Attachment 99798 Details for Bug 138977 – patch-proftpd.diff

[patch] patch-proftpd.diff

patch-proftpd.diff (text/plain), 8.44 KB, created by Chris Petrik on 2009-10-12 10:18:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Petrik

Created: 2009-10-12 10:18:04 UTC

Size: 8.44 KB

patch

obsolete

>Index: proftpd/Makefile
>===================================================================
>RCS file: /usr/ncvs/ports/ftp/proftpd/Makefile,v
>retrieving revision 1.158
>diff -u -r1.158 Makefile
>--- proftpd/Makefile	11 Oct 2009 11:53:06 -0000	1.158
>+++ proftpd/Makefile	12 Oct 2009 08:56:06 -0000
>@@ -107,7 +107,9 @@
> MODULES:=${MODULES}:mod_wrap2
> INCLUDEDIRS:=${INCLUDEDIRS}:${WORKDIR}/include
> LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
>-PLIST_FILES+=	include/proftpd/mod_wrap2.h
>+PLIST_SUB+=	WRAP=""
>+.else
>+PLIST_SUB+=	WRAP="@comment "
> .endif
> 
> .if defined(WITH_WRAP_FILE)
>@@ -190,7 +192,9 @@
> 
> .if ${MODULES:M*mod_sql_*}
> MODULES:=mod_sql${MODULES}
>-PLIST_FILES+=	include/proftpd/mod_sql.h
>+PLIST_SUB+=	SQL=""
>+.else
>+PLIST_SUB+=	SQL="@comment "
> .endif
> 
> .if defined(WITH_OPENSSL)
>@@ -202,15 +206,19 @@
> 
> .if defined(WITH_CTRLS)
> CONFIGURE_ARGS+=	--enable-ctrls
>-PLIST_FILES+=	sbin/ftpdctl
> .if !defined(WITHOUT_CTRLS_ADMIN)
> MODULES:=${MODULES}:mod_ctrls_admin
> .endif
>+PLIST_SUB+=	CTRLS_ADMIN=""
>+.else
>+PLIST_SUB+=	CTRLS_ADMIN="@comment "
> .endif
> 
> .if defined(WITH_QUOTA)
> MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file
>-PLIST_FILES+=	include/proftpd/mod_quotatab.h
>+PLIST_SUB+=	QUOTA=""
>+.else
>+PLIST_SUB+=	QUOTA="@comment "
> .if defined(WITH_LDAP)
> MODULES:=${MODULES}:mod_quotatab_ldap
> .endif
>@@ -243,7 +251,9 @@
> EXTRACT_ONLY+=	mod_sql_tds-4.11.tar.bz2
> MODULES:=${MODULES}:mod_sql_tds
> MODULES:=mod_sql${MODULES}
>-PLIST_FILES+=	include/proftpd/mod_sql.h
>+PLIST_SUB+=	TDS=""
>+.else
>+PLIST_SUB+=	TDS="@comment "
> INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
> LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
> LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds
>Index: proftpd/pkg-plist
>===================================================================
>RCS file: /usr/ncvs/ports/ftp/proftpd/pkg-plist,v
>retrieving revision 1.26
>diff -u -r1.26 pkg-plist
>--- proftpd/pkg-plist	23 Sep 2009 13:34:35 -0000	1.26
>+++ proftpd/pkg-plist	12 Oct 2009 08:47:43 -0000
>@@ -34,6 +34,10 @@
> include/proftpd/log.h
> include/proftpd/mkhome.h
> %%CLAMAV%%include/proftpd/mod_clamav.h
>+%%WRAP%%include/proftpd/mod_wrap2.h
>+%%SQL%%include/proftpd/mod_sql.h
>+%%TDS%%include/proftpd/mod_sql.h
>+%%QUOTA%%include/proftpd/mod_quotatab.h
> include/proftpd/mod_ctrls.h
> include/proftpd/modules.h
> include/proftpd/netacl.h
>@@ -64,6 +68,7 @@
> sbin/ftpshut
> sbin/in.proftpd
> sbin/proftpd
>+%%CTRLS_ADMIN%%sbin/ftpdctl
> %%NLS%%share/locale/zh_CN/LC_MESSAGES/proftpd.mo
> %%NLS%%share/locale/en_US/LC_MESSAGES/proftpd.mo
> %%NLS%%share/locale/it_IT/LC_MESSAGES/proftpd.mo
>Index: proftpd-devel/Makefile
>===================================================================
>RCS file: /usr/ncvs/ports/ftp/proftpd-devel/Makefile,v
>retrieving revision 1.147
>diff -u -r1.147 Makefile
>--- proftpd-devel/Makefile	19 Sep 2009 13:59:51 -0000	1.147
>+++ proftpd-devel/Makefile	12 Oct 2009 08:35:38 -0000
>@@ -6,9 +6,13 @@
> #
> 
> PORTNAME=	proftpd
>-DISTVERSION=	1.3.20080922
>+#DISTVERSION=	1.3.3rc1
>+PORTVERSION=	1.3.3rc1
> CATEGORIES=	ftp
>-MASTER_SITES=	http://www.alaskaparadise.com/freebsd/ \
>+MASTER_SITES=	ftp://ftp.proftpd.org/distrib/source/ \
>+		ftp://ftp1.at.proftpd.org/distrib/source/ \
>+		ftp://ftp1.ca.proftpd.org/distrib/source/ \
>+		ftp://ftp1.us.proftpd.org/distrib/source/ \
> 		LOCAL/beech \
> 		LOCAL/beech:clam \
> 		LOCAL/beech:digest
>@@ -19,11 +23,9 @@
> MAINTAINER?=	chris@officialunix.com
> COMMENT?=	Highly configurable ftp daemon
> 
>-IGNORE=		Please use ftp/proftpd
>-
> MAN1=	ftpcount.1 ftpwho.1 ftptop.1
> MAN5=	xferlog.5
>-MAN8=	proftpd.8 ftpshut.8 ftpdctl.8
>+MAN8=	proftpd.8 ftpshut.8 ftpdctl.8 ftpscrub.8
> 
> PORTDOCSdoc=	Configuration.html faq.html
> PORTDOCScontrib=mod_ifsession.html mod_radius.html mod_rewrite.html \
>@@ -106,7 +108,9 @@
> MODULES:=${MODULES}:mod_wrap2
> INCLUDEDIRS:=${INCLUDEDIRS}:${WORKDIR}/include
> LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
>-PLIST_FILES+=	include/proftpd/mod_wrap2.h
>+PLIST_SUB+=	WRAP=""
>+.else
>+PLIST_SUB+=	WRAP="@comment "
> .endif
> 
> .if defined(WITH_WRAP_FILE)
>@@ -201,7 +205,9 @@
> 
> .if ${MODULES:M*mod_sql_*}
> MODULES:=mod_sql${MODULES}
>-PLIST_FILES+=	include/proftpd/mod_sql.h
>+PLIST_SUB+=	SQL=""
>+.else
>+PLIST_SUB+=	SQL="@comment "
> .endif
> 
> .if defined(WITH_OPENSSL)
>@@ -209,19 +215,26 @@
> CFLAGS+=	-DHAVE_OPENSSL -I${OPENSSLINC}
> PROFTPD_LIBS+=	-lssl -lcrypto -L${OPENSSLLIB}
> MODULES:=${MODULES}:mod_tls
>+PLIST_SUB+=	TLS=""
>+.else
>+PLIST_SUB+=	TLS="@comment "
> .endif
> 
> .if defined(WITH_CTRLS)
> CONFIGURE_ARGS+=	--enable-ctrls
>-PLIST_FILES+=	sbin/ftpdctl
> .if !defined(WITHOUT_CTRLS_ADMIN)
> MODULES:=${MODULES}:mod_ctrls_admin
> .endif
>+PLIST_SUB+=	CTRLS_ADMIN=""
>+.else
>+PLIST_SUB+=	CTRLS_ADMIN="@comment "
> .endif
> 
> .if defined(WITH_QUOTA)
> MODULES:=${MODULES}:mod_quotatab:mod_quotatab_file
>-PLIST_FILES+=	include/proftpd/mod_quotatab.h
>+PLIST_SUB+=	QUOTA=""
>+.else
>+PLIST_SUB+=	QUOTA="@comment "
> .if defined(WITH_LDAP)
> MODULES:=${MODULES}:mod_quotatab_ldap
> .endif
>@@ -235,18 +248,17 @@
> .endif
> 
> .if defined(WITH_CLAMAV)
>-#http://www.thrallingpenguin.com/resources/mod_clamav-0.10.tar.bz2
>-DISTFILES+=	mod_clamav-0.10.tar.bz2:clam
>-EXTRACT_ONLY+=	mod_clamav-0.10.tar.bz2
>+DISTFILES+=	mod_clamav-0.11rc.tar.gz:clam
>+EXTRACT_ONLY+=	mod_clamav-0.11rc.tar.gz
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-modules_mod_xfer.c
> USE_CLAMAV=	yes
> MODULES:=${MODULES}:mod_clamav
> LIB_DEPENDS+=	clamav.6:${PORTSDIR}/security/clamav
> INCLUDEDIRS:=${INCLUDEDIRS}:${LOCALBASE}/include
> LIBDIRS:=${LIBDIRS}:${LOCALBASE}/lib
>-PLIST_SUB=	CLAMAV=""
>+PLIST_SUB+=	CLAMAV=""
> .else
>-PLIST_SUB=	CLAMAV="@comment "
>+PLIST_SUB+=	CLAMAV="@comment "
> .endif
> 
> .if defined(WITH_DIGEST)
>Index: proftpd-devel/distinfo
>===================================================================
>RCS file: /usr/ncvs/ports/ftp/proftpd-devel/distinfo,v
>retrieving revision 1.47
>diff -u -r1.47 distinfo
>--- proftpd-devel/distinfo	23 Sep 2008 07:01:53 -0000	1.47
>+++ proftpd-devel/distinfo	12 Oct 2009 05:31:00 -0000
>@@ -1,9 +1,12 @@
>-MD5 (proftpd-1.3.20080922.tar.bz2) = 5ee6eda1ef2beaacc01449b290e74461
>-SHA256 (proftpd-1.3.20080922.tar.bz2) = 0da28a00ac939929150e99c65a2303389889fa80ace6c169b0ff5196ed2a3e3a
>-SIZE (proftpd-1.3.20080922.tar.bz2) = 2330925
>-MD5 (mod_clamav-0.10.tar.bz2) = 7150cde88f6c692711c007f6312bd495
>-SHA256 (mod_clamav-0.10.tar.bz2) = 4f6d09979514a8b3f120890753dcf7c6247dfce0aa09d340edf8a359b031a1f4
>-SIZE (mod_clamav-0.10.tar.bz2) = 5435
>+MD5 (proftpd-1.3.3rc1.tar.bz2) = 23b8674208cceba595512c5d188a5f5d
>+SHA256 (proftpd-1.3.3rc1.tar.bz2) = db0f658ca261f8bf8b8724b669d89d4ebe1ad26b32de4f30f7beba93a674f811
>+SIZE (proftpd-1.3.3rc1.tar.bz2) = 4077391
>+MD5 (mod_clamav-0.11rc.tar.gz) = 42e560ec0bd5964e13fad1b2bb7afe21
>+SHA256 (mod_clamav-0.11rc.tar.gz) = 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a
>+SIZE (mod_clamav-0.11rc.tar.gz) = 5115
> MD5 (mod_digest.c) = e706e66fa4d82cf7875a1a5d6767fe00
> SHA256 (mod_digest.c) = 18174e3d3c1d61367d78c228e6510b0a21c11458f389630df281bb84d467d399
> SIZE (mod_digest.c) = 39073
>+MD5 (mod_sql_tds-4.11.tar.bz2) = 217d85806093f71cfe746838a7a9970d
>+SHA256 (mod_sql_tds-4.11.tar.bz2) = 0fea4bc2107fb61d7ee45f3913007876f5d95d95dff00a3f355ad50437f1ecff
>+SIZE (mod_sql_tds-4.11.tar.bz2)  = 11254
>Index: proftpd-devel/pkg-plist
>===================================================================
>RCS file: /usr/ncvs/ports/ftp/proftpd-devel/pkg-plist,v
>retrieving revision 1.25
>diff -u -r1.25 pkg-plist
>--- proftpd-devel/pkg-plist	23 Sep 2008 07:01:53 -0000	1.25
>+++ proftpd-devel/pkg-plist	12 Oct 2009 08:26:59 -0000
>@@ -11,6 +11,7 @@
> include/proftpd/buildstamp.h
> include/proftpd/child.h
> include/proftpd/class.h
>+include/proftpd/cmd.h
> include/proftpd/compat.h
> include/proftpd/conf.h
> include/proftpd/config.h
>@@ -24,6 +25,7 @@
> include/proftpd/event.h
> include/proftpd/expr.h
> include/proftpd/feat.h
>+include/proftpd/filter.h
> include/proftpd/fsio.h
> include/proftpd/ftp.h
> include/proftpd/glibc-glob.h
>@@ -32,8 +34,12 @@
> include/proftpd/libsupp.h
> include/proftpd/log.h
> include/proftpd/mkhome.h
>-%%CLAMAV%%include/proftpd/mod_clamav.h
> include/proftpd/mod_ctrls.h
>+%%CLAMAV%%include/proftpd/mod_clamav.h
>+%%WRAP%%include/proftpd/mod_wrap2.h
>+%%SQL%%include/proftpd/mod_sql.h
>+%%TLS%%include/proftpd/mod_tls.h
>+%%QUOTA%%include/proftpd/mod_quotatab.h
> include/proftpd/modules.h
> include/proftpd/netacl.h
> include/proftpd/netaddr.h
>@@ -49,6 +55,7 @@
> include/proftpd/regexp.h
> include/proftpd/response.h
> include/proftpd/scoreboard.h
>+include/proftpd/session.h
> include/proftpd/sets.h
> include/proftpd/str.h
> include/proftpd/support.h
>@@ -63,5 +70,7 @@
> sbin/ftpshut
> sbin/in.proftpd
> sbin/proftpd
>+sbin/ftpscrub
>+%%CTRLS_ADMIN%%sbin/ftpdctl
> @dirrm include/proftpd
> @dirrm lib/proftpd

Actions: View | Diff

Attachments on bug 138977: 99796 | 99797 | 99798 | 99799