From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Aug 6 14:35:18 2007 Return-Path: Delivered-To: freebsd-ports-bugs@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D397716A41A; Mon, 6 Aug 2007 14:35:18 +0000 (UTC) (envelope-from robin@yirdis.nl) Received: from mail.yirdis.nl (82-148-208-109.fiber.unet.nl [82.148.208.109]) by mx1.freebsd.org (Postfix) with ESMTP id 6D46C13C4B0; Mon, 6 Aug 2007 14:35:18 +0000 (UTC) (envelope-from robin@yirdis.nl) Received: from server.yirdis.net (localhost [127.0.0.1]) by mail.yirdis.nl (8.13.8/8.13.8) with ESMTP id l76EZE8F021872 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 6 Aug 2007 16:35:14 +0200 (CEST) (envelope-from robin@server.yirdis.net) Received: (from robin@localhost) by server.yirdis.net (8.13.8/8.13.8/Submit) id l76EZEFS021871; Mon, 6 Aug 2007 16:35:14 +0200 (CEST) (envelope-from robin) Date: Mon, 6 Aug 2007 16:35:14 +0200 From: Robin Gruyters To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Message-ID: <20070806143514.GA21568@server.yirdis.net> References: <200708060718.l767IlVq082374@server.yirdis.net> <200708060720.l767K1ht015357@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="IS0zKkzwUGydFO0o" Content-Disposition: inline In-Reply-To: <200708060720.l767K1ht015357@freefall.freebsd.org> User-Agent: Mutt/1.5.14 (2007-02-12) X-Virus-Scanned: OK Cc: Subject: Re: ports/115233: [MAINTAINER] security/prelude-manager: update to 0.9.9 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Aug 2007 14:35:18 -0000 --IS0zKkzwUGydFO0o Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Sorry, forgot to add the SUB_LIST=3D and also moved the *SUB* after bsd.port.pre.mk. =3D=3D=3D> Generating patch =3D=3D=3D> Viewing diff with less diff -ruN --exclude=3DCVS /usr/ports/security/prelude-manager/Makefile /dat= a2/FreeBSD/custom_ports/security/prelude-manager/Makefile --- /usr/ports/security/prelude-manager/Makefile Thu Jul 5 02:23:06 2007 +++ /data2/FreeBSD/custom_ports/security/prelude-manager/Makefile Mon Aug = 6 16:31:46 2007 @@ -5,8 +5,7 @@ # $FreeBSD: ports/security/prelude-manager/Makefile,v 1.45 2007/07/01 08:5= 6:14 novel Exp $ =20 PORTNAME=3D prelude-manager -PORTVERSION=3D 0.9.8 -PORTREVISION=3D 1 +PORTVERSION=3D 0.9.9 CATEGORIES=3D security MASTER_SITES=3D http://www.prelude-ids.org/download/releases/ \ http://www.prelude-ids.org/download/releases/old/ @@ -32,10 +31,21 @@ PRELUDEUID=3D 281 PRELUDEGID=3D ${PRELUDEUID} =20 +MAN1=3D prelude-manager.1 + .include =20 +PLIST_SUB+=3D PRELUDEDIR=3D${PRELUDEDIR} \ + PRELUDEUSER=3D${PRELUDEUSER} \ + PRELUDEGROUP=3D${PRELUDEGROUP} + +SUB_FILES=3D pkg-install \ + pkg-deinstall + +SUB_LIST=3D ${PLIST_SUB} + .if defined(WITHOUT_XML) -PLIST_SUB+=3D WITH_XML=3D"@comment " +PLIST_SUB+=3D WITH_XML=3D"@comment " CONFIGURE_ARGS+=3D --disable-xmltest --without-xml .else LIB_DEPENDS+=3D xml2.5:${PORTSDIR}/textproc/libxml2 diff -ruN --exclude=3DCVS /usr/ports/security/prelude-manager/distinfo /dat= a2/FreeBSD/custom_ports/security/prelude-manager/distinfo --- /usr/ports/security/prelude-manager/distinfo Wed May 30 11:07:52 2007 +++ /data2/FreeBSD/custom_ports/security/prelude-manager/distinfo Mon Aug = 6 09:07:24 2007 @@ -1,3 +1,3 @@ -MD5 (prelude-manager-0.9.8.tar.gz) =3D be73ee46a7279200c5b9fcc4a2f9b7ad -SHA256 (prelude-manager-0.9.8.tar.gz) =3D c5a41ba98ff05d4c75f237e7e8c01efb= 8c086362b0713736d4d3451a1c023f15 -SIZE (prelude-manager-0.9.8.tar.gz) =3D 617261 +MD5 (prelude-manager-0.9.9.tar.gz) =3D ca9258faadb7306863dffeac8f855161 +SHA256 (prelude-manager-0.9.9.tar.gz) =3D 734bd844df4e337cb989ea9700d60ca2= d0eae03a5b0e97a5559b3addb2498ec6 +SIZE (prelude-manager-0.9.9.tar.gz) =3D 647696 diff -ruN --exclude=3DCVS /usr/ports/security/prelude-manager/files/pkg-dei= nstall.in /data2/FreeBSD/custom_ports/security/prelude-manager/files/pkg-de= install.in --- /usr/ports/security/prelude-manager/files/pkg-deinstall.in Thu Jan 1 0= 1:00:00 1970 +++ /data2/FreeBSD/custom_ports/security/prelude-manager/files/pkg-deinstal= l.in Mon Aug 6 13:29:40 2007 @@ -0,0 +1,17 @@ +#!/bin/sh - +# +# $FreeBSD$ +# + +PRELUDEUSER=3D%%PRELUDEUSER%% +PRELUDEGROUP=3D%%PRELUDEGROUP%% + +if [ "$2" =3D "POST-DEINSTALL" ]; then + if /usr/sbin/pw group show "${PRELUDEGROUP}" 2>&1 >/dev/null; then + echo "You should manually remove the \"${PRELUDEGROUP}\" group." + fi + + if /usr/sbin/pw user show "${PRELUDEUSER}" 2>&1 >/dev/null; then + echo "You should manually remove the \"${PRELUDEUSER}\" user." + fi +fi diff -ruN --exclude=3DCVS /usr/ports/security/prelude-manager/files/pkg-ins= tall.in /data2/FreeBSD/custom_ports/security/prelude-manager/files/pkg-inst= all.in --- /usr/ports/security/prelude-manager/files/pkg-install.in Thu Jan 1 01:= 00:00 1970 +++ /data2/FreeBSD/custom_ports/security/prelude-manager/files/pkg-install.= in Mon Aug 6 13:30:48 2007 @@ -0,0 +1,74 @@ +#!/bin/sh - +# +# $FreeBSD$ +# + +PRELUDEDIR=3D%%PRELUDEDIR%% +PRELUDEUSER=3D%%PRELUDEUSER%% +PRELUDEGROUP=3D%%PRELUDEGROUP%% +PRELUDEUID=3D%%PRELUDEUID%% +PRELUDEGID=3D%%PRELUDEGID%% + +ask() { + local question default answer + + question=3D$1 + default=3D$2 + if [ -z "${PACKAGE_BUILDING}" ]; then + read -p "${question} [${default}]? " answer + fi + if [ "x${answer}" =3D "x" ]; then + answer=3D${default} + fi + echo ${answer} +} + +yesno() { + local default question answer + + question=3D$1 + default=3D$2 + while :; do + answer=3D$(ask "${question}" "${default}") + case "${answer}" in + [Yy][Ee][Ss]|[Yy]) + return 0 + ;; + [Nn][Oo]|[Nn]) + return 1 + ;; + esac + echo "Please answer yes or no." + done +} + +if [ "$2" =3D "PRE-INSTALL" ]; then + if /usr/sbin/pw group show "${PRELUDEGROUP}" 2>&1 >/dev/null; then + echo "You already have a \"${PRELUDEGROUP}\" group, so I will use it." + else + echo "You need a \"${PRELUDEGROUP}\" group." + if yesno "Would you like me to create it" "YES"; then + /usr/sbin/pw groupadd "${PRELUDEGROUP}" -g "${PRELUDEGID}" -h - || \ + /usr/sbin/pw groupadd "${PRELUDEGROUP}" -h - || exit + echo "Done." + else + echo "Please create the \"${PRELUDEGROUP}\" group manually and try a= gain." + exit 1 + fi + fi + + if /usr/sbin/pw user show "${PRELUDEUSER}" 2>&1 >/dev/null; then + echo "You already have a \"${PRELUDEUSER}\" user, so I will use it." + else + echo "You need a \"${PRELUDEUSER}\" user." + if yesno "Would you like me to create it" "YES"; then + /usr/sbin/pw useradd "${PRELUDEUSER}" -u "${PRELUDEUID}" -g "${PRELU= DEGROUP}" -h - -d "${PRELUDEDIR}" \ + -s /sbin/nologin -c "Prelude pseudo-user" || \ + /usr/sbin/pw useradd "${PRELUDEUSER}" -g "${PRELUDEGROUP}" -h - -d= "${PRELUDEDIR}" \ + -s /sbin/nologin -c "Prelude pseudo-user" || exit + else + echo "Please create the \"${PRELUDEUSER}\" user manually and try aga= in." + exit 1 + fi + fi +fi =3D=3D=3D> Done --IS0zKkzwUGydFO0o Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (FreeBSD) iD8DBQFGtzGhLh3hlgHmc7MRArNDAKDaHhIQHbz3huYobNyKBge/mLyA9gCgm3w/ hM0mhy1D9R+YB1rw1Egap7w= =xctN -----END PGP SIGNATURE----- --IS0zKkzwUGydFO0o--