OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 02-Aug-2008 20:33:40
Branch: HEAD Handle: 2008080219333900
Modified files:
openpkg-src/nss nss.patch nss.spec
Log:
include a patch from FreeBSD ports
Summary:
Revision Changes Path
1.3 +63 -7 openpkg-src/nss/nss.patch
1.6 +1 -1 openpkg-src/nss/nss.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nss/nss.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 nss.patch
--- openpkg-src/nss/nss.patch 18 Jun 2008 06:51:02 -0000 1.2
+++ openpkg-src/nss/nss.patch 2 Aug 2008 18:33:39 -0000 1.3
@@ -1,6 +1,6 @@
Index: mozilla/dbm/src/Makefile.in
--- mozilla/dbm/src/Makefile.in.orig 2005-09-22 12:38:07 +0200
-+++ mozilla/dbm/src/Makefile.in 2008-06-18 08:27:18 +0200
++++ mozilla/dbm/src/Makefile.in 2008-08-02 20:28:55 +0200
@@ -59,7 +59,6 @@
hash_buf.c \
hsearch.c \
@@ -11,7 +11,7 @@
$(NULL)
Index: mozilla/security/nss/Makefile
--- mozilla/security/nss/Makefile.orig 2006-04-15 00:48:31 +0200
-+++ mozilla/security/nss/Makefile 2008-06-18 08:27:18 +0200
++++ mozilla/security/nss/Makefile 2008-08-02 20:28:55 +0200
@@ -78,7 +78,7 @@
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
@@ -23,7 +23,7 @@
Index: mozilla/security/nss/cmd/certutil/certext.c
--- mozilla/security/nss/cmd/certutil/certext.c.orig 2008-02-16 02:17:41
+0100
-+++ mozilla/security/nss/cmd/certutil/certext.c 2008-06-18 08:32:12
+0200
++++ mozilla/security/nss/cmd/certutil/certext.c 2008-08-02 20:28:55
+0200
@@ -406,7 +406,7 @@
SEC_ASN1_MKSUB(SEC_ObjectIDTemplate)
@@ -44,7 +44,7 @@
Index: mozilla/security/nss/cmd/certutil/keystuff.c
--- mozilla/security/nss/cmd/certutil/keystuff.c.orig 2007-11-22
06:03:53 +0100
-+++ mozilla/security/nss/cmd/certutil/keystuff.c 2008-06-18 08:27:18
+0200
++++ mozilla/security/nss/cmd/certutil/keystuff.c 2008-08-02 20:28:55
+0200
@@ -70,7 +70,7 @@
#define ERROR_BREAK rv = SECFailure;break;
@@ -65,7 +65,7 @@
Index: mozilla/security/nss/cmd/crlutil/crlgen.c
--- mozilla/security/nss/cmd/crlutil/crlgen.c.orig 2006-05-21 23:02:26
+0200
-+++ mozilla/security/nss/cmd/crlutil/crlgen.c 2008-06-18 08:27:18
+0200
++++ mozilla/security/nss/cmd/crlutil/crlgen.c 2008-08-02 20:28:55
+0200
@@ -65,7 +65,7 @@
* inclined student.
*/
@@ -93,9 +93,65 @@
PL_CompareValues, NULL, NULL);
if (!crlGenData->entryDataHashTable) {
PORT_Free(crlGenData);
+Index: mozilla/security/nss/cmd/modutil/modutil.h
+--- mozilla/security/nss/cmd/modutil/modutil.h.orig 2004-04-25 17:02:47
+0200
++++ mozilla/security/nss/cmd/modutil/modutil.h 2008-08-02 20:28:55
+0200
+@@ -52,8 +52,8 @@
+
+ #include "error.h"
+
+-Error FipsMode(char *arg);
+-Error ChkFipsMode(char *arg);
++Error FipsMode(const char *arg);
++Error ChkFipsMode(const char *arg);
+ Error AddModule(char *moduleName, char *libFile, char *ciphers,
+ char *mechanisms, char* modparms);
+ Error DeleteModule(char *moduleName);
+Index: mozilla/security/nss/cmd/modutil/pk11.c
+--- mozilla/security/nss/cmd/modutil/pk11.c.orig 2007-02-28 20:47:39
+0100
++++ mozilla/security/nss/cmd/modutil/pk11.c 2008-08-02 20:28:55 +0200
+@@ -52,7 +52,7 @@
+ * disable FIPS mode on the internal module.
+ */
+ Error
+-FipsMode(char *arg)
++FipsMode(const char *arg)
+ {
+ char *internal_name;
+
+@@ -61,16 +61,18 @@
+ internal_name = PR_smprintf("%s",
+ SECMOD_GetInternalModule()->commonName);
+ if(SECMOD_DeleteInternalModule(internal_name) != SECSuccess) {
+- PR_fprintf(PR_STDERR, "%s\n", SECU_Strerror(PORT_GetError()));
++ PR_fprintf(PR_STDERR, "FipsMode(true): %s (%s)\n",
SECU_Strerror(PORT_GetError()), internal_name);
+ PR_smprintf_free(internal_name);
+ PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
+ return FIPS_SWITCH_FAILED_ERR;
+ }
+- PR_smprintf_free(internal_name);
+ if (!PK11_IsFIPS()) {
++ PR_fprintf(PR_STDERR, "FipsMode(true): in module %s",
internal_name);
++ PR_smprintf_free(internal_name);
+ PR_fprintf(PR_STDERR, errStrings[FIPS_SWITCH_FAILED_ERR]);
+ return FIPS_SWITCH_FAILED_ERR;
+ }
++ PR_smprintf_free(internal_name);
+ PR_fprintf(PR_STDOUT, msgStrings[FIPS_ENABLED_MSG]);
+ } else {
+ PR_fprintf(PR_STDERR, errStrings[FIPS_ALREADY_ON_ERR]);
+@@ -111,7 +113,7 @@
+ * If arg=="false", verify FIPS mode is disabled on the internal module.
+ */
+ Error
+-ChkFipsMode(char *arg)
++ChkFipsMode(const char *arg)
+ {
+ if(!PORT_Strcasecmp(arg, "true")) {
+ if (PK11_IsFIPS()) {
Index: mozilla/security/nss/cmd/shlibsign/Makefile
--- mozilla/security/nss/cmd/shlibsign/Makefile.orig 2006-12-07 02:57:18
+0100
-+++ mozilla/security/nss/cmd/shlibsign/Makefile 2008-06-18 08:27:18
+0200
++++ mozilla/security/nss/cmd/shlibsign/Makefile 2008-08-02 20:28:55
+0200
@@ -60,9 +60,10 @@
# sign any and all shared libraries that contain the word freebl
@@ -112,7 +168,7 @@
ALL_TRASH += $(CHECKLOC)
Index: mozilla/security/nss/cmd/zlib/manifest.mn
--- mozilla/security/nss/cmd/zlib/manifest.mn.orig 2004-11-04 17:23:19
+0100
-+++ mozilla/security/nss/cmd/zlib/manifest.mn 2008-06-18 08:27:18
+0200
++++ mozilla/security/nss/cmd/zlib/manifest.mn 2008-08-02 20:28:55
+0200
@@ -57,7 +57,7 @@
LIBRARY_NAME = zlib
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/nss/nss.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 nss.spec
--- openpkg-src/nss/nss.spec 18 Jun 2008 06:51:02 -0000 1.5
+++ openpkg-src/nss/nss.spec 2 Aug 2008 18:33:39 -0000 1.6
@@ -36,7 +36,7 @@
Group: Cryptography
License: MPL
Version: %{V_major}.%{V_minor}
-Release: 20080618
+Release: 20080802
# list of sources
Source0:
ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_%{V_major}_%{V_minor}_RTM/src/nss-%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
