OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Sep-2006 21:32:33
Branch: OPENPKG_2_STABLE Handle: 2006092020323300
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/perl-www perl-www.patch perl-www.spec
Log:
MFC: all recent fixes and updates
Summary:
Revision Changes Path
1.14.2.1 +11 -2 openpkg-src/perl-www/perl-www.patch
1.297.2.3 +20 -8 openpkg-src/perl-www/perl-www.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.patch
============================================================================
$ cvs diff -u -r1.14 -r1.14.2.1 perl-www.patch
--- openpkg-src/perl-www/perl-www.patch 8 Apr 2006 18:04:09 -0000
1.14
+++ openpkg-src/perl-www/perl-www.patch 20 Sep 2006 19:32:33 -0000
1.14.2.1
@@ -1,6 +1,6 @@
Index: Embperl-2.2.0/Makefile.PL
--- Embperl-2.2.0/Makefile.PL.orig 2005-10-26 08:44:21 +0200
-+++ Embperl-2.2.0/Makefile.PL 2005-11-15 08:12:18 +0100
++++ Embperl-2.2.0/Makefile.PL 2006-08-18 13:51:54 +0200
@@ -621,7 +621,7 @@
$base = $ENV{'ProgramFiles'} if ($win32) ;
@@ -10,9 +10,18 @@
if ($apache && $apache_src ne '')
{
+@@ -1330,7 +1330,7 @@
+ 'LIBS' => [$libs || ''],
+ 'DEFINE' => "$d \$(DEFS)",
+ 'INC' => $i,
+- 'EXE_FILES' => [ 'embpexec.pl', 'embpmsgid.pl' ],
++ 'EXE_FILES' => [ 'embpexec.pl', 'embpmsgid.pl', 'embpcgi.pl' ],
+ 'clean' => { FILES => 'dirent.h test/conf/httpd.conf
test/conf/httpd.stop.conf test/conf/httpd.min.conf test/tmp/* Embperl.c
$(OBJECT)' },
+ 'realclean' => { FILES => 'embpmsgid.pl embpexec.pl embpexec.bat
embpcgi.pl embpcgi.test.pl embpcgi.bat epocgi.pl epocgi.bat epocgi.test.pl
embpfastcgi.pl embpfastcgi.test.pl test/conf/config.pl xs/mmargs.pl' },
+ 'dist' => { COMPRESS => 'gzip', SUFFIX => 'gz'},
Index: Embperl-2.2.0/driver/epxalan.MAKEPL
--- Embperl-2.2.0/driver/epxalan.MAKEPL.orig 2005-10-26 00:16:36 +0200
-+++ Embperl-2.2.0/driver/epxalan.MAKEPL 2005-11-15 08:12:18 +0100
++++ Embperl-2.2.0/driver/epxalan.MAKEPL 2006-08-18 13:51:33 +0200
@@ -8,7 +8,7 @@
if (!$win32)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-www/perl-www.spec
============================================================================
$ cvs diff -u -r1.297.2.2 -r1.297.2.3 perl-www.spec
--- openpkg-src/perl-www/perl-www.spec 1 Aug 2006 07:49:48 -0000
1.297.2.2
+++ openpkg-src/perl-www/perl-www.spec 20 Sep 2006 19:32:33 -0000
1.297.2.3
@@ -27,7 +27,7 @@
%define V_libwww_perl 5.805
%define V_uri 1.35
%define V_uri_fetch 0.08
-%define V_cgi 3.20
+%define V_cgi 3.23
%define V_cgi_untaint 1.26
%define V_cgi_auth 3.00
%define V_cgi_simple 0.077
@@ -50,7 +50,7 @@
%define V_cgi_session_sqlite 1.0
%define V_cgi_session_id_uuid 0.03
%define V_cgi_paramcomposite 0.02
-%define V_cgi_gurumeditation 1.00
+%define V_cgi_gurumeditation 1.10
%define V_cgi_builder 1.36
%define V_cgi_builder_session 1.26
%define V_cgi_builder_htmltmpl 1.21
@@ -58,11 +58,11 @@
%define V_cgi_ajax 0.697
%define V_fcgi 0.67
%define V_rpc_xml 0.59
-%define V_soap_lite 0.68
+%define V_soap_lite 0.69
%define V_soap_lite_smartproxy 0.11
%define V_soap_payload 1.02
%define V_net_google 1.0.1
-%define V_www_mechanize 1.18
+%define V_www_mechanize 1.20
%define V_www_mechanize_cached 1.32
%define V_www_mechanize_formfi 0.05
%define V_www_mechanize_shell 0.36
@@ -73,10 +73,10 @@
%define V_www_search_yahoo 2.405
%define V_www_search_lycos 2.221
%define V_www_search_alltheweb 1.5
-%define V_www_opensearch 0.05
+%define V_www_opensearch 0.08
%define V_www_wikipedia 1.9
%define V_http_daemon_ssl 1.02
-%define V_http_proxy 0.19
+%define V_http_proxy 0.20
%define V_http_request_params 1.01
%define V_http_recorder 0.05
%define V_wddx 1.02
@@ -95,7 +95,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 2.20060801
+Release: 2.20060920
# list of sources
Source0: http://www.cpan.org/modules/by-module/URI/URI-%{V_uri}.tar.gz
@@ -513,9 +513,13 @@
%setup -q -T -D -a 31
%setup -q -T -D -a 32
%setup -q -T -D -a 33
+ ( # FIXME: ugly workaround for partially broken tarballs
%setup -q -T -D -a 34
+ ) || true
%setup -q -T -D -a 35
+ ( # FIXME: ugly workaround for partially broken tarballs
%setup -q -T -D -a 36
+ ) || true
%setup -q -T -D -a 37
%setup -q -T -D -a 38
%setup -q -T -D -a 39
@@ -606,9 +610,17 @@
# cleanup installation
( cd $RPM_BUILD_ROOT%{l_prefix}/bin
for prog in *.pl; do
- mv $prog `echo $prog | sed -e 's;\.pl$;;'`
+ base=`echo $prog | sed -e 's;\.pl$;;'`
+ %{l_shtool} install -c -m 755 \
+ -e 's;^#!/.*;#!%{l_prefix}/bin/perl;' \
+ $prog $base
+ rm -f $prog
done
) || exit $?
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi
+ mv $RPM_BUILD_ROOT%{l_prefix}/bin/embpcgi \
+ $RPM_BUILD_ROOT%{l_prefix}/cgi/embpcgi
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat
perl-openpkg-files`
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
