diff -u postfix-2.11.0/debian/changelog postfix-2.11.0/debian/changelog --- postfix-2.11.0/debian/changelog +++ postfix-2.11.0/debian/changelog @@ -1,3 +1,17 @@ +postfix (2.11.0-1ubuntu1.2) trusty; urgency=medium + + * makedefs, src/util/sys_defs.h: Fix FTBFS with prior upload. + - Source assumes only Linux 3.x kernels exist, but HWE in trusty is + at 4.4. + + -- Nishanth Aravamudan Fri, 18 Aug 2017 18:13:13 -0700 + +postfix (2.11.0-1ubuntu1.1) trusty; urgency=medium + + * Ignore broken symbolic links during ca_cert check (Closes LP: #1305232) + + -- Joshua Powers Wed, 19 Jul 2017 14:38:08 -0700 + postfix (2.11.0-1ubuntu1) trusty; urgency=low * support postfix/protocols (LP: #583216) diff -u postfix-2.11.0/debian/control postfix-2.11.0/debian/control --- postfix-2.11.0/debian/control +++ postfix-2.11.0/debian/control @@ -1,7 +1,8 @@ Source: postfix Section: mail Priority: extra -Maintainer: LaMont Jones +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: LaMont Jones Standards-Version: 3.9.1.0 Homepage: http://www.postfix.org Build-Depends: debhelper (>= 7), po-debconf (>= 0.5.0), groff-base, patch, lsb-release, libdb-dev (>=4.6.19), libldap2-dev (>=2.1), libpcre3-dev, libmysqlclient-dev|libmysqlclient15-dev|libmysqlclient14-dev, libssl-dev (>=0.9.7), libsasl2-dev, libpq-dev, libcdb-dev, hardening-wrapper, dpkg-dev (>= 1.15.5), libsqlite3-dev diff -u postfix-2.11.0/debian/init.d postfix-2.11.0/debian/init.d --- postfix-2.11.0/debian/init.d +++ postfix-2.11.0/debian/init.d @@ -109,7 +109,7 @@ fi mkdir --parent ${dest_dir} # handle files in subdirectories - (cd "$ca_path" && find . -name '*.pem' -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || + (cd "$ca_path" && find . -name '*.pem' -not -xtype l -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || (log_failure_msg failure copying certificates; exit 1) c_rehash "$dest_dir" >/dev/null 2>&1 if [ "$new" = 1 ]; then diff -u postfix-2.11.0/makedefs postfix-2.11.0/makedefs --- postfix-2.11.0/makedefs +++ postfix-2.11.0/makedefs @@ -109,6 +109,8 @@ # Officially supported usage. 0) SYSTEM=`(uname -s) 2>/dev/null` RELEASE=`(uname -r) 2>/dev/null` + # No ${x%%y} support in Solaris 11 /bin/sh + RELEASE_MAJOR=`expr "$RELEASE" : '\([0-9]*\)'` || exit 1 VERSION=`(uname -v) 2>/dev/null` case "$VERSION" in dcosx*) SYSTEM=$VERSION;; @@ -369,7 +371,7 @@ fi;; esac ;; - Linux.3*) SYSTYPE=LINUX3 + Linux.[34].*) SYSTYPE=LINUX$RELEASE_MAJOR case "$CCARGS" in *-DNO_DB*) ;; *-DHAS_DB*) ;; diff -u postfix-2.11.0/src/util/sys_defs.h postfix-2.11.0/src/util/sys_defs.h --- postfix-2.11.0/src/util/sys_defs.h +++ postfix-2.11.0/src/util/sys_defs.h @@ -755,7 +755,7 @@ /* * LINUX. */ -#if defined(LINUX2) || defined(LINUX3) +#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) #define SUPPORTED #include #define UINT32_TYPE unsigned int