From be41cbf92b1eb12f62b75f47e5a68101c34797bc914886a15f24115c83ec35ad Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 13 Jun 2007 22:39:59 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nspr?expand=0&rev=4 --- mozilla-nspr.changes | 5 +++++ mozilla-nspr.spec | 8 +++++--- nspr-4.6.5.tar.bz2 | 3 --- nspr-4.6.7.tar.bz2 | 3 +++ strcstr.patch | 23 +++++++++++++++++------ 5 files changed, 30 insertions(+), 12 deletions(-) delete mode 100644 nspr-4.6.5.tar.bz2 create mode 100644 nspr-4.6.7.tar.bz2 diff --git a/mozilla-nspr.changes b/mozilla-nspr.changes index 00fda3d..b6333bd 100644 --- a/mozilla-nspr.changes +++ b/mozilla-nspr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 11 12:11:49 CEST 2007 - ro@suse.de + +- update to NSPR 4.6.7 (pull in from wr from opensuse BS) + ------------------------------------------------------------------- Wed Feb 21 16:50:31 CST 2007 - maw@suse.de diff --git a/mozilla-nspr.spec b/mozilla-nspr.spec index 20feb9c..53e2ccb 100644 --- a/mozilla-nspr.spec +++ b/mozilla-nspr.spec @@ -1,5 +1,5 @@ # -# spec file for package mozilla-nspr (Version 4.6.5) +# spec file for package mozilla-nspr (Version 4.6.7) # # 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-nspr BuildRequires: gcc-c++ License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 4.6.5 -Release: 1 +Version: 4.6.7 +Release: 2 Summary: Netscape Portable Runtime URL: http://www.mozilla.org/projects/nspr/ Group: System/Libraries @@ -103,6 +103,8 @@ chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h %{_libdir}/nspr/ %changelog +* Mon Jun 11 2007 - ro@suse.de +- update to NSPR 4.6.7 (pull in from wr from opensuse BS) * Wed Feb 21 2007 - maw@suse.de - Update to version 4.6.5 * Wed Feb 07 2007 - wr@rosenauer.org diff --git a/nspr-4.6.5.tar.bz2 b/nspr-4.6.5.tar.bz2 deleted file mode 100644 index c78bdd9..0000000 --- a/nspr-4.6.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aae3ec26306ea8fd1e0ec9f317ebd8312d0f2ad8ad783ee3e6b1e861916e3ed6 -size 981895 diff --git a/nspr-4.6.7.tar.bz2 b/nspr-4.6.7.tar.bz2 new file mode 100644 index 0000000..53900a6 --- /dev/null +++ b/nspr-4.6.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:408f5bf4e4d040a1ec79824bb1e5d0316c5afca7705000901956ed3b5c8330a8 +size 982498 diff --git a/strcstr.patch b/strcstr.patch index 20d6eb4..6c572f5 100644 --- a/strcstr.patch +++ b/strcstr.patch @@ -4,18 +4,29 @@ RCS file: /cvsroot/mozilla/nsprpub/lib/libc/src/strcstr.c,v retrieving revision 3.6 diff -u -p -6 -r3.6 strcstr.c --- nsprpub/lib/libc/src/strcstr.c 25 Apr 2004 15:00:36 -0000 3.6 -+++ nsprpub/lib/libc/src/strcstr.c 6 Feb 2007 13:46:30 -0000 -@@ -62,12 +62,13 @@ PL_strcaserstr(const char *big, const ch - PRUint32 ll; ++++ nsprpub/lib/libc/src/strcstr.c 14 Feb 2007 05:57:21 -0000 +@@ -56,20 +56,21 @@ PL_strcasestr(const char *big, const cha + } + + PR_IMPLEMENT(char *) + PL_strcaserstr(const char *big, const char *little) + { + const char *p; +- PRUint32 ll; ++ PRUint32 bl, ll; if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0; if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0; ++ bl = PL_strlen(big); ll = PL_strlen(little); -+ if(PL_strlen(big) < ll) return (char *)0; - p = &big[ PL_strlen(big) - ll ]; - if( p < big ) return (char *)0; +- p = &big[ PL_strlen(big) - ll ]; +- if( p < big ) return (char *)0; ++ if( bl < ll ) return (char *)0; ++ p = &big[ bl - ll ]; for( ; p >= big; p-- ) /* obvious improvement available here */ if( 0 == PL_strncasecmp(p, little, ll) ) + return (char *)p; +