This is an automated email from the git hooks/post-receive script.
grinorcole-guest pushed a commit to branch master
in repository libapache-ssllookup-perl.
commit 69b71e46359102eb7f0776f67af995fb85a40170
Author: Christopher Hoskin <christopher.hos...@gmail.com>
Date: Sun Mar 15 11:24:26 2015 +0000
Patch to reintroduce MP_dTHX macro
---
debian/control | 17 +--
debian/copyright | 32 ++++--
debian/patches/MP_dTHX.patch | 253 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 7 +-
5 files changed, 291 insertions(+), 19 deletions(-)
diff --git a/debian/control b/debian/control
index 9677236..90acebe 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,12 @@ Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintain...@lists.alioth.debian.org>
Uploaders: Christopher Hoskin <christopher.hos...@gmail.com>
Build-Depends: debhelper (>= 9.20120312~),
- libmod-perl-perl,
+ libapache2-mod-perl2,
+ libapache2-mod-perl2-dev,
+# apache2-threaded-dev, #Needs to be apache2-dev for 2.4
+ apache2-dev,
+ libapr1-dev,
+ apache2,
perl
Standards-Version: 3.9.6
Vcs-Browser:
https://anonscm.debian.org/cgit/pkg-perl/packages/libapache-ssllookup-perl.git
@@ -15,10 +20,10 @@ Testsuite: autopkgtest-pkg-perl
Package: libapache-ssllookup-perl
Architecture: any
Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
- libmod-perl-perl
-Description: unknown
+ libapache2-mod-perl2
+Description: a glue layer between Perl handlers and the mod_ssl public API
Apache::SSLLookup is a glue layer between Perl handlers and the mod_ssl
- public API. under normal circumstances, you would use $r>subprocess_env() to
+ public API. Under normal circumstances, you would use $r->subprocess_env() to
glean information about mod_ssl. for example,
.
my $request_is_over_ssl = $r->subprocess_env('HTTPS');
@@ -27,7 +32,5 @@ Description: unknown
handlers can only accurately check the subprocess_env table for mod_ssl
information in the PerlResponsePhase or later.
.
- this module allows you to query mod_ssl directly via its public C API at any
+ This module allows you to query mod_ssl directly via its public C API at any
point in the request cycle. but without using C, of course.
- .
- This description was automagically extracted from the module by dh-make-perl.
diff --git a/debian/copyright b/debian/copyright
index 92001db..95fb0bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,20 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: https://metacpan.org/release/Apache-SSLLookup
-Upstream-Contact: unknown
+Upstream-Contact: Geoffrey Young <ge...@modperlcookbook.org>
Upstream-Name: Apache-SSLLookup
-DISCLAIMER: This copyright info was automatically extracted
- from the perl module. It may not be accurate, so you better
- check the module sources in order to ensure the module for its
- inclusion in Debian or for general legal information. Please,
- if licensing information is incorrectly generated, file a bug
- on dh-make-perl.
- NOTE: Don't forget to remove this disclaimer once you are happy
- with this file.
Files: *
-Copyright: unknown
-License:
+Copyright: 2004, Geoffrey Young <ge...@modperlcookbook.org>
+License: Artistic or GPL-1+
Files: debian/*
Copyright: 2015, Christopher Hoskin <christopher.hos...@gmail.com>
License: Artistic or GPL-1+
+Files: debian/patches/MP_dTHX.patch
+Copyright: 2002-2011, The Apache Software Foundation
+License: Apache-2.0
+
License: Artistic
This program is free software; you can redistribute it and/or modify
it under the terms of the Artistic License, which comes with Perl.
@@ -34,3 +30,17 @@ License: GPL-1+
.
On Debian systems, the complete text of version 1 of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL-1'.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License,
+ Version 2.0 can be found in `/usr/share/common-licenses/Apache-2.0'.
diff --git a/debian/patches/MP_dTHX.patch b/debian/patches/MP_dTHX.patch
new file mode 100644
index 0000000..281200a
--- /dev/null
+++ b/debian/patches/MP_dTHX.patch
@@ -0,0 +1,253 @@
+--- a/SSLLookup.xs
++++ b/SSLLookup.xs
+@@ -5,6 +5,8 @@
+ #include "mod_perl.h"
+ #include "modperl_xs_typedefs.h"
+
++#include "mpi/MP_dTHX.h"
++
+ typedef request_rec * Apache__SSLLookup;
+
+ APR_DECLARE_OPTIONAL_FN(char *, ssl_var_lookup,
+--- /dev/null
++++ b/mpi/LICENSE
+@@ -0,0 +1,202 @@
++
++ 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.
+--- /dev/null
++++ b/mpi/MP_dTHX.h
+@@ -0,0 +1,29 @@
++/* 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.
++ */
++
++/* Extracted from modperl_config.h by Christopher Hoskin, March 2015 */
++
++/* hopefully this macro will not need to be used often */
++#ifndef MP_dTHX
++#ifdef USE_ITHREADS
++# define MP_dTHX \
++ modperl_interp_t *interp = \
++ modperl_interp_select(r, r->connection, r->server); \
++ dTHXa(interp->perl)
++#else
++# define MP_dTHX dNOOP
++#endif
++#endif
+--- /dev/null
++++ b/mpi/NOTICE
+@@ -0,0 +1,2 @@
++This product includes software developed by
++The Apache Software Foundation (http://www.apache.org/).
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3da8fd7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+MP_dTHX.patch
diff --git a/debian/rules b/debian/rules
index 2d33f6a..5432a0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,9 @@
#!/usr/bin/make -f
+APR_INC := $(shell /usr/bin/apr-config --includedir)
+
+override_dh_auto_build:
+ dh_auto_build -- C_INCLUDE_PATH="$(APR_INC)"
+
%:
- dh $@
+ dh $@ --with apache2
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libapache-ssllookup-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
