Bug 48966 - [PATCH] SECURITY UPDATE ports/ftp/proftpd to 1.2.8
Summary: [PATCH] SECURITY UPDATE ports/ftp/proftpd to 1.2.8
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Michael Haro
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2003-03-06 05:00 UTC by Jason Li
Modified: 2003-03-24 13:34 UTC (History)
1 user (show)

See Also:


Attachments
file.diff (1.44 KB, patch)
2003-03-06 05:00 UTC, Jason Li
no flags Details | Diff
file.diff (2.83 KB, patch)
2003-03-06 05:00 UTC, Jason Li
no flags Details | Diff
file.diff (203 bytes, patch)
2003-03-06 05:00 UTC, Jason Li
no flags Details | Diff
proftpd-patch.bz2 (4.86 KB, text/plain)
2003-03-06 05:00 UTC, Jason Li
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Jason Li 2003-03-06 05:00:33 UTC
	ProFTPD 1.2.8 released on March 4, 2003. This updates ports/ftp/proftpd to 
the most recent release, solving update problem, adds a new manpage.
	There is a security vulnerability in proftpd 1.2.6, described in:

	http://online.securityfocus.com/archive/1/298598

	The patch attached fixes the following problems, and therefore also 
superceds PR superceds 44498, 46189, 48096, 47134 and 48071.

	*de-pkgcomment
	*upgrade the port to 1.2.8-R so PR 44498 is corrected, and make 46189, 
48096 obsolete
	*correct the portgresql include directory to conform latest postgresql 
port. This is reported in ports/47134
	*obsoletes buggy PR I submit, numbered ports/48071.

	This port is a new release, containing some security updates. For security 
considerations, this is strongly recommeneded to be commited before 
4.8-RELEASE. Thanks.

Fix: apply the patch below:

PORTNAME=	proftpd
-PORTVERSION=	1.2.6
+PORTVERSION=	1.2.8
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
+COMMENT=	Highly configurable ftp daemon

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

@@ -59,7 +60,7 @@
POSTGRESQL_PORT?=	databases/postgresql7
MODULES:=${MODULES}:mod_sql:mod_sql_postgres
LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
-INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include/pgsql
+INCLUDEDIRS:=${INCLUDEDIRS}:${PREFIX}/include
LIBDIRS:=${LIBDIRS}:${PREFIX}/lib
.endif

@@ -90,24 +91,30 @@
		-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}/utils/ftpcount.1 ${WRKSRC}/utils/ftpcount.1.pre_sed

-	@${MV} ${WRKSRC}/src/ftpcount.1 ${WRKSRC}/src/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
--# A basic anonymous configuration, no upload directories.
+-# A basic anonymous configuration, no upload directories.  If you do
+not -# want anonymous users, simply delete this entire <Anonymous>
+section.
-<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 +37,30 @@
-  <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 in this port. Remove the comment # below to activate it.	#
+#########################################################################
-+### A basic anonymous configuration, no upload directories.
-+# <Anonymous ~ftp>
++## A basic anonymous configuration, no upload directories.  If you do
++not ## want anonymous users, simply delete this entire <Anonymous>
++section. #<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>
++#  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;
also, a uuencoded bzip2 archive for reference, it's the same as the above



_________________________________________________________________
Protect your PC - get McAfee.com VirusScan Online 
http://clinic.mcafee.com/clinic/ibuy/campaign.asp?cid=3963--8jc93ZsBqNxKoHssPd04X55Jr2UCeIbYeY2A1zP9n10rrqQJ
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	Mon Feb 24 10:26:51 2003
+++ proftpd/Makefile	Thu Mar  6 09:42:54 2003
@@ -6,17 +6,18 @@
#
Comment 1 Foxfair Hu freebsd_committer freebsd_triage 2003-03-11 06:06:09 UTC
Responsible Changed
From-To: freebsd-ports-bugs->mharo

Pass to MAINTAINER
Comment 2 Jacques Vidrine freebsd_committer freebsd_triage 2003-03-24 13:33:58 UTC
State Changed
From-To: open->closed

superseded by ports/50031