Date: Sun, 3 Sep 2023 20:59:44 GMT From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7f03f5c795dd - main - sysutils/mkjail: Revert "sysutils/mkjail: Update to 0.0.4" Message-ID: <202309032059.383KxiqZ040013@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f03f5c795dd7226e8f1dceb5198ce3873cf8dfa commit 7f03f5c795dd7226e8f1dceb5198ce3873cf8dfa Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2023-09-03 20:58:37 +0000 Commit: Dan Langille <dvl@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309032059.383KxiqZ040013>