Date: Mon, 7 Feb 2005 10:00:38 GMT From: Boris Kovalenko <boris@ntmk.ru> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/77194: net/quagga reveals some bugs if installing from a binary package Message-ID: <200502071000.j17A0cmH050389@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/77194; it has been noted by GNATS. From: Boris Kovalenko <boris@ntmk.ru> To: Yar Tikhiy <yar@comp.chem.msu.su>, FreeBSD-gnats-submit@freebsd.org Cc: Subject: Re: ports/77194: net/quagga reveals some bugs if installing from a binary package Date: Mon, 07 Feb 2005 14:55:18 +0500 This is a multi-part message in MIME format. --------------070709040501060705070709 Content-Type: text/plain; charset=KOI8-R; format=flowed Content-Transfer-Encoding: 7bit Hello! Thanks for the report. Please apply the patch attached. -- With respect, Boris Kovalenko. --------------070709040501060705070709 Content-Type: text/plain; name="quagga.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="quagga.patch" --- 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 Sun Feb 6 03:19:43 2005 +++ /usr/ports/net/quagga.new/Makefile Mon Feb 7 14:49:17 2005 @@ -7,7 +7,7 @@ PORTNAME= quagga PORTVERSION= 0.98.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://quagga.net/download/ @@ -28,6 +28,7 @@ MAN1= vtysh.1 MAN8= bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8 +INFO= quagga OPTIONS= ISISD "Enable experimental ISIS daemon" off \ PAM "PAM authentication for vtysh" off \ @@ -48,7 +49,33 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -SCRIPTS_ENV= PREFIX=${PREFIX} \ +.if !defined(ENABLE_USER) +ENABLE_USER=quagga +.endif +.if !defined(ENABLE_GROUP) +ENABLE_GROUP=quagga +.endif + +CONFIGURE_ARGS+=--enable-user=${ENABLE_USER} +CONFIGURE_ARGS+=--enable-group=${ENABLE_GROUP} + +.if !defined(SYSCONF_DIR) +SYSCONF_DIR=${PREFIX}/etc/quagga +.endif +.if !defined(LOCALSTATE_DIR) +LOCALSTATE_DIR=/var/run/quagga +.endif + +CONFIGURE_ARGS+=--sysconfdir=${SYSCONF_DIR} +CONFIGURE_ARGS+=--localstatedir=${LOCALSTATE_DIR} + +.if defined(ENABLE_VTY_GROUP) +CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP} +.endif + +CONFIGURE_ARGS+=--enable-vtysh + +SCRIPTS_ENV= PREFIX=${PREFIX} PKG_PREFIX=${PREFIX} \ SYSCONF_DIR=${SYSCONF_DIR} SYSSTATE_DIR=${SYSSTATE_DIR} \ ENABLE_USER=${ENABLE_USER} ENABLE_GROUP=${ENABLE_GROUP} @@ -108,32 +135,6 @@ 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 !defined(ENABLE_USER) -ENABLE_USER=quagga -.endif -.if !defined(ENABLE_GROUP) -ENABLE_GROUP=quagga -.endif - -CONFIGURE_ARGS+=--enable-user=${ENABLE_USER} -CONFIGURE_ARGS+=--enable-group=${ENABLE_GROUP} - -.if !defined(SYSCONF_DIR) -SYSCONF_DIR=${PREFIX}/etc/quagga -.endif -.if !defined(LOCALSTATE_DIR) -LOCALSTATE_DIR=/var/run/quagga -.endif - -CONFIGURE_ARGS+=--sysconfdir=${SYSCONF_DIR} -CONFIGURE_ARGS+=--localstatedir=${LOCALSTATE_DIR} - -.if defined(ENABLE_VTY_GROUP) -CONFIGURE_ARGS+=--enable-vty-group=${ENABLE_VTY_GROUP} -.endif - -CONFIGURE_ARGS+=--enable-vtysh - .if ${OSVERSION} >= 500038 RC_SUBR?= ${DESTDIR}/etc/rc.subr RC_DIR= ${DESTDIR}/etc/rc.d @@ -155,7 +156,8 @@ RC_SUFX=${RC_SUFX} \ LOCALSTATE_DIR=${LOCALSTATE_DIR} \ ENABLE_USER=${ENABLE_USER} \ - ENABLE_GROUP=${ENABLE_GROUP} + ENABLE_GROUP=${ENABLE_GROUP} \ + CWD_TRICK=${PREFIX} pre-everything:: @${ECHO} "=============================================================" diff -ruN --exclude=CVS /usr/ports/net/quagga/pkg-install /usr/ports/net/quagga.new/pkg-install --- /usr/ports/net/quagga/pkg-install Sat Jan 15 08:01:27 2005 +++ /usr/ports/net/quagga.new/pkg-install Mon Feb 7 14:21:40 2005 @@ -3,7 +3,7 @@ PATH=/bin:/usr/sbin if [ -z "${SYSCONF_DIR}" ]; then - SYSCONF_DIR=${PREFIX}/etc/quagga + SYSCONF_DIR=${PKG_PREFIX}/etc/quagga fi if [ -z "${LOCALSTATE_DIR}" ]; then @@ -26,7 +26,7 @@ echo "You already have a group \"${ENABLE_GROUP}\", so I will use it." else if pw groupadd ${ENABLE_GROUP} -g ${GID}; then - echo "Added group \"${ENABLE_GROUP}\." + echo "Added group \"${ENABLE_GROUP}\"." else echo "Adding group \"${ENABLE_GROUP}\" failed." exit 1 diff -ruN --exclude=CVS /usr/ports/net/quagga/pkg-plist /usr/ports/net/quagga.new/pkg-plist --- /usr/ports/net/quagga/pkg-plist Sun Feb 6 03:19:43 2005 +++ /usr/ports/net/quagga.new/pkg-plist Mon Feb 7 14:42:54 2005 @@ -63,9 +63,6 @@ include/quagga/zassert.h include/quagga/zclient.h include/quagga/zebra.h -info/quagga.info -@unexec install-info --delete %D/info/quagga.info %D/info/dir -@exec install-info %D/info/quagga.info %D/info/dir %%EXAMPLESDIR%%/bgpd.conf.sample %%EXAMPLESDIR%%/bgpd.conf.sample2 %%ISISD_CONF%% @@ -83,4 +80,5 @@ @cwd %%RC_DIR%% quagga%%RC_SUFX%% watchquagga%%RC_SUFX%% +@cwd %%CWD_TRICK%% @unexec rmdir %%LOCALSTATE_DIR%% 2>/dev/null || true --- quagga-0.98.2_1.patch ends here --- --------------070709040501060705070709--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502071000.j17A0cmH050389>