[Glibc-bsd-commits] r1786 - trunk/web/patches
Petr Salinger
ps-guest at alioth.debian.org
Fri Dec 8 20:21:25 CET 2006
Author: ps-guest
Date: 2006-12-08 20:21:24 +0100 (Fri, 08 Dec 2006)
New Revision: 1786
Modified:
trunk/web/patches/xulrunner.diff
Log:
* xulrunner.diff - sync dpatches with other mozilla based packages
Modified: trunk/web/patches/xulrunner.diff
===================================================================
--- trunk/web/patches/xulrunner.diff 2006-12-08 16:53:58 UTC (rev 1785)
+++ trunk/web/patches/xulrunner.diff 2006-12-08 19:21:24 UTC (rev 1786)
@@ -1,33 +1,107 @@
Author: rmh, petr
-Status: builds fine, needs testing
+Status: builds fine, in BTS
-diff -u xulrunner-1.8.0.7/debian/patches/00list xulrunner-1.8.0.7/debian/patches/00list
---- xulrunner-1.8.0.7/debian/patches/00list
-+++ xulrunner-1.8.0.7/debian/patches/00list
-@@ -25,6 +25,7 @@
+diff -u xulrunner-1.8.0.8/debian/patches/00list xulrunner-1.8.0.8/debian/patches/00list
+--- xulrunner-1.8.0.8/debian/patches/00list
++++ xulrunner-1.8.0.8/debian/patches/00list
+@@ -24,6 +24,7 @@
15_passwdmgr
15_pyxpcom_deadcode
18_arm_xpcom_unused_attribute
-+18_kbsd_nsprpub
++18_kbsd_nspr
18_m68k_xpcom
20_about:plugins
20_broken_perl
-@@ -59,6 +60,7 @@
- 65_mouse_buttons
- 65_native_uconv
- 68_mips_performance
-+68_kbsd_nspr
- 80_install_path
- 80_javaxpcom
- 80_libxpcom_hack
-@@ -79,2 +81,3 @@
- 85_xpcomglue
-+88_kbsd
- 99_configure
-diff -u xulrunner-1.8.0.7/debian/patches/80_uname.dpatch xulrunner-1.8.0.7/debian/patches/80_uname.dpatch
---- xulrunner-1.8.0.7/debian/patches/80_uname.dpatch
-+++ xulrunner-1.8.0.7/debian/patches/80_uname.dpatch
+@@ -34,7 +35,7 @@
+ 25_passwdmgr_crash
+ 25_xpidl
+ 25_xrender_bug_workaround
+-28_ppc64_build
++#28_ppc64_build
+ 30_distclean
+ 30_embedding_tests
+ 30_killAll
+@@ -45,10 +46,11 @@
+ 38_arm_xpcom_optim
+ 38_hppa_xpcom
+ 38_ia64_align
++38_kbsd
+ 38_mips64_build
+ 38_mips_xpcom
+ 38_sparc64_unichar_alignment
+-38_unsupported_arch_build
++#38_unsupported_arch_build
+ 60_config_install
+ 60_js_binary
+ 60_nspr_m4
+diff -u xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch
+--- xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch
++++ xulrunner-1.8.0.8/debian/patches/38_mips64_build.dpatch
+@@ -10,18 +10,17 @@
+ ==================================================================
+ --- xulrunner/security/coreconf/Linux.mk (revision 44)
+ +++ xulrunner/security/coreconf/Linux.mk (local)
+-@@ -100,6 +100,10 @@
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = s390x
++@@ -78,6 +78,9 @@
++ ifeq ($(OS_TEST),parisc64)
++ CPU_ARCH = hppa
+ else
+ +ifeq ($(OS_TEST),mips64)
+-+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+ + CPU_ARCH = mips
+ +else
+- ifeq ($(OS_TEST),mips)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = mips
+-@@ -119,6 +123,7 @@
++ ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
++ OS_REL_CFLAGS += -Di386
++ CPU_ARCH = x86
++@@ -87,6 +90,7 @@
+ endif
+ endif
+ endif
+diff -u xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch
+--- xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch
++++ xulrunner-1.8.0.8/debian/patches/81_sonames.dpatch
+@@ -629,9 +629,9 @@
+ --- xulrunner/security/coreconf/Linux2.6.mk (revision 8)
+ +++ xulrunner/security/coreconf/Linux2.6.mk (local)
+ @@ -38,7 +38,7 @@
+- include $(CORE_DEPTH)/coreconf/Linux.mk
+-
+ OS_REL_CFLAGS += -DLINUX2_1
++ endif
++
+ -MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+ +MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME)
+ ifdef BUILD_OPT
+diff -u xulrunner-1.8.0.8/debian/patches/99_configure.dpatch xulrunner-1.8.0.8/debian/patches/99_configure.dpatch
+--- xulrunner-1.8.0.8/debian/patches/99_configure.dpatch
++++ xulrunner-1.8.0.8/debian/patches/99_configure.dpatch
+@@ -1694,7 +1694,7 @@
+
+ MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
+ MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat'
+-@@ -5042,10 +4911,17 @@
++@@ -5042,10 +4911,18 @@
+ darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
+ esac
+ else
+@@ -1707,6 +1707,7 @@
+ + OS_TEST="${host_cpu}"
+ + case "${host_os}" in
+ + linux*) OS_ARCH=Linux ;;
+++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
+ + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
+ + mingw*) OS_ARCH=WINNT ;;
+ + wince*) OS_ARCH=WINCE ;;
+diff -u xulrunner-1.8.0.8/debian/patches/80_uname.dpatch xulrunner-1.8.0.8/debian/patches/80_uname.dpatch
+--- xulrunner-1.8.0.8/debian/patches/80_uname.dpatch
++++ xulrunner-1.8.0.8/debian/patches/80_uname.dpatch
@@ -13,7 +13,7 @@
--- xulrunner/configure.in 2006-08-09 10:26:00.000000000 +0200
@@ -47,74 +121,39 @@
+ wince*) OS_ARCH=WINCE ;;
only in patch2:
unchanged:
---- xulrunner-1.8.0.7.orig/debian/patches/18_kbsd_nsprpub.dpatch
-+++ xulrunner-1.8.0.7/debian/patches/18_kbsd_nsprpub.dpatch
-@@ -0,0 +1,400 @@
-+#! /bin/sh /usr/share/dpatch/dpatch-run
-+## 18_kbsd_nsprpub.dpatch
+--- xulrunner-1.8.0.8.orig/debian/patches/18_kbsd_nspr.dpatch
++++ xulrunner-1.8.0.8/debian/patches/18_kbsd_nspr.dpatch
+@@ -0,0 +1,417 @@
++#!/bin/sh -e
++## 18_kbsd_nspr.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: port nsprpub for kfreebsd-i386. bz#261649
-+## DP: taken from https://bugzilla.mozilla.org/attachment.cgi?id=206765&action=view
++## DP: GNU/kFreeBSD support for nspr
++## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=261649
++## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=355999
+
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++case "$1" in
++ -patch) patch $patch_opts -p1 < $0;;
++ -unpatch) patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1;;
++esac
++
++exit 0
++
+ at DPATCH@
-+
-+Index: a/nsprpub/configure.in
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/configure.in,v
-+retrieving revision 1.83.2.123
-+retrieving revision 1.210
-+diff -u -r1.83.2.123 -r1.210
-+--- a/nsprpub/configure.in 22 Dec 2005 22:45:32 -0000 1.83.2.123
-++++ a/nsprpub/configure.in 24 Dec 2005 08:25:22 -0000 1.210
-+@@ -1336,7 +1336,7 @@
-+ esac
-+ ;;
-+
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -1347,7 +1347,11 @@
-+ AC_DEFINE(_SVID_SOURCE)
-+ AC_DEFINE(_LARGEFILE64_SOURCE)
-+ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
-+- AC_DEFINE(LINUX)
-++ case "${target_os}" in
-++ linux*)
-++ AC_DEFINE(LINUX)
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
-+@@ -2442,7 +2446,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
-+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ AC_DEFINE(_REENTRANT)
-+ ;;
-+ esac
-+@@ -2526,7 +2530,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
-+ fi
-+Index: a/nsprpub/config/nsinstall.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/config/nsinstall.c,v
-+retrieving revision 3.17.2.3
-+retrieving revision 3.21
-+diff -u -r3.17.2.3 -r3.21
-+--- a/nsprpub/config/nsinstall.c 28 Apr 2004 00:33:11 -0000 3.17.2.3
-++++ a/nsprpub/config/nsinstall.c 24 Dec 2005 15:03:29 -0000 3.21
++diff -urN mozilla/nsprpub/config/nsinstall.c mozilla/nsprpub/config/nsinstall.c
++--- mozilla/nsprpub/config/nsinstall.c 2004-04-28 02:33:11.000000000 +0200
+++++ mozilla/nsprpub/config/nsinstall.c 2006-11-20 22:10:27.000000000 +0100
+@@ -98,7 +98,7 @@
+ }
+ #endif /* NEXTSTEP */
@@ -124,14 +163,9 @@
+ #include <getopt.h>
+ #endif
+
-+Index: a/nsprpub/pr/include/md/_linux.cfg
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_linux.cfg,v
-+retrieving revision 3.12.4.8
-+retrieving revision 3.19
-+diff -u -r3.12.4.8 -r3.19
-+--- a/nsprpub/pr/include/md/_linux.cfg 15 Aug 2005 17:53:33 -0000 3.12.4.8
-++++ a/nsprpub/pr/include/md/_linux.cfg 24 Dec 2005 08:25:22 -0000 3.19
++diff -urN mozilla/nsprpub/pr/include/md/_linux.cfg mozilla/nsprpub/pr/include/md/_linux.cfg
++--- mozilla/nsprpub/pr/include/md/_linux.cfg 2005-08-18 19:24:28.000000000 +0200
+++++ mozilla/nsprpub/pr/include/md/_linux.cfg 2006-11-20 22:10:27.000000000 +0100
+@@ -35,6 +35,11 @@
+ *
+ * ***** END LICENSE BLOCK ***** */
@@ -144,7 +178,7 @@
+ #ifndef nspr_cpucfg___
+ #define nspr_cpucfg___
+
-+@@ -42,7 +47,7 @@
++@@ -42,11 +47,15 @@
+ #define XP_UNIX
+ #endif
+
@@ -153,14 +187,36 @@
+ #define LINUX
+ #endif
+
-+Index: a/nsprpub/pr/include/md/_pth.h
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_pth.h,v
-+retrieving revision 3.19.2.13
-+retrieving revision 3.32
-+diff -u -r3.19.2.13 -r3.32
-+--- a/nsprpub/pr/include/md/_pth.h 15 Aug 2005 17:53:33 -0000 3.19.2.13
-++++ a/nsprpub/pr/include/md/_pth.h 24 Dec 2005 15:03:30 -0000 3.32
+++#ifdef __FreeBSD_kernel__
+++#define PR_AF_INET6 28 /* same as AF_INET6 */
+++#else
++ #define PR_AF_INET6 10 /* same as AF_INET6 */
+++#endif
++
++ #ifdef __powerpc64__
++
++diff -urN mozilla/nsprpub/pr/include/md/_linux.h mozilla/nsprpub/pr/include/md/_linux.h
++--- mozilla/nsprpub/pr/include/md/_linux.h 2005-08-18 19:24:28.000000000 +0200
+++++ mozilla/nsprpub/pr/include/md/_linux.h 2006-11-20 22:10:27.000000000 +0100
++@@ -41,6 +41,15 @@
++ #include "prthread.h"
++
++ /*
+++ * This file is used by not only Linux but also other glibc systems
+++ * such as GNU/Hurd and GNU/k*BSD.
+++ */
+++
+++#ifdef __FreeBSD_kernel__
+++#define _PR_HAVE_SOCKADDR_LEN
+++#endif
+++
+++/*
++ * Internal configuration macros
++ */
++
++diff -urN mozilla/nsprpub/pr/include/md/_pth.h mozilla/nsprpub/pr/include/md/_pth.h
++--- mozilla/nsprpub/pr/include/md/_pth.h 2005-08-18 19:24:28.000000000 +0200
+++++ mozilla/nsprpub/pr/include/md/_pth.h 2006-11-20 22:10:27.000000000 +0100
+@@ -143,10 +143,15 @@
+ (!memcmp(&(t), &pt_zero_tid, sizeof(pthread_t)))
+ #define _PT_PTHREAD_COPY_THR_HANDLE(st, dt) (dt) = (st)
@@ -208,14 +264,9 @@
+ || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
+ || defined(BSDI) || defined(NTO) || defined(DARWIN) \
+ || defined(UNIXWARE) || defined(RISCOS)
-+Index: a/nsprpub/pr/include/md/_unixos.h
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/_unixos.h,v
-+retrieving revision 3.31.4.4
-+retrieving revision 3.36
-+diff -u -r3.31.4.4 -r3.36
-+--- a/nsprpub/pr/include/md/_unixos.h 17 Jan 2005 22:13:36 -0000 3.31.4.4
-++++ a/nsprpub/pr/include/md/_unixos.h 24 Dec 2005 08:25:23 -0000 3.36
++diff -urN mozilla/nsprpub/pr/include/md/_unixos.h mozilla/nsprpub/pr/include/md/_unixos.h
++--- mozilla/nsprpub/pr/include/md/_unixos.h 2005-01-17 23:13:36.000000000 +0100
+++++ mozilla/nsprpub/pr/include/md/_unixos.h 2006-11-20 22:10:27.000000000 +0100
+@@ -46,7 +46,8 @@
+ * Linux: FD_SETSIZE is defined in /usr/include/sys/select.h and should
+ * not be redefined.
@@ -226,14 +277,9 @@
+ #ifndef FD_SETSIZE
+ #define FD_SETSIZE 4096
+ #endif
-+Index: a/nsprpub/pr/include/md/prosdep.h
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/include/md/prosdep.h,v
-+retrieving revision 3.13.4.3
-+retrieving revision 3.17
-+diff -u -r3.13.4.3 -r3.17
-+--- a/nsprpub/pr/include/md/prosdep.h 15 Aug 2005 17:53:33 -0000 3.13.4.3
-++++ a/nsprpub/pr/include/md/prosdep.h 24 Dec 2005 08:25:23 -0000 3.17
++diff -urN mozilla/nsprpub/pr/include/md/prosdep.h mozilla/nsprpub/pr/include/md/prosdep.h
++--- mozilla/nsprpub/pr/include/md/prosdep.h 2005-08-18 19:24:28.000000000 +0200
+++++ mozilla/nsprpub/pr/include/md/prosdep.h 2006-11-20 22:10:27.000000000 +0100
+@@ -90,7 +90,7 @@
+ #elif defined(IRIX)
+ #include "md/_irix.h"
@@ -243,14 +289,9 @@
+ #include "md/_linux.h"
+
+ #elif defined(OSF1)
-+Index: a/nsprpub/pr/src/linking/Makefile.in
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/linking/Makefile.in,v
-+retrieving revision 1.10.2.5
-+retrieving revision 1.17
-+diff -u -r1.10.2.5 -r1.17
-+--- a/nsprpub/pr/src/linking/Makefile.in 26 Oct 2005 19:05:10 -0000 1.10.2.5
-++++ a/nsprpub/pr/src/linking/Makefile.in 24 Dec 2005 15:03:30 -0000 1.17
++diff -urN mozilla/nsprpub/pr/src/linking/Makefile.in mozilla/nsprpub/pr/src/linking/Makefile.in
++--- mozilla/nsprpub/pr/src/linking/Makefile.in 2006-01-05 16:40:18.000000000 +0100
+++++ mozilla/nsprpub/pr/src/linking/Makefile.in 2006-11-20 22:10:27.000000000 +0100
+@@ -63,7 +63,7 @@
+ INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
+
@@ -260,15 +301,10 @@
+ DEFINES += -D_GNU_SOURCE
+ endif
+
-+Index: a/nsprpub/pr/src/linking/prlink.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/linking/prlink.c,v
-+retrieving revision 3.51.2.28
-+retrieving revision 3.84
-+diff -u -r3.51.2.28 -r3.84
-+--- a/nsprpub/pr/src/linking/prlink.c 7 Nov 2005 22:07:32 -0000 3.51.2.28
-++++ a/nsprpub/pr/src/linking/prlink.c 24 Dec 2005 15:03:30 -0000 3.84
-+@@ -1388,7 +1388,8 @@
++diff -urN mozilla/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
++--- mozilla/nsprpub/pr/src/linking/prlink.c 2005-08-18 19:24:29.000000000 +0200
+++++ mozilla/nsprpub/pr/src/linking/prlink.c 2006-11-20 22:10:27.000000000 +0100
++@@ -1374,7 +1374,8 @@
+ PR_IMPLEMENT(char *)
+ PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
+ {
@@ -278,14 +314,9 @@
+ Dl_info dli;
+ char *result;
+
-+Index: a/nsprpub/pr/src/md/prosdep.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/prosdep.c,v
-+retrieving revision 3.9.4.2
-+retrieving revision 3.12
-+diff -u -r3.9.4.2 -r3.12
-+--- a/nsprpub/pr/src/md/prosdep.c 28 Apr 2004 00:33:56 -0000 3.9.4.2
-++++ a/nsprpub/pr/src/md/prosdep.c 24 Dec 2005 08:25:29 -0000 3.12
++diff -urN mozilla/nsprpub/pr/src/md/prosdep.c mozilla/nsprpub/pr/src/md/prosdep.c
++--- mozilla/nsprpub/pr/src/md/prosdep.c 2004-04-28 02:33:56.000000000 +0200
+++++ mozilla/nsprpub/pr/src/md/prosdep.c 2006-11-20 22:10:27.000000000 +0100
+@@ -63,7 +63,8 @@
+
+ /* Get page size */
@@ -296,14 +327,9 @@
+ || defined FREEBSD || defined NETBSD || defined OPENBSD \
+ || defined DARWIN || defined NEXTSTEP
+ _pr_pageSize = getpagesize();
-+Index: a/nsprpub/pr/src/md/unix/unix.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/unix/unix.c,v
-+retrieving revision 3.43.2.8
-+retrieving revision 3.52
-+diff -u -r3.43.2.8 -r3.52
-+--- a/nsprpub/pr/src/md/unix/unix.c 15 Aug 2005 17:53:43 -0000 3.43.2.8
-++++ a/nsprpub/pr/src/md/unix/unix.c 24 Dec 2005 08:25:29 -0000 3.52
++diff -urN mozilla/nsprpub/pr/src/md/unix/unix.c mozilla/nsprpub/pr/src/md/unix/unix.c
++--- mozilla/nsprpub/pr/src/md/unix/unix.c 2005-08-18 19:24:37.000000000 +0200
+++++ mozilla/nsprpub/pr/src/md/unix/unix.c 2006-11-20 22:10:27.000000000 +0100
+@@ -65,7 +65,7 @@
+ * PRInt32* pointer to a _PRSockLen_t* pointer.
+ */
@@ -313,14 +339,9 @@
+ #define _PRSockLen_t socklen_t
+ #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
+ || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-+Index: a/nsprpub/pr/src/md/unix/uxproces.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/unix/uxproces.c,v
-+retrieving revision 3.14.2.5
-+retrieving revision 3.20
-+diff -u -r3.14.2.5 -r3.20
-+--- a/nsprpub/pr/src/md/unix/uxproces.c 15 Dec 2004 05:52:40 -0000 3.14.2.5
-++++ a/nsprpub/pr/src/md/unix/uxproces.c 24 Dec 2005 08:25:29 -0000 3.20
++diff -urN mozilla/nsprpub/pr/src/md/unix/uxproces.c mozilla/nsprpub/pr/src/md/unix/uxproces.c
++--- mozilla/nsprpub/pr/src/md/unix/uxproces.c 2004-12-15 06:52:40.000000000 +0100
+++++ mozilla/nsprpub/pr/src/md/unix/uxproces.c 2006-11-20 22:10:27.000000000 +0100
+@@ -92,7 +92,8 @@
+ * that can share the virtual address space and file descriptors.
+ */
@@ -341,14 +362,9 @@
+ #define _PR_NATIVE_THREADS
+ #endif
+
-+Index: a/nsprpub/pr/src/md/unix/uxrng.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/md/unix/uxrng.c,v
-+retrieving revision 1.11.4.5
-+retrieving revision 1.19
-+diff -u -r1.11.4.5 -r1.19
-+--- a/nsprpub/pr/src/md/unix/uxrng.c 15 Aug 2005 17:53:43 -0000 1.11.4.5
-++++ a/nsprpub/pr/src/md/unix/uxrng.c 24 Dec 2005 08:25:29 -0000 1.19
++diff -urN mozilla/nsprpub/pr/src/md/unix/uxrng.c mozilla/nsprpub/pr/src/md/unix/uxrng.c
++--- mozilla/nsprpub/pr/src/md/unix/uxrng.c 2005-08-18 19:24:37.000000000 +0200
+++++ mozilla/nsprpub/pr/src/md/unix/uxrng.c 2006-11-20 22:10:27.000000000 +0100
+@@ -138,7 +138,8 @@
+ return 0;
+ }
@@ -359,14 +375,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
-+Index: a/nsprpub/pr/src/misc/prnetdb.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/prnetdb.c,v
-+retrieving revision 3.21.2.26
-+retrieving revision 3.48
-+diff -u -r3.21.2.26 -r3.48
-+--- a/nsprpub/pr/src/misc/prnetdb.c 15 Aug 2005 17:53:52 -0000 3.21.2.26
-++++ a/nsprpub/pr/src/misc/prnetdb.c 24 Dec 2005 08:25:30 -0000 3.48
++diff -urN mozilla/nsprpub/pr/src/misc/prnetdb.c mozilla/nsprpub/pr/src/misc/prnetdb.c
++--- mozilla/nsprpub/pr/src/misc/prnetdb.c 2005-08-18 19:24:38.000000000 +0200
+++++ mozilla/nsprpub/pr/src/misc/prnetdb.c 2006-11-20 22:10:27.000000000 +0100
+@@ -108,7 +108,7 @@
+ #define _PR_HAVE_GETPROTO_R_INT
+ #endif
@@ -376,14 +387,9 @@
+ #define _PR_HAVE_GETPROTO_R
+ #define _PR_HAVE_5_ARG_GETPROTO_R
+ #endif
-+Index: a/nsprpub/pr/src/pthreads/ptio.c
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/src/pthreads/ptio.c,v
-+retrieving revision 3.71.2.23
-+retrieving revision 3.103
-+diff -u -r3.71.2.23 -r3.103
-+--- a/nsprpub/pr/src/pthreads/ptio.c 7 Nov 2005 22:23:25 -0000 3.71.2.23
-++++ a/nsprpub/pr/src/pthreads/ptio.c 24 Dec 2005 08:25:30 -0000 3.103
++diff -urN mozilla/nsprpub/pr/src/pthreads/ptio.c mozilla/nsprpub/pr/src/pthreads/ptio.c
++--- mozilla/nsprpub/pr/src/pthreads/ptio.c 2005-08-18 19:24:38.000000000 +0200
+++++ mozilla/nsprpub/pr/src/pthreads/ptio.c 2006-11-20 22:10:27.000000000 +0100
+@@ -205,7 +205,8 @@
+ #define _PRSelectFdSetArg_t void *
+ #elif defined(IRIX) || (defined(AIX) && !defined(AIX4_1)) \
@@ -423,14 +429,9 @@
+ #include <sys/select.h>
+ #endif
+
-+Index: a/nsprpub/pr/tests/Makefile.in
-+===================================================================
-+RCS file: /cvsroot/mozilla/nsprpub/pr/tests/Makefile.in,v
-+retrieving revision 1.34.2.13
-+retrieving revision 1.49
-+diff -u -r1.34.2.13 -r1.49
-+--- a/nsprpub/pr/tests/Makefile.in 28 Apr 2004 00:34:16 -0000 1.34.2.13
-++++ a/nsprpub/pr/tests/Makefile.in 24 Dec 2005 15:03:31 -0000 1.49
++diff -urN mozilla/nsprpub/pr/tests/Makefile.in mozilla/nsprpub/pr/tests/Makefile.in
++--- mozilla/nsprpub/pr/tests/Makefile.in 2004-04-28 02:34:16.000000000 +0200
+++++ mozilla/nsprpub/pr/tests/Makefile.in 2006-11-20 22:10:27.000000000 +0100
+@@ -376,14 +376,10 @@
+ EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
+ endif
@@ -450,73 +451,275 @@
+ endif
+ endif
+
++diff -urN mozilla/nsprpub/configure.in mozilla/nsprpub/configure.in
++--- mozilla/nsprpub/configure.in 2006-02-23 00:03:11.000000000 +0100
+++++ mozilla/nsprpub/configure.in 2006-11-20 22:10:26.000000000 +0100
++@@ -1370,7 +1370,7 @@
++ esac
++ ;;
++
++-*-linux*)
+++*-linux*|*-gnu*|*-k*bsd*-gnu)
++ if test -z "$USE_NSPR_THREADS"; then
++ USE_PTHREADS=1
++ IMPL_STRATEGY=_PTH
++@@ -1381,7 +1381,11 @@
++ AC_DEFINE(_SVID_SOURCE)
++ AC_DEFINE(_LARGEFILE64_SOURCE)
++ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
++- AC_DEFINE(LINUX)
+++ case "${target_os}" in
+++ linux*)
+++ AC_DEFINE(LINUX)
+++ ;;
+++ esac
++ CFLAGS="$CFLAGS -ansi -Wall"
++ CXXFLAGS="$CXXFLAGS -ansi -Wall"
++ MDCPUCFG_H=_linux.cfg
++@@ -2456,7 +2460,7 @@
++ _PTHREAD_LDFLAGS=-pthread
++ fi
++ ;;
++- *-linux*)
+++ *-linux*|*-gnu*|*-k*bsd*-gnu)
++ AC_DEFINE(_REENTRANT)
++ ;;
++ esac
++@@ -2540,7 +2544,7 @@
++ fi
++ fi
++ ;;
++-*-linux*)
+++*-linux*|*-gnu*|*-k*bsd*-gnu)
++ if test -n "$USE_NSPR_THREADS"; then
++ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
++ fi
++diff -urN mozilla/nsprpub/configure mozilla/nsprpub/configure
++--- mozilla/nsprpub/configure 2006-02-23 00:03:10.000000000 +0100
+++++ mozilla/nsprpub/configure 2006-11-20 22:19:53.000000000 +0100
++@@ -3820,7 +3820,7 @@
++ esac
++ ;;
++
++-*-linux*)
+++*-linux*|*-gnu*|*-k*bsd*-gnu)
++ if test -z "$USE_NSPR_THREADS"; then
++ USE_PTHREADS=1
++ IMPL_STRATEGY=_PTH
++@@ -3849,10 +3849,14 @@
++ #define HAVE_FCNTL_FILE_LOCKING 1
++ EOF
++
++- cat >> confdefs.h <<\EOF
+++ case "${target_os}" in
+++ linux*)
+++ cat >> confdefs.h <<\EOF
++ #define LINUX 1
++ EOF
++
+++ ;;
+++ esac
++ CFLAGS="$CFLAGS -ansi -Wall"
++ CXXFLAGS="$CXXFLAGS -ansi -Wall"
++ MDCPUCFG_H=_linux.cfg
++@@ -5496,7 +5500,7 @@
++ _PTHREAD_LDFLAGS=-pthread
++ fi
++ ;;
++- *-linux*)
+++ *-linux*|*-gnu*|*-k*bsd*-gnu)
++ cat >> confdefs.h <<\EOF
++ #define _REENTRANT 1
++ EOF
++@@ -5633,7 +5637,7 @@
++ fi
++ fi
++ ;;
++-*-linux*)
+++*-linux*|*-gnu*|*-k*bsd*-gnu)
++ if test -n "$USE_NSPR_THREADS"; then
++ cat >> confdefs.h <<\EOF
++ #define _PR_LOCAL_THREADS_ONLY 1
++
only in patch2:
unchanged:
---- xulrunner-1.8.0.7.orig/debian/patches/68_kbsd_nspr.dpatch
-+++ xulrunner-1.8.0.7/debian/patches/68_kbsd_nspr.dpatch
-@@ -0,0 +1,44 @@
-+#! /bin/sh /usr/share/dpatch/dpatch-run
-+## 68_kbsd_nspr.dpatch
+--- xulrunner-1.8.0.8.orig/debian/patches/38_kbsd.dpatch
++++ xulrunner-1.8.0.8/debian/patches/38_kbsd.dpatch
+@@ -0,0 +1,584 @@
++#!/bin/sh -e
++## 38_kbsd.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: fixes for nsprpub for port kfreebsd-i386
++## DP: GNU/kFreeBSD support
++## DP: https://bugzilla.mozilla.org/show_bug.cgi?id=356011
+
++if [ $# -ne 1 ]; then
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1
++fi
++
++[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
++patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
++
++case "$1" in
++ -patch) patch $patch_opts -p1 < $0;;
++ -unpatch) patch $patch_opts -p1 -R < $0;;
++ *)
++ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
++ exit 1;;
++esac
++
++exit 0
++
+ at DPATCH@
-+
-+only in patch2:
-+unchanged:
-+--- xulrunner-1.8.0.7.orig/nsprpub/pr/include/md/_linux.cfg
-++++ xulrunner-1.8.0.7/nsprpub/pr/include/md/_linux.cfg
-+@@ -51,7 +51,11 @@
-+ #define LINUX
++diff -ur mozilla/directory/c-sdk/config/nsinstall.c mozilla/directory/c-sdk/config/nsinstall.c
++--- mozilla/directory/c-sdk/config/nsinstall.c 2002-03-27 11:06:18.000000000 +0100
+++++ mozilla/directory/c-sdk/config/nsinstall.c 2006-11-20 23:14:53.000000000 +0100
++@@ -106,7 +106,7 @@
++ }
++ #endif /* NEXTSTEP */
++
++-#ifdef LINUX
+++#if defined(LINUX) || defined(__GLIBC__) || defined(__GNU__)
++ #include <getopt.h>
+ #endif
+
-++#ifdef __FreeBSD_kernel__
-++#define PR_AF_INET6 28 /* same as AF_INET6 */
-++#else
-+ #define PR_AF_INET6 10 /* same as AF_INET6 */
-++#endif
++diff -ur mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client
++--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2002-03-26 22:53:26.000000000 +0100
+++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.client 2006-11-20 23:00:17.000000000 +0100
++@@ -161,7 +161,7 @@
++ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
++ endif
+
-+ #ifdef __powerpc64__
++-ifeq ($(OS_ARCH), Linux)
+++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
++ EXTRA_LIBS = -L$(NSCP_DISTDIR)/$(OBJDIR_NAME)/lib -l$(LBER_LIBNAME)
++ EXTRA_LIBS += -L$(NSCP_DISTDIR)/lib
++ endif
++@@ -237,7 +237,7 @@
++ ifeq ($(OS_ARCH), AIX)
++ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
++ else
++-ifeq ($(OS_ARCH), Linux)
+++ifneq (,$(filter Linux GNU GNU_%, $(OS_ARCH)))
++ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
++ else
++ $(LINK_LIB) $(EXTRA_LIBS)
++diff -ur mozilla/directory/c-sdk/configure.in mozilla/directory/c-sdk/configure.in
++--- mozilla/directory/c-sdk/configure.in 2006-02-23 00:58:25.000000000 +0100
+++++ mozilla/directory/c-sdk/configure.in 2006-11-20 23:08:37.000000000 +0100
++@@ -560,6 +560,7 @@
++ OS_TEST="${target_cpu}"
++ case "${target_os}" in
++ linux*) OS_ARCH=Linux ;;
+++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
++ mingw*) OS_ARCH=WINNT ;;
++ darwin*) OS_ARCH=Darwin ;;
++@@ -1260,7 +1261,7 @@
++ esac
++ ;;
+
-+only in patch2:
-+unchanged:
-+--- xulrunner-1.8.0.7.orig/nsprpub/pr/include/md/_linux.h
-++++ xulrunner-1.8.0.7/nsprpub/pr/include/md/_linux.h
-+@@ -41,6 +41,15 @@
-+ #include "prthread.h"
++-*-linux*)
+++*-linux*|*-kfreebsd*-gnu)
++ if test -z "$USE_NSPR_THREADS"; then
++ USE_PTHREADS=1
++ IMPL_STRATEGY=_PTH
++@@ -1271,8 +1272,12 @@
++ AC_DEFINE(_SVID_SOURCE)
++ AC_DEFINE(_LARGEFILE64_SOURCE)
++ AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
++- AC_DEFINE(LINUX)
++- AC_DEFINE(linux)
+++ case "${target_os}" in
+++ linux*)
+++ AC_DEFINE(LINUX)
+++ AC_DEFINE(linux)
+++ ;;
+++ esac
++ LD='$(CC)'
++ CFLAGS="$CFLAGS -ansi -Wall"
++ CXXFLAGS="$CXXFLAGS -ansi -Wall"
++@@ -2186,7 +2191,7 @@
++ _PTHREAD_LDFLAGS=
++ fi
++ ;;
++- *-linux*)
+++ *-linux*|*-kfreebsd*-gnu)
++ AC_DEFINE(_REENTRANT)
++ ;;
++ esac
++@@ -2262,7 +2267,7 @@
++ fi
++ fi
++ ;;
++-*-linux*)
+++*-linux*|*-kfreebsd*-gnu)
++ if test -n "$USE_NSPR_THREADS"; then
++ AC_DEFINE(_PR_LOCAL_THREADS_ONLY)
++ fi
++diff -ur mozilla/directory/c-sdk/configure mozilla/directory/c-sdk/configure
++--- mozilla/directory/c-sdk/configure 2006-02-23 00:58:25.000000000 +0100
+++++ mozilla/directory/c-sdk/configure 2006-11-20 23:08:42.000000000 +0100
++@@ -2753,6 +2753,7 @@
++ OS_TEST="${target_cpu}"
++ case "${target_os}" in
++ linux*) OS_ARCH=Linux ;;
+++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
++ mingw*) OS_ARCH=WINNT ;;
++ darwin*) OS_ARCH=Darwin ;;
++@@ -3766,7 +3767,7 @@
++ esac
++ ;;
+
-+ /*
-++ * This file is used by not only Linux but also other glibc systems
-++ * such as GNU/Hurd and GNU/k*BSD.
-++ */
-++
-++#ifdef __FreeBSD_kernel__
-++#define _PR_HAVE_SOCKADDR_LEN
-++#endif
-++
-++/*
-+ * Internal configuration macros
-+ */
++-*-linux*)
+++*-linux*|*-kfreebsd*-gnu)
++ if test -z "$USE_NSPR_THREADS"; then
++ USE_PTHREADS=1
++ IMPL_STRATEGY=_PTH
++@@ -3795,14 +3796,18 @@
++ #define HAVE_FCNTL_FILE_LOCKING 1
++ EOF
+
-only in patch2:
-unchanged:
---- xulrunner-1.8.0.7.orig/debian/patches/88_kbsd.dpatch
-+++ xulrunner-1.8.0.7/debian/patches/88_kbsd.dpatch
-@@ -0,0 +1,362 @@
-+#! /bin/sh /usr/share/dpatch/dpatch-run
-+## 88_kbsd.dpatch
-+##
-+## All lines beginning with `## DP:' are a description of the patch.
-+## DP: port xulrunner for kfreebsd-i386
-+## DP: it builds fine, but it needs more testing
-+
-+
-+ at DPATCH@
-+
-+diff -ur mozilla.old/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h
-+--- mozilla.old/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/include/portable.h 2005-12-24 19:14:23.000000000 +0100
++- cat >> confdefs.h <<\EOF
+++ case "${target_os}" in
+++ linux*)
+++ cat >> confdefs.h <<\EOF
++ #define LINUX 1
++ EOF
++
++- cat >> confdefs.h <<\EOF
+++ cat >> confdefs.h <<\EOF
++ #define linux 1
++ EOF
++
+++ ;;
+++ esac
++ LD='$(CC)'
++ CFLAGS="$CFLAGS -ansi -Wall"
++ CXXFLAGS="$CXXFLAGS -ansi -Wall"
++@@ -5281,7 +5286,7 @@
++ _PTHREAD_LDFLAGS=
++ fi
++ ;;
++- *-linux*)
+++ *-linux*|*-kfreebsd*-gnu)
++ cat >> confdefs.h <<\EOF
++ #define _REENTRANT 1
++ EOF
++@@ -5404,7 +5409,7 @@
++ fi
++ fi
++ ;;
++-*-linux*)
+++*-linux*|*-kfreebsd*-gnu)
++ if test -n "$USE_NSPR_THREADS"; then
++ cat >> confdefs.h <<\EOF
++ #define _PR_LOCAL_THREADS_ONLY 1
++diff -urN mozilla/directory/c-sdk/ldap/include/portable.h mozilla/directory/c-sdk/ldap/include/portable.h
++--- mozilla/directory/c-sdk/ldap/include/portable.h 2003-09-17 05:18:10.000000000 +0200
+++++ mozilla/directory/c-sdk/ldap/include/portable.h 2006-11-20 22:10:27.000000000 +0100
+@@ -116,7 +116,7 @@
+ * some systems don't have the BSD re_comp and re_exec routines
+ */
@@ -591,9 +794,9 @@
+ #define STRTOK( s1, s2, l ) strtok( s1, s2 )
+ #else
+ #define HAVE_STRTOK_R
-+diff -ur mozilla.old/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
-+--- mozilla.old/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200
-++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-12-24 19:14:23.000000000 +0100
++diff -urN mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in
++--- mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2005-06-02 06:00:33.000000000 +0200
+++++ mozilla/directory/c-sdk/ldap/libraries/libldap/Makefile.in 2006-11-20 22:10:27.000000000 +0100
+@@ -168,7 +168,7 @@
+ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) $(OS_LIBS) -lc
+ endif
@@ -612,9 +815,9 @@
+ $(LINK_LIB) ../liblber/$(OBJDIR_NAME)/*.a
+ else
+ ifeq ($(OS_ARCH),OS2)
-+diff -ur mozilla.old/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
-+--- mozilla.old/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100
-++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2005-12-24 19:14:23.000000000 +0100
++diff -urN mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c
++--- mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2003-03-25 14:57:38.000000000 +0100
+++++ mozilla/directory/c-sdk/ldap/libraries/libprldap/ldappr-error.c 2006-11-20 22:10:27.000000000 +0100
+@@ -218,7 +218,7 @@
+
+ #if defined(__hpux) || defined(_AIX) || defined(OSF1) || defined(DARWIN) || \
@@ -624,10 +827,10 @@
+ #define EDEADLOCK -1
+ #endif
+
-+diff -ur mozilla.old/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
-+--- mozilla.old/security/coreconf/Linux.mk 2005-02-02 00:39:18.000000000 +0100
-++++ mozilla/security/coreconf/Linux.mk 2005-12-25 10:06:13.000000000 +0100
-+@@ -52,80 +52,42 @@
++diff -urN mozilla/security/coreconf/Linux.mk mozilla/security/coreconf/Linux.mk
++--- mozilla/security/coreconf/Linux.mk 2005-02-02 00:39:18.000000000 +0100
+++++ mozilla/security/coreconf/Linux.mk 2006-11-20 22:16:26.000000000 +0100
++@@ -52,59 +52,34 @@
+
+ DEFAULT_COMPILER = gcc
+
@@ -635,22 +838,17 @@
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = m68k
+-else
-+-ifeq ($(OS_TEST),ppc64)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = ppc64
-+-else
+-ifeq ($(OS_TEST),ppc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = ppc
-++CPU_ARCH = $(OS_TEST)
+++CPU_ARCH = $(OS_TEST)
++
++ifeq ($(KERNEL),linux)
-++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
-++ ARCH = linux
+++ OS_REL_CFLAGS = -D_XOPEN_SOURCE -DLINUX1_2
+++ ARCH = linux
+ else
++ OS_REL_CFLAGS = -D_XOPEN_SOURCE
-++ ARCH = gnu
-++
+++ ARCH = gnu
++endif
++
++
@@ -669,7 +867,7 @@
+-ifeq ($(OS_TEST),sparc)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = sparc
-++ OS_REL_CFLAGS += -D_ALPHA_
+++ OS_REL_CFLAGS += -D_ALPHA_
+ else
+ ifeq ($(OS_TEST),sparc64)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
@@ -691,25 +889,24 @@
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = s390
+-else
-+ ifeq ($(OS_TEST),s390x)
++-ifeq ($(OS_TEST),s390x)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = s390x
-+ else
-+ ifeq ($(OS_TEST),mips64)
++- CPU_ARCH = s390x
++-else
++-ifeq ($(OS_TEST),mips)
+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
+- CPU_ARCH = mips
+++ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
+-else
-+-ifeq ($(OS_TEST),mips)
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+ CPU_ARCH = mips
-+ else
-+ ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
+- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
++ OS_REL_CFLAGS += -Di386
+ CPU_ARCH = x86
-+-else
-+- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
-+- CPU_ARCH = $(OS_TEST)
++ endif
++ endif
++@@ -112,18 +88,11 @@
++ endif
++ endif
++ endif
+-endif
+-endif
+-endif
@@ -717,20 +914,16 @@
+-endif
+-endif
+-endif
-+-endif
-+ endif
-+ endif
-+ endif
-+@@ -138,7 +100,7 @@
+
++
+ 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,$(SONAME)
++ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+ ifdef BUILD_OPT
-+@@ -155,20 +117,22 @@
++@@ -140,20 +109,22 @@
+ OS_PTHREAD = -lpthread
+ endif
+
@@ -756,24 +949,23 @@
+ G++INCLUDES = -I/usr/include/g++
+
+ #
-+diff -ur mozilla.old/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux2.6.mk
-+--- mozilla.old/security/coreconf/Linux2.6.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/Linux2.6.mk 2005-12-25 10:01:45.000000000 +0100
++diff -urN mozilla/security/coreconf/Linux2.6.mk mozilla/security/coreconf/Linux2.6.mk
++--- mozilla/security/coreconf/Linux2.6.mk 2004-04-25 17:02:17.000000000 +0200
+++++ mozilla/security/coreconf/Linux2.6.mk 2006-11-20 22:10:27.000000000 +0100
+@@ -37,7 +37,10 @@
+
+ include $(CORE_DEPTH)/coreconf/Linux.mk
+
-+-OS_REL_CFLAGS += -DLINUX2_1
++ifeq ($(KERNEL), linux)
-++ OS_REL_CFLAGS += -DLINUX2_1
++ OS_REL_CFLAGS += -DLINUX2_1
++endif
++
-+ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(SONAME)
++ MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+ ifdef BUILD_OPT
+ OPTIMIZER = -O2
-+diff -ur mozilla.old/security/coreconf/arch.mk mozilla/security/coreconf/arch.mk
-+--- mozilla.old/security/coreconf/arch.mk 2005-05-17 23:26:14.000000000 +0200
-++++ mozilla/security/coreconf/arch.mk 2005-12-25 09:55:32.000000000 +0100
++diff -urN mozilla/security/coreconf/arch.mk mozilla/security/coreconf/arch.mk
++--- mozilla/security/coreconf/arch.mk 2005-10-11 01:30:12.000000000 +0200
+++++ mozilla/security/coreconf/arch.mk 2006-11-20 22:10:27.000000000 +0100
+@@ -154,6 +154,14 @@
+ ifneq ($(words $(OS_RELEASE)),1)
+ OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
@@ -789,9 +981,9 @@
+ endif
+
+ #
-+diff -ur mozilla.old/security/coreconf/config.mk mozilla/security/coreconf/config.mk
-+--- mozilla.old/security/coreconf/config.mk 2004-04-25 17:02:17.000000000 +0200
-++++ mozilla/security/coreconf/config.mk 2005-12-24 19:14:23.000000000 +0100
++diff -urN mozilla/security/coreconf/config.mk mozilla/security/coreconf/config.mk
++--- mozilla/security/coreconf/config.mk 2004-04-25 17:02:17.000000000 +0200
+++++ mozilla/security/coreconf/config.mk 2006-11-20 22:10:27.000000000 +0100
+@@ -63,7 +63,7 @@
+ #######################################################################
+
@@ -801,9 +993,9 @@
+
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
-+diff -ur mozilla.old/security/nss/lib/freebl/unix_rand.c mozilla/security/nss/lib/freebl/unix_rand.c
-+--- mozilla.old/security/nss/lib/freebl/unix_rand.c 2005-05-10 23:14:51.000000000 +0200
-++++ mozilla/security/nss/lib/freebl/unix_rand.c 2005-12-26 07:11:30.000000000 +0100
++diff -urN mozilla/security/nss/lib/freebl/unix_rand.c mozilla/security/nss/lib/freebl/unix_rand.c
++--- mozilla/security/nss/lib/freebl/unix_rand.c 2005-10-11 01:22:50.000000000 +0200
+++++ mozilla/security/nss/lib/freebl/unix_rand.c 2006-11-20 22:10:26.000000000 +0100
+@@ -81,7 +81,8 @@
+ }
+
@@ -814,10 +1006,9 @@
+ #include <sys/times.h>
+
+ #define getdtablesize() sysconf(_SC_OPEN_MAX)
-+only in patch2:
-+unchanged:
-+--- xulrunner-1.8.0.5.orig/security/nss/lib/ssl/sslmutex.c
-++++ xulrunner-1.8.0.5/security/nss/lib/ssl/sslmutex.c
++diff -urN mozilla/security/nss/lib/ssl/sslmutex.c mozilla/security/nss/lib/ssl/sslmutex.c
++--- mozilla/security/nss/lib/ssl/sslmutex.c 2004-04-28 01:04:39.000000000 +0200
+++++ mozilla/security/nss/lib/ssl/sslmutex.c 2006-11-20 22:10:27.000000000 +0100
+@@ -89,7 +89,7 @@
+ return SECSuccess;
+ }
@@ -827,10 +1018,9 @@
+
+ #include <unistd.h>
+ #include <fcntl.h>
-+only in patch2:
-+unchanged:
-+--- xulrunner-1.8.0.5.orig/security/nss/lib/ssl/sslmutex.h
-++++ xulrunner-1.8.0.5/security/nss/lib/ssl/sslmutex.h
++diff -urN mozilla/security/nss/lib/ssl/sslmutex.h mozilla/security/nss/lib/ssl/sslmutex.h
++--- mozilla/security/nss/lib/ssl/sslmutex.h 2004-04-28 01:04:39.000000000 +0200
+++++ mozilla/security/nss/lib/ssl/sslmutex.h 2006-11-20 22:10:27.000000000 +0100
+@@ -79,7 +79,7 @@
+
+ typedef int sslPID;
@@ -840,10 +1030,21 @@
+
+ #include <sys/types.h>
+ #include "prtypes.h"
-+only in patch2:
-+unchanged:
-+--- xulrunner-1.8.0.7.orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
-++++ xulrunner-1.8.0.7/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
++diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in
++--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:20:44.000000000 +0100
+++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2006-11-20 22:10:27.000000000 +0100
++@@ -70,7 +70,7 @@
++ # New code for Linux, et. al., with gcc
++ # Migrate other platforms here after testing
++ #
++-ifneq (,$(filter Linux,$(OS_ARCH)))
+++ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
++ # Linux/x86-64
++ ifeq (x86_64,$(OS_TEST))
++ CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
++diff -urN mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
++--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 20:37:11.000000000 +0100
+++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-11-20 22:10:27.000000000 +0100
+@@ -67,7 +67,7 @@
+ *
+ */
@@ -853,93 +1054,79 @@
+
+ #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)
+ /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */
-+only in patch2:
-+unchanged:
-+--- xulrunner-1.8.0.7.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-++++ xulrunner-1.8.0.7/xpcom/reflect/xptcall/src/md/unix/Makefile.in
-+@@ -70,7 +70,7 @@
-+ # New code for Linux, et. al., with gcc
-+ # Migrate other platforms here after testing
-+ #
-+-ifneq (,$(filter Linux,$(OS_ARCH)))
-++ifneq (,$(filter Linux GNU_%,$(OS_ARCH)))
-+ # Linux/x86-64
-+ ifeq (x86_64,$(OS_TEST))
-+ CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
-diff -u xulrunner-1.8.0.7/debian/patches/99_configure.dpatch xulrunner-1.8.0.7/debian/patches/99_configure.dpatch
---- xulrunner-1.8.0.7/debian/patches/99_configure.dpatch
-+++ xulrunner-1.8.0.7/debian/patches/99_configure.dpatch
-@@ -37,6 +37,31 @@
- PR_MD_CSRCS=hpux.c
- if test "$OS_TEST" != "ia64"; then
- PR_MD_ASFILES=os_HPUX.s
-+@@ -3820,7 +3820,7 @@
-+ esac
++diff -urN mozilla/configure.in mozilla/configure.in
++--- mozilla/configure.in 2006-11-20 22:20:44.000000000 +0100
+++++ mozilla/configure.in 2006-11-20 22:10:27.000000000 +0100
++@@ -812,6 +812,7 @@
++ OS_TEST="${target_cpu}"
++ case "${target_os}" in
++ linux*) OS_ARCH=Linux ;;
+++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
++ mingw*) OS_ARCH=WINNT ;;
++ wince*) OS_ARCH=WINCE ;;
++@@ -1261,7 +1262,7 @@
++ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
+ ;;
+
+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -z "$USE_NSPR_THREADS"; then
-+ USE_PTHREADS=1
-+ IMPL_STRATEGY=_PTH
-+@@ -3849,10 +3849,14 @@
-+ #define HAVE_FCNTL_FILE_LOCKING 1
-+ EOF
+++*-linux*|*-kfreebsd*-gnu)
++ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
++ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
++ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++@@ -2169,7 +2170,7 @@
++ dnl = Flags to strip unused symbols from .so components
++ dnl ========================================================
++ case "$target" in
++- *-linux*)
+++ *-linux*|*-kfreebsd*-gnu)
++ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
++ ;;
++ *-solaris*)
++@@ -2735,7 +2736,7 @@
++ fi
++ ;;
+
-+- cat >> confdefs.h <<\EOF
-++ case "${target_os}" in
-++ linux*)
-++ cat >> confdefs.h <<\EOF
-+ #define LINUX 1
-+ EOF
++- *-*-linux*)
+++ *-*-linux*|*-*-kfreebsd*-gnu)
++ AC_DEFINE(_REENTRANT)
++ ;;
+
-++ ;;
-++ esac
-+ CFLAGS="$CFLAGS -ansi -Wall"
-+ CXXFLAGS="$CXXFLAGS -ansi -Wall"
-+ MDCPUCFG_H=_linux.cfg
- @@ -3859,7 +3859,7 @@
- PR_MD_CSRCS=linux.c
- MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
-@@ -95,6 +120,24 @@
- fi
- if test -n "$GNU_CC"; then
- CFLAGS="$CFLAGS -Wall"
-+@@ -5496,7 +5500,7 @@
-+ _PTHREAD_LDFLAGS=-pthread
-+ fi
++diff -urN mozilla/configure mozilla/configure
++--- mozilla/configure 2006-11-20 22:20:44.000000000 +0100
+++++ mozilla/configure 2006-11-20 22:19:49.000000000 +0100
++@@ -5036,6 +4934,7 @@
++ OS_TEST="${target_cpu}"
++ case "${target_os}" in
++ linux*) OS_ARCH=Linux ;;
+++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
++ solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
++ mingw*) OS_ARCH=WINNT ;;
++ wince*) OS_ARCH=WINCE ;;
++@@ -5523,7 +5422,7 @@
++ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(DIST)/bin/XUL -lobjc'
++ ;;
++
++-*-linux*)
+++*-linux*|*-kfreebsd*-gnu)
++ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
++ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
++ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
++@@ -6792,7 +6691,7 @@
++ esac
++
++ case "$target" in
++- *-linux*)
+++ *-linux*|*-kfreebsd*-gnu)
++ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
+ ;;
-+- *-linux*)
-++ *-linux*|*-gnu*|*-k*bsd*-gnu)
-+ cat >> confdefs.h <<\EOF
++ *-solaris*)
++@@ -9498,7 +9400,7 @@
++ fi
++ ;;
++
++- *-*-linux*)
+++ *-*-linux*|*-*-kfreebsd*-gnu)
++ cat >> confdefs.h <<\EOF
+ #define _REENTRANT 1
+ EOF
-+@@ -5633,7 +5637,7 @@
-+ fi
-+ fi
-+ ;;
-+-*-linux*)
-++*-linux*|*-gnu*|*-k*bsd*-gnu)
-+ if test -n "$USE_NSPR_THREADS"; then
-+ cat >> confdefs.h <<\EOF
-+ #define _PR_LOCAL_THREADS_ONLY 1
- @@ -5910,6 +5910,8 @@
- MAKEFILES="$MAKEFILES pr/src/cplus/Makefile pr/src/cplus/tests/Makefile"
- fi
-@@ -1737,7 +1737,7 @@
-
- MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)'
- MOZ_XPCOM_OBSOLETE_LIBS='-L$(DIST)/lib -lxpcom_compat'
--@@ -5042,10 +4911,17 @@
-+@@ -5042,10 +4911,18 @@
- darwin*) OS_ARCH=Darwin OS_TARGET=Darwin ;;
- esac
- else
-@@ -1750,6 +1750,7 @@
- + OS_TEST="${host_cpu}"
- + case "${host_os}" in
- + linux*) OS_ARCH=Linux ;;
-++ kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD ;;
- + solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;;
- + mingw*) OS_ARCH=WINNT ;;
- + wince*) OS_ARCH=WINCE ;;
More information about the Glibc-bsd-commits
mailing list