Hello community, here is the log from the commit of package metamail for openSUSE:Factory checked in at 2019-07-16 08:37:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/metamail (Old) and /work/SRC/openSUSE:Factory/.metamail.new.1887 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "metamail" Tue Jul 16 08:37:14 2019 rev:24 rq:714572 version:2.7.19 Changes: -------- --- /work/SRC/openSUSE:Factory/metamail/metamail.changes 2019-06-22 11:21:53.725239099 +0200 +++ /work/SRC/openSUSE:Factory/.metamail.new.1887/metamail.changes 2019-07-16 08:37:15.483299696 +0200 @@ -1,0 +2,5 @@ +Wed Jul 10 08:29:15 UTC 2019 - Dr. Werner Fink <[email protected]> + +- Replace old mgrep script with new m(mime)grep written in hackweek + +------------------------------------------------------------------- New: ---- mimegrep-0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ metamail.spec ++++++ --- /var/tmp/diff_new_pack.E4Zwgs/_old 2019-07-16 08:37:16.079293942 +0200 +++ /var/tmp/diff_new_pack.E4Zwgs/_new 2019-07-16 08:37:16.083293903 +0200 @@ -1,7 +1,7 @@ # # spec file for package metamail # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,23 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: metamail +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bdftopcf +BuildRequires: libpipeline-devel BuildRequires: mkfontdir BuildRequires: ncurses-devel Requires: sharutils Version: 2.7.19 Release: 0 Summary: MIME Mail Handler -License: MIT +License: MIT AND GPL-2.0-only Group: Productivity/Networking/Email/Utilities Source: metamail-2.7-19.tar.gz Source1: mimecheck Source2: mimecheck.1 +Source3: mimegrep-0.2.tar.xz Patch0: metamail-2.7-19-security.dif Patch1: metamail-2.7-19.dif Patch2: metamail-2.7-19-getline.dif @@ -36,71 +40,79 @@ Patch4: metamail-2.7-19-fix-bashisms.patch Patch5: metamail-2.7-19-provide-filenames-for-attachments.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +%bcond_with font %description Metamail is required for reading multimedia mail messages (such as those using the Andrew toolkit) with elm. - - %prep -%autosetup -p1 -n metamail-2.7-19 +%autosetup -p1 -n metamail-2.7-19 -b 3 %build -rm -f bin/mailserver -rm -f bin/sun-message.csh + rm -f bin/mailserver + rm -f bin/sun-message.csh make make -C fonts + pushd ../mimegrep-0.2 + ./autogen.sh + %configure + make %{?_smp_mflags} + popd %install - mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT%_mandir/man{1,4} - make INSTROOT=$RPM_BUILD_ROOT/usr INSTALL=install install-all -# mkdir -p $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc -# install -m 444 fonts/heb8x13B.pcf $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/ -# gzip -9f $RPM_BUILD_ROOT/usr/X11R6/lib/X11/fonts/misc/heb8x13B.pcf - install -m 755 %{S:1} $RPM_BUILD_ROOT/usr/bin/ - install -m 644 %{S:2} $RPM_BUILD_ROOT%{_mandir}/man1/ - ln -sf mimecheck $RPM_BUILD_ROOT/usr/bin/mimezip - ln -sf mimecheck $RPM_BUILD_ROOT/usr/bin/mimebzip - ln -sf mimecheck $RPM_BUILD_ROOT/usr/bin/mimegzip + mkdir -p %{buildroot}%{_bindir} %{buildroot}%_mandir/man{1,4} + make INSTROOT=%{buildroot}/usr INSTALL=install install-all +%if %{with font} + mkdir -p %{buildroot}%{_datadir}/fonts/misc + install -m 0644 fonts/heb8x13B.pcf %{buildroot}%{_datadir}/fonts/misc/ + gzip -9f %{buildroot}%{_datadir}/fonts/misc/heb8x13B.pcf +%endif + install -m 755 %{S:1} %{buildroot}%{_bindir}/ + install -m 644 %{S:2} %{buildroot}%{_mandir}/man1/ + ln -sf mimecheck %{buildroot}%{_bindir}/mimezip + ln -sf mimecheck %{buildroot}%{_bindir}/mimebzip + ln -sf mimecheck %{buildroot}%{_bindir}/mimegzip + pushd ../mimegrep-0.2 + make install DESTDIR=%{buildroot} + popd %files %defattr(-,root,root) %doc README mailers.txt -#/usr/X11R6/lib/X11/fonts/misc/heb8x13B.pcf.gz -/usr/bin/audiocompose -/usr/bin/audiosend -/usr/bin/extcompose -/usr/bin/getfilename -/usr/bin/mailto -/usr/bin/mailto-hebrew -/usr/bin/metamail -/usr/bin/metasend -/usr/bin/mimeit -/usr/bin/mimencode -/usr/bin/mimecheck -/usr/bin/mimezip -/usr/bin/mimebzip -/usr/bin/mimegzip -/usr/bin/mmencode -/usr/bin/mgrep -/usr/bin/patch-metamail -/usr/bin/rcvAppleSingle -/usr/bin/richtext -/usr/bin/richtoatk -/usr/bin/showaudio -/usr/bin/showexternal -/usr/bin/shownonascii -/usr/bin/showpartial -/usr/bin/showpicture -/usr/bin/sndAppleSingle -/usr/bin/splitmail -/usr/bin/sun-audio-file -/usr/bin/sun-message -/usr/bin/sun-to-mime -/usr/bin/sun2mime -/usr/bin/uudepipe -/usr/bin/uuenpipe +%{_bindir}/audiocompose +%{_bindir}/audiosend +%{_bindir}/extcompose +%{_bindir}/getfilename +%{_bindir}/mailto +%{_bindir}/mailto-hebrew +%{_bindir}/metamail +%{_bindir}/metasend +%{_bindir}/mimeit +%{_bindir}/mimencode +%{_bindir}/mimecheck +%{_bindir}/mimezip +%{_bindir}/mimebzip +%{_bindir}/mimegzip +%{_bindir}/mmencode +%{_bindir}/mgrep +%{_bindir}/patch-metamail +%{_bindir}/rcvAppleSingle +%{_bindir}/richtext +%{_bindir}/richtoatk +%{_bindir}/showaudio +%{_bindir}/showexternal +%{_bindir}/shownonascii +%{_bindir}/showpartial +%{_bindir}/showpicture +%{_bindir}/sndAppleSingle +%{_bindir}/splitmail +%{_bindir}/sun-audio-file +%{_bindir}/sun-message +%{_bindir}/sun-to-mime +%{_bindir}/sun2mime +%{_bindir}/uudepipe +%{_bindir}/uuenpipe %doc %{_mandir}/man1/audiocompose.1.gz %doc %{_mandir}/man1/audiosend.1.gz %doc %{_mandir}/man1/extcompose.1.gz @@ -123,5 +135,8 @@ %doc %{_mandir}/man1/showpicture.1.gz %doc %{_mandir}/man1/splitmail.1.gz %doc %{_mandir}/man4/mailcap.4.gz +%if %{with font} +%{_datadir}/fonts/misc/heb8x13B.pcf.gz +%endif %changelog ++++++ metamail-2.7-19.dif ++++++ --- /var/tmp/diff_new_pack.E4Zwgs/_old 2019-07-16 08:37:16.111293633 +0200 +++ /var/tmp/diff_new_pack.E4Zwgs/_new 2019-07-16 08:37:16.111293633 +0200 @@ -441,89 +441,6 @@ echo "Content-Transfer-Encoding: $encode" >> $fname fi echo "" >> $fname ---- /dev/null -+++ b/bin/mgrep -@@ -0,0 +1,80 @@ -+#!/bin/sh -+ -+# mgrep -- a wrapper around a grep program that decode MIMEd data -+# as needed (some code taken from zgrep of gzip) -+ -+PATH="/usr/bin:$PATH"; export PATH -+ -+prog=${0##*/} -+case "$prog" in -+ *egrep) grep=${EGREP-egrep -a} ;; -+ *fgrep) grep=${FGREP-egrep -a} ;; -+ *) grep=${GREP-grep -a} ;; -+esac -+ -+pat="" -+while test $# -ne 0; do -+ case "$1" in -+ -e|-f) -+ opt="$opt $1" -+ shift -+ pat="$1" -+ if test "$grep" = grep; then -+ grep=egrep -+ fi -+ ;; -+ -*) -+ opt="$opt $1" -+ ;; -+ *) -+ if test -z "$pat"; then -+ pat="$1" -+ else -+ break; -+ fi -+ ;; -+ esac -+ shift -+done -+ -+if test -z "$pat"; then -+ echo "$prog: grep through mimencoded files" 1>&2 -+ echo "usage: $prog [grep_options] pattern [files]" 1>&2 -+ exit 1 -+fi -+ -+ list=0 -+silent=0 -+case "$opt" in -+ *l*) list=1 -+esac -+case "$opt" in -+ *h*) silent=1 -+esac -+ -+mimedecode () -+{ -+ mimencode -u -b $1 2> /dev/null -+ echo -+} -+ -+if test $# -eq 0; then -+ mimedecode | $grep $opt "$pat" -+ exit $? -+fi -+ -+res=0 -+for i do -+ if test $list -eq 1; then -+ mimedecode $i | $grep $opt "$pat" > /dev/null && echo $i -+ r=$? -+ elif test $# -eq 1 -o $silent -eq 1; then -+ mimedecode $i | $grep $opt "$pat" -+ r=$? -+ else -+ mimedecode $i | $grep $opt "$pat" | sed "s|^|${i}:|" -+ r=$? -+ fi -+ test "$r" -ne 0 && res="$r" -+done -+exit $res --- a/bin/mimeit +++ b/bin/mimeit @@ -19,4 +19,4 @@ shift @@ -1306,50 +1223,6 @@ quiet -- controls the verbosity of output from the mailto program. keepblind -- controls whether or not a 'blind' copy of the mail is kept. commasonly -- controls whether or not a space character ---- /dev/null -+++ b/man/mgrep.1 -@@ -0,0 +1,41 @@ -+.TH MGREP 1 -+.SH NAME -+mgrep \- search mimencoded files for a regular expression -+.SH SYNOPSIS -+.B mgrep -+[ grep_options ] -+.BI [\ -e\ ] " pattern" -+.IR filename ".\|.\|." -+.SH DESCRIPTION -+.IR Mgrep -+is used to invoke the -+.I grep -+on mimencoded files. All options specified are passed directly to -+.I grep. -+If no file is specified, then the standard input is mimdecoded -+and fed to grep. -+Otherwise the given files are mimdecoded and fed to -+.I grep. -+.PP -+If -+.I mgrep -+is invoked as -+.I megrep -+or -+.I mfgrep -+then -+.I egrep -+or -+.I fgrep -+is used instead of -+.I grep. -+If the GREP environment variable is set, -+.I mgrep -+uses it as the -+.I grep -+program to be invoked. For example: -+ -+ for sh: GREP=fgrep mgrep string files -+ for csh: (setenv GREP fgrep; mgrep string files) -+.SH "SEE ALSO" -+grep(1), egrep(1), fgrep(1) --- a/metamail/Makefile +++ b/metamail/Makefile @@ -41,9 +41,9 @@ shared.o: shared.c ../config.h
