[packages/swish-e] - avoid namespace pollution, patch from debian
baggins
baggins at pld-linux.org
Tue Sep 16 00:01:25 CEST 2014
commit af66a6b25d3b8faf686432d30a953a29a48a6a80
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Sep 16 00:01:11 2014 +0200
- avoid namespace pollution, patch from debian
namespace.patch | 30 ++++++++++++++++++++++++++++++
swish-e.spec | 2 ++
2 files changed, 32 insertions(+)
---
diff --git a/swish-e.spec b/swish-e.spec
index 75375f9..f94c19f 100644
--- a/swish-e.spec
+++ b/swish-e.spec
@@ -12,6 +12,7 @@ Group: Applications/Text
Source0: http://swish-e.org/swish-daily/%{name}-%{version}-%{snap}.tar.gz
# Source0-md5: c6b918413382ff61eb5e224c8b4c6f7d
Patch0: format-security.patch
+Patch1: namespace.patch
URL: http://swish-e.org/
#Icon: swish-e.xpm
BuildRequires: libxml2-devel
@@ -144,6 +145,7 @@ Biblioteka statyczna dla swish-e.
%prep
%setup -q -n %{name}-%{version}-%{snap}
%patch0 -p1
+%patch1 -p1
%build
%configure \
diff --git a/namespace.patch b/namespace.patch
new file mode 100644
index 0000000..3e49d6b
--- /dev/null
+++ b/namespace.patch
@@ -0,0 +1,30 @@
+--- swish-e-2.4.7.orig/perl/API.pm
++++ swish-e-2.4.7/perl/API.pm
+@@ -2,7 +2,7 @@
+
+ # $Id: API.pm 2499 2009-10-04 03:34:07Z karpet $
+
+-use vars qw/ @ISA $VERSION /;
++use vars qw/ @ISA $VERSION/;
+
+ $VERSION = '0.04_01';
+
+@@ -31,7 +31,17 @@
+ return $m;
+ }
+
+-CL: for my $class ( grep { m/::$/ } keys %SWISH::API:: )
++# Fix for Debian Bug #422609
++ at moduleslist = (
++ "MetaName::",
++ "Search::",
++ "PropertyName::",
++ "Results::",
++ "FuzzyWord::",
++ "Result::",
++);
++
++CL: for my $class ( @moduleslist )
+ {
+ local *c = $SWISH::API::{$class};
+ METH: foreach my $meth ( keys %c ) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/swish-e.git/commitdiff/af66a6b25d3b8faf686432d30a953a29a48a6a80
More information about the pld-cvs-commit
mailing list