pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www



Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun  4 03:42:23 UTC 2023

Modified Files:
        pkgsrc/www: Makefile
Added Files:
        pkgsrc/www/mailman3-web: DESCR Makefile PLIST distinfo
        pkgsrc/www/mailman3-web/files: crontab.sample mailman-web.sh
            settings.py
        pkgsrc/www/mailman3-web/patches: patch-mailman__web_manage.py
            patch-mailman__web_settings_base.py

Log Message:
mailman3-web: add version 0.0.6

This is a Django project that contains default settings and url settings
for Mailman 3 Web Interface. It consists of the following sub-projects:

* Postorius
* Hyperkitty


To generate a diff of this commit:
cvs rdiff -u -r1.1722 -r1.1723 pkgsrc/www/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/www/mailman3-web/DESCR \
    pkgsrc/www/mailman3-web/Makefile pkgsrc/www/mailman3-web/PLIST \
    pkgsrc/www/mailman3-web/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/mailman3-web/files/crontab.sample \
    pkgsrc/www/mailman3-web/files/mailman-web.sh \
    pkgsrc/www/mailman3-web/files/settings.py
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/mailman3-web/patches/patch-mailman__web_manage.py \
    pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_base.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/Makefile
diff -u pkgsrc/www/Makefile:1.1722 pkgsrc/www/Makefile:1.1723
--- pkgsrc/www/Makefile:1.1722  Sun Jun  4 03:15:07 2023
+++ pkgsrc/www/Makefile Sun Jun  4 03:42:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1722 2023/06/04 03:15:07 markd Exp $
+# $NetBSD: Makefile,v 1.1723 2023/06/04 03:42:22 markd Exp $
 #
 
 COMMENT=       Packages related to the World Wide Web
@@ -232,6 +232,7 @@ SUBDIR+=    lua-resty-lrucache
 SUBDIR+=       lua-web-sanitize
 SUBDIR+=       luakit
 SUBDIR+=       lynx
+SUBDIR+=       mailman3-web
 SUBDIR+=       make_album
 SUBDIR+=       matcha-sns
 SUBDIR+=       mediawiki

Added files:

Index: pkgsrc/www/mailman3-web/DESCR
diff -u /dev/null pkgsrc/www/mailman3-web/DESCR:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/DESCR       Sun Jun  4 03:42:22 2023
@@ -0,0 +1,5 @@
+This is a Django project that contains default settings and url settings
+for Mailman 3 Web Interface. It consists of the following sub-projects:
+
+* Postorius
+* Hyperkitty
Index: pkgsrc/www/mailman3-web/Makefile
diff -u /dev/null pkgsrc/www/mailman3-web/Makefile:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/Makefile    Sun Jun  4 03:42:22 2023
@@ -0,0 +1,71 @@
+# $NetBSD: Makefile,v 1.1 2023/06/04 03:42:22 markd Exp $
+
+DISTNAME=      mailman-web-0.0.6
+PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=    www python
+MASTER_SITES=  ${MASTER_SITE_PYPI:=m/mailman-web/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://www.list.org/
+COMMENT=       Mailman 3 Web interface
+LICENSE=       gnu-gpl-v3
+
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm
+DEPENDS+=      ${PYPKGPREFIX}-django>=3.2:../../www/py-django3
+DEPENDS+=      ${PYPKGPREFIX}-hyperkitty-[0-9]*:../../www/py-hyperkitty
+DEPENDS+=      ${PYPKGPREFIX}-postorius-[0-9]*:../../www/py-postorius
+DEPENDS+=      ${PYPKGPREFIX}-Whoosh-[0-9]*:../../textproc/py-Whoosh
+
+USE_LANGUAGES= # none
+
+PYTHON_VERSIONS_INCOMPATIBLE=  27
+
+BUILD_DEFS+=           VARBASE
+
+PKG_SYSCONFSUBDIR=     mailman3
+
+SUBST_CLASSES+=                fhs
+SUBST_STAGE.fhs=       pre-configure
+SUBST_FILES.fhs=       mailman_web/manage.py
+SUBST_FILES.fhs+=      mailman_web/settings/base.py
+SUBST_FILES.fhs+=      crontab.sample
+SUBST_MESSAGE.fhs=     Fixing default paths
+SUBST_VARS.fhs=                PKG_SYSCONFDIR PREFIX VARBASE
+
+MAILMAN_USER?=         mailman
+MAILMAN_GROUP?=                mailman
+
+PKG_GROUPS_VARS+=      MAILMAN_GROUP
+PKG_USERS_VARS+=       MAILMAN_USER
+
+PKG_GROUPS=            ${MAILMAN_GROUP}
+PKG_USERS=             ${MAILMAN_USER}:${MAILMAN_GROUP}
+
+PKG_GECOS.${MAILMAN_USER}=     Mailman user
+PKG_SHELL.${MAILMAN_USER}=     ${SH}
+
+FILES_SUBST+=          MAILMAN_USER=${MAILMAN_USER}
+FILES_SUBST+=          MAILMAN_GROUP=${MAILMAN_GROUP}
+FILES_SUBST+=          PYTHONBIN=${PYTHONBIN}
+
+RCD_SCRIPTS=           mailman-web
+
+OWN_DIRS_PERMS+=       ${VARBASE}/lib/mailman-web ${MAILMAN_USER} ${MAILMAN_GROUP} 775
+OWN_DIRS_PERMS+=       ${VARBASE}/lib/mailman-web/data ${MAILMAN_USER} ${MAILMAN_GROUP} 770
+OWN_DIRS_PERMS+=       ${VARBASE}/log/mailman-web ${MAILMAN_USER} ${MAILMAN_GROUP} 770
+
+EGDIR=                 share/examples/mailman-web
+CONF_FILES_PERMS=      ${EGDIR}/settings.py ${PKG_SYSCONFDIR}/settings.py \
+                       ${MAILMAN_USER} ${MAILMAN_GROUP} 0640
+
+INSTALLATION_DIRS+=    ${EGDIR}
+
+post-patch:
+       ${CP} ${FILESDIR}/crontab.sample ${WRKSRC}/crontab.sample
+
+post-install:
+       ${INSTALL_DATA} ${FILESDIR}/settings.py ${DESTDIR}${PREFIX}/${EGDIR}/settings.py
+       ${INSTALL_DATA} ${WRKSRC}/crontab.sample ${DESTDIR}${PREFIX}/${EGDIR}/crontab.sample
+
+.include "../../lang/python/egg.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/mailman3-web/PLIST
diff -u /dev/null pkgsrc/www/mailman3-web/PLIST:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/PLIST       Sun Jun  4 03:42:22 2023
@@ -0,0 +1,31 @@
+@comment $NetBSD: PLIST,v 1.1 2023/06/04 03:42:22 markd Exp $
+bin/mailman-web
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/mailman_web/__init__.py
+${PYSITELIB}/mailman_web/__init__.pyc
+${PYSITELIB}/mailman_web/__init__.pyo
+${PYSITELIB}/mailman_web/manage.py
+${PYSITELIB}/mailman_web/manage.pyc
+${PYSITELIB}/mailman_web/manage.pyo
+${PYSITELIB}/mailman_web/settings/__init__.py
+${PYSITELIB}/mailman_web/settings/__init__.pyc
+${PYSITELIB}/mailman_web/settings/__init__.pyo
+${PYSITELIB}/mailman_web/settings/base.py
+${PYSITELIB}/mailman_web/settings/base.pyc
+${PYSITELIB}/mailman_web/settings/base.pyo
+${PYSITELIB}/mailman_web/settings/mailman.py
+${PYSITELIB}/mailman_web/settings/mailman.pyc
+${PYSITELIB}/mailman_web/settings/mailman.pyo
+${PYSITELIB}/mailman_web/urls.py
+${PYSITELIB}/mailman_web/urls.pyc
+${PYSITELIB}/mailman_web/urls.pyo
+${PYSITELIB}/mailman_web/wsgi.py
+${PYSITELIB}/mailman_web/wsgi.pyc
+${PYSITELIB}/mailman_web/wsgi.pyo
+share/examples/mailman-web/crontab.sample
+share/examples/mailman-web/settings.py
Index: pkgsrc/www/mailman3-web/distinfo
diff -u /dev/null pkgsrc/www/mailman3-web/distinfo:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/distinfo    Sun Jun  4 03:42:22 2023
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2023/06/04 03:42:22 markd Exp $
+
+BLAKE2s (mailman-web-0.0.6.tar.gz) = d6e674b082e1ed1dc4d1ad31f151b125955f2d665420c24b25d7f0055b73e93f
+SHA512 (mailman-web-0.0.6.tar.gz) = db1844f77c38469dab0f8aedd2efcebe2ae6a58877ba99b8489ebec7d05fba5f448a1952d2275b5db7c62e5f8641d5bcdd42915ae44aeb1a27c7063efde12906
+Size (mailman-web-0.0.6.tar.gz) = 24775 bytes
+SHA1 (patch-mailman__web_manage.py) = dc7ba1e520869d93bedb4dedb8ac8c92ca362cd8
+SHA1 (patch-mailman__web_settings_base.py) = 3f9aa8af506f1d3b988a3a0da7193efa2e993668

Index: pkgsrc/www/mailman3-web/files/crontab.sample
diff -u /dev/null pkgsrc/www/mailman3-web/files/crontab.sample:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/files/crontab.sample        Sun Jun  4 03:42:22 2023
@@ -0,0 +1,7 @@
+@hourly        @PREFIX@/bin/mailman-web runjobs hourly
+@daily @PREFIX@/bin/mailman-web runjobs daily
+@weekly        @PREFIX@/bin/mailman-web runjobs weekly
+@monthly  @PREFIX@/bin/mailman-web runjobs monthly
+@yearly        @PREFIX@/bin/mailman-web runjobs yearly
+* * * * *  @PREFIX@/bin/mailman-web runjobs minutely
+2,17,32,47 * * * * @PREFIX@/bin/mailman-web runjobs quarter_hourly
Index: pkgsrc/www/mailman3-web/files/mailman-web.sh
diff -u /dev/null pkgsrc/www/mailman3-web/files/mailman-web.sh:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/files/mailman-web.sh        Sun Jun  4 03:42:22 2023
@@ -0,0 +1,32 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: mailman-web.sh,v 1.1 2023/06/04 03:42:22 markd Exp $
+#
+#  run django_q task queue for hyperkitty
+#
+# PROVIDE: mailman_web
+# REQUIRE: mail
+
+if [ -f /etc/rc.subr ]
+then
+       . /etc/rc.subr
+fi
+
+name="mailman_web"
+rcvar=$name
+command="@PREFIX@/bin/mailman-web"
+command_args="qcluster"
+command_interpreter="@PYTHONBIN@"
+start_cmd="mailman_web_doit"
+
+mailman_web_doit()
+{
+       @SU@ -m @MAILMAN_USER@ -c "${command} ${command_args} &"
+}
+
+if [ -f /etc/rc.subr ]; then
+       load_rc_config $name
+       run_rc_command "$1"
+else
+        [ "$1" eq "start" ] && $start_cmd
+fi
Index: pkgsrc/www/mailman3-web/files/settings.py
diff -u /dev/null pkgsrc/www/mailman3-web/files/settings.py:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/files/settings.py   Sun Jun  4 03:42:22 2023
@@ -0,0 +1,4 @@
+# mailman-web config
+from mailman_web.settings.base import *
+from mailman_web.settings.mailman import *
+# modifications to the file should begin below this comment

Index: pkgsrc/www/mailman3-web/patches/patch-mailman__web_manage.py
diff -u /dev/null pkgsrc/www/mailman3-web/patches/patch-mailman__web_manage.py:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/patches/patch-mailman__web_manage.py        Sun Jun  4 03:42:22 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-mailman__web_manage.py,v 1.1 2023/06/04 03:42:22 markd Exp $
+
+configure paths
+
+--- mailman_web/manage.py.orig 2022-09-10 15:28:48.000000000 +0000
++++ mailman_web/manage.py
+@@ -12,7 +12,7 @@ def setup():
+ 
+     MAILMAN_WEB_CONFIG = os.getenv(
+         'MAILMAN_WEB_CONFIG',
+-        '/etc/mailman3/settings.py',
++        '@PKG_SYSCONFDIR@/settings.py',
+     )
+ 
+     if not os.path.exists(MAILMAN_WEB_CONFIG):
Index: pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_base.py
diff -u /dev/null pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_base.py:1.1
--- /dev/null   Sun Jun  4 03:42:23 2023
+++ pkgsrc/www/mailman3-web/patches/patch-mailman__web_settings_base.py Sun Jun  4 03:42:22 2023
@@ -0,0 +1,33 @@
+$NetBSD: patch-mailman__web_settings_base.py,v 1.1 2023/06/04 03:42:22 markd Exp $
+
+configure paths
+
+--- mailman_web/settings/base.py.orig  2022-09-10 14:41:36.000000000 +0000
++++ mailman_web/settings/base.py
+@@ -4,7 +4,7 @@ from django.contrib.messages import cons
+ from pathlib import Path
+ 
+ #: The base directory for logs and database.
+-BASE_DIR = Path('/opt/mailman/web')
++BASE_DIR = Path('@VARBASE@/lib/mailman-web')
+ 
+ #: Default list of admins who receive the emails from error logging.
+ ADMINS = (
+@@ -137,7 +137,7 @@ WSGI_APPLICATION = 'mailman_web.wsgi.app
+ DATABASES = {
+     'default': {
+         'ENGINE': 'django.db.backends.sqlite3',
+-        'NAME': os.path.join(BASE_DIR, 'mailman-web.db'),
++        'NAME': os.path.join(BASE_DIR, 'data/mailman-web.db'),
+         'HOST': '',
+         'PORT': '',
+     }
+@@ -255,7 +255,7 @@ LOGGING = {
+         'file': {
+             'level': 'INFO',
+             'class': 'logging.handlers.WatchedFileHandler',
+-            'filename': os.path.join(BASE_DIR, 'logs', 'mailmanweb.log'),
++            'filename': '@VARBASE@/log/mailman-web/mailman-web.log',
+             'formatter': 'verbose',
+         },
+         'console': {



Home | Main Index | Thread Index | Old Index