ports/96307: [PATCH] ftp/proftpd: [SUMMARIZE CHANGES]

Beecher Rintoul akbeech at gmail.com
Tue Apr 25 09:00:36 UTC 2006 

>Number:         96307
>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:   Tue Apr 25 09:00:35 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 #59: Sun Apr 23 06:12:48 AKDT 2006
>Description:
[DESCRIBE CHANGES]

Added file(s):
- Makefile~

Port maintainer (mharo at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>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 Apr 24 23:32:11 2006
+++ /usr/ports/ftp/proftpd/Makefile	Tue Apr 25 00:53:20 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,8 @@
 		WRAP "Include mod_wrap" on \
 		RADIUS "Include mod_radius" off
 
-MODULES?=	
-
-.include <bsd.port.pre.mk>
+MODULES?=
+.include <bsd.port.pre.mk>  
 
 .if defined(WITH_RATIO)
 MODULES:=${MODULES}:mod_ratio
diff -ruN --exclude=CVS /usr/ports/ftp/proftpd.orig/Makefile~ /usr/ports/ftp/proftpd/Makefile~
--- /usr/ports/ftp/proftpd.orig/Makefile~	Wed Dec 31 14:00:00 1969
+++ /usr/ports/ftp/proftpd/Makefile~	Tue Apr 25 00:52:32 2006
@@ -0,0 +1,205 @@
+# New ports collection makefile for:	proftpd
+# Date created:		26 January 1998
+# Whom:			Stephane Legrand
+#
+# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.82 2005/11/29 17:50:27 flz Exp $
+#
+
+PORTNAME=	proftpd
+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/ \
+		ftp://ftp.dataguard.no/ftp/pub/proftpd/distrib/source/ \
+		ftp://spirit.bentel.sk/mirrors/Proftpd/distrib/source/ \
+		ftp://proftpd.networkedsystems.co.uk/distrib/source/ \
+		ftp://ftp.ethereal.com/mirrors/ftp.proftpd.org/distrib/source/ \
+		ftp://mirror.cybercomm.nl/pub/proftpd/distrib/source/
+
+MAINTAINER?=	mharo at FreeBSD.org
+COMMENT?=	Highly configurable ftp daemon
+
+MAN1=	ftpcount.1 ftpwho.1 ftptop.1
+MAN5=	xferlog.5
+MAN8=	proftpd.8 ftpshut.8 ftpdctl.8
+
+PORTDOCSdoc=	Configuration.html faq.html
+PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \
+		mod_tls.html mod_wrap.html ftpasswd.html
+PORTDOCS=	${PORTDOCSdoc} ${PORTDOCScontrib}
+
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
+USE_REINPLACE=	yes
+
+USE_RC_SUBR=	proftpd.sh
+
+CONFIGURE_ARGS=	--localstatedir=/var/run \
+		--sysconfdir=${EXAMPLESDIR}/etc \
+		--disable-sendfile
+
+OPTIONS=	IPV6 "Use IPv6" off \
+		LDAP "Use LDAP" off \
+		MYSQL "Use MySQL" off \
+		POSTGRESQL "Use Postgres" off \
+		OPENSSL "Include mod_tls" off \
+		QUOTA "Include mod_quota" off \
+		IFSESSION "Include mod_ifsession" on \
+		README "Include mod_readme" on \
+		RATIO "Include mod_ratio" on \
+		REWRITE "Include mod_rewrite" on \
+		WRAP "Include mod_wrap" on \
+		RADIUS "Include mod_radius" off
+
+MODULES?=
+.include <bsd.port.pre.mk>
+
+
+.if defined(WITH_RATIO)
+MODULES:=${MODULES}:mod_ratio
+.endif
+
+.if defined(WITH_README)
+MODULES:=${MODULES}:mod_readme
+.endif
+
+.if defined(WITH_REWRITE)
+MODULES:=${MODULES}:mod_rewrite
+.endif
+
+.if defined(WITH_WRAP)
+MODULES:=${MODULES}:mod_wrap
+.endif
+
+.if defined(WITH_RADIUS)
+MODULES:=${MODULES}:mod_radius
+.endif
+
+.if defined(WITH_SETPASSENT)
+CONFIGURE_ARGS+=	--enable-force-setpassent
+.endif
+
+.if defined(WITHOUT_PAM)
+CONFIGURE_ARGS+=	--disable-auth-pam
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+.if defined(WITHOUT_IPV6)
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+#allow user to override
+MODULES?=	mod_ratio:mod_readme:mod_rewrite:mod_wrap:mod_ifsession
+
+INCLUDEDIRS=
+LIBDIRS=
+
+.if defined(WITH_LDAP)
+USE_OPENLDAP=	yes
+MODULES:=${MODULES}:mod_ldap
+INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
+LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
+.endif
+
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+MODULES:=${MODULES}:mod_sql:mod_sql_mysql
+INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
+LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib/mysql
+.endif
+
+.if defined(WITH_POSTGRESQL)
+USE_PGSQL=	yes
+MODULES:=${MODULES}:mod_sql:mod_sql_postgres
+INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
+LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
+.endif
+
+.if defined(WITH_OPENSSL)
+CFLAGS+=	-DHAVE_OPENSSL
+USE_OPENSSL=	yes
+.include <${PORTSDIR}/Mk/bsd.openssl.mk>
+PROFTPD_LIBS+=	-lssl -lcrypto -L${LOCALBASE}/lib
+MODULES:=${MODULES}:mod_tls
+.endif
+
+.if defined(WITH_CTRLS)
+CONFIGURE_ARGS+=	--enable-ctrls
+PLIST_FILES+=	sbin/ftpdctl
+.if !defined(WITHOUT_CTRLS_ADMIN)
+MODULES:=${MODULES}:mod_ctrls_admin
+.endif
+.endif
+
+.if defined(WITH_QUOTA)
+MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file
+.if defined(WITH_LDAP)
+MODULES:=${MODULES}:mod_quotatab_ldap
+.endif
+.if defined(WITH_POSTGRESQL) || defined(WITH_MYSQL)
+MODULES:=${MODULES}:mod_quotatab_sql
+.endif
+.endif
+
+# mod_ifsession should be the last item in the modules list
+.if defined(WITH_IFSESSION)
+MODULES:=${MODULES}:mod_ifsession
+.endif
+
+# Keep this here below, in case similar constructs need to be made
+CONFIGURE_ENV+=	"LIBS=${PROFTPD_LIBS}"
+
+.if !empty(MODULES)
+CONFIGURE_ARGS+=	--with-modules=${MODULES}
+.endif
+
+.if !empty(INCLUDEDIRS)
+CONFIGURE_ARGS+=	--with-includes=${INCLUDEDIRS}
+.endif
+
+.if !empty(LIBDIRS)
+CONFIGURE_ARGS+=	--with-libraries=${LIBDIRS}
+.endif
+
+MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,'
+
+pre-configure:
+	@${ECHO_MSG} "==> Configuring with ${MODULES}"
+
+post-configure:
+	${REINPLACE_CMD} -e 's:${EXAMPLESDIR}:${PREFIX}:' ${WRKSRC}/config.h
+	${REINPLACE_CMD} -e 's: -lnsl::' ${WRKSRC}/Make.rules
+	${REINPLACE_CMD} -e 's:/usr/sbin:${PREFIX}/sbin:' \
+		-e 's:/usr/bin:${PREFIX}/bin:' \
+		${WRKSRC}/src/proftpd.8 ${WRKSRC}/utils/ftpshut.8 \
+		${WRKSRC}/utils/ftpcount.1
+
+post-install:
+	[ -f ${PREFIX}/etc/proftpd.conf ] || \
+		${CP} ${EXAMPLESDIR}/etc/proftpd.conf ${PREFIX}/etc/proftpd.conf
+
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/proftpd
+.for f in ${PORTDOCSdoc}
+	@${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/proftpd
+.endfor
+.for f in ${PORTDOCScontrib}
+	@${INSTALL_DATA} ${WRKSRC}/doc/contrib/${f} ${PREFIX}/share/doc/proftpd
+.endfor
+.endif
+
+.if !defined(WITHOUT_PAM)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
+.if defined(WITH_CTRLS)
+	@${INSTALL_PROGRAM} ${WRKSRC}/ftpdctl ${PREFIX}/sbin/ftpdctl
+	@${INSTALL_MAN} ${WRKSRC}/src/ftpdctl.8 ${PREFIX}/man/man8/ftpdctl.8
+.endif
+
+.include <bsd.port.post.mk>
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 Apr 24 23:45:55 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
--- proftpd-1.3.0_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list