Version bump + various cleanups

7 files changed, 50 insertions, 66 deletions

diff --git a/net-mail/sympa/Manifest b/net-mail/sympa/Manifest
index 9bd1185..ae99f3c 100644
--- a/net-mail/sympa/Manifest
+++ b/net-mail/sympa/Manifest
@@ -1,8 +1,7 @@
 AUX sympa-6.2.initd 1101 BLAKE2B f367ac3730aaeda4ae8cb99bafc87291e3b2aeeecc507256ea2a3bd19a2094f6dafc00536bd8132beecd7fb214f4e25c5c0b8cfe49a28d5c14ac0f7af897286f SHA512 bf2e6fe97abf58379fe37d6cf9fa4528ccc1027217562efa9b61a66b8f6e65993f2577e5bc0ac8711d10f12ae090b848e6acd9db047cb79d3b53ea488b598940
-AUX sympa-apache.conf 307 BLAKE2B 01c2cf98a32951916e0ca2472c3ac4d30a40659d4b7c0474ce10e01b151cf69ad0c7d17cc93e540240ea386005a23de276cdc1ce2e423a101af4d8fd4b120a8e SHA512 26a132c6e8fd1aec951f5755351d2ec69c34dd213a2249cb0b995938cfdf7c1ec50fe5c11780cfb0da953ba00e9fee5c6846cc5beb486b1d6e0716d0c7695486
-AUX sympa-apache_soap.conf 332 BLAKE2B 97003842d7e4f57ab5df3a8ee7e971e1de8fc7a23787667e3ec3af6883f38f028c12d1986cc48e70503754e2dfb06bc68c167129eb7a32355407f177c6063714 SHA512 f54c45f0a5b49fb3e687a17ad8982c6f6cab667959ed92d2ee56f231b3bcf378b267adb3c32b26597c3af625e88f9dfdfe0cbe58a20153d224bb5f107b681891
-AUX sympa-lighttpd.conf 372 BLAKE2B 701e0bc7ed328257a62d29eb5899da255a5102e8fc1c199ae8769000053fc7c771b2159be86ba7fa232cb243801352719d9cf9f985f36a84b157faff70dcb673 SHA512 765ec8521fe426da3c17186a8820982388cc6678fb038473de7310d15aa789b902df2edd055e82bfc98cc7161a2728f9f685f2da5862c466635a901d47f301e5
-AUX sympa-lighttpd_soap.conf 382 BLAKE2B 08456e6603a4a2f960a818c5ab5374d03c15e5cc30aae83ad6602758d7cad857fd0b2a1995f23c37b17f3046a2f45f57e14f9b5cf7742fde0b4c23c86798d5b2 SHA512 1aac44ca4c410d90e384ac092cfbb2ead8a144ed472998266ccc9b1411e6ce6d4c02edbf46496c14585c65cfbf23cf8276901df2d54895bdf4edd3cecf447f2d
+AUX sympa-apache.conf 372 BLAKE2B db8dc96e13cb022322137f79314c24f6724fc42b2ec66c72e8c6b52f5070360d7583cda4c7ba470a62185bf253e00e705c2816151f31a879534b515d7c932913 SHA512 ec050ca4ebfac8439f7c3715e7650fa7507d6c9f2ef07d6ae0e1d9928081997fd1425afd37be9654726c25cf3fdcf651f6700fc046d83a2dfabba7908498e477
+AUX sympa-lighttpd.conf 398 BLAKE2B 7a35e360cb546ec9151ec564a245bf62a9acbb1a9f56e3ad598e1fbdd8be1405a92c1bf623a575c29cb6b09f0cc235cc34d2a6ca7ae2f38197b6bb8e667eb4b4 SHA512 8c7811d7a82c9d77aea5d20dced41c394fc8d3ec3e46c898e519d19422e4cf3fc6edce9bc9065ecf9ce08f1775b03bfd5cfac07e1ba40a3beceb8e240ba99b33
 AUX sympa-nginx.conf 252 BLAKE2B 51471cdc0151a10d86b396bb7d3ecca51508d53fbcce91804c2ffcfefd6ee9170502d2cc36519eb66570371150fafa81ae7ed991d38ba901e1c4248f806d06e5 SHA512 076900022f1d6c03e26301ed15514dc922a9ba9718c8a344722ad755c5caf0277daae944959f061445f58ef163d6d243670fb97b92f06e6370a1f8621762221f
-DIST sympa-6.2.56.tar.gz 12864493 BLAKE2B 0eefa3c132eb347b6d71bd522409fe0264bd65f265c9ebb02c360a9ae503cb32a22c70069e5c96bc0892b0045b96b325a07e283cd536ffd79197a57b8aff01fa SHA512 eb83e773bc23f1e5100fac8efd6091b7767f67ffbeeac42b26d6ec42629c61ff8e8372541924afbaccd5f34d208f53454dec40581dbd162fa58c85301e1a3414
-EBUILD sympa-6.2.56.ebuild 7914 BLAKE2B 357707951efbd742049f9986beafb05bf57bd1bf22d4f992dec7ce0d9f76d2a68665bf5d7b31a23b092ceec438a2a5f78acc9d740504d5c885dd79a8cd3334ed SHA512 fbf49aa7e210ad49adc0a19376361c3b66f77cc35809e71a6bb7670ef15c480e70f1ab0d43da151a7d7ffcea1c703065f8a3c8f74248d71296e44e687bb80b31
+DIST sympa-6.2.58.tar.gz 12863222 BLAKE2B 5211ceca6c1e82d908ba479d69d21cafb0c7d38e15e41ad5bd9668913ad8f7f9669e5708d8770375d7b390b51eb51f7f2fccd81ffd9a2ea2b1fe8c4cc8cfc2f5 SHA512 39c74dbd33ba6dd3babbe395c03feeae78b02923e8ddd152d2aca94438bee01eaa86e3d9458c25b230296763303958bb2b1ed03f245121635c0e5820ecb33fb0
+EBUILD sympa-6.2.58.ebuild 7602 BLAKE2B a3e69edb43d76c94177cef5871af9039a444a5d104ac821d2986bf31fb637dc58e67e09f3495f2e92c4acec7006862e9f4b2bc59c5d91c26b8c34da833018383 SHA512 bf94e46b277a1d27f68bd48898800b2715cb870c245015473464e415de9c5078ddbaf10d0bf46960b97c63e6724ef3770b9c23e6eaf8f5c784276cff70a0af14
+MISC metadata.xml 401 BLAKE2B 5cafd6f758cd237ea92cf4071381782f55e0e4e52d3579058339d62f55dbe8855479b1102032e6e3d533277621d8cf0be9596bd34d4f685c7935bd9a3d3ea12c SHA512 0ef7a477f6063a6876774ac78404785235eb07646766951f4c08617dcb06126339ca0d2607054a770861f93e17509d9e28a11a36d7b84f0fb8f8d63771b7362e
diff --git a/net-mail/sympa/files/sympa-apache.conf b/net-mail/sympa/files/sympa-apache.conf
index 94098f8..1d652c1 100644
--- a/net-mail/sympa/files/sympa-apache.conf
+++ b/net-mail/sympa/files/sympa-apache.conf
@@ -1,11 +1,14 @@
-Alias /static-sympa		/var/spool/sympa/static_content
+LoadModule alias_module modules/mod_alias.so
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
+
+<Location /sympa>
+    SetHandler "proxy:unix:/var/run/sympa.sock|fcgi://"
+    Require all granted
+</Location>
 
-<IfDefine SYMPA>
-	ScriptAlias /sympa /usr/libexec/sympa/wwsympa-wrapper.fcgi
-	<IfDefine FASTCGI>
-		FastCgiServer /usr/libexec/sympa/wwsympa-wrapper.fcgi -processes 2
-		<Location /sympa>
-		SetHandler fastcgi-script
-		</Location>
-	</Ifdefine>
-</Ifdefine>
+<Location /static-sympa>
+    Require all granted
+</Location>
+
+Alias /static-sympa		/var/spool/sympa/static_content
diff --git a/net-mail/sympa/files/sympa-apache_soap.conf b/net-mail/sympa/files/sympa-apache_soap.conf
deleted file mode 100644
index 553df34..0000000
--- a/net-mail/sympa/files/sympa-apache_soap.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Alias /static-sympa		/var/spool/sympa/static_content
-
-<IfDefine SYMPA_SOAP>
-	ScriptAlias /sympa /usr/libexec/sympa/sympa_soap_server-wrapper.fcgi
-	<IfDefine FASTCGI>
-		FastCgiServer /usr/libexec/sympa/sympa_soap_server-wrapper.fcgi -processes 2
-		<Location /sympa>
-		SetHandler fastcgi-script
-		</Location>
-	</Ifdefine>
-</Ifdefine>
diff --git a/net-mail/sympa/files/sympa-lighttpd.conf b/net-mail/sympa/files/sympa-lighttpd.conf
index 7023086..ce072c5 100644
--- a/net-mail/sympa/files/sympa-lighttpd.conf
+++ b/net-mail/sympa/files/sympa-lighttpd.conf
@@ -1,14 +1,15 @@
 server.modules += ("mod_fastcgi")
+server.modules += ("mod_alias")
 
 alias.url += ( "/static-sympa/" => "/var/spool/sympa/static_content/" )
 
 $HTTP["url"] =~ "^/sympa" {
-fastcgi.server = ( "/sympa" =>
-			((	"check-local"	=>	"disable",
-				"bin-path"	=>	"/usr/libexec/sympa/wwsympa-wrapper.fcgi",
-				"socket"	=>	"/var/run/lighttpd/sympa.sock",
-				"max-procs"	=> 	2,
-				"idle-timeout"	=> 	20,
-			))
-		)
+	fastcgi.server = ( "/sympa" =>
+		((	"check-local"	=>	"disable",
+			"bin-path"	=>	"/usr/libexec/sympa/wwsympa-wrapper.fcgi",
+			"socket"	=>	"/var/run/lighttpd/sympa.sock",
+			"max-procs"	=> 	2,
+			"idle-timeout"	=> 	20,
+		))
+	)
 }
diff --git a/net-mail/sympa/files/sympa-lighttpd_soap.conf b/net-mail/sympa/files/sympa-lighttpd_soap.conf
deleted file mode 100644
index 121114f..0000000
--- a/net-mail/sympa/files/sympa-lighttpd_soap.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-server.modules += ("mod_fastcgi")
-
-alias.url += ( "/static-sympa/" => "/var/spool/sympa/static_content/" )
-
-$HTTP["url"] =~ "^/sympa" {
-fastcgi.server = ( "/sympa" =>
-			((	"check-local"	=>	"disable",
-				"bin-path"	=>	"/usr/libexec/sympa/sympa_soap_server-wrapper.fcgi",
-				"socket"	=>	"/var/run/lighttpd/sympa.sock",
-				"max-procs"	=> 	2,
-				"idle-timeout"	=> 	20,
-			))
-		)
-}
diff --git a/net-mail/sympa/metadata.xml b/net-mail/sympa/metadata.xml
new file mode 100644
index 0000000..3f08bb9
--- /dev/null
+++ b/net-mail/sympa/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marcin.deranek@slonko.net</email>
+		<name>Marcin Deranek</name>
+	</maintainer>
+	<use>
+		<flag name="compat">Enable migration compatibility flag</flag>
+		<flag name="dkim">Add DomainKeys Identified Mail support</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-mail/sympa/sympa-6.2.56.ebuild b/net-mail/sympa/sympa-6.2.58.ebuild
index 2b4fe71..fa3c8ab 100644
--- a/net-mail/sympa/sympa-6.2.56.ebuild
+++ b/net-mail/sympa/sympa-6.2.58.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils user multilib autotools
+inherit eutils multilib autotools
 
 SYMPA_VERSION="$(ver_cut 1-2)"
 SYMPA_RELEASE="$(ver_cut 3-)"
@@ -32,8 +32,12 @@ KEYWORDS="~amd64 ~x86"
 IUSE="clamav -compat dkim fastcgi ldap mysql nls postgres soap sqlite ssl"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
-# See https://www.sympa.org/manual/installing-sympa#required_cpan_modules
+ACCT_DEPEND="
+	acct-group/sympa
+	acct-user/sympa
+"
 RDEPEND="
+	${ACCT_DEPEND}
 	>=dev-lang/perl-5.8
 	>=dev-perl/CGI-3.51
 	>=virtual/perl-Digest-MD5-2.00
@@ -94,14 +98,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	"
 
-SYMPA_USER="sympa"
-SYMPA_GROUP="sympa"
-
-pkg_setup() {
-	enewgroup ${SYMPA_GROUP}
-	enewuser ${SYMPA_USER} -1 -1 -1 ${SYMPA_GROUP}
-}
-
 src_prepare() {
 	default
 	# Override defaults for certain options, so
@@ -139,8 +135,8 @@ src_configure() {
 		--without-initdir \
 		--with-unitsdir=/usr/lib/systemd/system \
 		--with-defaultdir=/usr/share/sympa/default \
-		--with-user=${SYMPA_USER} \
-		--with-group=${SYMPA_GROUP} \
+		--with-user=sympa \
+		--with-group=sympa \
 		$(use_enable nls) \
 		|| die "econf failed"
 }
@@ -155,7 +151,7 @@ src_install() {
 	# Do not overwrite data_structure.version
 	rm -f "${D}/etc/sympa/data_structure.version"
 	# Set permissions and ownership on config files
-	fowners root:${SYMPA_GROUP} /etc/sympa/sympa.conf
+	fowners root:sympa /etc/sympa/sympa.conf
 	fperms u=rwX,g=rX,o= /etc/sympa/sympa.conf
 	# Elevate some permissions to read config files
 	fperms g+s /usr/libexec/sympa/{bouncequeue,familyqueue,queue}
@@ -206,7 +202,7 @@ src_install() {
 	local DIR
 	for DIR in ${SYMPA_DIRS}; do
 		keepdir /var/spool/sympa/${DIR}
-		fowners ${SYMPA_USER}:${SYMPA_GROUP} /var/spool/sympa/${DIR}
+		fowners sympa:sympa /var/spool/sympa/${DIR}
 		case "${DIR}" in
 			static_content*)
 				fperms 755 /var/spool/sympa/${DIR}
@@ -220,9 +216,7 @@ src_install() {
 	keepdir /var/lib/sympa/lists
 
 	newdoc "${FILESDIR}/${PN}-apache.conf" apache.conf
-	newdoc "${FILESDIR}/${PN}-apache_soap.conf" apache_soap.conf
 	newdoc "${FILESDIR}/${PN}-lighttpd.conf" lighttpd.conf
-	newdoc "${FILESDIR}/${PN}-lighttpd_soap.conf" lighttpd_soap.conf
 	newdoc "${FILESDIR}/${PN}-nginx.conf" nginx.conf
 }
 
@@ -234,7 +228,7 @@ pkg_postinst() {
 	elog
 	elog "The Sympa web interface needs to be setup in your webserver."
 	elog "For more information please consult Sympa documentation at"
-	elog "https://www.sympa.org/manual/web-interface#web_server_setup"
+	elog "https://www.sympa.org/manual/install/configure-http-server.md"
 	elog "Sample configs are installed in /usr/share/doc/${P}"
 	elog