--- libapache2-mod-perl2-2.0.4.orig/debian/rules +++ libapache2-mod-perl2-2.0.4/debian/rules @@ -0,0 +1,134 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +# If set to a true value then MakeMaker's prompt function will +# always return the default without waiting for user input. +export PERL_MM_USE_DEFAULT=1 + +ifndef PERL +PERL = /usr/bin/perl +endif + +TMP =$(CURDIR)/debian/tmp +LA2MP2 =$(CURDIR)/debian/libapache2-mod-perl2 + +# Allow disabling build optimation by setting noopt in +# $DEB_BUILD_OPTIONS +CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) + +.PHONY: build +build: build-stamp + +build-stamp: $(QUILT_STAMPFN) + dh_testdir + + # Add commands to compile the package here + $(PERL) Makefile.PL \ + INSTALLDIRS=vendor \ + MP_USE_GTOP=1 \ + MP_TRACE=0 \ + MP_USE_DSO=1 \ + MP_USE_STATIC=0 \ + MP_CCOPTS="-g -Wall" \ + MP_INCLUDE_DIR=/usr/include/apache2 \ + MP_APXS=/usr/bin/apxs2 \ + MP_INCLUDE_DIR=/usr/include/apr-1.0 + $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH="" + +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) + APACHE_TEST_EXTRA_ARGS="-httpd_conf /etc/apache2/apache2.conf" LANG=C $(MAKE) test +endif + + touch $@ + +.PHONY: clean +clean: unpatch + dh_testdir + dh_testroot + + dh_clean build-stamp install-stamp + + # Add commands to clean up after the build process here + + # unpatch modifies Makefile.PL, rendering Makefile out of date + if [ -f Makefile ] ; then touch Makefile && $(MAKE) realclean ; fi + + dh_clean .mypacklist Apache-Test/Makefile.old Apache-Test/t/REPORT \ + 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 + [ ! -d t/htdocs/hooks ] || rm -r t/htdocs/hooks + [ ! -d lib/Apache ] || rm -r lib/Apache + [ ! -d WrapXS ] || rm -r WrapXS + +.PHONY: install +install: install-stamp + +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + + $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr + + # As this is a architecture dependent package, we are not + # supposed to install stuff to /usr/share. MakeMaker creates + # the dirs, we delete them from the deb: + [ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5 + + touch $@ + +.PHONY: binary-indep +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installexamples -i + dh_installdocs -i + dh_installchangelogs -i Changes + dh_install -i + dh_perl -i + dh_compress -i + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +.PHONY: binary-arch +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdirs -a + dh_installexamples -a + dh_installdocs -a + dh_installchangelogs -a Changes + dh_install -a + mv $(LA2MP2)/usr/bin/mp2bug $(LA2MP2)/usr/share/libapache2-mod-perl2/ + rmdir --ignore-fail-on-non-empty --parents $(LA2MP2)/usr/bin/ + install -m755 debian/libapache2-mod-perl2.bug $(LA2MP2)/usr/share/bug/libapache2-mod-perl2 + dh_shlibdeps -a + dh_strip -a + dh_perl -a + dh_compress -a + dh_fixperms -a + dh_installdeb -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +.PHONY: binary +binary: binary-indep binary-arch --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.prerm +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "remove" ]; then + a2dismod perl || true +fi + +exit 0 --- libapache2-mod-perl2-2.0.4.orig/debian/watch +++ libapache2-mod-perl2-2.0.4/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://perl.apache.org/dist/mod_perl-([\d\.]+)\.tar\.gz --- libapache2-mod-perl2-2.0.4.orig/debian/README.source +++ libapache2-mod-perl2-2.0.4/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. --- libapache2-mod-perl2-2.0.4.orig/debian/copyright +++ libapache2-mod-perl2-2.0.4/debian/copyright @@ -0,0 +1,43 @@ +Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat + +Debianized-By: Thom May +Debianized-Date: Wed, 23 Oct 2002 16:21:08 +0100 + +Original-Source-Location: http://perl.apache.org/dist/ +Original-Source-Command: uscan --force + +Upstream-Author: mod_perl-2.0 was designed and written by Doug MacEachern, with + contributions from many others (see Changes files). + +Files: * +Copyright: © 2002-2008 Doug MacEachern +License: Apache-2.0 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + +Files: debian/* +Copyright: + © 2008 Niko Tyni + © 2007-2008 Gunnar Wolf + © 2007-2008 Damyan Ivanov + © 2003-2006 Andres Salomon + © 2002-2005 Thom May +License: Apache-2.0 + The packaging work is licensed under the same terms as the software itself. + +License: Apache-2.0 + On Debian systems the Apache License 2.0 can be found at + `/usr/share/common-licenses/Apache-2.0'. + --- libapache2-mod-perl2-2.0.4.orig/debian/control +++ libapache2-mod-perl2-2.0.4/debian/control @@ -0,0 +1,59 @@ +Source: libapache2-mod-perl2 +Section: httpd +Priority: optional +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Perl Group +Uploaders: Gunnar Wolf , Damyan Ivanov , + Niko Tyni , gregor herrmann +Standards-Version: 3.8.4 +Homepage: http://perl.apache.org/ +Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libapache2-mod-perl2/ +Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libapache2-mod-perl2/ +Build-Depends: perl (>= 5.8.7-3), libperl-dev (>= 5.8.7-3), + apache2-threaded-dev (>= 2.2.3) | apache2-prefork-dev (>= 2.2.3), + debhelper (>= 6), libwww-perl, libdevel-symdump-perl, libhtml-parser-perl, + libgdbm-dev, libgtop2-dev, quilt, apache2, libcompress-zlib-perl, + libbsd-resource-perl, locales, netbase, + perl (>= 5.10.0-14) | libcgi-pm-perl (>= 3.33) +Build-Conflicts: libapache2-mod-perl2 (<= 1.999.22-1) + +Package: libapache2-mod-perl2 +Architecture: any +Depends: ${misc:Depends}, apache2.2-common, ${perl:Depends}, libwww-perl, libmime-base64-perl, + libdevel-symdump-perl, liburi-perl, ${shlibs:Depends}, netbase, + apache2 (>= 2.2.4) | apache2-mpm-itk (>= 2.2.4) +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 +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} +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. --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.install +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/* +debian/tmp/usr/lib/* +debian/tmp/usr/share/* +src/modules/perl/mod_perl.so usr/lib/apache2/modules +debian/perl.load etc/apache2/mods-available --- libapache2-mod-perl2-2.0.4.orig/debian/perl.load +++ libapache2-mod-perl2-2.0.4/debian/perl.load @@ -0,0 +1 @@ +LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.bug +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.bug @@ -0,0 +1,6 @@ +#!/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 --- libapache2-mod-perl2-2.0.4.orig/debian/changelog +++ libapache2-mod-perl2-2.0.4/debian/changelog @@ -0,0 +1,555 @@ +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 + --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.preinst +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.preinst @@ -0,0 +1,19 @@ +#!/bin/sh +set -e + +CONFFILE=/etc/apache2/mods-available/perl.conf +CONFLINK=/etc/apache2/mods-enabled/perl.conf +if [ -n "$2" ] && [ -e "$CONFFILE" ] \ + && dpkg --compare-versions "$2" lt 2.0.2-2.4 +then + sed -i -e'/^[[:space:]]*PerlModule[[:space:]]\+Apache2[[:space:]]*/d' \ + $CONFFILE + if [ ! -s "$CONFFILE" ]; then + rm $CONFFILE + if [ -L "$CONFLINK" ]; then + rm $CONFLINK + fi + fi +fi + +#DEBHELPER# --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.postinst +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.postinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +if [ "$1" = "configure" ] && [ -z "$2" ]; then + a2enmod perl || true +fi + +exit 0 --- libapache2-mod-perl2-2.0.4.orig/debian/compat +++ libapache2-mod-perl2-2.0.4/debian/compat @@ -0,0 +1 @@ +6 --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.dirs +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.dirs @@ -0,0 +1,2 @@ +usr/share/libapache2-mod-perl2 +usr/share/bug --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2-doc.install +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2-doc.install @@ -0,0 +1 @@ +docs/* /usr/share/doc/libapache2-mod-perl2-doc --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.postrm +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.postrm @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +CONFFILE=/etc/apache2/mods-available/perl.conf +CONFLINK=/etc/apache2/mods-enabled/perl.conf + +if [ "$1" = "purge" ]; then + rm -f $CONFFILE +fi + +if [ "$1" = "upgrade" ] && dpkg --compare-versions "$2" lt 2.0.2-2.4 \ + && [ -e /etc/apache2/mods-enabled/perl.load ] +then + ln -s "$CONFFILE" "$CONFLINK" || true +fi + +#DEBHELPER# --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2.docs +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2.docs @@ -0,0 +1 @@ +README --- libapache2-mod-perl2-2.0.4.orig/debian/libapache2-mod-perl2-dev.install +++ libapache2-mod-perl2-2.0.4/debian/libapache2-mod-perl2-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/apache2/* +xs/*.h src/modules/perl/*.h usr/include/apache2 --- libapache2-mod-perl2-2.0.4.orig/debian/patches/110-Fix-two-uninitialized-value-warnings-triggered-with-.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/110-Fix-two-uninitialized-value-warnings-triggered-with-.patch @@ -0,0 +1,35 @@ +From d8e544ba57806daa88035fa75ea8e6acd7c9dc6a Mon Sep 17 00:00:00 2001 +From: Niko Tyni +Date: Tue, 20 Apr 2010 10:10:09 +0300 +Subject: [PATCH] Fix two uninitialized value warnings triggered with Perl 5.12.0 +Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread + +Perl 5.12.0 has new uninitialized value warnings for the various +lc* and uc* functions. These break the test suite: + + Failed test 14 in t/modules/apache_status.t at line 47 + Failed test 15 in t/modules/apache_status.t at line 47 fail #2 + +so short-circuit the variables to the empty string. +--- + lib/Apache2/Status.pm | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Apache2/Status.pm b/lib/Apache2/Status.pm +index 288531a..8bbebdb 100644 +--- a/lib/Apache2/Status.pm ++++ b/lib/Apache2/Status.pm +@@ -95,8 +95,8 @@ sub install_hint { + + sub status_config { + my ($r, $key) = @_; +- return (lc($r->dir_config($key)) eq "on") || +- (lc($r->dir_config('StatusOptionsAll')) eq "on"); ++ return (lc($r->dir_config($key) || "") eq "on") || ++ (lc($r->dir_config('StatusOptionsAll') || "") eq "on"); + } + + sub menu_item { +-- +1.7.0.4 + --- libapache2-mod-perl2-2.0.4.orig/debian/patches/100-svn-XSS-Status.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/100-svn-XSS-Status.patch @@ -0,0 +1,50 @@ +# Description: Fix XSS in Apache2::Status (CVE-2009-0796) +# Origin: http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/Status.pm?r1=607697&r2=760926&pathrev=761081&view=patch +# Bug-Debian: 567635 +--- a/lib/Apache2/Status.pm ++++ b/lib/Apache2/Status.pm +@@ -29,7 +29,7 @@ use File::Spec (); + + use Apache2::Const -compile => qw(OK); + +-$Apache2::Status::VERSION = '4.00'; # mod_perl 2.0 ++$Apache2::Status::VERSION = '4.01'; # mod_perl 2.0 + + use constant IS_WIN32 => ($^O eq "MSWin32"); + +@@ -126,7 +126,7 @@ sub handler { + $r->print(symdump($r, $qs)); + } + else { +- my $uri = $r->uri; ++ my $uri = $r->location; + $r->print('

'); + $r->print( + map { qq[$status{$_}
\n] } sort { lc $a cmp lc $b } keys %status +@@ -198,7 +198,7 @@ sub status_section_config { + sub status_inc { + my ($r) = @_; + +- my $uri = $r->uri; ++ my $uri = $r->location; + my @retval = ( + '', + "", +@@ -289,7 +289,7 @@ sub status_rgysubs { + my ($r) = @_; + + local $_; +- my $uri = $r->uri; ++ my $uri = $r->location; + my $cache = __PACKAGE__->registry_cache; + + my @retval = "

Compiled registry scripts grouped by their handler

"; +@@ -765,7 +765,7 @@ sub as_HTML { + my ($self, $package, $r) = @_; + + my @m = qw(
); +- my $uri = $r->uri; ++ my $uri = $r->location; + my $is_main = $package eq "main"; + + my $do_dump = has($r, "dumper"); --- libapache2-mod-perl2-2.0.4.orig/debian/patches/200_fix-pod-spelling-errors.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/200_fix-pod-spelling-errors.patch @@ -0,0 +1,220 @@ +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: 2010-04-20 + +--- a/Apache-Test/lib/Apache/TestConfig.pm ++++ b/Apache-Test/lib/Apache/TestConfig.pm +@@ -2221,8 +2221,8 @@ sub custom_config_add_conf_opts { + # the logic is quite complicated with 'httpd' and 'apxs', since + # one is enough to run the test suite, and we need to avoid the + # situation where both are saved in custom config but only one +- # (let's say httpd) is overriden by the command line /env var and +- # a hell may break loose if we take that overriden httpd value and ++ # (let's say httpd) is overridden by the command line /env var and ++ # a hell may break loose if we take that overridden httpd value and + # also use apxs from custom config which could point to a different + # server. So if there is an override of apxs or httpd, do not use + # the custom config for apxs or httpd. +--- a/Apache-Test/lib/Apache/TestRun.pm ++++ b/Apache-Test/lib/Apache/TestRun.pm +@@ -1456,7 +1456,7 @@ F (if duri + F<~/.apache-test/Apache/TestConfigData.pm> and + F in the perl's libraries. + +-C<$config_overriden> - that means that we have either C or ++C<$config_overridden> - that means that we have either C or + C values provided by user, via env vars or command line options. + + =over +@@ -1477,12 +1477,12 @@ bundles Apache-Test). + 3) make test + + if $config_exists +- if $config_overriden +- override saved options (for those that were overriden) ++ if $config_overridden ++ override saved options (for those that were overridden) + else + use saved options + else +- if $config_overriden ++ if $config_overridden + save them in lib/Apache/TestConfigData.pm + (which will be installed on 'make install') + else +@@ -1523,12 +1523,12 @@ F<~/.apache-test/Apache/TestConfigData.p + 3) make test + + if $config_exists +- if $config_overriden +- override saved options (for those that were overriden) ++ if $config_overridden ++ override saved options (for those that were overridden) + else + use saved options + else +- if $config_overriden ++ if $config_overridden + save them in $custom_config_path + else + - run interactive prompt for C and optionally for C +--- 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 +@@ -822,7 +822,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 +@@ -61,7 +61,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 --- libapache2-mod-perl2-2.0.4.orig/debian/patches/006_man_section_and_build_warnings.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/006_man_section_and_build_warnings.patch @@ -0,0 +1,18 @@ +Description: fix man section of the generated manpages + On Debian, manual pages about Perl modules need to nbe with '3pm' extension as + per Debian Perl policy. +Forwarded: not-needed +Author: Gunnar Wolf +Last-Update: 2007-08-18 + +--- 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)" + } + } --- libapache2-mod-perl2-2.0.4.orig/debian/patches/035-testrequest_add_credentials.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/035-testrequest_add_credentials.patch @@ -0,0 +1,18 @@ +# Closing bug #509457 triggered by libwww-perl 5.813 to 5.820 +# transition (thanks to Niko Tyni for the patch) +Index: libapache2-mod-perl2/Apache-Test/lib/Apache/TestRequest.pm +=================================================================== +--- libapache2-mod-perl2.orig/Apache-Test/lib/Apache/TestRequest.pm 2008-12-26 19:31:56.000000000 -0600 ++++ libapache2-mod-perl2/Apache-Test/lib/Apache/TestRequest.pm 2008-12-26 19:32:27.000000000 -0600 +@@ -256,6 +256,11 @@ + $self; + } + ++sub credentials { ++ my $self = shift; ++ return $self->get_basic_credentials(@_); ++} ++ + sub get_basic_credentials { + my($self, $realm, $uri, $proxy) = @_; + --- libapache2-mod-perl2-2.0.4.orig/debian/patches/009-allow-parallel-build.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/009-allow-parallel-build.patch @@ -0,0 +1,19 @@ +Description: allow building in parallel (make -j) + add some target inter-dependencies so that parallel building can be done +Forwarded: no +Author: Frank Lichtenheld +Last-Update: 2010-04-21 + +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -738,7 +738,9 @@ sub MY::install { + ModPerl::MM::add_dep_after(\$string, qw(install doc_install modperl_banner)); + + # glue_pods target must come first +- ModPerl::MM::add_dep(\$string, pure_install => 'glue_pods'); ++ ModPerl::MM::add_dep(\$string, pure_perl_install => 'glue_pods'); ++ ModPerl::MM::add_dep(\$string, pure_site_install => 'glue_pods'); ++ ModPerl::MM::add_dep(\$string, pure_vendor_install => 'glue_pods'); + + $string; + } --- libapache2-mod-perl2-2.0.4.orig/debian/patches/210_fix-pod-errors.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/210_fix-pod-errors.patch @@ -0,0 +1,25 @@ +Description: Fix POD errors +Forwarded: http://mail-archives.apache.org/mod_mbox/perl-modperl/201004.mbox/thread +Author: Damyan Ivanov +Last-Update: 2010-04-20 + +--- a/Apache-Test/lib/Apache/Test.pm ++++ b/Apache-Test/lib/Apache/Test.pm +@@ -936,6 +936,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(); +@@ -968,6 +970,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 --- libapache2-mod-perl2-2.0.4.orig/debian/patches/series +++ libapache2-mod-perl2-2.0.4/debian/patches/series @@ -0,0 +1,14 @@ +099-fix-url-on-index_top.patch +001-gtop2.patch +004-bugs-to-debian-bts.patch +006_man_section_and_build_warnings.patch +009-allow-parallel-build.patch +010-doc-no-more-send_http_header.patch +030-apxs-no-prefix.patch +031-test-extra-args.patch +035-testrequest_add_credentials.patch +100-svn-XSS-Status.patch +110-Fix-two-uninitialized-value-warnings-triggered-with-.patch +200_fix-pod-spelling-errors.patch +210_fix-pod-errors.patch +220_fix-bad-whatis-entry.patch --- libapache2-mod-perl2-2.0.4.orig/debian/patches/099-fix-url-on-index_top.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/099-fix-url-on-index_top.patch @@ -0,0 +1,18 @@ +# +# Description: Fix link present on doc/index_top.html page +# Author: Dario Minnucci +# +Index: libapache2-mod-perl2/docs/index_top.html +=================================================================== +--- libapache2-mod-perl2.orig/docs/index_top.html 2010-01-13 08:34:46.962368377 +0100 ++++ libapache2-mod-perl2/docs/index_top.html 2010-01-13 08:35:09.582367282 +0100 +@@ -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 ++ --- libapache2-mod-perl2-2.0.4.orig/debian/patches/001-gtop2.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/001-gtop2.patch @@ -0,0 +1,16 @@ +Description: link with gtop-2.0 +Forwarded: no +Author: Andres Salomon +Last-Update: 2010-04-21 + +--- a/lib/Apache2/Build.pm ++++ b/lib/Apache2/Build.pm +@@ -449,7 +449,7 @@ sub gtop_ldopts_old { + $xlibs .= ' -lintl'; + } + +- return " -lgtop -lgtop_sysdeps -lgtop_common $xlibs"; ++ return " -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0 $xlibs"; + } + + sub gtop_ldopts { --- libapache2-mod-perl2-2.0.4.orig/debian/patches/010-doc-no-more-send_http_header.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/010-doc-no-more-send_http_header.patch @@ -0,0 +1,13 @@ +# Trivial patch to remove a stale reference to send_http_header that is no +# longer available or necessary +# Closes Debian #507821 +--- 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 --- libapache2-mod-perl2-2.0.4.orig/debian/patches/031-test-extra-args.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/031-test-extra-args.patch @@ -0,0 +1,21 @@ +Honour $(APACHE_TEST_EXTRA_ARGS); Makefile.PL has apparently not been updated +since this was added to Apache::Test. +Index: libapache2-mod-perl2/Makefile.PL +=================================================================== +--- libapache2-mod-perl2.orig/Makefile.PL 2008-12-26 19:33:34.000000000 -0600 ++++ libapache2-mod-perl2/Makefile.PL 2008-12-26 19:33:37.000000000 -0600 +@@ -781,12 +781,12 @@ + + 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) + cd ModPerl-Registry && $(MAKE) test + + test :: pure_all run_tests test_clean --- libapache2-mod-perl2-2.0.4.orig/debian/patches/220_fix-bad-whatis-entry.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/220_fix-bad-whatis-entry.patch @@ -0,0 +1,19 @@ +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: 2010-04-20 + +--- 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. + --- libapache2-mod-perl2-2.0.4.orig/debian/patches/030-apxs-no-prefix.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/030-apxs-no-prefix.patch @@ -0,0 +1,14 @@ +As a comment inside apxs2 indicates: +# Debian doesn't have a CFG_PREFIX [...] +so use SYSCONFDIR instead to shut up apxs warnings. +--- a/Apache-Test/lib/Apache/TestConfigParse.pm ++++ b/Apache-Test/lib/Apache/TestConfigParse.pm +@@ -86,7 +86,7 @@ sub server_file_rel2abs { + 'user-supplied $base' ], + [ $self->{inherit_config}->{ServerRoot}, + 'httpd.conf inherited ServerRoot' ], +- [ $self->apxs('PREFIX'), ++ [ $self->apxs('SYSCONFDIR'), + 'apxs-derived ServerRoot' ]); + + # remove surrounding quotes if any --- libapache2-mod-perl2-2.0.4.orig/debian/patches/004-bugs-to-debian-bts.patch +++ libapache2-mod-perl2-2.0.4/debian/patches/004-bugs-to-debian-bts.patch @@ -0,0 +1,21 @@ +Description: direct bug reports to Debian BTS +Forwarded: not-needed +Author: Gunnar Wolf +Last-Update: 2010-04-21 + +--- 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;