ports/78614: [MAINTAINER UPDATE] net/quagga: [SUMMARIZE CHANGES]
Boris Kovalenko
boris at tagnet.ru
Wed Mar 9 11:00:09 UTC 2005
>Number: 78614
>Category: ports
>Synopsis: [MAINTAINER UPDATE] net/quagga: [SUMMARIZE CHANGES]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Mar 09 11:00:07 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Boris Kovalenko
>Release: FreeBSD 5.3-STABLE i386
>Organization:
JSC "Tagnet"
>Environment:
System: FreeBSD boris.nikom.ru 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Feb 9 09:45:12 YEKT
>Description:
[DESCRIBE CHANGES]
This patch uses new USE_RCORDER feature to properly install rcNG scripts. With
this patch PR 77194 may be closed.
Added file(s):
- files/quagga.sh.in
- files/watchquagga.sh.in
Removed file(s):
- files/quagga.sh
- files/watchquagga.sh
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- quagga-0.98.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/quagga/Makefile /usr/ports/net/quagga.new/Makefile
--- /usr/ports/net/quagga/Makefile Wed Mar 9 15:05:07 2005
+++ /usr/ports/net/quagga.new/Makefile Wed Mar 9 15:36:09 2005
@@ -135,29 +135,16 @@
EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd::bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-configure.ac ${PATCHDIR}/extra-tcpmd5-patch-lib::sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib::sockopt.h
.endif
-.if ${OSVERSION} >= 500038
-RC_SUBR?= ${DESTDIR}/etc/rc.subr
-RC_DIR= ${DESTDIR}/etc/rc.d
-RC_SUFX=
-.else
-USE_RC_SUBR= yes
-RC_DIR= ${PREFIX}/etc/rc.d
-RC_SUFX= .sh
-.endif
+USE_RC_SUBR= watchquagga.sh
+USE_RCORDER= quagga.sh
-SED_SCRIPT= -e 's,%%PREFIX%%,${PREFIX},g' \
- -e 's,%%SYSCONF_DIR%%,${SYSCONF_DIR},g' \
- -e 's,%%LOCALSTATE_DIR%%,${LOCALSTATE_DIR},g' \
- -e 's,%%RC_SUBR%%,${RC_SUBR},g' \
- -e 's,%%RC_DIR%%,${RC_DIR},g' \
- -e 's,%%RC_SUFX%%,${RC_SUFX},g'
+SUB_LIST+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \
+ SYSCONF_DIR=${SYSCONF_DIR}
-PLIST_SUB+= RC_DIR=${RC_DIR} \
- RC_SUFX=${RC_SUFX} \
- LOCALSTATE_DIR=${LOCALSTATE_DIR} \
+PLIST_SUB+= LOCALSTATE_DIR=${LOCALSTATE_DIR} \
+ SYSCONF_DIR=${SYSCONF_DIR} \
ENABLE_USER=${ENABLE_USER} \
- ENABLE_GROUP=${ENABLE_GROUP} \
- CWD_TRICK=${PREFIX}
+ ENABLE_GROUP=${ENABLE_GROUP}
pre-everything::
@${ECHO} "============================================================="
@@ -179,10 +166,6 @@
@${ECHO} " WITH_SNMP SNMP support"
@${ECHO} " WITH_TCPSOCKETS Use TCP/IP sockets for protocol daemons"
@${ECHO} " WITH_TCPMD5 Use experimental MD5 patch for BGP"
-
-post-build:
- @${SED} ${SED_SCRIPT} ${FILESDIR}/quagga.sh > ${WRKDIR}/quagga.sh
- @${SED} ${SED_SCRIPT} ${FILESDIR}/watchquagga.sh > ${WRKDIR}/watchquagga.sh
post-install:
@${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/quagga.sh /usr/ports/net/quagga.new/files/quagga.sh
--- /usr/ports/net/quagga/files/quagga.sh Sat Jan 15 08:01:27 2005
+++ /usr/ports/net/quagga.new/files/quagga.sh Thu Jan 1 05:00:00 1970
@@ -1,76 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: quagga
-# REQUIRE: netif routing mountcritlocal
-# BEFORE: NETWORKING
-# KEYWORD: FreeBSD NetBSD
-
-#
-# Add the following line to /etc/rc.conf to enable quagga:
-#quagga_enable="YES"
-#
-# You may also wish to use the following variables to fine-tune startup:
-#quagga_flags="-d"
-#quagga_daemons="zebra ripd ripng ospfd ospf6d bgpd isisd"
-#
-# If the quagga daemons require additional shared libraries to start,
-# use the following variable to run ldconfig(8) in advance:
-#quagga_extralibs_path="/usr/local/lib ..."
-#
-
-. %%RC_SUBR%%
-
-name="quagga"
-rcvar=`set_rcvar`
-
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
- rm -f $pidfile
-}
-
-# set defaults
-
-quagga_enable=${quagga_enable:-"NO"}
-quagga_flags=${quagga_flags:-"-d"}
-quagga_daemons=${quagga_daemons:-"zebra ripd ripng ospfd ospf6d bgpd isisd"}
-quagga_extralibs_path=${quagga_extralibs_path:-""}
-load_rc_config $name
-
-quagga_cmd=$1
-
-case "$1" in
- force*)
- quagga_cmd=${quagga_cmd#force}
- ;;
- fast*)
- quagga_cmd=${quagga_cmd#fast}
- ;;
-esac
-
-case "${quagga_cmd}" in
- start)
- if [ ! -z ${quagga_extralibs_path} ]; then
- /sbin/ldconfig -m ${quagga_extralibs_path}
- fi
- ;;
- stop)
- quagga_daemons=$(reverse_list ${quagga_daemons})
- ;;
-esac
-
-for daemon in ${quagga_daemons}; do
- command=%%PREFIX%%/sbin/${daemon}
- required_files=%%SYSCONF_DIR%%/${daemon}.conf
- pidfile=%%LOCALSTATE_DIR%%/${daemon}.pid
- if [ ${quagga_cmd} = "start" -a ! -f ${required_files} ]; then
- continue
- fi
- if [ ${quagga_cmd} = "stop" -a -z $(check_process ${command}) ]; then
- continue
- fi
- run_rc_command "$1"
-done
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/quagga.sh.in /usr/ports/net/quagga.new/files/quagga.sh.in
--- /usr/ports/net/quagga/files/quagga.sh.in Thu Jan 1 05:00:00 1970
+++ /usr/ports/net/quagga.new/files/quagga.sh.in Sat Jan 15 08:01:27 2005
@@ -0,0 +1,76 @@
+#!/bin/sh
+#
+
+# PROVIDE: quagga
+# REQUIRE: netif routing mountcritlocal
+# BEFORE: NETWORKING
+# KEYWORD: FreeBSD NetBSD
+
+#
+# Add the following line to /etc/rc.conf to enable quagga:
+#quagga_enable="YES"
+#
+# You may also wish to use the following variables to fine-tune startup:
+#quagga_flags="-d"
+#quagga_daemons="zebra ripd ripng ospfd ospf6d bgpd isisd"
+#
+# If the quagga daemons require additional shared libraries to start,
+# use the following variable to run ldconfig(8) in advance:
+#quagga_extralibs_path="/usr/local/lib ..."
+#
+
+. %%RC_SUBR%%
+
+name="quagga"
+rcvar=`set_rcvar`
+
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+ rm -f $pidfile
+}
+
+# set defaults
+
+quagga_enable=${quagga_enable:-"NO"}
+quagga_flags=${quagga_flags:-"-d"}
+quagga_daemons=${quagga_daemons:-"zebra ripd ripng ospfd ospf6d bgpd isisd"}
+quagga_extralibs_path=${quagga_extralibs_path:-""}
+load_rc_config $name
+
+quagga_cmd=$1
+
+case "$1" in
+ force*)
+ quagga_cmd=${quagga_cmd#force}
+ ;;
+ fast*)
+ quagga_cmd=${quagga_cmd#fast}
+ ;;
+esac
+
+case "${quagga_cmd}" in
+ start)
+ if [ ! -z ${quagga_extralibs_path} ]; then
+ /sbin/ldconfig -m ${quagga_extralibs_path}
+ fi
+ ;;
+ stop)
+ quagga_daemons=$(reverse_list ${quagga_daemons})
+ ;;
+esac
+
+for daemon in ${quagga_daemons}; do
+ command=%%PREFIX%%/sbin/${daemon}
+ required_files=%%SYSCONF_DIR%%/${daemon}.conf
+ pidfile=%%LOCALSTATE_DIR%%/${daemon}.pid
+ if [ ${quagga_cmd} = "start" -a ! -f ${required_files} ]; then
+ continue
+ fi
+ if [ ${quagga_cmd} = "stop" -a -z $(check_process ${command}) ]; then
+ continue
+ fi
+ run_rc_command "$1"
+done
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/watchquagga.sh /usr/ports/net/quagga.new/files/watchquagga.sh
--- /usr/ports/net/quagga/files/watchquagga.sh Sat Jan 15 08:01:27 2005
+++ /usr/ports/net/quagga.new/files/watchquagga.sh Thu Jan 1 05:00:00 1970
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-
-# PROVIDE: watchquagga
-# REQUIRE: netif routing mountcritlocal quagga
-# BEFORE: NETWORKING
-# KEYWORD: FreeBSD NetBSD
-
-#
-# Add the following line to /etc/rc.conf to enable quagga:
-#watchquagga_enable="YES"
-#
-# You may also wish to use the following variables to fine-tune startup:
-#watchquagga_flags=""
-#
-#
-
-. %%RC_SUBR%%
-
-name="watchquagga"
-rcvar=`set_rcvar`
-
-
-stop_postcmd=stop_postcmd
-
-stop_postcmd()
-{
- rm -f $pidfile
-}
-
-# set defaults
-
-watchquagga_enable=${watchquagga_enable:-"NO"}
-watchquagga_flags=${watchquagga_flags:-""}
-load_rc_config $name
-
-command=%%PREFIX%%/sbin/watchquagga
-pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid
-run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/watchquagga.sh.in /usr/ports/net/quagga.new/files/watchquagga.sh.in
--- /usr/ports/net/quagga/files/watchquagga.sh.in Thu Jan 1 05:00:00 1970
+++ /usr/ports/net/quagga.new/files/watchquagga.sh.in Sat Jan 15 08:01:27 2005
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+
+# PROVIDE: watchquagga
+# REQUIRE: netif routing mountcritlocal quagga
+# BEFORE: NETWORKING
+# KEYWORD: FreeBSD NetBSD
+
+#
+# Add the following line to /etc/rc.conf to enable quagga:
+#watchquagga_enable="YES"
+#
+# You may also wish to use the following variables to fine-tune startup:
+#watchquagga_flags=""
+#
+#
+
+. %%RC_SUBR%%
+
+name="watchquagga"
+rcvar=`set_rcvar`
+
+
+stop_postcmd=stop_postcmd
+
+stop_postcmd()
+{
+ rm -f $pidfile
+}
+
+# set defaults
+
+watchquagga_enable=${watchquagga_enable:-"NO"}
+watchquagga_flags=${watchquagga_flags:-""}
+load_rc_config $name
+
+command=%%PREFIX%%/sbin/watchquagga
+pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid
+run_rc_command "$1"
diff -ruN --exclude=CVS /usr/ports/net/quagga/pkg-plist /usr/ports/net/quagga.new/pkg-plist
--- /usr/ports/net/quagga/pkg-plist Tue Feb 8 08:17:51 2005
+++ /usr/ports/net/quagga.new/pkg-plist Wed Mar 9 15:32:02 2005
@@ -77,8 +77,4 @@
@dirrm include/quagga
@dirrm share/examples/quagga
@dirrm etc/quagga
- at cwd %%RC_DIR%%
-quagga%%RC_SUFX%%
-watchquagga%%RC_SUFX%%
- at cwd %%CWD_TRICK%%
@unexec rmdir %%LOCALSTATE_DIR%% 2>/dev/null || true
--- quagga-0.98.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list