From c98552118a8925f3927056294418543cdba736f7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 25 Jun 2009 21:06:06 +0200 Subject: remove old patches --- .../patch-mozilla_security_coreconf_arch_mk.orig | 11 -------- package/rpm/patches/patch-rpmio_rpmio_h.orig | 22 ---------------- package/rpm/patches/patch-rpmio_rpmsq_c.orig | 30 ---------------------- 3 files changed, 63 deletions(-) delete mode 100644 package/nss/patches/patch-mozilla_security_coreconf_arch_mk.orig delete mode 100644 package/rpm/patches/patch-rpmio_rpmio_h.orig delete mode 100644 package/rpm/patches/patch-rpmio_rpmsq_c.orig diff --git a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk.orig b/package/nss/patches/patch-mozilla_security_coreconf_arch_mk.orig deleted file mode 100644 index 20af1c767..000000000 --- a/package/nss/patches/patch-mozilla_security_coreconf_arch_mk.orig +++ /dev/null @@ -1,11 +0,0 @@ ---- nss-3.12.3.orig/mozilla/security/coreconf/arch.mk 2009-03-11 19:54:24.000000000 +0100 -+++ nss-3.12.3/mozilla/security/coreconf/arch.mk 2009-06-24 21:38:51.010734431 +0200 -@@ -329,7 +329,7 @@ endif - # IMPL_STRATEGY may be defined too. - # - --OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ -+OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(OBJDIR_TAG).OBJ - - ifeq (,$(filter-out WIN%,$(OS_TARGET))) - ifndef BUILD_OPT diff --git a/package/rpm/patches/patch-rpmio_rpmio_h.orig b/package/rpm/patches/patch-rpmio_rpmio_h.orig deleted file mode 100644 index a2d2d8572..000000000 --- a/package/rpm/patches/patch-rpmio_rpmio_h.orig +++ /dev/null @@ -1,22 +0,0 @@ ---- rpm-4.7.0.orig/rpmio/rpmio.h 2009-03-03 07:51:52.000000000 +0100 -+++ rpm-4.7.0/rpmio/rpmio.h 2009-06-25 19:32:01.343208721 +0200 -@@ -25,15 +25,19 @@ extern "C" { - * argument as a pointer rather than as an off_t. The snarl below defines - * typedefs to isolate the lossage. - */ -+/* - #if defined(__GLIBC__) && \ - (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) - #define USE_COOKIE_SEEK_POINTER 1 - typedef _IO_off64_t _libio_off_t; - typedef _libio_off_t * _libio_pos_t; - #else -+*/ - typedef off_t _libio_off_t; - typedef off_t _libio_pos_t; -+/* - #endif -+*/ - - /** \ingroup rpmio - */ diff --git a/package/rpm/patches/patch-rpmio_rpmsq_c.orig b/package/rpm/patches/patch-rpmio_rpmsq_c.orig deleted file mode 100644 index c192ed276..000000000 --- a/package/rpm/patches/patch-rpmio_rpmsq_c.orig +++ /dev/null @@ -1,30 +0,0 @@ ---- rpm-4.7.0.orig/rpmio/rpmsq.c 2009-03-03 07:51:52.000000000 +0100 -+++ rpm-4.7.0/rpmio/rpmsq.c 2009-06-25 20:02:58.903020248 +0200 -@@ -115,6 +115,7 @@ fprintf(stderr, " Insert(%p): %p\n", - */ - static int rpmsqRemove(void * elem) - { -+ sigset_t new_set, old_set; - rpmsq sq = (rpmsq) elem; - int ret = -1; - -@@ -124,7 +125,9 @@ static int rpmsqRemove(void * elem) - if (_rpmsq_debug) - fprintf(stderr, " Remove(%p): %p\n", ME(), sq); - #endif -- ret = sighold (SIGCHLD); -+ sigemptyset( &new_set ); -+ sigaddset( &new_set, SIGCHLD ); -+ ret = sigprocmask(SIG_BLOCK, &new_set, &old_set); - if (ret == 0) { - remque(elem); - -@@ -142,7 +145,7 @@ fprintf(stderr, " Remove(%p): %p\n", - sq->reaped = 0; - sq->child = 0; - #endif -- ret = sigrelse(SIGCHLD); -+ ret = sigprocmask( SIG_SETMASK, &old_set, NULL ); - } - } - return ret; -- cgit v1.2.3