Revision bump and remove old. Update to EAPI 3, respect LDFLAGS (bug #334593 by Diego Pettenò), fix buffer overflow (bug #340149 by Diego Pettenò), add static-libs USE flag, fix parallel build, and use ebuild helper functions for installing. Thanks to Kevin Pyle for ebuild updates and patches.

Package-Manager: portage-2.2.0_alpha3/cvs/Linux x86_64

6 files changed, 165 insertions, 34 deletions

diff --git a/net-mail/ripmime/ChangeLog b/net-mail/ripmime/ChangeLog
index bd1e2f1428e3..f5a3e4915e4b 100644
--- a/net-mail/ripmime/ChangeLog
+++ b/net-mail/ripmime/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/ripmime
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ripmime/ChangeLog,v 1.31 2009/05/22 20:05:13 dertobi123 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ripmime/ChangeLog,v 1.32 2010/11/07 21:28:26 radhermit Exp $
+
+*ripmime-1.4.0.9-r1 (07 Nov 2010)
+
+  07 Nov 2010; Tim Harder <radhermit@gentoo.org> -ripmime-1.4.0.9.ebuild,
+  +ripmime-1.4.0.9-r1.ebuild, +files/ripmime-1.4.0.9-buffer-overflow.patch,
+  +files/ripmime-1.4.0.9-makefile.patch:
+  Revision bump and remove old. Update to EAPI 3, respect LDFLAGS (bug
+  #334593 by Diego Pettenò), fix buffer overflow (bug #340149 by Diego
+  Pettenò), add static-libs USE flag, fix parallel build, and use ebuild
+  helper functions for installing. Thanks to Kevin Pyle for ebuild updates
+  and patches.
 
 *ripmime-1.4.0.9 (22 May 2009)
 
diff --git a/net-mail/ripmime/Manifest b/net-mail/ripmime/Manifest
index af213e75f649..8dfde8be3cfa 100644
--- a/net-mail/ripmime/Manifest
+++ b/net-mail/ripmime/Manifest
@@ -1,6 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ripmime-1.4.0.9-buffer-overflow.patch 595 RMD160 2fb0a1e9c0cd1218c6cddb52a80f6620e53f044d SHA1 aa6343cd548daedd34162b432969190e94622dac SHA256 6e792f39d6ee75a42a8f5b64b086ea9de4d7a4f6115e7cb0fc61d36b1011e347
+AUX ripmime-1.4.0.9-makefile.patch 2162 RMD160 d9c6763a01c6fa9392e7cc1ab7a22698128985ed SHA1 5b6d2a6249ca8510721482e354845db0cc974278 SHA256 32af5dcda01e04a7129953fb3baa0514378a0ca9fe1be6b6a77afa3c89dfabe6
 DIST ripmime-1.4.0.6.tar.gz 163441 RMD160 b0f5f4d99e06fe2edbd8071972157c923eb0fb11 SHA1 60683ed3420464caf3f55c6c2f25419ba8ba8cb2 SHA256 ba1d82c80d8651bd6af0678db88e9dcaf69802922e0ea0de9c750093f988bef6
 DIST ripmime-1.4.0.9.tar.gz 169021 RMD160 f1a096af23a8a4eb3d299afdaf31fbdea8e4058b SHA1 883fbed480807c2425965f1c1a96d4c207ae8634 SHA256 1f666b6d488434581cf528cc57c76e49fb672eb7cce3c25f6c5b616491458495
 EBUILD ripmime-1.4.0.6.ebuild 604 RMD160 7b277ce20dc5fbf00988fcaf421d4a1f4b99ad51 SHA1 34f7d3078bed3f55fe94c2b1267c0c1d95c7b539 SHA256 e33db12a5972cb14eb3e9062122479c6e92d39bf4f712cedab0a9775d37e0aa7
-EBUILD ripmime-1.4.0.9.ebuild 897 RMD160 c935bf6a0874d93239b38f5b2600d58f1c1743a8 SHA1 b7668a67b2a3b366eca9a201a8f2a1ae423e3728 SHA256 f099ce8b2e14e80115635b1f0e8033d1b06132f4922197a0ae8304e10eb8d8e6
-MISC ChangeLog 3528 RMD160 66d118e67512c5ba4a27a0c76f4c85423e95b7d4 SHA1 3e62be829f690eca96806a70b9778ad494f21abd SHA256 bde4f88e9cc7d90d0562b18f9ffa89a821b5575628745b2b84ac1a48103e8b4c
+EBUILD ripmime-1.4.0.9-r1.ebuild 1228 RMD160 d0526996ba4e9efae66f61f2de2783d2bfaabc08 SHA1 7e58f7496e7ffb1735bb09c1ab24e79d785d80b1 SHA256 9272415846145fe2ecb91d46e321ce27c9296ed44a3ac368111ea28fa637ae08
+MISC ChangeLog 4061 RMD160 e624d083ea3b72af21fd4284300662d941601b40 SHA1 1daf84c283cd5d86a788a3fb865dce39edee9bb6 SHA256 ea32cb9cbef17e873c118fdb9555e9616af74e91ca239affe5ebdbaf4f4b73ff
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBAgAGBQJM1xoEAAoJEEqz6FtPBkyj3dwIAJZNDaDOIsW8eXRHwm9/XiD8
+U5OmxYimn4vDDIrXPEEgD3g0YhvjB/vq4pDilN0w5TRcaoCr056jrpC3KhWibB+/
+oJRDwTOaP7Yc+8CypkNaIRms0qsVCOleJXo3+ECWH1UBSWen0590wXFyjSk0Fyrh
+0zsJuQ3MZBYiv1O4lIOYPr/MuVueCyWSIKGubf5N+nH91sPpv/xFdbmbOpXrhMHS
+t9hhrHU3yn0WdiORZClrk44c1FyrTD66Gled64u7on1/tPQliS46BOp4G3sIJqYH
+oHtECI5xOL0nlZBFa1KqUWtmX+vR3KMfRyd281QkgHSXX2QKKaagxL5+7mJWgUI=
+=amcM
+-----END PGP SIGNATURE-----
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
new file mode 100644
index 000000000000..418a204101e9
--- /dev/null
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-buffer-overflow.patch
@@ -0,0 +1,11 @@
+--- ripmime-1.4.0.9/MIME_headers.c.orig	2010-11-07 12:38:52.994063648 -0800
++++ ripmime-1.4.0.9/MIME_headers.c	2010-11-07 12:39:06.395161970 -0800
+@@ -2239,7 +2239,7 @@
+ 		{
+ 			if (MIMEH_DNORMAL) LOGGER_log("%s:%d:MIME_parse_contentlocation:DEBUG: filename = %s\n", FL, p);
+ 			snprintf(hinfo->name, sizeof(hinfo->name),"%s",p);
+-			snprintf(hinfo->filename, sizeof(hinfo->name),"%s",p);
++			snprintf(hinfo->filename, sizeof(hinfo->filename),"%s",p);
+ 			FNFILTER_filter(hinfo->filename, _MIMEH_FILENAMELEN_MAX);
+ 			SS_push(&(hinfo->ss_filenames), hinfo->filename, strlen(hinfo->filename));
+ 
diff --git a/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
new file mode 100644
index 000000000000..856319bf63b7
--- /dev/null
+++ b/net-mail/ripmime/files/ripmime-1.4.0.9-makefile.patch
@@ -0,0 +1,79 @@
+--- ripmime-1.4.0.9.orig/Makefile	2008-11-06 19:33:33.000000000 -0800
++++ ripmime-1.4.0.9/Makefile	2010-11-07 12:53:03.898947384 -0800
+@@ -42,22 +42,22 @@
+ 	./generate-buildcodes.sh
+ 
+ ripOLE/ole.o:
+-	./build_ripOLE
++	$(MAKE) -C ripOLE
+ 
+ tnef/tnef.o:
+-	./build_tnef
++	$(MAKE) -C tnef
+ 
+ .c.o:
+-	${CC} ${CFLAGS} $(COMPONENTS) -c $*.c
++	${CC} ${CFLAGS} -fPIC $(COMPONENTS) -c $*.c
+ 
+ all: ${OBJ} 
+ 
+ 
+ solib: ${OFILES} ripmime-api.o
+-	gcc --shared -Wl,-soname,libripmime.so.1 ${OFILES} ripmime-api.o -o libripmime.so.1.4.0 -lc
++	${CC} ${LDFLAGS} --shared -Wl,-soname,libripmime.so.1 ${OFILES} ripmime-api.o -o libripmime.so.1.4.0 -lc
+ 
+-libripmime: ${OFILES} ripmime-api.o
+-	ar ruvs libripmime.a ${OFILES}  ripmime-api.o
++libripmime.a: ${OFILES} ripmime-api.o
++	${AR} ruvs $@ $^
+ 
+ ripl: ripmime.a
+ 	${CC} ${CFLAGS} ripmime.c ripmime.a -o ripmime
+@@ -65,8 +65,10 @@
+ sco: ${OFILES}
+ 	${CC} ${CFLAGS} ripmime.c ${OFILES} -o ripmime -lsocket
+ 
+-ripmime: ${OFILES} ripmime.c buildcodes.h
+-	${CC} ${CFLAGS} $(COMPONENTS) ripmime.c ${OFILES} -o ripmime ${LIBS}
++ripmime: ${OFILES} ripmime.o
++	${CC} ${CFLAGS} $(COMPONENTS) $(LDFLAGS) $^ -o $@ ${LIBS}
++
++ripmime.o: buildcodes.h
+ 
+ riptest: ${OFILES}
+ 	${CC} ${CFLAGS} riptest.c ${OFILES} -o riptest
+--- ripmime-1.4.0.9.orig/ripOLE/Makefile	2008-10-31 09:17:32.000000000 -0700
++++ ripmime-1.4.0.9/ripOLE/Makefile	2010-11-07 12:55:38.222278266 -0800
+@@ -4,7 +4,7 @@
+ 
+ 
+ .c.o:
+-	$(CC) $(CFLAGS) $(DEFINES) -c $*.c
++	$(CC) $(CFLAGS) -fPIC $(DEFINES) -c $*.c
+ 
+ default: ripole
+ 
+@@ -12,7 +12,7 @@
+ 	rm -f *.o ripole
+ 
+ ripole: $(OBJS) ripole.[ch]
+-		$(CC) $(CFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
++		$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(DEFINES) ripole.c -o ripole
+ 	
+ validate: ripole
+ 		cp ripole validate
+--- ripmime-1.4.0.9.orig/tnef/Makefile	2008-11-06 19:33:33.000000000 -0800
++++ ripmime-1.4.0.9/tnef/Makefile	2010-11-07 12:54:47.434840614 -0800
+@@ -8,10 +8,10 @@
+ CFLAGS=-Wall -g -O2 -I.
+ 
+ default: config.h tnef.h tnef.c
+-	$(CC) $(CFLAGS) $(PLATFORM) -c tnef.c
++	$(CC) $(CFLAGS) -fPIC $(PLATFORM) -c tnef.c
+ 	
+ lib: tnef.o
+-	ar ruvs tnef.a tnef.o
++	${AR} ruvs tnef.a tnef.o
+ 
+ clean:
+ 	rm -f *.o *.~[ch]
diff --git a/net-mail/ripmime/ripmime-1.4.0.9-r1.ebuild b/net-mail/ripmime/ripmime-1.4.0.9-r1.ebuild
new file mode 100644
index 000000000000..937aefec9b7b
--- /dev/null
+++ b/net-mail/ripmime/ripmime-1.4.0.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/ripmime/ripmime-1.4.0.9-r1.ebuild,v 1.1 2010/11/07 21:28:26 radhermit Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="extract attachment files out of a MIME-encoded email pack"
+HOMEPAGE="http://pldaniels.com/ripmime/"
+SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
+
+LICENSE="Sendmail"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
+}
+
+src_compile() {
+	local maketargets="default solib"
+	use static-libs && maketargets="${maketargets} libripmime.a"
+
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" CFLAGS="${CFLAGS}" ${maketargets} \
+		|| die "emake failed"
+}
+
+src_install() {
+	dobin ripmime || die "dobin failed"
+	doman ripmime.1 || die "doman failed"
+	dodoc CHANGELOG INSTALL README TODO || die "dodoc failed"
+
+	insinto /usr/include/ripmime
+	doins mime.h ripmime-api.h || die "doins failed"
+
+	dolib.so libripmime.so.1.4.0 || die "dolib.so failed"
+
+	if use static-libs ; then
+		dolib.a libripmime.a || die "dolib.a failed"
+	fi
+}
diff --git a/net-mail/ripmime/ripmime-1.4.0.9.ebuild b/net-mail/ripmime/ripmime-1.4.0.9.ebuild
deleted file mode 100644
index 24efde05c718..000000000000
--- a/net-mail/ripmime/ripmime-1.4.0.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/ripmime/ripmime-1.4.0.9.ebuild,v 1.1 2009/05/22 20:05:13 dertobi123 Exp $
-
-inherit multilib
-
-DESCRIPTION="extract attachment files out of a MIME-encoded email pack"
-HOMEPAGE="http://pldaniels.com/ripmime/"
-SRC_URI="http://www.pldaniels.com/ripmime/${P}.tar.gz"
-
-LICENSE="Sendmail"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-src_compile() {
-	emake -j1 CFLAGS="${CFLAGS}" || die
-	emake -j1 CFLAGS="${CFLAGS}" libripmime || die
-}
-
-src_install() {
-	dobin ripmime || die
-	doman ripmime.1
-	dodoc CHANGELOG INSTALL README TODO
-	mkdir -p "${D}"/usr/$(get_libdir)
-	mkdir -p "${D}"/usr/include/ripmime
-	install mime.h  "${D}"/usr/include/ripmime
-	install ripmime-api.h  "${D}"/usr/include/ripmime
-	install libripmime.a "${D}"/usr/$(get_libdir)
-}