diff options
| author | Micah Cowan <micah@addictivecode.org> | 2014-08-22 09:59:35 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2014-08-22 09:59:35 +0000 |
| commit | 1ed80b59e761003a0e7d14f490afbb788838baa5 (patch) | |
| tree | 04cc020fefdd39d9dc4f42e6295abcc2d98cf928 /debian/patches/080_gc72.patch | |
| parent | Debian release 0.5.3-16 (diff) | |
| download | w3m-1ed80b59e761003a0e7d14f490afbb788838baa5.tar.gz w3m-1ed80b59e761003a0e7d14f490afbb788838baa5.zip | |
Update 080_gc72.patch to prevent segfaults (closes: #758831)
Diffstat (limited to 'debian/patches/080_gc72.patch')
| -rw-r--r-- | debian/patches/080_gc72.patch | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/debian/patches/080_gc72.patch b/debian/patches/080_gc72.patch index 938a5da..e643b3a 100644 --- a/debian/patches/080_gc72.patch +++ b/debian/patches/080_gc72.patch @@ -1,26 +1,16 @@ Description: Patch from Gentoo to support Boehm GC 7.2 Origin: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/www-client/w3m/files/w3m-0.5.2-gc72.patch?revision=1.1&view=markup -diff -Naurb w3m-0.5.2.orig/main.c w3m-0.5.2/main.c ---- w3m-0.5.2.orig/main.c 2007-05-31 10:19:50.000000000 +0900 -+++ w3m-0.5.2/main.c 2009-11-09 08:20:02.184953443 +0900 -@@ -312,7 +312,11 @@ - lock = 0; - } - } -+#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2 -+ else if (orig_GC_warn_proc = GC_get_warn_proc()) -+#else - else if (orig_GC_warn_proc) -+#endif - orig_GC_warn_proc(msg, arg); - else - fprintf(stderr, msg, (unsigned long)arg); -@@ -842,7 +846,11 @@ +Index: w3m-0.5.3/main.c +=================================================================== +--- w3m-0.5.3.orig/main.c 2014-08-21 12:22:32.000000000 -0700 ++++ w3m-0.5.3/main.c 2014-08-21 12:22:52.419420062 -0700 +@@ -845,7 +845,12 @@ main(int argc, char **argv, char **envp) mySignal(SIGPIPE, SigPipe); #endif +#if GC_VERSION_MAJOR >= 7 && GC_VERSION_MINOR >= 2 ++ orig_GC_warn_proc = GC_get_warn_proc(); + GC_set_warn_proc(wrap_GC_warn_proc); +#else orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); |