remove patches

Change-Id: I45fd8cd1d3ceca0e9915849337d94c829c41daf8

diff --git a/packaging/char.patch b/packaging/char.patch
deleted file mode 100644 (file)
index b2b9244..0000000
--- a/packaging/char.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: security/nss/cmd/modutil/install-ds.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/cmd/modutil/install-ds.c,v
-retrieving revision 1.2
-diff -u -p -6 -r1.2 install-ds.c
---- security/nss/cmd/modutil/install-ds.c      25 Apr 2004 15:02:47 -0000      1.2
-+++ security/nss/cmd/modutil/install-ds.c      5 Feb 2007 06:57:38 -0000
-@@ -249,13 +249,13 @@ Pk11Install_File_Generate(Pk11Install_Fi
-                               if(!subval || (subval->type != STRING_VALUE)){
-                                       errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
-                                     _this->jarPath);
-                                       goto loser;
-                               }
-                               _this->permissions = (int) strtol(subval->string, &endp, 8);
--                              if(*endp != '\0' || subval->string == "\0") {
-+                              if(*endp != '\0' || subval->string[0] == '\0') {
-                                       errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
-                                     _this->jarPath);
-                                       goto loser;
-                               }
-                               gotPerms = PR_TRUE;
-                               Pk11Install_ListIter_delete(subiter);

diff --git a/packaging/malloc.patch b/packaging/malloc.patch
deleted file mode 100644 (file)
index 174bbf8..0000000
--- a/packaging/malloc.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: security/nss/tests/ssl/ssl.sh
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/tests/ssl/ssl.sh,v
-retrieving revision 1.100
-diff -u -r1.100 ssl.sh
---- security/nss/tests/ssl/ssl.sh      26 Mar 2009 23:14:34 -0000      1.100
-+++ security/nss/tests/ssl/ssl.sh      6 Jun 2009 06:21:07 -0000
-@@ -974,6 +974,7 @@
-
- ################################# main #################################
-
-+unset MALLOC_CHECK_
- ssl_init
- ssl_run_tests
- ssl_cleanup

diff --git a/packaging/nss-no-rpath.patch b/packaging/nss-no-rpath.patch
deleted file mode 100644 (file)
index 6c99327..0000000
--- a/packaging/nss-no-rpath.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: security/nss/cmd/platlibs.mk
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v
-retrieving revision 1.64
-diff -u -r1.64 platlibs.mk
---- security/nss/cmd/platlibs.mk       17 Jun 2009 23:01:48 -0000      1.64
-+++ security/nss/cmd/platlibs.mk       31 Jul 2009 08:04:09 -0000
-@@ -53,9 +53,9 @@
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(BUILD_SUN_PKG), 1)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib'
- endif
- else
- ifeq ($(USE_64), 1)

diff --git a/packaging/nss-opt.patch b/packaging/nss-opt.patch
deleted file mode 100644 (file)
index b57bd24..0000000
--- a/packaging/nss-opt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: security/coreconf/Linux.mk
-===================================================================
-RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v
-retrieving revision 1.45.2.1
-diff -u -r1.45.2.1 Linux.mk
---- security/coreconf/Linux.mk 31 Jul 2010 04:23:37 -0000      1.45.2.1
-+++ security/coreconf/Linux.mk 5 Aug 2010 07:35:06 -0000
-@@ -112,11 +112,7 @@
- endif
-
- ifdef BUILD_OPT
--ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE))
--      OPTIMIZER = -Os
--else
--      OPTIMIZER = -O2
--endif
-+      OPTIMIZER = $(OPT_FLAGS)
- ifdef MOZ_DEBUG_SYMBOLS
-       ifdef MOZ_DEBUG_FLAGS
-               OPTIMIZER += $(MOZ_DEBUG_FLAGS)

diff --git a/packaging/nss.spec b/packaging/nss.spec
index f569892..7295595 100644 (file)
--- a/packaging/nss.spec
+++ b/packaging/nss.spec
@@ -22,12 +22,6 @@ Source6:        setup-nsssysinit.sh
 Source7:        cert9.db
 Source8:        key4.db
 Source9:        pkcs11.txt
-Patch1:         nss-opt.patch
-Patch2:         system-nspr.patch
-Patch3:         char.patch
-Patch4:         nss-no-rpath.patch
-Patch5:         renegotiate-transitional.patch
-Patch6:         malloc.patch
 %define nspr_ver %(rpm -q --queryformat '%{VERSION}' nspr)
 Requires(pre):  nspr >= %nspr_ver
 Requires(pre):  libfreebl3 >= %{nss_softokn_fips_version}
@@ -125,12 +119,6 @@ Mozilla project.
 %prep
 %setup -n nss-%{version} -q
 cd mozilla
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5
-%patch6
 
 %build
 modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")"

diff --git a/packaging/renegotiate-transitional.patch b/packaging/renegotiate-transitional.patch
deleted file mode 100644 (file)
index c99c2aa..0000000
--- a/packaging/renegotiate-transitional.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: security/nss/lib/ssl/sslsock.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ssl/sslsock.c,v
-retrieving revision 1.75
-diff -u -p -6 -r1.75 sslsock.c
---- security/nss/lib/ssl/sslsock.c     22 Oct 2011 16:45:40 -0000      1.75
-+++ security/nss/lib/ssl/sslsock.c     24 Oct 2011 12:52:25 -0000
-@@ -178,13 +178,13 @@ static sslOptions ssl_defaults = {
-     PR_TRUE,  /* detectRollBack     */
-     PR_FALSE,   /* noStepDown         */
-     PR_FALSE,   /* bypassPKCS11       */
-     PR_FALSE,   /* noLocks            */
-     PR_FALSE,   /* enableSessionTickets */
-     PR_FALSE,   /* enableDeflate      */
--    2,          /* enableRenegotiation (default: requires extension) */
-+    3,          /* enableRenegotiation (default: transitional) */
-     PR_FALSE,   /* requireSafeNegotiation */
-     PR_FALSE,   /* enableFalseStart   */
-     PR_TRUE     /* cbcRandomIV        */
- };
-
- sslSessionIDLookupFunc  ssl_sid_lookup;

diff --git a/packaging/system-nspr.patch b/packaging/system-nspr.patch
deleted file mode 100644 (file)
index 3ca85a5..0000000
--- a/packaging/system-nspr.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: security/nss/Makefile
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/Makefile,v
-retrieving revision 1.36
-diff -u -p -r1.36 Makefile
---- security/nss/Makefile      2 Dec 2008 23:24:39 -0000       1.36
-+++ security/nss/Makefile      23 Nov 2009 16:19:04 -0000
-@@ -78,7 +78,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk
- # (7) Execute "local" rules. (OPTIONAL).                              #
- #######################################################################
-
--nss_build_all: build_coreconf build_nspr build_dbm all
-+nss_build_all: build_coreconf build_dbm all
-
- nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber