Mon Jun 10 19:23:44 UTC 202420240610192344

ap/stow-2.4.0-x86_64-1.txz:  Added.
  Thanks to r1w1s1.
ap/texinfo-7.1-x86_64-2.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
ap/vim-9.1.0473-x86_64-1.txz:  Upgraded.
  Compiled against perl-5.40.0.
d/ccache-4.10-x86_64-2.txz:  Rebuilt.
  Avoid downloading doctest.h at build time. Thanks to lucabon.
d/perl-5.40.0-x86_64-1.txz:  Upgraded.
  Upgraded:  DBD-mysql-4.052, Path-Tiny-0.146, URI-5.28.
d/subversion-1.14.3-x86_64-2.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
kde/plasma-workspace-5.27.11.1-x86_64-2.txz:  Rebuilt.
  [PATCH] Fix writing ICEAuthority file.
l/glib2-2.80.3-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.1_33-x86_64-2.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
l/pango-1.54.0-x86_64-1.txz:  Upgraded.
l/python-packaging-24.1-x86_64-1.txz:  Upgraded.
n/epic5-2.1.12-x86_64-9.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
n/irssi-1.4.5-x86_64-3.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
n/net-snmp-5.9.4-x86_64-5.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
n/ntp-4.2.8p18-x86_64-3.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
n/openldap-2.6.8-x86_64-2.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
xap/hexchat-2.16.2-x86_64-3.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
xap/pidgin-2.14.13-x86_64-2.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
xap/rxvt-unicode-9.31-x86_64-3.txz:  Rebuilt.
  Recompiled against perl-5.40.0.
xap/vim-gvim-9.1.0473-x86_64-1.txz:  Upgraded.
  Compiled against perl-5.40.0.
xap/xscreensaver-6.09-x86_64-1.txz:  Upgraded.
xfce/xfce4-power-manager-4.18.4-x86_64-1.txz:  Upgraded.
xfce/xfce4-session-4.18.4-x86_64-1.txz:  Upgraded.

5 files changed, 10 insertions, 215 deletions

diff --git a/source/xap/hexchat/hexchat.SlackBuild b/source/xap/hexchat/hexchat.SlackBuild
index d1baf6d30..75d706127 100755
--- a/source/xap/hexchat/hexchat.SlackBuild
+++ b/source/xap/hexchat/hexchat.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=hexchat
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/pidgin/pidgin.SlackBuild b/source/xap/pidgin/pidgin.SlackBuild
index 627d1b1bf..6fab57a2d 100755
--- a/source/xap/pidgin/pidgin.SlackBuild
+++ b/source/xap/pidgin/pidgin.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=pidgin
 VERSION=${VERSION:-$(echo $PKGNAM-2.*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 PIDGINENC=${PIDGINENC:-3.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild
index 0135cdab3..b161d2d34 100755
--- a/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild
+++ b/source/xap/rxvt-unicode/rxvt-unicode.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=rxvt-unicode
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index ffc957672..1e287dcd8 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xscreensaver
 VERSION=${VERSION:-$(echo xscreensaver-*.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
@@ -71,20 +71,6 @@ rm -rf xscreensaver-$VERSION
 tar xvf $CWD/xscreensaver-$VERSION.tar.?z || exit 1
 cd xscreensaver-$VERSION
 
-if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then
-  USE_PAM="--with-pam"
-  unset USE_SHADOW
-else
-  ## NOTE: The patch below (and support for setgid shadow) is broken and
-  ## unmaintained. But the broken bits will be left as hints for anyone
-  ## down the line who might care.
-  # Allow xscreensaver to work setgid shadow.  I'd rather avoid requiring
-  # setuid root on this if at all possible...
-  #zcat $CWD/xscreensaver.setuid.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
-  unset USE_PAM
-  USE_SHADOW="--with-shadow"
-fi
-
 # Add support for the electricsheep distributed screensaver:
 zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1
 
@@ -110,8 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --with-app-defaults=/etc/X11/app-defaults \
   --with-text-file=/usr/doc/netdate/COPYRIGHT \
-  $USE_SHADOW \
-  $USE_PAM \
+  --with-pam \
   --without-kerberos \
   --with-jpeg \
   --with-gl \
@@ -121,22 +106,10 @@ CXXFLAGS="$SLKCFLAGS" \
 make $NUMJOBS || make || exit 1
 make install_prefix=$PKG install-strip || exit 1
 
-if [ -z $USE_PAM ]; then
-  # Needed for password unlock:
-  chown root:shadow $PKG/usr/bin/xscreensaver
-  chmod 2751 $PKG/usr/bin/xscreensaver
-else
-  ## Commenting out the chmod below, since as of v6.00 this binary is no longer
-  ## made setuid at installation. But if that changes, we'll go along with it
-  ## since jwz says it may be required to prevent OOM killer abuse from
-  ## unlocking the screen.
-  # No special perms needed with PAM:
-  #chmod 755 $PKG/usr/bin/xscreensaver
-  mkdir -p $PKG/etc/pam.d
-  cat $CWD/xscreensaver.pam > $PKG/etc/pam.d/xscreensaver.new
-  mkdir -p $PKG/install
-  zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
-fi
+# No special perms needed with PAM:
+#chmod 755 $PKG/usr/bin/xscreensaver
+mkdir -p $PKG/etc/pam.d
+cat $CWD/xscreensaver.pam > $PKG/etc/pam.d/xscreensaver.new
 
 # This is needed for the menus:
 mkdir -p $PKG/usr/share/pixmaps
@@ -168,6 +141,7 @@ fi
 cat $CWD/xscreensaver-getimage-file-5.14 > $PKG/usr/bin/xscreensaver-getimage-file
 
 mkdir -p $PKG/install
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source/xap/xscreensaver/xscreensaver.setuid.diff b/source/xap/xscreensaver/xscreensaver.setuid.diff
deleted file mode 100644
index c6810af55..000000000
--- a/source/xap/xscreensaver/xscreensaver.setuid.diff
+++ /dev/null
@@ -1,179 +0,0 @@
---- ./driver/setuid.c.orig	2006-02-08 20:28:38.000000000 -0600
-+++ ./driver/setuid.c	2006-04-04 16:48:08.000000000 -0500
-@@ -1,5 +1,5 @@
- /* setuid.c --- management of runtime privileges.
-- * xscreensaver, Copyright (c) 1993-1998, 2005 Jamie Zawinski <jwz@jwz.org>
-+ * xscreensaver, Copyright (c) 1993-1998 Jamie Zawinski <jwz@jwz.org>
-  *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-  * documentation for any purpose is hereby granted without fee, provided that
-@@ -41,7 +41,7 @@
-   struct group *g = 0;
-   p = getpwuid (uid);
-   g = getgrgid (gid);
--  sprintf (buf, "%.100s/%.100s (%ld/%ld)",
-+  sprintf (buf, "%s/%s (%ld/%ld)",
- 	   (p && p->pw_name ? p->pw_name : "???"),
- 	   (g && g->gr_name ? g->gr_name : "???"),
- 	   (long) uid, (long) gid);
-@@ -74,50 +74,11 @@
- }
- 
- 
--/* Returns true if we need to call setgroups().
--
--   Without calling setgroups(), the process will retain any supplementary
--   gids associated with the uid, e.g.:
--
--       % groups root
--       root : root bin daemon sys adm disk wheel
--
--   However, setgroups() can only be called by root, and returns EPERM
--   for other users even if the call would be a no-op (e.g., setting the
--   group list to the current list.)  So, to avoid that spurious error,
--   before calling setgroups() we first check whether the current list
--   of groups contains only one element, our target group.  If so, we
--   don't need to call setgroups().
-- */
--static int
--setgroups_needed_p (uid_t target_group)
--{
--  gid_t groups[1024];
--  int n, size;
--  size = sizeof(groups) / sizeof(gid_t);
--  n = getgroups (size - 1, groups);
--  if (n < 0)
--    {
--      char buf [1024];
--      sprintf (buf, "%s: getgroups(%ld, ...)", blurb(), (long int)(size - 1));
--      perror (buf);
--      return 1;
--    }
--  else if (n == 0)            /* an empty list means only egid is in effect. */
--    return 0;
--  else if (n == 1 && groups[0] == target_group)   /* one element, the target */
--    return 0;
--  else                        /* more than one, or the wrong one. */
--    return 1;
--}
--
--
- static int
- set_ids_by_number (uid_t uid, gid_t gid, char **message_ret)
- {
-   int uid_errno = 0;
-   int gid_errno = 0;
--  int sgs_errno = 0;
-   struct passwd *p = getpwuid (uid);
-   struct group  *g = getgrgid (gid);
- 
-@@ -136,11 +97,6 @@
-   if (uid == (uid_t) -1) uid = (uid_t) -2;
- 
-   errno = 0;
--  if (setgroups_needed_p (gid) &&
--      setgroups (1, &gid) < 0)
--    sgs_errno = errno ? errno : -1;
--
--  errno = 0;
-   if (setgid (gid) != 0)
-     gid_errno = errno ? errno : -1;
- 
-@@ -148,10 +104,10 @@
-   if (setuid (uid) != 0)
-     uid_errno = errno ? errno : -1;
- 
--  if (uid_errno == 0 && gid_errno == 0 && sgs_errno == 0)
-+  if (uid_errno == 0 && gid_errno == 0)
-     {
-       static char buf [1024];
--      sprintf (buf, "changed uid/gid to %.100s/%.100s (%ld/%ld).",
-+      sprintf (buf, "changed uid/gid to %s/%s (%ld/%ld).",
- 	       (p && p->pw_name ? p->pw_name : "???"),
-                (g && g->gr_name ? g->gr_name : "???"),
- 	       (long) uid, (long) gid);
-@@ -162,71 +118,28 @@
-   else
-     {
-       char buf [1024];
--      gid_t groups[1024];
--      int n, size;
--
--      if (sgs_errno)
--	{
--	  sprintf (buf, "%s: couldn't setgroups to %.100s (%ld)",
--		   blurb(),
--		   (g && g->gr_name ? g->gr_name : "???"),
--		   (long) gid);
--	  if (sgs_errno == -1)
--	    fprintf(stderr, "%s: unknown error\n", buf);
--	  else
--            {
--              errno = sgs_errno;
--              perror(buf);
--            }
--
--	  fprintf (stderr, "%s: effective group list: ", blurb());
--	  size = sizeof(groups) / sizeof(gid_t);
--          n = getgroups (size - 1, groups);
--          if (n < 0)
--            fprintf (stderr, "unknown!\n");
--          else
--            {
--              int i;
--              fprintf (stderr, "[");
--              for (i = 0; i < n; i++)
--                {
--                  g = getgrgid (groups[i]);
--                  if (i > 0) fprintf (stderr, ", ");
--                  if (g && g->gr_name) fprintf (stderr, "%s", g->gr_name);
--                  else fprintf (stderr, "%ld", (long) groups[i]);
--                }
--              fprintf (stderr, "]\n");
--            }
--        }
--
-       if (gid_errno)
- 	{
--	  sprintf (buf, "%s: couldn't set gid to %.100s (%ld)",
-+	  sprintf (buf, "%s: couldn't set gid to %s (%ld)",
- 		   blurb(),
- 		   (g && g->gr_name ? g->gr_name : "???"),
- 		   (long) gid);
- 	  if (gid_errno == -1)
- 	    fprintf(stderr, "%s: unknown error\n", buf);
- 	  else
--            {
--              errno = gid_errno;
--              perror(buf);
--            }
-+	    perror(buf);
- 	}
- 
-       if (uid_errno)
- 	{
--	  sprintf (buf, "%s: couldn't set uid to %.100s (%ld)",
-+	  sprintf (buf, "%s: couldn't set uid to %s (%ld)",
- 		   blurb(),
- 		   (p && p->pw_name ? p->pw_name : "???"),
- 		   (long) uid);
- 	  if (uid_errno == -1)
- 	    fprintf(stderr, "%s: unknown error\n", buf);
- 	  else
--            {
--              errno = uid_errno;
--              perror(buf);
--            }
-+	    perror(buf);
- 	}
- 
-       return -1;
-@@ -350,7 +263,7 @@
- 	!strcmp (p->pw_name, "games"))
-       {
- 	static char buf [1024];
--	sprintf (buf, "running as %.100s",
-+	sprintf (buf, "running as %s",
- 		 (p && p->pw_name && *p->pw_name
- 		  ? p->pw_name : "<unknown>"));
- 	si->nolock_reason = buf;