Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=backporting.git;a=commitdiff;h=3e963891e8c8c74154a56cd360d8fba907ac844f

commit 3e963891e8c8c74154a56cd360d8fba907ac844f
Author: kikadf <[email protected]>
Date:   Sun Apr 20 14:59:19 2014 +0200

nspr-4.10.4-1arcturus1-x86_64

* Version bump
* Backported from -current

diff --git a/source/base/nspr/CVE-2013-5607.patch 
b/source/base/nspr/CVE-2013-5607.patch
deleted file mode 100644
index 529677e..0000000
--- a/source/base/nspr/CVE-2013-5607.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# HG changeset patch
-# User Wan-Teh Chang <[email protected]>
-# Date 1383160555 25200
-# Node ID 4df6bc35be64c660cd9770637a2f9e8247c6c407
-# Parent  9b26e99c21c37c97d3ca286c3ac96e2fd82e980d
-Bug 927687: Avoid unsigned integer wrapping in PL_ArenaAllocate. r=rrelyea.
-
-Index: nspr-4.9.2/mozilla/nsprpub/lib/ds/plarena.c
-===================================================================
---- nspr-4.9.2.orig/mozilla/nsprpub/lib/ds/plarena.c   2012-07-20 
08:32:28.000000000 +0200
-+++ nspr-4.9.2/mozilla/nsprpub/lib/ds/plarena.c        2013-12-16 
17:09:04.147721841 +0100
-@@ -196,8 +196,12 @@ PR_IMPLEMENT(void *) PL_ArenaAllocate(PL
-     /* attempt to allocate from the heap */
-     {
-         PRUint32 sz = PR_MAX(pool->arenasize, nb);
--        sz += sizeof *a + pool->mask;  /* header and alignment slop */
--        a = (PLArena*)PR_MALLOC(sz);
-+        if (PR_UINT32_MAX - sz < sizeof *a + pool->mask) {
-+            a = NULL;
-+        } else {
-+            sz += sizeof *a + pool->mask;  /* header and alignment slop */
-+            a = (PLArena*)PR_MALLOC(sz);
-+        }
-         if ( NULL != a )  {
-             a->limit = (PRUword)a + sz;
-             a->base = a->avail = (PRUword)PL_ARENA_ALIGN(pool, a + 1);
diff --git a/source/base/nspr/FrugalBuild b/source/base/nspr/FrugalBuild
index eed959a..50b171c 100644
--- a/source/base/nspr/FrugalBuild
+++ b/source/base/nspr/FrugalBuild
@@ -1,11 +1,11 @@
-# Compiling Time: 0.36 SBU
-# Maintainer: Christian Hamar alias krix <[email protected]>
+# Compiling Time: 0.30 SBU
+# Maintainer: DeX77 <[email protected]>

options+=('asneeded')

pkgname=nspr
-pkgver=4.9.2
-pkgrel=4arcturus1
+pkgver=4.10.4
+pkgrel=1arcturus1
pkgdesc="NSPR library from mozilla.org"
url="http://www.mozilla.org/projects/nspr/";
pkgurl="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/";
@@ -13,16 +13,11 @@ groups=('base')
archs=('i686' 'x86_64' 'arm')
license="MPL GPL"
depends=('glibc>=2.12.1')
-up2date="lynx -dump '$pkgurl'|sort -n -r|head -n 2|sort -n|head -n 1|sed -e 
's/.*v//' -e 's|/||g'"
-#source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz pkgconfig.patch)
+up2date="Flastverdir '$pkgurl' | sed 's/v//g' "
source=($pkgurl/v${pkgver}/src/$pkgname-$pkgver.tar.gz nspr.pc)
-sha1sums=('455eab365f8fd732a4b014ca0af685f3c2dec598' \
-          'd42605b2dce3e222f4bdddb3609347b229e9ada8')
-
-# FSA fix ***
-source=(${source[@]} CVE-2013-5607.patch)
-sha1sums=(${sha1sums[@]} '928b34e8faa27369e012d9f397e3b6c91fa3ce19')
-# ***********
+sha1sums=('43b2029d990515f952c89d2921397c064fbbe2e7' \
+          '38df8a27fa1e5579b79251e609f6c9bf2afe329b')
+_F_cd_path="$pkgname-$pkgver/$pkgname"

build()
{
@@ -30,8 +25,6 @@ build()
opts="--enable-64bit"
fi
Fcd
-       Fpatchall
-       cd mozilla/nsprpub || Fdie
Fconf \
--libdir=/usr/lib \
--includedir=/usr/include/nspr4 \
@@ -44,6 +37,7 @@ build()
## do not use Fmakeinstall here
make || Fdie
make DESTDIR=$Fdestdir install || Fdie
+
Fexe /usr/lib/pkgconfig/nspr.pc
Fln nspr4 /usr/include/nspr
Frm usr/bin/compile-et.pl
diff --git a/source/base/nspr/nspr.pc b/source/base/nspr/nspr.pc
index ce4d426..c174f6b 100644
--- a/source/base/nspr/nspr.pc
+++ b/source/base/nspr/nspr.pc
@@ -5,6 +5,6 @@ includedir=${prefix}/include/nspr4

Name: NSPR
Description: The Netscape Portable Runtime
-Version: 4.9.2
+Version: 4.10.4
Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread
Cflags: -I${includedir}
diff --git a/source/base/nspr/pkgconfig.patch b/source/base/nspr/pkgconfig.patch
deleted file mode 100644
index f7fb787..0000000
--- a/source/base/nspr/pkgconfig.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/config/config.mk 
nspr-4.8.7-p/mozilla/nsprpub/config/config.mk
---- nspr-4.8.7/mozilla/nsprpub/config/config.mk        2005-04-29 
23:02:53.000000000 +0200
-+++ nspr-4.8.7-p/mozilla/nsprpub/config/config.mk      2008-06-23 
01:52:14.000000000 +0200
-@@ -162,3 +162,4 @@
- RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
- RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
- RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
-+RELEASE_LIB_PKGCONFIG_DIR = $(RELEASE_LIB_DIR)/pkgconfig
-diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/config/Makefile.in 
nspr-4.8.7-p/mozilla/nsprpub/config/Makefile.in
---- nspr-4.8.7/mozilla/nsprpub/config/Makefile.in      2005-11-23 
07:35:18.000000000 +0100
-+++ nspr-4.8.7-p/mozilla/nsprpub/config/Makefile.in    2008-06-23 
01:51:15.000000000 +0200
-@@ -52,9 +52,10 @@
-
- # autoconf.mk must be deleted last (from the top-level directory)
- # because it is included by every makefile.
--DIST_GARBAGE  = nsprincl.mk nsprincl.sh nspr-config
-+DIST_GARBAGE  = nsprincl.mk nsprincl.sh nspr-config nspr.pc
-
- RELEASE_BINS  = nspr-config
-+RELEASE_LIB_PKGCONFIG = nspr.pc
-
- include $(topsrcdir)/config/config.mk
-
-@@ -139,6 +140,7 @@
-
- export:: $(TARGETS)
-       rm -f $(dist_bindir)/nspr-config
-+      rm -f $(dist_bindir)/nspr.pc
-
- ifdef WRAP_SYSTEM_INCLUDES
- export::
-diff -Naur -X nope nspr-4.7.1/mozilla/nsprpub/config/nspr.pc.in 
nspr-4.7.1-p/mozilla/nsprpub/config/nspr.pc.in
---- nspr-4.8.7/mozilla/nsprpub/config/nspr.pc.in       1970-01-01 
01:00:00.000000000 +0100
-+++ nspr-4.8.7-p/mozilla/nsprpub/config/nspr.pc.in     2008-06-23 
01:27:54.000000000 +0200
-@@ -0,0 +1,12 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@
-+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ 
-lnspr@MOD_MAJOR_VERSION@ -lpthread -ldl
-+Cflags: -I${includedir}
-+
-+
-diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/config/rules.mk 
nspr-4.8.7-p/mozilla/nsprpub/config/rules.mk
---- nspr-4.8.7/mozilla/nsprpub/config/rules.mk 2007-06-09 18:28:46.000000000 
+0200
-+++ nspr-4.8.7-p/mozilla/nsprpub/config/rules.mk       2008-06-23 
02:00:43.000000000 +0200
-@@ -224,7 +224,7 @@
-       rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE)
-       +$(LOOP_OVER_DIRS)
-
--install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS)
-+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) 
$(RELEASE_LIB_PKGCONFIG)
- ifdef RELEASE_BINS
-       $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir)
- endif
-@@ -234,6 +234,9 @@
- ifdef RELEASE_LIBS
-       $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) 
$(DESTDIR)$(libdir)/$(lib_subdir)
- endif
-+ifdef RELEASE_LIB_PKGCONFIG
-+      $(NSINSTALL) -t -m 0644 $(RELEASE_LIB_PKGCONFIG) 
$(DESTDIR)$(libdir)/pkgconfig
-+endif
-       +$(LOOP_OVER_DIRS)
-
- release:: export
-diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/configure 
nspr-4.8.7-p/mozilla/nsprpub/configure
---- nspr-4.8.7/mozilla/nsprpub/configure       2008-04-29 01:21:11.000000000 
+0200
-+++ nspr-4.8.7-p/mozilla/nsprpub/configure     2008-06-23 01:27:54.000000000 
+0200
-@@ -5980,6 +5980,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
-diff -Naur -X nope nspr-4.8.7/mozilla/nsprpub/configure.in 
nspr-4.8.7-p/mozilla/nsprpub/configure.in
---- nspr-4.8.7/mozilla/nsprpub/configure.in    2008-04-29 01:21:11.000000000 
+0200
-+++ nspr-4.8.7-p/mozilla/nsprpub/configure.in  2008-06-23 01:27:54.000000000 
+0200
-@@ -2857,6 +2857,7 @@
- config/nsprincl.mk
- config/nsprincl.sh
- config/nspr-config
-+config/nspr.pc
- lib/Makefile
- lib/ds/Makefile
- lib/libc/Makefile
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to