Date: Wed, 31 May 2006 21:10:48 +0800 (CST) From: Jui-Nan Lin <jnlin@csie.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: novel@FreeBSD.org Subject: ports/98212: [PATCH] ftp/wzdftpd: update to 0.7.2 Message-ID: <20060531131048.DC699CF2B@Seattle.tamama.org> Resent-Message-ID: <200605311320.k4VDKK3q045208@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98212
>Category: ports
>Synopsis: [PATCH] ftp/wzdftpd: update to 0.7.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed May 31 13:20:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Jui-Nan Lin
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD Seattle.tamama.org 6.1-STABLE FreeBSD 6.1-STABLE #6: Thu May 11 13:21:57 CST 2006
>Description:
- Update to 0.7.2
* The location of configuration files was changed from etc/ to etc/wzdftpd/
Added file(s):
- files/wzdftpd.sh.in
Removed file(s):
- files/wzdftpd.sh
Port maintainer (novel@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- wzdftpd-0.7.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/ftp/wzdftpd/Makefile /home/jnlin/ports/wzdftpd/Makefile
--- /usr/ports/ftp/wzdftpd/Makefile Sun May 7 19:09:22 2006
+++ /home/jnlin/ports/wzdftpd/Makefile Wed May 31 21:01:47 2006
@@ -6,8 +6,7 @@
#
PORTNAME= wzdftpd
-PORTVERSION= 0.6.1
-PORTREVISION= 2
+PORTVERSION= 0.7.2
CATEGORIES= ftp ipv6
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -15,12 +14,12 @@
MAINTAINER= novel@FreeBSD.org
COMMENT= Modular FTP server configurable online using SITE commands
-USE_RC_SUBR= yes
+USE_RC_SUBR= wzdftpd.sh
USE_GMAKE= yes
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
USE_GNOME= pkgconfig
-CONFIGURE_ARGS+= --without-pam --without-pgsql --disable-bonjour
+CONFIGURE_ARGS+= --without-pam --disable-pgsql --disable-bonjour --mandir=${MANPREFIX}/man
CONFIGURE_ENV= CPPFLAGS="${CPPLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -72,8 +71,8 @@
CONFIGURE_ARGS+= --disable-gnutls
.endif
-.if defined(WITH_IPV6)
-CONFIGURE_ARGS+= --enable-ipv6
+.if !defined(WITH_IPV6)
+CONFIGURE_ARGS+= --disable-ipv6
.endif
.if !defined(WITH_PERL)
@@ -88,7 +87,7 @@
USE_MYSQL= yes
PLIST_SUB+= MYSQL=""
.else
-CONFIGURE_ARGS+= --without-mysql
+CONFIGURE_ARGS+= --disable-mysql
PLIST_SUB+= MYSQL="@comment "
.endif
@@ -126,14 +125,11 @@
@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
.endfor
.endif
- @${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; \
+ @if test ! -f ${PREFIX}/etc/wzdftpd/wzd.cfg; then \
+ ${CP} ${PREFIX}/etc/wzdftpd/wzd.cfg.sample ${PREFIX}/etc/wzdftpd/wzd.cfg; \
fi
- @if test ! -f ${PREFIX}/etc/users; then \
- ${CP} ${PREFIX}/etc/users.sample ${PREFIX}/etc/users; \
+ @if test ! -f ${PREFIX}/etc/wzdftpd/users; then \
+ ${CP} ${PREFIX}/etc/wzdftpd/users.sample ${PREFIX}/etc/wzdftpd/users; \
fi
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/ftp/wzdftpd/distinfo /home/jnlin/ports/wzdftpd/distinfo
--- /usr/ports/ftp/wzdftpd/distinfo Sat Feb 4 15:36:15 2006
+++ /home/jnlin/ports/wzdftpd/distinfo Wed May 31 19:19:57 2006
@@ -1,3 +1,3 @@
-MD5 (wzdftpd-0.6.1.tar.gz) = 4cffafcf1c3b76504b82250b92d73cdf
-SHA256 (wzdftpd-0.6.1.tar.gz) = ad0045dac6f061830aa784fdc1a18da28874a97c0005b6e665c0467dd0c48672
-SIZE (wzdftpd-0.6.1.tar.gz) = 888206
+MD5 (wzdftpd-0.7.2.tar.gz) = 92ed2975f5a2ddcbd1f34301d6d0d7be
+SHA256 (wzdftpd-0.7.2.tar.gz) = c2ecea11b9d864e320c6af82de1eeecd4ad1ad458e588e6a65886d715754a749
+SIZE (wzdftpd-0.7.2.tar.gz) = 895046
diff -ruN --exclude=CVS /usr/ports/ftp/wzdftpd/files/wzdftpd.sh /home/jnlin/ports/wzdftpd/files/wzdftpd.sh
--- /usr/ports/ftp/wzdftpd/files/wzdftpd.sh Tue Feb 21 04:47:01 2006
+++ /home/jnlin/ports/wzdftpd/files/wzdftpd.sh Thu Jan 1 08:00:00 1970
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Start or stop wzdftpd
-# $FreeBSD: ports/ftp/wzdftpd/files/wzdftpd.sh,v 1.3 2006/02/20 20:47:01 dougb Exp $
-
-# PROVIDE: wzdftpd
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-#
-
-prefix=%%PREFIX%%
-
-wzdftpd_enable=${wzdftpd_enable:-"NO"} # Enable wzdftpd
-wzdftpd_program="${prefix}/sbin/wzdftpd" # Location of wzdftpd
-wzdftpd_flags=${wzdftpd_flags:-""} # Flags to wzdftpd
-
-. %%RC_SUBR%%
-
-name="wzdftpd"
-rcvar=`set_rcvar`
-command="${prefix}/sbin/${name}"
-required_files="${prefix}/etc/wzd.cfg"
-
-load_rc_config $name
-run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/ftp/wzdftpd/files/wzdftpd.sh.in /home/jnlin/ports/wzdftpd/files/wzdftpd.sh.in
--- /usr/ports/ftp/wzdftpd/files/wzdftpd.sh.in Thu Jan 1 08:00:00 1970
+++ /home/jnlin/ports/wzdftpd/files/wzdftpd.sh.in Wed May 31 19:16:54 2006
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Start or stop wzdftpd
+# $FreeBSD: ports/ftp/wzdftpd/files/wzdftpd.sh,v 1.3 2006/02/20 20:47:01 dougb Exp $
+
+# PROVIDE: wzdftpd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+#
+
+prefix=%%PREFIX%%
+
+wzdftpd_enable=${wzdftpd_enable:-"NO"} # Enable wzdftpd
+wzdftpd_program="${prefix}/sbin/wzdftpd" # Location of wzdftpd
+wzdftpd_flags=${wzdftpd_flags:-""} # Flags to wzdftpd
+
+. %%RC_SUBR%%
+
+name="wzdftpd"
+rcvar=`set_rcvar`
+command="${prefix}/sbin/${name}"
+required_files="${prefix}/etc/wzd.cfg"
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/ftp/wzdftpd/pkg-plist /home/jnlin/ports/wzdftpd/pkg-plist
--- /usr/ports/ftp/wzdftpd/pkg-plist Sun Feb 26 03:08:55 2006
+++ /home/jnlin/ports/wzdftpd/pkg-plist Wed May 31 21:05:38 2006
@@ -3,18 +3,17 @@
bin/siteuptime
bin/sitewho
bin/wzd-config
-etc/rc.d/wzdftpd.sh
-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
+etc/wzdftpd/wzd.pem
+etc/wzdftpd/file_ginfo.txt
+etc/wzdftpd/file_help.txt
+etc/wzdftpd/file_swho.txt
+etc/wzdftpd/file_user.txt
+etc/wzdftpd/file_group.txt
+etc/wzdftpd/file_rules.txt
+etc/wzdftpd/file_users.txt
+etc/wzdftpd/file_vfs.txt
+etc/wzdftpd/file_who.txt
+etc/wzdftpd/file_groups.txt
include/wzdftpd/libwzd-auth/wzd_auth.h
include/wzdftpd/libwzd-auth/wzd_base64.h
include/wzdftpd/libwzd-auth/wzd_crypt.h
@@ -80,11 +79,11 @@
lib/libwzd_core.a
lib/libwzd_core.la
lib/libwzd_core.so
-lib/libwzd_core.so.1
+lib/libwzd_core.so.700
lib/libwzd.a
lib/libwzd.la
lib/libwzd.so
-lib/libwzd.so.1
+lib/libwzd.so.700
share/aclocal/wzd.m4
sbin/wzdftpd
%%DATADIR%%/backends/libwzdplaintext.a
@@ -93,6 +92,9 @@
%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.a
%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.la
%%MYSQL%%%%DATADIR%%/backends/libwzdmysql.so
+%%DATADIR%%/modules/libwzd_debug.so
+%%DATADIR%%/modules/libwzd_debug.la
+%%DATADIR%%/modules/libwzd_debug.a
%%DATADIR%%/modules/libwzd_sfv.a
%%DATADIR%%/modules/libwzd_sfv.la
%%DATADIR%%/modules/libwzd_sfv.so
@@ -113,7 +115,8 @@
@dirrm include/wzdftpd/libwzd-core/arch
@dirrm include/wzdftpd/libwzd-core
@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
+@unexec if cmp -s %D/etc/wzdftpd/wzd.cfg %D/etc/wzdftpd/wzd.cfg.sample; then rm -f %D/etc/wzdftpd/wzd.cfg; fi
+@unexec if cmp -s %D/etc/wzdftpd/users %D/etc/wzdftpd/users.sample; then rm -f %D/etc/wzdftpd/users; fi
+etc/wzdftpd/wzd.cfg.sample
+etc/wzdftpd/users.sample
+@dirrmtry etc/wzdftpd
--- wzdftpd-0.7.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060531131048.DC699CF2B>