From nobody Sun Sep 03 21:01:04 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf41z0ByBz4rJTs; Sun, 3 Sep 2023 21:01:27 +0000 (UTC) (envelope-from dan@langille.org) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf41y4NrBz4gH7; Sun, 3 Sep 2023 21:01:26 +0000 (UTC) (envelope-from dan@langille.org) Authentication-Results: mx1.freebsd.org; none Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 94E885C0134; Sun, 3 Sep 2023 17:01:25 -0400 (EDT) Received: from imap42 ([10.202.2.92]) by compute5.internal (MEProxy); Sun, 03 Sep 2023 17:01:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= cc:content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1693774885; x=1693861285; bh=GQ o7W2ab7VaBvI30GabrN6NLjbUkRbG5zGW0iPadiFw=; b=rNMIQZgm1uyOHbgzn/ X7QOX942OaBfVOG1NiCGxWDJspfFJV4ropCttWpWXEdlfKwya5fXRNftQBcn68O4 qiV5CNoL7T4slPco3z+ywk2+a5QbQS2gfSf2S2J3e66KUgn7TydcLXGLqrx/VBLD h4UFAQsxurj+9fruHOVTfPyDsFO7pSn4+QRjDeCA8Ke8s+jgXjBg1nAX1Up0/l3e cBXHo3p/7ncAt8Uw9TuKO3a+9AM7m+Z6TkAcCB751Zgpg7oNmOcyIJ3K0HayEzgx 9tv9l5seIrRpLZUkSJFCkXUc3me/p1LCX6/yD+MN8HGP/L+mcEBsOcgcVXxRXeex dj+A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1693774885; x=1693861285; bh=GQo7W2ab7VaBv I30GabrN6NLjbUkRbG5zGW0iPadiFw=; b=xzvxh2KWMEacsWeOVQOjT5B7yL0Yr P63iGuu4bg3s2Tt+fPO+kdhclfNn9FYoN5rvHEmZ3bN7+UixDLhZcFNF3KnSr7+G dkuwTJ1uLiDPKQmh0YAXVJzbuXkgKNvHlFGlZVVTTHyZGPuUNRoJZaEMqIsq6jwE MfjiKwyK/R1jwY8HXOGFjYASneaBlpdDdPeW60UDmp/sEYCrHDTSUYNGDUGKKYAD zMW6QLLKLBu9RV8zNwbmkuUvXOVUdtEbfNhpH1vpw0Qt+kab0FsfGuQWh2DZQHn7 8OqDLS9KFKHfdxdft+JpiYxo/Heo08/jE1OK3Tk2fPltsemTQsyRKSfSQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrudegiedgudehkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkjghffffhvffutgesth dtredtreertdenucfhrhhomhepfdffrghnucfnrghnghhilhhlvgdfuceouggrnheslhgr nhhgihhllhgvrdhorhhgqeenucggtffrrghtthgvrhhnpeevkedvieevieefjefhkeffie dvkefgfffgueelhfegvdfgvddtjeefgfevteetvdenucffohhmrghinhepfhhrvggvsghs ugdrohhrghdpshgvrhhvvghrrdhinhenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpegurghnsehlrghnghhilhhlvgdrohhrgh X-ME-Proxy: Feedback-ID: ifbf9424e:Fastmail Received: by mailuser.nyi.internal (Postfix, from userid 501) id 56D0BBC007C; Sun, 3 Sep 2023 17:01:25 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.9.0-alpha0-701-g9b2f44d3ee-fm-20230823.001-g9b2f44d3 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org Mime-Version: 1.0 Message-Id: <1b7ed148-88b7-46a1-9208-7b8db2c481c2@app.fastmail.com> In-Reply-To: <202309032059.383KxiqZ040013@gitrepo.freebsd.org> References: <202309032059.383KxiqZ040013@gitrepo.freebsd.org> Date: Sun, 03 Sep 2023 17:01:04 -0400 From: "Dan Langille" To: dvl , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 7f03f5c795dd - main - sysutils/mkjail: Revert "sysutils/mkjail: Update to 0.0.4" Content-Type: text/plain X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:19151, ipnet:66.111.4.0/24, country:US] X-Rspamd-Queue-Id: 4Rf41y4NrBz4gH7 This over-commit has been reverted. Sorry about that. On Sun, Sep 3, 2023, at 4:59 PM, Dan Langille wrote: > The branch main has been updated by dvl: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=7f03f5c795dd7226e8f1dceb5198ce3873cf8dfa > > commit 7f03f5c795dd7226e8f1dceb5198ce3873cf8dfa > Author: Dan Langille > AuthorDate: 2023-09-03 20:58:37 +0000 > Commit: Dan Langille > CommitDate: 2023-09-03 20:59:20 +0000 > > sysutils/mkjail: Revert "sysutils/mkjail: Update to 0.0.4" > > This reverts commit a8cc45bb7a5f1b8f4b7faa8506bb5ce65baa555b. > > Sorry, I committed way more than I intended to. > --- > .../bacula11-server/files/pkg-deinstall.server.in | 34 ++++++++++++++++++++++ > .../bacula11-server/files/pkg-install.server.in | 13 +++++++++ > .../bacula13-server/files/pkg-deinstall.server.in | 34 ++++++++++++++++++++++ > .../bacula13-server/files/pkg-install.server.in | 13 +++++++++ > .../bacula9-server/files/pkg-deinstall.server.in | 34 ++++++++++++++++++++++ > .../bacula9-server/files/pkg-install.server.in | 13 +++++++++ > sysutils/mkjail/Makefile | 2 +- > sysutils/mkjail/distinfo | 6 ++-- > 8 files changed, 145 insertions(+), 4 deletions(-) > > diff --git a/sysutils/bacula11-server/files/pkg-deinstall.server.in > b/sysutils/bacula11-server/files/pkg-deinstall.server.in > new file mode 100644 > index 000000000000..05da0eb6a7f6 > --- /dev/null > +++ b/sysutils/bacula11-server/files/pkg-deinstall.server.in > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +PATH=/bin:/usr/bin:/usr/sbin > + > +# Note how to delete UID/GID > +USER=%%BACULA_USER%% > +GROUP=%%BACULA_GROUP%% > +UID=%%BACULA_UID%% > +GID=%%BACULA_UID%% > +BACULA_DIR=%%BACULA_DIR%% > + > +TMPFILE=/tmp/services-$RANDOM-$$ > + > +case "$2" in > +"DEINSTALL") > + # Delete entries in /etc/services > + sed -e '/# Bacula port start/,/# Bacula port end/{' \ > + -e 'd' \ > + -e '}' /etc/services > $TMPFILE > + mv -f $TMPFILE /etc/services > + > + if [ -d ${BACULA_DIR} ]; then > + rmdir ${BACULA_DIR}; > + fi > + if [ -d ${BACULA_DIR} ]; then > + echo "Check if ${BACULA_DIR} is empty and delete it to > permanently remove the bacula port." > + fi > + > + if pw usershow "${USER}" 2>/dev/null 1>&2; then > + echo "To delete Bacula user permanently, use 'pw userdel ${USER}'" > + echo "To delete Bacula group permanently, use 'pw groupdel > ${GROUP}'" > + fi > + ;; > +esac > diff --git a/sysutils/bacula11-server/files/pkg-install.server.in > b/sysutils/bacula11-server/files/pkg-install.server.in > new file mode 100644 > index 000000000000..12e044538074 > --- /dev/null > +++ b/sysutils/bacula11-server/files/pkg-install.server.in > @@ -0,0 +1,13 @@ > +#!/bin/sh > + > +PATH=/bin:/usr/bin:/usr/sbin > + > +# Always add lines in /etc/services > +grep -q "bacula-dir" /etc/services > +if [ "$?" != "0" ]; then > + echo "# Bacula port start > +bacula-dir 9101/tcp #Bacula director daemon > +bacula-fd 9102/tcp #Bacula file daemon > +bacula-sd 9103/tcp #Bacula storage daemon > +# Bacula port end" >> /etc/services > +fi > diff --git a/sysutils/bacula13-server/files/pkg-deinstall.server.in > b/sysutils/bacula13-server/files/pkg-deinstall.server.in > new file mode 100644 > index 000000000000..05da0eb6a7f6 > --- /dev/null > +++ b/sysutils/bacula13-server/files/pkg-deinstall.server.in > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +PATH=/bin:/usr/bin:/usr/sbin > + > +# Note how to delete UID/GID > +USER=%%BACULA_USER%% > +GROUP=%%BACULA_GROUP%% > +UID=%%BACULA_UID%% > +GID=%%BACULA_UID%% > +BACULA_DIR=%%BACULA_DIR%% > + > +TMPFILE=/tmp/services-$RANDOM-$$ > + > +case "$2" in > +"DEINSTALL") > + # Delete entries in /etc/services > + sed -e '/# Bacula port start/,/# Bacula port end/{' \ > + -e 'd' \ > + -e '}' /etc/services > $TMPFILE > + mv -f $TMPFILE /etc/services > + > + if [ -d ${BACULA_DIR} ]; then > + rmdir ${BACULA_DIR}; > + fi > + if [ -d ${BACULA_DIR} ]; then > + echo "Check if ${BACULA_DIR} is empty and delete it to > permanently remove the bacula port." > + fi > + > + if pw usershow "${USER}" 2>/dev/null 1>&2; then > + echo "To delete Bacula user permanently, use 'pw userdel ${USER}'" > + echo "To delete Bacula group permanently, use 'pw groupdel > ${GROUP}'" > + fi > + ;; > +esac > diff --git a/sysutils/bacula13-server/files/pkg-install.server.in > b/sysutils/bacula13-server/files/pkg-install.server.in > new file mode 100644 > index 000000000000..12e044538074 > --- /dev/null > +++ b/sysutils/bacula13-server/files/pkg-install.server.in > @@ -0,0 +1,13 @@ > +#!/bin/sh > + > +PATH=/bin:/usr/bin:/usr/sbin > + > +# Always add lines in /etc/services > +grep -q "bacula-dir" /etc/services > +if [ "$?" != "0" ]; then > + echo "# Bacula port start > +bacula-dir 9101/tcp #Bacula director daemon > +bacula-fd 9102/tcp #Bacula file daemon > +bacula-sd 9103/tcp #Bacula storage daemon > +# Bacula port end" >> /etc/services > +fi > diff --git a/sysutils/bacula9-server/files/pkg-deinstall.server.in > b/sysutils/bacula9-server/files/pkg-deinstall.server.in > new file mode 100644 > index 000000000000..05da0eb6a7f6 > --- /dev/null > +++ b/sysutils/bacula9-server/files/pkg-deinstall.server.in > @@ -0,0 +1,34 @@ > +#!/bin/sh > + > +PATH=/bin:/usr/bin:/usr/sbin > + > +# Note how to delete UID/GID > +USER=%%BACULA_USER%% > +GROUP=%%BACULA_GROUP%% > +UID=%%BACULA_UID%% > +GID=%%BACULA_UID%% > +BACULA_DIR=%%BACULA_DIR%% > + > +TMPFILE=/tmp/services-$RANDOM-$$ > + > +case "$2" in > +"DEINSTALL") > + # Delete entries in /etc/services > + sed -e '/# Bacula port start/,/# Bacula port end/{' \ > + -e 'd' \ > + -e '}' /etc/services > $TMPFILE > + mv -f $TMPFILE /etc/services > + > + if [ -d ${BACULA_DIR} ]; then > + rmdir ${BACULA_DIR}; > + fi > + if [ -d ${BACULA_DIR} ]; then > + echo "Check if ${BACULA_DIR} is empty and delete it to > permanently remove the bacula port." > + fi > + > + if pw usershow "${USER}" 2>/dev/null 1>&2; then > + echo "To delete Bacula user permanently, use 'pw userdel ${USER}'" > + echo "To delete Bacula group permanently, use 'pw groupdel > ${GROUP}'" > + fi > + ;; > +esac > diff --git a/sysutils/bacula9-server/files/pkg-install.server.in > b/sysutils/bacula9-server/files/pkg-install.server.in > new file mode 100644 > index 000000000000..12e044538074 > --- /dev/null > +++ b/sysutils/bacula9-server/files/pkg-install.server.in > @@ -0,0 +1,13 @@ > +#!/bin/sh > + > +PATH=/bin:/usr/bin:/usr/sbin > + > +# Always add lines in /etc/services > +grep -q "bacula-dir" /etc/services > +if [ "$?" != "0" ]; then > + echo "# Bacula port start > +bacula-dir 9101/tcp #Bacula director daemon > +bacula-fd 9102/tcp #Bacula file daemon > +bacula-sd 9103/tcp #Bacula storage daemon > +# Bacula port end" >> /etc/services > +fi > diff --git a/sysutils/mkjail/Makefile b/sysutils/mkjail/Makefile > index 6492f3a606a4..340c91a46104 100644 > --- a/sysutils/mkjail/Makefile > +++ b/sysutils/mkjail/Makefile > @@ -1,5 +1,5 @@ > PORTNAME= mkjail > -DISTVERSION= 0.0.4 > +DISTVERSION= 0.0.3 > CATEGORIES= sysutils > > MAINTAINER= fuz@FreeBSD.org > diff --git a/sysutils/mkjail/distinfo b/sysutils/mkjail/distinfo > index 740c8e1115ea..6cd644cefcda 100644 > --- a/sysutils/mkjail/distinfo > +++ b/sysutils/mkjail/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1693773851 > -SHA256 (mkjail-mkjail-0.0.4_GH0.tar.gz) = > 280c632905918d080223c7b072c2893129422c266420192e7d34a41e4edaa04f > -SIZE (mkjail-mkjail-0.0.4_GH0.tar.gz) = 7334 > +TIMESTAMP = 1631795814 > +SHA256 (mkjail-mkjail-0.0.3_GH0.tar.gz) = > 42dbe2237d9e54ef9b5a6ecad4b3e224cef1be02bf33493a3ac83ea653de0455 > +SIZE (mkjail-mkjail-0.0.3_GH0.tar.gz) = 7628 -- Dan Langille dan@langille.org