Date: Mon, 6 Aug 2007 16:56:08 +0200 From: Robin Gruyters <r.gruyters@yirdis.nl> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/115233: [MAINTAINER] security/prelude-manager: update to 0.9.9 Message-ID: <20070806145607.GA23965@server.yirdis.net> In-Reply-To: <200708060720.l767K1ht015357@freefall.freebsd.org> References: <200708060718.l767IlVq082374@server.yirdis.net> <200708060720.l767K1ht015357@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--IJpNTDwzlM2Ie8A6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Grrr, Forgot to save my changes in Makefile. Here is another update. (sorry for the inconvenient) =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:52:40 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,23 @@ PRELUDEUID=3D 281 PRELUDEGID=3D ${PRELUDEUID} =20 +MAN1=3D prelude-manager.1 + .include <bsd.port.pre.mk> =20 +PLIST_SUB+=3D PRELUDEUSER=3D${PRELUDEUSER} \ + PRELUDEGROUP=3D${PRELUDEGROUP} + +SUB_FILES=3D pkg-install \ + pkg-deinstall + +SUB_LIST=3D PRELUDEDIR=3D${PRELUDEDIR} \ + PRELUDEUID=3D${PRELUDEUID} \ + PRELUDEGID=3D${PRELUDEGID} \ + ${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 @@ -48,6 +60,9 @@ LIB_DEPENDS+=3D preludedb.4:${PORTSDIR}/security/libpreludedb PLIST_SUB+=3D WITH_PRELUDEDB=3D"" .endif + +pre-install: + @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL =20 post-install: @if [ ! -f ${PREFIX}/etc/prelude-manager/prelude-manager.conf ]; then \ 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 --IJpNTDwzlM2Ie8A6 Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (FreeBSD) iD8DBQFGtzaHLh3hlgHmc7MRAvtkAKDhvJh1ev37APl9DixiemT2pu/MtgCg4/he R84rI4WVInzVfaUphkTC+LQ= =SQv2 -----END PGP SIGNATURE----- --IJpNTDwzlM2Ie8A6--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070806145607.GA23965>