[patch] 02_postal-0.69-nossl.patch

02_postal-0.69-nossl.patch (text/plain), 3.51 KB, created by Peter Alfredsen (RETIRED) on 2008-04-24 00:00:38 UTC

diff -NrU5 postal-0.69.orig/basictcp.h postal-0.69/basictcp.h
--- postal-0.69.orig/basictcp.h	2008-04-10 03:36:15.000000000 +0200
+++ postal-0.69/basictcp.h	2008-04-23 22:32:23.000000000 +0200
@@ -47,11 +47,13 @@
 
 #ifdef USE_SSL
   // after calling Connect() and getting high-level protocol ready call
   // ConnectTLS() to start TLS.
   int ConnectTLS();
+#endif
   int disconnect();
+#ifdef USE_SSL
   int isTLS() { return m_isTLS; }
 #endif
 
   // returns negative error or the number of bytes read
   int readLine(char *buf, int bufSize, bool stripCR = false, int timeout = 60);
diff -NrU5 postal-0.69.orig/bhm.cpp postal-0.69/bhm.cpp
--- postal-0.69.orig/bhm.cpp	2007-02-28 01:57:08.000000000 +0100
+++ postal-0.69/bhm.cpp	2008-04-23 22:32:23.000000000 +0200
@@ -259,11 +259,15 @@
   return t.readLine(buf, bufSize, stripCR, timeout);
 }
 
 void do_work(thread_data *td)
 {
-  base_tcp t(td->fd, log, td->debug, &res, td->ssl);
+  base_tcp t(td->fd, log, td->debug, &res
+#ifdef USE_SSL
+	, td->ssl
+#endif
+		);
   struct sockaddr_in name;
   socklen_t namelen = sizeof(name);
   char buf[1024];
 
   int rc = getsockname(td->fd, (sockaddr *)&name, &namelen);
@@ -474,11 +478,13 @@
       thread_data *td = (thread_data *)malloc(sizeof(thread_data));
       td->threadNum = i;
       td->fd = fd;
       memcpy(&td->addr, &addr, sizeof(addr));
       td->debug = debug ? new Logit(*debug, i) : NULL;
+#ifdef USE_SSL
       td->ssl = use_ssl;
+#endif
       int p = pthread_create(&thread_info[i], &attr, smtp_worker, PVOID(td));
       pthread_attr_destroy(&attr);
       if(p)
       {
         fprintf(stderr, "Can't create a thread.\n");
diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
--- postal-0.69.orig/configure.in	2008-04-09 03:08:28.000000000 +0200
+++ postal-0.69/configure.in	2008-04-23 22:37:41.000000000 +0200
@@ -13,15 +13,28 @@
 else
   stripping="-s"
 fi
 
 AC_ARG_ENABLE(openssl,
-      [  --disable-openssl  disables openssl support],
-      DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no)
+	[  --disable-openssl	disable openssl support],
+	[ if test $enableval = yes; then
+		DISABLEOPENSSL=no
+	else
+		DISABLEOPENSSL=yes
+	fi ]
+	,
+	[ DISABLEOPENSSL=no ])
+
 AC_ARG_ENABLE(gnutls,
-      [  --disable-gnutls  disables gnutls support],
-      DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no)
+	[  --disable-gnutls  disables gnutls support],
+	[if test $enableval = yes; then
+		DISABLEGNUTLS=no
+	else
+		DISABLEGNUTLS=yes
+	fi]	
+	,
+	[ DISABLEGNUTLS=no ])
 
 dnl Checks for programs.
 AC_LANG_CPLUSPLUS
 AC_PROG_CC
 AC_PROG_CXX
@@ -118,17 +131,17 @@
 crypt_ldflags=
 if [[ "$GNUTLS" = "no" ]]; then
   gnutls=""
 else
   gnutls="#define USE_GNUTLS"
-  crypt_ldflags="$extra_ldflags -lgnutls"
+  crypt_ldflags=" -lgnutls"
 fi
 if [[ "$OPENSSL" = "no" ]]; then
   openssl=""
 else
   openssl="#define USE_OPENSSL"
-  crypt_ldflags="$extra_ldflags -lssl -lcrypto"
+  crypt_ldflags=" -lssl -lcrypto"
 fi
 
 AC_SUBST(large_file)
 large_file=""
 
diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
--- postal-0.69.orig/Makefile.in	2008-04-10 03:19:34.000000000 +0200
+++ postal-0.69/Makefile.in	2008-04-23 22:37:13.000000000 +0200
@@ -16,11 +16,11 @@
 INSTALL=@INSTALL@
 
 TESTEXE=ex-test
 BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
 LFLAGS=-lstdc++ @extra_ldflags@
-CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
+CRYPTLFLAGS=-lstdc++ @extra_ldflags@  @crypt_ldflags@ 
 
 
 ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
 
 postal: postal.cpp $(BASEOBJS) postal.h smtp.o