From nobody Sun Sep 3 20:59:44 2023 X-Original-To: dev-commits-ports-main@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 4Rf4004R2Vz4rJ94; Sun, 3 Sep 2023 20:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf40041hnz4Z56; Sun, 3 Sep 2023 20:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693774784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TAF+VArcgj/FKGwsgWwd726QPAQRurSm3oo19p73kco=; b=BVG6uYx/4goZO7I2AmFQlryr7YrzH+/i0I8pO+YZcBmUMPtG6CaRyhio38S3yp+fMY2rRz YpmqThx77Nr3zdGQqZh8yAwv4UlmIYxcAHDeNoJp1eI6o/dsmxSR+rB74gpwGJMDgDv9iN 1DWKKkjWBVs/pV9vc+xjcvxCe2MvqE1eIe2iAoRndtsyTIWVBQBPZcRq0OfXOmrhz/HH0C y835UkSMIWnu8sfNlb8bHwwmDyKTf5mXf38rEKZCueW/w3u3Ue+kHHGbq3M9gyrY/ak5E8 uTdluiQ8qpwhK7PRuAI3oyfPcZ+SB9gM4f2JNAR1mk3+QW27DB3mu4Yr2CGDpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693774784; a=rsa-sha256; cv=none; b=JiIvYzCVAoeLTljVPJ/m/7t3l+z16LDd7C+tR7I67a67rBkDc+ZptOppWJtREdAGs/lvEx YdxZ8BCt6UzyNBZk4hHitlpAYa9uvmtbUAJQyUanfTZhRMucxQwboA3aEN5M2Yxwsx9qA1 Qx4Ebh/UMTCQAaR2JHCeQgHi1bm92XssCgWAEkQMVZAnq3bPV+bMLp6ZgZ7FGEBm4gUyqn JWbrAQ4VM3ztvr0gXTc+Lyw2JVcBtAFQe6/brbu9DMy4VYWseRLd+uP1RRrIy/wp7rjoeJ OTUnAFa28nMHBioQDfR/a5F9Awub794YFktPv4ESnIctLry8IZhfW6abZJugmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693774784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TAF+VArcgj/FKGwsgWwd726QPAQRurSm3oo19p73kco=; b=yQZmm/S5Q0sdzJ+kG6AKHEiTeDpnAEBX36MAYsovumxSrhFm3FiHRx20ici4kWN9aAhhWM OFcwOHStYDK1CHTNVfGerNz4U9nX6/vawMoRI4lPfrsMFZSfN1STRWtW154jy3q4GBs63G pCDE9msRDvyNzts8ngAz/SRkUzDj7f/yNQ3deQOYpi4iM6yc5PDq4EQq+GNpiNVanhi3aC 3hvGLkESpaTJuC08F9/hzxF88g08JA0vplYV2vcGBsKGIhq04CoOHY3Jc7oYfZFJYg8aW9 X57k628tMLNtXC7v0+gN1hlcS/CpW2gTs6c2Oud/+kOc27tATpJRPCOk+EpSMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rf40035nLzfRh; Sun, 3 Sep 2023 20:59:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383KxiE0040016; Sun, 3 Sep 2023 20:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383KxiqZ040013; Sun, 3 Sep 2023 20:59:44 GMT (envelope-from git) Date: Sun, 3 Sep 2023 20:59:44 GMT Message-Id: <202309032059.383KxiqZ040013@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 7f03f5c795dd - main - sysutils/mkjail: Revert "sysutils/mkjail: Update to 0.0.4" List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f03f5c795dd7226e8f1dceb5198ce3873cf8dfa Auto-Submitted: auto-generated 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