aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ftp/proftpd-devel/Makefile17
-rw-r--r--ftp/proftpd-devel/distinfo3
-rw-r--r--ftp/proftpd-devel/pkg-message7
-rw-r--r--ftp/proftpd/Makefile17
-rw-r--r--ftp/proftpd/distinfo3
-rw-r--r--ftp/proftpd/pkg-message7
6 files changed, 28 insertions, 26 deletions
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index c905c10c50cf..08933d0e54a5 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -6,15 +6,10 @@
# $FreeBSD$
#
-DISTNAME= proftpd-1.2.0pre3
-PKGNAME= proftpd-1.2.0
+DISTNAME= proftpd-1.2.0pre6
+PKGNAME= proftpd-1.2.0p6
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.proftpd.org/distrib/ \
- ftp://ftp3.proftpd.org/distrib/
-
-PATCH_SITES= ftp://ftp.tos.net/pub/proftpd/
-PATCHFILES= proftpd-1.2.0pre3a.patch.gz
-PATCH_DIST_STRIP= -p1
+MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/
MAINTAINER= mharo@FreeBSD.org
@@ -22,13 +17,11 @@ MAN1= ftpcount.1
MAN8= proftpd.8 ftpshut.8
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CONFIGURE_ARGS= --localstatedir=/var/run \
--with-modules=mod_ratio
-FORBIDDEN= security problems
-
post-configure:
@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
@${SED} -e 's:/etc:${PREFIX}/etc:' \
@@ -61,4 +54,6 @@ do-install:
${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
fi
+ @${CAT} ${PKGMESSAGE}
+
.include <bsd.port.mk>
diff --git a/ftp/proftpd-devel/distinfo b/ftp/proftpd-devel/distinfo
index 1b84f6287b27..bfc0d22bff01 100644
--- a/ftp/proftpd-devel/distinfo
+++ b/ftp/proftpd-devel/distinfo
@@ -1,2 +1 @@
-MD5 (proftpd-1.2.0pre3.tar.gz) = 60b8dc1ffd656a0c6823e83dc07aaecb
-MD5 (proftpd-1.2.0pre3a.patch.gz) = 77615026fa30edf24eaa1764ae1272b2
+MD5 (proftpd-1.2.0pre6.tar.gz) = f29634071a39db8572ec0c5c7310cc2b
diff --git a/ftp/proftpd-devel/pkg-message b/ftp/proftpd-devel/pkg-message
new file mode 100644
index 000000000000..f05875e40d90
--- /dev/null
+++ b/ftp/proftpd-devel/pkg-message
@@ -0,0 +1,7 @@
+###
+As of release 1.2.0p5 and later, you need to edit /etc/pam.conf to add
+support for ftp. To do so, add the following two lines to this file:
+
+ftp auth required pam_unix.so try_first_pass
+ftp account required pam_unix.so try_first_pass
+###
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index c905c10c50cf..08933d0e54a5 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -6,15 +6,10 @@
# $FreeBSD$
#
-DISTNAME= proftpd-1.2.0pre3
-PKGNAME= proftpd-1.2.0
+DISTNAME= proftpd-1.2.0pre6
+PKGNAME= proftpd-1.2.0p6
CATEGORIES= ftp
-MASTER_SITES= ftp://ftp.proftpd.org/distrib/ \
- ftp://ftp3.proftpd.org/distrib/
-
-PATCH_SITES= ftp://ftp.tos.net/pub/proftpd/
-PATCHFILES= proftpd-1.2.0pre3a.patch.gz
-PATCH_DIST_STRIP= -p1
+MASTER_SITES= ftp://ftp.tos.net/pub/proftpd/
MAINTAINER= mharo@FreeBSD.org
@@ -22,13 +17,11 @@ MAN1= ftpcount.1
MAN8= proftpd.8 ftpshut.8
USE_GMAKE= yes
-GNU_CONFIGURE= yes
+USE_AUTOCONF= yes
CONFIGURE_ARGS= --localstatedir=/var/run \
--with-modules=mod_ratio
-FORBIDDEN= security problems
-
post-configure:
@${MV} ${WRKSRC}/src/proftpd.8 ${WRKSRC}/src/proftpd.8.pre_sed
@${SED} -e 's:/etc:${PREFIX}/etc:' \
@@ -61,4 +54,6 @@ do-install:
${WRKSRC}/sample-configurations/basic.conf ${PREFIX}/etc/proftpd.conf; \
fi
+ @${CAT} ${PKGMESSAGE}
+
.include <bsd.port.mk>
diff --git a/ftp/proftpd/distinfo b/ftp/proftpd/distinfo
index 1b84f6287b27..bfc0d22bff01 100644
--- a/ftp/proftpd/distinfo
+++ b/ftp/proftpd/distinfo
@@ -1,2 +1 @@
-MD5 (proftpd-1.2.0pre3.tar.gz) = 60b8dc1ffd656a0c6823e83dc07aaecb
-MD5 (proftpd-1.2.0pre3a.patch.gz) = 77615026fa30edf24eaa1764ae1272b2
+MD5 (proftpd-1.2.0pre6.tar.gz) = f29634071a39db8572ec0c5c7310cc2b
diff --git a/ftp/proftpd/pkg-message b/ftp/proftpd/pkg-message
new file mode 100644
index 000000000000..f05875e40d90
--- /dev/null
+++ b/ftp/proftpd/pkg-message
@@ -0,0 +1,7 @@
+###
+As of release 1.2.0p5 and later, you need to edit /etc/pam.conf to add
+support for ftp. To do so, add the following two lines to this file:
+
+ftp auth required pam_unix.so try_first_pass
+ftp account required pam_unix.so try_first_pass
+###