Revert r691: Use File::MMagic::XS since it has now been packaged.

File::MMagic::XS corrupted the heap and crashed Apache when I tested it under mod_perl.

diff --git a/debian/control b/debian/control
index 18b24d2b423d9caf01f1cdaedf5faee29463e956..54b8f94aa05a695e4178cfc4dfb3ef9a29575693 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends-Indep: perl (>= 5.6.0-16),
  libtemplate-plugin-class-perl,
  libtest-mockmodule-perl,
  libdigest-perl,
- libfile-mmagic-xs-perl,
+ libfile-mmagic-perl,
  libclass-dbi-plugin-type-perl,
  libclass-accessor-perl,
  libclass-data-inheritable-perl,

diff --git a/debian/patches/201_no-file-mmagic-xs.diff b/debian/patches/201_no-file-mmagic-xs.diff
new file mode 100644 (file)
index 0000000..91f3c0e
--- /dev/null
+++ b/debian/patches/201_no-file-mmagic-xs.diff
@@ -0,0 +1,26 @@
+--- maypole.orig/lib/Maypole.pm
++++ maypole/lib/Maypole.pm
+@@ -10,10 +10,10 @@
+ use URI();
+ use URI::QueryParam;
+ use NEXT;
+-use File::MMagic::XS qw(:compat);
++use File::MMagic;
+ 
+ our $VERSION = '2.13';
+-our $mmagic = File::MMagic::XS->new();
++our $mmagic = File::MMagic->new();
+ 
+ # proposed privacy conventions:
+ # - no leading underscore     - public to custom application code and plugins
+--- maypole.orig/Makefile.PL
++++ maypole/Makefile.PL
+@@ -26,7 +26,7 @@
+         Template::Plugin::Class          => 0,
+         Test::MockModule                 => 0,
+         Digest::MD5                    => 0,
+-      File::MMagic::XS                 => 0.08,
++      File::MMagic                     => 1.21,
+       Class::DBI::Plugin::Type         => 0,
+     },    # e.g., Module::Name => 1.1
+     (

diff --git a/debian/patches/series b/debian/patches/series
index 9221ee40c673b8f3e514661bdeff716adda7140e..dd06d33f6feb86fad8eded6c4e6a8a9932f966bb 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 103_fix-view_object-warning.diff
 106_fix-_column_info-clash.diff
 108_fix-uris.diff
+201_no-file-mmagic-xs.diff
 202_fix-example-references.diff