ports/53412: [Update] Port: ftp/pure-ftpd

[Alex Dupre]

>Number:         53412
>Category:       ports
>Synopsis:       [Update] Port: ftp/pure-ftpd
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 17 10:20:16 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Alex Dupre
>Release:        FreeBSD 4.8-ALEXDUPRE i386
>Organization:
>Environment:
System: FreeBSD 4.8-ALEXDUPRE i386
>Description:
Update to 1.0.15.
Add startup file.
Update some dependencies.
Minor changes.
>How-To-Repeat:
>Fix:

--- pure-ftpd.diff begins here ---
diff -ruN pure-ftpd.orig/Makefile pure-ftpd/Makefile
--- pure-ftpd.orig/Makefile	Tue Jun 17 18:33:44 2003
+++ pure-ftpd/Makefile	Tue Jun 17 19:14:04 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pure-ftpd
-PORTVERSION=	1.0.14
+PORTVERSION=	1.0.15
 PORTREVISION=	0
 CATEGORIES=	ftp ipv6
 MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
@@ -24,11 +24,11 @@
 COMMENT=	A small, easy to set up, fast and very secure FTP server
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=	ldap:${PORTSDIR}/net/openldap21
 .endif
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql323-client
+LIB_DEPENDS+=	mysqlclient:${PORTSDIR}/databases/mysql40-client
 .endif
 
 .if defined(WITH_PGSQL)
@@ -85,7 +85,7 @@
 . endif
 .endif
 .if defined(PAM_TEMPL)
-PAM_DIR?=	${PREFIX}/share/examples/${PORTNAME}/pam
+PAM_DIR?=	${EXAMPLESDIR}/pam
 PAM_TARGET?=	pure-ftpd
 .endif
 
@@ -104,10 +104,10 @@
 	@${ECHO_CMD} "WITH_PGSQL=1          - Support for users in PostgreSQL databases"
 	@${ECHO_CMD} "WITH_PRIVSEP=1        - Enable privilege separation"
 	@${ECHO_CMD} "WITH_LANG=lang        - Enable compilation of language support, lang is one of"
-	@${ECHO_CMD} "  english, german, romanian, french, french-funny, polish, spanish,"
-	@${ECHO_CMD} "  dutch, italian, brazilian-portuguese, danish, slovak, korean,"
-	@${ECHO_CMD} "  norwegian, swedish, russian, traditional-chinese, simplified-chinese"
-	@${ECHO_CMD} "  and czech."
+	@${ECHO_CMD} "                        english, german, romanian, french, french-funny, polish,"
+	@${ECHO_CMD} "                        spanish, dutch, italian, brazilian-portuguese, danish,"
+	@${ECHO_CMD} "                        slovak, korean, norwegian, swedish, russian,"
+	@${ECHO_CMD} "                        traditional-chinese, simplified-chinese and czech."
 	@${ECHO_CMD} ""
 
 post-install:
@@ -115,13 +115,14 @@
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-mysql.conf ${PREFIX}/etc/pureftpd-mysql.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/pureftpd-pgsql.conf ${PREFIX}/etc/pureftpd-pgsql.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/configuration-file/pure-ftpd.conf ${PREFIX}/etc/pure-ftpd.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/configuration-file/pure-config.pl ${PREFIX}/sbin/
-	${MKDIR} ${PREFIX}/share/examples/pure-ftpd
-	(cd ${WRKSRC}/contrib && ${INSTALL_SCRIPT} ${CONTRIB} ${PREFIX}/share/examples/pure-ftpd)
-	${CHMOD} 755 ${PREFIX}/sbin/pure-config.pl
+	${INSTALL_SCRIPT} ${WRKSRC}/configuration-file/pure-config.pl ${PREFIX}/sbin/
+	@${SED} 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pure-ftpd.sh > ${WRKSRC}/pure-ftpd.sh
+	@${INSTALL_SCRIPT} ${WRKSRC}/pure-ftpd.sh ${PREFIX}/etc/rc.d
+	${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/contrib && ${INSTALL_DATA} ${CONTRIB} ${EXAMPLESDIR})
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/pure-ftpd
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/pure-ftpd)
+	@${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR})
 .endif
 .if defined(PAM_TEMPL)
 	${MKDIR} ${PAM_DIR}
diff -ruN pure-ftpd.orig/distinfo pure-ftpd/distinfo
--- pure-ftpd.orig/distinfo	Tue Jun 17 18:33:44 2003
+++ pure-ftpd/distinfo	Tue Jun 17 18:43:00 2003
@@ -1 +1 @@
-MD5 (pure-ftpd-1.0.14.tar.gz) = 20a1231e701d6d78fd754b712016f3df
+MD5 (pure-ftpd-1.0.15.tar.gz) = 3783fa94c7fd0723da2a497334430ad0
diff -ruN pure-ftpd.orig/files/pure-ftpd.sh pure-ftpd/files/pure-ftpd.sh
--- pure-ftpd.orig/files/pure-ftpd.sh	Thu Jan  1 01:00:00 1970
+++ pure-ftpd/files/pure-ftpd.sh	Tue Jun 17 19:00:04 2003
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+case "$1" in
+	start)
+		if [ -r %%PREFIX%%/etc/pure-ftpd.conf ]; then
+			%%PREFIX%%/sbin/pure-config.pl %%PREFIX%%/etc/pure-ftpd.conf > /dev/null && echo -n ' pure-ftpd'
+		fi
+		;;
+	stop)
+		if [ -r /var/run/pure-ftpd.pid ]; then
+			/bin/kill `cat /var/run/pure-ftpd.pid` > /dev/null 2>&1 && echo -n ' pure-ftp'
+		fi
+		;;
+	*)
+                echo ""
+                echo "Usage: `basename $0` { start | stop }"
+                echo ""
+                exit 64
+		;;
+esac
+
+exit 0
diff -ruN pure-ftpd.orig/pkg-plist pure-ftpd/pkg-plist
--- pure-ftpd.orig/pkg-plist	Tue Jun 17 18:33:44 2003
+++ pure-ftpd/pkg-plist	Tue Jun 17 19:02:33 2003
@@ -5,6 +5,7 @@
 etc/pureftpd-ldap.conf.sample
 etc/pureftpd-mysql.conf.sample
 etc/pureftpd-pgsql.conf.sample
+etc/rc.d/pure-ftpd.sh
 sbin/pure-authd
 sbin/pure-config.pl
 sbin/pure-ftpd
--- pure-ftpd.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: