This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository libapache2-mod-perl2.
commit 48f9df4460921308c87e5ffd72be1a9d88931338 Author: gregor herrmann <[email protected]> Date: Wed Jul 9 23:15:04 2014 +0200 Add patch to make Linux::Pid conditional in Apache::SizeLimit. Thanks: Guillem Jover for the patch. Closes: #684290 --- .../patches/360-conditional-linux-pid-module.patch | 27 ++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 28 insertions(+) diff --git a/debian/patches/360-conditional-linux-pid-module.patch b/debian/patches/360-conditional-linux-pid-module.patch new file mode 100644 index 0000000..7da31f2 --- /dev/null +++ b/debian/patches/360-conditional-linux-pid-module.patch @@ -0,0 +1,27 @@ +Description: Fallback to use native perl getppid() if Linux::Pid is not present +Author: Guillem Jover <[email protected]> +Origin: vendor +Bug-Debian: http://bugs.debian.org/684290 +Forwarded: no +Last-Update: 2014-07-04 + + +--- a/Apache-SizeLimit/lib/Apache/SizeLimit/Core.pm ++++ b/Apache-SizeLimit/lib/Apache/SizeLimit/Core.pm +@@ -139,10 +139,12 @@ + *_platform_getppid = \&_perl_getppid; + } + elsif ($Config{'osname'} eq 'linux') { +- _load('Linux::Pid'); +- +- *_platform_getppid = \&_linux_getppid; +- ++ if (eval { require Linux::Pid }) { ++ *_platform_getppid = \&_linux_getppid; ++ } ++ else { ++ *_platform_getppid = \&_perl_getppid; ++ } + if (eval { require Linux::Smaps && Linux::Smaps->new($$) }) { + $USE_SMAPS = 1; + *_platform_check_size = \&_linux_smaps_size_check; diff --git a/debian/patches/series b/debian/patches/series index 5a77abd..bb7c9f1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ avoid-db-linkage.patch #330-mod_authz_core.patch 340-rewrite-2.4.patch 350-ap-test-apache24-define.patch +360-conditional-linux-pid-module.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libapache2-mod-perl2.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
