rpms/nss
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 3.12.8 and resolve bugs 636787, 636787, 636801

Browse Source 
nss.spec prevents disabling of nss-sysinit on package upgrade - #636787
setup-nsssysinit.shc creates pkcs11.txt with correct permissions regardless of umask - #636792
setup-nsssysinit.sh reports whether nss-sysinit is turned on or off - #636801
This commit is contained in:
Elio Maldonado 2010-09-23 17:45:52 -07:00
parent 958c0f4fd5
commit 1e21f59c8c
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
nss-3.12.7.99.4-stripped.tar.bz2 nss-3.12.8-stripped.tar.bz2
nss-pem-20100809.tar.bz2 nss-pem-20100809.tar.bz2
blank-cert8.db blank-cert8.db
blank-key3.db blank-key3.db

10
nss.spec
View File

@ -5,7 +5,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.12.7.99.4 Version: 3.12.8
Release: 1%{?dist} Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
@ -375,7 +375,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_bindir}/setup-nsssysinit.sh on %{_bindir}/setup-nsssysinit.sh on
%preun sysinit %preun sysinit
%{_bindir}/setup-nsssysinit.sh off
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -489,6 +489,12 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_libdir}/libnssckfw.a %{_libdir}/libnssckfw.a
%changelog %changelog
* Thu Sep 23 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-1
- Update to 3.12.8
- Prevent disabling of nss-sysinit on package upgrade (#636787)
- Create pkcs11.txt with correct permissions regardless of umask (#636792)
- Setup-nsssysinit.sh reports whether nss-sysinit is turned on or off (#636801)
* Sat Sep 18 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7.99.4-1 * Sat Sep 18 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7.99.4-1
- NSS 3.12.8 RC0 - NSS 3.12.8 RC0

24
setup-nsssysinit.sh
View File

@ -1,18 +1,18 @@
#!/bin/sh #!/bin/sh
# #
# Turns on or off the nss-sysinit module db by editing the # Turns on or off the nss-sysinit module db by editing the
# global PKCS #11 congiguration file. # global PKCS #11 congiguration file. Displays the status.
# #
# This script can be invoked by the user as super user. # This script can be invoked by the user as super user.
# It is invoked at nss-sysinit post install time with argument on # It is invoked at nss-sysinit post install time with argument on.
# and at nss-sysinit pre uninstall with argument off.
# #
usage() usage()
{ {
cat <<EOF cat <<EOF
Usage: setup-nsssysinit [on|off] Usage: setup-nsssysinit [on|off]
on - turns on nsssysinit on - turns on nsssysinit
off - turns off nsssysinit off - turns off nsssysinit
status - reports whether nsssysinit is turned on or off
EOF EOF
exit $1 exit $1
} }
@ -33,22 +33,30 @@ fi
on="1" on="1"
case "$1" in case "$1" in
on | ON ) on | ON )
if [ `grep '^library=libnsssysinit' ${p11conf}` ]; then
exit 0
fi
umask 022
cat ${p11conf} | \ cat ${p11conf} | \
sed -e 's/^library=$/library=libnsssysinit.so/' \ sed -e 's/^library=$/library=libnsssysinit.so/' \
-e '/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/' > \ -e '/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/' > \
${p11conf}.on ${p11conf}.on
mv ${p11conf}.on ${p11conf} mv ${p11conf}.on ${p11conf}
;; ;;
off | OFF ) off | OFF )
if [ ! `grep "^library=libnsssysinit" ${p11conf}` ]; then if [ ! `grep "^library=libnsssysinit" ${p11conf}` ]; then
exit 0 exit 0
fi fi
umask 022
cat ${p11conf} | \ cat ${p11conf} | \
sed -e 's/^library=libnsssysinit.so/library=/' \ sed -e 's/^library=libnsssysinit.so/library=/' \
-e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \ -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \
${p11conf}.off ${p11conf}.off
mv ${p11conf}.off ${p11conf} mv ${p11conf}.off ${p11conf}
;; ;;
status )
grep -q '^library=libnsssysinit' ${p11conf} && echo 'ON' || echo OFF
;;
* ) * )
usage 1 1>&2 usage 1 1>&2
;; ;;

2
sources
View File

@ -1,4 +1,4 @@
bb9c620f1a33a5f3ce13fe0199909646 nss-3.12.7.99.4-stripped.tar.bz2 248bc97cb3fd613b23d66fd1d9d8d60a nss-3.12.8-stripped.tar.bz2
765fa031d5affa91ab824dd981777ddf nss-pem-20100809.tar.bz2 765fa031d5affa91ab824dd981777ddf nss-pem-20100809.tar.bz2
a5ae49867124ac75f029a9a33af31bad blank-cert8.db a5ae49867124ac75f029a9a33af31bad blank-cert8.db
9315689bbd9f28ceebd47894f99fccbd blank-key3.db 9315689bbd9f28ceebd47894f99fccbd blank-key3.db