Update to version 1.0.16a.

Based on PR pkg/22680 by Jon Olsson.

Changes:

- add new build-time options: PURE_FTPD_USE_TLS, PURE_FTPD_USE_VIRTUAL_CHROOT
- make the MySQL support actually work
- install more documentation

1.0.16a:
========
- Fix typo (sizeof_resolved instead of sizeof resolved) in src/bsd-realpath.c
  Not a vulnerability because it happens in the good way, but it sometimes
  used to break uploadscript.

1.0.16:
=======
- An obsolete comment in pure-ftpd.conf was fixed : RPMs don't parse
  /etc/sysconf/pure-ftpd any more.
- Recognize the '##' prefix as a shadowed password - make authentication work
  on Solaris with shadow/NIS.
- Add back some random sleep() between authentication failures in addition to
  the exponential sleep. Zzzzz... sleeping is good in summer...
- Upgrade to automake 1.7.5.
- The list of options in the pure-ftpd(8) man page was reordered -
  Thanks to our beloved Claudiu Costin.
- SSL/TLS support was added (bits in src/{ftpd.c,ftp_parser.c,tls.c,tls.h,
  configure.ac}, new doc: README.TLS, new globals: tls_ctx, tls_cnx). New
  related commands were introduced : AUTH, PBSZ and PROT.
- Uploaded files are now removed when realpath() fails and bsd_realpath() was
  modified to fall back to getcwd()/chdir() if we can't get a descriptor on
  the current directory because it is not readable. It fixes pure-uploadscript
  on some platforms like MacOS X.
- HAVE_BROKEN_REALPATH is gone. USE_BUILTIN_REALPATH is born.
- A typo in the Python configuration file wrapper was fixed : -t was used in
  place of -y.
- MacOS X Panther has a lousy getnameinfo() implementation that doesn't fill
  the buffer when no DNS entry is found for a host and a numerical result
  wasn't explicitely asked. As a result, Pure-FTPd didn't even start on Panther
  (saying "bad IP address") . We now check for EAI_NONAME if available and we
  retry with NI_NUMERICHOST if this is what getnameinfo() returns. Thanks to
  Yann Bizeul for his valuable help on this issue.
- Implement a working strdup() replacement in puredb for systems lacking it.
- Some MAXPATHLEN / MAXPATHLEN + 1 cleanups. Basically when paths are
  generated by our own functions, we use MAXPATHLEN for the complete
  zero-terminated string. When a buffer is passed to a libc function, we reserve
  a MAXPATHLEN + 1 buffer and give a MAXPATHLEN size, just to avoid bad
  surprises if an off-by-one ever occurs in a getcwd() like function.
- Don't use make_scrambled_password() in the MySQL backend because the API
  changed since MySQL 4.1.
- Removed fixed-size constant arrays in src/crypto.c because of MacOS X linker
  bugs (grrr...) .

3 files changed, 47 insertions, 18 deletions

diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile
index 7b4aba8534a..16a8f21d0a7 100644
--- a/net/pure-ftpd/Makefile
+++ b/net/pure-ftpd/Makefile
@@ -1,9 +1,16 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/12 14:43:08 salo Exp $
+# $NetBSD: Makefile,v 1.2 2003/09/20 16:56:39 salo Exp $
 #
 
-DISTNAME=	pure-ftpd-1.0.15
+DISTNAME=	pure-ftpd-1.0.16a
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pureftpd/}
+MASTER_SITES=	ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/		\
+		ftp://ftp2.fr.pureftpd.org/pub/mirrors/ftp.fr.pureftpd.org/pub/pure-ftpd/releases/ \
+		ftp://ftp3.fr.pureftpd.org/pure-ftpd/releases/		\
+		ftp://ftp.dk.pureftpd.org/mirrors/pure-ftpd/releases/	\
+		ftp://ftp.nl.pureftpd.org/pub/pure-ftpd/releases/	\
+		ftp://ftp.fr.pureftpd.org/pub/pure-ftpd/releases/	\
+		ftp://ftp.cn.pureftpd.org/pub/pureftpd/pure-ftpd/releases/ \
+		${MASTER_SITE_SOURCEFORGE:=pureftpd/}
 
 MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.pureftpd.org/
@@ -13,32 +20,47 @@ USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
-CONFIGURE_ARGS+=	--with-sysquotas	\
-			--with-ftpwho		\
-			--with-virtualvhosts	\
-			--with-virtualchroot	\
-			--with-diraliases	\
-			--with-ratios		\
-			--with-throttling	\
-			--with-altlog		\
-			--with-puredb		\
-			--with-quotas
+CONFIGURE_ARGS+=	--with-everything	\
+			--with-privsep		\
+			--sysconfdir=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(PURE_FTPD_USE_MYSQL) && !empty(PURE_FTPD_USE_MYSQL:M[Yy][Ee][Ss])
 .include "../../databases/mysql-client/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-mysql
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.mysql-client}/include/mysql
+LDFLAGS+=		-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+LDFLAGS+=		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
 BUILD_DEFS+=		PURE_FTPD_USE_MYSQL
 .endif
 
 .if defined(PURE_FTPD_USE_PGSQL) && !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss])
 .include "../../databases/postgresql-lib/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-pgsql
-CPPFLAGS+=		-I${BUILDLINK_DIR}/include/pgsql
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.postgresql-lib}/include/pgsql
 BUILD_DEFS+=		PURE_FTPD_USE_PGSQL
 .endif
 
+.if defined(PURE_FTPD_USE_TLS) && !empty(PURE_FTPD_USE_TLS:M[Yy][Ee][Ss])
+.include "../../security/openssl/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-tls
+BUILD_DEFS+=		PURE_FTPD_USE_TLS
+.endif
+
+.if defined(PURE_FTPD_USE_VIRTUAL_CHROOT) && !empty(PURE_FTPD_USE_VIRTUAL_CHROOT:M[Yy][Ee][Ss])
+CONFIGURE_ARGS+=	--with-virtualchroot
+BUILD_DEFS+=		PURE_FTPD_USE_VIRTUAL_CHROOT
+.endif
+
 RCD_SCRIPTS=	pure_ftpd
 
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pure-ftpd
+	cd ${WRKSRC} &&	\
+		${INSTALL_DATA} README README.Authentication-Modules	 \
+				README.Configuration-File README.Contrib \
+				README.TLS README.Virtual-Users		 \
+			${PREFIX}/share/doc/pure-ftpd
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/pure-ftpd/PLIST b/net/pure-ftpd/PLIST
index d6ebe7c8881..cda468f1119 100644
--- a/net/pure-ftpd/PLIST
+++ b/net/pure-ftpd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/12 14:43:08 salo Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/20 16:56:40 salo Exp $
 bin/pure-pw
 bin/pure-pwconvert
 bin/pure-statsdecode
@@ -18,3 +18,10 @@ sbin/pure-ftpwho
 sbin/pure-mrtginfo
 sbin/pure-quotacheck
 sbin/pure-uploadscript
+share/doc/pure-ftpd/README
+share/doc/pure-ftpd/README.Authentication-Modules
+share/doc/pure-ftpd/README.Configuration-File
+share/doc/pure-ftpd/README.Contrib
+share/doc/pure-ftpd/README.TLS
+share/doc/pure-ftpd/README.Virtual-Users
+@dirrm share/doc/pure-ftpd
diff --git a/net/pure-ftpd/distinfo b/net/pure-ftpd/distinfo
index 63d24795c36..4725d463995 100644
--- a/net/pure-ftpd/distinfo
+++ b/net/pure-ftpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/07/12 14:43:08 salo Exp $
+$NetBSD: distinfo,v 1.2 2003/09/20 16:56:41 salo Exp $
 
-SHA1 (pure-ftpd-1.0.15.tar.gz) = 301384e4967b325b439235abe661c406d6f036a3
-Size (pure-ftpd-1.0.15.tar.gz) = 495335 bytes
+SHA1 (pure-ftpd-1.0.16a.tar.gz) = 7795efc25595c86224912d42a18eb9527faebd10
+Size (pure-ftpd-1.0.16a.tar.gz) = 509865 bytes