Sebastian Knapp:

package/public/exim/config.hlp

@@ -23,13 +23,18 @@
 
 MENU_PKG_EXIM
    Because some SMTP-server allow only plain text authentification, you can 
-   configure here the authentification methods for exim.
+   configure here the authentification methods for exim and set the content 
+   scan feature.
 
-ROCK_CFG_EXIM_CRAM_MD5
+ROCKCFG_PKG_EXIM_CRAM_MD5
    The more secure standard authentification.
 
-ROCK_CFG_EXIM_PLAINTEXT
+ROCKCFG_PKG_EXIM_PLAINTEXT
    Authentification without cryptographic technology.
 
-ROCK_CFG_EXIM_SPA
+ROCKCFG_PKG_EXIM_SPA
    Sorry, no help available for this option.
+
+ROCKCFG_PKG_EXIM_CONTENT_SCAN
+   Enables the former exiscan features. Provides a interface for
+   antivirus and malware scaner and spam detection.

package/public/exim/config.in

@@ -27,5 +27,6 @@ then
          bool 'Use MD5 auth' ROCKCFG_PKG_EXIM_CRAM_MD5 1
          bool 'Use plain text auth' ROCKCFG_PKG_EXIM_PLAIN_TEXT 0
          bool 'SPA authentification' ROCKCFG_PKG_EXIM_SPA 0
+         bool 'Enable content scan' ROCKCFG_PKG_EXIM_CONTENT_SCAN 1
       menu_end
 fi

package/public/exim/exim.conf

@@ -21,11 +21,6 @@
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
 exim_pc() {
-	echo "merging exiscan ..."
-	# patches are not compressed (any more). Feature or Bug?
-	# bunzip2 -c $archdir/exiscan-${exiscan_version}.patch.bz2 | patch -p1
-	patch -p1 <$archdir/exiscan-${exiscan_version}.patch
-
 	[ "${prefix#opt/}" == "$prefix" ] && sysconfdir="$sysconfdir/exim"
 
 	echo "creating Makefile ..."
@@ -48,6 +43,8 @@ EOT
 	      echo "AUTH_PLAINTEXT=yes" >> Local/Makefile
 [ "$ROCKCFG_PKG_EXIM_SPA" = 1 ]       && \
 	      echo "AUTH_SPA=yes"         >> Local/Makefile
+[ "$ROCKCFG_PKG_EXIM_CONTENT_SCAN" = 1 ] && \
+              echo "WITH_CONTENT_SCAN=yes" >> Local/Makefile
 
 if pkginstalled gnutls; then 
 	 cat >> Local/Makefile << EOT

package/public/exim/exim.desc

@@ -34,6 +34,7 @@
 [T] Compared with sendmail it is much easier to configure, too ;-)!
 
 [U] http://www.exim.org
+[U] http://duncanthrax.net/exiscan-acl/
 
 [A] University of Cambridge
 [M] The ROCK Linux Project
@@ -43,12 +44,9 @@
 
 [L] GPL
 [S] Stable
-[V] 4.44
+[V] 4.50
 [P] X -?---5---9 160.000
 
-[O] exiscan_version=acl-4.44-28
-
-[D] 3295364322 exim-4.44.tar.bz2 ftp://ftp.exim.org/pub/exim/exim4/
-[D] 3522884505 exiscan-acl-4.44-28.patch http://duncanthrax.net/exiscan-acl/
+[D] 675839166 exim-4.50.tar.bz2 ftp://ftp.exim.org/pub/exim/exim4/
 [D] X config.samples.tar.bz2 ftp://ftp.exim.org/pub/exim/exim4/