summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-03-25 01:29:36 +0000
committer Eric Hameleers <alien@slackware.com>2021-03-25 08:59:54 +0100
commit74147bf26e89436f62ddf9e4390aba27fa6c4581 (patch)
treec238ad6aa109a6fe1362a74aad4d438693a56981 /source/a
parent0f03f1b385050b37bf9e0adc1f93b6e45788b99b (diff)
downloadcurrent-74147bf26e89436f62ddf9e4390aba27fa6c4581.tar.gz
current-74147bf26e89436f62ddf9e4390aba27fa6c4581.tar.xz
Thu Mar 25 01:29:36 UTC 202120210325012936
a/dialog-1.3_20210319-x86_64-2.txz: Rebuilt. Install /etc/dialogrc as /etc/dialogrc.new. This won't protect the file with this update, but it will moving forward. Thanks to Tonus. l/libsigc++3-3.0.6-x86_64-1.txz: Added. x/libinput-1.17.1-x86_64-1.txz: Upgraded. xap/mozilla-firefox-87.0-x86_64-2.txz: Rebuilt. Pass --enable-optimize to let the build handle optimizations (apparently which optimizations work best differs throughout the tree). Don't pass optimization options in CFLAGS/CXXFLAGS. Build with --enable-rust-simd since upstream's binary releases do. xap/mozilla-thunderbird-78.9.0-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/thunderbird/78.9.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2021-12/ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23981 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23982 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23984 https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-23987 (* Security fix *) testing/packages/linux-5.11.x/kernel-generic-5.11.9-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-headers-5.11.9-x86-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-huge-5.11.9-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-modules-5.11.9-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-source-5.11.9-noarch-1.txz: Upgraded. -ADI_AXI_ADC m AD9467 m -> n FONT_TER16x32 n -> y
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/dialog/dialog.SlackBuild7
-rw-r--r--source/a/dialog/doinst.sh14
2 files changed, 19 insertions, 2 deletions
diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild
index ba3a8722d..150809084 100755
--- a/source/a/dialog/dialog.SlackBuild
+++ b/source/a/dialog/dialog.SlackBuild
@@ -42,7 +42,7 @@ PKGNAM=dialog
# We'll determine $VERSION automatically again (for now):
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -130,6 +130,9 @@ cat samples/slackware.rc > $PKG/etc/dialogrc
rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libdialog.a
rmdir $PKG/usr/lib${LIBDIRSUFFIX} 2> /dev/null
+# Ship the config file as .new:
+mv $PKG/etc/dialogrc $PKG/etc/dialogrc.new
+
mkdir -p $PKG/bin
mv $PKG/usr/bin/dialog $PKG/bin
( cd $PKG/usr/bin
@@ -170,8 +173,8 @@ if [ -r CHANGES ]; then
fi
mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $TMP/package-${PKGNAM}
/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz
-
diff --git a/source/a/dialog/doinst.sh b/source/a/dialog/doinst.sh
new file mode 100644
index 000000000..c35113318
--- /dev/null
+++ b/source/a/dialog/doinst.sh
@@ -0,0 +1,14 @@
+config() {
+ NEW="$1"
+ OLD="$(dirname $NEW)/$(basename $NEW .new)"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+ # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/dialogrc.new