Date: Fri, 7 Aug 2009 12:54:44 -0800 From: Mel Flynn <mel.flynn+fbsd.questions@mailing.thruhere.net> To: freebsd-questions@freebsd.org Cc: Kalle =?iso-8859-1?q?M=F8ller?= <freebsd-questions@k-moeller.dk>, janos.mohacsi@bsd.hu Subject: Re: net-mgmt/flowd - broken ? Message-ID: <200908071254.44524.mel.flynn%2Bfbsd.questions@mailing.thruhere.net> In-Reply-To: <8250ac3f0908060754u714379dw51948c0ac858a8da@mail.gmail.com> References: <8250ac3f0908051135g282fabb1m4009077010a6fd72@mail.gmail.com> <200908051048.03079.mel.flynn%2Bfbsd.questions@mailing.thruhere.net> <8250ac3f0908060754u714379dw51948c0ac858a8da@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_USJfKal++N1uTlV
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Thursday 06 August 2009 06:54:52 Kalle M=F8ller wrote:
> Damn have no clue how to build fix or anything with plist ... Except it
> seemd to be a list of the files used ??
Try attached patch. Checking WITH_PYTHON now. Also fixed pkg-install while =
I=20
was in there to respect a FLOWD_UID variable, so that one can assign a uid=
=20
rather then using the next available.
=2D-=20
Mel
--Boundary-00=_USJfKal++N1uTlV
Content-Type: text/plain; charset="ISO-8859-1"; name="flowd-fix.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="flowd-fix.patch.txt"
Index: net-mgmt/flowd/Makefile
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/flowd/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- net-mgmt/flowd/Makefile 13 Jul 2009 16:22:56 -0000 1.14
+++ net-mgmt/flowd/Makefile 7 Aug 2009 20:44:36 -0000
@@ -22,13 +22,14 @@
MAN5= flowd.conf.5
PORTDOCS= README INSTALL
FLOWD_USER?= _flowd
+.if defined(FLOWD_UID)
+SCRIPTS_ENV+= FLOWD_UID="${FLOWD_UID}"
+.endif
.if defined(WITH_PERL)
USE_PERL5= yes
PLIST_SUB+= WITH_PERL=""
-#MAN3PREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-#MAN3= Flowd.3
-BROKEN= Incomplete pkg-plist
+MAN3= Flowd.3
.else
PLIST_SUB+= WITH_PERL="@comment "
.endif
@@ -67,9 +68,10 @@
.if defined(WITH_PERL)
cd ${WRKSRC}/Flowd-perl && \
- ${PERL} Makefile.PL && \
+ ${PERL} Makefile.PL INSTALLSITEMAN3DIR=${MAN3PREFIX}/man/man3 && \
${GMAKE} && \
- ${GMAKE} install
+ ${GMAKE} install;
+ -${RM} -f ${SITE_PERL}/${PERL_ARCH}/perllocal.pod
.endif
.if defined(WITH_PYTHON)
Index: net-mgmt/flowd/pkg-install
===================================================================
RCS file: /home/ncvs/ports/net-mgmt/flowd/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- net-mgmt/flowd/pkg-install 4 Jun 2005 00:43:20 -0000 1.2
+++ net-mgmt/flowd/pkg-install 7 Aug 2009 20:16:59 -0000
@@ -20,9 +20,15 @@
shell=/nonexistent
fi
uhome="/var/empty"
+ if [ -z "${FLOWD_UID}" ]; then
+ uid=`${PW} usernext`;
+ uid=${uid%%:*}
+ else
+ uid=${FLOWD_UID}
+ fi
if ! ${PW} show user ${USER} -q >/dev/null; then
- if ! ${PW} add user ${USER} -g ${GROUP} -d "${uhome}" \
+ if ! ${PW} add user ${USER} -u ${uid} -g ${GROUP} -d "${uhome}" \
-c "flowd privilege separation user" -s "${shell}" -p "*" \
; then
e=$?
--Boundary-00=_USJfKal++N1uTlV--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908071254.44524.mel.flynn%2Bfbsd.questions>