This commit is contained in:
parent
95ca1e6e57
commit
db89391454
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 16:50:31 CST 2007 - maw@suse.de
|
||||
|
||||
- Update to version 4.6.5
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 7 07:18:56 CET 2007 - wr@rosenauer.org
|
||||
|
||||
- fixed crasher in PL_strcaserstr() (strcstr.patch) (bmo #369467)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 31 18:37:50 CET 2007 - maw@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package mozilla-nspr (Version 4.6.3)
|
||||
# spec file for package mozilla-nspr (Version 4.6.5)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -13,13 +13,14 @@
|
||||
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.3
|
||||
Release: 14
|
||||
Version: 4.6.5
|
||||
Release: 1
|
||||
Summary: Netscape Portable Runtime
|
||||
URL: http://www.mozilla.org/projects/nspr/
|
||||
Group: System/Libraries
|
||||
Source: nspr-%{version}.tar.bz2
|
||||
Patch1: prdtoa.patch
|
||||
Patch2: strcstr.patch
|
||||
Patch3: pkgconfig.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
@ -56,11 +57,12 @@ Authors:
|
||||
%setup -n nspr-%{version} -q
|
||||
cd mozilla
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3 -p2
|
||||
|
||||
%build
|
||||
cd mozilla/nsprpub
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -g -fno-strict-aliasing"
|
||||
./configure --enable-optimize="$CFLAGS" \
|
||||
--disable-debug \
|
||||
%ifarch x86_64
|
||||
@ -100,7 +102,11 @@ chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h
|
||||
%exclude %{_includedir}/nspr4/md/*.h
|
||||
%{_libdir}/nspr/
|
||||
|
||||
%changelog -n mozilla-nspr
|
||||
%changelog
|
||||
* Wed Feb 21 2007 - maw@suse.de
|
||||
- Update to version 4.6.5
|
||||
* Wed Feb 07 2007 - wr@rosenauer.org
|
||||
- fixed crasher in PL_strcaserstr() (strcstr.patch) (bmo #369467)
|
||||
* Wed Jan 31 2007 - maw@suse.de
|
||||
- Don't install %%{_includedir}/nspr4/prvrsion.h with the executable
|
||||
bit set.
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1b1a012cec28b4dccb49667e13659f5fa14a476e6808bb6a49e0b5143f98d4e9
|
||||
size 980883
|
3
nspr-4.6.5.tar.bz2
Normal file
3
nspr-4.6.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:aae3ec26306ea8fd1e0ec9f317ebd8312d0f2ad8ad783ee3e6b1e861916e3ed6
|
||||
size 981895
|
21
strcstr.patch
Normal file
21
strcstr.patch
Normal file
@ -0,0 +1,21 @@
|
||||
Index: nsprpub/lib/libc/src/strcstr.c
|
||||
===================================================================
|
||||
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;
|
||||
|
||||
if( ((const char *)0 == big) || ((const char *)0 == little) ) return (char *)0;
|
||||
if( ((char)0 == *big) || ((char)0 == *little) ) return (char *)0;
|
||||
|
||||
ll = PL_strlen(little);
|
||||
+ if(PL_strlen(big) < ll) return (char *)0;
|
||||
p = &big[ PL_strlen(big) - ll ];
|
||||
if( p < big ) return (char *)0;
|
||||
|
||||
for( ; p >= big; p-- )
|
||||
/* obvious improvement available here */
|
||||
if( 0 == PL_strncasecmp(p, little, ll) )
|
Loading…
x
Reference in New Issue
Block a user