debian/0000755000000000000000000000000013373343152007172 5ustar debian/parse_apache_changes.pl0000755000000000000000000000224012200354765013633 0ustar #!/usr/bin/perl use strict; package ChangesPodFormatter; use base qw(Pod::Simple::Methody); sub start_Document { my $self = shift; $self->{state} = 'Doc'; $self->{year} = ''; if (not exists $self->{contributers}) { $self->{contributers} = {}; } } sub start_item_text { my $self = shift; $self->{state} = 'Item'; return; } sub end_item_text { my $self = shift; $self->{state} = 'Doc'; return; } sub handle_text { my ($self, $text) = @_; if ($self->{state} eq 'Item') { if ($text =~ /\w+\s+\d{1,2},\s+(\d{4})$/) { my $year = $1; $self->{year} = $year; } else { print "$text\n"; } } else { foreach my $c ($text =~ /\[([\w\s\<\>\@\.\-]+)\]/g) { $self->{contributers}->{$c}->{$self->{year}} = 1; } } return; } 1; package main; my $parser = ChangesPodFormatter->new; $parser->parse_file('Apache-Test/Changes'); $parser->parse_file('Changes'); foreach my $c (keys %{$parser->{contributers}}) { my %years = %{$parser->{contributers}->{$c}}; print join ", ", sort keys %years; print ", $c\n"; } exit 0; debian/perl.load0000644000000000000000000000007412200354765010776 0ustar LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so debian/index.tmpl0000644000000000000000000000274612200354765011210 0ustar NAME

NAME

index of mod_perl2 documentation

">

 debian/libapache2-mod-perl2-dev.examples0000644000000000000000000000002712200354765015276 0ustar docs/devel/debug/code/ debian/rules0000755000000000000000000000604612200354765010260 0ustar #!/usr/bin/make -f PACKAGE = $(firstword $(shell dh_listpackages)) TMP = $(CURDIR)/debian/$(PACKAGE) LMP = $(CURDIR)/lib/ModPerl MPR = $(CURDIR)/ModPerl-Registry APR = $(CURDIR)/Apache-Reload %: dh $@ --parallel --with apache2 override_dh_auto_configure: ! [ -e $(LMP)/DummyVersions.pm ] \ || cp $(LMP)/DummyVersions.pm debian/DummyVersions.pm.save ! [ -e $(LMP)/MethodLookup.pm ] \ || cp $(LMP)/MethodLookup.pm debian/MethodLookup.pm.save dh_auto_configure -- \ INSTALLDIRS=vendor \ MP_TRACE=0 \ MP_USE_DSO=1 \ MP_USE_STATIC=0 \ MP_CCOPTS="$(CFLAGS) -Wall" \ MP_APR_CONFIG=/usr/bin/apr-config override_dh_auto_build: dh_auto_build --parallel -- MODPERL_OPTIMIZE="$(CFLAGS)" OPTIMIZE="$(CFLAGS)" override_dh_auto_test: [ -d $(CURDIR)/t/run ] || mkdir $(CURDIR)/t/run [ -d $(CURDIR)/t/logs ] || mkdir $(CURDIR)/t/logs touch $(CURDIR)/t/logs/error_log [ -d $(MPR)/t/run ] || mkdir $(MPR)/t/run [ -d $(MPR)/t/logs ] || mkdir $(MPR)/t/logs touch $(MPR)/t/logs/error_log [ -d $(APR)/t/run ] || mkdir $(APR)/t/run [ -d $(APR)/t/logs ] || mkdir $(APR)/t/logs touch $(APR)/t/logs/error_log APACHE_TEST_EXTRA_ARGS="-httpd_conf $(CURDIR)/debian/apache2.conf" \ LANG=C \ dh_auto_test --max-parallel=1 || ( RET=$$?; \ echo "--- test suite failed with code $$RET, t/logs/error_log starts ---"; \ cat t/logs/error_log; \ echo "--- test suite failed with code $$RET, t/logs/error_log ends ---"; \ exit $$RET ) override_dh_clean: dh_clean rm -rf t/htdocs/hooks lib/Apache WrapXS debian/docs find . -name 'pod2htmd.tmp' -exec rm '{}' \; find . -name 'pod2htmi.tmp' -exec rm '{}' \; ! [ -e debian/DummyVersions.pm.save ] \ || mv debian/DummyVersions.pm.save $(LMP)/DummyVersions.pm ! [ -e debian/MethodLookup.pm.save ] \ || mv debian/MethodLookup.pm.save $(LMP)/MethodLookup.pm # these shouldn't be needed really rm -rf $(CURDIR)/t/logs $(CURDIR)/t/run $(MPR)/t/logs $(MPR)/t/run $(APR)/t/logs $(APR)/t/run find . -name 'Makefile.old' -exec rm '{}' \; rm -f Apache-Test/Apache-TestItSelf/t/SMOKE t/core override_dh_auto_install: rm -f t/core dh_auto_install override_dh_install: mkdir -p $(CURDIR)/debian/docs perl debian/transform_pod2html.pl $(CURDIR) docs debian dh_install mv $(TMP)/usr/bin/mp2bug $(TMP)/usr/share/libapache2-mod-perl2/ rm -r $(TMP)/usr/bin/ install -m755 debian/libapache2-mod-perl2.bug $(TMP)/usr/share/bug/libapache2-mod-perl2 rm $(TMP)/usr/lib/perl5/Apache2/Reload.pm rm $(TMP)/usr/lib/perl5/Apache/SizeLimit.pm rm $(TMP)/usr/lib/perl5/Apache/Reload.pm override_dh_installman: dh_installman rm $(TMP)/usr/share/man/man3/Apache2::Reload.3pm rm $(TMP)/usr/share/man/man3/Apache::SizeLimit.3pm rm $(TMP)/usr/share/man/man3/Apache::Reload.3pm override_dh_installexamples: dh_installexamples prename 's,\.,,' debian/libapache2-mod-perl2-dev/usr/share/doc/libapache2-mod-perl2-dev/examples/code/.debug-* # These rules are needed because otherwise the build process # tries to re-make the 'build' directory and fails .PHONY: build build: dh build debian/libapache2-mod-perl2-doc.doc-base0000644000000000000000000000100512200354765015121 0ustar Document: libapache2-mod-perl2-doc Title: Apache2 mod_perl2 documentation Author: Nicholas Bamber Abstract: Mod_perl allows the use of Perl for just about anything Apache-related, including sections in the config files and the famous Apache::Registry module for caching compiled scripts. Section: Web Development Format: Text Files: /usr/share/doc/libapache2-mod-perl2-doc/todo Format: HTML Index: /usr/share/doc/libapache2-mod-perl2-doc/index.html Files: /usr/share/doc/libapache2-mod-perl2-doc/docs debian/control0000644000000000000000000000521012224575374010602 0ustar Source: libapache2-mod-perl2 Section: httpd Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Perl Group Uploaders: Damyan Ivanov , Niko Tyni , gregor herrmann , Nicholas Bamber , Dominic Hargreaves , Ivan Kohler Standards-Version: 3.9.4 Homepage: http://perl.apache.org/ Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libapache2-mod-perl2.git Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libapache2-mod-perl2.git Build-Depends: perl, apache2-dev (>= 2.4~), apache2 (>= 2.4~), dh-apache2, debhelper (>= 9.20120312), libbsd-resource-perl, libdevel-symdump-perl, libhtml-parser-perl, libhtml-template-perl, libperl-dev, libreadonly-perl, libwww-perl, locales, netbase Build-Conflicts: apache2-mpm-event Package: libapache2-mod-perl2 Architecture: any Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, libdevel-symdump-perl, liburi-perl, libwww-perl, netbase Recommends: libbsd-resource-perl, libapache2-reload-perl Description: Integration of perl with the Apache2 web server mod_perl allows the use of Perl for just about anything Apache-related, including sections in the config files and the famous Apache::Registry module for caching compiled scripts. . It can produce anywhere from a 400% to 2000% speed increase on sites using perl scripts, and is used on many large script- based web sites - for example, http://slashdot.org. Package: libapache2-mod-perl2-dev Architecture: all Section: libdevel Depends: ${misc:Depends}, libapache2-mod-perl2 (>= ${source:Version}), libapache2-mod-perl2 (<< ${source:Version}.1~) Description: Integration of perl with the Apache2 web server - development files mod_perl allows the use of Perl for just about anything Apache-related, including sections in the config files and the famous Apache::Registry module for caching compiled scripts. . This package contains the header files required for building C-based modules integrating with mod_perl. Package: libapache2-mod-perl2-doc Architecture: all Section: doc Depends: ${misc:Depends} Suggests: dwww Description: Integration of perl with the Apache2 web server - documentation mod_perl allows the use of Perl for just about anything Apache-related, including sections in the config files and the famous Apache::Registry module for caching compiled scripts. . This package contains additional documentation for mod_perl tailored to be indexed by the doc-base system. debian/watch0000644000000000000000000000024412200354765010223 0ustar version=3 http://perl.apache.org/dist/mod_perl-([\d\.]+)\.tar\.gz https://metacpan.org/release/mod_perl/ .*/mod_perl-v?(\d[\d.]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip) debian/patches/0000755000000000000000000000000013373343070010620 5ustar debian/patches/010-doc-no-more-send_http_header.patch0000644000000000000000000000124412200354765017556 0ustar Author: Damyan Ivanov Description: Can't locate object method "send_http_header" Trivial patch to remove a stale reference to send_http_header that is no longer available or necessary Last-Update: 2011-03-22 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=507821 Forwarded: yes Reviewed-by: Nicholas Bamber --- a/docs/api/ModPerl/Registry.pod +++ b/docs/api/ModPerl/Registry.pod @@ -31,7 +31,6 @@ For example: my $r = Apache2::RequestUtil->request; $r->content_type("text/html"); - $r->send_http_header; $r->print("mod_perl rules!"); XXX: STOPPED here. Below is the old Apache::Registry document which I debian/patches/200_fix-pod-spelling-errors.patch0000644000000000000000000002512712200354765016725 0ustar Description: Fix spelling errors in documentation This includes both POD and comments. The 'overriden -> overridden' fix may also be applied to variable names, but is not done with this patch. Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread Author: Damyan Ivanov Last-Update: 2011-04-10 Reviewed-by: Nicholas Bamber --- a/Apache-Test/lib/Apache/TestTrace.pm +++ b/Apache-Test/lib/Apache/TestTrace.pm @@ -126,9 +126,9 @@ sub nc_trace { } sub trace_level { - # overriden by user/-trace + # overridden by user/-trace (defined $Level && $levels{$Level}) || - # or overriden by env var + # or overridden by env var (exists $ENV{APACHE_TEST_TRACE_LEVEL} && $levels{$ENV{APACHE_TEST_TRACE_LEVEL}}) || # or default --- a/Apache-Test/lib/Apache/TestUtil.pm +++ b/Apache-Test/lib/Apache/TestUtil.pm @@ -886,7 +886,7 @@ directory separators. The function is no =item t_start_error_log_watch(), t_finish_error_log_watch() This pair of functions provides an easy interface for checking -the presence or absense of any particular message or messages +the presence or absence of any particular message or messages in the httpd error_log that were generated by the httpd daemon as part of a test suite. It is likely, that you should proceed this with a call to one of the t_*_is_expected() functions. --- a/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm +++ b/ModPerl-Registry/lib/ModPerl/RegistryCooker.pm @@ -63,7 +63,7 @@ use constant D_WARN => 2; use constant D_COMPILE => 4; use constant D_NOISE => 8; -# the debug level can be overriden on the main server level of +# the debug level can be overridden on the main server level of # httpd.conf with: # PerlSetVar ModPerl::RegistryCooker::DEBUG 4 use constant DEBUG => 0; --- a/docs/api/APR.pod +++ b/docs/api/APR.pod @@ -18,7 +18,7 @@ libaprutil Libraries) =head1 Description -On load this modules prepares the APR enviroment (initializes memory +On load this modules prepares the APR environment (initializes memory pools, data structures, etc.) You don't need to use this module explicitly, since it's already --- a/docs/api/Apache2/Module.pod +++ b/docs/api/Apache2/Module.pod @@ -413,7 +413,7 @@ Remove a module from the list of loaded =head2 C -Returns the first module in the module list. Usefull to start a +Returns the first module in the module list. Useful to start a module iteration. $module = Apache2::Module::top_module(); --- a/docs/api/Apache2/Util.pod +++ b/docs/api/Apache2/Util.pod @@ -36,7 +36,7 @@ C provides the following =head2 C -convert an OS path to a URL in an OS dependant way. +convert an OS path to a URL in an OS dependent way. $escaped_path = Apache2::Util::escape_path($path, $p); $escaped_path = Apache2::Util::escape_path($path, $p, $partial); --- a/docs/api/ModPerl/MM.pod +++ b/docs/api/ModPerl/MM.pod @@ -55,7 +55,7 @@ hasn't already specified a method I will DWIM and do nothing. In case the functionality of C methods needs to be -extended, rather than completely overriden, the C methods +extended, rather than completely overridden, the C methods can be called internally. For example if you need to modify constants in addition to the modifications applied by C, call the C @@ -72,7 +72,7 @@ not C), then do your extra In certain cases a developers may want to prevent from C to override certain methods. In that case an explicit override in I will do the job. For example if you don't want the -C method to be overriden by C, add to your +C method to be overridden by C, add to your I: sub MY::constants { shift->MM::constants(@_); }"; @@ -89,7 +89,7 @@ C supplies d C and C unless they weren't passed to C from I. -If the default values aren't satisfying these should be overriden in +If the default values aren't satisfying these should be overridden in I. For example to supply an empty INC, explicitly set the argument in I. --- a/docs/api/ModPerl/RegistryCooker.pod +++ b/docs/api/ModPerl/RegistryCooker.pod @@ -25,7 +25,7 @@ Provide ingredients that can be used by =item * -Provide a default behavior, which can be overriden in sub-classed +Provide a default behavior, which can be overridden in sub-classed META: in the future this functionality may move into a separate class. --- a/lib/Apache2/compat.pm +++ b/lib/Apache2/compat.pm @@ -254,7 +254,7 @@ sub override_mp2_api { } # restore_mp2_api does the opposite of override_mp2_api(), it removes -# the overriden API and restores the original mod_perl 2.0 API +# the overridden API and restores the original mod_perl 2.0 API sub restore_mp2_api { my (@subs) = @_; --- a/lib/Apache2/porting.pm +++ b/lib/Apache2/porting.pm @@ -84,9 +84,9 @@ BEGIN { $package =~ s|/|::|g; $package =~ s|.pm$||; - # this picks the original require (which could be overriden + # this picks the original require (which could be overridden # elsewhere, so we don't lose that) because we haven't - # overriden it yet + # overridden it yet return require $_[0] unless $packages{$package}; my $msg = "mod_perl 2.0 API doesn't include package '$package'."; --- a/xs/APR/Pool/APR__Pool.h +++ b/xs/APR/Pool/APR__Pool.h @@ -49,7 +49,7 @@ APR_OPTIONAL_FN_TYPE(modperl_thx_interp_ #define MP_APR_POOL_SV_HAS_OWNERSHIP(sv) mpxs_pool_is_custom(sv) /* before the magic is freed, one needs to carefully detach the - * dependant pool magic added by mpxs_add_pool_magic (most of the time + * dependent pool magic added by mpxs_add_pool_magic (most of the time * it'd be a parent pool), and postpone its destruction, until after * the child pool is destroyed. Since if we don't do that the * destruction of the parent pool will destroy the child pool C guts --- a/todo/bugs_build +++ b/todo/bugs_build @@ -71,7 +71,7 @@ HPUX11i DSO * we have a dependency check problem when xs/*/*.h use code from xs/modperl_xs*.h, when the latter change 'make' won't rebuild the - dependant files + dependent files * Testing: Need to put Philippe's smoking test into the core --- a/docs/api/Apache2/RequestUtil.pod +++ b/docs/api/Apache2/RequestUtil.pod @@ -815,7 +815,7 @@ Nothing, except it doesn't work as expec same code is called in a sub-request then the pnote of $r-Eprev is magically updated at a distance to the same value! -Try explain why that is to anyone not deeply familar with perl internals! +Try to explain why that is to anyone not deeply familiar with perl internals! The fix is to avoid pnotes taking a ref to the invisible op_targ embededed in the code by passing a simple lexical variable as the actual argument. That can be done in-line like this: --- a/docs/user/intro/overview.pod +++ b/docs/user/intro/overview.pod @@ -279,7 +279,7 @@ mod_perl 2.0's I. See t =item * -The I pragma, which allows to force the code to be super +The I pragma, which allows one to force the code to be super clean, via the setting: use warnings FATAL => 'all'; --- a/docs/user/handlers/http.pod +++ b/docs/user/handlers/http.pod @@ -1580,7 +1580,7 @@ There are several usages for this use ph a cleanup code, for example removing temporarily created files. The less obvious is to use this phase instead of C> if the logging operation is time -consuming. This approach allows to free the client as soon as the +consuming. This approach allows one to free the client as soon as the response is sent. This phase is of type --- a/docs/user/coding/coding.pod +++ b/docs/user/coding/coding.pod @@ -300,7 +300,7 @@ downgrade them to be non-fatal. The foll no warnings 'redefine'; use warnings 'redefine'; -Perl 5.8.0 allows to do all this in one line: +Perl 5.8.0 allows one to do all this in one line: use warnings FATAL => 'all', NONFATAL => 'redefine'; --- a/docs/api/Apache2/SizeLimit.pod +++ b/docs/api/Apache2/SizeLimit.pod @@ -147,7 +147,7 @@ the patch is included in the mm-tree (li to make it into the vanilla kernel in the near future. F reports various sizes for each memory segment of a -process and allows to count the amount of shared memory correctly. +process and allows one to count the amount of shared memory correctly. If C detects a kernel that supports F and if the C module is installed it will use them instead of --- a/docs/api/Apache2/RequestRec.pod +++ b/docs/api/Apache2/RequestRec.pod @@ -804,7 +804,7 @@ Get/set MIME response headers, printed o =back -See also C>, which allows to +See also C>, which allows one to set headers for non-2xx responses and persist across internal redirects. --- a/docs/api/ModPerl/RegistryLoader.pod +++ b/docs/api/ModPerl/RegistryLoader.pod @@ -175,7 +175,7 @@ otherwise the C<$virtual_hostname> argum C performs a very simple job, at run time it loads and sub-classes the module passed via the I attribute and overrides some of its functions, to emulate the run-time -environment. This allows to preload the same script into different +environment. This allows one to preload the same script into different registry environments. =head1 Authors --- a/docs/devel/core/mod_perl_specific.pod +++ b/docs/devel/core/mod_perl_specific.pod @@ -131,7 +131,7 @@ a normal Perl handler by modperl_run_fil retrieve ctx->handler modperl_output_filter_handler -> modperl_run_filter -> modperl_callback -This trick allows to have more than one filter handler in the filters +This trick allows one to have more than one filter handler in the filters chain using the same Apache filter name (the real filter's name is stored in ctx-Ehandler-Ename. --- a/Apache-Test/lib/Apache/Test.pm +++ b/Apache-Test/lib/Apache/Test.pm @@ -749,7 +749,7 @@ Same as I, see I docu =item sok -Allows to skip a sub-test, controlled from the command line. The +Allows one to skip a sub-test, controlled from the command line. The argument to sok() is a CODE reference or a BLOCK whose return value will be passed to ok(). By default behaves like ok(). If all sub-tests of the same test are written using sok(), and a test is executed as: debian/patches/series0000644000000000000000000000125413373343064012042 0ustar avoid-db-linkage.patch 099-fix-url-on-index_top.patch 004-bugs-to-debian-bts.patch 006_man_section_and_build_warnings.patch 010-doc-no-more-send_http_header.patch 030-apxs-no-prefix.patch 031-test-extra-args.patch 200_fix-pod-spelling-errors.patch 210_fix-pod-errors.patch 220_fix-bad-whatis-entry.patch 260_fix_pipelined_response_deadlock.patch 280-ignore-sysconf-for-defines.patch 290-httpd-transition-test-todo.patch 300-http-headers-version.patch 310-defaultruntimedir.patch 320-cleanup-authn-authz-providers.patch #330-mod_authz_core.patch 340-rewrite-2.4.patch 350-ap-test-apache24-define.patch CVE-2011-2767.patch 370_http_syntax.patch 380_inject_header_line_terminators.patch debian/patches/300-http-headers-version.patch0000644000000000000000000000243112200354765016215 0ustar Description: adjust the version check for HTTP::Headers Origin: vendor Bug-Debian: http://bugs.debian.org/710873 Forwarded: no Author: gregor herrmann Last-Update: 2013-06-03 --- a/t/api/err_headers_out.t +++ b/t/api/err_headers_out.t @@ -5,6 +5,8 @@ use Apache::TestRequest; use Apache::TestUtil; +use version; + plan tests => 6, need 'HTML::HeadParser'; my $location = '/TestAPI__err_headers_out'; @@ -25,7 +27,7 @@ local $HTTP::Headers::TRANSLATE_UNDERSCORE= $HTTP::Headers::TRANSLATE_UNDERSCORE; undef $HTTP::Headers::TRANSLATE_UNDERSCORE - if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00; + if defined HTTP::Headers->VERSION and version->parse(HTTP::Headers->VERSION) >= version->parse(6.00); ok t_cmp $res->header('X-err_headers_out'), "err_headers_out", "X-err_headers_out: made it"; @@ -50,7 +52,7 @@ local $HTTP::Headers::TRANSLATE_UNDERSCORE= $HTTP::Headers::TRANSLATE_UNDERSCORE; undef $HTTP::Headers::TRANSLATE_UNDERSCORE - if defined HTTP::Headers->VERSION and HTTP::Headers->VERSION==6.00; + if defined HTTP::Headers->VERSION and version->parse(HTTP::Headers->VERSION) >= version->parse(6.00); ok t_cmp $res->header('X-err_headers_out'), "err_headers_out", "X-err_headers_out: made it"; debian/patches/avoid-db-linkage.patch0000644000000000000000000000136012200354765014737 0ustar Author: Damyan Ivanov Reviewed-by: Nicholas Bamber Subject: Linking with dbm is unnecessary and causes issues Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621415 Last-Update: 2011-04-10 Forwarded: not-needed --- a/lib/Apache2/Build.pm +++ b/lib/Apache2/Build.pm @@ -1184,6 +1184,8 @@ sub apru_link_flags { # resolve the symbols right during linking for ($self->apu_config_path, $self->apr_config_path) { my $flags = '--link-ld --libs'; + # we don't use dbm + $flags =~ s/--libs/--avoid-dbm --libs/ if $_ eq $self->apu_config_path; $flags .= ' --ldflags' unless (WIN32); if (my $link = $_ && -x $_ && qx{$_ $flags}) { chomp $link; debian/patches/260_fix_pipelined_response_deadlock.patch0000644000000000000000000000733312200354765020622 0ustar Subject: pipelined response deadlock Date: Fri, 4 Jan 2013 16:27:07 +0000 From: Zefram There's a race condition that can cause mod_perl's test suite to hang in t/filter/in_str_declined.t. The problem is that the response handler starts generating response body, and so triggers header output, before it reads the request body. If LWP::Protocol::http, which is the client for this test, receives a complete set of response headers, it will stop sending the request body. (However, if the request body is no more than 8192 octets then it will send the whole body before it starts looking for a response. The failure only shows up with an appreciably large request body.) RFC 2616 doesn't explicitly address this sort of pipelining, but the start of section 6 does say "After receiving and interpreting a request message, a server responds with an HTTP response message.", which can be read as prohibiting sending any part of the response before the entire request has been received. The attached patch fixes this issue by making all the POST handlers in the test suite read the body before doing anything that generates output (specifically plan()). -zefram Bug-Debian: http://bugs.debian.org/676754 Bug: https://rt.cpan.org/Public/Bug/Display.html?id=82409 Origin: https://rt.cpan.org/Public/Bug/Display.html?id=82409 --- a/t/filter/TestFilter/in_str_declined.pm +++ b/t/filter/TestFilter/in_str_declined.pm @@ -35,13 +35,17 @@ sub handler { sub response { my $r = shift; + my $data; + if ($r->method_number == Apache2::Const::M_POST) { + # consume the data so the input filter is invoked + $data = TestCommon::Utils::read_post($r); + } + plan $r, tests => 2; $r->content_type('text/plain'); if ($r->method_number == Apache2::Const::M_POST) { - # consume the data so the input filter is invoked - my $data = TestCommon::Utils::read_post($r); ok t_cmp(length $data, 20000, "the request body received ok"); } --- a/t/filter/TestFilter/in_str_declined_read.pm +++ b/t/filter/TestFilter/in_str_declined_read.pm @@ -31,14 +31,19 @@ sub handler { sub response { my $r = shift; + my $err; + if ($r->method_number == Apache2::Const::M_POST) { + # this should fail, because of the failing filter + eval { TestCommon::Utils::read_post($r) }; + $err = $@; + } + plan $r, tests => 1; $r->content_type('text/plain'); if ($r->method_number == Apache2::Const::M_POST) { - # this should fail, because of the failing filter - eval { TestCommon::Utils::read_post($r) }; - ok $@; + ok $err; } Apache2::Const::OK; --- a/t/filter/TestFilter/in_str_msg.pm +++ b/t/filter/TestFilter/in_str_msg.pm @@ -76,10 +76,10 @@ my $expected = "UPCASED"; sub response { my $r = shift; - plan $r, tests => 1; - my $received = TestCommon::Utils::read_post($r); + plan $r, tests => 1; + ok t_cmp($received, $expected, "request filter must have upcased the data"); --- a/t/response/TestModperl/post_utf8.pm +++ b/t/response/TestModperl/post_utf8.pm @@ -29,14 +29,14 @@ sub handler { # $r->content_type("text/plain; charset=utf-8"); # $r->print("expected: $expected_utf8\n"); + my $received = TestCommon::Utils::read_post($r) || ""; + # utf encode/decode was added only in 5.8.0 # XXX: currently binmode is only available with perlio (used on the # server side on the tied/perlio STDOUT) plan $r, tests => 2, need need_min_perl_version(5.008), need_perl('perlio'); - my $received = TestCommon::Utils::read_post($r) || ""; - # workaround for perl-5.8.0, which doesn't decode correctly a # tainted variable require ModPerl::Util; debian/patches/310-defaultruntimedir.patch0000644000000000000000000000175012200354765015675 0ustar Description: Since Apache 2.4, DefaultRuntimeDir needs to be set, otherwise mod_auth_digest tries to write to /var/run and fails (depending on permissions). Set DefaultRuntimeDir in the generated httpd.conf of Apache::Test conditionally. This also means we don't need the extra DefaultRuntimeDir in t/conf/extra.conf.in. Origin: vendor Forwarded: no Author: gregor herrmann , Niko Tyni Last-Update: 2013-06-04 --- a/Apache-Test/lib/Apache/TestConfig.pm +++ b/Apache-Test/lib/Apache/TestConfig.pm @@ -2148,6 +2148,10 @@ ErrorLog @t_logs@/error_log LogLevel debug + 2.4.1> + DefaultRunTimeDir "@t_logs@" + + TransferLog @t_logs@/access_log --- a/t/conf/extra.conf.in +++ b/t/conf/extra.conf.in @@ -1,6 +1,5 @@ # needed to test $r->psignature ServerSignature On -DefaultRuntimeDir run/ # The following tests require more than one interpreter during the # same request: debian/patches/320-cleanup-authn-authz-providers.patch0000644000000000000000000000262012200354765020054 0ustar From 75662f4285bad8d28fe787d1293bdd95a535cad1 Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Fri, 14 Jun 2013 14:07:22 +0300 Subject: [PATCH] Make sure authn and authz providers are cleaned up in time The authn and authz providers need to be registered in the configuration pool rather than the server process pool. The latter outlives the load time of the mod_perl shared object, so cleanup hooks could get called after the registered functions were unloaded, causing SIGSEGVs and other undefined behaviour. Fix suggested by Stefan Fritsch. Bug-Debian: http://bugs.debian.org/711213 --- src/modules/perl/modperl_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/perl/modperl_cmd.c b/src/modules/perl/modperl_cmd.c index 4ae0a62..d14b330 100644 --- a/src/modules/perl/modperl_cmd.c +++ b/src/modules/perl/modperl_cmd.c @@ -419,7 +419,7 @@ MP_CMD_SRV_DECLARE(init_handlers) MP_CMD_SRV_DECLARE2(authz_provider) { - apr_pool_t *p = parms->server->process->pool; + apr_pool_t *p = parms->pool; char *name = apr_pstrdup(p, arg1); char *cb = apr_pstrdup(p, arg2); @@ -431,7 +431,7 @@ MP_CMD_SRV_DECLARE2(authz_provider) MP_CMD_SRV_DECLARE2(authn_provider) { - apr_pool_t *p = parms->server->process->pool; + apr_pool_t *p = parms->pool; char *name = apr_pstrdup(p, arg1); char *cb = apr_pstrdup(p, arg2); -- 1.7.10.4 debian/patches/280-ignore-sysconf-for-defines.patch0000644000000000000000000000175312200354765017323 0ustar From ce60ebed111b66381b639c51363cb685fb07fd09 Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Fri, 24 May 2013 15:30:29 +0300 Subject: [PATCH] Run "httpd -V" with the test config and server root if available The system configuration may not be available to the user building mod_perl, or may depend on special environment variables or the like, so try to bypass the system configuration altogether. --- Apache-Test/lib/Apache/TestConfigParse.pm | 7 +++++++ 1 file changed, 7 insertions(+) --- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm +++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm @@ -458,6 +458,13 @@ $httpd = shell_ready($httpd); my $cmd = "$httpd -V"; + + my $httpdconf = $self->{vars}->{httpd_conf}; + $cmd .= " -f $httpdconf" if $httpdconf; + + my $serverroot = $self->{vars}->{serverroot}; + $cmd .= " -d $serverroot" if $serverroot; + my $proc = $self->open_cmd($cmd); while (<$proc>) { debian/patches/380_inject_header_line_terminators.patch0000644000000000000000000000405713373343070020463 0ustar From d59229cf4f5b91ed58e25e27977e76f59096b72d Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Sat, 24 Dec 2016 23:07:28 +0200 Subject: [PATCH 2/2] Fix in_bbs_inject_header line terminators for Apache 2.4.24 compatibility rfc7230 3.5 says: Although the line terminator for the start-line and header fields is the sequence CRLF, a recipient MAY recognize a single LF as a line terminator and ignore any preceding CR. Apache with strict enabled chooses not to implement the MAY. Author: Stefan Fritsch Bug-Debian: https://bugs.debian.org/849082 Bug-Ubuntu: https://launchpad.net/bugs/1779400 --- t/filter/TestFilter/in_bbs_inject_header.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: libapache2-mod-perl2-2.0.8+httpd24-r1449661/t/filter/TestFilter/in_bbs_inject_header.pm =================================================================== --- libapache2-mod-perl2-2.0.8+httpd24-r1449661.orig/t/filter/TestFilter/in_bbs_inject_header.pm 2018-11-15 14:17:10.220379962 -0500 +++ libapache2-mod-perl2-2.0.8+httpd24-r1449661/t/filter/TestFilter/in_bbs_inject_header.pm 2018-11-15 14:17:10.220379962 -0500 @@ -180,7 +180,7 @@ sub handler : FilterConnectionHandler { if ($data and $data =~ /^POST/) { # demonstrate how to add a header while processing other headers - my $header = "$header1_key: $header1_val\n"; + my $header = "$header1_key: $header1_val\r\n"; push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc, $header); debug "queued header [$header]"; } @@ -198,7 +198,7 @@ sub handler : FilterConnectionHandler { # we hit the headers and body separator, which is a good # time to add extra headers: for my $key (keys %headers) { - my $header = "$key: $headers{$key}\n"; + my $header = "$key: $headers{$key}\r\n"; push @{ $ctx->{buckets} }, APR::Bucket->new($c->bucket_alloc, $header); debug "queued header [$header]"; } debian/patches/370_http_syntax.patch0000644000000000000000000000233713373337246014634 0ustar From 4a803fdb4c9eae8538293fe31c9222eecb6465be Mon Sep 17 00:00:00 2001 From: Niko Tyni Date: Fri, 23 Dec 2016 18:27:23 +0200 Subject: [PATCH 1/2] Fix t/apache/read.t HTTP syntax for Apache 2.4.24 compatibility HTTP/1.1 RFC 7230, section 2.6. "Protocol Versioning" says the HTTP name is case sensitive. Starting with Apache 2.4.24, using lower case will make the server issue a 400 Bad request response, causing a test failure. https://tools.ietf.org/html/rfc7230#section-2.6 Bug-Debian: https://bugs.debian.org/849082 Bug-Ubuntu: https://launchpad.net/bugs/1779400 --- t/apache/read.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: libapache2-mod-perl2-2.0.8+httpd24-r1449661/t/apache/read.t =================================================================== --- libapache2-mod-perl2-2.0.8+httpd24-r1449661.orig/t/apache/read.t 2018-11-15 13:44:52.193191345 -0500 +++ libapache2-mod-perl2-2.0.8+httpd24-r1449661/t/apache/read.t 2018-11-15 13:44:52.189191323 -0500 @@ -23,7 +23,7 @@ close $fh; my $size = length $data; -for my $string ("POST $location http/1.0", +for my $string ("POST $location HTTP/1.0", "Content-length: $size", "") { my $line = "$string\r\n"; debian/patches/350-ap-test-apache24-define.patch0000644000000000000000000000147312200354765016346 0ustar diff --git a/Apache-Test/lib/Apache/TestServer.pm b/Apache-Test/lib/Apache/TestServer.pm index 254aec6..a3bc3ab 100644 --- a/Apache-Test/lib/Apache/TestServer.pm +++ b/Apache-Test/lib/Apache/TestServer.pm @@ -85,6 +85,15 @@ sub post_config { $self->{rev} = 0; # unknown } + ($self->{revminor}) = $self->{version} =~ m|/\d\.(\d)|; + + if ($self->{revminor}) { + debug "Matched Apache revminor $self->{version} $self->{revminor}"; + } + else { + $self->{revminor} = 0; + } + $self; } @@ -126,7 +135,14 @@ sub pid_file { sub dversion { my $self = shift; - "-D APACHE$self->{rev}"; + + my $dv = "-D APACHE$self->{rev}"; + + if ($self->{rev} == 2 and $self->{revminor} >= 4) { + $dv .= " -D APACHE24"; + } + + return $dv; } sub config_defines { debian/patches/220_fix-bad-whatis-entry.patch0000644000000000000000000000116712200354765016200 0ustar Description: Replace stray POD with =for comment This is the only documented methd and leaving in =head2 makes the build system generate a manual page lacking a basic requisite like the whatis entry (=head1 NAME) Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread Author: Damyan Ivanov Last-Update: 2011-03-22 Reviewed-by: Nicholas Bamber --- a/Apache-Test/lib/Apache/TestServer.pm +++ b/Apache-Test/lib/Apache/TestServer.pm @@ -379,7 +379,7 @@ sub port_available { } } -=head2 stop() +=for comment head2 stop() attempt to stop the server. debian/patches/004-bugs-to-debian-bts.patch0000644000000000000000000000115512200354765015533 0ustar Description: direct bug reports to Debian BTS Forwarded: not-needed Author: Gunnar Wolf Last-Update: 2011-03-22 Reviewed-by: Nicholas Bamber --- a/lib/ModPerl/TestReport.pm +++ b/lib/ModPerl/TestReport.pm @@ -97,7 +97,11 @@ sub package2filename { return $package; } -sub report_to { 'modperl@perl.apache.org' } - +# We are reporting to the Debian BTS, not directly to the upstream (Apache) +sub report_to { 'submit@bugs.debian.org' } +sub postit_note { + # No, no postit notes required :) This report will be typically + # embedded in reportbug's, so... +} 1; debian/patches/210_fix-pod-errors.patch0000644000000000000000000000136012200354765015104 0ustar Description: Fix POD errors Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread Author: Damyan Ivanov Last-Update: 2011-03-22 Reviewed-by: Nicholas Bamber --- a/Apache-Test/lib/Apache/Test.pm +++ b/Apache-Test/lib/Apache/Test.pm @@ -1020,6 +1020,8 @@ if no reason is given a default reason w =head1 Additional Configuration Variables +=over + =item basic_config my $basic_cfg = Apache::Test::basic_config(); @@ -1052,6 +1054,8 @@ If no arguments are passed, the referenc returned. If one or more arguments are passed the corresponding values are returned. +=back + =head1 Test::More Integration There are a few caveats if you want to use I with debian/patches/290-httpd-transition-test-todo.patch0000644000000000000000000000132512200354765017406 0ustar Description: Mark individual failing tests as TODO rather than ignore the overall test suite exit status Origin: vendor Forwarded: no Author: Dominic Hargreaves Reviewed-by: gregor herrmann Last-Update: 2013-06-03 diff --git a/t/directive/perlloadmodule3.t b/t/directive/perlloadmodule3.t index 8c1d0dc..92d7199 100644 --- a/t/directive/perlloadmodule3.t +++ b/t/directive/perlloadmodule3.t @@ -14,7 +14,7 @@ my $path = Apache::TestRequest::module2path($module); # smaller portions of information, but requires a more elaborate # logic. Alternatively could use diff($expected, $received). -plan tests => 3; +plan tests => 3, todo => [1]; t_debug("connecting to $base_hostport"); { debian/patches/CVE-2011-2767.patch0000644000000000000000000000374213373275250013254 0ustar From: Markus Koschany Date: Tue, 18 Sep 2018 19:03:15 +0200 Subject: CVE-2011-2767 Original patch by Jan Ingvoldstad. Bug-Debian: https://bugs.debian.org/644169 Origin: https://bugs.debian.org/644169#19 --- src/modules/perl/mod_perl.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) Index: libapache2-mod-perl2-2.0.8+httpd24-r1449661/src/modules/perl/mod_perl.c =================================================================== --- libapache2-mod-perl2-2.0.8+httpd24-r1449661.orig/src/modules/perl/mod_perl.c 2018-11-15 08:54:45.412486694 -0500 +++ libapache2-mod-perl2-2.0.8+httpd24-r1449661/src/modules/perl/mod_perl.c 2018-11-15 08:54:45.404486673 -0500 @@ -919,18 +919,18 @@ static const command_rec modperl_cmds[] MP_CMD_DIR_ITERATE2("PerlAddVar", add_var, "PerlAddVar"), MP_CMD_DIR_TAKE2("PerlSetEnv", set_env, "PerlSetEnv"), MP_CMD_SRV_TAKE1("PerlPassEnv", pass_env, "PerlPassEnv"), - MP_CMD_DIR_RAW_ARGS_ON_READ(" Forwarded: no Last-Update: 2011-03-22 Reviewed-by: Nicholas Bamber --- a/docs/index_top.html +++ b/docs/index_top.html @@ -3,6 +3,6 @@ index bottom -

FYI: Porting CPAN modules to mod_perl 2.0 Status

+

FYI: Porting CPAN modules to mod_perl 2.0 Status

- \ No newline at end of file + debian/patches/006_man_section_and_build_warnings.patch0000644000000000000000000000127712200354765020446 0ustar Description: fix man section of the generated manpages On Debian, manual pages about Perl modules need to have the '3pm' extension as per Debian Perl policy. Forwarded: not-needed Author: Gunnar Wolf Last-Update: 2011-03-22 Reviewed-by: Nicholas Bamber --- a/lib/ModPerl/BuildMM.pm +++ b/lib/ModPerl/BuildMM.pm @@ -281,7 +281,7 @@ sub ModPerl::BuildMM::MY::postamble { $man =~ s!/!::!g; push @target, - '$(NOECHO) $(POD2MAN_EXE) --section=3 ' . + '$(NOECHO) $(POD2MAN_EXE) --section=3pm ' . "$podpath \$(INST_MAN3DIR)/$man.\$(MAN3EXT)" } } debian/patches/031-test-extra-args.patch0000644000000000000000000000145312200354765015200 0ustar Author: Niko Tyni Subject: APACHE_TEST_EXTRA Honour $(APACHE_TEST_EXTRA_ARGS); Makefile.PL has apparently not been updated since this was added to Apache::Test. Forwarded: http://www.gossamer-threads.com/lists/modperl/dev/105354 Last-Update: 2012-05-19 Reviewed-by: Nicholas Bamber --- a/Makefile.PL +++ b/Makefile.PL @@ -788,12 +788,12 @@ TEST_FILES = test_clean : $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ - t/TEST -clean + t/TEST $(APACHE_TEST_EXTRA_ARGS) -clean run_tests : test_clean $(PASSENV) \ $(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \ - t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) + t/TEST $(APACHE_TEST_EXTRA_ARGS) -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES) run_subtests :: cd ModPerl-Registry && $(MAKE) test debian/patches/030-apxs-no-prefix.patch0000644000000000000000000000225412200354765015025 0ustar Author: Niko Tyni Subject: [PATCH] Apache-Test: Fall back to SYSCONFDIR if PREFIX is not set Forwarded: http://www.gossamer-threads.com/lists/modperl/dev/105353 Debian and Ubuntu packaged versions of Apache2 don't define PREFIX, so the build is filled with warnings like APXS (/usr/bin/apxs2) query for PREFIX failed Falling back to SYSCONFDIR (which is /etc/apache2 on Debian) should be better than failing altogether. --- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestConfigParse.pm +++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestConfigParse.pm @@ -87,8 +87,10 @@ 'user-supplied $base' ], [ $self->{inherit_config}->{ServerRoot}, 'httpd.conf inherited ServerRoot' ], - [ $self->apxs('PREFIX'), - 'apxs-derived ServerRoot' ]); + [ $self->apxs('PREFIX', 1), # ok_fail => 1 + 'apxs-derived ServerRoot based on PREFIX' ], + [ $self->apxs('SYSCONFDIR'), + 'apxs-derived ServerRoot based on SYSCONFDIR' ]); # remove surrounding quotes if any # e.g. Include "/tmp/foo.html" debian/patches/330-mod_authz_core.patch0000644000000000000000000000542312200354765015153 0ustar Description: adjust test config to mod_authz_core changes in 2.4 Origin: Gentoo Forwarded: no Author: Jorge Manuel B. S. Vicetto Reviewed-by: gregor herrmann Last-Update: 2013-06-22 --- a/t/response/TestModules/proxy.pm +++ b/t/response/TestModules/proxy.pm @@ -47,9 +47,7 @@ - Order Deny,Allow - Deny from all - Allow from @servername@ + Require host @servername@ --- a/t/response/TestAPI/access2.pm +++ b/t/response/TestAPI/access2.pm @@ -103,16 +103,17 @@ # needed to test $r->satisfies - Allow from All + Require all granted AuthType Basic AuthName "Access" - Require my-user goo bar - Require my-group xar tar - - Require valid-user - - Satisfy All + + Require my-user goo bar + Require my-group xar tar + + Require valid-user + + # htpasswd -mbc auth-users goo foo # htpasswd -mb auth-users bar mar --- a/t/filter/TestFilter/both_str_req_proxy.pm +++ b/t/filter/TestFilter/both_str_req_proxy.pm @@ -62,9 +62,7 @@ - Order Deny,Allow - Deny from all - Allow from @servername@ + Require host @servername@ --- a/t/protocol/TestProtocol/pseudo_http.pm +++ b/t/protocol/TestProtocol/pseudo_http.pm @@ -154,21 +154,21 @@ - - Order Deny,Allow - Allow from @servername@ - - - - # htpasswd -mbc basic-auth stas foobar - # using md5 password so it'll work on win32 too - AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth - - - AuthName TestProtocol::pseudo_http - AuthType Basic - Require user stas - Satisfy any + + + Require host @servername@ + + + + # htpasswd -mbc basic-auth stas foobar + # using md5 password so it'll work on win32 too + AuthUserFile @ServerRoot@/htdocs/protocols/basic-auth + + + AuthName TestProtocol::pseudo_http + AuthType Basic + Require user stas + debian/patches/340-rewrite-2.4.patch0000644000000000000000000000115712200354765014134 0ustar Description: adjust test to mod_rewrite changes in 2.4 Origin: Gentoo Forwarded: no Author: Jorge Manuel B. S. Vicetto Reviewed-by: gregor herrmann Last-Update: 2013-06-21 --- a/ModPerl-Registry/t/conf/extra.conf.in +++ b/ModPerl-Registry/t/conf/extra.conf.in @@ -218,8 +218,8 @@ RewriteEngine On - RewriteLogLevel 9 - RewriteLog @ServerRoot@/logs/rewrite_log + LogLevel rewrite:trace8 + ErrorLog @ServerRoot@/logs/rewrite_log RewriteRule /rewritetest /rewrite_env/env_val.pl?REWRITE_TEST [E=REWRITE_TEST:GOTCHA,PT,NS,L] debian/clean0000644000000000000000000000044012200354765010175 0ustar .mypacklist Apache-Test/Makefile.old Apache-SizeLimit/Makefile.old Apache-Test/t/REPORT Apache-Test/t/SMOKE Apache-Test/t/cgi-bin/cookies.pl Apache-Test/t/cgi-bin/next_available_port.pl ModPerl-Registry/Makefile.old t/conf/perlsection.conf t/htdocs/perlio/test Makefile debian/index.html debian/transform_pod2html.pl0000644000000000000000000000537312200354765013363 0ustar #!/usr/bin/perl use strict; use Carp; use File::Find; use File::Spec; use Pod::Html; use File::Path qw(make_path); use File::Copy; # Q: Would this be better with Pod::Tree? # dependencies use Readonly; use autodie qw(open close); use HTML::Template; Readonly my $CUR_DIR => $ARGV[0]; Readonly my $SRC_DIR => $ARGV[1]; Readonly my $DEST_DIR => $ARGV[2]; croak "No source directory: $SRC_DIR" if not -d $SRC_DIR; croak "No destination directory: $DEST_DIR" if not -d $DEST_DIR; # This data structure will end up being # a hierarchical index of the HTML formats of # the pod in the form expected by HTML::Template. my %data = (pod=>[],sections=>[]); find( \&transform_pod2html, $SRC_DIR ); my $template = HTML::Template->new(filename=>"$CUR_DIR/debian/index.tmpl", die_on_bad_params=>0); $template->param(%{$data{sections}->[0]->{sections}->[0]}); open my $fh,'>', "$CUR_DIR/$DEST_DIR/index.html"; print {$fh} $template->output; close$fh; exit(0); sub transform_pod2html { return if $File::Find::dir =~ m{/\.svn}; my $name = $_; return if $name eq '.svn'; return if $name !~ m{\.(\w{3})$}; my $ext = $1; return if $ext ne 'pod' and $ext ne 'png'; my ($v, $directories, $file) = File::Spec->splitpath($File::Find::name); my @dirs = File::Spec->splitdir($directories); my $docs = shift @dirs; unshift @dirs, '2.0'; unshift @dirs, $docs; my $catdirs = File::Spec->catdir(@dirs); my $newdir = File::Spec->catdir($CUR_DIR, $DEST_DIR, $catdirs); make_path($newdir, {verbose=>1}); my $oldfile = File::Spec->catfile($CUR_DIR, $File::Find::name); if ($ext eq 'pod') { $name =~ s{\.pod$}{\.html}; } my $newfile = File::Spec->catfile($newdir, $name); print "$File::Find::name -> $newfile\n"; if ($ext eq 'pod') { pod2html( "--infile=$oldfile", "--outfile=$newfile", "--podroot=$CUR_DIR", "--verbose", "--htmldir=$CUR_DIR/debian", ); } else { copy($oldfile, $newfile); } my $index_file = "/${catdirs}/$name"; $index_file =~ s{^/+}{}; $index_file =~ s{/+}{/}g; index_file($name, $index_file, $ext, @dirs); return; } sub index_file { my $name = shift; my $newfile = shift; my $ext = shift; my @dirs = @_; my $ptr = \%data; foreach my $d (@dirs) { last if $d eq ''; $ptr = find_section($ptr, $d); } push @{$ptr->{$ext}}, {href=>$newfile,text=>$name}; return; } sub find_section { my $ptr = shift; my $dir = shift; my @sections = @{$ptr->{sections}}; foreach my $s (@sections) { return $s if $s->{title} eq $dir; } my %ldata = (title=>$dir,pod=>[],sections=>[],png=>[]); push @{$ptr->{sections}}, \%ldata; return \%ldata; } debian/README.source0000644000000000000000000000065312200354765011355 0ustar The script debian/parse_apache_changes.pl can be used to parse the Changes and Apache-Test/Changes file to get the contributers and their copyright years. It is fairly crude. The users are generally CPAN ids. --- The 2.0.8+httpd24 "orig" tarball is created - from the httpd24 branch in upstream svn - with the 2.0.8 tag merged in - and then the directory tarred up. SVN URL: http://svn.apache.org/repos/asf/perl/modperl/ debian/apache2.conf0000644000000000000000000000264012200354765011346 0ustar # these modules are needed for the test suite LoadModule mpm_worker_module "/usr/lib/apache2/modules/mod_mpm_worker.so" LoadModule authn_core_module "/usr/lib/apache2/modules/mod_authn_core.so" LoadModule auth_basic_module "/usr/lib/apache2/modules/mod_auth_basic.so" LoadModule auth_digest_module "/usr/lib/apache2/modules/mod_auth_digest.so" LoadModule authz_core_module "/usr/lib/apache2/modules/mod_authz_core.so" LoadModule access_compat_module "/usr/lib/apache2/modules/mod_access_compat.so" LoadModule authz_user_module "/usr/lib/apache2/modules/mod_authz_user.so" LoadModule authn_file_module "/usr/lib/apache2/modules/mod_authn_file.so" LoadModule authz_groupfile_module "/usr/lib/apache2/modules/mod_authz_groupfile.so" LoadModule proxy_module "/usr/lib/apache2/modules/mod_proxy.so" LoadModule authz_host_module "/usr/lib/apache2/modules/mod_authz_host.so" LoadModule alias_module "/usr/lib/apache2/modules/mod_alias.so" LoadModule deflate_module "/usr/lib/apache2/modules/mod_deflate.so" LoadModule include_module "/usr/lib/apache2/modules/mod_include.so" LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so LoadModule env_module /usr/lib/apache2/modules/mod_env.so LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so debian/libapache2-mod-perl2.install0000644000000000000000000000010112200354765014343 0ustar debian/tmp/usr/bin/* debian/tmp/usr/lib/* debian/tmp/usr/share/* debian/compat0000644000000000000000000000000212200354765010370 0ustar 9 debian/libapache2-mod-perl2-dev.install0000644000000000000000000000012112200354765015121 0ustar debian/tmp/usr/include/apache2/* xs/*.h src/modules/perl/*.h usr/include/apache2 debian/copyright0000644000000000000000000000435212200354765011131 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: mod_perl2 Upstream-Contact: Doug MacEachern , Phillipe M. Chiasson , Geoffrey Young , Phillip M. Gollucci , Fred Moyer Source: http://perl.apache.org/dist/ Files: * Copyright: 2002-2011, Doug MacEachern 2003, Mike Cramer 2003, 2004, 2005, 2006, 2007, 2010, Philippe M. Chiasson 2005, 2006, Philip M. Gollucci 2003, 2004, 2005, 2006, 2007, Geoffrey Young 2004, 2005, 2006, Randy Kobes 2010, 2011, Torsten Foertsch 2011, Stefan Fritsch 2004, Ken 2003, 2004, 2005, 2006, Stas 2004, 2006, 2010, Joe Orton 2004, Boris Zentner 2010, Mark A. Hershberger 2010, 2011, Fred Moyer 2005, joes 2004, David Wheeler 2004, Steve Hay License: Apache-2.0 Files: debian/* Copyright: 2002, 2004-2005, Thom May 2003-2006, Andres Salomon 2004, Adam Conrad 2006, Andreas Barth 2006, Luk Claes 2006, Steinar H. Gunderson 2007-2008, 2010-2011, Damyan Ivanov 2007-2008, Gunnar Wolf 2007, Steve Langasek 2008, Niko Tyni 2008, 2012, gregor herrmann 2011, Nicholas Bamber License: Apache-2.0 License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. . On Debian systems, the complete text of the Apache License, Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'. debian/libapache2-mod-perl2.lintian-overrides0000644000000000000000000000024012200354765016337 0ustar # right, but that's the name since at least 2002 ... libapache2-mod-perl2: non-standard-apache2-module-package-name libapache2-mod-perl2 != libapache2-mod-perl debian/source/0000755000000000000000000000000012200354765010472 5ustar debian/source/format0000644000000000000000000000001412200354765011700 0ustar 3.0 (quilt) debian/libapache2-mod-perl2.dirs0000644000000000000000000000005512200354765013646 0ustar usr/share/libapache2-mod-perl2 usr/share/bug debian/libapache2-mod-perl2-doc.install0000644000000000000000000000023312200354765015114 0ustar todo /usr/share/doc/libapache2-mod-perl2-doc debian/index.html /usr/share/doc/libapache2-mod-perl2-doc debian/docs /usr/share/doc/libapache2-mod-perl2-doc debian/libapache2-mod-perl2.manpages0000644000000000000000000000001412200354765014473 0ustar blib/man3/* debian/BUGS.Debian0000644000000000000000000000201712200354765011036 0ustar The following notes constitute a cursory opinion over what to do with the following bugs. The actul bug reports in BTS are authoritative and if I had had more confidence in these opinions I could have simply acted upon them - so please treat with a pinch of salt. Review bug reports Can we close these? ------------------- #617883 - Don't see why he does not just down load the package source. #435480 - Ticket seems to state why I think this could be closed. #617884 - Blatant incompatibility. Surely this is mod_perl 1 code. #267969 - Cannot find a chronos package and this was a mod_perl 1 ticket. #380296 - Ticket says it. These look worth investigating --------------------- #418825 - Can we add these to a Debian FAQ and close the ticket? #419952 - Can we add these to a Debian FAQ and close the ticket? #428499 - Looks easy to check, patch and forward. #590735 - Ticket seems to be well documented. #620822 - Should be easy to investigate these. debian/libapache2-mod-perl2.bug0000644000000000000000000000033712200354765013465 0ustar #!/bin/sh BUGHELPER=/usr/share/libapache2-mod-perl2/mp2bug # The output from the bughelper must be captured and sent to file # descriptor 3 so it gets included in the user's bug report [ -f $BUGHELPER ] && $BUGHELPER >& 3 debian/libapache2-mod-perl2.apache20000644000000000000000000000006612200354765014212 0ustar mod src/modules/perl/mod_perl.so mod debian/perl.load debian/changelog0000644000000000000000000010751313373343152011053 0ustar libapache2-mod-perl2 (2.0.8+httpd24-r1449661-6ubuntu2.1) trusty-security; urgency=medium * SECURITY UPDATE: arbitrary perl code execution via .htaccess file - debian/patches/CVE-2011-2767.patch: only allow perl and pod sections in server configuration and not per directory in src/modules/perl/mod_perl.c. - CVE-2011-2767 * Fix FTBFS caused by test failures due to Apache security updates. - debian/patches/370_http_syntax.patch - debian/patches/380_inject_header_line_terminators.patch -- Marc Deslauriers Thu, 15 Nov 2018 08:54:50 -0500 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-6ubuntu2) trusty; urgency=low * Rebuild for Perl 5.18. -- Colin Watson Mon, 21 Oct 2013 13:52:00 +0100 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-6ubuntu1) saucy; urgency=low * Merge with Debian, remaining changes: - Change locales-all to locales. - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Matthias Klose Mon, 07 Oct 2013 20:16:04 +0200 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-6) unstable; urgency=low [ gregor herrmann ] * Add patch from Jorge Manuel B. S. Vicetto to adjust test module configuration to mod_authz_core changes in 2.4. Currently disabled since it doesn't seem to be needed during Debian builds. * Add patch from Jorge Manuel B. S. Vicetto to handle mod_rewrite changes in apache 2.4. Load rewrite_module in debian/apache2.conf. * Drop lintian override (spelling-error-in-binary). lintian 2.5.14 ignores "teH" in ELF binaries. [ Ivan Kohler ] * Add patch from Michael Schout to add a conditional define for Apache 2.4 (-D APACHE24) to Apache::Test, from https://rt.cpan.org/Public/Bug/Display.html?id=87620 * Add myself to Uploaders: -- Ivan Kohler Tue, 06 Aug 2013 21:53:01 -0700 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-5ubuntu1) saucy; urgency=low * Merge with Debian; remaining changes: - Change locales-all to locales. - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Matthias Klose Tue, 02 Jul 2013 20:50:59 +0200 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-5) unstable; urgency=low * Update debian/patches/280-ignore-sysconf-for-defines.patch not to unnecessarily use explicit configuration file and server root for running 'apache2 -l' * Update debian/patches/030-apxs-no-prefix.patch to fall back to SYSCONFDIR when PREFIX fails. * Include the contents of t/logs/error_log in the build log if the test suite fails, to debug #711167 on ia64. -- Niko Tyni Wed, 19 Jun 2013 23:26:43 +0300 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-4) unstable; urgency=low * Add 320-cleanup-authn-authz-providers.patch from Niko Tyni. The patch makes sure authn and authz providers are cleaned up in time by registering them in the configuration pool rather than the server process pool. Thanks to Stefan Fritsch for suggesting the fix. (Closes: #711213) * Update lintian override (false positive spelling-error). -- gregor herrmann Sat, 15 Jun 2013 17:29:02 +0200 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-3) unstable; urgency=low * Add a patch to handle a test failure with newer HTTP::Headers. Thanks to Niko Tyni for the analysis. (Closes: #710873) * Load the mod_auth_digest module in debian/apache2.conf and remove the TODOs from the t/hooks/authen_digest.t in debian/patches/290-httpd- transition-test-todo.patch. This addresses parts of #710327. Thanks to Niko Tyni for the pointer. * After loading mod_auth_digest, the tests behave differently. Tests in ModPerl-Registry/ and Apache-Reload/ are now run by dh_auto_test. Adjust debian/rules. * The newly run tests in ModPerl-Registry/ and Apache-Reload/ need DefaultRuntimeDir set, otherwise mod_auth_digest tries to write to /var/run and fails. Add patch 310-defaultruntimedir.patch: Set DefaultRuntimeDir in the created apache config for Apache::Test in Apache-Test/lib/Apache/TestConfig.pm. Thanks to Niko Tyni for his help in teaking this patch. -- gregor herrmann Tue, 04 Jun 2013 19:01:10 +0200 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-2) unstable; urgency=low [ Dominic Hargreaves ] * Credit for the Apache 2.4 patch (from the upstream httpd24 branch) applied in this and the previous release goes to Jan Kaluza [ gregor herrmann ] * Upload to unstable now that apache 2.4.4-4 is there. Closes: #666822 * Add a lintian override for non-standard-apache2-module-package-name. lintian is technically right, but changing the name after 13 years doesn't sound appealing. * Add a lintian override for spelling-error-in-binary. The string is nowhere in the code. -- gregor herrmann Fri, 31 May 2013 00:49:37 +0200 libapache2-mod-perl2 (2.0.8+httpd24-r1449661-1) experimental; urgency=low [ gregor herrmann ] * New upstream release. [ Niko Tyni ] * First steps at Apache 2.4 support. Upstream doesn't currently support 2.2 and 2.4 with the same codebase, so we don't even try. dh_apache2 now does most of the heavy lifting, we don't need special maintainer scripts anymore. * Revisit Makefile.PL arguments. MP_APR_CONFIG is now necessary, MP_INCLUDE_DIR and MP_APXS can be removed. * Remove gtop linkage and MP_USE_GTOP. Nobody seems to know anymore why libgtop was needed, so this seems a good time to drop it. * Supply a list of Apache modules needed for the test suite. We used to get these from /etc/apache2, but this is much more robust. Also, when using the test directory as server root, Apache seems to require existing run/ and logs/ directories, so create them when necessary. * Remove a possible leftover core file before the install phase, as the build system complains rather excessively about those. * Run "httpd -V" with the test config and server root if available. The system configuration may not be available to the user building mod_perl, or may depend on special environment variables or the like, so try to bypass the system configuration altogether. * Improve the "clean" target. * Run the ModPerl-Registry tests too. TODO: the test suite still looks for /etc/apache2/httpd.conf [ gregor herrmann ] * Refresh patches. Drop 250-lfs-perl-5.14.patch. * Add notes to debian/README.source about the tarball creation. * Set Standards-Version to 3.9.4 (no changes). * debian/control: drop explicit build dependency on autodie. autodie is in perl core since 5.10.1, which is available in oldstable. [ Dominic Hargreaves ] * Add Build-Depends on apache2, which is needed for the test suite * Mark individual failing tests as TODO for now. We can't fix these for the Apache 2.4 transition -- Dominic Hargreaves Thu, 30 May 2013 00:07:54 +0100 libapache2-mod-perl2 (2.0.8-1) unstable; urgency=low * watch: add alternative URL on metacpan.org * Imported Upstream version 2.0.8 Closes: #708591 -- libapache2-mod-perl2: FTBFS with perl 5.18: hashing updates + Drop 270_fix_hash_attack_test.patch since the problem is fixed upstream + refresh other patches to apply cleanly -- Damyan Ivanov Fri, 17 May 2013 17:46:10 +0300 libapache2-mod-perl2 (2.0.7-3) unstable; urgency=low [ Salvatore Bonaccorso ] * Change Vcs-Git to canonical URI (git://anonscm.debian.org) [ Dominic Hargreaves ] * Fix FTBFS with versions of perl including the CVE-2013-1667 fix (Closes: #702821) -- Dominic Hargreaves Tue, 12 Mar 2013 20:06:02 +0000 libapache2-mod-perl2 (2.0.7-2ubuntu1) raring; urgency=low * Resynchronise with Debian. Remaining changes: - Change locales-all to locales. - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Colin Watson Tue, 08 Jan 2013 10:06:28 +0000 libapache2-mod-perl2 (2.0.7-2) unstable; urgency=low * Apply patch from Zefram fixing occasional FTBFS due to pipelined response deadlock (Closes: #676754) -- Dominic Hargreaves Sat, 05 Jan 2013 18:27:29 +0000 libapache2-mod-perl2 (2.0.7-1ubuntu1) raring; urgency=low * Resynchronise with Debian (LP: #1071529). Remaining changes: - Change locales-all to locales. - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Colin Watson Tue, 27 Nov 2012 23:08:38 +0000 libapache2-mod-perl2 (2.0.7-1) unstable; urgency=low * New upstream release - fixes FTBFS with perl 5.16 (Closes: #676269) * Partially revert change which removes Apache::Sizelimit::Core as this is still needed (Closes: #661370) -- Dominic Hargreaves Thu, 07 Jun 2012 18:51:16 +0100 libapache2-mod-perl2 (2.0.6-2) unstable; urgency=low * debian/rules: run dh_auto_test with --max-parallel=1. This avoids build failures with -jN and build-arch. * debian/copyright: update to Copyright-Format 1.0. * Update packaging copyright years. -- gregor herrmann Mon, 21 May 2012 23:54:34 +0200 libapache2-mod-perl2 (2.0.6-1) unstable; urgency=low * New upstream release - rebase/drop some patches -- Dominic Hargreaves Sat, 19 May 2012 20:49:39 +0100 libapache2-mod-perl2 (2.0.5-6) unstable; urgency=low * Bump debhelper compat level to 9 * Apply patch from Niko Tyni fixing FTBFS with -Werror=format-security (Closes: #661540) * Update Standards-Version (no changes) -- Dominic Hargreaves Sun, 01 Apr 2012 16:25:22 +0100 libapache2-mod-perl2 (2.0.5-5ubuntu2) quantal; urgency=low * Rebuild for new armel compiler default of ARMv5t. -- Colin Watson Thu, 04 Oct 2012 13:15:20 +0100 libapache2-mod-perl2 (2.0.5-5ubuntu1) precise; urgency=low [ Chuck Short ] * Merge from Debian testing. Remaining changes: - Change locales-all to locales. (LP: #184206) - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Chuck Short Mon, 06 Feb 2012 08:48:30 -0500 libapache2-mod-perl2 (2.0.5-5) unstable; urgency=low [ gregor herrmann ] * Remove build dependency on libcompress-zlib-perl, Compress::Zlib is in perl core since 5.9.3. [ Dominic Hargreaves ] * Add Build-Conflicts on apache2-mpm-event (marked as experimental) since it causes this package to FTBFS (Closes: #652331) * Add patches from Niko fixing reference counting bugs when using perl 5.14 (Closes: #650675) -- Dominic Hargreaves Sat, 14 Jan 2012 18:50:42 +0000 libapache2-mod-perl2 (2.0.5-4ubuntu2) precise; urgency=low * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. -- Adam Conrad Fri, 02 Dec 2011 17:34:46 -0700 libapache2-mod-perl2 (2.0.5-4ubuntu1) precise; urgency=low * Merge from Debian unstable, remaining changes: - Change locales-all to locales. (LP: #184206) - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Dave Walker (Daviey) Wed, 16 Nov 2011 09:53:30 +0000 libapache2-mod-perl2 (2.0.5-4) unstable; urgency=low * Add patch from upstream svn adopting the Perl_sv_dup() changes in Perl 5.14 * Don't strip LFS CFLAGS in lib/Apache2/Build.pm any more (Closes: #636651) -- Dominic Hargreaves Sun, 13 Nov 2011 15:14:12 +0000 libapache2-mod-perl2 (2.0.5-3ubuntu1) precise; urgency=low * Merge from Debian unstable, remaining changes: - Change locales-all to locales. (LP: #184206) - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Dave Walker (Daviey) Sat, 29 Oct 2011 10:51:46 +0100 libapache2-mod-perl2 (2.0.5-3) unstable; urgency=low [ Ansgar Burchardt ] * debian/control: Convert Vcs-* fields to Git. [ Salvatore Bonaccorso ] * debian/copyright: Replace DEP5 Format-Specification URL from svn.debian.org to anonscm.debian.org URL. [ Niko Tyni ] * Improve the test suite coverage (again) with a typo fix. The APACHE_TEST_EXTRA_ARGS setting in debian/rules was introduced in 2.0.3-5 to improve the test suite coverage, but got accidentally disabled later with 2.0.5-1 due to a missing line continuation. Closes: #646267 [ gregor herrmann ] * Bump debhelper compatibility level to 8. -- gregor herrmann Sat, 22 Oct 2011 23:35:26 +0200 libapache2-mod-perl2 (2.0.5-2ubuntu1) oneiric; urgency=low * Merge from Debian unstable, remaining changes: - Change locales-all to locales. - Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Steve Langasek Fri, 17 Jun 2011 19:31:06 +0000 libapache2-mod-perl2 (2.0.5-2) unstable; urgency=low * Team upload. * Add 230-test-failures-fix.patch. Fixes for the testsuite to be compatible with >= LWP + HTTP:Headers 6.0. (LP: #797716), (Closes: #628296). -- Salvatore Bonaccorso Thu, 16 Jun 2011 14:56:44 +0200 libapache2-mod-perl2 (2.0.5-1ubuntu2) oneiric; urgency=low * Drop dwww from a recommends to a suggests to avoid pulling this into main. -- Steve Langasek Fri, 17 Jun 2011 06:40:27 +0000 libapache2-mod-perl2 (2.0.5-1ubuntu1) oneiric; urgency=low * Merge from debian unstable. Remaining changes: - Change locales-all to locales. (LP: #184206) * debian/patches/230-test-failures-fix.patch: Fixes for the testsuite to be compatible with >= LWP + HTTP:Headers 6.0. Resolves FTBFS due to testsuite failure. Patch cherry picked from upstream commits. (LP: #797716) -- Dave Walker (Daviey) Wed, 15 Jun 2011 14:31:02 +0100 libapache2-mod-perl2 (2.0.5-1) unstable; urgency=low [ Nicholas Bamber ] * Added myself to Uploaders * Upped debian compatibility level to 7, migrated to source format '3.0 (quilt)' and removed quilt * Refreshed debian/rules * Upped standards version to 3.9.2 * Added versioning of depdendency between dev and core packages * Registered documents with doc-base - Adding todo files to doc package - Added dwww as a recommendation to doc package - Transformed .pod files to indexed HTML files (Closes: #507279) - Copied .png files and added them to the HTML index * New upstream release * Reviewed patches - Removed 009_allow_parallel_build.patch [applied upstream] - Removed 100-svn-XSS-Status.patch [applied upstream] - Removed 110-Fix-two-uninitialized-....patch [applied upstream] - Removed 035-testrequest_add_credentials.patch [applied upstream] - New lintian version requires new correctons * Email change: Andres Salomon -> dilinger@debian.org * Refreshed copyright * Reviewed dependencies * Installed gdb scripts to examples for dev package [ Damyan Ivanov ] * add avoid-db-linkage.patch: avoids needless linking with libdb, which entangles us in libdb transitions. Closes: #621415 * rules: pass --parallel to dh command allowing parallel builds * rules: pass CFLAGS to upstream make as MODPERL_OPTIMIZE, allowing dpkg-buildpackage-induced CFLAGS to end up on the compiler command line * drop libgdbm-dev from B-D -- Damyan Ivanov Tue, 19 Apr 2011 09:47:07 +0300 libapache2-mod-perl2 (2.0.4-7ubuntu2) oneiric; urgency=low * Rebuild for Perl 5.12. -- Colin Watson Sun, 08 May 2011 07:35:47 +0100 libapache2-mod-perl2 (2.0.4-7ubuntu1) maverick; urgency=low * Merge from debian unstable. Remaining changes: - Change locales-all to locales. (LP: #184206) - Don't ignore testsuite failures on armel anymore. -- Chuck Short Wed, 05 May 2010 02:31:07 +0100 libapache2-mod-perl2 (2.0.4-7) unstable; urgency=low * change source Section to 'httpd' * add a patch from Niko Tyni avoiding two warnings about use of uninitialized values, which break tests under Perl 5.12. (Closes: #578481) * add a patch fixinf spelling errors in POD and other documentation * add a patch fixinng POD errors * add a patch fixing bad manpage whatis name * Standards-Version: 3.8.4 + support 'nockeck' in DEB_BUILD_OPTIONS as per Policy 3.8.1 * describe all patches -- Damyan Ivanov Wed, 21 Apr 2010 12:48:11 +0300 libapache2-mod-perl2 (2.0.4-6ubuntu1) lucid; urgency=low * Merge from debian testing. Remaining changes: LP: #516430 - Change locales-all to locales. (LP: #184206) - Don't ignore testsuite failures on armel anymore. -- Bhavani Shankar Wed, 03 Feb 2010 12:25:44 +0530 libapache2-mod-perl2 (2.0.4-6) unstable; urgency=high [ gregor herrmann ] * debian/control: Changed: (build-)depend on perl instead of perl- modules. [ Dario Minnucci ] * docs/index_top.html: Issued patch 099-fix-url-on-index_top.patch to fix link URL. (Closes: #507606) [ Damyan Ivanov ] * add 100-svn-XSS-Status.patch; fixes XSS in Apache2::Status (CVE-2009-0796) Patch taken from r760926 of upstream SVN. Closes: #567635 * .docs: drop debian/NEWS.Debian and Changes * -doc: depend on ${misc:Depends} * drop debian/NEWS (documents changes before oldstable) -- Damyan Ivanov Sat, 30 Jan 2010 18:00:43 +0200 libapache2-mod-perl2 (2.0.4-5ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes: - Change locales-all to locales. (LP: #184206) * Don't ignore testsuite failures on armel anymore. -- Matthias Klose Mon, 05 Jan 2009 18:11:43 +0100 libapache2-mod-perl2 (2.0.4-5) unstable; urgency=low [ gregor herrmann ] * debian/control: Changed: Switched Vcs-Browser field to ViewSVN (source stanza). [ Damyan Ivanov ] * add 010-doc-no-more-send_http_header.patch removing a forgotten send_http_header that is no nonger available in Registry.pod Closes: #507821 -- Can't locate object method "send_http_header" via package "Apache2::RequestRec" [ gregor herrmann ] * debian/control: Added: ${misc:Depends} to Depends: field. [ Gunnar Wolf ] * Added conditional dependency on libapache2-mpm-itk (together with apache2). (Closes: #508910) * Added patch which created a FTBFS with the libwww-perl 5.813 to 5.820 update (acknowledged upstream, will be included in next release) (Closes: #509457) * reordered debian/patches/series to match reality -- Gunnar Wolf Fri, 26 Dec 2008 19:38:28 -0600 libapache2-mod-perl2 (2.0.4-4ubuntu2) jaunty; urgency=low * Ignore test results on armel (2 test failures) for a first build on this architecture. -- Matthias Klose Wed, 24 Dec 2008 08:33:32 +0100 libapache2-mod-perl2 (2.0.4-4ubuntu1) jaunty; urgency=low * Merge from debian unstable, remaining changes: - Change locales-all to locales. (LP: #184206) -- Mathias Gug Mon, 10 Nov 2008 22:42:23 -0500 libapache2-mod-perl2 (2.0.4-4) unstable; urgency=medium [ Frank Lichtenheld ] * Convert debian/copyright to proposed new format. * Refer to Apache License in /usr/share/common-licenses. * Bump Standards-Version to 3.8.0. [ gregor herrmann ] * Add debian/README.source to document quilt usage, as required by Debian Policy since 3.8.0. [ Damyan Ivanov ] * add dependency on apache2 (>= 2.2.4) because of the new ap_get_server_banner symbol not available in previous apaches Closes: #503375: libapache2-mod-perl2 - Uses undefined symbol ap_get_server_banner Thanks to Bastian Blank for reporting. -- Damyan Ivanov Fri, 31 Oct 2008 14:00:39 +0200 libapache2-mod-perl2 (2.0.4-3) unstable; urgency=low * Add an alternative (and preferred) build-dependency on perl-modules (>= 5.10.0-14) to the libcgi-pm-perl one. This works around an sbuild bug (#395271) on the buildds. (Closes: #494677) -- Niko Tyni Mon, 15 Sep 2008 21:04:52 +0300 libapache2-mod-perl2 (2.0.4-2) unstable; urgency=medium * add explicit build-dependency on libcgi-pm-perl (>= 3.33) as the version of CGI.pm shipped in perl-modules fails with a taint failure when handling uploads. Thanks to Niko Tyni for the investigation. Closes: #480154 -- FTBFS on mips (cgiupload tests fail) - bump urgency to medium -- Damyan Ivanov Mon, 11 Aug 2008 12:27:28 +0300 libapache2-mod-perl2 (2.0.4-1ubuntu1) intrepid; urgency=low * Merge from debian unstable (LP: #230016), remaining changes: - Change locales-all to locales. (LP: #184206) * debian/control: - Update Maintainer and VCS-* fields. -- Mathias Gug Thu, 05 Jun 2008 19:21:01 -0400 libapache2-mod-perl2 (2.0.4-1) unstable; urgency=low [ Damyan Ivanov ] * New upstream release. Support to Perl 5.10 added. Closes: #479240 * Apache2::Reload was split in its own CPAN module, add libapache2-reload-perl to Recommends * Drop patches applied upstream + 005-regex-DoS-bug-433549.patch + 013-test-apache-status.patch + 015-nonvoid-return.patch * Drop Perl 5.10 related patches that are not needed now that upstream supports 5.10 + 010-svn-fix-bleadperl.patch + 011-svn-fix-perl5.10-build.patch + 012-svn-more-perl5.10-fixes.patch [ Niko Tyni ] * 008_fix_version_check_in_t_response_TestAPI_server_const_pm.patch: dropped, no longer needed. [ gregor herrmann ] * debian/copyright: deduct years of copyright from Changes. * Add /me to Uploaders. -- gregor herrmann Sun, 04 May 2008 00:43:47 +0200 libapache2-mod-perl2 (2.0.3-5) unstable; urgency=low * debian/rules: Improve the test suite coverage by setting APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf" so that Apache::Test parses the right apache2 configuration file. * debian/patches/030-apxs-no-prefix.patch: fix a resulting warning from apxs2 looking for CFG_PREFIX, which is not set on Debian. * debian/patches/031-test-extra-args.patch: honour APACHE_TEST_EXTRA_ARGS with the top level test suite too. -- Niko Tyni Wed, 12 Mar 2008 23:15:59 +0200 libapache2-mod-perl2 (2.0.3-4) unstable; urgency=low * debian/patches/015-nonvoid-return.patch: make modperl_thx_interp_get() always return a value, fixing undefined behaviour that led to a SIGBUS on sparc (Closes: #468327). * debian/patches/010-svn-fix-bleadperl.patch: add a null pointer reference fix from upstream SVN r481237. -- Niko Tyni Wed, 12 Mar 2008 14:53:51 +0200 libapache2-mod-perl2 (2.0.3-3) unstable; urgency=low [ gregor herrmann ] * debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser field (source stanza); Homepage field (source stanza). Removed: XS- Vcs-Svn fields. * debian/rules: delete /usr/share/perl5 only if it exists. [ Frank Lichtenheld ] * debian/rules: Fix some typos and some dependencies * debian/patches/009-allow-parallel-build.patch: Fix Makefile.PL to allow parallel building. Fixes a misbuild with dpkg-buildpackage -j found by Daniel Schepler. * Standards-Version: 3.7.3 (no changes) * debhelper compatibility level 6 [ Damyan Ivanov ] * add 011-svn-fix-perl5.10-build.patch. Closes: #462994 * debian/rules: + replace debian/stamp-patched with $(QUILT_STAMPFN) + make install-stamp depend on build-stamp, not build + remove commented-out cdbs make rules * Use http://perl.apache.org/ for Homepage * Reformat NEWS.Debian, following DevRef 6.3.4. Thanks, lintian. * Drop "-1" revision from dependencies. Thanks, lintian. * Add copyright information to debian/copyright [ Niko Tyni ] * Don't ship an empty /usr/bin directory. * Fix the 'clean' target, broken when Makefile.PL got unpatched. * Add myself to Uploaders. * debian/patches: + remove those Debian patches included upstream from the source package, as they had not been applied since 2.0.3-1. + 010-svn-fix-bleadperl.patch: more Perl 5.10 fixes from upstream SVN. + 012-svn-more-perl5.10-fixes.patch: as above. + 013-test-apache-status.patch: make the apache_status.t test work with Perl 5.10 too. Upstream SVN r614146. -- Niko Tyni Wed, 27 Feb 2008 22:43:01 +0200 libapache2-mod-perl2 (2.0.3-2ubuntu2) hardy; urgency=low * Really change locales-all to locales, this change didn't make it into the preceding upload. (LP: #184206) * Modify Maintainer value to match the DebianMaintainerField specification. -- Steve Langasek Sat, 23 Feb 2008 09:30:41 +0000 libapache2-mod-perl2 (2.0.3-2ubuntu1) hardy; urgency=low * Change locales-all to locales. (LP: #184206) * Change standards version to 3.7.3. -- Chuck Short Mon, 21 Jan 2008 08:45:06 -0500 libapache2-mod-perl2 (2.0.3-2) unstable; urgency=low [ Damyan Ivanov ] * Upload to unstable + Closes: #401737 -- Please package latest libapache2-mod-perl2 - Closes: #398675 -- Rejects configuration in a Perl configuration section that works fine as a regular configuration directive - Closes: #399639 -- Data pushed onto @PerlSections is ignored + Closes: #406742 -- clean rule does not clean properly + Closes: #357438 -- Apache2::Resource uses BSD::Resource [ Gunnar Wolf ] * Added netbase to build-dependencies, fixing FTBFS (Closes: #439281) -- Gunnar Wolf Wed, 29 Aug 2007 11:38:42 +0200 libapache2-mod-perl2 (2.0.3-1) experimental; urgency=low * New upstream release + refreshed patches 001-gtop2.patch 004-bugs-to-debian-bts.patch 005-regex-DoS-bug-433549.patch 006_man_section_and_build_warnings.patch - one hunk dropped + dropped patches applied upstream 002-crash-404051.patch -- applied upstream 003-segfault-local-ENV-bug-384622.patch -- applied upstream 007_test_head_content_length_on_empty_content_2.2.patch -- upstream contains better fix * Add dh_slibdeps to arch-dep target * Wrapped (Build-)Depends lists * Add testing to the build process + Added apache2, libcompress-zlib-perl and libbsd-resource-perl to Build-Depends to allow tests to be run on buildds + Put LANG=C in front of '$(MAKE) test' to avoid locale side effects (in dates etc) + Add locales-all to Build-Depends, since some of the tests need that + Add new 008_fix_version_check_in_t_response_TestAPI_server_const_pm.patch to fix the server_const test + Fail if $(MAKE) test fails + Add cleaning after tests to clean target -- Damyan Ivanov Wed, 22 Aug 2007 13:12:39 +0300 libapache2-mod-perl2 (2.0.2-6) UNRELEASED; urgency=low [ Gunnar Wolf ] * Added recommendation on libbsd-resource-perl (Closes: #357438) [ Damyan Ivanov ] * Transformed debian/rules from CDBS to debhelper * Converted patches from simple-patchsys to quilt Added quilt to Build-Depends * Add 007_test_head_content_length_on_empty_content_2.2.patch to adapt the content_length test to apache2.2 * Clean more files in clean target * Run $(MAKE) test, but don't abort if they fail * Add myself to Uploaders -- Damyan Ivanov Sun, 19 Aug 2007 19:12:34 +0300 libapache2-mod-perl2 (2.0.2-5) unstable; urgency=low * New Maintainer: the Debian pkg-perl group (Closes: #438168) * Updated copyright information including the copyright for the packaging information * Integrated the bugreport helper mp2bug to the /usr/share/bug way of life, so its output is automatically included in our users' reports * Bumping up standards-version from 3.6.1 to 3.7.2 (Only change needed: Moving mp2bug) * Added debian/watch * Moved libapache2-mod-perl2-doc to section: doc * the -dev and -doc generated binary packages are now arch: all insteaed of arch: any * Applied upstream patch fixing CVE-2007-1349 DoS caused by improperly quoted regex (Closes: #433549) * Moved the generated manpages from section 3 to 3pm * Finally, lintian- and linda-clean, yay! :D -- Gunnar Wolf Fri, 17 Aug 2007 18:27:25 -0500 libapache2-mod-perl2 (2.0.2-2.4) unstable; urgency=high * Non-maintainer upload. * High-urgency upload for RC bugfix. * Drop /etc/apache2/mods-available/perl.conf as a conffile, since it no longer contains anything of relevance; instead, manually remove the file on purge if present, and in the preinst handle upgrading it to remove the automatically created bits that conflict with apache2.2 so that this conversion is done in time for the apache2.2-mpm-* configuration to run. Closes: #416231. -- Steve Langasek Tue, 27 Mar 2007 01:48:55 -0700 libapache2-mod-perl2 (2.0.2-2.3) UNRELEASED; urgency=high * Non-maintainer upload. Thanks to Kjetil Kjernsmo for noticing the issues. * Fix segfault if localizing %ENV. Closes: #384622 Using patch from http://svn.apache.org/viewvc/perl/modperl/trunk/src/modules/perl/modperl_env.c?r1=158000&r2=357236&pathrev=357236 * Fix typo in Apache2::SizeLimit that could cause crash. Closes: #404051 -- Andreas Barth Sat, 23 Dec 2006 17:10:47 +0000 libapache2-mod-perl2 (2.0.2-2.2) unstable; urgency=medium * Non-maintainer upload. * Make it build against libapr1 (Closes: #391750). -- Luk Claes Mon, 16 Oct 2006 22:58:01 +0200 libapache2-mod-perl2 (2.0.2-2.1) unstable; urgency=medium * Non-maintainer upload. * Rebuild against Apache 2.2. (Closes: #389053) * Update dependency on apache2-common to apache2.2-common. -- Steinar H. Gunderson Sun, 8 Oct 2006 23:23:28 +0200 libapache2-mod-perl2 (2.0.2-2) unstable; urgency=low * Add a dependency on netbase (closes: #354777). -- Andres Salomon Sun, 12 Mar 2006 21:22:51 +0000 libapache2-mod-perl2 (2.0.2-1) unstable; urgency=low * New upstream release (closes: #342114). -- Andres Salomon Fri, 20 Jan 2006 19:35:43 +0000 libapache2-mod-perl2 (2.0.1-4) unstable; urgency=low * The I'm-tired-of-maintaining-stuff-I-don't-use release. * Build pod docs in the package; thanks to Morten Bøgeskov (closes: #329270). * Make perl.conf a bit more, umm, descriptive (closes: #323142). * Add a -doc package, include docs/ subdir in there (closes: #285588). * Kill a bashism in the postinst script. -- Andres Salomon Tue, 04 Oct 2005 00:36:16 -0400 libapache2-mod-perl2 (2.0.1-3) unstable; urgency=low * Grr. Really include perl.conf file; it got lost due to diff not wanting to add an empty file. -- Andres Salomon Fri, 12 Aug 2005 01:40:38 -0400 libapache2-mod-perl2 (2.0.1-2) unstable; urgency=low * "'cause she's the cheese and I'm the macaroni." * Add empty perl.conf file, to override older one from 1.99* (closes: #308252, #315676). -- Andres Salomon Sat, 23 Jul 2005 05:24:18 -0400 libapache2-mod-perl2 (2.0.1-1) unstable; urgency=low * New upstream release. No upstreams were harmed during the making of this package (closes: #307867). * Updated my email address. * Change perl build-dep version to >= 5.8.7-3, because I can. Oh, and (closes: #308604). -- Andres Salomon Thu, 23 Jun 2005 00:28:07 -0400 libapache2-mod-perl2 (1.999.23-1) unstable; urgency=low * New upstream release -- Thom May Sun, 8 May 2005 15:36:04 +0100 libapache2-mod-perl2 (1.999.22-1) unstable; urgency=low * New upstream release NOTE: This release breaks API. Please see Changes for further details. -- Thom May Wed, 20 Apr 2005 08:52:13 +0000 libapache2-mod-perl2 (1.999.21-1) unstable; urgency=low * New upstream release * Add -dev package, thanks Steinar H. Gunderson (Closes: #257506) * Steal new ACL patch from HEAD (Closes: #296650) -- Thom May Mon, 4 Apr 2005 15:47:46 +0100 libapache2-mod-perl2 (1.999.20-1) unstable; urgency=low * New upstream release (closes: #285476). * Drop 003-int_offset_my_ass.patch, as it was merged. * New release doesn't include those fun arch files (closes: #277461). -- Andres Salomon Mon, 10 Jan 2005 00:08:33 -0500 libapache2-mod-perl2 (1.99.14-4) unstable; urgency=high * Remove the LFS CFLAGS, and build-dep against apache2-*-dev (>= 2.0.50-10) as we're backing out of the apache2/apr ABI transition. -- Adam Conrad Thu, 19 Aug 2004 06:23:48 -0600 libapache2-mod-perl2 (1.99.14-3) unstable; urgency=medium * Add a patch to fix an upstream bug where we were passing offsets to apr functions using 'int' rather then 'apr_off_t' * Add "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" to CFLAGS. -- Adam Conrad Tue, 17 Aug 2004 04:02:17 -0600 libapache2-mod-perl2 (1.99.14-2) unstable; urgency=medium * Rebuild against new apache2/libapr0, w/ updated build-deps (closes: #266185). -- Andres Salomon Tue, 17 Aug 2004 01:10:41 -0400 libapache2-mod-perl2 (1.99.14-1) unstable; urgency=low * New upstream release * Ship perl.conf file with "PerlModule Apache2" in. (Closes: #240585, #242049, #235458) * Update copyright to new License * Using a2enmod to create symlinks (Closes: #247166) -- Thom May Sun, 4 Jul 2004 10:27:33 +0100 libapache2-mod-perl2 (1.99.12-4) unstable; urgency=low * Add a postinst/prerm that automatically enable/disable this module. * Update copyright file. -- Andres Salomon Sun, 29 Feb 2004 02:46:41 -0500 libapache2-mod-perl2 (1.99.12-3) unstable; urgency=low * Better ACL compatibility patch, courtesy of Damon Buckwalter . (Closes: #230439) -- Andres Salomon Fri, 13 Feb 2004 22:22:35 -0500 libapache2-mod-perl2 (1.99.12-2) unstable; urgency=low * Drop superfluous mod_perl manpage. (Closes: #231871) * Add ACL compatibility patch. -- Andres Salomon Tue, 10 Feb 2004 02:51:28 -0500 libapache2-mod-perl2 (1.99.12-1) unstable; urgency=low * New upstream release. * Drop 002-manpage_fix.patch (applied upstream). -- Andres Salomon Sun, 08 Feb 2004 03:44:54 -0500 libapache2-mod-perl2 (1.99.11-2) unstable; urgency=low * Remove libapache-mod-perl conflicts. (Closes: #223341) -- Andres Salomon Sun, 14 Dec 2003 22:47:52 -0500 libapache2-mod-perl2 (1.99.11-1) unstable; urgency=low * New upstream release. (Closes: #214073) * Move from experimental to unstable (*cross fingers*). * Convert build system to cdbs. * Update standards-version. * Fix TestTrace.pm manpage entry. (Closes: #221771) -- Andres Salomon Sat, 06 Dec 2003 19:23:29 -0500 libapache2-mod-perl2 (1.99.09-1) experimental; urgency=low * New upstream release. * Update (co-)maintainer email address. * Update standards-version. * Update build-deps (libgdbm{,g1}-dev and libgtop{1,2}-dev) and link rules. * Change reference to apxs back to apxs2. * No more examples? -- Andres Salomon Sat, 26 Jul 2003 01:29:05 -0400 libapache2-mod-perl2 (1.99.08-1) experimental; urgency=low * New upstream release. (Closes: #184301) * Add myself to the Uploaders field of control file. * Use newly renamed apache2 apxs. (Closes: #182577) * Update apache2-dev build-dep to 2.0.45 (for apr-config --includedir). * Change lib/Apache/Build.pm to use apr-config instead of apxs for the location of apr stuff. * Force removal of a bunch of additional (generated) files in clean rule. * Additional args to Makefile.PL. * Make /etc/apache2/mods-available/perl.load a conffile. -- Andres Salomon Sat, 12 Apr 2003 03:28:38 -0500 libapache2-mod-perl2 (1.99.07-1) experimental; urgency=low * New Upstream Release * Uploading to experimental for now. * First cut at packaging. -- Thom May Wed, 23 Oct 2002 16:17:27 +0100 debian/libapache2-mod-perl2.docs0000644000000000000000000000000712200354765013632 0ustar README