[arch-commits] Commit in nextcloud/trunk (3 files)

[David Runge]

    Date: Saturday, July 17, 2021 @ 21:58:56
  Author: dvzrv
Revision: 978432

upgpkg: nextcloud 22.0.0-2: Rebuild to move .htaccess file.

Install the application's .htaccess file to /etc/webapps/nextcloud so that it
can be added to the backup array and be owned by the nextcloud user.
Fixes https://bugs.archlinux.org/task/71474

Modified:
  nextcloud/trunk/PKGBUILD
  nextcloud/trunk/nextcloud.install
  nextcloud/trunk/nextcloud.tmpfiles

--------------------+
 PKGBUILD           |   14 +++++++++-----
 nextcloud.install  |    5 ++++-
 nextcloud.tmpfiles |    1 +
 3 files changed, 14 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-07-17 21:03:12 UTC (rev 978431)
+++ PKGBUILD	2021-07-17 21:58:56 UTC (rev 978432)
@@ -4,7 +4,7 @@
 pkgname=nextcloud
 # NOTE: do not package x.0.0 versions as they are considered beta
 pkgver=22.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A cloud server to store your files centrally on a hardware controlled by you"
 arch=('any')
 url="https://nextcloud.com"
@@ -35,6 +35,7 @@
 )
 backup=(
   "etc/webapps/${pkgname}/config/config.php"
+  "etc/webapps/${pkgname}/.htaccess"
   "etc/uwsgi/${pkgname}.ini"
 )
 # there are no elf files, no need to strip anything
@@ -59,7 +60,7 @@
             '7b18b73ee369607b8ee3d00d2a054262a7b8f3033fc4873eb333c9b9333d7338870c035910ae123b564a65d7d245730178137311048f0713d5bc524de3654923'
             'daae0331998fc3b135c18330cd8f8405958abce1a913cdbc16accc3c49f2b185a6d44cf4d768eb1eb11d1dd1d81dcc3fe75ec959bd9f4c9c5eb85c450d5ad408'
             '1d06f339c43d57e5f5406c2698b815241fd9e39039a9e55f777face510c9a5ddae5ccd4e051393e8f16f391301a6aa03fff2462837a2d3441d969ea7195e7d84'
-            '51beae1dc7889cda73fa0b9bd578ba0d01272c3293e91946a4179496ed98ac900109dfe6e9e3b83f94096ecd2f17f77b8d2190960e41f47a599f4e6fd594a78a'
+            '919008a2bf6cf2492cb1e9c8e28c1e082d74e45da5a96e6669f8971d6cf721e36d23625c89918fe10d8bc1b202c0340aa897849d9ec501a26f3f4572ccb57a98'
             '8bc7e76ba986cadf8d3bf35d6fbd8e7e236a61d1372e023c07e60427bacce925737c996d9fbaaeb51ed1066c1d0c8d83a86d7d640ed991b531744ed06629a670'
             'c585af280c2503a5a969fffd53d192a045a1dedd6d3a32901dfa0e226f9ddb4b5d1b1760553e962b061172c0077fcc57b095d8b7c70cafaa8ca84dbfce2eaa24'
             'eb69785a5b0df0e2a11f53f9c2e2dbf75681d7c698e88cbcc5ceed713a558d528511cc576813cc083cbaa28a2c83d543a39436ad4805670348ef22634305b1c8')
@@ -70,7 +71,7 @@
         '772a9571fe7d88dbcbeb46351a188354e237dfe8e020131f2752b3a36cff0ff177423b4cfd6a1a5f28946f86a8581f3e24ee06ebda7260c5f862ca4071908e43'
         '150273823fdadcaecf3e2af036067581cb4cf02507c6da2a533ef3c288a2a715d076f83c6d6d4ff13cd336184f595361318faa2acdc68979edfad7afef0b575b'
         '1a61a89531636b65dade03cd7edca8747b3e1e880f9bbd4d5a53cffa452d70fe17e345cfed739ae92e99e336d4c1f2633c84a5c84a4ee6da518762bf1396b1db'
-        'e7ce2f3dba5ea4a2daf2ce6e6c0fb3ff1afefbbc6067296b11ca3da4194a8ba049b137c4b2ca5411de2a1fd3b8ae28912bf0fd5f50fd9b147727a7f4e52290dc'
+        'd132044cb7f1d61a1ce87800d2e1142e3ac385acdec25e2f5ad685603a0ffa88e105f4c35688584d65d287adbb40b8d9a02d6a80d7a0b58bb8801a6769405218'
         '937ae5b89d968d784c7b68e1ca81e7aec11e295b95244fc4bcfec55b3d5f37ef70d5f593086eeb14101c8940a241565730cb6edcdf88165094c4ad27a89bd980'
         '9857f3dd219b624869255e0d6c262b60de813b87ac4fd3fccad0a330392f55709e8c2d4b9dfb5ad19df7cc0fc13cc83cead06c9a1d893ee4e4972c4937df0c2b'
         'e6214351ca16bfe97683e838e727d6b5eaa62194878272204034c62aac4a632c9b33cd31aa0570c2eb936d7e9e7ff60190ac05a3a8cc2e27eda423a7d89b6d39')
@@ -97,10 +98,11 @@
   # uwsgi integration
   install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini"
   # config dir
+  install -vDm 644 .htaccess -t "${pkgdir}/etc/webapps/${pkgname}/"
   install -vDm 640 "../${pkgname}.config.php" "${pkgdir}/etc/webapps/${pkgname}/config/config.php"
   find config -type f -exec install -vDm 644 {} "${pkgdir}/etc/webapps/${pkgname}/"{} \;
-  # remove config dir from source so that it is not installed to default location
-  rm -rf config
+  # remove config dir and .htaccess from source so that it is not installed to default location
+  rm -rf config .htaccess
 
   # webapp
   find . -type f -exec install -vDm 644 {} "${pkgdir}/usr/share/webapps/${pkgname}/"{} \;
@@ -107,6 +109,8 @@
 
   # symlink config directory into place
   ln -sv "/etc/webapps/${pkgname}/config" "${pkgdir}/usr/share/webapps/${pkgname}/"
+  # symlink .htaccess file into place
+  ln -sv "/etc/webapps/${pkgname}/.htaccess" "${pkgdir}/usr/share/webapps/${pkgname}/"
   # add symlink to default writable apps directory
   ln -sv "/var/lib/${pkgname}/apps" "${pkgdir}/usr/share/webapps/${pkgname}/wapps"
   # install occ command

Modified: nextcloud.install
===================================================================
--- nextcloud.install	2021-07-17 21:03:12 UTC (rev 978431)
+++ nextcloud.install	2021-07-17 21:58:56 UTC (rev 978432)
@@ -1,7 +1,7 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  if [ "$(vercmp "$2" '21.0.0-6')" -lt 0 ]; then
+  if (( "$(vercmp "$2" '21.0.0-6')" < 0 )); then
     printf "WARNING: Major changes introduced to package!\n"
     printf "         The application is now run as its own user - nextcloud.\n"
     printf "         Default directories for runtime, state and log files are provided.\n"
@@ -10,4 +10,7 @@
     # nextcloud user due to nextcloud < 21.0.0
     find /usr/share/webapps/nextcloud -type d -exec chgrp root {} \;
   fi
+  if (( "$(vercmp "$2" '22.0.0-1')" < 0 )); then
+    printf "NOTE: The application's .htaccess file is now located in /etc/webapps/nextcloud/.\n"
+  fi
 }

Modified: nextcloud.tmpfiles
===================================================================
--- nextcloud.tmpfiles	2021-07-17 21:03:12 UTC (rev 978431)
+++ nextcloud.tmpfiles	2021-07-17 21:58:56 UTC (rev 978432)
@@ -1,4 +1,5 @@
 Z /etc/webapps/nextcloud/config - nextcloud nextcloud
+z /etc/webapps/nextcloud/.htaccess 0644 nextcloud nextcloud
 z /etc/webapps/nextcloud/ 0755 root root
 Z %C/nextcloud - nextcloud nextcloud
 d %t/nextcloud 0755 nextcloud nextcloud