Date: Wed, 26 May 2010 19:13:59 +0200 (CEST) From: Martin Matuska <mm@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: kuriyama@FreeBSD.org Subject: ports/147084: [PATCH] net/relayd: fix package build Message-ID: <201005261713.o4QHDxfT013290@neo.vx.sk> Resent-Message-ID: <201005261720.o4QHK7XY082600@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 147084 >Category: ports >Synopsis: [PATCH] net/relayd: fix package build >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed May 26 17:20:06 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 8.1-PRERELEASE amd64 >Organization: >Environment: System: FreeBSD neo.vx.sk 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #13 r208365M: Fri May 21 21:41:01 CEST >Description: The user and group addition is not performed correctly so it is impossible to install the package. Fix by adding pkg-install to SUB_FILES and RUSER/RGROUP to SUB_LIST. Added file(s): - files/pkg-install.in Removed file(s): - pkg-install Port maintainer (kuriyama@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- relayd-4.2.20071221_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/net/relayd/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 6 Jan 2009 17:59:12 -0000 1.5 +++ Makefile 26 May 2010 17:12:02 -0000 @@ -6,7 +6,7 @@ PORTNAME= relayd PORTVERSION= 4.2.20071221 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= kuriyama @@ -28,6 +28,11 @@ _MAKE= ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} RUSER= _relayd RGROUP= _relayd +PKGINSTALL= ${WRKDIR}/pkginstall +SUB_FILES+= pkg-install + +SUB_LIST+= RUSER=${RUSER} \ + RGROUP=${RGROUP} post-extract: ${MKDIR} ${WRKSRC} @@ -44,7 +49,7 @@ (cd ${WRKSRCD}; ${_MAKE} ${ALL_TARGET}) pre-su-install: - @${SETENV} PKG_PREFIX=${PREFIX} RUSER=${RUSER} RGROUP=${RGROUP} \ + @${SETENV} PKG_PREFIX=${PREFIX} \ ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL do-install: Index: pkg-install =================================================================== RCS file: pkg-install diff -N pkg-install --- pkg-install 20 Jan 2008 21:38:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/net/relayd/pkg-install,v 1.1 2008/01/20 21:38:25 kuriyama Exp $ - -case $2 in -PRE-INSTALL) - USER=${RUSER} - GROUP=${RGROUP} - UID=913 - GID=913 - - if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d /var/empty -c "Relay Daemon" -s /usr/sbin/nologin - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; -esac Index: files/pkg-install.in =================================================================== RCS file: files/pkg-install.in diff -N files/pkg-install.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/pkg-install.in 26 May 2010 17:12:02 -0000 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# $FreeBSD$ + +case $2 in +PRE-INSTALL) + USER=%%RUSER%% + GROUP=%%RGROUP%% + UID=913 + GID=913 + + if pw group show "${GROUP}" 2>/dev/null; then + echo "You already have a group \"${GROUP}\", so I will use it." + else + if pw groupadd ${GROUP} -g ${GID}; then + echo "Added group \"${GROUP}\"." + else + echo "Adding group \"${GROUP}\" failed..." + exit 1 + fi + fi + + if pw user show "${USER}" 2>/dev/null; then + echo "You already have a user \"${USER}\", so I will use it." + else + if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ + -d /var/empty -c "Relay Daemon" -s /usr/sbin/nologin + then + echo "Added user \"${USER}\"." + else + echo "Adding user \"${USER}\" failed..." + exit 1 + fi + fi + ;; +esac --- relayd-4.2.20071221_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005261713.o4QHDxfT013290>