ports/96630: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES]
Beecher Rintoul
akbeech at gmail.com
Mon May 1 21:00:40 UTC 2006
>Number: 96630
>Category: ports
>Synopsis: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 01 21:00:36 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Beecher Rintoul
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
NorthWind Communications
>Environment:
System: FreeBSD stargate.alaskaparadise.com 7.0-CURRENT FreeBSD 7.0-CURRENT #60: Sun Apr 30 11:36:56 AKDT 2006
>Description:
Upgrade to 1.3.0-Stable - Fixed makefile syntax after pr-96141. Note: This pr is an upgrade to pr-96578.
Added file(s):
- files/extra-patch-module-mod_ldap.c
Port maintainer (beech at mangohealth.org) is cc'd.
Generated with FreeBSD Port Tools 0.75
>How-To-Repeat:
>Fix:
--- proftpd-1.3.0_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile /usr/ports/ftp/proftpd/Makefile
--- /usr/ports/ftp/proftpd.orig/Makefile Mon May 1 12:43:18 2006
+++ /usr/ports/ftp/proftpd/Makefile Mon May 1 12:31:58 2006
@@ -6,8 +6,8 @@
#
PORTNAME= proftpd
-DISTVERSION= 1.3.0rc3
-PORTREVISION= 0
+DISTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \
@@ -53,9 +53,9 @@
WRAP "Include mod_wrap" on \
RADIUS "Include mod_radius" off
-MODULES?=
+MODULES?=
-.include <bsd.port.pre.mk>
+.include <bsd.port.pre.mk>
.if defined(WITH_RATIO)
MODULES:=${MODULES}:mod_ratio
@@ -126,6 +126,9 @@
.include <${PORTSDIR}/Mk/bsd.openssl.mk>
PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib
MODULES:=${MODULES}:mod_tls
+.if defined(WITH_LDAP)
+EXTRA_PATCHES=${FILESDIR}/extra-patch-module-mod_ldap.c
+.endif
.endif
.if defined(WITH_CTRLS)
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/distinfo /usr/ports/ftp/proftpd/distinfo
--- /usr/ports/ftp/proftpd.orig/distinfo Mon Apr 24 23:32:11 2006
+++ /usr/ports/ftp/proftpd/distinfo Mon May 1 12:20:07 2006
@@ -1,3 +1,3 @@
-MD5 (proftpd-1.3.0rc3.tar.bz2) = 050c3e2caec0d930f8a331e7b3ec0931
-SHA256 (proftpd-1.3.0rc3.tar.bz2) = ee181d7fe22b849589d9d886e5a4ed40fbe205cc14f8f4c95cc1db629c95ca97
-SIZE (proftpd-1.3.0rc3.tar.bz2) = 1377481
+MD5 (proftpd-1.3.0.tar.bz2) = fae47d01b52e035eb6b7190e74c17722
+SHA256 (proftpd-1.3.0.tar.bz2) = 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
+SIZE (proftpd-1.3.0.tar.bz2) = 1386086
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra-patch-module-mod_ldap.c /usr/ports/ftp/proftpd/files/extra-patch-module-mod_ldap.c
--- /usr/ports/ftp/proftpd.orig/files/extra-patch-module-mod_ldap.c Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/proftpd/files/extra-patch-module-mod_ldap.c Mon May 1 12:20:07 2006
@@ -0,0 +1,31 @@
+--- 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
--- proftpd-1.3.0_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list