Add to UPDATING - Move /usr/local/include/getopt.h so port will build on 4x machines with libgnugetopt installed. Fix: Add to ports/UPDATING: 20060516: AFFECTS: users of ftp/proftpd > 1.3.0 AUTHOR: beech@mangohealth.org Proftpd 1.3.0 will not build on 4x machines with libgnugetopt installed. Move or rename /usr/local/include/getopt.h before building.
Responsible Changed From-To: freebsd-ports-bugs->itetcu I have 2 others PRs for this port
State Changed From-To: open->suspended Suspended waiting for the proper fix from maintainer
This patch addresses all open pr's: diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile /usr/ports/ftp/proftpd/Makefile --- /usr/ports/ftp/proftpd.orig/Makefile Wed May 10 13:32:16 2006 +++ /usr/ports/ftp/proftpd/Makefile Wed May 17 03:15:30 2006 @@ -2,12 +2,12 @@ # Date created: 26 January 1998 # Whom: Stephane Legrand # -# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.85 2006/05/10 21:32:16 ehaupt Exp $ +# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.84 2006/05/03 07:49:02 az Exp $ # PORTNAME= proftpd DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -41,6 +41,7 @@ OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ + LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\ MYSQL "Use MySQL" off \ POSTGRESQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ @@ -52,9 +53,15 @@ WRAP "Include mod_wrap" on \ RADIUS "Include mod_radius" off +MODULES?= + .include <bsd.port.pre.mk> -MODULES?= +.if ${OSVERSION} < 500000 +.if exists (${LOCALBASE}/include/getopt.h) +BROKEN= Does not build when libgnugetopt is installed +.endif +.endif .if defined(WITH_RATIO) MODULES:=${MODULES}:mod_ratio @@ -125,6 +132,9 @@ .include <${PORTSDIR}/Mk/bsd.openssl.mk> PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib MODULES:=${MODULES}:mod_tls +.if defined(WITH_LDAP_TLS) +EXTRA_PATCHES=${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c +.endif .endif .if defined(WITH_CTRLS) diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra_patch-ldap-tls-mod_ldap.c /usr/ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c --- /usr/ports/ftp/proftpd.orig/files/extra_patch-ldap-tls-mod_ldap.c Wed Dec 31 14:00:00 1969 +++ /usr/ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c Mon May 8 13:34:45 2006 @@ -0,0 +1,8 @@ +--- 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 -- --------------------------------------------------------------------------------------- Beech Rintoul - Sys. Administrator - beech@mangohealth.org /"\ ASCII Ribbon Campaign | Mangohealth \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - XanGo - http://www.mangohealth.org ---------------------------------------------------------------------------------------
On Wed, 17 May 2006 03:24:43 -0800 Beech Rintoul <beech@mangohealth.org> wrote: > This patch addresses all open pr's: All non-closed, I think :) Thanks for a single patch. -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" BOFH excuse #87: Password is too complex to decrypt
State Changed From-To: suspended->open nex pach received
Could you please check the way you use OPTIONS against the respective PH chapter ? (check "on" options against WITHOUT and "off" against WITH) (I don't think you actually break something because the "bug" mentioned there only affects make depend /describe, but let's be consistent). Thanks, -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" BOFH excuse #48: bad ether in the cables
State Changed From-To: open->feedback Ask for maintainer fix.
On Wednesday 17 May 2006 03:56, you wrote: > Could you please check the way you use OPTIONS against the respective > PH chapter ? (check "on" options against WITHOUT and "off" against WITH) > (I don't think you actually break something because the "bug" mentioned > there only affects make depend /describe, but let's be consistent). I reread the chapter and looked over the options. I don't see a problem and all of the options are working correctly. Most of the options were already set when I inherited the port and tested to work. I tested them again when I did the upgrade. Beech -- --------------------------------------------------------------------------------------- Beech Rintoul - Sys. Administrator - beech@mangohealth.org /"\ ASCII Ribbon Campaign | Mangohealth \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - XanGo - http://www.mangohealth.org ---------------------------------------------------------------------------------------
OK, I fixed those options. You might want to double check my code before committing. diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile /usr/ports/ftp/proftpd/Makefile --- /usr/ports/ftp/proftpd.orig/Makefile Wed May 10 13:32:16 2006 +++ /usr/ports/ftp/proftpd/Makefile Wed May 17 14:28:44 2006 @@ -2,12 +2,12 @@ # Date created: 26 January 1998 # Whom: Stephane Legrand # -# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.85 2006/05/10 21:32:16 ehaupt Exp $ +# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.84 2006/05/03 07:49:02 az Exp $ # PORTNAME= proftpd DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -41,6 +41,7 @@ OPTIONS= IPV6 "Use IPv6" off \ LDAP "Use LDAP" off \ + LDAP_TLS "Use LDAP TLS (Requires LDAP)" off\ MYSQL "Use MySQL" off \ POSTGRESQL "Use Postgres" off \ OPENSSL "Include mod_tls" off \ @@ -52,23 +53,29 @@ WRAP "Include mod_wrap" on \ RADIUS "Include mod_radius" off +MODULES?= + .include <bsd.port.pre.mk> -MODULES?= +.if ${OSVERSION} < 500000 +.if exists (${LOCALBASE}/include/getopt.h) +BROKEN= Does not build when libgnugetopt is installed +.endif +.endif -.if defined(WITH_RATIO) +.if !defined(WITHOUT_RATIO) MODULES:=${MODULES}:mod_ratio .endif -.if defined(WITH_README) +.if !defined(WITHOUT_README) MODULES:=${MODULES}:mod_readme .endif -.if defined(WITH_REWRITE) +.if !defined(WITHOUT_REWRITE) MODULES:=${MODULES}:mod_rewrite .endif -.if defined(WITH_WRAP) +.if !defined(WITHOUT_WRAP) MODULES:=${MODULES}:mod_wrap .endif @@ -88,7 +95,7 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif -.if defined(WITHOUT_IPV6) +.if !defined(WITH_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif @@ -125,6 +132,9 @@ .include <${PORTSDIR}/Mk/bsd.openssl.mk> PROFTPD_LIBS+= -lssl -lcrypto -L${LOCALBASE}/lib MODULES:=${MODULES}:mod_tls +.if defined(WITH_LDAP_TLS) +EXTRA_PATCHES=${FILESDIR}/extra_patch-ldap-tls-mod_ldap.c +.endif .endif .if defined(WITH_CTRLS) @@ -146,7 +156,7 @@ .endif # mod_ifsession should be the last item in the modules list -.if defined(WITH_IFSESSION) +.if !defined(WITHOUT_IFSESSION) MODULES:=${MODULES}:mod_ifsession .endif diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/files/extra_patch-ldap-tls-mod_ldap.c /usr/ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c --- /usr/ports/ftp/proftpd.orig/files/extra_patch-ldap-tls-mod_ldap.c Wed Dec 31 14:00:00 1969 +++ /usr/ports/ftp/proftpd/files/extra_patch-ldap-tls-mod_ldap.c Mon May 8 13:34:45 2006 @@ -0,0 +1,8 @@ +--- 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 --------------------------------------------------------------------------------------- Beech Rintoul - Sys. Administrator - beech@mangohealth.org /"\ ASCII Ribbon Campaign | Mangohealth \ / - NO HTML/RTF in e-mail | 201 East 9Th Avenue Ste.310 X - NO Word docs in e-mail | Anchorage, AK 99501 / \ - XanGo - http://www.mangohealth.org ---------------------------------------------------------------------------------------
State Changed From-To: feedback->open new patch received
State Changed From-To: open->closed Fix commited