This commit is contained in:
parent
be41cbf92b
commit
638e603027
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 7 18:03:16 CET 2008 - maw@suse.de
|
||||||
|
|
||||||
|
- Merge changes from the build service (thanks, Wolfgang).
|
||||||
|
- Remove strcstr.patch, which has been upstreamed.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Feb 7 15:45:17 CET 2008 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- update to 4.7.0 (requirement for Firefox 3)
|
||||||
|
- added a %clean section
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 22 09:39:59 CET 2007 - wr@rosenauer.org
|
||||||
|
|
||||||
|
- update to version 4.6.8
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 11 12:11:49 CEST 2007 - ro@suse.de
|
Mon Jun 11 12:11:49 CEST 2007 - ro@suse.de
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package mozilla-nspr (Version 4.6.7)
|
# spec file for package mozilla-nspr (Version 4.7.0)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
# package are under the same license as the package itself.
|
# package are under the same license as the package itself.
|
||||||
#
|
#
|
||||||
@ -12,15 +12,14 @@
|
|||||||
|
|
||||||
Name: mozilla-nspr
|
Name: mozilla-nspr
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
|
||||||
Version: 4.6.7
|
Version: 4.7.0
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: Netscape Portable Runtime
|
Summary: Netscape Portable Runtime
|
||||||
URL: http://www.mozilla.org/projects/nspr/
|
Url: http://www.mozilla.org/projects/nspr/
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Source: nspr-%{version}.tar.bz2
|
Source: nspr-%{version}.tar.bz2
|
||||||
Patch1: prdtoa.patch
|
Patch1: prdtoa.patch
|
||||||
Patch2: strcstr.patch
|
|
||||||
Patch3: pkgconfig.patch
|
Patch3: pkgconfig.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
@ -57,7 +56,6 @@ Authors:
|
|||||||
%setup -n nspr-%{version} -q
|
%setup -n nspr-%{version} -q
|
||||||
cd mozilla
|
cd mozilla
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
|
||||||
%patch3 -p2
|
%patch3 -p2
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -86,6 +84,9 @@ cp -rL mozilla/nsprpub/dist/include/nspr/* $RPM_BUILD_ROOT/%{_includedir}/nspr4/
|
|||||||
# #31667
|
# #31667
|
||||||
chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h
|
chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
|
|
||||||
%postun -p /sbin/ldconfig
|
%postun -p /sbin/ldconfig
|
||||||
@ -99,29 +100,37 @@ chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h
|
|||||||
%{_bindir}/nspr-config
|
%{_bindir}/nspr-config
|
||||||
%{_libdir}/pkgconfig/nspr.pc
|
%{_libdir}/pkgconfig/nspr.pc
|
||||||
%{_includedir}/nspr4/
|
%{_includedir}/nspr4/
|
||||||
%exclude %{_includedir}/nspr4/md/*.h
|
%exclude %{_includedir}/nspr4/md/*
|
||||||
%{_libdir}/nspr/
|
%{_libdir}/nspr/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jun 11 2007 - ro@suse.de
|
* Thu Feb 07 2008 maw@suse.de
|
||||||
|
- Merge changes from the build service (thanks, Wolfgang).
|
||||||
|
- Remove strcstr.patch, which has been upstreamed.
|
||||||
|
* Thu Feb 07 2008 wr@rosenauer.org
|
||||||
|
- update to 4.7.0 (requirement for Firefox 3)
|
||||||
|
- added a %%clean section
|
||||||
|
* Thu Nov 22 2007 wr@rosenauer.org
|
||||||
|
- update to version 4.6.8
|
||||||
|
* Mon Jun 11 2007 ro@suse.de
|
||||||
- update to NSPR 4.6.7 (pull in from wr from opensuse BS)
|
- update to NSPR 4.6.7 (pull in from wr from opensuse BS)
|
||||||
* Wed Feb 21 2007 - maw@suse.de
|
* Thu Feb 22 2007 maw@suse.de
|
||||||
- Update to version 4.6.5
|
- Update to version 4.6.5
|
||||||
* Wed Feb 07 2007 - wr@rosenauer.org
|
* Wed Feb 07 2007 wr@rosenauer.org
|
||||||
- fixed crasher in PL_strcaserstr() (strcstr.patch) (bmo #369467)
|
- fixed crasher in PL_strcaserstr() (strcstr.patch) (bmo #369467)
|
||||||
* Wed Jan 31 2007 - maw@suse.de
|
* Wed Jan 31 2007 maw@suse.de
|
||||||
- Don't install %%{_includedir}/nspr4/prvrsion.h with the executable
|
- Don't install %%{_includedir}/nspr4/prvrsion.h with the executable
|
||||||
bit set.
|
bit set.
|
||||||
* Sat Oct 21 2006 - aj@suse.de
|
* Sat Oct 21 2006 aj@suse.de
|
||||||
- from openSUSE BuildService (thanks Wolfgang Rosenauer):
|
- from openSUSE BuildService (thanks Wolfgang Rosenauer):
|
||||||
- update to version 4.6.3: Bug fix release.
|
- update to version 4.6.3: Bug fix release.
|
||||||
* Tue Aug 01 2006 - stark@suse.de
|
* Tue Aug 01 2006 stark@suse.de
|
||||||
- version is still 4.6.2
|
- version is still 4.6.2
|
||||||
* Sat Jul 15 2006 - stark@suse.de
|
* Sat Jul 15 2006 stark@suse.de
|
||||||
- added PR_SI_HOSTNAME_UNTRUNCATED flag to get the hostname as
|
- added PR_SI_HOSTNAME_UNTRUNCATED flag to get the hostname as
|
||||||
FQDN with PR_GetSystemInfo() if configured on a system
|
FQDN with PR_GetSystemInfo() if configured on a system
|
||||||
(bmo #322956)
|
(bmo #322956)
|
||||||
* Mon May 15 2006 - stark@suse.de
|
* Mon May 15 2006 stark@suse.de
|
||||||
- update to 4.6.2 RTM version
|
- update to 4.6.2 RTM version
|
||||||
bugs fixed:
|
bugs fixed:
|
||||||
* PR_ParseTimeString use PR_Assert and it calls abort on
|
* PR_ParseTimeString use PR_Assert and it calls abort on
|
||||||
@ -130,41 +139,41 @@ chmod -x $RPM_BUILD_ROOT/%{_includedir}/nspr4/prvrsion.h
|
|||||||
(bmo #326110)
|
(bmo #326110)
|
||||||
* Add a UTF-16 API to load a library (bmo #326168)
|
* Add a UTF-16 API to load a library (bmo #326168)
|
||||||
* various changes for non-Linux platforms
|
* various changes for non-Linux platforms
|
||||||
* Wed Jan 25 2006 - mls@suse.de
|
* Wed Jan 25 2006 mls@suse.de
|
||||||
- converted neededforbuild to BuildRequires
|
- converted neededforbuild to BuildRequires
|
||||||
* Fri Dec 16 2005 - stark@suse.de
|
* Fri Dec 16 2005 stark@suse.de
|
||||||
- update to final 4.6.1 RTM version
|
- update to final 4.6.1 RTM version
|
||||||
* Wed Dec 07 2005 - stark@suse.de
|
* Wed Dec 07 2005 stark@suse.de
|
||||||
- moved headers to nspr4 sub-directories and removed some
|
- moved headers to nspr4 sub-directories and removed some
|
||||||
unneeded headers
|
unneeded headers
|
||||||
* Fri Nov 25 2005 - stark@suse.de
|
* Fri Nov 25 2005 stark@suse.de
|
||||||
- changed ldconfig call in install-scripts
|
- changed ldconfig call in install-scripts
|
||||||
* Tue Nov 15 2005 - stark@suse.de
|
* Tue Nov 15 2005 stark@suse.de
|
||||||
- current 4.6.1pre (20051114)
|
- current 4.6.1pre (20051114)
|
||||||
* Tue Oct 11 2005 - stark@suse.de
|
* Tue Oct 11 2005 stark@suse.de
|
||||||
- next official release will most likely be 4.6.1 (20051010)
|
- next official release will most likely be 4.6.1 (20051010)
|
||||||
* Mon Sep 26 2005 - mls@suse.de
|
* Mon Sep 26 2005 mls@suse.de
|
||||||
- make devel package require base package
|
- make devel package require base package
|
||||||
* Thu Sep 22 2005 - stark@suse.de
|
* Thu Sep 22 2005 stark@suse.de
|
||||||
- update to 4.7.0pre (20050921)
|
- update to 4.7.0pre (20050921)
|
||||||
* Tue May 31 2005 - stark@suse.de
|
* Tue May 31 2005 stark@suse.de
|
||||||
- update to final 4.6
|
- update to final 4.6
|
||||||
* Thu May 19 2005 - stark@suse.de
|
* Thu May 19 2005 stark@suse.de
|
||||||
- renamed mozilla-nspr.pc to nspr.pc as decided upstream
|
- renamed mozilla-nspr.pc to nspr.pc as decided upstream
|
||||||
- latest snapshots which integrates hidden.patch
|
- latest snapshots which integrates hidden.patch
|
||||||
* Wed May 18 2005 - stark@suse.de
|
* Wed May 18 2005 stark@suse.de
|
||||||
- workaround for gcc bug (bmo #293438, bnc #83908)
|
- workaround for gcc bug (bmo #293438, bnc #83908)
|
||||||
- provide its own pkgconfig file (mozilla-nspr.pc)
|
- provide its own pkgconfig file (mozilla-nspr.pc)
|
||||||
* Tue May 10 2005 - stark@suse.de
|
* Tue May 10 2005 stark@suse.de
|
||||||
- update to current HEAD (upstreamed two patches)
|
- update to current HEAD (upstreamed two patches)
|
||||||
* Tue Apr 26 2005 - stark@suse.de
|
* Tue Apr 26 2005 stark@suse.de
|
||||||
- moved static libs to sub-directory
|
- moved static libs to sub-directory
|
||||||
(almost nobody should link against them statically)
|
(almost nobody should link against them statically)
|
||||||
* Mon Apr 25 2005 - stark@suse.de
|
* Mon Apr 25 2005 stark@suse.de
|
||||||
- fix nspr-config for biarch
|
- fix nspr-config for biarch
|
||||||
* Tue Mar 22 2005 - stark@suse.de
|
* Tue Mar 22 2005 stark@suse.de
|
||||||
- update to HEAD for mozilla compatibility
|
- update to HEAD for mozilla compatibility
|
||||||
* Sat Mar 19 2005 - stark@suse.de
|
* Sat Mar 19 2005 stark@suse.de
|
||||||
- update to 4.5.2beta1
|
- update to 4.5.2beta1
|
||||||
* Tue Mar 08 2005 - stark@suse.de
|
* Tue Mar 08 2005 stark@suse.de
|
||||||
- initial standalone package
|
- initial standalone package
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:408f5bf4e4d040a1ec79824bb1e5d0316c5afca7705000901956ed3b5c8330a8
|
|
||||||
size 982498
|
|
3
nspr-4.7.0.tar.bz2
Normal file
3
nspr-4.7.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:6e8a28b36af79fc0df69de60200c29780f833afb9662053a25e447c32c2d4b28
|
||||||
|
size 978109
|
@ -1,32 +0,0 @@
|
|||||||
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 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);
|
|
||||||
- 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;
|
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user