diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-12-13 08:00:48 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-12-13 08:00:48 +0000 |
| commit | c9686bbe491bee54b36e69d8bb05129cdc9dec38 (patch) | |
| tree | e13485b36cc3fc880de74e96b9bb50e311551d68 /debian | |
| parent | Releasing progress-linux version 3.9.1-4~progress7.99u1. (diff) | |
| download | postfix-c9686bbe491bee54b36e69d8bb05129cdc9dec38.tar.xz postfix-c9686bbe491bee54b36e69d8bb05129cdc9dec38.zip | |
Merging debian version 3.9.1-5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
41 files changed, 425 insertions, 563 deletions
diff --git a/debian/NOTES b/debian/NOTES index 35bc43d..656a56f 100644 --- a/debian/NOTES +++ b/debian/NOTES @@ -109,6 +109,17 @@ used chroots working, and fix the remaining bugs if possible. See https://bugs.debian.org/151692 https://bugs.debian.org/1084167 and numerous bug reports marked with "[chroot]" in the title. +We copy nss stuff to chroot because this is what's used by postfix smtp +client as "native" way for host lookups (smtp_host_lookup). By default +it uses internal dns routines directly, which utilizes res_* functions. +Also, various networking maps might use nss host lookups, but these are +better to be handled with proxy: map type. Glibc does not need libresolv +anymore. And picks up changes to resolv.conf immediately on next lookup. + +#572841 says /dev/random and /dev/urandom are needed in chroot jail +to run ldaps. Is this true still? Are these device files needed for +something else? In 3.9.1-5, I stopped creating /dev/random in chroot. + rmail ~~~~~ diff --git a/debian/README.Debian b/debian/README.Debian index 0218e12..cd915bf 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -29,7 +29,7 @@ and the source from upstream: 1. The Debian install is chrooted by default. 2. When starting a postfix instance (either using system startup procedures or direct call to postfix binary), chroot directory for each instance is - updated, syncronizing files from the root system to the chroot. This is + updated, synchronizing files from the root system to the chroot. This is controlled by SYNC_CHROOT (default Y) variable in /etc/default/postfix file if exists. This feature can be disabled by setting SYNC_CHROOT= (empty) in /etc/default/postfix. Chroot directory is being updated only diff --git a/debian/changelog b/debian/changelog index 8ee1b90..fc6e928 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +postfix (3.9.1-5) unstable; urgency=medium + + * a "making some clean-ups, part 3" release + * rewrite of d/configure-instance.sh chroot setup script: + - remove some old files which shouldn't be there, like lib/libnss_s.so + or lib/mozilla/libnss.3 or lib/$otherarch/libnssdbm3.so + - stop re-writing whole chroot each time, use cp -u + - copy /etc/ssl/certs by hash only, so the result matches those on + host, not all of them like before + - copy just libnss_*.so.2 for the correct architecture + - stop creating dev/[u]random in chroot, device nodes in /var was + a long-standing issue. Cf. #572841 + * d/{update-libc,ip-{up,down}}.d: just copy resolv.conf, no reload needed + (postfix uses system resolver, glibc picks up changes automatically) + add a note we only support default/main instance + * postfix-resolvconf: some updates + * remove cpio from Depends, downgrade ssl-cert to Recommends + (postfix uses ssl-snakeoil by default); + add ssl-cert dependency to tests, so it checks smtps + * drop very old (before buster) versioned deps + * d/rules,d/control: do not build postfix-mongodb on hurd + * provide (shorter) long Description for all packages directly in d/control + * stop moving dynamic maps manpages to postfix-MAP subpackages, provide + them in main postfix package + * remove stray debian-differences-main-cf.diff which was added mistakenly + * d/README.Debian: spelling: synchronizing + * d/po: run debconf-updatepo + + -- Michael Tokarev <mjt@tls.msk.ru> Fri, 13 Dec 2024 00:09:16 +0300 + postfix (3.9.1-4~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/configure-instance.in b/debian/configure-instance.in new file mode 100644 index 0000000..a90c0b8 --- /dev/null +++ b/debian/configure-instance.in @@ -0,0 +1,161 @@ +#! /bin/sh -e + +# This helper script is run by postfix-script with all +# postfix instance specific environment variables set. +# It is used mostly to update chroot setup for a given +# instance. Run every time any instance starts, from +# /usr/lib/postfix/sbin/postfix-script + +# safety +[ -f "$MAIL_CONFIG/main.cf" ] && [ -d "$queue_directory/pid" ] && +[ -x "$command_directory/postconf" ] && [ $# = 0 ] || +{ echo "E: This is internal script used by postfix" >&2 + [ $# != 1 ] || + echo "E: old postfix initscript will not work with this postfix package version" >&2 + exit 1 +} + +chroot_extra_files= +chroot_extra_CAdir= +SYNC_CHROOT="y" + +if test -r /etc/default/postfix; then + . /etc/default/postfix +fi + +# multiarch triplet for the host this package is built for +# (substituted at package build time) +multiarch=@MULTIARCH@ + +POSTCONF="$command_directory/postconf" + +# if you set myorigin to 'ubuntu.com' or 'debian.org', it is wrong +# and annoys the admins of those domains. See also sender_canonical_maps. +myorigin=$($POSTCONF -hx myorigin) +[ "X${myorigin#/}" = "X${myorigin}" ] || + myorigin=$(head -n1 -- "$myorigin") +case "$(echo "$myorigin" | tr A-Z a-z)" in + (ubuntu.com | debian.org) + echo "Invalid \$myorigin ($myorigin), refusing to start" + exit 1 + ;; +esac + +[ -n "$SYNC_CHROOT" ] || exit 0 + +compat=$($POSTCONF -xh compatibility_level) +[ ${compat%%.*} -ge 1 ] && chroot_test="[y]" || chroot_test="[-y]" + +# parse master.cf and find out which amount of chroot setup do we need +need_chroot=$($POSTCONF -M | awk '# $5=chroot $8=cmd + BEGIN { need="" } + $5 !~ /'$chroot_test'/ { next } # skip non-chrooted services + $8 ~ /^(anvil|bounce|discard|error|flush|pickup|[no]?qmgr|scache|showq|tlsmgr|trivial-rewrite|verify)$/ { + next } # internal simple safe services which need no extra chroot setup + $8 ~ /^(dnsblog|postscreen)$/ { need="dns"; next } + $8 ~ /^(qmqpd)$/ { need="dns"; next } # does it need dns? + $8 ~ /^(cleanup)$/ { print "y"; exit } # #948321 - to move to safe list + $8 ~ /^(local|pipe|postlogd|proxymap|virtual)$/ { print "y"; exit } # non-chrootable? + $8 ~ /^(smtp|smtpd|lmtp)$/ { print "y"; exit } # the interesting ones + { print "y"; exit } # by default assume chroot is needed + END { print need } + ') + +cd "$queue_directory" +# Make sure that the chroot environment is set up correctly. +umask 022 + +# some users keep actual files in /var/spool/postfix/{etc,lib,usr} +# (as primary place) because the chroot setup doesn't work right + +if [ -d usr/lib/zoneinfo ] # unused, <<3.9.1-4 +then + rm -f usr/lib/zoneinfo/* + rmdir usr/lib/zoneinfo 2>/dev/null || : +fi +if [ -f lib/$multiarch/libgcc_s.so.1 ] # <<3.9.1-5 +then + # we now place libnss_*.so.2 directly to lib/ (below), but this rm is a one-time op + rm -fv lib/libgcc_s*.so* lib/libnss*.so* lib/libresolv*.so* # very old cruft + rm -f lib/*/libgcc_s*.so* lib/*/libnss*.so* lib/*/libresolv*.so* + rmdir lib/* 2>/dev/null || : +fi +if [ -f etc/ssl/cert/GlobalSign_Root_CA.pem ] # arbitrary, <<3.9.1-5 +then # we re-created everything each run before 3.9.1-5 + # remove just the most common dir + rm -rf etc/ssl/cert +fi + +# always copy/update small stuff so simple services works too +mkdir -p etc +cp= rm= +for file in \ + etc/localtime etc/services etc/resolv.conf etc/hosts \ + etc/host.conf etc/nsswitch.conf etc/nss_mdns.config \ + $chroot_extra_files +do + [ -f /$file ] && cp="$cp /$file" || rm="$rm ./$file" +done +[ -n "$rm" ] && rm -f $rm +[ -n "$cp" ] && cp -pLu --parents -t . -- $cp + +[ -n "$need_chroot" ] || exit 0 + +# put just the right nsswitch libraries ($multiarch/libnss_*.so.2) +# directly to lib/ (no subdirs) +# nss stuff is needed for "native" smtp host lookups (smtp_host_lookup) +cp -pLuv -t lib /usr/lib/$multiarch/libnss_*.so.2 || : + +case "$chroot_extra_CAdir" in # ensure CAdir is absolute + ( /* ) ;; + ( ?* ) chroot_extra_CAdir=/$chroot_extra_CAdir ;; +esac + +# Copy certificate dirs +cadirs_copied= +for cadir in \ + $($POSTCONF -hx smtp_tls_CApath smtpd_tls_CApath) \ + $chroot_extra_CAdir +do + + # strip trailing / + while [ "x${cadir%/}" != "x${cadir}" ]; do cadir=${cadir%/}; done + case "$cadir" in + ($queue_directory/*) continue;; # skip stuff already in chroot + (/*) [ -d $cadir ] || continue;; + (*) continue;; + esac + case "$cadis_copied " in + (*" $cadir "*) continue ;; + esac + cadirs_copied="$cadirs_copied $cadir" + + # only copy already hashed names. This means we only trust + # what's trusted on the system, not everything present + # Before 3.9.1-5 we truested everything + dest=$queue_directory$cadir + if [ -d $dest ]; then ( + cd $dest + for f in *; do + case "$f" in + ( [0-9a-f]*[0-9a-f].[0-9] ) [ -f "$cadir/$f" ] || rm -f -- "$f" ;; + ( * ) rm -f -- "$f" ;; + esac + done + ) fi + mkdir -p $dest + ( cd $cadir + find -L . -name '[0-9a-f]*.[0-9]' -type f \ + -exec cp -pLu -t $dest '{}' + + ) +done + +mkdir -p usr/lib/sasl2 # https://bugs.debian.org/426338 + +## ldaps needs this. debian bug 572841 (Mar-2010) +# let's omit this for now (in Dec-2024) for new installs and see what happens +# Having device nodes in /var causes numerous issues +# If anything, it can be bind-mounted from actual /dev, +# or better yet, just use proxy: map types. +# Might as well remove existing dev/*random from old chroot +#cp -a -n --parents /dev/random /dev/urandom . 2>/dev/null || : diff --git a/debian/configure-instance.sh b/debian/configure-instance.sh deleted file mode 100644 index ccbe1fb..0000000 --- a/debian/configure-instance.sh +++ /dev/null @@ -1,142 +0,0 @@ -#! /bin/sh -e - -# This helper script is run by postfix-script with all -# postfix instance specific environment variables set. -# It is used mostly to update chroot setup for a given -# instance. Run every time any instance starts from -# /usr/lib/postfix/sbin/postfix-script - -# It was originally part of the postfix init script, which -# was written by LaMont Jones <lamont@debian.org>, and based -# off of the sendmail init script. - -# safety -[ -f "$MAIL_CONFIG/main.cf" ] && [ -d "$queue_directory/pid" ] && -[ -x "$command_directory/postconf" ] && [ $# = 0 ] || -{ echo "E: This is internal script used by postfix" >&2 - [ $# != 1 ] || - echo "E: old postfix initscript will not work with this postfix package version" >&2 - exit 1 -} - -chroot_extra_files= -chroot_extra_CAdir= -SYNC_CHROOT="y" - -if test -r /etc/default/postfix; then - . /etc/default/postfix -fi - -POSTCONF="$command_directory/postconf" - -# if you set myorigin to 'ubuntu.com' or 'debian.org', it is wrong -# and annoys the admins of those domains. See also sender_canonical_maps. -myorigin=$($POSTCONF -hx myorigin) -[ "X${myorigin#/}" = "X${myorigin}" ] || - myorigin=$(head -n1 -- "$myorigin") -case "$(echo "$myorigin" | tr A-Z a-z)" in - (ubuntu.com | debian.org) - echo "Invalid \$myorigin ($myorigin), refusing to start" - exit 1 - ;; -esac - -[ -n "$SYNC_CHROOT" ] || exit 0 - -compat=$($POSTCONF -xh compatibility_level) -[ ${compat%%.*} -ge 1 ] && chroot_test="[y]" || chroot_test="[-y]" - -# parse master.cf and find out which amount of chroot setup do we need -need_chroot=$($POSTCONF -M | awk '# $5=chroot $8=cmd - BEGIN { need="" } - $5 !~ /'$chroot_test'/ { next } # skip non-chrooted services - $8 ~ /^(anvil|bounce|discard|error|flush|pickup|[no]?qmgr|scache|showq|tlsmgr|trivial-rewrite|verify)/ { - next } # internal simple safe services which need no extra chroot setup - $8 ~ /^(dnsblog|postscreen)/ { need="dns"; next } - $8 ~ /^(qmqpd)/ { need="dns"; next } # does it need dns? - $8 ~ /^(cleanup)/ { print "y"; exit } # #948321 - to move to safe list - $8 ~ /^(local|pipe|postlogd|proxymap|virtual)/ { print "y"; exit } # non-chrootable? - $8 ~ /^(smtp|smtpd|lmtp)/ { print "y"; exit } # the interesting ones - { print "y"; exit } # by default assume chroot is needed - END { print need } - ') - -# might remove/cleanup chroot here - -[ -n "$need_chroot" ] || exit 0 - -# Sigh. Because reasons, files is relative, CAdir not -[ "$chroot_extra_CAdir" != '' ] && [ ! "${chroot_extra_CAdir%${chroot_extra_CAdir#?}}"x = '/x' ] && chroot_extra_CAdir=/$chroot_extra_CAdir -if [ "$chroot_extra_files" != '' ]; then - files='' - for file in $chroot_extra_files - do - [ "${file%${file#?}}"x = '/x' ] && file=${file#?} - files="$files $file" - done - chroot_extra_files=$files -fi - -# Make sure that the chroot environment is set up correctly. -umask 022 -cd "$queue_directory" - -#XXX lib=>usr/lib? -mkdir -p dev etc lib usr -mkdir -p usr/lib/sasl2 # https://bugs.debian.org/426338 - -# Copy certificate dirs -cadirs_copied= -for cadir in \ - $($POSTCONF -hx smtp_tls_CApath smtpd_tls_CApath) \ - $chroot_extra_CAdir -do - - # strip trailing / - while [ "x${cadir%/}" != "x${cadir}" ]; do cadir=${cadir%/}; done - case "$cadir" in - ($queue_directory/*) continue;; # skip stuff already in chroot - (/*) [ -d $cadir ] || continue;; - (*) continue;; - esac - case "$cadis_copied " in - (*" $cadir "*) continue ;; - esac - cadirs_copied="$cadirs_copied $cadir" - - dest=$queue_directory$cadir - rm -rf $dest.NEW; mkdir -p $dest.NEW - ( cd $cadir - # *.pem are mostly symlinks to /usr/share/ca-certificates/ - #XXX we can copy just [0-9a-f]{8}\.r?[0-9] files and omit rehash - - # do we really want pem and nothing else? - find -L . -maxdepth 1 -name '*.pem' -type f -print0 | - cpio -p -L0 $dest.NEW ) - openssl rehash $dest.NEW - rm -rf $dest - mv $dest.NEW $dest -done - -FILES="etc/localtime etc/services etc/resolv.conf etc/hosts \ - etc/host.conf etc/nsswitch.conf etc/nss_mdns.config \ - $chroot_extra_files" -for file in $FILES; do - [ -d ${file%/*} ] || mkdir -p ${file%/*} - if [ -f /${file} ]; then rm -f ${file} && cp /${file} ${file}; fi - if [ -f ${file} ]; then chmod a+rX ${file}; fi -done -# ldaps needs this. debian bug 572841 -(echo /dev/random; echo /dev/urandom) | cpio -pdL --quiet . 2>/dev/null || true - -LIBLIST=$(for name in gcc_s nss resolv; do - for f in /lib/*/lib${name}*.so* /lib/lib${name}*.so*; do - if [ -f "$f" ]; then echo ${f#/}; fi; - done; -done) - -if [ -n "$LIBLIST" ]; then - for f in $LIBLIST; do - rm -f "$f" - done - tar cf - -C / $LIBLIST 2>/dev/null |tar xf - -fi diff --git a/debian/control b/debian/control index 6900816..399d32a 100644 --- a/debian/control +++ b/debian/control @@ -13,25 +13,25 @@ Rules-Requires-Root: no Homepage: https://www.postfix.org Build-Depends: debhelper-compat (= 13), default-libmysqlclient-dev, - dpkg-dev (>= 1.16.1~), groff-base, html2text, libcdb-dev, - libdb-dev (>=4.6.19), + libdb-dev, libicu-dev, libldap-dev, liblmdb-dev, - libmongoc-dev, +# mongoc is not available on hurd, mark it linux-any for now + libmongoc-dev [linux-any], libnsl-dev | libc6-dev (<<2.37-15.1), libpcre2-dev, libpq-dev, libsasl2-dev, libsqlite3-dev, - libssl-dev (>=1.0.2), + libssl-dev, lsb-release, patch, pkgconf, - po-debconf (>= 0.5.0), + po-debconf, systemd-dev, txt2man Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/postfix @@ -42,17 +42,25 @@ XSBC-Original-Vcs-Git: https://salsa.debian.org/postfix-team/postfix-dev.git Package: postfix Architecture: any Pre-Depends: ${misc:Pre-Depends} -Depends: adduser (>=3.48), - cpio, - dpkg (>= 1.8.3), +Depends: adduser, netbase, - ssl-cert, ${misc:Depends}, ${shlibs:Depends} Replaces: mail-transport-agent, # RELEASE_NOTES file moved from postfix-doc, not worth a Breaks: postfix-doc (<<3.9.1-3~), -Recommends: ca-certificates, python3 +# manpages moved from postfix-MAP subpackages: + postfix-ldap (<<3.9.1-5~), postfix-lmdb (<<3.9.1-5~), + postfix-pcre (<<3.9.1-5~), + postfix-mongodb (<<3.9.1-5~), postfix-mysql (<<3.9.1-5~), + postfix-pgsql (<<3.9.1-5~), postfix-sqlite (<<3.9.1-5~), +Recommends: +# for smtps: + ca-certificates, +# for snakeoil cert (used in smtpd_tls_key_file): + ssl-cert, +# for postfix-add-filter, postfix-add-policy: + python3, Suggests: libsasl2-modules | dovecot-common, mail-reader, postfix-cdb, @@ -60,7 +68,7 @@ Suggests: libsasl2-modules | dovecot-common, postfix-ldap, postfix-lmdb, postfix-mta-sts-resolver, - postfix-mongodb, + postfix-mongodb [linux-any], postfix-mysql, postfix-pcre, postfix-pgsql, @@ -72,16 +80,32 @@ Suggests: libsasl2-modules | dovecot-common, Conflicts: mail-transport-agent, smail Provides: mail-transport-agent, ${postfix:Provides} Description: High-performance mail transport agent - ${Description} + Postfix is Wietse Venema's mail transport agent that started life as an + alternative to the widely-used Sendmail program. Postfix attempts to + be fast, easy to administer, and secure, while at the same time being + sendmail compatible enough to not upset existing users. Thus, the outside + has a sendmail-ish flavor, but the inside is completely different. + +Package: postfix-doc +Architecture: all +Section: doc +Suggests: postfix +Depends: ${misc:Depends} +Description: Documentation for Postfix + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. + . + This package provides documentation for Postfix. Package: postfix-ldap Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: LDAP map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for LDAP maps in Postfix. If you plan to use LDAP maps - with Postfix, you need this. + This package provides support for LDAP maps in Postfix. + If you plan to use LDAP maps with Postfix, you need this. Package: postfix-lmdb Architecture: any @@ -90,71 +114,68 @@ Depends: liblmdb0 (>=0.9.14), ${misc:Depends}, ${shlibs:Depends} Description: LMDB map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for LMDB maps in Postfix. If you plan to use LMDB maps - with Postfix, you need this. + This package provides support for LMDB maps in Postfix. + If you plan to use LMDB maps with Postfix, you need this. Package: postfix-cdb Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: CDB map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for CDB (constant database) maps in Postfix. If you - plan to use CDB maps with Postfix, you need this. + This package provides support for CDB (constant database) maps in Postfix. + If you plan to use CDB maps with Postfix, you need this. Package: postfix-pcre Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: PCRE map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for PCRE (perl compatible regular expression) maps in - Postfix. If you plan to use PCRE maps with Postfix, you need this. + This package provides support for PCRE (perl-compatible regular expression) + maps in Postfix. If you plan to use PCRE maps with Postfix, you need this. Package: postfix-mongodb Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: MongoDB map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for MongoDB maps in Postfix. If you plan to use MongDB - maps with Postfix, you need this. + This package provides support for MongoDB maps in Postfix. + If you plan to use MongDB maps with Postfix, you need this. Package: postfix-mysql Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: MySQL map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for MySQL maps in Postfix. If you plan to use MySQL - maps with Postfix, you need this. + This package provides support for MySQL maps in Postfix. + If you plan to use MySQL maps with Postfix, you need this. Package: postfix-pgsql Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: PostgreSQL map support for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This provides support for PostgreSQL maps in Postfix. If you plan to use - PostgreSQL maps with Postfix, you need this. + This package provides support for PostgreSQL maps in Postfix. + If you plan to use PostgreSQL maps with Postfix, you need this. Package: postfix-sqlite Architecture: any Depends: postfix (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} Description: SQLite map support for Postfix - ${Description} - . - This provides support for SQLite maps in Postfix. If you plan to use - SQLite maps with Postfix, you need this. - -Package: postfix-doc -Architecture: all -Section: doc -Suggests: postfix -Depends: ${misc:Depends} -Description: Documentation for Postfix - ${Description} + Postfix is Wietse Venema's mail transport agent, available in Debian + in postfix package. . - This package provides the documentation for Postfix. + This package provides support for SQLite maps in Postfix. + If you plan to use SQLite maps with Postfix, you need this. diff --git a/debian/ip-down.d b/debian/ip-down.d index a754fb3..82acc2f 100644 --- a/debian/ip-down.d +++ b/debian/ip-down.d @@ -1,34 +1,7 @@ -#!/bin/sh -e - -# Called when an interface disconnects -# Written by LaMont Jones <lamont@debian.org> - -# start or reload Postfix as needed - -# If /usr isn't mounted yet, silently bail. -if [ ! -d /usr/lib/postfix ]; then - exit 0 +#! /bin/sh +# update postfix copy of resolv.conf; only default instance is handled +file=/etc/resolv.conf queue=/var/spool/postfix +if [ lo != "$IFACE" ] && [ -d $queue${file%/*} ] && [ -f /etc/postfix/main.cf ] +then # just refresh, glibc pick it up automatically + [ ! -f $file ] && rm -f $queue$file && cp -pLu $file $queue$file fi - -RUNNING="" -# If master is running, force a queue run to unload any mail that is -# hanging around. Yes, sendmail is a symlink... -if [ -f /var/spool/postfix/pid/master.pid ]; then - pid=$(sed 's/ //g' /var/spool/postfix/pid/master.pid) - exe=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* //;s/.*\///') - if [ "X$exe" = "Xmaster" ]; then - RUNNING="y" - fi -fi - -if [ ! -x /sbin/resolvconf ]; then - f=/etc/resolv.conf - if ! cp $f "$(postconf -hx queue_directory)$f" 2>/dev/null; then - exit 0 - fi - if [ -n "$RUNNING" ]; then - service postfix reload >/dev/null 2>&1 - fi -fi - -exit 0 diff --git a/debian/ip-up.d b/debian/ip-up.d index 200414e..56b8c96 100644 --- a/debian/ip-up.d +++ b/debian/ip-up.d @@ -1,44 +1,8 @@ -#!/bin/sh -e -# Called when a new interface comes up -# Written by LaMont Jones <lamont@debian.org> - -# don't bother to restart postfix when lo is configured. -if [ "$IFACE" = "lo" ]; then - exit 0 -fi - -# If /usr isn't mounted yet, silently bail. -if [ ! -d /usr/lib/postfix ]; then - exit 0 -fi - -RUNNING="" -# If master is running, force a queue run to unload any mail that is -# hanging around. Yes, sendmail is a symlink... -if [ -f /var/spool/postfix/pid/master.pid ]; then - pid=$(sed 's/ //g' /var/spool/postfix/pid/master.pid) - exe=$(ls -l /proc/$pid/exe 2>/dev/null | sed 's/.* //;s/.*\///') - if [ "X$exe" = "Xmaster" ]; then - RUNNING="y" - fi -fi - -# start or reload Postfix as needed -if [ ! -x /sbin/resolvconf ]; then - f=/etc/resolv.conf - if ! cp $f "$(postconf -hx queue_directory)$f" 2>/dev/null; then - exit 0 - fi - if [ -n "$RUNNING" ]; then - service postfix reload >/dev/null 2>&1 - fi -fi - -# If master is running, force a queue run to unload any mail that is -# hanging around. Yes, sendmail is a symlink... -if [ -n "$RUNNING" ]; then - if [ -x /usr/sbin/sendmail ]; then - # Don't propagate the exit code on failure; cf. #959864 - /usr/sbin/sendmail -q >/dev/null 2>&1 || true - fi +#! /bin/sh +# update postfix copy of resolv.conf; only default instance is handled +file=/etc/resolv.conf queue=/var/spool/postfix +if [ lo != "$IFACE" ] && [ -d $queue${file%/*} ] && [ -f /etc/postfix/main.cf ] +then # just refresh, glibc pick it up automatically + [ ! -f $file ] && rm -f $queue$file || cp -pLu $file $queue$file + #sendmail -q 2>/dev/null || : # flush mail queue fi diff --git a/debian/patches/debian-differences-main-cf.diff b/debian/patches/debian-differences-main-cf.diff deleted file mode 100644 index e674e72..0000000 --- a/debian/patches/debian-differences-main-cf.diff +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/conf/main.cf b/conf/main.cf -index 2f4eba9e..f5448915 100644 ---- a/conf/main.cf -+++ b/conf/main.cf -@@ -81,3 +81,3 @@ data_directory = /var/lib/postfix - # --mail_owner = postfix -+#mail_owner = postfix - -@@ -120,2 +120,7 @@ mail_owner = postfix - # -+# Debian GNU/Linux specific: Specifying a file name will cause the -+# first line of that file to be used as the name. The Debian default -+# is /etc/mailname. -+# -+#myorigin = /etc/mailname - #myorigin = $myhostname -@@ -288,2 +293,3 @@ unknown_local_recipient_reject_code = 550 - #mynetworks = hash:/etc/postfix/network_table -+mynetworks = 127.0.0.0/8 - -@@ -578,2 +584,3 @@ unknown_local_recipient_reject_code = 550 - #smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) -+smtpd_banner = $myhostname ESMTP $mail_name (@@DISTRO@@) - -@@ -602,3 +609,3 @@ unknown_local_recipient_reject_code = 550 - # --debug_peer_level = 2 -+#debug_peer_level = 2 - diff --git a/debian/po/ca.po b/debian/po/ca.po index dc04424..700e080 100644 --- a/debian/po/ca.po +++ b/debian/po/ca.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: 3.1.3-6\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2017-01-07 18:19+0100\n" "Last-Translator: Innocent De Marchi <tangram.peces@gmail.com>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -548,12 +548,6 @@ msgstr "" "possible que us calgui afegir-la. Deixeu-ho en blanc si no en voleu afegir " "cap." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "" #~ "Voleu actualitzar la configuració per tal d'evitar avisos de " diff --git a/debian/po/cs.po b/debian/po/cs.po index cb9400c..83c6b59 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2017-01-22 12:37+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -540,12 +540,6 @@ msgstr "" "Pokud již soubor /etc/aliases máte a chybí v něm záznam pro uživatele root, " "měli byste ho přidat. Ponecháte-li prázdné, záznam se nepřidá." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "Aktualizovat konfiguraci pro zamezení varování o kompatibilitě?" diff --git a/debian/po/da.po b/debian/po/da.po index ee1bffb..1e00b1d 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2019-02-23 19:21+0100\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n" @@ -538,11 +538,8 @@ msgstr "" "(administrator), så skal du tilføje dette punkt. Efterlad tom for ikke at " "tilføje nogen." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Kør kommandoen newaliases?" +#~ msgid "Run newaliases command?" +#~ msgstr "Kør kommandoen newaliases?" #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "Opdater konfiguration for at undgåe kompatibilitetsadvarsler?" diff --git a/debian/po/de.po b/debian/po/de.po index 3539db9..0e60c76 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 3.7.3-4\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2023-01-15 22:00+0100\n" "Last-Translator: Markus Hiereth <translation@hiereth.de>\n" "Language-Team: debian-l10n-german <debian-l10n-german@lists.debian.org>\n" @@ -509,11 +509,8 @@ msgstr "" "root enthält, sollten Sie diesen Eintrag hinzufügen. Lassen Sie dies leer, " "um keinen hinzuzufügen." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Befehl newaliases ausführen?" +#~ msgid "Run newaliases command?" +#~ msgstr "Befehl newaliases ausführen?" #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "" diff --git a/debian/po/es.po b/debian/po/es.po index ecf4252..fbf467f 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -32,7 +32,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 2.5.5-1.1\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2012-06-18 14:00-0300\n" "Last-Translator: Matías A. Bellone <matiasbellone+debian@gmail.com>\n" "Language-Team: Debian Spanish Translation Team <debian-l10n-spanish@lists." @@ -573,12 +573,6 @@ msgstr "" "«root», posiblemente necesite añadir esta entrada. Deje esto en blanco para " "no añadir ninguna." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #, fuzzy #~| msgid "Correct dynamicmaps.cf for upgrade?" #~ msgid "Update dynamicmaps.cf for 3.0?" diff --git a/debian/po/eu.po b/debian/po/eu.po index 21edb4e..5ee34ae 100644 --- a/debian/po/eu.po +++ b/debian/po/eu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix-eu\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2017-01-03 15:49+0100\n" "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n" "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n" @@ -533,12 +533,6 @@ msgstr "" "Dagoeneko /etc/aliases fitxategia baduzu eta root-entzako sarrerarik ez " "badu, sarrera hau gehitu behar duzu. Utzi hutsik ez gehitzeko." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "Eguneratu konfigurazioa bateragarritasunaren abisuak saihesteko?" diff --git a/debian/po/fi.po b/debian/po/fi.po index 3858038..93d8f4a 100644 --- a/debian/po/fi.po +++ b/debian/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix debconf templates\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2012-06-05 11:43+0300\n" "Last-Translator: Tommi Vainikainen <tvainika@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -535,12 +535,6 @@ msgstr "" "pääkäyttäjälle (root), niin silloin tämä tietue pitäisi lisätä. Jätä " "tyhjäksi jos et halua lisätä." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #, fuzzy #~| msgid "" #~| "Postfix version 2.9 adds sqlite support to maps, but your dynamicmaps.cf " diff --git a/debian/po/fr.po b/debian/po/fr.po index 6d31b66..d653d92 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2018-06-08 10:52+0100\n" "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -555,11 +555,8 @@ msgstr "" "« root », vous devriez ajouter cette entrée. Laissez le champ vide pour ne " "pas en ajouter." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Faut-il exécuter la commande newaliases ?" +#~ msgid "Run newaliases command?" +#~ msgstr "Faut-il exécuter la commande newaliases ?" #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "" diff --git a/debian/po/gl.po b/debian/po/gl.po index f509ec6..24a80bf 100644 --- a/debian/po/gl.po +++ b/debian/po/gl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2008-05-30 19:25+0100\n" "Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" "Language-Team: Galician <proxecto@trasno.net>\n" @@ -544,12 +544,6 @@ msgstr "" "Se xa ten un ficheiro /etc/aliases, probablemente teña que engadir esta " "entrada. Deixe a opción baleira para non engadila." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Add a 'mydomain' entry in main.cf for upgrade?" #~ msgstr "¿Engadir unha entrada mydomain en main.cf para a actualización?" diff --git a/debian/po/id.po b/debian/po/id.po index 17e531e..6cb68d9 100644 --- a/debian/po/id.po +++ b/debian/po/id.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 3.9.0-3\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2024-10-07 18:16+0700\n" "Last-Translator: Andika Triwidada <andika@gmail.com>\n" "Language-Team: Debian Indonesia Translators <debian-l10n-indonesian@lists." @@ -500,8 +500,5 @@ msgstr "" "root, maka seharusnya Anda menambahkan entri ini. Tinggalkan kosong untuk " "tidak menambahkan apa pun." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Jalankan perintah newaliases?" +#~ msgid "Run newaliases command?" +#~ msgstr "Jalankan perintah newaliases?" diff --git a/debian/po/it.po b/debian/po/it.po index c2f95fb..00315b7 100644 --- a/debian/po/it.po +++ b/debian/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 2.9.1-2\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2016-03-04 23:04+0100\n" "Last-Translator: Cristian Rigamonti <cri@linux.it>\n" "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n" @@ -599,12 +599,6 @@ msgstr "" "Se si ha già un file /etc/aliases che non contiene una voce per root, " "occorre aggiungerla. Lasciando in bianco non ne verrà aggiunta alcuna." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #, fuzzy #~| msgid "Update dynamicmaps.cf for 3.0" #~ msgid "Update dynamicmaps.cf for 3.0?" diff --git a/debian/po/ja.po b/debian/po/ja.po index ca5eaed..e3e111b 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 3.1.3-6\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2017-01-02 18:16+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -537,12 +537,6 @@ msgstr "" "既存の /etc/aliases ファイルがあるけれども、root 用のエントリがない場合には、" "このエントリを追加すべきです。追加しない場合は空のままにしておいてください。" -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "互換性についての警告を避けるために設定を更新しますか?" diff --git a/debian/po/ko.po b/debian/po/ko.po index 15e1f90..c829c02 100644 --- a/debian/po/ko.po +++ b/debian/po/ko.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2008-06-06 15:54-0400\n" "Last-Translator: Sunjae Park <darehanl@gmail.com>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -535,12 +535,6 @@ msgstr "" "/etc/aliases 파일이 있다면 이 항목을 추가해야 할 수 있습니다. 받는이를 추가하" "지 않으려면 비워두십시오." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Add a 'mydomain' entry in main.cf for upgrade?" #~ msgstr "업그레이드시 main.cf에 'mydomain' 항목을 추가할까요?" diff --git a/debian/po/nl.po b/debian/po/nl.po index 537b0f2..b5fd527 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 3.7.3-2\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2022-11-28 22:01+0100\n" "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n" "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n" @@ -497,11 +497,8 @@ msgstr "" "'root', dan dient u dit toe te voegen. Laat dit veld leeg om geen item toe " "te voegen." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Het commando newaliases uitvoeren?" +#~ msgid "Run newaliases command?" +#~ msgstr "Het commando newaliases uitvoeren?" #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "" diff --git a/debian/po/pl.po b/debian/po/pl.po index 1bd8ee8..734179f 100644 --- a/debian/po/pl.po +++ b/debian/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2012-06-09 21:24+0200\n" "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -556,12 +556,6 @@ msgstr "" "roota, powinno się dodać ten wpis. Pozostawienie pustego pola zapobiegnie " "dodaniu wpisu." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #, fuzzy #~| msgid "" #~| "Postfix version 2.9 adds sqlite support to maps, but your dynamicmaps.cf " diff --git a/debian/po/pt.po b/debian/po/pt.po index 225928d..72c623f 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2017-01-04 22:46+0000\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -539,12 +539,6 @@ msgstr "" "Se já tem um ficheiro /etc/aliases e não tiver uma entrada para root, então " "deverá acrescentar esta entrada. Deixe em branco para não acrescentar uma." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "Actualizar a configuração para evitar avisos de compatibilidade?" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 09c5803..c72383b 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix_3.7.3-2\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2022-11-15 18:56-0300\n" "Last-Translator: Paulo Henrique de Lima Santana (phls) <phls@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -500,11 +500,8 @@ msgstr "" "o root, então você deve adicionar esta entrada. Deixe isso em branco para " "não adicionar uma." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Executar comando newaliases?" +#~ msgid "Run newaliases command?" +#~ msgstr "Executar comando newaliases?" #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "Atualizar a configuração para evitar avisos de compatibilidade?" diff --git a/debian/po/ro.po b/debian/po/ro.po index 42f4013..3e8a40f 100644 --- a/debian/po/ro.po +++ b/debian/po/ro.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 3.8.1-2\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2023-07-09 00:26+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: \n" @@ -36,8 +36,8 @@ msgstr "Doriți să se ignore intrarea incorectă a numelui de gazdă „hostnam #. Description #: ../templates:1001 msgid "" -"The string '${enteredstring}' does not follow RFC 1035 and does not appear to " -"be a valid IP address." +"The string '${enteredstring}' does not follow RFC 1035 and does not appear " +"to be a valid IP address." msgstr "" "Șirul \"${entredstring}\" nu respectă standardul RFC 1035 și nu pare a fi o " "adresă IP validă." @@ -46,9 +46,9 @@ msgstr "" #. Description #: ../templates:1001 msgid "" -"RFC 1035 states that 'each component must start with an alphanum, end with an " -"alphanum and contain only alphanums and hyphens. Components must be separated " -"by full stops.'" +"RFC 1035 states that 'each component must start with an alphanum, end with " +"an alphanum and contain only alphanums and hyphens. Components must be " +"separated by full stops.'" msgstr "" "RFC 1035 prevede că „fiecare componentă trebuie să înceapă cu un caracter " "alfanumeric, să se termine cu un caracter alfanumeric și să conțină numai " @@ -187,9 +187,9 @@ msgid "" " - Editing /etc/postfix/main.cf to your liking;\n" " - Running 'service postfix start'." msgstr "" -"Ați ales \"Fără configurare\". Postfix nu va fi configurat și nu va fi pornit " -"în mod implicit. Vă rugăm să rulați «dpkg-reconfigure postfix» la o dată " -"ulterioară sau să îl configurați singur:\n" +"Ați ales \"Fără configurare\". Postfix nu va fi configurat și nu va fi " +"pornit în mod implicit. Vă rugăm să rulați «dpkg-reconfigure postfix» la o " +"dată ulterioară sau să îl configurați singur:\n" "- Editați /etc/postfix/main.cf după preferințele (necesitățile) " "dumneavoastră;\n" "- Executați «service postfix start»." @@ -206,21 +206,21 @@ msgstr "Numele de poștă al sistemului:" msgid "" "The 'mail name' is the domain name used to 'qualify' _ALL_ mail addresses " "without a domain name. This includes mail to and from <root>: please do not " -"make your machine send out mail from root@example.org unless root@example.org " -"has told you to." +"make your machine send out mail from root@example.org unless root@example." +"org has told you to." msgstr "" "„Numele de poștă al sistemului” este numele de domeniu utilizat pentru a " "„califica” _TOATE_ adresele de poștă electronică fără un nume de domeniu. " -"Aceasta include corespondența către și de la <root>; vă rugăm să nu faceți ca " -"mașina dumneavoastră să trimită corespondență de la root@example.org decât " -"dacă root@example.org v-a solicitat acest lucru." +"Aceasta include corespondența către și de la <root>; vă rugăm să nu faceți " +"ca mașina dumneavoastră să trimită corespondență de la root@example.org " +"decât dacă root@example.org v-a solicitat acest lucru." #. Type: string #. Description #: ../templates:4001 msgid "" -"This name will also be used by other programs. It should be the single, fully " -"qualified domain name (FQDN)." +"This name will also be used by other programs. It should be the single, " +"fully qualified domain name (FQDN)." msgstr "" "Acest nume va fi folosit și de alte programe. Acesta trebuie să fie un nume " "de domeniu unic, complet calificat (FQDN)." @@ -349,12 +349,12 @@ msgstr "Protocoale de internet de utilizat:" #: ../templates:8002 msgid "" "By default, whichever Internet protocols are enabled on the system at " -"installation time will be used. You may override this default with any of the " -"following:" +"installation time will be used. You may override this default with any of " +"the following:" msgstr "" -"În mod implicit, vor fi utilizate protocoalele de internet care sunt activate " -"în sistem în momentul instalării. Puteți înlocui această valoare implicită cu " -"oricare dintre următoarele:" +"În mod implicit, vor fi utilizate protocoalele de internet care sunt " +"activate în sistem în momentul instalării. Puteți înlocui această valoare " +"implicită cu oricare dintre următoarele:" #. Type: select #. Description @@ -417,16 +417,16 @@ msgstr "Rețele locale:" #: ../templates:11001 msgid "" "Please specify the network blocks for which this host should relay mail. The " -"default is just the local host, which is needed by some mail user agents. The " -"default includes local host for both IPv4 and IPv6. If just connecting via " -"one IP version, the unused value(s) may be removed." +"default is just the local host, which is needed by some mail user agents. " +"The default includes local host for both IPv4 and IPv6. If just connecting " +"via one IP version, the unused value(s) may be removed." msgstr "" "Specificați blocurile de rețea pentru care această gazdă trebuie să " -"retransmită corespondența. Valoarea implicită este doar gazda locală, de care " -"au nevoie unii agenți de utilizator de poștă electronică. Valoarea implicită " -"include gazda locală atât pentru IPv4, cât și pentru IPv6. În cazul în care " -"vă conectați doar printr-o singură versiune IP, valorile neutilizate pot fi " -"eliminate." +"retransmită corespondența. Valoarea implicită este doar gazda locală, de " +"care au nevoie unii agenți de utilizator de poștă electronică. Valoarea " +"implicită include gazda locală atât pentru IPv4, cât și pentru IPv6. În " +"cazul în care vă conectați doar printr-o singură versiune IP, valorile " +"neutilizate pot fi eliminate." #. Type: string #. Description @@ -460,15 +460,15 @@ msgstr "Limita dimensiunii căsuței poștale (octeți):" #: ../templates:12001 msgid "" "Please specify the limit that Postfix should place on mailbox files to " -"constrain file system usage by a single file (potentially due to abusive mail " -"or software errors). A value of zero (0) means no limit. The upstream default " -"is 51200000." +"constrain file system usage by a single file (potentially due to abusive " +"mail or software errors). A value of zero (0) means no limit. The upstream " +"default is 51200000." msgstr "" -"Specificați limita pe care Postfix ar trebui să o impună fișierelor de căsuțe " -"poștale pentru a restricționa utilizarea sistemului de fișiere de către un " -"singur fișier (potențial din cauza corespondenței abuzive sau a erorilor de " -"software). O valoare de zero (0) înseamnă că nu există nicio limită. Valoarea " -"implicită stabilită de dezvoltatori este de 51200000." +"Specificați limita pe care Postfix ar trebui să o impună fișierelor de " +"căsuțe poștale pentru a restricționa utilizarea sistemului de fișiere de " +"către un singur fișier (potențial din cauza corespondenței abuzive sau a " +"erorilor de software). O valoare de zero (0) înseamnă că nu există nicio " +"limită. Valoarea implicită stabilită de dezvoltatori este de 51200000." #. Type: string #. Description @@ -514,11 +514,8 @@ msgstr "" "„root”, atunci trebuie să adăugați această intrare. Lăsați acest câmp gol " "pentru a nu adăuga nici o intrare." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Rulați comanda «newaliases»?" +#~ msgid "Run newaliases command?" +#~ msgstr "Rulați comanda «newaliases»?" #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "" @@ -561,6 +558,6 @@ msgstr "Rulați comanda «newaliases»?" #~ "dynamicmaps.cf to the version required for 3.0." #~ msgstr "" #~ "Versiunea 3.0 a Postfix modifică modul în care sunt livrate hărțile " -#~ "dinamice, iar fișierul „dynamicmaps.cf” nu reflectă acest lucru. Acceptați " -#~ "această opțiune pentru a converti „dynamicmaps.cf” la versiunea necesară " -#~ "pentru 3.0." +#~ "dinamice, iar fișierul „dynamicmaps.cf” nu reflectă acest lucru. " +#~ "Acceptați această opțiune pentru a converti „dynamicmaps.cf” la versiunea " +#~ "necesară pentru 3.0." diff --git a/debian/po/ru.po b/debian/po/ru.po index 1c3fef5..b74896c 100644 --- a/debian/po/ru.po +++ b/debian/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix_3.1.3-6_ru\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2017-01-08 20:07+0300\n" "Last-Translator: Sergey Alyoshin <alyoshin.s@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -16,8 +16,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: boolean #. Description @@ -548,12 +548,6 @@ msgstr "" "вам нужно добавить эту запись. Оставьте поле пустым, чтобы ничего не " "добавлять." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "Обновить настройки во избежание предупреждений о совместимости?" @@ -665,9 +659,10 @@ msgstr "" #~ "configuration (master.cf) refers to it: lmtp was merged into smtp long " #~ "ago. The install will be aborted if you do not allow the change." #~ msgstr "" -#~ "Данное обновление postfix прекращает поддержку символьной ссылки \"lmtp" -#~ "\", но её используют ваши настройки (master.cf). lmtp давно объединено с " -#~ "smtp. Установка будет прервана если вы не согласитесь с изменением." +#~ "Данное обновление postfix прекращает поддержку символьной ссылки " +#~ "\"lmtp\", но её используют ваши настройки (master.cf). lmtp давно " +#~ "объединено с smtp. Установка будет прервана если вы не согласитесь с " +#~ "изменением." #~ msgid "Add 'sqlite' entry to dynamicmaps.cf?" #~ msgstr "Добавить запись 'sqlite' в dynamicmaps.cf?" diff --git a/debian/po/sk.po b/debian/po/sk.po index 340a864..7a96745 100644 --- a/debian/po/sk.po +++ b/debian/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2016-12-30 23:05+0200\n" "Last-Translator: Ivan Masár <helix84@centrum.sk>\n" "Language-Team: x\n" @@ -533,12 +533,6 @@ msgstr "" "Ak už máte súbor /etc/aliases a nemá záznam používateľa root, mali by ste " "tento záznam pridať. Ak ho nechcete pridať, ponechajte toto pole prázdne." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Update configuration to avoid compatibility warnings?" #~ msgstr "" #~ "Aktualizovať konfiguráciu a predísť tak upozorneniam na nekompatibilitu?" diff --git a/debian/po/sv.po b/debian/po/sv.po index dfb818c..c1f21c0 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix_2.5.2-2_sv\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2024-01-26 15:27+0100\n" "Last-Translator: Martin Bagge / brother <brother@persilja.net>\n" "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" @@ -493,8 +493,5 @@ msgstr "" "detta läggas till. Lämna detta blankt för att inte lägga till någon " "instruktion." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "Ska newaliases-kommandot köras?" +#~ msgid "Run newaliases command?" +#~ msgstr "Ska newaliases-kommandot köras?" diff --git a/debian/po/ta.po b/debian/po/ta.po index a1b1039..b149b33 100644 --- a/debian/po/ta.po +++ b/debian/po/ta.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ta\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2008-01-21 13:07+0530\n" "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n" "Language-Team: Tamil <ubuntu>\n" @@ -530,12 +530,6 @@ msgstr "" "உங்களுக்கு ஏற்கெனவே /etc/aliases கோப்பு இருப்பின் நீங்கள் இந்த உள்ளீட்டை சேர்க்க வேண்டும். " "எதையும் சேர்க்க வேண்டாம் எனில் வெற்றாக விடவும்." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Add a 'mydomain' entry in main.cf for upgrade?" #~ msgstr "மேம்படுத்த main.cf இல் 'mydomain' உள்ளீடு ஒன்றை சேர்க்கலாமா?" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 72b7567..75fff15 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -413,9 +413,3 @@ msgid "" "If you already have a /etc/aliases file and it does not have an entry for " "root, then you should add this entry. Leave this blank to not add one." msgstr "" - -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" diff --git a/debian/po/tr.po b/debian/po/tr.po index 1931156..6be2711 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2023-02-14 21:24+0300\n" "Last-Translator: Atila KOÇ <koc@artielektronik.com.tr>\n" "Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n" @@ -494,8 +494,5 @@ msgstr "" "Eğer hazırda bir /etc/aliases dosyanız varsa ve bu dosyada 'root' girdisi " "yoksa, bu girdiyi eklemeniz gerekir. Girdi eklemeyecekseniz bunu boş bırakın." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "newaliases komutu çalıştırılsın mı?" +#~ msgid "Run newaliases command?" +#~ msgstr "newaliases komutu çalıştırılsın mı?" diff --git a/debian/po/vi.po b/debian/po/vi.po index 89c9ddb..c38f949 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: postfix 2.5.2-1\n" "Report-Msgid-Bugs-To: postfix@packages.debian.org\n" -"POT-Creation-Date: 2024-12-05 09:36+0300\n" +"POT-Creation-Date: 2024-12-13 00:06+0300\n" "PO-Revision-Date: 2008-05-30 18:56+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -571,12 +571,6 @@ msgstr "" "Nếu bạn đã có tập tin « /etc/aliases », bạn có thể cần phải thêm mục nhập " "này. Bỏ rỗng để không thêm." -#. Type: boolean -#. Description -#: ../templates:14001 -msgid "Run newaliases command?" -msgstr "" - #~ msgid "Add a 'mydomain' entry in main.cf for upgrade?" #~ msgstr "Têm mục nhập « mydomain » vào « main.cf » để nâng cấp không?" diff --git a/debian/postfix.postfix-resolvconf.path b/debian/postfix.postfix-resolvconf.path index 60380d2..34c69c6 100644 --- a/debian/postfix.postfix-resolvconf.path +++ b/debian/postfix.postfix-resolvconf.path @@ -1,11 +1,9 @@ [Unit] -Description=Watch for resolv.conf updates and restart postfix +Description=Watch for resolv.conf updates for postfix ConditionPathExists=/etc/resolv.conf [Path] PathChanged=/etc/resolv.conf -Unit=postfix-resolvconf.service [Install] WantedBy=multi-user.target - diff --git a/debian/postfix.postfix-resolvconf.service b/debian/postfix.postfix-resolvconf.service index 0072957..38eeb08 100644 --- a/debian/postfix.postfix-resolvconf.service +++ b/debian/postfix.postfix-resolvconf.service @@ -1,10 +1,9 @@ +# Update postfix in-chroot copy of /etc/resolv.conf +# Works for main/default postfix instance only [Unit] -Description=Copies updated resolv.conf to postfix chroot and restarts postfix. +Description=Updates postfix copy of resolv.conf Documentation=man:postfix(1) man:resolvconf(8) [Service] -Type=simple +Type=oneshot ExecStart=/etc/resolvconf/update-libc.d/postfix - -[Install] -WantedBy=multi-user.target diff --git a/debian/rules b/debian/rules index 1b811ae..3e7b051 100755 --- a/debian/rules +++ b/debian/rules @@ -9,46 +9,71 @@ export SHELL = /bin/sh -e DISTRO:=$(shell (lsb_release -is 2>/dev/null || echo Debian) | sed s:Debian:Debian/GNU:) -export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto +export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto future=+lfs +# Extra hardening flags (level 3): +# https://developers.redhat.com/articles/2022/09/17/gccs-new-fortification-level +# https://fedoraproject.org/wiki/Changes/Add_FORTIFY_SOURCE%3D3_to_distribution_build_flags +export DEB_CPPFLAGS_MAINT_APPEND = -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 export DEB_LDFLAGS_MAINT_STRIP = -Wl,-Bsymbolic-functions DPKG_EXPORT_BUILDFLAGS = 1 + +include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/buildflags.mk include /usr/share/dpkg/buildtools.mk # for ${CC} include /usr/share/dpkg/pkg-info.mk +# list of packages we build (cache it to avoid extra execs) +export POSTFIX_PACKAGES_2BUILD ?= $(shell dh_listpackages) + package=postfix base=debian/${package} prvlibdir=/usr/lib/postfix daemondir=/usr/lib/postfix/sbin docdir=/usr/share/doc/${package} -maps = cdb ldap lmdb mongodb mysql pcre pgsql sqlite + +maps = cdb ldap lmdb mysql pcre pgsql sqlite # sed ERE for postfix-files to select files for the doc package docfiles-re = \$$(sample|readme|html)_directory -CCARGS += -DDEBIAN \ +CCARGS = \ + -DDEBIAN \ -DHAS_PCRE=2 $(shell pcre2-config --cflags) \ -DHAS_LDAP \ -DUSE_LDAP_SASL \ -DHAS_SQLITE \ -DMYORIGIN_FROM_FILE \ - $(shell getconf LFS_CFLAGS) \ -DHAS_CDB \ -DHAS_LMDB \ - -DHAS_MONGODB -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 \ -DHAS_MYSQL -I/usr/include/mysql \ -DHAS_PGSQL -I$(shell pg_config --includedir) \ -DHAS_SQLITE \ -DHAS_SSL -I/usr/include/openssl \ -DUSE_SASL_AUTH -I/usr/include/sasl \ -DUSE_CYRUS_SASL \ - -DUSE_TLS + -DUSE_TLS \ -AUXLIBS += -lssl -lcrypto -lsasl2 -lpthread +CONFARGS = \ + DEBUG='' \ + OPT="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" \ + PLUGIN_LD="${CC} -shared ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" \ + SHLIB_RPATH="-Wl,-rpath,${prvlibdir} ${LDFLAGS}" \ + AUXLIBS="${AUXLIBS}" \ + AUXLIBS_CDB="-lcdb" \ + AUXLIBS_LDAP="-lldap -llber" \ + AUXLIBS_LMDB="-llmdb" \ + AUXLIBS_MYSQL="-lmysqlclient" \ + AUXLIBS_PCRE="$(shell pcre2-config --libs8)" \ + AUXLIBS_PGSQL="-lpq" \ + AUXLIBS_SQLITE="-lsqlite3" \ -# Extra hardening flags -export DEB_CPPFLAGS_MAINT_APPEND = -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 +AUXLIBS = -lssl -lcrypto -lsasl2 -lpthread +ifneq (,$(filter ${package}-mongodb,${POSTFIX_PACKAGES_2BUILD})) +maps += mongodb +CCARGS += -DHAS_MONGODB -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 +CONFARGS += AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0" +endif %: dh $@ @@ -58,19 +83,7 @@ override_dh_auto_configure: touch .makefiles-made ${MAKE} \ CCARGS="${CCARGS}" \ - DEBUG='' \ - OPT="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" \ - PLUGIN_LD="${CC} -shared ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}" \ - AUXLIBS="${AUXLIBS}" \ - AUXLIBS_CDB="-lcdb" \ - AUXLIBS_LDAP="-lldap -llber" \ - AUXLIBS_LMDB="-llmdb" \ - AUXLIBS_MONGODB="-lmongoc-1.0 -lbson-1.0" \ - AUXLIBS_MYSQL="-lmysqlclient" \ - AUXLIBS_PCRE="$(shell pcre2-config --libs8)" \ - AUXLIBS_PGSQL="-lpq" \ - AUXLIBS_SQLITE="-lsqlite3" \ - SHLIB_RPATH="-Wl,-rpath,${prvlibdir} ${LDFLAGS}" \ + ${CONFARGS} \ shared=yes pie=yes dynamicmaps=yes \ daemon_directory=${daemondir} \ shlib_directory=${prvlibdir} \ @@ -183,9 +196,9 @@ override_dh_install-arch: pkgdir=${base}-$$map; \ install lib/postfix-$$map.so -D -t $$pkgdir${prvlibdir}/ ; \ mkdir -p $$pkgdir/etc/postfix/postfix-files.d ; \ - grep -E "\\b$$map[._]" ${base}/etc/postfix/postfix-files > \ + grep "postfix-$$map\\.so" ${base}/etc/postfix/postfix-files > \ $$pkgdir/etc/postfix/postfix-files.d/$$map.files ; \ - sed -i "/\\b$$map[._]/D" ${base}/etc/postfix/postfix-files ; \ + sed -i "/postfix-$$map\\.so/D" ${base}/etc/postfix/postfix-files ; \ { echo '. /usr/share/postfix/postinst.functions' ; \ echo "[ configure != \"\$$1\" ] || addmap \"$$map\"" ; \ } > debian/postfix-$$map.postinst.debhelper ; \ @@ -193,16 +206,11 @@ override_dh_install-arch: echo "[ remove != \"\$$1\" -a purge != \"\$$1\" ] || delmap \"$$map\"" ; \ } > debian/postfix-$$map.prerm.debhelper ; \ done -# manpages for dynamic maps (there's no cdb_table manpage) - for map in $(filter-out cdb, ${maps}); do \ - pkgdir=${base}-$$map; \ - mkdir -m755 -p $$pkgdir/usr/share/man/man5 ; \ - mv ${base}/usr/share/man/man5/$${map}_table.5 \ - $$pkgdir/usr/share/man/man5 ; \ - done # debian-specific and extra addons install -m0644 debian/functions -T ${base}/usr/share/postfix/postinst.functions - install -m0755 debian/configure-instance.sh -t ${base}${prvlibdir}/ + sed 's/@MULTIARCH@/${DEB_HOST_MULTIARCH}/' debian/configure-instance.in > \ + ${base}${prvlibdir}/configure-instance.sh + chmod 0755 ${base}${prvlibdir}/configure-instance.sh install -m0755 \ debian/postfix-add-filter \ debian/postfix-add-policy \ @@ -236,9 +244,6 @@ override_dh_installsystemd: -Dt ${base}/$(shell pkg-config --variable=systemdsystemgeneratordir systemd)/ execute_before_dh_gencontrol: - for i in $$(dh_listpackages) ; do \ - cat debian/vars.in >> debian/$$i.substvars ; \ - done echo ${package}:Provides=default-mta \ >> debian/${package}.substvars diff --git a/debian/tests/control b/debian/tests/control index 63dcbb8..1b89db1 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -4,5 +4,6 @@ Depends: libsasl2-modules, procmail, python3, python3-pexpect, - sasl2-bin + sasl2-bin, + ssl-cert, Restrictions: needs-root diff --git a/debian/tests/test-postfix.py b/debian/tests/test-postfix.py index 7e18c6f..e13851b 100644 --- a/debian/tests/test-postfix.py +++ b/debian/tests/test-postfix.py @@ -27,7 +27,7 @@ not work if "Local Only" was selected. How to run against a clean schroot named 'hardy': - schroot -c hardy -u root -- sh -c 'apt-get -y install procmail python-unit postfix sasl2-bin python-pexpect lsb-release && ./test-postfix.py -v' + schroot -c hardy -u root -- sh -c 'apt-get -y install procmail python-unit postfix sasl2-bin python-pexpect lsb-release ssl-cert && ./test-postfix.py -v' Tests: 00: setup diff --git a/debian/update-libc.d b/debian/update-libc.d index 84e954b..d071430 100644 --- a/debian/update-libc.d +++ b/debian/update-libc.d @@ -1,13 +1,7 @@ -#!/bin/sh -e - -# we only need to copy this in if the service is already running. -# if it's not running, it'll get picked up by the init script on start. -/usr/sbin/service postfix status >/dev/null 2>&1 || exit 0 - -QUEUEDIR="$(/usr/sbin/postconf -hx queue_directory 2>/dev/null || true)" -if [ -n "$QUEUEDIR" ]; then - cp /etc/resolv.conf "${QUEUEDIR}/etc/resolv.conf" - /usr/sbin/service postfix reload >/dev/null 2>&1 || exit 0 +#! /bin/sh +# update postfix copy of resolv.conf; only default instance is handled +file=/etc/resolv.conf queue=/var/spool/postfix +if [ -d $queue${file%/*} ] && [ -f /etc/postfix/main.cf ] +then # just refresh, glibc pick it up automatically + [ ! -f $file ] && rm -f $queue$file || cp -pLu $file $queue$file fi - -exit 0 diff --git a/debian/vars.in b/debian/vars.in deleted file mode 100644 index a3d6139..0000000 --- a/debian/vars.in +++ /dev/null @@ -1 +0,0 @@ -Description=Postfix is Wietse Venema's mail transport agent that started life as an${Newline}alternative to the widely-used Sendmail program. Postfix attempts to${Newline}be fast, easy to administer, and secure, while at the same time being${Newline}sendmail compatible enough to not upset existing users. Thus, the outside${Newline}has a sendmail-ish flavor, but the inside is completely different. |