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

[David Runge]

    Date: Saturday, November 7, 2020 @ 12:04:34
  Author: dvzrv
Revision: 745724

upgpkg: hyperkitty 1.3.3-3: Rebuild to allow url modifications.

Add the urls.py to /etc/webapps/hyperkitty/ as it is required to modify it under certain circumstances.
Comment another debug option in settings.py.

Modified:
  hyperkitty/trunk/PKGBUILD
  hyperkitty/trunk/hyperkitty-1.3.2-settings.patch
  hyperkitty/trunk/hyperkitty.tmpfiles

---------------------------------+
 PKGBUILD                        |   16 ++++++++++------
 hyperkitty-1.3.2-settings.patch |   11 ++++++++++-
 hyperkitty.tmpfiles             |    1 +
 3 files changed, 21 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-07 11:46:07 UTC (rev 745723)
+++ PKGBUILD	2020-11-07 12:04:34 UTC (rev 745724)
@@ -3,7 +3,7 @@
 _name=HyperKitty
 pkgname=hyperkitty
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc="A web interface to access GNU Mailman v3 archives"
 arch=('any')
 url="https://gitlab.com/mailman/hyperkitty"
@@ -22,7 +22,9 @@
             'uwsgi-plugin-python: for running inside uwsgi'
             'ruby-sassc: alternative to sassc')
 backup=("etc/uwsgi/${pkgname}.ini"
-        "etc/webapps/${pkgname}/settings_local.py")
+        "etc/webapps/${pkgname}/settings_local.py"
+        "etc/webapps/${pkgname}/urls.py"
+)
 install="${pkgname}.install"
 source=("https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.tar.gz"{,.asc}
         "${pkgname}-1.3.2-settings.patch"
@@ -33,11 +35,11 @@
         "${pkgname}.uwsgi")
 sha512sums=('4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76'
             'SKIP'
-            'de2f0ddd4006b3647ab2b482f853070576817c8729d7473cc71c22566053a43e3eb4888ac7e0e014811d1498d81e2349695ab334be3548f5ab121b507c82cfc6'
+            '452da2c049f0c35d27e15c16af1a6a526de79a6672b6fdaf9a4bcbdfd2110ebf608e8c5a1f5dfc3bb2febc39ecc6e69e2a657c3b2c6e1d2dc2eca2de81125380'
             'e8a90eaef5f98c0025af2dd98589e5059fd0073416c10fe17f810e8c7965a2fc724994dd2e56b034d948de032a98d41a4a3520721516dc2e573e324f4a74dff3'
             'a41c938082ceee555143ddb21c3a95835f9832b9aff423142d78d3e52f12500561f80e0ce43c67a4f190065c9d045945741ac71ab3307db1419c4dc0686db09a'
             '3267427109b08b8c9336b187381ed14357a07370bdcdfc24da94555020ad0424c5bbebc09e131e981e0540c51db443ffe558209e1bca7c2a1b7b1f602ed0805b'
-            'e734e28fbaa5d7143a5c31161b2de0beed5435cb4fa48521ec0e82ed81b045f07bd4ca61f9da81c87dfe2cc5a5ecf79eb9ed4c255a31f97c69fe97bf6df37073'
+            'c943d82b8640a513728e3f07fa44c0ddb5a3bb8ec84a3a70990e51287ca01977887f895b901688fc4643d8fcb106d524259a86a51bccaafd77c69b241f1b23ba'
             '351f40a6bc1fd1735c883408f9941808e081206927a7c02467e03228243dd156378cac21f851b498702bd4f96fde8e4c80536dbcc6f3c384bf708bed4e988971')
 validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhilash1 at gmail.com>
 
@@ -75,7 +77,7 @@
   # doc
   install -vDm 644 README.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
   # django project
-  install -vDm 644 example_project/{__init__,manage,settings,urls,wsgi}.py \
+  install -vDm 644 example_project/{__init__,manage,settings,wsgi}.py \
     -t "${pkgdir}/usr/share/webapps/${pkgname}"
   # symlink locale and static dirs to state dir
   ln -svf "/var/lib/${pkgname}/locale/" \
@@ -88,10 +90,12 @@
   # log dir
   install -vdm 750 "${pkgdir}/var/log/${pkgname}"
   # config
-  install -vDm 640 settings_local.py \
+  install -vDm 640 settings_local.py example_project/urls.py \
     -t "${pkgdir}/etc/webapps/${pkgname}"
   ln -svf "/etc/webapps/${pkgname}/settings_local.py" \
     "${pkgdir}/usr/share/webapps/${pkgname}/settings_local.py"
+  ln -svf "/etc/webapps/${pkgname}/urls.py" \
+    "${pkgdir}/usr/share/webapps/${pkgname}/urls.py"
   # systemd service
   install -vDm 644 "../${pkgname}-qcluster.service" \
     -t "${pkgdir}/usr/lib/systemd/system"

Modified: hyperkitty-1.3.2-settings.patch
===================================================================
--- hyperkitty-1.3.2-settings.patch	2020-11-07 11:46:07 UTC (rev 745723)
+++ hyperkitty-1.3.2-settings.patch	2020-11-07 12:04:34 UTC (rev 745724)
@@ -1,6 +1,6 @@
 diff -ruN a/example_project/settings.py b/example_project/settings.py
 --- a/example_project/settings.py	2020-06-01 18:21:21.000000000 +0200
-+++ b/example_project/settings.py	2020-11-07 11:25:38.898195802 +0100
++++ b/example_project/settings.py	2020-11-07 12:19:48.531767195 +0100
 @@ -75,12 +75,12 @@
      'allauth.socialaccount.providers.github',
      'allauth.socialaccount.providers.gitlab',
@@ -16,6 +16,15 @@
  )
  
  
+@@ -88,7 +88,7 @@
+     'django.middleware.security.SecurityMiddleware',
+     'django.contrib.sessions.middleware.SessionMiddleware',
+     # NOTE: Do not include DebugToolbarMiddleware in any production site.
+-    'debug_toolbar.middleware.DebugToolbarMiddleware',
++    # 'debug_toolbar.middleware.DebugToolbarMiddleware',
+     'django.middleware.common.CommonMiddleware',
+     'django.middleware.csrf.CsrfViewMiddleware',
+     'django.contrib.auth.middleware.AuthenticationMiddleware',
 @@ -134,7 +134,7 @@
          # Use 'sqlite3', 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
          'ENGINE': 'django.db.backends.sqlite3',

Modified: hyperkitty.tmpfiles
===================================================================
--- hyperkitty.tmpfiles	2020-11-07 11:46:07 UTC (rev 745723)
+++ hyperkitty.tmpfiles	2020-11-07 12:04:34 UTC (rev 745724)
@@ -1,4 +1,5 @@
 z /etc/webapps/hyperkitty/settings_local.py 0640 root hyperkitty -
+z /etc/webapps/hyperkitty/urls.py 0640 root hyperkitty -
 d %L/hyperkitty 750 hyperkitty hyperkitty -
 d %S/hyperkitty - hyperkitty hyperkitty -
 d %S/hyperkitty/data 750 hyperkitty hyperkitty -