update to 3.34.1 [release 3.34.1-1mamba;Sun Dec 17 2017]

libnss.spec

@@ -1,10 +1,12 @@
-%define        srcver                        %(echo %version | tr . _)
+%define        srcver %(echo %version | tr . _)
-#%define        nspr_version                  %(rpm -q --queryformat '%{VERSION}' libnspr)
+%define        ver1 %(echo %version | cut -d. -f1)
+%define        ver2 %(echo %version | cut -d. -f2)
+%define        ver3 %(echo %version | cut -d. -f3)
 %define        nspr_version                  %(%{_bindir}/nspr-config --version)
 %define        with_test   0
-%define        with_nsspem 1
+%define        with_nsspem 0
 Name:          libnss
-Version:       3.27.2
+Version:       3.34.1
 Release:       1mamba
 Summary:       Network Security Services
 Group:         System/Libraries
@@ -25,15 +27,15 @@ Source9:       setup-nsssysinit.sh
 # from fedora
 # git clone https://git.fedorahosted.org/git/nss-pem.git
 # tar cjf ../SOURCES/libnss-pem-20140218.tar.bz2 nss-pem/
-%if %with_nsspem
+#%if %with_nsspem
-#Source10:      libnss-pem-20140218.tar.bz2
+#Source10:      https://git.fedorahosted.org/git/nss-pem.git/master/nss-pem-%{version}.tar.bz2
-Source10:      https://git.fedorahosted.org/git/nss-pem.git/master/nss-pem-%{version}.tar.bz2
+#%endif
-%endif
 Patch4:        libnss-3.12.9-enable-pem.patch
 Patch10:       libnss-3.15.1-opt_flags.patch
 Patch15:       libnss-3.27.1-standalone-1.patch
 License:       GPL, MPL 1.1, LGPL
 ## AUTOBUILDREQ-BEGIN
+BuildRequires: glibc-devel
 BuildRequires: libgcc
 BuildRequires: libnspr-devel
 BuildRequires: libsqlite-devel
@@ -105,11 +107,11 @@ mv nss-pem-%{version}/nss/lib/ckfw/pem/ nss/lib/ckfw/
 %patch4 -p3
 %endif
 %patch10 -p0
-%patch15 -p1
+#%patch15 -p1
 
-%ifarch x86_64
+#%ifarch x86_64
-sed -i "s|/lib,|/lib64,|" nss/config/Makefile
+#sed -i "s|/lib,|/lib64,|" nss/config/Makefile
-%endif
+#%endif
 
 %build
 #:<< __EOF
@@ -137,50 +139,31 @@ export OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 #make -C ./nss/coreconf
 #make -C ./nss/lib/dbm
 #make -C ./nss CORE_DEPTH=`pwd`/nss
-#
-#cat %{SOURCE1} | sed -e "s,%%libdir%%,%{_libdir},g" \
-#                 -e "s,%%prefix%%,%{_prefix},g" \
-#                 -e "s,%%exec_prefix%%,%{_prefix},g" \
-#                 -e "s,%%includedir%%,%{_includedir}/nss3,g" \
-#                 -e "s,%%NSPR_VERSION%%,%{nspr_version},g" \
-#                 -e "s,%%NSS_VERSION%%,%{version},g" > custom_nss.pc
-#
-#%define majver %(echo %version | cut -d. -f1)
-#%define minver %(echo %version | cut -d. -f2)
-#%define patchver %(echo %version | cut -d. -f3)
-#
-#NSS_VMAJOR=%majver
-#NSS_VMINOR=%minver
-#NSS_VPATCH=%patchver
-#cat %{SOURCE2} | sed -e "s,@libdir@,%{_libdir},g" \
-#                 -e "s,@prefix@,%{_prefix},g" \
-#                 -e "s,@exec_prefix@,%{_prefix},g" \
-#                 -e "s,@includedir@,%{_includedir}/nss3,g" \
-#                 -e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
-#                 -e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
-#                 -e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" > custom_nss-config
-#
-#cat %{SOURCE9} > setup-nsssysinit.sh
-#
-#% if %with_test
-#export BUILD_OPT=1
-#export HOST="localhost"
-#export DOMSUF=" "
-#export USE_IP=TRUE
-#export IP_ADDRESS="127.0.0.1"
-#cd nss/tests
-#./all.sh
-##TEST_FAILURES=`grep -c FAILED ../../../tests_results/security/localhost.1/output.log` || :
-##if [ $TEST_FAILURES -ne 0 ]; then
-##  echo "error: test suite returned failure(s)"
-##  exit 1
-##fi
-#% endif
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
-install -D -m644 dist/Linux*/lib/pkgconfig/nss.pc %{buildroot}%{_libdir}/pkgconfig/nss.pc
+sed nss/pkg/pkg-config/nss.pc.in \
+    -e "s,%libdir%,%{_libdir},g" \
+    -e "s,%prefix%,%{_prefix},g" \
+    -e "s,%exec_prefix%,%{_bindir},g" \
+    -e "s,%includedir%,%{_includedir}/nss,g" \
+    -e "s,%NSPR_VERSION%,%{nspr_version},g" \
+    -e "s,%NSS_VERSION%,%{version},g" |
+    install -Dm644 /dev/stdin %{buildroot}%{_libdir}/pkgconfig/nss.pc
+ln -s nss.pc %{buildroot}%{_libdir}/pkgconfig/mozilla-nss.pc
+
+sed nss/pkg/pkg-config/nss-config.in \
+    -e "s,%libdir%,%{_libdir},g" \
+    -e "s,%prefix%,%{_prefix},g" \
+    -e "s,%exec_prefix%,%{_bindir},g" \
+    -e "s,%includedir%,%{_includedir}/nss,g" \
+    -e "s,@MOD_MAJOR_VERSION@,%{ver1},g" \
+    -e "s,@MOD_MINOR_VERSION@,%{ver2},g" \
+    -e "s,@MOD_PATCH_VERSION@,%{ver3},g" |
+    install -D /dev/stdin %{buildroot}%{_bindir}/nss-config
+
+#install -D -m644 dist/Linux*/lib/pkgconfig/nss.pc %{buildroot}%{_libdir}/pkgconfig/nss.pc
 #install -D -m 644 custom_nss.pc %{buildroot}%{_libdir}/pkgconfig/nss.pc
 #install -D -m 755 custom_nss-config %{buildroot}%{_bindir}/nss-config
 
@@ -216,7 +199,7 @@ for file in libcrmf.a libnssb.a libnssckfw.a; do
 done
 
 # copy the binaries we want
-for file in certutil cmsutil crlutil modutil nss-config pk12util signtool signver ssltap; do
+for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap; do
    install -m 755 dist/*.OBJ/bin/$file %{buildroot}%{_bindir}
 done
 
@@ -251,6 +234,7 @@ ln -s nss3 %{buildroot}%{_includedir}/nss
 %{_libdir}/libfreeblpriv3.chk
 %{_libdir}/libfreeblpriv3.so
 %{_libdir}/libgtest1.so
+%{_libdir}/libgtestutil.so
 %{_libdir}/libnss3.so
 %{_libdir}/libnssckbi.so
 %{_libdir}/libnssdbm3.so
@@ -264,29 +248,6 @@ ln -s nss3 %{buildroot}%{_includedir}/nss
 %if %with_nsspem
 %{_libdir}/libnsspem.so
 %endif
-#%dir %{_sysconfdir}/pki/nssdb
-#%config(noreplace) %{_sysconfdir}/pki/nssdb/cert8.db
-#%config(noreplace) %{_sysconfdir}/pki/nssdb/key3.db
-#%config(noreplace) %{_sysconfdir}/pki/nssdb/secmod.db
-
-
-#%post sysinit
-#/sbin/ldconfig
-#%{_sbindir}/setup-nsssysinit.sh on
-
-#%preun sysinit
-#if [ $1 = 0 ]; then
-#  %{_sbindir}/setup-nsssysinit.sh off
-#fi
-
-#%postun sysinit -p /sbin/ldconfig
-
-#%files sysinit
-#%defattr(-,root,root)
-#%{_sbindir}/setup-nsssysinit.sh
-#%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
-#%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
-#%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
 
 %files tools
 %defattr(-,root,root)
@@ -308,11 +269,15 @@ ln -s nss3 %{buildroot}%{_includedir}/nss
 %{_libdir}/libnssb.a
 %{_libdir}/libnssckfw.a
 %{_libdir}/pkgconfig/nss.pc
+%{_libdir}/pkgconfig/mozilla-nss.pc
 %{_includedir}/nss
 %dir %{_includedir}/nss3
 %{_includedir}/nss3/*
 
 %changelog
+* Sun Dec 17 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 3.34.1-1mamba
+- update to 3.34.1
+
 * Tue Dec 06 2016 Automatic Build System <autodist@mambasoft.it> 3.27.2-1mamba
 - automatic version update by autodist