From d0b7f1842886d38e23bf6507ed5dd7e78a61b31e255536ef3c99b37708e4f630 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 6 Aug 2009 16:07:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=23 --- PayPalEE.cert | Bin 1483 -> 0 bytes PayPalICA.cert | Bin 1512 -> 0 bytes bmo485145-libjar.patch.bz2 | 3 -- bmo488646-oscp-test.patch | 104 ------------------------------------- mozilla-nss.changes | 7 +++ mozilla-nss.spec | 17 ++---- nss-3.12.3.1.tar.bz2 | 3 -- nss-3.12.3.99.tar.bz2 | 3 ++ nss-no-rpath.patch | 30 +++++------ nss-noexec.patch | 25 --------- nss-opt.patch | 20 +++---- 11 files changed, 32 insertions(+), 180 deletions(-) delete mode 100644 PayPalEE.cert delete mode 100644 PayPalICA.cert delete mode 100644 bmo485145-libjar.patch.bz2 delete mode 100644 bmo488646-oscp-test.patch delete mode 100644 nss-3.12.3.1.tar.bz2 create mode 100644 nss-3.12.3.99.tar.bz2 delete mode 100644 nss-noexec.patch diff --git a/PayPalEE.cert b/PayPalEE.cert deleted file mode 100644 index c3ed544e3ac20a075a2c3ca8a5e44e5eb8d511b6fa17cfc2d4f7946af3c5f00e..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1483 zcmaJ>e@qj16z^THEu{rySBi?jA!-1neb@3^8NtE?K?Dl50#nX%LZ!5oMbi`M5aaN!Gs90`tT7X;z)I8b?>6oHV>&BXXP znyDr|!GkrNaaRp()~ogT#&txZQ70pP!J7?;aOr%2$S{{!tV9ZJwVBL?&4621emFY}Ha&s|71n2@Gj0^z=TTO@$w;Wx$%HBvd^}ws5<(OaF#BbBx{v@NKq{1>k)e@U zU`O0Y9NhV$wR{9a?BN?wggd+CGVpxaiQ-Oiw1KiwW}5VZW$Yww_$wMx2I~lB40erB zS-`G9atXMyK^`tp0vVzR3tvng+lvXiOPnJ^NhKMq00lWa0ONGRomI>NyG>@Jo+91B zjm;EDoYa(&*le=Uq!c8qODJ(sFjYhfK{Dj3t)vIwtlwE8PNm9IDZ|`7R={%BEt24g zMh3KKj+kkGrCb$-cb0O~GsO);^d%_-fGjxVXDl+cngc;@=sP znx6ecDct_7IwIoF)IPbXBYn94)P(9l>_A0^BQ|a1+U>9YNXYWg>Fy(?O(Vm-pA8+= z*U295zx8P5Zq4S~WpyRr^cSLBgoAuwM}A`tH!&+pZyZB`GpjsrS4@gY&b3#VueWB_ zj&TS-kE3IgcOJBE01-okw;P6WQC>4_WDQ@8Q6q#mhc+u6Br88geeoJKtt&Cp!8)^H zu?*)U3V<*f6NNYygTSJJ)wC$rk$^aUk4FTad=#q7#@M^g zm2i=T7Ye>?6Mt+eNDoS$A4xsmcy4u8MP}93lN?>`BW)A}XJj=j(Ta zANYcR&s*!tMVDieq{4Fn^?dP#Z_^`A1%8wyc+-!!6xK*r&CO~s<(n2aEw!*dQpQ3p z{x5Ou2*PoED9&$_$C#$K4i+>IyQ_Mh#ta?ex4rK>Sy){<-Z$dkv8lUjFzM&xClY-g zREt+$zFBbK=9=V7x8#lWHP4o}H5xDaOpMkgpDA5B6KzYNuYB=*rY9)1Gp_+V9ksur zE$ZH6y2W;MDG1 z`>%a>tr})>k PKm4MdY&jA4{O;60{ubU9 diff --git a/PayPalICA.cert b/PayPalICA.cert deleted file mode 100644 index c1b416eb2a15587f29887ff4922e318cf686d9b5185a87d62fa97e8a7111832c..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1512 zcmXqLVtr!J#ByccMufI$miByN&9u`3D}onV$JQ=JNMI zCT2zk#>GvHmw+L14xCtJ`B=nQME-OI?3%YzHL5za)qg5Oa{tSSY-a-@U{Q2ej}nG6P61{!P}+HAm_!p_7fCWA9>lM9L=+T|hI7Z@zi zYtsQK2c`tqu;A3>(xOz|ZfO>87Laa8?dvnYV$EONwJ9Z zKfNr~wx+i)`|$aOtScT8I@OYT2C8DpP^abOr{|+OsjL_*1~N$#9B?E;eat1Pn zQU(%00bm{#1ZPcSXGbFg6AN8KT@!Pl-=U!dbgQ9(zJV@`Z@}25h#n02$;AaImKw-| zY*J>CFc51HslS}M{LtMuyFVCkes;F}#kAho&=@)00}Cx+x@TmVw&+*=GuyXUw9jo9 zwLehA9N)c5Y=Y|dL(MmimzpGJ2nF*5cUGSa<6M5&%*BuILQ>M^wqGw6&NfN!4OSAj z`@7~{x}Ni+*m~oZPm2l;m~#EwXB&=&JGX4Qr~C23HxGG{!thON3?EKc zQ9dagTk_QHJ!j3lhcgYiI4Y(43+Iccov=9nu4no-ww=XpPcBb6_%vawYN_tcOv5*4 zryX8g_V-1J%Nn7bzWW1T?7ZUQr+#{!!o@nRnr+GM^U8KjzaaLUJ16(MbG|XRra}3y zxj(=9?I_!PR$|Lfh4;3%pPgDe`-0!4_LaQLT#5tk7DT^YTj#Y$>FNr#Cx==Ucy9s# Da6$|! diff --git a/bmo485145-libjar.patch.bz2 b/bmo485145-libjar.patch.bz2 deleted file mode 100644 index 6cb839c..0000000 --- a/bmo485145-libjar.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18bb217adb927e4ef618dacb3b3dea7fc123f28544bf3b2c49b7a886f65e061c -size 36032 diff --git a/bmo488646-oscp-test.patch b/bmo488646-oscp-test.patch deleted file mode 100644 index be621f6..0000000 --- a/bmo488646-oscp-test.patch +++ /dev/null @@ -1,104 +0,0 @@ -Index: chains.sh -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/tests/chains/chains.sh,v -retrieving revision 1.15 -diff -u -9 -r1.15 chains.sh ---- chains.sh 15 Apr 2009 18:04:35 -0000 1.15 -+++ security/nss/tests/chains/chains.sh 17 Apr 2009 13:02:49 -0000 -@@ -689,18 +689,49 @@ - if [ "${EXP_RESULT}" = "pass" -a ${RESULT} -eq 0 ]; then - html_passed "${SCENARIO}${TESTNAME}" - elif [ "${EXP_RESULT}" = "fail" -a ${RESULT} -ne 0 ]; then - html_passed "${SCENARIO}${TESTNAME}" - else - html_failed "${SCENARIO}${TESTNAME}" - fi - } - -+ -+check_ocsp() -+{ -+ OCSP_CERT=$1 -+ -+ CERT_NICK=`echo ${OCSP_CERT} | cut -d: -f1` -+ CERT_ISSUER=`echo ${OCSP_CERT} | cut -d: -f2` -+ -+ if [ "${CERT_ISSUER}" = "x" ]; then -+ CERT_ISSUER= -+ CERT=${CERT_NICK}.cert -+ CERT_FILE="${QADIR}/libpkix/certs/${CERT}" -+ else -+ CERT=${CERT_NICK}${CERT_ISSUER}.der -+ CERT_FILE=${CERT} -+ fi -+ -+ OCSP_HOST=$(${BINDIR}/pp -t certificate -i ${CERT_FILE} | grep URI | sed "s/.*:\/\///" | sed "s/:.*//") -+ -+ if [ "${OS_ARCH}" = "WINNT" ]; then -+ ping -n 1 ${OCSP_HOST} -+ return $? -+ elif [ "${OS_ARCH}" = "HP-UX" ]; then -+ ping ${OCSP_HOST} -c 1 -+ return $? -+ else -+ ping -c 1 ${OCSP_HOST} -+ return $? -+ fi -+} -+ - ############################ parse_result ############################## - # local shell function to process expected result value - # this function was created for case that expected result depends on - # some conditions - in our case type of cert DB - # - # default results are pass and fail - # this function added parsable values in format: - # type1:value1 type2:value2 .... typex:valuex - # -@@ -859,18 +890,25 @@ - LOGFILE="${LOGDIR}/${LOGNAME}" - fi - ;; - "sleep") - sleep ${VALUE} - ;; - "break") - break - ;; -+ "check_ocsp") -+ check_ocsp ${VALUE} -+ if [ $? -ne 0 ]; then -+ echo "OCSP server not accessible, skipping OCSP tests" -+ break; -+ fi -+ ;; - "") - if [ -n "${ENTITY}" ]; then - if [ -z "${DB}" ]; then - create_entity "${ENTITY}" "${TYPE}" - fi - sign_cert "${ENTITY}" "${ISSUER}" "${TYPE}" - if [ "${TYPE}" = "Bridge" ]; then - create_pkcs7 "${ENTITY}" - fi -Index: scenarios/ocsp.cfg -=================================================================== -RCS file: /cvsroot/mozilla/security/nss/tests/chains/scenarios/ocsp.cfg,v -retrieving revision 1.4 -diff -u -9 -r1.4 ocsp.cfg ---- scenarios/ocsp.cfg 19 Mar 2009 09:55:31 -0000 1.4 -+++ security/nss/tests/chains/scenarios/ocsp.cfg 17 Apr 2009 13:02:49 -0000 -@@ -1,11 +1,13 @@ - scenario OCSP - -+check_ocsp OCSPEE11:x -+ - db OCSPRoot - import OCSPRoot:x:CT,C,C - - db OCSPCA1 - import_key OCSPCA1 - - crl OCSPCA1 - - revoke OCSPCA1 diff --git a/mozilla-nss.changes b/mozilla-nss.changes index 94484ed..7ec6ab3 100644 --- a/mozilla-nss.changes +++ b/mozilla-nss.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 3 18:45:02 CEST 2009 - wr@rosenauer.org + +- update to NSS 3.12.4pre snapshot +- rebased existing patches +- enable testsuite again (was disabled accidentally before) + ------------------------------------------------------------------- Wed Jul 29 09:40:02 CEST 2009 - wr@rosenauer.org diff --git a/mozilla-nss.spec b/mozilla-nss.spec index d12381b..cd85b7e 100644 --- a/mozilla-nss.spec +++ b/mozilla-nss.spec @@ -1,5 +1,5 @@ # -# spec file for package mozilla-nss (Version 3.12.3.1) +# spec file for package mozilla-nss (Version 3.12.3.99) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2009 Wolfgang Rosenauer @@ -28,7 +28,7 @@ BuildRequires: sqlite-devel BuildRequires: sqlite3-devel %endif License: GPL v2 or later ; LGPL v2.1 or later ; MPL -Version: 3.12.3.1 +Version: 3.12.3.99 Release: 1 # bug437293 %ifarch ppc64 @@ -43,16 +43,11 @@ Source: nss-%{version}.tar.bz2 Source1: nss.pc.in Source2: addon-certs.txt Source3: nss-config.in -Source4: PayPalEE.cert -Source5: PayPalICA.cert Patch1: nss-opt.patch Patch2: nss-sqlitename.patch Patch3: system-nspr.patch Patch4: char.patch Patch5: nss-no-rpath.patch -Patch6: nss-noexec.patch -Patch7: bmo488646-oscp-test.patch -Patch8: bmo485145-libjar.patch.bz2 Patch9: malloc.patch # Remove remnant traces from the package split. Provides: libnss3 = %{version}-%{release} @@ -63,7 +58,7 @@ PreReq: libfreebl3 >= %{version} Requires(post): coreutils BuildRoot: %{_tmppath}/%{name}-%{version}-build %define nssdbdir %{_sysconfdir}/pki/nssdb -%define run_testsuite 0 +%define run_testsuite 1 %description Network Security Services (NSS) is a set of libraries designed to @@ -133,7 +128,6 @@ certificates, and other security standards. This package installs the freebl library from NSS. - Authors: -------- Mozilla Foundation @@ -146,9 +140,6 @@ cd mozilla %patch3 %patch4 %patch5 -%patch6 -%patch7 -%patch8 %if %suse_version > 1110 %patch9 %endif @@ -180,8 +171,6 @@ export DOMSUF=" " export USE_IP=TRUE export IP_ADDRESS="127.0.0.1" cd tests -# fix testsuite's certs -cp %{SOURCE4} %{SOURCE5} libpkix/certs/ ./all.sh if grep "FAILED" ../../../tests_results/security/localhost.1/output.log ; then echo "Testsuite FAILED" diff --git a/nss-3.12.3.1.tar.bz2 b/nss-3.12.3.1.tar.bz2 deleted file mode 100644 index cfd39ee..0000000 --- a/nss-3.12.3.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c491fdab1d8b99988cc17ac7f977e21564b7c2cb3cde79a2826f6358fda41dd -size 4101271 diff --git a/nss-3.12.3.99.tar.bz2 b/nss-3.12.3.99.tar.bz2 new file mode 100644 index 0000000..7ccb200 --- /dev/null +++ b/nss-3.12.3.99.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c150079100cddc15f4361cf838613a9b902bbd8b77ac56d0c4a7a1ccb18c2b2 +size 4126948 diff --git a/nss-no-rpath.patch b/nss-no-rpath.patch index 3ab7a8c..51827e1 100644 --- a/nss-no-rpath.patch +++ b/nss-no-rpath.patch @@ -1,25 +1,19 @@ Index: security/nss/cmd/platlibs.mk =================================================================== RCS file: /cvsroot/mozilla/security/nss/cmd/platlibs.mk,v -retrieving revision 1.55 -diff -u -p -6 -r1.55 platlibs.mk ---- security/nss/cmd/platlibs.mk 12 Oct 2007 01:44:40 -0000 1.55 -+++ security/nss/cmd/platlibs.mk 22 Jan 2008 09:18:05 -0000 -@@ -49,15 +49,15 @@ else - EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib' - endif - endif - +retrieving revision 1.64 +diff -u -r1.64 platlibs.mk +--- security/nss/cmd/platlibs.mk 17 Jun 2009 23:01:48 -0000 1.64 ++++ security/nss/cmd/platlibs.mk 31 Jul 2009 08:04:09 -0000 +@@ -53,9 +53,9 @@ ifeq ($(OS_ARCH), Linux) + ifeq ($(BUILD_SUN_PKG), 1) ifeq ($(USE_64), 1) --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:/opt/sun/private/lib64:$$ORIGIN/../lib' else --EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' -+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' +-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' ++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib:/opt/sun/private/lib' endif - endif - - ifeq ($(OS_ARCH), HP-UX) - ifeq ($(OS_TEST), ia64) - EXTRA_SHARED_LIBS += -Wl,+b,'$$ORIGIN/../lib' + else + ifeq ($(USE_64), 1) diff --git a/nss-noexec.patch b/nss-noexec.patch deleted file mode 100644 index 9bbf50d..0000000 --- a/nss-noexec.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: mozilla/security/coreconf/Linux.mk -=================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v -retrieving revision 1.35 -diff -u -8 -r1.35 Linux.mk ---- security/coreconf/Linux.mk 5 Sep 2008 23:17:23 -0000 1.35 -+++ security/coreconf/Linux.mk 3 Apr 2009 03:17:22 -0000 -@@ -172,16 +172,17 @@ - endif - - ARCH = linux - - DSO_CFLAGS = -fPIC - DSO_LDOPTS = -shared $(ARCHFLAG) -Wl,-z,defs - DSO_LDFLAGS = - LDFLAGS += $(ARCHFLAG) -+ASFLAGS += -Wa,--noexecstack - - # INCLUDES += -I/usr/include -Y/usr/include/linux - G++INCLUDES = -I/usr/include/g++ - - # - # Always set CPU_TAG on Linux, OpenVMS, WINCE. - # - CPU_TAG = _$(CPU_ARCH) diff --git a/nss-opt.patch b/nss-opt.patch index ae144e1..91e66e1 100644 --- a/nss-opt.patch +++ b/nss-opt.patch @@ -1,14 +1,11 @@ Index: security/coreconf/Linux.mk =================================================================== RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v -retrieving revision 1.31 -diff -u -p -6 -r1.31 Linux.mk ---- security/coreconf/Linux.mk 22 Nov 2007 04:39:56 -0000 1.31 -+++ security/coreconf/Linux.mk 22 Jan 2008 08:30:06 -0000 -@@ -145,17 +145,13 @@ ifeq ($(OS_RELEASE),2.0) - endif - PROCESS_MAP_FILE = grep -v ';-' $< | \ - sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ +retrieving revision 1.41 +diff -u -r1.41 Linux.mk +--- security/coreconf/Linux.mk 29 Jul 2009 23:43:41 -0000 1.41 ++++ security/coreconf/Linux.mk 31 Jul 2009 08:02:50 -0000 +@@ -119,11 +119,7 @@ endif ifdef BUILD_OPT @@ -18,9 +15,6 @@ diff -u -p -6 -r1.31 Linux.mk - OPTIMIZER = -O2 -endif + OPTIMIZER = $(OPT_FLAGS) + ifdef MOZ_DEBUG_SYMBOLS + OPTIMIZER += -gstabs+ endif - - ifeq ($(USE_PTHREADS),1) - OS_PTHREAD = -lpthread - endif -