Hopefully fix bug 141904 that is causing mail loss on the Gentoo lists.

Package-Manager: portage-2.1.4_rc11

5 files changed, 129 insertions, 5 deletions

diff --git a/net-mail/mlmmj/ChangeLog b/net-mail/mlmmj/ChangeLog
index 18ff7100fa92..9954c41d92d6 100644
--- a/net-mail/mlmmj/ChangeLog
+++ b/net-mail/mlmmj/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/mlmmj
 # Copyright 2004-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.24 2008/01/04 07:26:54 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/ChangeLog,v 1.25 2008/01/09 08:25:58 robbat2 Exp $
+
+*mlmmj-1.2.15-r1 (09 Jan 2008)
+
+  09 Jan 2008; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mlmmj-1.2.15_mmap_zero_byte.patch, +mlmmj-1.2.15-r1.ebuild:
+  Hopefully fix bug 141904 that is causing mail loss on the Gentoo lists.
 
 *mlmmj-1.2.15 (04 Jan 2008)
 
diff --git a/net-mail/mlmmj/Manifest b/net-mail/mlmmj/Manifest
index 4a6058c2d27a..16f391d9b51e 100644
--- a/net-mail/mlmmj/Manifest
+++ b/net-mail/mlmmj/Manifest
@@ -2,6 +2,10 @@ AUX mlmmj-1.2.11_subscriber_mmap.patch 397 RMD160 51c8e143634a754928164630a65710
 MD5 5e42a66609c2212bb45affb7df2aee92 files/mlmmj-1.2.11_subscriber_mmap.patch 397
 RMD160 51c8e143634a754928164630a65710fda44fe3ba files/mlmmj-1.2.11_subscriber_mmap.patch 397
 SHA256 c1d28b44fc943ee73e7d80fe7bbf81592e070be7d4f6b365cd97f3a836ecd6e5 files/mlmmj-1.2.11_subscriber_mmap.patch 397
+AUX mlmmj-1.2.15_mmap_zero_byte.patch 1411 RMD160 455168e47365b9ea4b70440fc238c21c2ad1d634 SHA1 3312a0bed19f7abc0f274b47b22be8fdf0dada1a SHA256 15b5be768f14f1c91ad779dfd082aa110c7ea0d3b7a6adec82f3953bf61ea759
+MD5 8c6fe43055c2d14e5da3b4e2c77f800f files/mlmmj-1.2.15_mmap_zero_byte.patch 1411
+RMD160 455168e47365b9ea4b70440fc238c21c2ad1d634 files/mlmmj-1.2.15_mmap_zero_byte.patch 1411
+SHA256 15b5be768f14f1c91ad779dfd082aa110c7ea0d3b7a6adec82f3953bf61ea759 files/mlmmj-1.2.15_mmap_zero_byte.patch 1411
 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
@@ -35,6 +39,10 @@ EBUILD mlmmj-1.2.14.ebuild 1203 RMD160 5e452ee9af171db40fcda05aa8676889955b6b05
 MD5 fa945c17d51daa53ec9ecada4cd8cd7c mlmmj-1.2.14.ebuild 1203
 RMD160 5e452ee9af171db40fcda05aa8676889955b6b05 mlmmj-1.2.14.ebuild 1203
 SHA256 dc0239edbfe4e862f706b535ea1884c2b2281738b8255a23162235f97967053e mlmmj-1.2.14.ebuild 1203
+EBUILD mlmmj-1.2.15-r1.ebuild 1474 RMD160 31d6ac444174fcee5acf216ba21cdfe90b02b3ab SHA1 0c2298a1b46ddd0cc366f3b1ea3c3c98c1f6a08a SHA256 779b74f259197f03b2ba6e1662d3d0d102f32084f770856a2787001a3cfa386d
+MD5 5216f8428dde39bf9f9db764e0ee8338 mlmmj-1.2.15-r1.ebuild 1474
+RMD160 31d6ac444174fcee5acf216ba21cdfe90b02b3ab mlmmj-1.2.15-r1.ebuild 1474
+SHA256 779b74f259197f03b2ba6e1662d3d0d102f32084f770856a2787001a3cfa386d mlmmj-1.2.15-r1.ebuild 1474
 EBUILD mlmmj-1.2.15.ebuild 1399 RMD160 de178a1ef1e6f9a17fe878fd63bd7e4677f5e53f SHA1 9848dd2d6871b5c9557010878b1805a37ef771bd SHA256 8911c054b23ba0055f76952cc9fa2468b0ee894830a9f4ed70d3dd76bfe02a50
 MD5 b27abaf39ccdc73a283d1a425cad6cdf mlmmj-1.2.15.ebuild 1399
 RMD160 de178a1ef1e6f9a17fe878fd63bd7e4677f5e53f mlmmj-1.2.15.ebuild 1399
@@ -51,10 +59,10 @@ EBUILD mlmmj-1.2.9.ebuild 1202 RMD160 be8b78a9f86d691520f4165bac6001c42a719b40 S
 MD5 b64f812a9b243f37ff4481908db55f12 mlmmj-1.2.9.ebuild 1202
 RMD160 be8b78a9f86d691520f4165bac6001c42a719b40 mlmmj-1.2.9.ebuild 1202
 SHA256 d3c29bf6ad84f5234dade433d16ad7eee55ce3ae9fe1a1521666b171f085d6e2 mlmmj-1.2.9.ebuild 1202
-MISC ChangeLog 4098 RMD160 8b7cb1ae25a69df2cd1b38eec053ca4669241648 SHA1 7807ad438f1e0f646ec2d9a4a822e74c4466a12e SHA256 f8ba940d704fabb8bdaf0748bec8bda4dc56399c460386d08666094318ed6a5c
-MD5 e81001ca5acc666f017fe03eba53f535 ChangeLog 4098
-RMD160 8b7cb1ae25a69df2cd1b38eec053ca4669241648 ChangeLog 4098
-SHA256 f8ba940d704fabb8bdaf0748bec8bda4dc56399c460386d08666094318ed6a5c ChangeLog 4098
+MISC ChangeLog 4327 RMD160 cda03a75ec0f0edc5c9b1639d8ff390a6d9874b1 SHA1 d8f0410a99e5a90fd2eda0d747f5b23f26f786d0 SHA256 56329243df0310f054199bafe42eef72b24f6955c4a185959c2c15b738c93120
+MD5 df8facf362d820297d33adc29efbe7ce ChangeLog 4327
+RMD160 cda03a75ec0f0edc5c9b1639d8ff390a6d9874b1 ChangeLog 4327
+SHA256 56329243df0310f054199bafe42eef72b24f6955c4a185959c2c15b738c93120 ChangeLog 4327
 MISC metadata.xml 224 RMD160 1f8313d73dc37b4c91c0947d68ca058ee0727744 SHA1 f5cbb921c4390958ec580f3c587b1066354f2ad7 SHA256 eef0fff1da926bc7c91be50c8b0eb207a3a5d6a293066b9b6e7ffb558ce90672
 MD5 689f6b5f424fddb285d6d2b9bc0f7f03 metadata.xml 224
 RMD160 1f8313d73dc37b4c91c0947d68ca058ee0727744 metadata.xml 224
@@ -80,6 +88,9 @@ SHA256 9c2b2b6351e5bf5730636046583fb50252152d61789f7f61f9a39e1fe573e35e files/di
 MD5 1df08ce4bc3b263711c07675d9b20729 files/digest-mlmmj-1.2.15 241
 RMD160 7e5b1bde9e06539bb12885489bf1345365cfdd08 files/digest-mlmmj-1.2.15 241
 SHA256 8fdbd0f0f290b622d7eb4e79081675e3dab97f236a820320396ac1dce25db250 files/digest-mlmmj-1.2.15 241
+MD5 1df08ce4bc3b263711c07675d9b20729 files/digest-mlmmj-1.2.15-r1 241
+RMD160 7e5b1bde9e06539bb12885489bf1345365cfdd08 files/digest-mlmmj-1.2.15-r1 241
+SHA256 8fdbd0f0f290b622d7eb4e79081675e3dab97f236a820320396ac1dce25db250 files/digest-mlmmj-1.2.15-r1 241
 MD5 71d77d64b02a00c17618e024b0eefcde files/digest-mlmmj-1.2.4 238
 RMD160 ce18e79dbbbc6e50068f1133d2e2ed01307af059 files/digest-mlmmj-1.2.4 238
 SHA256 8b0aaa747831fdd0abe063fe83dc707ac990269fc100d33ade71794b66dba527 files/digest-mlmmj-1.2.4 238
diff --git a/net-mail/mlmmj/files/digest-mlmmj-1.2.15-r1 b/net-mail/mlmmj/files/digest-mlmmj-1.2.15-r1
new file mode 100644
index 000000000000..60f62496198a
--- /dev/null
+++ b/net-mail/mlmmj/files/digest-mlmmj-1.2.15-r1
@@ -0,0 +1,3 @@
+MD5 465b01218c3834346ecc7b25a9d9208d mlmmj-1.2.15.tar.bz2 168232
+RMD160 084837f79ec7326964dacdcabeb85aa5c36f4b37 mlmmj-1.2.15.tar.bz2 168232
+SHA256 5607ce673be1d5c9b8094336bb3210515d59dfc6c4a0b560d3a428f63efb35f3 mlmmj-1.2.15.tar.bz2 168232
diff --git a/net-mail/mlmmj/files/mlmmj-1.2.15_mmap_zero_byte.patch b/net-mail/mlmmj/files/mlmmj-1.2.15_mmap_zero_byte.patch
new file mode 100644
index 000000000000..d6537ecc0559
--- /dev/null
+++ b/net-mail/mlmmj/files/mlmmj-1.2.15_mmap_zero_byte.patch
@@ -0,0 +1,41 @@
+Since 2.6.12, mmap() on a zero-byte file will fail.
+If you have unsubscribed users from a list, you might be left with zero-byte
+subscriber list files, which will cause parsing the full subscriber to fail,
+and mail will only be delivered to some subset of subscribers.
+
+mlmmj-list uses similar logic, but would give a failure instead of counting the
+subscribers properly.
+
+Gentoo-BugID: 141904
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Date: Wed, 09 Jan 2008 08:25:04 +0000
+
+diff -Nuar mlmmj-1.2.15.orig/src/getaddrsfromfd.c mlmmj-1.2.15/src/getaddrsfromfd.c
+--- mlmmj-1.2.15.orig/src/getaddrsfromfd.c	2005-02-14 14:56:44.000000000 -0800
++++ mlmmj-1.2.15/src/getaddrsfromfd.c	2008-01-09 00:15:14.690251914 -0800
+@@ -21,6 +21,10 @@
+ 		log_error(LOG_ARGS, "Could not fstat fd");
+ 		return -1;
+ 	}
++	/* mmap of 0-bytes is invalid */
++	if(st.st_size == 0) {
++		return 0;
++	}
+ 
+ 	start = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+ 	if(start == MAP_FAILED) {
+diff -Nuar mlmmj-1.2.15.orig/src/mlmmj-list.c mlmmj-1.2.15/src/mlmmj-list.c
+--- mlmmj-1.2.15.orig/src/mlmmj-list.c	2004-11-28 10:46:43.000000000 -0800
++++ mlmmj-1.2.15/src/mlmmj-list.c	2008-01-09 00:16:12.719781510 -0800
+@@ -68,6 +68,11 @@
+ 	
+ 	if(!S_ISREG(st.st_mode))
+ 		return -1;
++	
++	/* Nobody there */
++	if(st.st_size == 0) {
++		return 0;
++	}
+ 
+ 	start = mmap(0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+ 	if(start == MAP_FAILED)
diff --git a/net-mail/mlmmj/mlmmj-1.2.15-r1.ebuild b/net-mail/mlmmj/mlmmj-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..db46d144d1ec
--- /dev/null
+++ b/net-mail/mlmmj/mlmmj-1.2.15-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mlmmj/mlmmj-1.2.15-r1.ebuild,v 1.1 2008/01/09 08:25:58 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="~x86 ~ppc ~ppc-macos ~amd64"
+IUSE=""
+DEPEND="virtual/mta"
+#RDEPEND=""
+S="${WORKDIR}/${MY_P}"
+SHAREDIR="/usr/share/mlmmj"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}_mmap_zero_byte.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"
+}