diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /mail-filter/policyd/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'mail-filter/policyd/files')
-rw-r--r-- | mail-filter/policyd/files/policyd-cleanup.cron | 2 | ||||
-rw-r--r-- | mail-filter/policyd/files/policyd-makefile.patch | 39 | ||||
-rw-r--r-- | mail-filter/policyd/files/policyd-post182.patch | 52 | ||||
-rw-r--r-- | mail-filter/policyd/files/policyd.confd | 2 | ||||
-rw-r--r-- | mail-filter/policyd/files/policyd.rc | 22 |
5 files changed, 117 insertions, 0 deletions
diff --git a/mail-filter/policyd/files/policyd-cleanup.cron b/mail-filter/policyd/files/policyd-cleanup.cron new file mode 100644 index 000000000000..fef8d275bd63 --- /dev/null +++ b/mail-filter/policyd/files/policyd-cleanup.cron @@ -0,0 +1,2 @@ +#!/bin/bash +/usr/sbin/policyd_cleanup -c /etc/policyd.conf diff --git a/mail-filter/policyd/files/policyd-makefile.patch b/mail-filter/policyd/files/policyd-makefile.patch new file mode 100644 index 000000000000..94e3edb1c193 --- /dev/null +++ b/mail-filter/policyd/files/policyd-makefile.patch @@ -0,0 +1,39 @@ +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 +-CPPFLAGS := -O $(inc) +-CFLAGS := -g -W -Wall -DMAXFDS=4096 ++CPPFLAGS := $(inc) ${CPPFLAGS} ++CFLAGS := -g -W -Wall -DMAXFDS=`ulimit -n` ${CFLAGS} + 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/files/policyd.confd b/mail-filter/policyd/files/policyd.confd new file mode 100644 index 000000000000..1fc697d451f2 --- /dev/null +++ b/mail-filter/policyd/files/policyd.confd @@ -0,0 +1,2 @@ +# Config file for policyd +POLICYD_CONFIG="/etc/policyd.conf" diff --git a/mail-filter/policyd/files/policyd.rc b/mail-filter/policyd/files/policyd.rc new file mode 100644 index 000000000000..ea36e4ec4aec --- /dev/null +++ b/mail-filter/policyd/files/policyd.rc @@ -0,0 +1,22 @@ +#!/sbin/runscript +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + before mta + provide postfix_greylist +} + +start() { + ebegin "Starting policyd" + start-stop-daemon --name policyd --start --quiet --exec /usr/sbin/policyd \ + -- -c ${POLICYD_CONFIG} + eend $? +} + +stop() { + ebegin "Stopping policyd" + start-stop-daemon --stop --quiet --pidfile /var/run/policyd.pid + eend $? +} |