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:45:30
Branch: HEAD Handle: 2008080219452900
Modified files:
openpkg-src/nss nss.patch
Log:
take over Debian patches
Summary:
Revision Changes Path
1.4 +350 -9 openpkg-src/nss/nss.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/nss/nss.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 nss.patch
--- openpkg-src/nss/nss.patch 2 Aug 2008 18:33:39 -0000 1.3
+++ openpkg-src/nss/nss.patch 2 Aug 2008 18:45:29 -0000 1.4
@@ -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-08-02 20:28:55 +0200
++++ mozilla/dbm/src/Makefile.in 2008-08-02 20:41:16 +0200
@@ -59,7 +59,6 @@
hash_buf.c \
hsearch.c \
@@ -9,9 +9,189 @@
strerror.c \
nsres.c \
$(NULL)
+Index: mozilla/security/coreconf/Linux.mk
+--- mozilla/security/coreconf/Linux.mk.orig 2007-11-22 05:39:56 +0100
++++ mozilla/security/coreconf/Linux.mk 2008-08-02 20:41:16 +0200
+@@ -52,72 +52,46 @@
+
+ DEFAULT_COMPILER = gcc
+
+-ifeq ($(OS_TEST),m68k)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = m68k
++CPU_ARCH = $(OS_TEST)
++
++ifeq ($(KERNEL),linux)
++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
++ ARCH = linux
+ else
++ OS_REL_CFLAGS = -D_XOPEN_SOURCE
++ ARCH = gnu
++endif
++
+ ifeq ($(OS_TEST),ppc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = ppc
+ ifeq ($(USE_64),1)
+ ARCHFLAG = -m64
+ endif
+ else
+-ifeq ($(OS_TEST),ppc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = ppc
+-else
+ ifeq ($(OS_TEST),alpha)
+- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = alpha
+-else
+-ifeq ($(OS_TEST),ia64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = ia64
++ OS_REL_CFLAGS += -D_ALPHA_
+ else
+ ifeq ($(OS_TEST),x86_64)
+-ifeq ($(USE_64),1)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = x86_64
+-else
+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
++ifneq ($(USE_64),1)
++ OS_REL_CFLAGS += -Di386
+ CPU_ARCH = x86
+ ARCHFLAG = -m32
+ endif
+ else
+-ifeq ($(OS_TEST),sparc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = sparc
+-else
+ ifeq ($(OS_TEST),sparc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = sparc
+ else
+ ifeq (,$(filter-out arm% sa110,$(OS_TEST)))
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = arm
+ else
+ ifeq ($(OS_TEST),parisc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = hppa
+ else
+ ifeq ($(OS_TEST),parisc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ CPU_ARCH = hppa
+ else
+-ifeq ($(OS_TEST),s390)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = s390
+-else
+-ifeq ($(OS_TEST),s390x)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = s390x
+-else
+-ifeq ($(OS_TEST),mips)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = mips
+-else
+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
++ OS_REL_CFLAGS += -Di386
+ CPU_ARCH = x86
+ endif
+ endif
+@@ -127,17 +101,11 @@
+ endif
+ endif
+ endif
+-endif
+-endif
+-endif
+-endif
+-endif
+-endif
+
+
+ LIBC_TAG = _glibc
+
+-ifeq ($(OS_RELEASE),2.0)
++ifeq ($(KERNEL)-$(OS_RELEASE),linux-2.0)
+ OS_REL_CFLAGS += -DLINUX2_0
+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+ ifdef MAPFILE
+@@ -159,21 +127,22 @@
+ OS_PTHREAD = -lpthread
+ endif
+
+-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi
-Wall -Werror-implicit-function-declaration -Wno-switch -pipe -DLINUX -Dlinux
-D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi
-Wall -Werror-implicit-function-declaration -Wno-switch -pipe -D_POSIX_SOURCE
-D_BSD_SOURCE -DHAVE_STRERROR
++ifeq ($(KERNEL),linux)
++OS_CFLAGS += -DLINUX -Dlinux
++endif
+ OS_LIBS = $(OS_PTHREAD) -ldl -lc
+
+ ifdef USE_PTHREADS
+ DEFINES += -D_REENTRANT
+ endif
+
+-ARCH = linux
+-
+ DSO_CFLAGS = -fPIC
+ DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-z,defs
+ DSO_LDFLAGS =
+ LDFLAGS += $(ARCHFLAG)
+
+-# INCLUDES += -I/usr/include -Y/usr/include/linux
++# INCLUDES += -I/usr/include
+ G++INCLUDES = -I/usr/include/g++
+
+ #
+Index: mozilla/security/coreconf/Linux2.6.mk
+--- mozilla/security/coreconf/Linux2.6.mk.orig 2005-09-16 19:09:23
+0200
++++ mozilla/security/coreconf/Linux2.6.mk 2008-08-02 20:41:16 +0200
+@@ -37,7 +37,10 @@
+
+ include $(CORE_DEPTH)/coreconf/Linux.mk
+
++ifeq ($(KERNEL), linux)
+ OS_REL_CFLAGS += -DLINUX2_1
++endif
++
+ MKSHLIB = $(CC) $(DSO_LDOPTS) -Wl,-soname
-Wl,$(@:$(OBJDIR)/%.so=%.so)
+
+ ifdef MAPFILE
+Index: mozilla/security/coreconf/arch.mk
+--- mozilla/security/coreconf/arch.mk.orig 2007-11-14 23:49:43 +0100
++++ mozilla/security/coreconf/arch.mk 2008-08-02 20:41:16 +0200
+@@ -155,6 +155,14 @@
+ ifneq ($(words $(OS_RELEASE)),1)
+ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
+ endif
++ KERNEL = linux
++endif
++
++# This check must be last. Since all uses of OS_ARCH that follow affect
only
++# userland, we can merge other Glibc systems with Linux here.
++ifneq (, $(filter GNU GNU_%, $(OS_ARCH)))
++OS_ARCH = Linux
++OS_RELEASE = 2.6
+ endif
+
+ #
+Index: mozilla/security/coreconf/config.mk
+--- mozilla/security/coreconf/config.mk.orig 2008-03-26 19:48:58 +0100
++++ mozilla/security/coreconf/config.mk 2008-08-02 20:41:16 +0200
+@@ -63,7 +63,7 @@
+ #######################################################################
+
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+- OpenVMS AIX
++ OpenVMS AIX GNU GNU_%
+
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
Index: mozilla/security/nss/Makefile
--- mozilla/security/nss/Makefile.orig 2006-04-15 00:48:31 +0200
-+++ mozilla/security/nss/Makefile 2008-08-02 20:28:55 +0200
++++ mozilla/security/nss/Makefile 2008-08-02 20:41:16 +0200
@@ -78,7 +78,7 @@
# (7) Execute "local" rules. (OPTIONAL). #
#######################################################################
@@ -23,7 +203,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-08-02 20:28:55
+0200
++++ mozilla/security/nss/cmd/certutil/certext.c 2008-08-02 20:41:16
+0200
@@ -406,7 +406,7 @@
SEC_ASN1_MKSUB(SEC_ObjectIDTemplate)
@@ -44,7 +224,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-08-02 20:28:55
+0200
++++ mozilla/security/nss/cmd/certutil/keystuff.c 2008-08-02 20:41:16
+0200
@@ -70,7 +70,7 @@
#define ERROR_BREAK rv = SECFailure;break;
@@ -65,7 +245,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-08-02 20:28:55
+0200
++++ mozilla/security/nss/cmd/crlutil/crlgen.c 2008-08-02 20:41:16
+0200
@@ -65,7 +65,7 @@
* inclined student.
*/
@@ -93,9 +273,20 @@
PL_CompareValues, NULL, NULL);
if (!crlGenData->entryDataHashTable) {
PORT_Free(crlGenData);
+Index: mozilla/security/nss/cmd/manifest.mn
+--- mozilla/security/nss/cmd/manifest.mn.orig 2007-01-25 20:04:56
+0100
++++ mozilla/security/nss/cmd/manifest.mn 2008-08-02 20:41:16 +0200
+@@ -65,6 +65,7 @@
+ pk12util \
+ pk11mode \
+ pp \
++ pwdecrypt \
+ rsaperf \
+ sdrtest \
+ selfserv \
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
++++ mozilla/security/nss/cmd/modutil/modutil.h 2008-08-02 20:41:16
+0200
@@ -52,8 +52,8 @@
#include "error.h"
@@ -109,7 +300,7 @@
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
++++ mozilla/security/nss/cmd/modutil/pk11.c 2008-08-02 20:41:16 +0200
@@ -52,7 +52,7 @@
* disable FIPS mode on the internal module.
*/
@@ -149,9 +340,28 @@
{
if(!PORT_Strcasecmp(arg, "true")) {
if (PK11_IsFIPS()) {
+Index: mozilla/security/nss/cmd/platlibs.mk
+--- mozilla/security/nss/cmd/platlibs.mk.orig 2008-02-25 22:32:33
+0100
++++ mozilla/security/nss/cmd/platlibs.mk 2008-08-02 20:41:16 +0200
+@@ -38,6 +38,7 @@
+ # set RPATH-type linker instructions here so they can be used in the shared
+ # version and in the mixed (static nss libs/shared NSPR libs) version.
+
++ifdef ENABLE_RPATH
+ ifeq ($(OS_ARCH), SunOS)
+ ifeq ($(BUILD_SUN_PKG), 1)
+ ifeq ($(USE_64), 1)
+@@ -71,6 +72,7 @@
+ endif
+ endif
+ endif
++endif
+
+ SQLITE=-lsqlite3
+
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-08-02 20:28:55
+0200
++++ mozilla/security/nss/cmd/shlibsign/Makefile 2008-08-02 20:41:16
+0200
@@ -60,9 +60,10 @@
# sign any and all shared libraries that contain the word freebl
@@ -166,9 +376,47 @@
MD_LIB_RELEASE_FILES = $(CHECKLOC)
ALL_TRASH += $(CHECKLOC)
+Index: mozilla/security/nss/cmd/shlibsign/shlibsign.c
+--- mozilla/security/nss/cmd/shlibsign/shlibsign.c.orig 2007-11-05
18:13:27 +0100
++++ mozilla/security/nss/cmd/shlibsign/shlibsign.c 2008-08-02 20:41:16
+0200
+@@ -159,7 +159,6 @@
+ #ifdef USES_LINKS
+ int ret;
+ struct stat stat_buf;
+- char link_buf[MAXPATHLEN+1];
+ char *link_file = NULL;
+ #endif
+
+@@ -266,10 +265,22 @@
+ }
+ if (S_ISLNK(stat_buf.st_mode)) {
+ char *dirpath,*dirend;
+- ret = readlink(input_file, link_buf, sizeof(link_buf) - 1);
+- if (ret < 0) {
+- perror(input_file);
+- goto loser;
++ char *link_buf = NULL;
++ size_t size = 64;
++ while (1) {
++ link_buf = realloc(link_buf, size);
++ if (!link_buf) {
++ perror(input_file);
++ goto loser;
++ }
++ ret = readlink(input_file, link_buf, size - 1);
++ if (ret < 0) {
++ perror(input_file);
++ goto loser;
++ }
++ if (ret < size - 1)
++ break;
++ size *= 2;
+ }
+ link_buf[ret] = 0;
+ link_file = mkoutput(input_file);
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-08-02 20:28:55
+0200
++++ mozilla/security/nss/cmd/zlib/manifest.mn 2008-08-02 20:41:16
+0200
@@ -57,7 +57,7 @@
LIBRARY_NAME = zlib
@@ -178,3 +426,96 @@
# REQUIRES = nss
+Index: mozilla/security/nss/lib/freebl/genload.c
+--- mozilla/security/nss/lib/freebl/genload.c.orig 2008-08-02 20:41:16
+0200
++++ mozilla/security/nss/lib/freebl/genload.c 2008-08-02 20:41:16
+0200
+@@ -124,9 +124,14 @@
+
+ /* Remove the trailing filename from referencePath and add the new one
*/
+ c = strrchr(referencePath, PR_GetDirectorySeparator());
++ if (!c) { /* referencePath doesn't contain a / means that dladdr gave
us argv[0]
++ * and program was called from $PATH. Hack to get libs from
/usr/lib */
++ referencePath = "/usr/lib/";
++ c = &referencePath[8]; /* last / */
++ }
+ if (c) {
+ size_t referencePathSize = 1 + c - referencePath;
+- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1);
++ fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);
+ if (fullName) {
+ memcpy(fullName, referencePath, referencePathSize);
+ strcpy(fullName + referencePathSize, name);
+@@ -136,7 +141,17 @@
+ #endif
+ libSpec.type = PR_LibSpec_Pathname;
+ libSpec.value.pathname = fullName;
++ if ((referencePathSize >= 4) &&
++ (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0))
{
++ memcpy(fullName + referencePathSize -4, "lib", 3);
++ }
++ strcpy(fullName + referencePathSize, "nss/");
++ strcpy(fullName + referencePathSize + 4, name);
+ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
++ if (! dlh) {
++ strcpy(fullName + referencePathSize, name);
++ dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW |
PR_LD_LOCAL);
++ }
+ PORT_Free(fullName);
+ }
+ }
+Index: mozilla/security/nss/lib/freebl/unix_rand.c
+--- mozilla/security/nss/lib/freebl/unix_rand.c.orig 2008-08-02 20:41:16
+0200
++++ mozilla/security/nss/lib/freebl/unix_rand.c 2008-08-02 20:41:16
+0200
+@@ -185,7 +185,9 @@
+ #endif
+
+ #if defined(SCO) || defined(UNIXWARE) || defined(BSDI) || defined(FREEBSD) \
+- || defined(NETBSD) || defined(NTO) || defined(DARWIN) ||
defined(OPENBSD)
++ || defined(NETBSD) || defined(NTO) || defined(DARWIN) ||
defined(OPENBSD) \
++ || defined(__FreeBSD_kernel__) || defined(__NetBSD_kernel__) \
++ || defined(__GNU__)
+ #include <sys/times.h>
+
+ #define getdtablesize() sysconf(_SC_OPEN_MAX)
+Index: mozilla/security/nss/lib/pk11wrap/pk11load.c
+--- mozilla/security/nss/lib/pk11wrap/pk11load.c.orig 2007-10-09
19:06:23 +0200
++++ mozilla/security/nss/lib/pk11wrap/pk11load.c 2008-08-02 20:41:16
+0200
+@@ -331,6 +331,14 @@
+ #endif
+
+ if (library == NULL) {
++ full_name = rindex(mod->dllName, PR_GetDirectorySeparator());
++ if (full_name)
++ full_name++;
++ else
++ full_name = mod->dllName;
++ library = loader_LoadLibrary(full_name);
++ }
++ if (library == NULL) {
+ return SECFailure;
+ }
+
+Index: mozilla/security/nss/lib/ssl/sslmutex.c
+--- mozilla/security/nss/lib/ssl/sslmutex.c.orig 2006-06-07 20:36:26
+0200
++++ mozilla/security/nss/lib/ssl/sslmutex.c 2008-08-02 20:41:16 +0200
+@@ -89,7 +89,7 @@
+ return SECSuccess;
+ }
+
+-#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) ||
defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
++#if defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) ||
defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
+
+ #include <unistd.h>
+ #include <fcntl.h>
+Index: mozilla/security/nss/lib/ssl/sslmutex.h
+--- mozilla/security/nss/lib/ssl/sslmutex.h.orig 2004-04-28 01:04:39
+0200
++++ mozilla/security/nss/lib/ssl/sslmutex.h 2008-08-02 20:41:16 +0200
+@@ -79,7 +79,7 @@
+
+ typedef int sslPID;
+
+-#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) ||
defined(BSDI) || defined(NETBSD) || defined(OPENBSD)
++#elif defined(LINUX) || defined(AIX) || defined(VMS) || defined(BEOS) ||
defined(BSDI) || defined(NETBSD) || defined(OPENBSD) || defined(__GLIBC__)
+
+ #include <sys/types.h>
+ #include "prtypes.h"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
