Bug 48096

	ProFTPD 1.2.8rc2 released recently. This updates ports/ftp/proftpd to the 
most recent release, solving update problem, adds a new manpage. This 
obsoletes ports/46189. In addition at least ports/46189 should be applied 
because there're some security improvements on 1.2.7-R

Fix: Apply the patch below, and delete the following files in 
ports/ftp/proftpd/files:

	patch-ah  patch-ai

	as they are obsolete for the port.

begin 644 proftpd.patch.bz2
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
?O:0=ULS`JKGM>,_XGP1((C))NG_B[DBG"A(&]G5+@```
`
end

The following text patch is just for reference if you have problem decoding 
the patch above.

PORTNAME=	proftpd
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.8rc2
CATEGORIES=	ftp
MASTER_SITES=	ftp://ftp.proftpd.net/distrib/source/ \
		ftp://ftp.stikman.com/pub/proftpd/source/ \
		ftp://ftp.dataguard.no/pub/proftpd/distrib/source/ \
		ftp://ftp.club-internet.fr/pub/mirrors/ftp.proftpd.org/distrib/source/
-DISTNAME=	${PORTNAME}-1.2.6
+DISTNAME=	${PORTNAME}-${PORTVERSION}

MAINTAINER=	mharo@FreeBSD.org

-MAN1=	ftpcount.1 ftpwho.1
+MAN1=	ftpcount.1 ftpwho.1 ftptop.1
MAN5=	xferlog.5
MAN8=	proftpd.8 ftpshut.8

@@ -90,24 +90,29 @@
		-e 's:/usr/bin:${PREFIX}/bin:' \
		< ${WRKSRC}/src/proftpd.8.pre_sed > ${WRKSRC}/src/proftpd.8

-	@${MV} ${WRKSRC}/src/ftpshut.8 ${WRKSRC}/src/ftpshut.8.pre_sed
+	@${MV} ${WRKSRC}/utils/ftpshut.8 ${WRKSRC}/utils/ftpshut.8.pre_sed
	@${SED}	-e 's:/usr/sbin:${PREFIX}/sbin:' \
		-e 's:/etc:/var/run:' \
-		< ${WRKSRC}/src/ftpshut.8.pre_sed > ${WRKSRC}/src/ftpshut.8
+		< ${WRKSRC}/utils/ftpshut.8.pre_sed > ${WRKSRC}/utils/ftpshut.8

-	@${MV} ${WRKSRC}/src/ftpcount.1 ${WRKSRC}/src/ftpcount.1.pre_sed
+	@${MV} ${WRKSRC}/utils/ftpcount.1 ${WRKSRC}/utils/ftpcount.1.pre_sed
	@${SED}	-e 's:/usr/bin:${PREFIX}/bin:' \
-		< ${WRKSRC}/src/ftpcount.1.pre_sed > ${WRKSRC}/src/ftpcount.1
+		< ${WRKSRC}/utils/ftpcount.1.pre_sed > ${WRKSRC}/utils/ftpcount.1
+
+	@${MV} ${WRKSRC}/utils/ftptop.1 ${WRKSRC}/utils/ftptop.1.pre_sed
+	@${SED} -e 's:/usr/bin:${PREFIX}/bin:' \
+		< ${WRKSRC}/utils/ftptop.1.pre_sed > ${WRKSRC}/utils/ftptop.1

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/ftpcount ${PREFIX}/bin/ftpcount
	@${INSTALL_PROGRAM} ${WRKSRC}/ftpwho ${PREFIX}/bin/ftpwho
	@${INSTALL_PROGRAM} ${WRKSRC}/proftpd ${PREFIX}/libexec/proftpd
	@${INSTALL_PROGRAM} ${WRKSRC}/ftpshut ${PREFIX}/sbin/ftpshut
-	@${INSTALL_MAN} ${WRKSRC}/src/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
-	@${INSTALL_MAN} ${WRKSRC}/src/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1
+	@${INSTALL_MAN} ${WRKSRC}/utils/ftpcount.1 ${PREFIX}/man/man1/ftpcount.1
+	@${INSTALL_MAN} ${WRKSRC}/utils/ftpwho.1 ${PREFIX}/man/man1/ftpwho.1
+	@${INSTALL_MAN} ${WRKSRC}/utils/ftptop.1 ${PREFIX}/man/man1/ftptop.1
	@${INSTALL_MAN} ${WRKSRC}/src/xferlog.5 ${PREFIX}/man/man5/xferlog.5
-	@${INSTALL_MAN} ${WRKSRC}/src/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
+	@${INSTALL_MAN} ${WRKSRC}/utils/ftpshut.8 ${PREFIX}/man/man8/ftpshut.8
	@${INSTALL_MAN} ${WRKSRC}/src/proftpd.8 ${PREFIX}/man/man8/proftpd.8
	@${INSTALL_DATA} \
		${WRKSRC}/sample-configurations/basic.conf 
${PREFIX}/etc/proftpd.conf.default
@@ -16,6 +20,7 @@
-<Anonymous ~ftp>
-  User				ftp
-  Group				ftp
+-
-  # We want clients to be able to login with "anonymous" as well as "ftp"
-  UserAlias			anonymous ftp
-
@@ -31,37 +36,34 @@
-  <Limit WRITE>
-    DenyAll
-  </Limit>
+
+-</Anonymous>
+#########################################################################
-+#                                                                       #
-+# Uncomment lines with only one # to allow basic anonymous access       #
-+#                                                                       #
++#									#
++# The original distribution assumes a basic anonymous access, which is  #
++# disabled on this port. To activate it, remove the comment # below.	#
++#									#
+#########################################################################
-+### A basic anonymous configuration, no upload directories.
-+# <Anonymous ~ftp>
-+#  User				ftp
-+#  Group			ftp
-+  ### We want clients to be able to login with "anonymous" as well as 
"ftp"
-+  # UserAlias			anonymous ftp
-+
-+  ### Limit the maximum number of anonymous logins
-+  # MaxClients			10
-+
-+  ### It is wise when making an 'ftp' user that you either block its
-+  ### ability to login either via /etc/login.access or my giving it
-+  ### an invalid shell.
-+  ### Uncomment this if the 'ftp' user you made has an invalid shell
-+
-+  # RequireValidShell          off
+
-+  ### We want 'welcome.msg' displayed at login, and '.message' displayed
-+  ### in each newly chdired directory.
-+  # DisplayLogin			welcome.msg
-+  # DisplayFirstChdir		.message
-+
-+  ### Limit WRITE everywhere in the anonymous chroot
-+  # <Limit WRITE>
-+  #  DenyAll
-+  # </Limit>
-
--</Anonymous>
-+# </Anonymous>
++## A basic anonymous configuration, no upload directories.
++#<Anonymous ~ftp>
++#  User				ftp
++#  Group				ftp
++#
++#  # We want clients to be able to login with "anonymous" as well as "ftp"
++#  UserAlias			anonymous ftp
++#
++#  # Limit the maximum number of anonymous logins
++#  MaxClients			10
++#
++#  # We want 'welcome.msg' displayed at login, and '.message' displayed
++#  # in each newly chdired directory.
++#  DisplayLogin			welcome.msg
++#  DisplayFirstChdir		.message
++#
++#  # Limit WRITE everywhere in the anonymous chroot
++#  <Limit WRITE>
++#    DenyAll
++#  </Limit>
++#
++#</Anonymous>


static pam_handle_t *	pamh			= NULL;
-static char *		pamconfig		= "ftp";
+static char *		pamconfig		= "ftpd";
- static char *		pam_user 		= (char *)0;
- static char *		pam_pass 		= (char *)0;
- static int		pam_user_len		= 0;
+ static char *		pam_user 		= NULL;
+ static char *		pam_pass 		= NULL;
+ static size_t		pam_user_len		= 0;


_________________________________________________________________
MSN 8 with e-mail virus protection service: 2 months FREE* 
http://join.msn.com/?page=features/virus--FyQ754oYZHcs1dGdOV54yvC4f70g0BlxGL6LaobStB8dth3E
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -ruN proftpd.orig/Makefile proftpd/Makefile
--- proftpd.orig/Makefile	Sat Jan  4 23:53:38 2003
+++ proftpd/Makefile	Sat Feb  8 03:11:42 2003
@@ -6,17 +6,17 @@
#
How-To-Repeat: 	http://www.proftpd.org