upgrading package: nspr 4.9.6 -> 4.25

nspr/nspr.patch

@@ -1,74 +0,0 @@
-Index: mozilla/nsprpub/pr/include/md/_freebsd.h
---- mozilla/nsprpub/pr/include/md/_freebsd.h.orig	2004-11-22 22:24:53 +0100
-+++ mozilla/nsprpub/pr/include/md/_freebsd.h	2008-02-07 19:15:24 +0100
-@@ -43,6 +43,7 @@
- #if __FreeBSD__ >= 2
- #include <osreldate.h>  /* for __FreeBSD_version */
- #endif
-+#include <sys/param.h>
- #include <sys/syscall.h>
- 
- #define PR_LINKER_ARCH	"freebsd"
-Index: mozilla/nsprpub/pr/include/md/_pth.h
---- mozilla/nsprpub/pr/include/md/_pth.h.orig	2006-12-08 23:58:13 +0100
-+++ mozilla/nsprpub/pr/include/md/_pth.h	2008-02-07 19:15:24 +0100
-@@ -84,7 +84,7 @@
- #define _PT_PTHREAD_MUTEXATTR_DESTROY(x)  /* */
- #define _PT_PTHREAD_MUTEX_INIT(m, a)      (memset(&(m), 0, sizeof(m)), \
-                                       pthread_mutex_init(&(m), NULL))
--#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
-+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (0 != pthread_mutex_trylock(&(m)))
- #define _PT_PTHREAD_CONDATTR_INIT(x)      0
- #define _PT_PTHREAD_CONDATTR_DESTROY(x)   /* */
- #define _PT_PTHREAD_COND_INIT(m, a)       (memset(&(m), 0, sizeof(m)), \
-@@ -96,7 +96,7 @@
- #if defined(FREEBSD)
- #define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    pt_pthread_mutex_is_locked(&(m))
- #else
--#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (EBUSY == pthread_mutex_trylock(&(m)))
-+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m)    (0 != pthread_mutex_trylock(&(m)))
- #endif
- #if defined(DARWIN)
- #define _PT_PTHREAD_CONDATTR_INIT(x)      0
-Index: mozilla/nsprpub/pr/src/md/unix/unix.c
---- mozilla/nsprpub/pr/src/md/unix/unix.c.orig	2006-04-05 22:57:15 +0200
-+++ mozilla/nsprpub/pr/src/md/unix/unix.c	2008-02-07 19:20:57 +0100
-@@ -68,7 +68,7 @@
-  * PRInt32* pointer to a _PRSockLen_t* pointer.
-  */
- #if defined(HAVE_SOCKLEN_T) \
--    || (defined(__GLIBC__) && __GLIBC__ >= 2)
-+    || (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(FREEBSD)
- #define _PRSockLen_t socklen_t
- #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \
-     || defined(AIX4_1) || defined(LINUX) || defined(SONY) \
-@@ -76,7 +76,7 @@
-     || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \
-     || defined(NEXTSTEP) || defined(QNX)
- #define _PRSockLen_t int
--#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \
-+#elif (defined(AIX) && !defined(AIX4_1)) \
-     || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \
-     || defined(DGUX) || defined(VMS) || defined(NTO) || defined(RISCOS)
- #define _PRSockLen_t size_t
-Index: mozilla/nsprpub/pr/src/pthreads/ptio.c
---- mozilla/nsprpub/pr/src/pthreads/ptio.c.orig	2008-01-13 02:27:16 +0100
-+++ mozilla/nsprpub/pr/src/pthreads/ptio.c	2008-02-07 19:15:24 +0100
-@@ -3475,6 +3475,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);
-     }

nspr/nspr.pc

@@ -1,10 +0,0 @@
-prefix=@l_prefix@
-exec_prefix=@l_prefix@
-libdir=@l_prefix@/lib
-includedir=@l_prefix@/include
-
-Name: Mozilla NSPR
-Description: Mozilla Netscape Portable Runtime (NSPR)
-Version: @version@
-Libs: -pthread -L${libdir}/nspr -lplds4 -lplc4 -lnspr4
-Cflags: -I${includedir}/nspr -I${includedir}

nspr/nspr.spec

@@ -31,13 +31,11 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Libraries
 License:      MPL
-Version:      4.9.6
+Version:      4.25
-Release:      20140830
+Release:      20200306
 
 #   list of sources
-Source0:      ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v%{version}/src/nspr-%{version}.tar.gz
+Source0:      https://archive.mozilla.org/pub/nspr/releases/v%{version}/src/nspr-%{version}.tar.gz
-Source1:      nspr.pc
-Patch0:       nspr.patch
 
 #   build information
 BuildPreReq:  OpenPKG, openpkg >= 20160101, make, gcc
@@ -53,48 +51,30 @@ PreReq:       OpenPKG, openpkg >= 20160101
 %track
     prog nspr = {
         version   = %{version}
-        url       = ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/
+        url       = https://archive.mozilla.org/pub/nspr/releases/
-        regex     = v(__VER__)
+        regex     = v(__VER__)/
-        url       = ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v__NEWVER__/src/
-        regex     = nspr-(__VER__)\.tar\.gz
     }
 
 %prep
     %setup -q
-    %patch -p0
 
 %build
-    cd mozilla/nsprpub
+    mkdir build
+    cd build
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
-    ./configure \
+    ../nspr/configure \
         --prefix=%{l_prefix} \
-        --with-pthreads \
+        --enable-optimize \
-        --disable-debug
+        --disable-debug \
+        --disable-shared
     %{l_make} %{l_mflags -O}
 
 %install
-    %{l_shtool} mkdir -f -p -m 755 \
+    (   cd build
-        $RPM_BUILD_ROOT%{l_prefix}/include/nspr/obsolete \
+        %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
-        $RPM_BUILD_ROOT%{l_prefix}/include/nspr/private \
+    ) || exit $?
-        $RPM_BUILD_ROOT%{l_prefix}/lib/nspr \
+    rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/*.so
-        $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
-    %{l_shtool} install -c -m 644 \
-        mozilla/nsprpub/dist/include/nspr/*.h \
-        $RPM_BUILD_ROOT%{l_prefix}/include/nspr/
-    %{l_shtool} install -c -m 644 \
-        mozilla/nsprpub/dist/include/nspr/obsolete/*.h \
-        $RPM_BUILD_ROOT%{l_prefix}/include/nspr/obsolete/
-    %{l_shtool} install -c -m 644 \
-        mozilla/nsprpub/dist/include/nspr/private/*.h \
-        $RPM_BUILD_ROOT%{l_prefix}/include/nspr/private/
-    %{l_shtool} install -c -m 644 \
-        mozilla/nsprpub/dist/lib/*.a \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/nspr/
-    %{l_shtool} install -c -m 755 %{l_value -s -a} \
-        -e 's;@version@;%{version};g' \
-        %{SOURCE nspr.pc} \
-        $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
 
 %files -f files