Version bump.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 220 insertions, 6 deletions

diff --git a/mail-filter/milter-regex/ChangeLog b/mail-filter/milter-regex/ChangeLog
index d6343f605e3a..43d855f98217 100644
--- a/mail-filter/milter-regex/ChangeLog
+++ b/mail-filter/milter-regex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/milter-regex
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/ChangeLog,v 1.7 2009/08/22 23:10:29 mrness Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/ChangeLog,v 1.8 2010/09/24 20:35:56 mrness Exp $
+
+*milter-regex-1.8 (24 Sep 2010)
+
+  24 Sep 2010; Alin Năstac <mrness@gentoo.org> +milter-regex-1.8.ebuild,
+  +files/milter-regex-1.8-gentoo.patch, +files/milter-regex-1.8-rules.patch:
+  Version bump.
 
 *milter-regex-1.7-r2 (22 Aug 2009)
 
diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index f417767c6977..e9bde0445f00 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -4,16 +4,20 @@ Hash: SHA1
 AUX milter-regex-1.7-gentoo.patch 1489 RMD160 4f7c5b88f59ff176e9524a6d1d713d5bac1b0ffc SHA1 a7fc8354d8d8286012d14572cfbf8c2760dc8f00 SHA256 9bbfd44ac27041421a3e8887db49057386628c52ac60fea4a9344493c560b209
 AUX milter-regex-1.7-rules.patch 351 RMD160 ab1cd7404c555b78be8d5b7e0b04bccbe1dd539d SHA1 e757096c4404ae3fcd36bbe1f619628b73537403 SHA256 8319e51b061a12d13b49fdb602e232d229fe25d418cddbe9e96c6001753724ae
 AUX milter-regex-1.7-yacc.patch 428 RMD160 81e6fa5aec57c9824989ef61af0eefad66b45a34 SHA1 927e217aed49d9e4bf52e23325759387a5190d25 SHA256 a2f40699187e9a075f6a306b1051fb71adfd430a0c3d1d2e65f8170f12535d05
+AUX milter-regex-1.8-gentoo.patch 4222 RMD160 ce478f3fcc556a58a82c772ea19aab48fd7bf2f7 SHA1 0bb5518cb72ae733122831b95a0f9501ed5f8019 SHA256 f6b475d7640e9f8ba70907f44daa2bc74f080020af35399c648b7bb5bccbeb17
+AUX milter-regex-1.8-rules.patch 450 RMD160 f451867c2f4b39207269a5cec140ed11312a81bb SHA1 cd63ffd7f190bc2daf1ea8f7fbf99a67a0af8b4a SHA256 96454430f7ae9b3bb6460d3ee9a4121cec17488214ad0074233d8c568befe893
 AUX milter-regex-conf 177 RMD160 aac67efe1fa295755d85fe313a504bab70ed5dad SHA1 46760523a139d2ab80b9e27a4c7248a28387cee6 SHA256 e26c4c6a876dd8c3c5a15e6093feec5da7e44b396636c96d2b4441f555a8a150
 AUX milter-regex-init 964 RMD160 01d87fac14c32e763ce64ab1fd969d9a9e1570d1 SHA1 357c0283b08cf69ed14e40e78c795cd163179a26 SHA256 3aa5c796e3b4c96378395aacb6defe489fc1018aa5544680508dd59525aa1145
 DIST milter-regex-1.7.tar.gz 19321 RMD160 66868b21eb095f203ef8391e99744506d7ee3cc4 SHA1 de337bc12dade1ed4b715657c4317040f08ef902 SHA256 ca64e51c67a27962e2d258a0f69f832ffd56b5270dbe4440f960f457c74bbce6
+DIST milter-regex-1.8.tar.gz 19545 RMD160 41f7248b3f15bd4cef8cb45c20ad3d8d8e4a0ce1 SHA1 d87dacd492be59a4a7a9d4441b3a59595d008833 SHA256 6399ab230618a419c42b117e37fdb2def3c6e1ce368341df5105cd505f377c2e
 EBUILD milter-regex-1.7-r2.ebuild 1916 RMD160 cdefaf983d2d869a788bf23d08b02a68de2d9d21 SHA1 cf5144d00b0faab09493587a678c7b2f532d03ad SHA256 059d83ffe86f382acc720160097465c21ae7c60dd1f1bde4ddfb87c56453ae52
-MISC ChangeLog 1456 RMD160 29b998a03ef76b4a0bc2ccc3d64fb82343ef1e28 SHA1 06d50713f9f6dba2a65d05e06eff48a2b36e706e SHA256 037de76f0fead8e9cd37de043dc09b64fe3273cbfd4e95b60dd6e75d61d738d6
+EBUILD milter-regex-1.8.ebuild 1875 RMD160 127c5fbafe415719d2f987d4b182ffb682cd75e1 SHA1 3b105f8e06540aabe46b99858aee2106ff908b3d SHA256 c6da55cb071f2d0542961b199389a9e80eabdd84a4b91aef136489d013c507a3
+MISC ChangeLog 1657 RMD160 e4f929797fb1540fae20430da1c4a29502714f33 SHA1 7c9a4fe9c2df05a7aca98c664ea5e65f60451ccd SHA256 0e5536675556ec2085837ee35d77267121cd3c39479a21f933c9222f4ecf9be1
 MISC metadata.xml 492 RMD160 afd9793c7ad83c56f53e9d5a5b1f596b033b4e8b SHA1 5fba558c4dcabeba151318150772910833860f90 SHA256 5dd05145d4a0eb2d55ba127f97290e7c3b2ebe32bb45ad952358f61b69c4718a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqQeu0ACgkQ9A5kJBGSrsuHwwCgn3uAPuGmQOwQG1oAOR7JyIk+
-BZ0An0YwVqC9/Y/vbW1ATaZz5pJ2jYHV
-=vy+r
+iEYEARECAAYFAkydC7YACgkQ1564UogppBKfkACgsX0gx3fHKGHbYQN7cz+F+0Sr
+MqsAoJ2iJrTvg1y/5MhGO42+nuuy87ir
+=gyt5
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch
new file mode 100644
index 000000000000..27caafb654c3
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch
@@ -0,0 +1,129 @@
+diff -Nru milter-regex-1.8.orig/Makefile.linux milter-regex-1.8/Makefile.linux
+--- milter-regex-1.8.orig/Makefile.linux	2007-01-11 16:49:52.000000000 +0100
++++ milter-regex-1.8/Makefile.linux	2010-09-24 22:33:19.000000000 +0200
+@@ -6,13 +6,12 @@
+ # see milter-regex.init for an init script for RedHat/Fedora
+ # (contributed by admin@2ka.mipt.ru)
+ 
+-CFLAGS=		-g
+-LDFLAGS=	-lmilter -lpthread
++LIBS=	-lmilter -lpthread
+ 
+ all: milter-regex milter-regex.cat8
+ 
+-milter-regex: milter-regex.o eval.o strlcpy.o y.tab.o
+-	gcc -o milter-regex milter-regex.o eval.o strlcpy.o y.tab.o $(LDFLAGS)
++milter-regex: milter-regex.o eval.o strlcpy.o strlcat.o y.tab.o
++	gcc $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcpy.o strlcat.o y.tab.o $(LIBS)
+ 
+ milter-regex.o: milter-regex.c eval.h
+ 	gcc $(CFLAGS) -c milter-regex.c
+@@ -22,7 +21,10 @@
+ 
+ strlcpy.o: strlcpy.c
+ 	gcc $(CFLAGS) -c strlcpy.c
+-	
++
++strlcat.o: strlcat.c
++	gcc $(CFLAGS) -c strlcat.c
++
+ y.tab.o: y.tab.c
+ 	gcc $(CFLAGS) -c y.tab.c
+ 
+diff -Nru milter-regex-1.8.orig/parse.y milter-regex-1.8/parse.y
+--- milter-regex-1.8.orig/parse.y	2007-01-11 16:49:52.000000000 +0100
++++ milter-regex-1.8/parse.y	2010-09-24 22:33:19.000000000 +0200
+@@ -71,6 +71,7 @@
+ 	} v;
+ 	int lineno;
+ } YYSTYPE;
++#define YYSTYPE_IS_DECLARED 1
+ 
+ %}
+ 
+@@ -481,9 +482,9 @@
+ 		*r = rs;
+ 		return (0);
+ 	}
+-#ifdef __linux__
+-	(void)&yyrcsid; /* warning about yyrcsid declared but unused */
+-#endif
++//#ifdef __linux__
++//	(void)&yyrcsid; /* warning about yyrcsid declared but unused */
++//#endif
+ }
+ 
+ static int
+diff -Nru milter-regex-1.8.orig/strlcat.c milter-regex-1.8/strlcat.c
+--- milter-regex-1.8.orig/strlcat.c	1970-01-01 01:00:00.000000000 +0100
++++ milter-regex-1.8/strlcat.c	2010-09-24 22:34:31.000000000 +0200
+@@ -0,0 +1,69 @@
++/*	$OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $	*/
++
++/*-
++ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions and the following disclaimer.
++ * 2. Redistributions in binary form must reproduce the above copyright
++ *    notice, this list of conditions and the following disclaimer in the
++ *    documentation and/or other materials provided with the distribution.
++ * 3. The name of the author may not be used to endorse or promote products
++ *    derived from this software without specific prior written permission.
++ *
++ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
++ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
++ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
++ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
++ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
++ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
++ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
++ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
++ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
++ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++ */
++
++#include <sys/types.h>
++#include <string.h>
++
++/*
++ * Appends src to string dst of size siz (unlike strncat, siz is the
++ * full size of dst, not space left).  At most siz-1 characters
++ * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
++ * Returns strlen(src) + MIN(siz, strlen(initial dst)).
++ * If retval >= siz, truncation occurred.
++ */
++size_t
++strlcat(dst, src, siz)
++	char *dst;
++	const char *src;
++	size_t siz;
++{
++	char *d = dst;
++	const char *s = src;
++	size_t n = siz;
++	size_t dlen;
++
++	/* Find the end of dst and adjust bytes left but don't go past end */
++	while (n-- != 0 && *d != '\0')
++		d++;
++	dlen = d - dst;
++	n = siz - dlen;
++
++	if (n == 0)
++		return(dlen + strlen(s));
++	while (*s != '\0') {
++		if (n != 1) {
++			*d++ = *s;
++			n--;
++		}
++		s++;
++	}
++	*d = '\0';
++
++	return(dlen + (s - src));	/* count does not include NUL */
++}
diff --git a/mail-filter/milter-regex/files/milter-regex-1.8-rules.patch b/mail-filter/milter-regex/files/milter-regex-1.8-rules.patch
new file mode 100644
index 000000000000..7103e7e6c59e
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-1.8-rules.patch
@@ -0,0 +1,12 @@
+diff -Nru milter-regex-1.8.orig/rules milter-regex-1.8/rules
+--- milter-regex-1.8.orig/rules	2007-01-11 16:49:52.000000000 +0100
++++ milter-regex-1.8/rules	2010-09-24 22:11:46.000000000 +0200
+@@ -21,7 +21,7 @@
+ header /From/ /ebay\.com/i
+ header /From/ /sabresfc11@aol\.com/i
+ header /From/ /ictp\.ch/i
+-header /From/ /(sgi.org.uk/ei
++header /From/ /(sgi.org.uk)/ei
+ header /From/ /tera-byte/i
+ header /From/ /google\.com/i
+ header /Subject/ /item/i
diff --git a/mail-filter/milter-regex/milter-regex-1.8.ebuild b/mail-filter/milter-regex/milter-regex-1.8.ebuild
new file mode 100644
index 000000000000..5e2d8e36f6e6
--- /dev/null
+++ b/mail-filter/milter-regex/milter-regex-1.8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/milter-regex/milter-regex-1.8.ebuild,v 1.1 2010/09/24 20:35:56 mrness Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A milter-based regular expression filter"
+HOMEPAGE="http://www.benzedrine.cx/milter-regex.html"
+SRC_URI="http://www.benzedrine.cx/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
+DEPEND="|| ( sys-devel/bison dev-util/yacc )
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-rules.patch # fix a typo in upstream sample rules
+}
+
+src_compile() {
+	emake -f Makefile.linux milter-regex || die "emake failed"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe milter-regex
+
+	keepdir /var/run/milter-regex
+
+	insinto /etc/mail
+	newins rules milter-regex.conf
+
+	newconfd "${FILESDIR}"/milter-regex-conf milter-regex
+	newinitd "${FILESDIR}"/milter-regex-init milter-regex
+
+	doman *.8
+}
+
+pkg_preinst() {
+	enewgroup milter
+	# mail-milter/spamass-milter creates milter user with this home directory
+	# For consistency reasons, milter user must be created here with this home directory
+	# even though this package doesn't need a home directory for this user (#280571)
+	enewuser milter -1 -1 /var/lib/milter milter
+
+	fowners milter:milter /var/run/milter-regex
+}
+
+pkg_postinst() {
+	elog "If you're using Sendmail, you'll need to add this to your sendmail.mc:"
+	elog "  INPUT_MAIL_FILTER(\`milter-regex', \`S=unix:/var/run/milter-regex/milter-regex.sock, T=S:30s;R:2m')"
+	elog
+	elog "If you are using Postfix, you'll need to add this to your main.cf:"
+	elog "  smtpd_milters     = unix:/var/run/milter-regex/milter-regex.sock"
+	elog "  non_smtpd_milters = unix:/var/run/milter-regex/milter-regex.sock"
+}