Critical bugfix to 1.2.16 that can cause mail loss. Upstream is releasing a 1.2.17 with it soon, but we need it already.

Package-Manager: portage-2.2_rc58/cvs/Linux x86_64

4 files changed, 104 insertions, 3 deletions

diff --git a/net-mail/mlmmj/ChangeLog b/net-mail/mlmmj/ChangeLog
index fb9b24173501..e9297bedd4f2 100644
--- a/net-mail/mlmmj/ChangeLog
+++ b/net-mail/mlmmj/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mlmmj
-# Copyright 2004-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.29 2009/03/18 07:08:18 josejx Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.30 2009/12/16 19:38:38 robbat2 Exp $
+
+*mlmmj-1.2.16-r1 (16 Dec 2009)
+
+  16 Dec 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +mlmmj-1.2.16-r1.ebuild, +files/mlmmj-1.2.16-requeue-unlink-fix.patch:
+  Critical bugfix to 1.2.16 that can cause mail loss. Upstream is releasing
+  a 1.2.17 with it soon, but we need it already.
 
   18 Mar 2009; Joseph Jezak <josejx@gentoo.org> mlmmj-1.2.15-r1.ebuild:
   Marked ppc stable for bug #249615.
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index 4c958c8492b8..71d17e6cc226 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -1,5 +1,6 @@
 AUX mlmmj-1.2.11_subscriber_mmap.patch 397 RMD160 51c8e143634a754928164630a65710fda44fe3ba SHA1 65c7489b822612167ad4d6e05e6941abbb91e73d SHA256 c1d28b44fc943ee73e7d80fe7bbf81592e070be7d4f6b365cd97f3a836ecd6e5
 AUX mlmmj-1.2.15_mmap_zero_byte.patch 1411 RMD160 455168e47365b9ea4b70440fc238c21c2ad1d634 SHA1 3312a0bed19f7abc0f274b47b22be8fdf0dada1a SHA256 15b5be768f14f1c91ad779dfd082aa110c7ea0d3b7a6adec82f3953bf61ea759
+AUX mlmmj-1.2.16-requeue-unlink-fix.patch 1085 RMD160 800b2083d9a9d4ce85cdb1b1a3ec34db9f93feaf SHA1 15369e76465c6c1f8e90b60a3a844e0c3ecf2284 SHA256 2bd6b6a15b42dead78f6f13e29f35c38adaef599f96d03242c46b8181af8459e
 DIST mlmmj-1.2.10.tar.bz2 143526 RMD160 1539f6fa1c785b64e90719875ea6d3c50330693a SHA1 d77f7983abd4aea9df7a7575711e2e5b50c1e841 SHA256 55fcf4122f7175b2f466afdbea6a3cade3e0039011553d9b161159adebbe8607
 DIST mlmmj-1.2.11.tar.bz2 143586 RMD160 058e4d28f010ccb3bdca59143b05afa9b19eeefd SHA1 46ddb87d9fb51c9fdd2e8db4985866739a185b78 SHA256 f24890d14c38c9a45b36c1d6af71859190c968675777d9d8d8a0ce906c8748c9
 DIST mlmmj-1.2.12.tar.bz2 149784 RMD160 0310b61c8d4667ed7b87cdcbc5847d489079b0ba SHA1 e0e4e21aef5c1dd3666ee57f983116e4d606ba42 SHA256 7946f761c704b6c9bded10cd440a9883567c683551632ea578309d5025e319f3
@@ -18,9 +19,10 @@ EBUILD mlmmj-1.2.13.ebuild 1192 RMD160 00fd12fb773bc4d39754c8282d053e6a8ae72235
 EBUILD mlmmj-1.2.14.ebuild 1192 RMD160 ae0f7279219d130c0cbab719ce989c82ba83ed4b SHA1 fb128d3213e8babf9f7128ea84c8c6fda780c431 SHA256 3517c5630f84847127acab8323da26ef772abb597fc7f7d425af62ae34555496
 EBUILD mlmmj-1.2.15-r1.ebuild 1459 RMD160 909c3fa94d133eff8292da631f2e931527a8ad0b SHA1 387b7ea62416d317f1aef70f80a0739360f805f8 SHA256 0d7b9f081e290dc797f07ab017ce1b9201c99991c13d67a6d0b3315363faab3a
 EBUILD mlmmj-1.2.15.ebuild 1388 RMD160 daebee38f12004def66dcee3d9e390ae5d989aa7 SHA1 81d3bbb80ee5faaa762ae645f0dea148b8f99665 SHA256 d0a81d59599bf2df2d838e2bd5360a849f022da94b1c8d5c5b4f068de726a06a
+EBUILD mlmmj-1.2.16-r1.ebuild 1475 RMD160 0134affb1fcf250ac24e2c7044e7f842ad4bf39c SHA1 90c064be7cac6adc36b3bd65c328d185f84797e7 SHA256 a0f3dbf676078037c1b19013a2cda4acbe7f33973098958b2f828cdc35e61935
 EBUILD mlmmj-1.2.16.ebuild 1461 RMD160 625db333f451367d906d8da540c8535fb442e962 SHA1 81b2ce3f8702a611219034243d8d158ce44bd18d SHA256 7dee5bcea9ff8cceea94c7b76942487e6170d311cb0a4abb71ec6cda882ee9a5
 EBUILD mlmmj-1.2.4.ebuild 1139 RMD160 5c4495ad0a92b950970e2ace276312f2506c86d4 SHA1 250a5657144abbeb920ca959db1fc35e3aa7596d SHA256 4c5c69be7db5901a6f77d6b34106c4896dcdae562b032bd6fdad9a185d798528
 EBUILD mlmmj-1.2.8.ebuild 1139 RMD160 26acd6abf3398b2935663a6d6f69433e349c3005 SHA1 e2173ebbe06b0a2a696a96632ec4bb420acacd39 SHA256 d4ee686c9af056bc720a2303a3dc0f96c8dd986cdbd59dada1e0e8e2c9a3d39c
 EBUILD mlmmj-1.2.9.ebuild 1191 RMD160 dc10eaf3c52bd05c4ef6f15fd3a4a70b39370704 SHA1 482c3b31a6573629a707f1e377348cd9f8572684 SHA256 8eca1b69b5942edebc91e374ce9cceb91524412b413699ed6c7414d7f92b68a2
-MISC ChangeLog 5003 RMD160 31eb6df8fb6601386b56c2bbfd7ea91484627c99 SHA1 c5cdfcf7e39f13487bb12aef8a263a806dfee909 SHA256 4bfdd8df6c138c8e445e0ce5ecfc9eaff19395a64ad2bd2b7fdc6ef389ae058a
+MISC ChangeLog 5288 RMD160 a302d8f3ba75259dd0132930c7581f1b52fb9448 SHA1 0e6c3d85c188206e20f1bafdedc6f99ecd711551 SHA256 0cb93cbf70cc7bba94d1f5e1b7b90f19f74fe900329d719a77b3f8d595b41ba2
 MISC metadata.xml 224 RMD160 1f8313d73dc37b4c91c0947d68ca058ee0727744 SHA1 f5cbb921c4390958ec580f3c587b1066354f2ad7 SHA256 eef0fff1da926bc7c91be50c8b0eb207a3a5d6a293066b9b6e7ffb558ce90672
diff --git a/net-mail/mlmmj/files/mlmmj-1.2.16-requeue-unlink-fix.patch b/net-mail/mlmmj/files/mlmmj-1.2.16-requeue-unlink-fix.patch
new file mode 100644
index 000000000000..00664e3c09e4
--- /dev/null
+++ b/net-mail/mlmmj/files/mlmmj-1.2.16-requeue-unlink-fix.patch
@@ -0,0 +1,29 @@
+If the maintd visited more than one mail in the /requeue/ directory, and the
+FIRST one set the fromrequeuedir flag to unlink the mail file, the flag was NOT
+cleared and caused mail in the real archive to be erronously removed.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude mlmmj-make-ml.sh mlmmj-1.2.16.orig/src/mlmmj-maintd.c mlmmj-1.2.16/src/mlmmj-maintd.c
+--- mlmmj-1.2.16.orig/src/mlmmj-maintd.c	2008-10-31 14:20:51.000000000 +0000
++++ mlmmj-1.2.16/src/mlmmj-maintd.c	2009-12-16 02:11:16.848146214 +0000
+@@ -373,7 +373,7 @@
+ 	struct stat st;
+ 	pid_t childpid, pid;
+ 	time_t t;
+-	int status, fromrequeuedir = 0;
++	int status, fromrequeuedir;
+ 
+ 	if(chdir(dirname) < 0) {
+ 		log_error(LOG_ARGS, "Could not chdir(%s)", dirname);
+@@ -408,6 +408,10 @@
+ 
+ 		archivefilename = concatstr(3, listdir, "/archive/",
+ 						dp->d_name);
++
++		/* Explicitly initialize for each mail we examine */
++		fromrequeuedir = 0;
++
+ 		if(stat(archivefilename, &st) < 0) {
+ 			/* Might be it's just not moved to the archive
+ 			 * yet because it's still getting sent, so just
diff --git a/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild b/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild
new file mode 100644
index 000000000000..2579247932ad
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/mlmmj-1.2.16-r1.ebuild,v 1.1 2009/12/16 19:38:38 robbat2 Exp $
+
+inherit eutils
+
+MY_PV="${PV/_rc/-RC}"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="Mailing list managing made joyful"
+HOMEPAGE="http://mlmmj.mmj.dk/"
+SRC_URI="http://mlmmj.mmj.dk/files/${MY_P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND="virtual/mta"
+#RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+SHAREDIR="/usr/share/mlmmj"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${PN}-1.2.16-requeue-unlink-fix.patch
+	cd "${S}"
+	for i in "${S}" "${S}"/contrib/recievestrip ; do
+		pushd "${i}"
+		# Ignore errors
+		emake -j1 distclean 2>/dev/null 1>/dev/null
+		popd
+	done
+}
+
+src_compile() {
+	econf
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodir ${SHAREDIR}
+	dodir ${SHAREDIR}/texts
+	insinto ${SHAREDIR}/texts
+	doins listtexts/*
+
+	dodoc AUTHORS ChangeLog FAQ README
+	dodoc TODO TUNABLES UPGRADE VERSION README.access
+	dodoc README.sendmail README.exim4 README.security
+
+	insinto /usr/share/mlmmj
+	cd "${S}"/contrib/web
+	doins -r *
+
+	dobin "${S}"/contrib/recievestrip
+}
+
+pkg_postinst() {
+	elog "mlmmj comes with serveral webinterfaces:"
+	elog "- One for user subscribing/unsubscribing"
+	elog "- One for admin tasks"
+	elog "both available in a php and perl module."
+	elog "For more info have a look in /usr/share/mlmmj"
+}