sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (42bb00e8d9b4c820dd2bf740cebe9d1c36a14b7e)

From: Ismael Luceno <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (42bb00e8d9b4c820dd2bf740cebe9d1c36a14b7e)
Date: Mon, 27 May 2019 18:26:18 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

audio-drivers/sndio/HISTORY
| 3
audio-drivers/sndio/INSTALL
| 4
audio-libs/faad2/HISTORY
| 3
audio-libs/faad2/PRE_BUILD
| 8
crypto/cryptopp/HISTORY
| 3
crypto/cryptopp/INSTALL
| 4
devel/libgc/DETAILS
| 4
devel/libgc/HISTORY
| 3
disk/libatasmart/HISTORY
| 3
disk/libatasmart/PRE_BUILD
| 3
gnome2-libs/rarian/HISTORY
| 3
gnome2-libs/rarian/PRE_BUILD
| 3
java/fastjar/HISTORY
| 3
java/fastjar/PRE_BUILD
| 3
libs/ffcall/DETAILS
| 10
libs/ffcall/HISTORY
| 4
libs/muparser/BUILD
| 4
libs/muparser/DEPENDS
| 1
libs/muparser/DETAILS
| 11
libs/muparser/HISTORY
| 4
net/iptables/HISTORY
| 7
net/iptables/PRE_BUILD
| 18

net/iptables/patches/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
| 44 +

net/iptables/patches/0003-include-fix-build-with-kernel-headers-before-4.2.patch
| 50 ++
net/iptables/patches/0004-xtables-monitor-fix-build-with-musl-libc.patch
| 43 +
net/libnftnl/HISTORY
| 4
net/libnftnl/PRE_BUILD
| 3
net/openbsd-inetd/BUILD
| 6
net/openbsd-inetd/DEPENDS
| 1
net/openbsd-inetd/DETAILS
| 4
net/openbsd-inetd/HISTORY
| 4
net/openbsd-inetd/patches/0000-portability.patch
| 239 ++++++++++
net/openbsd-inetd/patches/portability.patch
| 233 ---------
net/sslh/DETAILS
| 2
net/sslh/HISTORY
| 4
printer/enscript/HISTORY
| 3
printer/enscript/PRE_BUILD
| 3
shell-term-fm/tcsh/DETAILS
| 4
shell-term-fm/tcsh/HISTORY
| 3
telephony/libosip2/DETAILS
| 2
telephony/libosip2/HISTORY
| 3
41 files changed, 482 insertions(+), 282 deletions(-)

New commits:
commit 42bb00e8d9b4c820dd2bf740cebe9d1c36a14b7e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tcsh 6.21.00

commit a0469409bf20e91f2eb393f099e598de3a77d4e9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libatasmart: Fix build against musl

commit 1abfa8e992febccc661f7ab7acdef8b41c28f0a6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iptables: Fix build against musl

commit 8363663f1e404060a2164604da8521020c3ab754
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

iptables: Move patch out of PRE_BUILD

commit 316d8d4556572447ad2096384d6391d64072a9d6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libnftnl: Don't prevent build because of misconfigured kernel

commit a9abe393cc8972a3e24da1a23755db067e245dd8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

sndio: Fix installation when user or run dir exist

commit 0c81a92812757917b32eedd1dcc20631028fbf65
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

openbsd-inetd 0.20160825

commit 84081ba0b9d865f14642537c73ba069f76025358
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

sslh 1.20

commit 7c2c7d4c9d8db0e5aa565642e784abb30a07b336
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

muparser 2.2.6.1

commit d8f08cf3c15987ff6b1de64e7c0e6efc6e83bca6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

faad2: Fix build against musl

commit cd395a3a4f03f1d979fa747c7c1bcedfb8068fd9
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libgc 8.0.4

commit ead5b409b11fd209f74d22b85a9138a6b35c42d1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ffcall 2.1

commit 9ddb255e38277d03690a4fd740be4349a26a9b54
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

fastjar: Fix build against musl

commit 8d83d364a3b9ec9cb691cb5db708daa461fe6540
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

cryptopp: Fix installation on non-glibc systems

commit b2b3900ce46855ce5f5e0e30fdb18d81f94cd63a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

rarian: Fix build against musl

commit bd1d70f3afbe54ca9cdcafdc14ff8f6901e4a31a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libosip 5.1.0

commit 4a0e0829fe9c053f33426cf7bb92d615ee0c43eb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

enscript: Fix build against musl

diff --git a/audio-drivers/sndio/HISTORY b/audio-drivers/sndio/HISTORY
index 7dc5716..2e4f1b9 100644
--- a/audio-drivers/sndio/HISTORY
+++ b/audio-drivers/sndio/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL: Fixed installation when the user and run dir exist
+
2019-05-27 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.5.0

diff --git a/audio-drivers/sndio/INSTALL b/audio-drivers/sndio/INSTALL
index 835eed7..e610c5a 100755
--- a/audio-drivers/sndio/INSTALL
+++ b/audio-drivers/sndio/INSTALL
@@ -1,5 +1,5 @@
default_install &&
-mkdir /var/run/sndiod &&
-if ! exists_account sndiod; then
+mkdir -p /var/run/sndiod &&
+if ! grep -q "^sndiod:" "$INSTALL_ROOT"/etc/passwd; then
useradd -r -g audio -s /sbin/nologin -d /var/run/sndiod sndiod
fi
diff --git a/audio-libs/faad2/HISTORY b/audio-libs/faad2/HISTORY
index e89bf9e..80bda2f 100644
--- a/audio-libs/faad2/HISTORY
+++ b/audio-libs/faad2/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2019-01-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.8.0
* PRE_BUILD: clean
diff --git a/audio-libs/faad2/PRE_BUILD b/audio-libs/faad2/PRE_BUILD
index 0e93d06..e7a30bc 100755
--- a/audio-libs/faad2/PRE_BUILD
+++ b/audio-libs/faad2/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-#sedit 's/^AC_PROG_CPP$/AC_PROG_CXX/' configure.in &&
-#sedit 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in &&
-/bin/sh ./bootstrap
+# Bundled getopt is broken, and so is main.c, so let's avoid it and use the
+# system version whatever it is.
+sedit '/^AC_OUTPUT/iAC_DEFINE([HAVE_GETOPT_H], 1, [Use getopt from system])'
\
+ configure.ac &&
+autoreconf -i
diff --git a/crypto/cryptopp/HISTORY b/crypto/cryptopp/HISTORY
index c6c1b75..94e9979 100644
--- a/crypto/cryptopp/HISTORY
+++ b/crypto/cryptopp/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * INSTALL: Fixed installation on non-glibc systems
+
2019-05-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 8.2.0

diff --git a/crypto/cryptopp/INSTALL b/crypto/cryptopp/INSTALL
index 7e5b780..7acd0b4 100755
--- a/crypto/cryptopp/INSTALL
+++ b/crypto/cryptopp/INSTALL
@@ -1,2 +1,6 @@
+case "$HOST" in
+*-gnu) ;;
+*) export LDCONF=true ;;
+esac
make PREFIX=$INSTALL_ROOT/usr install &&
sed "s:%%VERSION%%:${VERSION}:" "${SPELL_DIRECTORY}/files/libcrypto++.pc.in"
> "${INSTALL_ROOT}/usr/lib/pkgconfig/libcrypto++.pc"
diff --git a/devel/libgc/DETAILS b/devel/libgc/DETAILS
index 7a31a67..dc7de20 100755
--- a/devel/libgc/DETAILS
+++ b/devel/libgc/DETAILS
@@ -1,6 +1,6 @@
SPELL=libgc
- VERSION=7.6.0
-
SOURCE_HASH=sha512:511e8c01287b1ee9dbec87f0573377de77038b7af053a3f33afed9b3ffa30e2402d6a9bb0ca4f4b81cd808209b47b5718d498cff3de6632a057fe03fad51fc43
+ VERSION=8.0.4
+
SOURCE_HASH=sha512:57ccca15c6e50048d306a30de06c1a844f36103a84c2d1c17cbccbbc0001e17915488baec79737449982da99ce5d14ce527176afae9ae153cbbb5a19d986366e
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
SOURCE=${SPELL/\lib/}-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL/\lib/}-$VERSION
diff --git a/devel/libgc/HISTORY b/devel/libgc/HISTORY
index 8609460..8d73b60 100644
--- a/devel/libgc/HISTORY
+++ b/devel/libgc/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 8.0.4
+
2017-06-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 7.6.0
* DEPENDS: remove optional dependency on gcc with JAVA
diff --git a/disk/libatasmart/HISTORY b/disk/libatasmart/HISTORY
index 88fd77a..e2da07f 100644
--- a/disk/libatasmart/HISTORY
+++ b/disk/libatasmart/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2015-02-11 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: UDEV -> DEVICE-MANAGER, changed mode to 755

diff --git a/disk/libatasmart/PRE_BUILD b/disk/libatasmart/PRE_BUILD
new file mode 100755
index 0000000..c179f78
--- /dev/null
+++ b/disk/libatasmart/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' build-aux/config.sub
diff --git a/gnome2-libs/rarian/HISTORY b/gnome2-libs/rarian/HISTORY
index 33a463e..8a7e4d8 100644
--- a/gnome2-libs/rarian/HISTORY
+++ b/gnome2-libs/rarian/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2008-09-28 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.8.1

diff --git a/gnome2-libs/rarian/PRE_BUILD b/gnome2-libs/rarian/PRE_BUILD
new file mode 100755
index 0000000..3c8cac2
--- /dev/null
+++ b/gnome2-libs/rarian/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/java/fastjar/HISTORY b/java/fastjar/HISTORY
index 56b6ec2..b340707 100644
--- a/java/fastjar/HISTORY
+++ b/java/fastjar/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2016-11-27 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_URL[0]
updated spell to 0.98
diff --git a/java/fastjar/PRE_BUILD b/java/fastjar/PRE_BUILD
new file mode 100755
index 0000000..3c8cac2
--- /dev/null
+++ b/java/fastjar/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/libs/ffcall/DETAILS b/libs/ffcall/DETAILS
index 8d11959..304df45 100755
--- a/libs/ffcall/DETAILS
+++ b/libs/ffcall/DETAILS
@@ -1,10 +1,10 @@
SPELL=ffcall
- VERSION=1.10
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=ftp://ftp.santafe.edu/pub/gnu/$SOURCE
+ VERSION=2.1
+ SOURCE="lib$SPELL-$VERSION.tar.gz"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SOURCE%.tar.gz}"
+ SOURCE_URL[0]=https://ftp.gnu.org/gnu/libffcall/$SOURCE
WEB_SITE=http://www.gnustep.org
-
SOURCE_HASH=sha512:dceb620907adae5bbbb52cf2d0b0c829242ad22adceb3186b7a887b7ba49e28b607c30179de6b5a0c46a90bd52f9963ce503ca0c69bc3ecf41e3556df094ddca
+
SOURCE_HASH=sha512:da73375fb45b7d764c06437a517c2a90abf7d5de6afe0a8ca19e6dfafd2a8c7107e39d230ecbc8edfdd5926b16a0c13b7bb9319287047c47de1241b2f6ae805e
LICENSE[0]=LGPL
ENTERED=20050908
KEYWORDS="libs"
diff --git a/libs/ffcall/HISTORY b/libs/ffcall/HISTORY
index 42fe50e..eb0f64e 100644
--- a/libs/ffcall/HISTORY
+++ b/libs/ffcall/HISTORY
@@ -1,3 +1,7 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: Fixed SOURCE_URL[0]
+ updated spell to 2.1
+
2006-10-03 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed UPDATED.

diff --git a/libs/muparser/BUILD b/libs/muparser/BUILD
index d22e99f..e013b8d 100755
--- a/libs/muparser/BUILD
+++ b/libs/muparser/BUILD
@@ -1,3 +1 @@
-make_single &&
-default_build &&
-make_normal
+cmake_build
diff --git a/libs/muparser/DEPENDS b/libs/muparser/DEPENDS
index fa848c2..98b886e 100755
--- a/libs/muparser/DEPENDS
+++ b/libs/muparser/DEPENDS
@@ -1 +1,2 @@
+depends cmake &&
depends -sub CXX gcc
diff --git a/libs/muparser/DETAILS b/libs/muparser/DETAILS
index af0adca..b94bd51 100755
--- a/libs/muparser/DETAILS
+++ b/libs/muparser/DETAILS
@@ -1,10 +1,9 @@
SPELL=muparser
- VERSION=v2_2_3
-
SOURCE_HASH=sha512:86d140c07161757e2f0de516a4c2922ce5b135d06b01466bc15ad90833bd3e9f99b9b9c528617262597a7a5a6b09bff5ae8ced5d51c413ea611059e0bdb22e6d
- SX="${SPELL}_${VERSION}"
- SOURCE="${SX}.zip"
-
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/$SPELL/$SPELL/Version%20$(echo
${VERSION} | sed -e 's:^v::' -e 's:_:.:g')/$SOURCE
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SX}"
+ VERSION=2.2.6.1
+
SOURCE_HASH=sha512:01bfc8cc48158c8413ae5e1da2ddbac1c9f0b9075470b1ab75853587d641dd195ebea268e1060a340098fd8015bc5f77d8e9cde5f81cffeade2f157c5f295496
+ SOURCE="$SPELL-$VERSION.tar.gz"
+
SOURCE_URL[0]=https://github.com/beltoforion/$SPELL/archive/v$VERSION.tar.gz
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="http://muparser.beltoforion.de";
LICENSE[0]=MIT
ENTERED=20070218
diff --git a/libs/muparser/HISTORY b/libs/muparser/HISTORY
index ab95c86..9539ea4 100644
--- a/libs/muparser/HISTORY
+++ b/libs/muparser/HISTORY
@@ -1,3 +1,7 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DEPENDS, BUILD: Now build with cmake
+ * DETAILS: updated spell to 2.2.6.1
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/net/iptables/HISTORY b/net/iptables/HISTORY
index 31062dc..a83801c 100644
--- a/net/iptables/HISTORY
+++ b/net/iptables/HISTORY
@@ -1,3 +1,10 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * patches/0003-include-fix-build-with-kernel-headers-before-4.2.patch,
+ PRE_BUILD: Move patch out of PRE_BUILD into a file.
+ *
patches/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch,
+ patches/0004-xtables-monitor-fix-build-with-musl-libc.patch:
+ Fixed build against musl
+
2019-01-01 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD: added, fix build with older kernel headers (<4.2)

diff --git a/net/iptables/PRE_BUILD b/net/iptables/PRE_BUILD
index cf75715..c230ad1 100755
--- a/net/iptables/PRE_BUILD
+++ b/net/iptables/PRE_BUILD
@@ -1,19 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-# Avoid conflict with kernel headers before 4.2 .
-# See http://patchwork.ozlabs.org/patch/998781/ .
-patch -p1 << EOT
-diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
-index c3f087ac680c..bacf8cd92116 100644
---- a/include/linux/netfilter.h
-+++ b/include/linux/netfilter.h
-@@ -3,7 +3,9 @@
-
- #include <linux/types.h>
-
-+#ifndef _NETINET_IN_H
- #include <linux/in.h>
-+#endif
- #include <linux/in6.h>
- #include <limits.h>
-EOT
+apply_patch_dir patches
diff --git
a/net/iptables/patches/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch

b/net/iptables/patches/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
new file mode 100644
index 0000000..a19d50c
--- /dev/null
+++
b/net/iptables/patches/0001-ebtables-vlan-fix-userspace-kernel-headers-collision.patch
@@ -0,0 +1,44 @@
+From 51d374ba41ae4f1bb851228c06b030b83dd2092f Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch AT tkos.co.il>
+Date: Tue, 13 Nov 2018 19:22:08 +0200
+Subject: [PATCH] ebtables: vlan: fix userspace/kernel headers collision
+
+Build with musl libc fails because of conflicting struct ethhdr
+definitions:
+
+In file included from .../sysroot/usr/include/net/ethernet.h:10:0,
+ from ../iptables/nft-bridge.h:8,
+ from libebt_vlan.c:18:
+.../sysroot/usr/include/netinet/if_ether.h:107:8: error: redefinition of
‘struct ethhdr’
+ struct ethhdr {
+ ^~~~~~
+In file included from libebt_vlan.c:16:0:
+.../sysroot/usr/include/linux/if_ether.h:160:8: note: originally defined here
+ struct ethhdr {
+ ^~~~~~
+
+Include the userspace header first for the definition suppression logic
+to do the right thing.
+
+Signed-off-by: Baruch Siach <baruch AT tkos.co.il>
+Signed-off-by: Pablo Neira Ayuso <pablo AT netfilter.org>
+---
+Upstream status: commit 51d374ba41ae
+
+ extensions/libebt_vlan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extensions/libebt_vlan.c b/extensions/libebt_vlan.c
+index 4a2eb7126895..be269c6cdb4c 100644
+--- a/extensions/libebt_vlan.c
++++ b/extensions/libebt_vlan.c
+@@ -12,6 +12,7 @@
+ #include <getopt.h>
+ #include <ctype.h>
+ #include <xtables.h>
++#include <netinet/if_ether.h>
+ #include <linux/netfilter_bridge/ebt_vlan.h>
+ #include <linux/if_ether.h>
+ #include "iptables/nft.h"
+--
+2.19.1
diff --git
a/net/iptables/patches/0003-include-fix-build-with-kernel-headers-before-4.2.patch

b/net/iptables/patches/0003-include-fix-build-with-kernel-headers-before-4.2.patch
new file mode 100644
index 0000000..6efe9c8
--- /dev/null
+++
b/net/iptables/patches/0003-include-fix-build-with-kernel-headers-before-4.2.patch
@@ -0,0 +1,50 @@
+From 8d9d7e4b9ef4c6e6abab2cf35c747d7ca36824bd Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch AT tkos.co.il>
+Date: Fri, 16 Nov 2018 09:30:33 +0200
+Subject: [PATCH] include: fix build with kernel headers before 4.2
+
+Commit 672accf1530 (include: update kernel netfilter header files)
+updated linux/netfilter.h and brought with it the update from kernel
+commit a263653ed798 (netfilter: don't pull include/linux/netfilter.h
+from netns headers). This triggers conflict of headers that is fixed in
+kernel commit 279c6c7fa64f (api: fix compatibility of linux/in.h with
+netinet/in.h) included in kernel version 4.2. For earlier kernel headers
+we need a workaround that prevents the headers conflict.
+
+Fixes the following build failure:
+
+In file included from .../sysroot/usr/include/netinet/ip.h:25:0,
+ from ../include/libiptc/ipt_kernel_headers.h:8,
+ from ../include/libiptc/libiptc.h:6,
+ from libip4tc.c:29:
+.../sysroot/usr/include/linux/in.h:26:3: error: redeclaration of enumerator
‘IPPROTO_IP’
+ IPPROTO_IP = 0, /* Dummy protocol for TCP */
+ ^
+.../sysroot/usr/include/netinet/in.h:33:5: note: previous definition of
‘IPPROTO_IP’ was here
+ IPPROTO_IP = 0, /* Dummy protocol for TCP. */
+ ^~~~~~~~~~
+
+Signed-off-by: Baruch Siach <baruch AT tkos.co.il>
+Signed-off-by: Florian Westphal <fw AT strlen.de>
+---
+Upstream status: commit 8d9d7e4b9ef4c6
+
+ include/linux/netfilter.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
+index c3f087ac680c..bacf8cd92116 100644
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -3,7 +3,9 @@
+
+ #include <linux/types.h>
+
++#ifndef _NETINET_IN_H
+ #include <linux/in.h>
++#endif
+ #include <linux/in6.h>
+ #include <limits.h>
+
+--
+2.19.1
diff --git
a/net/iptables/patches/0004-xtables-monitor-fix-build-with-musl-libc.patch
b/net/iptables/patches/0004-xtables-monitor-fix-build-with-musl-libc.patch
new file mode 100644
index 0000000..6423989
--- /dev/null
+++ b/net/iptables/patches/0004-xtables-monitor-fix-build-with-musl-libc.patch
@@ -0,0 +1,43 @@
+From 90b0d3abfc0b4150b198eb17080d75acc5838a59 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch AT tkos.co.il>
+Date: Sat, 17 Nov 2018 22:20:08 +0200
+Subject: [PATCH] xtables-monitor: fix build with musl libc
+
+Commit 7c8791edac3 ("xtables-monitor: fix build with older glibc")
+changed the code to use GNU style tcphdr fields. Unfortunately, musl
+libc requires _GNU_SOURCE definition to expose these fields.
+
+Fix the following build failure:
+
+xtables-monitor.c: In function ‘trace_print_packet’:
+xtables-monitor.c:406:43: error: ‘const struct tcphdr’ has no member named
‘source’
+ printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest));
+ ^~
+xtables-monitor.c:406:64: error: ‘const struct tcphdr’ has no member named
‘dest’
+ printf("SPORT=%d DPORT=%d ", ntohs(tcph->source), ntohs(tcph->dest));
+ ^~
+...
+
+Cc: Florian Westphal <fw AT strlen.de>
+Signed-off-by: Baruch Siach <baruch AT tkos.co.il>
+Signed-off-by: Florian Westphal <fw AT strlen.de>
+---
+Upstream status: commit 90b0d3abfc0b
+
+ iptables/xtables-monitor.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/iptables/xtables-monitor.c b/iptables/xtables-monitor.c
+index 5d1611122df5..f835c5e503e0 100644
+--- a/iptables/xtables-monitor.c
++++ b/iptables/xtables-monitor.c
+@@ -9,6 +9,7 @@
+ * This software has been sponsored by Sophos Astaro <http://www.sophos.com>
+ */
+
++#define _GNU_SOURCE
+ #include <stdlib.h>
+ #include <time.h>
+ #include <string.h>
+--
+2.19.1
diff --git a/net/libnftnl/HISTORY b/net/libnftnl/HISTORY
index 85c14e4..d5581bf 100644
--- a/net/libnftnl/HISTORY
+++ b/net/libnftnl/HISTORY
@@ -1,6 +1,8 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Don't prevent build because of misconfigured kernel
+
2018-11-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.2

2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
* Created
-
diff --git a/net/libnftnl/PRE_BUILD b/net/libnftnl/PRE_BUILD
index 139bcd8..28c9f9c 100755
--- a/net/libnftnl/PRE_BUILD
+++ b/net/libnftnl/PRE_BUILD
@@ -1,8 +1,7 @@
if [[ "$(get_kernel_config CONFIG_NF_TABLES)" != "y" &&
"$(get_kernel_config CONFIG_NF_TABLES)" != "m" ]]; then
message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
- "CONFIG_NF_TABLES module/built-in${DEFAULT_COLOR}" &&
- return 1
+ "CONFIG_NF_TABLES module/built-in${DEFAULT_COLOR}"
fi &&

default_pre_build
diff --git a/net/openbsd-inetd/BUILD b/net/openbsd-inetd/BUILD
index 66fd05f..8e786de 100755
--- a/net/openbsd-inetd/BUILD
+++ b/net/openbsd-inetd/BUILD
@@ -1,3 +1,5 @@
+CFLAGS+=" -isystem \"$INSTALL_ROOT\"/usr/include/bsd -DLIBBSD_OVERLAY" &&
+CFLAGS+=" -isystem \"$INSTALL_ROOT\"/usr/include/tirpc" &&
bmake \
- CFLAGS="$CFLAGS -isystem $INSTALL_ROOT/usr/include/bsd -DLIBBSD_OVERLAY"
\
- LDFLAGS="${LDFLAGS//-Wl,--as-needed} -lbsd"
+ CFLAGS="$CFLAGS" \
+ LDFLAGS="${LDFLAGS//-Wl,--as-needed} -lbsd -ltirpc"
diff --git a/net/openbsd-inetd/DEPENDS b/net/openbsd-inetd/DEPENDS
index ed94dab..df8c202 100755
--- a/net/openbsd-inetd/DEPENDS
+++ b/net/openbsd-inetd/DEPENDS
@@ -1,2 +1,3 @@
depends libbsd &&
+depends libtirpc &&
depends bmake
diff --git a/net/openbsd-inetd/DETAILS b/net/openbsd-inetd/DETAILS
index cb3be05..b22a0cd 100755
--- a/net/openbsd-inetd/DETAILS
+++ b/net/openbsd-inetd/DETAILS
@@ -1,8 +1,8 @@
SPELL=openbsd-inetd
- VERSION=0.20140418
+ VERSION=0.20160825
SOURCE="${SPELL}_$VERSION.orig.tar.xz"
SOURCE_URL[0]=http://ftp.de.debian.org/debian/pool/main/o/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:5000b18bc36879d99cc15e7e72aa6c4156a53c86350b6a5f0fb6658bd9479b448885af8d5cf6e7393113e5f33d238f6567d56a23652adc09b97137b3e4934c62
+
SOURCE_HASH=sha512:406d711be2d8fd0caf9eb0357b6eb862bc8c398317d82fb6b9533d0965daa360c55139de8c69a2ff12c21b741e69ed160867d922840e8f5a07115c24c13f7d52
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE="https://packages.debian.org/sid/openbsd-inetd";
LICENSE[0]="ISC"
diff --git a/net/openbsd-inetd/HISTORY b/net/openbsd-inetd/HISTORY
index 6b4d139..0df7410 100644
--- a/net/openbsd-inetd/HISTORY
+++ b/net/openbsd-inetd/HISTORY
@@ -1,3 +1,7 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DETAILS, patches/0000-portability.patch:
+ updated spell to 0.20160825
+
2016-08-14 Ismael Luceno <ismael AT sourcemage.org>
* PRE_BUILD: Use apply_patch_dir

diff --git a/net/openbsd-inetd/patches/0000-portability.patch
b/net/openbsd-inetd/patches/0000-portability.patch
new file mode 100644
index 0000000..3522c62
--- /dev/null
+++ b/net/openbsd-inetd/patches/0000-portability.patch
@@ -0,0 +1,239 @@
+Author: Marco d'Itri
+
+Portability patch. Taken from Debian.
+
+--- a/inetd.8
++++ b/inetd.8
+@@ -42,11 +42,7 @@
+ .Op Ar configuration_file
+ .Sh DESCRIPTION
+ .Nm inetd
+-should be run at boot time by
+-.Pa /etc/rc
+-(see
+-.Xr rc 8 ) .
+-It then listens for connections on certain internet sockets.
++listens for connections on certain internet sockets.
+ When a connection is found on one
+ of its sockets, it decides what service the socket
+ corresponds to, and invokes a program to service the request.
+@@ -149,7 +145,8 @@ The
+ .Em service name
+ entry is the name of a valid service in
+ the file
+-.Pa /etc/services .
++.Pa /etc/services
++or a port number.
+ For
+ .Dq internal
+ services (discussed below), the service
+@@ -166,7 +163,7 @@ The part on the right of the
+ is the RPC version number.
+ This can simply be a single numeric argument or a range of versions.
+ A range is bounded by the low version to the high version -
+-.Dq rusers/1-3 .
++.Dq rusers/1\-3 .
+ For
+ .Ux Ns -domain
+ sockets this field specifies the path name of the socket.
+@@ -186,7 +183,8 @@ reliably delivered message, or sequenced
+ The
+ .Em protocol
+ must be a valid protocol as given in
+-.Pa /etc/protocols .
++.Pa /etc/protocols or
++.Dq unix .
+ Examples might be
+ .Dq tcp
+ or
+@@ -364,9 +362,7 @@ If you have only one server on
+ only IPv6 traffic will be routed to the server.
+ .El
+ .Sh SEE ALSO
+-.Xr comsat 8 ,
+ .Xr fingerd 8 ,
+-.Xr ftp-proxy 8 ,
+ .Xr ftpd 8 ,
+ .Xr identd 8 ,
+ .Xr talkd 8
+@@ -379,7 +375,23 @@ Support for Sun-RPC
+ based services is modelled after that
+ provided by SunOS 4.1.
+ IPv6 support was added by the KAME project in 1999.
++.Pp
++Marco d'Itri ported this code from OpenBSD in summer 2002 and added
++socket buffers tuning and libwrap support from the NetBSD source tree.
+ .Sh BUGS
++On Linux systems, the daemon cannot reload its configuration and needs
++to be restarted when the host address for a service is changed between
++.Dq \&*
++and a specific address.
++.Pp
++Server programs used with
++.Dq dgram
++.Dq udp
++.Dq nowait
++must read from the network socket, or
++.Nm inetd
++will spawn processes until the maximum is reached.
++.Pp
+ Host address specifiers, while they make conceptual sense for RPC
+ services, do not work entirely correctly.
+ This is largely because the
+--- a/inetd.c
++++ b/inetd.c
+@@ -127,6 +127,7 @@
+ #include <sys/un.h>
+ #include <sys/file.h>
+ #include <sys/wait.h>
++#include <time.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+
+@@ -147,14 +148,21 @@
+ #include <unistd.h>
+ #include <limits.h>
+ #include <string.h>
++#ifdef HAVE_SETUSERCONTEXT
+ #include <login_cap.h>
++#endif
++#ifdef HAVE_GETIFADDRS
+ #include <ifaddrs.h>
++#endif
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_clnt.h>
+-#include <rpcsvc/nfs_prot.h>
+ #include <event.h>
+ #include "pathnames.h"
+
++#ifndef HAVE_PLEDGE
++#define pledge(a, b) (0)
++#endif
++
+ #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
+
+ #define TOOMANY 256 /* don't start more than
TOOMANY */
+@@ -342,8 +350,10 @@ main(int argc, char *argv[])
+ umask(022);
+ if (debug == 0) {
+ daemon(0, 0);
++#ifdef HAVE_SETLOGIN
+ if (uid == 0)
+ (void) setlogin("");
++#endif
+ }
+
+ if (pledge("stdio rpath cpath getpw dns inet unix proc exec id",
NULL) == -1)
+@@ -384,6 +394,15 @@ main(int argc, char *argv[])
+
+ signal(SIGPIPE, SIG_IGN);
+
++ /* space for daemons to overwrite environment for ps */
++ {
++#define DUMMYSIZE 100
++ char dummy[DUMMYSIZE];
++ memset(dummy, 'x', DUMMYSIZE - 1);
++ dummy[DUMMYSIZE - 1] = '\0';
++ setenv("inetd_dummy", dummy, 1);
++ }
++
+ event_dispatch();
+
+ return (0);
+@@ -476,9 +495,6 @@ dg_badinput(struct sockaddr *sa)
+ goto bad;
+ }
+
+- if (port < IPPORT_RESERVED || port == NFS_PORT)
+- goto bad;
+-
+ return (0);
+
+ bad:
+@@ -488,6 +504,7 @@ bad:
+ int
+ dg_broadcast(struct in_addr *in)
+ {
++#ifdef HAVE_GETIFADDRS
+ struct ifaddrs *ifa, *ifap;
+ struct sockaddr_in *sin;
+
+@@ -504,6 +521,7 @@ dg_broadcast(struct in_addr *in)
+ }
+ }
+ freeifaddrs(ifap);
++#endif
+ return (0);
+ }
+
+@@ -1690,7 +1708,7 @@ print_service(char *action, struct servt
+ fprintf(stderr,
+ " wait.max=%d.%d user:group=%s:%s builtin=%lx server=%s\n",
+ sep->se_wait, sep->se_max, sep->se_user,
+- sep->se_group ? sep->se_group : "wheel",
++ sep->se_group ? sep->se_group : "(default)",
+ (long)sep->se_bi, sep->se_server);
+ }
+
+@@ -1799,6 +1817,7 @@ spawn(int ctrl, short events, void *xsep
+ if (uid != pwd->pw_uid)
+ exit(1);
+ } else {
++#ifdef HAVE_SETUSERCONTEXT
+ tmpint = LOGIN_SETALL &
+ ~(LOGIN_SETGROUP|LOGIN_SETLOGIN);
+ if (pwd->pw_uid)
+@@ -1814,6 +1833,53 @@ spawn(int ctrl, short events, void *xsep
+ sep->se_service, sep->se_proto);
+ exit(1);
+ }
++#else
++ /* what about setpriority(2), setrlimit(2),
++ * and umask(2)? The $PATH is cleared.
++ */
++ if (pwd->pw_uid) {
++ if (sep->se_group)
++ pwd->pw_gid = grp->gr_gid;
++ if (setgid(pwd->pw_gid) < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't set gid %d: %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_gid);
++ exit(1);
++ }
++ if (initgroups(pwd->pw_name, pwd->pw_gid)
++ < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't initgroups(%s): %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_name);
++ exit(1);
++ }
++ if (setuid(pwd->pw_uid) < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't set uid %d: %m",
++ sep->se_service,
sep->se_proto,
++ pwd->pw_uid);
++ exit(1);
++ }
++ } else if (sep->se_group) {
++ if (setgid(pwd->pw_gid) < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't set gid %d: %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_gid);
++ exit(1);
++ }
++ if (initgroups(pwd->pw_name, pwd->pw_gid)
++ < 0) {
++ syslog(LOG_ERR,
++ "%s/%s: can't initgroups(%s): %m",
++ sep->se_service, sep->se_proto,
++ pwd->pw_name);
++ exit(1);
++ }
++ }
++#endif
+ }
+ if (debug)
+ fprintf(stderr, "%ld execv %s\n",
diff --git a/net/openbsd-inetd/patches/portability.patch
b/net/openbsd-inetd/patches/portability.patch
deleted file mode 100644
index c354bafa..0000000
--- a/net/openbsd-inetd/patches/portability.patch
+++ /dev/null
@@ -1,233 +0,0 @@
-Author: Marco d'Itri
-
-Portability patch. Taken from Debian, includes a few modifications by me
-(Ismael Luceno).
-
---- a/inetd.8
-+++ b/inetd.8
-@@ -42,11 +42,7 @@
- .Op Ar configuration_file
- .Sh DESCRIPTION
- .Nm inetd
--should be run at boot time by
--.Pa /etc/rc
--(see
--.Xr rc 8 ) .
--It then listens for connections on certain internet sockets.
-+listens for connections on certain internet sockets.
- When a connection is found on one
- of its sockets, it decides what service the socket
- corresponds to, and invokes a program to service the request.
-@@ -149,7 +145,8 @@ The
- .Em service name
- entry is the name of a valid service in
- the file
--.Pa /etc/services .
-+.Pa /etc/services
-+or a port number.
- For
- .Dq internal
- services (discussed below), the service
-@@ -166,7 +163,7 @@ The part on the right of the
- is the RPC version number.
- This can simply be a single numeric argument or a range of versions.
- A range is bounded by the low version to the high version -
--.Dq rusers/1-3 .
-+.Dq rusers/1\-3 .
- For
- .Ux Ns -domain
- sockets this field specifies the path name of the socket.
-@@ -186,7 +183,8 @@ reliably delivered message, or sequenced
- The
- .Em protocol
- must be a valid protocol as given in
--.Pa /etc/protocols .
-+.Pa /etc/protocols or
-+.Dq unix .
- Examples might be
- .Dq tcp
- or
-@@ -368,9 +366,7 @@ If you have only one server on
- only IPv6 traffic will be routed to the server.
- .El
- .Sh SEE ALSO
--.Xr comsat 8 ,
- .Xr fingerd 8 ,
--.Xr ftp-proxy 8 ,
- .Xr ftpd 8 ,
- .Xr identd 8 ,
- .Xr talkd 8
-@@ -383,7 +379,23 @@ Support for Sun-RPC
- based services is modelled after that
- provided by SunOS 4.1.
- IPv6 support was added by the KAME project in 1999.
-+.Pp
-+Marco d'Itri ported this code from OpenBSD in summer 2002 and added
-+socket buffers tuning and libwrap support from the NetBSD source tree.
- .Sh BUGS
-+On Linux systems, the daemon cannot reload its configuration and needs
-+to be restarted when the host address for a service is changed between
-+.Dq \&*
-+and a specific address.
-+.Pp
-+Server programs used with
-+.Dq dgram
-+.Dq udp
-+.Dq nowait
-+must read from the network socket, or
-+.Nm inetd
-+will spawn processes until the maximum is reached.
-+.Pp
- Host address specifiers, while they make conceptual sense for RPC
- services, do not work entirely correctly.
- This is largely because the
---- a/inetd.c
-+++ b/inetd.c
-@@ -128,6 +128,7 @@
- #include <sys/un.h>
- #include <sys/file.h>
- #include <sys/wait.h>
-+#include <time.h>
- #include <sys/time.h>
- #include <sys/resource.h>
-
-@@ -146,11 +147,12 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <string.h>
-+#ifdef HAVE_SETUSERCONTEXT
- #include <login_cap.h>
-+#endif
- #include <ifaddrs.h>
- #include <rpc/rpc.h>
- #include <rpc/pmap_clnt.h>
--#include <rpcsvc/nfs_prot.h>
- #include "pathnames.h"
-
- #define TOOMANY 256 /* don't start more than
TOOMANY */
-@@ -324,14 +328,11 @@ main(int argc, char *argv[])
- fd_set *fdsrp = NULL;
- int readablen = 0, ch;
- struct servtab *sep;
-- extern char *optarg;
-- extern int optind;
-
- while ((ch = getopt(argc, argv, "dR:")) != -1)
- switch (ch) {
- case 'd':
- debug = 1;
-- options |= SO_DEBUG;
- break;
- case 'R': { /* invocation rate */
- char *p;
-@@ -373,9 +374,13 @@ main(int argc, char *argv[])
- umask(022);
- if (debug == 0) {
- daemon(0, 0);
-+#ifdef HAVE_SETLOGIN
- if (uid == 0)
- (void) setlogin("");
-+#endif
- }
-+ if (debug && uid == 0)
-+ options |= SO_DEBUG;
-
- if (uid == 0) {
- gid_t gid = getgid();
-@@ -420,6 +425,15 @@ main(int argc, char *argv[])
- sa.sa_handler = SIG_IGN;
- sigaction(SIGPIPE, &sa, &sapipe);
-
-+ /* space for daemons to overwrite environment for ps */
-+ {
-+#define DUMMYSIZE 100
-+ char dummy[DUMMYSIZE];
-+ memset(dummy, 'x', DUMMYSIZE - 1);
-+ dummy[DUMMYSIZE - 1] = '\0';
-+ setenv("inetd_dummy", dummy, 1);
-+ }
-+
- for (;;) {
- int n, ctrl = -1;
-
-@@ -576,9 +590,6 @@ dg_badinput(struct sockaddr *sa)
- goto bad;
- }
-
-- if (port < IPPORT_RESERVED || port == NFS_PORT)
-- goto bad;
--
- return (0);
-
- bad:
-@@ -1852,7 +1865,7 @@ print_service(char *action, struct servt
- fprintf(stderr,
- " wait.max=%d.%d user:group=%s:%s builtin=%lx server=%s\n",
- sep->se_wait, sep->se_max, sep->se_user,
-- sep->se_group ? sep->se_group : "wheel",
-+ sep->se_group ? sep->se_group : "(default)",
- (long)sep->se_bi, sep->se_server);
- }
-
-@@ -1960,6 +1973,7 @@ spawn(struct servtab *sep, int ctrl)
- if (uid != pwd->pw_uid)
- exit(1);
- } else {
-+#ifdef HAVE_SETUSERCONTEXT
- tmpint = LOGIN_SETALL &
- ~(LOGIN_SETGROUP|LOGIN_SETLOGIN);
- if (pwd->pw_uid)
-@@ -1975,6 +1989,53 @@ spawn(struct servtab *sep, int ctrl)
- sep->se_service, sep->se_proto);
- exit(1);
- }
-+#else
-+ /* what about setpriority(2), setrlimit(2),
-+ * and umask(2)? The $PATH is cleared.
-+ */
-+ if (pwd->pw_uid) {
-+ if (sep->se_group)
-+ pwd->pw_gid = grp->gr_gid;
-+ if (setgid(pwd->pw_gid) < 0) {
-+ syslog(LOG_ERR,
-+ "%s/%s: can't set gid %d: %m",
-+ sep->se_service, sep->se_proto,
-+ pwd->pw_gid);
-+ exit(1);
-+ }
-+ if (initgroups(pwd->pw_name, pwd->pw_gid)
-+ < 0) {
-+ syslog(LOG_ERR,
-+ "%s/%s: can't initgroups(%s): %m",
-+ sep->se_service, sep->se_proto,
-+ pwd->pw_name);
-+ exit(1);
-+ }
-+ if (setuid(pwd->pw_uid) < 0) {
-+ syslog(LOG_ERR,
-+ "%s/%s: can't set uid %d: %m",
-+ sep->se_service,
sep->se_proto,
-+ pwd->pw_uid);
-+ exit(1);
-+ }
-+ } else if (sep->se_group) {
-+ if (setgid(pwd->pw_gid) < 0) {
-+ syslog(LOG_ERR,
-+ "%s/%s: can't set gid %d: %m",
-+ sep->se_service, sep->se_proto,
-+ pwd->pw_gid);
-+ exit(1);
-+ }
-+ if (initgroups(pwd->pw_name, pwd->pw_gid)
-+ < 0) {
-+ syslog(LOG_ERR,
-+ "%s/%s: can't initgroups(%s): %m",
-+ sep->se_service, sep->se_proto,
-+ pwd->pw_name);
-+ exit(1);
-+ }
-+ }
-+#endif
- }
- if (debug)
- fprintf(stderr, "%ld execv %s\n",
diff --git a/net/sslh/DETAILS b/net/sslh/DETAILS
index b889231..e6f4bfb 100755
--- a/net/sslh/DETAILS
+++ b/net/sslh/DETAILS
@@ -1,5 +1,5 @@
SPELL=sslh
- VERSION=1.18
+ VERSION=1.20
SOURCE=${SPELL}-v${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=http://www.rutschle.net/tech/${SPELL}/${SOURCE}
diff --git a/net/sslh/HISTORY b/net/sslh/HISTORY
index af50703..06b6b24 100644
--- a/net/sslh/HISTORY
+++ b/net/sslh/HISTORY
@@ -1,3 +1,7 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 1.20
+ fixed WEB_SITE
+
2017-08-06 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.18; converted to upstream GPG source
verification; added missing docs; updated website, source URL
diff --git a/printer/enscript/HISTORY b/printer/enscript/HISTORY
index 8ce7c65..ee3e442 100644
--- a/printer/enscript/HISTORY
+++ b/printer/enscript/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/printer/enscript/PRE_BUILD b/printer/enscript/PRE_BUILD
new file mode 100755
index 0000000..3c8cac2
--- /dev/null
+++ b/printer/enscript/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/shell-term-fm/tcsh/DETAILS b/shell-term-fm/tcsh/DETAILS
index 4e1f12f..fd4c209 100755
--- a/shell-term-fm/tcsh/DETAILS
+++ b/shell-term-fm/tcsh/DETAILS
@@ -1,10 +1,10 @@
SPELL=tcsh
- VERSION=6.20.00
+ VERSION=6.21.00
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.astron.com/pub/tcsh/$SOURCE
SOURCE_URL[1]=ftp://ftp.funet.fi/pub/unix/shells/tcsh/$SOURCE
-
SOURCE_HASH=sha512:c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9
+
SOURCE_HASH=sha512:d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
LICENSE[0]=BSD
WEB_SITE=http://www.tcsh.org/Home
KEYWORDS="console"
diff --git a/shell-term-fm/tcsh/HISTORY b/shell-term-fm/tcsh/HISTORY
index 1b751d1..ad04dcf 100644
--- a/shell-term-fm/tcsh/HISTORY
+++ b/shell-term-fm/tcsh/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 6.21.00
+
2017-01-18 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: version 6.20.00

diff --git a/telephony/libosip2/DETAILS b/telephony/libosip2/DETAILS
index 0308d1c..87cbf04 100755
--- a/telephony/libosip2/DETAILS
+++ b/telephony/libosip2/DETAILS
@@ -1,5 +1,5 @@
SPELL=libosip2
- VERSION=4.1.0
+ VERSION=5.1.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNU_URL/osip/$SOURCE
diff --git a/telephony/libosip2/HISTORY b/telephony/libosip2/HISTORY
index c09848c..f334a94 100644
--- a/telephony/libosip2/HISTORY
+++ b/telephony/libosip2/HISTORY
@@ -1,3 +1,6 @@
+2019-05-27 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 5.1.0
+
2016-03-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.1.0

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (42bb00e8d9b4c820dd2bf740cebe9d1c36a14b7e), Ismael Luceno, 05/27/2019