Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=3bd90f0b15f539aed91852677fc726047503cd7f
commit 3bd90f0b15f539aed91852677fc726047503cd7f Author: crazy <cr...@frugalware.org> Date: Sun Jan 28 16:26:47 2018 +0100 nss-3.35-2-x86_64 * rebuild with tc * workaround 32bit crap so a least builds * force -j1 diff --git a/source/base/nss/FrugalBuild b/source/base/nss/FrugalBuild index 1afda20..b235f31 100644 --- a/source/base/nss/FrugalBuild +++ b/source/base/nss/FrugalBuild @@ -3,7 +3,7 @@ pkgname=nss pkgver=3.35 -pkgrel=1 +pkgrel=2 pkgdesc="NSS library from mozilla.org" url="http://www.mozilla.org/projects/security/pki/nss/"; pkgurl="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/"; @@ -11,16 +11,18 @@ pkg_stable="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Re groups=('base') archs=('x86_64') license="MPL GPL" -depends=('glibc>=2.25-5' 'nspr>=4.13.1-2' 'sqlite3>=3.14.2-2' 'libstdc++>=6.3.1-4' 'zlib>=1.2.8-8') -makedepends=('perl' 'python' 'xmlto' 'docbook-xsl') +depends=('glibc>=2.26.9000-3' 'nspr>=4.13.1-2' 'sqlite3>=3.14.2-2' 'libstdc++>=7.3.0-4' 'zlib>=1.2.8-8') +makedepends=('perl>=5.26.1' 'python' 'xmlto' 'docbook-xsl') up2date="lynx -dump '$pkg_stable' | grep -a 'current Stable release' | sed 's/.*is \(.*\), .*/\1/'" source=($pkgurl/NSS_${pkgver//./_}_RTM/src/$pkgname-$pkgver.tar.gz \ - nss-config.in nss.pc.in) + nss-config.in nss.pc.in add-relro-linker-option.patch) sha1sums=('72fb5bd2fc56113fec0d8867a1030bb0dfa108ac' \ '0227f94c745519b67b1b530e6cc116e8069a6b43' \ - 'ae2d58b2aa31ce0426541e8c76aeda7a8d34c8cf') -_F_cross32_combined="yes" + 'ae2d58b2aa31ce0426541e8c76aeda7a8d34c8cf' \ + '476b87b0658ed7d0ce09894f7e2c563ad457594c') +#_F_cross32_combined="yes" +_F_cross32_new_path="yes" _F_cross32_simple_auto="true" Finclude cross32 @@ -34,24 +36,26 @@ build() { export NSS_USE_SYSTEM_SQLITE=1 export DISTPATH=$Fsrcdir/$pkgname-$pkgver/dist export BUILD_OPT=1 + export NSS_ENABLE_WERROR=0 Fcross32_prepare Fcross32_copy_source export NSPR_INCLUDE_DIR=`/usr/i686-frugalware-linux/bin/nspr-config --includedir` export NSPR_LIB_DIR=/usr/lib32 - export XCFLAGS="$CFLAGS" - unset ASFLAGS ## - + export XCFLAGS="" + export ASFLAGS='' + export USE_N32=1 + unset LDFLAGS Fexec cd $pkgname || Fdie export NSS_VMAJOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'` export NSS_VMINOR=`cat lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'` export NSS_VPATCH=`cat lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'` - Fexec make -C coreconf || Fdie - Fexec make -C lib/dbm || Fdie - Fexec make || Fdie + Fexec make -j1 -C coreconf || Fdie + Fexec make -j1 -C lib/dbm || Fdie + Fexec make -j1 || Fdie Fmkdir /usr/i686-frugalware-linux/bin Fmkdir /usr/i686-frugalware-linux/include/nss3 @@ -118,6 +122,7 @@ build() { export NSPR_INCLUDE_DIR=`/usr/bin/nspr-config --includedir` export NSPR_LIB_DIR=/usr/lib export USE_64=1 + export USE_N32=0 export XCFLAGS="$CFLAGS" cd $pkgname diff --git a/source/base/nss/add-relro-linker-option.patch b/source/base/nss/add-relro-linker-option.patch new file mode 100644 index 0000000..7ab9db1 --- /dev/null +++ b/source/base/nss/add-relro-linker-option.patch @@ -0,0 +1,16 @@ +diff -up nss/coreconf/Linux.mk.relro nss/coreconf/Linux.mk +--- nss/coreconf/Linux.mk.relro 2013-04-09 14:29:45.943228682 -0700 ++++ nss/coreconf/Linux.mk 2013-04-09 14:31:26.194953927 -0700 +@@ -174,6 +174,12 @@ endif + endif + endif + ++# harden DSOs/executables a bit against exploits ++ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE)))) ++DSO_LDOPTS+=-Wl,-z,relro ++LDFLAGS += -Wl,-z,relro ++endif ++ + USE_SYSTEM_ZLIB = 1 + ZLIB_LIBS = -lz + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
