[pkg-wine-party] [wine] 02/02: Drop shlib-exit-calls.patch.
This is an automated email from the git hooks/post-receive script.
jreyer-guest pushed a commit to branch master
in repository wine.
commit d624c3cf813fb7357d211de4641a9b8e2d26fda5
Author: Jens Reyer <jre.winesim@gmail.com>
Date: Fri Oct 14 15:07:53 2016 +0200
Drop shlib-exit-calls.patch.
The wineloader often requires exit in the shared lib, see thread
around
https://www.winehq.org/pipermail/wine-devel/2016-October/114988.html
---
debian/changelog | 1 +
debian/libwineVERSION.lintian-overrides | 3 +
debian/patches/disable/shlib-exit-calls.patch | 141 --------------------------
debian/patches/series | 1 -
4 files changed, 4 insertions(+), 142 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ecec94b..db7948f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
wine-development (1.9.20-2) UNRELEASED; urgency=medium
* Simplify the foreign-arch test in the wine script.
+ * Drop shlib-exit-calls.patch.
-- Jens Reyer <jre.winesim@gmail.com> Fri, 14 Oct 2016 14:57:50 +0200
diff --git a/debian/libwineVERSION.lintian-overrides b/debian/libwineVERSION.lintian-overrides
index 7581093..e942f16 100644
--- a/debian/libwineVERSION.lintian-overrides
+++ b/debian/libwineVERSION.lintian-overrides
@@ -4,3 +4,6 @@ package-has-unnecessary-activation-of-ldconfig-trigger
hardening-no-fortify-functions
# incorrectly flagged
spelling-error-in-binary
+# the loader often requires exit in the shared lib, see thread around
+# https://www.winehq.org/pipermail/wine-devel/2016-October/114988.html
+shlib-calls-exit
diff --git a/debian/patches/disable/shlib-exit-calls.patch b/debian/patches/disable/shlib-exit-calls.patch
deleted file mode 100644
index b81be9a..0000000
--- a/debian/patches/disable/shlib-exit-calls.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-description: use abort instead of exit for shared library failure modes
-author: Michael Gilbert <mgilbert@debian.org>
-
---- a/libs/wine/mmap.c
-+++ b/libs/wine/mmap.c
-@@ -76,7 +76,7 @@ static inline int get_fdzero(void)
- if ((fd = open( "/dev/zero", O_RDONLY )) == -1)
- {
- perror( "/dev/zero: open" );
-- exit(1);
-+ abort();
- }
- }
- return fd;
-@@ -128,7 +128,7 @@ static int try_mmap_fixed (void *addr, s
- if ( (pid = vfork()) == -1 )
- {
- perror("try_mmap_fixed: vfork");
-- exit(1);
-+ abort();
- }
- if ( pid == 0 )
- {
-@@ -140,18 +140,18 @@ static int try_mmap_fixed (void *addr, s
- mapped and we must fail. */
- for ( i = 0; i < len; i += pagesize )
- if ( mincore( (caddr_t)addr + i, pagesize, &vec ) != -1 )
-- _exit(1);
-+ abort();
-
- /* Perform the mapping with MAP_FIXED set. This is safe
- now, as none of the pages is currently in use. */
- result = mmap( addr, len, prot, flags | MAP_FIXED, fildes, off );
- if ( result == addr )
-- _exit(0);
-+ break;
-
- if ( result != (void *) -1 ) /* This should never happen ... */
- munmap( result, len );
-
-- _exit(1);
-+ abort();
- }
-
- /* reap child */
---- a/libs/wine/ldt.c
-+++ b/libs/wine/ldt.c
-@@ -192,7 +192,7 @@ static int internal_set_entry( unsigned
- {
- perror("i386_set_ldt");
- fprintf( stderr, "Did you reconfigure the kernel with \"options USER_LDT\"?\n" );
-- exit(1);
-+ abort();
- }
- }
- #elif defined(__svr4__) || defined(_SCO_DS)
-@@ -213,7 +213,7 @@ static int internal_set_entry( unsigned
- perror("i386_set_ldt");
- #else
- fprintf( stderr, "No LDT support on this platform\n" );
-- exit(1);
-+ abort();
- #endif
-
- if (ret >= 0)
---- a/libs/wine/config.c
-+++ b/libs/wine/config.c
-@@ -68,7 +68,7 @@ static void fatal_error( const char *err
- fprintf( stderr, "wine: " );
- vfprintf( stderr, err, args );
- va_end( args );
-- exit(1);
-+ abort();
- }
-
- /* die on a fatal error */
-@@ -81,7 +81,7 @@ static void fatal_perror( const char *er
- vfprintf( stderr, err, args );
- perror( " " );
- va_end( args );
-- exit(1);
-+ abort();
- }
-
- /* malloc wrapper */
---- a/libs/wine/debug.c
-+++ b/libs/wine/debug.c
-@@ -186,7 +186,7 @@ static void debug_usage(void)
- " turns on all messages except warning heap messages\n"
- "Available message classes: err, warn, fixme, trace\n";
- write( 2, usage, sizeof(usage) - 1 );
-- exit(1);
-+ abort();
- }
-
-
---- a/libs/wpp/preproc.c
-+++ b/libs/wpp/preproc.c
-@@ -711,7 +711,7 @@ end:
- static void wpp_default_error(const char *file, int line, int col, const char *near, const char *msg, va_list ap)
- {
- generic_msg(msg, "Error", near, ap);
-- exit(1);
-+ abort();
- }
-
- static void wpp_default_warning(const char *file, int line, int col, const char *near, const char *msg, va_list ap)
-@@ -759,5 +759,5 @@ void pp_internal_error(const char *file,
- vfprintf(stderr, s, ap);
- fprintf(stderr, "\n");
- va_end(ap);
-- exit(3);
-+ abort();
- }
---- a/libs/port/spawn.c
-+++ b/libs/port/spawn.c
-@@ -55,20 +55,20 @@ int _spawnvp(int mode, const char *cmdna
- if (mode == _P_DETACH)
- {
- pid = fork();
-- if (pid == -1) _exit(1);
-- else if (pid > 0) _exit(0);
-+ if (pid == -1) abort();
-+ else if (pid > 0) return pid;
- /* else in grandchild */
- }
-
- signal( SIGPIPE, SIG_DFL );
- execvp(cmdname, (char **)argv);
-- _exit(1);
-+ abort();
- }
-
- if (pid == -1)
- return -1;
-
-- if (mode == _P_OVERLAY) exit(0);
-+ if (mode == _P_OVERLAY) abort();
-
- if (mode == _P_WAIT || mode == _P_DETACH)
- {
diff --git a/debian/patches/series b/debian/patches/series
index f9dbcf7..e5f1555 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,6 @@ manpages-wineserver-persistence.patch
disable/tests.patch
disable/addons-download.patch
disable/rerun-configure.patch
-disable/shlib-exit-calls.patch
generate/opengl.patch
generate/unicode.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
Reply to: