diff --git a/exim/.footprint b/exim/.footprint index 19941ad4..93300895 100644 --- a/exim/.footprint +++ b/exim/.footprint @@ -6,15 +6,15 @@ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/exim drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.77-1 +lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.80-1 drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/exim.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/exicyclog -rwxr-xr-x root/root usr/sbin/exigrep -lrwxrwxrwx root/root usr/sbin/exim -> exim-4.77-1 --rwsr-xr-x root/root usr/sbin/exim-4.77-1 +lrwxrwxrwx root/root usr/sbin/exim -> exim-4.80-1 +-rwsr-xr-x root/root usr/sbin/exim-4.80-1 -rwxr-xr-x root/root usr/sbin/exim_checkaccess -rwxr-xr-x root/root usr/sbin/exim_dbmbuild -rwxr-xr-x root/root usr/sbin/exim_dumpdb @@ -27,7 +27,7 @@ lrwxrwxrwx root/root usr/sbin/exim -> exim-4.77-1 -rwxr-xr-x root/root usr/sbin/exiqgrep -rwxr-xr-x root/root usr/sbin/exiqsumm -rwxr-xr-x root/root usr/sbin/exiwhat -lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.77-1 +lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.80-1 drwxr-xr-x root/root var/ drwxr-xr-x root/root var/log/ drwxr-x--- mail/mail var/log/exim/ diff --git a/exim/.md5sum b/exim/.md5sum index 5f9891a9..eedfe67c 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,4 +1,4 @@ e00ba95600b51e47d8fedb0ed24d2bf3 exim -78ccaa64ec356c662723ee4088ba36e3 exim-4.77-compile_number.patch -5d746275f2cc85845567f9d5eb84a57a exim-4.77.tar.bz2 -6ae6fdd8b58fe78a9b3186b3401785ca exim-config.patch +de93a242e9e148de28d67056e5c1b34f exim-4.80.tar.bz2 +6091cb3cb1a3edd1203df64dbe26c498 exim-compile_number.patch +56111ce31a6f7fa085ed4e6909d52a54 exim-config.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index 4f24597a..20f85523 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,16 +4,16 @@ # Depends on: db openssl libpcre tcp_wrappers name=exim -version=4.77 +version=4.80 release=1 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \ $name $name-config.patch - $name-$version-compile_number.patch) + $name-compile_number.patch) build() { cd $name-$version - patch -p1 -i $SRC/$name-$version-compile_number.patch + patch -p1 -i $SRC/$name-compile_number.patch sed "s/#CFLAGS#/$CFLAGS/" $SRC/$name-config.patch | patch -p1 cp src/EDITME Local/Makefile diff --git a/exim/exim-4.77-compile_number.patch b/exim/exim-4.77-compile_number.patch deleted file mode 100644 index 37996ff1..00000000 --- a/exim/exim-4.77-compile_number.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru exim-4.77.orig/OS/Makefile-Base exim-4.77/OS/Makefile-Base ---- exim-4.77.orig/OS/Makefile-Base 2011-10-10 08:45:22.289284198 +0200 -+++ exim-4.77/OS/Makefile-Base 2011-10-10 11:22:38.007450668 +0200 -@@ -455,7 +455,7 @@ - - # Update Exim's version information and build the version object. - --version.h:: -+version.h: - @../scripts/reversion - - version.o: $(HDRS) cnumber.h version.h version.c -diff -Nru exim-4.77.orig/src/version.sh exim-4.77/src/version.sh ---- exim-4.77.orig/src/version.sh 2011-10-10 08:45:22.279284561 +0200 -+++ exim-4.77/src/version.sh 2011-10-10 11:22:53.783546108 +0200 -@@ -1,4 +1,4 @@ - # automatically generated file - see ../scripts/reversion - EXIM_RELEASE_VERSION="4.77" - EXIM_VARIANT_VERSION="" --EXIM_COMPILE_NUMBER="1" -+EXIM_COMPILE_NUMBER="0" diff --git a/exim/exim-compile_number.patch b/exim/exim-compile_number.patch new file mode 100644 index 00000000..05586661 --- /dev/null +++ b/exim/exim-compile_number.patch @@ -0,0 +1,23 @@ +# http://bugs.exim.org/show_bug.cgi?id=1164 + +diff -Nru exim-4.80.orig/OS/Makefile-Base exim-4.80/OS/Makefile-Base +--- exim-4.80.orig/OS/Makefile-Base 2012-05-31 15:48:44.513624313 +0200 ++++ exim-4.80/OS/Makefile-Base 2012-05-31 16:23:02.159673311 +0200 +@@ -457,7 +457,7 @@ + + # Update Exim's version information and build the version object. + +-version.h:: ++version.h: + @../scripts/reversion + + cnumber.h: version.h +diff -Nru exim-4.80.orig/src/version.sh exim-4.80/src/version.sh +--- exim-4.80.orig/src/version.sh 2012-05-31 15:48:44.510291099 +0200 ++++ exim-4.80/src/version.sh 2012-05-31 16:23:02.159673311 +0200 +@@ -1,4 +1,4 @@ + # automatically generated file - see ../scripts/reversion + EXIM_RELEASE_VERSION="4.80" + EXIM_VARIANT_VERSION="" +-EXIM_COMPILE_NUMBER="1" ++EXIM_COMPILE_NUMBER="0" diff --git a/exim/exim-config.patch b/exim/exim-config.patch index 2ed6e297..08e8ec54 100644 --- a/exim/exim-config.patch +++ b/exim/exim-config.patch @@ -1,6 +1,6 @@ -diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME ---- exim-4.77.orig/src/EDITME 2011-10-10 08:45:22.282617774 +0200 -+++ exim-4.77/src/EDITME 2011-10-10 08:45:36.068785496 +0200 +diff -Nru exim-4.80.orig/src/EDITME exim-4.80/src/EDITME +--- exim-4.80.orig/src/EDITME 2012-05-31 15:48:44.506957885 +0200 ++++ exim-4.80/src/EDITME 2012-05-31 15:46:51.000000000 +0200 @@ -72,7 +72,7 @@ # this would be wanted. ############################################################################### @@ -46,7 +46,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME # SUPPORT_MAILSTORE=yes # SUPPORT_MBX=yes -@@ -284,8 +284,8 @@ +@@ -296,8 +296,8 @@ LOOKUP_LSEARCH=yes LOOKUP_DNSDB=yes @@ -57,7 +57,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME # LOOKUP_IBASE=yes # LOOKUP_LDAP=yes # LOOKUP_MYSQL=yes -@@ -355,7 +355,7 @@ +@@ -373,7 +373,7 @@ # files are defaulted in the OS/Makefile-Default file, but can be overridden in # local OS-specific make files. @@ -66,7 +66,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME #------------------------------------------------------------------------------ -@@ -550,10 +550,10 @@ +@@ -578,14 +578,14 @@ # included in the Exim binary. You will then need to set up the run time # configuration to make use of the mechanism(s) selected. @@ -74,25 +74,29 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME +AUTH_CRAM_MD5=yes # AUTH_CYRUS_SASL=yes # AUTH_DOVECOT=yes + # AUTH_GSASL=yes + # AUTH_GSASL_PC=libgsasl + # AUTH_HEIMDAL_GSSAPI=yes + # AUTH_HEIMDAL_GSSAPI_PC=heimdal-gssapi -# AUTH_PLAINTEXT=yes +AUTH_PLAINTEXT=yes # AUTH_SPA=yes -@@ -653,10 +653,10 @@ +@@ -689,10 +689,10 @@ # leave these settings commented out. # This setting is required for any TLS support (either OpenSSL or GnuTLS) -# SUPPORT_TLS=yes +SUPPORT_TLS=yes - # Uncomment this setting if you are using OpenSSL --# TLS_LIBS=-lssl -lcrypto -+TLS_LIBS=-lssl -lcrypto + # Uncomment one of these settings if you are using OpenSSL; pkg-config vs not +-# USE_OPENSSL_PC=openssl ++USE_OPENSSL_PC=openssl + # TLS_LIBS=-lssl -lcrypto - # Uncomment these settings if you are using GnuTLS - # USE_GNUTLS=yes -@@ -720,7 +720,7 @@ + # Uncomment the first and either the second or the third of these if you +@@ -764,7 +764,7 @@ # %s. This will be replaced by one of the strings "main", "panic", or "reject" # to form the final file names. Some installations may want something like this: @@ -101,7 +105,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME # which results in files with names /var/log/exim_mainlog, etc. The directory # in which the log files are placed must exist; Exim does not try to create -@@ -769,7 +769,7 @@ +@@ -813,7 +813,7 @@ # files. Both the name of the command and the suffix that it adds to files # need to be defined here. See also the EXICYCLOG_MAX configuration. @@ -110,7 +114,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME COMPRESS_SUFFIX=gz -@@ -777,7 +777,7 @@ +@@ -821,7 +821,7 @@ # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. @@ -119,7 +123,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME #------------------------------------------------------------------------------ -@@ -887,9 +887,9 @@ +@@ -931,9 +931,9 @@ # You may well also have to specify a local "include" file and an additional # library for TCP wrappers, so you probably need something like this: # @@ -131,7 +135,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -922,7 +922,7 @@ +@@ -966,7 +966,7 @@ # aliases). The following setting can be changed to specify a different # location for the system alias file. @@ -140,7 +144,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME #------------------------------------------------------------------------------ -@@ -968,13 +968,13 @@ +@@ -1016,13 +1016,13 @@ # haven't got Perl, Exim will still build and run; you just won't be able to # use those utilities. @@ -161,7 +165,7 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME #------------------------------------------------------------------------------ -@@ -1168,7 +1168,7 @@ +@@ -1222,7 +1222,7 @@ # (process id) to a file so that it can easily be identified. The path of the # file can be specified here. Some installations may want something like this: @@ -170,9 +174,9 @@ diff -Nru exim-4.77.orig/src/EDITME exim-4.77/src/EDITME # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory # using the name "exim-daemon.pid". -diff -Nru exim-4.77.orig/src/configure.default exim-4.77/src/configure.default ---- exim-4.77.orig/src/configure.default 2011-10-10 08:45:22.279284561 +0200 -+++ exim-4.77/src/configure.default 2011-10-10 08:45:36.068785496 +0200 +diff -Nru exim-4.80.orig/src/configure.default exim-4.80/src/configure.default +--- exim-4.80.orig/src/configure.default 2012-05-31 15:48:44.506957885 +0200 ++++ exim-4.80/src/configure.default 2012-05-31 15:41:11.000000000 +0200 @@ -54,7 +54,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: