From 955976c5a9c4fb35488843c3142e08600f6def72 Mon Sep 17 00:00:00 2001
From: "Andreas V. 'netrunner' Meier" <avmeier@web.de>
Date: Wed, 26 Jan 2005 15:59:50 +0000
Subject: [PATCH] Andreas V. Meier: 	 exim.conf: fix authenticator
 configuration 	 exim.conf: fix patch inclusion

[2005010414411311038] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5502 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/rene/exim/exim.conf | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/package/rene/exim/exim.conf b/package/rene/exim/exim.conf
index 09864fa28..711a8ac74 100644
--- a/package/rene/exim/exim.conf
+++ b/package/rene/exim/exim.conf
@@ -22,7 +22,9 @@
 
 exim_pc() {
 	echo "merging exiscan ..."
-	bunzip2 -c $archdir/exiscan-${exiscan_version}.patch.bz2 | patch -p1
+	# 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"
 
@@ -40,16 +42,25 @@ CC=$CC
 INCLUDE=-I/usr/include/${ROCKCFG_PKG_BDB_DEFAULT:1}
 EOT
 
-if [ "$ROCKCFG_EXIM_CRAM_MD5" = "1" ] ; then
-    echo "AUTH_CRAM_MD5=yes" >> Local/Makefile
-fi
-if [ "$ROCKCFG_EXIM_PLAINTEXT" = "1" ] ; then
-    echo "AUTH_PLAINTEXT=yes" >> Local/Makefile
-fi
-if [ "$ROCKCFG_EXIM_SPA" = "1" ] ; then
-    echo "AUTH_SPA=yes" >> Local/Makefile
-fi
+[ "$ROCKCFG_PKG_EXIM_CRAM_MD5" = 1 ]  && \
+	      echo "AUTH_CRAM_MD5=yes"    >> Local/Makefile
+[ "$ROCKCFG_PKG_EXIM_PLAIN_TEXT" = 1 ] && \
+	      echo "AUTH_PLAINTEXT=yes" >> Local/Makefile
+[ "$ROCKCFG_PKG_EXIM_SPA" = 1 ]       && \
+	      echo "AUTH_SPA=yes"         >> Local/Makefile
 
+if pkginstalled gnutls; then 
+	 cat >> Local/Makefile << EOT
+SUPPORT_TLS=yes
+USE_GNUTLS=yes
+TLS_LIBS=-lgnutls -ltasn1 -lgcrypt
+EOT
+elif pkginstalled openssl; then
+	 cat >> Local/Makefile << EOT
+SUPPORT_TLS=yes
+TLS_LIBS=-lssl -lcrypto
+EOT
+fi
 }
 
 exim_pm(){