summaryrefslogtreecommitdiffstats
path: root/libraries/libslack
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/libslack')
-rw-r--r--libraries/libslack/README12
-rw-r--r--libraries/libslack/libslack.SlackBuild46
-rw-r--r--libraries/libslack/libslack.info12
-rw-r--r--libraries/libslack/notwanted-0.7.3.diff (renamed from libraries/libslack/notwanted.patch)33
4 files changed, 60 insertions, 43 deletions
diff --git a/libraries/libslack/README b/libraries/libslack/README
index ea462496eb..b762807f91 100644
--- a/libraries/libslack/README
+++ b/libraries/libslack/README
@@ -1,5 +1,5 @@
-Libslack is a library of general utilities designed to make
-UNIX/C programming a bit easier on the eye.
+Libslack is a library of general utilities designed to make UNIX/C
+programming a bit easier on the eye.
It's a small library with lots of functionality, accurately
documented and thoroughly tested.
@@ -23,11 +23,11 @@ locker - abstract locking and reader/writer lock implementation
map - map (hash table) data type
mem - memory helper functions, secure memory, memory pools
msg - message handling and syslog helper functions
-net - network functions (clients/servers, expect/send, pack/unpack, mail)
-prog - program framework and flexible command line option handling
+net - network (clients/servers, expect/send, pack/unpack, mail)
+prog - program framework, flexible command line option handling
prop - program properties files
pseudo - pseudo terminals
sig - ISO C compliant signal handling
snprintf - safe sprintf for systems that don't have it
-str - string data type (tr, regex, regsub, fmt, trim, lc, uc, ...)
-vsscanf - sscanf() with va_list argument for systems that don't have it
+str - strings (tr, regex, regsub, fmt, trim, lc, uc, ...)
+vsscanf - sscanf() with va_list for systems that don't have it
diff --git a/libraries/libslack/libslack.SlackBuild b/libraries/libslack/libslack.SlackBuild
index 62943ee552..91721dbf48 100644
--- a/libraries/libslack/libslack.SlackBuild
+++ b/libraries/libslack/libslack.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for libslack
-# Copyright 2012-2017 Christoph Willing, Australia
+# Copyright 2012-2023 Christoph Willing, Australia
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20230703 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install static library without +x permission (this is the standard).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=libslack
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7.5}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -61,7 +71,15 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/$PRGNAM-$VERSION.html.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-html.tar.gz
+cd $PRGNAM-$VERSION-html
+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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+cd ..
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -71,7 +89,7 @@ find -L . \
-exec chmod 644 {} \;
# Strip update, download and uninstall capabilities from libslack-config
-patch -p1 < $CWD/notwanted.patch
+patch -p0 < $CWD/notwanted-0.7.3.diff
# Set our CFLAGS
sed -i "s|-O3|$SLKCFLAGS|" conf/linux Makefile
@@ -82,7 +100,7 @@ make
# "make install" is badly broken (thanks XGizzmo), so manual install
mkdir -p $PKG/usr/bin $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/slack
-install -m 0755 $PRGNAM.a $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION.a
+install -m 0644 $PRGNAM.a $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION.a
( cd $PKG/usr/lib$LIBDIRSUFFIX ; ln -s $PRGNAM-$VERSION.a $PRGNAM.a )
install -m 0644 *.h $PKG/usr/include/slack/
@@ -100,14 +118,16 @@ chmod 0755 $PKG/usr/bin/$PRGNAM-config
# Man pages overwrite stuff (thanks XGizzmo), so we ignore them
# and install only the html documentation
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README LICENSE \
+cp -a COPYING LICENSE README.md REFERENCES \
$PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.html \
+cp -a $TMP/$PRGNAM-$VERSION-html/* \
$PKG/usr/doc/$PRGNAM-$VERSION/html/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+rm -f $PKG/usr/lib*/*.la
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/libraries/libslack/libslack.info b/libraries/libslack/libslack.info
index 1063bbef12..fbbd7eec2d 100644
--- a/libraries/libslack/libslack.info
+++ b/libraries/libslack/libslack.info
@@ -1,10 +1,10 @@
PRGNAM="libslack"
-VERSION="0.6"
-HOMEPAGE="http://libslack.org"
-DOWNLOAD="http://libslack.org/download/libslack-0.6.tar.gz \
- http://libslack.org/download/libslack-0.6.html.tar.gz"
-MD5SUM="0e22e1d38865be2d94372027e5c42b58 \
- 8687e661c8e3cf591bc33231a9aff553"
+VERSION="0.7.5"
+HOMEPAGE="https://libslack.org"
+DOWNLOAD="https://libslack.org/download/libslack-0.7.5.tar.gz \
+ https://libslack.org/download/libslack-0.7.5-html.tar.gz"
+MD5SUM="b9c0fde8dcfffad780841cfdf67ad552 \
+ 4d387927d584a7a0e94312bb0a8db57b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/libraries/libslack/notwanted.patch b/libraries/libslack/notwanted-0.7.3.diff
index b07c391619..7cf4cd6ebb 100644
--- a/libraries/libslack/notwanted.patch
+++ b/libraries/libslack/notwanted-0.7.3.diff
@@ -1,7 +1,6 @@
-diff -Naur libslack-0.6.orig/libslack-config.pod libslack-0.6/libslack-config.pod
---- libslack-0.6.orig/libslack-config.pod 2010-06-12 15:37:00.000000000 +0200
-+++ libslack-0.6/libslack-config.pod 2013-01-02 20:36:02.802707880 +0100
-@@ -32,13 +32,10 @@
+--- libslack-config.pod.orig 2023-03-30 14:30:22.000000000 +1000
++++ libslack-config.pod 2023-06-26 18:40:09.568000000 +1000
+@@ -31,13 +31,10 @@
-h, --help - Print this help and exit
-v, --version - Print the version of the currently installed libslack
-L, --latest - Print the latest version of libslack (uses wget)
@@ -15,19 +14,19 @@ diff -Naur libslack-0.6.orig/libslack-config.pod libslack-0.6/libslack-config.po
Note: The dashes are optional for long option names
-@@ -75,19 +72,6 @@
+@@ -74,19 +71,6 @@
Print the latest version of I<libslack> available at
- C<http://libslack.org/>.
+ C<https://libslack.org>.
-=item C<-D>, C<--download>
-
-Download the latest version of I<libslack> from
--C<http://libslack.org/>.
+-C<https://libslack.org>.
-
-=item C<-U>, C<--upgrade>
-
-Upgrade to the latest version of I<libslack> from
--C<http://libslack.org/>. This downloads the latest
+-C<https://libslack.org>. This downloads the latest
-version, configures it, compiles it, uninstalls the currently installed
-version and then installs the new version wherever the current version
-was installed.
@@ -35,7 +34,7 @@ diff -Naur libslack-0.6.orig/libslack-config.pod libslack-0.6/libslack-config.po
=item C<-p>, C<--prefix>
Print the prefix directory under which I<libslack> was installed.
-@@ -100,10 +84,6 @@
+@@ -99,10 +83,6 @@
Print the linker flags needed to link code against I<libslack>.
@@ -46,10 +45,9 @@ diff -Naur libslack-0.6.orig/libslack-config.pod libslack-0.6/libslack-config.po
=back
=head1 SEE ALSO
-diff -Naur libslack-0.6.orig/libslack-config.t libslack-0.6/libslack-config.t
---- libslack-0.6.orig/libslack-config.t 2010-06-12 15:37:00.000000000 +0200
-+++ libslack-0.6/libslack-config.t 2013-01-02 19:55:45.772706368 +0100
-@@ -45,13 +45,10 @@
+--- libslack-config.t.orig 2023-03-30 14:30:22.000000000 +1000
++++ libslack-config.t 2023-06-26 18:41:34.885000000 +1000
+@@ -46,13 +46,10 @@
-h, --help - Print this help and exit
-v, --version - Print the version of the currently installed libslack
-L, --latest - Print the latest version of libslack (uses wget)
@@ -63,14 +61,14 @@ diff -Naur libslack-0.6.orig/libslack-config.t libslack-0.6/libslack-config.t
Note: the dashes are optional for long option names
-@@ -102,37 +99,6 @@
+@@ -103,36 +100,6 @@
'
}
-download()
-{
- latest="`latest 2>&1`"
-- test "$latest" = "No versions found at ${url}download" && die "$latest"
+- test "$latest" = "No versions found at ${url}/download" && die "$latest"
- file="`echo $latest | sed 's/^.*\///'`"
- test -f "$file" && die "The file $file already exists"
- wget "$latest"
@@ -97,11 +95,10 @@ diff -Naur libslack-0.6.orig/libslack-config.t libslack-0.6/libslack-config.t
-{
-@@UNINSTALL@@
-}
--
+
test $# -eq 0 && usage 1 1>&2
- while test $# -gt 0
-@@ -141,13 +107,10 @@
+@@ -142,13 +109,10 @@
-h|--help|help) usage 0;;
-v|--version|version) echo "$version";;
-L|--latest|latest) latest;;
generated by cgit v1.2.3 (git 2.26.2) at 2024-05-23 14:24:05 +0000