Tue Mar 12 19:49:57 UTC 202420240312194957

a/elogind-252.23-x86_64-1.txz:  Upgraded.
ap/sqlite-3.45.2-x86_64-1.txz:  Upgraded.
l/jasper-4.2.2-x86_64-1.txz:  Upgraded.
l/libpaper-2.2.5-x86_64-1.txz:  Upgraded.
l/netpbm-11.05.03-x86_64-1.txz:  Upgraded.
l/python-wheel-0.43.0-x86_64-1.txz:  Upgraded.
n/iproute2-6.8.0-x86_64-1.txz:  Upgraded.
xap/sane-1.3.0-x86_64-1.txz:  Upgraded.

7 files changed, 209 insertions, 145 deletions

diff --git a/source/a/dcron/stub b/source/a/dcron/stub
deleted file mode 100644
index c33bafee3..000000000
--- a/source/a/dcron/stub
+++ /dev/null
@@ -1 +0,0 @@
-.TH CRONTABS 4 2012-08-29 "Marcela Mašláňová" "Crontabs users' Manual"
diff --git a/source/a/elogind/elogind-polkit.patch b/source/a/elogind/elogind-polkit.patch
deleted file mode 100644
index 4d91b9817..000000000
--- a/source/a/elogind/elogind-polkit.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-Update org.freedesktop.login1.conf
-This mirrors an upstream change opening up all of logind's bus calls to
-unprivileged users via polkit.
-
-See systemd/systemd#471.
-Closes #3.
-
-diff -uar a/src/login/org.freedesktop.login1.conf b/src/login/org.freedesktop.login1.conf
---- a/src/login/org.freedesktop.login1.conf
-+++ b/src/login/org.freedesktop.login1.conf
-@@ -90,6 +90,42 @@
- 
-                 <allow send_destination="org.freedesktop.login1"
-                        send_interface="org.freedesktop.login1.Manager"
-+                       send_member="LockSession"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="UnlockSession"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="LockSessions"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="UnlockSessions"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="KillSession"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="KillUser"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="TerminateSession"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="TerminateUser"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-+                       send_member="TerminateSeat"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-                        send_member="PowerOff"/>
- 
-                 <allow send_destination="org.freedesktop.login1"
- @@ -130,6 +166,10 @@
- 
-                 <allow send_destination="org.freedesktop.login1"
-                        send_interface="org.freedesktop.login1.Manager"
-+                       send_member="SetWallMessage"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Manager"
-                        send_member="AttachDevice"/>
- 
-                 <allow send_destination="org.freedesktop.login1"
- @@ -138,6 +178,10 @@
- 
-                 <allow send_destination="org.freedesktop.login1"
-                        send_interface="org.freedesktop.login1.Seat"
-+                       send_member="Terminate"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Seat"
-                        send_member="ActivateSession"/>
- 
-                 <allow send_destination="org.freedesktop.login1"
- @@ -154,14 +198,30 @@
- 
-                 <allow send_destination="org.freedesktop.login1"
-                        send_interface="org.freedesktop.login1.Session"
-+                       send_member="Terminate"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Session"
-                        send_member="Activate"/>
- 
-                 <allow send_destination="org.freedesktop.login1"
-                        send_interface="org.freedesktop.login1.Session"
-+                       send_member="Lock"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Session"
-+                       send_member="Unlock"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Session"
-                        send_member="SetIdleHint"/>
- 
-                 <allow send_destination="org.freedesktop.login1"
-                        send_interface="org.freedesktop.login1.Session"
-+                       send_member="Kill"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.Session"
-                        send_member="TakeControl"/>
- 
-                 <allow send_destination="org.freedesktop.login1"
- @@ -180,6 +240,14 @@
-                        send_interface="org.freedesktop.login1.Session"
-                        send_member="PauseDeviceComplete"/>
- 
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.User"
-+                       send_member="Terminate"/>
-+
-+                <allow send_destination="org.freedesktop.login1"
-+                       send_interface="org.freedesktop.login1.User"
-+                       send_member="Kill"/>
-+
-                 <allow receive_sender="org.freedesktop.login1"/>
-         </policy>
- 
diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild
index 32e90443e..e11ea435a 100755
--- a/source/a/elogind/elogind.SlackBuild
+++ b/source/a/elogind/elogind.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Copyright 2016, 2017, 2020  Eric Hameleers, Eindhoven, NL
-# Copyright 2020, 2023  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2020, 2023, 2024  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elogind
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -86,8 +86,17 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# Our nobody user has UIDNumber 99, not 65534:
-sed -e "s/65534/99/g" -i $(grep -lr 65534 .)
+# Once upon a time we were encouraged to go against long-standing UNIX
+# traditions and use 99:99 for nobody:nogroup.
+# This may have been a bad idea.
+# But since to change this we'll have to dig through the system and make
+# sure that nothing hardcodes 99:99, we'll leave it as-is for now.
+# It's more than likely on the TODO list to change these back to
+# 65534:65534, however.
+# Meanwhile we'll at least change this from a sed to a patch.
+# Always hated sed in these situations because the underlying code can change
+# but sed will still happily scribble all over everything.
+cat $CWD/elogind.nobody.nogroup.99.99.diff | patch -p1 --verbose || exit 1
 
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
@@ -107,6 +116,7 @@ meson \
   -Dman=true \
   -Dhtml=false \
   -Dbashcompletiondir="/usr/share/bash-completion/completions" \
+  -Dnobody-user=nobody \
   -Dnobody-group=nogroup \
   -Dpam=true \
   -Dpamlibdir="/lib${LIBDIRSUFFIX}/security" \
@@ -157,8 +167,7 @@ mkdir -p $PKG/etc/elogind/logind.conf.d/ $PKG/etc/elogind/sleep.conf.d/
 # Add login1 policy file that allows users in the 'power' group
 # to shutdown/reboot the computer:
 mkdir -p $PKG/usr/share/polkit-1/rules.d
-zcat $CWD/10-enable-elogind-power.rules.gz > \
-  $PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules
+zcat $CWD/10-enable-elogind-power.rules.gz > $PKG/usr/share/polkit-1/rules.d/10-enable-session-power.rules
 
 # We don't need the hidden files to make inferior package managers keep dirs:
 find $PKG -type f -name ".keep_dir" -exec rm -f {} \;
diff --git a/source/a/elogind/elogind.nobody.nogroup.99.99.diff b/source/a/elogind/elogind.nobody.nogroup.99.99.diff
new file mode 100644
index 000000000..e1930ef52
--- /dev/null
+++ b/source/a/elogind/elogind.nobody.nogroup.99.99.diff
@@ -0,0 +1,174 @@
+diff -u -r --new-file elogind-252.23.orig/meson.build elogind-252.23/meson.build
+--- elogind-252.23.orig/meson.build	2024-03-10 03:24:27.000000000 -0500
++++ elogind-252.23/meson.build	2024-03-12 13:22:28.571004872 -0500
+@@ -1031,40 +1031,40 @@
+ nobody_group = get_option('nobody-group')
+ 
+ if not meson.is_cross_build()
+-        getent_result = run_command('getent', 'passwd', '65534', check : false)
++        getent_result = run_command('getent', 'passwd', '99', check : false)
+         if getent_result.returncode() == 0
+                 name = getent_result.stdout().split(':')[0]
+                 if name != nobody_user
+                         warning('\n' +
+-                                'The local user with the UID 65534 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) +
++                                'The local user with the UID 99 does not match the configured user name "@0@" of the nobody user (its name is @1@).\n'.format(nobody_user, name) +
+                                 'Your build will result in an user table setup that is incompatible with the local system.')
+                 endif
+         endif
+         id_result = run_command('id', '-u', nobody_user, check : false)
+         if id_result.returncode() == 0
+                 id = id_result.stdout().strip().to_int()
+-                if id != 65534
++                if id != 99
+                         warning('\n' +
+-                                'The local user with the configured user name "@0@" of the nobody user does not have UID 65534 (it has @1@).\n'.format(nobody_user, id) +
++                                'The local user with the configured user name "@0@" of the nobody user does not have UID 99 (it has @1@).\n'.format(nobody_user, id) +
+                                 'Your build will result in an user table setup that is incompatible with the local system.')
+                 endif
+         endif
+ 
+-        getent_result = run_command('getent', 'group', '65534', check : false)
++        getent_result = run_command('getent', 'group', '99', check : false)
+         if getent_result.returncode() == 0
+                 name = getent_result.stdout().split(':')[0]
+                 if name != nobody_group
+                         warning('\n' +
+-                                'The local group with the GID 65534 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) +
++                                'The local group with the GID 99 does not match the configured group name "@0@" of the nobody group (its name is @1@).\n'.format(nobody_group, name) +
+                                 'Your build will result in an group table setup that is incompatible with the local system.')
+                 endif
+         endif
+         id_result = run_command('id', '-g', nobody_group, check : false)
+         if id_result.returncode() == 0
+                 id = id_result.stdout().strip().to_int()
+-                if id != 65534
++                if id != 99
+                         warning('\n' +
+-                                'The local group with the configured group name "@0@" of the nobody group does not have GID 65534 (it has @1@).\n'.format(nobody_group, id) +
++                                'The local group with the configured group name "@0@" of the nobody group does not have GID 99 (it has @1@).\n'.format(nobody_group, id) +
+                                 'Your build will result in an group table setup that is incompatible with the local system.')
+                 endif
+         endif
+diff -u -r --new-file elogind-252.23.orig/meson_options.txt elogind-252.23/meson_options.txt
+--- elogind-252.23.orig/meson_options.txt	2024-03-10 03:24:27.000000000 -0500
++++ elogind-252.23/meson_options.txt	2024-03-12 13:22:28.571004872 -0500
+@@ -308,10 +308,10 @@
+ option('wheel-group', type : 'boolean',
+        description : 'the ACL for wheel group should be added')
+ option('nobody-user', type : 'string',
+-       description : 'The name of the nobody user (the one with UID 65534)',
++       description : 'The name of the nobody user (the one with UID 99)',
+        value : 'nobody')
+ option('nobody-group', type : 'string',
+-       description : 'The name of the nobody group (the one with GID 65534)',
++       description : 'The name of the nobody group (the one with GID 99)',
+        value : 'nobody')
+ #if 0 /// UNNEEDED by elogind
+ # option('adm-gid', type : 'integer', value : 0,
+diff -u -r --new-file elogind-252.23.orig/src/basic/user-util.c elogind-252.23/src/basic/user-util.c
+--- elogind-252.23.orig/src/basic/user-util.c	2024-03-10 03:24:27.000000000 -0500
++++ elogind-252.23/src/basic/user-util.c	2024-03-12 13:22:28.571004872 -0500
+@@ -178,7 +178,7 @@
+                 const char **shell,
+                 UserCredsFlags flags) {
+ 
+-        /* We enforce some special rules for uid=0 and uid=65534: in order to avoid NSS lookups for root we hardcode
++        /* We enforce some special rules for uid=0 and uid=99: in order to avoid NSS lookups for root we hardcode
+          * their user record data. */
+ 
+         if (STR_IN_SET(*username, "root", "0")) {
+@@ -198,7 +198,7 @@
+                 return 0;
+         }
+ 
+-        if (STR_IN_SET(*username, NOBODY_USER_NAME, "65534") &&
++        if (STR_IN_SET(*username, NOBODY_USER_NAME, "99") &&
+             synthesize_nobody()) {
+                 *username = NOBODY_USER_NAME;
+ 
+@@ -344,7 +344,7 @@
+                 return 0;
+         }
+ 
+-        if (STR_IN_SET(*groupname, NOBODY_GROUP_NAME, "65534") &&
++        if (STR_IN_SET(*groupname, NOBODY_GROUP_NAME, "99") &&
+             synthesize_nobody()) {
+                 *groupname = NOBODY_GROUP_NAME;
+ 
+@@ -940,7 +940,7 @@
+ bool synthesize_nobody(void) {
+         /* Returns true when we shall synthesize the "nobody" user (which we do by default). This can be turned off by
+          * touching /etc/systemd/dont-synthesize-nobody in order to provide upgrade compatibility with legacy systems
+-         * that used the "nobody" user name and group name for other UIDs/GIDs than 65534.
++         * that used the "nobody" user name and group name for other UIDs/GIDs than 99.
+          *
+          * Note that we do not employ any kind of synchronization on the following caching variable. If the variable is
+          * accessed in multi-threaded programs in the worst case it might happen that we initialize twice, but that
+diff -u -r --new-file elogind-252.23.orig/src/basic/user-util.h elogind-252.23/src/basic/user-util.h
+--- elogind-252.23.orig/src/basic/user-util.h	2024-03-10 03:24:27.000000000 -0500
++++ elogind-252.23/src/basic/user-util.h	2024-03-12 13:22:28.571004872 -0500
+@@ -78,8 +78,8 @@
+ #define UID_INVALID ((uid_t) -1)
+ #define GID_INVALID ((gid_t) -1)
+ 
+-#define UID_NOBODY ((uid_t) 65534U)
+-#define GID_NOBODY ((gid_t) 65534U)
++#define UID_NOBODY ((uid_t) 99U)
++#define GID_NOBODY ((gid_t) 99U)
+ 
+ /* If REMOUNT_IDMAPPING_HOST_ROOT is set for remount_idmap() we'll include a mapping here that maps the host
+  * root user accessing the idmapped mount to the this user ID on the backing fs. This is the last valid UID in
+diff -u -r --new-file elogind-252.23.orig/src/test/test-fs-util.c elogind-252.23/src/test/test-fs-util.c
+--- elogind-252.23.orig/src/test/test-fs-util.c	2024-03-10 03:24:27.000000000 -0500
++++ elogind-252.23/src/test/test-fs-util.c	2024-03-12 13:22:28.571004872 -0500
+@@ -591,8 +591,8 @@
+         usec_t test_mtime;
+         int r;
+ 
+-        test_uid = geteuid() == 0 ? 65534 : getuid();
+-        test_gid = geteuid() == 0 ? 65534 : getgid();
++        test_uid = geteuid() == 0 ? 99 : getuid();
++        test_gid = geteuid() == 0 ? 99 : getgid();
+ 
+         test_mtime = usec_sub_unsigned(now(CLOCK_REALTIME), USEC_PER_WEEK);
+ 
+diff -u -r --new-file elogind-252.23.orig/src/test/test-user-util.c elogind-252.23/src/test/test-user-util.c
+--- elogind-252.23.orig/src/test/test-user-util.c	2024-03-10 03:24:27.000000000 -0500
++++ elogind-252.23/src/test/test-user-util.c	2024-03-12 13:22:28.571004872 -0500
+@@ -230,7 +230,7 @@
+         assert_se(!valid_user_group_name("", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+         assert_se(valid_user_group_name("0", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+         assert_se(valid_user_group_name("1", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+-        assert_se(valid_user_group_name("65534", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
++        assert_se(valid_user_group_name("99", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+         assert_se(!valid_user_group_name("65535", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+         assert_se(valid_user_group_name("65536", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+         assert_se(!valid_user_group_name("-1", VALID_USER_ALLOW_NUMERIC|VALID_USER_RELAX));
+@@ -266,7 +266,7 @@
+         assert_se(!valid_user_group_name("", VALID_USER_ALLOW_NUMERIC));
+         assert_se(valid_user_group_name("0", VALID_USER_ALLOW_NUMERIC));
+         assert_se(valid_user_group_name("1", VALID_USER_ALLOW_NUMERIC));
+-        assert_se(valid_user_group_name("65534", VALID_USER_ALLOW_NUMERIC));
++        assert_se(valid_user_group_name("99", VALID_USER_ALLOW_NUMERIC));
+         assert_se(!valid_user_group_name("65535", VALID_USER_ALLOW_NUMERIC));
+         assert_se(valid_user_group_name("65536", VALID_USER_ALLOW_NUMERIC));
+         assert_se(!valid_user_group_name("-1", VALID_USER_ALLOW_NUMERIC));
+@@ -350,7 +350,7 @@
+         test_get_user_creds_one("root", "root", 0, 0, "/root", DEFAULT_USER_SHELL);
+         test_get_user_creds_one("0", "root", 0, 0, "/root", DEFAULT_USER_SHELL);
+         test_get_user_creds_one(NOBODY_USER_NAME, NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
+-        test_get_user_creds_one("65534", NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
++        test_get_user_creds_one("99", NOBODY_USER_NAME, UID_NOBODY, GID_NOBODY, "/", NOLOGIN);
+ }
+ 
+ #if 0 /// UNNEEDED by elogind
+@@ -375,7 +375,7 @@
+         test_get_group_creds_one("root", "root", 0);
+         test_get_group_creds_one("0", "root", 0);
+         test_get_group_creds_one(NOBODY_GROUP_NAME, NOBODY_GROUP_NAME, GID_NOBODY);
+-        test_get_group_creds_one("65534", NOBODY_GROUP_NAME, GID_NOBODY);
++        test_get_group_creds_one("99", NOBODY_GROUP_NAME, GID_NOBODY);
+ }
+ 
+ TEST(make_salt) {
diff --git a/source/l/jasper/jasper.url b/source/l/jasper/jasper.url
index 96a94610a..b648f6121 100644
--- a/source/l/jasper/jasper.url
+++ b/source/l/jasper/jasper.url
@@ -1,2 +1,2 @@
 https://github.com/jasper-software/jasper/releases
-https://github.com/jasper-software/jasper/releases/download/version-4.2.1/jasper-4.2.1.tar.gz
+https://github.com/jasper-software/jasper/releases/download/version-4.2.2/jasper-4.2.2.tar.gz
diff --git a/source/l/libpaper/libpaper.url b/source/l/libpaper/libpaper.url
index 87084d62d..5237242ac 100644
--- a/source/l/libpaper/libpaper.url
+++ b/source/l/libpaper/libpaper.url
@@ -1,2 +1,2 @@
 https://github.com/rrthomas/libpaper
-https://github.com/rrthomas/libpaper/releases/download/v2.2.3/libpaper-2.2.3.tar.gz
+https://github.com/rrthomas/libpaper/releases/download/v2.2.5/libpaper-2.2.5.tar.gz
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index e44209c1e..3e700ba30 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019, 2020  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019, 2020, 2024  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sane
-VERSION=1.2.1
-BACKVER=1.2.1
+BACKVER=1.3.0
 FRONTVER=1.0.14
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$BACKVER}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -70,15 +70,23 @@ mkdir -p $TMP $PKG
 
 # First, we'll build the backends
 cd $TMP
-rm -rf sane-backends-$BACKVER
-tar xvf $CWD/sane-backends-$BACKVER.tar.xz || exit 1
-cd sane-backends-$BACKVER || exit 1
+rm -rf backends-$BACKVER
+tar xvf $CWD/backends-$BACKVER.tar.?z || exit 1
+cd backends-$BACKVER || exit 1
 chown -R root:root .
 
 # Put the SANE_CAP_ALWAYS_SETTABLE definition back until
 # everything else catches up with the API change...
+# NOTE: "everything" includes the frontends lol
 zcat $CWD/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz | patch -p1 || exit 1
 
+if [ ! -r configure ]; then
+  if [ -x ./autogen.sh ]; then
+    NOCONFIGURE=1 ./autogen.sh
+  else
+    autoreconf -vif
+  fi
+fi
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -111,14 +119,9 @@ cat tools/udev/libsane.rules \
   | sed -e "s/ACTION!=\"add\"/ACTION!=\"add|change\"/g" \
   > $PKG/lib/udev/rules.d/80-libsane.rules
 
-## Add the hal fdi file:
-#mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor/
-#cat tools/hal/libsane.fdi \
-#  > $PKG/usr/share/hal/fdi/policy/10osvendor/10-libsane.fdi
-
 # Install the pkgconfig file:
-install -D -m644 tools/sane-backends.pc \
-     $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
+#install -D -m644 tools/sane-backends.pc \
+#     $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
 
 # If there's a ChangeLog, installing at least part of the recent history
 # is useful, but don't let it get totally out of control:
@@ -131,7 +134,7 @@ fi
 # Now let's build the frontends:
 cd $TMP 
 rm -rf sane-frontends-$FRONTVER
-tar xvf $CWD/sane-frontends-$FRONTVER.tar.xz || exit 1
+tar xvf $CWD/sane-frontends-$FRONTVER.tar.?z || exit 1
 cd sane-frontends-$FRONTVER || exit 1
 chown -R root:root .