Hello community, here is the log from the commit of package metamail for openSUSE:Factory checked in at 2016-06-12 18:52:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metamail (Old) and /work/SRC/openSUSE:Factory/.metamail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "metamail" Changes: -------- --- /work/SRC/openSUSE:Factory/metamail/metamail.changes 2015-02-22 17:26:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.metamail.new/metamail.changes 2016-06-12 18:52:56.000000000 +0200 @@ -1,0 +2,8 @@ +Sat May 28 20:22:34 UTC 2016 - mar...@gmx.de + +- add patches: + * metamail-2.7-19-provide-filenames-for-attachments.patch + rebased from Immanuel Halupczok original debian patch: + https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=321968 + +------------------------------------------------------------------- New: ---- metamail-2.7-19-provide-filenames-for-attachments.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metamail.spec ++++++ --- /var/tmp/diff_new_pack.VMKGne/_old 2016-06-12 18:52:57.000000000 +0200 +++ /var/tmp/diff_new_pack.VMKGne/_new 2016-06-12 18:52:57.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package metamail # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,7 @@ Patch2: metamail-2.7-19-getline.dif Patch3: metamail-2.7-19-binderman.dif Patch4: metamail-2.7-19-fix-bashisms.patch +Patch5: metamail-2.7-19-provide-filenames-for-attachments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,6 +50,7 @@ %patch2 %patch3 %patch4 -p1 +%patch5 -p1 %build make ++++++ metamail-2.7-19-provide-filenames-for-attachments.patch ++++++ diff --git a/bin/metasend b/bin/metasend index e0f0aff..395e3d3 100755 --- a/bin/metasend +++ b/bin/metasend @@ -55,7 +55,8 @@ fi ouputfile="" multipartsubtype="mixed" -cdescrip="An object packed by metasend" +cdescrip= # -Immi +attachfilename= # -Immi isentity=0 newid=`date ${d+"$d"}| tr " :" "__"` cid="<${newid}_$idctr@${hname}>" @@ -210,6 +211,17 @@ do cdescrip=$1 shift ;; +# begin immi + -A) shift + if test -z "$*" + then + echo "-A requires a following argument, the attachment file name" + exit 1 + fi + attachfilename=$1 + shift ;; +#end immi + -E) isentity=1 shift ;; @@ -253,6 +265,7 @@ do eval datafile${multipart}=$datafile eval encode${multipart}=$encode eval cdescrip${multipart}=\"$cdescrip\" + eval attachfilename${multipart}=\"$attachfilename\" # -Immi eval cid${multipart}=\"$cid\" eval isentity${multipart}=$isentity eval encodingprog${multipart}=\"\$encodingprog\" @@ -264,7 +277,8 @@ do newid=`date ${d+"$d"}| tr " :" "__"` cid="<${newid}_$idctr@${hname}>" idctr=`expr $idctr + 1` - cdescrip="An object packed by metasend" + cdescrip= # -Immi + attachfilename= # -Immi isentity=0 multipart=`expr $multipart + 1` shift ;; @@ -363,9 +377,11 @@ then eval encode${multipart}=$encode eval encodingprog${multipart}=\"\$encodingprog\" eval cdescrip${multipart}=\"$cdescrip\" + eval attachfilename${multipart}=\"$attachfilename\" # -Immi eval cid${multipart}=\"$cid\" eval isentity${multipart}=$isentity - cdescrip="An object packed by metasend" + cdescrip= # -Immi + attachfilename= # -Immi isentity=0 ctype="" datafile="" @@ -458,6 +474,7 @@ eval ctype${multipart}=\"$ctype\" eval datafile${multipart}=$datafile eval encode${multipart}=$encode eval cdescrip${multipart}=\"$cdescrip\" +eval attachfilename${multipart}=\"$attachfilename\" # -Immi eval cid${multipart}=\"$cid\" eval isentity${multipart}=$isentity eval encodingprog${multipart}=\"\$encodingprog\" @@ -521,7 +538,18 @@ then then eval echo "Content-ID: \$cid$i" >> $fname eval echo "Content-type: \$ctype$i" >> $fname - eval echo "Content-Description: \$cdescrip$i" >> $fname +#begin immi + eval cdescrip=\$cdescrip$i + if test ! -z "$cdescrip" + then + echo "Content-Description: $cdescrip" >> $fname + fi + eval attachfilename=\$attachfilename$i + if test ! -z "$attachfilename" + then + echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname + fi +#end immi eval echo "Content-Transfer-Encoding: \$encode$i" >> $fname echo "" >> $fname fi @@ -536,7 +564,16 @@ else then echo "Content-ID: $cid" >> $fname echo "Content-type: $ctype" >> $fname - echo "Content-Description: $cdescrip" >> $fname +#begin immi + if test ! -z "$cdescrip" + then + echo "Content-Description: $cdescrip" >> $fname + fi + if test ! -z "$attachfilename" + then + echo "Content-Disposition: attachment; filename=\"$attachfilename\"" >> $fname + fi +#end immi echo "Content-Transfer-Encoding: $encode" >> $fname fi echo "" >> $fname
