Date: Saturday, November 7, 2020 @ 12:05:34 Author: dvzrv Revision: 745727
archrelease: copy trunk to community-any Added: postorius/repos/community-any/PKGBUILD (from rev 745726, postorius/trunk/PKGBUILD) postorius/repos/community-any/postorius-1.3.2-settings.patch (from rev 745726, postorius/trunk/postorius-1.3.2-settings.patch) postorius/repos/community-any/postorius.install (from rev 745726, postorius/trunk/postorius.install) postorius/repos/community-any/postorius.sysusers (from rev 745726, postorius/trunk/postorius.sysusers) postorius/repos/community-any/postorius.tmpfiles (from rev 745726, postorius/trunk/postorius.tmpfiles) postorius/repos/community-any/postorius.uwsgi (from rev 745726, postorius/trunk/postorius.uwsgi) Deleted: postorius/repos/community-any/PKGBUILD postorius/repos/community-any/postorius-1.3.2-settings.patch postorius/repos/community-any/postorius.install postorius/repos/community-any/postorius.sysusers postorius/repos/community-any/postorius.tmpfiles postorius/repos/community-any/postorius.uwsgi --------------------------------+ PKGBUILD | 186 +++++++++++++++++++-------------------- postorius-1.3.2-settings.patch | 62 ++++++------- postorius.install | 18 +-- postorius.sysusers | 2 postorius.tmpfiles | 13 +- postorius.uwsgi | 36 +++---- 6 files changed, 161 insertions(+), 156 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-11-07 12:05:24 UTC (rev 745726) +++ PKGBUILD 2020-11-07 12:05:34 UTC (rev 745727) @@ -1,91 +0,0 @@ -# Maintainer: David Runge <dv...@archlinux.org> - -pkgname=postorius -pkgver=1.3.3 -pkgrel=2 -pkgdesc="The New Mailman Web UI" -arch=('any') -url="https://gitlab.com/mailman/postorius" -license=('GPL3') -depends=('python-cmarkgfm' 'python-django' 'python-django-mailman3' -'python-mailmanclient' 'python-readme-renderer') -makedepends=('python-setuptools') -checkdepends=('mailman3' 'python-beautifulsoup4' 'python-isort' 'python-mock' -'python-pytest' 'python-pytest-django' 'python-vcrpy') -optdepends=('mailman3: for configuring a local mailman instance' - 'uwsgi-plugin-python: for running inside uwsgi') -replaces=('python-django-postorius') -backup=("etc/uwsgi/${pkgname}.ini" - "etc/webapps/${pkgname}/settings_local.py") -install="${pkgname}.install" -source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc} - "${pkgname}.sysusers" - "${pkgname}.tmpfiles" - "${pkgname}.uwsgi" - "${pkgname}-1.3.2-settings.patch") -sha512sums=('31d6d6d0dbbe8a57251c81cf8f7d8b80d17dd4aab9f31be684fef26637a4ba81a196d4ab63e7389bd4173a60778a00c83ee440c24f83a1f60b094ccab8cf345a' - 'SKIP' - '3884b818da2deb148279e50316f720c95f0aaa529777b1b3662d8ab253cda823a90682a9eb47e941ca5ba80eefcb9a2d4afacd29f0340d7f9828b36ebcee23b3' - '97cb4c0530a270db1e608f255b0940fbf1779252da74b7df9865adff809f0e644e88e0cbcfa7d7c858877887bc8ae64dddec88734fbc4abb75b6a270be38d2cf' - 'c042f00d0d8dc72dadd19023152e55246c4d7a4b9d53bca3a05e7b8cb38cac5116417440d4ae82350820c7cb0cd414dcce45fa6af9be19296c4ebd0862dba896' - '53713874043e368c71543966e878ff7a49f03088b7ebcff9487935bef2c20a57a561a122dd6b4cbde126c25b935871288dadd7693b831a94b8f27da52afeaa0c') -b2sums=('0ae5a7b3ace1ad7f64eae53156592d0c76a09e358d08edfe1b506717e87df67c669bfab356c203e28c03006f46461a67b4c7222e0e305100e15511a93e3e6a59' - 'SKIP' - '1ef6dc98c6751e6d65e49812d08d813879b791a7f13622ea31ecadae6dd1859a918761d7723732ed2e4872b9cae61b84c8dbfec2dd2522de9f0929a1ee1cec24' - 'cb5653cde88a3bfee87e5609066c6e4accd96d97c0e225ee721d23356a3c88a17ceb3e849849ff487c77a17070e281c105a1a0298bd0a8508df0c29f155bf45c' - '4b80d60c88d46edd0e6e61ad2ff37ba3568c6c56a2abd449f903f7302aeec4a3bc91bbd3ee846731513fa1906df2e3d7d1c52b75a55214051fb96b048f9b4999' - 'c4017fe87b8743ae516e360be97efd767d726b043733a6dd880503e796e28f65c9ad5924b0fef53281e4fa73a1a329e818baedbe5dbbc0dc07db2af0cf25f1b7') -validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhila...@gmail.com> - -prepare() { - cd "$pkgname-$pkgver" - # patch global paths into settings.py - patch -Np1 -i "../${pkgname}-1.3.2-settings.patch" - touch settings_local.py -} - -build() { - cd "$pkgname-$pkgver" - python setup.py build -} - -check() { - cd "$pkgname-$pkgver/example_project" - export PYTHONPATH="../build/lib:${PYTHONPATH}" - PYTHONDONTWRITEBYTECODE=1 \ - pytest -v ../build/lib/${pkgname} -} - -package() { - cd "$pkgname-$pkgver" - export PYTHONHASHSEED=0 - python setup.py install --skip-build \ - --optimize=1 \ - --root="${pkgdir}" - # django project - install -vDm 644 example_project/{__init__,manage,settings,urls,wsgi}.py \ - -t "${pkgdir}/usr/share/webapps/${pkgname}" - # symlink locale and static dirs to state dir - ln -svf "/var/lib//${pkgname}/locale/" \ - "${pkgdir}/usr/share/webapps/${pkgname}" - ln -svf "/var/lib/${pkgname}/static/" \ - "${pkgdir}/usr/share/webapps/${pkgname}" - # state dir - install -vdm 750 "${pkgdir}/var/lib/${pkgname}/data" - install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"{locale,static} - # log dir - install -vdm 750 "${pkgdir}/var/log/${pkgname}" - # config - install -vDm 640 settings_local.py \ - -t "${pkgdir}/etc/webapps/${pkgname}" - ln -svf "/etc/webapps/${pkgname}/settings_local.py" \ - "${pkgdir}/usr/share/webapps/${pkgname}/settings_local.py" - # uwsgi - install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini" - # tmpfiles.d - install -vDm 644 "../${pkgname}.tmpfiles" \ - "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" - # sysusers.d - install -vDm 644 "../${pkgname}.sysusers" \ - "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" -} Copied: postorius/repos/community-any/PKGBUILD (from rev 745726, postorius/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-11-07 12:05:34 UTC (rev 745727) @@ -0,0 +1,95 @@ +# Maintainer: David Runge <dv...@archlinux.org> + +pkgname=postorius +pkgver=1.3.3 +pkgrel=3 +pkgdesc="The New Mailman Web UI" +arch=('any') +url="https://gitlab.com/mailman/postorius" +license=('GPL3') +depends=('python-cmarkgfm' 'python-django' 'python-django-mailman3' +'python-mailmanclient' 'python-readme-renderer') +makedepends=('python-setuptools') +checkdepends=('mailman3' 'python-beautifulsoup4' 'python-isort' 'python-mock' +'python-pytest' 'python-pytest-django' 'python-vcrpy') +optdepends=('mailman3: for configuring a local mailman instance' + 'uwsgi-plugin-python: for running inside uwsgi') +replaces=('python-django-postorius') +backup=("etc/uwsgi/${pkgname}.ini" + "etc/webapps/${pkgname}/settings_local.py" + "etc/webapps/${pkgname}/urls.py" +) +install="${pkgname}.install" +source=("https://files.pythonhosted.org/packages/source/${pkgname::1}/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.asc} + "${pkgname}.sysusers" + "${pkgname}.tmpfiles" + "${pkgname}.uwsgi" + "${pkgname}-1.3.2-settings.patch") +sha512sums=('31d6d6d0dbbe8a57251c81cf8f7d8b80d17dd4aab9f31be684fef26637a4ba81a196d4ab63e7389bd4173a60778a00c83ee440c24f83a1f60b094ccab8cf345a' + 'SKIP' + '3884b818da2deb148279e50316f720c95f0aaa529777b1b3662d8ab253cda823a90682a9eb47e941ca5ba80eefcb9a2d4afacd29f0340d7f9828b36ebcee23b3' + '1c14f48423c2db5ea2b2a95485b7391df30d8dd9255981c1ed9f5036e70b8d6f6495e83275b1593baeea20d1dbed3a447e2ac037870d3eafb7eb6f9d0cae443f' + 'c042f00d0d8dc72dadd19023152e55246c4d7a4b9d53bca3a05e7b8cb38cac5116417440d4ae82350820c7cb0cd414dcce45fa6af9be19296c4ebd0862dba896' + '53713874043e368c71543966e878ff7a49f03088b7ebcff9487935bef2c20a57a561a122dd6b4cbde126c25b935871288dadd7693b831a94b8f27da52afeaa0c') +b2sums=('0ae5a7b3ace1ad7f64eae53156592d0c76a09e358d08edfe1b506717e87df67c669bfab356c203e28c03006f46461a67b4c7222e0e305100e15511a93e3e6a59' + 'SKIP' + '1ef6dc98c6751e6d65e49812d08d813879b791a7f13622ea31ecadae6dd1859a918761d7723732ed2e4872b9cae61b84c8dbfec2dd2522de9f0929a1ee1cec24' + '2ddbf7fdf2a98d96f4a122faca35f4ca1e2cf1f81542d7fc45ae64f8b860eebdcb997c58c633ae45325f50c247b187216337550866ec186fac380f802b1eb74f' + '4b80d60c88d46edd0e6e61ad2ff37ba3568c6c56a2abd449f903f7302aeec4a3bc91bbd3ee846731513fa1906df2e3d7d1c52b75a55214051fb96b048f9b4999' + 'c4017fe87b8743ae516e360be97efd767d726b043733a6dd880503e796e28f65c9ad5924b0fef53281e4fa73a1a329e818baedbe5dbbc0dc07db2af0cf25f1b7') +validpgpkeys=('541EA0448453394FF77A0ECC9D9B2BA061D0A67C') # Abhilash Raj <raj.abhila...@gmail.com> + +prepare() { + cd "$pkgname-$pkgver" + # patch global paths into settings.py + patch -Np1 -i "../${pkgname}-1.3.2-settings.patch" + touch settings_local.py +} + +build() { + cd "$pkgname-$pkgver" + python setup.py build +} + +check() { + cd "$pkgname-$pkgver/example_project" + export PYTHONPATH="../build/lib:${PYTHONPATH}" + PYTHONDONTWRITEBYTECODE=1 \ + pytest -v ../build/lib/${pkgname} +} + +package() { + cd "$pkgname-$pkgver" + export PYTHONHASHSEED=0 + python setup.py install --skip-build \ + --optimize=1 \ + --root="${pkgdir}" + # django project + 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/" \ + "${pkgdir}/usr/share/webapps/${pkgname}" + ln -svf "/var/lib/${pkgname}/static/" \ + "${pkgdir}/usr/share/webapps/${pkgname}" + # state dir + install -vdm 750 "${pkgdir}/var/lib/${pkgname}/data" + install -vdm 755 "${pkgdir}/var/lib/${pkgname}/"{locale,static} + # log dir + install -vdm 750 "${pkgdir}/var/log/${pkgname}" + # config + 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" + # uwsgi + install -vDm 644 "../${pkgname}.uwsgi" "${pkgdir}/etc/uwsgi/${pkgname}.ini" + # tmpfiles.d + install -vDm 644 "../${pkgname}.tmpfiles" \ + "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + # sysusers.d + install -vDm 644 "../${pkgname}.sysusers" \ + "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" +} Deleted: postorius-1.3.2-settings.patch =================================================================== --- postorius-1.3.2-settings.patch 2020-11-07 12:05:24 UTC (rev 745726) +++ postorius-1.3.2-settings.patch 2020-11-07 12:05:34 UTC (rev 745727) @@ -1,31 +0,0 @@ -diff --git c/example_project/settings.py w/example_project/settings.py -index c54af7e..d05535b 100644 ---- c/example_project/settings.py -+++ w/example_project/settings.py -@@ -136,7 +136,7 @@ WSGI_APPLICATION = 'wsgi.application' - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', -- 'NAME': os.path.join(BASE_DIR, 'postorius.db'), -+ 'NAME': '/var/lib/postorius/data/postorius.db', - } - } - -@@ -180,7 +180,7 @@ USE_TZ = True - # Don't put anything in this directory yourself; store your static files - # in apps' "static/" subdirectories and in STATICFILES_DIRS. - # Example: "/var/www/example.com/static/" --STATIC_ROOT = os.path.join(BASE_DIR, 'static') -+STATIC_ROOT = '/var/lib/postorius/static' - - # URL prefix for static files. - # Example: "http://example.com/static/", "http://static.example.com/" -@@ -259,7 +259,7 @@ LOGGING = { - 'level': 'INFO', - #'class': 'logging.handlers.RotatingFileHandler', - 'class': 'logging.handlers.WatchedFileHandler', -- 'filename': os.path.join(BASE_DIR, 'logs', 'postorius.log'), -+ 'filename': '/var/log/postorius/postorius.log', - 'formatter': 'verbose', - }, - }, Copied: postorius/repos/community-any/postorius-1.3.2-settings.patch (from rev 745726, postorius/trunk/postorius-1.3.2-settings.patch) =================================================================== --- postorius-1.3.2-settings.patch (rev 0) +++ postorius-1.3.2-settings.patch 2020-11-07 12:05:34 UTC (rev 745727) @@ -0,0 +1,31 @@ +diff --git c/example_project/settings.py w/example_project/settings.py +index c54af7e..d05535b 100644 +--- c/example_project/settings.py ++++ w/example_project/settings.py +@@ -136,7 +136,7 @@ WSGI_APPLICATION = 'wsgi.application' + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', +- 'NAME': os.path.join(BASE_DIR, 'postorius.db'), ++ 'NAME': '/var/lib/postorius/data/postorius.db', + } + } + +@@ -180,7 +180,7 @@ USE_TZ = True + # Don't put anything in this directory yourself; store your static files + # in apps' "static/" subdirectories and in STATICFILES_DIRS. + # Example: "/var/www/example.com/static/" +-STATIC_ROOT = os.path.join(BASE_DIR, 'static') ++STATIC_ROOT = '/var/lib/postorius/static' + + # URL prefix for static files. + # Example: "http://example.com/static/", "http://static.example.com/" +@@ -259,7 +259,7 @@ LOGGING = { + 'level': 'INFO', + #'class': 'logging.handlers.RotatingFileHandler', + 'class': 'logging.handlers.WatchedFileHandler', +- 'filename': os.path.join(BASE_DIR, 'logs', 'postorius.log'), ++ 'filename': '/var/log/postorius/postorius.log', + 'formatter': 'verbose', + }, + }, Deleted: postorius.install =================================================================== --- postorius.install 2020-11-07 12:05:24 UTC (rev 745726) +++ postorius.install 2020-11-07 12:05:34 UTC (rev 745727) @@ -1,9 +0,0 @@ -post_install() { - echo "Run the following to create/migrate the database:" - echo "sudo -u postorius django-admin migrate --pythonpath /usr/share/webapps/postorius/ --settings settings" -} - -post_upgrade() { - echo "Run the following to update static files and compress them:" - echo "sudo -u postorius django-admin collectstatic --pythonpath /usr/share/webapps/postorius --settings settings" -} Copied: postorius/repos/community-any/postorius.install (from rev 745726, postorius/trunk/postorius.install) =================================================================== --- postorius.install (rev 0) +++ postorius.install 2020-11-07 12:05:34 UTC (rev 745727) @@ -0,0 +1,9 @@ +post_install() { + echo "Run the following to create/migrate the database:" + echo "sudo -u postorius django-admin migrate --pythonpath /usr/share/webapps/postorius/ --settings settings" +} + +post_upgrade() { + echo "Run the following to update static files and compress them:" + echo "sudo -u postorius django-admin collectstatic --pythonpath /usr/share/webapps/postorius --settings settings" +} Deleted: postorius.sysusers =================================================================== --- postorius.sysusers 2020-11-07 12:05:24 UTC (rev 745726) +++ postorius.sysusers 2020-11-07 12:05:34 UTC (rev 745727) @@ -1 +0,0 @@ -u postorius - "GNU Mailman Web User Interface" - Copied: postorius/repos/community-any/postorius.sysusers (from rev 745726, postorius/trunk/postorius.sysusers) =================================================================== --- postorius.sysusers (rev 0) +++ postorius.sysusers 2020-11-07 12:05:34 UTC (rev 745727) @@ -0,0 +1 @@ +u postorius - "GNU Mailman Web User Interface" - Deleted: postorius.tmpfiles =================================================================== --- postorius.tmpfiles 2020-11-07 12:05:24 UTC (rev 745726) +++ postorius.tmpfiles 2020-11-07 12:05:34 UTC (rev 745727) @@ -1,6 +0,0 @@ -z /etc/webapps/postorius/settings_local.py 0640 root postorius - -d %L/postorius 750 postorius postorius - -d %S/postorius/data 750 postorius postorius - -d %S/postorius/locale - postorius postorius - -d %S/postorius/static - postorius postorius - -d %t/postorius - postorius postorius - Copied: postorius/repos/community-any/postorius.tmpfiles (from rev 745726, postorius/trunk/postorius.tmpfiles) =================================================================== --- postorius.tmpfiles (rev 0) +++ postorius.tmpfiles 2020-11-07 12:05:34 UTC (rev 745727) @@ -0,0 +1,7 @@ +z /etc/webapps/postorius/settings_local.py 0640 root postorius - +z /etc/webapps/postorius/url.py 0640 root postorius - +d %L/postorius 750 postorius postorius - +d %S/postorius/data 750 postorius postorius - +d %S/postorius/locale - postorius postorius - +d %S/postorius/static - postorius postorius - +d %t/postorius - postorius postorius - Deleted: postorius.uwsgi =================================================================== --- postorius.uwsgi 2020-11-07 12:05:24 UTC (rev 745726) +++ postorius.uwsgi 2020-11-07 12:05:34 UTC (rev 745727) @@ -1,18 +0,0 @@ -[uwsgi] -procname-master = postorius -master = true -plugins = python -socket = /run/postorius/%n.sock -stats = /run/postorius/%n-stats.sock -uid = postorius -gid = postorius -processes = 10 -cheaper = 2 -cheaper-step = 1 -idle = 120 -die-on-idle = true -chdir = /usr/share/webapps/postorius -module = wsgi -home = / -touch-reload = %p -vacuum = true Copied: postorius/repos/community-any/postorius.uwsgi (from rev 745726, postorius/trunk/postorius.uwsgi) =================================================================== --- postorius.uwsgi (rev 0) +++ postorius.uwsgi 2020-11-07 12:05:34 UTC (rev 745727) @@ -0,0 +1,18 @@ +[uwsgi] +procname-master = postorius +master = true +plugins = python +socket = /run/postorius/%n.sock +stats = /run/postorius/%n-stats.sock +uid = postorius +gid = postorius +processes = 10 +cheaper = 2 +cheaper-step = 1 +idle = 120 +die-on-idle = true +chdir = /usr/share/webapps/postorius +module = wsgi +home = / +touch-reload = %p +vacuum = true