Pullup updates to lftp-2.6.9 and 2.6.10 to the pkgsrc-2003Q4 branch to

fix a security hole, requested by Quentin Garnier.

	Module Name:    pkgsrc
	Committed By:   cube
	Date:           Sun Dec 14 15:48:37 UTC 2003

	Modified Files:
		pkgsrc/net/lftp: Makefile distinfo

	Log Message:
	Update to version 2.6.10.  This version contains a fix for a buffer
	overflow vulnerability in the HTML parser code affecting "ls" command on
	malicious HTTP server.

	See
	http://lists.netsys.com/pipermail/full-disclosure/2003-December/014824.html

	Version 2.6.10 - 2003-12-11

	* security fixes in html parsing code.
	* fxp between ftps session is now possible (unencrypted yet).
	* fixed a rare bug with access to freed memory in ftp.
	* fixed a bug in mirror, now it does not incorrectly append directory name
	  when target directory is the root.
	* fixed compilation on AIX.
	* Polish translation updated.

and

	Update to version 2.6.9.

	Addresses PR pkg/23633 by Soren Jacobsen.

	Changes:
	- shorten DESCR
	- style nits

	2.6.9:
	======
	- New setting ftp:ssl-protect-list for encrypting file listings selectively.
	- Don't use PRET again if it is not supported.
	- Added cls --sort=time option (alias for sort=date).
	- Don't set file modification time if it grew while downloading.
	- New setting cmd:verify-path-cached.
	- Added long options for `open' command.

2 files changed, 19 insertions, 18 deletions

diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index ccb040427ee..2fb7e0e2638 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.28 2003/11/08 06:31:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2003/12/14 20:34:57 agc Exp $
 #
 
-DISTNAME=	lftp-2.6.8
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
-		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
-EXTRACT_SUFX=	.tar.bz2
+DISTNAME=		lftp-2.6.10
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/ \
+			ftp://ftp.yars.free.net/pub/software/unix/net/ftp/client/lftp/old/
+EXTRACT_SUFX=		.tar.bz2
 
-MAINTAINER=	michal@pasternak.w.lub.pl
-HOMEPAGE=	http://lftp.yar.ru/
-COMMENT=	Powerful command line ftp client
+MAINTAINER=		michal@pasternak.w.lub.pl
+HOMEPAGE=		http://lftp.yar.ru/
+COMMENT=		Powerful command line ftp client
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
 GNU_CONFIGURE=		YES
+USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
+
+SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -25,12 +26,12 @@ CONFIGURE_ARGS+=	--with-modules
 
 CONFIGURE_ENV+=		F77=${FALSE}
 
-CONF_FILES=	${PREFIX}/share/examples/lftp/lftp.conf	\
-		${PKG_SYSCONFDIR}/lftp.conf
+EGDIR=			${PREFIX}/share/examples/lftp
+CONF_FILES=		${EGDIR}/lftp.conf.default ${PKG_SYSCONFDIR}/lftp.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lftp
-	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${PREFIX}/share/examples/lftp
+	${INSTALL_DATA_DIR} ${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/lftp.conf ${EGDIR}/lftp.conf.default
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
diff --git a/net/lftp/distinfo b/net/lftp/distinfo
index 7020b43e382..2ea20477a1a 100644
--- a/net/lftp/distinfo
+++ b/net/lftp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2003/11/08 06:31:58 xtraeme Exp $
+$NetBSD: distinfo,v 1.12.2.1 2003/12/14 20:34:57 agc Exp $
 
-SHA1 (lftp-2.6.8.tar.bz2) = c9ce743b067c72ec539daca0c9c8125811502ef8
-Size (lftp-2.6.8.tar.bz2) = 1196767 bytes
+SHA1 (lftp-2.6.10.tar.bz2) = 78a7e726401278c847b78b190cadc6d8a6243b23
+Size (lftp-2.6.10.tar.bz2) = 1198513 bytes
 SHA1 (patch-aa) = 007249b3b1235cc8b163f95324ad94ac75284915
 SHA1 (patch-ab) = 4312c2878b6e553bdadfab8528906f811cd9d381
 SHA1 (patch-ac) = 6df164610322c4dcfa82b8cb92e6a0845a75aee2