proftpd: update to 1.3.2a update to mod_sql 4.11 update pkg-plist http://tinderbox.officialunix.com//logs/7.2-FreeBSD/proftpd-1.3.2a.log proftpd-devel: update to 1.3.3rc1 update mod_sql update pkg-plist update mod_sql section to add mod_tls.h http://tinderbox.officialunix.com//logs/7.2-FreeBSD/proftpd-1.3.3rc1.log proftpd-mysql: add MAINTAINER: to myself Fix: Patch attached with submission follows:
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
Responsible Changed From-To: freebsd-ports-bugs->wxs I'll take it.
Cancel request to remove ftp/proftpd-mysql -- Chris Petrik Consulting: http://www.officialunix.com BSD Site: http://www.bsdjunk.com FreeBSD ports contributor Since 18-July-2009
State Changed From-To: open->feedback I've committed a modified version of the ftp/proftpd piece but the proftpd-devel patch requires an update to match what's currently in the tree. Also, when communicating about ports you maintain it's best to do so from the maintainer address so that we know it's really the maintainer requesting these changes.
wxs 2009-09-23 13:34:36 UTC FreeBSD ports repository Modified files: ftp/proftpd Makefile distinfo pkg-plist Log: - Update to 1.3.2a PR: ports/138977 Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> (maintainer) Feature safe: yes Revision Changes Path 1.156 +3 -4 ports/ftp/proftpd/Makefile 1.54 +3 -3 ports/ftp/proftpd/distinfo 1.26 +15 -8 ports/ftp/proftpd/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
On Wed, Sep 23, 2009 at 12:44:37PM -0500, Chris Petrik wrote: > proftpd-devel is at version 1.3.3rc1 > > not sure what you mean by "whats really in the tree" > > http://www.proftpd.org/ version is 1.3.3rc1 The patch in the PR does not apply at all. >Index: proftpd-devel/Makefile >=================================================================== >RCS file: /usr/ncvs/ports/ftp/proftpd/Makefile,v This line doesn't make sense. >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/ \ This chunk doesn't even match what's in the tree. The current Makefile in the tree looks like this: PORTNAME= proftpd DISTVERSION= 1.3.20080922 CATEGORIES= ftp MASTER_SITES= http://www.alaskaparadise.com/freebsd/ \ >@@ -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 Do you really want to use PLIST_FILES here. Just use PLIST_SUB. > > .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 You added mod_sql_tds-4.10.tar.bz2 but put 4.11 in distinfo. This can't be correct. >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 >-+> The rename of this file is not necessary. It seems like you wanted to please portlint but the repo churn is not necessary. -- WXS
I am redoing the port, as I messed it all up when I copied/pasted it over. Please bare with me while I redo it :) -- Chris Petrik Consulting: http://www.officialunix.com BSD Site: http://www.bsdjunk.com FreeBSD ports contributor Since 18-July-2009
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Here is to update finally. proftpd: Modifed Makefile to use PLIST_SUB instead of PLIST_FILES Modified pkg-plist to suite proftpd-devel: Update to 1.3.3rc1 Remove DISTVERSION Added PORTVERSION Use PLIST_SUB instead of PLIST_FILES Modified pkg-plist to suite log files: http://logfiles.officialunix.com/proftpd-1.3.2a.log http://logfiles.officialunix.com/proftpd-devel-1.3.3rc1.log - -- Chris Petrik Consulting: http://www.officialunix.com BSD Site: http://www.bsdjunk.com FreeBSD ports contributor Since 18-July-2009 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.13 (FreeBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJK0vRLAAoJECSyykH9cwaKpyAQAIKP5Wat7jiDzYXYwHzvRqsx whAUYhEi9cLV0vPVk7lcL8Pt5im/XvnnQZ042qteqdwHDLPtndcCjel0URlnIyyG kfxJgMPo2MpZkHtq/mSh62iavdiXc/+k/hKcQ9dbQR7B20SiinuiSXbDlQrk4ZJj 9jqbPFYMznozqeYkJ94J1AvZri+Vf1WrC8OvbKJND4e/GkLD2aZnTgz4DLJBlggD 7hwXpolKkNOGRs3S5jakzeQZsU2yOC8mU1dnfDjzU99Hd3miipkfblh3tIDTE6MW kLSW7vJO1M0NlIh7dZSZtWrg0Tl/IB9KqLd20OewXKx9yi4Qi1UjxoLrMZtz3waV aFbELwlnTu8zVxsqZx7gaM8xIh/AJaYnUH//xVvLdqw3jz9FRhZwm4bmmHwnwXII w8tjfnnqT7IYvZpYVwsUVFUz86/TQuyg7nxhmn0k0XDK/xDylUUGJmKD6e0XtjLL AyPPXEECrh8QvIEy8nH1yNvuvJmV9vvkF++vIpD991F8Cq0luFeFQd06grakzTPj 7Bzhsc+yzKA7hJvG6fj6aBbSHCr2ZibVzDNxg9muyPlMs1uFgo8h4rHg3yllspXC /G2u2jN8Dn2Slo3SUQT76zT2dIbfqvXNZ85lXyJCtEiCUox0YocfQ3xVP27cqTRq PE/+pKd3R5I9WT/W/nfX =PcGK -----END PGP SIGNATURE-----
wxs 2009-10-12 13:20:01 UTC FreeBSD ports repository Modified files: ftp/proftpd Makefile pkg-plist Log: - Use PLIST_SUB instead of PLIST_FILES in some cases. - Whitespace fix to pet portlint. PR: ports/138977 Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> (maintainer) Revision Changes Path 1.159 +17 -7 ports/ftp/proftpd/Makefile 1.27 +5 -0 ports/ftp/proftpd/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
wxs 2009-10-12 14:01:23 UTC FreeBSD ports repository Modified files: ftp/proftpd-devel Makefile distinfo pkg-plist Log: - Update to 1.3.3rc1 - Don't use ?= for MAINTAINER and COMMENT (there are no slave ports) - Remove IGNORE - Use PLIST_SUB in place of PLIST_FILES - Use LOCALBASE instead of hardcoding /usr/local PR: ports/138977 Submitted by: Chris Petrik <c.petrik.sosa@gmail.com> (maintainer) Revision Changes Path 1.148 +28 -17 ports/ftp/proftpd-devel/Makefile 1.48 +9 -6 ports/ftp/proftpd-devel/distinfo 1.26 +10 -1 ports/ftp/proftpd-devel/pkg-plist _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, with minor changes. Thanks!