summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--INSTALL2
-rwxr-xr-xconfigure27
-rw-r--r--doc/index.html4
-rw-r--r--doc/skadns/skadnsd.html2
-rw-r--r--doc/upgrade.html6
-rw-r--r--package/deps.mak6
-rw-r--r--package/info2
-rw-r--r--src/clients/deps-exe/s6-dnsip4-filter1
-rw-r--r--src/clients/deps-exe/s6-dnsip6-filter1
-rw-r--r--src/clients/deps-exe/s6-dnsname-filter1
10 files changed, 30 insertions, 22 deletions
diff --git a/INSTALL b/INSTALL
index 0d100cf..98b83d1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
- A POSIX-compliant C development environment
- GNU make version 3.81 or later
- - skalibs version 2.3.10.0 or later: http://skarnet.org/software/skalibs/
+ - skalibs version 2.4.0.0 or later: http://skarnet.org/software/skalibs/
This software will run on any operating system that implements
POSIX.1-2008, available at:
diff --git a/configure b/configure
index e8b14ad..32f7ab2 100755
--- a/configure
+++ b/configure
@@ -18,12 +18,12 @@ Installation directories:
Fine tuning of the installation directories:
--dynlibdir=DIR shared library files [PREFIX/lib]
- --bindir=DIR user executables [EPREFIX/bin]
+ --bindir=BINDIR user executables [EPREFIX/bin]
--sbindir=DIR admin executables [EPREFIX/sbin]
--libexecdir=DIR package-scoped executables [EPREFIX/libexec]
--libdir=DIR static library files [PREFIX/lib/$package]
--includedir=DIR C header files [PREFIX/include]
- --datadir=DIR global configuration files [PREFIX/etc]
+ --shebangdir=DIR absolute path for #! invocations [BINDIR]
If no --prefix option is given, by default libdir (but not dynlibdir) will be
/usr/lib/$package, and includedir will be /usr/include.
@@ -121,7 +121,7 @@ tryldflag () {
CC_AUTO=
CFLAGS_AUTO="$CFLAGS"
-CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 -fsigned-char $CPPFLAGS"
+CPPFLAGS_AUTO="-D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -O2 $CPPFLAGS"
LDFLAGS_AUTO="$LDFLAGS"
LDFLAGS_SHARED=-shared
LDFLAGS_NOSHARED=
@@ -133,7 +133,7 @@ bindir='$exec_prefix/bin'
sbindir='$exec_prefix/sbin'
libdir='$prefix/lib/$package'
includedir='$prefix/include'
-datadir='$prefix/etc'
+shebangdir='$bindir'
sysdeps='$prefix/lib/skalibs/sysdeps'
manualsysdeps=false
shared=false
@@ -162,7 +162,7 @@ for arg ; do
--sbindir=*) sbindir=${arg#*=} ;;
--libdir=*) libdir=${arg#*=} ;;
--includedir=*) includedir=${arg#*=} ;;
- --datadir=*) datadir=${arg#*=} ;;
+ --shebangdir=*) shebangdir=${arg#*=} ;;
--with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;;
--with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ;;
--with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; vpaths="$vpaths $var" ;;
@@ -202,7 +202,7 @@ fi
# Expand installation directories
stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir datadir sysdeps sproot ; do
+for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir shebangdir sysdeps sproot ; do
eval tmp=\${$i}
eval $i=$tmp
stripdir $i
@@ -289,7 +289,7 @@ if [ "x$target" != "x$(cat $sysdeps/target)" ] ; then
exit 1
fi
-rt_lib=$(cat $sysdeps/rt.lib)
+spawn_lib=$(cat $sysdeps/spawn.lib)
socket_lib=$(cat $sysdeps/socket.lib)
sysclock_lib=$(cat $sysdeps/sysclock.lib)
tainnow_lib=$(cat $sysdeps/tainnow.lib)
@@ -312,6 +312,8 @@ tryflag CFLAGS_AUTO -fdata-sections
tryldflag LDFLAGS_AUTO -Wl,--sort-section=alignment
tryldflag LDFLAGS_AUTO -Wl,--sort-common
+CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}"
+
if $evenmorestatic ; then
LDFLAGS_NOSHARED=-static
fi
@@ -337,12 +339,9 @@ if test -z "$vpaths" ; then
done < package/deps-build
fi
-CPPFLAGS_AUTO="$CPPFLAGS_AUTO $addincpath"
-
echo "creating config.mak..."
cmdline=$(quote "$0")
for i ; do cmdline="$cmdline $(quote "$i")" ; done
-ccbase=${CC_AUTO##${cross}}
exec 3>&1 1>config.mak
cat << EOF
# This file was generated by:
@@ -359,20 +358,19 @@ bindir := $bindir
sbindir := $sbindir
libdir := $libdir
includedir := $includedir
-datadir := $datadir
sysdeps := $sysdeps
slashpackage := $slashpackage
sproot := $sproot
version := $version
home := $home
exthome := $exthome
-RT_LIB := ${rt_lib}
+SPAWN_LIB := ${spawn_lib}
SOCKET_LIB := ${socket_lib}
SYSCLOCK_LIB := ${sysclock_lib}
TAINNOW_LIB := ${tainnow_lib}
UTIL_LIB := ${util_lib}
-CC := $ccbase
+CC := ${CC_AUTO##${cross}}
CFLAGS := $CFLAGS_AUTO
CPPFLAGS := $CPPFLAGS_AUTO
LDFLAGS := $LDFLAGS_AUTO
@@ -415,16 +413,17 @@ cat <<EOF
#define ${package_macro_name}_CONFIG_H
#define ${package_macro_name}_VERSION "$version"
-#define ${package_macro_name}_ETC "$datadir"
EOF
if $slashpackage ; then
echo "#define ${package_macro_name}_BINPREFIX \"$binprefix/\""
echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\""
echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix/\""
+ echo "#define ${package_macro_name}_SHEBANGPREFIX \"$extbinprefix/\""
else
echo "#define ${package_macro_name}_BINPREFIX \"\""
echo "#define ${package_macro_name}_EXTBINPREFIX \"\""
echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\""
+ echo "#define ${package_macro_name}_SHEBANGPREFIX \"$shebangdir/\""
fi
echo
echo "#endif"
diff --git a/doc/index.html b/doc/index.html
index ed7f4ee..df24185 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -46,7 +46,7 @@ point in the future.
<li> A POSIX-compliant system with a standard C development environment </li>
<li> GNU make, version 3.81 or later </li>
<li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.10.0 or later </li>
+2.4.0.0 or later </li>
</ul>
<h3> Licensing </h3>
@@ -59,7 +59,7 @@ point in the future.
<h3> Download </h3>
<ul>
- <li> The current released version of s6-dns is <a href="s6-dns-2.0.1.0.tar.gz">2.0.1.0</a>. </li>
+ <li> The current released version of s6-dns is <a href="s6-dns-2.1.0.0.tar.gz">2.1.0.0</a>. </li>
<li> Alternatively, you can checkout a copy of the
<a href="http://git.skarnet.org/cgi-bin/cgit.cgi/s6-dns/">s6-dns
git repository</a>:
diff --git a/doc/skadns/skadnsd.html b/doc/skadns/skadnsd.html
index ebe1912..0a11297 100644
--- a/doc/skadns/skadnsd.html
+++ b/doc/skadns/skadnsd.html
@@ -80,7 +80,7 @@ that it requires support from the system administrator.
<p>
skadnsd has no "standalone" mode: it is designed to work with a Unix
domain superserver, like
-<a href="http://skarnet.org/software/s6-networking/s6-ipcserver.html">s6-ipcserver</a>.
+<a href="http://skarnet.org/software/s6/s6-ipcserver.html">s6-ipcserver</a>.
skadnsd follows the <a href="http://cr.yp.to/proto/ucspi.txt">UCSPI</a>
interface, it can be directly executed from the superserver.
</p>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 063dd4c..af176f8 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
<h1> What has changed in s6-dns </h1>
+<h2> in 2.1.0.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.4.0.0. </li>
+</ul>
+
<h2> in 2.0.1.0 </h2>
<ul>
diff --git a/package/deps.mak b/package/deps.mak
index 0a60cdf..28eeab2 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -132,17 +132,17 @@ src/skadns/skadnsd.o src/skadns/skadnsd.lo: src/skadns/skadnsd.c src/include/s6-
s6-dnsip4: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-dnsip4: src/clients/s6-dnsip4.o ${LIBS6DNS} -lskarnet
-s6-dnsip4-filter: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsip4-filter: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
s6-dnsip4-filter: src/clients/s6-dnsip4-filter.o src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o ${LIBSKADNS} ${LIBS6DNS} -lskarnet
s6-dnsip6: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-dnsip6: src/clients/s6-dnsip6.o ${LIBS6DNS} -lskarnet
-s6-dnsip6-filter: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsip6-filter: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
s6-dnsip6-filter: src/clients/s6-dnsip6-filter.o src/clients/s6dns_generic_filter_main.o src/clients/s6dns_namescanner.o ${LIBSKADNS} ${LIBS6DNS} -lskarnet
s6-dnsmx: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-dnsmx: src/clients/s6-dnsmx.o ${LIBS6DNS} -lskarnet
s6-dnsname: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-dnsname: src/clients/s6-dnsname.o ${LIBS6DNS} -lskarnet
-s6-dnsname-filter: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
+s6-dnsname-filter: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB}
s6-dnsname-filter: src/clients/s6-dnsname-filter.o src/clients/s6dns_generic_filter_main.o ${LIBSKADNS} ${LIBS6DNS} -lskarnet
s6-dnsns: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB}
s6-dnsns: src/clients/s6-dnsns.o ${LIBS6DNS} -lskarnet
diff --git a/package/info b/package/info
index b533331..3db5938 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=s6-dns
-version=2.0.1.0
+version=2.1.0.0
category=web
package_macro_name=S6_DNS
diff --git a/src/clients/deps-exe/s6-dnsip4-filter b/src/clients/deps-exe/s6-dnsip4-filter
index 5f78e23..94cfec6 100644
--- a/src/clients/deps-exe/s6-dnsip4-filter
+++ b/src/clients/deps-exe/s6-dnsip4-filter
@@ -5,3 +5,4 @@ ${LIBS6DNS}
-lskarnet
${SOCKET_LIB}
${TAINNOW_LIB}
+${SPAWN_LIB}
diff --git a/src/clients/deps-exe/s6-dnsip6-filter b/src/clients/deps-exe/s6-dnsip6-filter
index 5f78e23..94cfec6 100644
--- a/src/clients/deps-exe/s6-dnsip6-filter
+++ b/src/clients/deps-exe/s6-dnsip6-filter
@@ -5,3 +5,4 @@ ${LIBS6DNS}
-lskarnet
${SOCKET_LIB}
${TAINNOW_LIB}
+${SPAWN_LIB}
diff --git a/src/clients/deps-exe/s6-dnsname-filter b/src/clients/deps-exe/s6-dnsname-filter
index 2e0c3d7..b4bf9ca 100644
--- a/src/clients/deps-exe/s6-dnsname-filter
+++ b/src/clients/deps-exe/s6-dnsname-filter
@@ -4,3 +4,4 @@ ${LIBS6DNS}
-lskarnet
${SOCKET_LIB}
${TAINNOW_LIB}
+${SPAWN_LIB}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 12:25:51 +0000