Date: Wed, 23 Feb 2005 22:51:39 +0300 From: Roman Bogorodskiy <bogorodskiy@inbox.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/77994: [ maintainer ] ftp/wzdftpd: update to 0.5.0 Message-ID: <E1D42Xq-000FBa-00.bogorodskiy-inbox-ru@mx1.mail.ru> Resent-Message-ID: <200502232000.j1NK0e7A058871@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 77994
>Category: ports
>Synopsis: [ maintainer ] ftp/wzdftpd: update to 0.5.0
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 23 20:00:40 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-STABLE FreeBSD 5.3-STABLE #1: Tue Feb 8 19:09:32 MSK 2005 root@lame.novel.ru:/usr/obj/usr/src/sys/NOVEL i386
>Description:
Update to 0.5.0
Removed files: files/pkg-message.in
>How-To-Repeat:
>Fix:
--- wzdftpd.diff begins here ---
diff -ru wzdftpd.orig/Makefile wzdftpd/Makefile
--- wzdftpd.orig/Makefile Wed Feb 23 01:40:30 2005
+++ wzdftpd/Makefile Wed Feb 23 22:48:46 2005
@@ -6,7 +6,7 @@
#
PORTNAME= wzdftpd
-PORTVERSION= 0.4.4
+PORTVERSION= 0.5.0
CATEGORIES= ftp ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -20,15 +20,17 @@
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_INC_LIBTOOL_VER=13
-CONFIGURE_ARGS+= --without-mysql --without-pam
+CONFIGURE_ARGS+= --without-pam
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
PKGMESSAGE= ${WRKDIR}/pkg-message
OPTIONS= UTF8 "Enable UTF8 support" off \
TCL "Enable TCL support" off \
SSL "Enable OpenSSL support" on \
+ GNUTLS "Enable gnutls support" off \
IPV6 "Enable IPv6 support" on \
- PERL "Enable PERL support" off
+ PERL "Enable PERL support" off \
+ MYSQL "Enable MYSQL backend" off
MAN1= siteconfig.1 \
siteuptime.1 \
@@ -55,7 +57,13 @@
.if defined(WITH_SSL)
USE_OPENSSL= yes
.else
-CONFIGURE_ARGS+= --with-openssl=/dev/null
+CONFIGURE_ARGS+= --disable-openssl
+.endif
+
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls
+.else
+CONFIGURE_ARGS+= --disable-gnutls
.endif
.if defined(WITH_IPV6)
@@ -70,24 +78,34 @@
PLIST_SUB+= PERL=""
.endif
+.if defined(WITH_MYSQL)
+USE_MYSQL= yes
+PLIST_SUB+= MYSQL=""
+.else
+CONFIGURE_ARGS+= --without-mysql
+PLIST_SUB+= MYSQL="@comment "
+.endif
+
PORTDOCS= AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst ChangeLog
RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
RC_SUBR=${RC_SUBR}
post-install:
- ${MV} ${PREFIX}/etc/wzd.cfg ${PREFIX}/etc/wzd.cfg.sample
- ${MV} ${PREFIX}/etc/users ${PREFIX}/etc/users.sample
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for i in ${PORTDOCS}
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
- @${SED} -e 's,PREFIX,${PREFIX},g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
- @${CAT} ${PKGMESSAGE}
@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
${FILESDIR}/wzdftpd.sh > ${PREFIX}/etc/rc.d/wzdftpd.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/wzdftpd.sh
+ @if test ! -f ${PREFIX}/etc/wzd.cfg; then \
+ ${CP} ${PREFIX}/etc/wzd.cfg.sample ${PREFIX}/etc/wzd.cfg; \
+ fi
+ @if test ! -f ${PREFIX}/etc/users; then \
+ ${CP} ${PREFIX}/etc/users.sample ${PREFIX}/etc/users; \
+ fi
.include <bsd.port.post.mk>
diff -ru wzdftpd.orig/distinfo wzdftpd/distinfo
--- wzdftpd.orig/distinfo Wed Feb 23 01:40:30 2005
+++ wzdftpd/distinfo Wed Feb 23 01:47:44 2005
@@ -1,2 +1,2 @@
-MD5 (wzdftpd-0.4.4.tar.gz) = e08d3ce20779ec3c61940293d0042cdd
-SIZE (wzdftpd-0.4.4.tar.gz) = 744775
+MD5 (wzdftpd-0.5.0.tar.gz) = b8da91483230490cb7148e9be286e35e
+SIZE (wzdftpd-0.5.0.tar.gz) = 806802
Only in wzdftpd.orig/files: pkg-message.in
diff -ru wzdftpd.orig/pkg-plist wzdftpd/pkg-plist
--- wzdftpd.orig/pkg-plist Wed Feb 23 01:40:30 2005
+++ wzdftpd/pkg-plist Wed Feb 23 22:47:46 2005
@@ -4,14 +4,41 @@
bin/sitewho
bin/wzd-config
etc/rc.d/wzdftpd.sh
-etc/users.sample
-etc/wzd.cfg.sample
etc/wzd.pem
+etc/file_ginfo.txt
+etc/file_help.txt
+etc/file_swho.txt
+etc/file_user.txt
+etc/file_group.txt
+etc/file_rules.txt
+etc/file_users.txt
+etc/file_vfs.txt
+etc/file_who.txt
+etc/file_groups.txt
+include/wzdftpd/libwzd-auth/wzd_auth.h
+include/wzdftpd/libwzd-auth/wzd_crypt.h
+include/wzdftpd/libwzd-auth/wzd_md5.h
+include/wzdftpd/libwzd-auth/wzd_md5crypt.h
+include/wzdftpd/libwzd-auth/wzd_pam.h
+include/wzdftpd/libwzd-auth/wzd_tls.h
+include/wzdftpd/libwzd-base/hash.h
+include/wzdftpd/libwzd-base/list.h
+include/wzdftpd/libwzd-base/stack.h
+include/wzdftpd/libwzd-base/wzd_strlcat.h
+include/wzdftpd/libwzd.h
+include/wzdftpd/libwzd_pv.h
+include/wzdftpd/libwzd_socket.h
+include/wzdftpd/libwzd_tls.h
+include/wzdftpd/ls.h
+include/wzdftpd/wzd_ClientThread.h
include/wzdftpd/wzd_action.h
+include/wzdftpd/wzd_all.h
include/wzdftpd/wzd_backend.h
include/wzdftpd/wzd_cache.h
+include/wzdftpd/wzd_commands.h
include/wzdftpd/wzd_crc32.h
include/wzdftpd/wzd_crontab.h
+include/wzdftpd/wzd_data.h
include/wzdftpd/wzd_debug.h
include/wzdftpd/wzd_dir.h
include/wzdftpd/wzd_file.h
@@ -19,17 +46,21 @@
include/wzdftpd/wzd_ip.h
include/wzdftpd/wzd_libmain.h
include/wzdftpd/wzd_log.h
-include/wzdftpd/wzd_md5.h
include/wzdftpd/wzd_messages.h
include/wzdftpd/wzd_misc.h
include/wzdftpd/wzd_mod.h
include/wzdftpd/wzd_mutex.h
include/wzdftpd/wzd_perm.h
+include/wzdftpd/wzd_ratio.h
include/wzdftpd/wzd_section.h
include/wzdftpd/wzd_shm.h
-include/wzdftpd/wzd_strlcat.h
-include/wzdftpd/wzd_strtok_r.h
+include/wzdftpd/wzd_site.h
+include/wzdftpd/wzd_site_group.h
+include/wzdftpd/wzd_site_user.h
+include/wzdftpd/wzd_socket.h
+include/wzdftpd/wzd_string.h
include/wzdftpd/wzd_structs.h
+include/wzdftpd/wzd_tls.h
include/wzdftpd/wzd_types.h
include/wzdftpd/wzd_utf8.h
include/wzdftpd/wzd_vars.h
@@ -40,19 +71,12 @@
lib/libwzd.la
share/aclocal/wzd.m4
sbin/wzdftpd
-etc/file_ginfo.txt
-etc/file_help.txt
-etc/file_swho.txt
-etc/file_user.txt
-etc/file_group.txt
-etc/file_rules.txt
-etc/file_users.txt
-etc/file_vfs.txt
-etc/file_who.txt
-etc/file_groups.txt
%%DATADIR%%/backends/libwzdplaintext.a
%%DATADIR%%/backends/libwzdplaintext.so
%%DATADIR%%/backends/libwzdplaintext.la
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.a
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.la
+%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.so
%%DATADIR%%/modules/libwzd_sfv.la
%%DATADIR%%/modules/libwzd_sfv.a
%%DATADIR%%/modules/libwzd_sfv.so
@@ -65,4 +89,10 @@
@dirrm %%DATADIR%%/modules/
@dirrm %%DATADIR%%/backends/
@dirrm %%DATADIR%%/
+@dirrm include/wzdftpd/libwzd-auth
+@dirrm include/wzdftpd/libwzd-base
@dirrm include/wzdftpd
+@unexec if cmp -s %D/etc/wzd.cfg %D/etc/wzd.cfg.sample; then rm -f %D/etc/wzd.cfg; fi
+@unexec if cmp -s %D/etc/users %D/etc/users.sample; then rm -f %D/etc/users; fi
+etc/wzd.cfg.sample
+etc/users.sample
--- wzdftpd.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1D42Xq-000FBa-00.bogorodskiy-inbox-ru>