commit e0c934f890547b442063300f148e56d1cc6bbbd5 Author: Juergen Daubert <jue@jue.li> Date: Sat Jun 27 17:49:51 2015 +0200 dovecot: disable tcp_wrappers diff --git a/dovecot/.footprint b/dovecot/.footprint index ae97fbf..6ddc25d 100644 --- a/dovecot/.footprint +++ b/dovecot/.footprint @@ -671,7 +671,6 @@ drwxr-xr-x root/root usr/lib/dovecot/modules/stats/ -rwxr-xr-x root/root usr/lib/dovecot/script-login -rwxr-xr-x root/root usr/lib/dovecot/ssl-params -rwxr-xr-x root/root usr/lib/dovecot/stats --rwxr-xr-x root/root usr/lib/dovecot/tcpwrap -rwxr-xr-x root/root usr/lib/dovecot/xml2text drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ diff --git a/dovecot/.md5sum b/dovecot/.md5sum index e5eb71f..8e004e7 100644 --- a/dovecot/.md5sum +++ b/dovecot/.md5sum @@ -1,3 +1,3 @@ ec342928dd97131f82dba41546741b5f dovecot 1e42eb3b69544c447ad882d7858f3630 dovecot-2.2.18.tar.gz -346f4af957cd9fabaee1bc3c729f300f dovecot-config.patch +27862b85db1c005492718f5aa4d21304 dovecot-config.patch diff --git a/dovecot/Pkgfile b/dovecot/Pkgfile index af2c412..6b4e002 100644 --- a/dovecot/Pkgfile +++ b/dovecot/Pkgfile @@ -1,11 +1,11 @@ # Description: IMAP and POP3 server with ssl/ipv6 support, written with security primarily in mind # URL: http://dovecot.org # Maintainer: Juergen Daubert, jue at crux dot nu -# Depends on: zlib bzip2 openssl tcp_wrappers libcap +# Depends on: zlib bzip2 openssl libcap name=dovecot version=2.2.18 -release=1 +release=2 source=(http://dovecot.org/releases/2.2/$name-$version.tar.gz \ dovecot-config.patch dovecot) @@ -21,7 +21,7 @@ build () { --mandir=/usr/man \ --with-moduledir=/usr/lib/dovecot/modules \ --with-ssl=openssl \ - --with-libwrap + --without-libwrap make make DESTDIR=$PKG install diff --git a/dovecot/dovecot-config.patch b/dovecot/dovecot-config.patch index d3dadcf..2085044 100644 --- a/dovecot/dovecot-config.patch +++ b/dovecot/dovecot-config.patch @@ -1,17 +1,3 @@ -diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/10-master.conf dovecot-2.2.2/doc/example-config/conf.d/10-master.conf ---- dovecot-2.2.2.orig/doc/example-config/conf.d/10-master.conf 2013-05-20 09:01:57.619437034 +0200 -+++ dovecot-2.2.2/doc/example-config/conf.d/10-master.conf 2013-05-20 09:02:27.065041953 +0200 -@@ -117,3 +117,10 @@ - #group = - } - } -+ -+service tcpwrap { -+ unix_listener login/tcpwrap { -+ mode = 0666 -+ } -+} -+ diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf --- dovecot-2.2.2.orig/doc/example-config/conf.d/10-ssl.conf 2013-05-20 09:01:57.619437034 +0200 +++ dovecot-2.2.2/doc/example-config/conf.d/10-ssl.conf 2013-05-20 09:02:27.065041953 +0200 @@ -60,23 +46,3 @@ diff -Nru dovecot-2.2.2.orig/doc/example-config/conf.d/auth-system.conf.ext dove # PAM-like authentication for OpenBSD. # <doc/wiki/PasswordDatabase.BSDAuth.txt> -diff -Nru dovecot-2.2.2.orig/doc/example-config/dovecot.conf dovecot-2.2.2/doc/example-config/dovecot.conf ---- dovecot-2.2.2.orig/doc/example-config/dovecot.conf 2013-05-20 09:01:57.619437034 +0200 -+++ dovecot-2.2.2/doc/example-config/dovecot.conf 2013-05-20 09:04:33.220519452 +0200 -@@ -28,6 +28,7 @@ - # If you want to specify non-default ports or anything more complex, - # edit conf.d/master.conf. - #listen = *, :: -+listen = * - - # Base directory where to store runtime data. - #base_dir = /var/run/dovecot/ -@@ -48,7 +49,7 @@ - #login_trusted_networks = - - # Space separated list of login access check sockets (e.g. tcpwrap) --#login_access_sockets = -+login_access_sockets = tcpwrap - - # With proxy_maybe=yes if proxy destination matches any of these IPs, don't do - # proxying. This isn't necessary normally, but may be useful if the destination