diff --git a/PKGBUILD b/PKGBUILD index bcfcd8d87bb44b4de270316ad09f8928e079e56e..cad809dfa9130d87d268cfaf8860e6af90a742d6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ license=( ) depends=(glibc) makedepends=( - db5.3 + db icu libldap libnsl @@ -37,7 +37,6 @@ source=( 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-3.8.4-db53.patch $pkgbase.service $pkgbase.sysusers $pkgbase.tmpfiles @@ -45,14 +44,12 @@ source=( sha512sums=('5bae3d62e104714aead1fff28a595bab4315227382f53c8dae2a231f4240e31abda19c1e3befc1db4c89bc5d66c9a43830390365aadabdac5cf36b493c5c48c7' 'SKIP' '7b2785aa8120ca3ff91b405baf675e9e11f8d58b18a9b842672e7ae30932febddac10556a70823d8746fcb160bceb4dbabdee45cf46b02fc0127057656fb85c4' - '9a431ce829355b259b6cb617e983ab96b370185280abcbcc82268c2e9fc4e9d34a215720e83e66a4fb30b7f7fc4293491ba9fe6077c326f2cec68d259c333e47' '27f54747ad480d65b560c9dbc97e12c6353e4bceca0ffe3e358e31de56db0ad79928164c9f8790c73a9f791daa378253d2ee29b5a766661778553ec889b2cf97' 'a7f15970f613ae7b98ce1b84ca0a6034ce3cc7b2b9ce7160dad9731f740fb762f4a54f44acceb5f06f8744fa9e952b088086af8a69da388a600b742a3cda37f2' 'd08574a6acd595fc146513c92dc1bb341c3432d67de1e93ab73a7ce60e385dd34f3a55e3d3d7aec5f358ac4aae260f028599ac47650ebc663cea3043a760a7bc') b2sums=('200ce3d72444da05e42fc8627002d53d68c1b3d78b7f74b0130ac958c23d16454783ef4849a8c9a4e3cba8ae36646e921f7e94ac4fb819b597e1a5ab1a875272' 'SKIP' 'b5f19e0619f1fb017cd889c14e341c21146b3afe7b9eefcdb7fb1eb83a357434b899d1e92f3ab0023c78ef8f2de6ae54c4599ee0f0bd04d257f4ca0a4dc9a16c' - '44c58ddcf8b2b7dd86c59c2aaf50c5656f86145c3d351ac819104d379516909a341509eefd371c33c51c10cbca5acf860a12a89d102d4fdb6d5a1add37176ac4' '02dd441cf6e4a7c2bc0de876f020b0784d811f77a5c6102dd075d67b07158dbc53c8b4d62bc8035283d4f349008574b1c3fac03f4519d56ffd809cb5bcfb7bea' 'db58b7deb24cea16fb84f56680f0000683f72e11a95039969878e3819607aad5e65af9d9f50007e7710609065c0e3ebb9b30c1d929162b74eca5e74434d82cf1' 'de31693cea5f452a9c8c0d1cf5210a6e67c0176f8b1a4d74106f2e803911569e9fdbb2301b3b5dc7ad6a6da285026b1a3ed3de52117d216b030cf0d92348909d') @@ -71,9 +68,6 @@ _pick() { prepare() { # add distribution defaults to main.cf (alias_maps and alias_database) patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.5.8-main_defaults.patch - - # allow building against against db5.3 - patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.8.4-db53.patch } build() { @@ -128,7 +122,7 @@ package_postfix() { local _files_dir="$pkgdir/etc/$pkgbase/$pkgbase-files.d" depends+=( - db5.3 + db icu libicuuc.so libnsl libnsl.so libsasl libsasl2.so diff --git a/postfix-3.8.4-db53.patch b/postfix-3.8.4-db53.patch deleted file mode 100644 index 7805cff43a0ba8cdf00c5f1dff3a10586b8d8b33..0000000000000000000000000000000000000000 --- a/postfix-3.8.4-db53.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/makedefs b/makedefs -index 005e4b3..a58bd08 100644 ---- a/makedefs -+++ b/makedefs -@@ -555,21 +555,8 @@ case "$SYSTEM.$RELEASE" in - case "$CCARGS" in - *-DNO_DB*) ;; - *-DHAS_DB*) ;; -- *) if [ -f /usr/include/db.h ] -- then -- : we are all set -- elif [ -f /usr/include/db/db.h ] -- then -- CCARGS="$CCARGS -I/usr/include/db" -- else -- # No, we're not going to try db1 db2 db3 etc. -- # On a properly installed system, Postfix builds -- # by including <db.h> and by linking with -ldb -- echo "No <db.h> include file found." 1>&2 -- echo "Install the appropriate db*-devel package first." 1>&2 -- exit 1 -- fi -- SYSLIBS="-ldb" -+ *) CCARGS="$CCARGS -I/usr/include/db5.3" -+ SYSLIBS="-ldb5.3" - ;; - esac - for name in nsl resolv $GDBM_LIBS