summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Boeck <hanno@gentoo.org>2008-04-21 12:05:22 +0000
committerHanno Boeck <hanno@gentoo.org>2008-04-21 12:05:22 +0000
commit8150f010c8f1926422d847a8aba4636c551e1ee7 (patch)
tree28f0baeba86683e4d168ab19ee196896901bf8be /mail-mta/courier
parentadd local useflags for courier (diff)
downloadhistorical-8150f010c8f1926422d847a8aba4636c551e1ee7.tar.gz
historical-8150f010c8f1926422d847a8aba4636c551e1ee7.tar.bz2
historical-8150f010c8f1926422d847a8aba4636c551e1ee7.zip
courier version bump, proxy-maintained ebuild
Package-Manager: portage-2.1.5_rc5
Diffstat (limited to 'mail-mta/courier')
-rw-r--r--mail-mta/courier/ChangeLog8
-rw-r--r--mail-mta/courier/Manifest11
-rw-r--r--mail-mta/courier/courier-0.59.0.ebuild325
-rw-r--r--mail-mta/courier/files/remove-sysconftool.patch30
4 files changed, 369 insertions, 5 deletions
diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog
index 56f94c1f9ad3..15ea9131b8be 100644
--- a/mail-mta/courier/ChangeLog
+++ b/mail-mta/courier/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for mail-mta/courier
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.99 2008/04/20 12:11:16 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.100 2008/04/21 12:05:22 hanno Exp $
+
+*courier-0.59.0 (21 Apr 2008)
+
+ 21 Apr 2008; Hanno Boeck <hanno@gentoo.org>
+ +files/remove-sysconftool.patch, +courier-0.59.0.ebuild:
+ Version bump, proxy-maintained user ebuild by Bernd Wurst.
20 Apr 2008; Hanno Boeck <hanno@gentoo.org> courier-0.55.1-r1.ebuild:
Fix quoting.
diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest
index 7af83f1352b0..3330d5bec260 100644
--- a/mail-mta/courier/Manifest
+++ b/mail-mta/courier/Manifest
@@ -13,19 +13,22 @@ AUX mailer.conf 197 RMD160 4229dfa9cf33b275571538211dad33da5ae84048 SHA1 caf0957
AUX norewrite.patch 489 RMD160 1d0bacf702126cc4f8b9d7b07bbc6a9357b7b6e9 SHA1 007059af9ab5d89b36004e590b6a21911515f69b SHA256 526f3742fb43af93811e6e4b3210fda1c611b50ce5abdf3a57a25dfe4f5c38e4
AUX pam-include.patch 1534 RMD160 20456564341339c661ee20efe6b830f9df484b7e SHA1 318d1ae44e946c3809f56476ab02d0f851bc981c SHA256 2f0ea30cffdfec5d0f2ce3aece3e5ea2717ae6d04918210a0b9247a30fc15782
AUX password.dist 247 RMD160 eab211be0b1e3dbd6206f79e993b1d314a24efa3 SHA1 2cdd5bcf561f7267be6f18b731813962030af166 SHA256 46f20a84922d108d39a7c26ad3ba8915326549f46cea811e2384f55a589d38e2
+AUX remove-sysconftool.patch 1462 RMD160 e7cf6c03ff92840278eed734ed62920ed5095bfe SHA1 70910e9a4e39b7b9474d8354f67dd344559dadcb SHA256 bcd99b15bffa735a7ce219ddf52f018c3bc630b5b95b928e7ba7652ee3cff298
AUX set-mime 741 RMD160 8ed45fb4a0aee168a70cdcab6d17cf1606f85cad SHA1 b8834602c7304d42f3179a8dde43dcc57d0f4972 SHA256 bf15af7c181d517a924cb82854cbce46278e6e28ffb338e2159ba89c386dc74f
DIST courier-0.53.2.tar.bz2 6942557 RMD160 a6efce3a8d6572923190ea49ed6085906317ebd8 SHA1 89c6a9a57467adf8c1ac815a5ffacf47e5e694a3 SHA256 0b44e02652084ca4023646ca0cdd3d173dcbadf919e81aa012b42666b3acf726
DIST courier-0.55.1.tar.bz2 7019376 RMD160 43b4e5868a3e450cbc238cae0ba411011c1fa49f SHA1 a4b83a1fa018abd9d32b946b6407764ad2d98993 SHA256 caec49a2fed5c2048ea69fc290dc01402bf0dfc7852d2e1865e35ae15ce1eea6
+DIST courier-0.59.0.tar.bz2 7121762 RMD160 580e57fd9d39b62772e07dcdec653379cd21caaf SHA1 6870d2b12f1c93d5ede12f2a5c9c1107a7fb647c SHA256 e488cc920ed970c6d38496dba21359b50c6032ff4f2f91432b5d23db261578ec
EBUILD courier-0.53.2-r1.ebuild 11567 RMD160 6d0aa51f770a25bc3ed037d92ccad8ed2be56254 SHA1 6aa1721a7b4732c97814479067cb22463172a9ad SHA256 ab406803613dc3cea093ebacf8d3fa7437e4297ddf7ee4f18d01d38e37cccd09
EBUILD courier-0.53.2.ebuild 11532 RMD160 576ce689a2bc8fb1f6e4518bbddc5bd1a1fcd453 SHA1 40690f3fe06591582b52e0ee29c28c0a0b1e2da7 SHA256 fb00cdf3c88032f267ed838186b0d6e6b7699ad2354906ec8090ca6fd90cb115
EBUILD courier-0.55.1-r1.ebuild 11645 RMD160 34b63074e5b99003b0558f29162fbde2abbdd6ab SHA1 549654b9cf13e1a9cb44700f52cdb487698e3180 SHA256 ca309870b086cab8be373ddeef62a3e69a218d65e401a2ca15ca6f90c178acce
EBUILD courier-0.55.1.ebuild 11538 RMD160 15e23e2c8736ead5b71d502020a266f1712f257e SHA1 5f01c3926aa1fc9d080dd4190c6899c6ed104879 SHA256 253f511eb570d6915fe68c77e55d3ca194e1b4e6ead018dd9c622934ef1f59da
-MISC ChangeLog 27366 RMD160 370717eaa103588ba34b12d1df1347d037d40ce7 SHA1 7733dea77fd26e2854cf24965a92f2276c9cbb17 SHA256 c021f8d46dac8345451a7a9188849f7ddf880abb546fe83647c1bfa8984360fa
+EBUILD courier-0.59.0.ebuild 10319 RMD160 5b8ad931aae6233d08c62712df59dbe61bda7ece SHA1 42bdaee8f50ff0bce151a3fc1bd19a5f4a744f96 SHA256 6128be31b7cf817129326319b35a8f37a2bebba138f2d3178fe5b962ae5b6097
+MISC ChangeLog 27565 RMD160 eb5090dba672bc5d0954ccad546a656e1e364195 SHA1 22914a9b07c194ee6e650b23737cc22cb51868a4 SHA256 ce6356bb4d0fca8924a03c288db8fe00b9db4bad0c58bb44ff523a756c005b63
MISC metadata.xml 322 RMD160 44060011d03244f97a8cc9605f0eb0de3631a2e5 SHA1 ca88991053a2eef8c9f1603ce850eff1d145deaa SHA256 1ef3b7121e17952973a7b717155b7e892b40ef64ff22d370bf7d425521df88a0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAkgLMu0ACgkQr2QksT29OyBCLwCdFIjrEUuSWRlQkpUraN7OGisA
-JM4An2q9F4oX66OPKa0639fu+JQhap8S
-=gS3A
+iEYEARECAAYFAkgMgw4ACgkQr2QksT29OyCuKgCfU78bEMgHi81Pl8/3aLmP40b3
+AMYAnA3NcdG+3QHO2obu3dLOshWZ+2j+
+=ptlQ
-----END PGP SIGNATURE-----
diff --git a/mail-mta/courier/courier-0.59.0.ebuild b/mail-mta/courier/courier-0.59.0.ebuild
new file mode 100644
index 000000000000..6d310ab3f881
--- /dev/null
+++ b/mail-mta/courier/courier-0.59.0.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.59.0.ebuild,v 1.1 2008/04/21 12:05:22 hanno Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="An MTA designed specifically for maildirs"
+[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "${PV/?.??.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
+HOMEPAGE="http://www.courier-mta.org/"
+S="${WORKDIR}/${P%%_pre}"
+
+SLOT="0"
+LICENSE="GPL-2"
+# not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite mailwrapper \
+ fam web webmail"
+
+PROVIDE="virtual/mta
+ virtual/mda
+ virtual/imapd"
+
+DEPEND="
+ >=net-libs/courier-authlib-0.59
+ >=dev-libs/openssl-0.9.6
+ >=sys-libs/gdbm-1.8.0
+ dev-libs/libpcre
+ app-misc/mime-types
+ fax? ( >=media-libs/netpbm-9.12 virtual/ghostscript >=net-dialup/mgetty-1.1.28 )
+ pam? ( virtual/pam )
+ mysql? ( virtual/mysql )
+ ldap? ( >=net-nds/openldap-1.2.11 )
+ postgres? ( >=dev-db/postgresql-7.1.3 )
+ spell? ( virtual/aspell-dict )
+ fam? ( virtual/fam )
+ !mailwrapper? ( !virtual/mta )
+ !virtual/imapd
+ !mail-filter/maildrop"
+
+RDEPEND="${DEPEND}
+ dev-lang/perl
+ sys-process/procps"
+
+PDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 )
+ pam? ( net-mail/mailbase )
+ crypt? ( >=app-crypt/gnupg-1.0.4 )"
+
+filter-flags '-fomit-frame-pointer'
+
+src_unpack() {
+ use fam || (
+ ewarn "File Alteration Monitor (FAM) is disabled"
+ ewarn "courier-imap will fall back to 60 second polls."
+ ewarn 'add "fam" to your USE flags to build as usual'
+ ebeep 4
+ epause 4 )
+ unpack ${A}
+ cd "${S}"
+ use norewrite && epatch "${FILESDIR}/norewrite.patch"
+ use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+
+ epatch "${FILESDIR}/remove-sysconftool.patch"
+
+ # some libtool version mismatch
+ _elibtoolize --copy --force || die
+}
+
+src_compile() {
+ local myconf
+ myconf="`use_with ipv6` \
+ `use_with ldap ldapaliasd` `use_enable ldap maildropldap`"
+
+ use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"
+ use spell || myconf="${myconf} --without-ispell"
+
+ myconf="${myconf} --enable-mimetypes=/etc/mime.types"
+
+ myconf="${myconf} $(use_with fam)"
+
+ einfo "Configuring courier: $(echo ${myconf} | xargs echo)"
+
+ econf \
+ --prefix=/usr \
+ --disable-root-check \
+ --mandir=/usr/share/man \
+ --sysconfdir=/etc/courier \
+ --libexecdir=/usr/$(get_libdir)/courier \
+ --datadir=/usr/share/courier \
+ --sharedstatedir=/var/lib/courier/com \
+ --localstatedir=/var/lib/courier \
+ --with-piddir=/var/run/courier \
+ --with-authdaemonvar=/var/lib/courier/authdaemon \
+ --with-mailuser=mail \
+ --with-mailgroup=mail \
+ --with-paranoid-smtpext \
+ --with-db=gdbm \
+ --disable-autorenamesent \
+ --cache-file="${S}/configuring.cache" \
+ --host="${CHOST}" ${myconf} debug=true || die "./configure"
+ sed -e'/^install-perms-local:/a\ sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
+ emake || die "Compile problem"
+}
+
+etc_courier() {
+ # Import existing /etc/courier/file if it exists.
+ # Add option only if it was not already set or even commented out
+ file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
+ [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
+ cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
+ grep -q "${word}" "${D}/etc/courier/${file}" || \
+ echo "${2}" >> "${D}/etc/courier/${file}"
+}
+
+etc_courier_chg() {
+ file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
+ [ -z "${section}" ] && section="${2}"
+ grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
+ sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
+}
+
+
+src_install() {
+ local f
+ diropts -o mail -g mail
+ keepdir /var/run/courier
+ keepdir /var/lib/courier/tmp
+ keepdir /var/lib/courier/msgs
+ make install DESTDIR="${D}" || die "install"
+ make install-configure || die "install-configure"
+
+ # Get rid of files we dont want
+ if ! use webmail ; then
+ cd "${D}"
+ cat "${FILESDIR}/webmail_files" | xargs rm -rf
+ fi
+
+ if ! use web ; then
+ cd "${D}"
+ cat "${FILESDIR}/webadmin_files" | xargs rm -rf
+ fi
+
+ for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
+ keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
+ done
+
+ newinitd "${FILESDIR}/courier-init-r1" "courier"
+ use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"
+
+ cd "${D}/etc/courier"
+ if use webmail ; then
+ insinto /etc/courier
+ newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
+ fi
+
+ for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
+ if use ldap ; then
+ [ -e ldapaliasrc ] && ( chown root:0 ldapaliasrc ; chmod 400 ldapaliasrc )
+ else
+ rm -f ldapaliasrc
+ fi
+
+ ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
+ > "${D}/etc/courier/sizelimit"
+ etc_courier maildroprc ""
+ etc_courier esmtproutes ""
+ etc_courier backuprelay ""
+ etc_courier locallowercase ""
+ etc_courier bofh "opt BOFHBADMIME=accept"
+ etc_courier bofh "opt BOFHSPFTRUSTME=1"
+ etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
+ etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
+ etc_courier bofh "opt BOFHSPFFROM=all"
+ etc_courier bofh "opt BOFHSPFMAILFROM=all"
+ etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
+ etc_courier esmtpd "BOFHBADMIME=accept"
+ etc_courier esmtpd-ssl "BOFHBADMIME=accept"
+ etc_courier esmtpd-msa "BOFHBADMIME=accept"
+
+ 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"
+ 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"
+
+ # Fix for a sandbox violation on subsequential merges
+ # - ticho@gentoo.org, 2005-07-10
+ rm "${D}"/usr/sbin/{pop3d,imapd}{,-ssl}
+ dosym /usr/share/courier/pop3d /usr/sbin/courier-pop3d
+ dosym /usr/share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
+ dosym /usr/share/courier/imapd /usr/sbin/courier-imapd
+ dosym /usr/share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl
+
+ cd "${S}"
+ cp imap/README README.imap
+ use nls && cp unicode/README README.unicode
+ dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
+ dodoc tcpd/README.couriertls
+ mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${P}/html"
+
+ if use webmail ; then
+ insinto /usr/$(get_libdir)/courier/courier
+ insopts -m 755 -o mail -g mail
+ doins "${S}/courier/webmaild"
+ fi
+
+ if use web ; then
+ insinto /etc/courier/webadmin
+ insopts -m 400 -o mail -g mail
+ doins "${FILESDIR}/password.dist"
+ fi
+
+ # avoid name collisions in /usr/sbin, make webadmin match
+ cd "${D}/usr/sbin"
+ for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
+ if use web ; then
+ sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
+ -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
+ "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
+ || ewarn "failed to fix webadmin"
+ sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
+ -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
+ "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
+ || ewarn "failed to fix webadmin"
+ fi
+
+ # users should be able to send mail. Could be restricted with suictl.
+ chmod u+s "${D}/usr/bin/sendmail"
+
+ if use mailwrapper ; then
+ mv "${D}/usr/bin/sendmail" "${D}/usr/bin/sendmail.courier"
+ mv "${D}/usr/bin/rmail" "${D}/usr/bin/rmail.courier"
+ mv "${D}/usr/bin/mailq" "${D}/usr/bin/mailq.courier"
+
+ mv "${D}/usr/share/man/man1/sendmail.1" \
+ "${D}/usr/share/man/man1/sendmail-courier.1"
+ mv "${D}/usr/share/man/man1/mailq.1" \
+ "${D}/usr/share/man/man1/mailq-courier.1"
+ mv "${D}/usr/share/man/man1/rmail.1" \
+ "${D}/usr/share/man/man1/rmail-courier.1"
+
+ insopts -m 444 -o mail -g mail
+ insinto /etc/mail
+ doins "${FILESDIR}/mailer.conf"
+ else
+ dosym /usr/bin/sendmail /usr/sbin/sendmail
+ fi
+}
+
+src_test() {
+ addpredict /
+ vecho ">>> Test phase [check]: ${CATEGORY}/${PF}"
+ if hasq userpriv "${FEATURES}" ; then
+ if ! emake -j1 check; then
+ hasq test "${FEATURES}" && die "Make check failed. See above for details."
+ hasq test "${FEATURES}" || eerror "Make check failed. See above for details."
+ fi
+ else
+ hasq test "${FEATURES}" && eerror "Make check needs FEATURES="userpriv" to work."
+ fi
+ SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+pkg_postinst() {
+ use fam && elog "fam daemon is needed for courier-imapd" \
+ || ewarn "courier was built without fam support"
+}
+
+pkg_config() {
+ mailhost="$(hostname)"
+ export mailhost
+
+ domainname="$(domainname)"
+ if [ "x$domainname" = "x(none)" ] ; then
+ domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
+ fi
+ export domainname
+
+ if [ "${ROOT}" = "/" ] ; then
+ file="${ROOT}/etc/courier/locals"
+ if [ ! -f "${file}" ] ; then
+ echo "localhost" > "${file}";
+ echo "${domainname}" >> "${file}";
+ fi
+ file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
+ if [ ! -f "${file}" ] ; then
+ echo "${domainname}" > "${file}"
+ /usr/sbin/makeacceptmailfor
+ fi
+
+ file="${ROOT}/etc/courier/smtpaccess/${domainname}"
+ if [ ! -f "${file}" ]
+ then
+ netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
+ do
+ i=1
+ net=""
+ TIFS="${IFS}"
+ IFS="."
+ for o in "${netmask}"
+ do
+ if [ "${o}" == "255" ]
+ then
+ [ "_${net}" == "_" ] || net="${net}."
+ t="$(echo "${network}" | cut -d " " -f ${i})"
+ net="${net}${t}"
+ fi
+ i="$((${i} + 1))"
+ done
+ IFS="${TIFS}"
+ echo "doing configuration - relay control for the network ${net} !"
+ echo "${net} allow,RELAYCLIENT" >> ${file}
+ done
+ /usr/sbin/makesmtpaccess
+ fi
+ fi
+
+ echo "creating cert for esmtpd-ssl:"
+ /usr/sbin/mkesmtpdcert
+ echo "creating cert for imapd-ssl:"
+ /usr/sbin/mkpop3dcert
+ echo "creating cert for pop3d-ssl:"
+ /usr/sbin/mkimapdcert
+}
diff --git a/mail-mta/courier/files/remove-sysconftool.patch b/mail-mta/courier/files/remove-sysconftool.patch
new file mode 100644
index 000000000000..cf191be76db3
--- /dev/null
+++ b/mail-mta/courier/files/remove-sysconftool.patch
@@ -0,0 +1,30 @@
+--- orig/configure.in 2008-03-06 13:50:29.000000000 +0100
++++ new/configure.in 2008-03-06 13:50:39.000000000 +0100
+@@ -19,7 +19,6 @@
+
+ AC_PROG_MAKE_SET
+ AC_PROG_CXX
+-AC_PROG_SYSCONFTOOL
+ AC_PATH_PROGS(SETENV, env)
+
+ AC_ARG_ENABLE(root-check, [ --disable-root-check Allow build as root (make check will fail)],
+--- orig/Makefile.in 2008-03-06 19:37:53.000000000 +0100
++++ new/Makefile.in 2008-03-06 19:38:22.000000000 +0100
+@@ -791,7 +791,6 @@
+
+ install-configure:
+ @$(MAKE) -$(MAKEFLAGS) install-perms
+- @SYSCONFTOOL@ `awk ' $$5 == "config" && $$1 ~ /\.dist$$/ { print $$1 }' <permissions.dat`
+
+ install-webadmin-password:
+ @stty -echo ; echo -n "Password: " ; read P; stty echo ; echo "" ; echo $$P >@sysconfdir@/webadmin/password && chown @mailuser@ @sysconfdir@/webadmin/password && chgrp @mailgroup@ @sysconfdir@/webadmin/password && chmod 400 @sysconfdir@/webadmin/password
+--- orig/Makefile.am 2008-03-06 19:39:06.000000000 +0100
++++ new/Makefile.am 2008-03-06 19:39:21.000000000 +0100
+@@ -160,7 +160,6 @@
+
+ install-configure:
+ @$(MAKE) -$(MAKEFLAGS) install-perms
+- @SYSCONFTOOL@ `awk ' $$5 == "config" && $$1 ~ /\.dist$$/ { print $$1 }' <permissions.dat`
+
+ install-webadmin-password:
+ @stty -echo ; echo -n "Password: " ; read P; stty echo ; echo "" ; echo $$P >@sysconfdir@/webadmin/password && chown @mailuser@ @sysconfdir@/webadmin/password && chgrp @mailgroup@ @sysconfdir@/webadmin/password && chmod 400 @sysconfdir@/webadmin/password