From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- mail-mta/courier/files/apache-sqwebmail.inc | 14 ++ .../courier/files/courier-0.74.0-fix-linking.diff | 24 +++ ...er-0.74.1-fix-implicit-declaration-warning.diff | 12 ++ .../files/courier-0.74.1-fix-testsuite.diff | 12 ++ mail-mta/courier/files/courier-init-r4 | 190 +++++++++++++++++++++ mail-mta/courier/files/norewrite.patch | 21 +++ mail-mta/courier/files/password.dist | 6 + 7 files changed, 279 insertions(+) create mode 100644 mail-mta/courier/files/apache-sqwebmail.inc create mode 100644 mail-mta/courier/files/courier-0.74.0-fix-linking.diff create mode 100644 mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff create mode 100644 mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff create mode 100644 mail-mta/courier/files/courier-init-r4 create mode 100644 mail-mta/courier/files/norewrite.patch create mode 100644 mail-mta/courier/files/password.dist (limited to 'mail-mta/courier/files') diff --git a/mail-mta/courier/files/apache-sqwebmail.inc b/mail-mta/courier/files/apache-sqwebmail.inc new file mode 100644 index 000000000000..c88f803c5d1b --- /dev/null +++ b/mail-mta/courier/files/apache-sqwebmail.inc @@ -0,0 +1,14 @@ +Alias /webmail/ /usr/share/courier/sqwebmail/images/ + + Order Allow,Deny + AllowOverride All + Allow from all + + +ScriptAlias /courier/ /usr/lib/courier/courier/webmail/ + + AllowOverride All + Options ExecCGI + Order allow,deny + Allow from all + diff --git a/mail-mta/courier/files/courier-0.74.0-fix-linking.diff b/mail-mta/courier/files/courier-0.74.0-fix-linking.diff new file mode 100644 index 000000000000..f9d10d02c432 --- /dev/null +++ b/mail-mta/courier/files/courier-0.74.0-fix-linking.diff @@ -0,0 +1,24 @@ +diff -Naur courier-0.74.0/libs/gpglib/Makefile.am courier-0.74.0-1/libs/gpglib/Makefile.am +--- courier-0.74.0/libs/gpglib/Makefile.am 2014-12-04 03:31:09.000000000 +0100 ++++ courier-0.74.0-1/libs/gpglib/Makefile.am 2014-12-14 02:18:25.599274395 +0100 +@@ -18,7 +18,7 @@ + + testgpg_SOURCES=testgpg.c + testgpg_DEPENDENCIES=libgpg.la ../numlib/libnumlib.la +-testgpg_LDADD= -lunicode $(testgpg_DEPENDENCIES) ++testgpg_LDADD= $(testgpg_DEPENDENCIES) -lunicode + testgpg_LDFLAGS=-static + + mimegpg_SOURCES=mimegpg.c +diff -Naur courier-0.74.0/libs/gpglib/Makefile.in courier-0.74.0-1/libs/gpglib/Makefile.in +--- courier-0.74.0/libs/gpglib/Makefile.in 2014-12-13 15:26:42.000000000 +0100 ++++ courier-0.74.0-1/libs/gpglib/Makefile.in 2014-12-14 02:18:35.512275143 +0100 +@@ -335,7 +335,7 @@ + + testgpg_SOURCES = testgpg.c + testgpg_DEPENDENCIES = libgpg.la ../numlib/libnumlib.la +-testgpg_LDADD = -lunicode $(testgpg_DEPENDENCIES) ++testgpg_LDADD = $(testgpg_DEPENDENCIES) -lunicode + testgpg_LDFLAGS = -static + mimegpg_SOURCES = mimegpg.c + mimegpg_LDADD = libgpg.la ../rfc2045/librfc2045.la ../rfc822/librfc822.la \ diff --git a/mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff b/mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff new file mode 100644 index 000000000000..e21da955d17c --- /dev/null +++ b/mail-mta/courier/files/courier-0.74.1-fix-implicit-declaration-warning.diff @@ -0,0 +1,12 @@ +--- courier-0.74.1/libs/rfc1035/testlookup.c 2014-11-04 13:15:00.000000000 +0100 ++++ courier-0.74.1-1/libs/rfc1035/testlookup.c 2015-02-16 13:36:14.455760592 +0100 +@@ -41,6 +41,9 @@ + + extern char rfc1035_spf_gettxt(const char *current_domain, + char *buf); ++extern char rfc1035_spf_gettxt_n(const char *current_domain, ++ char **buf); ++ + + static void spflookup(const char *current_domain) + { diff --git a/mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff b/mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff new file mode 100644 index 000000000000..b19bf2fc6fca --- /dev/null +++ b/mail-mta/courier/files/courier-0.74.1-fix-testsuite.diff @@ -0,0 +1,12 @@ +--- courier-0.74.1-plain/libs/maildrop/testsuite2 2013-08-30 02:36:07.000000000 +0200 ++++ courier-0.74.1/libs/maildrop/testsuite2 2015-02-16 13:22:37.455698929 +0100 +@@ -232,7 +232,8 @@ + + for f in testsuite?.filter + do +- echo 'xfilter "cat"' >t ++ echo "SHELL=/bin/sh" > t ++ echo 'xfilter "cat"' >>t + cat $f >>t + chmod 600 t + mv -f t $f diff --git a/mail-mta/courier/files/courier-init-r4 b/mail-mta/courier/files/courier-init-r4 new file mode 100644 index 000000000000..03dece396e86 --- /dev/null +++ b/mail-mta/courier/files/courier-init-r4 @@ -0,0 +1,190 @@ +#!/sbin/runscript +# Portions Copyright 2003 Gentoo Linux +# $Id$ +# +# script originally from Courier distfile original name = courier.sysvinit +# adapted for Gentoo by Brian Jackson +# +# TODO +# should we update all the .dat/.pem files when the source/config files are +# newer than the .dat/.pem files? + +prefix="/usr" +exec_prefix="/usr/bin" +sysconfdir="/etc/courier" +sbindir="/usr/sbin" +libexecdir="/usr/lib/courier" +datadir="/usr/share/courier" + +depend() { + need net + [ -d /etc/courier/authlib ] && need courier-authlib + grep -q "^IMAPDSTART=.*[Yy].*" /etc/courier/imapd && use famd + grep -q "^IMAPDSSLSTART=.*[Yy].*" /etc/courier/imapd-ssl && use famd +} + +checkconfig() { + checkpath -q -d -o mail:mail -m 0755 /var/run/courier + + [ -f ${sysconfdir}/pop3d-ssl ] && . ${sysconfdir}/pop3d-ssl + + # If we do not have a certificate, make one up. + [ ! -f "${datadir}/pop3d.pem" ] && \ + ebegin " generating-POP3-SSL-certificate..." && "${sbindir}/mkpop3dcert" + + [ -f ${sysconfdir}/imapd-ssl ] && . ${sysconfdir}/imapd-ssl + + # If we do not have a certificate, make one up. + [ ! -f ${datadir}/imapd.pem ] && \ + ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert" + + [ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl + + # If we do not have a certificate, make one up. + [ ! -f ${datadir}/esmtpd.pem ] && \ + ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert" + + # First time after install create aliases.dat and smtpaccess.dat + + [ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases + + [ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess + + [ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa +} + +start() { + # Start daemons. + ebegin "Starting Courier mail server:" + + checkconfig || return 1 + + ebegin " Starting courierfilterd" + ${sbindir}/courierfilter start + + [ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \ + ${libexecdir}/authlib/authdaemond start && ebegin " Starting authdaemond" + + [ -x ${sbindir}/webmaild ] && \ + ${sbindir}/webmaild start && ebegin " Starting webmaild" + + [ -x ${sbindir}/courierldapaliasd ] && \ + ${sbindir}/courierldapaliasd start && ebegin " Starting courierldapaliasd" + + ebegin " Starting courierd" + ${sbindir}/courier start + + savepath="$PATH" + # start esmtpd if so written + [ -f ${sysconfdir}/esmtpd ] && source ${sysconfdir}/esmtpd + PATH="$savepath" + case x$ESMTPDSTART in + x[yY]*) + ebegin " Starting esmtpd" + ${sbindir}/esmtpd start + ;; + esac + + # start esmtpd-msa if so written + [ -f ${sysconfdir}/esmtpd-msa ] && source ${sysconfdir}/esmtpd-msa + PATH="$savepath" + case x$ESMTPDSTART in + x[yY]*) + ebegin " Starting esmtpd-msa" + ${sbindir}/esmtpd-msa start + ;; + esac + + # start esmtpd-ssl if so written + [ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl + PATH="$savepath" + case x$ESMTPDSSLSTART in + x[yY]*) + ebegin " Starting esmtpd-ssl" + ${sbindir}/esmtpd-ssl start + ;; + esac + + # start pop3d if so written + [ -f ${sysconfdir}/pop3d ] && source ${sysconfdir}/pop3d + PATH="$savepath" + case x$POP3DSTART in + x[yY]*) + ebegin " courier-pop3d" + ${sbindir}/courier-pop3d start + ;; + esac + + # start pop3d-ssl if so written + [ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl + PATH="$savepath" + case x$POP3DSSLSTART in + x[yY]*) + ebegin " courier-pop3d-ssl" + ${sbindir}/courier-pop3d-ssl start + ;; + esac + + [ -f ${sysconfdir}/imapd ] && source ${sysconfdir}/imapd + PATH="$savepath" + case x$IMAPDSTART in + x[yY]*) + ebegin " courier-imapd" + ${sbindir}/courier-imapd start + ;; + esac + + [ -f ${sysconfdir}/imapd-ssl ] && source ${sysconfdir}/imapd-ssl + PATH="$savepath" + case x$IMAPDSSLSTART in + x[yY]*) + ebegin " courier-imapd-ssl" + ${sbindir}/courier-imapd-ssl start + ;; + esac + + eend $? +} + +stop() { + ebegin "Stopping Courier mail server:" + + ebegin " Stopping courier-esmtpd" + ${sbindir}/esmtpd stop + + ebegin " Stopping courier-esmtpd-msa" + ${sbindir}/esmtpd-msa stop + + ebegin " Stopping courier-esmtpd-ssl" + ${sbindir}/esmtpd-ssl stop + + [ -x ${sbindir}/courier-pop3d ] && \ + ebegin " Stopping courier-pop3d" && ${sbindir}/courier-pop3d stop + + [ -x ${sbindir}/courier-pop3d-ssl ] && \ + ebegin " Stopping courier-pop3d-ssl" && ${sbindir}/courier-pop3d-ssl stop + + [ -x ${sbindir}/courier-imapd ] && \ + ebegin " Stopping courier-imapd" && ${sbindir}/courier-imapd stop + + + [ -x ${sbindir}/courier-imapd-ssl ] && \ + ebegin " Stopping courier-imapd-ssl" && ${sbindir}/courier-imapd-ssl stop + + ebegin " Stopping courierd" + ${sbindir}/courier stop + + [ -x ${sbindir}/courierldapaliasd ] && \ + ( ${sbindir}/courierldapaliasd stop ; ebegin " Stopping courierldapaliasd" ) + + [ -x ${sbindir}/webmaild ] && \ + ( ${sbindir}/webmaild stop ; ebegin " Stopping webmaild" ) + + [ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \ + ( ${libexecdir}/authlib/authdaemond stop ; ebegin " Stopping authdaemond" ) + + ${sbindir}/courierfilter stop + ebegin " Stopping courierfilterd" + + eend $? +} diff --git a/mail-mta/courier/files/norewrite.patch b/mail-mta/courier/files/norewrite.patch new file mode 100644 index 000000000000..8d8f5362967e --- /dev/null +++ b/mail-mta/courier/files/norewrite.patch @@ -0,0 +1,21 @@ +--- courier/module.esmtp/esmtp.c.orig 2004-02-03 01:08:15.679486558 -0700 ++++ courier/module.esmtp/esmtp.c 2004-02-03 01:07:41.262697092 -0700 +@@ -255,6 +255,10 @@ const char *me; + struct rfc822t *tp; + struct rfc822token at; + ++#if 1 ++ (*func)(info); ++ return; ++#else + if (info->ptr == 0) + { + (*func)(info); +@@ -289,6 +293,7 @@ struct rfc822token at; + (*func)(info); + *r=0; + rfc822t_free(tp); ++#endif + } + + static void rw_esmtp(struct rw_info *info, void (*func)(struct rw_info *)) diff --git a/mail-mta/courier/files/password.dist b/mail-mta/courier/files/password.dist new file mode 100644 index 000000000000..5220e4ee0eb3 --- /dev/null +++ b/mail-mta/courier/files/password.dist @@ -0,0 +1,6 @@ +# 1. Open /etc/courier/webadmin/password for editing +# 2. There should be one word in this file. The webadmin password +# 3. chown mail:mail password +# 4. chmod 400 password +# +# Thanks to Fernando Tobler on bug #10574 for the concise instructions -- cgit v1.2.3-65-gdbad