SPECS: metamail.spec - updated to debian patches .51 - fixes recen...

glen glen at pld-linux.org
Sat Mar 18 15:27:04 CET 2006 

Author: glen                         Date: Sat Mar 18 14:27:04 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to debian patches .51
- fixes recent CVE-2006-0709

---- Files affected:
SPECS:
   metamail.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/metamail.spec
diff -u SPECS/metamail.spec:1.40 SPECS/metamail.spec:1.41
--- SPECS/metamail.spec:1.40	Tue Aug 10 00:54:55 2004
+++ SPECS/metamail.spec	Sat Mar 18 15:26:58 2006
@@ -1,41 +1,40 @@
 # $Revision$, $Date$
+# TODO
+# - drop fonts and sun/apple/server stuff as did debian? (read debian/README.debian)
+%define	_ver	2.7
+%define	_debrel 51
 Summary:	Collection of MIME handling utilities
 Summary(de):	Sammlung von MIME-Behandlungs-Utilities
 Summary(fr):	Ensemble d'utilitaires de gestion MIME
 Summary(pl):	Zestaw narzędzi do obsługi standardu MIME
 Summary(tr):	MIME iţleme araçlarý
 Name:		metamail
-Version:	2.7
-Release:	36
-License:	distributable
+Version:	%{_ver}.%{_debrel}
+Release:	0.15
+License:	GPL v2
 Group:		Applications/Mail
-Source0:	ftp://thumper.bellcore.com/pub/nsb/mm%{version}.tar.Z
+Source0:	ftp://thumper.bellcore.com/pub/nsb/mm%{_ver}.tar.Z
 # Source0-md5:	fd5617ea87e20d7f2fa839e1d1fede60
 Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5:	0ad0e591d536bc4e0d5ae97514ee6cc4
 Source2:	htmlview
-Patch0:		%{name}-make.patch
-Patch1:		%{name}-fonts.patch
-Patch2:		%{name}-glibc.patch
-Patch3:		%{name}-csh.patch
-Patch4:		%{name}-uudecode.patch
-Patch5:		%{name}-sunquote.patch
-Patch6:		%{name}-tmpfile.patch
-Patch7:		%{name}-ohnonotagain.patch
-Patch8:		%{name}-arghhh.patch
-Patch9:		%{name}-ncurses.patch
-Patch10:	%{name}-nl.patch
-Patch11:	%{name}-linux.patch
-Patch12:	%{name}-fixawk.patch
-Patch13:	%{name}-fixpartial.patch
-Patch14:	%{name}-usesox.patch
-Patch15:	%{name}-suggestedname.patch
-Patch16:	%{name}-security.patch
-BuildRequires:	ncurses-devel >= 5.0
+Source3:	ftp://ftp.debian.org/debian/pool/main/m/metamail/%{name}_%{_ver}-%{_debrel}.diff.gz
+# Source3-md5:	8152ee3780223118a18e4d0969a6ddad
+Patch0:		%{name}-ncurses.patch
+Patch1:		%{name}-pager.patch
+Patch2:		%{name}-linux.patch
+Patch3:		%{name}-fixawk.patch
+Patch4:		%{name}-fonts.patch
+Patch5:		%{name}-am.patch
+Patch6:		%{name}-suggestedname.patch
 BuildRequires:	XFree86
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	libtool
+BuildRequires:	ncurses-devel >= 5.0
+Requires:	/usr/lib/sendmail
 Requires:	mktemp
 Requires:	sharutils
-Requires:	/usr/lib/sendmail
 Provides:	htmlview
 Obsoletes:	htmlview
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,6 +48,8 @@
 configuration via the "mailcap" mechanism described in an
 informational RFC that is a companion to the MIME document.
 
+This version includes Debian patches.
+
 %description -l pl
 Metamail obsługuje standard MIME (rozszerzenie poczty internetowej dla
 różnych celów) używany do przesyłania pocztą plików multimedialnych.
@@ -56,36 +57,53 @@
 i artykułach news.
 
 %prep
-%setup -q -n mm%{version}
-%patch0  -p1
-%patch1  -p1
-%patch2  -p1
-%patch3  -p1
-%patch4  -p1
-%patch5  -p1
-%patch7  -p1
-%patch8  -p1
-%patch9  -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
+%setup -q -n mm%{_ver}
+cd src
+
+# there's {metamail,richmail} unused in debian patch and metamail is libmetamail sources
+# but due debian patch patching (erronously probably) metamail/splitmail.c, we need to keep it first
+rm -rf richmail
+mv metamail metamail.org
+mkdir metamail
+mv metamail.org/splitmail.c metamail
+
+%{__gzip} -dc %{SOURCE3} | %{__patch} -p1
+
+# needed as file was created from patching
+chmod +x configure
+
+# same as mimeencode
+rm man/mmencode.1
+
+cd ..
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+#%patch6 -p1 - neccessary?
 
 %build
 cd src
-%{__make} basics
+%{__aclocal} -I config
+%{__libtoolize}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+%configure
+%{__make} -j1
+%{__make} -C fonts
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_fontdir},%{_mandir}/man1}
 
 cd src
-%{__make} install-all INSTROOT=$RPM_BUILD_ROOT%{_prefix} \
-	MAN1DIR=$RPM_BUILD_ROOT%{_mandir}/man1 \
-	MAN4DIR=$RPM_BUILD_ROOT%{_mandir}/man4
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+install man/* debian/mimencode.1 debian/mimeit.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install fonts/*.pcf 	  $RPM_BUILD_ROOT%{_fontdir}
 install fonts/fonts.alias $RPM_BUILD_ROOT%{_fontdir}
@@ -93,20 +111,24 @@
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 mkfontdir $RPM_BUILD_ROOT%{_fontdir}
 
-rm -f $RPM_BUILD_ROOT%{_bindir}/*.orig
-rm -f $RPM_BUILD_ROOT%{_bindir}/*~
+#ln -f $RPM_BUILD_ROOT%{_bindir}/mmencode $RPM_BUILD_ROOT%{_bindir}/mimencode
+rm -rf $RPM_BUILD_ROOT%{_includedir}/metamail
+rm -rf $RPM_BUILD_ROOT%{_libdir}/libmetamail.{la,a}
 
-ln -f $RPM_BUILD_ROOT%{_bindir}/mmencode $RPM_BUILD_ROOT%{_bindir}/mimencode
+# that site doesn't exist
+rm $RPM_BUILD_ROOT{%{_bindir}/patch-metamail,%{_mandir}/man1/patch-metamail.1}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc src/{README,CREDITS,mailers.txt}
-
 %attr(755,root,root) %{_bindir}/*
-
+%attr(755,root,root) %{_libdir}/libmetamail.so.0.0.0
 %{_libdir}/metamail
 %{_mandir}/man1/*
 %lang(fi) %{_mandir}/fi/man1/*
@@ -118,6 +140,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2006/03/18 14:26:58  glen
+- updated to debian patches .51
+- fixes recent CVE-2006-0709
+
 Revision 1.40  2004/08/09 22:54:55  havner
 - rel 36
 
@@ -145,7 +171,7 @@
 - fixed Source0 URL
 
 Revision 1.32  2002/11/27 22:06:21  juandon
-- new %%doc
+- new %doc
 
 Revision 1.31  2002/11/12 14:27:46  undefine
 - release 31 to rebuild with fixed htmlview(fixed path to more)
@@ -166,7 +192,7 @@
   Group field using gettext).
 
 Revision 1.26  2002/01/18 02:13:49  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.25  2001/11/24 20:54:33  juandon
 - added missing %lang(fi) and %lang(pl) for man pages
@@ -201,7 +227,7 @@
 - rebuild with ncurses 5.1
 
 Revision 1.17  2000/06/09 07:23:25  kloczek
-- added using %%{__make} macro.
+- added using %{__make} macro.
 
 Revision 1.16  2000/05/31 12:46:32  kloczek
 - spec adapterized.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/metamail.spec?r1=1.40&r2=1.41&f=u

More information about the pld-cvs-commit mailing list