diff options
| -rwxr-xr-x | debian/bfh-container.postrm | 16 | ||||
| -rwxr-xr-x | debian/bfh-container.preinst | 41 | ||||
| -rw-r--r-- | debian/changelog | 180 | ||||
| -rw-r--r-- | debian/control | 71 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/watch | 3 |
6 files changed, 270 insertions, 43 deletions
diff --git a/debian/bfh-container.postrm b/debian/bfh-container.postrm index ec69346..e53463e 100755 --- a/debian/bfh-container.postrm +++ b/debian/bfh-container.postrm @@ -6,13 +6,23 @@ case "${1}" in remove) for FILE in halt poweroff reboot shutdown coldreboot do - dpkg-divert --package bfh-container --quiet --remove --rename --divert /lib/container/divert/${FILE}.orig /sbin/${FILE} + dpkg-divert --package bfh-container --quiet --remove --rename --divert "/lib/container/divert/${FILE}.orig.usr-is-merged" "/sbin/${FILE}" done - for FILE in pm-hibernate pm-suspend pm-suspend-hybrid + for FILE in halt poweroff reboot shutdown coldreboot pm-hibernate pm-suspend pm-suspend-hybrid do - dpkg-divert --package bfh-container --quiet --remove --rename --divert /lib/container/divert/${FILE}.orig /usr/sbin/${FILE} + dpkg-divert --package bfh-container --quiet --remove --rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" done + + if [ -d /usr/lib/container ] + then + if [ -d /usr/lib/container/divert ] + then + rmdir --ignore-fail-on-non-empty /usr/lib/container/divert > /dev/null 2>&1 + fi + + rmdir --ignore-fail-on-non-empty /usr/lib/container > /dev/null 2>&1 + fi ;; purge|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) diff --git a/debian/bfh-container.preinst b/debian/bfh-container.preinst index 335d160..2a6624f 100755 --- a/debian/bfh-container.preinst +++ b/debian/bfh-container.preinst @@ -4,16 +4,51 @@ set -e case "${1}" in install|upgrade) - mkdir -p /lib/container/divert + mkdir -p /usr/lib/container/divert for FILE in halt poweroff reboot shutdown coldreboot do - dpkg-divert --package bfh-container --quiet --add --rename --divert /lib/container/divert/${FILE}.orig /sbin/${FILE} + TRUENAME_USR="$(dpkg-divert --truename "/usr/sbin/${FILE}")" + TRUENAME_ALIAS="$(dpkg-divert --truename "/sbin/${FILE}")" + RENAME_FLAG="--no-rename" + + if [ "${TRUENAME_USR}" = "/usr/sbin/${FILE}" ] + then + if [ "${TRUENAME_ALIAS}" = "/sbin/${FILE}" ] + then + RENAME_FLAG="--rename" + fi + + dpkg-divert --package bfh-container --quiet --add "${RENAME_FLAG}" --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" + fi + + # DEP17 M18 duplicated diversion, can be removed after trixie. + if [ "${TRUENAME_ALIAS}" = "/sbin/${FILE}" ] + then + dpkg-divert --package bfh-container --quiet --add "${RENAME_FLAG}" --divert "/lib/container/divert/${FILE}.orig.usr-is-merged" "/sbin/${FILE}" + elif [ "${TRUENAME_ALIAS}" != "/lib/container/divert/${FILE}.orig.usr-is-merged" ] + then + dpkg-divert --package bfh-container --quiet --remove --no-rename "/sbin/${FILE}" + dpkg-divert --package bfh-container --quiet --add --no-rename --divert "/lib/container/divert/${FILE}.orig.usr-is-merged" "/sbin/${FILE}" + + if [ -e "${TRUENAME_ALIAS}" ] || [ -h "${TRUENAME_ALIAS}" ] + then + mv "${TRUENAME_ALIAS}" "/lib/container/divert/${FILE}.orig.usr-is-merged" + fi + fi done for FILE in pm-hibernate pm-suspend pm-suspend-hybrid do - dpkg-divert --package bfh-container --quiet --add --rename --divert /lib/container/divert/${FILE}.orig /usr/sbin/${FILE} + TRUENAME_USR="$(dpkg-divert --truename "/usr/sbin/${FILE}")" + + if [ "${TRUENAME_USR}" = "/lib/container/divert/${FILE}.orig" ] + then + dpkg-divert --package bfh-container --quiet --remove --no-rename "/usr/sbin/${FILE}" + dpkg-divert --package bfh-container --quiet --add --no-rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" + else + dpkg-divert --package bfh-container --quiet --add --rename --divert "/usr/lib/container/divert/${FILE}.orig" "/usr/sbin/${FILE}" + fi done ;; diff --git a/debian/changelog b/debian/changelog index 79b9773..9676430 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,183 @@ +bfh-metapackages (20211009-24) sid; urgency=medium + + * Uploading to sid. + * Applying patch from Helmut Grohne <helmut@subdivi.de> to delete + /usr/lib/container/divert on package removal. + * Cosmetically harmonizing directory cleanup in progress-linux + maintainer scripts for better readability. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 23 Dec 2023 08:39:55 +0100 + +bfh-metapackages (20211009-23) sid; urgency=medium + + * Uploading to sid. + * Applying patch from Helmut Grohne <helmut@subdivi.de> to delete + /usr/lib/container/divert on package removal. + * Cosmetically harmonizing directory cleanup in progress-linux + maintainer scripts for better readability. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sat, 23 Dec 2023 08:39:41 +0100 + +bfh-metapackages (20211009-22) experimental; urgency=medium + + * Uploading to experimental. + * Applying patch from Helmut Grohne <helmut@subdivi.de> to duplicate + diversion via DEP17 M18 (Closes: #1055509). + * Cosmetically harmonizing diversion handling in bfh-container + maintainer scripts for better readability. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 20 Dec 2023 11:12:25 +0100 + +bfh-metapackages (20211009-21) sid; urgency=medium + + * Uploading to sid. + * Adding ipcalc-ng to bfh-base-system dependencies. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 11 Oct 2023 11:26:46 +0200 + +bfh-metapackages (20211009-20) sid; urgency=medium + + * Uploading to sid. + * Adding conflicts/replaces against progress-linux-container (Closes: + #1034911). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 03 May 2023 11:21:33 +0200 + +bfh-metapackages (20211009-19) sid; urgency=medium + + * Uploading to sid. + * Replacing individual gnome-shell-extensions suggests with + conglomeration package. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Sun, 05 Feb 2023 11:54:38 +0100 + +bfh-metapackages (20211009-18) sid; urgency=medium + + * Uploading to sid. + * Adding gnome-shell-extension-hibernate-status to bfh-gnome-desktop + suggests. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 30 Jan 2023 12:14:32 +0100 + +bfh-metapackages (20211009-17) sid; urgency=medium + + * Uploading to sid. + * Shortening knot package list in bfh-base-system for bookworm. + * Reordering packages in bfh-base-system for consistency. + * Adding zutils to bfh-base-system depends. + * Shortening systemd package list in bfh-base-system for bookworm. + * Removing crudini from bfh-base-system depends. + * Adding ptpython to bfh-base-system depends. + * Shortening policykit package list in bfh-container for bookworm. + * Removing rng-tools in bfh-host depends. + * Wrapping firmware packages in bfh-host depends. + * Removing intel-isdct in bfh-host suggests. + * Removing old webext-umatrix suggests in bfh-desktop. + * Adding gnome-shell-extensions to bfh-gnome-desktop. + * Removing pass related packages from bfh-desktop depends. + * Removing duplicated whois in bfh-desktop depends. + * Removing seahorse-nautilus from bfh-gnome-desktop depends. + * Removing ioping from bfh-base-system depends. + * Harmonizing coments in control. + * Prefering mmdebstrap over debootstrap in bfh-container-server. + * Removing inactive sub-packages in control for bookworm. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 26 Jan 2023 17:24:59 +0100 + +bfh-metapackages (20211009-16) sid; urgency=medium + + * Uploading to sid. + * Removing watch file for now. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Tue, 24 Jan 2023 13:55:33 +0100 + +bfh-metapackages (20211009-15) sid; urgency=medium + + * Uploading to sid. + * Removing obsolete webext-https-everywhere from bfh-desktop. + * Updating ublock-origin depends (Closes: #1029286). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 23 Jan 2023 09:29:46 +0100 + +bfh-metapackages (20211009-14) sid; urgency=medium + + * Uploading to sid. + * Adding whois to bfh-base-system depends. + * Updating to standards version 4.6.2. + * Updating policykit dependencies (Closes: #1025544). + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 18 Jan 2023 09:13:21 +0100 + +bfh-metapackages (20211009-13) sid; urgency=medium + + * Uploading to sid. + * Correcting alternative depends against knot-dnsutils to ensure that + knot-dnssecutils is properly pulled in. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 26 Sep 2022 18:33:05 +0200 + +bfh-metapackages (20211009-12) sid; urgency=medium + + * Uploading to sid. + * Adding knot-dnssecutils to progress-linux-base-system depends. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Wed, 21 Sep 2022 11:48:56 +0200 + +bfh-metapackages (20211009-11) sid; urgency=medium + + * Uploading to sid. + * Updating to standards version 4.6.1. + * Including knot-resolver in bfh-hosts only, rather than bfh-container. + * Adding bfh-server-r metapackage. + * Adding bfh-server-rstudio metapackage. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 05 May 2022 13:47:57 +0200 + +bfh-metapackages (20211009-10) sid; urgency=medium + + * Uploading to sid. + * Removing ifupdown related packages in order to switch to systemd- + networkd on container-servers. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 28 Apr 2022 14:21:58 +0200 + +bfh-metapackages (20211009-9) sid; urgency=medium + + * Uploading to sid. + * Adding traceroute to bfh-base-system depends. + * Adding zstd to bfh-base-system. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 21 Apr 2022 10:46:13 +0200 + +bfh-metapackages (20211009-8) sid; urgency=medium + + * Uploading to sid. + * Adding systemd-oomd to bfh-base-system depends. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 17 Feb 2022 05:25:07 +0100 + +bfh-metapackages (20211009-7) sid; urgency=medium + + * Uploading to sid. + * Replacing ntp in favour of systemd-timesyncd in progress-linux-host. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 20 Jan 2022 07:16:24 +0100 + +bfh-metapackages (20211009-6) sid; urgency=medium + + * Uploading to sid. + * Updating packaging copyright for 2022. + * Adding lldpd to bfh-container-server depends. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Thu, 06 Jan 2022 15:00:48 +0100 + +bfh-metapackages (20211009-5) sid; urgency=medium + + * Uploading to sid. + * Removing some more old gnome-shell-extensions. + + -- Daniel Baumann <daniel.baumann@progress-linux.org> Mon, 08 Nov 2021 13:23:30 +0100 + bfh-metapackages (20211009-4) sid; urgency=medium * Uploading to sid. diff --git a/debian/control b/debian/control index 0cc113a..862115c 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper-compat (= 13), python3-docutils, Rules-Requires-Root: no -Standards-Version: 4.6.0 +Standards-Version: 4.7.0 Homepage: https://bfh.science Vcs-Browser: https://git.progress-linux.org/users/daniel.baumann/debian/packages/bfh-metapackages Vcs-Git: https://git.progress-linux.org/users/daniel.baumann/debian/packages/bfh-metapackages @@ -26,9 +26,9 @@ Depends: debconf-utils, needrestart, # knot - knot-dnsutils, knot-host, - knot-resolver [amd64 arm64 armhf armel i386], - socat, + knot-dnsutils, + knot-dnssecutils, + knot-host, # ldap sssd, sssd-tools, @@ -37,18 +37,19 @@ Depends: # lzip plzip, tarlz, + zutils, # systemd libpam-systemd, -# Other + systemd-oomd, +# other acl, bc, ca-certificates, - crudini, gawk, git, gnupg, htop, - ioping, + ipcalc-ng, jq, less, lnav, @@ -60,14 +61,22 @@ Depends: openssl, psmisc, python3, + ptpython, rsync, screen, sudo, tcpdump, + traceroute, vim, wget, + whois, + zstd, Conflicts: resolvconf, +Recommends: +# knot-resolver + knot-resolver [amd64 arm64 armhf armel i386], + socat, Description: BFH - Base System Metapackage Bern University of Applied Sciences (BFH) provides Debian-based images and systems to its users and everyone else interested in the form of a Debian @@ -84,12 +93,14 @@ Depends: bfh-base-system, # systemd dbus, - policykit-1, + polkitd, systemd-sysv, Conflicts: molly-guard, + progress-linux-container, Replaces: molly-guard, + progress-linux-container, Enhances: bfh-base-system, Description: BFH - Container Metapackage @@ -111,31 +122,33 @@ Depends: plymouth, # firmware-free firmware-linux-free, +# knot-resolver + knot-resolver [amd64 arm64 armhf armel i386], + socat, # monitoring spectre-meltdown-checker, -# Other +# other dmidecode [amd64 arm64 armhf i386], ethtool, gpm, hdparm, - ntp, nvme-cli, parted, - rng-tools | rng-tools5, smartmontools, + systemd-timesyncd, Suggests: # bash fonts-powerline-extra, # firmware-nonfree (non-free) - firmware-linux-nonfree, firmware-misc-nonfree, + firmware-linux-nonfree, + firmware-misc-nonfree, +# firmware (non-free) + firmware-ast, # microcode (contrib, non-free) iucode-tool, amd64-microcode, intel-microcode, -# firmware (third-party) - firmware-ast, -# Other (third-party) - intel-isdct, +# other (third-party) supermicro-ipmicfg, Enhances: bfh-base-system, @@ -161,9 +174,8 @@ Depends: # firefox firefox | firefox-esr | www-browser, webext-foxyproxy, - webext-https-everywhere, webext-privacy-badger, - webext-ublock-origin, + webext-ublock-origin-firefox, # filesystems dosfstools, exfatprogs, @@ -184,26 +196,18 @@ Depends: # network-manager network-manager-config-connectivity-debian, network-manager-ssh, -# pass - pass, - webext-browserpass [amd64 arm64 armhf i386], - pass-extension-tail, - tree, # thunderbird thunderbird [amd64 arm64 i386], # zip unzip, zip, -# Other +# other apg, nwipe, symlinks, - whois, Suggests: # deluge deluge-gtk, deluged, -# firefox - webext-umatrix, # virtualbox (contrib, non-free) virtualbox, virtualbox-dkms, @@ -228,11 +232,13 @@ Depends: # gnome-shell-extensions gnome-shell-extension-bluetooth-quick-connect, gnome-shell-extension-impatience, + gnome-shell-extension-no-annoyance, # nautilus nautilus-admin, - seahorse-nautilus, # network-manager network-manager-ssh-gnome, +Suggests: + gnome-shell-extensions-extra, Enhances: bfh-base-system, bfh-desktop, @@ -250,7 +256,7 @@ Architecture: all Depends: ${misc:Depends}, bfh-base-system, -# Other +# other localepurge, logrotate, molly-guard | bfh-container, @@ -276,19 +282,18 @@ Depends: # container-tools open-infrastructure-container-tools, curl, - debootstrap, + mmdebstrap | debootstrap, irker, pv, bridge-utils, - ifenslave, - vlan, # monitoring netdata, netdata-apache2, netdata-plugins-python, # web apache2, -# Other +# other + lldpd, numad, Suggests: ttyd, diff --git a/debian/copyright b/debian/copyright index 8bee4eb..11f2956 100644 --- a/debian/copyright +++ b/debian/copyright @@ -4,7 +4,7 @@ Upstream-Contact: BFH Linux System Administration <bfh-linux-sysadmin@lists.bfh. Source: https://get.bfh.science/packages/bfh-metapackages Files: * -Copyright: 2013-2021 Daniel Baumann <daniel@debian.org> +Copyright: 2013-2024 Daniel Baumann <daniel@debian.org> License: GPL-3+ License: GPL-3+ diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 1b2d65b..0000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=4 -opts="pgpmode=auto" \ -https://get.bfh.science/packages/bfh-metapackages/upstream/bfh-metapackages-(.+)\.tar\.lz |