OBS User unknown 2007-06-13 22:40:35 +00:00 committed by Git OBS Bridge
parent 9f2088605c
commit f160c4badf
6 changed files with 45 additions and 7 deletions

22
char.patch Normal file
View File

@ -0,0 +1,22 @@
Index: security/nss/cmd/modutil/install-ds.c
===================================================================
RCS file: /cvsroot/mozilla/security/nss/cmd/modutil/install-ds.c,v
retrieving revision 1.2
diff -u -p -6 -r1.2 install-ds.c
--- security/nss/cmd/modutil/install-ds.c 25 Apr 2004 15:02:47 -0000 1.2
+++ security/nss/cmd/modutil/install-ds.c 5 Feb 2007 06:57:38 -0000
@@ -249,13 +249,13 @@ Pk11Install_File_Generate(Pk11Install_Fi
if(!subval || (subval->type != STRING_VALUE)){
errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
_this->jarPath);
goto loser;
}
_this->permissions = (int) strtol(subval->string, &endp, 8);
- if(*endp != '\0' || subval->string == "\0") {
+ if(*endp != '\0' || subval->string[0] == '\0') {
errStr = PR_smprintf(errString[BOGUS_FILE_PERMISSIONS],
_this->jarPath);
goto loser;
}
gotPerms = PR_TRUE;
Pk11Install_ListIter_delete(subiter);

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Jun 11 11:41:27 CEST 2007 - ro@suse.de
- use string[0] instead of string in char.patch
-------------------------------------------------------------------
Mon Jun 11 11:33:34 CEST 2007 - ro@suse.de
- update to NSS 3.11.6 (pull in from wr from opensuse BS)
-------------------------------------------------------------------
Wed Feb 21 16:55:06 CST 2007 - maw@suse.de

View File

@ -1,5 +1,5 @@
#
# spec file for package mozilla-nss (Version 3.11.5)
# spec file for package mozilla-nss (Version 3.11.6)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,8 +13,8 @@
Name: mozilla-nss
BuildRequires: gcc-c++ mozilla-nspr-devel
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Version: 3.11.5
Release: 1
Version: 3.11.6
Release: 2
Summary: Network (Netscape) Security Services
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System/Libraries
@ -25,6 +25,7 @@ Source3: nss-config.in
Patch1: nss-opt.patch
Patch2: uninit.patch
Patch3: system-nspr.patch
Patch4: char.patch
PreReq: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -82,6 +83,7 @@ cd mozilla
%patch1
%patch2
%patch3
%patch4
# additional CA certificates
#cd security/nss/lib/ckfw/builtins
#cat %{SOURCE2} >> certdata.txt
@ -174,6 +176,10 @@ rm -rf $RPM_BUILD_ROOT
%exclude %{_bindir}/nss-config
%changelog
* Mon Jun 11 2007 - ro@suse.de
- use string[0] instead of string in char.patch
* Mon Jun 11 2007 - ro@suse.de
- update to NSS 3.11.6 (pull in from wr from opensuse BS)
* Wed Feb 21 2007 - maw@suse.de
- Update to NSS 3.11.5 (thanks, Wolfgang)
* Sun Oct 01 2006 - wr@rosenauer.org

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15282a082e57596b587f559e1eacf90c24546c88ca2156bf87dabed9546be8dd
size 2895059

3
nss-3.11.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f944050a54c9853c50cf235ac68865e610069b005a20ab343c0d395fc34d033
size 2899252

View File

@ -6,6 +6,6 @@ includedir=${prefix}/include/nss3
Name: NSS
Description: Network Security Services
Version: %VERSION%
Requires: nspr >= 4.6.3
Requires: nspr >= 4.6.6
Libs: -Wl,-rpath-link,${libdir} -L${libdir} -lssl3 -lsmime3 -lnss3
Cflags: -I${includedir}