[mhonarc] add patch (based on debian patch) that:

jamatos jamatos at fedoraproject.org
Mon Apr 14 21:25:59 UTC 2014 

commit d2246407de36a536ac97c9b9a43178e0aaf9ea18
Author: José Matos <jamatos at fedoraproject.org>
Date:   Mon Apr 14 22:25:44 2014 +0100

    add patch (based on debian patch) that:
    
    -   removes some deprecation warning (bz 901351)
    -   adds some Microsoft Office 2007 mime types
    -   adds some hardening

 .gitignore           |    2 +-
 mhonarc-2.6.18.patch |  126 ++++++++++++++++++++++++++++++++++++++++++++++++++
 mhonarc.spec         |   13 +++++-
 3 files changed, 139 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4354f6d..5ef1d7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-MHonArc-2.6.16.tar.bz2
+clog
 /MHonArc-2.6.18.tar.bz2
diff --git a/mhonarc-2.6.18.patch b/mhonarc-2.6.18.patch
new file mode 100644
index 0000000..12df05c
--- /dev/null
+++ b/mhonarc-2.6.18.patch
@@ -0,0 +1,126 @@
+--- mhonarc-2.6.18.orig/install.me
++++ mhonarc-2.6.18/install.me
+@@ -255,6 +255,7 @@
+ 		   noman
+ 		   perl=s
+ 		   prefix=s
++		   instprefix=s
+ 
+ 		   help));
+ 
+@@ -430,6 +431,10 @@
+     my $plprefix  = "#!$OptValues{'perl'}\n";
+        $plprefix .= "use lib qw($OptValues{'libpath'});\n"
+ 		    if $OptValues{'libpath'};
++    $OptValues{'instprefix'} and $OptValues{'binpath'} = join ('', $OptValues{'instprefix'}, $OptValues{'binpath'});
++    $OptValues{'instprefix'} and $OptValues{'libpath'} = join ('', $OptValues{'instprefix'}, $OptValues{'libpath'});
++    $OptValues{'instprefix'} and $OptValues{'docpath'} = join ('', $OptValues{'instprefix'}, $OptValues{'docpath'});
++    $OptValues{'instprefix'} and $OptValues{'manpath'} = join ('', $OptValues{'instprefix'}, $OptValues{'manpath'});
+     my($file, $destfile);
+     if ($dobin) {
+ 	print STDOUT qq(Installing programs to "$OptValues{'binpath'}":\n);
+--- mhonarc-2.6.18.orig/lib/mhmimetypes.pl
++++ mhonarc-2.6.18/lib/mhmimetypes.pl
+@@ -48,6 +48,7 @@
+     'application/ms-powerpoint',	'ppt:MS-Powerpoint presentation',
+     'application/ms-project',		'mpp:MS-Project file',
+     'application/msword',		'doc:MS-Word document',
++    'application/vnd.openxmlformats-officedocument.wordprocessingml.document',		'docx:MS-Word 2007 document',
+     'application/octet-stream', 	'bin:Binary data',
+     'application/oda', 			'oda:ODA file',
+     'application/pdf', 			'pdf:Adobe PDF document',
+@@ -71,7 +72,9 @@
+     'application/vnd.lotus-wordpro',    'lwp,sam:Lotus WordPro',
+     'application/vnd.mif', 		'mif:Frame MIF document',
+     'application/vnd.ms-excel',         'xls:MS-Excel spreadsheet',
++    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',		'xlsx:MS-Excel 2007 spreadsheet',
+     'application/vnd.ms-powerpoint',    'ppt:MS-Powerpoint presentation',
++    'application/vnd.openxmlformats-officedocument.presentationml.presentation',    'pptx:MS-Powerpoint 2007 presentation',
+     'application/vnd.ms-project',	'mpp:MS-Project file',
+     'application/vnd.stardivision.calc', 'sdc:StarCalc spreadsheet',
+     'application/vnd.stardivision.chart', 'sds:StarChart document',
+--- mhonarc-2.6.18.orig/lib/ewhutil.pl
++++ mhonarc-2.6.18/lib/ewhutil.pl
+@@ -70,7 +70,7 @@
+ 
+ sub commentize {
+     my($txt) = $_[0];
+-    $txt =~ s/([\-&])/'&#'.unpack('C',$1).';'/ge;
++    $txt =~ s/([\-&<])/'&#'.unpack('C',$1).';'/ge;
+     $txt;
+ }
+ 
+--- mhonarc-2.6.18.orig/lib/readmail.pl
++++ mhonarc-2.6.18/lib/readmail.pl
+@@ -117,9 +117,9 @@
+ ##  set to true.
+ 
+ %MIMEDecoders			= ()
+-    unless defined(%MIMEDecoders);
++    unless %MIMEDecoders;
+ %MIMEDecodersSrc		= ()
+-    unless defined(%MIMEDecodersSrc);
++    unless %MIMEDecodersSrc;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMECharSetConverters is the associative array for storing functions
+@@ -153,9 +153,9 @@
+ ##  string.
+ 
+ %MIMECharSetConverters			= ()
+-    unless defined(%MIMECharSetConverters);
++    unless %MIMECharSetConverters;
+ %MIMECharSetConvertersSrc		= ()
+-    unless defined(%MIMECharSetConvertersSrc);
++    unless %MIMECharSetConvertersSrc;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEFilters is the associative array for storing functions that
+@@ -180,9 +180,9 @@
+ ##  that all functions are defined before invoking MAILread_body.
+ 
+ %MIMEFilters	= ()
+-    unless defined(%MIMEFilters);
++    unless %MIMEFilters;
+ %MIMEFiltersSrc	= ()
+-    unless defined(%MIMEFiltersSrc);
++    unless %MIMEFiltersSrc;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEFiltersArgs is the associative array for storing any optional
+@@ -196,7 +196,7 @@
+ ##  listed for a function if both are applicable.
+ 
+ %MIMEFiltersArgs	= ()
+-    unless defined(%MIMEFiltersArgs);
++    unless %MIMEFiltersArgs;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEExcs is the associative array listing which data types
+@@ -206,7 +206,7 @@
+ ##	Values => <should evaluate to a true expression>
+ 
+ %MIMEExcs			= ()
+-    unless defined(%MIMEExcs);
++    unless %MIMEExcs;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMEIncs is the associative array listing which data types
+@@ -220,7 +220,7 @@
+ ##  be used to only allow a well-defined set of content-types.
+ 
+ %MIMEIncs			= ()
+-    unless defined(%MIMEIncs);
++    unless %MIMEIncs;
+ 
+ ## - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ ##  %MIMECharsetAliases is a mapping of charset names to charset names.
+@@ -231,7 +231,7 @@
+ ##	Values => real charset name
+ ##
+ %MIMECharsetAliases = ()
+-    unless defined(%MIMECharsetAliases);
++    unless %MIMECharsetAliases;
+ 
+ ##---------------------------------------------------------------------------
+ ##	Text entity-related variables
diff --git a/mhonarc.spec b/mhonarc.spec
index bebff8c..eebb193 100644
--- a/mhonarc.spec
+++ b/mhonarc.spec
@@ -1,12 +1,16 @@
 Name:           mhonarc
 Version:        2.6.18
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Perl mail-to-HTML converter
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://www.mhonarc.org/
 Source:         http://www.mhonarc.org/release/MHonArc/tar/MHonArc-%{version}.tar.bz2
+
+# Patch based on debian that fixes some issues spotted after 2.6.18 release
+Patch0:         mhonarc-2.6.18.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -30,6 +34,7 @@ customization features.
 
 %prep
 %setup -q -n MHonArc-%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +60,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 14 2014 José Matos <jamatos at fedoraproject.org> - 2.6.18-13
+- add patch (based on debian patch) that:
+-   removes some deprecation warning (bz 901351)
+-   adds some Microsoft Office 2007 mime types
+-   adds some hardening
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.18-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

More information about the scm-commits mailing list