From 6c27e52ef43baed0aed78a516db2b9b7973f5c13 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Wed, 24 Oct 2018 16:00:16 +0000 Subject: [PATCH] nss: drop all patches for versions < 3.23, unneeded since #3156 --- dev-libs/nss/patches/nss-3.17.4.patchset | 141 -------------------- dev-libs/nss/patches/nss-3.18.patchset | 141 -------------------- dev-libs/nss/patches/nss-3.19.1.patchset | 141 -------------------- dev-libs/nss/patches/nss-3.20.1.patchset | 141 -------------------- dev-libs/nss/patches/nss-3.20.patchset | 141 -------------------- dev-libs/nss/patches/nss-3.21.patchset | 160 ----------------------- dev-libs/nss/patches/nss-3.22.1.patchset | 160 ----------------------- 7 files changed, 1025 deletions(-) delete mode 100644 dev-libs/nss/patches/nss-3.17.4.patchset delete mode 100644 dev-libs/nss/patches/nss-3.18.patchset delete mode 100644 dev-libs/nss/patches/nss-3.19.1.patchset delete mode 100644 dev-libs/nss/patches/nss-3.20.1.patchset delete mode 100644 dev-libs/nss/patches/nss-3.20.patchset delete mode 100644 dev-libs/nss/patches/nss-3.21.patchset delete mode 100644 dev-libs/nss/patches/nss-3.22.1.patchset diff --git a/dev-libs/nss/patches/nss-3.17.4.patchset b/dev-libs/nss/patches/nss-3.17.4.patchset deleted file mode 100644 index d99cd24fe..000000000 --- a/dev-libs/nss/patches/nss-3.17.4.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 782e6c0..669e52a 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index f204484..5cb10ee 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -66,7 +66,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -1.8.3.4 - - -From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 1de9b49..08d7753 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -1.8.3.4 - - -From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -1.8.3.4 - - -From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -1.8.3.4 - diff --git a/dev-libs/nss/patches/nss-3.18.patchset b/dev-libs/nss/patches/nss-3.18.patchset deleted file mode 100644 index d99cd24fe..000000000 --- a/dev-libs/nss/patches/nss-3.18.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 782e6c0..669e52a 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index f204484..5cb10ee 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -66,7 +66,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -1.8.3.4 - - -From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 1de9b49..08d7753 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -1.8.3.4 - - -From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -1.8.3.4 - - -From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -1.8.3.4 - diff --git a/dev-libs/nss/patches/nss-3.19.1.patchset b/dev-libs/nss/patches/nss-3.19.1.patchset deleted file mode 100644 index d99cd24fe..000000000 --- a/dev-libs/nss/patches/nss-3.19.1.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 782e6c0..669e52a 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index f204484..5cb10ee 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -66,7 +66,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -1.8.3.4 - - -From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 1de9b49..08d7753 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -1.8.3.4 - - -From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -1.8.3.4 - - -From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -1.8.3.4 - diff --git a/dev-libs/nss/patches/nss-3.20.1.patchset b/dev-libs/nss/patches/nss-3.20.1.patchset deleted file mode 100644 index d99cd24fe..000000000 --- a/dev-libs/nss/patches/nss-3.20.1.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 782e6c0..669e52a 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index f204484..5cb10ee 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -66,7 +66,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -1.8.3.4 - - -From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 1de9b49..08d7753 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -1.8.3.4 - - -From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -1.8.3.4 - - -From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -1.8.3.4 - diff --git a/dev-libs/nss/patches/nss-3.20.patchset b/dev-libs/nss/patches/nss-3.20.patchset deleted file mode 100644 index d99cd24fe..000000000 --- a/dev-libs/nss/patches/nss-3.20.patchset +++ /dev/null @@ -1,141 +0,0 @@ -From be5d83aa3c8725caa18a940fcb5f72bc6ca20bcd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 782e6c0..669e52a 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index f204484..5cb10ee 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -66,7 +66,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -1.8.3.4 - - -From a90f08ec358c67555eced1750db584e1dfcc9381 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 1de9b49..08d7753 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -594,6 +594,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -1.8.3.4 - - -From 654a6b2ba7aabe42120b1477138bc357ddf9c98a Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -1.8.3.4 - - -From 6ed942559c69cdfaa34a8dfe427b080e87512055 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -1.8.3.4 - diff --git a/dev-libs/nss/patches/nss-3.21.patchset b/dev-libs/nss/patches/nss-3.21.patchset deleted file mode 100644 index 1d07aad7b..000000000 --- a/dev-libs/nss/patches/nss-3.21.patchset +++ /dev/null @@ -1,160 +0,0 @@ -From a05105e8cf826330b1de3e2f33150c0283c934bd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 62ba8d5..d515a20 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index 4cca532..ecec75d 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -60,7 +60,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -2.2.2 - - -From 155512db961560ecaa31781efc1a4e8e56673d51 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 993d01e..b436dd2 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -596,6 +596,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -2.2.2 - - -From 107d6928d8f969d28a7341bb500268d15fa7ebe1 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -2.2.2 - - -From 814cc5773310331615081ead443177f3085f6dd7 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -2.2.2 - - -From 22dc826a0490c0fdb42e5ba69a56695d388a9e14 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 24 Nov 2015 19:12:08 +0000 -Subject: avoid some tests. - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index fe54580..3bc0ce3 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -50,3 +50,4 @@ SKIP_SHLIBSIGN=1 - USE_SYSTEM_ZLIB = 1 - ZLIB_LIBS = -lz - NSS_USE_SYSTEM_SQLITE=1 -+NSS_DISABLE_GTESTS=1 --- -2.2.2 - diff --git a/dev-libs/nss/patches/nss-3.22.1.patchset b/dev-libs/nss/patches/nss-3.22.1.patchset deleted file mode 100644 index 1d07aad7b..000000000 --- a/dev-libs/nss/patches/nss-3.22.1.patchset +++ /dev/null @@ -1,160 +0,0 @@ -From a05105e8cf826330b1de3e2f33150c0283c934bd Mon Sep 17 00:00:00 2001 -From: Kacper Kasper -Date: Sat, 5 Jul 2014 02:12:23 +0200 -Subject: Haiku support - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 750696d..b53cfea 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -7,7 +7,7 @@ include $(CORE_DEPTH)/coreconf/UNIX.mk - - XP_DEFINE := $(XP_DEFINE:-DXP_UNIX=-DXP_BEOS) - --USE_PTHREADS = -+USE_PTHREADS = 1 - - ifeq ($(USE_PTHREADS),1) - IMPL_STRATEGY = _PTH -@@ -27,7 +27,7 @@ else - CPU_ARCH = x86 - endif - --MKSHLIB = $(CC) -nostart -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) -+MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) - ifdef BUILD_OPT - OPTIMIZER = -O2 - endif -diff --git a/coreconf/arch.mk b/coreconf/arch.mk -index 62ba8d5..d515a20 100644 ---- a/coreconf/arch.mk -+++ b/coreconf/arch.mk -@@ -41,6 +41,14 @@ else - endif - - # -+# Force the Haiku machines to use BeOS. -+# -+ -+ifeq ($(OS_ARCH),Haiku) -+ OS_ARCH = BeOS -+endif -+ -+# - # Force the IRIX64 machines to use IRIX. - # - -diff --git a/lib/dbm/include/mcom_db.h b/lib/dbm/include/mcom_db.h -index 4cca532..ecec75d 100644 ---- a/lib/dbm/include/mcom_db.h -+++ b/lib/dbm/include/mcom_db.h -@@ -60,7 +60,7 @@ typedef PRUint32 uint32; - #include - #endif - --#if defined(__linux) || defined(__BEOS__) -+#if defined(__linux) || defined(BEOS) - #include - #ifndef BYTE_ORDER - #define BYTE_ORDER __BYTE_ORDER --- -2.2.2 - - -From 155512db961560ecaa31781efc1a4e8e56673d51 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:09:35 +0000 -Subject: define RTLD_NOLOAD - - -diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c -index 993d01e..b436dd2 100644 ---- a/lib/freebl/stubs.c -+++ b/lib/freebl/stubs.c -@@ -596,6 +596,10 @@ freebl_InitNSSUtil(void *lib) - return SECSuccess; - } - -+#ifndef RTLD_NOLOAD -+ #define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ --- -2.2.2 - - -From 107d6928d8f969d28a7341bb500268d15fa7ebe1 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 13:40:13 +0000 -Subject: skip optionally the signing part - - -diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile -index 83f90fa..8934439 100644 ---- a/cmd/shlibsign/Makefile -+++ b/cmd/shlibsign/Makefile -@@ -95,5 +95,7 @@ else - endif - endif - -+ifndef SKIP_SHLIBSIGN - libs install :: $(CHECKLOC) -+endif - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index b53cfea..51fe162 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -45,3 +45,5 @@ ARCH = beos - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -+ -+SKIP_SHLIBSIGN=1 --- -2.2.2 - - -From 814cc5773310331615081ead443177f3085f6dd7 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 25 Sep 2014 14:14:26 +0000 -Subject: use system libs - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index 51fe162..fe54580 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -47,3 +47,6 @@ DSO_CFLAGS = -fPIC - DSO_LDOPTS = - - SKIP_SHLIBSIGN=1 -+USE_SYSTEM_ZLIB = 1 -+ZLIB_LIBS = -lz -+NSS_USE_SYSTEM_SQLITE=1 --- -2.2.2 - - -From 22dc826a0490c0fdb42e5ba69a56695d388a9e14 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Tue, 24 Nov 2015 19:12:08 +0000 -Subject: avoid some tests. - - -diff --git a/coreconf/BeOS.mk b/coreconf/BeOS.mk -index fe54580..3bc0ce3 100644 ---- a/coreconf/BeOS.mk -+++ b/coreconf/BeOS.mk -@@ -50,3 +50,4 @@ SKIP_SHLIBSIGN=1 - USE_SYSTEM_ZLIB = 1 - ZLIB_LIBS = -lz - NSS_USE_SYSTEM_SQLITE=1 -+NSS_DISABLE_GTESTS=1 --- -2.2.2 -