Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

16 files changed, 130 insertions, 207 deletions

diff --git a/source/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc
index 472ab31a..fc947587 100644
--- a/source/l/glibc/doinst.sh-glibc
+++ b/source/l/glibc/doinst.sh-glibc
@@ -145,8 +145,9 @@ fi
 ( cd usr/lib ; ln -sf ../../lib/libnss_hesiod.so.2 libnss_hesiod.so )
 ( cd usr/lib ; rm -rf libnss_files.so )
 ( cd usr/lib ; ln -sf ../../lib/libnss_files.so.2 libnss_files.so )
-( cd usr/lib ; rm -rf libm.so )
-( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
+# This is now a linker script:
+#( cd usr/lib ; rm -rf libm.so )
+#( cd usr/lib ; ln -sf ../../lib/libm.so.6 libm.so )
 ( cd usr/lib ; rm -rf libutil.so )
 ( cd usr/lib ; ln -sf ../../lib/libutil.so.1 libutil.so )
 ( cd usr/lib ; rm -rf libnss_compat.so )
diff --git a/source/l/glibc/glibc-2.10-dns-no-gethostbyname4.diff b/source/l/glibc/glibc-2.10-dns-no-gethostbyname4.diff
deleted file mode 100644
index 3fa365af..00000000
--- a/source/l/glibc/glibc-2.10-dns-no-gethostbyname4.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-The gethostbyname4() lookup method is problematic since it fires out both
-the A and AAAA DNS queries in parallel and over the same socket. This
-should work in theory, but it turns out that many cheap DSL modems and
-similar devices have buggy DNS servers - if the AAAA query arrives too
-quickly after the A query, the server will generate only a single reply
-with the A query id but returning an error for the AAAA query; we get
-stuck waiting for the second reply.
-
-For gethostbyname4() users affected, disabling IPv6 in the system might
-work around the issue, unfortunately it only helps with applications
-using AI_ADDRCONFIG (e.g. Firefox); some (notably e.g. Pidgin) neglect
-to do that.
-
-Real fix should be using separate ports for the A and AAAA queries.
-
---- resolv/Versions	2008-08-02 10:26:09.000000000 +0200
-+++ resolv/Versions	2008-12-08 12:51:53.000000000 +0100
-@@ -102,7 +102,7 @@ libnss_dns {
-     _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
-     _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
-     _nss_dns_gethostbyaddr2_r;
--    _nss_dns_gethostbyname4_r;
-+#    _nss_dns_gethostbyname4_r;
-   }
- }
- 
diff --git a/source/l/glibc/glibc-c-utf8-locale.patch b/source/l/glibc/glibc-c-utf8-locale.patch
index 70c92a98..7fabf303 100644
--- a/source/l/glibc/glibc-c-utf8-locale.patch
+++ b/source/l/glibc/glibc-c-utf8-locale.patch
@@ -1,5 +1,18 @@
---- ./localedata/SUPPORTED.orig	2015-08-05 01:42:21.000000000 -0500
-+++ ./localedata/SUPPORTED	2015-12-17 17:07:08.053200616 -0600
+From 2eda7b462b415105f5a05c1323372d4e39d46439 Mon Sep 17 00:00:00 2001
+From: Mike FABIAN <mfabian@redhat.com>
+Date: Mon, 10 Aug 2015 15:58:12 +0200
+Subject: [PATCH] Add a C.UTF-8 locale
+
+---
+ localedata/SUPPORTED |   1 +
+ localedata/locales/C | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 239 insertions(+)
+ create mode 100644 localedata/locales/C
+
+diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
+index 8ca023e..2a78391 100644
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
 @@ -1,6 +1,7 @@
  # This file names the currently supported and somewhat tested locales.
  # If you have any additions please file a glibc bug report.
@@ -8,8 +21,11 @@
  aa_DJ.UTF-8/UTF-8 \
  aa_DJ/ISO-8859-1 \
  aa_ER/UTF-8 \
---- ./localedata/locales/C.orig	2015-12-17 17:07:08.053200616 -0600
-+++ ./localedata/locales/C	2015-12-17 17:07:08.053200616 -0600
+diff --git a/localedata/locales/C b/localedata/locales/C
+new file mode 100644
+index 0000000..fdf460e
+--- /dev/null
++++ b/localedata/locales/C
 @@ -0,0 +1,238 @@
 +escape_char /
 +comment_char %
@@ -20,7 +36,7 @@
 +source     ""
 +address    ""
 +contact    ""
-+email      ""
++email      "mfabian@redhat.com"
 +tel        ""
 +fax        ""
 +language   "C"
@@ -28,18 +44,18 @@
 +revision   "1.0"
 +date       "2015-08-10"
 +%
-+category  "C:2015";LC_IDENTIFICATION
-+category  "C:2015";LC_CTYPE
-+category  "C:2015";LC_COLLATE
-+category  "C:2015";LC_TIME
-+category  "C:2015";LC_NUMERIC
-+category  "C:2015";LC_MONETARY
-+category  "C:2015";LC_MESSAGES
-+category  "C:2015";LC_PAPER
-+category  "C:2015";LC_NAME
-+category  "C:2015";LC_ADDRESS
-+category  "C:2015";LC_TELEPHONE
-+category  "C:2015";LC_MEASUREMENT
++category  "i18n:2012";LC_IDENTIFICATION
++category  "i18n:2012";LC_CTYPE
++category  "i18n:2012";LC_COLLATE
++category  "i18n:2012";LC_TIME
++category  "i18n:2012";LC_NUMERIC
++category  "i18n:2012";LC_MONETARY
++category  "i18n:2012";LC_MESSAGES
++category  "i18n:2012";LC_PAPER
++category  "i18n:2012";LC_NAME
++category  "i18n:2012";LC_ADDRESS
++category  "i18n:2012";LC_TELEPHONE
++category  "i18n:2012";LC_MEASUREMENT
 +END LC_IDENTIFICATION
 +
 +LC_CTYPE
@@ -249,3 +265,6 @@
 +measurement    1
 +END LC_MEASUREMENT
 +
+-- 
+2.4.3
+
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index 9418e669..b5fdf021 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,9 +22,12 @@
 
 ## build glibc-$VERSION for Slackware
 
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=glibc
 VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # I was considering disabling NSCD, but MoZes talked me out of it.  :)
 #DISABLE_NSCD=" --disable-nscd "
@@ -40,6 +43,17 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "glibc-$VERSION-$ARCH-$BUILD.txz"
+  echo "glibc-i18n-$VERSION-$ARCH-$BUILD.txz"
+  echo "glibc-profile-$VERSION-$ARCH-$BUILD.txz"
+  echo "glibc-solibs-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 # I'll break this out as an option for fun  :-)
 case $ARCH  in
   i386)
@@ -97,10 +111,7 @@ CVSVER=${VERSION}${CHECKOUT}
 # Be sure the correct version of the headers package is installed BEFORE
 # building glibc!
 
-CWD=$(pwd)
-# Temporary build location.  This should not be a directory
-# path a non-root user could create later...
-TMP=${TMP:-/glibc-tmp-$(mcookie)}
+TMP=${TMP:-/tmp}
 mkdir -p $TMP
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
@@ -129,21 +140,12 @@ apply_patches() {
   # Use old-style locale directories rather than a single (and strangely
   # formatted) /usr/lib/locale/locale-archive file:
   zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1
-  # The is_IS locale is causing a strange error about the "echn" command
-  # not existing.  This patch reverts is_IS to the version shipped in
-  # glibc-2.5:
-  zcat $CWD/is_IS.diff.gz | patch -p1 --verbose || exit 1
   # Support ru_RU.CP1251 locale:
   zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
-  # Fix resolver problem with glibc-2.9:
-  zcat $CWD/glibc-2.10-dns-no-gethostbyname4.diff.gz | patch -p0 --verbose || exit 1
-  # This reverts a patch that was made to glibc to fix "namespace leakage",
-  # which seems to cause some build failures (e.g. with conntrack):
-  zcat $CWD/glibc.revert.to.fix.build.breakages.diff.gz | patch -p1 -l --verbose || exit 1
-  # Make it harder for people to trick ldd into running code:
-  zcat $CWD/glibc.ldd.trace.through.dynamic.linker.diff.gz | patch -p1 --verbose || exit 1
   # Add a C.UTF-8 locale:
   zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1
+  # Linux: use reserved name __key in pkey_get [BZ #22797]:
+  zcat $CWD/glibc.pkey_get.56170e0.diff.gz | patch -p1 --verbose || exit 1
 }
 
 # This is going to be the initial $DESTDIR:
@@ -220,6 +222,7 @@ CFLAGS="-g $OPTIMIZ" \
   --enable-kernel=2.6.32 \
   --with-headers=/usr/include \
   --enable-add-ons \
+  --enable-obsolete-nsl \
   --enable-obsolete-rpc \
   --enable-profile \
   $DISABLE_NSCD \
@@ -335,7 +338,8 @@ mkdir -p usr/lib${LIBDIRSUFFIX}
 mv $PKG/usr/lib${LIBDIRSUFFIX}/debug usr/lib${LIBDIRSUFFIX}
 mkdir install
 cp -a $CWD/slack-desc.glibc-debug install/slack-desc
-makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+## Don't package this:
+#makepkg -l y -c n $TMP/glibc-debug-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 ## INSTEAD, NUKE THESE LIBS
 #rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/debug
 
@@ -406,6 +410,11 @@ chown -R root:root etc
 chmod 755 etc/profile.d/*
 # Ditch links (these are in doinst.sh-glibc):
 find . -type l -exec rm {} \;
+# libm.so is *not* a linker script on all $ARCH.
+# If it's missing now, replace the symlink:
+if [ ! -r usr/lib${LIBDIRSUFFIX}/libm.so ]; then
+  ( cd usr/lib${LIBDIRSUFFIX} ; ln -sf ../../lib${LIBDIRSUFFIX}/libm.so.6 libm.so )
+fi
 mkdir install
 cp -a $CWD/slack-desc.glibc install/slack-desc
 cp -a $CWD/doinst.sh-glibc install/doinst.sh
diff --git a/source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff b/source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff
deleted file mode 100644
index 6b1f5c84..00000000
--- a/source/l/glibc/glibc.ldd.trace.through.dynamic.linker.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-2009-11-08  Aurelien Jarno  <aurelien@aurel32.net>
-
-	* elf/ldd.bash.in: also handle error code 126 (ld.so non
-	executable). Always trace dynamic library dependencies through
-	the dynamic linker.
-
---- a/elf/ldd.bash.in
-+++ b/elf/ldd.bash.in
-@@ -153,8 +153,6 @@ for file do
-     echo "ldd: ${file}:" $"not regular file" >&2
-     result=1
-   elif test -r "$file"; then
--    test -x "$file" || echo 'ldd:' $"\
--warning: you do not have execution permission for" "\`$file'" >&2
-     RTLD=
-     ret=1
-     for rtld in ${RTLDLIST}; do
-@@ -167,28 +165,16 @@ warning: you do not have execution permission for" "\`$file'" >&2
-       fi
-     done
-     case $ret in
--    0)
--      # If the program exits with exit code 5, it means the process has been
--      # invoked with __libc_enable_secure.  Fall back to running it through
--      # the dynamic linker.
--      try_trace "$file"
--      rc=$?
--      if [ $rc = 5 ]; then
--	try_trace "$RTLD" "$file"
--	rc=$?
--      fi
--      [ $rc = 0 ] || result=1
-+    0|2)
-+      try_trace "$RTLD" "$file" || result=1
-       ;;
--    1)
-+    1|126)
-       # This can be a non-ELF binary or no binary at all.
-       nonelf "$file" || {
- 	echo $"	not a dynamic executable"
- 	result=1
-       }
-       ;;
--    2)
--      try_trace "$RTLD" "$file" || result=1
--      ;;
-     *)
-       echo 'ldd:' ${RTLD} $"exited with unknown exit code" "($ret)" >&2
-       exit 1
diff --git a/source/l/glibc/glibc.locale.no-archive.diff b/source/l/glibc/glibc.locale.no-archive.diff
index bf1a83b7..4b2828ba 100644
--- a/source/l/glibc/glibc.locale.no-archive.diff
+++ b/source/l/glibc/glibc.locale.no-archive.diff
@@ -1,10 +1,10 @@
---- ./localedata/Makefile.orig	2003-11-20 15:31:38.000000000 -0800
-+++ ./localedata/Makefile	2004-08-03 17:20:54.000000000 -0700
-@@ -222,6 +222,7 @@
+--- ./localedata/Makefile.orig	2018-02-04 23:06:03.700212576 -0600
++++ ./localedata/Makefile	2018-02-04 23:07:10.102218076 -0600
+@@ -223,6 +223,7 @@
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
- 	$(LOCALEDEF) --alias-file=../intl/locale.alias \
+ 	$(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
 +		     --no-archive \
- 		     -i locales/$$input -c -f charmaps/$$charset \
- 		     $(addprefix --prefix=,$(install_root)) $$locale; \
- 	echo ' done'; \
+ 		     -i locales/$$input -f charmaps/$$charset \
+ 		     $(addprefix --prefix=,$(install_root)) $$locale \
+ 	&& echo ' done'; \
diff --git a/source/l/glibc/glibc.make-3.82.diff b/source/l/glibc/glibc.make-3.82.diff
deleted file mode 100644
index 56b0675b..00000000
--- a/source/l/glibc/glibc.make-3.82.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2010-07-26
-Initial Package Version: 2.11.2
-Upstream Status:         Not submitted
-Origin:                  Denis Onischenko
-                         (http://www.mail-archive.com/help-make@gnu.org/msg08847.html)
-Description:             Fixes an incompatibility with Make-3.82.
-
-diff -Naur glibc-2.11.2.orig/manual/Makefile glibc-2.11.2/manual/Makefile
---- glibc-2.11.2.orig/manual/Makefile	2010-05-19 20:38:20.000000000 +0000
-+++ glibc-2.11.2/manual/Makefile	2010-07-26 06:51:27.049899308 +0000
-@@ -232,9 +232,13 @@
- .PHONY: stubs
- stubs: $(objpfx)stubs
- endif
--$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
--	$(make-target-directory)
--	touch $@
-+$(objpfx)stubs ../po/manual.pot:
-+	$(make-target-directory)
-+	touch $@
-+
-+$(objpfx)stamp%:
-+	$(make-target-directory)
-+	touch $@
- 
- # Make the target directory if it doesn't exist, using the `mkinstalldirs'
- # script that does `mkdir -p' even if `mkdir' doesn't support that flag.
diff --git a/source/l/glibc/glibc.pkey_get.56170e0.diff b/source/l/glibc/glibc.pkey_get.56170e0.diff
new file mode 100644
index 00000000..d7111fba
--- /dev/null
+++ b/source/l/glibc/glibc.pkey_get.56170e0.diff
@@ -0,0 +1,28 @@
+From 56170e064e2b21ce204f0817733e92f1730541ea Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <ignatenko@redhat.com>
+Date: Wed, 7 Feb 2018 13:53:10 +0100
+Subject: [PATCH] Linux: use reserved name __key in pkey_get [BZ #22797]
+
+_key is not reserved name and we should avoid using that. It seems that
+it was simple typo when pkey_* was implemented.
+
+(cherry picked from commit 388ff7bd0d57d7061fdd39a2f26f65687e8058da)
+---
+ sysdeps/unix/sysv/linux/bits/mman-shared.h | 2 +-
+ 1 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h
+index 7715e68..d15ba95 100644
+--- a/sysdeps/unix/sysv/linux/bits/mman-shared.h
++++ b/sysdeps/unix/sysv/linux/bits/mman-shared.h
+@@ -61,7 +61,7 @@ int pkey_set (int __key, unsigned int __access_rights) __THROW;
+
+ /* Return the access rights for the current thread for KEY, which must
+    have been allocated using pkey_alloc.  */
+-int pkey_get (int _key) __THROW;
++int pkey_get (int __key) __THROW;
+
+ /* Free an allocated protection key, which must have been allocated
+    using pkey_alloc.  */
+--
+2.9.3
diff --git a/source/l/glibc/glibc.revert.to.fix.build.breakages.diff b/source/l/glibc/glibc.revert.to.fix.build.breakages.diff
deleted file mode 100644
index 9c8e93b9..00000000
--- a/source/l/glibc/glibc.revert.to.fix.build.breakages.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./sysdeps/unix/sysv/linux/bits/socket.h.orig	2008-07-27 03:25:30.000000000 -0500
-+++ ./sysdeps/unix/sysv/linux/bits/socket.h	2009-02-24 17:38:52.000000000 -0600
-@@ -26,8 +26,9 @@
- #endif
- 
- #define	__need_size_t
-+#define __need_NULL
- #include <stddef.h>
--
-+#include <limits.h>
- #include <sys/types.h>
- 
- /* Type for length arguments in socket calls.  */
diff --git a/source/l/glibc/is_IS.diff b/source/l/glibc/is_IS.diff
deleted file mode 100644
index 52a99696..00000000
--- a/source/l/glibc/is_IS.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./localedata/locales/is_IS.orig	2007-09-30 17:30:17.000000000 -0500
-+++ ./localedata/locales/is_IS	2006-07-30 17:19:43.000000000 -0500
-@@ -947,6 +947,7 @@
- <UE00D>	IGNORE;IGNORE;IGNORE;<UE00D>
- <UE00E>	IGNORE;IGNORE;IGNORE;<UE00E>
- <UE00F>	IGNORE;IGNORE;IGNORE;<UE00F>
-+<"=>	IGNORE;IGNORE;IGNORE;<"=>
- <UE011>	IGNORE;IGNORE;IGNORE;<UE011>
- <UE012>	IGNORE;IGNORE;IGNORE;<UE012>
- <UE013>	IGNORE;IGNORE;IGNORE;<UE013>
-@@ -955,6 +956,8 @@
- <UE017>	IGNORE;IGNORE;IGNORE;<UE017>
- <UE018>	IGNORE;IGNORE;IGNORE;<UE018>
- <UE019>	IGNORE;IGNORE;IGNORE;<UE019>
-+<Mc>	IGNORE;IGNORE;IGNORE;<Mc>
-+<Fl>	IGNORE;IGNORE;IGNORE;<Fl>
- UNDEFINED	IGNORE;IGNORE;IGNORE
- 
- <U0030>	<U0030>;<U0030>;IGNORE;IGNORE
diff --git a/source/l/glibc/slack-desc.glibc b/source/l/glibc/slack-desc.glibc
index c9c35c2d..0deb19d1 100644
--- a/source/l/glibc/slack-desc.glibc
+++ b/source/l/glibc/slack-desc.glibc
@@ -1,16 +1,16 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
      |-----handy-ruler------------------------------------------------------|
 glibc: glibc (GNU C libraries)
 glibc:
-glibc: This package contains the GNU C libraries and header files.  The GNU
+glibc: This package contains the GNU C libraries and header files. The GNU
 glibc: C library was written originally by Roland McGrath, and is currently
-glibc: maintained by Ulrich Drepper.  Some parts of the library were
+glibc: maintained by Ulrich Drepper. Some parts of the library were
 glibc: contributed or worked on by other people.
 glibc:
 glibc: You'll need this package to compile programs.
diff --git a/source/l/glibc/slack-desc.glibc-debug b/source/l/glibc/slack-desc.glibc-debug
index 79398d0b..8cb64d59 100644
--- a/source/l/glibc/slack-desc.glibc-debug
+++ b/source/l/glibc/slack-desc.glibc-debug
@@ -1,19 +1,19 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
 glibc-debug: glibc-debug (GNU C libraries with debugging symbols)
 glibc-debug:
 glibc-debug: This package contains versions of the GNU C libraries with debugging
-glibc-debug: information.  These are needed only if you wish to be able to step
-glibc-debug: through C library routines while debugging programs.  Most debugging
+glibc-debug: information. These are needed only if you wish to be able to step
+glibc-debug: through C library routines while debugging programs. Most debugging
 glibc-debug: efforts will not require these.
 glibc-debug: To use these libraries, set LD_LIBRARY_PATH when calling the debugger:
-glibc-debug:   LD_LIBRARY_PATH=/usr/lib/debug gdb <executable>
+glibc-debug:  LD_LIBRARY_PATH=/usr/lib/debug gdb <executable>
 glibc-debug:
 glibc-debug: Or, use this approach if you need to debug a setuid binary:
-glibc-debug:   su user -c "LD_LIBRARY_PATH=/usr/lib/debug gdb <executable>"
+glibc-debug:  su user -c "LD_LIBRARY_PATH=/usr/lib/debug gdb <executable>"
diff --git a/source/l/glibc/slack-desc.glibc-i18n b/source/l/glibc/slack-desc.glibc-i18n
index 1a678d98..a697bc3d 100644
--- a/source/l/glibc/slack-desc.glibc-i18n
+++ b/source/l/glibc/slack-desc.glibc-i18n
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
           |-----handy-ruler------------------------------------------------------|
diff --git a/source/l/glibc/slack-desc.glibc-profile b/source/l/glibc/slack-desc.glibc-profile
index 8c873fd9..4b4100e0 100644
--- a/source/l/glibc/slack-desc.glibc-profile
+++ b/source/l/glibc/slack-desc.glibc-profile
@@ -1,15 +1,15 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
              |-----handy-ruler------------------------------------------------------|
 glibc-profile: glibc-profile (GNU C libraries with profiling support)
 glibc-profile:
 glibc-profile: This package contains static versions of the GNU C libraries with 
-glibc-profile: support for profiling binaries using gprof.  gprof calculates how
+glibc-profile: support for profiling binaries using gprof. gprof calculates how
 glibc-profile: much time a program spends in each routine which can suggest where
 glibc-profile: to concentrate efforts to improve performance.
 glibc-profile:
diff --git a/source/l/glibc/slack-desc.glibc-solibs b/source/l/glibc/slack-desc.glibc-solibs
index 807df645..a538452f 100644
--- a/source/l/glibc/slack-desc.glibc-solibs
+++ b/source/l/glibc/slack-desc.glibc-solibs
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
             |-----handy-ruler------------------------------------------------------|
diff --git a/source/l/glibc/slack-desc.glibc-solibs-linuxthreads b/source/l/glibc/slack-desc.glibc-solibs-linuxthreads
index 9efe3bf1..fd91f4c5 100644
--- a/source/l/glibc/slack-desc.glibc-solibs-linuxthreads
+++ b/source/l/glibc/slack-desc.glibc-solibs-linuxthreads
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in.  You must make
-# exactly 11 lines for the formatting to be correct.  It's also customary to
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
 # leave one space after the ':'.
 
                          |-----handy-ruler------------------------------------------------------|
@@ -10,9 +10,10 @@ glibc-solibs-linuxthreads: glibc-solibs-linuxthreads (LinuxThreads shared GNU C
 glibc-solibs-linuxthreads:
 glibc-solibs-linuxthreads: This package contains the shared libraries for glibc that uses
 glibc-solibs-linuxthreads: LinuxThreads, the threading implementation in Linux 2.4.x and
-glibc-solibs-linuxthreads: earlier kernels.  In some cases you'll need to use these libraries
+glibc-solibs-linuxthreads: earlier kernels. In some cases you'll need to use these libraries
 glibc-solibs-linuxthreads: to run old binaries by setting these environment variables:
 glibc-solibs-linuxthreads:   export LD_ASSUME_KERNEL=2.4.33
 glibc-solibs-linuxthreads:   export LD_LIBRARY_PATH=/lib/obsolete/linuxthreads
 glibc-solibs-linuxthreads:   old-program
-glibc-solibs-linuxthreads: Most users should have no need for this package.  Recompile.  :-)
+glibc-solibs-linuxthreads: Most users should have no need for this package. Recompile. :-)
+glibc-solibs-linuxthreads: