From 63c10ea49627209703d9160e3b47445f07b23f0e Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 20 May 2026 01:21:08 +0000 Subject: Prepare for 0.1.1.0; add --qmailrundir --- INSTALL | 6 +++--- NEWS | 7 +++++++ configure | 19 ++++++++++++------- doc/index.html | 8 ++++---- doc/upgrade.html | 9 +++++++++ package/configure-snippets/configure_case_lines | 3 ++- package/configure-snippets/configure_expand_dirs | 2 +- package/configure-snippets/configure_generate_configh | 4 +++- package/configure-snippets/configure_generate_make | 3 ++- package/configure-snippets/configure_help_install | 3 ++- package/configure-snippets/configure_help_options | 1 - package/configure-snippets/configure_init_vars | 3 ++- package/deps-build | 4 ++-- package/info | 2 +- src/qmail-remote/qmailr_tcpto.c | 4 ++-- src/qmail-remote/smtproutes.c | 18 +++++++++--------- 16 files changed, 61 insertions(+), 35 deletions(-) diff --git a/INSTALL b/INSTALL index 4709ba3..3412bcc 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.15.0.0 or later: https://skarnet.org/software/skalibs/ - - s6 version 2.15.0.0 or later: https://skarnet.org/software/s6/ - - s6-networking version 2.7.3.0 or later: https://skarnet.org/software/s6-networking/ + - skalibs version 2.15.0.1 or later: https://skarnet.org/software/skalibs/ + - s6 version 2.15.0.1 or later: https://skarnet.org/software/s6/ + - s6-networking version 2.8.0.0 or later: https://skarnet.org/software/s6-networking/ This software will run on any operating system that implements POSIX.1-2024, available at: diff --git a/NEWS b/NEWS index 3b5418c..0d83ae4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,12 @@ Changelog for smtpd-starttls-proxy. +In 0.1.1.0 +---------- + + - Bugfixes. + - Support for --qmailrundir + + In 0.1.0.0 ---------- diff --git a/configure b/configure index 241a8ad..483e360 100755 --- a/configure +++ b/configure @@ -25,7 +25,8 @@ Fine tuning of the installation directories: --includedir=DIR C header files [PREFIX/include] --sysconfdir=DIR global configuration files [PREFIX/etc] --pkgconfdir=DIR pkg-config .pc files [PREFIX/lib/pkgconfig] - --qmaildir=DIR qmail installation directory [/var/qmail] + --qmaildir=QMAILDIR qmail installation directory [/var/qmail] + --qmailrundir=QMAILRUNDIR directory for run-time files [QMAILDIR/run] If no --prefix option is given, by default libdir (but not dynlibdir) will be /usr/lib, and includedir will be /usr/include. @@ -50,7 +51,6 @@ Optional features: --enable-pkgconfig Build and install .pc files for pkg-config [disabled] --enable-slashpackage[=ROOT] assume /package installation at ROOT [disabled] --enable-absolute-paths hardcode absolute BINDIR/foobar paths in binaries [disabled] - --with-qmail-home=DIR qmail installation directory [/var/qmail] --with-qmailr-ids=uid:gid qmail-remote user:group [qmailr:qmail] --enable-qmail-install setup qmail to use qmail-remote [disabled] EOF @@ -173,7 +173,8 @@ deplibpath='' vpaths='' vpathd='' build= -qmailhome=/var/qmail +qmaildir=/var/qmail +qmailrundir='$qmaildir/run' qmailrids=qmailr:qmail qmailinstall=false @@ -215,7 +216,8 @@ for arg ; do --disable-slashpackage) sproot= ; slashpackage=false ;; --enable-absolute-paths|--enable-absolute-paths=yes) abspath=true ;; --disable-absolute-paths|--enable-absolute-paths=no) abspath=false ;; - --qmaildir=*) qmailhome=${arg#*=} ;; + --qmaildir=*) qmaildir=${arg#*=} ;; + --qmailrundir=*) qmailrundir=${arg#*=} ;; --with-qmailr-ids=*) qmailrids=${arg#*=} ;; --enable-qmail-install|--enable-qmail-install=yes) qmailinstall=true ;; --disable-qmail-install|--enable-qmail-install=no) qmailinstall=false ;; @@ -247,7 +249,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot qmailhome ; do +for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot qmaildir qmailrundir ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -529,7 +531,8 @@ if $allpic ; then else echo "STATIC_LIBS_ARE_PIC :=" fi -echo "QMAIL_HOME := $qmailhome" +echo "QMAIL_HOME := $qmaildir" +echo "QMAIL_RUN := $qmailrundir" echo "QMAILR_IDS := $qmailrids" if $qmailinstall ; then echo 'INSTALL_QMAIL := 1' @@ -568,7 +571,9 @@ fi echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\"" echo "#define ${package_macro_name}_SYSCONFPREFIX \"$sysconfdir/\"" echo "#undef ${package_macro_name}_QMAIL_HOME" -echo "#define ${package_macro_name}_QMAIL_HOME \"$qmailhome\"" +echo "#define ${package_macro_name}_QMAIL_HOME \"$qmaildir\"" +echo "#undef ${package_macro_name}_QMAIL_RUN" +echo "#define ${package_macro_name}_QMAIL_RUN \"$qmailrundir\"" echo echo "#endif" diff --git a/doc/index.html b/doc/index.html index 3121361..ee80fb5 100644 --- a/doc/index.html +++ b/doc/index.html @@ -43,11 +43,11 @@ SMTP client.
  • A POSIX-compliant system with a standard C development environment
  • GNU make, version 3.81 or later
  • skalibs version -2.15.0.0 or later. It's a build-time requirement. It's also a run-time +2.15.0.1 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.15.0.0 or later. It's a build-time and run-time requirement.
    • +2.15.0.1 or later. It's a build-time and run-time requirement.
  • s6-dns version 2.4.1.2 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the s6-dns library.
    • @@ -66,8 +66,8 @@ if you link against the shared version of the s6-dns library.