Date: Sun, 20 Sep 2009 12:20:04 GMT From: Chris Petrik <c.petrik.sosa@gmail.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/138977 update ftp/proftpd ftp/proftpd-devel ftp/proftpd-mysql Message-ID: <200909201220.n8KCK40x022137@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/138977; it has been noted by GNATS. From: Chris Petrik <c.petrik.sosa@gmail.com> To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/138977 update ftp/proftpd ftp/proftpd-devel ftp/proftpd-mysql Date: Sun, 20 Sep 2009 07:16:39 -0500 This is a multi-part message in MIME format. --------------010509050505060404030001 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Please see the attached patch, this should fix the warnings portlint -AC displays. Also please remove ftp/proftpd-mysql as the current ftp/proftpd ftp/proftpd-devel gives the user a easy way of enabling such module. -- Chris Petrik Consulting: http://www.officialunix.com BSD Site: http://www.bsdjunk.com FreeBSD ports contributor Since 18-July-2009 --------------010509050505060404030001 Content-Type: text/plain; name="patch-proftpd" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="patch-proftpd" Index: proftpd/Makefile =================================================================== RCS file: /usr/ncvs/ports/ftp/proftpd/Makefile,v retrieving revision 1.154 diff -u -p -r1.154 Makefile --- proftpd/Makefile 19 Sep 2009 13:59:50 -0000 1.154 +++ proftpd/Makefile 20 Sep 2009 11:40:49 -0000 @@ -2,11 +2,11 @@ # Date created: 26 January 1998 # Whom: Stephane Legrand # -# $FreeBSD: ports/ftp/proftpd/Makefile,v 1.154 2009/09/19 13:59:50 miwi Exp $ +# $FreeBSD$ # PORTNAME= proftpd -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.2a CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -20,11 +20,9 @@ MASTER_SITES= ftp://ftp.proftpd.org/dist http://www.smartftp.com/oss/proftpd/:digest \ LOCAL/beech:digest \ LOCAL/beech:sql_tds -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER?= chris@officialunix.com -COMMENT?= Highly configurable ftp daemon +MAINTAINER= chris@officialunix.com +COMMENT= Highly configurable ftp daemon MAN1= ftpcount.1 ftpwho.1 ftptop.1 MAN5= xferlog.5 @@ -240,8 +238,8 @@ MODULES:=${MODULES}:mod_digest .endif .if defined(WITH_TDS) -DISTFILES+= mod_sql_tds-4.9.tar.bz2:sql_tds -EXTRACT_ONLY+= mod_sql_tds-4.9.tar.bz2 +DISTFILES+= mod_sql_tds-4.11.tar.bz2:sql_tds +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 @@ -270,6 +268,8 @@ CONFIGURE_ARGS+= --with-includes=${INCLU CONFIGURE_ARGS+= --with-libraries=${LIBDIRS} .endif +#Todo: Fix this to not use != if possible +# Will leave as is for now. MODULES!=${ECHO} ${MODULES} | ${SED} -e 's,^:,,' -e 's,:$$,,' post-extract: Index: proftpd/distinfo =================================================================== RCS file: /usr/ncvs/ports/ftp/proftpd/distinfo,v retrieving revision 1.52 diff -u -p -r1.52 distinfo --- proftpd/distinfo 28 Jul 2009 10:02:12 -0000 1.52 +++ proftpd/distinfo 20 Sep 2009 09:36:41 -0000 @@ -1,12 +1,12 @@ -MD5 (proftpd-1.3.2.tar.bz2) = 89f5e31fc3d3e02b66424dfc6cc5892d -SHA256 (proftpd-1.3.2.tar.bz2) = 1cadcaf9bb0ff8a2fddcc20fc93844568cf52db872a3aea9f90ab22efa7baf1e -SIZE (proftpd-1.3.2.tar.bz2) = 2457498 +MD5 (proftpd-1.3.2a.tar.bz2) = ad3cbb5db30c5ae39e09b308892392b3 +SHA256 (proftpd-1.3.2a.tar.bz2) = 59d5ff059763d23c0693b0e73ebb6de35a2ab38280994c4b8e7c3f0067af5dcd +SIZE (proftpd-1.3.2a.tar.bz2) = 2506692 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.9.tar.bz2) = 71b8372a90f382cf6049fe0e32747492 -SHA256 (mod_sql_tds-4.9.tar.bz2) = 712f9e43d2443b292626483bea22b42535e76a21d0a83779f8b622ff773b1cf5 -SIZE (mod_sql_tds-4.9.tar.bz2) = 11062 +MD5 (mod_sql_tds-4.11.tar.bz2) = 217d85806093f71cfe746838a7a9970d +SHA256 (mod_sql_tds-4.11.tar.bz2) = 0fea4bc2107fb61d7ee45f3913007876f5d95d95dff +SIZE (mod_sql_tds-4.11.tar.bz2) = 11254 Index: proftpd/pkg-plist =================================================================== RCS file: /usr/ncvs/ports/ftp/proftpd/pkg-plist,v retrieving revision 1.25 diff -u -p -r1.25 pkg-plist --- proftpd/pkg-plist 27 Jan 2009 15:21:06 -0000 1.25 +++ proftpd/pkg-plist 19 Sep 2009 23:17:32 -0000 @@ -68,13 +68,22 @@ sbin/proftpd %%NLS%%share/locale/en_US/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/it_IT/LC_MESSAGES/proftpd.mo %%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo -%%NLS%%@dirrm share/locale/zh_CN/LC_MESSAGES -%%NLS%%@dirrm share/locale/en_US/LC_MESSAGES -%%NLS%%@dirrm share/locale/it_IT/LC_MESSAGES -%%NLS%%@dirrm share/locale/ru_RU/LC_MESSAGES -%%NLS%%@dirrm share/locale/zh_CN -%%NLS%%@dirrm share/locale/en_US -%%NLS%%@dirrm share/locale/it_IT -%%NLS%%@dirrm share/locale/ru_RU +%%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo +%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/bg_BG/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fr_FR/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN +%%NLS%%@dirrmtry share/locale/en_US +%%NLS%%@dirrmtry share/locale/it_IT +%%NLS%%@dirrmtry share/locale/ru_RU +%%NLS%%@dirrmtry share/locale/bg_BG +%%NLS%%@dirrmtry share/locale/fr_FR +%%NLS%%@dirrmtry share/locale/ko_KR @dirrm include/proftpd @dirrmtry lib/proftpd Index: proftpd/files/patch-doc-Configuration.html =================================================================== RCS file: proftpd/files/patch-doc-Configuration.html diff -N proftpd/files/patch-doc-Configuration.html --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ proftpd/files/patch-doc-Configuration.html 19 Sep 2009 23:17:32 -0000 @@ -0,0 +1,18 @@ +--- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003 ++++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003 +@@ -4226,7 +4226,7 @@ + ></DT + ><DD + ><P +->ftp</P ++>ftpd</P + ></DD + ><DT + ><PRE +@@ -32252,4 +32252,4 @@ + ></DIV + ></BODY + ></HTML +-> +\ No newline at end of file ++> Index: proftpd/files/patch-doc::Configuration.html =================================================================== RCS file: proftpd/files/patch-doc::Configuration.html diff -N proftpd/files/patch-doc::Configuration.html --- proftpd/files/patch-doc::Configuration.html 24 Mar 2003 13:33:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ ---- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003 -+++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003 -@@ -4226,7 +4226,7 @@ - ></DT - ><DD - ><P -->ftp</P -+>ftpd</P - ></DD - ><DT - ><PRE -@@ -32252,4 +32252,4 @@ - ></DIV - ></BODY - ></HTML --> -\ No newline at end of file -+> Index: proftpd-devel/Makefile =================================================================== RCS file: /usr/ncvs/ports/ftp/proftpd/Makefile,v retrieving revision 1.154 diff -u -p -r1.154 Makefile --- proftpd-devel/Makefile 19 Sep 2009 13:59:50 -0000 1.154 +++ proftpd-devel/Makefile 20 Sep 2009 11:46:06 -0000 @@ -6,7 +6,7 @@ # PORTNAME= proftpd -PORTVERSION= 1.3.2 +PORTVERSION= 1.3.3rc1 CATEGORIES= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ ftp://ftp.fastorama.com/mirrors/ftp.proftpd.org/distrib/source/ \ @@ -20,15 +20,13 @@ MASTER_SITES= ftp://ftp.proftpd.org/dist http://www.smartftp.com/oss/proftpd/:digest \ LOCAL/beech:digest \ LOCAL/beech:sql_tds -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER?= chris@officialunix.com -COMMENT?= Highly configurable ftp daemon +MAINTAINER= chris@officialunix.com +COMMENT= Highly configurable ftp daemon 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 MAKE_JOBS_UNSAFE= yes PORTDOCSdoc= Configuration.html faq.html @@ -198,6 +196,7 @@ PLIST_FILES+= include/proftpd/mod_sql.h CFLAGS+= -DHAVE_OPENSSL -I${OPENSSLINC} PROFTPD_LIBS+= -lssl -lcrypto -L${OPENSSLLIB} MODULES:=${MODULES}:mod_tls +PLIST_FILES+= include/proftpd/mod_tls.h .endif .if defined(WITH_CTRLS) @@ -240,8 +239,8 @@ MODULES:=${MODULES}:mod_digest .endif .if defined(WITH_TDS) -DISTFILES+= mod_sql_tds-4.9.tar.bz2:sql_tds -EXTRACT_ONLY+= mod_sql_tds-4.9.tar.bz2 +DISTFILES+= mod_sql_tds-4.10.tar.bz2:sql_tds +EXTRACT_ONLY+= mod_sql_tds-4.10.tar.bz2 MODULES:=${MODULES}:mod_sql_tds MODULES:=mod_sql${MODULES} PLIST_FILES+= include/proftpd/mod_sql.h Index: proftpd-devel/distinfo =================================================================== RCS file: /usr/ncvs/ports/ftp/proftpd/distinfo,v retrieving revision 1.52 diff -u -p -r1.52 distinfo --- proftpd-devel/distinfo 28 Jul 2009 10:02:12 -0000 1.52 +++ proftpd-devel/distinfo 20 Sep 2009 11:37:23 -0000 @@ -1,12 +1,12 @@ -MD5 (proftpd-1.3.2.tar.bz2) = 89f5e31fc3d3e02b66424dfc6cc5892d -SHA256 (proftpd-1.3.2.tar.bz2) = 1cadcaf9bb0ff8a2fddcc20fc93844568cf52db872a3aea9f90ab22efa7baf1e -SIZE (proftpd-1.3.2.tar.bz2) = 2457498 +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.9.tar.bz2) = 71b8372a90f382cf6049fe0e32747492 -SHA256 (mod_sql_tds-4.9.tar.bz2) = 712f9e43d2443b292626483bea22b42535e76a21d0a83779f8b622ff773b1cf5 -SIZE (mod_sql_tds-4.9.tar.bz2) = 11062 +MD5 (mod_sql_tds-4.11.tar.bz2) = 217d85806093f71cfe746838a7a9970d +SHA256 (mod_sql_tds-4.11.tar.bz2) = 0fea4bc2107fb61d7ee45f3913007876f5d95d95dff +SIZE (mod_sql_tds-4.11.tar.bz2) = 11254 Index: proftpd-devel/pkg-plist =================================================================== RCS file: /usr/ncvs/ports/ftp/proftpd/pkg-plist,v retrieving revision 1.25 diff -u -p -r1.25 pkg-plist --- proftpd-devel/pkg-plist 27 Jan 2009 15:21:06 -0000 1.25 +++ proftpd-devel/pkg-plist 19 Sep 2009 23:41:25 -0000 @@ -16,6 +16,7 @@ include/proftpd/compat.h include/proftpd/conf.h include/proftpd/config.h include/proftpd/ctrls.h +include/proftpd/cmd.h include/proftpd/data.h include/proftpd/default_paths.h include/proftpd/dirtree.h @@ -27,6 +28,7 @@ include/proftpd/expr.h include/proftpd/feat.h include/proftpd/fsio.h include/proftpd/ftp.h +include/proftpd/filter.h include/proftpd/glibc-glob.h include/proftpd/help.h include/proftpd/inet.h @@ -50,6 +52,7 @@ include/proftpd/proftpd.h 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 @@ -64,17 +67,27 @@ libdata/pkgconfig/proftpd.pc sbin/ftpshut sbin/in.proftpd sbin/proftpd +sbin/ftpscrub %%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 %%NLS%%share/locale/ru_RU/LC_MESSAGES/proftpd.mo -%%NLS%%@dirrm share/locale/zh_CN/LC_MESSAGES -%%NLS%%@dirrm share/locale/en_US/LC_MESSAGES -%%NLS%%@dirrm share/locale/it_IT/LC_MESSAGES -%%NLS%%@dirrm share/locale/ru_RU/LC_MESSAGES -%%NLS%%@dirrm share/locale/zh_CN -%%NLS%%@dirrm share/locale/en_US -%%NLS%%@dirrm share/locale/it_IT -%%NLS%%@dirrm share/locale/ru_RU +%%NLS%%share/locale/bg_BG/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/fr_FR/LC_MESSAGES/proftpd.mo +%%NLS%%share/locale/ko_KR/LC_MESSAGES/proftpd.mo +%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/it_IT/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/bg_BG/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fr_FR/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/zh_CN +%%NLS%%@dirrmtry share/locale/en_US +%%NLS%%@dirrmtry share/locale/it_IT +%%NLS%%@dirrmtry share/locale/ru_RU +%%NLS%%@dirrmtry share/locale/bg_BG +%%NLS%%@dirrmtry share/locale/fr_FR +%%NLS%%@dirrmtry share/locale/ko_KR @dirrm include/proftpd @dirrmtry lib/proftpd Index: proftpd-devel/files/patch-doc-Configuration.html =================================================================== RCS file: proftpd-devel/files/patch-doc-Configuration.html diff -N proftpd-devel/files/patch-doc-Configuration.html --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ proftpd-devel/files/patch-doc-Configuration.html 19 Sep 2009 23:41:25 -0000 @@ -0,0 +1,18 @@ +--- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003 ++++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003 +@@ -4226,7 +4226,7 @@ + ></DT + ><DD + ><P +->ftp</P ++>ftpd</P + ></DD + ><DT + ><PRE +@@ -32252,4 +32252,4 @@ + ></DIV + ></BODY + ></HTML +-> +\ No newline at end of file ++> Index: proftpd-devel/files/patch-doc::Configuration.html =================================================================== RCS file: proftpd-devel/files/patch-doc::Configuration.html diff -N proftpd-devel/files/patch-doc::Configuration.html --- proftpd-devel/files/patch-doc::Configuration.html 24 Mar 2003 13:33:28 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ ---- ./doc/Configuration.html.orig Wed Jan 29 12:27:24 2003 -+++ ./doc/Configuration.html Sat Mar 15 11:34:14 2003 -@@ -4226,7 +4226,7 @@ - ></DT - ><DD - ><P -->ftp</P -+>ftpd</P - ></DD - ><DT - ><PRE -@@ -32252,4 +32252,4 @@ - ></DIV - ></BODY - ></HTML --> -\ No newline at end of file -+> --------------010509050505060404030001--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909201220.n8KCK40x022137>