From 36aac3b7052792acd25aceeb7d0498474988a197 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 20:47:26 +0000 Subject: Prepare for 0.0.1.7; align configure to rest of skaware Signed-off-by: Laurent Bercot --- COPYING | 2 +- INSTALL | 4 ++-- NEWS | 8 +++++++- configure | 18 +++++------------- doc/index.html | 6 +++--- doc/upgrade.html | 11 +++++++++++ package/info | 2 +- 7 files changed, 30 insertions(+), 21 deletions(-) diff --git a/COPYING b/COPYING index 44b4d49..4871b3f 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2020-2023 Laurent Bercot +Copyright (c) 2020-2024 Laurent Bercot Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/INSTALL b/INSTALL index b3710ab..fa69e6e 100644 --- a/INSTALL +++ b/INSTALL @@ -6,8 +6,8 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.0.0 or later: https://skarnet.org/software/skalibs/ - - s6-dns version 2.3.6.0 or later: https://skarnet.org/software/s6-dns/ + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ + - s6-dns version 2.3.8.0 or later: https://skarnet.org/software/s6-dns/ This software will run on any operating system that implements POSIX.1-2008, available at: diff --git a/NEWS b/NEWS index d515f1a..63c84ce 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,12 @@ Changelog for dnsfunnel. -In 0.0.1.5 +In 0.0.1.7 +---------- + + - Align on rest of skaware. + + +In 0.0.1.6 ---------- - Adaptation to skalibs-2.14.0.0. diff --git a/configure b/configure index 41b2b76..11c5bcf 100755 --- a/configure +++ b/configure @@ -21,11 +21,11 @@ Fine tuning of the installation directories: --dynlibdir=DIR shared library files [PREFIX/lib] --bindir=BINDIR user executables [EPREFIX/bin] --libexecdir=DIR package-scoped executables [EPREFIX/libexec] - --libdir=DIR static library files [PREFIX/lib/$package] + --libdir=DIR static library files [PREFIX/lib] --includedir=DIR C header files [PREFIX/include] If no --prefix option is given, by default libdir (but not dynlibdir) will be - /usr/lib/$package, and includedir will be /usr/include. + /usr/lib, and includedir will be /usr/include. Dependencies: --with-sysdeps=DIR use sysdeps in DIR [PREFIX/lib/skalibs/sysdeps] @@ -137,7 +137,7 @@ exec_prefix='$prefix' dynlibdir='$prefix/lib' libexecdir='$exec_prefix/libexec' bindir='$exec_prefix/bin' -libdir='$prefix/lib/$package' +libdir='$prefix/lib' includedir='$prefix/include' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false @@ -198,8 +198,8 @@ done # Add /usr in the default default case if test -z "$prefix" ; then - if test "$libdir" = '$prefix/lib/$package' ; then - libdir=/usr/lib/$package + if test "$libdir" = '$prefix/lib' ; then + libdir=/usr/lib fi if test "$includedir" = '$prefix/include' ; then includedir=/usr/include @@ -356,14 +356,6 @@ fi LDFLAGS_SHARED="${LDFLAGS_SHARED}${addlibdpath}" -if test -z "$vpaths" ; then - while read dep ; do - base=$(basename $dep) ; - vpaths="$vpaths /usr/lib/$base" - addlibspath="$addlibspath -L/usr/lib/$base" - done < package/deps-build -fi - if $allstatic ; then LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibspath}" tryldflag LDFLAGS_NOSHARED -Wl,--gc-sections diff --git a/doc/index.html b/doc/index.html index 325413e..a1648c5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -45,11 +45,11 @@ TCP DNS transport. It was originally written to be used in the
  • A POSIX-compliant system with a standard C development environment.
  • GNU make, version 3.81 or later
  • skalibs version -2.14.0.0 or later. It's a build-time requirement. It's also a run-time +2.14.3.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library.
  • s6-dns version -2.3.6.0 or later. It's a build-time requirement. It's also a run-time +2.3.8.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the s6dns library.
    • @@ -65,7 +65,7 @@ library.
    • The current released version of dnsfunnel is -0.0.1.6. +0.0.1.7. (dnsfunnel is in beta development at the moment. Use at your own risk.)
    • Alternatively, you can checkout a copy of the diff --git a/doc/upgrade.html b/doc/upgrade.html index c0a246b..f478bdc 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,17 @@

      What has changed in dnsfunnel

      +

      in 0.0.1.7

      + +
        +
      • skalibs dependency bumped to +2.14.3.0.
        • +
      • s6-dns dependency bumped to +2.3.8.0.
        • +
      • Static libraries (if any, which isn't the case for now) +are installed in /usr/lib by default.
        • +
      +

      in 0.0.1.6

        diff --git a/package/info b/package/info index 76bf671..44f9e4b 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=dnsfunnel -version=0.0.1.6 +version=0.0.1.7 category=web package_macro_name=DNSFUNNEL -- cgit v1.3.1