Respect LDFLAGS - bug #332099. Small post 1.82 fixes - bug #288438.

(Portage version: 2.1.10/cvs/Linux x86_64)

5 files changed, 165 insertions, 9 deletions

diff --git a/mail-filter/policyd/ChangeLog b/mail-filter/policyd/ChangeLog
index e34ac8fc0b9d..49cc22a87c03 100644
--- a/mail-filter/policyd/ChangeLog
+++ b/mail-filter/policyd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/policyd
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/ChangeLog,v 1.7 2009/05/22 20:12:04 dertobi123 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/ChangeLog,v 1.8 2011/06/09 12:56:50 eras Exp $
+
+  09 Jun 2011; Eray Aslan <eras@gentoo.org> policyd-1.82-r1.ebuild,
+  +files/policyd-post182.patch, files/policyd-makefile.patch:
+  Respect LDFLAGS - bug #332099. Small post 1.82 fixes - bug #288438.
 
   22 May 2009; Tobias Scherbaum <dertobi123@gentoo.org>
   -policyd-1.80.ebuild, -policyd-1.81.ebuild, policyd-1.82.ebuild:
diff --git a/mail-filter/policyd/files/policyd-makefile.patch b/mail-filter/policyd/files/policyd-makefile.patch
index 73c1da30db17..94e3edb1c193 100644
--- a/mail-filter/policyd/files/policyd-makefile.patch
+++ b/mail-filter/policyd/files/policyd-makefile.patch
@@ -1,10 +1,11 @@
---- Makefile	2006-09-04 22:05:27.000000000 +0200
-+++ Makefile	2006-09-04 22:08:54.000000000 +0200
-@@ -15,9 +15,8 @@
- lib += -L /usr/local/mysql
+diff --git a/Makefile b/Makefile
+index ded74ce..6f2afd1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -16,8 +16,8 @@ lib += -L/usr/local/mysql
  
  
--CC       := gcc
+ CC       := gcc
 -CPPFLAGS := -O $(inc)
 -CFLAGS   := -g -W -Wall -DMAXFDS=4096
 +CPPFLAGS := $(inc) ${CPPFLAGS}
@@ -12,3 +13,27 @@
  OS_NAME  := $(shell uname | tr [A-Z] [a-z])
  LDLIBS    = $(lib) -lmysqlclient -lz
  
+@@ -50,20 +50,20 @@ policyd: syslog.o policyd.o generic.o mysql.o greylist.o throttle.o sockets.o ci
+ 	whitelist.o throttle_host.o throttle_sasl.o throttle_from.o throttle_rcpt.o helo.o
+ 	@echo ""
+ 	@echo "[*] Linking policyd*"
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) \
++	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+ 	syslog.o policyd.o generic.o mysql.o greylist.o throttle.o sockets.o cidr.o spamtrap.o blacklist.o blacklist_helo.o \
+ 	whitelist.o throttle_host.o throttle_sasl.o throttle_from.o throttle_rcpt.o helo.o \
+ 	$(LDLIBS) -o policyd
+ 
+ cleanup: syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o
+ 	@echo "[*] Linking cleanup*"
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) \
++	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+ 	syslog.o cidr.o cleanup.o generic.o sockets.o mysql.o \
+ 	$(LDLIBS) -o cleanup
+ 
+ stats: cidr.o syslog.o stats.o generic.o sockets.o mysql.o
+ 	@echo "[*] Linking stats*"
+-	@$(CC) $(CFLAGS) $(CPPFLAGS) \
++	@$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) \
+ 	cidr.o syslog.o stats.o generic.o sockets.o mysql.o \
+ 	$(LDLIBS) -o stats
+ 	@echo ""
diff --git a/mail-filter/policyd/files/policyd-post182.patch b/mail-filter/policyd/files/policyd-post182.patch
new file mode 100644
index 000000000000..fc684aab7cb3
--- /dev/null
+++ b/mail-filter/policyd/files/policyd-post182.patch
@@ -0,0 +1,52 @@
+First patch from debian.  The other two mostly cosmetic patches from bug #288438.
+--- a/syslog.c
++++ b/syslog.c
+@@ -214,14 +214,15 @@ char
+   if (strlen (str) == 0)
+     return (str);
+ 
++  p = str + strlen(str);
++
+   for (i = 0; isspace (str[i]); i++)
+     ;
+ 
+-  strcpy (str, str + i);
++  str += i;
+ 
+-  p = str + strlen (str);
+-    while ((p--) != str && isspace (*p))
+-  *p = 0;
++  while ((p--) != str && isspace (*p))
++    *p = 0;
+ 
+   return (str);
+ }
+diff -ur policyd-1.82-orig/throttle.c policyd-1.82/throttle.c
+--- a/throttle.c	2007-08-20 08:42:05.000000000 +0200
++++ b/throttle.c	2009-10-10 03:49:25.000000000 +0200
+@@ -145,11 +145,11 @@
+   
+   if(tcount[fd] >= tquota[fd] && tcount[fd] >= trcpt[fd]) {
+     tresult = tcount[fd];
+-    if (DEBUG >= 4) logmessage("tquota[fd] won\n"); }
++    if (DEBUG >= 4) logmessage("tcount[fd] won\n"); }
+     
+   if(trcpt[fd]  >= tcount[fd] && trcpt[fd] >= tquota[fd]) {
+     tresult = trcpt[fd];
+-    if (DEBUG >= 4) logmessage("tquota[fd] won\n"); }
++    if (DEBUG >= 4) logmessage("trcpt[fd] won\n"); }
+ 
+   if(DEBUG >= 4)
+     logmessage("DEBUG: fd: %d: tresult: %d\n", fd, tresult);
+diff -ur policyd-1.82-orig/throttle_sasl.c policyd-1.82/throttle_sasl.c
+--- a/throttle_sasl.c	2007-08-20 08:42:05.000000000 +0200
++++ b/throttle_sasl.c	2009-10-10 03:50:27.000000000 +0200
+@@ -188,7 +188,7 @@
+       "UPDATE throttle SET"
+       " _abuse_cur=1"
+       " WHERE _from='%s'",
+-      triplet_array[fd][1]);
++      triplet_array[fd][4]);
+     if(db_doquery(fd) == -1) return(db_failure(fd, "throttle"));
+ 
+     return (-5);
diff --git a/mail-filter/policyd/policyd-1.82-r1.ebuild b/mail-filter/policyd/policyd-1.82-r1.ebuild
new file mode 100644
index 000000000000..df12d1b81b64
--- /dev/null
+++ b/mail-filter/policyd/policyd-1.82-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.82-r1.ebuild,v 1.1 2011/06/09 12:56:50 eras Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Policy daemon for postfix and other MTAs"
+HOMEPAGE="http://policyd.sf.net/"
+
+# This is not available through SF mirrors
+SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND="virtual/mysql
+		dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-post182.patch"
+	epatch "${FILESDIR}/${PN}-makefile.patch"
+	sed -i -e "s/gcc/$(tc-getCC)/" Makefile
+
+	ebegin "Applying config patches"
+	sed -i -e s:UID=0:UID=65534:g \
+	    -e s:GID=0:GID=65534:g \
+	    -e s:DAEMON=0:DAEMON=1:g \
+	    -e s:DEBUG=3:DEBUG=0:g \
+	    -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
+	    policyd.conf || die "sed failed"
+	eend
+}
+
+src_compile() {
+	emake build || die "emake build failed"
+}
+
+src_install() {
+	insopts -o root -g nobody -m 0750
+	mv cleanup policyd_cleanup
+	mv stats policyd_stats
+
+	dosbin policyd policyd_cleanup policyd_stats
+
+	insopts -o root -g nobody -m 0640
+	insinto /etc
+	doins policyd.conf
+
+	insopts -o root -g nobody -m 0700
+	exeinto /etc/cron.hourly
+	newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
+
+	dodoc ChangeLog DATABASE.mysql README doc/support.txt
+
+	newinitd "${FILESDIR}/${PN}.rc" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+pkg_postinst() {
+	elog "You will need to create the database using the script DATABASE.mysql"
+	elog "in /usr/share/doc/${PF}/"
+	elog "Read the mysql section of the README.txt for details."
+	elog
+	elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
+	elog "  check_policy_service inet:127.0.0.1:10031"
+	elog "to your smtpd_recipient_restrictions line, or similar."
+	elog
+	elog "Also remember to start the daemon at boot:"
+	elog "  rc-update add policyd default"
+	elog
+	elog "Read the documentation for more info."
+}
diff --git a/mail-filter/policyd/policyd-1.82.ebuild b/mail-filter/policyd/policyd-1.82.ebuild
index 1a0a72527f0f..5a86191aef97 100644
--- a/mail-filter/policyd/policyd-1.82.ebuild
+++ b/mail-filter/policyd/policyd-1.82.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.82.ebuild,v 1.4 2009/05/22 20:12:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/policyd/policyd-1.82.ebuild,v 1.5 2011/06/09 12:56:50 eras Exp $
 
 inherit eutils