Attachment #212210 for bug #244473





PORTNAME=	ircproxy
PORTVERSION=	1.3.6
PORTREVISION=	4
CATEGORIES=	irc
MASTER_SITES=	https://BSDforge.com/projects/source/irc/ircproxy/


SUB_LIST=	IRC_USR=${USERS} IRC_GRP=${GROUPS}
SUB_FILES=	pkg-deinstall

OPTIONS_DEFINE=	IPV6 MEMDEBUG FDDEBUG
OPTIONS_DEFAULT=	MEMDEBUG FDDEBUG
MEMDEBUG_DESC=	Enable memory debugging
FDDEBUG_DESC=	Enable file descriptor debugging


MEMDEBUG_CONFIGURE_ENABLE=	memdebug
FDDEBUG_CONFIGURE_ENABLE=	fddebug
IPV6_CONFIGURE_ENABLE=		ipv6
SSL_CONFIGURE_ENABLE=		ssl
SSL_USES=		ssl

.include <bsd.port.pre.mk>

.if ${SSL_DEFAULT} == base
BROKEN_FreeBSD_12=	gnutls library not found. Install gnutls or use --with-openssl
BROKEN_FreeBSD_13=	gnutls library not found. Install gnutls or use --with-openssl
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|EUSER="ircproxy"|EUSER="ircproxyd"|g; \
		s|EGROUP="users"|EGROUP="ircproxyd"|g' ${WRKSRC}/data/${PORTNAME}d.conf

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/imkpasswd ${STAGEDIR}${PREFIX}/bin/ircproxyd

.include <bsd.port.mk>




--- configure.orig	2009-03-21 17:29:58.000000000 -0700
+++ configure	2020-02-26 22:39:06.516413000 -0800
@@ -5358,8 +5358,8 @@
 if test "x$ssl_support" = "xyes" ; then
 
   if test "x$with_gnutls" = "xno" -a "x$with_openssl" = "xno" ; then
-    { $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
+    { $as_echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lssl" >&5
+$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; }
 if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
@@ -5378,11 +5378,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char OPENSSL_init_ssl ();
 int
 main ()
 {
-return SSL_library_init ();
+return OPENSSL_init_ssl ();
   ;
   return 0;
 }
@@ -5429,8 +5429,8 @@
   with_openssl=no
 fi
 
-    { $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lgnutls-openssl" >&5
-$as_echo_n "checking for SSL_library_init in -lgnutls-openssl... " >&6; }
+    { $as_echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lgnutls-openssl" >&5
+$as_echo_n "checking for OPENSSL_init_ssl in -lgnutls-openssl... " >&6; }
 if test "${ac_cv_lib_gnutls_openssl_SSL_library_init+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
@@ -5449,11 +5449,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char OPENSSL_init_ssl ();
 int
 main ()
 {
-return SSL_library_init ();
+return OPENSSL_init_ssl ();
   ;
   return 0;
 }
@@ -5503,8 +5503,8 @@
   fi
 
   if test "x$with_openssl" != "xno" ; then
-    { $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing OPENSSL_init_ssl" >&5
+$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; }
 if test "${ac_cv_search_SSL_library_init+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
@@ -5522,11 +5522,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char OPENSSL_init_ssl ();
 int
 main ()
 {
-return SSL_library_init ();
+return OPENSSL_init_ssl ();
   ;
   return 0;
 }
@@ -5604,8 +5604,8 @@
       exit 1
     fi
   else
-    { $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing OPENSSL_init_ssl" >&5
+$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; }
 if test "${ac_cv_search_SSL_library_init+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
@@ -5623,11 +5623,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char SSL_library_init ();
+char OPENSSL_init_ssl ();
 int
 main ()
 {
-return SSL_library_init ();
+return OPENSSL_init_ssl ();
   ;
   return 0;
 }




--- configure.in.orig	2009-03-21 17:29:58.000000000 -0700
+++ configure.in	2020-02-26 22:39:03.499134000 -0800
@@ -230,12 +230,12 @@
 if test "x$ssl_support" = "xyes" ; then
 
   if test "x$with_gnutls" = "xno" -a "x$with_openssl" = "xno" ; then
-    AC_CHECK_LIB(ssl, SSL_library_init, [with_openssl=yes], [with_openssl=no], [])
-    AC_CHECK_LIB(gnutls-openssl, SSL_library_init, [with_gnutls=yes], [with_gnutls=no], [])
+    AC_CHECK_LIB(ssl, OPENSSL_init_ssl, [with_openssl=yes], [with_openssl=no], [])
+    AC_CHECK_LIB(gnutls-openssl, OPENSSL_init_ssl, [with_gnutls=yes], [with_gnutls=no], [])
   fi
 
   if test "x$with_openssl" != "xno" ; then
-    AC_SEARCH_LIBS(SSL_library_init, [ssl], [have_openssl=yes], [have_openssl=no], [])
+    AC_SEARCH_LIBS(OPENSSL_init_ssl, [ssl], [have_openssl=yes], [have_openssl=no], [])
     if test "x$have_openssl" = "xyes" ; then
       AC_DEFINE([HAVE_OPENSSL], [], [OpenSSL Library])
       have_ssl=yes
@@ -244,7 +244,7 @@
       exit 1
     fi
   else
-    AC_SEARCH_LIBS(SSL_library_init, [gnutls-openssl], [have_gnutls=yes], [have_gnutls=no], [])
+    AC_SEARCH_LIBS(OPENSSL_init_ssl, [gnutls-openssl], [have_gnutls=yes], [have_gnutls=no], [])
     if test "x$have_gnutls" = "xyes" ; then
       AC_DEFINE([HAVE_GNUTLS], [], [GNUTLS Library])
       have_ssl=yes

Lines 10-13 Link Here

(-)ircproxy/pkg-descr (-1 / +1 lines)
10	IRC connection. This is useful if you want to be connected from home and	10	IRC connection. This is useful if you want to be connected from home and
11	work at the same time without cloning.	11	work at the same time without cloning.
12		12
13	WWW: http://ircproxy.sourceforge.net/	13	WWW: https://BSDforge.com/projects/irc/ircproxy/

Return to bug 244473

Lines 3-9 Link Here

(-)ircproxy/Makefile (-13 / +4 lines)
3		3
4	PORTNAME= ircproxy	4	PORTNAME= ircproxy
5	PORTVERSION= 1.3.6	5	PORTVERSION= 1.3.6
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= irc	7	CATEGORIES= irc
8	MASTER_SITES= https://BSDforge.com/projects/source/irc/ircproxy/	8	MASTER_SITES= https://BSDforge.com/projects/source/irc/ircproxy/
9		9
Lines 26-33 Link Here
26	SUB_LIST= IRC_USR=${USERS} IRC_GRP=${GROUPS}	26	SUB_LIST= IRC_USR=${USERS} IRC_GRP=${GROUPS}
27	SUB_FILES= pkg-deinstall	27	SUB_FILES= pkg-deinstall
28		28
29	OPTIONS_DEFINE= SSL IPV6 MEMDEBUG FDDEBUG	29	OPTIONS_DEFINE= IPV6 MEMDEBUG FDDEBUG
30	OPTIONS_DEFAULT= SSL MEMDEBUG FDDEBUG	30	OPTIONS_DEFAULT= MEMDEBUG FDDEBUG
31	MEMDEBUG_DESC= Enable memory debugging	31	MEMDEBUG_DESC= Enable memory debugging
32	FDDEBUG_DESC= Enable file descriptor debugging	32	FDDEBUG_DESC= Enable file descriptor debugging
33		33
Lines 34-49 Link Here
34	MEMDEBUG_CONFIGURE_ENABLE= memdebug	34	MEMDEBUG_CONFIGURE_ENABLE= memdebug
35	FDDEBUG_CONFIGURE_ENABLE= fddebug	35	FDDEBUG_CONFIGURE_ENABLE= fddebug
36	IPV6_CONFIGURE_ENABLE= ipv6	36	IPV6_CONFIGURE_ENABLE= ipv6
37	SSL_CONFIGURE_ENABLE= ssl
38	SSL_USES= ssl
39		37
40	.include <bsd.port.pre.mk>
41
42	.if ${SSL_DEFAULT} == base
43	BROKEN_FreeBSD_12= gnutls library not found. Install gnutls or use --with-openssl
44	BROKEN_FreeBSD_13= gnutls library not found. Install gnutls or use --with-openssl
45	.endif
46
47	post-patch:	38	post-patch:
48	@${REINPLACE_CMD} -e 's\|EUSER="ircproxy"\|EUSER="ircproxyd"\|g; \	39	@${REINPLACE_CMD} -e 's\|EUSER="ircproxy"\|EUSER="ircproxyd"\|g; \
49	s\|EGROUP="users"\|EGROUP="ircproxyd"\|g' ${WRKSRC}/data/${PORTNAME}d.conf	40	s\|EGROUP="users"\|EGROUP="ircproxyd"\|g' ${WRKSRC}/data/${PORTNAME}d.conf
Lines 51-54 Link Here
51	post-install:	42	post-install:
52	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/imkpasswd ${STAGEDIR}${PREFIX}/bin/ircproxyd	43	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/imkpasswd ${STAGEDIR}${PREFIX}/bin/ircproxyd
53		44
54	.include <bsd.port.post.mk>	45	.include <bsd.port.mk>

Line 0 Link Here

(-)ircproxy/files/patch-configure (+102 lines)
		1	--- configure.orig 2009-03-21 17:29:58.000000000 -0700
		2	+++ configure 2020-02-26 22:39:06.516413000 -0800
		3	@@ -5358,8 +5358,8 @@
		4	if test "x$ssl_support" = "xyes" ; then
		5
		6	if test "x$with_gnutls" = "xno" -a "x$with_openssl" = "xno" ; then
		7	- { $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lssl" >&5
		8	-$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
		9	+ { $as_echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lssl" >&5
		10	+$as_echo_n "checking for OPENSSL_init_ssl in -lssl... " >&6; }
		11	if test "${ac_cv_lib_ssl_SSL_library_init+set}" = set; then
		12	$as_echo_n "(cached) " >&6
		13	else
		14	@@ -5378,11 +5378,11 @@
		15	#ifdef __cplusplus
		16	extern "C"
		17	#endif
		18	-char SSL_library_init ();
		19	+char OPENSSL_init_ssl ();
		20	int
		21	main ()
		22	{
		23	-return SSL_library_init ();
		24	+return OPENSSL_init_ssl ();
		25	;
		26	return 0;
		27	}
		28	@@ -5429,8 +5429,8 @@
		29	with_openssl=no
		30	fi
		31
		32	- { $as_echo "$as_me:$LINENO: checking for SSL_library_init in -lgnutls-openssl" >&5
		33	-$as_echo_n "checking for SSL_library_init in -lgnutls-openssl... " >&6; }
		34	+ { $as_echo "$as_me:$LINENO: checking for OPENSSL_init_ssl in -lgnutls-openssl" >&5
		35	+$as_echo_n "checking for OPENSSL_init_ssl in -lgnutls-openssl... " >&6; }
		36	if test "${ac_cv_lib_gnutls_openssl_SSL_library_init+set}" = set; then
		37	$as_echo_n "(cached) " >&6
		38	else
		39	@@ -5449,11 +5449,11 @@
		40	#ifdef __cplusplus
		41	extern "C"
		42	#endif
		43	-char SSL_library_init ();
		44	+char OPENSSL_init_ssl ();
		45	int
		46	main ()
		47	{
		48	-return SSL_library_init ();
		49	+return OPENSSL_init_ssl ();
		50	;
		51	return 0;
		52	}
		53	@@ -5503,8 +5503,8 @@
		54	fi
		55
		56	if test "x$with_openssl" != "xno" ; then
		57	- { $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5
		58	-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
		59	+ { $as_echo "$as_me:$LINENO: checking for library containing OPENSSL_init_ssl" >&5
		60	+$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; }
		61	if test "${ac_cv_search_SSL_library_init+set}" = set; then
		62	$as_echo_n "(cached) " >&6
		63	else
		64	@@ -5522,11 +5522,11 @@
65	#ifdef __cplusplus
66	extern "C"
67	#endif
68	-char SSL_library_init ();
69	+char OPENSSL_init_ssl ();
70	int
71	main ()
72	{
73	-return SSL_library_init ();
74	+return OPENSSL_init_ssl ();
75	;
76	return 0;
77	}
78	@@ -5604,8 +5604,8 @@
79	exit 1
80	fi
81	else
82	- { $as_echo "$as_me:$LINENO: checking for library containing SSL_library_init" >&5
83	-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
84	+ { $as_echo "$as_me:$LINENO: checking for library containing OPENSSL_init_ssl" >&5
85	+$as_echo_n "checking for library containing OPENSSL_init_ssl... " >&6; }
86	if test "${ac_cv_search_SSL_library_init+set}" = set; then
87	$as_echo_n "(cached) " >&6
88	else
89	@@ -5623,11 +5623,11 @@
90	#ifdef __cplusplus
91	extern "C"
92	#endif
93	-char SSL_library_init ();
94	+char OPENSSL_init_ssl ();
95	int
96	main ()
97	{
98	-return SSL_library_init ();
99	+return OPENSSL_init_ssl ();
100	;
101	return 0;
102	}

Line 0 Link Here

(-)ircproxy/files/patch-configure.in (+27 lines)
	1	--- configure.in.orig 2009-03-21 17:29:58.000000000 -0700
	2	+++ configure.in 2020-02-26 22:39:03.499134000 -0800
	3	@@ -230,12 +230,12 @@
	4	if test "x$ssl_support" = "xyes" ; then
	5
	6	if test "x$with_gnutls" = "xno" -a "x$with_openssl" = "xno" ; then
	7	- AC_CHECK_LIB(ssl, SSL_library_init, [with_openssl=yes], [with_openssl=no], [])
	8	- AC_CHECK_LIB(gnutls-openssl, SSL_library_init, [with_gnutls=yes], [with_gnutls=no], [])
	9	+ AC_CHECK_LIB(ssl, OPENSSL_init_ssl, [with_openssl=yes], [with_openssl=no], [])
	10	+ AC_CHECK_LIB(gnutls-openssl, OPENSSL_init_ssl, [with_gnutls=yes], [with_gnutls=no], [])
	11	fi
	12
	13	if test "x$with_openssl" != "xno" ; then
	14	- AC_SEARCH_LIBS(SSL_library_init, [ssl], [have_openssl=yes], [have_openssl=no], [])
	15	+ AC_SEARCH_LIBS(OPENSSL_init_ssl, [ssl], [have_openssl=yes], [have_openssl=no], [])
	16	if test "x$have_openssl" = "xyes" ; then
	17	AC_DEFINE([HAVE_OPENSSL], [], [OpenSSL Library])
	18	have_ssl=yes
	19	@@ -244,7 +244,7 @@
	20	exit 1
	21	fi
	22	else
	23	- AC_SEARCH_LIBS(SSL_library_init, [gnutls-openssl], [have_gnutls=yes], [have_gnutls=no], [])
	24	+ AC_SEARCH_LIBS(OPENSSL_init_ssl, [gnutls-openssl], [have_gnutls=yes], [have_gnutls=no], [])
	25	if test "x$have_gnutls" = "xyes" ; then
	26	AC_DEFINE([HAVE_GNUTLS], [], [GNUTLS Library])
	27	have_ssl=yes