Attachment 132557 Details for Bug 176866 – patch-ja-ebnetd

patch-ja-ebnetd

patch-ja-ebnetd (text/plain), 8.21 KB, created by Yasuhiro Kimura on 2013-03-12 00:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2013-03-12 00:10:00 UTC

Size: 8.21 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 313906)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	ebnetd
> PORTVERSION=	1.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	japanese ipv6
> MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
> 
>@@ -20,19 +20,14 @@
> # Local variables
> LOGDIR=		/var/log
> RUNDIR=		/var/run
>-STARTUP_SCRIPT=	${PORTNAME}.sh
> 
>-USE_RC_SUBR=	yes
>-RC_SCRIPTS_SUB=	PREFIX=${PREFIX}
>+USE_RC_SUBR=	ebhttpd ebnetd ndtpd
>+SUB_FILES=	pkg-message
>+PLIST_SUB=	EBNETD_RUNDIR=${RUNDIR}/${PORTNAME}
> 
> INFO=		ebnetd ebnetd-ja
> 
>-post-build:
>-	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
>-		${FILESDIR}/${STARTUP_SCRIPT} > ${WRKDIR}/${STARTUP_SCRIPT}
>-
> post-install:
>-	${INSTALL_SCRIPT} ${WRKDIR}/${STARTUP_SCRIPT} ${PREFIX}/etc/rc.d
> 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 	@${ECHO}
> 	@${CAT} ${PKGMESSAGE}
>Index: files/ebhttpd.in
>===================================================================
>--- files/ebhttpd.in	(working copy)
>+++ files/ebhttpd.in	(working copy)
>@@ -3,21 +3,12 @@
> # $FreeBSD$
> #
> 
>-# PROVIDE: ebnetd ndtpd ebhttpd
>-# REQUIRE: NETWORKING SERVERS
>-# BEFORE: DAEMON
>+# PROVIDE: ebhttpd
>+# REQUIRE: LOGIN
> # KEYWORD: shutdown
> 
> #
>-# Add the following lines to /etc/rc.conf to enable EBNETD servers:
>-# ebnetd_enable (bool):  Set to "NO" by default.
>-#                        Set it to "YES" to enable ebnetd.
>-# ebnetd_flags (str):    Set to "" by default.
>-#                        Extra flags passed to start ebnetd.
>-# ndtpd_enable (bool):   Set to "NO" by default.
>-#                        Set it to "YES" to enable ndtpd.
>-# ndtpd_flags (str):     Set to "" by default.
>-#                        Extra flags passed to start ndtpd.
>+# Add the following lines to /etc/rc.conf to enable ebhttpd:
> # ebhttpd_enable (bool): Set to "NO" by default.
> #                        Set it to "YES" to enable ebhttpd.
> # ebhttpd_flags (str):   Set to "" by default.
>@@ -25,41 +16,6 @@
> 
> . /etc/rc.subr
> 
>-# ebnetd
>-name=ebnetd
>-rcvar=ebnetd_enable
>-command="%%PREFIX%%/sbin/${name}"
>-pidfile="/var/run/ebnetd/ebnd.pid"
>-required_dirs="/var/run/ebnetd"
>-required_files=%%PREFIX%%/etc/ebnetd.conf
>-
>-ebnetd_enable=${ebnetd_enable:-"NO"}
>-ebnetd_flags=${ebnetd_flags:-""}
>-
>-sig_reload=SIGHUP
>-extra_commands="reload"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>-
>-# ndtpd
>-name=ndtpd
>-rcvar=ndtpd_enable
>-command="%%PREFIX%%/sbin/${name}"
>-pidfile="/var/run/ebnetd/${name}.pid"
>-required_dirs="/var/run/ebnetd"
>-required_files=%%PREFIX%%/etc/ebnetd.conf
>-
>-ndtpd_enable=${ndtpd_enable:-"NO"}
>-ndtpd_flags=${ndtpd_flags:-""}
>-
>-sig_reload=SIGHUP
>-extra_commands="reload"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>-
>-# ebhttpd
> name=ebhttpd
> rcvar=ebhttpd_enable
> command="%%PREFIX%%/sbin/${name}"
>Index: files/ebnetd.in
>===================================================================
>--- files/ebnetd.in	(working copy)
>+++ files/ebnetd.in	(working copy)
>@@ -3,25 +3,16 @@
> # $FreeBSD$
> #
> 
>-# PROVIDE: ebnetd ndtpd ebhttpd
>-# REQUIRE: NETWORKING SERVERS
>-# BEFORE: DAEMON
>+# PROVIDE: ebnetd
>+# REQUIRE: LOGIN
> # KEYWORD: shutdown
> 
> #
>-# Add the following lines to /etc/rc.conf to enable EBNETD servers:
>+# Add the following lines to /etc/rc.conf to enable ebnetd:
> # ebnetd_enable (bool):  Set to "NO" by default.
> #                        Set it to "YES" to enable ebnetd.
> # ebnetd_flags (str):    Set to "" by default.
> #                        Extra flags passed to start ebnetd.
>-# ndtpd_enable (bool):   Set to "NO" by default.
>-#                        Set it to "YES" to enable ndtpd.
>-# ndtpd_flags (str):     Set to "" by default.
>-#                        Extra flags passed to start ndtpd.
>-# ebhttpd_enable (bool): Set to "NO" by default.
>-#                        Set it to "YES" to enable ebhttpd.
>-# ebhttpd_flags (str):   Set to "" by default.
>-#                        Extra flags passed to start ebhttpd.
> 
> . /etc/rc.subr
> 
>@@ -41,37 +32,3 @@
> 
> load_rc_config $name
> run_rc_command "$1"
>-
>-# ndtpd
>-name=ndtpd
>-rcvar=ndtpd_enable
>-command="%%PREFIX%%/sbin/${name}"
>-pidfile="/var/run/ebnetd/${name}.pid"
>-required_dirs="/var/run/ebnetd"
>-required_files=%%PREFIX%%/etc/ebnetd.conf
>-
>-ndtpd_enable=${ndtpd_enable:-"NO"}
>-ndtpd_flags=${ndtpd_flags:-""}
>-
>-sig_reload=SIGHUP
>-extra_commands="reload"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>-
>-# ebhttpd
>-name=ebhttpd
>-rcvar=ebhttpd_enable
>-command="%%PREFIX%%/sbin/${name}"
>-pidfile="/var/run/ebnetd/${name}.pid"
>-required_dirs="/var/run/ebnetd"
>-required_files=%%PREFIX%%/etc/ebnetd.conf
>-
>-ebhttpd_enable=${ebhttpd_enable:-"NO"}
>-ebhttpd_flags=${ebhttpd_flags:-""}
>-
>-sig_reload=SIGHUP
>-extra_commands="reload"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>Index: files/ndtpd.in
>===================================================================
>--- files/ndtpd.in	(working copy)
>+++ files/ndtpd.in	(working copy)
>@@ -3,45 +3,19 @@
> # $FreeBSD$
> #
> 
>-# PROVIDE: ebnetd ndtpd ebhttpd
>-# REQUIRE: NETWORKING SERVERS
>-# BEFORE: DAEMON
>+# PROVIDE: ndtpd
>+# REQUIRE: LOGIN
> # KEYWORD: shutdown
> 
> #
>-# Add the following lines to /etc/rc.conf to enable EBNETD servers:
>-# ebnetd_enable (bool):  Set to "NO" by default.
>-#                        Set it to "YES" to enable ebnetd.
>-# ebnetd_flags (str):    Set to "" by default.
>-#                        Extra flags passed to start ebnetd.
>+# Add the following lines to /etc/rc.conf to enable ndtpd:
> # ndtpd_enable (bool):   Set to "NO" by default.
> #                        Set it to "YES" to enable ndtpd.
> # ndtpd_flags (str):     Set to "" by default.
> #                        Extra flags passed to start ndtpd.
>-# ebhttpd_enable (bool): Set to "NO" by default.
>-#                        Set it to "YES" to enable ebhttpd.
>-# ebhttpd_flags (str):   Set to "" by default.
>-#                        Extra flags passed to start ebhttpd.
> 
> . /etc/rc.subr
> 
>-# ebnetd
>-name=ebnetd
>-rcvar=ebnetd_enable
>-command="%%PREFIX%%/sbin/${name}"
>-pidfile="/var/run/ebnetd/ebnd.pid"
>-required_dirs="/var/run/ebnetd"
>-required_files=%%PREFIX%%/etc/ebnetd.conf
>-
>-ebnetd_enable=${ebnetd_enable:-"NO"}
>-ebnetd_flags=${ebnetd_flags:-""}
>-
>-sig_reload=SIGHUP
>-extra_commands="reload"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>-
> # ndtpd
> name=ndtpd
> rcvar=ndtpd_enable
>@@ -58,20 +32,3 @@
> 
> load_rc_config $name
> run_rc_command "$1"
>-
>-# ebhttpd
>-name=ebhttpd
>-rcvar=ebhttpd_enable
>-command="%%PREFIX%%/sbin/${name}"
>-pidfile="/var/run/ebnetd/${name}.pid"
>-required_dirs="/var/run/ebnetd"
>-required_files=%%PREFIX%%/etc/ebnetd.conf
>-
>-ebhttpd_enable=${ebhttpd_enable:-"NO"}
>-ebhttpd_flags=${ebhttpd_flags:-""}
>-
>-sig_reload=SIGHUP
>-extra_commands="reload"
>-
>-load_rc_config $name
>-run_rc_command "$1"
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(working copy)
>+++ files/pkg-message.in	(working copy)
>@@ -1,12 +1,13 @@
> **********************************************************************
>-You'll need manual configurations to actually activate EBNETD servers.
>+You'll need manual configurations to actually activate EBNETD servers 
>+(ebhttpd/ebnetd/ndtpd).
> 
> Step 0(optional):
> If you want to setup private syslog, edit /etc/syslog.conf.
> 
> Step 1:
> Copy a sample configuration file `ebnetd.conf.sample' to `ebnetd.conf'
>-in `${PREFIX}/etc' directory, and edit it. Consult the "Configuration
>+in `%%PREFIX%%/etc' directory, and edit it. Consult the "Configuration
> File" section of info file.
> 
> Step 2a:
>Index: pkg-descr
>===================================================================
>--- pkg-descr	(revision 313906)
>+++ pkg-descr	(working copy)
>@@ -20,5 +20,3 @@
> In addition, you must follow the licenses of your CD-ROM books. Though
> EBNETD is free software, your books may not be free. Don't open your
> books to unlicensed hosts nor users.
>-
>-WWW: http://www.sra.co.jp/people/m-kasahr/ebnetd/
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 313906)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,5 @@
> @comment $FreeBSD$
> etc/ebnetd.conf.sample
>-etc/rc.d/ebnetd.sh
> libexec/ebhtstat
> libexec/ebnstat
> libexec/ndtpstat
>@@ -15,5 +14,5 @@
> sbin/ndtpcheck
> sbin/ndtpcontrol
> sbin/ndtpd
>-@exec /bin/mkdir -m 0755 -p /var/run/ebnetd
>-@dirrmtry /var/run/ebnetd
>+@exec mkdir -m 0755 -p %%EBNETD_RUNDIR%%
>+@unexec rmdir %%EBNETD_RUNDIR%%

Actions: View

Attachments on bug 176866: 132557