Hanno Böck commited on 2024-07-01 20:58:23
              Zeige 6 geänderte Dateien mit 544 Einfügungen und 0 Löschungen.
            
| ... | ... | 
                      @@ -0,0 +1 @@  | 
                  
| 1 | 
                        +DIST courier-1.3.8.20240630.tar.bz2 7899983 BLAKE2B 03ef27c43b698e57560604af9626cd43f0edf3ec09706a61903145f2abd95fbf958e4eea9bde3931a4dec80f14ca57ddd18836ce20f82bc33e026177aa7081e2 SHA512 77d43c7cdbef237946edf3baecbe2997a7a65fbca764a30b58a2c7e77876e5fb92da3a0c1dd4ec7184cdea1710d775a289578857d056d0089bfec9765b54a0d8  | 
                    
| ... | ... | 
                      @@ -0,0 +1,313 @@  | 
                  
| 1 | 
                        +# Copyright 1999-2024 Gentoo Authors  | 
                    |
| 2 | 
                        +# Distributed under the terms of the GNU General Public License v2  | 
                    |
| 3 | 
                        +  | 
                    |
| 4 | 
                        +EAPI=8  | 
                    |
| 5 | 
                        +  | 
                    |
| 6 | 
                        +inherit flag-o-matic  | 
                    |
| 7 | 
                        +  | 
                    |
| 8 | 
                        +DESCRIPTION="An MTA designed specifically for maildirs"  | 
                    |
| 9 | 
                        +HOMEPAGE="https://www.courier-mta.org/"  | 
                    |
| 10 | 
                        +SRC_URI="https://downloads.sourceforge.net/courier/${P}.tar.bz2"
                       | 
                    |
| 11 | 
                        +  | 
                    |
| 12 | 
                        +LICENSE="GPL-3"  | 
                    |
| 13 | 
                        +SLOT="0"  | 
                    |
| 14 | 
                        +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"  | 
                    |
| 15 | 
                        +IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \  | 
                    |
| 16 | 
                        + fam web webmail gnutls split-usr"  | 
                    |
| 17 | 
                        +  | 
                    |
| 18 | 
                        +DEPEND="  | 
                    |
| 19 | 
                        + >=net-libs/courier-authlib-0.72.1  | 
                    |
| 20 | 
                        + >=net-libs/courier-unicode-2.3.0:=  | 
                    |
| 21 | 
                        + net-dns/libidn2:=  | 
                    |
| 22 | 
                        + gnutls? ( net-libs/gnutls:= )  | 
                    |
| 23 | 
                        + !gnutls? (  | 
                    |
| 24 | 
                        + dev-libs/openssl:0=  | 
                    |
| 25 | 
                        + )  | 
                    |
| 26 | 
                        + >=sys-libs/gdbm-1.8.0:=  | 
                    |
| 27 | 
                        + dev-libs/libpcre2  | 
                    |
| 28 | 
                        + app-misc/mime-types  | 
                    |
| 29 | 
                        + dev-lang/perl:=  | 
                    |
| 30 | 
                        + fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )  | 
                    |
| 31 | 
                        + pam? ( sys-libs/pam )  | 
                    |
| 32 | 
                        + mysql? ( dev-db/mysql-connector-c )  | 
                    |
| 33 | 
                        + ldap? ( >=net-nds/openldap-1.2.11:= )  | 
                    |
| 34 | 
                        + postgres? ( dev-db/postgresql:= )  | 
                    |
| 35 | 
                        + spell? ( app-text/aspell )  | 
                    |
| 36 | 
                        + fam? ( virtual/fam )  | 
                    |
| 37 | 
                        + !mail-filter/maildrop  | 
                    |
| 38 | 
                        + !mail-mta/esmtp  | 
                    |
| 39 | 
                        + !mail-mta/exim  | 
                    |
| 40 | 
                        + !mail-mta/msmtp[mta]  | 
                    |
| 41 | 
                        + !mail-mta/netqmail  | 
                    |
| 42 | 
                        + !mail-mta/nullmailer  | 
                    |
| 43 | 
                        + !mail-mta/postfix  | 
                    |
| 44 | 
                        + !mail-mta/sendmail  | 
                    |
| 45 | 
                        + !mail-mta/ssmtp[mta]  | 
                    |
| 46 | 
                        + !mail-mta/opensmtpd  | 
                    |
| 47 | 
                        + !net-mail/dot-forward  | 
                    |
| 48 | 
                        + !sys-apps/ucspi-tcp  | 
                    |
| 49 | 
                        + "  | 
                    |
| 50 | 
                        +  | 
                    |
| 51 | 
                        +RDEPEND="${DEPEND}
                       | 
                    |
| 52 | 
                        + sys-process/procps"  | 
                    |
| 53 | 
                        +  | 
                    |
| 54 | 
                        +# get rid of old style virtual/imapd - bug 350792  | 
                    |
| 55 | 
                        +# all blockers really needed?  | 
                    |
| 56 | 
                        +RDEPEND="${RDEPEND}
                       | 
                    |
| 57 | 
                        + !net-mail/courier-imap  | 
                    |
| 58 | 
                        + !net-mail/cyrus-imapd"  | 
                    |
| 59 | 
                        +  | 
                    |
| 60 | 
                        +PDEPEND="pam? ( net-mail/mailbase )  | 
                    |
| 61 | 
                        + crypt? ( >=app-crypt/gnupg-1.0.4 )"  | 
                    |
| 62 | 
                        +  | 
                    |
| 63 | 
                        +src_prepare() {
                       | 
                    |
| 64 | 
                        +	use norewrite && eapply "${FILESDIR}/norewrite.patch"
                       | 
                    |
| 65 | 
                        + default  | 
                    |
| 66 | 
                        +}  | 
                    |
| 67 | 
                        +  | 
                    |
| 68 | 
                        +src_configure() {
                       | 
                    |
| 69 | 
                        + filter-flags '-fomit-frame-pointer'  | 
                    |
| 70 | 
                        +  | 
                    |
| 71 | 
                        + local myconf  | 
                    |
| 72 | 
                        + myconf=""  | 
                    |
| 73 | 
                        +  | 
                    |
| 74 | 
                        +	use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
                       | 
                    |
| 75 | 
                        +  | 
                    |
| 76 | 
                        +	econf ${myconf} \
                       | 
                    |
| 77 | 
                        + $(use_with fam) \  | 
                    |
| 78 | 
                        + $(use_with ipv6) \  | 
                    |
| 79 | 
                        + $(use_with spell ispell) \  | 
                    |
| 80 | 
                        + $(use_with ldap ldapaliasd) \  | 
                    |
| 81 | 
                        + $(use_enable ldap maildroldap) \  | 
                    |
| 82 | 
                        + $(use_with gnutls) \  | 
                    |
| 83 | 
                        + --with-notice=unicode \  | 
                    |
| 84 | 
                        + --enable-mimetypes=/etc/mime.types \  | 
                    |
| 85 | 
                        + --prefix=/usr \  | 
                    |
| 86 | 
                        + --disable-root-check \  | 
                    |
| 87 | 
                        + --mandir=/usr/share/man \  | 
                    |
| 88 | 
                        + --sysconfdir=/etc/courier \  | 
                    |
| 89 | 
                        + --datadir=/usr/share/courier \  | 
                    |
| 90 | 
                        + --sharedstatedir=/var/lib/courier/com \  | 
                    |
| 91 | 
                        + --localstatedir=/var/lib/courier \  | 
                    |
| 92 | 
                        + --with-piddir=/var/run/courier \  | 
                    |
| 93 | 
                        + --with-authdaemonvar=/var/lib/courier/authdaemon \  | 
                    |
| 94 | 
                        + --with-mailuser=mail \  | 
                    |
| 95 | 
                        + --with-mailgroup=mail \  | 
                    |
| 96 | 
                        + --with-paranoid-smtpext \  | 
                    |
| 97 | 
                        + --with-db=gdbm \  | 
                    |
| 98 | 
                        + --disable-autorenamesent \  | 
                    |
| 99 | 
                        +		--cache-file="${S}/configuring.cache" \
                       | 
                    |
| 100 | 
                        +		--host="${CHOST}" debug=true || die "./configure"
                       | 
                    |
| 101 | 
                        +}  | 
                    |
| 102 | 
                        +  | 
                    |
| 103 | 
                        +src_compile() {
                       | 
                    |
| 104 | 
                        + default  | 
                    |
| 105 | 
                        +}  | 
                    |
| 106 | 
                        +  | 
                    |
| 107 | 
                        +etc_courier() {
                       | 
                    |
| 108 | 
                        + # Import existing /etc/courier/file if it exists.  | 
                    |
| 109 | 
                        + # Add option only if it was not already set or even commented out  | 
                    |
| 110 | 
                        +	local file="${1}" word=$(echo "${2}" | sed -e "s|=.*$||" -e "s|^.*opt ||")
                       | 
                    |
| 111 | 
                        +	[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
                       | 
                    |
| 112 | 
                        +			cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
                       | 
                    |
| 113 | 
                        +	grep -q "${word}" "${D}/etc/courier/${file}" || \
                       | 
                    |
| 114 | 
                        +		echo "${2}" >> "${D}/etc/courier/${file}"
                       | 
                    |
| 115 | 
                        +}  | 
                    |
| 116 | 
                        +  | 
                    |
| 117 | 
                        +etc_courier_chg() {
                       | 
                    |
| 118 | 
                        +	local file="${1}" key="${2}" value="${3}" section="${4}"
                       | 
                    |
| 119 | 
                        +	[ -z "${section}" ] && section="${2}"
                       | 
                    |
| 120 | 
                        +	grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
                       | 
                    |
| 121 | 
                        +	sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
                       | 
                    |
| 122 | 
                        +}  | 
                    |
| 123 | 
                        +  | 
                    |
| 124 | 
                        +src_install() {
                       | 
                    |
| 125 | 
                        + local f  | 
                    |
| 126 | 
                        + diropts -o mail -g mail  | 
                    |
| 127 | 
                        + keepdir /var/lib/courier/tmp  | 
                    |
| 128 | 
                        + keepdir /var/lib/courier/msgs  | 
                    |
| 129 | 
                        +	make install DESTDIR="${D}" || die "install"
                       | 
                    |
| 130 | 
                        +	make install-configure DESTDIR="${D}" || die "install-configure"
                       | 
                    |
| 131 | 
                        +  | 
                    |
| 132 | 
                        + # init script takes care of this  | 
                    |
| 133 | 
                        +	rm -rf "${D}/var/run"
                       | 
                    |
| 134 | 
                        +  | 
                    |
| 135 | 
                        + # Get rid of files we dont want  | 
                    |
| 136 | 
                        + if ! use webmail ; then  | 
                    |
| 137 | 
                        +		rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
                       | 
                    |
| 138 | 
                        +			"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
                       | 
                    |
| 139 | 
                        +			"${D}/usr/share/courier/sqwebmail/" \
                       | 
                    |
| 140 | 
                        +			"${D}/usr/sbin/webmaild" \
                       | 
                    |
| 141 | 
                        +			"${D}/usr/sbin/webgpg" \
                       | 
                    |
| 142 | 
                        +			"${D}/etc/courier/webmail.authpam" \
                       | 
                    |
| 143 | 
                        +			"${D}/var/lib/courier/webmail-logincache" \
                       | 
                    |
| 144 | 
                        +			"${D}"/etc/courier/sqwebmaild*
                       | 
                    |
| 145 | 
                        + fi  | 
                    |
| 146 | 
                        +  | 
                    |
| 147 | 
                        + if ! use web ; then  | 
                    |
| 148 | 
                        +		rm -rf "${D}/usr/share/courier/courierwebadmin/" \
                       | 
                    |
| 149 | 
                        +			"${D}/etc/courier/webadmin"
                       | 
                    |
| 150 | 
                        + fi  | 
                    |
| 151 | 
                        +  | 
                    |
| 152 | 
                        +	for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
                       | 
                    |
| 153 | 
                        + keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"  | 
                    |
| 154 | 
                        + done  | 
                    |
| 155 | 
                        +  | 
                    |
| 156 | 
                        +	newinitd "${FILESDIR}/courier-init-r4" "courier"
                       | 
                    |
| 157 | 
                        +	use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
                       | 
                    |
| 158 | 
                        +  | 
                    |
| 159 | 
                        +	cd "${D}/etc/courier"
                       | 
                    |
| 160 | 
                        + if use webmail ; then  | 
                    |
| 161 | 
                        + insinto /etc/courier  | 
                    |
| 162 | 
                        +		newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
                       | 
                    |
| 163 | 
                        + fi  | 
                    |
| 164 | 
                        +  | 
                    |
| 165 | 
                        +	for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
                       | 
                    |
| 166 | 
                        + if use ldap ; then  | 
                    |
| 167 | 
                        + [ -e ldapaliasrc ] && ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )  | 
                    |
| 168 | 
                        + else  | 
                    |
| 169 | 
                        + rm -f ldapaliasrc  | 
                    |
| 170 | 
                        + fi  | 
                    |
| 171 | 
                        +  | 
                    |
| 172 | 
                        + ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \  | 
                    |
| 173 | 
                        +		> "${D}/etc/courier/sizelimit"
                       | 
                    |
| 174 | 
                        + etc_courier maildroprc ""  | 
                    |
| 175 | 
                        + etc_courier esmtproutes ""  | 
                    |
| 176 | 
                        + etc_courier backuprelay ""  | 
                    |
| 177 | 
                        + etc_courier locallowercase ""  | 
                    |
| 178 | 
                        + etc_courier bofh "opt BOFHBADMIME=accept"  | 
                    |
| 179 | 
                        + etc_courier bofh "opt BOFHSPFTRUSTME=1"  | 
                    |
| 180 | 
                        + etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"  | 
                    |
| 181 | 
                        + etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"  | 
                    |
| 182 | 
                        + etc_courier bofh "opt BOFHSPFFROM=all"  | 
                    |
| 183 | 
                        + etc_courier bofh "opt BOFHSPFMAILFROM=all"  | 
                    |
| 184 | 
                        + etc_courier bofh "#opt BOFHSPFHARDERROR=fail"  | 
                    |
| 185 | 
                        + etc_courier esmtpd "BOFHBADMIME=accept"  | 
                    |
| 186 | 
                        + etc_courier esmtpd-ssl "BOFHBADMIME=accept"  | 
                    |
| 187 | 
                        + etc_courier esmtpd-msa "BOFHBADMIME=accept"  | 
                    |
| 188 | 
                        +  | 
                    |
| 189 | 
                        + use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"  | 
                    |
| 190 | 
                        + use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"  | 
                    |
| 191 | 
                        +  | 
                    |
| 192 | 
                        + # Fix for a sandbox violation on subsequential merges  | 
                    |
| 193 | 
                        + # - ticho@gentoo.org, 2005-07-10  | 
                    |
| 194 | 
                        + dosym ../share/courier/pop3d /usr/sbin/courier-pop3d  | 
                    |
| 195 | 
                        + dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl  | 
                    |
| 196 | 
                        + dosym ../share/courier/imapd /usr/sbin/courier-imapd  | 
                    |
| 197 | 
                        + dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl  | 
                    |
| 198 | 
                        +  | 
                    |
| 199 | 
                        +	cd "${S}"
                       | 
                    |
| 200 | 
                        + cp imap/README README.imap  | 
                    |
| 201 | 
                        + use nls && cp unicode/README README.unicode  | 
                    |
| 202 | 
                        + dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt  | 
                    |
| 203 | 
                        + dodoc libs/tcpd/README.couriertls  | 
                    |
| 204 | 
                        +	mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"
                       | 
                    |
| 205 | 
                        +  | 
                    |
| 206 | 
                        + if use webmail ; then  | 
                    |
| 207 | 
                        + insinto /usr/$(get_libdir)/courier/courier  | 
                    |
| 208 | 
                        + insopts -m 755 -o mail -g mail  | 
                    |
| 209 | 
                        +		doins "${S}/courier/webmaild"
                       | 
                    |
| 210 | 
                        + fi  | 
                    |
| 211 | 
                        +  | 
                    |
| 212 | 
                        + if use web ; then  | 
                    |
| 213 | 
                        + insinto /etc/courier/webadmin  | 
                    |
| 214 | 
                        + insopts -m 400 -o mail -g mail  | 
                    |
| 215 | 
                        +		doins "${FILESDIR}/password.dist"
                       | 
                    |
| 216 | 
                        + fi  | 
                    |
| 217 | 
                        +  | 
                    |
| 218 | 
                        + # avoid name collisions in /usr/sbin, make webadmin match  | 
                    |
| 219 | 
                        +	cd "${D}/usr/sbin"
                       | 
                    |
| 220 | 
                        +	for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
                       | 
                    |
| 221 | 
                        + if use web ; then  | 
                    |
| 222 | 
                        + sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \  | 
                    |
| 223 | 
                        + -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \  | 
                    |
| 224 | 
                        +			"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
                       | 
                    |
| 225 | 
                        + || ewarn "failed to fix webadmin"  | 
                    |
| 226 | 
                        + sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \  | 
                    |
| 227 | 
                        + -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \  | 
                    |
| 228 | 
                        +			"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
                       | 
                    |
| 229 | 
                        + || ewarn "failed to fix webadmin"  | 
                    |
| 230 | 
                        + fi  | 
                    |
| 231 | 
                        +  | 
                    |
| 232 | 
                        + # users should be able to send mail. Could be restricted with suictl.  | 
                    |
| 233 | 
                        +	chmod u+s "${D}/usr/bin/sendmail"
                       | 
                    |
| 234 | 
                        +  | 
                    |
| 235 | 
                        + if use split-usr; then  | 
                    |
| 236 | 
                        + dosym ../bin/sendmail /usr/sbin/sendmail  | 
                    |
| 237 | 
                        + fi  | 
                    |
| 238 | 
                        +}  | 
                    |
| 239 | 
                        +  | 
                    |
| 240 | 
                        +src_test() {
                       | 
                    |
| 241 | 
                        + if [ `whoami` != 'root' ]; then  | 
                    |
| 242 | 
                        + # Disable valgrind checks  | 
                    |
| 243 | 
                        + echo '#!/bin/sh' > libs/imap/testsuitevalgrind  | 
                    |
| 244 | 
                        + echo '#!/bin/sh' > libs/maildir/testsuitevalgrind  | 
                    |
| 245 | 
                        + sed -i -e 's:VALGRIND=:exit 0 #VALGRIND=:g' libs/maildrop/Makefile*  | 
                    |
| 246 | 
                        + emake -j1 check  | 
                    |
| 247 | 
                        + else  | 
                    |
| 248 | 
                        + einfo "make check skipped, can't run as root."  | 
                    |
| 249 | 
                        + einfo "You can enable it with FEATURES=\"userpriv\""  | 
                    |
| 250 | 
                        + fi  | 
                    |
| 251 | 
                        +}  | 
                    |
| 252 | 
                        +  | 
                    |
| 253 | 
                        +pkg_postinst() {
                       | 
                    |
| 254 | 
                        + use fam && elog "fam daemon is needed for courier-imapd" \  | 
                    |
| 255 | 
                        + || ewarn "courier was built without fam support"  | 
                    |
| 256 | 
                        +}  | 
                    |
| 257 | 
                        +  | 
                    |
| 258 | 
                        +pkg_config() {
                       | 
                    |
| 259 | 
                        + mailhost="$(hostname)"  | 
                    |
| 260 | 
                        + export mailhost  | 
                    |
| 261 | 
                        +  | 
                    |
| 262 | 
                        + domainname="$(domainname)"  | 
                    |
| 263 | 
                        + if [ "x$domainname" = "x(none)" ] ; then  | 
                    |
| 264 | 
                        +		domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
                       | 
                    |
| 265 | 
                        + fi  | 
                    |
| 266 | 
                        + export domainname  | 
                    |
| 267 | 
                        +  | 
                    |
| 268 | 
                        +	if [[ -z "${ROOT}" ]] ; then
                       | 
                    |
| 269 | 
                        +		file="${ROOT}/etc/courier/locals"
                       | 
                    |
| 270 | 
                        +		if [ ! -f "${file}" ] ; then
                       | 
                    |
| 271 | 
                        +			echo "localhost" > "${file}";
                       | 
                    |
| 272 | 
                        +			echo "${domainname}" >> "${file}";
                       | 
                    |
| 273 | 
                        + fi  | 
                    |
| 274 | 
                        +		file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
                       | 
                    |
| 275 | 
                        +		if [ ! -f "${file}" ] ; then
                       | 
                    |
| 276 | 
                        +			echo "${domainname}" > "${file}"
                       | 
                    |
| 277 | 
                        + /usr/sbin/makeacceptmailfor  | 
                    |
| 278 | 
                        + fi  | 
                    |
| 279 | 
                        +  | 
                    |
| 280 | 
                        +		file="${ROOT}/etc/courier/smtpaccess/${domainname}"
                       | 
                    |
| 281 | 
                        +		if [ ! -f "${file}" ]
                       | 
                    |
| 282 | 
                        + then  | 
                    |
| 283 | 
                        + netstat -nr | grep "^[1-9]" | while read network gateway netmask rest  | 
                    |
| 284 | 
                        + do  | 
                    |
| 285 | 
                        + i=1  | 
                    |
| 286 | 
                        + net=""  | 
                    |
| 287 | 
                        +				TIFS="${IFS}"
                       | 
                    |
| 288 | 
                        + IFS="."  | 
                    |
| 289 | 
                        +				for o in "${netmask}"
                       | 
                    |
| 290 | 
                        + do  | 
                    |
| 291 | 
                        +					if [ "${o}" == "255" ]
                       | 
                    |
| 292 | 
                        + then  | 
                    |
| 293 | 
                        +						[ "_${net}" == "_" ] || net="${net}."
                       | 
                    |
| 294 | 
                        +						t="$(echo "${network}" | cut -d " " -f ${i})"
                       | 
                    |
| 295 | 
                        +						net="${net}${t}"
                       | 
                    |
| 296 | 
                        + fi  | 
                    |
| 297 | 
                        +					i="$((${i} + 1))"
                       | 
                    |
| 298 | 
                        + done  | 
                    |
| 299 | 
                        +				IFS="${TIFS}"
                       | 
                    |
| 300 | 
                        +				echo "doing configuration - relay control for the network ${net} !"
                       | 
                    |
| 301 | 
                        +				echo "${net}	allow,RELAYCLIENT" >> ${file}
                       | 
                    |
| 302 | 
                        + done  | 
                    |
| 303 | 
                        + /usr/sbin/makesmtpaccess  | 
                    |
| 304 | 
                        + fi  | 
                    |
| 305 | 
                        + fi  | 
                    |
| 306 | 
                        +  | 
                    |
| 307 | 
                        + echo "creating cert for esmtpd-ssl:"  | 
                    |
| 308 | 
                        + /usr/sbin/mkesmtpdcert  | 
                    |
| 309 | 
                        + echo "creating cert for imapd-ssl:"  | 
                    |
| 310 | 
                        + /usr/sbin/mkpop3dcert  | 
                    |
| 311 | 
                        + echo "creating cert for pop3d-ssl:"  | 
                    |
| 312 | 
                        + /usr/sbin/mkimapdcert  | 
                    |
| 313 | 
                        +}  | 
                    
| ... | ... | 
                      @@ -0,0 +1,14 @@  | 
                  
| 1 | 
                        +Alias /webmail/ /usr/share/courier/sqwebmail/images/  | 
                    |
| 2 | 
                        +<Directory /usr/share/courier/sqwebmail/>  | 
                    |
| 3 | 
                        + Order Allow,Deny  | 
                    |
| 4 | 
                        + AllowOverride All  | 
                    |
| 5 | 
                        + Allow from all  | 
                    |
| 6 | 
                        +</Directory>  | 
                    |
| 7 | 
                        +  | 
                    |
| 8 | 
                        +ScriptAlias /courier/ /usr/lib/courier/courier/webmail/  | 
                    |
| 9 | 
                        +<Directory /usr/lib/courier/courier/webmail/>  | 
                    |
| 10 | 
                        + AllowOverride All  | 
                    |
| 11 | 
                        + Options ExecCGI  | 
                    |
| 12 | 
                        + Order allow,deny  | 
                    |
| 13 | 
                        + Allow from all  | 
                    |
| 14 | 
                        +</Directory>  | 
                    
| ... | ... | 
                      @@ -0,0 +1,189 @@  | 
                  
| 1 | 
                        +#!/sbin/openrc-run  | 
                    |
| 2 | 
                        +# Portions Copyright 2003 Gentoo Linux  | 
                    |
| 3 | 
                        +#  | 
                    |
| 4 | 
                        +# script originally from Courier distfile original name = courier.sysvinit  | 
                    |
| 5 | 
                        +# adapted for Gentoo by Brian Jackson  | 
                    |
| 6 | 
                        +#  | 
                    |
| 7 | 
                        +# TODO  | 
                    |
| 8 | 
                        +# should we update all the .dat/.pem files when the source/config files are  | 
                    |
| 9 | 
                        +# newer than the .dat/.pem files?  | 
                    |
| 10 | 
                        +  | 
                    |
| 11 | 
                        +prefix="/usr"  | 
                    |
| 12 | 
                        +exec_prefix="/usr/bin"  | 
                    |
| 13 | 
                        +sysconfdir="/etc/courier"  | 
                    |
| 14 | 
                        +sbindir="/usr/sbin"  | 
                    |
| 15 | 
                        +libexecdir="/usr/lib/courier"  | 
                    |
| 16 | 
                        +datadir="/usr/share/courier"  | 
                    |
| 17 | 
                        +  | 
                    |
| 18 | 
                        +depend() {
                       | 
                    |
| 19 | 
                        + need net  | 
                    |
| 20 | 
                        + [ -d /etc/courier/authlib ] && need courier-authlib  | 
                    |
| 21 | 
                        + grep -q "^IMAPDSTART=.*[Yy].*" /etc/courier/imapd && use famd  | 
                    |
| 22 | 
                        + grep -q "^IMAPDSSLSTART=.*[Yy].*" /etc/courier/imapd-ssl && use famd  | 
                    |
| 23 | 
                        +}  | 
                    |
| 24 | 
                        +  | 
                    |
| 25 | 
                        +checkconfig() {
                       | 
                    |
| 26 | 
                        + checkpath -q -d -o mail:mail -m 0755 /var/run/courier  | 
                    |
| 27 | 
                        +  | 
                    |
| 28 | 
                        +	[ -f ${sysconfdir}/pop3d-ssl ] && . ${sysconfdir}/pop3d-ssl
                       | 
                    |
| 29 | 
                        +  | 
                    |
| 30 | 
                        + # If we do not have a certificate, make one up.  | 
                    |
| 31 | 
                        +	[ ! -f "${datadir}/pop3d.pem" ] && \
                       | 
                    |
| 32 | 
                        +	ebegin " generating-POP3-SSL-certificate..." && "${sbindir}/mkpop3dcert"
                       | 
                    |
| 33 | 
                        +  | 
                    |
| 34 | 
                        +	[ -f ${sysconfdir}/imapd-ssl ] && . ${sysconfdir}/imapd-ssl
                       | 
                    |
| 35 | 
                        +  | 
                    |
| 36 | 
                        + # If we do not have a certificate, make one up.  | 
                    |
| 37 | 
                        +	[ ! -f ${datadir}/imapd.pem ] && \
                       | 
                    |
| 38 | 
                        +	ebegin " generating-IMAP-SSL-certificate..." && "${sbindir}/mkimapdcert"
                       | 
                    |
| 39 | 
                        +  | 
                    |
| 40 | 
                        +	[ -f ${sysconfdir}/esmtpd-ssl ] && . ${sysconfdir}/esmtpd-ssl
                       | 
                    |
| 41 | 
                        +  | 
                    |
| 42 | 
                        + # If we do not have a certificate, make one up.  | 
                    |
| 43 | 
                        +	[ ! -f ${datadir}/esmtpd.pem ] && \
                       | 
                    |
| 44 | 
                        +	ebegin " generating-ESMTP-SSL-certificate..." && "${sbindir}/mkesmtpdcert"
                       | 
                    |
| 45 | 
                        +  | 
                    |
| 46 | 
                        + # First time after install create aliases.dat and smtpaccess.dat  | 
                    |
| 47 | 
                        +  | 
                    |
| 48 | 
                        +	[ -f ${sysconfdir}/aliases.dat ] || ${sbindir}/makealiases
                       | 
                    |
| 49 | 
                        +  | 
                    |
| 50 | 
                        +	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess
                       | 
                    |
| 51 | 
                        +  | 
                    |
| 52 | 
                        +	[ -f ${sysconfdir}/${ACCESSFILE}.dat ] || ${sbindir}/makesmtpaccess-msa
                       | 
                    |
| 53 | 
                        +}  | 
                    |
| 54 | 
                        +  | 
                    |
| 55 | 
                        +start() {
                       | 
                    |
| 56 | 
                        + # Start daemons.  | 
                    |
| 57 | 
                        + ebegin "Starting Courier mail server:"  | 
                    |
| 58 | 
                        +  | 
                    |
| 59 | 
                        + checkconfig || return 1  | 
                    |
| 60 | 
                        +  | 
                    |
| 61 | 
                        + ebegin " Starting courierfilterd"  | 
                    |
| 62 | 
                        +	${sbindir}/courierfilter start
                       | 
                    |
| 63 | 
                        +  | 
                    |
| 64 | 
                        +	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
                       | 
                    |
| 65 | 
                        +	${libexecdir}/authlib/authdaemond start && ebegin " Starting authdaemond"
                       | 
                    |
| 66 | 
                        +  | 
                    |
| 67 | 
                        +	[ -x ${sbindir}/webmaild ] && \
                       | 
                    |
| 68 | 
                        +	  ${sbindir}/webmaild start && ebegin " Starting webmaild" 
                       | 
                    |
| 69 | 
                        +  | 
                    |
| 70 | 
                        +	[ -x ${sbindir}/courierldapaliasd ] && \
                       | 
                    |
| 71 | 
                        +	${sbindir}/courierldapaliasd start && ebegin " Starting courierldapaliasd"
                       | 
                    |
| 72 | 
                        +  | 
                    |
| 73 | 
                        + ebegin " Starting courierd"  | 
                    |
| 74 | 
                        +	${sbindir}/courier start
                       | 
                    |
| 75 | 
                        +  | 
                    |
| 76 | 
                        + savepath="$PATH"  | 
                    |
| 77 | 
                        + # start esmtpd if so written  | 
                    |
| 78 | 
                        +	[ -f ${sysconfdir}/esmtpd ] && source ${sysconfdir}/esmtpd
                       | 
                    |
| 79 | 
                        + PATH="$savepath"  | 
                    |
| 80 | 
                        + case x$ESMTPDSTART in  | 
                    |
| 81 | 
                        + x[yY]*)  | 
                    |
| 82 | 
                        + ebegin " Starting esmtpd"  | 
                    |
| 83 | 
                        +		${sbindir}/esmtpd start
                       | 
                    |
| 84 | 
                        + ;;  | 
                    |
| 85 | 
                        + esac  | 
                    |
| 86 | 
                        +  | 
                    |
| 87 | 
                        + # start esmtpd-msa if so written  | 
                    |
| 88 | 
                        +	[ -f ${sysconfdir}/esmtpd-msa ] && source ${sysconfdir}/esmtpd-msa
                       | 
                    |
| 89 | 
                        + PATH="$savepath"  | 
                    |
| 90 | 
                        + case x$ESMTPDSTART in  | 
                    |
| 91 | 
                        + x[yY]*)  | 
                    |
| 92 | 
                        + ebegin " Starting esmtpd-msa"  | 
                    |
| 93 | 
                        +		${sbindir}/esmtpd-msa start
                       | 
                    |
| 94 | 
                        + ;;  | 
                    |
| 95 | 
                        + esac  | 
                    |
| 96 | 
                        +  | 
                    |
| 97 | 
                        + # start esmtpd-ssl if so written  | 
                    |
| 98 | 
                        +	[ -f ${sysconfdir}/esmtpd-ssl ] && source ${sysconfdir}/esmtpd-ssl
                       | 
                    |
| 99 | 
                        + PATH="$savepath"  | 
                    |
| 100 | 
                        + case x$ESMTPDSSLSTART in  | 
                    |
| 101 | 
                        + x[yY]*)  | 
                    |
| 102 | 
                        + ebegin " Starting esmtpd-ssl"  | 
                    |
| 103 | 
                        +		${sbindir}/esmtpd-ssl start
                       | 
                    |
| 104 | 
                        + ;;  | 
                    |
| 105 | 
                        + esac  | 
                    |
| 106 | 
                        +  | 
                    |
| 107 | 
                        + # start pop3d if so written  | 
                    |
| 108 | 
                        +	[ -f ${sysconfdir}/pop3d ] && source ${sysconfdir}/pop3d
                       | 
                    |
| 109 | 
                        + PATH="$savepath"  | 
                    |
| 110 | 
                        + case x$POP3DSTART in  | 
                    |
| 111 | 
                        + x[yY]*)  | 
                    |
| 112 | 
                        + ebegin " courier-pop3d"  | 
                    |
| 113 | 
                        +		${sbindir}/courier-pop3d start
                       | 
                    |
| 114 | 
                        + ;;  | 
                    |
| 115 | 
                        + esac  | 
                    |
| 116 | 
                        +  | 
                    |
| 117 | 
                        + # start pop3d-ssl if so written  | 
                    |
| 118 | 
                        +	[ -f ${sysconfdir}/pop3d-ssl ] && source ${sysconfdir}/pop3d-ssl
                       | 
                    |
| 119 | 
                        + PATH="$savepath"  | 
                    |
| 120 | 
                        + case x$POP3DSSLSTART in  | 
                    |
| 121 | 
                        + x[yY]*)  | 
                    |
| 122 | 
                        + ebegin " courier-pop3d-ssl"  | 
                    |
| 123 | 
                        +		${sbindir}/courier-pop3d-ssl start
                       | 
                    |
| 124 | 
                        + ;;  | 
                    |
| 125 | 
                        + esac  | 
                    |
| 126 | 
                        +  | 
                    |
| 127 | 
                        +	[ -f ${sysconfdir}/imapd ] && source ${sysconfdir}/imapd
                       | 
                    |
| 128 | 
                        + PATH="$savepath"  | 
                    |
| 129 | 
                        + case x$IMAPDSTART in  | 
                    |
| 130 | 
                        + x[yY]*)  | 
                    |
| 131 | 
                        + ebegin " courier-imapd"  | 
                    |
| 132 | 
                        +		${sbindir}/courier-imapd start
                       | 
                    |
| 133 | 
                        + ;;  | 
                    |
| 134 | 
                        + esac  | 
                    |
| 135 | 
                        +  | 
                    |
| 136 | 
                        +	[ -f ${sysconfdir}/imapd-ssl ] && source ${sysconfdir}/imapd-ssl
                       | 
                    |
| 137 | 
                        + PATH="$savepath"  | 
                    |
| 138 | 
                        + case x$IMAPDSSLSTART in  | 
                    |
| 139 | 
                        + x[yY]*)  | 
                    |
| 140 | 
                        + ebegin " courier-imapd-ssl"  | 
                    |
| 141 | 
                        +		${sbindir}/courier-imapd-ssl start
                       | 
                    |
| 142 | 
                        + ;;  | 
                    |
| 143 | 
                        + esac  | 
                    |
| 144 | 
                        +  | 
                    |
| 145 | 
                        + eend $?  | 
                    |
| 146 | 
                        +}  | 
                    |
| 147 | 
                        +  | 
                    |
| 148 | 
                        +stop() {
                       | 
                    |
| 149 | 
                        + ebegin "Stopping Courier mail server:"  | 
                    |
| 150 | 
                        +  | 
                    |
| 151 | 
                        + ebegin " Stopping courier-esmtpd"  | 
                    |
| 152 | 
                        +	${sbindir}/esmtpd stop
                       | 
                    |
| 153 | 
                        +  | 
                    |
| 154 | 
                        + ebegin " Stopping courier-esmtpd-msa"  | 
                    |
| 155 | 
                        +	${sbindir}/esmtpd-msa stop
                       | 
                    |
| 156 | 
                        +  | 
                    |
| 157 | 
                        + ebegin " Stopping courier-esmtpd-ssl"  | 
                    |
| 158 | 
                        +	${sbindir}/esmtpd-ssl stop
                       | 
                    |
| 159 | 
                        +  | 
                    |
| 160 | 
                        +	[ -x ${sbindir}/courier-pop3d ] && \
                       | 
                    |
| 161 | 
                        +		ebegin " Stopping courier-pop3d" && ${sbindir}/courier-pop3d stop
                       | 
                    |
| 162 | 
                        +  | 
                    |
| 163 | 
                        +	[ -x ${sbindir}/courier-pop3d-ssl ] && \
                       | 
                    |
| 164 | 
                        +		ebegin " Stopping courier-pop3d-ssl" && ${sbindir}/courier-pop3d-ssl stop
                       | 
                    |
| 165 | 
                        +  | 
                    |
| 166 | 
                        +	[ -x ${sbindir}/courier-imapd ] && \
                       | 
                    |
| 167 | 
                        +		ebegin " Stopping courier-imapd" && ${sbindir}/courier-imapd stop
                       | 
                    |
| 168 | 
                        +  | 
                    |
| 169 | 
                        +  | 
                    |
| 170 | 
                        +	[ -x ${sbindir}/courier-imapd-ssl ] && \
                       | 
                    |
| 171 | 
                        +		ebegin " Stopping courier-imapd-ssl" && ${sbindir}/courier-imapd-ssl stop
                       | 
                    |
| 172 | 
                        +  | 
                    |
| 173 | 
                        + ebegin " Stopping courierd"  | 
                    |
| 174 | 
                        +	${sbindir}/courier stop
                       | 
                    |
| 175 | 
                        +  | 
                    |
| 176 | 
                        +	[ -x ${sbindir}/courierldapaliasd ] && \
                       | 
                    |
| 177 | 
                        +	( ${sbindir}/courierldapaliasd stop ; ebegin " Stopping courierldapaliasd" )
                       | 
                    |
| 178 | 
                        +  | 
                    |
| 179 | 
                        +	[ -x ${sbindir}/webmaild ] && \
                       | 
                    |
| 180 | 
                        +	  ( ${sbindir}/webmaild stop ; ebegin " Stopping webmaild" )
                       | 
                    |
| 181 | 
                        +  | 
                    |
| 182 | 
                        +	[ ! -d /etc/courier/authlib ] && [ -x ${libexecdir}/authlib/authdaemond ] && \
                       | 
                    |
| 183 | 
                        +	( ${libexecdir}/authlib/authdaemond stop ; ebegin " Stopping authdaemond" )
                       | 
                    |
| 184 | 
                        +  | 
                    |
| 185 | 
                        +	${sbindir}/courierfilter stop
                       | 
                    |
| 186 | 
                        + ebegin " Stopping courierfilterd"  | 
                    |
| 187 | 
                        +  | 
                    |
| 188 | 
                        + eend $?  | 
                    |
| 189 | 
                        +}  | 
                    
| ... | ... | 
                      @@ -0,0 +1,21 @@  | 
                  
| 1 | 
                        +--- a/courier/module.esmtp/esmtp.c 2004-02-03 01:08:15.679486558 -0700  | 
                    |
| 2 | 
                        ++++ b/courier/module.esmtp/esmtp.c 2004-02-03 01:07:41.262697092 -0700  | 
                    |
| 3 | 
                        +@@ -255,6 +255,10 @@ const char *me;  | 
                    |
| 4 | 
                        + struct rfc822t *tp;  | 
                    |
| 5 | 
                        + struct rfc822token at;  | 
                    |
| 6 | 
                        +  | 
                    |
| 7 | 
                        ++#if 1  | 
                    |
| 8 | 
                        ++ (*func)(info);  | 
                    |
| 9 | 
                        ++ return;  | 
                    |
| 10 | 
                        ++#else  | 
                    |
| 11 | 
                        + if (info->ptr == 0)  | 
                    |
| 12 | 
                        + 	{
                       | 
                    |
| 13 | 
                        + (*func)(info);  | 
                    |
| 14 | 
                        +@@ -289,6 +293,7 @@ struct rfc822token at;  | 
                    |
| 15 | 
                        + (*func)(info);  | 
                    |
| 16 | 
                        + *r=0;  | 
                    |
| 17 | 
                        + rfc822t_free(tp);  | 
                    |
| 18 | 
                        ++#endif  | 
                    |
| 19 | 
                        + }  | 
                    |
| 20 | 
                        +  | 
                    |
| 21 | 
                        + static void rw_esmtp(struct rw_info *info, void (*func)(struct rw_info *))  |