diff options
21 files changed, 1825 insertions, 992 deletions
diff --git a/mail-filter/libdomainkeys/Manifest b/mail-filter/libdomainkeys/Manifest new file mode 100644 index 00000000..8c675af0 --- /dev/null +++ b/mail-filter/libdomainkeys/Manifest @@ -0,0 +1,8 @@ +DIST libdomainkeys-0.68.tar.gz 37973 RMD160 14ae2960a9d1ee033804c50615e65b7da8ac64d4 SHA1 f3695df8fb1a6dc88e71d9ae3dcbebf0d7dc8f2a SHA256 78c8ddc2efb81a715d186cfe42a643da190f98f707b3348353da822fdbd8e1e1 +EBUILD libdomainkeys-0.68-r1.ebuild 851 RMD160 d6d5270a078003c441e25e7461fedd582710dbe6 SHA1 a1c7738bd8f2196f2ef214752a07a7484cef84ee SHA256 e72e0fd5f2e70f32ea2da6329dbf1cae4f7ce4c8a773ac65ec7a48f800b79110 +MD5 56b21f858182d24a5837908afd92ec6c libdomainkeys-0.68-r1.ebuild 851 +RMD160 d6d5270a078003c441e25e7461fedd582710dbe6 libdomainkeys-0.68-r1.ebuild 851 +SHA256 e72e0fd5f2e70f32ea2da6329dbf1cae4f7ce4c8a773ac65ec7a48f800b79110 libdomainkeys-0.68-r1.ebuild 851 +MD5 c1e705efd6aa8458ecde09d1f6e43d93 files/digest-libdomainkeys-0.68-r1 253 +RMD160 f10580243f14010f323d4d85aef55283a6ad126b files/digest-libdomainkeys-0.68-r1 253 +SHA256 25fe3053c6a3c87c8bf242c2f983b631046da51ab530e0631f9bcc7582a3f3fb files/digest-libdomainkeys-0.68-r1 253 diff --git a/mail-filter/libdomainkeys/files/digest-libdomainkeys-0.68-r1 b/mail-filter/libdomainkeys/files/digest-libdomainkeys-0.68-r1 new file mode 100644 index 00000000..b6bf8ed1 --- /dev/null +++ b/mail-filter/libdomainkeys/files/digest-libdomainkeys-0.68-r1 @@ -0,0 +1,3 @@ +MD5 c9fe164d6296e7ad5468580875ac4f2e libdomainkeys-0.68.tar.gz 37973 +RMD160 14ae2960a9d1ee033804c50615e65b7da8ac64d4 libdomainkeys-0.68.tar.gz 37973 +SHA256 78c8ddc2efb81a715d186cfe42a643da190f98f707b3348353da822fdbd8e1e1 libdomainkeys-0.68.tar.gz 37973 diff --git a/mail-filter/libdomainkeys/libdomainkeys-0.68-r1.ebuild b/mail-filter/libdomainkeys/libdomainkeys-0.68-r1.ebuild new file mode 100644 index 00000000..b6e52074 --- /dev/null +++ b/mail-filter/libdomainkeys/libdomainkeys-0.68-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header$ + +inherit eutils + +DESCRIPTION="libdomainkeys is a library usable by MTAs to verify and create signatures of e-mail headers." +HOMEPAGE="http://domainkeys.sourceforge.net/" +SRC_URI="mirror://sourceforge/domainkeys/${P}.tar.gz" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="0" +KEYWORDS="~x86" +IUSE="" + +DEPEND=">=sys-devel/libtool-1.4.1-r8" +RDEPEND="" + +src_unpack() { + unpack ${A} + sed -i -e "s:-lcrypto:-lcrypto -lresolv:" ${S}/Makefile +} + +src_install() { + insinto /usr/lib + doins libdomainkeys.a + + insinto /usr/include + doins domainkeys.h + doins dktrace.h + + dobin dknewkey dktest + + dodoc README CHANGES *.html + + # remove unwanted doc files + rm -rf ${S}/testcases/CVS + rm -rf ${S}/testcases/*~ + docinto /testcases + dodoc testcases/* + prepalldocs +} + diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest new file mode 100644 index 00000000..cbccefb0 --- /dev/null +++ b/mail-mta/exim/Manifest @@ -0,0 +1,36 @@ +AUX exim-4.14-tail.patch 446 RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 SHA1 d52b5d10656ead546beda128068ed2f9dbc67200 SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da +MD5 5d5aabea7d56a91803df1312c04d32c0 files/exim-4.14-tail.patch 446 +RMD160 685e27ff995710f3b8d77d8785b04503170e7e27 files/exim-4.14-tail.patch 446 +SHA256 74d1044bb94e167180fd8f8aba7449ca3d2b09b1ce170a1a2e4e54ca0cd660da files/exim-4.14-tail.patch 446 +AUX exim-4.20-maildir.patch 478 RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce SHA1 c8287f7e44d93b0ca8761b8f7111974cfe1280a5 SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c +MD5 622b726ea7b32aae93a8fe9f3c2af9cd files/exim-4.20-maildir.patch 478 +RMD160 50c6a1dd6ae3f7bb1776696d3d0d7a161c351fce files/exim-4.20-maildir.patch 478 +SHA256 2704c4db67bb7c58c2421656d942f533d1eedf1df187e76297ab72d2c2a2fb4c files/exim-4.20-maildir.patch 478 +AUX exim-4.43-SmtpUsingDovecot.patch 13382 RMD160 792ec7e17ebf40e3b2ae7a4cb7d2ccee7dde7438 SHA1 c50d1a3a2b87690e439a380a77424472edff8977 SHA256 9c64359f42b9f6019c486a240e2b4a14c5390f680e6fed456894eb6ec3da81cd +MD5 d7affee8bf277ce9380f2027320c958c files/exim-4.43-SmtpUsingDovecot.patch 13382 +RMD160 792ec7e17ebf40e3b2ae7a4cb7d2ccee7dde7438 files/exim-4.43-SmtpUsingDovecot.patch 13382 +SHA256 9c64359f42b9f6019c486a240e2b4a14c5390f680e6fed456894eb6ec3da81cd files/exim-4.43-SmtpUsingDovecot.patch 13382 +AUX exim-4.43-SmtpUsingDovecot.patch3 11103 RMD160 01845114ae4cab9e323ad9536dede17efa9e0686 SHA1 4c95885af306479b133bb62e4f40f3b2d7e0f96d SHA256 8dbd42b7e14cb45aceaef5b458cf2ef61e6b2adcd3fc66f69ce41b165ffcdf15 +MD5 327dd7e08aa0757741d2dda318fa9f4f files/exim-4.43-SmtpUsingDovecot.patch3 11103 +RMD160 01845114ae4cab9e323ad9536dede17efa9e0686 files/exim-4.43-SmtpUsingDovecot.patch3 11103 +SHA256 8dbd42b7e14cb45aceaef5b458cf2ef61e6b2adcd3fc66f69ce41b165ffcdf15 files/exim-4.43-SmtpUsingDovecot.patch3 11103 +AUX exim-4.43-r2-localscan_dlopen.patch 9236 RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 SHA1 e4239a1bf0261f99491b4a29b26bbe8d9beffbd8 SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d +MD5 c76437104cbde9184f01eb0987bfd738 files/exim-4.43-r2-localscan_dlopen.patch 9236 +RMD160 d33f7bcf72f947e8d1a3d917713630100c175491 files/exim-4.43-r2-localscan_dlopen.patch 9236 +SHA256 3ec15d2dfdf251c70647c3def09711385f23983eceeecb6ec9d42b39f54b198d files/exim-4.43-r2-localscan_dlopen.patch 9236 +DIST exim-4.62.tar.bz2 1577729 RMD160 9553b758e3bfd3d12027262b6211e37ad3259252 SHA1 2b3f95c1880de07ef22a96d7141eaa66e3c46768 SHA256 b5438894807c560a7933af36d10b2951f890aece9bff14c95fe2b91b0398629b +DIST exiscan.conf 22113 RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 SHA1 74dc6e30f49402f5e6fefc280ea325d17f6af8c4 SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 +EBUILD exim-4.62-r1.ebuild 9415 RMD160 d30f3cc4b0589ad5fdba440158873b90db1d0bec SHA1 14282701dc9a90c0a40979f8895da13ef851b085 SHA256 dfec5f6a4a2a2608189d0982fe48af69a1c6919d7bca13ba622fd5606bda6624 +MD5 06ae8ab5fb6ae358fca522e635177655 exim-4.62-r1.ebuild 9415 +RMD160 d30f3cc4b0589ad5fdba440158873b90db1d0bec exim-4.62-r1.ebuild 9415 +SHA256 dfec5f6a4a2a2608189d0982fe48af69a1c6919d7bca13ba622fd5606bda6624 exim-4.62-r1.ebuild 9415 +EBUILD exim-4.62-r2.ebuild 9746 RMD160 83c3af9169d0e94cf426f4c75d92d57582199ab4 SHA1 ebf4e93c374a677f3fa58e1a45689362bc62250d SHA256 d54efa135f261c97cc94063189c951b20700c5899c46fc63ea48f285d4f6bc87 +MD5 1287278ba300ed151881be0abd68d9af exim-4.62-r2.ebuild 9746 +RMD160 83c3af9169d0e94cf426f4c75d92d57582199ab4 exim-4.62-r2.ebuild 9746 +SHA256 d54efa135f261c97cc94063189c951b20700c5899c46fc63ea48f285d4f6bc87 exim-4.62-r2.ebuild 9746 +MD5 31e2a5f83bcae355694aafddd6d76d10 files/digest-exim-4.62-r1 449 +RMD160 b65f09555de6587827634d3c592f8a25515d938e files/digest-exim-4.62-r1 449 +SHA256 23a4934530694bdb862bb652d6045101cfaa263d8be8e34f7a6b296f97ae2202 files/digest-exim-4.62-r1 449 +MD5 31e2a5f83bcae355694aafddd6d76d10 files/digest-exim-4.62-r2 449 +RMD160 b65f09555de6587827634d3c592f8a25515d938e files/digest-exim-4.62-r2 449 +SHA256 23a4934530694bdb862bb652d6045101cfaa263d8be8e34f7a6b296f97ae2202 files/digest-exim-4.62-r2 449 diff --git a/mail-mta/exim/exim-4.62-r1.ebuild b/mail-mta/exim/exim-4.62-r1.ebuild new file mode 100644 index 00000000..678e00b7 --- /dev/null +++ b/mail-mta/exim/exim-4.62-r1.ebuild @@ -0,0 +1,310 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.62.ebuild,v 1.4 2006/10/11 08:40:33 corsair Exp $ + +inherit eutils + +IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx X exiscan nis syslog spf srs domainkeys gnutls sqlite" + +DESCRIPTION="A highly configurable, drop-in replacement for sendmail" +SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2 mirror://gentoo/exiscan.conf" +HOMEPAGE="http://www.exim.org/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86" + +PROVIDE="virtual/mta" +DEPEND=">=sys-apps/sed-4.0.5 + perl? ( sys-devel/libperl ) + >=sys-libs/db-3.2 + pam? ( >=sys-libs/pam-0.75 ) + tcpd? ( sys-apps/tcp-wrappers ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + gnutls? ( net-libs/gnutls ) + ldap? ( >=net-nds/openldap-2.0.7 ) + mysql? ( >=dev-db/mysql-3.23.28 ) + postgres? ( >=dev-db/postgresql-7 ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) + spf? ( >=mail-filter/libspf2-1.2.5-r1 ) + srs? ( mail-filter/libsrs_alt ) + domainkeys? ( mail-filter/libdomainkeys ) + X? ( || ( ( x11-proto/xproto + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXt + x11-libs/libXaw ) + virtual/x11 ) + ) + sqlite? ( dev-db/sqlite )" + # added X check for #57206 +RDEPEND="${DEPEND} + mailwrapper? ( >=net-mail/mailwrapper-0.2 ) + !mailwrapper? ( !virtual/mta ) + >=net-mail/mailbase-0.00-r5" + +src_unpack() { + unpack ${A} + cd ${S} + + local myconf + + epatch ${FILESDIR}/exim-4.14-tail.patch + epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch + + if ! use mbox; then + einfo "Patching maildir support into exim.conf" + epatch ${FILESDIR}/exim-4.20-maildir.patch + fi + + sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default + cp ${S}/src/configure.default ${S}/src/configure.default.orig + + # Includes Typo fix for bug 47106 + sed -e "48i\CFLAGS=${CFLAGS}" \ + -e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \ + -e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \ + -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \ + -e "s:COMPRESS_COMMAND=/usr/bin/gzip:COMPRESS_COMMAND=/bin/gzip:" \ + -e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=/bin/zcat:" \ + -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/exim.conf:" \ + -e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \ + -e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \ + -e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=/var/log/exim/exim_%s.log:" \ + -e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=/var/run/exim.pid:" \ + -e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \ + -e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \ + -e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \ + -e "s:EXIM_USER=:EXIM_USER=mail:" \ + -e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \ + -e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \ + -e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \ + src/EDITME > Local/Makefile + + # exiscan-acl is now integrated - enabled it when use-flag set + if use exiscan-acl; then + sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile + sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile + elif (use spf || use srs || use domainkeys) then + eerror SPF, SRS and DomainKeys support require exiscan-acl to be enabled, please add + eerror to your USE settings. + exit 1 + fi + if use spf; then + myconf="${myconf} -lspf2" + sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Local/Makefile + mycflags="${mycflags} -DEXPERIMENTAL_SPF" + fi + if use srs; then + myconf="${myconf} -lsrs_alt" + sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Local/Makefile + fi + + if use domainkeys; then + myconf="${myconf} -ldomainkeys" + echo "EXPERIMENTAL_DOMAINKEYS=yes" >> Local/Makefile + mycflags="${mycflags} -DEXPERIMENTAL_DOMAINKEYS" + fi + + cd Local + # enable optional exim_monitor support via X use flag bug #46778 + if use X; then + einfo "Configuring eximon" + cp ../exim_monitor/EDITME eximon.conf + sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile + fi + #These next two should resolve 37964 + if use perl; then + sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile + fi + # mbox useflag renamed, see bug 110741 + if use mbx; then + sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile + fi + if use pam; then + sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile + myconf="${myconf} -lpam" + fi + if use sasl; then + sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:" Makefile + sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" Makefile + myconf="${myconf} -lsasl2" + fi + if use tcpd; then + sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile + myconf="${myconf} -lwrap" + fi + if use lmtp; then + sed -i "s:# \(TRANSPORT_LMTP=yes\):\1:" Makefile + fi + if use ipv6; then + echo "HAVE_IPV6=YES" >> Makefile + #To fix bug 41196 + echo "IPV6_USE_INET_PTON=yes" >> Makefile + fi + + if [ -n "$myconf" ] ; then + echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile + fi + + cd ${S} + if use ssl; then + sed -i \ + -e "s:# \(SUPPORT_TLS=yes\):\1:" Local/Makefile + if use gnutls; then + sed -i \ + -e "s:# \(USE_GNUTLS=yes\):\1:" \ + -e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Local/Makefile + else + sed -i \ + -e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile + fi + fi + + LOOKUP_INCLUDE= + LOOKUP_LIBS= + + if use ldap; then + sed -i \ + -e "s:# \(LOOKUP_LDAP=yes\):\1:" \ + -e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile + LOOKUP_INCLUDE="-I/usr/include/ldap" + LOOKUP_LIBS="-L/usr/lib -lldap -llber" + fi + + if use mysql; then + sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile + LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql" + LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient" + fi + + if use postgres; then + sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile + LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql" + LOOKUP_LIBS="$LOOKUP_LIBS -lpq" + fi + if use sqlite; then + sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile + LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite" + LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3" + fi + if [ -n "$LOOKUP_INCLUDE" ]; then + sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \ + Local/Makefile + fi + + if [ -n "$LOOKUP_LIBS" ]; then + sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \ + Local/Makefile + fi + + + cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile + + sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile + + if use dnsdb; then + sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Local/Makefile + fi + sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile + + if use nis; then + sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile + sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile + fi + if use syslog; then + sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile + fi +# Use the "native" interface to the DBM library + echo "USE_DB=yes" >> ${S}/Local/Makefile +} + +src_compile() { + make || die "make failed" +} + + +src_install () { + cd ${S}/build-exim-gentoo + exeinto /usr/sbin + doexe exim + if use X;then + doexe eximon.bin + doexe eximon + fi + fperms 4755 /usr/sbin/exim + + dodir /usr/bin /usr/sbin /usr/lib + dosym ../sbin/exim /usr/bin/mailq + dosym ../sbin/exim /usr/bin/newaliases + einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail." + dosym exim /usr/sbin/rsmtp + dosym exim /usr/sbin/rmail + if \[ ! -e /usr/lib/sendmail \]; + then + dosym /usr/sbin/sendmail /usr/lib/sendmail + fi + + if use mailwrapper + then + insinto /etc/mail + doins ${FILESDIR}/mailer.conf + else + dosym exim /usr/sbin/sendmail + fi + + exeinto /usr/sbin + for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \ + exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \ + convert4r3 convert4r4 exipick + do + doexe $i + done + + dodoc ${S}/doc/* + doman ${S}/doc/exim.8 + + # conf files + insinto /etc/exim + newins ${S}/src/configure.default.orig exim.conf.dist + if use exiscan-acl; then + newins ${S}/src/configure.default exim.conf.exiscan-acl + fi + doins ${FILESDIR}/system_filter.exim + doins ${FILESDIR}/auth_conf.sub + if use exiscan; then + newins ${S}/src/configure.default exim.conf.exiscan + doins ${FILESDIR}/exiscan.conf + fi + + if use pam + then + # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam + insinto /etc/pam.d + newins ${FILESDIR}/pam.d-exim exim + fi + + exeinto /etc/init.d + newexe ${FILESDIR}/exim.rc6 exim + + insinto /etc/conf.d + newins ${FILESDIR}/exim.confd exim + + DIROPTIONS="--mode=0750 --owner=mail --group=mail" + dodir /var/log/${PN} +} + + +pkg_postinst() { + einfo "/etc/exim/system_filter.exim is a sample system_filter." + einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth." + einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist." + + if ! use mailwrapper && [[ -e /etc/mailer.conf ]] + then + einfo + einfo "Since you emerged $PN without mailwrapper in USE," + einfo "you probably want to 'emerge -C mailwrapper' now." + einfo + fi +} diff --git a/mail-mta/exim/exim-4.62-r2.ebuild b/mail-mta/exim/exim-4.62-r2.ebuild new file mode 100644 index 00000000..74b068b9 --- /dev/null +++ b/mail-mta/exim/exim-4.62-r2.ebuild @@ -0,0 +1,321 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.62.ebuild,v 1.4 2006/10/11 08:40:33 corsair Exp $ + +inherit eutils + +IUSE="tcpd ssl postgres mysql ldap pam exiscan-acl mailwrapper lmtp ipv6 sasl dnsdb perl mbx X exiscan nis syslog spf srs domainkeys gnutls sqlite dovecot mbox" + +DESCRIPTION="A highly configurable, drop-in replacement for sendmail" +SRC_URI="ftp://ftp.exim.org/pub/exim/exim4/${P}.tar.bz2 mirror://gentoo/exiscan.conf" +HOMEPAGE="http://www.exim.org/" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 sparc x86" + +PROVIDE="virtual/mta" +DEPEND=">=sys-apps/sed-4.0.5 + perl? ( sys-devel/libperl ) + >=sys-libs/db-3.2 + pam? ( >=sys-libs/pam-0.75 ) + tcpd? ( sys-apps/tcp-wrappers ) + ssl? ( >=dev-libs/openssl-0.9.6 ) + gnutls? ( net-libs/gnutls ) + ldap? ( >=net-nds/openldap-2.0.7 ) + mysql? ( >=dev-db/mysql-3.23.28 ) + postgres? ( >=dev-db/postgresql-7 ) + sasl? ( >=dev-libs/cyrus-sasl-2.1.14 ) + spf? ( >=mail-filter/libspf2-1.2.5-r1 ) + srs? ( mail-filter/libsrs_alt ) + domainkeys? ( mail-filter/libdomainkeys ) + X? ( || ( ( x11-proto/xproto + x11-libs/libX11 + x11-libs/libXmu + x11-libs/libXt + x11-libs/libXaw ) + virtual/x11 ) + ) + sqlite? ( dev-db/sqlite ) + dovecot? ( net-mail/dovecot )" + # added X check for #57206 +RDEPEND="${DEPEND} + mailwrapper? ( >=net-mail/mailwrapper-0.2 ) + !mailwrapper? ( !virtual/mta ) + >=net-mail/mailbase-0.00-r5" + +src_unpack() { + unpack ${A} + cd ${S} + + local myconf + + epatch ${FILESDIR}/exim-4.14-tail.patch + epatch ${FILESDIR}/exim-4.43-r2-localscan_dlopen.patch + + if use dovecot; then + einfo "Patching for SMTP Dovecot Auth" + einfo "See http://www.exim.org/eximwiki/AuthenticatedSmtpUsingDovecot" + epatch ${FILESDIR}/exim-4.43-SmtpUsingDovecot.patch + fi + + if ! use mbox; then + einfo "Patching maildir support into exim.conf" + epatch ${FILESDIR}/exim-4.20-maildir.patch + fi + + sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/mail/aliases'" ${S}/src/configure.default + cp ${S}/src/configure.default ${S}/src/configure.default.orig + + # Includes Typo fix for bug 47106 + sed -e "48i\CFLAGS=${CFLAGS}" \ + -e "s:# AUTH_CRAM_MD5=yes:AUTH_CRAM_MD5=yes:" \ + -e "s:# AUTH_PLAINTEXT=yes:AUTH_PLAINTEXT=yes:" \ + -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=/usr/sbin:" \ + -e "s:COMPRESS_COMMAND=/usr/bin/gzip:COMPRESS_COMMAND=/bin/gzip:" \ + -e "s:ZCAT_COMMAND=/usr/bin/zcat:ZCAT_COMMAND=/bin/zcat:" \ + -e "s:CONFIGURE_FILE=/usr/exim/configure:CONFIGURE_FILE=/etc/exim/exim.conf:" \ + -e "s:EXIM_MONITOR=eximon.bin:# EXIM_MONITOR=eximon.bin:" \ + -e "s:# INFO_DIRECTORY=/usr/local/info:INFO_DIRECTORY=/usr/share/info:" \ + -e "s:# LOG_FILE_PATH=/var/log/exim_%slog:LOG_FILE_PATH=/var/log/exim/exim_%s.log:" \ + -e "s:# PID_FILE_PATH=/var/lock/exim.pid:PID_FILE_PATH=/var/run/exim.pid:" \ + -e "s:# SPOOL_DIRECTORY=/var/spool/exim:SPOOL_DIRECTORY=/var/spool/exim:" \ + -e "s:# SUPPORT_MAILDIR=yes:SUPPORT_MAILDIR=yes:" \ + -e "s:# SUPPORT_MAILSTORE=yes:SUPPORT_MAILSTORE=yes:" \ + -e "s:EXIM_USER=:EXIM_USER=mail:" \ + -e "s:# AUTH_SPA=yes:AUTH_SPA=yes:" \ + -e "s:^ZCAT_COMMAND.*$:ZCAT_COMMAND=/bin/zcat:" \ + -e "s:# LOOKUP_PASSWD=yes:LOOKUP_PASSWD=yes:" \ + src/EDITME > Local/Makefile + + # exiscan-acl is now integrated - enabled it when use-flag set + if use exiscan-acl; then + sed -i "s:# WITH_CONTENT_SCAN=yes:WITH_CONTENT_SCAN=yes:" Local/Makefile + sed -i "s:# WITH_OLD_DEMIME=yes:WITH_OLD_DEMIME=yes:" Local/Makefile + elif (use spf || use srs || use domainkeys) then + eerror SPF, SRS and DomainKeys support require exiscan-acl to be enabled, please add + eerror to your USE settings. + exit 1 + fi + if use spf; then + myconf="${myconf} -lspf2" + sed -i "s:# EXPERIMENTAL_SPF=yes:EXPERIMENTAL_SPF=yes:" Local/Makefile + mycflags="${mycflags} -DEXPERIMENTAL_SPF" + fi + if use srs; then + myconf="${myconf} -lsrs_alt" + sed -i "s:# EXPERIMENTAL_SRS=yes:EXPERIMENTAL_SRS=yes:" Local/Makefile + fi + + if use domainkeys; then + myconf="${myconf} -ldomainkeys" + echo "EXPERIMENTAL_DOMAINKEYS=yes" >> Local/Makefile + mycflags="${mycflags} -DEXPERIMENTAL_DOMAINKEYS" + fi + + if use dovecot; then + sed -i "s:# AUTH_DOVECOT=yes:AUTH_DOVECOT=yes:" Local/Makefile + fi + + cd Local + # enable optional exim_monitor support via X use flag bug #46778 + if use X; then + einfo "Configuring eximon" + cp ../exim_monitor/EDITME eximon.conf + sed -i "s:# EXIM_MONITOR=eximon.bin:EXIM_MONITOR=eximon.bin:" Makefile + fi + #These next two should resolve 37964 + if use perl; then + sed -i "s:# EXIM_PERL=perl.o:EXIM_PERL=perl.o:" Makefile + fi + # mbox useflag renamed, see bug 110741 + if use mbx; then + sed -i "s:# SUPPORT_MBX=yes:SUPPORT_MBX=yes:" Makefile + fi + if use pam; then + sed -i "s:# \(SUPPORT_PAM=yes\):\1:" Makefile + myconf="${myconf} -lpam" + fi + if use sasl; then + sed -i "s:# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux:CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux:" Makefile + sed -i "s:# AUTH_CYRUS_SASL=yes:AUTH_CYRUS_SASL=yes:" Makefile + myconf="${myconf} -lsasl2" + fi + if use tcpd; then + sed -i "s:# \(USE_TCP_WRAPPERS=yes\):\1:" Makefile + myconf="${myconf} -lwrap" + fi + if use lmtp; then + sed -i "s:# \(TRANSPORT_LMTP=yes\):\1:" Makefile + fi + if use ipv6; then + echo "HAVE_IPV6=YES" >> Makefile + #To fix bug 41196 + echo "IPV6_USE_INET_PTON=yes" >> Makefile + fi + + if [ -n "$myconf" ] ; then + echo "EXTRALIBS=${myconf} ${LDFLAGS}" >> Makefile + fi + + cd ${S} + if use ssl; then + sed -i \ + -e "s:# \(SUPPORT_TLS=yes\):\1:" Local/Makefile + if use gnutls; then + sed -i \ + -e "s:# \(USE_GNUTLS=yes\):\1:" \ + -e "s:# \(TLS_LIBS=-lgnutls -ltasn1 -lgcrypt\):\1:" Local/Makefile + else + sed -i \ + -e "s:# \(TLS_LIBS=-lssl -lcrypto\):\1:" Local/Makefile + fi + fi + + LOOKUP_INCLUDE= + LOOKUP_LIBS= + + if use ldap; then + sed -i \ + -e "s:# \(LOOKUP_LDAP=yes\):\1:" \ + -e "s:# \(LDAP_LIB_TYPE=OPENLDAP2\):\1:" Local/Makefile + LOOKUP_INCLUDE="-I/usr/include/ldap" + LOOKUP_LIBS="-L/usr/lib -lldap -llber" + fi + + if use mysql; then + sed -i "s:# LOOKUP_MYSQL=yes:LOOKUP_MYSQL=yes:" Local/Makefile + LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/mysql" + LOOKUP_LIBS="$LOOKUP_LIBS -L/usr/lib -lmysqlclient" + fi + + if use postgres; then + sed -i "s:# LOOKUP_PGSQL=yes:LOOKUP_PGSQL=yes:" Local/Makefile + LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/postgresql" + LOOKUP_LIBS="$LOOKUP_LIBS -lpq" + fi + if use sqlite; then + sed -i "s:# LOOKUP_SQLITE=yes: LOOKUP_SQLITE=yes:" Local/Makefile + LOOKUP_INCLUDE="$LOOKUP_INCLUDE -I/usr/include/sqlite" + LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3" + fi + if [ -n "$LOOKUP_INCLUDE" ]; then + sed -i "s:# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include:LOOKUP_INCLUDE=$LOOKUP_INCLUDE:" \ + Local/Makefile + fi + + if [ -n "$LOOKUP_LIBS" ]; then + sed -i "s:# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3:LOOKUP_LIBS=$LOOKUP_LIBS:" \ + Local/Makefile + fi + + + cat Makefile | sed -e 's/^buildname=.*/buildname=exim-gentoo/g' > Makefile.gentoo && mv -f Makefile.gentoo Makefile + + sed -i "s:# LOOKUP_DSEARCH=yes:LOOKUP_DSEARCH=yes:" Local/Makefile + + if use dnsdb; then + sed -i "s:# LOOKUP_DNSDB=yes:LOOKUP_DNSDB=yes:" Local/Makefile + fi + sed -i "s:# LOOKUP_CDB=yes:LOOKUP_CDB=yes:" Local/Makefile + + if use nis; then + sed -i "s:# LOOKUP_NIS=yes:LOOKUP_NIS=yes:" Local/Makefile + sed -i "s:# LOOKUP_NISPLUS=yes:LOOKUP_NISPLUS=yes:" Local/Makefile + fi + if use syslog; then + sed -i "s:LOG_FILE_PATH=/var/log/exim/exim_%s.log:LOG_FILE_PATH=syslog:" Local/Makefile + fi +# Use the "native" interface to the DBM library + echo "USE_DB=yes" >> ${S}/Local/Makefile +} + +src_compile() { + make || die "make failed" +} + + +src_install () { + cd ${S}/build-exim-gentoo + exeinto /usr/sbin + doexe exim + if use X;then + doexe eximon.bin + doexe eximon + fi + fperms 4755 /usr/sbin/exim + + dodir /usr/bin /usr/sbin /usr/lib + dosym ../sbin/exim /usr/bin/mailq + dosym ../sbin/exim /usr/bin/newaliases + einfo "The Exim ebuild will no longer touch /usr/bin/mail, so as not to interfere with mailx/nail." + dosym exim /usr/sbin/rsmtp + dosym exim /usr/sbin/rmail + if \[ ! -e /usr/lib/sendmail \]; + then + dosym /usr/sbin/sendmail /usr/lib/sendmail + fi + + if use mailwrapper + then + insinto /etc/mail + doins ${FILESDIR}/mailer.conf + else + dosym exim /usr/sbin/sendmail + fi + + exeinto /usr/sbin + for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \ + exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \ + convert4r3 convert4r4 exipick + do + doexe $i + done + + dodoc ${S}/doc/* + doman ${S}/doc/exim.8 + + # conf files + insinto /etc/exim + newins ${S}/src/configure.default.orig exim.conf.dist + if use exiscan-acl; then + newins ${S}/src/configure.default exim.conf.exiscan-acl + fi + doins ${FILESDIR}/system_filter.exim + doins ${FILESDIR}/auth_conf.sub + if use exiscan; then + newins ${S}/src/configure.default exim.conf.exiscan + doins ${FILESDIR}/exiscan.conf + fi + + if use pam + then + # INSTALL a pam.d file for SMTP AUTH that works with gentoo's pam + insinto /etc/pam.d + newins ${FILESDIR}/pam.d-exim exim + fi + + exeinto /etc/init.d + newexe ${FILESDIR}/exim.rc6 exim + + insinto /etc/conf.d + newins ${FILESDIR}/exim.confd exim + + DIROPTIONS="--mode=0750 --owner=mail --group=mail" + dodir /var/log/${PN} +} + + +pkg_postinst() { + einfo "/etc/exim/system_filter.exim is a sample system_filter." + einfo "/etc/exim/auth_conf.sub contains the configuration sub for using smtp auth." + einfo "Please create /etc/exim/exim.conf from /etc/exim/exim.conf.dist." + + if ! use mailwrapper && [[ -e /etc/mailer.conf ]] + then + einfo + einfo "Since you emerged $PN without mailwrapper in USE," + einfo "you probably want to 'emerge -C mailwrapper' now." + einfo + fi +} diff --git a/mail-mta/exim/files/digest-exim-4.62-r1 b/mail-mta/exim/files/digest-exim-4.62-r1 new file mode 100644 index 00000000..0ff59235 --- /dev/null +++ b/mail-mta/exim/files/digest-exim-4.62-r1 @@ -0,0 +1,6 @@ +MD5 a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 1577729 +RMD160 9553b758e3bfd3d12027262b6211e37ad3259252 exim-4.62.tar.bz2 1577729 +SHA256 b5438894807c560a7933af36d10b2951f890aece9bff14c95fe2b91b0398629b exim-4.62.tar.bz2 1577729 +MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113 +RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113 +SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113 diff --git a/mail-mta/exim/files/digest-exim-4.62-r2 b/mail-mta/exim/files/digest-exim-4.62-r2 new file mode 100644 index 00000000..0ff59235 --- /dev/null +++ b/mail-mta/exim/files/digest-exim-4.62-r2 @@ -0,0 +1,6 @@ +MD5 a8efc92427192fd3b7b5e71decc8cc31 exim-4.62.tar.bz2 1577729 +RMD160 9553b758e3bfd3d12027262b6211e37ad3259252 exim-4.62.tar.bz2 1577729 +SHA256 b5438894807c560a7933af36d10b2951f890aece9bff14c95fe2b91b0398629b exim-4.62.tar.bz2 1577729 +MD5 eb249c90af3ab11e5a4d307e184a75ac exiscan.conf 22113 +RMD160 e52b77f656b3ba2105e833075d1368f41e414d64 exiscan.conf 22113 +SHA256 f8cc731d3225a902461e05c0997df23bfd231ea8d5bf33a9aba5783bc6e0c964 exiscan.conf 22113 diff --git a/mail-mta/exim/files/exim-4.14-tail.patch b/mail-mta/exim/files/exim-4.14-tail.patch new file mode 100644 index 00000000..481dca9b --- /dev/null +++ b/mail-mta/exim/files/exim-4.14-tail.patch @@ -0,0 +1,11 @@ +--- scripts/Configure-config.h.orig 2003-07-17 18:01:19.000000000 -0400 ++++ scripts/Configure-config.h 2003-07-17 18:01:25.000000000 -0400 +@@ -41,7 +41,7 @@ + + # Double-check that config.h is complete. + +-if [ "`tail -1 config.h`" != "/* End of config.h */" ] ; then ++if [ "`tail -n 1 config.h`" != "/* End of config.h */" ] ; then + echo "*** config.h appears to be incomplete" + echo "*** unexpected failure in buildconfig program" + exit 1 diff --git a/mail-mta/exim/files/exim-4.20-maildir.patch b/mail-mta/exim/files/exim-4.20-maildir.patch new file mode 100644 index 00000000..3cb198d5 --- /dev/null +++ b/mail-mta/exim/files/exim-4.20-maildir.patch @@ -0,0 +1,14 @@ +diff -urN ./exim-4.20.orig/src/configure.default exim-4.20/src/configure.default +--- ./exim-4.20.orig/src/configure.default 2003-06-27 16:48:22.000000000 -0700 ++++ exim-4.20/src/configure.default 2003-06-27 16:52:20.000000000 -0700 +@@ -451,7 +451,9 @@ + + local_delivery: + driver = appendfile +- file = /var/mail/$local_part ++# file = /var/mail/$local_part ++ directory = /home/$local_part/.maildir ++ maildir_format + delivery_date_add + envelope_to_add + return_path_add diff --git a/mail-mta/exim/files/exim-4.43-SmtpUsingDovecot.patch b/mail-mta/exim/files/exim-4.43-SmtpUsingDovecot.patch new file mode 100644 index 00000000..c51971cc --- /dev/null +++ b/mail-mta/exim/files/exim-4.43-SmtpUsingDovecot.patch @@ -0,0 +1,384 @@ +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/scripts/MakeLinks exim-4.43/scripts/MakeLinks +--- exim-4.43.vanilla/scripts/MakeLinks 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/scripts/MakeLinks 2004-12-09 15:38:46.000000000 +0300 +@@ -167,6 +167,8 @@ ln -s ../../src/auths/auth-spa.h + ln -s ../../src/auths/sha1.c sha1.c + ln -s ../../src/auths/spa.c spa.c + ln -s ../../src/auths/spa.h spa.h ++ln -s ../../src/auths/dovecot.c dovecot.c ++ln -s ../../src/auths/dovecot.h dovecot.h + cd .. + + # The basic source files for Exim and utilities. NB local_scan.h gets linked, +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/auths/dovecot.c exim-4.43/src/auths/dovecot.c +--- exim-4.43.vanilla/src/auths/dovecot.c 1970-01-01 03:00:00.000000000 +0300 ++++ exim-4.43/src/auths/dovecot.c 2004-12-09 15:38:46.000000000 +0300 +@@ -0,0 +1,247 @@ ++/* ++ * Copyright (c) 2004 Andrey Panin <pazke@donpac.ru> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ */ ++ ++#include "../exim.h" ++#include "dovecot.h" ++ ++#define VERSION_MAJOR 1 ++#define VERSION_MINOR 0 ++ ++/* Options specific to the authentication mechanism. */ ++optionlist auth_dovecot_options[] = { ++ { ++ "server_socket", ++ opt_stringptr, ++ (void *)(offsetof(auth_dovecot_options_block, server_socket)) ++ }, ++}; ++ ++/* Size of the options list. An extern variable has to be used so that its ++address can appear in the tables drtables.c. */ ++int auth_dovecot_options_count = ++ sizeof(auth_dovecot_options) / sizeof(optionlist); ++ ++/* Default private options block for the authentication method. */ ++auth_dovecot_options_block auth_dovecot_option_defaults = { ++ NULL, /* server_socket */ ++}; ++ ++/************************************************* ++ * Initialization entry point * ++ *************************************************/ ++ ++/* Called for each instance, after its options have been read, to ++enable consistency checks to be done, or anything else that needs ++to be set up. */ ++void auth_dovecot_init(auth_instance *ablock) ++{ ++ auth_dovecot_options_block *ob = ++ (auth_dovecot_options_block *)(ablock->options_block); ++ ++ if (ablock->public_name == NULL) ++ ablock->public_name = ablock->name; ++ if (ob->server_socket != NULL) ++ ablock->server = TRUE; ++ ablock->client = FALSE; ++} ++ ++static int strcut(char *str, char **ptrs, int nptrs) ++{ ++ char *tmp = str; ++ int n; ++ ++ for (n = 0; n < nptrs; n++) ++ ptrs[n] = NULL; ++ n = 1; ++ ++ while (*str) { ++ if (*str == '\t') { ++ if (n <= nptrs) { ++ *ptrs++ = tmp; ++ tmp = str + 1; ++ *str = 0; ++ } ++ n++; ++ } ++ str++; ++ } ++ ++ if (n < nptrs) ++ *ptrs = tmp; ++ ++ return n; ++} ++ ++#define CHECK_COMMAND(str, arg_min, arg_max) do { \ ++ if (strcasecmp((str), args[0]) != 0) \ ++ goto out; \ ++ if (nargs - 1 < (arg_min)) \ ++ goto out; \ ++ if (nargs - 1 > (arg_max)) \ ++ goto out; \ ++} while (0) ++ ++#define OUT(msg) do { \ ++ auth_defer_msg = (msg); \ ++ goto out; \ ++} while(0) ++ ++/************************************************* ++ * Server entry point * ++ *************************************************/ ++ ++int auth_dovecot_server(auth_instance *ablock, uschar *data) ++{ ++ auth_dovecot_options_block *ob = ++ (auth_dovecot_options_block *)(ablock->options_block); ++ struct sockaddr_un sa; ++ char buffer[4096]; ++ char *args[8]; ++ int nargs, tmp; ++ int cuid = 0, cont = 1, found = 0, fd, ret = DEFER; ++ FILE *f; ++ ++ memset(&sa, 0, sizeof(sa)); ++ sa.sun_family = AF_UNIX; ++ if (strncpy(sa.sun_path, ob->server_socket, sizeof(sa.sun_path)) < 0) { ++ auth_defer_msg = "authentication socket path too long"; ++ return DEFER; ++ } ++ ++ auth_defer_msg = "authentication socket connection error"; ++ ++ fd = socket(PF_UNIX, SOCK_STREAM, 0); ++ if (fd < 0) ++ return DEFER; ++ ++ if (connect(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) ++ goto out; ++ ++ f = fdopen(fd, "a+"); ++ if (f == NULL) ++ goto out; ++ ++ auth_defer_msg = "authentication socket protocol error"; ++ ++ while (cont) { ++ if (fgets(buffer, sizeof(buffer), f) == NULL) ++ OUT("authentication socket read error or premature eof"); ++ ++ buffer[strlen(buffer) - 1] = 0; ++ nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); ++ ++ switch (toupper(*args[0])) { ++ case 'C': ++ CHECK_COMMAND("CUID", 1, 1); ++ cuid = atoi(args[1]); ++ break; ++ ++ case 'D': ++ CHECK_COMMAND("DONE", 0, 0); ++ cont = 0; ++ break; ++ ++ case 'M': ++ CHECK_COMMAND("MECH", 1, INT_MAX); ++ if (!strcasecmp(args[1], ablock->public_name)) ++ found = 1; ++ break; ++ ++ case 'S': ++ CHECK_COMMAND("SPID", 1, 1); ++ break; ++ ++ case 'V': ++ CHECK_COMMAND("VERSION", 2, 2); ++ if (atoi(args[1]) != VERSION_MAJOR) ++ OUT("authentication socket protocol version mismatch"); ++ break; ++ ++ default: ++ goto out; ++ } ++ } ++ ++ if (!found) ++ goto out; ++ ++ fprintf(f, "VERSION\t%d\t%d\r\nSERVICE\tSMTP\r\nCPID\t%d\r\n" ++ "AUTH\t%d\t%s\trip=%s\tlip=%s\tresp=%s\r\n", ++ VERSION_MAJOR, VERSION_MINOR, getpid(), cuid, ++ ablock->public_name, sender_host_address, interface_address, ++ data ? (char *) data : ""); ++ ++ while (1) { ++ if (fgets(buffer, sizeof(buffer), f) == NULL) { ++ auth_defer_msg = "authentication socket read error or premature eof"; ++ goto out; ++ } ++ ++ buffer[strlen(buffer) - 1] = 0; ++ nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); ++ ++ if (atoi(args[1]) != cuid) ++ OUT("authentication socket connection id mismatch"); ++ ++ switch (toupper(*args[0])) { ++ case 'C': ++ CHECK_COMMAND("CONT", 1, 2); ++ ++ tmp = auth_get_no64_data(&data, args[2]); ++ if (tmp != OK) { ++ ret = tmp; ++ goto out; ++ } ++ ++ if (fprintf(f, "CONT\t%d\t%s\r\n", cuid, data) < 0) ++ OUT("authentication socket write error"); ++ ++ break; ++ ++ case 'F': ++ CHECK_COMMAND("FAIL", 1, 2); ++ ++ /* FIXME: add proper response handling */ ++ if (args[2]) { ++ char *p = strchr(args[2], '='); ++ if (p) { ++ ++p; ++ expand_nstring[1] = p; ++ expand_nlength[1] = strlen(p); ++ expand_nmax = 1; ++ } ++ } ++ ++ ret = FAIL; ++ goto out; ++ ++ case 'O': ++ CHECK_COMMAND("OK", 2, 2); ++ { ++ /* FIXME: add proper response handling */ ++ char *p = strchr(args[2], '='); ++ if (!p) ++ OUT("authentication socket protocol error, username missing"); ++ ++ p++; ++ expand_nstring[1] = p; ++ expand_nlength[1] = strlen(p); ++ expand_nmax = 1; ++ } ++ ret = OK; ++ /* fallthrough */ ++ ++ default: ++ goto out; ++ } ++ } ++ ++out: close(fd); ++ return ret; ++} +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/auths/dovecot.h exim-4.43/src/auths/dovecot.h +--- exim-4.43.vanilla/src/auths/dovecot.h 1970-01-01 03:00:00.000000000 +0300 ++++ exim-4.43/src/auths/dovecot.h 2004-12-09 15:47:43.000000000 +0300 +@@ -0,0 +1,28 @@ ++/************************************************* ++* Exim - an Internet mail transport agent * ++*************************************************/ ++ ++/* Copyright (c) University of Cambridge 1995 - 2003 */ ++/* See the file NOTICE for conditions of use and distribution. */ ++ ++/* Private structure for the private options. */ ++ ++typedef struct { ++ uschar *server_socket; ++} auth_dovecot_options_block; ++ ++/* Data for reading the private options. */ ++ ++extern optionlist auth_dovecot_options[]; ++extern int auth_dovecot_options_count; ++ ++/* Block containing default values. */ ++ ++extern auth_dovecot_options_block auth_dovecot_option_defaults; ++ ++/* The entry points for the mechanism */ ++ ++extern void auth_dovecot_init(auth_instance *); ++extern int auth_dovecot_server(auth_instance *, uschar *); ++ ++/* End of dovecot.h */ +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/auths/Makefile exim-4.43/src/auths/Makefile +--- exim-4.43.vanilla/src/auths/Makefile 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/auths/Makefile 2004-12-09 15:46:44.000000000 +0300 +@@ -7,7 +7,7 @@ + + OBJ = b64encode.o b64decode.o call_pam.o call_pwcheck.o call_radius.o \ + xtextencode.o xtextdecode.o get_data.o get_no64_data.o md5.o \ +- cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o ++ cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o dovecot.o + + auths.a: $(OBJ) + /bin/rm -f auths.a +@@ -37,4 +37,6 @@ cyrus_sasl.o: $(HDRS) cyrus_sasl.c cy + plaintext.o: $(HDRS) plaintext.c plaintext.h + spa.o: $(HDRS) spa.c spa.h + ++dovecot.o: $(HDRS) dovecot.c dovecot.h ++ + # End +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/config.h.defaults exim-4.43/src/config.h.defaults +--- exim-4.43.vanilla/src/config.h.defaults 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/config.h.defaults 2004-12-09 15:38:46.000000000 +0300 +@@ -20,6 +20,7 @@ in config.h unless some value is defined + #define AUTH_CYRUS_SASL + #define AUTH_PLAINTEXT + #define AUTH_SPA ++#define AUTH_DOVECOT + + #define BIN_DIRECTORY + +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/drtables.c exim-4.43/src/drtables.c +--- exim-4.43.vanilla/src/drtables.c 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/drtables.c 2004-12-09 15:47:14.000000000 +0300 +@@ -515,6 +515,10 @@ set to NULL for those that are not compi + #include "auths/spa.h" + #endif + ++#ifdef AUTH_DOVECOT ++#include "auths/dovecot.h" ++#endif ++ + auth_info auths_available[] = { + + /* Checking by an expansion condition on plain text */ +@@ -571,6 +575,18 @@ auth_info auths_available[] = { + }, + #endif + ++#ifdef AUTH_DOVECOT ++ { ++ US"dovecot", /* lookup name */ ++ auth_dovecot_options, ++ &auth_dovecot_options_count, ++ &auth_dovecot_option_defaults, ++ sizeof(auth_dovecot_options_block), ++ auth_dovecot_init, /* init function */ ++ auth_dovecot_server, /* server function */ ++ }, ++#endif ++ + { US"", NULL, NULL, NULL, 0, NULL, NULL, NULL } + }; + +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/EDITME exim-4.43/src/EDITME +--- exim-4.43.vanilla/src/EDITME 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/EDITME 2004-12-09 16:00:00.000000000 +0300 +@@ -410,6 +410,7 @@ FIXED_NEVER_USERS=root + # AUTH_CYRUS_SASL=yes + # AUTH_PLAINTEXT=yes + # AUTH_SPA=yes ++# AUTH_DOVECOT=yes + + + #------------------------------------------------------------------------------ +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/exim.c exim-4.43/src/exim.c +--- exim-4.43.vanilla/src/exim.c 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/exim.c 2004-12-09 15:38:46.000000000 +0300 +@@ -895,6 +895,10 @@ fprintf(f, "Authenticators:"); + #ifdef AUTH_SPA + fprintf(f, " spa"); + #endif ++#ifdef AUTH_DOVECOT ++ fprintf(f, " dovecot"); ++#endif ++ + fprintf(f, "\n"); + + fprintf(f, "Routers:"); + diff --git a/mail-mta/exim/files/exim-4.43-SmtpUsingDovecot.patch3 b/mail-mta/exim/files/exim-4.43-SmtpUsingDovecot.patch3 new file mode 100644 index 00000000..bc7d0b06 --- /dev/null +++ b/mail-mta/exim/files/exim-4.43-SmtpUsingDovecot.patch3 @@ -0,0 +1,384 @@ +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/scripts/MakeLinks exim-4.43/scripts/MakeLinks +--- exim-4.43.vanilla/scripts/MakeLinks 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/scripts/MakeLinks 2004-12-09 15:38:46.000000000 +0300 + <at> <at> -167,6 +167,8 <at> <at> ln -s ../../src/auths/auth-spa.h + ln -s ../../src/auths/sha1.c sha1.c + ln -s ../../src/auths/spa.c spa.c + ln -s ../../src/auths/spa.h spa.h ++ln -s ../../src/auths/dovecot.c dovecot.c ++ln -s ../../src/auths/dovecot.h dovecot.h + cd .. + + # The basic source files for Exim and utilities. NB local_scan.h gets linked, +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/auths/dovecot.c exim-4.43/src/auths/dovecot.c +--- exim-4.43.vanilla/src/auths/dovecot.c 1970-01-01 03:00:00.000000000 +0300 ++++ exim-4.43/src/auths/dovecot.c 2004-12-09 15:38:46.000000000 +0300 + <at> <at> -0,0 +1,247 <at> <at> ++/* ++ * Copyright (c) 2004 Andrey Panin <pazke <at> donpac.ru> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published ++ * by the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ */ ++ ++#include "../exim.h" ++#include "dovecot.h" ++ ++#define VERSION_MAJOR 1 ++#define VERSION_MINOR 0 ++ ++/* Options specific to the authentication mechanism. */ ++optionlist auth_dovecot_options[] = { ++ { ++ "server_socket", ++ opt_stringptr, ++ (void *)(offsetof(auth_dovecot_options_block, server_socket)) ++ }, ++}; ++ ++/* Size of the options list. An extern variable has to be used so that its ++address can appear in the tables drtables.c. */ ++int auth_dovecot_options_count = ++ sizeof(auth_dovecot_options) / sizeof(optionlist); ++ ++/* Default private options block for the authentication method. */ ++auth_dovecot_options_block auth_dovecot_option_defaults = { ++ NULL, /* server_socket */ ++}; ++ ++/************************************************* ++ * Initialization entry point * ++ *************************************************/ ++ ++/* Called for each instance, after its options have been read, to ++enable consistency checks to be done, or anything else that needs ++to be set up. */ ++void auth_dovecot_init(auth_instance *ablock) ++{ ++ auth_dovecot_options_block *ob = ++ (auth_dovecot_options_block *)(ablock->options_block); ++ ++ if (ablock->public_name == NULL) ++ ablock->public_name = ablock->name; ++ if (ob->server_socket != NULL) ++ ablock->server = TRUE; ++ ablock->client = FALSE; ++} ++ ++static int strcut(char *str, char **ptrs, int nptrs) ++{ ++ char *tmp = str; ++ int n; ++ ++ for (n = 0; n < nptrs; n++) ++ ptrs[n] = NULL; ++ n = 1; ++ ++ while (*str) { ++ if (*str == '\t') { ++ if (n <= nptrs) { ++ *ptrs++ = tmp; ++ tmp = str + 1; ++ *str = 0; ++ } ++ n++; ++ } ++ str++; ++ } ++ ++ if (n < nptrs) ++ *ptrs = tmp; ++ ++ return n; ++} ++ ++#define CHECK_COMMAND(str, arg_min, arg_max) do { \ ++ if (strcasecmp((str), args[0]) != 0) \ ++ goto out; \ ++ if (nargs - 1 < (arg_min)) \ ++ goto out; \ ++ if (nargs - 1 > (arg_max)) \ ++ goto out; \ ++} while (0) ++ ++#define OUT(msg) do { \ ++ auth_defer_msg = (msg); \ ++ goto out; \ ++} while(0) ++ ++/************************************************* ++ * Server entry point * ++ *************************************************/ ++ ++int auth_dovecot_server(auth_instance *ablock, uschar *data) ++{ ++ auth_dovecot_options_block *ob = ++ (auth_dovecot_options_block *)(ablock->options_block); ++ struct sockaddr_un sa; ++ char buffer[4096]; ++ char *args[8]; ++ int nargs, tmp; ++ int cuid = 0, cont = 1, found = 0, fd, ret = DEFER; ++ FILE *f; ++ ++ memset(&sa, 0, sizeof(sa)); ++ sa.sun_family = AF_UNIX; ++ if (strncpy(sa.sun_path, ob->server_socket, sizeof(sa.sun_path)) < 0) { ++ auth_defer_msg = "authentication socket path too long"; ++ return DEFER; ++ } ++ ++ auth_defer_msg = "authentication socket connection error"; ++ ++ fd = socket(PF_UNIX, SOCK_STREAM, 0); ++ if (fd < 0) ++ return DEFER; ++ ++ if (connect(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) ++ goto out; ++ ++ f = fdopen(fd, "a+"); ++ if (f == NULL) ++ goto out; ++ ++ auth_defer_msg = "authentication socket protocol error"; ++ ++ while (cont) { ++ if (fgets(buffer, sizeof(buffer), f) == NULL) ++ OUT("authentication socket read error or premature eof"); ++ ++ buffer[strlen(buffer) - 1] = 0; ++ nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); ++ ++ switch (toupper(*args[0])) { ++ case 'C': ++ CHECK_COMMAND("CUID", 1, 1); ++ cuid = atoi(args[1]); ++ break; ++ ++ case 'D': ++ CHECK_COMMAND("DONE", 0, 0); ++ cont = 0; ++ break; ++ ++ case 'M': ++ CHECK_COMMAND("MECH", 1, INT_MAX); ++ if (!strcasecmp(args[1], ablock->public_name)) ++ found = 1; ++ break; ++ ++ case 'S': ++ CHECK_COMMAND("SPID", 1, 1); ++ break; ++ ++ case 'V': ++ CHECK_COMMAND("VERSION", 2, 2); ++ if (atoi(args[1]) != VERSION_MAJOR) ++ OUT("authentication socket protocol version mismatch"); ++ break; ++ ++ default: ++ goto out; ++ } ++ } ++ ++ if (!found) ++ goto out; ++ ++ fprintf(f, "VERSION\t%d\t%d\r\nSERVICE\tSMTP\r\nCPID\t%d\r\n" ++ "AUTH\t%d\t%s\trip=%s\tlip=%s\tresp=%s\r\n", ++ VERSION_MAJOR, VERSION_MINOR, getpid(), cuid, ++ ablock->public_name, sender_host_address, interface_address, ++ data ? (char *) data : ""); ++ ++ while (1) { ++ if (fgets(buffer, sizeof(buffer), f) == NULL) { ++ auth_defer_msg = "authentication socket read error or premature eof"; ++ goto out; ++ } ++ ++ buffer[strlen(buffer) - 1] = 0; ++ nargs = strcut(buffer, args, sizeof(args) / sizeof(args[0])); ++ ++ if (atoi(args[1]) != cuid) ++ OUT("authentication socket connection id mismatch"); ++ ++ switch (toupper(*args[0])) { ++ case 'C': ++ CHECK_COMMAND("CONT", 1, 2); ++ ++ tmp = auth_get_no64_data(&data, args[2]); ++ if (tmp != OK) { ++ ret = tmp; ++ goto out; ++ } ++ ++ if (fprintf(f, "CONT\t%d\t%s\r\n", cuid, data) < 0) ++ OUT("authentication socket write error"); ++ ++ break; ++ ++ case 'F': ++ CHECK_COMMAND("FAIL", 1, 2); ++ ++ /* FIXME: add proper response handling */ ++ if (args[2]) { ++ char *p = strchr(args[2], '='); ++ if (p) { ++ ++p; ++ expand_nstring[1] = p; ++ expand_nlength[1] = strlen(p); ++ expand_nmax = 1; ++ } ++ } ++ ++ ret = FAIL; ++ goto out; ++ ++ case 'O': ++ CHECK_COMMAND("OK", 2, 2); ++ { ++ /* FIXME: add proper response handling */ ++ char *p = strchr(args[2], '='); ++ if (!p) ++ OUT("authentication socket protocol error, username missing"); ++ ++ p++; ++ expand_nstring[1] = p; ++ expand_nlength[1] = strlen(p); ++ expand_nmax = 1; ++ } ++ ret = OK; ++ /* fallthrough */ ++ ++ default: ++ goto out; ++ } ++ } ++ ++out: close(fd); ++ return ret; ++} +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/auths/dovecot.h exim-4.43/src/auths/dovecot.h +--- exim-4.43.vanilla/src/auths/dovecot.h 1970-01-01 03:00:00.000000000 +0300 ++++ exim-4.43/src/auths/dovecot.h 2004-12-09 15:47:43.000000000 +0300 + <at> <at> -0,0 +1,28 <at> <at> ++/************************************************* ++* Exim - an Internet mail transport agent * ++*************************************************/ ++ ++/* Copyright (c) University of Cambridge 1995 - 2003 */ ++/* See the file NOTICE for conditions of use and distribution. */ ++ ++/* Private structure for the private options. */ ++ ++typedef struct { ++ uschar *server_socket; ++} auth_dovecot_options_block; ++ ++/* Data for reading the private options. */ ++ ++extern optionlist auth_dovecot_options[]; ++extern int auth_dovecot_options_count; ++ ++/* Block containing default values. */ ++ ++extern auth_dovecot_options_block auth_dovecot_option_defaults; ++ ++/* The entry points for the mechanism */ ++ ++extern void auth_dovecot_init(auth_instance *); ++extern int auth_dovecot_server(auth_instance *, uschar *); ++ ++/* End of dovecot.h */ +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/auths/Makefile exim-4.43/src/auths/Makefile +--- exim-4.43.vanilla/src/auths/Makefile 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/auths/Makefile 2004-12-09 15:46:44.000000000 +0300 + <at> <at> -7,7 +7,7 <at> <at> + + OBJ = b64encode.o b64decode.o call_pam.o call_pwcheck.o call_radius.o \ + xtextencode.o xtextdecode.o get_data.o get_no64_data.o md5.o \ +- cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o ++ cram_md5.o cyrus_sasl.o plaintext.o pwcheck.o sha1.o auth-spa.o spa.o dovecot.o + + auths.a: $(OBJ) + /bin/rm -f auths.a + <at> <at> -37,4 +37,6 <at> <at> cyrus_sasl.o: $(HDRS) cyrus_sasl.c cy + plaintext.o: $(HDRS) plaintext.c plaintext.h + spa.o: $(HDRS) spa.c spa.h + ++dovecot.o: $(HDRS) dovecot.c dovecot.h ++ + # End +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/config.h.defaults exim-4.43/src/config.h.defaults +--- exim-4.43.vanilla/src/config.h.defaults 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/config.h.defaults 2004-12-09 15:38:46.000000000 +0300 + <at> <at> -20,6 +20,7 <at> <at> in config.h unless some value is defined + #define AUTH_CYRUS_SASL + #define AUTH_PLAINTEXT + #define AUTH_SPA ++#define AUTH_DOVECOT + + #define BIN_DIRECTORY + +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/drtables.c exim-4.43/src/drtables.c +--- exim-4.43.vanilla/src/drtables.c 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/drtables.c 2004-12-09 15:47:14.000000000 +0300 + <at> <at> -515,6 +515,10 <at> <at> set to NULL for those that are not compi + #include "auths/spa.h" + #endif + ++#ifdef AUTH_DOVECOT ++#include "auths/dovecot.h" ++#endif ++ + auth_info auths_available[] = { + + /* Checking by an expansion condition on plain text */ + <at> <at> -571,6 +575,18 <at> <at> auth_info auths_available[] = { + }, + #endif + ++#ifdef AUTH_DOVECOT ++ { ++ US"dovecot", /* lookup name */ ++ auth_dovecot_options, ++ &auth_dovecot_options_count, ++ &auth_dovecot_option_defaults, ++ sizeof(auth_dovecot_options_block), ++ auth_dovecot_init, /* init function */ ++ auth_dovecot_server, /* server function */ ++ }, ++#endif ++ + { US"", NULL, NULL, NULL, 0, NULL, NULL, NULL } + }; + +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/EDITME exim-4.43/src/EDITME +--- exim-4.43.vanilla/src/EDITME 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/EDITME 2004-12-09 16:00:00.000000000 +0300 + <at> <at> -410,6 +410,7 <at> <at> FIXED_NEVER_USERS=root + # AUTH_CYRUS_SASL=yes + # AUTH_PLAINTEXT=yes + # AUTH_SPA=yes ++# AUTH_DOVECOT=yes + + + #------------------------------------------------------------------------------ +diff -urdpNx build-Linux-i386 -x Local exim-4.43.vanilla/src/exim.c exim-4.43/src/exim.c +--- exim-4.43.vanilla/src/exim.c 2004-10-05 12:32:08.000000000 +0400 ++++ exim-4.43/src/exim.c 2004-12-09 15:38:46.000000000 +0300 + <at> <at> -895,6 +895,10 <at> <at> fprintf(f, "Authenticators:"); + #ifdef AUTH_SPA + fprintf(f, " spa"); + #endif ++#ifdef AUTH_DOVECOT ++ fprintf(f, " dovecot"); ++#endif ++ + fprintf(f, "\n"); + + fprintf(f, "Routers:"); + diff --git a/mail-mta/exim/files/exim-4.43-r2-localscan_dlopen.patch b/mail-mta/exim/files/exim-4.43-r2-localscan_dlopen.patch new file mode 100644 index 00000000..146606a1 --- /dev/null +++ b/mail-mta/exim/files/exim-4.43-r2-localscan_dlopen.patch @@ -0,0 +1,259 @@ +diff -Naur exim-4.32/src/EDITME exim-4.32-dlopen/src/EDITME +--- src/EDITME 2004-04-15 08:27:01.000000000 +0000 ++++ src/EDITME 2004-05-06 16:15:47.000000000 +0000 +@@ -505,6 +505,21 @@ + + + #------------------------------------------------------------------------------ ++# On systems which support dynamic loading of shared libraries, Exim can ++# load a local_scan function specified in its config file instead of having ++# to be recompiled with the desired local_scan function. For a full ++# description of the API to this function, see the Exim specification. ++ ++DLOPEN_LOCAL_SCAN=yes ++ ++# If you set DLOPEN_LOCAL_SCAN, then you need to include -rdynamic in the ++# linker flags. Without it, the loaded .so won't be able to access any ++# functions from exim. ++ ++LFLAGS=-rdynamic -ldl ++ ++ ++#------------------------------------------------------------------------------ + # The default distribution of Exim contains only the plain text form of the + # documentation. Other forms are available separately. If you want to install + # the documentation in "info" format, first fetch the Texinfo documentation +diff -Naur exim-4.32/src/config.h.defaults exim-4.32-dlopen/src/config.h.defaults +--- src/config.h.defaults 2004-04-15 08:27:01.000000000 +0000 ++++ src/config.h.defaults 2004-05-06 16:16:30.000000000 +0000 +@@ -20,6 +20,8 @@ + #define AUTH_PLAINTEXT + #define AUTH_SPA + ++#define DLOPEN_LOCAL_SCAN ++ + #define BIN_DIRECTORY + + #define CONFIGURE_FILE +diff -Naur exim-4.32/src/globals.c exim-4.32-dlopen/src/globals.c +--- src/globals.c 2004-04-15 08:27:01.000000000 +0000 ++++ src/globals.c 2004-05-06 16:17:07.000000000 +0000 +@@ -109,6 +109,10 @@ + uschar *tls_verify_hosts = NULL; + #endif + ++#ifdef DLOPEN_LOCAL_SCAN ++uschar *local_scan_path = NULL; ++#endif ++ + + /* Input-reading functions for messages, so we can use special ones for + incoming TCP/IP. The defaults use stdin. We never need these for any +diff -Naur exim-4.32/src/globals.h exim-4.32-dlopen/src/globals.h +--- src/globals.h 2004-04-15 08:27:01.000000000 +0000 ++++ src/globals.h 2004-05-06 16:17:50.000000000 +0000 +@@ -73,6 +73,9 @@ + extern uschar *tls_verify_hosts; /* Mandatory client verification */ + #endif + ++#ifdef DLOPEN_LOCAL_SCAN ++extern uschar *local_scan_path; /* Path to local_scan() library */ ++#endif + + /* Input-reading functions for messages, so we can use special ones for + incoming TCP/IP. */ +diff -Naur exim-4.32/src/local_scan.c exim-4.32-dlopen/src/local_scan.c +--- src/local_scan.c 2004-04-15 08:27:01.000000000 +0000 ++++ src/local_scan.c 2004-05-06 16:21:57.000000000 +0000 +@@ -5,60 +5,131 @@ + /* Copyright (c) University of Cambridge 1995 - 2004 */ + /* See the file NOTICE for conditions of use and distribution. */ + ++#include "exim.h" + +-/****************************************************************************** +-This file contains a template local_scan() function that just returns ACCEPT. +-If you want to implement your own version, you should copy this file to, say +-Local/local_scan.c, and edit the copy. To use your version instead of the +-default, you must set +- +-LOCAL_SCAN_SOURCE=Local/local_scan.c +- +-in your Local/Makefile. This makes it easy to copy your version for use with +-subsequent Exim releases. +- +-For a full description of the API to this function, see the Exim specification. +-******************************************************************************/ +- +- +-/* This is the only Exim header that you should include. The effect of +-including any other Exim header is not defined, and may change from release to +-release. Use only the documented interface! */ +- +-#include "local_scan.h" +- +- +-/* This is a "do-nothing" version of a local_scan() function. The arguments +-are: +- +- fd The file descriptor of the open -D file, which contains the +- body of the message. The file is open for reading and +- writing, but modifying it is dangerous and not recommended. +- +- return_text A pointer to an unsigned char* variable which you can set in +- order to return a text string. It is initialized to NULL. +- +-The return values of this function are: +- +- LOCAL_SCAN_ACCEPT +- The message is to be accepted. The return_text argument is +- saved in $local_scan_data. +- +- LOCAL_SCAN_REJECT +- The message is to be rejected. The returned text is used +- in the rejection message. +- +- LOCAL_SCAN_TEMPREJECT +- This specifies a temporary rejection. The returned text +- is used in the rejection message. +-*/ ++#ifdef DLOPEN_LOCAL_SCAN ++#include <dlfcn.h> ++static int (*local_scan_fn)(int fd, uschar **return_text) = NULL; ++static int load_local_scan_library(void); ++#endif + + int + local_scan(int fd, uschar **return_text) + { + fd = fd; /* Keep picky compilers happy */ + return_text = return_text; +-return LOCAL_SCAN_ACCEPT; ++#ifdef DLOPEN_LOCAL_SCAN ++/* local_scan_path is defined AND not the empty string */ ++if (local_scan_path && *local_scan_path) ++ { ++ if (!local_scan_fn) ++ { ++ if (!load_local_scan_library()) ++ { ++ char *base_msg , *error_msg , *final_msg ; ++ int final_length = -1 ; ++ ++ base_msg=US"Local configuration error - local_scan() library failure\n"; ++ error_msg = dlerror() ; ++ ++ final_length = strlen(base_msg) + strlen(error_msg) + 1 ; ++ final_msg = (char*)malloc( final_length*sizeof(char) ) ; ++ *final_msg = '\0' ; ++ ++ strcat( final_msg , base_msg ) ; ++ strcat( final_msg , error_msg ) ; ++ ++ *return_text = final_msg ; ++ return LOCAL_SCAN_TEMPREJECT; ++ } ++ } ++ return local_scan_fn(fd, return_text); ++ } ++else ++#endif ++ return LOCAL_SCAN_ACCEPT; ++} ++ ++#ifdef DLOPEN_LOCAL_SCAN ++ ++static int load_local_scan_library(void) ++{ ++/* No point in keeping local_scan_lib since we'll never dlclose() anyway */ ++void *local_scan_lib = NULL; ++int (*local_scan_version_fn)(void); ++int vers_maj; ++int vers_min; ++ ++local_scan_lib = dlopen(local_scan_path, RTLD_NOW); ++if (!local_scan_lib) ++ { ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library open failed - " ++ "message temporarily rejected"); ++ return FALSE; ++ } ++ ++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_major"); ++if (!local_scan_version_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan_version_major() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++/* The major number is increased when the ABI is changed in a non ++ backward compatible way. */ ++vers_maj = local_scan_version_fn(); ++ ++local_scan_version_fn = dlsym(local_scan_lib, "local_scan_version_minor"); ++if (!local_scan_version_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan_version_minor() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++/* The minor number is increased each time a new feature is added (in a ++ way that doesn't break backward compatibility) -- Marc */ ++vers_min = local_scan_version_fn(); ++ ++ ++if (vers_maj != LOCAL_SCAN_ABI_VERSION_MAJOR) ++ { ++ dlclose(local_scan_lib); ++ local_scan_lib = NULL; ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible major" ++ "version number, you need to recompile your module for this version" ++ "of exim (The module was compiled for version %d.%d and this exim provides" ++ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, ++ LOCAL_SCAN_ABI_VERSION_MINOR); ++ return FALSE; ++ } ++else if (vers_min > LOCAL_SCAN_ABI_VERSION_MINOR) ++ { ++ dlclose(local_scan_lib); ++ local_scan_lib = NULL; ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() has an incompatible minor" ++ "version number, you need to recompile your module for this version" ++ "of exim (The module was compiled for version %d.%d and this exim provides" ++ "ABI version %d.%d)", vers_maj, vers_min, LOCAL_SCAN_ABI_VERSION_MAJOR, ++ LOCAL_SCAN_ABI_VERSION_MINOR); ++ return FALSE; ++ } ++ ++local_scan_fn = dlsym(local_scan_lib, "local_scan"); ++if (!local_scan_fn) ++ { ++ dlclose(local_scan_lib); ++ log_write(0, LOG_MAIN|LOG_REJECT, "local_scan() library doesn't contain " ++ "local_scan() function - message temporarily rejected"); ++ return FALSE; ++ } ++ ++return TRUE; + } + ++#endif /* DLOPEN_LOCAL_SCAN */ ++ + /* End of local_scan.c */ +diff -Naur exim-4.32/src/readconf.c exim-4.32-dlopen/src/readconf.c +--- src/readconf.c 2004-04-15 08:27:01.000000000 +0000 ++++ src/readconf.c 2004-05-06 16:23:12.000000000 +0000 +@@ -223,6 +223,9 @@ + { "local_from_prefix", opt_stringptr, &local_from_prefix }, + { "local_from_suffix", opt_stringptr, &local_from_suffix }, + { "local_interfaces", opt_stringptr, &local_interfaces }, ++#ifdef DLOPEN_LOCAL_SCAN ++ { "local_scan_path", opt_stringptr, &local_scan_path }, ++#endif + { "local_scan_timeout", opt_time, &local_scan_timeout }, + { "local_sender_retain", opt_bool, &local_sender_retain }, + { "localhost_number", opt_stringptr, &host_number_string }, diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index ac783f6d..db303b21 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,3 +1,7 @@ +AUX check_pam.diff 12905 RMD160 aee968e9d72be0b0cbc37852226db14cba67a4fe SHA1 92fd41da261025f3cb4af056e46db16391d5e6e1 SHA256 d8ec3dd0ff902c465535809a94e7bd3c34bd53c7d0a50a206150e688ac6386c9 +MD5 6b0c111316a61e615be8da892b596266 files/check_pam.diff 12905 +RMD160 aee968e9d72be0b0cbc37852226db14cba67a4fe files/check_pam.diff 12905 +SHA256 d8ec3dd0ff902c465535809a94e7bd3c34bd53c7d0a50a206150e688ac6386c9 files/check_pam.diff 12905 AUX ejabberd-1.1.2-mod-proxy.patch 14771 RMD160 4a3d817fd103aebfb8e76fc9f23396b57da5f473 SHA1 023ab0fe368bd6de78ad21a977b1d5a09818cab3 SHA256 3c130d4d76fcc6e51014c4ef7db2939d3d6ee911f59fe17bd580ca914a07d6e3 MD5 c9f267fcc007f5a0a92834fc63d9cb3e files/ejabberd-1.1.2-mod-proxy.patch 14771 RMD160 4a3d817fd103aebfb8e76fc9f23396b57da5f473 files/ejabberd-1.1.2-mod-proxy.patch 14771 @@ -14,36 +18,32 @@ AUX ejabberd-1.1.2.initd 1298 RMD160 ec7b25205026521ec09f8595bbe6ae36c94bc55f SH MD5 13c4ef3cee491a8529dc8866347f0636 files/ejabberd-1.1.2.initd 1298 RMD160 ec7b25205026521ec09f8595bbe6ae36c94bc55f files/ejabberd-1.1.2.initd 1298 SHA256 69481e6f156e85c69038675283f818fe3fa92d0ab442aaf78831345969aa021a files/ejabberd-1.1.2.initd 1298 +AUX http_binding.patch 27120 RMD160 33a486a0070317755217d2513f38e1fc51436cd8 SHA1 9b5079ed7134c9ec6b101e79921f9978de820475 SHA256 9edbe0257b9e3fb547bcdb4f4325627e279199adfd6753622665b762eb675ed0 +MD5 98f2370cd26723c02ae57ae780221663 files/http_binding.patch 27120 +RMD160 33a486a0070317755217d2513f38e1fc51436cd8 files/http_binding.patch 27120 +SHA256 9edbe0257b9e3fb547bcdb4f4325627e279199adfd6753622665b762eb675ed0 files/http_binding.patch 27120 AUX mod_archive.erl 29560 RMD160 6c628ca4f1d82cd826c2a4d11c87d6b3344f3f24 SHA1 b934e9a9ed1ab7dc700b589177dc9425aa535a6f SHA256 b46976ca86a43cb13ed71009a5fadf7a2ca231e51da83150cdff0d646fbed00f MD5 c3c630a783edc22b0d81646f2c2eb829 files/mod_archive.erl 29560 RMD160 6c628ca4f1d82cd826c2a4d11c87d6b3344f3f24 files/mod_archive.erl 29560 SHA256 b46976ca86a43cb13ed71009a5fadf7a2ca231e51da83150cdff0d646fbed00f files/mod_archive.erl 29560 -AUX mod_presence.diff 24484 RMD160 6b13d9029854cbf8f22e34722428e805385e4b35 SHA1 8583b61d5f3d3108a631505fc7db0b8c37453e91 SHA256 dd03c73b4b900a160c85abe8df64d27934a5d79126566e6347c727517776a0ad -MD5 acd6e372c151a9df76d8a171a8653139 files/mod_presence.diff 24484 -RMD160 6b13d9029854cbf8f22e34722428e805385e4b35 files/mod_presence.diff 24484 -SHA256 dd03c73b4b900a160c85abe8df64d27934a5d79126566e6347c727517776a0ad files/mod_presence.diff 24484 -DIST check_pam.diff.gz 3865 RMD160 86d6ff263d216c63662ef1078f947f9f7a6c1fce SHA1 756d258a27d145c53b0bac7bb2a333102604127b SHA256 c474adefeefd6e2d18fff531dc4c2f3c149ba003dbd606655656a95ca72ee62a -DIST ejabberd-1.1.1.tar.gz 803278 RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 SHA1 4f23d787afe75c7c866decdff6f539195449776e SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082 +AUX mod_pep.patch 74047 RMD160 04ea7221b539038a3610a2d745667abbe4b39969 SHA1 4c072204fc46e928492336dcc587c725e14992b1 SHA256 8335979552f290078015347433b0eb1aaa7f59da8431874b4720cd99f7ef91cf +MD5 f6f334f668f70146c06dcdfcb55e0f40 files/mod_pep.patch 74047 +RMD160 04ea7221b539038a3610a2d745667abbe4b39969 files/mod_pep.patch 74047 +SHA256 8335979552f290078015347433b0eb1aaa7f59da8431874b4720cd99f7ef91cf files/mod_pep.patch 74047 +DIST ejabberd-1.1.1_httpbind.tar.gz 14496 RMD160 3dd17d39daf0ff58ed6572559dbc74faadc475cc SHA1 82d9c2b63b27d241fc08495347d979fbd000b66f SHA256 a5e48ce27b9691ef428f82959e6d487e6b293b60fbc415cc88a99bed476e720c DIST ejabberd-1.1.2.tar.gz 836240 RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d SHA1 9e94bdbc10fee5b781405daf43a0b4abc4dee6c1 SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 -DIST mod_presence-0.0.3.tar.gz 51392 RMD160 adb6444dcef2fead52c1510fc247f7af20aa62c7 SHA1 88afa3af72d61608a55f1605d58b6ffd1fc43cfa SHA256 5fc2a97576f33965d07bb1f803a8fe48647479da37cd58333aea6a7e48ebc4a1 -EBUILD ejabberd-1.1.1-r1.ebuild 3886 RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 SHA1 42051242370093ccff3ecd35fcfa4bda4140ddd3 SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53 -MD5 151e7780af1a89705e11cdae74358821 ejabberd-1.1.1-r1.ebuild 3886 -RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 ejabberd-1.1.1-r1.ebuild 3886 -SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53 ejabberd-1.1.1-r1.ebuild 3886 -EBUILD ejabberd-1.1.2-r1.ebuild 5726 RMD160 2426f1d8488a7c685efffc470cd3c67e485d3850 SHA1 3f981158b85b92f2ca825dee38f92fa50b4b8dd2 SHA256 c8d73f7922ac2c672024b86bb6bb63c7b5416ece901390b2341ed2f06f58c14c -MD5 1713684f7f7dbad5c06b18ffc7a06271 ejabberd-1.1.2-r1.ebuild 5726 -RMD160 2426f1d8488a7c685efffc470cd3c67e485d3850 ejabberd-1.1.2-r1.ebuild 5726 -SHA256 c8d73f7922ac2c672024b86bb6bb63c7b5416ece901390b2341ed2f06f58c14c ejabberd-1.1.2-r1.ebuild 5726 -EBUILD ejabberd-1.1.2.ebuild 3886 RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 SHA1 42051242370093ccff3ecd35fcfa4bda4140ddd3 SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53 -MD5 151e7780af1a89705e11cdae74358821 ejabberd-1.1.2.ebuild 3886 -RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 ejabberd-1.1.2.ebuild 3886 -SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53 ejabberd-1.1.2.ebuild 3886 -MD5 6bf0894f239498e7a5bdbaac771cdc75 files/digest-ejabberd-1.1.1-r1 723 -RMD160 d2d272d4488b3eec4fc58eeb9449396f29d783c0 files/digest-ejabberd-1.1.1-r1 723 -SHA256 f57333e151bec1d584876aade6dc4fec76e8deffdd240d7aa2d2ec947d6dbba8 files/digest-ejabberd-1.1.1-r1 723 -MD5 f10adb4f04e5543f5410c8a2e1081c96 files/digest-ejabberd-1.1.2 723 -RMD160 7eeb128a9c425adfe020101bef8a0278e1bd0211 files/digest-ejabberd-1.1.2 723 -SHA256 811fc4d85d4bcd926bdce37a5ecade163afb5b14663d747842375c8ffdc5100d files/digest-ejabberd-1.1.2 723 -MD5 f10adb4f04e5543f5410c8a2e1081c96 files/digest-ejabberd-1.1.2-r1 723 -RMD160 7eeb128a9c425adfe020101bef8a0278e1bd0211 files/digest-ejabberd-1.1.2-r1 723 -SHA256 811fc4d85d4bcd926bdce37a5ecade163afb5b14663d747842375c8ffdc5100d files/digest-ejabberd-1.1.2-r1 723 +DIST mod_presence-0.0.4.tar.gz 51874 RMD160 f9a724b4c6d58fc83c09f71eacb18b6b0ba77ea9 SHA1 c9a7f05939798bdaf61f9ca8da5c0ac80258afbd SHA256 0f3983a61ac779ddbadde94961db0ce724bff2fb23483654d1be0221a13c5a11 +EBUILD ejabberd-1.1.2-r1.ebuild 6047 RMD160 67cac92974a0abad21d0742691541d4e04763ba8 SHA1 c3f5dbd14928e4f3bae8743af7c0ca0a5466fae5 SHA256 8b3a13991e2a1b2a3e9d262acfa663f6e7c054596801e96359121a0e25b15f55 +MD5 97b595d6ef284930fda4e83563e6ef3f ejabberd-1.1.2-r1.ebuild 6047 +RMD160 67cac92974a0abad21d0742691541d4e04763ba8 ejabberd-1.1.2-r1.ebuild 6047 +SHA256 8b3a13991e2a1b2a3e9d262acfa663f6e7c054596801e96359121a0e25b15f55 ejabberd-1.1.2-r1.ebuild 6047 +EBUILD ejabberd-1.1.2-r2.ebuild 6109 RMD160 667e6cbaec3903d773d70d09833bd849b4b848a2 SHA1 57f23c26bf40b172e0f30ba09ba851d77c13d269 SHA256 f6844047ac3615d97658c27f8e6f30fff6efc71fd984b8533564c5620610d0b5 +MD5 acf6e6019067a4867e029a874c36b806 ejabberd-1.1.2-r2.ebuild 6109 +RMD160 667e6cbaec3903d773d70d09833bd849b4b848a2 ejabberd-1.1.2-r2.ebuild 6109 +SHA256 f6844047ac3615d97658c27f8e6f30fff6efc71fd984b8533564c5620610d0b5 ejabberd-1.1.2-r2.ebuild 6109 +MD5 30a6b40979271475494b8103ac79c2b4 files/digest-ejabberd-1.1.2-r1 497 +RMD160 93a5b27c67cf098e343f1e877df1bdb5b4fe05ff files/digest-ejabberd-1.1.2-r1 497 +SHA256 e90edb5f4836aa10b0e5490f1d9ed4d690c9dbd841ad566e03797f61f41f9024 files/digest-ejabberd-1.1.2-r1 497 +MD5 28991a43f2edef2f12f58b614f87d1a3 files/digest-ejabberd-1.1.2-r2 765 +RMD160 ab10e70d0a76179cfa03d7358b790ca12caa1484 files/digest-ejabberd-1.1.2-r2 765 +SHA256 3fb5d04a5f49ed371b8f835c393ea62c566c669d9ad1557073dbc3a04d11cc82 files/digest-ejabberd-1.1.2-r2 765 diff --git a/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild deleted file mode 100644 index 586f4fce..00000000 --- a/net-im/ejabberd/ejabberd-1.1.1-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1.ebuild,v 1.2 2006/08/01 04:26:09 tsunam Exp $ - -inherit eutils multilib ssl-cert versionator autotools - -JABBER_ETC="/etc/jabber" -JABBER_RUN="/var/run/jabber" -JABBER_SPOOL="/var/spool/jabber" -JABBER_LOG="/var/log/jabber" - -DESCRIPTION="The Erlang Jabber Daemon" -HOMEPAGE="http://ejabberd.jabber.ru/" -SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz - pam? ( http://beber.meleeweb.net/jabber/check_pam.diff.gz ) - mod_presence? ( http://www.goryachev.org/jabber/mod_presence-0.0.3.tar.gz )" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~amd64" -IUSE="mod_archive mod_irc mod_muc mod_pubsub mod_presence ldap odbc pam web" - -DEPEND=">=net-im/jabber-base-0.01 - >=dev-libs/expat-1.95 - >=dev-lang/erlang-10.2.0 - odbc? ( dev-db/unixODBC ) - ldap? ( =net-nds/openldap-2* ) - pam? ( sys-libs/pam)" -RESTRICT="nomirror" - -PROVIDE="virtual/jabber-server" -S=${WORKDIR}/${P}/src - -src_unpack() { - unpack ${A} - cd ${S} - - if use mod_presence; then - epatch ${WORKDIR}/mod_presence/mod_presence.diff - cp -r ${WORKDIR}/mod_presence/pixmaps . - fi - - if use pam; then - patch -p0 < ${WORKDIR}/check_pam.diff - fi - - if use mod_archive; then - cp ${FILESDIR}/mod_archive.erl . - fi -} - -src_compile() { - eautoconf - econf ${myconf} \ - $(use_enable mod_irc) \ - $(use_enable ldap eldap) \ - $(use_enable mod_muc) \ - $(use_enable mod_pubsub) \ - $(use_enable ssl tls) \ - $(use_enable web) \ - $(use_enable odbc) \ - $(use_enable mod_presence) \ - || die "econf failed" - - emake || die "compiling ejabberd core failed" -} - -src_install() { - make \ - DESTDIR=${D} \ - EJABBERDDIR=${D}/usr/$(get_libdir)/erlang/lib/${P} \ - ETCDIR=${D}${JABBER_ETC} \ - LOGDIR=${D}${JABBER_LOG} \ - install \ - || die "install failed" - - insinto /usr/share/doc/${PF} - cd ${S}/.. - dodoc doc/release_notes_${PV}.txt - dohtml doc/*.{html,png} - - # - # Create /usr/bin/ejabberd - # - cat <<EOF > ${T}/ejabberd -#!/bin/bash - -erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ - ${pa} \\ - -sname ejabberd \\ - -s ejabberd \\ - -ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\ - log_path \"${JABBER_LOG}/ejabberd.log\" \\ - -kernel inetrc \"${JABBER_ETC}/inetrc\" \\ - -sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\ - -mnesia dir \"${JABBER_SPOOL}\" \\ - \$@ -EOF - - # - # Create /usr/bin/ejabberdctl - # - cat <<EOF > ${T}/ejabberdctl -#!/bin/sh - -exec env HOME=${JABBER_RUN} \\ - erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ - ${pa} \\ - -noinput \\ - -sname ejabberdctl \\ - -s ejabberd_ctl \\ - -extra \$@ -EOF - - dobin ${T}/ejabberdctl - dobin ${T}/ejabberd - - newinitd ${FILESDIR}/${P}.initd ${PN} - newconfd ${FILESDIR}/${P}.confd ${PN} - - insinto ${JABBER_ETC} - if use ssl; then - docert ssl - rm -f ${D}${JABBER_ETC}/ssl.{crt,csr,key} - fowners jabber:jabber ${JABBER_ETC}/ssl.pem - fi - doins ${FILESDIR}/inetrc -} - -pkg_postinst() { - if [ ! -e ${JABBER_ETC}/ejabberd.cfg ] - then - einfo "Configuration file has been installed in ${JABBER_ETC}/ejabberd.cfg." - einfo "Edit it according to your needs. For configuration instructions," - einfo "please see /usr/share/doc/${PF}/html/guide.html" - fi - if use ssl ; then - einfo "A script to generate a ssl key has been installed in" - einfo "${JABBER_ETC}/self-cert.sh . Use it and change the config file to" - einfo "point to the full path" - fi - if ! use web ; then - einfo "The web USE flag is off, this will disable the web admin interface," - einfo "if this was not the intention then add web to your USE flags." - fi -} diff --git a/net-im/ejabberd/ejabberd-1.1.2-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.2-r1.ebuild index 25cb81b6..2ba43ad6 100644 --- a/net-im/ejabberd/ejabberd-1.1.2-r1.ebuild +++ b/net-im/ejabberd/ejabberd-1.1.2-r1.ebuild @@ -20,12 +20,11 @@ E_PGSQL=${E_PGSQL_N}-${E_PGSQL_V} DESCRIPTION="The Erlang Jabber Daemon" HOMEPAGE="http://ejabberd.jabber.ru/" SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz - pam? ( http://beber.meleeweb.net/jabber/check_pam.diff.gz ) - mod_presence? ( http://www.goryachev.org/jabber/mod_presence-0.0.3.tar.gz )" + mod_presence? ( http://www.goryachev.org/jabber/mod_presence-0.0.4.tar.gz )" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ~amd64" -IUSE="${IUSE} mod_archive mod_irc mod_muc mod_pubsub mod_presence mod_proxy statsdx ldap odbc pam web mysql postgres" +IUSE="${IUSE} mod_archive mod_irc mod_muc mod_pep mod_pubsub mod_presence mod_proxy statsdx ldap odbc pam web mysql postgres http_binding" DEPEND="${RDEPEND} >=net-im/jabber-base-0.01 @@ -72,22 +71,15 @@ src_unpack() { epatch ${FILESDIR}/${P}-statsdx-web.patch fi - if use mod_proxy; then - epatch ${FILESDIR}/${P}-mod-proxy.patch - fi + use pam && epatch ${FILESDIR}/check_pam.diff # http://ejabberd.jabber.ru/pam + use mod_proxy && epatch ${FILESDIR}/${P}-mod-proxy.patch # http://bugs.gentoo.org/show_bug.cgi?id=137724 + use mod_pep && epatch ${FILESDIR}/mod_pep.patch # http://www.dtek.chalmers.se/~henoch/text/ejabberd-pep.html + use http_binding && epatch ${FILESDIR}/http_binding.patch # http://www.jabber.ru/bugzilla/show_bug.cgi?id=91 | http://ejabberd.jabber.ru/mod_proxy65 + use mod_archive && cp ${FILESDIR}/mod_archive.erl ${S} # http://ejabberd.jabber.ru/mod_archive if use mod_presence; then - cp -r ${WORKDIR}/mod_presence/pixmaps . - cd ../.. - epatch ${FILESDIR}/mod_presence.diff - fi - - if use pam; then - patch -p0 < ${WORKDIR}/check_pam.diff - fi - - if use mod_archive; then - cp ${FILESDIR}/mod_archive.erl . + cp -r ${WORKDIR}/mod_presence/pixmaps ${S} + epatch ${WORKDIR}/mod_presence/mod_presence.diff fi } diff --git a/net-im/ejabberd/ejabberd-1.1.2.ebuild b/net-im/ejabberd/ejabberd-1.1.2.ebuild deleted file mode 100644 index 586f4fce..00000000 --- a/net-im/ejabberd/ejabberd-1.1.2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1.ebuild,v 1.2 2006/08/01 04:26:09 tsunam Exp $ - -inherit eutils multilib ssl-cert versionator autotools - -JABBER_ETC="/etc/jabber" -JABBER_RUN="/var/run/jabber" -JABBER_SPOOL="/var/spool/jabber" -JABBER_LOG="/var/log/jabber" - -DESCRIPTION="The Erlang Jabber Daemon" -HOMEPAGE="http://ejabberd.jabber.ru/" -SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz - pam? ( http://beber.meleeweb.net/jabber/check_pam.diff.gz ) - mod_presence? ( http://www.goryachev.org/jabber/mod_presence-0.0.3.tar.gz )" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86 ~amd64" -IUSE="mod_archive mod_irc mod_muc mod_pubsub mod_presence ldap odbc pam web" - -DEPEND=">=net-im/jabber-base-0.01 - >=dev-libs/expat-1.95 - >=dev-lang/erlang-10.2.0 - odbc? ( dev-db/unixODBC ) - ldap? ( =net-nds/openldap-2* ) - pam? ( sys-libs/pam)" -RESTRICT="nomirror" - -PROVIDE="virtual/jabber-server" -S=${WORKDIR}/${P}/src - -src_unpack() { - unpack ${A} - cd ${S} - - if use mod_presence; then - epatch ${WORKDIR}/mod_presence/mod_presence.diff - cp -r ${WORKDIR}/mod_presence/pixmaps . - fi - - if use pam; then - patch -p0 < ${WORKDIR}/check_pam.diff - fi - - if use mod_archive; then - cp ${FILESDIR}/mod_archive.erl . - fi -} - -src_compile() { - eautoconf - econf ${myconf} \ - $(use_enable mod_irc) \ - $(use_enable ldap eldap) \ - $(use_enable mod_muc) \ - $(use_enable mod_pubsub) \ - $(use_enable ssl tls) \ - $(use_enable web) \ - $(use_enable odbc) \ - $(use_enable mod_presence) \ - || die "econf failed" - - emake || die "compiling ejabberd core failed" -} - -src_install() { - make \ - DESTDIR=${D} \ - EJABBERDDIR=${D}/usr/$(get_libdir)/erlang/lib/${P} \ - ETCDIR=${D}${JABBER_ETC} \ - LOGDIR=${D}${JABBER_LOG} \ - install \ - || die "install failed" - - insinto /usr/share/doc/${PF} - cd ${S}/.. - dodoc doc/release_notes_${PV}.txt - dohtml doc/*.{html,png} - - # - # Create /usr/bin/ejabberd - # - cat <<EOF > ${T}/ejabberd -#!/bin/bash - -erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ - ${pa} \\ - -sname ejabberd \\ - -s ejabberd \\ - -ejabberd config \"${JABBER_ETC}/ejabberd.cfg\" \\ - log_path \"${JABBER_LOG}/ejabberd.log\" \\ - -kernel inetrc \"${JABBER_ETC}/inetrc\" \\ - -sasl sasl_error_logger \{file,\"${JABBER_LOG}/sasl.log\"\} \\ - -mnesia dir \"${JABBER_SPOOL}\" \\ - \$@ -EOF - - # - # Create /usr/bin/ejabberdctl - # - cat <<EOF > ${T}/ejabberdctl -#!/bin/sh - -exec env HOME=${JABBER_RUN} \\ - erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ - ${pa} \\ - -noinput \\ - -sname ejabberdctl \\ - -s ejabberd_ctl \\ - -extra \$@ -EOF - - dobin ${T}/ejabberdctl - dobin ${T}/ejabberd - - newinitd ${FILESDIR}/${P}.initd ${PN} - newconfd ${FILESDIR}/${P}.confd ${PN} - - insinto ${JABBER_ETC} - if use ssl; then - docert ssl - rm -f ${D}${JABBER_ETC}/ssl.{crt,csr,key} - fowners jabber:jabber ${JABBER_ETC}/ssl.pem - fi - doins ${FILESDIR}/inetrc -} - -pkg_postinst() { - if [ ! -e ${JABBER_ETC}/ejabberd.cfg ] - then - einfo "Configuration file has been installed in ${JABBER_ETC}/ejabberd.cfg." - einfo "Edit it according to your needs. For configuration instructions," - einfo "please see /usr/share/doc/${PF}/html/guide.html" - fi - if use ssl ; then - einfo "A script to generate a ssl key has been installed in" - einfo "${JABBER_ETC}/self-cert.sh . Use it and change the config file to" - einfo "point to the full path" - fi - if ! use web ; then - einfo "The web USE flag is off, this will disable the web admin interface," - einfo "if this was not the intention then add web to your USE flags." - fi -} diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.1-r1 b/net-im/ejabberd/files/digest-ejabberd-1.1.1-r1 deleted file mode 100644 index b4b47cb1..00000000 --- a/net-im/ejabberd/files/digest-ejabberd-1.1.1-r1 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 6b78cb824b35a7f651ab33790cf841c7 check_pam.diff.gz 3865 -RMD160 86d6ff263d216c63662ef1078f947f9f7a6c1fce check_pam.diff.gz 3865 -SHA256 c474adefeefd6e2d18fff531dc4c2f3c149ba003dbd606655656a95ca72ee62a check_pam.diff.gz 3865 -MD5 ef6fae4a3f9c7f807f21e9cd3dae195b ejabberd-1.1.1.tar.gz 803278 -RMD160 b9c0b7ab3fe1f1b2dce52e1460bba04b313ea534 ejabberd-1.1.1.tar.gz 803278 -SHA256 52a97275537073066bd352f5718954f6994b272d1efa51187e17edf0c9b11082 ejabberd-1.1.1.tar.gz 803278 -MD5 fa9a979f5e3530a2b3143416934d989b mod_presence-0.0.3.tar.gz 51392 -RMD160 adb6444dcef2fead52c1510fc247f7af20aa62c7 mod_presence-0.0.3.tar.gz 51392 -SHA256 5fc2a97576f33965d07bb1f803a8fe48647479da37cd58333aea6a7e48ebc4a1 mod_presence-0.0.3.tar.gz 51392 diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.2 b/net-im/ejabberd/files/digest-ejabberd-1.1.2 deleted file mode 100644 index 2e59e9e3..00000000 --- a/net-im/ejabberd/files/digest-ejabberd-1.1.2 +++ /dev/null @@ -1,9 +0,0 @@ -MD5 6b78cb824b35a7f651ab33790cf841c7 check_pam.diff.gz 3865 -RMD160 86d6ff263d216c63662ef1078f947f9f7a6c1fce check_pam.diff.gz 3865 -SHA256 c474adefeefd6e2d18fff531dc4c2f3c149ba003dbd606655656a95ca72ee62a check_pam.diff.gz 3865 -MD5 5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz 836240 -RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d ejabberd-1.1.2.tar.gz 836240 -SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 ejabberd-1.1.2.tar.gz 836240 -MD5 fa9a979f5e3530a2b3143416934d989b mod_presence-0.0.3.tar.gz 51392 -RMD160 adb6444dcef2fead52c1510fc247f7af20aa62c7 mod_presence-0.0.3.tar.gz 51392 -SHA256 5fc2a97576f33965d07bb1f803a8fe48647479da37cd58333aea6a7e48ebc4a1 mod_presence-0.0.3.tar.gz 51392 diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.2-r1 b/net-im/ejabberd/files/digest-ejabberd-1.1.2-r1 index 2e59e9e3..1810b759 100644 --- a/net-im/ejabberd/files/digest-ejabberd-1.1.2-r1 +++ b/net-im/ejabberd/files/digest-ejabberd-1.1.2-r1 @@ -1,9 +1,6 @@ -MD5 6b78cb824b35a7f651ab33790cf841c7 check_pam.diff.gz 3865 -RMD160 86d6ff263d216c63662ef1078f947f9f7a6c1fce check_pam.diff.gz 3865 -SHA256 c474adefeefd6e2d18fff531dc4c2f3c149ba003dbd606655656a95ca72ee62a check_pam.diff.gz 3865 MD5 5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz 836240 RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d ejabberd-1.1.2.tar.gz 836240 SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 ejabberd-1.1.2.tar.gz 836240 -MD5 fa9a979f5e3530a2b3143416934d989b mod_presence-0.0.3.tar.gz 51392 -RMD160 adb6444dcef2fead52c1510fc247f7af20aa62c7 mod_presence-0.0.3.tar.gz 51392 -SHA256 5fc2a97576f33965d07bb1f803a8fe48647479da37cd58333aea6a7e48ebc4a1 mod_presence-0.0.3.tar.gz 51392 +MD5 5b0a9fd6fb1c595f6812cb33be8d2cd5 mod_presence-0.0.4.tar.gz 51874 +RMD160 f9a724b4c6d58fc83c09f71eacb18b6b0ba77ea9 mod_presence-0.0.4.tar.gz 51874 +SHA256 0f3983a61ac779ddbadde94961db0ce724bff2fb23483654d1be0221a13c5a11 mod_presence-0.0.4.tar.gz 51874 diff --git a/net-im/ejabberd/files/mod_presence.diff b/net-im/ejabberd/files/mod_presence.diff deleted file mode 100644 index 159cbbb5..00000000 --- a/net-im/ejabberd/files/mod_presence.diff +++ /dev/null @@ -1,633 +0,0 @@ -diff -ruN ejabberd-1.1.2.orig/src/Makefile.in ejabberd-1.1.2/src/Makefile.in ---- ejabberd-1.1.2.orig/src/Makefile.in 2006-04-01 20:06:36.000000000 +0400 -+++ ejabberd-1.1.2/src/Makefile.in 2006-09-25 19:14:28.000000000 +0400 -@@ -39,6 +39,7 @@ - PRIVDIR = $(EJABBERDDIR)/priv - SODIR = $(PRIVDIR)/lib - MSGSDIR = $(PRIVDIR)/msgs -+PIXMAPSDIR = $(PRIVDIR)/pixmaps - LOGDIR = $(DESTDIR)@prefix@/var/log/ejabberd - ETCDIR = $(DESTDIR)@prefix@/etc/ejabberd - -@@ -81,6 +82,8 @@ - install -m 644 *.so $(SODIR) - install -d $(MSGSDIR) - install -m 644 msgs/*.msg $(MSGSDIR) -+ install -d $(PIXMAPSDIR) -+ cp -r pixmaps/* $(PIXMAPSDIR) - install -d $(ETCDIR) - install -b -m 644 ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg - install -d $(LOGDIR) -diff -ruN ejabberd-1.1.2.orig/src/mod_presence.erl ejabberd-1.1.2/src/mod_presence.erl ---- ejabberd-1.1.2.orig/src/mod_presence.erl 1970-01-01 03:00:00.000000000 +0300 -+++ ejabberd-1.1.2/src/mod_presence.erl 2006-09-25 19:45:31.000000000 +0400 -@@ -0,0 +1,572 @@ -+%%%---------------------------------------------------------------------- -+%%% File : mod_presence.erl -+%%% Author : Igor Goryachev <igor@goryachev.org> -+%%% Purpose : Module for showing presences via web -+%%% Created : 30 Apr 2006 by Igor Goryachev <igor@goryachev.org> -+%%% Id : $Id$ -+%%%---------------------------------------------------------------------- -+ -+-module(mod_presence). -+-author('igor@goryachev.org'). -+-vsn('$Revision$'). -+ -+-behaviour(gen_server). -+-behaviour(gen_mod). -+ -+%% API -+-export([start_link/2, -+ start/2, -+ stop/1, -+ get_info/2, -+ show_presence/1]). -+ -+%% gen_server callbacks -+-export([init/1, handle_call/3, handle_cast/2, handle_info/2, -+ terminate/2, code_change/3]). -+ -+-include("ejabberd.hrl"). -+-include("jlib.hrl"). -+ -+-record(presence_registered, {us_host, xml, icon}). -+-record(state, {host, server_host, access}). -+-record(session, {sid, usr, us, priority}). -+-record(presence, {resource, status, priority, text}). -+ -+-define(PROCNAME, ejabberd_mod_presence). -+-define(SERVICE_NAME(Host), "presence." ++ Host). -+ -+-define(PIXMAPS_DIR, "pixmaps"). -+ -+ -+%%==================================================================== -+%% API -+%%==================================================================== -+%%-------------------------------------------------------------------- -+%% Function: start_link() -> {ok,Pid} | ignore | {error,Error} -+%% Description: Starts the server -+%%-------------------------------------------------------------------- -+start_link(Host, Opts) -> -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ gen_server:start_link({local, Proc}, ?MODULE, [Host, Opts], []). -+ -+start(Host, Opts) -> -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ ChildSpec = -+ {Proc, -+ {?MODULE, start_link, [Host, Opts]}, -+ temporary, -+ 1000, -+ worker, -+ [?MODULE]}, -+ Dir = -+ case os:getenv("EJABBERD_PIXMAPS_PATH") of -+ false -> -+ case code:priv_dir(ejabberd) of -+ {error, _} -> -+ ?PIXMAPS_DIR; -+ Path -> -+ filename:join([Path, ?PIXMAPS_DIR]) -+ end; -+ Path -> -+ Path -+ end, -+ ets:new(pixmaps_dirs, [named_table, public]), -+ ets:insert(pixmaps_dirs, {directory, Dir}), -+ supervisor:start_child(ejabberd_sup, ChildSpec). -+ -+stop(Host) -> -+ Proc = gen_mod:get_module_proc(Host, ?PROCNAME), -+ gen_server:call(Proc, stop), -+ supervisor:stop_child(ejabberd_sup, Proc). -+ -+%%==================================================================== -+%% gen_server callbacks -+%%==================================================================== -+ -+%%-------------------------------------------------------------------- -+%% Function: init(Args) -> {ok, State} | -+%% {ok, State, Timeout} | -+%% ignore | -+%% {stop, Reason} -+%% Description: Initiates the server -+%%-------------------------------------------------------------------- -+init([Host, Opts]) -> -+ mnesia:create_table(presence_registered, -+ [{disc_copies, [node()]}, -+ {attributes, record_info(fields, presence_registered)}]), -+ MyHost = gen_mod:get_opt(host, Opts, ?SERVICE_NAME(Host)), -+ mnesia:add_table_index(presence_registered, xml), -+ mnesia:add_table_index(presence_registered, icon), -+ Access = gen_mod:get_opt(access, Opts, all), -+ AccessCreate = gen_mod:get_opt(access_create, Opts, all), -+ AccessAdmin = gen_mod:get_opt(access_admin, Opts, none), -+ ejabberd_router:register_route(MyHost), -+ {ok, #state{host = MyHost, -+ server_host = Host, -+ access = {Access, AccessCreate, AccessAdmin}}}. -+ -+%%-------------------------------------------------------------------- -+%% Function: %% handle_call(Request, From, State) -> {reply, Reply, State} | -+%% {reply, Reply, State, Timeout} | -+%% {noreply, State} | -+%% {noreply, State, Timeout} | -+%% {stop, Reason, Reply, State} | -+%% {stop, Reason, State} -+%% Description: Handling call messages -+%%-------------------------------------------------------------------- -+handle_call(stop, _From, State) -> -+ {stop, normal, ok, State}. -+ -+%%-------------------------------------------------------------------- -+%% Function: handle_cast(Msg, State) -> {noreply, State} | -+%% {noreply, State, Timeout} | -+%% {stop, Reason, State} -+%% Description: Handling cast messages -+%%-------------------------------------------------------------------- -+handle_cast(_Msg, State) -> -+ {noreply, State}. -+ -+%%-------------------------------------------------------------------- -+%% Function: handle_info(Info, State) -> {noreply, State} | -+%% {noreply, State, Timeout} | -+%% {stop, Reason, State} -+%% Description: Handling all non call/cast messages -+%%-------------------------------------------------------------------- -+handle_info({route, From, To, Packet}, -+ #state{host = Host, -+ server_host = ServerHost, -+ access = Access} = State) -> -+ case catch do_route(Host, ServerHost, Access, From, To, Packet) of -+ {'EXIT', Reason} -> -+ ?ERROR_MSG("~p", [Reason]); -+ _ -> -+ ok -+ end, -+ {noreply, State}; -+handle_info(_Info, State) -> -+ {noreply, State}. -+ -+%%-------------------------------------------------------------------- -+%% Function: terminate(Reason, State) -> void() -+%% Description: This function is called by a gen_server when it is about to -+%% terminate. It should be the opposite of Module:init/1 and do any necessary -+%% cleaning up. When it returns, the gen_server terminates with Reason. -+%% The return value is ignored. -+%%-------------------------------------------------------------------- -+terminate(_Reason, State) -> -+ ejabberd_router:unregister_route(State#state.host), -+ ok. -+ -+%%-------------------------------------------------------------------- -+%% Func: code_change(OldVsn, State, Extra) -> {ok, NewState} -+%% Description: Convert process state when code is changed -+%%-------------------------------------------------------------------- -+code_change(_OldVsn, State, _Extra) -> -+ {ok, State}. -+ -+%%-------------------------------------------------------------------- -+%%% Internal functions -+%%-------------------------------------------------------------------- -+ -+do_route(Host, ServerHost, Access, From, To, Packet) -> -+ {AccessRoute, _AccessCreate, _AccessAdmin} = Access, -+ case acl:match_rule(ServerHost, AccessRoute, From) of -+ allow -> -+ do_route1(Host, ServerHost, Access, From, To, Packet); -+ _ -> -+ {xmlelement, _Name, Attrs, _Els} = Packet, -+ Lang = xml:get_attr_s("xml:lang", Attrs), -+ ErrText = "Access denied by service policy", -+ Err = jlib:make_error_reply(Packet, -+ ?ERRT_FORBIDDEN(Lang, ErrText)), -+ ejabberd_router:route(To, From, Err) -+ end. -+ -+do_route1(Host, ServerHost, Access, From, To, Packet) -> -+ {_AccessRoute, AccessCreate, AccessAdmin} = Access, -+ {xmlelement, Name, Attrs, _Els} = Packet, -+ case Name of -+ "iq" -> -+ case jlib:iq_query_info(Packet) of -+ #iq{type = get, xmlns = ?NS_DISCO_INFO = XMLNS, -+ sub_el = _SubEl} = IQ -> -+ Res = IQ#iq{type = result, -+ sub_el = [{xmlelement, "query", -+ [{"xmlns", XMLNS}], -+ iq_disco_info()}]}, -+ ejabberd_router:route(To, -+ From, -+ jlib:iq_to_xml(Res)); -+ #iq{type = get, -+ xmlns = ?NS_DISCO_ITEMS} = IQ -> -+ ok; -+ #iq{type = get, -+ xmlns = ?NS_REGISTER = XMLNS, -+ lang = Lang, -+ sub_el = _SubEl} = IQ -> -+ Res = IQ#iq{type = result, -+ sub_el = -+ [{xmlelement, "query", -+ [{"xmlns", XMLNS}], -+ iq_get_register_info( -+ Host, From, Lang)}]}, -+ ejabberd_router:route(To, -+ From, -+ jlib:iq_to_xml(Res)); -+ #iq{type = set, -+ xmlns = ?NS_REGISTER = XMLNS, -+ lang = Lang, -+ sub_el = SubEl} = IQ -> -+ case process_iq_register_set(Host, From, SubEl, Lang) of -+ {result, IQRes} -> -+ Res = IQ#iq{type = result, -+ sub_el = -+ [{xmlelement, "query", -+ [{"xmlns", XMLNS}], -+ IQRes}]}, -+ ejabberd_router:route( -+ To, From, jlib:iq_to_xml(Res)); -+ {error, Error} -> -+ Err = jlib:make_error_reply( -+ Packet, Error), -+ ejabberd_router:route( -+ To, From, Err) -+ end; -+ #iq{type = get, -+ xmlns = ?NS_VCARD = XMLNS, -+ lang = Lang, -+ sub_el = _SubEl} = IQ -> -+ Res = IQ#iq{type = result, -+ sub_el = -+ [{xmlelement, "vCard", -+ [{"xmlns", XMLNS}], -+ iq_get_vcard(Lang)}]}, -+ ejabberd_router:route(To, -+ From, -+ jlib:iq_to_xml(Res)); -+ #iq{} -> -+ Err = jlib:make_error_reply( -+ Packet, -+ ?ERR_FEATURE_NOT_IMPLEMENTED), -+ ejabberd_router:route(To, From, Err); -+ _ -> -+ ok -+ end; -+ _ -> -+ case xml:get_attr_s("type", Attrs) of -+ "error" -> -+ ok; -+ "result" -> -+ ok; -+ _ -> -+ Err = jlib:make_error_reply( -+ Packet, ?ERR_ITEM_NOT_FOUND), -+ ejabberd_router:route(To, From, Err) -+ end -+ end. -+ -+iq_disco_info() -> -+ [{xmlelement, "identity", -+ [{"category", "presence"}, -+ {"type", "text"}, -+ {"name", "ejabberd/mod_presence"}], []}, -+ {xmlelement, "feature", [{"var", ?NS_REGISTER}], []}, -+ {xmlelement, "feature", [{"var", ?NS_VCARD}], []}]. -+ -+-define(XFIELD(Type, Label, Var, Val), -+ {xmlelement, "field", [{"type", Type}, -+ {"label", translate:translate(Lang, Label)}, -+ {"var", Var}], -+ [{xmlelement, "value", [], [{xmlcdata, Val}]}]}). -+ -+iq_get_register_info(Host, From, Lang) -> -+ {LUser, LServer, _} = jlib:jid_tolower(From), -+ LUS = {LUser, LServer}, -+ {XML, Icon, Registered} = -+ case catch mnesia:dirty_read(presence_registered, {LUS, Host}) of -+ {'EXIT', _Reason} -> -+ {"false", "disabled", []}; -+ [] -> -+ {"false", "disabled", []}; -+ [#presence_registered{xml = X, icon = I}] -> -+ {X, I, [{xmlelement, "registered", [], []}]} -+ end, -+ Registered ++ -+ [{xmlelement, "instructions", [], -+ [{xmlcdata, -+ translate:translate( -+ Lang, "You need an x:data capable client to register presence")}]}, -+ {xmlelement, "x", -+ [{"xmlns", ?NS_XDATA}], -+ [{xmlelement, "title", [], -+ [{xmlcdata, -+ translate:translate( -+ Lang, "Presence registration at ") ++ Host}]}, -+ {xmlelement, "instructions", [], -+ [{xmlcdata, -+ translate:translate( -+ Lang, "What presence features do you want to register?")}]}, -+ {xmlelement, "field", [{"type", "list-single"}, -+ {"label", "Icon theme"}, -+ {"var", "icon"}], -+ [{xmlelement, "value", [], [{xmlcdata, Icon}]}, -+ {xmlelement, "option", [{"label", "disabled"}], -+ [{xmlelement, "value", [], [{xmlcdata, "disabled"}]}]} -+ ] ++ available_themes(xdata)}, -+ ?XFIELD("boolean", "Raw XML", "xml", XML)]}]. -+ -+iq_set_register_info(Host, From, XML, Icon, Lang) -> -+ {LUser, LServer, _} = jlib:jid_tolower(From), -+ LUS = {LUser, LServer}, -+ F = fun() -> -+ case XML of -+ "" -> -+ mnesia:delete({presence_registered, {LUS, Host}}), -+ ok; -+ _ -> -+ Allow = -+ case mnesia:select( -+ presence_registered, -+ [{#presence_registered{us_host = '$1', -+ xml = XML, -+ icon = Icon, -+ _ = '_'}, -+ [{'==', {element, 2, '$1'}, Host}], -+ ['$_']}]) of -+ [] -> -+ true; -+ [#presence_registered{us_host = {U, _Host}}] -> -+ U == LUS -+ end, -+ if -+ Allow -> -+ mnesia:write( -+ #presence_registered{us_host = {LUS, Host}, -+ xml = XML, -+ icon = Icon}), -+ ok; -+ true -> -+ false -+ end -+ end -+ end, -+ case mnesia:transaction(F) of -+ {atomic, ok} -> -+ {result, []}; -+ {atomic, false} -> -+ ErrText = "Specified presence is already registered", -+ {error, ?ERRT_CONFLICT(Lang, ErrText)}; -+ _ -> -+ {error, ?ERR_INTERNAL_SERVER_ERROR} -+ end. -+ -+process_iq_register_set(Host, From, SubEl, Lang) -> -+ {xmlelement, _Name, _Attrs, Els} = SubEl, -+ case xml:get_subtag(SubEl, "remove") of -+ false -> -+ case xml:remove_cdata(Els) of -+ [{xmlelement, "x", _Attrs1, _Els1} = XEl] -> -+ case {xml:get_tag_attr_s("xmlns", XEl), -+ xml:get_tag_attr_s("type", XEl)} of -+ {?NS_XDATA, "cancel"} -> -+ {result, []}; -+ {?NS_XDATA, "submit"} -> -+ XData = jlib:parse_xdata_submit(XEl), -+ case XData of -+ invalid -> -+ {error, ?ERR_BAD_REQUEST}; -+ _ -> -+ case lists:keysearch("xml", 1, XData) of -+ false -> -+ ErrText = "You must fill in field \"Xml\" in the form", -+ {error, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)}; -+ {value, {_, [XML]}} -> -+ case lists:keysearch("icon", 1, XData) of -+ false -> -+ ErrText = "You must fill in field \"Icon\" in the form", -+ {error, ?ERRT_NOT_ACCEPTABLE(Lang, ErrText)}; -+ {value, {_, [Icon]}} -> -+ iq_set_register_info(Host, From, XML, Icon, Lang) -+ end -+ end -+ end; -+ _ -> -+ {error, ?ERR_BAD_REQUEST} -+ end; -+ _ -> -+ {error, ?ERR_BAD_REQUEST} -+ end; -+ _ -> -+ iq_set_register_info(Host, From, "false", "disabled", Lang) -+ end. -+ -+iq_get_vcard(Lang) -> -+ [{xmlelement, "FN", [], -+ [{xmlcdata, "ejabberd/mod_presence"}]}, -+ {xmlelement, "URL", [], -+ [{xmlcdata, -+ "http://ejabberd.jabberstudio.org/"}]}, -+ {xmlelement, "DESC", [], -+ [{xmlcdata, translate:translate(Lang, "ejabberd presence module\n" -+ "Copyright (c) 2006 Igor Goryachev")}]}]. -+ -+get_info(LUser, LServer) -> -+ LUS = {LUser, LServer}, -+ case catch mnesia:dirty_read(presence_registered, {LUS, ?SERVICE_NAME(LServer)}) of -+ {'EXIT', _Reason} -> -+ {false, disabled}; -+ [] -> -+ {false, disabled}; -+ [#presence_registered{xml = X, icon = I}] -> -+ X1 = case X of -+ "0" -> false; -+ "1" -> true; -+ _ -> list_to_atom(X) -+ end, -+ {X1, list_to_atom(I)} -+ end. -+ -+get_status_weight(Status) -> -+ case Status of -+ "chat" -> 0; -+ "available" -> 1; -+ "away" -> 2; -+ "xa" -> 3; -+ "dnd" -> 4; -+ _ -> 9 -+ end. -+ -+ -+get_presences({bare, LUser, LServer}) -> -+ Resources = ejabberd_sm:get_user_resources(LUser, LServer), -+ lists:map( -+ fun(Resource) -> -+ [Session] = mnesia:dirty_index_read(session, -+ {LUser, LServer, Resource}, -+ #session.usr), -+ Pid = element(2, Session#session.sid), -+ {_User, _Resource, Status, Text} = -+ rpc:call(node(Pid), ejabberd_c2s, get_presence, [Pid]), -+ Priority = Session#session.priority, -+ #presence{resource = Resource, -+ status = Status, -+ priority = Priority, -+ text = Text} -+ end, -+ Resources); -+get_presences({sorted, LUser, LServer}) -> -+ lists:sort( -+ fun(A, B) -> -+ if -+ A#presence.priority == B#presence.priority -> -+ WA = get_status_weight(A#presence.status), -+ WB = get_status_weight(B#presence.status), -+ WA < WB; -+ true -> -+ A#presence.priority > B#presence.priority -+ end -+ end, -+ get_presences({bare, LUser, LServer})); -+get_presences({xml, LUser, LServer}) -> -+ {xmlelement, "presence", -+ [{"user", LUser}, {"server", LServer}], -+ lists:map( -+ fun(Presence) -> -+ {xmlelement, "resource", -+ [{"name", Presence#presence.resource}, -+ {"status", Presence#presence.status}, -+ {"priority", integer_to_list(Presence#presence.priority)}], -+ [{xmlcdata, Presence#presence.text}]} -+ end, -+ get_presences({sorted, LUser, LServer}))}; -+get_presences({status, LUser, LServer}) -> -+ case get_presences({sorted, LUser, LServer}) of -+ [Highest | _Rest] -> -+ Highest#presence.status; -+ _ -> -+ "unavailable" -+ end; -+get_presences(_) -> -+ []. -+ -+-define(XML_HEADER, "<?xml version='1.0' encoding='utf-8'?>"). -+ -+get_pixmaps_directory() -> -+ [{directory, Path} | _] = ets:lookup(pixmaps_dirs, directory), -+ Path. -+ -+available_themes(list) -> -+ case file:list_dir(get_pixmaps_directory()) of -+ {ok, List} -> -+ List; -+ {error, _} -> -+ [] -+ end; -+available_themes(xdata) -> -+ lists:map( -+ fun(Theme) -> -+ {xmlelement, "option", [{"label", Theme}], -+ [{xmlelement, "value", [], [{xmlcdata, Theme}]}]} -+ end, available_themes(list)); -+available_themes(_) -> -+ []. -+ -+-define(XE(Name, Els), {xmlelement, Name, [], Els}). -+-define(C(Text), {xmlcdata, Text}). -+-define(XC(Name, Text), ?XE(Name, [?C(Text)])). -+ -+show_presence({xml, LUser, LServer}) -> -+ {XML, _Icon} = get_info(LUser, LServer), -+ case XML of -+ true -> -+ {200, [{"Content-Type", "text/xml; charset=utf-8"}], -+ ?XML_HEADER ++ xml:element_to_string( -+ get_presences({xml, LUser, LServer}))}; -+ _ -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])} -+ end; -+show_presence({image, LUser, LServer}) -> -+ {_XML, Icon} = get_info(LUser, LServer), -+ case Icon of -+ disabled -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])}; -+ _ -> -+ show_presence({image_no_check, LUser, LServer, atom_to_list(Icon)}) -+ end; -+show_presence({image, LUser, LServer, Theme}) -> -+ {_XML, Icon} = get_info(LUser, LServer), -+ case Icon of -+ disabled -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])}; -+ _ -> -+ show_presence({image_no_check, LUser, LServer, Theme}) -+ end; -+show_presence({image_no_check, LUser, LServer, Theme}) -> -+ case lists:member(Theme, available_themes(list)) of -+ true -> -+ case filelib:wildcard( -+ filename:join([get_pixmaps_directory(), Theme, -+ get_presences( -+ {status, LUser, LServer}) ++ ".{gif,png,jpg}"])) of -+ [First | _Rest] -> -+ CT = case string:substr(First, string:len(First) - 2, 3) of -+ "gif" -> "gif"; -+ "png" -> "png"; -+ "jpg" -> "jpeg" -+ end, -+ case file:read_file(First) of -+ {ok, Content} -> -+ {200, [{"Content-Type", "image/" ++ CT}], -+ binary_to_list(Content)}; -+ _ -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])} -+ end; -+ _ -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])} -+ end; -+ false -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])} -+ end; -+show_presence(_) -> -+ {404, [], ejabberd_web:make_xhtml([?XC("h1", "Not found")])}. -+ -diff -ruN ejabberd-1.1.2.orig/src/web/ejabberd_web.erl ejabberd-1.1.2/src/web/ejabberd_web.erl ---- ejabberd-1.1.2.orig/src/web/ejabberd_web.erl 2006-02-07 11:42:39.000000000 +0300 -+++ ejabberd-1.1.2/src/web/ejabberd_web.erl 2006-09-25 19:18:13.000000000 +0400 -@@ -139,6 +139,33 @@ - lang = _Lang} = Request) -> - ejabberd_http_poll:process_request(Request#request{path = RPath}); - -+process_get({true, _}, -+ #request{path = ["presence" | RPath], -+ q = _Query, -+ lang = _Lang} = Request) -> -+ case RPath of -+ [User, Server | Tail] -> -+ LServer = jlib:nameprep(Server), -+ case lists:member(LServer, ?MYHOSTS) of -+ true -> -+ LUser = jlib:nodeprep(User), -+ case Tail of -+ ["xml"] -> -+ mod_presence:show_presence({xml, LUser, LServer}); -+ ["image"] -> -+ mod_presence:show_presence({image, LUser, LServer}); -+ ["image", Theme] -> -+ mod_presence:show_presence({image, LUser, LServer, Theme}); -+ _ -> -+ {404, [], make_xhtml([?XC("h1", "Not found")])} -+ end; -+ false -> -+ {404, [], make_xhtml([?XC("h1", "Not found")])} -+ end; -+ _ -> -+ {404, [], make_xhtml([?XC("h1", "Not found")])} -+ end; -+ - process_get(_, _Request) -> - {404, [], make_xhtml([?XC("h1", "Not found")])}. - |