[arch-commits] Commit in postfixadmin/trunk (PKGBUILD postfixadmin.uwsgi)

[David Runge]

    Date: Sunday, January 10, 2021 @ 20:56:12
  Author: dvzrv
Revision: 817454

upgpkg: postfixadmin 3.3.0-1: Upgrade to 3.3.0.

Simplify installation of files using find.
Switch to pdo_{mysql,pgsql,sqlite} in uwsgi config.

Modified:
  postfixadmin/trunk/PKGBUILD
  postfixadmin/trunk/postfixadmin.uwsgi

--------------------+
 PKGBUILD           |   72 +++++++++++++++++++++------------------------------
 postfixadmin.uwsgi |    9 +++---
 2 files changed, 35 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-10 20:54:54 UTC (rev 817453)
+++ PKGBUILD	2021-01-10 20:56:12 UTC (rev 817454)
@@ -3,7 +3,7 @@
 # Contributor: Filip <fila pruda.com>
 
 pkgname=postfixadmin
-pkgver=3.2.4
+pkgver=3.3.0
 pkgrel=1
 pkgdesc="Web based interface to manage Postfix mailboxes, virtual domains and aliases"
 arch=('any')
@@ -31,10 +31,14 @@
         "${pkgname}.tmpfiles"
         "${pkgname}.uwsgi")
 install="${pkgname}.install"
-sha512sums=('2bd7ae05addbaf3c6c7eebea16ec1e21b2c67c8e6161446ed82a9553c26c04e19c1ec9ce248a9b9df504df56d309590259e6f04907b04b593548028b40e40d47'
+sha512sums=('941c1b51d353253039fd8af48428b981e5f79f463ed09e5bb3417a22cbd114e025f86245e74c92ff5e375ab944ed7d9ff57f51d145838eede77ab3f7e54d5eb6'
             'dc61527dbec79a3b19c8fcbc424fbfbe483cccf99a606e566ea6cd624d46c70a6d87dd8d4da398fedf12b60cfd0cf364c351d6b826e6eee6b2ca8eac0d9efcbe'
             '7e55c844be7b186d9eb568fe097632651c683582da83e0ee24cd6dd7c5a581fe05e5462174237f542ff8dc5d17a8ab651a77f0087a0c8df01d7b36c7722b1440'
-            '50640e431f9b167d618e5e5f6acd36453270aeb7ef8b714afe8207eba9916c86d4b42a1edb9b73a46a1c732a886efcab01389e007baa5b85295c091b451d5673')
+            'd526f45b5904cfa2e0a7f9d31d88b92bc48c233b10cab927cc101d52ba6ba3724066e9528297c59ff1ab578038f68ddabef9cc9b8bb766b64c843cafcc8a25d9')
+b2sums=('126a9ad89338372ff28f7d4400456678d6599f453457e180b31e34dd3239023c0c77f3d195ff25dbebfbe3fd65186934ac876d92b438c885340c34eba28cf93f'
+        'a73314d9befe48869ca121bddfb3af61e916f8458f388e13eed1a7ffd64e7ae75604dc3af92d3d4d5b97c30d3cb089e28cbf64c7e81e324f3ff85d75b15b5f0d'
+        '0e0170b08284dcfc5a68afd46a2e726d696905f3ddcd8158fed68c84fec039fabe60379005055e5fa1cc1fbb098c107b739d0e107f027bd7054d0e31b6e9cea6'
+        'f34569a8c442b2354d2748e9c69065849386c51cd4c875cf27d96bf207618043e710248f1be2569a7132eefdff34628e34d8ebee960e14799c5648a590c1c74c')
 
 prepare(){
   mv -v "${pkgname}-${pkgname}-${pkgver}" "${pkgname}-${pkgver}"
@@ -64,31 +68,34 @@
   # docs
   install -vDm 644 {README.md,CHANGELOG.TXT} \
     -t "${pkgdir}/usr/share/doc/${pkgname}/"
-  install -vDm 644 DOCUMENTS/*.txt \
+  install -vDm 644 DOCUMENTS/{README*,*.{txt,md}} \
     -t "${pkgdir}/usr/share/doc/${pkgname}/documents"
   cp -av ADDITIONS VIRTUAL_VACATION \
     "${pkgdir}/usr/share/doc/${pkgname}"
+
   # webapp
+  find configs languages lib model public scripts templates tests \
+    -type f \( \
+    -iname "*.conf" -or \
+    -iname "*.css" -or \
+    -iname "*.eot" -or \
+    -iname "*.gif" -or \
+    -iname "*.ico" -or \
+    -iname "*.js" -or \
+    -iname "*.lang" -or \
+    -iname "*.lib" -or \
+    -iname "*.map" -or \
+    -iname "*.php" -or \
+    -iname "*.png" -or \
+    -iname "*.sql" -or \
+    -iname "*.svg" -or \
+    -iname "*.tpl" -or \
+    -iname "*.ttf" -or \
+    -iname "*.woff" -or \
+    -iname "*.woff2" \
+    \) -exec install -vDm 644 {} "${pkgdir}/usr/share/webapps/${pkgname}/"{} \;
   install -vDm 644 {common,functions.inc,index}.php phpunit.xml \
     -t "${pkgdir}/usr/share/webapps/${pkgname}"
-  install -vDm 644 configs/menu.conf \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/configs"
-  install -vDm 644 languages/*.{lang,php} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/languages/"
-  install -vDm 644 lib/*.{phar,pubkey,php,txt} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/lib/"
-  install -vDm 644 lib/smarty/{COPYING.lib,smarty_version} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/lib/smarty"
-  install -vDm 644 lib/smarty/libs/*.{php,tpl} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/lib/smarty/libs"
-  install -vDm 644 lib/smarty/libs/plugins/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/lib/smarty/libs/plugins"
-  install -vDm 644 lib/smarty/libs/sysplugins/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/lib/smarty/libs/sysplugins"
-  install -vDm 644 model/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/model"
-  install -vDm 644 public/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/public"
   (
     # adding weird symlinks
     cd "${pkgdir}/usr/share/webapps/${pkgname}/public"
@@ -95,26 +102,7 @@
     ln -sv users/password-change.php .
     ln -sv users/password-recover.php .
   )
-  install -vDm 644 public/css/*.css \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/public/css"
-  install -vDm 644 public/images/*.{gif,ico,php,png} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/public/images"
-  install -vDm 644 public/users/*.{js,php} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/public/users"
-  install -vDm 644 public/users/css/*.css \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/public/users/css"
-  install -vDm 644 public/users/images/calendar/*.{gif,png} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/public/users/images/calendar"
-  install -vDm 755 scripts/${pkgname}-cli \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/scripts"
-  install -vDm 644 scripts/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/scripts"
-  install -vDm 644 scripts/snippets/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/scripts/snippets"
-  install -vDm 644 templates/*.{php,tpl} \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/templates"
-  install -vDm 644 tests/*.php \
-    -t "${pkgdir}/usr/share/webapps/${pkgname}/tests"
+
   # config
   install -vDm 640 config.{inc,local}.php -t "${pkgdir}/etc/webapps/${pkgname}/"
   ln -sv "/etc/webapps/${pkgname}/config.inc.php" \

Modified: postfixadmin.uwsgi
===================================================================
--- postfixadmin.uwsgi	2021-01-10 20:54:54 UTC (rev 817453)
+++ postfixadmin.uwsgi	2021-01-10 20:56:12 UTC (rev 817454)
@@ -11,7 +11,7 @@
 cheaper-step = 1
 idle = 120
 die-on-idle = true
-
+touch-reload = %p
 php-allowed-ext = .php
 php-docroot = /usr/share/webapps/postfixadmin/public
 php-index = index.php
@@ -21,6 +21,7 @@
 php-set = session.gc_maxlifetime 21600
 php-set = session.gc_divisor 500
 php-set = session.gc_probability 1
-php-set = extension=mysqli.so
-php-set = extension=imap.so
-
+php-set = extension=imap
+php-set = extension=pdo_mysql
+php-set = extension=pdo_pgsql
+php-set = extension=pdo_sqlite