diff options
| author | Andrej Zverev <az@FreeBSD.org> | 2006-05-03 07:49:03 +0000 |
|---|---|---|
| committer | Andrej Zverev <az@FreeBSD.org> | 2006-05-03 07:49:03 +0000 |
| commit | 108b2f95228cfe204a3642b6cf294326eda6838c (patch) | |
| tree | e464bc3280f05f73c9a37f8b9ab8a1d69e616056 /ftp/proftpd | |
| parent | ef7f35d623efe0f2e05d34665bc283ed5c1df044 (diff) | |
| download | ports-108b2f95228cfe204a3642b6cf294326eda6838c.tar.gz ports-108b2f95228cfe204a3642b6cf294326eda6838c.zip | |
- Update to version 1.3.0
- Fixed makefile syntax after ports/96141
-
PR: ports/96630
Submitted by: Beecher Rintoul <akbeech@gmail.com>
Approved by: Beech Rintoul <beech@mangohealth.org> (maintainer)
Notes
Notes:
svn path=/head/; revision=161256
Diffstat (limited to 'ftp/proftpd')
| -rw-r--r-- | ftp/proftpd/Makefile | 9 | ||||
| -rw-r--r-- | ftp/proftpd/distinfo | 6 | ||||
| -rw-r--r-- | ftp/proftpd/files/extra-patch-module-mod_ldap.c | 31 |
3 files changed, 40 insertions, 6 deletions
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile index 9b357128ac35..b84903971b44 100644 --- a/ftp/proftpd/Makefile +++ b/ftp/proftpd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= proftpd -DISTVERSION= 1.3.0rc3 +DISTVERSION= 1.3.0 PORTREVISION= 0 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ @@ -32,7 +32,6 @@ PORTDOCS= ${PORTDOCSdoc} ${PORTDOCScontrib} USE_GMAKE= yes GNU_CONFIGURE= yes USE_BZIP2= yes -USE_REINPLACE= yes USE_RC_SUBR= proftpd.sh @@ -53,7 +52,7 @@ OPTIONS= IPV6 "Use IPv6" off \ WRAP "Include mod_wrap" on \ RADIUS "Include mod_radius" off -MODULES?= +MODULES?= .include <bsd.port.pre.mk> @@ -126,6 +125,10 @@ USE_OPENSSL= yes .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 --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo index 56be108e1985..e9d4f19c0005 100644 --- a/ftp/proftpd/distinfo +++ b/ftp/proftpd/distinfo @@ -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 --git a/ftp/proftpd/files/extra-patch-module-mod_ldap.c b/ftp/proftpd/files/extra-patch-module-mod_ldap.c new file mode 100644 index 000000000000..632264c44c44 --- /dev/null +++ b/ftp/proftpd/files/extra-patch-module-mod_ldap.c @@ -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 |