From 368aede679320d999321f180b83634dccde6afab Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 23 Sep 2024 20:19:22 +0000 Subject: Prepare for 0.0.1.5; align configure to rest of skaware Signed-off-by: Laurent Bercot --- COPYING | 2 +- INSTALL | 6 +++--- NEWS | 6 ++++++ configure | 18 +++++------------- doc/index.html | 8 ++++---- doc/upgrade.html | 13 +++++++++++++ package/info | 2 +- 7 files changed, 33 insertions(+), 22 deletions(-) diff --git a/COPYING b/COPYING index ec67559..c99cd7a 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2021-2023 Laurent Bercot +Copyright (c) 2021-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 1489922..1d0f57e 100644 --- a/INSTALL +++ b/INSTALL @@ -6,9 +6,9 @@ Build Instructions - A POSIX-compliant C development environment - GNU make version 3.81 or later - - skalibs version 2.14.2.0 or later: https://skarnet.org/software/skalibs/ - - s6 version 2.13.0.0 or later: https://skarnet.org/software/s6/ - - (optional but recommended): s6-networking version 2.7.0.3 or later: + - skalibs version 2.14.3.0 or later: https://skarnet.org/software/skalibs/ + - s6 version 2.13.0.1 or later: https://skarnet.org/software/s6/ + - (optional but recommended): s6-networking version 2.7.0.4 or later: https://skarnet.org/software/s6-networking/ This software will run on any operating system that implements diff --git a/NEWS b/NEWS index 9e17eb7..d4c2450 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,11 @@ Changelog for smtpd-starttls-proxy. +In 0.0.1.5 +---------- + + - Align to rest of skaware. + + In 0.0.1.4 ---------- diff --git a/configure b/configure index 28dbee3..c41b82d 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] @@ -139,7 +139,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 @@ -203,8 +203,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 @@ -361,14 +361,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 4af8fee..cd69232 100644 --- a/doc/index.html +++ b/doc/index.html @@ -34,13 +34,13 @@ inetd-like mail servers that do not already support it.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.14.2.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 version -2.13.0.0 or later. It's a build-time and run-time requirement.
    • +2.13.0.1 or later. It's a build-time and run-time requirement.
  • Recommended at run-time: s6-networking version -2.7.0.3 or later. It's not a requirement, but you won't be able +2.7.0.4 or later. It's not a requirement, but you won't be able to do much with smtpd-starttls-proxy if you don't have a suitable UCSPI-TLS server tool, and s6-networking provides a simple one.
    • @@ -57,7 +57,7 @@ provides a simple one.
    • The current released version of smtpd-starttls-proxy is -0.0.1.4.
      • +0.0.1.5.
    • You can checkout a copy of the smtpd-starttls-proxy git repository: diff --git a/doc/upgrade.html b/doc/upgrade.html index 1fec97c..6218994 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,19 @@

      What has changed in smtpd-starttls-proxy

      +

      in 0.0.1.5

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

      in 0.0.1.4

        diff --git a/package/info b/package/info index db41955..1cf181d 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=smtpd-starttls-proxy -version=0.0.1.4 +version=0.0.1.5 category=mail package_macro_name=SMTPD_STARTTLS_PROXY -- cgit v1.3.1