Date: Fri, 14 Jan 2000 17:14:41 +0900 (JST) From: takamune@avrl.mei.co.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16117: Update: japanese/ndtpd, japanese/eb Message-ID: <200001140814.RAA40450@dream.vrl.mei.co.jp>
next in thread | raw e-mail | index | archive | help
>Number: 16117
>Category: ports
>Synopsis: Update: japanese/ndtpd, japanese/eb
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Jan 14 00:20:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Kazu TAKAMUNE
>Release: FreeBSD 3.4-STABLE i386
>Organization:
Matsushita Electric Industrial Co., Ltd.
>Environment:
FreeBSD 3.4-STABLE(Thu Jan 13 12:08:32 JST 2000)
ports/Mk/bsd.port.mk,v 1.324 1999/11/11 02:36:15
>Description:
Please apply this patch to upgrade ports (of which I'm the maintainer).
These ports should be simultaneously upgraded.
- Updates japanese/ndtpd for the latest version ja-ndtpd-2.3.6.
- Updates japanese/eb for the latest version ja-eb-2.3.6.
Changes:
- japanese/ndtpd
o Set default syslog file for `/var/log/ndtpd.log'.
o Change the default working directory `/var/ndtpd' to `/var/run/ndtpd'.
* It will created by `${PREFIX}/etc/rc.d/ndtpd.sh'
(even if the user select "Inetd mode" !)
* Lock files and a PID file are created under it.
o Support some arguments in the startup script:
${PREFIX}/etc/rc.d/ndtpd.sh start|stop|kill|restart|status|terminate
o Separate the session to build `ndtpd.sh.sample'
from `post-install' into `post-build'.
o Don't configure EB sybsystem in NDTPD.
- japanese/eb
o Don't configure ZLIB sybsystem in EB.
o Don't define CONFIGURE_ENV.
* Suggested by Michael's last commit to japanese/ndtpd/Makefile.
Removed files:
- japanese/ndtpd/patches/patch-aa
* Author has imported this patch into distfiles.
>How-To-Repeat:
>Fix:
diff -x CVS -Nur /usr/ports/japanese/ndtpd/Makefile japanese/ndtpd/Makefile
--- /usr/ports/japanese/ndtpd/Makefile Tue Jan 11 13:26:10 2000
+++ japanese/ndtpd/Makefile Fri Jan 14 12:00:00 2000
@@ -1,13 +1,13 @@
# New ports collection makefile for: ndtpd
-# Version required: 2.3.5
+# Version required: 2.3.6
# Date created: 4 Aug 1998
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD: ports/japanese/ndtpd/Makefile,v 1.14 1999/12/24 18:39:31 mharo Exp $
#
-DISTNAME= ndtpd-2.3.5
-PKGNAME= ja-ndtpd-2.3.5
+DISTNAME= ndtpd-2.3.6
+PKGNAME= ja-ndtpd-2.3.6
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
@@ -16,28 +16,28 @@
LIB_DEPENDS= eb.3:${PORTSDIR}/japanese/eb
USE_LIBTOOL= yes
-CONFIGURE_ARGS= --localstatedir=${VARDIR} --with-eb --with-zlib \
- --with-eb-includes=${PREFIX}/include \
- --with-eb-libraries=${PREFIX}/lib
+CONFIGURE_ARGS= --localstatedir=${RUNDIR} --with-logdir=${LOGDIR} \
+ --with-eb --with-eb-includes=${PREFIX}/include \
+ --with-zlib --with-eb-libraries=${PREFIX}/lib
.if !defined(PACKAGE_BUILDING)
IS_INTERACTIVE= Maybe_interactive_at_install_stage
.endif
-PLIST_SUB= VARDIR=${VARDIR} OWNER=${OWNER} GROUP=${GROUP} MODE=${MODE}
# Local variables
-VARDIR= /var
-OWNER= nobody
-GROUP= nogroup
-MODE= 755
+LOGDIR= /var/log
+RUNDIR= /var/run
STARTUP_SCRIPT= ndtpd.sh.sample
-INSTALL_DIR= ${INSTALL} -d -o ${OWNER} -g ${GROUP} -m ${MODE}
+
+post-extract:
+ cd ${WRKSRC} && ${RM} -rf eb
+
+post-build:
+ ${SED} "s,@prefix@,${PREFIX},; s,@rundir@,${RUNDIR},"\
+ ${FILESDIR}/${STARTUP_SCRIPT} > ${WRKDIR}/${STARTUP_SCRIPT}
post-install:
- ${SED} "s,@prefix@,${PREFIX}," ${FILESDIR}/${STARTUP_SCRIPT} \
- > ${WRKDIR}/${STARTUP_SCRIPT}
${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d
- ${INSTALL_DIR} ${VARDIR}/ndtpd
@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
@${ECHO}
@${CAT} ${PKGMESSAGE}
diff -x CVS -Nur /usr/ports/japanese/ndtpd/files/md5 japanese/ndtpd/files/md5
--- /usr/ports/japanese/ndtpd/files/md5 Sat Nov 27 15:17:49 1999
+++ japanese/ndtpd/files/md5 Fri Jan 14 12:00:00 2000
@@ -1 +1 @@
-MD5 (ndtpd-2.3.5.tar.gz) = dee1cde3d114a0cf5d5d6917382d953e
+MD5 (ndtpd-2.3.6.tar.gz) = e5c5c70b321edbf34eeb7cd3b8120340
diff -x CVS -Nur /usr/ports/japanese/ndtpd/files/ndtpd.sh.sample japanese/ndtpd/files/ndtpd.sh.sample
--- /usr/ports/japanese/ndtpd/files/ndtpd.sh.sample Thu Aug 19 19:50:17 1999
+++ japanese/ndtpd/files/ndtpd.sh.sample Fri Jan 14 12:00:00 2000
@@ -1,15 +1,49 @@
-#!/bin/sh -
-#
-# NDTPD: rc-file for FreeBSD.
-#
-
-### NDTPD options: ###
-ndtpd_program=@prefix@/sbin/ndtpd # path to ndtpd.
-ndtpd_enable=YES # Run ndtpd (or NO).
-ndtpd_flags= # Flags to ndtpd (if enabled).
-### End of NDTPD options: ###
-
-if [ "x${ndtpd_enable}" = xYES -a -x ${ndtpd_program} ]; then
- echo -n " ndtpd"
- ${ndtpd_program} ${ndtpd_flags}
+#!/bin/sh -e -
+# startup script for ndtpd
+
+# Usage: ndtpd.sh [kill|restart|status|terminate|stop|start]
+
+command=$1
+standalone=YES # Run ndtpd as a standalone daemon.
+#standalone=NO # Run ndtpd as a child of inetd.
+
+GetDirective() {
+ directive=$1
+
+ awk '/^[ ]*'${directive}'[ ]+/ {print $2; exit}' ${conf}
+}
+
+MakeWorkingDirectory() {
+ user="`GetDirective user`"
+ group="`GetDirective group`"
+ work="`GetDirective work-path`"
+
+ rm -rf ${work:=@rundir@/ndtpd}
+ eval install -d ${user:+-o ${user}} ${group:+-g ${group}} ${work}
+}
+
+conf=@prefix@/etc/ndtpd.conf
+
+[ -f ${conf} ] || exit
+ndtpcheck || exit
+
+if [ "${standalone}" = YES ]; then
+ ctrl=ndtpcontrol
+ start="echo -n ' ndtpd'; ndtpd"
+else
+ ctrl="echo 'Error: inetd invokes ndtpd.' >&2; false"
fi
+
+case "${command}" in
+kill|restart|status|terminate)
+ eval ${ctrl} ${command};;
+
+stop)
+ eval ${ctrl} terminate;;
+
+start|*)
+ MakeWorkingDirectory
+ eval ${start};;
+esac
+
+exit
diff -x CVS -Nur /usr/ports/japanese/ndtpd/patches/patch-aa japanese/ndtpd/patches/patch-aa
--- /usr/ports/japanese/ndtpd/patches/patch-aa Sat Nov 27 15:17:49 1999
+++ japanese/ndtpd/patches/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- ndtpd/ndtpd.c.orig Sat Sep 4 12:03:40 1999
-+++ ndtpd/ndtpd.c Tue Nov 23 12:00:00 1999
-@@ -660,7 +660,7 @@
- clear_line_buffer(&line_buffer);
- clear_ticket_stock(&connection_ticket_stock);
-
-- syslog(LOG_ERR, "the child server process exits");
-+ syslog(LOG_INFO, "the child server process exits");
- exit(0);
-
- /*
diff -x CVS -Nur /usr/ports/japanese/ndtpd/pkg/MESSAGE japanese/ndtpd/pkg/MESSAGE
--- /usr/ports/japanese/ndtpd/pkg/MESSAGE Thu Aug 19 19:50:21 1999
+++ japanese/ndtpd/pkg/MESSAGE Fri Jan 14 12:00:00 2000
@@ -1,11 +1,19 @@
************************************************************************
- To use `ndtpd', copy a sample configuration file `ndtpd.conf.sample'
-to `ndtpd.conf' in '${PREFIX}/etc' directory, and edit it. Consult the
-"Configuration File" section of info file.
+You'll need manual configurations to actually activate `ndtpd'.
- If you want to start `ndtpd' as a standalone daemon, copy a script
-`ndtpd.sh.sample' to `ndtpd.sh' in '${PREFIX}/etc/rc.d' directory, and
-exec it. Otherwise, to start as a child process of `inetd', edit the
-file `/etc/inetd.conf'. In either case, consult the "Start the Server"
-section of info file.
+**** IF YOU WANT TO SETUP PRIVATE SYSLOG, edit /etc/syslog.conf.
+
+1st) Copy a sample configuration file `ndtpd.conf.sample' to `ndtpd.conf'
+ in `${PREFIX}/etc' directory, and edit it.
+ Consult the "Configuration File" section of info file.
+
+2nd) Copy a sample startup script `ndtpd.sh.sample' to `ndtpd.sh'
+ in `${PREFIX}/etc/rc.d' directory, and edit it.
+
+ a) To start `ndtpd' as a standalone daemon, set the variable
+ `standalone' in the script to `YES', and exec it.
+
+ b) Otherwise, to start as a child process of `inetd',
+ set `standalone' to `NO', and edit the file `/etc/inetd.conf'.
+ Consult the "Run as a Child of inetd" section of info file.
************************************************************************
diff -x CVS -Nur /usr/ports/japanese/ndtpd/pkg/PLIST japanese/ndtpd/pkg/PLIST
--- /usr/ports/japanese/ndtpd/pkg/PLIST Thu Aug 19 19:50:21 1999
+++ japanese/ndtpd/pkg/PLIST Fri Jan 14 12:00:00 2000
@@ -11,5 +11,3 @@
sbin/ndtpcontrol
sbin/ndtpd
sbin/ndtpdaily
-@exec install -d -o %%OWNER%% -g %%GROUP%% -m %%MODE%% %%VARDIR%%/ndtpd
-@unexec rm -rf %%VARDIR%%/ndtpd
diff -x CVS -Nur /usr/ports/japanese/eb/Makefile japanese/eb/Makefile
--- /usr/ports/japanese/eb/Makefile Sat Nov 27 15:17:45 1999
+++ japanese/eb/Makefile Fri Jan 14 12:00:00 2000
@@ -1,13 +1,13 @@
# New ports collection makefile for: eb
-# Version required: 2.3.5
+# Version required: 2.3.6
# Date created: 20 Jan 1999
# Whom: Motoyuki Kasahara <m-kasahr@sra.co.jp>
#
# $FreeBSD: ports/japanese/eb/Makefile,v 1.9 1999/11/27 06:17:45 sumikawa Exp $
#
-DISTNAME= eb-2.3.5
-PKGNAME= ja-eb-2.3.5
+DISTNAME= eb-2.3.6
+PKGNAME= ja-eb-2.3.6
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/eb/
DISTFILES= ${EBFILES} ${APPENDIXFILES}
@@ -47,10 +47,11 @@
DIST_SUBDIR= eb
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-zlib
-CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
- INSTALL_DATA="${INSTALL_DATA}"
APPENDIXDIR= ${PREFIX}/share/eb/appendix
+
+post-extract:
+ cd ${WRKSRC} && ${RM} -rf zlib
post-install:
.for file in ${APPENDIXFILES}
diff -x CVS -Nur /usr/ports/japanese/eb/files/md5 japanese/eb/files/md5
--- /usr/ports/japanese/eb/files/md5 Sat Nov 27 15:17:46 1999
+++ japanese/eb/files/md5 Fri Jan 14 12:00:00 2000
@@ -1,4 +1,4 @@
-MD5 (eb/eb-2.3.5.tar.gz) = f84cca7164703dea5862f622f76eb515
+MD5 (eb/eb-2.3.6.tar.gz) = 73fbad533550af126b5666b336f54062
MD5 (eb/appendix/cencro-1.0.tar.gz) = 1c93a68fae90990b631bd5302349d199
MD5 (eb/appendix/chujiten-2.3.tar.gz) = 750c15b8e94faca7cb4b15b98d1fbb19
MD5 (eb/appendix/chujiten2-2.0.tar.gz) = 62a86bdb51a38b554bc6c3bb40da443a
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001140814.RAA40450>