[libgeo-ip-perl] 01/02: Add patch by Raphael Geissert to avoid error log noise under mod_perl

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository libgeo-ip-perl.

commit 811f833db057c9b155f667d7897507e59eb80643
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Oct 11 04:05:54 2014 +0200

    Add patch by Raphael Geissert to avoid error log noise under mod_perl
    
    Closes: #680321
---
 debian/changelog                  |  2 +
 debian/patches/no-constants.patch | 78 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 81 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c963de5..b6b714d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ libgeo-ip-perl (1.45-1) UNRELEASED; urgency=medium
   * Add myself as uploader to fix lintian warning no-human-maintainers
   * Bump Standards-Version to 3.9.6 (no changes needed)
   * Fix pkg-perl-specific lintian warning missing-testsuite-header
+  * Apply patch by Raphael Geissert to avoid error log noise under
+    mod_perl (Closes: #680321)
 
  -- Axel Beckert <abe at debian.org>  Sat, 11 Oct 2014 03:19:41 +0200
 
diff --git a/debian/patches/no-constants.patch b/debian/patches/no-constants.patch
new file mode 100644
index 0000000..e272f78
--- /dev/null
+++ b/debian/patches/no-constants.patch
@@ -0,0 +1,78 @@
+Description: Avoid error log noise under mod_perl
+Author: Raphael Geissert <geissert at debian.org>
+Reviewed-by: Axel Beckert <abe at debian.org>
+Last-Modified: 2014-10-11
+Bug-Debian: https://bugs.debian.org/680321
+
+Index: libgeo-ip-perl/lib/Geo/IP.pm
+===================================================================
+--- libgeo-ip-perl.orig/lib/Geo/IP.pm	2014-10-11 03:47:46.259401287 +0200
++++ libgeo-ip-perl/lib/Geo/IP.pm	2014-10-11 03:53:21.359196991 +0200
+@@ -43,40 +43,40 @@
+ 
+ require Geo::IP::Record;
+ 
+-sub GEOIP_STANDARD()     { 0; }    # PP
+-sub GEOIP_MEMORY_CACHE() { 1; }    # PP
+-sub GEOIP_CHECK_CACHE()  { 2; }
+-sub GEOIP_INDEX_CACHE()  { 4; }
+-sub GEOIP_MMAP_CACHE()   { 8; }    # PP
+-sub GEOIP_SILENCE()      { 16; }
+-
+-sub GEOIP_UNKNOWN_SPEED()   { 0; }    #PP
+-sub GEOIP_DIALUP_SPEED()    { 1; }    #PP
+-sub GEOIP_CABLEDSL_SPEED()  { 2; }    #PP
+-sub GEOIP_CORPORATE_SPEED() { 3; }    #PP
++sub GEOIP_STANDARD     { 0; }    # PP
++sub GEOIP_MEMORY_CACHE { 1; }    # PP
++sub GEOIP_CHECK_CACHE  { 2; }
++sub GEOIP_INDEX_CACHE  { 4; }
++sub GEOIP_MMAP_CACHE   { 8; }    # PP
++sub GEOIP_SILENCE      { 16; }
++
++sub GEOIP_UNKNOWN_SPEED   { 0; }    #PP
++sub GEOIP_DIALUP_SPEED    { 1; }    #PP
++sub GEOIP_CABLEDSL_SPEED  { 2; }    #PP
++sub GEOIP_CORPORATE_SPEED { 3; }    #PP
+ 
+ BEGIN {
+ 
+     #my $pp = !( defined &_XScompiled && &_XScompiled && !$TESTING_PERL_ONLY );
+     my $pp = !defined &open;
+ 
+-    sub GEOIP_COUNTRY_EDITION()        { 1; }
+-    sub GEOIP_CITY_EDITION_REV1()      { 2; }
+-    sub GEOIP_REGION_EDITION_REV1()    { 3; }
+-    sub GEOIP_ISP_EDITION()            { 4; }
+-    sub GEOIP_ORG_EDITION()            { 5; }
+-    sub GEOIP_CITY_EDITION_REV0()      { 6; }
+-    sub GEOIP_REGION_EDITION_REV0()    { 7; }
+-    sub GEOIP_PROXY_EDITION()          { 8; }
+-    sub GEOIP_ASNUM_EDITION()          { 9; }
+-    sub GEOIP_NETSPEED_EDITION()       { 10; }
+-    sub GEOIP_DOMAIN_EDITION()         { 11; }
+-    sub GEOIP_COUNTRY_EDITION_V6()     { 12; }
+-    sub GEOIP_ACCURACYRADIUS_EDITION() { 14; }
+-    sub GEOIP_NETSPEED_EDITION_REV1()  { 32; }
++    sub GEOIP_COUNTRY_EDITION        { 1; }
++    sub GEOIP_CITY_EDITION_REV1      { 2; }
++    sub GEOIP_REGION_EDITION_REV1    { 3; }
++    sub GEOIP_ISP_EDITION            { 4; }
++    sub GEOIP_ORG_EDITION            { 5; }
++    sub GEOIP_CITY_EDITION_REV0      { 6; }
++    sub GEOIP_REGION_EDITION_REV0    { 7; }
++    sub GEOIP_PROXY_EDITION          { 8; }
++    sub GEOIP_ASNUM_EDITION          { 9; }
++    sub GEOIP_NETSPEED_EDITION       { 10; }
++    sub GEOIP_DOMAIN_EDITION         { 11; }
++    sub GEOIP_COUNTRY_EDITION_V6     { 12; }
++    sub GEOIP_ACCURACYRADIUS_EDITION { 14; }
++    sub GEOIP_NETSPEED_EDITION_REV1  { 32; }
+ 
+-    sub GEOIP_CHARSET_ISO_8859_1() { 0; }
+-    sub GEOIP_CHARSET_UTF8()       { 1; }
++    sub GEOIP_CHARSET_ISO_8859_1 { 0; }
++    sub GEOIP_CHARSET_UTF8       { 1; }
+ 
+     #
+     sub api {
diff --git a/debian/patches/series b/debian/patches/series
index 5299247..29c31f8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 spelling.patch
+no-constants.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libgeo-ip-perl.git