r6842 - in /trunk/libapache2-mod-perl2: debian/ debian/patches/ lib/Apache2/

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Fri Aug 17 15:13:14 UTC 2007


Author: gwolf
Date: Fri Aug 17 15:13:14 2007
New Revision: 6842

URL: http://svn.debian.org/wsvn/?sc=1&rev=6842
Log:
[svn-inject] Applying Debian modifications to trunk

Added:
    trunk/libapache2-mod-perl2/debian/
    trunk/libapache2-mod-perl2/debian/NEWS.Debian
    trunk/libapache2-mod-perl2/debian/changelog
    trunk/libapache2-mod-perl2/debian/compat
    trunk/libapache2-mod-perl2/debian/control
    trunk/libapache2-mod-perl2/debian/copyright
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-dev.dirs
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.dirs
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.dirs
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.docs
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postinst
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postrm
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.preinst
    trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.prerm
    trunk/libapache2-mod-perl2/debian/patches/
    trunk/libapache2-mod-perl2/debian/patches/001-gtop2.patch
    trunk/libapache2-mod-perl2/debian/patches/002-crash-404051.patch
    trunk/libapache2-mod-perl2/debian/patches/03-384622.patch
    trunk/libapache2-mod-perl2/debian/perl.load
    trunk/libapache2-mod-perl2/debian/rules   (with props)
    trunk/libapache2-mod-perl2/lib/Apache2/BuildConfig.pm

Added: trunk/libapache2-mod-perl2/debian/NEWS.Debian
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/NEWS.Debian?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/NEWS.Debian (added)
+++ trunk/libapache2-mod-perl2/debian/NEWS.Debian Fri Aug 17 15:13:14 2007
@@ -1,0 +1,17 @@
+libapache2-mod-perl2 (1.999.23-1) unstable; urgency=low
+
+ This version is utterly incompatible with all previous ones. Please read the 
+ Changes file for further information on how to proceed with upgrading your
+ applications to the new APIs.
+
+ -- Thom May <thom at debian.org>  Sun,  8 May 2005 15:36:04 +0100
+
+libapache2-mod-perl2 (1.99.14-1) unstable; urgency=low
+
+ We now ship a perl.conf file that will be loaded on import. This file contains:
+ "PerlModule Apache2", as recommended at 
+ http://perl.apache.org/docs/2.0/user/config/config.html#Accessing_the_mod_perl_2_0_Modules
+ If you use a startup file, you should comment out this line in 
+ /etc/apache2/mods-available/perl.conf .
+
+ -- Thom May <thom at debian.org>  Sun,  4 Jul 2004 10:27:33 +0100

Added: trunk/libapache2-mod-perl2/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/changelog?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/changelog (added)
+++ trunk/libapache2-mod-perl2/debian/changelog Fri Aug 17 15:13:14 2007
@@ -1,0 +1,222 @@
+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 <vorlon at debian.org>  Tue, 27 Mar 2007 01:48:55 -0700
+
+libapache2-mod-perl2 (2.0.2-2.3) unstable; 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 <aba at not.so.argh.org>  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 <luk at debian.org>  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 <sesse at debian.org>  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 <dilinger at debian.org>  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 <dilinger at debian.org>  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 <morten at bogeskov.dk> (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 <dilinger at debian.org>  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 <dilinger at debian.org>  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 <dilinger at debian.org>  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 <dilinger at debian.org>  Thu, 23 Jun 2005 00:28:07 -0400
+
+libapache2-mod-perl2 (1.999.23-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Thom May <thom at debian.org>  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 <thom at debian.org>  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 <thom at debian.org>  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 <dilinger at voxel.net>  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 <adconrad at 0c3.net>  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 <adconrad at 0c3.net>  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 <dilinger at voxel.net>  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 <thom at debian.org>  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 <dilinger at voxel.net>  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
+    <damon at cryptomeme.com>.  (Closes: #230439)
+
+ -- Andres Salomon <dilinger at voxel.net>  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 <dilinger at voxel.net>  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 <dilinger at voxel.net>  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 <dilinger at voxel.net>  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 <dilinger at voxel.net>  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 <dilinger at voxel.net>  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 <dilinger at mp3revolution.net>  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 <thom at debian.org>  Wed, 23 Oct 2002 16:17:27 +0100

Added: trunk/libapache2-mod-perl2/debian/compat
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/compat?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/compat (added)
+++ trunk/libapache2-mod-perl2/debian/compat Fri Aug 17 15:13:14 2007
@@ -1,0 +1,1 @@
+4

Added: trunk/libapache2-mod-perl2/debian/control
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/control?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/control (added)
+++ trunk/libapache2-mod-perl2/debian/control Fri Aug 17 15:13:14 2007
@@ -1,0 +1,43 @@
+Source: libapache2-mod-perl2
+Section: web
+Priority: optional
+Maintainer: Thom May <thom at debian.org>
+Uploaders: Andres Salomon <dilinger at debian.org>
+Standards-Version: 3.6.1
+Build-Depends: perl (>= 5.8.7-3), libperl-dev (>= 5.8.7-3), apache2-threaded-dev (>= 2.2.3-1) | apache2-prefork-dev (>= 2.2.3-1), debhelper (>> 4.1.0), libwww-perl, libdevel-symdump-perl, libhtml-parser-perl, libgdbm-dev, libgtop2-dev, cdbs
+Build-Conflicts: libapache2-mod-perl2 (<= 1.999.22-1)
+
+Package: libapache2-mod-perl2
+Architecture: any
+Depends: apache2.2-common, ${perl:Depends}, libwww-perl, libmime-base64-perl, libdevel-symdump-perl, liburi-perl, ${shlibs:Depends}, netbase
+Description: Integration of perl with the Apache2 web server
+ mod_perl allows the use of Perl for just about anything
+ Apache-related, including <Perl> 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: any
+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 <Perl> 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: any
+Description: Integration of perl with the Apache2 web server - documentation
+ mod_perl allows the use of Perl for just about anything
+ Apache-related, including <Perl> sections in the config
+ files and the famous Apache::Registry module for caching
+ compiled scripts.
+ .
+ This package contains additional documentation for mod_perl.

Added: trunk/libapache2-mod-perl2/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/copyright?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/copyright (added)
+++ trunk/libapache2-mod-perl2/debian/copyright Fri Aug 17 15:13:14 2007
@@ -1,0 +1,210 @@
+This package was debianized by Thom May on
+Wed, 23 Oct 2002 16:21:08 +0100.
+
+This package is also maintained by Andres Salomon <dilinger at debian.org>
+
+It was downloaded from http://perl.apache.org/dist/
+
+Copyright:
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-dev.dirs
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-dev.dirs?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-dev.dirs (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-dev.dirs Fri Aug 17 15:13:14 2007
@@ -1,0 +1,1 @@
+usr/include/apache2

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.dirs
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.dirs?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.dirs (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.dirs Fri Aug 17 15:13:14 2007
@@ -1,0 +1,1 @@
+usr/share/doc/libapache2-mod-perl2-doc

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2-doc.install Fri Aug 17 15:13:14 2007
@@ -1,0 +1,1 @@
+docs/* /usr/share/doc/libapache2-mod-perl2-doc

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.dirs
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.dirs?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.dirs (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.dirs Fri Aug 17 15:13:14 2007
@@ -1,0 +1,6 @@
+usr/lib/apache2/modules
+usr/lib/perl5
+usr/lib/perl5/Apache
+usr/lib/perl5/Bundle
+usr/man/man3
+etc/apache2/mods-available

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.docs
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.docs?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.docs (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.docs Fri Aug 17 15:13:14 2007
@@ -1,0 +1,3 @@
+debian/NEWS.Debian
+Changes
+README 

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postinst
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postinst?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postinst (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postinst Fri Aug 17 15:13:14 2007
@@ -1,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+        a2enmod perl || true
+fi
+
+exit 0

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postrm
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postrm?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postrm (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.postrm Fri Aug 17 15:13:14 2007
@@ -1,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#

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.preinst
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.preinst?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.preinst (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.preinst Fri Aug 17 15:13:14 2007
@@ -1,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#

Added: trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.prerm
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.prerm?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.prerm (added)
+++ trunk/libapache2-mod-perl2/debian/libapache2-mod-perl2.prerm Fri Aug 17 15:13:14 2007
@@ -1,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ]; then
+	a2dismod perl || true
+fi
+
+exit 0

Added: trunk/libapache2-mod-perl2/debian/patches/001-gtop2.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/001-gtop2.patch?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/001-gtop2.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/001-gtop2.patch Fri Aug 17 15:13:14 2007
@@ -1,0 +1,11 @@
+--- lib/Apache2/Build.pm.orig	2005-04-20 08:55:55.806157776 +0000
++++ lib/Apache2/Build.pm	2005-04-20 08:56:28.165238448 +0000
+@@ -419,7 +419,7 @@
+         $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 {

Added: trunk/libapache2-mod-perl2/debian/patches/002-crash-404051.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/002-crash-404051.patch?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/002-crash-404051.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/002-crash-404051.patch Fri Aug 17 15:13:14 2007
@@ -1,0 +1,11 @@
+--- lib/Apache2/SizeLimit.pm~	2005-10-21 00:04:43.000000000 +0000
++++ lib/Apache2/SizeLimit.pm	2006-12-23 17:13:33.000000000 +0000
+@@ -110,7 +110,7 @@
+ sub linux_smaps_size_check {
+ 
+     my $s = Linux::Smaps->new($$)->all;
+-    return ($s->size, $s->shared_cleani + $s->shared_dirty);
++    return ($s->size, $s->shared_clean + $s->shared_dirty);
+ }
+ 
+ # return process size (in KB)

Added: trunk/libapache2-mod-perl2/debian/patches/03-384622.patch
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/patches/03-384622.patch?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/patches/03-384622.patch (added)
+++ trunk/libapache2-mod-perl2/debian/patches/03-384622.patch Fri Aug 17 15:13:14 2007
@@ -1,0 +1,38 @@
+--- src/modules/perl/modperl_env.c   2005/03/18 00:59:38
++++ src/modules/perl/modperl_env.c   2005/12/16 21:20:23
+@@ -15,8 +15,13 @@
+
+ #include "mod_perl.h"
+
+-#define EnvMgObj SvMAGIC((SV*)ENVHV)->mg_ptr
+-#define EnvMgLen SvMAGIC((SV*)ENVHV)->mg_len
++#define EnvMgOK  ((SV*)ENVHV && SvMAGIC((SV*)ENVHV))
++#define EnvMgObj (EnvMgOK ? SvMAGIC((SV*)ENVHV)->mg_ptr : NULL)
++#define EnvMgLen (EnvMgOK ? SvMAGIC((SV*)ENVHV)->mg_len : 0)
++#define EnvMgObjSet(val){ \
++    if (EnvMgOK) SvMAGIC((SV*)ENVHV)->mg_ptr = (char *)val;}
++#define EnvMgLenSet(val) {\
++    if (EnvMgOK) SvMAGIC((SV*)ENVHV)->mg_len = val;}
+
+ /* XXX: move to utils? */
+ static unsigned long modperl_interp_address(pTHX)
+@@ -401,8 +406,8 @@
+
+ void modperl_env_request_tie(pTHX_ request_rec *r)
+ {
+-    EnvMgObj = (char *)r;
+-    EnvMgLen = -1;
++    EnvMgObjSet(r);
++    EnvMgLenSet(-1);
+
+ #ifdef MP_PERL_HV_GMAGICAL_AWARE
+     MP_TRACE_e(MP_FUNC, "[%s/0x%lx] tie %%ENV, $r\n\t (%s%s)",
+@@ -414,7 +419,7 @@
+
+ void modperl_env_request_untie(pTHX_ request_rec *r)
+ {
+-    EnvMgObj = NULL;
++    EnvMgObjSet(NULL);
+
+ #ifdef MP_PERL_HV_GMAGICAL_AWARE
+     MP_TRACE_e(MP_FUNC, "[%s/0x%lx] untie %%ENV; # from r\n\t (%s%s)",

Added: trunk/libapache2-mod-perl2/debian/perl.load
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/perl.load?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/perl.load (added)
+++ trunk/libapache2-mod-perl2/debian/perl.load Fri Aug 17 15:13:14 2007
@@ -1,0 +1,1 @@
+LoadModule perl_module /usr/lib/apache2/modules/mod_perl.so

Added: trunk/libapache2-mod-perl2/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/debian/rules?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/debian/rules (added)
+++ trunk/libapache2-mod-perl2/debian/rules Fri Aug 17 15:13:14 2007
@@ -1,0 +1,31 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/class/perlmodule.mk
+
+DEB_MAKE_CHECK_TARGET =
+DEB_MAKE_BUILD_TARGET = all glue_pods
+DEB_MAKE_INSTALL_TARGET = install_vendor PREFIX=debian/libapache2-mod-perl2/usr
+
+DEB_MAKEMAKER_USER_FLAGS := 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
+
+		#deleted for new build
+		#MP_AP_PREFIX=/usr \
+
+install/libapache2-mod-perl2::
+	install $(CURDIR)/src/modules/perl/mod_perl.so debian/libapache2-mod-perl2/usr/lib/apache2/modules/mod_perl.so
+	install -m644 $(CURDIR)/debian/perl.load debian/libapache2-mod-perl2/etc/apache2/mods-available
+	rm -rf debian/libapache2-mod-perl2/usr/man
+	rm -f debian/libapache2-mod-perl2/usr/share/man/man3/mod_perl.3pm
+
+install/libapache2-mod-perl2-dev::
+	install -m644 $(CURDIR)/xs/*.h debian/libapache2-mod-perl2-dev/usr/include/apache2
+	install -m644 $(CURDIR)/src/modules/perl/*.h debian/libapache2-mod-perl2-dev/usr/include/apache2

Propchange: trunk/libapache2-mod-perl2/debian/rules
------------------------------------------------------------------------------
    svn:executable = *

Added: trunk/libapache2-mod-perl2/lib/Apache2/BuildConfig.pm
URL: http://svn.debian.org/wsvn/trunk/libapache2-mod-perl2/lib/Apache2/BuildConfig.pm?rev=6842&op=file
==============================================================================
--- trunk/libapache2-mod-perl2/lib/Apache2/BuildConfig.pm (added)
+++ trunk/libapache2-mod-perl2/lib/Apache2/BuildConfig.pm Fri Aug 17 15:13:14 2007
@@ -1,0 +1,67 @@
+# 
+# /*
+#  * *********** WARNING **************
+#  * This file generated by Apache2::Build/0.01
+#  * Any changes made here will be lost
+#  * ***********************************
+#  * 01: lib/ModPerl/Code.pm:708
+#  * 02: lib/Apache2/Build.pm:924
+#  * 03: lib/Apache2/Build.pm:944
+#  * 04: Makefile.PL:313
+#  * 05: Makefile.PL:56
+#  */
+# 
+package Apache2::BuildConfig;
+
+use Apache2::Build ();
+
+sub new {
+    bless( {
+        'API_VERSION' => 2,
+        'APXS_APR_BINDIR' => '/usr/bin',
+        'APXS_BINDIR' => '/usr/bin',
+        'APXS_INCLUDEDIR' => '/usr/include/apache2',
+        'MP_APR_LIB' => 'aprext',
+        'MP_APXS' => '/usr/bin/apxs2',
+        'MP_CCOPTS' => '-g -Wall',
+        'MP_COMPAT_1X' => 1,
+        'MP_GENERATE_XS' => 1,
+        'MP_INCLUDE_DIR' => '/usr/include/apache2 /usr/include/apr-0',
+        'MP_LIBNAME' => 'mod_perl',
+        'MP_TRACE' => '0',
+        'MP_USE_DSO' => '1',
+        'MP_USE_GTOP' => '1',
+        'MP_USE_STATIC' => '0',
+        'VERSION' => '2.0.2',
+        'ap_includedir' => '/usr/include/apache2',
+        'apr_bindir' => '/usr/bin',
+        'apr_config' => {
+                          'HAS_DSO' => '1',
+                          'HAS_FORK' => '1',
+                          'HAS_INLINE' => '1',
+                          'HAS_LARGE_FILES' => '0',
+                          'HAS_MMAP' => '1',
+                          'HAS_RANDOM' => '1',
+                          'HAS_SENDFILE' => '1',
+                          'HAS_THREADS' => '1'
+                        },
+        'apr_config_path' => '/usr/bin/apr-config',
+        'apr_includedir' => '/usr/include/apr-0',
+        'cwd' => '/mod_perl-2.0.2',
+        'dir' => undef,
+        'file_build_config' => 'lib/Apache2/BuildConfig.pm',
+        'file_ldopts' => 'src/modules/perl/ldopts',
+        'file_makefile' => 'src/modules/perl/Makefile',
+        'httpd_is_source_tree' => '',
+        'httpd_version' => {
+                             '/usr/include/apache2' => '2.0.55'
+                           },
+        'libpth' => [
+                      '/usr/local/lib',
+                      '/lib',
+                      '/usr/lib'
+                    ]
+      }, 'Apache2::Build' );
+}
+
+1;




More information about the Pkg-perl-cvs-commits mailing list