libraries/dietlibc: New maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 22 insertions, 35 deletions

diff --git a/libraries/dietlibc/README b/libraries/dietlibc/README
index d314ab4270..bc684eb286 100644
--- a/libraries/dietlibc/README
+++ b/libraries/dietlibc/README
@@ -1,2 +1,5 @@
-dietlibc is a libc that is optimized for small size.  It can be used to
-create small statically linked binaries for Linux on various platforms.
+dietlibc (a libc optimized for small size)
+
+dietlibc is a libc that is optimized for small size. It can be used
+to create small statically linked binaries for Linux on various
+platforms.
diff --git a/libraries/dietlibc/dietlibc.SlackBuild b/libraries/dietlibc/dietlibc.SlackBuild
index 5ef6721086..9ecae89321 100644
--- a/libraries/dietlibc/dietlibc.SlackBuild
+++ b/libraries/dietlibc/dietlibc.SlackBuild
@@ -23,11 +23,14 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+# 20230709 bkw: BUILD=2
+# - new maintainer.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=dietlibc
 VERSION=${VERSION:-0.34}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -39,9 +42,6 @@ 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -51,19 +51,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
+# 20230709 bkw: no SLKCFLAGS or LIBDIRSUFFIX needed, use upstream's
+# default CFLAGS.
 
 set -e
 
@@ -74,11 +63,8 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 make
 make install DESTDIR=$PKG
@@ -88,17 +74,15 @@ cat $CWD/profile.d/dietlibc.sh > $PKG/etc/profile.d/dietlibc.sh
 cat $CWD/profile.d/dietlibc.csh > $PKG/etc/profile.d/dietlibc.csh
 chmod 0755 $PKG/etc/profile.d/*
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+strip $PKG/opt/diet/bin/*
 
-find $PKG/opt/diet/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/opt/diet/man/*/*
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHOR* BUGS* CAVEAT* CHANGES* COPYING* FAQ* PORTING* README* SECURITY* THANKS* TODO* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cp -a AUTHOR* BUGS* C* FAQ* PORTING* README* SECURITY* THANKS* TODO* $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cat $CWD/README.SLACKWARE > $PKGDOC/README.SLACKWARE
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/libraries/dietlibc/dietlibc.info b/libraries/dietlibc/dietlibc.info
index 50928648e5..fa3f2e1c16 100644
--- a/libraries/dietlibc/dietlibc.info
+++ b/libraries/dietlibc/dietlibc.info
@@ -6,5 +6,5 @@ MD5SUM="4f04a6f642548cc5be716a6e0de6b631"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Markus Reichelt"
-EMAIL="slackbuilds@mareichelt.de"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"