Revision: 46140
Author: river
Date: 2009-01-24 14:18:01 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
TSpcre: bump to 7.8
TScurl: bump to 7.19.3
TSphp: add %defattr for TSphp-root files
Modified Paths:
--------------
trunk/tools/ts-specs/TScurl.spec
trunk/tools/ts-specs/TSpcre.spec
trunk/tools/ts-specs/TSphp.spec
trunk/tools/ts-specs/base-specs/curl.spec
trunk/tools/ts-specs/base-specs/pcre.spec
Removed Paths:
-------------
trunk/tools/ts-specs/patches/pcre-01-cve-2008-2371
Modified: trunk/tools/ts-specs/TScurl.spec
===================================================================
--- trunk/tools/ts-specs/TScurl.spec 2009-01-24 13:33:21 UTC (rev 46139)
+++ trunk/tools/ts-specs/TScurl.spec 2009-01-24 14:18:01 UTC (rev 46140)
@@ -9,7 +9,7 @@
Name: TScurl
Summary: curl - Get a file from FTP or HTTP server.
-Version: 7.19.0
+Version: 7.19.3
URL: http://curl.haxx.se/
Source: http://curl.haxx.se/download/curl-%{version}.tar.bz2
SUNW_BaseDir: %{_basedir}
Modified: trunk/tools/ts-specs/TSpcre.spec
===================================================================
--- trunk/tools/ts-specs/TSpcre.spec 2009-01-24 13:33:21 UTC (rev 46139)
+++ trunk/tools/ts-specs/TSpcre.spec 2009-01-24 14:18:01 UTC (rev 46140)
@@ -9,7 +9,7 @@
%use pcre = pcre.spec
%define src_name pcre
-%define src_version 7.7
+%define src_version 7.8
%define pkg_release 1
SUNW_BaseDir: %{_basedir}
@@ -20,7 +20,6 @@
Release: %{pkg_release}
License: BSD
Source: %{sf_download}/pcre/%{src_name}-%{version}.tar.gz
-Patch1: pcre-01-cve-2008-2371
BuildRoot: %{_tmppath}/%{src_name}-%{version}-build
Conflicts: SUNWpcre
%include default-depend.inc
Modified: trunk/tools/ts-specs/TSphp.spec
===================================================================
--- trunk/tools/ts-specs/TSphp.spec 2009-01-24 13:33:21 UTC (rev 46139)
+++ trunk/tools/ts-specs/TSphp.spec 2009-01-24 14:18:01 UTC (rev 46140)
@@ -90,6 +90,7 @@
%{_prefix}/include/*
%files root
+%defattr (-, root, bin)
%dir %attr (0755, root, sys) /etc
%dir %attr (0755, root, sys) /etc/opt
%dir %attr (0755, root, sys) /etc/opt/php
Modified: trunk/tools/ts-specs/base-specs/curl.spec
===================================================================
--- trunk/tools/ts-specs/base-specs/curl.spec 2009-01-24 13:33:21 UTC (rev
46139)
+++ trunk/tools/ts-specs/base-specs/curl.spec 2009-01-24 14:18:01 UTC (rev
46140)
@@ -5,7 +5,7 @@
#
Name: TScurl
Summary: curl - Get a file from FTP or HTTP server.
-Version: 7.19.0
+Version: 7.19.3
URL: http://curl.haxx.se/
Source: http://curl.haxx.se/download/curl-%{version}.tar.bz2
SUNW_BaseDir: %{_basedir}
Modified: trunk/tools/ts-specs/base-specs/pcre.spec
===================================================================
--- trunk/tools/ts-specs/base-specs/pcre.spec 2009-01-24 13:33:21 UTC (rev
46139)
+++ trunk/tools/ts-specs/base-specs/pcre.spec 2009-01-24 14:18:01 UTC (rev
46140)
@@ -1,7 +1,6 @@
Name: TSpcre
-Version: 7.7
+Version: 7.8
Source: %{sf_download}/pcre/pcre-%{version}.tar.gz
-Patch1: pcre-01-cve-2008-2371
%prep
%setup -q -n %{src_name}-%{version}
@@ -13,8 +12,6 @@
./configure --prefix=%{_prefix} --libdir=%{_libdir} --bindir=%{_bindir}
-%patch1 -p0
-
%build
CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
if test "x$CPUS" = "x" -o $CPUS = 0; then
@@ -30,34 +27,3 @@
%clean
rm -rf $RPM_BUILD_ROOT
-
-#%files
-#%defattr(-,root,bin)
-#%dir %attr (0755, root, bin) %{_libdir}
-#%{_libdir}/*.so.*
-
-#%files devel
-#%defattr(-,root,bin)
-#%dir %attr (0755, root, sys) %{_datadir}
-#%{_datadir}/man
-#%dir %attr (0755, root, other) %{_datadir}/doc
-#%{_datadir}/doc/*
-
-#%dir %attr (0755, root, bin) %{_includedir}
-#%{_includedir}/*
-#%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-#%{_libdir}/pkgconfig/*
-#%dir %attr (0755, root, bin) %{_libdir}
-#%{_libdir}/*.so
-#%dir %attr (0755, root, bin) %{_bindir}
-#%{_bindir}/*
-
-#%changelog
-#* Sun Jul 6 2008 - [email protected]
-#- modified for toolserver
-#* Fri Jan 11 2008 - [email protected]
-#- Add conflict with SUNWpcre, remove -i386 from package name
-#* Mon Oct 29 2007 - [email protected]
-#- Bump to 7.4 and fix Source URL.
-#* 2007.Aug.11 - <shivakumar dot gn at gmail dot com>
-##- Initial spec.
Deleted: trunk/tools/ts-specs/patches/pcre-01-cve-2008-2371
===================================================================
--- trunk/tools/ts-specs/patches/pcre-01-cve-2008-2371 2009-01-24 13:33:21 UTC
(rev 46139)
+++ trunk/tools/ts-specs/patches/pcre-01-cve-2008-2371 2009-01-24 14:18:01 UTC
(rev 46140)
@@ -1,11 +0,0 @@
---- pcre_compile.c.old Sun Jul 6 14:43:28 2008
-+++ pcre_compile.c Sun Jul 6 14:44:18 2008
-@@ -4931,7 +4931,7 @@
- (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
- {
- cd->external_options = newoptions;
-- options = newoptions;
-+ options = *optionsptr = newoptions;
- }
- else
- {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
