Upgrade to 3.7.1.

Remove unneeded quotes and curly braces.

Upgrade to 3.7.1.
37cea92a · David Runge · 7ff74a83 · 37cea92a
Commit 37cea92a authored 2 years ago by David Runge
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=postfix
 pkgname=(postfix postfix-cdb postfix-ldap postfix-lmdb postfix-mysql
 postfix-pcre postfix-pgsql postfix-sqlite)
-pkgver=3.7.0
-pkgrel=3
+pkgver=3.7.1
+pkgrel=1
 pkgdesc="Fast, easy to administer, secure mail server"
 arch=(x86_64)
 url="http://www.postfix.org/"
@@ -16,20 +16,21 @@ depends=(glibc)
 makedepends=(db icu libldap libnsl libsasl lmdb mariadb-libs openssl pcre2
 postgresql-libs sqlite tinycdb zlib)
 options=(debug)
-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"
-        "${pkgname}-3.5.8-main_defaults.patch"
-        "${pkgname}.service"
-        "${pkgname}.sysusers"
-        "${pkgname}.tmpfiles"
+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
+  $pkgname-3.5.8-main_defaults.patch
+  $pkgname.service
+  $pkgname.sysusers
+  $pkgname.tmpfiles
 )
-sha512sums=('f2fb5c0399100c19e428b68728a8ce62b1fb74d365038373f22ed698c1d0fece506b3f1335c322b949875a4a9fa96fa0a7680b12641d596d09615e8fef061da4'
+sha512sums=('2a8916eae4b0a4f4e055e1dbae1b9655b1eabcb22d911599a63fb9a1900174c9eab24280bee2ddab42db6674c6b4362964a2a41f67fcb18f0c8c41ad0100b044'
            'SKIP'
            '7b2785aa8120ca3ff91b405baf675e9e11f8d58b18a9b842672e7ae30932febddac10556a70823d8746fcb160bceb4dbabdee45cf46b02fc0127057656fb85c4'
            '27f54747ad480d65b560c9dbc97e12c6353e4bceca0ffe3e358e31de56db0ad79928164c9f8790c73a9f791daa378253d2ee29b5a766661778553ec889b2cf97'
            'a7f15970f613ae7b98ce1b84ca0a6034ce3cc7b2b9ce7160dad9731f740fb762f4a54f44acceb5f06f8744fa9e952b088086af8a69da388a600b742a3cda37f2'
            'd08574a6acd595fc146513c92dc1bb341c3432d67de1e93ab73a7ce60e385dd34f3a55e3d3d7aec5f358ac4aae260f028599ac47650ebc663cea3043a760a7bc')
-b2sums=('7388ad49862c97e20179a2d3ed26069f21e8a578790fcb8adc9f5b648202269bd4c07905931237dab905d991002bcfd9f03d11e6a85b46fcf0e3b72412d852eb'
+b2sums=('d0bfdbc5105407e5143823e8e14b49e60d5c248eac435279a5fe803b370b46a56de9aff39fdf94398758863f753e43e889e2dffbb393ab63cf486d4fd3f5cf99'
        'SKIP'
        'b5f19e0619f1fb017cd889c14e341c21146b3afe7b9eefcdb7fb1eb83a357434b899d1e92f3ab0023c78ef8f2de6ae54c4599ee0f0bd04d257f4ca0a4dc9a16c'
        '02dd441cf6e4a7c2bc0de876f020b0784d811f77a5c6102dd075d67b07158dbc53c8b4d62bc8035283d4f349008574b1c3fac03f4519d56ffd809cb5bcfb7bea'
@@ -48,9 +49,8 @@ _pick() {
 }

 prepare() {
-  cd "${pkgbase}-${pkgver}"
  # add distribution defaults to main.cf (alias_maps and alias_database)
-  patch -Np1 -i ../"${pkgbase}-3.5.8-main_defaults.patch"
+  patch -Np1 -d $pkgbase-$pkgver -i ../$pkgbase-3.5.8-main_defaults.patch
 }

 build() {
@@ -74,7 +74,6 @@ build() {
    '-DDEF_MANPAGE_DIR=\"/usr/share/man\"'
  )

-  cd "${pkgbase}-${pkgver}"
  # NOTE: descriptions of variables in makedefs
  make makefiles \
    DEBUG='' \
@@ -90,19 +89,20 @@ build() {
    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}"
+    SHLIB_RPATH="-Wl,-rpath,/usr/lib/postfix $LDFLAGS" \
+    OPT="$CFLAGS $CPPFLAGS $LDFLAGS" \
+    -C $pkgbase-$pkgver

-  make
+  make -C $pkgbase-$pkgver
 }

 package_postfix() {
  local _name _feature

-  local _dynamicmaps_file="${pkgdir}/etc/${pkgbase}/dynamicmaps.cf"
-  local _dynamicmaps_dir="${pkgdir}/etc/${pkgbase}/dynamicmaps.cf.d"
-  local _files_file="${pkgdir}/etc/${pkgbase}/${pkgbase}-files"
-  local _files_dir="${pkgdir}/etc/${pkgbase}/${pkgbase}-files.d"
+  local _dynamicmaps_file="$pkgdir/etc/$pkgbase/dynamicmaps.cf"
+  local _dynamicmaps_dir="$pkgdir/etc/$pkgbase/dynamicmaps.cf.d"
+  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)
  optdepends=(
@@ -118,54 +118,54 @@ package_postfix() {
  conflicts=(smtp-server smtp-forwarder)
  provides=(smtp-server smtp-forwarder)
  backup=(etc/postfix/{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
-  install="${pkgbase}.install"
+  install=$pkgbase.install

-  cd "${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
  LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" \
-  sh postfix-install -non-interactive install_root="${pkgdir}"
+  sh postfix-install -non-interactive install_root="$pkgdir"

  # additional man pages and scripts
  for _name in posttls-finger {smtp,qmqp}-{sink,source}; do
-    install -vDm 644 "man/man1/${_name}.1" -t "${pkgdir}/usr/share/man/man1/"
-    install -vDm 755 "bin/${_name}" -t "${pkgdir}/usr/bin/"
+    install -vDm 644 man/man1/$_name.1 -t "$pkgdir/usr/share/man/man1/"
+    install -vDm 755 bin/$_name -t "$pkgdir/usr/bin/"
  done
-  install -vDm 644 "man/man1/qshape.1" -t "${pkgdir}/usr/share/man/man1/"
-  install -vDm 755 "auxiliary/qshape/qshape.pl" "${pkgdir}/usr/bin/qshape"
-  install -vDm 755 "auxiliary/collate/collate.pl" "${pkgdir}/usr/bin/postfix-collate.pl"
-  install -vDm 755 "auxiliary/collate/tlstype.pl" "${pkgdir}/usr/bin/postfix-tlstype.pl"
-  install -vDm 644 "auxiliary/collate/README"* -t "${pkgdir}/usr/share/doc/${pkgname}/collate/"
+  install -vDm 644 man/man1/qshape.1 -t "$pkgdir/usr/share/man/man1/"
+  install -vDm 755 auxiliary/qshape/qshape.pl "$pkgdir/usr/bin/qshape"
+  install -vDm 755 auxiliary/collate/collate.pl "$pkgdir/usr/bin/postfix-collate.pl"
+  install -vDm 755 auxiliary/collate/tlstype.pl "$pkgdir/usr/bin/postfix-tlstype.pl"
+  install -vDm 644 auxiliary/collate/README* -t "$pkgdir/usr/share/doc/$pkgname/collate/"
  # license
-  install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
+  install -vDm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
  # systemd service
-  install -vDm 644 "../${pkgname}.service" -t "${pkgdir}/usr/lib/systemd/system/"
+  install -vDm 644 ../$pkgname.service -t "$pkgdir/usr/lib/systemd/system/"
  # sysusers.d
-  install -vDm 644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -vDm 644 ../$pkgname.sysusers "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
  # tmpfiles.d
  # NOTE: follows setup in conf/postfix-files
-  install -vDm 644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  install -vDm 644 ../$pkgname.tmpfiles "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"

  # create dynamicmaps.cf.d and postfix-files.d entries for split packages
  # remove targetted files from main configuration files
  for _feature in {cdb,ldap,lmdb,mysql,pcre,pgsql,sqlite}; do
    printf "Split out dynamicmaps file for %s\n" $pkgbase-$_feature
-    grep "${pkgbase}-${_feature}" "$_dynamicmaps_file" > "$_dynamicmaps_dir/${pkgbase}-${_feature}.cf"
-    sed -e "/${pkgbase}-${_feature}/d" -i "$_dynamicmaps_file"
+    grep "$pkgbase-$_feature" "$_dynamicmaps_file" > "$_dynamicmaps_dir/$pkgbase-$_feature.cf"
+    sed -e "/$pkgbase-$_feature/d" -i "$_dynamicmaps_file"
    (
      cd "$pkgdir"
      _pick $pkgbase-$_feature etc/$pkgbase/dynamicmaps.cf.d/$pkgbase-$_feature.cf
    )

    printf "Split out %s from %s-files.d\n" $pkgbase-$_feature $pkgbase
-    grep "${pkgbase}-${_feature}" "$_files_file" > "$_files_dir/${pkgbase}-${_feature}.cf"
-    sed -e "/${pkgbase}-${_feature}/d" -i "$_files_file"
+    grep "$pkgbase-$_feature" "$_files_file" > "$_files_dir/$pkgbase-$_feature.cf"
+    sed -e "/$pkgbase-$_feature/d" -i "$_files_file"

    printf "Split %s from %s-files\n" ${_feature^^}_README $pkgbase
-    grep "${_feature^^}_README:" "$_files_file" >> "$_files_dir/${pkgbase}-${_feature}.cf"
+    grep "${_feature^^}_README:" "$_files_file" >> "$_files_dir/$pkgbase-$_feature.cf"
    sed -e "/${_feature^^}_README:/d" -i "$_files_file"

-    if [[ "${_feature}" != cdb ]]; then
+    if [[ "$_feature" != cdb ]]; then
      printf "Split %s from %s-files\n" ${_feature}_table.5 $pkgbase
-      grep "${_feature}_table.5:" "$_files_file" >> "$_files_dir/${pkgbase}-${_feature}.cf"
+      grep "${_feature}_table.5:" "$_files_file" >> "$_files_dir/$pkgbase-$_feature.cf"
      sed -e "/${_feature}_table.5:/d" -i "$_files_file"
      (
        cd "$pkgdir"
@@ -176,7 +176,7 @@ package_postfix() {
      cd "$pkgdir"
      _pick $pkgbase-$_feature etc/$pkgbase/$pkgbase-files.d/$pkgbase-$_feature.cf
      _pick $pkgbase-$_feature usr/lib/$pkgbase/$pkgbase-$_feature.so
-      _pick $pkgbase-$_feature usr/share/doc/${pkgbase}/${_feature^^}_README
+      _pick $pkgbase-$_feature usr/share/doc/$pkgbase/${_feature^^}_README
    )
    # install directories that are otherwise cleared by calls to _pick()
    install -vdm 755 "$_dynamicmaps_dir"
@@ -184,8 +184,8 @@ package_postfix() {
  done

  # remove non-reproducible file, that only lists what the build circumstances were
-  rm -v "${pkgdir}/etc/${pkgname}/makedefs.out"
-  sed -e '/makedefs/d' -i "${pkgdir}/etc/${pkgname}/${pkgname}-files"
+  rm -v "$pkgdir/etc/$pkgname/makedefs.out"
+  sed -e '/makedefs/d' -i "$pkgdir/etc/$pkgname/$pkgname-files"
 }

 package_postfix-cdb() {