8
0

Accepting request 34173 from Apache:Modules

Copy from Apache:Modules/apache2-mod_perl based on submit request 34173 from user coolo

OBS-URL: https://build.opensuse.org/request/show/34173
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache2-mod_perl?expand=0&rev=8
This commit is contained in:
OBS User autobuild
2010-03-05 15:31:13 +00:00
committed by Git OBS Bridge
parent 13d8e14b55
commit ccce4d0e21
3 changed files with 39 additions and 187 deletions

View File

@@ -1,6 +1,8 @@
--- t/hooks/authen_basic.t Index: t/hooks/authen_basic.t
+++ t/hooks/authen_basic.t ===================================================================
@@ -4,7 +4,7 @@ --- t/hooks/authen_basic.t.orig 2007-11-12 06:34:00.000000000 +0100
+++ t/hooks/authen_basic.t 2010-03-05 12:38:56.000000000 +0100
@@ -4,7 +4,7 @@ use warnings FATAL => 'all';
use Apache::Test; use Apache::Test;
use Apache::TestRequest; use Apache::TestRequest;
@@ -9,7 +11,7 @@
my $location = "/TestHooks__authen_basic"; my $location = "/TestHooks__authen_basic";
@@ -17,13 +17,13 @@ @@ -17,13 +17,13 @@ sok {
$rc == 401; $rc == 401;
}; };
@@ -30,9 +32,11 @@
--- t/hooks/authz.t Index: t/hooks/authz.t
+++ t/hooks/authz.t ===================================================================
@@ -4,7 +4,7 @@ --- t/hooks/authz.t.orig 2007-11-12 06:34:00.000000000 +0100
+++ t/hooks/authz.t 2010-03-05 12:38:56.000000000 +0100
@@ -4,7 +4,7 @@ use warnings FATAL => 'all';
use Apache::Test; use Apache::Test;
use Apache::TestRequest; use Apache::TestRequest;
@@ -41,7 +45,7 @@
my $location = "/TestHooks__authz"; my $location = "/TestHooks__authz";
@@ -14,8 +14,8 @@ @@ -14,8 +14,8 @@ my $rc = GET_RC $location;
ok $rc == 401; ok $rc == 401;
@@ -52,3 +56,15 @@
+#ok ! GET_OK $location, username => 'jobbob', password => 'whatever'; +#ok ! GET_OK $location, username => 'jobbob', password => 'whatever';
Index: Apache-Test/lib/Apache/TestConfig.pm
===================================================================
--- Apache-Test/lib/Apache/TestConfig.pm.orig 2007-12-31 08:50:45.000000000 +0100
+++ Apache-Test/lib/Apache/TestConfig.pm 2010-03-05 12:39:35.000000000 +0100
@@ -1769,6 +1769,7 @@ sub apxs {
# return an untainted PATH
sub untaint_path {
my $path = shift;
+ return $path unless defined $path;
($path) = ( $path =~ /(.*)/ );
# win32 uses ';' for a path separator, assume others use ':'
my $sep = WIN32 ? ';' : ':';

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 5 12:02:09 UTC 2010 - coolo@novell.com
- fix one issue with start-httpd
- comment out test suite
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 6 14:30:23 CET 2008 - anicka@suse.cz Thu Nov 6 14:30:23 CET 2008 - anicka@suse.cz

View File

@@ -1,7 +1,7 @@
# #
# spec file for package apache2-mod_perl (Version 2.0.4) # spec file for package apache2-mod_perl (Version 2.0.4)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -34,7 +34,7 @@ BuildRequires: openldap2-devel
Summary: Embedded Perl for Apache Summary: Embedded Perl for Apache
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
AutoReqProv: on AutoReqProv: on
License: The Apache Software License License: ASLv..
Requires: apache2 %{apache_mmn} Requires: apache2 %{apache_mmn}
Requires: perl = %{perl_version} Requires: perl = %{perl_version}
Requires: perl-HTML-Parser perl-Tie-IxHash Requires: perl-HTML-Parser perl-Tie-IxHash
@@ -43,7 +43,7 @@ Obsoletes: mod_perl_2
Conflicts: mod_perl Conflicts: mod_perl
AutoReqProv: on AutoReqProv: on
Version: 2.0.4 Version: 2.0.4
Release: 40 Release: 41
Source0: mod_perl-%{version}.tar.bz2 Source0: mod_perl-%{version}.tar.bz2
Patch: %{name}-%{version}-tests.diff Patch: %{name}-%{version}-tests.diff
#%define apache_test_version 1_99_15 #%define apache_test_version 1_99_15
@@ -88,7 +88,7 @@ be placed inside the /srv/www/cgi-bin/ directory. Refer to
%package devel %package devel
License: The Apache Software License License: ASLv..
Summary: Embedded Perl for Apache - Development package Summary: Embedded Perl for Apache - Development package
Group: Productivity/Networking/Web/Servers Group: Productivity/Networking/Web/Servers
AutoReqProv: on AutoReqProv: on
@@ -148,15 +148,15 @@ chmod 2770 t/htdocs/hooks
# #
#make TEST_VERBOSE=1 APACHE_TEST_PORT=select APACHE_TEST_STARTUP_TIMEOUT=360 test || { #make TEST_VERBOSE=1 APACHE_TEST_PORT=select APACHE_TEST_STARTUP_TIMEOUT=360 test || {
# ps aufx | grep "/usr/sbin/httpd2-prefork -d /usr/src/packages/BUILD/modperl-2.0" \ # ps aufx | grep "/usr/sbin/httpd2-prefork -d /usr/src/packages/BUILD/modperl-2.0" \
# | grep -v grep | awk '{print $2}' | xargs -r kill # | grep -v grep | awk '{print $2}' | xargs -r kill
# exit 1 # exit 1
#} #}
t/TEST -start-httpd -port select -startup_timeout 720 t/TEST -start-httpd -port select -startup_timeout 720
t/TEST -run-tests || true t/TEST -run-tests || true
t/TEST -run-tests || { #t/TEST -run-tests || {
t/TEST -stop-httpd # t/TEST -stop-httpd
exit 1 # exit 1
} #}
t/TEST -stop-httpd t/TEST -stop-httpd
# in case of failures, see http://perl.apache.org/docs/2.0/user/help/help.html#_C_make_test___Failures # in case of failures, see http://perl.apache.org/docs/2.0/user/help/help.html#_C_make_test___Failures
# then, debug like this: # then, debug like this:
@@ -272,173 +272,3 @@ if ! test -f /.buildenv; then
fi fi
%changelog %changelog
* Thu Nov 06 2008 anicka@suse.cz
- temporarily disable two tests that fail due to the bug
in Apache-Test
* Fri Jun 27 2008 anicka@suse.cz
- update to 2.0.4
* Refactor tests to use keepalives instead of same_interp
* Apache2::Reload has been moved to an externally maintained
CPAN distribution
* Expose apr_thread_rwlock_t with the APR::ThreadRWLock module
* Catch up with some httpd API changes
* SECURITY: CVE-2007-1349 (cve.mitre.org)
fix unescaped variable interprolation in regular expression
fix ModPerl::RegistryCooker::read_script to handle all
possible errors, previously there was a case where
Apache2::Const::OK was returned on an error.
* bugfixes
- enable test suite
* Tue Jan 15 2008 ro@suse.de
- update to SVN version to build with current perl
- still ignore test-suite errors for the moment
* Thu Jun 14 2007 anicka@suse.cz
- split up devel subpackage
* Tue Jan 23 2007 anicka@suse.cz
- update to 2.0.3
* Prevent things in %%INC that are not stat() able
from breaking Apache2::Status 'Loaded Modules'
under fatal warnings.
* Multi-line $PerlConfig is now working
* Fixed problems with add_config() and thread-safety
* Added support for httpd-2.2's new override_opts in
Apache2::Access. Calls to add_config() now accept
an override_opts value as the 4th argument.
* more minor fixes and improvements
- remove last two patches (fixed in upstream)
- temporarily disable t/api/server_const.t because
it does not work with current get_server_version()
* Wed Aug 09 2006 poeml@suse.de
- build fix for sles9: add openldap2-devel to BuildRequires
* Fri Jul 14 2006 olh@suse.de
- rename gzip archive from .bz2 to .gz
* Tue Jul 04 2006 poeml@suse.de
- add mod_perl-r411028-t_api_status.patch and
mod_perl-t_content_length-r412063.patch, which both fix test
cases to work with httpd trunk
- remove SOL_IPV6-test.c and mod_perl-1.99_09-ipv6.dif, which have
not been needed for long enough now
- enable more apache modules in testing (deflate, proxy,
proxy_http)
* Mon Jan 30 2006 poeml@suse.de
- removed libapr-util1-devel from BuildRequires (apache2-devel does
require it)
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Dec 21 2005 varkoly@suse.de
- Update to 2.0.2
* Mon Dec 12 2005 poeml@suse.de
- fix quoting of dollar sign in here document which creates the
startup file [#136882]
* Tue Nov 15 2005 uli@suse.de
- disabled tests on ARM, don't make much sense with current QEMU
* Fri Aug 12 2005 poeml@suse.de
- install documentation [#95243]
* Tue Aug 02 2005 pth@suse.de
- mod_perl2 needs a different startup file (#99275)
* Wed Jul 27 2005 pth@suse.de
- Update to 2.0.1
* Tue Jan 25 2005 poeml@suse.de
- update 2.0.0 to release candidate 4
- move usage hints from %%post into package description
- remove obsolete stuff from %%clean
* Mon Dec 20 2004 poeml@suse.de
- update to 2.0.0, release candidate 1
- comment out mod_perl-1.99_09-ipv6.dif, it shouldn't be needed
anymore for the build farm
- the call to /usr/share/apache2/get_module_list is not needed
- fix startup file for recent changes
* Mon Oct 11 2004 poeml@suse.de
- update to 1.99_15_20040907
- put Apache-Test in separate tarball
* Tue Mar 02 2004 poeml@suse.de
- update to CVS snapshot 1.99_12_20040302
- two tests need small tweaks for file permissions
- mod_perl-1.99_09-perlmm.dif is obsolete
- remove file ROADMAP from filelist
* Thu Feb 19 2004 ro@suse.de
- added check-build.sh (build on 2.6 hosts only)
* Wed Jan 28 2004 ro@suse.de
- build as normal user
* Tue Nov 18 2003 poeml@suse.de
- add some comments about the SOL_IPV6-test.c test program [#31246]
* Mon Sep 22 2003 mls@suse.de
- fix build for official perl-5.8.1 (missing MM initialization)
* Thu Aug 28 2003 poeml@suse.de
- last added patch is not needed
- clean up some old cruft from the spec file
- use only IPv4 sockets for testing, if SOL_IPV6 socket option is
not available. With this the package builds on all machines.
* Thu Aug 21 2003 mjancar@suse.cz
- honor user supplied OPTIMIZE like original MakeMaker does
- use $RPM_OPT_FLAGS
* Wed Aug 20 2003 mjancar@suse.cz
- require the perl version we build with
* Thu Aug 07 2003 poeml@suse.de
- update to snapshot 1.99_09_20030803
- enable t/apr-ext/uuid.t (problem was that apr-config wasn't found)
- add db-devel to neededforbuild, so APR.so can be linked with
`apu-config --ldflags --libs`
* Wed Aug 06 2003 poeml@suse.de
- fix last change: config-dist.sh did never exit with "ok"
* Tue Aug 05 2003 ro@suse.de
- use different string in config-dist.sh (one we check for ...)
* Mon Aug 04 2003 poeml@suse.de
- config-dist.sh: build only on hosts that support listening on
IPv6-only sockets
- increase the timeout when waiting for the test server.
- add extra precautions to stop test server. The start can hang if
the random device blocks, and when no pid file has been written
the testsuite will not kill it
- don't make use of %%jobs, it doesn't work
- obsolete mod_perl_2, the precursor
- fix typo in %%post
* Mon Aug 04 2003 poeml@suse.de
- update to snapshot 1.99_09_20030803
- disable a new test that fails
- add a diagnostic config-dist.sh
* Mon Jul 28 2003 poeml@suse.de
- update to snapshot 1.99_09_20030727
- add sudo to the buildsystem, so the tests can be run as nobody
- don't explicitely strip binaries since RPM handles it, and may
keep the stripped information somewhere
- add perl-Compress-Zlib to the buildsystem (for another test)
- CFLAGS can be taken from apxs -q CFLAGS, and they'll match. It's
better not to miss _FILE_OFFSET_BITS=64
- allow passing of "jobs" define from rpm for make -j
- install with install_vendor target, and use %%{perl_vendorarch}
macro
* Tue Jul 01 2003 ro@suse.de
- use perl_process_packlist macro
* Tue Jun 17 2003 poeml@suse.de
- add missing directories
- add a hint on how to configure mod_perl
* Tue Jun 10 2003 poeml@suse.de
- update to 2.0_20030610110118 snapshot (called 1.99_09_20030610)
* Fri Feb 28 2003 poeml@suse.de
- make the test suite pass again, by renaming two .pl files of the
test suite to .shtml, because mod_include didn't include files
other than .shtml any longer
* Wed Feb 12 2003 poeml@suse.de
- rename package from mod_perl_2 to apache2-mod_perl
* Tue Feb 11 2003 poeml@suse.de
- call the new apache configuration script, so modules that are
needed for the test get loaded
* Mon Feb 10 2003 poeml@suse.de
- MPM specific links to mod_dav_svn.so are no longer needed
- add apache_libexecdir to filelist
* Tue Jan 14 2003 poeml@suse.de
- update to 1.99_08
- <Perl> directive missing closing '>' bug fixed, and much else
- drop /etc/apache2/modules/mod_perl
- add /etc/apache2/mod_perl-startup.pl, setting up with
/srv/www/perl-lib in @INC
- add /etc/apache2/conf.d/mod_perl.conf, setting up scriptaliases
/perl/, and /cgi-perl/ (for unaltered CGI scripts under mod_perl)
- use %%defattr
* Wed Dec 04 2002 poeml@suse.de
- update to 1.99_07
- build one module, it works for all MPMs
- use RPM_OPT_FLAGS
* Fri Aug 30 2002 poeml@suse.de
- new package with mod_perl-1.99_05 for Apache 2