Bläddra i källkod

upgrading package: nspr 4.3 -> 4.4.1

Ralf S. Engelschall 22 år sedan
förälder
incheckning
16c8ac7ad4
2 ändrade filer med 30 tillägg och 27 borttagningar
  1. 27 24
      nspr/nspr.patch
  2. 3 3
      nspr/nspr.spec

+ 27 - 24
nspr/nspr.patch

@@ -1,5 +1,6 @@
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	Sat Feb 16 09:12:55 2002
-+++ mozilla/nsprpub/pr/include/md/_freebsd.h	Thu Aug  8 19:31:23 2002
+Index: mozilla/nsprpub/pr/include/md/_freebsd.h
+--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2003-01-16 17:16:27.000000000 +0100
++++ mozilla/nsprpub/pr/include/md/_freebsd.h	2004-02-04 19:53:59.000000000 +0100
 @@ -40,6 +40,7 @@
  #if __FreeBSD__ >= 2
  #include <osreldate.h>  /* for __FreeBSD_version */
@@ -8,28 +9,9 @@
  #include <sys/syscall.h>
  
  #define PR_LINKER_ARCH	"freebsd"
---- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ mozilla/nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
---- mozilla/nsprpub/pr/src/md/unix/unix.c.orig	Sat May 31 18:06:04 2003
-+++ mozilla/nsprpub/pr/src/md/unix/unix.c	Sat May 31 18:04:43 2003
+Index: mozilla/nsprpub/pr/src/md/unix/unix.c
+--- mozilla/nsprpub/pr/src/md/unix/unix.c.orig	2002-12-12 00:03:31.000000000 +0100
++++ mozilla/nsprpub/pr/src/md/unix/unix.c	2004-02-04 19:53:59.000000000 +0100
 @@ -65,7 +65,8 @@
   * PRInt32* pointer to a _PRSockLen_t* pointer.
   */
@@ -49,3 +31,24 @@
      || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
      || defined(DGUX) || defined(VMS) || defined(NTO)
  #define _PRSockLen_t size_t
+Index: mozilla/nsprpub/pr/src/pthreads/ptio.c
+--- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig	Mon Feb  2 10:41:43 2004
++++ mozilla/nsprpub/pr/src/pthreads/ptio.c	Mon Feb  2 10:44:49 2004
+@@ -3470,6 +3470,17 @@
+                     &on, sizeof(on));
+         }
+ #endif
++#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
++	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
++		if (domain == PR_AF_INET6) {
++			int opt = 0;
++			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
++			    &opt, sizeof(opt))) {
++				close(osfd);
++				return NULL;
++			}
++		}
++#endif  
+         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
+         if (fd == NULL) close(osfd);
+     }

+ 3 - 3
nspr/nspr.spec

@@ -33,8 +33,8 @@ Distribution: OpenPKG
 Class:        PLUS
 Group:        System
 License:      MPL
-Version:      4.3
-Release:      20040203
+Version:      4.4.1
+Release:      20040204
 
 #   list of sources
 Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nspr/releases/v%{version}/src/nspr-%{version}.tar.gz
@@ -57,7 +57,7 @@ AutoReqProv:  no
 
 %track
     prog nspr = {
-        version   = 4.3
+        version   = %{version}
         url       = ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nspr/releases/
         regex     = v(__VER__)
         url       = ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/nspr/releases/v__NEWVER__/src/