Attachment #65154 for bug #96630

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

Lines 6-13 Link Here

(-)/usr/ports/ftp/proftpd/Makefile (-4 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= proftpd	8	PORTNAME= proftpd
9	DISTVERSION= 1.3.0rc3	9	DISTVERSION= 1.3.0
10	PORTREVISION= 0	10	PORTREVISION= 1
11	CATEGORIES= ftp	11	CATEGORIES= ftp
12	MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \	12	MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
13	ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \	13	ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
Lines 53-61 Link Here
53	WRAP "Include mod_wrap" on \	53	WRAP "Include mod_wrap" on \
54	RADIUS "Include mod_radius" off	54	RADIUS "Include mod_radius" off
55		55
56	MODULES?=	56	MODULES?=
57		57
58	.include <bsd.port.pre.mk>	58	.include <bsd.port.pre.mk>
59		59
60	.if defined(WITH_RATIO)	60	.if defined(WITH_RATIO)
61	MODULES:=${MODULES}:mod_ratio	61	MODULES:=${MODULES}:mod_ratio
Lines 126-131 Link Here
126	.include <${PORTSDIR}/Mk/bsd.openssl.mk>	126	.include <${PORTSDIR}/Mk/bsd.openssl.mk>
127	PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib	127	PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib
128	MODULES:=${MODULES}:mod_tls	128	MODULES:=${MODULES}:mod_tls
		129	.if defined(WITH_LDAP)
		130	EXTRA_PATCHES=${FILESDIR}/extra-patch-module-mod_ldap.c
		131	.endif
129	.endif	132	.endif
130		133
131	.if defined(WITH_CTRLS)	134	.if defined(WITH_CTRLS)

Lines 1-3 Link Here

(-)/usr/ports/ftp/proftpd/distinfo (-3 / +3 lines)
1	MD5 (proftpd-1.3.0rc3.tar.bz2) = 050c3e2caec0d930f8a331e7b3ec0931	1	MD5 (proftpd-1.3.0.tar.bz2) = fae47d01b52e035eb6b7190e74c17722
2	SHA256 (proftpd-1.3.0rc3.tar.bz2) = ee181d7fe22b849589d9d886e5a4ed40fbe205cc14f8f4c95cc1db629c95ca97	2	SHA256 (proftpd-1.3.0.tar.bz2) = 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
3	SIZE (proftpd-1.3.0rc3.tar.bz2) = 1377481	3	SIZE (proftpd-1.3.0.tar.bz2) = 1386086




--- contrib/mod_ldap.c	Fri Apr 21 10:31:23 2006
+++ contrib/mod_ldap.c	Fri Apr 21 10:31:43 2006
@@ -55,7 +55,7 @@
  * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
  * connection will fail.
  */
-/* #define USE_LDAP_TLS */
+#define USE_LDAP_TLS
 
 /* Uncomment this if you have OpenSSL and wish to verify non-crypt()
  * password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c	Fri Apr 21 10:31:23 2006
+++ contrib/mod_ldap.c	Fri Apr 21 10:31:43 2006
@@ -55,7 +55,7 @@
  * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
  * connection will fail.
  */
-/* #define USE_LDAP_TLS */
+#define USE_LDAP_TLS
 
 /* Uncomment this if you have OpenSSL and wish to verify non-crypt()
  * password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c	Fri Apr 21 10:31:23 2006
+++ contrib/mod_ldap.c	Fri Apr 21 10:31:43 2006
@@ -55,7 +55,7 @@
  * after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
  * connection will fail.
  */
-/* #define USE_LDAP_TLS */
+#define USE_LDAP_TLS
 
 /* Uncomment this if you have OpenSSL and wish to verify non-crypt()
  * password hashes locally with OpenSSL. You'll also need to edit

Return to bug 96630

Line 0 Link Here

(-)/usr/ports/ftp/proftpd/files/extra-patch-module-mod_ldap.c (+31 lines)
	1	--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006
	2	+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006
	3	@@ -55,7 +55,7 @@
	4	* after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
	5	* connection will fail.
	6	*/
	7	-/* #define USE_LDAP_TLS */
	8	+#define USE_LDAP_TLS
	9
	10	/* Uncomment this if you have OpenSSL and wish to verify non-crypt()
	11	* password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006
	12	+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006
	13	@@ -55,7 +55,7 @@
	14	* after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
	15	* connection will fail.
	16	*/
	17	-/* #define USE_LDAP_TLS */
	18	+#define USE_LDAP_TLS
	19
	20	/* Uncomment this if you have OpenSSL and wish to verify non-crypt()
	21	* password hashes locally with OpenSSL. You'll also need to edit--- contrib/mod_ldap.c Fri Apr 21 10:31:23 2006
	22	+++ contrib/mod_ldap.c Fri Apr 21 10:31:43 2006
	23	@@ -55,7 +55,7 @@
	24	* after connecting to the LDAP server. If TLS cannot be enabled, the LDAP
	25	* connection will fail.
	26	*/
	27	-/* #define USE_LDAP_TLS */
	28	+#define USE_LDAP_TLS
	29
	30	/* Uncomment this if you have OpenSSL and wish to verify non-crypt()
	31	* password hashes locally with OpenSSL. You'll also need to edit