summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/dialog/dialog.SlackBuild17
-rw-r--r--source/a/dialog/dialog.all.use_height.diff48
-rw-r--r--source/a/dialog/dialog.no.aspect.ratio.autoajust.patch31
-rw-r--r--source/a/shadow/doinst.sh2
-rw-r--r--source/a/shadow/environment6
-rwxr-xr-xsource/a/shadow/shadow.SlackBuild8
6 files changed, 93 insertions, 19 deletions
diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild
index e7e94a382..261e73010 100755
--- a/source/a/dialog/dialog.SlackBuild
+++ b/source/a/dialog/dialog.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -35,10 +35,13 @@ PKGNAM=dialog
# that uses dialog and found to work, and you've already gotten any needed
# patches accepted upstream... well... I like this version. If it's got bugs,
# they aren't bugs that I'm running into often.
-#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
-VERSION=1.3-20170509
+#
+# Update: dialog-1.3-20191210 actually passes the formatting tests here (with a
+# couple of patches), so we will take our first dialog upgrade in quite a while.
+#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
+VERSION=1.3-20191210
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -85,10 +88,14 @@ fi
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
+# These patches take care of the formatting issues that were preventing
+# us from moving to a more recent version of dialog:
+zcat $CWD/dialog.all.use_height.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dialog.no.aspect.ratio.autoajust.patch.gz | patch -p1 --verbose || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
diff --git a/source/a/dialog/dialog.all.use_height.diff b/source/a/dialog/dialog.all.use_height.diff
new file mode 100644
index 000000000..9eb1952c7
--- /dev/null
+++ b/source/a/dialog/dialog.all.use_height.diff
@@ -0,0 +1,48 @@
+--- ./menubox.c.orig 2019-11-10 19:41:15.000000000 -0600
++++ ./menubox.c 2019-12-06 13:16:39.400865476 -0600
+@@ -433,7 +433,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- all.menu_height = height - MIN_HIGH - cur_y;
++ if (all.menu_height + MIN_HIGH > height - cur_y)
++ all.menu_height = height - MIN_HIGH - cur_y;
+ if (all.menu_height <= 0)
+ all.menu_height = 1;
+
+--- ./buildlist.c.orig 2019-11-10 19:41:43.000000000 -0600
++++ ./buildlist.c 2019-12-06 13:16:39.402865476 -0600
+@@ -653,7 +653,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- all.use_height = height - MIN_HIGH - cur_y;
++ if (all.use_height + MIN_HIGH > height - cur_y)
++ all.use_height = height - MIN_HIGH - cur_y;
+ if (all.use_height <= 0)
+ all.use_height = 1;
+
+--- ./checklist.c.orig 2019-11-10 19:26:35.000000000 -0600
++++ ./checklist.c 2019-12-06 13:16:39.404865476 -0600
+@@ -304,7 +304,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- all.use_height = height - MIN_HIGH - cur_y;
++ if (all.use_height + MIN_HIGH > height - cur_y)
++ all.use_height = height - MIN_HIGH - cur_y;
+ if (all.use_height <= 0)
+ all.use_height = 1;
+
+--- ./treeview.c.orig 2019-11-10 19:38:22.000000000 -0600
++++ ./treeview.c 2019-12-06 13:17:35.604866677 -0600
+@@ -291,7 +291,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- use_height = height - MIN_HIGH - cur_y;
++ if (use_height + MIN_HIGH > height - cur_y)
++ use_height = height - MIN_HIGH - cur_y;
+ if (use_height <= 0)
+ use_height = 1;
+
diff --git a/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch b/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch
new file mode 100644
index 000000000..7bce97b80
--- /dev/null
+++ b/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch
@@ -0,0 +1,31 @@
+--- ./util.c.orig 2019-11-10 17:20:58.000000000 -0600
++++ ./util.c 2019-12-07 14:40:23.404722986 -0600
+@@ -1237,28 +1237,6 @@
+ justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
+ car = (float) (wide / high);
+
+- /*
+- * If the aspect ratio is greater than it should be, then decrease the
+- * width proportionately.
+- */
+- if (car > ar) {
+- float diff = car / (float) ar;
+- max_x = (int) ((float) wide / diff + 4);
+- justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
+- car = (float) wide / (float) high;
+- }
+-
+- /*
+- * If the aspect ratio is too small after decreasing the width, then
+- * incrementally increase the width until the aspect ratio is equal to or
+- * greater than the specified aspect ratio.
+- */
+- while (car < ar && max_x < max_width) {
+- max_x += 4;
+- justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
+- car = (float) (wide / high);
+- }
+-
+ *height = high;
+ *width = wide;
+ }
diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh
index b5fcee426..a7bf2ee4a 100644
--- a/source/a/shadow/doinst.sh
+++ b/source/a/shadow/doinst.sh
@@ -11,9 +11,7 @@ config() {
}
config etc/default/useradd.new
-config etc/environment.new
config etc/login.access.new
config etc/login.defs.new
config var/log/faillog.new
rm -f var/log/faillog.new
-
diff --git a/source/a/shadow/environment b/source/a/shadow/environment
deleted file mode 100644
index 9e96a54ce..000000000
--- a/source/a/shadow/environment
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/environment
-# This file may contain environment variable settings that should be used
-# system-wide. Please note that it is not a script file and should only
-# contain assignment expressions, one per line.
-# The environment variables in this file will be loaded before those in other
-# files such as: /etc/profile, /etc/profile.d/*, ~/.profile, etc.
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
index fd184bb94..d3fd6d14b 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=shadow
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -137,10 +137,6 @@ find $PKG -name groups.1 -exec rm {} \+
rm -f $PKG/etc/login.defs
zcat $CWD/login.defs.gz > $PKG/etc/login.defs.new
-# Install /etc/environment (referenced in login.defs and used by sudo and
-# other utilities):
-zcat $CWD/environment.gz > $PKG/etc/environment.new
-
mv $PKG/etc/login.access $PKG/etc/login.access.new
# I don't think this works well enough to recommend it.
generated by cgit v1.2.3-80-g2a13 (git 2.46.2) at 2024-11-02 13:30:09 +0000