rpms/libnss
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 3.22 [release 3.22-1mamba;Fri Feb 19 2016]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 05:12:54 +01:00
parent 9917c135e1
commit a06981f6e7
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libnss.spec
View File

@ -1,10 +1,10 @@
%define srcver %(echo %version | tr . _)
#%define nspr_version %(rpm -q --queryformat '%{VERSION}' libnspr)
%define nspr_version %(%{_bindir}/nspr-config --version)
%define with_test 1
%define with_test 0
%define with_nsspem 1
Name: libnss
Version: 3.20.1
Version: 3.22
Release: 1mamba
Summary: Network Security Services
Group: System/Libraries
@ -26,7 +26,8 @@ Source9: setup-nsssysinit.sh
# git clone https://git.fedorahosted.org/git/nss-pem.git
# tar cjf ../SOURCES/libnss-pem-20140218.tar.bz2 nss-pem/
%if %with_nsspem
Source10: libnss-pem-20140218.tar.bz2
#Source10: libnss-pem-20140218.tar.bz2
Source10: https://git.fedorahosted.org/git/nss-pem.git/master/nss-pem-%{version}.tar.bz2
%endif
Patch1: libnss-3.12.3-no-rpath.patch
Patch2: libnss-3.12.3-nolocalsql.patch
@ -41,6 +42,7 @@ Patch10: libnss-3.15.1-opt_flags.patch
Patch11: libnss-3.12.9-ipv6-type-connections-bug539183.patch
Patch12: libnss-3.15.4-add-missing-RSA_BlockOAEP.patch
Patch13: libnss-3.15.1-lfs-buildfixes.patch
Patch14: nss-pem-3.22-buildfix.patch
License: GPL, MPL 1.1, LGPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@ -105,8 +107,8 @@ Default Operating System module that manages applications loading NSS globally o
%patch3 -p3
%if %with_nsspem
tar -xf %{SOURCE10}
mv nss-pem/nss/lib/ckfw/pem/ nss/lib/ckfw/
mv nss-pem-%{version}/nss/lib/ckfw/pem/ nss/lib/ckfw/
%patch14 -p0
%patch4 -p3
#%patch5 -p3
%endif
@ -304,6 +306,9 @@ fi
%{_includedir}/nss3/
%changelog
* Fri Feb 19 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.22-1mamba
- update to 3.22
* Wed Nov 04 2015 Automatic Build System <autodist@mambasoft.it> 3.20.1-1mamba
- automatic version update by autodist

22
nss-pem-3.22-buildfix.patch Normal file
View File

@ -0,0 +1,22 @@
--- nss/lib/ckfw/pem/pinst.c.orig 2016-02-19 18:32:43.545902319 +0100
+++ nss/lib/ckfw/pem/pinst.c 2016-02-19 18:32:50.773900029 +0100
@@ -581,7 +581,7 @@
objid = pem_nobjs + 1;
- nickname = getUniquePEMNicknameFromFilename(certfile, i);
+ nickname = getUniquePEMNicknameFromFilename(certfile, 0);
if (!nickname) {
error = CKR_GENERAL_ERROR;
goto loser;
--- nss/lib/ckfw/pem/pinst.c.orig 2016-02-19 18:54:07.225438587 +0100
+++ nss/lib/ckfw/pem/pinst.c 2016-02-19 18:54:37.368427084 +0100
@@ -534,7 +534,7 @@
AddCertificate(char *certfile, char *keyfile, PRBool cacert,
CK_SLOT_ID slotID)
{
- pemInternalObject *o;
+ pemInternalObject *o = NULL;
CK_RV error = 0;
int objid, i;
int nobjs = 0;