diff --git a/PKGBUILD b/PKGBUILD
index eece3e4e56191901441fd869c120fcbcaefe10d5..38f052c358c3165e0aa395f055542830507b1be8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,34 +6,44 @@
pkgbase=postfix
pkgname=(postfix postfix-cdb postfix-ldap postfix-lmdb postfix-mysql
postfix-pcre postfix-pgsql postfix-sqlite)
-pkgver=3.7.3
-pkgrel=4
+pkgver=3.7.4
+pkgrel=1
pkgdesc="Fast, easy to administer, secure mail server"
arch=(x86_64)
url="http://www.postfix.org/"
license=(EPL)
depends=(glibc)
-makedepends=(db icu libldap libnsl libsasl lmdb mariadb-libs openssl pcre2
-postgresql-libs sqlite tinycdb zlib)
+makedepends=(
+ db
+ icu
+ libldap
+ libnsl
+ libsasl
+ lmdb
+ mariadb-libs
+ openssl
+ pcre2
+ postgresql-libs
+ sqlite
+ tinycdb
+ zlib
+)
source=(
- https://de.postfix.org/ftpmirror/official/$pkgname-$pkgver.tar.gz
- $pkgname-$pkgver.tar.gz.sig::https://de.postfix.org/ftpmirror/official/$pkgname-$pkgver.tar.gz.gpg2
- linux6.patch
- $pkgname-3.5.8-main_defaults.patch
- $pkgname.service
- $pkgname.sysusers
- $pkgname.tmpfiles
+ https://de.postfix.org/ftpmirror/official/$pkgbase-$pkgver.tar.gz
+ $pkgbase-$pkgver.tar.gz.sig::https://de.postfix.org/ftpmirror/official/$pkgbase-$pkgver.tar.gz.gpg2
+ $pkgbase-3.5.8-main_defaults.patch
+ $pkgbase.service
+ $pkgbase.sysusers
+ $pkgbase.tmpfiles
)
-sha512sums=('4ceedd1b7b364f47a3becc041cf29a48aea54e38306fd1227c5a7c25894831fb5c37150d99d781d237175e58da21ac53887c97d99bb6b715c4988777596ee890'
+sha512sums=('972738291b960c90fe83861d55b1288900416167adb353418956e69bcc709a6daf84fbfde11d573eebba030654d27abc8d55f90661a2b880ccfb3a334064c236'
'SKIP'
- '3557a530095b36e9e3db4e085dbdff1ed9a52a1e14113cbf7f2a5e3406516bac1f58b346c236133aebdece2a77bbedac09b1ce06ee6b6bd75497454741bff8e7'
'7b2785aa8120ca3ff91b405baf675e9e11f8d58b18a9b842672e7ae30932febddac10556a70823d8746fcb160bceb4dbabdee45cf46b02fc0127057656fb85c4'
'27f54747ad480d65b560c9dbc97e12c6353e4bceca0ffe3e358e31de56db0ad79928164c9f8790c73a9f791daa378253d2ee29b5a766661778553ec889b2cf97'
'a7f15970f613ae7b98ce1b84ca0a6034ce3cc7b2b9ce7160dad9731f740fb762f4a54f44acceb5f06f8744fa9e952b088086af8a69da388a600b742a3cda37f2'
'd08574a6acd595fc146513c92dc1bb341c3432d67de1e93ab73a7ce60e385dd34f3a55e3d3d7aec5f358ac4aae260f028599ac47650ebc663cea3043a760a7bc')
-b2sums=('005abf49b27e59bd3e3251e345df4da0c830314c4d4478aee11057163166afa1a0159017c46bead6572d29d9738a18e1a42a0b72fe260facd3ad77f8ed309271'
+b2sums=('edb716ef4576d339189f11b535a62f3c6f8f28613723d916f13cdd2d37228aa8768dacdb9d8616c83f0ded3a3c801c45747375ea6cfa505b668a7163c4637128'
'SKIP'
- 'a978f3a02f6aef4bfd48f7ea1e373e37c0f1471afad1c98224a23e5f63b63ed679d7b29043dc4c8baefb6af20228876c496d532499e9335c15d7596f20f525b5'
'b5f19e0619f1fb017cd889c14e341c21146b3afe7b9eefcdb7fb1eb83a357434b899d1e92f3ab0023c78ef8f2de6ae54c4599ee0f0bd04d257f4ca0a4dc9a16c'
'02dd441cf6e4a7c2bc0de876f020b0784d811f77a5c6102dd075d67b07158dbc53c8b4d62bc8035283d4f349008574b1c3fac03f4519d56ffd809cb5bcfb7bea'
'db58b7deb24cea16fb84f56680f0000683f72e11a95039969878e3819607aad5e65af9d9f50007e7710609065c0e3ebb9b30c1d929162b74eca5e74434d82cf1'
@@ -51,14 +61,12 @@ _pick() {
}
prepare() {
- # support Linux 6.x
- patch -Np2 -d $pkgbase-$pkgver -i ../linux6.patch
# add distribution defaults to main.cf (alias_maps and alias_database)
patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.5.8-main_defaults.patch
}
build() {
- local _ccargs=(
+ local ccargs=(
'-fPIC' '-fcommon'
'-DUSE_SASL_AUTH'
'-DUSE_CYRUS_SASL' '-I/usr/include/sasl'
@@ -77,26 +85,26 @@ build() {
'-DDEF_README_DIR=\"/usr/share/doc/postfix\"'
'-DDEF_MANPAGE_DIR=\"/usr/share/man\"'
)
+ # NOTE: descriptions of options in makedefs
+ local make_options=(
+ DEBUG=''
+ pie=yes
+ shared=yes
+ dynamicmaps=yes
+ CCARGS="${ccargs[*]}"
+ AUXLIBS="$(pkgconf --libs openssl libsasl2) -lnsl"
+ AUXLIBS_LDAP='-lldap -llber'
+ AUXLIBS_LMDB="$(pkgconf --libs lmdb)"
+ AUXLIBS_PCRE="$(pcre2-config --libs8)"
+ AUXLIBS_MYSQL="$(pkgconf --libs mariadb)"
+ AUXLIBS_PGSQL="$(pkgconf --libs libpq)"
+ AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)"
+ AUXLIBS_CDB='-lcdb'
+ SHLIB_RPATH="-Wl,-rpath,/usr/lib/postfix $LDFLAGS"
+ OPT="$CFLAGS $CPPFLAGS $LDFLAGS"
+ )
- # NOTE: descriptions of variables in makedefs
- make makefiles \
- DEBUG='' \
- pie=yes \
- shared=yes \
- dynamicmaps=yes \
- CCARGS="${_ccargs[*]}" \
- AUXLIBS="$(pkgconf --libs openssl libsasl2) -lnsl" \
- AUXLIBS_LDAP='-lldap -llber' \
- AUXLIBS_LMDB="$(pkgconf --libs lmdb)" \
- AUXLIBS_PCRE="$(pcre2-config --libs8)" \
- AUXLIBS_MYSQL="$(pkgconf --libs mariadb)" \
- AUXLIBS_PGSQL="$(pkgconf --libs libpq)" \
- AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)" \
- AUXLIBS_CDB='-lcdb' \
- SHLIB_RPATH="-Wl,-rpath,/usr/lib/postfix $LDFLAGS" \
- OPT="$CFLAGS $CPPFLAGS $LDFLAGS" \
- -C $pkgbase-$pkgver
-
+ make makefiles "${make_options[@]}" -C $pkgbase-$pkgver
make -C $pkgbase-$pkgver
}
@@ -108,7 +116,14 @@ package_postfix() {
local _files_file="$pkgdir/etc/$pkgbase/$pkgbase-files"
local _files_dir="$pkgdir/etc/$pkgbase/$pkgbase-files.d"
- depends+=(db libsasl openssl zlib libicuuc.so libnsl.so)
+ depends+=(
+ db
+ icu libicuuc.so
+ libnsl libnsl.so
+ libsasl libsasl2.so
+ openssl libcrypto.so libssl.so
+ zlib
+ )
optdepends=(
'perl: for postfix-collate.pl, postfix-tlstype.pl and qshape'
'postfix-cdb: for CDB integration'
@@ -193,49 +208,70 @@ package_postfix() {
}
package_postfix-cdb() {
- depends+=(postfix libcdb.so)
+ depends+=(
+ postfix
+ tinycdb libcdb.so
+ )
pkgdesc+=' (CDB integration)'
mv -v $pkgname/* "$pkgdir"
}
package_postfix-ldap() {
- depends+=(postfix libldap)
+ depends+=(
+ libldap
+ postfix
+ )
pkgdesc+=' (LDAP integration)'
mv -v $pkgname/* "$pkgdir"
}
package_postfix-lmdb() {
- depends+=(lmdb postfix)
+ depends+=(
+ lmdb
+ postfix
+ )
pkgdesc+=' (LMDB integration)'
mv -v $pkgname/* "$pkgdir"
}
package_postfix-mysql() {
- depends+=(postfix libmariadb.so)
+ depends+=(
+ mariadb-libs libmariadb.so
+ postfix
+ )
pkgdesc+=' (MySQL integration)'
mv -v $pkgname/* "$pkgdir"
}
package_postfix-pcre() {
- depends+=(pcre2 postfix)
+ depends+=(
+ pcre2 libpcre2-8.so
+ postfix
+ )
pkgdesc+=' (PCRE integration)'
mv -v $pkgname/* "$pkgdir"
}
package_postfix-pgsql() {
- depends+=(postfix libpq.so)
+ depends+=(
+ postfix
+ postgresql-libs libpq.so
+ )
pkgdesc+=' (PostgreSQL integration)'
mv -v $pkgname/* "$pkgdir"
}
package_postfix-sqlite() {
- depends+=(postfix sqlite)
+ depends+=(
+ postfix
+ sqlite libsqlite3.so
+ )
pkgdesc+=' (SQLite integration)'
mv -v $pkgname/* "$pkgdir"
diff --git a/linux6.patch b/linux6.patch
deleted file mode 100644
index 3bdaa9d224b79b0d3e9cbad2f9e403dbb40f65e6..0000000000000000000000000000000000000000
--- a/linux6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b65530350fa4a7eee40946160fd80c3e1e0b63e5 Mon Sep 17 00:00:00 2001
-From: Wietse Venema <wietse@porcupine.org>
-Date: Thu, 6 Oct 2022 00:00:00 -0500
-Subject: [PATCH] postfix-3.8-20221006
-
----
- postfix/makedefs | 3 ++-
- postfix/src/util/sys_defs.h | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/postfix/makedefs b/postfix/makedefs
-index 2839f3a8..9e061b37 100644
---- a/postfix/makedefs
-+++ b/postfix/makedefs
-@@ -627,7 +627,8 @@ EOF
- : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
- : ${PLUGIN_LD="${CC-gcc} -shared"}
- ;;
-- Linux.[345].*) SYSTYPE=LINUX$RELEASE_MAJOR
-+ Linux.[3456].*)
-+ SYSTYPE=LINUX$RELEASE_MAJOR
- case "$CCARGS" in
- *-DNO_DB*) ;;
- *-DHAS_DB*) ;;
-diff --git a/postfix/src/util/sys_defs.h b/postfix/src/util/sys_defs.h
-index c9ebc337..37e460f9 100644
---- a/postfix/src/util/sys_defs.h
-+++ b/postfix/src/util/sys_defs.h
-@@ -751,7 +751,8 @@ extern int initgroups(const char *, int);
- /*
- * LINUX.
- */
--#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5)
-+#if defined(LINUX2) || defined(LINUX3) || defined(LINUX4) || defined(LINUX5) \
-+ || defined(LINUX6)
- #define SUPPORTED
- #define UINT32_TYPE unsigned int
- #define UINT16_TYPE unsigned short