Attachment #138798 for bug #184879

View | Details | Raw Unified | Return to bug 184879
Collapse All | Expand All




OPTIONS_DEFINE=	SSL
OPTIONS_DEFAULT=	SSL

USE_OPENSSL=	yes
GNU_CONFIGURE=	yes
USES=		gmake
USE_GCC=	any
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--disable-gnutls

PLIST_FILES=	sbin/bhm sbin/postal bin/postal-list sbin/rabid \
		man/man1/postal-list.1.gz man/man8/bhm.8.gz \
		man/man8/postal.8.gz man/man8/rabid.8.gz
MAN8=	bhm.8 postal.8 rabid.8

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MSSL}
USE_OPENSSL=	yes
.else
CONFIGURE_ARGS+=	--disable-openssl
.endif

post-patch:
	@${REINPLACE_CMD} -e \
		's|-lpthread|-pthread|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|-O2 -g|| ; \
		 s|-lstdc|$${LDFLAGS}|' ${WRKSRC}/Makefile.in

.include <bsd.port.mk>




--- Makefile.in.orig	2008-05-26 11:14:18.000000000 +0200
+++ Makefile.in	2008-05-26 11:14:01.000000000 +0200
@@ -17,8 +17,8 @@
 
 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@
+LFLAGS=$(LDFLAGS) -lstdc++ @extra_ldflags@
+CRYPTLFLAGS=$(LDFLAGS) -lstdc++ @crypt_ldflags@
 
 
 ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o




--- basictcp.h.orig	2013-12-08 18:49:04.000000000 +0900
+++ basictcp.h	2013-12-08 18:49:33.000000000 +0900
@@ -89,7 +89,11 @@
 
 #ifdef USE_SSL
 #ifdef USE_OPENSSL
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *m_sslMeth;
+#else
   SSL_METHOD *m_sslMeth;
+#endif
   SSL_CTX* m_sslCtx;
   SSL *m_ssl;
 #else




--- configure.orig	2012-01-25 09:52:46.445155128 +0100
+++ configure	2012-01-25 09:53:01.565155948 +0100
@@ -4025,7 +4025,7 @@
    linux_pthread="#define LINUX_PTHREAD"
 fi
 
-LDFLAGS=-lpthread
+#LDFLAGS=-lpthread
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pthread.h>
@@ -4043,10 +4043,10 @@
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  extra_ldflags="$extra_ldflags -lpthread"
+#  extra_ldflags="$extra_ldflags -lpthread"
 
 else
-  extra_ldflags="$extra_ldflags -pthread"
+#  extra_ldflags="$extra_ldflags -pthread"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext




--- tcp.h.orig
+++ tcp.h
@@ -100,7 +100,11 @@
 
 #ifdef USE_SSL
 #ifdef USE_OPENSSL
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+  const SSL_METHOD *m_sslMeth;
+#else
   SSL_METHOD *m_sslMeth;
+#endif
   SSL_CTX* m_sslCtx;
   SSL *m_ssl;
 #else

Return to bug 184879

Lines 15-39 Link Here

(-)benchmarks/postal/Makefile (-12 / +15 lines)
15	OPTIONS_DEFINE= SSL	15	OPTIONS_DEFINE= SSL
16	OPTIONS_DEFAULT= SSL	16	OPTIONS_DEFAULT= SSL
17		17
18	USE_OPENSSL= yes
19	GNU_CONFIGURE= yes
20	USES= gmake	18	USES= gmake
		19	USE_GCC= any
		20	GNU_CONFIGURE= yes
		21	CONFIGURE_ARGS= --disable-gnutls
21		22
22	PLIST_FILES= sbin/bhm sbin/postal bin/postal-list sbin/rabid	23	PLIST_FILES= sbin/bhm sbin/postal bin/postal-list sbin/rabid \
23		24	man/man1/postal-list.1.gz man/man8/bhm.8.gz \
24	MAN1= postal-list.1	25	man/man8/postal.8.gz man/man8/rabid.8.gz
25	MAN8= bhm.8 postal.8 rabid.8
26		26
27	NO_STAGE= yes
28	.include <bsd.port.options.mk>	27	.include <bsd.port.options.mk>
29		28
30	CONFIGURE_ARGS= --disable-gnutls	29	.if ${PORT_OPTIONS:MSSL}
31		30	USE_OPENSSL= yes
32	.if empty(PORT_OPTIONS:MSSL)	31	.else
33	CONFIGURE_ARGS+= --disable-openssl	32	CONFIGURE_ARGS+= --disable-openssl
34	.endif	33	.endif
35		34
36	CFLAGS+= ${PTHREAD_CFLAGS} -Wno-long-long	35	post-patch:
37	LDFLAGS+= ${PTHREAD_LIBS}	36	@${REINPLACE_CMD} -e \
		37	's\|-lpthread\|-pthread\|' ${WRKSRC}/configure
		38	@${REINPLACE_CMD} -e \
		39	's\|-O2 -g\|\| ; \
		40	s\|-lstdc\|$${LDFLAGS}\|' ${WRKSRC}/Makefile.in
38		41
39	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 1-13 Link Here

(-)benchmarks/postal/files/patch-Makefile.in (-13 lines)
1	--- Makefile.in.orig 2008-05-26 11:14:18.000000000 +0200
2	+++ Makefile.in 2008-05-26 11:14:01.000000000 +0200
3	@@ -17,8 +17,8 @@
4
5	TESTEXE=ex-test
6	BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
7	-LFLAGS=-lstdc++ @extra_ldflags@
8	-CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
9	+LFLAGS=$(LDFLAGS) -lstdc++ @extra_ldflags@
10	+CRYPTLFLAGS=$(LDFLAGS) -lstdc++ @crypt_ldflags@
11
12
13	ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o

Line 0 Link Here

(-)benchmarks/postal/files/patch-basictcp.h (+14 lines)
	1	--- basictcp.h.orig 2013-12-08 18:49:04.000000000 +0900
	2	+++ basictcp.h 2013-12-08 18:49:33.000000000 +0900
	3	@@ -89,7 +89,11 @@
	4
	5	#ifdef USE_SSL
	6	#ifdef USE_OPENSSL
	7	+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
	8	+ const SSL_METHOD *m_sslMeth;
	9	+#else
	10	SSL_METHOD *m_sslMeth;
	11	+#endif
	12	SSL_CTX* m_sslCtx;
	13	SSL *m_ssl;
	14	#else

Lines 1-24 Link Here

(-)benchmarks/postal/files/patch-configure (-24 lines)
1	--- configure.orig 2012-01-25 09:52:46.445155128 +0100
2	+++ configure 2012-01-25 09:53:01.565155948 +0100
3	@@ -4025,7 +4025,7 @@
4	linux_pthread="#define LINUX_PTHREAD"
5	fi
6
7	-LDFLAGS=-lpthread
8	+#LDFLAGS=-lpthread
9	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
10	/* end confdefs.h. */
11	#include <pthread.h>
12	@@ -4043,10 +4043,10 @@
13	}
14	_ACEOF
15	if ac_fn_cxx_try_link "$LINENO"; then :
16	- extra_ldflags="$extra_ldflags -lpthread"
17	+# extra_ldflags="$extra_ldflags -lpthread"
18
19	else
20	- extra_ldflags="$extra_ldflags -pthread"
21	+# extra_ldflags="$extra_ldflags -pthread"
22	fi
23	rm -f core conftest.err conftest.$ac_objext \
24	conftest$ac_exeext conftest.$ac_ext

Line 0 Link Here

(-)benchmarks/postal/files/patch-tcp.h (+14 lines)
	1	--- tcp.h.orig
	2	+++ tcp.h
	3	@@ -100,7 +100,11 @@
	4
	5	#ifdef USE_SSL
	6	#ifdef USE_OPENSSL
	7	+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
	8	+ const SSL_METHOD *m_sslMeth;
	9	+#else
	10	SSL_METHOD *m_sslMeth;
	11	+#endif
	12	SSL_CTX* m_sslCtx;
	13	SSL *m_ssl;
	14	#else