summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/iputils/iputils.SlackBuild15
-rw-r--r--source/n/iputils/iputils.docbook.revert.diff121
-rwxr-xr-xsource/n/libmbim/libmbim.SlackBuild48
-rw-r--r--source/n/libmbim/libmbim.url1
4 files changed, 76 insertions, 109 deletions
diff --git a/source/n/iputils/iputils.SlackBuild b/source/n/iputils/iputils.SlackBuild
index 052e7212b..abb888184 100755
--- a/source/n/iputils/iputils.SlackBuild
+++ b/source/n/iputils/iputils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2015, 2018, 2019, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -93,28 +93,22 @@ meson setup \
--sysconfdir=/etc \
--localstatedir=/var \
--buildtype=release \
- -DBUILD_RARPD=true \
.. || exit 1
"${NINJA:=ninja}" $NUMJOBS || exit 1
cd ..
cd meson-build
-strip arping clockdiff ninfod/ninfod ping/ping rarpd rdisc tracepath
+strip arping clockdiff ping/ping tracepath
mkdir -p $PKG/sbin
cat arping > $PKG/sbin/arping
chmod 755 $PKG/sbin/arping
mkdir -p $PKG/usr/sbin
cat clockdiff > $PKG/usr/sbin/clockdiff
chmod 755 $PKG/usr/sbin/clockdiff
-cat ninfod/ninfod > $PKG/usr/sbin/ninfod
-chmod 755 $PKG/usr/sbin/ninfod
mkdir -p $PKG/bin
cat ping/ping > $PKG/bin/ping
chmod 4711 $PKG/bin/ping
( cd $PKG/bin ; ln -sf ping ping6 )
-cat rarpd > $PKG/usr/sbin/rarpd
-cat rdisc > $PKG/usr/sbin/rdisc
-chmod 755 $PKG/usr/sbin/rarpd $PKG/usr/sbin/rdisc
mkdir -p $PKG/usr/bin
cat tracepath > $PKG/usr/bin/tracepath
( cd $PKG/usr/bin ; ln -sf tracepath tracepath6 )
@@ -122,7 +116,7 @@ chmod 755 $PKG/usr/bin/tracepath*
mkdir -p $PKG/usr/man/man8
( cd doc
- for file in arping clockdiff ninfod ping rarpd rdisc tracepath ; do
+ for file in arping clockdiff ping tracepath ; do
cat $file.8 | gzip -9c > $PKG/usr/man/man8/$file.8.gz
done
cd $PKG/usr/man/man8
@@ -133,8 +127,7 @@ mkdir -p $PKG/usr/man/man8
cd ..
mkdir -p $PKG/usr/doc/iputils-$VERSION
cp -a \
- INSTALL* LICENSE* README* RELNOTES* \
- ninfod/COPYING* \
+ CHANGES* INSTALL* LICENSE* README* RELNOTES* \
$PKG/usr/doc/iputils-$VERSION
chmod 644 $PKG/usr/doc/iputils-$VERSION/*
diff --git a/source/n/iputils/iputils.docbook.revert.diff b/source/n/iputils/iputils.docbook.revert.diff
index 8521cc9c6..2c5145578 100644
--- a/source/n/iputils/iputils.docbook.revert.diff
+++ b/source/n/iputils/iputils.docbook.revert.diff
@@ -1,66 +1,26 @@
---- ./doc/rarpd.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/rarpd.xml 2019-07-19 11:58:31.999331384 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.rarpd">
-
- <refentryinfo>
---- ./doc/custom-man.xsl.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/custom-man.xsl 2019-07-19 11:58:31.966331383 -0500
-@@ -5,7 +5,7 @@
- extension-element-prefixes="exsl"
- version="1.0">
-
--<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
-+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
-
- <xsl:template name="top.comment" />
-
---- ./doc/ninfod.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/ninfod.xml 2019-07-19 11:58:31.996331384 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.ninfod">
-
- <refentryinfo>
---- ./doc/rdisc.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/rdisc.xml 2019-07-19 11:58:32.001331384 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.rdisc">
+--- ./doc/custom-html.xsl.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/custom-html.xsl 2022-11-26 14:12:42.892529567 -0600
+@@ -2,7 +2,7 @@
- <refentryinfo>
---- ./doc/clockdiff.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/clockdiff.xml 2019-07-19 11:58:31.962331383 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.clockdiff">
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <refentryinfo>
---- ./doc/arping.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/arping.xml 2019-07-19 11:58:31.960331383 -0500
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+ <!--
+ - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
+ - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
+--- ./doc/arping.xml.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/arping.xml 2022-11-26 14:11:48.538528351 -0600
@@ -1,4 +1,4 @@
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
xml:id="man.arping">
<refentryinfo>
---- ./doc/ping.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/ping.xml 2019-07-19 11:58:31.998331384 -0500
-@@ -1,4 +1,4 @@
--<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
-+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.ping">
-
- <refentryinfo>
---- ./doc/meson.build.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/meson.build 2019-07-19 12:01:49.464337710 -0500
-@@ -38,7 +38,7 @@
- manpages += ['ninfod']
+--- ./doc/meson.build.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/meson.build 2022-11-26 14:14:08.448531481 -0600
+@@ -20,7 +20,7 @@
+ manpages += ['tracepath']
endif
-xsltproc = find_program('xsltproc', required : build_mans or build_html_mans)
@@ -68,7 +28,7 @@
xsltproc_args = [
'--nonet',
'--stringparam', 'man.output.quietly', '1',
-@@ -59,10 +59,6 @@
+@@ -41,10 +41,6 @@
foreach doc_target : doc_targets
xsl = 'http://docbook.sourceforge.net/release/xsl-ns/current/' + doc_target + '/docbook.xsl'
testrun = run_command([xsltproc, '--nonet', xsl])
@@ -79,31 +39,38 @@
endforeach
endif
-@@ -88,7 +84,7 @@
- endforeach
- endif
-
--if build_html_mans
-+if build_html_mans and xsltproc_works
- foreach man : manpages
- custom_target(man + '.html',
- output : man + '.html',
---- ./doc/custom-html.xsl.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/custom-html.xsl 2019-07-19 11:58:31.964331383 -0500
-@@ -2,7 +2,7 @@
+--- ./doc/tracepath.xml.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/tracepath.xml 2022-11-26 14:14:38.116532144 -0600
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.tracepath">
- <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ <refentryinfo>
+--- ./doc/clockdiff.xml.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/clockdiff.xml 2022-11-26 14:11:55.087528497 -0600
+@@ -1,4 +1,4 @@
+-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
++<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
+ xml:id="man.clockdiff">
--<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
-+<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
- <!--
- - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
- - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
---- ./doc/tracepath.xml.orig 2019-07-09 15:55:49.000000000 -0500
-+++ ./doc/tracepath.xml 2019-07-19 11:58:32.003331384 -0500
+ <refentryinfo>
+--- ./doc/ping.xml.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/ping.xml 2022-11-26 14:14:30.108531965 -0600
@@ -1,4 +1,4 @@
-<refentry xmlns="http://docbook.org/ns/docbook" version="5.0"
+<refentry xmlns:db="http://docbook.org/ns/docbook" version="5.0"
- xml:id="man.tracepath">
+ xml:id="man.ping">
<refentryinfo>
+--- ./doc/custom-man.xsl.orig 2022-11-25 17:07:21.000000000 -0600
++++ ./doc/custom-man.xsl 2022-11-26 14:12:56.167529864 -0600
+@@ -5,7 +5,7 @@
+ extension-element-prefixes="exsl"
+ version="1.0">
+
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
++<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/>
+
+ <xsl:template name="top.comment" />
+
diff --git a/source/n/libmbim/libmbim.SlackBuild b/source/n/libmbim/libmbim.SlackBuild
index 5901801db..ffab4e413 100755
--- a/source/n/libmbim/libmbim.SlackBuild
+++ b/source/n/libmbim/libmbim.SlackBuild
@@ -1,6 +1,7 @@
#!/bin/bash
# Copyright 2013 Robby Workman, Northport, Alabama, USA
+# Copyright 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -81,29 +82,34 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
--sysconfdir=/etc \
--localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --disable-gtk-doc \
- --disable-gtk-doc-html \
- --disable-static \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la
-
-# Since this thing won't listen:
-rm -rf $PKG/usr/share/gtk-doc/html
-rmdir $PKG/usr/share/gtk-doc 2> /dev/null
-rmdir $PKG/usr/share 2> /dev/null
+ --buildtype=release \
+ -Dbash_completion=false \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
+
+# bash-completion is not available at build time, so install the file manually:
+mkdir -p $PKG/usr/share/bash-completion/completions
+cp -a src/mbimcli/mbimcli $PKG/usr/share/bash-completion/completions/mbimcli
+chown root:root $PKG/usr/share/bash-completion/completions/mbimcli
+chmod 644 $PKG/usr/share/bash-completion/completions/mbimcli
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
@@ -124,7 +130,7 @@ if [ -d $PKG/usr/man ]; then
fi
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a AUTHORS COPYING* NEWS README* $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a AUTHORS* LICENSES/* COPYING* NEWS* README* $PKG/usr/doc/$PKGNAM-$VERSION
# 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:
diff --git a/source/n/libmbim/libmbim.url b/source/n/libmbim/libmbim.url
new file mode 100644
index 000000000..4069f5ede
--- /dev/null
+++ b/source/n/libmbim/libmbim.url
@@ -0,0 +1 @@
+https://gitlab.freedesktop.org/mobile-broadband/libmbim