[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 88a63dcd3507114e2624358f5601cdf71e198b65 Author: Arthur Zamarin gentoo org> AuthorDate: Mon Jun 10 20:04:42 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Jun 10 20:05:12 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a63dcd net-im/ejabberd: dekeyword ia64 Signed-off-by: Arthur Zamarin gentoo.org> net-im/ejabberd/ejabberd-23.01.ebuild| 4 ++-- net-im/ejabberd/ejabberd-23.04.ebuild| 4 ++-- net-im/ejabberd/ejabberd-23.10-r1.ebuild | 2 +- net-im/ejabberd/ejabberd-24.02-r1.ebuild | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net-im/ejabberd/ejabberd-23.01.ebuild b/net-im/ejabberd/ejabberd-23.01.ebuild index 82b509558d13..0f035a88b40c 100644 --- a/net-im/ejabberd/ejabberd-23.01.ebuild +++ b/net-im/ejabberd/ejabberd-23.01.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis diff --git a/net-im/ejabberd/ejabberd-23.04.ebuild b/net-im/ejabberd/ejabberd-23.04.ebuild index 69ddba1b5199..93c881b724c4 100644 --- a/net-im/ejabberd/ejabberd-23.04.ebuild +++ b/net-im/ejabberd/ejabberd-23.04.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis diff --git a/net-im/ejabberd/ejabberd-23.10-r1.ebuild b/net-im/ejabberd/ejabberd-23.10-r1.ebuild index 6a842d1ea221..c8083549429e 100644 --- a/net-im/ejabberd/ejabberd-23.10-r1.ebuild +++ b/net-im/ejabberd/ejabberd-23.10-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis diff --git a/net-im/ejabberd/ejabberd-24.02-r1.ebuild b/net-im/ejabberd/ejabberd-24.02-r1.ebuild index c6595ebb5cd8..8627621ccdc6 100644 --- a/net-im/ejabberd/ejabberd-24.02-r1.ebuild +++ b/net-im/ejabberd/ejabberd-24.02-r1.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="~amd64 ~arm ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f036123a771c9e22a63a703084ebd3a34d72b600
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Apr 16 14:51:36 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Apr 16 14:55:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f036123a
net-im/ejabberd: drop 22.10
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 -
net-im/ejabberd/ejabberd-22.10.ebuild | 219 --
2 files changed, 220 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index de882a0699c5..87fa8a24c949 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,3 @@
-DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B
670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3
SHA512
3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B
c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4
SHA512
3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b
DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B
292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d
SHA512
2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab
DIST ejabberd-23.10-fix-ejabberdctl.patch 1945 BLAKE2B
3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808
SHA512
0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild
b/net-im/ejabberd/ejabberd-22.10.ebuild
deleted file mode 100644
index e7e594bb..
--- a/net-im/ejabberd/ejabberd-22.10.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools pam rebar systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="
- https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
- roster-gw selinux sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND="
- >=dev-lang/erlang-19.3[odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.30
- >=dev-erlang/eimp-1.0.22
- >=dev-erlang/fast_tls-1.1.16
- >=dev-erlang/fast_xml-1.1.49
- >=dev-erlang/fast_yaml-1.0.34
- >=dev-erlang/yconf-1.0.14
- >=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.11.2
- >=dev-erlang/lager-3.9.1
- >=dev-erlang/p1_oauth2-0.6.11
- >=dev-erlang/p1_utils-1.0.25
- >=dev-erlang/stringprep-1.0.29
- >=dev-erlang/xmpp-1.6.0
- >=dev-erlang/pkix-1.0.9
- >=dev-erlang/mqtree-1.0.15
- >=dev-erlang/idna-6.0.0-r1
- >=dev-erlang/p1_acme-1.0.20
- >=dev-erlang/base64url-1.0.1
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.20 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.12 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.19 )
- redis? ( >=dev-erlang/eredis-1.2.0 )
- sip? ( >=dev-erlang/esip-1.0.48 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
- stun? ( >=dev-erlang/stun-1.2.6 )
- zlib? ( >=dev-erlang/ezlib-1.0.12 )
-"
-RDEPEND="
- ${DEPEND}
- >=acct-user/ejabberd-2[pam?]
- captcha? ( media-gfx/imagemagick[truetype,png] )
- selinux? ( sec-policy/selinux-jabber )
-"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=(
-
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
-)
-
-# Get path to ejabberd lib directory.
-#
-# This is the path ./configure script Base for this path is path set in
-# ./configure script which is /usr/lib by default. If libdir is explicitely set
-# to something else than this should be adjusted here as well.
-get_ejabberd_path() {
- echo "/usr/$(get_libdir)/${P}"
-}
-
-src_prepare() {
- default
-
- eautoreconf
-
- rebar_remove_deps
-
- # Set paths to ejabberd lib directory consistently to point always to
directory
- # suffixed with version.
- sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f5f0792522d97a27caeb4be342c7f1016958e580 Author: Florian Schmaus gentoo org> AuthorDate: Tue Apr 16 14:50:43 2024 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Apr 16 14:50:43 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5f07925 net-im/ejabberd: stabilize 23.10-r1 for amd64 Closes: https://bugs.gentoo.org/926739 Signed-off-by: Florian Schmaus gentoo.org> net-im/ejabberd/ejabberd-23.10-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/ejabberd/ejabberd-23.10-r1.ebuild b/net-im/ejabberd/ejabberd-23.10-r1.ebuild index 72df4518bfd7..6a842d1ea221 100644 --- a/net-im/ejabberd/ejabberd-23.10-r1.ebuild +++ b/net-im/ejabberd/ejabberd-23.10-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f38ed16bd83f84025945271f3a6d660ab0438bfa
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Mar 12 19:26:57 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Mar 12 19:31:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f38ed16b
net-im/ejabberd: pass --with-rebar=rebar to use rebar 2
ejabberd 24.02 started to use rebar 3 as default build system. This
broke the ebuild, since rebar.eclass sill uses rebar 2. Passing
--with-rebar=rebar switches this back to rebar 2.
Thanks to Holger Weiß for pointing this out.
Closes: https://bugs.gentoo.org/926799
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/{ejabberd-24.02.ebuild => ejabberd-24.02-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-im/ejabberd/ejabberd-24.02.ebuild
b/net-im/ejabberd/ejabberd-24.02-r1.ebuild
similarity index 99%
rename from net-im/ejabberd/ejabberd-24.02.ebuild
rename to net-im/ejabberd/ejabberd-24.02-r1.ebuild
index 1a918b3c7001..c6595ebb5cd8 100644
--- a/net-im/ejabberd/ejabberd-24.02.ebuild
+++ b/net-im/ejabberd/ejabberd-24.02-r1.ebuild
@@ -122,6 +122,7 @@ src_configure() {
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
--localstatedir="${EPREFIX}/var" \
--enable-user=${PN} \
+ --with-rebar=rebar \
$(use_enable debug) \
$(use_enable full-xml) \
$(use_enable mssql) \
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: bea7f44732018363cd0743984e128780ac894de2
Author: Florian Schmaus gentoo org>
AuthorDate: Sun Mar 10 20:01:02 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Mar 10 20:09:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea7f447
net-im/ejabberd: add 24.02
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/ejabberd-24.02.ebuild | 220 ++
1 file changed, 220 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-24.02.ebuild
b/net-im/ejabberd/ejabberd-24.02.ebuild
new file mode 100644
index ..1a918b3c7001
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-24.02.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+
https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch
->
+ ${P}-fix-ejabberdctl.patch
+
https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch
->
+ ${P}-set-ejabberd-opts.patch
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+ >=dev-lang/erlang-20[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.19
+ >=dev-erlang/fast_xml-1.1.51
+ >=dev-erlang/fast_yaml-1.0.36
+ >=dev-erlang/yconf-1.0.15
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.5
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.14
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.29
+ >=dev-erlang/xmpp-1.8.1
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.16
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.22
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.23 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.14 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.25 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.52 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
+ stun? ( >=dev-erlang/stun-1.2.12 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-2[pam?]
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+ echo "/usr/$(get_libdir)/${P}"
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ rebar_remove_deps
+
+ # Set paths to ejabberd lib directory consistently to point always to
directory
+ # suffixed with version.
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+
+ # Get epam-wrapper from 'files' directory and correct path to lib
directory in
+ # it. epam-wrapper is placed into work directory. It is assumed no
epam-wrapper
+ # file exists there already.
+ local epam_wrapper_src="${FILESDIR}/epam-wrapper"
+ local epam_wrapper_dst="${S}/epam-wrapper"
+ [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+ sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+ "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+ || die 'failed to install epam-wrapper'
+
+ rebar_fix_include_path fast_xml
+ rebar_fix_include_path p1_utils
+ rebar_fix_include_path xmpp
+
+ # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+ # rather than its parent which is default. That way ejabberd directory
+ # takes precedence is module lookup.
+ local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, dev-erlang/mqtree/
commit: 3dcc16b18265c12cebaf9980bcca9444af9e29ef
Author: Florian Schmaus gentoo org>
AuthorDate: Sun Mar 10 17:57:27 2024 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Mar 10 20:08:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dcc16b1
dev-erlang/mqtree: add 1.0.16
Signed-off-by: Florian Schmaus gentoo.org>
dev-erlang/mqtree/Manifest | 1 +
dev-erlang/mqtree/mqtree-1.0.16.ebuild | 22 ++
net-im/ejabberd/Manifest | 3 +++
3 files changed, 26 insertions(+)
diff --git a/dev-erlang/mqtree/Manifest b/dev-erlang/mqtree/Manifest
index b0d868c58758..54e8e4726cf4 100644
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@@ -1 +1,2 @@
DIST mqtree-1.0.15.tar.gz 265445 BLAKE2B
44b887d3aa7d3ddb93cc42ee11f6612e399f880ab74a005cdae2c1de81ac035976d35f117052d55a1827c5074b494ef1f80d01742868cc7f10a8c94896cefd69
SHA512
e50066c39bb7feb4bea6a0fcff65ec4e73fca3aeeafa85be10ef7fe354e582a037369dc27163e47796f021e8cb70c40c396e5edce0ebf8255d4e452c4df0d4da
+DIST mqtree-1.0.16.tar.gz 265523 BLAKE2B
73398ba5cfb76ffd12f80aac88b1f793543d0a6a879d5674f6179c88e45bd23fa1a1143b0733bf05d63f7ac6804674299cf1fecce666166525b2bd4b199a9e5e
SHA512
435b4b3679827e7e2e9bf0f439c7f734a61095b576a8a5d461efe9bda31698a07171e1a13fa0378323b8d2713365ad4d4c4a06e4e75e467758b416aa08387113
diff --git a/dev-erlang/mqtree/mqtree-1.0.16.ebuild
b/dev-erlang/mqtree/mqtree-1.0.16.ebuild
new file mode 100644
index ..66dab4d0d700
--- /dev/null
+++ b/dev-erlang/mqtree/mqtree-1.0.16.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit rebar
+
+DESCRIPTION="Index tree for MQTT topic filters"
+HOMEPAGE="https://github.com/processone/mqtree;
+SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+DEPEND="
+ >=dev-lang/erlang-17.5
+ >=dev-erlang/p1_utils-1.0.25
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index ee84f649a34b..de882a0699c5 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -4,3 +4,6 @@ DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B
292da892f62d6940418980bfaec63f3aa570f
DIST ejabberd-23.10-fix-ejabberdctl.patch 1945 BLAKE2B
3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808
SHA512
0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
DIST ejabberd-23.10-set-ejabberd-opts.patch 1508 BLAKE2B
1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa
SHA512
aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B
0c3adfac5d99a33f37b0bd9970489f7a9e32bc1a832efe510be3281cd4ac2df890aa7eeab5758149b3cb16a2e6a71937ee955a86113bba14540d5c685f900ef6
SHA512
d42af356b0b6ebbba757de4256e308766f046d6c2a7df355330fbc9a9fb329635a22c2f9e5fc4d0a9dbe2d7e5488efe85000c4d04a9a0ce12921d839899e0c45
+DIST ejabberd-24.02-fix-ejabberdctl.patch 1945 BLAKE2B
3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808
SHA512
0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
+DIST ejabberd-24.02-set-ejabberd-opts.patch 1508 BLAKE2B
1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa
SHA512
aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
+DIST ejabberd-24.02.tar.gz 2531049 BLAKE2B
6d18393dd909ef580fdcc173fb927a1302f7d444e5587c30f36e5bbfe7634b61c14e06d31f386123ec8732f0c49180a10b0abbd7dea42589d1d0ec9df54ca0f4
SHA512
43dcf1c0f1a2a0390de9edfa24705be6b5bcfdc83b307c175effeae043b4a67dd00c4930c5e43fda98c7c3e0060fac7198313cd27b7962a8997e006ef255df0c
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 2f272ce2acf66bb2471cd5ce9fd4756336b36864
Author: Florian Schmaus gentoo org>
AuthorDate: Mon Dec 11 15:42:44 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Dec 11 15:43:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f272ce2
net-im/ejabberd: backport fixes for ejabberdctl
Thanks to Holger Weiß for mentioning the patches to backport.
Closes: https://bugs.gentoo.org/919711
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 2 ++
.../ejabberd/{ejabberd-23.10.ebuild => ejabberd-23.10-r1.ebuild} | 7 +++
2 files changed, 9 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 1e121eba56f2..ee84f649a34b 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,6 @@
DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B
670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3
SHA512
3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B
c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4
SHA512
3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b
DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B
292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d
SHA512
2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab
+DIST ejabberd-23.10-fix-ejabberdctl.patch 1945 BLAKE2B
3e9e690802dd201aaba50b16435c98e64b52bfa2c77dd054c4db538f8bd9035386282e43b3c51fa444119901addeb2c3174d55d66a515847f80771e350e0a808
SHA512
0a6780915177fa4012a194d3fa755a812f0bed5d446df630c46834953aad54679450ff9fdaa1aa7fb415de5bb905a3dc2b28c65b7b32f0fd83cd99634bb5073d
+DIST ejabberd-23.10-set-ejabberd-opts.patch 1508 BLAKE2B
1692fb54b3aeb9838f057d32ebebffbcca5761c820d95a377b257966094e973465740b224d17bebdae0a4f3d0b5ebe35c9c1b005217a3e9baae69fc2511c69aa
SHA512
aa7f13be15ec4cb0a9c17e5c1519d5fd94ccee75b46e3a8ee1de39e23000c7faad530208c049dd4a290be18b8b9f1c866584a9abf3f288a8f2fd66c2d72e4fa5
DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B
0c3adfac5d99a33f37b0bd9970489f7a9e32bc1a832efe510be3281cd4ac2df890aa7eeab5758149b3cb16a2e6a71937ee955a86113bba14540d5c685f900ef6
SHA512
d42af356b0b6ebbba757de4256e308766f046d6c2a7df355330fbc9a9fb329635a22c2f9e5fc4d0a9dbe2d7e5488efe85000c4d04a9a0ce12921d839899e0c45
diff --git a/net-im/ejabberd/ejabberd-23.10.ebuild
b/net-im/ejabberd/ejabberd-23.10-r1.ebuild
similarity index 94%
rename from net-im/ejabberd/ejabberd-23.10.ebuild
rename to net-im/ejabberd/ejabberd-23.10-r1.ebuild
index 01b54660d1ad..72df4518bfd7 100644
--- a/net-im/ejabberd/ejabberd-23.10.ebuild
+++ b/net-im/ejabberd/ejabberd-23.10-r1.ebuild
@@ -9,6 +9,10 @@ DESCRIPTION="Robust, scalable and extensible XMPP server"
HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
SRC_URI="
https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+
https://github.com/processone/ejabberd/commit/841d5c029905d5feabe07ab5a4db3aacfeedefb6.patch
->
+ ${P}-fix-ejabberdctl.patch
+
https://github.com/processone/ejabberd/commit/4ea46c57653b3d9ea9c1386d1cc3dd07163d74d6.patch
->
+ ${P}-set-ejabberd-opts.patch
"
LICENSE="GPL-2"
@@ -66,6 +70,9 @@ RDEPEND="
DOCS=( CHANGELOG.md README.md )
PATCHES=(
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+ # Both patches for https://bugs.gentoo.org/919711
+ "${DISTDIR}/${P}-fix-ejabberdctl.patch"
+ "${DISTDIR}/${P}-set-ejabberd-opts.patch"
)
# Get path to ejabberd lib directory.
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: b567bd0ca980d2680b7496ff11c4ab1941593cef
Author: Florian Schmaus gentoo org>
AuthorDate: Sun Dec 10 10:52:32 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Dec 10 10:53:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b567bd0c
net-im/ejabberd: add 23.10
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-23.10.ebuild | 216 ++
2 files changed, 217 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 7b6645103ecf..1e121eba56f2 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,4 @@
DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B
670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3
SHA512
3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B
c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4
SHA512
3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b
DIST ejabberd-23.04.tar.gz 2581686 BLAKE2B
292da892f62d6940418980bfaec63f3aa570f0af4c78be80ff6996d13269f5303ff9ecd88c0fa4ba8daecf5183a7eb31a7048f3425d128b03cc7029a3198ff0d
SHA512
2edb437baae54afd625222f2b251549af3ec469b535a10109679f1edd27fc840579351499f9bc79e8d0d17f752065787eb52607f886e5599386dbed52c8aecab
+DIST ejabberd-23.10.tar.gz 2615643 BLAKE2B
0c3adfac5d99a33f37b0bd9970489f7a9e32bc1a832efe510be3281cd4ac2df890aa7eeab5758149b3cb16a2e6a71937ee955a86113bba14540d5c685f900ef6
SHA512
d42af356b0b6ebbba757de4256e308766f046d6c2a7df355330fbc9a9fb329635a22c2f9e5fc4d0a9dbe2d7e5488efe85000c4d04a9a0ce12921d839899e0c45
diff --git a/net-im/ejabberd/ejabberd-23.10.ebuild
b/net-im/ejabberd/ejabberd-23.10.ebuild
new file mode 100644
index ..01b54660d1ad
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-23.10.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+ >=dev-lang/erlang-20[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.16
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/fast_yaml-1.0.36
+ >=dev-erlang/yconf-1.0.15
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.5
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.11
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.29
+ >=dev-erlang/xmpp-1.7.0
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.15
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.22
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.22 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.14 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.23 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.50 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
+ stun? ( >=dev-erlang/stun-1.2.10 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-2[pam?]
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+ echo "/usr/$(get_libdir)/${P}"
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ rebar_remove_deps
+
+ # Set paths to ejabberd lib directory consistently to point always to
directory
+ # suffixed with version.
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: a34f1d16fd9f691de94370bd8731d4b0abc35e79 Author: Arthur Zamarin gentoo org> AuthorDate: Wed Dec 6 21:20:14 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Wed Dec 6 21:20:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a34f1d16 net-im/ejabberd: Stabilize 23.04 amd64, #919334 Signed-off-by: Arthur Zamarin gentoo.org> net-im/ejabberd/ejabberd-23.04.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/ejabberd/ejabberd-23.04.ebuild b/net-im/ejabberd/ejabberd-23.04.ebuild index ff7f7e0f5d09..69ddba1b5199 100644 --- a/net-im/ejabberd/ejabberd-23.04.ebuild +++ b/net-im/ejabberd/ejabberd-23.04.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 04b5be7df1595fb7fc1d6b164423b7048e51d09b
Author: Florian Schmaus gentoo org>
AuthorDate: Sun Jul 30 17:20:53 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Jul 30 17:20:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b5be7d
net-im/ejabberd: revert accidentally pushed changes
Fixes: 6524848310ec ("app-text/kramdown-rfc: add 1.6.39")
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/ejabberd-23.04.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-23.04.ebuild
b/net-im/ejabberd/ejabberd-23.04.ebuild
index a7cfe808e6db..ff7f7e0f5d09 100644
--- a/net-im/ejabberd/ejabberd-23.04.ebuild
+++ b/net-im/ejabberd/ejabberd-23.04.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
- roster-gw selinux sip sqlite +stun +tools zlib"
+ roster-gw selinux sip sqlite +stun zlib"
RESTRICT="test"
@@ -129,7 +129,6 @@ src_configure() {
$(use_enable roster-gw roster-gateway-workaround) \
$(use_enable sqlite) \
$(use_enable sip) \
- $(use_enable tools) \
$(use_enable stun) \
$(use_enable zlib)
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f2ecfb1e05e9b983a8c82a45b011fb133db4cf52 Author: Sam James gentoo org> AuthorDate: Fri Jul 28 18:55:59 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jul 28 18:55:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2ecfb1e net-im/ejabberd: Stabilize 23.01 amd64, #911392 Signed-off-by: Sam James gentoo.org> net-im/ejabberd/ejabberd-23.01.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/ejabberd/ejabberd-23.01.ebuild b/net-im/ejabberd/ejabberd-23.01.ebuild index 99ac7b8d7df3..82b509558d13 100644 --- a/net-im/ejabberd/ejabberd-23.01.ebuild +++ b/net-im/ejabberd/ejabberd-23.01.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 01caadfa09198ae6f0606ab382bf74315f4ee796 Author: Sam James gentoo org> AuthorDate: Fri Feb 10 20:34:58 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 10 20:34:58 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01caadfa net-im/ejabberd: Stabilize 22.10 amd64, #893844 Signed-off-by: Sam James gentoo.org> net-im/ejabberd/ejabberd-22.10.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild b/net-im/ejabberd/ejabberd-22.10.ebuild index d872abcb6285..e7e594bb 100644 --- a/net-im/ejabberd/ejabberd-22.10.ebuild +++ b/net-im/ejabberd/ejabberd-22.10.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86" +KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 7ea044932b2baf0c070bcd65d7d32eb8ab528147
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Feb 10 12:23:45 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Feb 10 12:39:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea04493
net-im/ejabberd: add 23.01
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-23.01.ebuild | 219 ++
2 files changed, 220 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 308fe35abac5..e8affd8a2f51 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,4 @@
DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B
d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9
SHA512
33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B
634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce
SHA512
42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B
670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3
SHA512
3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
+DIST ejabberd-23.01.tar.gz 2569272 BLAKE2B
c8c06204ed6c4992d86b7fcc1a949883267364433fc5d6d05f2214f093301b3fc4cda7b5b078e3ebd1334a418173fd5decd902f582fe0492b2f2f19c39ac88e4
SHA512
3fe11123d24e430fa10d18aabb9cc9613bc25ee48d6c64a642ae1d0d458f220df638b94cde444241399e0d0777a4f64995ad7e37f963f1ee92bbb114ed431c4b
diff --git a/net-im/ejabberd/ejabberd-23.01.ebuild
b/net-im/ejabberd/ejabberd-23.01.ebuild
new file mode 100644
index ..99ac7b8d7df3
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-23.01.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+ >=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.16
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/fast_yaml-1.0.36
+ >=dev-erlang/yconf-1.0.15
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.5
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.11
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.29
+ >=dev-erlang/xmpp-1.6.1
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.15
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.22
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.21 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.14 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.20 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.49 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.14 )
+ stun? ( >=dev-erlang/stun-1.2.7 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-2[pam?]
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+ echo "/usr/$(get_libdir)/${P}"
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ rebar_remove_deps
+
+ # Set paths to ejabberd lib directory consistently to point always to
directory
+ # suffixed with version.
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: e0ed0500560d9f796c8a197e10ecfd6f2d993e5c
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Oct 28 19:10:54 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Oct 28 20:57:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0ed0500
net-im/ejabberd: add 22.10
Closes: https://github.com/gentoo/gentoo/pull/28011
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-22.10.ebuild | 219 +
...djust-ejabberd.service.template-to-Gentoo.patch | 16 ++
3 files changed, 236 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index df8cc1d38ab8..308fe35abac5 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B
d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9
SHA512
33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B
634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce
SHA512
42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
+DIST ejabberd-22.10.tar.gz 2553163 BLAKE2B
670721da1800b489103df49c24bb961cb048e02faffa57921c9740f2effadb8fd5b70841afaf9fc56160e4bb00d6d6d73014cdd3e2aaa683c351fd0d42d53bf3
SHA512
3010b0767017d63c1b1a8b062f881d98be6308f2ae065c58302288096058ed8030e37c73eaf037ee1e61d1040f4e61071b2d62e146c61109ee782b9e6b708942
diff --git a/net-im/ejabberd/ejabberd-22.10.ebuild
b/net-im/ejabberd/ejabberd-22.10.ebuild
new file mode 100644
index ..d872abcb6285
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-22.10.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+ >=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.16
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/fast_yaml-1.0.34
+ >=dev-erlang/yconf-1.0.14
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.2
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.11
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.29
+ >=dev-erlang/xmpp-1.6.0
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.15
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.20
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.20 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.12 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.19 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.48 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+ stun? ( >=dev-erlang/stun-1.2.6 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-2[pam?]
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+
"${FILESDIR}/ejabberd-22.10-adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
+get_ejabberd_path() {
+ echo "/usr/$(get_libdir)/${P}"
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+
+ rebar_remove_deps
+
+ # Set paths to ejabberd lib directory consistently to point always to
directory
+ # suffixed with version.
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/
commit: 9478d3bfc2d3fd51d4388a699ef1592d5e227e2d
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Sep 24 09:58:04 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sat Sep 24 10:34:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9478d3bf
net-im/ejabberd: remove unused patches
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Portage 3.0.37 / pkgdev 0.2.2 / pkgcheck 0.10.15
Closes: https://github.com/gentoo/gentoo/pull/27424
Signed-off-by: Florian Schmaus gentoo.org>
.../files/ejabberd-19.08-ejabberdctl.patch | 38 ---
net-im/ejabberd/files/ejabberd.initd | 54 --
net-im/ejabberd/files/ejabberd.logrotate | 13 --
3 files changed, 105 deletions(-)
diff --git a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
b/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
deleted file mode 100644
index 0fb1f5ce602e..
--- a/net-im/ejabberd/files/ejabberd-19.08-ejabberdctl.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Subject: [PATCH] Adjust ejabberdctl for Gentoo jabberbase setup
-
-Set SHELL since the generic jabber user used on Gentoo for jabber
-servers doesn't have a valid shell set by default and fix EXEC_CMD
-otherwise it fails with This account is currently not available again
-due to jabber not having a valid shell.
-
-Also, workaround the assumption that jabber's /root is a directory when
-instead it defaults to /dev/null on Gentoo.
-
-diff --git a/ejabberdctl.template b/ejabberdctl.template
-index 571b90b..71336c0 100755
a/ejabberdctl.template
-+++ b/ejabberdctl.template
-@@ -82,6 +82,7 @@ fi
- ERL_LIBS={{libdir}}
- ERL_CRASH_DUMP="$LOGS_DIR"/erl_crash_$(date "+%Y%m%d-%H%M%S").dump
- ERL_INETRC="$ETC_DIR"/inetrc
-+HOME=$SPOOL_DIR
-
- # define ejabberd parameters
- EJABBERD_OPTS="$EJABBERD_OPTS\
-@@ -105,12 +106,13 @@ export ERL_MAX_ETS_TABLES
- export CONTRIB_MODULES_PATH
- export CONTRIB_MODULES_CONF_DIR
- export ERL_LIBS
-+export HOME
-
- # run command either directly or via su $INSTALLUSER
- exec_cmd()
- {
- case $EXEC_CMD in
--as_install_user) su -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" -- "$@"
;;
-+as_install_user) su -p -s /bin/sh -c '"$0" "$@"' "$INSTALLUSER" --
"$@" ;;
- as_current_user) "$@" ;;
- esac
- }
diff --git a/net-im/ejabberd/files/ejabberd.initd
b/net-im/ejabberd/files/ejabberd.initd
deleted file mode 100644
index 94ac2ae8e465..
--- a/net-im/ejabberd/files/ejabberd.initd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
- use dns
- need epmd net
- provide jabber-server
-}
-
-start() {
- if ejabberdctl status >/dev/null 2>&1; then
- ewarn "ejabberd is already started (manually?)."
- return 0
- fi
- ebegin "Starting ejabberd"
- /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} start
- eend $?
-}
-
-reload() {
- ebegin "Reloading ejabberd configuration"
- /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
- eend $?
-}
-
-stop() {
- ejabberdctl status >/dev/null 2>&1
- if test $? = 3; then
- ewarn "ejabberd is already stopped (manually?)."
- return 0
- fi
- ebegin "Stopping ejabberd"
- if /usr/sbin/ejabberdctl stop >/dev/null 2>&1; then
- cnt=0
- sleep 1
- while ejabberdctl status >/dev/null 2>&1 || test $? = 1; do
- echo -n .
- cnt=`expr $cnt + 1`
- if [ $cnt -ge 60 ] ; then
- eend 1
- break
- fi
- sleep 1
- done
- eend 0
- else
- eend 1
- einfo "Please, run '/usr/sbin/ejabberdctl stop' to see what's
going on."
- fi
- eend 0
-}
diff --git a/net-im/ejabberd/files/ejabberd.logrotate
b/net-im/ejabberd/files/ejabberd.logrotate
deleted file mode 100644
index 4f324729dba8..
--- a/net-im/ejabberd/files/ejabberd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/jabber/*.log {
- su jabber jabber
- weekly
- rotate 4
- missingok
- nocreate
- sharedscripts
- notifempty
- compress
- postrotate
- /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
- endscript
-}
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 93e94c71b6c61e9472cfee0357e7a63ed78588fe
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Sep 21 16:49:41 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Sep 21 19:56:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e94c71
net-im/ejabberd: drop 21.12-r2
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 2 -
net-im/ejabberd/ejabberd-21.12-r2.ebuild | 222 ---
2 files changed, 224 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e8815deaf151..df8cc1d38ab8 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,2 @@
-DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
SHA512
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
-DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B
6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093
SHA512
81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B
d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9
SHA512
33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B
634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce
SHA512
42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
diff --git a/net-im/ejabberd/ejabberd-21.12-r2.ebuild
b/net-im/ejabberd/ejabberd-21.12-r2.ebuild
deleted file mode 100644
index 51848cda5a6c..
--- a/net-im/ejabberd/ejabberd-21.12-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam rebar systemd verify-sig
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
- -> ${P}.tar.gz
- verify-sig? (
https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc ->
${P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
- roster-gw selinux sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.29
- >=dev-erlang/eimp-1.0.21
- >=dev-erlang/fast_tls-1.1.13
- >=dev-erlang/fast_xml-1.1.48
- >=dev-erlang/fast_yaml-1.0.32
- >=dev-erlang/yconf-1.0.12
- >=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.11.2
- >=dev-erlang/lager-3.9.1
- >=dev-erlang/p1_oauth2-0.6.10
- >=dev-erlang/p1_utils-1.0.23
- >=dev-erlang/stringprep-1.0.27
- >=dev-erlang/xmpp-1.5.6
- >=dev-erlang/pkix-1.0.8
- >=dev-erlang/mqtree-1.0.14
- >=dev-erlang/idna-6.0.0-r1
- >=dev-erlang/p1_acme-1.0.16
- >=dev-erlang/base64url-1.0.1
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.12 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.16 )
- redis? ( >=dev-erlang/eredis-1.2.0 )
- sip? ( >=dev-erlang/esip-1.0.45 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
- stun? ( >=dev-erlang/stun-1.0.47 )
- zlib? ( >=dev-erlang/ezlib-1.0.10 )"
-RDEPEND="${DEPEND}
- >=acct-user/ejabberd-2[pam?]
- captcha? ( media-gfx/imagemagick[truetype,png] )
- selinux? ( sec-policy/selinux-jabber )
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=(
- "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
-)
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
- -i "${S}/Makefile.in" \
- || die 'failed to set ejabberd path in
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 718e284e6507bba7a7fec3da251b95558e894d10
Author: Conrad Kostecki gentoo org>
AuthorDate: Fri Jul 15 21:20:52 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sat Jul 16 14:46:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718e284e
net-im/ejabberd: update usermod handling
Signed-off-by: Conrad Kostecki gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/26433
Signed-off-by: Florian Schmaus gentoo.org>
...{ejabberd-21.12-r1.ebuild => ejabberd-21.12-r2.ebuild} | 15 +--
...{ejabberd-22.05-r1.ebuild => ejabberd-22.05-r2.ebuild} | 15 +--
2 files changed, 2 insertions(+), 28 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.12-r1.ebuild
b/net-im/ejabberd/ejabberd-21.12-r2.ebuild
similarity index 93%
rename from net-im/ejabberd/ejabberd-21.12-r1.ebuild
rename to net-im/ejabberd/ejabberd-21.12-r2.ebuild
index 51abb0f8f050..51848cda5a6c 100644
--- a/net-im/ejabberd/ejabberd-21.12-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12-r2.ebuild
@@ -56,7 +56,7 @@ DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
stun? ( >=dev-erlang/stun-1.0.47 )
zlib? ( >=dev-erlang/ezlib-1.0.10 )"
RDEPEND="${DEPEND}
- acct-user/ejabberd
+ >=acct-user/ejabberd-2[pam?]
captcha? ( media-gfx/imagemagick[truetype,png] )
selinux? ( sec-policy/selinux-jabber )
"
@@ -169,19 +169,6 @@ src_install() {
keepdir /var/{lib,log}/ejabberd
}
-pkg_preinst() {
- if use pam; then
- einfo "Adding ejabberd user to epam group to allow ejabberd to
use PAM" \
- "authentication"
- # See
- #
.
- # epam binary is installed by dev-erlang/epam package,
therefore SUID
- # is set by that package. Instead of jabber group it uses epam
group,
- # therefore we need to add jabber user to epam group.
- usermod -a -G epam ejabberd || die
- fi
-}
-
pkg_postinst() {
local migrate_to_ejabberd_user=false
diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild
b/net-im/ejabberd/ejabberd-22.05-r2.ebuild
similarity index 93%
rename from net-im/ejabberd/ejabberd-22.05-r1.ebuild
rename to net-im/ejabberd/ejabberd-22.05-r2.ebuild
index 39a5d3e79270..ebb3a879d1e2 100644
--- a/net-im/ejabberd/ejabberd-22.05-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-22.05-r2.ebuild
@@ -60,7 +60,7 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- >=acct-user/ejabberd-1
+ >=acct-user/ejabberd-2[pam?]
captcha? ( media-gfx/imagemagick[truetype,png] )
selinux? ( sec-policy/selinux-jabber )
"
@@ -174,19 +174,6 @@ src_install() {
keepdir /var/{lib,log}/ejabberd
}
-pkg_preinst() {
- if use pam; then
- einfo "Adding ejabberd user to epam group to allow ejabberd to
use PAM" \
- "authentication"
- # See
- #
.
- # epam binary is installed by dev-erlang/epam package,
therefore SUID
- # is set by that package. Instead of jabber group it uses epam
group,
- # therefore we need to add jabber user to epam group.
- usermod -a -G epam ejabberd || die
- fi
-}
-
pkg_postinst() {
local migrate_to_ejabberd_user=false
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: bfe38d3880c4ec75157cdf94b99647679cdcdf2e
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Jul 5 08:52:44 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Jul 5 08:52:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe38d38
net-im/ejabberd: amd64 stable wrt bug #856508
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-im/ejabberd/ejabberd-22.05-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-22.05-r1.ebuild
b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
index eae32ae4c02d..39a5d3e79270 100644
--- a/net-im/ejabberd/ejabberd-22.05-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
@@ -15,7 +15,7 @@
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: bd1911fdc84b38dfd4136b8986b49940bc34c946
Author: Florian Schmaus gentoo org>
AuthorDate: Wed May 18 07:03:41 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed May 18 07:05:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1911fd
net-im/ejabberd: bring back logrotate
Bug: https://bugs.gentoo.org/841976
Signed-off-by: Florian Schmaus gentoo.org>
.../{ejabberd-22.05.ebuild => ejabberd-22.05-r1.ebuild} | 3 +++
net-im/ejabberd/files/ejabberd-22.05.logrotate | 13 +
2 files changed, 16 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-22.05.ebuild
b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
similarity index 98%
rename from net-im/ejabberd/ejabberd-22.05.ebuild
rename to net-im/ejabberd/ejabberd-22.05-r1.ebuild
index 029431d351cb..eae32ae4c02d 100644
--- a/net-im/ejabberd/ejabberd-22.05.ebuild
+++ b/net-im/ejabberd/ejabberd-22.05-r1.ebuild
@@ -168,6 +168,9 @@ src_install() {
newinitd "${FILESDIR}/${PN}-22.05.initd" "${PN}"
systemd_dounit "${PN}.service"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}-22.05.logrotate" "${PN}"
+
keepdir /var/{lib,log}/ejabberd
}
diff --git a/net-im/ejabberd/files/ejabberd-22.05.logrotate
b/net-im/ejabberd/files/ejabberd-22.05.logrotate
new file mode 100644
index ..fd51673fc428
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-22.05.logrotate
@@ -0,0 +1,13 @@
+/var/log/ejabberd/*.log {
+ su ejabberd ejabberd
+ weekly
+ rotate 4
+ missingok
+ nocreate
+ sharedscripts
+ notifempty
+ compress
+ postrotate
+ /usr/sbin/ejabberdctl reopen-log > /dev/null 2>&1 || true
+ endscript
+}
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 5151cb8694d3ec75a36c016d8155b1237455c4a4 Author: Florian Schmaus gentoo org> AuthorDate: Tue May 17 18:46:43 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Tue May 17 20:01:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5151cb86 net-im/ejabberd: add metadata Signed-off-by: Florian Schmaus gentoo.org> net-im/ejabberd/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml index df085f63589b..f894e535971b 100644 --- a/net-im/ejabberd/metadata.xml +++ b/net-im/ejabberd/metadata.xml @@ -26,6 +26,7 @@ + https://docs.ejabberd.im processone/ejabberd
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: c8d1e4560d3eff6e034ef1ef2e83ef37f4702510
Author: Florian Schmaus gentoo org>
AuthorDate: Tue May 17 18:46:36 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue May 17 20:01:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d1e456
net-im/ejabberd: add 22.05
Fix bashism in OpenRC init script. Drop support for logrotate in favor
of ejabberd's built-in log rotation mechanism.
Also depend on >=acct-user/ejabberd-1, which will create the ejabberd
with HOME set to /var/lib/ejabberd, i.e., ejabberd's spool
directory. This allows us to drop ${PN}-19.08-ejabberdctl.patch.
Closes: https://bugs.gentoo.org/841976
Closes: https://github.com/gentoo/gentoo/pull/25540
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 2 +
net-im/ejabberd/ejabberd-22.05.ebuild | 232 +
net-im/ejabberd/files/ejabberd-22.05.initd | 54 +++
3 files changed, 288 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 4507c95a647f..e8815deaf151 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,4 @@
DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
SHA512
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B
6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093
SHA512
81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
+DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B
d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9
SHA512
33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
+DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B
634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce
SHA512
42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
diff --git a/net-im/ejabberd/ejabberd-22.05.ebuild
b/net-im/ejabberd/ejabberd-22.05.ebuild
new file mode 100644
index ..029431d351cb
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-22.05.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam rebar systemd verify-sig
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="
+ https://github.com/processone/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+ verify-sig? (
https://github.com/processone/${PN}/releases/download/${PV}/${P}.tar.gz.asc )
+"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND="
+ >=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.30
+ >=dev-erlang/eimp-1.0.22
+ >=dev-erlang/fast_tls-1.1.15
+ >=dev-erlang/fast_xml-1.1.49
+ >=dev-erlang/fast_yaml-1.0.33
+ >=dev-erlang/yconf-1.0.13
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.2
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.11
+ >=dev-erlang/p1_utils-1.0.25
+ >=dev-erlang/stringprep-1.0.28
+ >=dev-erlang/xmpp-1.5.6
+ >=dev-erlang/pkix-1.0.9
+ >=dev-erlang/mqtree-1.0.15
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.19
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.12 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.18 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.45 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+ stun? ( >=dev-erlang/stun-1.2.2 )
+ zlib? ( >=dev-erlang/ezlib-1.0.12 )
+"
+RDEPEND="
+ ${DEPEND}
+ >=acct-user/ejabberd-1
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: aa7e9af95f6b20a48eb2d25522be770160b972d8
Author: Jonathan Davies protonmail com>
AuthorDate: Wed Mar 16 11:55:43 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Mar 23 08:33:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7e9af9
net-im/ejabberd: Added verify-sig integration.
Signed-off-by: Jonathan Davies protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24604
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-21.12.ebuild | 7 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e50617f20488..9ed7f914b758 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,4 @@
DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B
85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e
SHA512
4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
SHA512
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
+DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B
6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093
SHA512
81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12.ebuild
index 2b533f549d33..c99d52ec5c5f 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -3,12 +3,14 @@
EAPI=7
-inherit pam rebar systemd
+inherit pam rebar systemd verify-sig
DESCRIPTION="Robust, scalable and extensible XMPP server"
HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
- -> ${P}.tar.gz"
+ -> ${P}.tar.gz
+ verify-sig? (
https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc ->
${P}.tar.gz.asc )"
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
LICENSE="GPL-2"
SLOT="0"
@@ -58,6 +60,7 @@ RDEPEND="${DEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )
selinux? ( sec-policy/selinux-jabber )
"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
DOCS=( CHANGELOG.md README.md )
PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: ac7fd9583afe227c0efa9ff882617574e8f41592
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Mar 23 08:20:51 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Mar 23 08:33:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7fd958
net-im/ejabberd: drop 20.04, 21.04, 21.04-r2
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 2 -
net-im/ejabberd/ejabberd-20.04.ebuild | 294 -
net-im/ejabberd/ejabberd-21.04-r2.ebuild | 245 -
net-im/ejabberd/ejabberd-21.04.ebuild | 275 ---
...rd-17.04-0002-Dont-overwrite-service-file.patch | 15 --
net-im/ejabberd/files/ejabberd.tmpfiles.conf | 2 -
net-im/ejabberd/metadata.xml | 1 -
7 files changed, 834 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 9ed7f914b758..4507c95a647f 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,2 @@
-DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
-DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B
85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e
SHA512
4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
SHA512
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B
6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093
SHA512
81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
deleted file mode 100644
index 90c657f64b01..
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ /dev/null
@@ -1,294 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd tmpfiles
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
- roster-gw sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[hipe(-)?,odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.22
- >=dev-erlang/eimp-1.0.14
- >=dev-erlang/fast_tls-1.1.5
- >=dev-erlang/fast_xml-1.1.40
- >=dev-erlang/fast_yaml-1.0.24
- >=dev-erlang/yconf-1.0.4
- >=dev-erlang/jiffy-1.0.1
- >=dev-erlang/jose-1.9.0
- >=dev-erlang/lager-3.6.10
- >=dev-erlang/p1_oauth2-0.6.6
- >=dev-erlang/p1_utils-1.0.18
- >=dev-erlang/stringprep-1.0.19
- >=dev-erlang/xmpp-1.4.6
- >=dev-erlang/pkix-1.0.5
- >=dev-erlang/mqtree-1.0.7
- >=dev-erlang/idna-6.0.0
- >=dev-erlang/p1_acme-1.0.5
- >=dev-erlang/base64url-1.0
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.7 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- sip? ( >=dev-erlang/esip-1.0.32 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
- stun? ( >=dev-erlang/stun-1.0.32 )
- zlib? ( >=dev-erlang/ezlib-1.0.7 )"
-RDEPEND="${DEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 824625c1fe3ca5b76a5bb1c56c447a3558d7d811
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Mar 23 08:24:40 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Mar 23 08:33:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824625c1
net-im/ejabberd: improve migration instructions
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/ejabberd-21.12.ebuild | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12.ebuild
index c99d52ec5c5f..09f794d0d456 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -206,6 +206,13 @@ pkg_postinst() {
# its own user. This increase isolation and hence robustness and
# security.
if $migrate_to_ejabberd_user; then
+ ewarn "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
+ ewarn "(just as upstream) and *not* /etc/jabber."
+ ewarn "The files from /etc/jabber will now be copied to
/etc/ejabberd."
+ ewarn "Also ejabberd's spool directory became /var/lib/ejabberd
(was /var/spool/jabber)."
+ ewarn "Please check your configuration, and finish the
migration by stopping ejabberd"
+ ewarn "followed by rsync'ing /var/spool/jabber to
/var/lib/ejabberd."
+
local -A dirs_to_migrate=(
[/etc/jabber]=/etc/ejabberd
[/var/spool/jabber]=/var/lib/ejabberd
@@ -224,11 +231,5 @@ pkg_postinst() {
chown --recursive ejabberd:ejabberd
"${eroot_dst_dir}" || die
fi
done
-
- ewarn "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
- ewarn "(just as upstream) and *not* /etc/jabber."
- ewarn "The files from /etc/jabber where copied to
/etc/ejabberd."
- ewarn "Also ejabberd's spool directory became /var/lib/ejabberd
(was /var/spool/jabber)."
- ewarn "Please check your configuration."
fi
}
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 0f5e3486955f3a22d2e999d0d3cb11d8396b68d1
Author: Florian Schmaus gentoo org>
AuthorDate: Wed Mar 23 08:25:37 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Wed Mar 23 08:33:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f5e3486
net-im/ejabberd: depend on newer jose
Closes: https://bugs.gentoo.org/834322
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/{ejabberd-21.12.ebuild => ejabberd-21.12-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12-r1.ebuild
similarity index 99%
rename from net-im/ejabberd/ejabberd-21.12.ebuild
rename to net-im/ejabberd/ejabberd-21.12-r1.ebuild
index 09f794d0d456..51abb0f8f050 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12-r1.ebuild
@@ -34,7 +34,7 @@ DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
>=dev-erlang/fast_yaml-1.0.32
>=dev-erlang/yconf-1.0.12
>=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.11.1
+ >=dev-erlang/jose-1.11.2
>=dev-erlang/lager-3.9.1
>=dev-erlang/p1_oauth2-0.6.10
>=dev-erlang/p1_utils-1.0.23
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 2b0e06c04ba2edfa23c2bbc5e62f352fb4016070
Author: Hanno Böck gentoo org>
AuthorDate: Tue Feb 1 07:22:41 2022 +
Commit: Hanno Böck gentoo org>
CommitDate: Tue Feb 1 07:22:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b0e06c0
net-im/ejabberd: Fix typo
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
net-im/ejabberd/ejabberd-21.04-r2.ebuild | 4 ++--
net-im/ejabberd/ejabberd-21.12.ebuild| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
index 63128525a5ca..d8911b3b288c 100644
--- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -237,7 +237,7 @@ pkg_postinst() {
done
ewarn "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
- ewarn "(just as upstream) and *not* /etc/ejabber."
+ ewarn "(just as upstream) and *not* /etc/jabber."
ewarn "The files from /etc/jabber where copied to
/etc/ejabberd."
ewarn "Also ejabberd's spool directory became /var/lib/ejabberd
(was /var/spool/jabber)."
ewarn "Please check your configuration."
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12.ebuild
index 49c2dc3fcfce..2b533f549d33 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -223,7 +223,7 @@ pkg_postinst() {
done
ewarn "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
- ewarn "(just as upstream) and *not* /etc/ejabber."
+ ewarn "(just as upstream) and *not* /etc/jabber."
ewarn "The files from /etc/jabber where copied to
/etc/ejabberd."
ewarn "Also ejabberd's spool directory became /var/lib/ejabberd
(was /var/spool/jabber)."
ewarn "Please check your configuration."
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: af7279f5dd8caa8f1b382f5a69193bf36d70ca6c
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Jan 20 20:10:36 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jan 20 20:10:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af7279f5
net-im/ejabberd: Stabilize 21.12 amd64, #831401
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/ejabberd-21.12.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12.ebuild
index 3f4d03ad5e89..49c2dc3fcfce 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 87e27f70f0f39184b56b15971dce58e7acdd2bd6
Author: Florian Schmaus gentoo org>
AuthorDate: Sun Dec 12 18:54:55 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Sun Dec 12 18:55:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e27f70
net-im/ejabberd: also migrate /var/spool/jabber to /var/lib/ejabberd
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/ejabberd-21.04-r2.ebuild | 41 +---
net-im/ejabberd/ejabberd-21.12.ebuild| 41 +---
2 files changed, 54 insertions(+), 28 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
index 9a2546e60e03..63128525a5ca 100644
--- a/net-im/ejabberd/ejabberd-21.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
@@ -194,7 +194,7 @@ pkg_preinst() {
}
pkg_postinst() {
- local migrate_to_etc_ejabberd=false
+ local migrate_to_ejabberd_user=false
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
@@ -204,7 +204,7 @@ pkg_postinst() {
else
for v in ${REPLACING_VERSIONS}; do
if ver_test "${v}" -lt 21.04-r1; then
- migrate_to_etc_ejabberd=true
+ migrate_to_ejabberd_user=true
break
fi
done
@@ -216,17 +216,30 @@ pkg_postinst() {
# under the, shared via net-im/jabber-base, 'jabber' use, but under
# its own user. This increase isolation and hence robustness and
# security.
- if $migrate_to_etc_ejabberd; then
- cp -r "${EROOT}"/etc/jabber/. "${EROOT}"/etc/ejabberd || die
- if [[ -f "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0 ]];
then
- rm "${EROOT}"/etc/ejabberd/.keep_net-im_jabber-base-0
|| die
- fi
- if ! use prefix; then
- chown --recursive ejabberd:ejabberd
"${EROOT}"/etc/ejabberd || die
- fi
- elog "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
- elog "(just as upstream) and *not* /etc/ejabber."
- elog "The files from /etc/jabber where copied to /etc/ejabberd."
- elog "Please check your configuration and delete the file in
/etc/jabber."
+ if $migrate_to_ejabberd_user; then
+ local -A dirs_to_migrate=(
+ [/etc/jabber]=/etc/ejabberd
+ [/var/spool/jabber]=/var/lib/ejabberd
+ )
+
+ for src_dir in "${!dirs_to_migrate[@]}"; do
+ local eroot_src_dir="${EROOT}${src_dir}"
+ local
eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
+
+ cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die
"Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
+
+ if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0
]]; then
+ rm
"${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
+ fi
+ if ! use prefix; then
+ chown --recursive ejabberd:ejabberd
"${eroot_dst_dir}" || die
+ fi
+ done
+
+ ewarn "Newer versions of the ejabberd Gentoo package use
/etc/ejabberd"
+ ewarn "(just as upstream) and *not* /etc/ejabber."
+ ewarn "The files from /etc/jabber where copied to
/etc/ejabberd."
+ ewarn "Also ejabberd's spool directory became /var/lib/ejabberd
(was /var/spool/jabber)."
+ ewarn "Please check your configuration."
fi
}
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12.ebuild
index e4ed2bfaac5c..3f4d03ad5e89 100644
--- a/net-im/ejabberd/ejabberd-21.12.ebuild
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -180,7 +180,7 @@ pkg_preinst() {
}
pkg_postinst() {
- local migrate_to_etc_ejabberd=false
+ local migrate_to_ejabberd_user=false
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
@@ -190,7 +190,7 @@ pkg_postinst() {
else
for v in ${REPLACING_VERSIONS}; do
if ver_test "${v}" -lt 21.04-r1; then
- migrate_to_etc_ejabberd=true
+ migrate_to_ejabberd_user=true
break
fi
done
@@ -202,17 +202,30 @@ pkg_postinst() {
# under the, shared via net-im/jabber-base, 'jabber' use, but under
# its own user. This increase isolation and hence robustness and
# security.
- if $migrate_to_etc_ejabberd; then
- cp -r "${EROOT}"/etc/jabber/. "${EROOT}"/etc/ejabberd || die
- if [[ -f
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: 78a9b46fa734d8a64b17c5230ba1f2a5f76f7e76
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Dec 10 09:18:16 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Dec 10 13:05:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78a9b46f
net-im/ejabberd: add 21.12
Closes: https://bugs.gentoo.org/810886
Closes: https://github.com/gentoo/gentoo/pull/23239
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-21.12.ebuild | 218 +
...djust-ejabberd.service.template-to-Gentoo.patch | 39
3 files changed, 258 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index a3cfc05ea25e..e50617f20488 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B
85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e
SHA512
4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
+DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B
847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2
SHA512
4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
diff --git a/net-im/ejabberd/ejabberd-21.12.ebuild
b/net-im/ejabberd/ejabberd-21.12.ebuild
new file mode 100644
index ..e4ed2bfaac5c
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.12.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.29
+ >=dev-erlang/eimp-1.0.21
+ >=dev-erlang/fast_tls-1.1.13
+ >=dev-erlang/fast_xml-1.1.48
+ >=dev-erlang/fast_yaml-1.0.32
+ >=dev-erlang/yconf-1.0.12
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.11.1
+ >=dev-erlang/lager-3.9.1
+ >=dev-erlang/p1_oauth2-0.6.10
+ >=dev-erlang/p1_utils-1.0.23
+ >=dev-erlang/stringprep-1.0.27
+ >=dev-erlang/xmpp-1.5.6
+ >=dev-erlang/pkix-1.0.8
+ >=dev-erlang/mqtree-1.0.14
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.16
+ >=dev-erlang/base64url-1.0.1
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.12 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.16 )
+ redis? ( >=dev-erlang/eredis-1.2.0 )
+ sip? ( >=dev-erlang/esip-1.0.45 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
+ stun? ( >=dev-erlang/stun-1.0.47 )
+ zlib? ( >=dev-erlang/ezlib-1.0.10 )"
+RDEPEND="${DEPEND}
+ acct-user/ejabberd
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=(
+ "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+ "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
+)
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+ local
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: a5ff92b12c9ed04134ba4c3bbf413be9bd9eb3d2
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Dec 10 09:24:21 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Dec 10 09:24:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ff92b1
net-im/ejabberd: drop jabber-base dependency leftover
This dependency is no longer necessary, as newer ejabberd ebuilds use
nothing from jabber-base anymore.
Fixes: 7ef9adb36a21
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/{ejabberd-21.04-r1.ebuild => ejabberd-21.04-r2.ebuild} | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-21.04-r1.ebuild
b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
similarity index 99%
rename from net-im/ejabberd/ejabberd-21.04-r1.ebuild
rename to net-im/ejabberd/ejabberd-21.04-r2.ebuild
index 0d4324cb98e4..9a2546e60e03 100644
--- a/net-im/ejabberd/ejabberd-21.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04-r2.ebuild
@@ -43,7 +43,6 @@ DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
>=dev-erlang/idna-6.0.0-r1
>=dev-erlang/p1_acme-1.0.12
>=dev-erlang/base64url-1.0.1
- >=net-im/jabber-base-0.01
ldap? ( =net-nds/openldap-2* )
mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
odbc? ( dev-db/unixODBC )
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 7ef9adb36a21fda32d38eaa0c4d0cf4312ade686
Author: Florian Schmaus gentoo org>
AuthorDate: Tue Dec 7 10:30:13 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Dec 7 10:42:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef9adb3
net-im/ejabberd: add 21.04-r1
This marks two important transitions:
- from EAPI 6 to EAPI 7
- from net-im/jabber-base to acct-user/ejabberd
The latter also means that ejabberd now runs under its own 'ejabberd'
user, and no longer used the *shared* 'jabber' user from
net-im/jabber-base. This increases the isolation of ejabberd. The
configuration directory also changes from /etc/jabber, which is a
non-standard ejabberd directory used only by Gentoo, to /etc/ejabberd,
ejabberd's standard configuration directory.
Futhermore, the custom SSL/TLS certificate handling (via the ssl-cert
eclass) is removed, as ejabberd has for a long time now a built-in
ACME client. And the certificate handling significantly increased the
complecity of the ejabberd ebuild. This also fixes bug #716968.
The ebuild also now passes the correct localstatedir to
econf. Previously ejabberd would use /var/lib/lib/ejabberd.
Ejabberd also unnecessarily created /var/lock/ejabberdctl, even though
this directory is no longer used. This is now fixed in the ebuild and
a patch was submitted and accepted upstream [1].
This also drops the non-upstream systemd tmpfile.conf. The directory
created by the tmpfile is only ever used if the user manually
configured it. And in this case, we should trust the user to also
ensure that the directory is created. This further reduces the
complexity of the ebuild.
1: https://github.com/processone/ejabberd/pull/3724
Signed-off-by: Florian Schmaus gentoo.org>
Closes: https://bugs.gentoo.org/716968
net-im/ejabberd/ejabberd-21.04-r1.ebuild | 233 +++
1 file changed, 233 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-21.04-r1.ebuild
b/net-im/ejabberd/ejabberd-21.04-r1.ebuild
new file mode 100644
index ..0d4324cb98e4
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.04-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam rebar systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw selinux sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.28
+ >=dev-erlang/eimp-1.0.20
+ >=dev-erlang/fast_tls-1.1.12
+ >=dev-erlang/fast_xml-1.1.46
+ >=dev-erlang/fast_yaml-1.0.31
+ >=dev-erlang/yconf-1.0.11
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.9.0
+ >=dev-erlang/lager-3.6.10
+ >=dev-erlang/p1_oauth2-0.6.9
+ >=dev-erlang/p1_utils-1.0.22
+ >=dev-erlang/stringprep-1.0.25
+ >=dev-erlang/xmpp-1.5.3
+ >=dev-erlang/pkix-1.0.7
+ >=dev-erlang/mqtree-1.0.13
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.12
+ >=dev-erlang/base64url-1.0.1
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.10 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ sip? ( >=dev-erlang/esip-1.0.42 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.12 )
+ stun? ( >=dev-erlang/stun-1.0.43 )
+ zlib? ( >=dev-erlang/ezlib-1.0.9 )"
+RDEPEND="${DEPEND}
+ acct-user/ejabberd
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+ "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ejabberd path in ejabberdctl.template'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it.
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 1c77ec49e504e970eb8fd74a1d835c7ba75ac360
Author: Sam James gentoo org>
AuthorDate: Fri Jul 30 23:14:43 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 30 23:30:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c77ec49
net-im/ejabberd: [QA] call tmpfiles_process in pkg_postinst
This is needed to actually apply the tmpfiles configuration
we've installed in the ebuild. See tmpfiles.eclass documentation.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sam James gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 ++
net-im/ejabberd/ejabberd-21.04.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index e2df234b563..90c657f64b0 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -271,6 +271,8 @@ pkg_preinst() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.tmpfiles.conf
+
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild
b/net-im/ejabberd/ejabberd-21.04.ebuild
index 3cf52812905..245c006f114 100644
--- a/net-im/ejabberd/ejabberd-21.04.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -252,6 +252,8 @@ pkg_preinst() {
}
pkg_postinst() {
+ tmpfiles_process ${PN}.tmpfiles.conf
+
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: bbd7526cbd8a9568a897fd1e56e89743bef46aef
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Jul 8 17:33:24 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jul 8 18:36:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd7526c
net-im/ejabberd: drop 20.07
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/Manifest | 1 -
net-im/ejabberd/ejabberd-20.07.ebuild | 292 --
2 files changed, 293 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 752106fe147..a3cfc05ea25 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,2 @@
DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
-DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B
c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c
SHA512
d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc
DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B
85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e
SHA512
4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
diff --git a/net-im/ejabberd/ejabberd-20.07.ebuild
b/net-im/ejabberd/ejabberd-20.07.ebuild
deleted file mode 100644
index a3250c01187..000
--- a/net-im/ejabberd/ejabberd-20.07.ebuild
+++ /dev/null
@@ -1,292 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd tmpfiles
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
- roster-gw sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[hipe(-)?,odbc?,ssl]
- >=dev-erlang/cache_tab-1.0.25
- >=dev-erlang/eimp-1.0.17
- >=dev-erlang/fast_tls-1.1.8
- >=dev-erlang/fast_xml-1.1.43
- >=dev-erlang/fast_yaml-1.0.27
- >=dev-erlang/yconf-1.0.7
- >=dev-erlang/jiffy-1.0.5
- >=dev-erlang/jose-1.9.0
- >=dev-erlang/lager-3.6.10
- >=dev-erlang/p1_oauth2-0.6.7
- >=dev-erlang/p1_utils-1.0.20
- >=dev-erlang/stringprep-1.0.22
- >=dev-erlang/xmpp-1.4.9
- >=dev-erlang/pkix-1.0.6
- >=dev-erlang/mqtree-1.0.10
- >=dev-erlang/idna-6.0.0
- >=dev-erlang/p1_acme-1.0.8
- >=dev-erlang/base64url-1.0
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.16 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.9 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.10 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- sip? ( >=dev-erlang/esip-1.0.37 )
- sqlite? ( >=dev-erlang/sqlite3-1.1.8 )
- stun? ( >=dev-erlang/stun-1.0.37 )
- zlib? ( >=dev-erlang/ezlib-1.0.8 )"
-RDEPEND="${DEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificate.
-adjust_config() {
- sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e
":a;n;/^#?\s+-/ba};p" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
- sed -re 's/^#\s+(certfiles)/\1/' \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
- -i "${S}/Makefile.in" \
-
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 468c0f70bcd7ba689d977f1f3eb8aebeec829778
Author: Florian Schmaus gentoo org>
AuthorDate: Thu Jul 8 15:37:09 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Thu Jul 8 15:37:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=468c0f70
net-im/ejabberd: Stabilize 21.04 amd64 x86, #801088
Signed-off-by: Florian Schmaus gentoo.org>
net-im/ejabberd/ejabberd-21.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild
b/net-im/ejabberd/ejabberd-21.04.ebuild
index b161498bc6a..3cf52812905 100644
--- a/net-im/ejabberd/ejabberd-21.04.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: be9f389bf17e9f46754e04ab7f5e377d85b40b0d Author: Sam James gentoo org> AuthorDate: Wed Jun 2 01:09:14 2021 + Commit: Sam James gentoo org> CommitDate: Wed Jun 2 01:09:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be9f389b net-im/ejabberd: update Manifest (see upstream bug) Upstream regenerated the tarballs because of a bad certificate. Link: https://github.com/processone/ejabberd/issues/3570#issuecomment-820189993 Closes: https://bugs.gentoo.org/793731 Signed-off-by: Sam James gentoo.org> net-im/ejabberd/Manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index bc7d6279d24..752106fe147 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,3 +1,3 @@ DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c SHA512 d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc -DIST ejabberd-21.04.tar.gz 1560926 BLAKE2B 9d00c892317a93e5754d6f265499e904bb7c22542495039d8cc5cd7296cd5b1c73f14844acc0f4b041b6595346ce01d633926fde9f693a7cd794afbb3c228eb8 SHA512 d30642e90be1feb8673e9d7b3b513a17d54d94405057034c706bbd43d288e89479adb0ebaf8a4e8ff0f7e394f027d01bf171690c00e4169951ceecfbc0af4dc2 +DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: bb797f58f335e6799ad19913b97338bae31f713e
Author: Jonathan Davies protonmail com>
AuthorDate: Mon Apr 12 08:27:10 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 1 09:35:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb797f58
net-im/ejabberd: add selinux USE flag to 21.04 ebuild
Signed-off-by: Jonathan Davies protonmail.com>
Modified-by: Florian Schmaus geekplace.eu>
Signed-off-by: Florian Schmaus geekplace.eu>
Closes: https://github.com/gentoo/gentoo/pull/20300
Signed-off-by: Sam James gentoo.org>
net-im/ejabberd/ejabberd-21.04.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild
b/net-im/ejabberd/ejabberd-21.04.ebuild
index 3f35fb5be97..b161498bc6a 100644
--- a/net-im/ejabberd/ejabberd-21.04.ebuild
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
- roster-gw sip sqlite +stun zlib"
+ roster-gw selinux sip sqlite +stun zlib"
RESTRICT="test"
@@ -57,7 +57,9 @@ DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
stun? ( >=dev-erlang/stun-1.0.43 )
zlib? ( >=dev-erlang/ezlib-1.0.9 )"
RDEPEND="${DEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
+ captcha? ( media-gfx/imagemagick[truetype,png] )
+ selinux? ( sec-policy/selinux-jabber )
+"
DOCS=( CHANGELOG.md README.md )
PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 26bb839b36582337bb3e4627e5e55a49004e567b
Author: Florian Schmaus geekplace eu>
AuthorDate: Thu Apr 8 07:08:54 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 1 09:35:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bb839b
net-im/ejabberd: add 21.04
Closes: https://bugs.gentoo.org/766686
Signed-off-by: Florian Schmaus geekplace.eu>
Signed-off-by: Sam James gentoo.org>
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-21.04.ebuild | 271 ++
2 files changed, 272 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 7f4a644bda9..bc7d6279d24 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B
c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c
SHA512
d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc
+DIST ejabberd-21.04.tar.gz 1560926 BLAKE2B
9d00c892317a93e5754d6f265499e904bb7c22542495039d8cc5cd7296cd5b1c73f14844acc0f4b041b6595346ce01d633926fde9f693a7cd794afbb3c228eb8
SHA512
d30642e90be1feb8673e9d7b3b513a17d54d94405057034c706bbd43d288e89479adb0ebaf8a4e8ff0f7e394f027d01bf171690c00e4169951ceecfbc0af4dc2
diff --git a/net-im/ejabberd/ejabberd-21.04.ebuild
b/net-im/ejabberd/ejabberd-21.04.ebuild
new file mode 100644
index 000..3f35fb5be97
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-21.04.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit pam rebar ssl-cert systemd tmpfiles
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
+ roster-gw sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.28
+ >=dev-erlang/eimp-1.0.20
+ >=dev-erlang/fast_tls-1.1.12
+ >=dev-erlang/fast_xml-1.1.46
+ >=dev-erlang/fast_yaml-1.0.31
+ >=dev-erlang/yconf-1.0.11
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.9.0
+ >=dev-erlang/lager-3.6.10
+ >=dev-erlang/p1_oauth2-0.6.9
+ >=dev-erlang/p1_utils-1.0.22
+ >=dev-erlang/stringprep-1.0.25
+ >=dev-erlang/xmpp-1.5.3
+ >=dev-erlang/pkix-1.0.7
+ >=dev-erlang/mqtree-1.0.13
+ >=dev-erlang/idna-6.0.0-r1
+ >=dev-erlang/p1_acme-1.0.12
+ >=dev-erlang/base64url-1.0.1
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.18 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.10 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.11 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ sip? ( >=dev-erlang/esip-1.0.42 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.12 )
+ stun? ( >=dev-erlang/stun-1.0.43 )
+ zlib? ( >=dev-erlang/ezlib-1.0.9 )"
+RDEPEND="${DEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+ "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+ sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e
":a;n;/^#?\s+-/ba};p" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+ sed -re 's/^#\s+(certfiles)/\1/' \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f2be78ab853fd71b884982f51a0f558aadfa302d Author: Sergei Trofimovich gentoo org> AuthorDate: Sun May 16 13:49:15 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun May 16 13:49:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2be78ab net-im/ejabberd: adapt to >=erlang-24 (hipe was removed) Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> net-im/ejabberd/ejabberd-20.04.ebuild | 2 +- net-im/ejabberd/ejabberd-20.07.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild index 21709574c14..e2df234b563 100644 --- a/net-im/ejabberd/ejabberd-20.04.ebuild +++ b/net-im/ejabberd/ejabberd-20.04.ebuild @@ -26,7 +26,7 @@ RESTRICT="test" # TODO: tools? ( # TODO:>=dev-erlang/luerl-0.3 # TODO: ) -DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl] +DEPEND=">=dev-lang/erlang-19.3[hipe(-)?,odbc?,ssl] >=dev-erlang/cache_tab-1.0.22 >=dev-erlang/eimp-1.0.14 >=dev-erlang/fast_tls-1.1.5 diff --git a/net-im/ejabberd/ejabberd-20.07.ebuild b/net-im/ejabberd/ejabberd-20.07.ebuild index ed5c06d61f1..a3250c01187 100644 --- a/net-im/ejabberd/ejabberd-20.07.ebuild +++ b/net-im/ejabberd/ejabberd-20.07.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -26,7 +26,7 @@ RESTRICT="test" # TODO: tools? ( # TODO:>=dev-erlang/luerl-0.3 # TODO: ) -DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl] +DEPEND=">=dev-lang/erlang-19.3[hipe(-)?,odbc?,ssl] >=dev-erlang/cache_tab-1.0.25 >=dev-erlang/eimp-1.0.17 >=dev-erlang/fast_tls-1.1.8
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: a47d4db8db672daf0af38a53f0dc5798519378ae
Author: Theo Anderson posteo de>
AuthorDate: Sun Mar 7 11:57:11 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Mar 7 11:57:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47d4db8
net-im/ejabberd: migrate to tmpfiles.eclass
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson posteo.de>
Signed-off-by: David Seifert gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 453de12094b..21709574c14 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
SSL_CERT_MANDATORY=1
-inherit eutils pam rebar ssl-cert systemd
+inherit eutils pam rebar ssl-cert systemd tmpfiles
DESCRIPTION="Robust, scalable and extensible XMPP server"
HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
@@ -251,7 +251,7 @@ src_install() {
newconfd "${FILESDIR}/${PN}.confd" "${PN}"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
systemd_dounit "${PN}.service"
- systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
+ dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}.logrotate" "${PN}"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: fdf540b4f55a1bb4162277606cddc54b27c9276d
Author: Hanno Böck gentoo org>
AuthorDate: Wed Oct 14 16:20:05 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Wed Oct 14 16:20:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf540b4
net-im/ejabberd: Version bump
Use tmpfiles.eclass.
Closes: https://bugs.gentoo.org/740612
Closes: https://bugs.gentoo.org/745144
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-20.07.ebuild | 292 ++
2 files changed, 293 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 2c690be71df..7f4a644bda9 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1 +1,2 @@
DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
+DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B
c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c
SHA512
d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc
diff --git a/net-im/ejabberd/ejabberd-20.07.ebuild
b/net-im/ejabberd/ejabberd-20.07.ebuild
new file mode 100644
index 000..ed5c06d61f1
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.07.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd tmpfiles
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+ roster-gw sip sqlite +stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.25
+ >=dev-erlang/eimp-1.0.17
+ >=dev-erlang/fast_tls-1.1.8
+ >=dev-erlang/fast_xml-1.1.43
+ >=dev-erlang/fast_yaml-1.0.27
+ >=dev-erlang/yconf-1.0.7
+ >=dev-erlang/jiffy-1.0.5
+ >=dev-erlang/jose-1.9.0
+ >=dev-erlang/lager-3.6.10
+ >=dev-erlang/p1_oauth2-0.6.7
+ >=dev-erlang/p1_utils-1.0.20
+ >=dev-erlang/stringprep-1.0.22
+ >=dev-erlang/xmpp-1.4.9
+ >=dev-erlang/pkix-1.0.6
+ >=dev-erlang/mqtree-1.0.10
+ >=dev-erlang/idna-6.0.0
+ >=dev-erlang/p1_acme-1.0.8
+ >=dev-erlang/base64url-1.0
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.16 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.9 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.10 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ sip? ( >=dev-erlang/esip-1.0.37 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.8 )
+ stun? ( >=dev-erlang/stun-1.0.37 )
+ zlib? ( >=dev-erlang/ezlib-1.0.8 )"
+RDEPEND="${DEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+ "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+ sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e
":a;n;/^#?\s+-/ba};p" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+ sed -re 's/^#\s+(certfiles)/\1/' \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: 6c9d3c1ddd8330358a28d93940c1f4d4afce1ce9
Author: Hanno Böck gentoo org>
AuthorDate: Sun Aug 23 10:41:55 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Sun Aug 23 10:41:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9d3c1d
net-im/ejabberd: remove old
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-3.0.4, Repoman-3.0.1
net-im/ejabberd/Manifest | 2 -
net-im/ejabberd/ejabberd-17.04-r2.ebuild | 331 -
net-im/ejabberd/ejabberd-20.03.ebuild | 292 --
...7.04-0001-Don-t-configure-or-compile-deps.patch | 53
.../files/ejabberd-17.04-ejabberdctl.patch | 62
net-im/ejabberd/metadata.xml | 3 -
6 files changed, 743 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 42042e3e5de..2c690be71df 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1 @@
-DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B
2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066
SHA512
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
-DIST ejabberd-20.03.tar.gz 2006603 BLAKE2B
67fa7d86e6802f24e783e91a8cb498375ca615bf22422ebe8bf630eb721e50574f468cfe25271172ebdfdca0c1df24dc6dd7f96a289153a017c32eb82af06d82
SHA512
f3ab666d9ffa596386ef121161dc7eeedca85cb7f5d290ad0882cd9557ea4166467bce9c082bdb423f932b44999c8e887d6a386d53564febf360f306feda3952
DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
deleted file mode 100644
index 45ea0080663..000
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ /dev/null
@@ -1,331 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit autotools eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
- riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/meck-0.8.4
-# TODO:>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
- >=dev-erlang/cache_tab-1.0.7
- >=dev-erlang/esip-1.0.11
- >=dev-erlang/fast_tls-1.0.11
- >=dev-erlang/fast_xml-1.1.21
- >=dev-erlang/fast_yaml-1.0.9
- >=dev-erlang/jiffy-0.14.8
- >=dev-erlang/lager-3.2.1
- >=dev-erlang/luerl-0.2
- >=dev-erlang/p1_oauth2-0.6.1
- >=dev-erlang/p1_utils-1.0.8
- >=dev-erlang/stringprep-1.0.8
- >=dev-erlang/stun-1.0.10
- >=dev-erlang/xmpp-1.1.9
- =dev-lang/erlang-17.1[hipe?,odbc?,ssl]
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
- nls? ( >=dev-erlang/iconv-1.0.4 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.2 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- riak? (
- >=dev-erlang/hamcrest-0.1.0_p20150103
- >=dev-erlang/riakc-2.4.1
- )
- sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
- zlib? ( >=dev-erlang/ezlib-1.0.2 )"
-DEPEND="${CDEPEND}
- >=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
- "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
- "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificates.
-# - Correct PAM service name.
-adjust_config() {
- sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
- -e "s|\"pamservicename\"|\"xmpp\"|" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: ef0ef1aded55341cf94470280245b8be966e1b10
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Aug 23 08:24:37 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Aug 23 08:24:37 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0ef1ad
net-im/ejabberd: drop ppc keywords
Bug: https://bugs.gentoo.org/732668
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich gentoo.org>
net-im/ejabberd/ejabberd-17.04-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 6a2041af6c5..45ea0080663 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@
SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 41ef21469095df4ec38a6c02807c49858bca98f0
Author: Hanno Böck gentoo org>
AuthorDate: Sun Aug 23 08:10:44 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Sun Aug 23 08:12:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ef2146
net-im/ejabberd: Remove ~ppc keyword
Does not build and it is unlikely anyone runs this on ppc
in reality.
Closes: https://bugs.gentoo.org/735926
Closes: https://bugs.gentoo.org/732668
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-3.0.4, Repoman-3.0.1
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 160a4a01d8b..453de12094b 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 1f8ac7b9121ff84036ce3b9f13fb103615567403
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Aug 6 11:52:54 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Aug 6 11:52:54 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8ac7b9
net-im/ejabberd: x86 stable wrt bug #735926
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 0171b11f881..160a4a01d8b 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 86027a90aec3bb5cac40c24bf7691c876cfd9be1
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Aug 6 11:47:28 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Aug 6 11:47:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86027a90
net-im/ejabberd: amd64 stable wrt bug #735926
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 785c35a6d60..0171b11f881 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 7cac3c4370b1cf5528ea8cb9e95331c7b254cb86
Author: Sam James gentoo org>
AuthorDate: Mon Jul 20 11:50:11 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 20 11:50:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cac3c43
net-im/ejabberd: x86 keyworded (bug #720724)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 61cae2f3766..785c35a6d60 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 56e451490af7da88ab48034546eb7fc74b31ec76
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jul 19 13:32:34 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jul 19 13:32:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e45149
net-im/ejabberd: keyworded 20.04 for ppc
keyworded wrt bug #720724
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index f616dff93cd..61cae2f3766 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: c25a73a487c0d03987770c32cff646dcc7a21df4
Author: Sam James gentoo org>
AuthorDate: Fri Jul 17 10:59:52 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 17 11:01:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c25a73a4
net-im/ejabberd: arm keyworded (bug #720724)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 15549444361..f616dff93cd 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~sparc"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 870a17c73019b1a4aa11c6cec53f2e3d4b3d0a23
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Jul 12 08:07:34 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Jul 12 08:07:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=870a17c7
net-im/ejabberd: keyworded 20.04 for ia64
keyworded wrt bug #720724
Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index 0a6e976566a..15549444361 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~sparc"
+KEYWORDS="~amd64 ~ia64 ~sparc"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: ecf0cc8a58744d25134d3fe54591f809b26e6208
Author: Sam James gentoo org>
AuthorDate: Sun Jul 12 02:25:16 2020 +
Commit: Sam James gentoo org>
CommitDate: Sun Jul 12 02:27:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf0cc8a
net-im/ejabberd: sparc keyworded (bug #720724)
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
net-im/ejabberd/ejabberd-20.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
index d68d2c5ba9f..0a6e976566a 100644
--- a/net-im/ejabberd/ejabberd-20.04.ebuild
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 4286e6b6fa1b9acdc3012b25b9013094fce9e635 Author: Hanno Böck gentoo org> AuthorDate: Mon May 4 18:54:36 2020 + Commit: Hanno Böck gentoo org> CommitDate: Mon May 4 18:54:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4286e6b6 net-im/ejabberd: Enable STUN by default Closes: https://bugs.gentoo.org/720960 Signed-off-by: Hanno Böck gentoo.org> Package-Manager: Portage-2.3.99, Repoman-2.3.22 net-im/ejabberd/ejabberd-20.04.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild b/net-im/ejabberd/ejabberd-20.04.ebuild index 706d73c5e2e..d68d2c5ba9f 100644 --- a/net-im/ejabberd/ejabberd-20.04.ebuild +++ b/net-im/ejabberd/ejabberd-20.04.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64" REQUIRED_USE="mssql? ( odbc )" # TODO: Add 'tools' flag. IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis - roster-gw sip sqlite stun zlib" + roster-gw sip sqlite +stun zlib" RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 2c32fa928d8209e3cb7dc683df891903f762fe4c
Author: Hanno Böck gentoo org>
AuthorDate: Mon May 4 11:55:35 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Mon May 4 11:55:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c32fa92
net-im/ejabberd: Version bump
Closes: https://bugs.gentoo.org/720426
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-20.04.ebuild | 292 ++
2 files changed, 293 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 20a2eb6b380..42042e3e5de 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B
2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066
SHA512
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
DIST ejabberd-20.03.tar.gz 2006603 BLAKE2B
67fa7d86e6802f24e783e91a8cb498375ca615bf22422ebe8bf630eb721e50574f468cfe25271172ebdfdca0c1df24dc6dd7f96a289153a017c32eb82af06d82
SHA512
f3ab666d9ffa596386ef121161dc7eeedca85cb7f5d290ad0882cd9557ea4166467bce9c082bdb423f932b44999c8e887d6a386d53564febf360f306feda3952
+DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B
02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578
SHA512
7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
diff --git a/net-im/ejabberd/ejabberd-20.04.ebuild
b/net-im/ejabberd/ejabberd-20.04.ebuild
new file mode 100644
index 000..706d73c5e2e
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.04.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+ roster-gw sip sqlite stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.22
+ >=dev-erlang/eimp-1.0.14
+ >=dev-erlang/fast_tls-1.1.5
+ >=dev-erlang/fast_xml-1.1.40
+ >=dev-erlang/fast_yaml-1.0.24
+ >=dev-erlang/yconf-1.0.4
+ >=dev-erlang/jiffy-1.0.1
+ >=dev-erlang/jose-1.9.0
+ >=dev-erlang/lager-3.6.10
+ >=dev-erlang/p1_oauth2-0.6.6
+ >=dev-erlang/p1_utils-1.0.18
+ >=dev-erlang/stringprep-1.0.19
+ >=dev-erlang/xmpp-1.4.6
+ >=dev-erlang/pkix-1.0.5
+ >=dev-erlang/mqtree-1.0.7
+ >=dev-erlang/idna-6.0.0
+ >=dev-erlang/p1_acme-1.0.5
+ >=dev-erlang/base64url-1.0
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.7 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ sip? ( >=dev-erlang/esip-1.0.32 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
+ stun? ( >=dev-erlang/stun-1.0.32 )
+ zlib? ( >=dev-erlang/ezlib-1.0.7 )"
+RDEPEND="${DEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+ "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+ sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e
":a;n;/^#?\s+-/ba};p" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+ sed -re 's/^#\s+(certfiles)/\1/' \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: fdfa70080cd3916f32561b479da795248eddf738
Author: Hanno Böck gentoo org>
AuthorDate: Thu Apr 30 09:44:25 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Thu Apr 30 09:44:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdfa7008
net-im/ejabberd: Remove duplicate patch
Both patch files for old and new version were identical.
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
net-im/ejabberd/ejabberd-20.03.ebuild | 2 +-
.../ejabberd-19.08-0002-Dont-overwrite-service-file.patch | 15 ---
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild
b/net-im/ejabberd/ejabberd-20.03.ebuild
index aadecdb23d9..7ed076748bb 100644
--- a/net-im/ejabberd/ejabberd-20.03.ebuild
+++ b/net-im/ejabberd/ejabberd-20.03.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${DEPEND}
DOCS=( CHANGELOG.md README.md )
PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
- "${FILESDIR}/${PN}-19.08-0002-Dont-overwrite-service-file.patch")
+ "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
diff --git
a/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch
b/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch
deleted file mode 100644
index 2bea750ef04..000
---
a/net-im/ejabberd/files/ejabberd-19.08-0002-Dont-overwrite-service-file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index a0b4553d..4675b88a 100644
a/Makefile.in
-+++ b/Makefile.in
-@@ -204,8 +204,8 @@ install: all copy-files
- chmod 755 ejabberd.init
- #
- # Service script
-- $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" ejabberd.service.template \
-- > ejabberd.service
-+ [ -f ejabberd.service ] || $(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*g" \
-+ ejabberd.service.template > ejabberd.service
- chmod 644 ejabberd.service
- #
- # Spool directory
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: 2d8c03f7f20c016978f58edf112225d52ea17dd8
Author: Hanno Böck gentoo org>
AuthorDate: Thu Apr 30 08:16:32 2020 +
Commit: Hanno Böck gentoo org>
CommitDate: Thu Apr 30 08:16:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8c03f7
net-im/ejabberd: Version bump.
Based on ebuild from Vampik's overlay with small changes.
Remove old postinst warnings, add warning for needed config changes
for updates from 17.x.
Closes: https://bugs.gentoo.org/626260
Signed-off-by: Hanno Böck gentoo.org>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-20.03.ebuild | 292 +
...rd-19.08-0002-Dont-overwrite-service-file.patch | 15 ++
.../files/ejabberd-19.08-ejabberdctl.patch | 38 +++
net-im/ejabberd/metadata.xml | 7 +-
5 files changed, 350 insertions(+), 3 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 57e9e73b4c0..20a2eb6b380 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1 +1,2 @@
DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B
2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066
SHA512
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
+DIST ejabberd-20.03.tar.gz 2006603 BLAKE2B
67fa7d86e6802f24e783e91a8cb498375ca615bf22422ebe8bf630eb721e50574f468cfe25271172ebdfdca0c1df24dc6dd7f96a289153a017c32eb82af06d82
SHA512
f3ab666d9ffa596386ef121161dc7eeedca85cb7f5d290ad0882cd9557ea4166467bce9c082bdb423f932b44999c8e887d6a386d53564febf360f306feda3952
diff --git a/net-im/ejabberd/ejabberd-20.03.ebuild
b/net-im/ejabberd/ejabberd-20.03.ebuild
new file mode 100644
index 000..aadecdb23d9
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-20.03.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
+ roster-gw sip sqlite stun zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/luerl-0.3
+# TODO: )
+DEPEND=">=dev-lang/erlang-19.3[hipe?,odbc?,ssl]
+ >=dev-erlang/cache_tab-1.0.22
+ >=dev-erlang/eimp-1.0.14
+ >=dev-erlang/fast_tls-1.1.4
+ >=dev-erlang/fast_xml-1.1.39
+ >=dev-erlang/fast_yaml-1.0.24
+ >=dev-erlang/yconf-1.0.4
+ >=dev-erlang/jiffy-1.0.1
+ >=dev-erlang/jose-1.9.0
+ >=dev-erlang/lager-3.6.10
+ >=dev-erlang/p1_oauth2-0.6.6
+ >=dev-erlang/p1_utils-1.0.18
+ >=dev-erlang/stringprep-1.0.19
+ >=dev-erlang/xmpp-1.4.5
+ >=dev-erlang/pkix-1.0.5
+ >=dev-erlang/mqtree-1.0.7
+ >=dev-erlang/idna-6.0.0
+ >=dev-erlang/p1_acme-1.0.5
+ >=dev-erlang/base64url-1.0
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.14 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.7 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.9 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ sip? ( >=dev-erlang/esip-1.0.32 )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.6 )
+ stun? ( >=dev-erlang/stun-1.0.31 )
+ zlib? ( >=dev-erlang/ezlib-1.0.7 )"
+RDEPEND="${DEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( CHANGELOG.md README.md )
+PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
+ "${FILESDIR}/${PN}-19.08-0002-Dont-overwrite-service-file.patch")
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificate.
+adjust_config() {
+ sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e
":a;n;/^#?\s+-/ba};p" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+ sed -re 's/^#\s+(certfiles)/\1/' \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 503c619633a7eb6c3326ec4d7cd9b764b71b30aa Author: Amadeusz Piotr Żołnowski gentoo org> AuthorDate: Sat Jul 13 10:09:59 2019 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Sat Jul 13 10:10:30 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503c6196 net-im/ejabberd: Remove aidecoe from maintainers Package-Manager: Portage-2.3.51, Repoman-2.3.11 Signed-off-by: Amadeusz Piotr Żołnowski gentoo.org> net-im/ejabberd/metadata.xml | 4 1 file changed, 4 deletions(-) diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml index e8a19e0f1ad..d9f1e24554e 100644 --- a/net-im/ejabberd/metadata.xml +++ b/net-im/ejabberd/metadata.xml @@ -1,10 +1,6 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - aide...@gentoo.org - Amadeusz Żołnowski - ha...@gentoo.org Hanno Böck
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: df82a20555aeb41fec827e3541928b6b40f38365
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Feb 24 10:34:59 2019 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Feb 24 10:53:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df82a205
net-im/ejabberd: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos gentoo.org>
net-im/ejabberd/Manifest | 2 -
net-im/ejabberd/ejabberd-16.09.ebuild | 319
net-im/ejabberd/ejabberd-17.01-r2.ebuild | 326
net-im/ejabberd/ejabberd-17.04-r1.ebuild | 327 -
.../files/ejabberd-16.09-ejabberdctl.patch | 62
...rd-17.01-0001-Dont-overwrite-service-file.patch | 15 -
.../files/ejabberd-17.01-ejabberdctl.patch | 62
7 files changed, 1113 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 6ac1c7f8a8c..57e9e73b4c0 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1 @@
-DIST ejabberd-16.09.tar.gz 1687485 BLAKE2B
01bdfc0ebfc54bf94f5ce645fdb7e4c86070249fe9c5bd6ae40fb355bb0cce8707b285b8e4519a38148a75d8a14719b2815dd0a987de74fe69099bce1401f9da
SHA512
506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f
-DIST ejabberd-17.01.tar.gz 1638418 BLAKE2B
016224277c45f753018a4e82783be1924acc1e747f1674ce1c902b06644908762750770debe5c06e8e4befcb4246b65efed4592d948188c30dcbf158bb049688
SHA512
d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
DIST ejabberd-17.04.tar.gz 1690441 BLAKE2B
2d31f1f0a393c6531653a55021b9deb729357bb53e86e85b85796a65f505257bcf7a14b0d168af2d13a6820e1524e1164ea7f17797df23ae41d7a8379f9e2066
SHA512
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild
b/net-im/ejabberd/ejabberd-16.09.ebuild
deleted file mode 100644
index 8c86270fcf8..000
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
- riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/meck-0.8.4
-# TODO:>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
- >=dev-erlang/cache_tab-1.0.4
- >=dev-erlang/esip-1.0.8
- >=dev-erlang/fast_tls-1.0.7
- >=dev-erlang/fast_xml-1.1.15
- >=dev-erlang/fast_yaml-1.0.6
- >=dev-erlang/jiffy-0.14.7
- >=dev-erlang/lager-3.2.1
- >=dev-erlang/luerl-0.2
- >=dev-erlang/p1_oauth2-0.6.1
- >=dev-erlang/p1_utils-1.0.5
- >=dev-erlang/stringprep-1.0.6
- >=dev-erlang/stun-1.0.7
- >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
- !>=dev-lang/erlang-20.0
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
- nls? ( >=dev-erlang/iconv-1.0.2 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.0
- =dev-erlang/p1_pgsql-1.1.0 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- riak? (
- >=dev-erlang/hamcrest-0.1.0_p20150103
- >=dev-erlang/riakc-2.1.1_p2015
- )
- sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
- zlib? ( >=dev-erlang/ezlib-1.0.1 )"
-DEPEND="${CDEPEND}
- >=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificates.
-# - Correct PAM service name.
-adjust_config() {
- sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
- -e "s|\"pamservicename\"|\"xmpp\"|" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 8181d09f2afaf55072d08ea80f8321010e2dd987 Author: Amadeusz Piotr Żołnowski gentoo org> AuthorDate: Tue Dec 4 21:59:32 2018 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Tue Dec 4 22:00:04 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8181d09f net-im/ejabberd: 17.* does not work with >=xmpp-1.2.0 Signed-off-by: Amadeusz Piotr Żołnowski gentoo.org> net-im/ejabberd/ejabberd-17.01-r2.ebuild | 1 + net-im/ejabberd/ejabberd-17.04-r1.ebuild | 1 + net-im/ejabberd/ejabberd-17.04-r2.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild index 2d05543a571..d20acca57fe 100644 --- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild +++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild @@ -41,6 +41,7 @@ CDEPEND=" >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 + =dev-lang/erlang-17.1[hipe?,odbc?,ssl] !>=dev-lang/erlang-20.0 >=net-im/jabber-base-0.01 diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild index 49ecf5359e3..02947b6b739 100644 --- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild +++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild @@ -41,6 +41,7 @@ CDEPEND=" >=dev-erlang/stringprep-1.0.8 >=dev-erlang/stun-1.0.10 >=dev-erlang/xmpp-1.1.9 + =dev-lang/erlang-17.1[hipe?,odbc?,ssl] !>=dev-lang/erlang-20.0 >=net-im/jabber-base-0.01 diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild b/net-im/ejabberd/ejabberd-17.04-r2.ebuild index 1c5c0216664..6a2041af6c5 100644 --- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild +++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild @@ -41,6 +41,7 @@ CDEPEND=" >=dev-erlang/stringprep-1.0.8 >=dev-erlang/stun-1.0.10 >=dev-erlang/xmpp-1.1.9 + =dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* )
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 1e12fa12e9d535e606cd5f44066642e0d3a5fdd6
Author: Mikle Kolyada gentoo org>
AuthorDate: Sun May 27 15:32:45 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sun May 27 15:32:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e12fa12
net-im/ejabberd: amd64 stable wrt bug #649202
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-im/ejabberd/ejabberd-17.04-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index aa0f79fc04f..46130f6cb92 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: b9eb85571d03ac04ab9ae3165534577814f89fd7
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sun May 27 14:12:17 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sun May 27 14:13:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9eb8557
net-im/ejabberd: x86 stable (bug #649202)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-im/ejabberd/ejabberd-17.04-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 8d05cca058b..aa0f79fc04f 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -14,7 +14,7 @@
SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 0763981ae04d106f57842fe2ab5196568a7c500e
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Apr 18 18:00:16 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Apr 18 18:11:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0763981a
net-im/ejabberd: Fix compilation against newer erlang (#651932)
Package-Manager: Portage-2.3.28, Repoman-2.3.9
net-im/ejabberd/ejabberd-17.04-r2.ebuild | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
index 3d86277c7cd..8d05cca058b 100644
--- a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
SSL_CERT_MANDATORY=1
-inherit eutils pam rebar ssl-cert systemd
+inherit autotools eutils pam rebar ssl-cert systemd
DESCRIPTION="Robust, scalable and extensible XMPP server"
HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
@@ -228,6 +228,11 @@ src_prepare() {
sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
-i "${S}/ejabberdctl.template" \
|| die 'failed to set ERL_LIBS in ejabberdctl.template'
+
+ #
https://github.com/processone/ejabberd/commit/58110e4bc152100078dbc0cb66d4a5257ae645e0,
+ # bug #651932, drop in next version
+ sed -i -e 's/REQUIRE_ERLANG_MAX="9.0.0 (No
Max)"/REQUIRE_ERLANG_MAX="100.0.0 (No Max)"/' configure.ac || die
+ eautoreconf
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 57d10109797c9972558e10cc8a2f1bba9380b0bf
Author: Pacho Ramos gentoo org>
AuthorDate: Wed Mar 28 18:58:24 2018 +
Commit: Pacho Ramos gentoo org>
CommitDate: Wed Mar 28 19:01:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d10109
net-im/ejabberd: erlang-20.0 block looks to not be needed (#641998)
Package-Manager: Portage-2.3.26, Repoman-2.3.7
net-im/ejabberd/ejabberd-17.04-r2.ebuild | 325 +++
1 file changed, 325 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-17.04-r2.ebuild
b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
new file mode 100644
index 000..3d86277c7cd
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-17.04-r2.ebuild
@@ -0,0 +1,325 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+ riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/meck-0.8.4
+# TODO:>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+ >=dev-erlang/cache_tab-1.0.7
+ >=dev-erlang/esip-1.0.11
+ >=dev-erlang/fast_tls-1.0.11
+ >=dev-erlang/fast_xml-1.1.21
+ >=dev-erlang/fast_yaml-1.0.9
+ >=dev-erlang/jiffy-0.14.8
+ >=dev-erlang/lager-3.2.1
+ >=dev-erlang/luerl-0.2
+ >=dev-erlang/p1_oauth2-0.6.1
+ >=dev-erlang/p1_utils-1.0.8
+ >=dev-erlang/stringprep-1.0.8
+ >=dev-erlang/stun-1.0.10
+ >=dev-erlang/xmpp-1.1.9
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+ nls? ( >=dev-erlang/iconv-1.0.4 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.2 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ riak? (
+ >=dev-erlang/hamcrest-0.1.0_p20150103
+ >=dev-erlang/riakc-2.4.1
+ )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+ zlib? ( >=dev-erlang/ezlib-1.0.2 )"
+DEPEND="${CDEPEND}
+ >=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
+ "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+ -e "s|\"pamservicename\"|\"xmpp\"|" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ejabberd path in ejabberdctl.template'
+ sed -e
's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|'
\
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+ local epam_wrapper_src="$1"
+ local epam_wrapper_dst="${S}/epam-wrapper"
+
+ [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+ sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+ "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+ || die 'failed to install epam-wrapper'
+}
+
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+ local needs_iconv='needs dev-erlang/iconv
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 181687b5fd8243a1692eb063bd55eb29b2dd90ce
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Mon Mar 26 18:12:10 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Mar 26 18:40:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181687b5
net-im/ejabberd: use HTTPS, update docs Homepage
Closes: https://github.com/gentoo/gentoo/pull/7627
net-im/ejabberd/ejabberd-16.09.ebuild| 8
net-im/ejabberd/ejabberd-17.01-r2.ebuild | 8
net-im/ejabberd/ejabberd-17.04-r1.ebuild | 8
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild
b/net-im/ejabberd/ejabberd-16.09.ebuild
index f313dbb0deb..8c86270fcf8 100644
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,8 +8,8 @@ SSL_CERT_MANDATORY=1
inherit eutils pam rebar ssl-cert systemd
DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-> ${P}.tar.gz"
LICENSE="GPL-2"
@@ -264,7 +264,7 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
- elog " http://www.process-one.net/en/ejabberd/docs/;
+ elog " https://docs.ejabberd.im/;
echo
if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
ewarn "If you have used pubsub in ejabberd-2.* you may
encounter issues after"
diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild
b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
index ec624d2c533..2d05543a571 100644
--- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,8 +8,8 @@ SSL_CERT_MANDATORY=1
inherit eutils pam rebar ssl-cert systemd
DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-> ${P}.tar.gz"
LICENSE="GPL-2"
@@ -278,7 +278,7 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
- elog " http://www.process-one.net/en/ejabberd/docs/;
+ elog " https://docs.ejabberd.im/;
echo
if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
ewarn "If you have used pubsub in ejabberd-2.* you may
encounter issues after"
diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild
b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
index 5ca27008f2c..49ecf5359e3 100644
--- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,8 +8,8 @@ SSL_CERT_MANDATORY=1
inherit eutils pam rebar ssl-cert systemd
DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="https://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
-> ${P}.tar.gz"
LICENSE="GPL-2"
@@ -279,7 +279,7 @@ pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
echo
elog "For configuration instructions, please see"
- elog " http://www.process-one.net/en/ejabberd/docs/;
+ elog " https://docs.ejabberd.im/;
echo
if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
ewarn "If you have used pubsub in ejabberd-2.* you may
encounter issues after"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: cd873d26a46260a171aedbeb73ac42e01d7c6d29 Author: Amadeusz Żołnowski gentoo org> AuthorDate: Wed Dec 6 22:18:02 2017 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Wed Dec 6 22:18:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd873d26 net-im/ejabberd: Versions 16 and 17 do not work with Erlang 20 or higher Package-Manager: Portage-2.3.14, Repoman-2.3.6 net-im/ejabberd/ejabberd-16.09.ebuild| 1 + net-im/ejabberd/ejabberd-17.01-r2.ebuild | 1 + net-im/ejabberd/ejabberd-17.04-r1.ebuild | 1 + 3 files changed, 3 insertions(+) diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild index 99e4a3aabcc..f313dbb0deb 100644 --- a/net-im/ejabberd/ejabberd-16.09.ebuild +++ b/net-im/ejabberd/ejabberd-16.09.ebuild @@ -41,6 +41,7 @@ CDEPEND=" >=dev-erlang/stringprep-1.0.6 >=dev-erlang/stun-1.0.7 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] + !>=dev-lang/erlang-20.0 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) diff --git a/net-im/ejabberd/ejabberd-17.01-r2.ebuild b/net-im/ejabberd/ejabberd-17.01-r2.ebuild index 7bada46b7dc..ec624d2c533 100644 --- a/net-im/ejabberd/ejabberd-17.01-r2.ebuild +++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild @@ -42,6 +42,7 @@ CDEPEND=" >=dev-erlang/stun-1.0.9 >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] + !>=dev-lang/erlang-20.0 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) diff --git a/net-im/ejabberd/ejabberd-17.04-r1.ebuild b/net-im/ejabberd/ejabberd-17.04-r1.ebuild index 729fae6076e..5ca27008f2c 100644 --- a/net-im/ejabberd/ejabberd-17.04-r1.ebuild +++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild @@ -42,6 +42,7 @@ CDEPEND=" >=dev-erlang/stun-1.0.10 >=dev-erlang/xmpp-1.1.9 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] + !>=dev-lang/erlang-20.0 >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 580840145dbdfe4c7623921ab53c3bca90248ad5
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun Jul 9 20:17:40 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Jul 9 20:17:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58084014
net-im/ejabberd: Remove older revision of 17.04
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-im/ejabberd/ejabberd-17.04.ebuild | 325 --
1 file changed, 325 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild
b/net-im/ejabberd/ejabberd-17.04.ebuild
deleted file mode 100644
index 729fae6076e..000
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
- riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/meck-0.8.4
-# TODO:>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
- >=dev-erlang/cache_tab-1.0.7
- >=dev-erlang/esip-1.0.11
- >=dev-erlang/fast_tls-1.0.11
- >=dev-erlang/fast_xml-1.1.21
- >=dev-erlang/fast_yaml-1.0.9
- >=dev-erlang/jiffy-0.14.8
- >=dev-erlang/lager-3.2.1
- >=dev-erlang/luerl-0.2
- >=dev-erlang/p1_oauth2-0.6.1
- >=dev-erlang/p1_utils-1.0.8
- >=dev-erlang/stringprep-1.0.8
- >=dev-erlang/stun-1.0.10
- >=dev-erlang/xmpp-1.1.9
- >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
- nls? ( >=dev-erlang/iconv-1.0.4 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.2 )
- postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- riak? (
- >=dev-erlang/hamcrest-0.1.0_p20150103
- >=dev-erlang/riakc-2.4.1
- )
- sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
- zlib? ( >=dev-erlang/ezlib-1.0.2 )"
-DEPEND="${CDEPEND}
- >=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
- "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
- "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificates.
-# - Correct PAM service name.
-adjust_config() {
- sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
- -e "s|\"pamservicename\"|\"xmpp\"|" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
- -i "${S}/Makefile.in" \
- || die 'failed to set ejabberd path in Makefile.in'
- sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
- -i "${S}/ejabberdctl.template" \
- || die 'failed to set ejabberd path in ejabberdctl.template'
- sed -e
's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|'
\
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to correct path to captcha.sh in example config'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
- local epam_wrapper_src="$1"
- local epam_wrapper_dst="${S}/epam-wrapper"
-
- [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
- sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
- "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
- || die 'failed to install epam-wrapper'
-}
-
-# Disable mod_irc in example configuration file.
-disable_mod_irc() {
- local needs_iconv='needs dev-erlang/iconv (+nls USE
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: e1c95311742e366e46a8e91cc6fcfa140caa263a
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun Jul 9 12:09:09 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Jul 9 20:14:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1c95311
net-im/ejabberd: Correct paths and user/group in unit service file
Gentoo-Bug: 621780
net-im/ejabberd/ejabberd-17.01-r1.ebuild | 5 +++--
...{ejabberd-17.01-r1.ebuild => ejabberd-17.01-r2.ebuild} | 5 +++--
.../{ejabberd-17.04.ebuild => ejabberd-17.04-r1.ebuild} | 5 +++--
net-im/ejabberd/ejabberd-17.04.ebuild | 5 +++--
.../ejabberd-17.01-0001-Dont-overwrite-service-file.patch | 15 +++
.../ejabberd-17.04-0002-Dont-overwrite-service-file.patch | 15 +++
6 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
index 7c2e9586ebd..7bada46b7dc 100644
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+ "${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
# Make ejabberd.service for systemd from upstream provided template.
make_ejabberd_service() {
sed -r \
- -e 's!@ctlscriptpath@!/usr/sbin!' \
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \
-e 's!(User|Group)=(.*)!\1=jabber!' \
"${PN}.service.template" >"${PN}.service" \
|| die 'failed to make ejabberd.service'
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
similarity index 98%
copy from net-im/ejabberd/ejabberd-17.01-r1.ebuild
copy to net-im/ejabberd/ejabberd-17.01-r2.ebuild
index 7c2e9586ebd..7bada46b7dc 100644
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r2.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+ "${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
# Make ejabberd.service for systemd from upstream provided template.
make_ejabberd_service() {
sed -r \
- -e 's!@ctlscriptpath@!/usr/sbin!' \
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \
-e 's!(User|Group)=(.*)!\1=jabber!' \
"${PN}.service.template" >"${PN}.service" \
|| die 'failed to make ejabberd.service'
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild
b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
similarity index 98%
copy from net-im/ejabberd/ejabberd-17.04.ebuild
copy to net-im/ejabberd/ejabberd-17.04-r1.ebuild
index 1cec62f2eba..729fae6076e 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04-r1.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
DOCS=( README )
PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
- "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
+ "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
# Make ejabberd.service for systemd from upstream provided template.
make_ejabberd_service() {
sed -r \
- -e 's!@ctlscriptpath@!/usr/sbin!' \
+ -e 's!@ctlscriptpath@!/usr/sbin!g' \
-e 's!(User|Group)=(.*)!\1=jabber!' \
"${PN}.service.template" >"${PN}.service" \
|| die 'failed to make ejabberd.service'
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild
b/net-im/ejabberd/ejabberd-17.04.ebuild
index 1cec62f2eba..729fae6076e 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -63,7 +63,8 @@ RDEPEND="${CDEPEND}
DOCS=( README )
PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
- "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch"
+ "${FILESDIR}/${P}-0002-Dont-overwrite-service-file.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
@@ -157,7 +158,7 @@ is_mod_irc_enabled() {
# Make ejabberd.service for systemd from upstream provided template.
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: eff5ee3fe2f381b192022af3fa25f1d02241dd7c
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun Jul 9 20:12:45 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Jul 9 20:14:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff5ee3f
net-im/ejabberd: Remove older revisions of 17.01
Package-Manager: Portage-2.3.6, Repoman-2.3.2
net-im/ejabberd/ejabberd-17.01-r1.ebuild | 324 ---
net-im/ejabberd/ejabberd-17.01.ebuild| 322 --
2 files changed, 646 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
deleted file mode 100644
index 7bada46b7dc..000
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
- riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/meck-0.8.4
-# TODO:>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
- >=dev-erlang/cache_tab-1.0.6
- >=dev-erlang/esip-1.0.10
- >=dev-erlang/fast_tls-1.0.10
- >=dev-erlang/fast_xml-1.1.19
- >=dev-erlang/fast_yaml-1.0.8
- >=dev-erlang/jiffy-0.14.8
- >=dev-erlang/lager-3.2.1
- >=dev-erlang/luerl-0.2
- >=dev-erlang/p1_oauth2-0.6.1
- >=dev-erlang/p1_utils-1.0.6
- >=dev-erlang/stringprep-1.0.7
- >=dev-erlang/stun-1.0.9
- >=dev-erlang/xmpp-1.1.6
- >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
- >=net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
- nls? ( >=dev-erlang/iconv-1.0.3 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.0-r1
- =dev-erlang/p1_pgsql-1.1.2 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- riak? (
- >=dev-erlang/hamcrest-0.1.0_p20150103
- >=dev-erlang/riakc-2.4.1
- )
- sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
- zlib? ( >=dev-erlang/ezlib-1.0.2 )"
-DEPEND="${CDEPEND}
- >=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
- "${FILESDIR}/${P}-0001-Dont-overwrite-service-file.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-
-# Adjust example configuration file to Gentoo.
-# - Use our sample certificates.
-# - Correct PAM service name.
-adjust_config() {
- sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
- -e "s|\"pamservicename\"|\"xmpp\"|" \
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to adjust example config'
-}
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
- -i "${S}/Makefile.in" \
- || die 'failed to set ejabberd path in Makefile.in'
- sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
- -i "${S}/ejabberdctl.template" \
- || die 'failed to set ejabberd path in ejabberdctl.template'
- sed -e
's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|'
\
- -i "${S}/ejabberd.yml.example" \
- || die 'failed to correct path to captcha.sh in example config'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
- local epam_wrapper_src="$1"
- local epam_wrapper_dst="${S}/epam-wrapper"
-
- [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
- sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
- "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
- || die 'failed to install epam-wrapper'
-}
-
-# Disable mod_irc in example configuration file.
-disable_mod_irc() {
- local needs_iconv='needs
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/
commit: 9cf6cd7008bb53f38b7a83b429b3473241a71fc7 Author: Amadeusz Żołnowski gentoo org> AuthorDate: Mon May 29 17:35:05 2017 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Mon May 29 17:35:44 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf6cd70 net-im/ejabberd: Create directory for PID file And change /var/lock/... to /run/lock/... Gentoo-Bug: 602236 Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-im/ejabberd/files/ejabberd.tmpfiles.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net-im/ejabberd/files/ejabberd.tmpfiles.conf b/net-im/ejabberd/files/ejabberd.tmpfiles.conf index cf17b73b43a..6a9cc9e61b7 100644 --- a/net-im/ejabberd/files/ejabberd.tmpfiles.conf +++ b/net-im/ejabberd/files/ejabberd.tmpfiles.conf @@ -1 +1,2 @@ -d /var/lock/ejabberdctl 0750 jabber jabber +d /run/lock/ejabberdctl 0750 jabber jabber +d /run/ejabberd 0750 jabber jabber
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 0912204c84b553560a7a48ad1393b7906cccf351
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun May 28 18:06:04 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun May 28 18:06:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0912204c
net-im/ejabberd: Disable mod_irc if nls USE flag is disbled
mod_irc is only required for mod_irc. If nls support is disabled,
disable mod_irc in example configuration file and warn user if he/she
has mod_irc enabled in configuration. Otherwise ejabberd will fail to
start.
Gentoo-Bug: 603822
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-im/ejabberd/ejabberd-16.09.ebuild| 21 +
net-im/ejabberd/ejabberd-17.01-r1.ebuild | 21 +
net-im/ejabberd/ejabberd-17.01.ebuild| 21 +
net-im/ejabberd/ejabberd-17.04.ebuild| 21 +
4 files changed, 84 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild
b/net-im/ejabberd/ejabberd-16.09.ebuild
index 5621156189e..99e4a3aabcc 100644
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -107,6 +107,15 @@ customize_epam_wrapper() {
|| die 'failed to install epam-wrapper'
}
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+ local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+ sed -r \
+ -e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to modify example config'
+}
+
# Check if there already exists a certificate.
ejabberd_cert_exists() {
local cert
@@ -138,6 +147,12 @@ get_ejabberd_path() {
echo "/usr/$(get_libdir)/${P}"
}
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+ egrep '^(\s*)(mod_irc\s*:.*$)' \
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
# Make ejabberd.service for systemd from upstream provided template.
make_ejabberd_service() {
sed -r \
@@ -184,6 +199,7 @@ src_prepare() {
make_ejabberd_service
skip_docs
adjust_config
+ use nls || disable_mod_irc
customize_epam_wrapper "${FILESDIR}/epam-wrapper"
# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
@@ -294,4 +310,9 @@ pkg_postinst() {
chmod g+r "${EROOT%/}${epam_path}" \
|| die "failed to correct ${epam_path} permissions"
fi
+
+ if ! use nls && is_mod_irc_enabled; then
+ ewarn "nls support (dev-erlang/iconv) is required by mod_irc.
Either rebuild ejabberd"
+ ewarn "with nls enabled or disable mod_irc in
${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+ fi
}
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
index 6ee9e157db6..7c2e9586ebd 100644
--- a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
@@ -108,6 +108,15 @@ customize_epam_wrapper() {
|| die 'failed to install epam-wrapper'
}
+# Disable mod_irc in example configuration file.
+disable_mod_irc() {
+ local needs_iconv='needs dev-erlang/iconv (+nls USE flag)'
+ sed -r \
+ -e "s@^(\s*)(mod_irc\s*:.*$)@\1## \2 # ${needs_iconv}@" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to modify example config'
+}
+
# Check if there already exists a certificate.
ejabberd_cert_exists() {
local cert
@@ -139,6 +148,12 @@ get_ejabberd_path() {
echo "/usr/$(get_libdir)/${P}"
}
+# Check whether mod_irc is enabled in ejabberd configuration on target system.
+is_mod_irc_enabled() {
+ egrep '^(\s*)(mod_irc\s*:.*$)' \
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"
+}
+
# Make ejabberd.service for systemd from upstream provided template.
make_ejabberd_service() {
sed -r \
@@ -198,6 +213,7 @@ src_prepare() {
make_ejabberd_service
skip_docs
adjust_config
+ use nls || disable_mod_irc
customize_epam_wrapper "${FILESDIR}/epam-wrapper"
rebar_fix_include_path fast_xml
@@ -299,4 +315,9 @@ pkg_postinst() {
if ! ejabberd_cert_exists; then
ejabberd_cert_install
fi
+
+ if ! use nls && is_mod_irc_enabled; then
+ ewarn "nls support (dev-erlang/iconv) is required by mod_irc.
Either rebuild ejabberd"
+ ewarn "with nls enabled or disable mod_irc in
${EROOT%/}${JABBER_ETC}/ejabberd.yml."
+ fi
}
diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild
b/net-im/ejabberd/ejabberd-17.01.ebuild
index a55828a551e..061059b6183 100644
--- a/net-im/ejabberd/ejabberd-17.01.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01.ebuild
@@ -108,6 +108,15 @@ customize_epam_wrapper() {
|| die 'failed to install epam-wrapper'
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: 3f1724d261577a5eebdd7cc64605c41baa7a4f48
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun May 28 13:08:41 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun May 28 13:08:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f1724d2
net-im/ejabberd: Bump version
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-17.04.ebuild | 302 +
.../files/ejabberd-17.04-ejabberdctl.patch | 62 +
3 files changed, 365 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index fcc89f207ce..c5017485df3 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
DIST ejabberd-16.09.tar.gz 1687485 SHA256
7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512
506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f
WHIRLPOOL
6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2
DIST ejabberd-17.01.tar.gz 1638418 SHA256
7efa8f25fe01bce876f9379ba7b4f49752a0fddc6a78e5ae82196fdc7f70c90b SHA512
d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
WHIRLPOOL
7b670b0876b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb
+DIST ejabberd-17.04.tar.gz 1690441 SHA256
b8395bc65b09f135a60320b62338258acd6056cc241e9e245fde267fb18dd3c9 SHA512
03467434dba92bd1ff2f70d78aa8fcf86fc73cb5273e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
WHIRLPOOL
c345a6b31e5ea63d72779630d7db8868e997e876ef929dc0de3df0584ca3dcbec1d36e6bb1cacdcc3ee428f9f82b4dbc73d3f08446ace0daa8beccd2fe9a8bfe
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild
b/net-im/ejabberd/ejabberd-17.04.ebuild
new file mode 100644
index 000..75726aedb77
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+ riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/meck-0.8.4
+# TODO:>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+ >=dev-erlang/cache_tab-1.0.7
+ >=dev-erlang/esip-1.0.11
+ >=dev-erlang/fast_tls-1.0.11
+ >=dev-erlang/fast_xml-1.1.21
+ >=dev-erlang/fast_yaml-1.0.9
+ >=dev-erlang/jiffy-0.14.8
+ >=dev-erlang/lager-3.2.1
+ >=dev-erlang/luerl-0.2
+ >=dev-erlang/p1_oauth2-0.6.1
+ >=dev-erlang/p1_utils-1.0.8
+ >=dev-erlang/stringprep-1.0.8
+ >=dev-erlang/stun-1.0.10
+ >=dev-erlang/xmpp-1.1.9
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+ nls? ( >=dev-erlang/iconv-1.0.4 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.2 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ riak? (
+ >=dev-erlang/hamcrest-0.1.0_p20150103
+ >=dev-erlang/riakc-2.4.1
+ )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+ zlib? ( >=dev-erlang/ezlib-1.0.2 )"
+DEPEND="${CDEPEND}
+ >=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+ -e "s|\"pamservicename\"|\"xmpp\"|" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: f7e77ea56eaafd2422d5009d52cae79ef264
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun May 28 13:29:55 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun May 28 13:29:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7e77ea5
net-im/ejabberd: Bump version
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-im/ejabberd/ejabberd-17.04.ebuild | 3 +-
...7.04-0001-Don-t-configure-or-compile-deps.patch | 53 ++
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-17.04.ebuild
b/net-im/ejabberd/ejabberd-17.04.ebuild
index 75726aedb77..8b82f975af8 100644
--- a/net-im/ejabberd/ejabberd-17.04.ebuild
+++ b/net-im/ejabberd/ejabberd-17.04.ebuild
@@ -62,7 +62,8 @@ RDEPEND="${CDEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )"
DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch"
+ "${FILESDIR}/${P}-0001-Don-t-configure-or-compile-deps.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
# Paths in net-im/jabber-base
diff --git
a/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
new file mode 100644
index 000..0a42f549b58
--- /dev/null
+++
b/net-im/ejabberd/files/ejabberd-17.04-0001-Don-t-configure-or-compile-deps.patch
@@ -0,0 +1,53 @@
+From 4086249e78cde107df84e6ad022e9d9821cecc40 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?=
+Date: Sun, 28 May 2017 14:22:08 +0100
+Subject: [PATCH] Don't configure or compile deps
+
+---
+ rebar.config.script | 23 ---
+ 1 file changed, 23 deletions(-)
+
+diff --git a/rebar.config.script b/rebar.config.script
+index 19142b9e..04f8b310 100644
+--- a/rebar.config.script
b/rebar.config.script
+@@ -242,27 +242,6 @@ CtParams = fun(CompileOpts) ->
+ TestConfig]
+ end,
+
+-GenDepConfigureLine =
+-fun(DepPath, Flags) ->
+- ["sh -c 'if test ! -f ",DepPath,"config.status -o ",
+- "config.status -nt ",DepPath,"config.status; ",
+- "then (cd ", DepPath, " && ",
+- "CFLAGS=\"", CFlags,"\" ",
+- "CPPFLAGS=\"", CPPFlags, "\" "
+- "LDFLAGS=\"", LDFlags, "\"",
+- " ./configure ", string:join(Flags, " "),
+- "); fi'"]
+-end,
+-
+-GenDepsConfigure =
+-fun(Hooks) ->
+- lists:map(fun({Pkg, Flags}) ->
+-DepPath = ResolveDepPath("deps/" ++ Pkg ++ "/"),
+-{'compile',
+- lists:flatten(GenDepConfigureLine(DepPath, Flags))}
+-end, Hooks)
+-end,
+-
+ ProcessErlOpt = fun(Vals) ->
+ lists:map(
+ fun({i, Path}) ->
+@@ -315,8 +294,6 @@ Rules = [
+ AppendList([{coveralls, ".*", {git,
"https://github.com/markusn/coveralls-erl.git;, "master"}}]), []},
+{[post_hooks], [cover_enabled], os:getenv("TRAVIS") == "true",
+ AppendList2(TravisPostHooks), [], false},
+- {[pre_hooks], [post_hook_configure], true,
+-AppendList2(GenDepsConfigure), [], []},
+{[ct_extra_params], [eunit_compile_opts], true,
+ AppendStr2(CtParams), "", []},
+{[erl_opts], true,
+--
+2.12.2
+
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: 8be8ae98b60da239244a5378f12999b6ce4c353f
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat May 27 19:48:33 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat May 27 20:55:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8be8ae98
net-im/ejabberd: Remove older versions
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-im/ejabberd/Manifest | 2 -
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 299 -
net-im/ejabberd/ejabberd-16.04.ebuild | 280 ---
net-im/ejabberd/ejabberd-16.08.ebuild | 298
.../files/ejabberd-16.04-ejabberdctl.patch | 49
.../files/ejabberd-16.08-ejabberdctl.patch | 62 -
6 files changed, 990 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index c0f2fe3a01a..fcc89f207ce 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,2 @@
-DIST ejabberd-16.04.tar.gz 1715963 SHA256
3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512
5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2
WHIRLPOOL
d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
-DIST ejabberd-16.08.tar.gz 1739542 SHA256
b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512
661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55
WHIRLPOOL
41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788
DIST ejabberd-16.09.tar.gz 1687485 SHA256
7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512
506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f
WHIRLPOOL
6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2
DIST ejabberd-17.01.tar.gz 1638418 SHA256
7efa8f25fe01bce876f9379ba7b4f49752a0fddc6a78e5ae82196fdc7f70c90b SHA512
d64125f81efbf841eded140d877c950439c11e65377e167994d25f85fa66437aad771d94548d063900bd3c472922e6bfa8f8bbe65413f18e7b641f0ed32db566
WHIRLPOOL
7b670b0876b4fb804410730571175c253e094fab6fc8c9412eae4e14b844ad38596426b4334bd751a056f940dfd60c1c06d2560af5b36061eb54553886fb
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
deleted file mode 100644
index 84354c2c2a2..000
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-SSL_CERT_MANDATORY=1
-
-inherit eutils pam rebar ssl-cert systemd
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
- -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
- riak roster-gw sqlite zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:>=dev-erlang/meck-0.8.4
-# TODO:>=dev-erlang/moka-1.0.5b
-# TODO: )
-CDEPEND="
- >=dev-erlang/cache_tab-1.0.2
- >=dev-erlang/esip-1.0.4
- >=dev-erlang/fast_tls-1.0.3
- >=dev-erlang/fast_xml-1.1.3
- >=dev-erlang/fast_yaml-1.0.3
- >=dev-erlang/jiffy-0.14.7
- >=dev-erlang/lager-3.0.2
- >=dev-erlang/luerl-0.2
- >=dev-erlang/p1_oauth2-0.6.1
- >=dev-erlang/p1_utils-1.0.4
- >=dev-erlang/p1_xmlrpc-1.15.1
- >=dev-erlang/stringprep-1.0.3
- >=dev-erlang/stun-1.0.3
- >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
- =net-im/jabber-base-0.01
- ldap? ( =net-nds/openldap-2* )
- mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
- nls? ( >=dev-erlang/iconv-1.0.0 )
- odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/epam-1.0.0
- =dev-erlang/p1_pgsql-1.1.0 )
- redis? ( >=dev-erlang/eredis-1.0.8 )
- riak? (
- >=dev-erlang/hamcrest-0.1.0_p20150103
- >=dev-erlang/riakc-2.1.1_p2015
- )
- sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
- zlib? ( >=dev-erlang/ezlib-1.0.1 )"
-DEPEND="${CDEPEND}
- >=sys-apps/gawk-4.1"
-RDEPEND="${CDEPEND}
- captcha? ( media-gfx/imagemagick[truetype,png] )"
-
-DOCS=( README )
-PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
-
-EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
-# Paths
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 52ef809dac2711cf1ff2c2a0c511e855e8b073d1 Author: Amadeusz Żołnowski gentoo org> AuthorDate: Sat May 27 14:26:29 2017 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Sat May 27 20:54:59 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52ef809d net-im/ejabberd: Require =dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.0 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.0 ) + pam? ( >=dev-erlang/epam-1.0.0 + =dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild b/net-im/ejabberd/ejabberd-16.08.ebuild index bb40fdee440..947f907b904 100644 --- a/net-im/ejabberd/ejabberd-16.08.ebuild +++ b/net-im/ejabberd/ejabberd-16.08.ebuild @@ -47,7 +47,8 @@ CDEPEND=" mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.1 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.0 ) + pam? ( >=dev-erlang/epam-1.0.0 + =dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild index 656bc3857ff..5621156189e 100644 --- a/net-im/ejabberd/ejabberd-16.09.ebuild +++ b/net-im/ejabberd/ejabberd-16.09.ebuild @@ -46,7 +46,8 @@ CDEPEND=" mysql? ( >=dev-erlang/p1_mysql-1.0.1 ) nls? ( >=dev-erlang/iconv-1.0.2 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.0 ) + pam? ( >=dev-erlang/epam-1.0.0 + =dev-erlang/p1_pgsql-1.1.0 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? ( diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild b/net-im/ejabberd/ejabberd-17.01.ebuild index 8c252b2799d..a55828a551e 100644 --- a/net-im/ejabberd/ejabberd-17.01.ebuild +++ b/net-im/ejabberd/ejabberd-17.01.ebuild @@ -47,7 +47,8 @@ CDEPEND=" mysql? ( >=dev-erlang/p1_mysql-1.0.2 ) nls? ( >=dev-erlang/iconv-1.0.3 ) odbc? ( dev-db/unixODBC ) - pam? ( >=dev-erlang/epam-1.0.0 ) + pam? ( >=dev-erlang/epam-1.0.0 + =dev-erlang/p1_pgsql-1.1.2 ) redis? ( >=dev-erlang/eredis-1.0.8 ) riak? (
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f62a4daaab97707076a0bd714d6fb2b6ee25e052
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat May 27 20:31:30 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat May 27 20:55:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f62a4daa
net-im/ejabberd: Fix PAM authentication
Rely on dev-erlang/epam setting SUID for epam binary instead of setting
SUID for wrapper bash script which doesn't actually work.
Gentoo-Bug: 612608
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-im/ejabberd/ejabberd-17.01-r1.ebuild | 302 +++
1 file changed, 302 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-17.01-r1.ebuild
b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
new file mode 100644
index 000..6ee9e157db6
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-17.01-r1.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+ riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/meck-0.8.4
+# TODO:>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+ >=dev-erlang/cache_tab-1.0.6
+ >=dev-erlang/esip-1.0.10
+ >=dev-erlang/fast_tls-1.0.10
+ >=dev-erlang/fast_xml-1.1.19
+ >=dev-erlang/fast_yaml-1.0.8
+ >=dev-erlang/jiffy-0.14.8
+ >=dev-erlang/lager-3.2.1
+ >=dev-erlang/luerl-0.2
+ >=dev-erlang/p1_oauth2-0.6.1
+ >=dev-erlang/p1_utils-1.0.6
+ >=dev-erlang/stringprep-1.0.7
+ >=dev-erlang/stun-1.0.9
+ >=dev-erlang/xmpp-1.1.6
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
+ nls? ( >=dev-erlang/iconv-1.0.3 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/epam-1.0.0-r1
+ =dev-erlang/p1_pgsql-1.1.2 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ riak? (
+ >=dev-erlang/hamcrest-0.1.0_p20150103
+ >=dev-erlang/riakc-2.4.1
+ )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+ zlib? ( >=dev-erlang/ezlib-1.0.2 )"
+DEPEND="${CDEPEND}
+ >=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+ -e "s|\"pamservicename\"|\"xmpp\"|" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ejabberd path in ejabberdctl.template'
+ sed -e
's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|'
\
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+ local epam_wrapper_src="$1"
+ local epam_wrapper_dst="${S}/epam-wrapper"
+
+ [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+ sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+ "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+ || die 'failed to install epam-wrapper'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+ local cert
+
+ for cert in $(gawk --
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/, dev-erlang/p1_pam/, dev-erlang/epam/, ...
commit: 9571494a273d4a9f6947a9530d7963077a673e7a
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat May 27 12:06:41 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat May 27 13:03:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9571494a
dev-erlang/p1_pam: Move to dev-erlang/epam
Upstream has eventually decided on the name and it's "epam" rather than
"p1_pam".
dev-erlang/epam/Manifest | 1 +
.../{p1_pam/p1_pam-1.0.0.ebuild => epam/epam-1.0.0.ebuild} | 9 +++--
dev-erlang/{p1_pam => epam}/metadata.xml | 0
dev-erlang/p1_pam/Manifest | 1 -
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 2 +-
net-im/ejabberd/ejabberd-16.04.ebuild| 2 +-
net-im/ejabberd/ejabberd-16.08.ebuild| 2 +-
net-im/ejabberd/ejabberd-16.09.ebuild| 2 +-
net-im/ejabberd/ejabberd-17.01.ebuild| 2 +-
net-im/ejabberd/files/epam-wrapper | 6 +++---
profiles/updates/2Q-2017 | 1 +
11 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
new file mode 100644
index 000..6c75e7daf00
--- /dev/null
+++ b/dev-erlang/epam/Manifest
@@ -0,0 +1 @@
+DIST epam-1.0.0.tar.gz 44008 SHA256
0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512
c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374
WHIRLPOOL
9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0
diff --git a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
b/dev-erlang/epam/epam-1.0.0.ebuild
similarity index 76%
rename from dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
rename to dev-erlang/epam/epam-1.0.0.ebuild
index e2f14d11244..eacf6aecb14 100644
--- a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
+++ b/dev-erlang/epam/epam-1.0.0.ebuild
@@ -3,14 +3,13 @@
EAPI=6
-inherit rebar
+REBAR_APP_SRC=src/p1_pam.app.src
-MY_PN="epam"
-MY_P="${MY_PN}-${PV}"
+inherit rebar
DESCRIPTION="epam for ejabberd to help with PAM authentication support"
HOMEPAGE="https://github.com/processone/epam;
-SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
+SRC_URI="https://github.com/processone/epam/archive/${PV}.tar.gz
-> ${P}.tar.gz"
LICENSE="GPL-2"
@@ -22,5 +21,3 @@ DEPEND=">=dev-lang/erlang-17.1
RDEPEND="${DEPEND}"
DOCS=( README.md )
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-erlang/p1_pam/metadata.xml b/dev-erlang/epam/metadata.xml
similarity index 100%
rename from dev-erlang/p1_pam/metadata.xml
rename to dev-erlang/epam/metadata.xml
diff --git a/dev-erlang/p1_pam/Manifest b/dev-erlang/p1_pam/Manifest
deleted file mode 100644
index 882d529664d..000
--- a/dev-erlang/p1_pam/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST p1_pam-1.0.0.tar.gz 44008 SHA256
0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512
c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374
WHIRLPOOL
9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 0c2d9fcb628..a7ed3a18ef7 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
nls? ( >=dev-erlang/iconv-1.0.0 )
odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/p1_pam-1.0.0 )
+ pam? ( >=dev-erlang/epam-1.0.0 )
postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
redis? ( >=dev-erlang/eredis-1.0.8 )
riak? (
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index f80f234023a..55352509f72 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
nls? ( >=dev-erlang/iconv-1.0.0 )
odbc? ( dev-db/unixODBC )
- pam? ( >=dev-erlang/p1_pam-1.0.0 )
+ pam? ( >=dev-erlang/epam-1.0.0 )
postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
redis? ( >=dev-erlang/eredis-1.0.8 )
riak? (
diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild
b/net-im/ejabberd/ejabberd-16.08.ebuild
index 6c3e31acaf7..bb40fdee440 100644
--- a/net-im/ejabberd/ejabberd-16.08.ebuild
+++ b/net-im/ejabberd/ejabberd-16.08.ebuild
@@ -47,7 +47,7 @@ CDEPEND="
mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
nls? ( >=dev-erlang/iconv-1.0.1 )
odbc? ( dev-db/unixODBC )
-
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: a08089c249b10b88d8075a6a17a4996ea0d415f5
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Wed May 17 20:32:58 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Wed May 17 20:33:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a08089c2
net-im/ejabberd: Fix include paths to xmpp and fast_xml
Gentoo-Bug: 614478
Package-Manager: Portage-2.3.5, Repoman-2.3.2
net-im/ejabberd/ejabberd-17.01.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild
b/net-im/ejabberd/ejabberd-17.01.ebuild
index c54283e897d..1f355ef0e52 100644
--- a/net-im/ejabberd/ejabberd-17.01.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01.ebuild
@@ -186,6 +186,9 @@ src_prepare() {
adjust_config
customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+ rebar_fix_include_path fast_xml
+ rebar_fix_include_path xmpp
+
# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
# rather than its parent which is default. That way ejabberd directory
# takes precedence is module lookup.
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: ca691addf2f40e81c68ca70e0b3e2d9226e6c188 Author: Amadeusz Żołnowski gentoo org> AuthorDate: Wed Apr 19 20:09:18 2017 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Wed Apr 19 20:10:16 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca691add net-im/ejabberd: Add missing dependency Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-im/ejabberd/ejabberd-17.01.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild b/net-im/ejabberd/ejabberd-17.01.ebuild index ad8edb6a765..c54283e897d 100644 --- a/net-im/ejabberd/ejabberd-17.01.ebuild +++ b/net-im/ejabberd/ejabberd-17.01.ebuild @@ -40,6 +40,7 @@ CDEPEND=" >=dev-erlang/p1_utils-1.0.6 >=dev-erlang/stringprep-1.0.7 >=dev-erlang/stun-1.0.9 + >=dev-erlang/xmpp-1.1.6 >=dev-lang/erlang-17.1[hipe?,odbc?,ssl] >=net-im/jabber-base-0.01 ldap? ( =net-nds/openldap-2* )
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 8b9eb0be950dd449b150f46807fdfbc57e167234
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Mon Jan 2 09:31:10 2017 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Mon Jan 2 09:35:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b9eb0be
net-im/ejabberd: Drop stable keyword because of bug 603784
It is fixed in 16.09 which is already stabilized for amd64.
Gentoo-Bug: 603784
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-im/ejabberd/ejabberd-16.08.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild
b/net-im/ejabberd/ejabberd-16.08.ebuild
index 0dc447d..c200fac 100644
--- a/net-im/ejabberd/ejabberd-16.08.ebuild
+++ b/net-im/ejabberd/ejabberd-16.08.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@
SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: e9b4daa5007e66345951490dfec4b3f46d1b7428
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Jan 1 21:49:03 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Jan 1 21:49:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b4daa5
net-im/ejabberd: amd64 stable wrt bug #603802
Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
net-im/ejabberd/ejabberd-16.09.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild
b/net-im/ejabberd/ejabberd-16.09.ebuild
index cb5c9fe..5279eda 100644
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@
SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 9f72ccb88e019ce5d01865113c040720c52eb3ba
Author: Aaron Bauman gentoo org>
AuthorDate: Fri Dec 23 07:47:19 2016 +
Commit: Aaron Bauman gentoo org>
CommitDate: Fri Dec 23 07:47:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f72ccb8
net-im/ejabberd: amd64 stable
Gentoo-bug: 599536
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.08.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild
b/net-im/ejabberd/ejabberd-16.08.ebuild
index 125bd01..0dc447d 100644
--- a/net-im/ejabberd/ejabberd-16.08.ebuild
+++ b/net-im/ejabberd/ejabberd-16.08.ebuild
@@ -15,7 +15,7 @@
SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: 0c9fa61cdf21f280c4be90c3be1b0a510731ecf0
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Thu Nov 10 22:41:24 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Nov 13 10:08:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c9fa61c
net-im/ejabberd: Bump version to 16.09
Package-Manager: portage-2.3.2
net-im/ejabberd/Manifest | 1 +
net-im/ejabberd/ejabberd-16.09.ebuild | 297 +
.../files/ejabberd-16.09-ejabberdctl.patch | 62 +
3 files changed, 360 insertions(+)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 8bcc74c..786180d 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,2 +1,3 @@
DIST ejabberd-16.04.tar.gz 1715963 SHA256
3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512
5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2
WHIRLPOOL
d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
DIST ejabberd-16.08.tar.gz 1739542 SHA256
b45598a6f2f1b398a19f23e3280b45eccc833d3339b1aeb6ec08ded7c19b1137 SHA512
661bf33e6d7f4c53d0c3679d1a9428fba11c22bad7d8bd535b49d7eeeff4de215a7a94f8300683e1dbaf2e68ea908f6e54cfe0ed2f1dc82326a46659e7c70f55
WHIRLPOOL
41f5ae825997818671d6db94ac62108a0b02f8eb6eed07ebaa04287ee2d7955dc4d15c3ce18cbf20240e4b2a14d48ccb8bf383b510851be12326131c4c829788
+DIST ejabberd-16.09.tar.gz 1687485 SHA256
7b44ab3af3310ca73624c47b65cf30a651d5a1398413e8af51c610d788fb8f14 SHA512
506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f
WHIRLPOOL
6c56ad58b4e247cedf29cf247fdadddf727270311a0ba21eef88f84ee6b997ad8be75448e3bfdaa67d978ea167e2feb21bc9ce0839741a62fb60fa045e45edf2
diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild
b/net-im/ejabberd/ejabberd-16.09.ebuild
new file mode 100644
index ..cb5c9fe
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+ riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/meck-0.8.4
+# TODO:>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+ >=dev-erlang/cache_tab-1.0.4
+ >=dev-erlang/esip-1.0.8
+ >=dev-erlang/fast_tls-1.0.7
+ >=dev-erlang/fast_xml-1.1.15
+ >=dev-erlang/fast_yaml-1.0.6
+ >=dev-erlang/jiffy-0.14.7
+ >=dev-erlang/lager-3.2.1
+ >=dev-erlang/luerl-0.2
+ >=dev-erlang/p1_oauth2-0.6.1
+ >=dev-erlang/p1_utils-1.0.5
+ >=dev-erlang/stringprep-1.0.6
+ >=dev-erlang/stun-1.0.7
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ >=net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
+ nls? ( >=dev-erlang/iconv-1.0.2 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/p1_pam-1.0.0 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ riak? (
+ >=dev-erlang/hamcrest-0.1.0_p20150103
+ >=dev-erlang/riakc-2.1.1_p2015
+ )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+ zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+DEPEND="${CDEPEND}
+ >=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+ -e "s|\"pamservicename\"|\"xmpp\"|" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: a42011129282e2508ea7604255ff74f4025c559c
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 13:04:38 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 13:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4201112
net-im/ejabberd: Bump revision
Fixes are coming.
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 280 +++
1 file changed, 280 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
new file mode 100644
index ..3f1c777
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+SSL_CERT_MANDATORY=1
+
+inherit eutils pam rebar ssl-cert systemd
+
+DESCRIPTION="Robust, scalable and extensible XMPP server"
+HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
+ -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+REQUIRED_USE="mssql? ( odbc )"
+# TODO: Add 'tools' flag.
+IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
+ riak roster-gw sqlite zlib"
+
+RESTRICT="test"
+
+# TODO: Add dependencies for 'tools' flag enabled.
+# TODO: tools? (
+# TODO:>=dev-erlang/meck-0.8.4
+# TODO:>=dev-erlang/moka-1.0.5b
+# TODO: )
+CDEPEND="
+ >=dev-erlang/cache_tab-1.0.2
+ >=dev-erlang/esip-1.0.4
+ >=dev-erlang/fast_tls-1.0.3
+ >=dev-erlang/fast_xml-1.1.3
+ >=dev-erlang/fast_yaml-1.0.3
+ >=dev-erlang/jiffy-0.14.7
+ >=dev-erlang/lager-3.0.2
+ >=dev-erlang/luerl-0.2
+ >=dev-erlang/p1_oauth2-0.6.1
+ >=dev-erlang/p1_utils-1.0.4
+ >=dev-erlang/p1_xmlrpc-1.15.1
+ >=dev-erlang/stringprep-1.0.3
+ >=dev-erlang/stun-1.0.3
+ >=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ =net-im/jabber-base-0.01
+ ldap? ( =net-nds/openldap-2* )
+ mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
+ nls? ( >=dev-erlang/iconv-1.0.0 )
+ odbc? ( dev-db/unixODBC )
+ pam? ( >=dev-erlang/p1_pam-1.0.0 )
+ postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
+ redis? ( >=dev-erlang/eredis-1.0.8 )
+ riak? (
+ >=dev-erlang/hamcrest-0.1.0_p20150103
+ >=dev-erlang/riakc-2.1.1_p2015
+ )
+ sqlite? ( >=dev-erlang/sqlite3-1.1.5 )
+ zlib? ( >=dev-erlang/ezlib-1.0.1 )"
+DEPEND="${CDEPEND}
+ >=sys-apps/gawk-4.1"
+RDEPEND="${CDEPEND}
+ captcha? ( media-gfx/imagemagick[truetype,png] )"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
+
+EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
+# Paths in net-im/jabber-base
+JABBER_ETC="${EPREFIX}/etc/jabber"
+JABBER_LOG="${EPREFIX}/var/log/jabber"
+JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
+
+# Adjust example configuration file to Gentoo.
+# - Use our sample certificates.
+# - Correct PAM service name.
+adjust_config() {
+ sed -e "s|\"/path/to/ssl.pem\"|\"${EJABBERD_CERT}\"|g" \
+ -e "s|\"pamservicename\"|\"xmpp\"|" \
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to adjust example config'
+}
+
+# Set paths to ejabberd lib directory consistently to point always to directory
+# suffixed with version.
+correct_ejabberd_paths() {
+ sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
+ -i "${S}/Makefile.in" \
+ || die 'failed to set ejabberd path in Makefile.in'
+ sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ejabberd path in ejabberdctl.template'
+ sed -e
's|\(captcha_cmd:[[:space:]]*"\).\+"|\1'$(get_ejabberd_path)'/priv/bin/captcha.sh"|'
\
+ -i "${S}/ejabberd.yml.example" \
+ || die 'failed to correct path to captcha.sh in example config'
+}
+
+# Get epam-wrapper from 'files' directory and correct path to lib directory in
+# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
+# file exists there already.
+customize_epam_wrapper() {
+ local epam_wrapper_src="$1"
+ local epam_wrapper_dst="${S}/epam-wrapper"
+
+ [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
+ sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
+ "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
+ || die 'failed to install epam-wrapper'
+}
+
+# Check if there already exists a certificate.
+ejabberd_cert_exists() {
+ local cert
+
+ for cert in $(gawk -- \
+ 'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m)
{print m[1];}' \
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
+
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 2e186ba09e162af23996042975aeb16fe14793b1
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 13:07:04 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 13:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e186ba0
net-im/ejabberd: Move ejabberd out of /usr/lib/erlang/lib
ejabberd may override some modules if it's in default Erlang search
path. Move it back to default location set by configure script which is
/usr/lib.
Gentoo-Bug: 591862
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 3f1c777..104edf0 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -132,8 +132,12 @@ ejabberd_cert_install() {
}
# Get path to ejabberd lib directory.
+#
+# This is the path ./configure script Base for this path is path set in
+# ./configure script which is /usr/lib by default. If libdir is explicitely set
+# to something else than this should be adjusted here as well.
get_ejabberd_path() {
- echo "$(get_erl_libs)/${P}"
+ echo "/usr/$(get_libdir)/${P}"
}
# Make ejabberd.service for systemd from upstream provided template.
@@ -188,7 +192,6 @@ src_prepare() {
src_configure() {
econf \
--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --libdir="${EPREFIX}$(get_erl_libs)" \
--enable-user=jabber \
$(use_enable debug) \
$(use_enable full-xml) \
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: b0275c3408ac007193ea244ef1c6e367443ed5ce
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 12:42:24 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 13:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0275c34
net-im/ejabberd: Reapply read bit on epam wrapper
sfperms drops read bit from files with suid. Reapply it.
Gentoo-Bug: 592218
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 8
1 file changed, 8 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 33a6258..ab12391 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -288,4 +288,12 @@ pkg_postinst() {
if ! ejabberd_cert_exists; then
ejabberd_cert_install
fi
+
+ if use pam; then
+ # sfperms drops read bit from files with suid. Reapply it.
+ # Fix bug #592218.
+ local epam_path="$(get_ejabberd_path)/priv/bin/epam"
+ chmod g+r "${EROOT%/}${epam_path}" \
+ || die "failed to correct ${epam_path} permissions"
+ fi
}
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: cce0a3aae046274707024d007aaa5180f45c90c6
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 09:57:48 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 13:12:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce0a3aa
net-im/ejabberd: Use internal eldap module instead of system one
First lookup ejabberd directory for modules.
Gentoo-Bug: 591862
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04-r1.ebuild | 8
1 file changed, 8 insertions(+)
diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 104edf0..33a6258 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -187,6 +187,14 @@ src_prepare() {
skip_docs
adjust_config
customize_epam_wrapper "${FILESDIR}/epam-wrapper"
+
+ # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
+ # rather than its parent which is default. That way ejabberd directory
+ # takes precedence is module lookup.
+ local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
+ sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
+ -i "${S}/ejabberdctl.template" \
+ || die 'failed to set ERL_LIBS in ejabberdctl.template'
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 4171aea709df12cdd338d1ccac805b8a885f03f2
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 12:39:45 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 12:59:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4171aea7
net-im/ejabberd: Remove leading double /
net-im/ejabberd/ejabberd-16.04.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index eb64457..7fd509d 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -114,7 +114,7 @@ ejabberd_cert_exists() {
for cert in $(gawk -- \
'match($0, /^[[:space:]]*certfile: "([^"]+)"/, m)
{print m[1];}' \
- "${EROOT}${JABBER_ETC}/ejabberd.yml"); do
+ "${EROOT%/}${JABBER_ETC}/ejabberd.yml"); do
[[ -f ${cert} ]] && return 0
done
@@ -126,8 +126,8 @@ ejabberd_cert_exists() {
ejabberd_cert_install() {
SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
install_cert "${EJABBERD_CERT%.*}"
- chown root:jabber "${EROOT}${EJABBERD_CERT}" || die
- chmod 0440 "${EROOT}${EJABBERD_CERT}" || die
+ chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
+ chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
}
# Get path to ejabberd lib directory.
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: f8903a96fbfc3562162c319d643d3ab8723f0abe
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 10:28:41 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 12:59:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8903a96
net-im/ejabberd: Clean up files directory
service file is no longer used because it's provided by upstream. Suffix
"-3" in init and confd file names is no longer neccessary because
there's only one version of the initd script.
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04.ebuild | 4 ++--
.../ejabberd/files/{ejabberd-3.confd => ejabberd.confd} | 0
.../ejabberd/files/{ejabberd-3.initd => ejabberd.initd} | 2 +-
net-im/ejabberd/files/ejabberd.service | 17 -
4 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 7fd509d..211f21d 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -224,8 +224,8 @@ src_install() {
fperms 4750 "${epam_path}"
fi
- newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
- newinitd "${FILESDIR}/${PN}-3.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
systemd_dounit "${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
diff --git a/net-im/ejabberd/files/ejabberd-3.confd
b/net-im/ejabberd/files/ejabberd.confd
similarity index 100%
rename from net-im/ejabberd/files/ejabberd-3.confd
rename to net-im/ejabberd/files/ejabberd.confd
diff --git a/net-im/ejabberd/files/ejabberd-3.initd
b/net-im/ejabberd/files/ejabberd.initd
similarity index 96%
rename from net-im/ejabberd/files/ejabberd-3.initd
rename to net-im/ejabberd/files/ejabberd.initd
index 2827aeb..aed39b8 100644
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd.initd
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-im/ejabberd/files/ejabberd.service
b/net-im/ejabberd/files/ejabberd.service
deleted file mode 100644
index 0b79256..
--- a/net-im/ejabberd/files/ejabberd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=A distributed, fault-tolerant Jabber/XMPP server
-After=network.target
-
-[Service]
-Type=oneshot
-User=jabber
-LimitNOFILE=16000
-RestartSec=5
-ExecStart=/usr/sbin/ejabberdctl \
- --config /etc/jabber/ejabberd.cfg --ctl-config
/etc/jabber/ejabberdctl.cfg \
- --logs "/var/log/jabber" --spool "/var/spool/jabber" start
-ExecStop=/usr/sbin/ejabberdctl stop
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: a1e2f4fe6ffbfcca4134c5223e25aa67b109f323
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 12:48:56 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 12:59:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e2f4fe
net-im/ejabberd: Don't install symlink README.md -> README
net-im/ejabberd/ejabberd-16.04.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 211f21d..5aa78de 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -63,6 +63,7 @@ DEPEND="${CDEPEND}
RDEPEND="${CDEPEND}
captcha? ( media-gfx/imagemagick[truetype,png] )"
+DOCS=( README )
PATCHES=( "${FILESDIR}/${P}-ejabberdctl.patch" )
EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 76d4c26fc39a660d8d72cc6ce05b79d15dbc27e0
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Aug 27 07:03:11 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sat Aug 27 07:04:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76d4c26f
net-im/ejabberd: Actually set suid bit on epam wrapper
Because setting suid bit was followed by changing owner suid is reset.
Change the order of commands.
It is a small change so I assume it can be made in stable ebuild.
Rev-bump will come after more bug fixes.
Gentoo-Bug: 592218
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 65bebc0..eb64457 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -220,8 +220,8 @@ src_install() {
newbin epam-wrapper epam
# PAM helper module permissions
# https://www.process-one.net/docs/ejabberd/guide_en.html#pam
- fperms 4750 "${epam_path}"
fowners root:jabber "${epam_path}"
+ fperms 4750 "${epam_path}"
fi
newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: ea72aea8d3e567e29f4a643a819c6350e21cbeeb
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun Aug 21 10:36:50 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Aug 21 10:45:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea72aea8
net-im/ejabberd: Remove old, vulnerable ejabberd version
Gentoo-Bug: 539040
Gentoo-Bug: 525478
Package-Manager: portage-2.3.0
net-im/ejabberd/Manifest | 2 -
net-im/ejabberd/ejabberd-2.1.13-r2.ebuild | 222 --
net-im/ejabberd/metadata.xml | 2 -
3 files changed, 226 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 9524ed7..b2fcc5e 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -2,8 +2,6 @@ DIST cache_tab-1.0.1.zip 16719 SHA256
149eff4dfb01f633cab643f368e5f96825c26c85ae
DIST eiconv-0.9.0.zip 101407 SHA256
fdaa09bcc79b556f2250c4693bc57c89ce474a5ea6ea12429cbb6c2d4ed3619b SHA512
44d0af378b9873dede92657c53557a565050cd4259598a1fe92e1c9bddc8219922ff093bfc20e380f3e39fc0d5648d6d6f72766a5847781cf2101dbd4b922fb6
WHIRLPOOL
97d97f527aaf4d0fb0176723bde464ab003b49b12acca1f657efe83f8c03186e6b4819f4aadedebb8e703e16cc4af23d317b6ebebe96a9a794e6aa78c8e6fc80
DIST ejabberd-16.01.tgz 1651587 SHA256
e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512
f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a
WHIRLPOOL
65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a
DIST ejabberd-16.04.tar.gz 1715963 SHA256
3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512
5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2
WHIRLPOOL
d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
-DIST ejabberd-2.1.13.tgz 1999853 SHA256
a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512
9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b
WHIRLPOOL
2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
-DIST ejabberd-mod_statsdx-1118.patch.gz 13989 SHA256
5e5d975e44248cf2b0d6dd0ecf4c477e8479b2b4d0bd531e80f4623fd787320e SHA512
99399323150990cda15e707385f0f26fa790d4ba188a97ac46db9c25e72a7ec72a875573136f17a18648017074d76e4e267b544dc4c95a5101ed9ad6815d
WHIRLPOOL
05997f03bb70136ee5e829ea9c55e3aeb0704150f1ed54f11c6cce382a82106129fc1a6ef35a62780837cd2b59fbb384fa10f3bb49813acaee8c5edc22ae3702
DIST elixir-f2a9c7016633ca63541a8160c63a53eb7edbccdb.zip 1335681 SHA256
4ef8cd93e68a314bb4702547629f9be7a6bb840f6b7956aead6f51700e73c41a SHA512
a6e5170f8d3efc1d31aa82477f4ff377ea7205d106bbf633075df5bef0b22a276cc6897c2a8b7fcbbff269c9fe8378f4802876e0e2aecb90012c0c2165c2b8e8
WHIRLPOOL
716e45804df24b7a4a55e0ad81f72c9961e4066dd3e24b1e3cd1ba041c6c1dc8426d0feaf97580eaf9b369d0fee33cb9e3c26b71eaf6c91d318590e9e6b5ab0c
DIST epam-1.0.0.zip 47889 SHA256
6704010b14034881d8c60f52d1a82d8125f20cdf1e52a7113c838f1db6be7e81 SHA512
710919ff2883a5e1a99703f3b72ad8a0d61c612b2af66b57b88a6bd9faddc64c61b8b44998feb37d3d3338d24d4c1d8d6a73d6836e254b8f8452249b41427c78
WHIRLPOOL
48a9fedc2fa52a7d5dc1cdcf11a48096798cd87d37987b709ffd0c6cf49881f9afec7fd85b3f8d84020e41920e129534d5f8d6adce92916370ab3a413d4919c9
DIST eredis-cbc013f516e464706493c01662e5e9dd82d1db01.zip 133223 SHA256
707c54c568b6d07a4a1ac82a528cabef73469136cc14b4f69457e28de9827227 SHA512
fbaa323da0d668fc7147bc406dd4f00bd132d592d4fd3d61c2bee59f4b1c9390784a4c03737d6efd3b004855a92911878bfb11a966dc1853a785c9b10714f34f
WHIRLPOOL
d6713eef9328f70d6f003c4a27b560715d7a4c433d522dde3a99731e7b868353082b2ba62060fcefc6241977713627b57353ba47919553fe6eb47a554d3b7264
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
deleted file mode 100644
index fd065b3..000
--- a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib pam ssl-cert systemd
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
- mod_statsdx? (
https://dev.gentoo.org/~radhermit/dist/${PN}-mod_statsdx-1118.patch.gz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
-IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
-
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/, net-im/ejabberd/
commit: c8542b3bce05ec947f3c3b0a1718624acb54791e Author: Amadeusz Żołnowski gentoo org> AuthorDate: Sun Aug 21 10:49:14 2016 + Commit: Amadeusz Piotr Żołnowski gentoo org> CommitDate: Sun Aug 21 10:49:14 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8542b3b net-im/ejabberd: Remove older, bundled version of ejabberd Clean up unused flags in metadata.xml. Package-Manager: portage-2.3.0 net-im/ejabberd/Manifest | 29 -- net-im/ejabberd/ejabberd-16.01-r1.ebuild | 348 - .../files/ejabberd-16.01-ejabberdctl.patch | 49 --- net-im/ejabberd/metadata.xml | 10 +- 4 files changed, 1 insertion(+), 435 deletions(-) diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest index b2fcc5e..bba25e2 100644 --- a/net-im/ejabberd/Manifest +++ b/net-im/ejabberd/Manifest @@ -1,30 +1 @@ -DIST cache_tab-1.0.1.zip 16719 SHA256 149eff4dfb01f633cab643f368e5f96825c26c85ae9e6c22de3f5792e5d3dc28 SHA512 ada72a578359909201d62ad775ca85969aed5cab9be31d38bd505f726434d08bb311f06654f3f26a3b639b9ae2742dd1950ba527489aef84f2ac0dfdb7fba0c8 WHIRLPOOL d026a7452274cb8cfd536da4c5dbabaf0414ddaa5fe835aa80d825d1afae9f952a71e61eaa825d89ee65f6a1d4db9714c3710e7ed36c8fac1be73730e732f362 -DIST eiconv-0.9.0.zip 101407 SHA256 fdaa09bcc79b556f2250c4693bc57c89ce474a5ea6ea12429cbb6c2d4ed3619b SHA512 44d0af378b9873dede92657c53557a565050cd4259598a1fe92e1c9bddc8219922ff093bfc20e380f3e39fc0d5648d6d6f72766a5847781cf2101dbd4b922fb6 WHIRLPOOL 97d97f527aaf4d0fb0176723bde464ab003b49b12acca1f657efe83f8c03186e6b4819f4aadedebb8e703e16cc4af23d317b6ebebe96a9a794e6aa78c8e6fc80 -DIST ejabberd-16.01.tgz 1651587 SHA256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512 f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a WHIRLPOOL 65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a DIST ejabberd-16.04.tar.gz 1715963 SHA256 3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2 WHIRLPOOL d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4 -DIST elixir-f2a9c7016633ca63541a8160c63a53eb7edbccdb.zip 1335681 SHA256 4ef8cd93e68a314bb4702547629f9be7a6bb840f6b7956aead6f51700e73c41a SHA512 a6e5170f8d3efc1d31aa82477f4ff377ea7205d106bbf633075df5bef0b22a276cc6897c2a8b7fcbbff269c9fe8378f4802876e0e2aecb90012c0c2165c2b8e8 WHIRLPOOL 716e45804df24b7a4a55e0ad81f72c9961e4066dd3e24b1e3cd1ba041c6c1dc8426d0feaf97580eaf9b369d0fee33cb9e3c26b71eaf6c91d318590e9e6b5ab0c -DIST epam-1.0.0.zip 47889 SHA256 6704010b14034881d8c60f52d1a82d8125f20cdf1e52a7113c838f1db6be7e81 SHA512 710919ff2883a5e1a99703f3b72ad8a0d61c612b2af66b57b88a6bd9faddc64c61b8b44998feb37d3d3338d24d4c1d8d6a73d6836e254b8f8452249b41427c78 WHIRLPOOL 48a9fedc2fa52a7d5dc1cdcf11a48096798cd87d37987b709ffd0c6cf49881f9afec7fd85b3f8d84020e41920e129534d5f8d6adce92916370ab3a413d4919c9 -DIST eredis-cbc013f516e464706493c01662e5e9dd82d1db01.zip 133223 SHA256 707c54c568b6d07a4a1ac82a528cabef73469136cc14b4f69457e28de9827227 SHA512 fbaa323da0d668fc7147bc406dd4f00bd132d592d4fd3d61c2bee59f4b1c9390784a4c03737d6efd3b004855a92911878bfb11a966dc1853a785c9b10714f34f WHIRLPOOL d6713eef9328f70d6f003c4a27b560715d7a4c433d522dde3a99731e7b868353082b2ba62060fcefc6241977713627b57353ba47919553fe6eb47a554d3b7264 -DIST erlang-sqlite3-cbc3505f7a131254265d3ef56191b2581b8cc172.zip 1843206 SHA256 10db9c7f1a8b8fe16e5e5695a3085584c63dc6d074e56d5e8595e2cc82d0679d SHA512 37f0530e83d69efa02ad1bbc98a4da760d93a8fe764086832bc838a0905843e635d342917c6c6784d1cb3f87f8af8a27189d87a25096bfccf36a561bd66e9696 WHIRLPOOL f25270e56bfd0a168c4a20ce0eb016ec3ee8313d5a78de221134e34ccc7cfa6c4a59d78374c9ae08daf1cdc8f76f26028a796b4b8065664b1a47df7450d0883e -DIST erlang_protobuffs-6e7fc924506e2dc166a6170e580ce1d95ebbd5bd.zip 255081 SHA256 a8d329ca06631951e8dd723ee07a28d84056efdfcf107ffc4390773de2c2652d SHA512 58d01ef598ca4b1894353a57cc561889b4b80f032df3bee1a0661edcb1f02775177a3655e85526ac855af128700a528987ad64854e3a4e6bf885778d0c76cc85 WHIRLPOOL 5f221d1bfe61f23290bbd5067a1c60a15e302cfb484df592bd92a27788803e7b66ca560a0ef575c592ab33a684f8fa0a5eeed31d6a2281fa388fd6d1eebc3871 -DIST goldrush-212299233c7e7eb63a97be2777e1c05ebaa58dbe.zip 36124 SHA256 529fd62c47a995e6efa4e96a015402177bc54d6f6c68e035799025679223f359 SHA512 afa8e687e3f06b2cbbdac2cc2933e4a136698661da350e16b1ecac34bbccdae9175d5a4e1ce2a4e237d0d8e846fcfb00d3a7143a5ac0c230a73dfef6c660 WHIRLPOOL 5cff5953b8c4096d8ec402f3be6ee94e839e50d3c087468d48c63ce914a50f35c80f93f2920564cdd74faeaa5047eb8a7176045c834347ffcc2566333540f4b8 -DIST
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 29c5527bd97630d0336ae1f32f82a079066b641c
Author: Anthony G. Basile gentoo org>
AuthorDate: Sat Aug 20 22:22:20 2016 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Sat Aug 20 22:22:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29c5527b
net-im/ejabberd: stabilize 16.04 on ppc, bug #576398
Package-Manager: portage-2.2.28
net-im/ejabberd/ejabberd-16.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 92181b6..65bebc0 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -15,7 +15,7 @@
SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f406b0894650085381cceb79e29923522b298a44
Author: Matthias Maier gentoo org>
AuthorDate: Sat Aug 20 03:17:23 2016 +
Commit: Matthias Maier gentoo org>
CommitDate: Sat Aug 20 03:18:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f406b089
net-im/ejabberd: stabilize 16.04 on amd64/x86, bug #576398
Package-Manager: portage-2.2.28
net-im/ejabberd/ejabberd-16.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index fa48fa8..92181b6 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -15,7 +15,7 @@
SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 62d8c0928a40ff655e20785fdc75aea2b7d8f059
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Fri Aug 19 20:21:24 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Fri Aug 19 20:22:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62d8c092
net-im/ejabberd: Restrict Erlang version for ejabberd-2.1
ejabberd-2.1 doesn't work with newer Erlang versions.
Gentoo-Bug: 539040
Gentoo-Bug: 590116
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-2.1.13-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
index 8c3ec87..fd065b3 100644
--- a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="captcha debug ldap odbc pam +web zlib
${EJABBERD_MODULES}"
DEPEND=">=net-im/jabber-base-0.01
>=dev-libs/expat-1.95
>=dev-lang/erlang-12.2.5[ssl]
- =dev-libs/openssl-0.9.8e:=
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: c76f9b9f9eca17f8bc4ea6edd6bcd9a626589ae1
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Wed Jul 13 20:34:06 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Wed Jul 13 20:34:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c76f9b9f
net-im/ejabberd: Add warning about pubsub data migration
Gentoo-Bug: 588244
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04.ebuild | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 07014ea..fa48fa8 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -235,10 +235,26 @@ src_install() {
pkg_postinst() {
if [[ ! ${REPLACING_VERSIONS} ]]; then
+ echo
elog "For configuration instructions, please see"
- elog " /usr/share/doc/${PF}/html/guide.html"
- elog "or the online version at"
elog " http://www.process-one.net/en/ejabberd/docs/;
+ echo
+ if [[ " ${REPLACING_VERSIONS} " =~ \ 2\. ]]; then
+ ewarn "If you have used pubsub in ejabberd-2.* you may
encounter issues after"
+ ewarn "migration to ${PV}. pubsub data may not be
migrated automatically and"
+ ewarn "you may need to run migration script manually,
see:"
+ ewarn
+ ewarn "
https://github.com/processone/ejabberd/issues/479#issuecomment-124497456;
+ ewarn
+ ewarn "In case you don't care about all stored moods,
activities, geoinfo and you"
+ ewarn "know you don't store in pubsub anything
important, you can just remove"
+ ewarn "pubsub tables:"
+ ewarn
+ ewarn " rm ${EROOT%/}${JABBER_SPOOL}/pubsub_*"
+ ewarn
+ ewarn "See also:
https://bugs.gentoo.org/show_bug.cgi?id=588244;
+ echo
+ fi
elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
elog "Ejabberd now defaults to using a YAML format for its
config file."
elog "The old ejabberd.cfg file can be converted using the
following instructions:"
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: abf61dec48f542e363779f0996d9c774ad44a40b
Author: Craig Andrews integralblue com>
AuthorDate: Fri Jul 8 14:14:45 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Fri Jul 8 14:14:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf61dec
net-im/ejabberd: require =dev-erlang/stringprep-1.0.3
>=dev-erlang/stun-1.0.3
>=dev-lang/erlang-17.1[hipe?,odbc?,ssl]
+ =net-im/jabber-base-0.01
ldap? ( =net-nds/openldap-2* )
mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
diff --git a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
index fd065b3..8c3ec87 100644
--- a/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.13-r2.ebuild
@@ -20,7 +20,7 @@ IUSE="captcha debug ldap odbc pam +web zlib
${EJABBERD_MODULES}"
DEPEND=">=net-im/jabber-base-0.01
>=dev-libs/expat-1.95
>=dev-lang/erlang-12.2.5[ssl]
- =dev-libs/openssl-0.9.8e:=
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: 6060c98ece21117982fac1fc258a140e79404966
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sun Jul 3 15:45:07 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Jul 3 17:39:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6060c98e
net-im/ejabberd: Add ~ia64 ~sparc keyword back
ejabberd has been debundled and has got a new dependency
(dev-util/rebar) which hasn't got these keywords at the time.
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 441023e..bf0b04b 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -15,7 +15,7 @@
SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
REQUIRED_USE="mssql? ( odbc )"
# TODO: Add 'tools' flag.
IUSE="captcha debug full-xml hipe ldap mssql mysql nls odbc pam postgres redis
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/files/
commit: 67b5839e3fbaab19eb22a793fb20e6ce84e418f2
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Jul 2 22:13:43 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Jul 3 07:44:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67b5839e
net-im/ejabberd: Add reload option to initd script
net-im/ejabberd/files/ejabberd-3.initd | 8
1 file changed, 8 insertions(+)
diff --git a/net-im/ejabberd/files/ejabberd-3.initd
b/net-im/ejabberd/files/ejabberd-3.initd
index a40d938..2827aeb 100644
--- a/net-im/ejabberd/files/ejabberd-3.initd
+++ b/net-im/ejabberd/files/ejabberd-3.initd
@@ -3,6 +3,8 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+extra_started_commands="reload"
+
depend() {
use dns
need epmd net
@@ -19,6 +21,12 @@ start() {
eend $?
}
+reload() {
+ ebegin "Reloading ejabberd configuration"
+ /usr/sbin/ejabberdctl ${EJABBERDCTL_OPTS} reload_config
+ eend $?
+}
+
stop() {
ejabberdctl status >/dev/null 2>&1
if test $? = 3; then
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: f888bec998225e36910b02954e40593aff2bd15e
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Sat Jul 2 22:15:49 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Sun Jul 3 07:44:06 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f888bec9
net-im/ejabberd: Make ejabberd.service from upstream template
Gentoo-Bug: 587454
Package-Manager: portage-2.3.0
net-im/ejabberd/ejabberd-16.04.ebuild | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index b7f818f..441023e 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -134,6 +134,15 @@ get_ejabberd_path() {
echo "$(get_erl_libs)/${P}"
}
+# Make ejabberd.service for systemd from upstream provided template.
+make_ejabberd_service() {
+ sed -r \
+ -e 's!@ctlscriptpath@!/usr/sbin!' \
+ -e 's!(User|Group)=(.*)!\1=jabber!' \
+ "${PN}.service.template" >"${PN}.service" \
+ || die 'failed to make ejabberd.service'
+}
+
# Set paths to defined by net-im/jabber-base.
set_jabberbase_paths() {
sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}"
\
@@ -168,6 +177,7 @@ src_prepare() {
rebar_remove_deps
correct_ejabberd_paths
set_jabberbase_paths
+ make_ejabberd_service
skip_docs
adjust_config
customize_epam_wrapper "${FILESDIR}/epam-wrapper"
@@ -215,7 +225,7 @@ src_install() {
newconfd "${FILESDIR}/${PN}-3.confd" "${PN}"
newinitd "${FILESDIR}/${PN}-3.initd" "${PN}"
- systemd_dounit "${FILESDIR}/${PN}.service"
+ systemd_dounit "${PN}.service"
systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
insinto /etc/logrotate.d
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
commit: fa0026cee40ef1c4f31a181a2715849f50e90a89
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Tue Jun 14 19:17:14 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Tue Jun 14 19:21:19 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0026ce
net-im/ejabberd: Remove double leading slash
Package-Manager: portage-2.3.0_rc1
net-im/ejabberd/ejabberd-16.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild
b/net-im/ejabberd/ejabberd-16.04.ebuild
index 56e0c9f..b7f818f 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -228,7 +228,7 @@ pkg_postinst() {
elog " /usr/share/doc/${PF}/html/guide.html"
elog "or the online version at"
elog " http://www.process-one.net/en/ejabberd/docs/;
- elif [[ -f ${EROOT}/etc/jabber/ejabberd.cfg ]]; then
+ elif [[ -f ${EROOT}etc/jabber/ejabberd.cfg ]]; then
elog "Ejabberd now defaults to using a YAML format for its
config file."
elog "The old ejabberd.cfg file can be converted using the
following instructions:"
echo
[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/
commit: b40598486bae8096d554d64aaf1e260625bf6833
Author: Amadeusz Żołnowski gentoo org>
AuthorDate: Mon Jun 13 21:42:43 2016 +
Commit: Amadeusz Piotr Żołnowski gentoo org>
CommitDate: Mon Jun 13 21:55:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4059848
net-im/ejabberd: Remove the oldest testing version
Package-Manager: portage-2.3.0_rc1
net-im/ejabberd/Manifest | 1 -
net-im/ejabberd/ejabberd-15.03-r1.ebuild | 150 -
.../files/ejabberd-15.03-ejabberdctl.patch | 49 ---
3 files changed, 200 deletions(-)
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 8d57afa..9524ed7 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,6 +1,5 @@
DIST cache_tab-1.0.1.zip 16719 SHA256
149eff4dfb01f633cab643f368e5f96825c26c85ae9e6c22de3f5792e5d3dc28 SHA512
ada72a578359909201d62ad775ca85969aed5cab9be31d38bd505f726434d08bb311f06654f3f26a3b639b9ae2742dd1950ba527489aef84f2ac0dfdb7fba0c8
WHIRLPOOL
d026a7452274cb8cfd536da4c5dbabaf0414ddaa5fe835aa80d825d1afae9f952a71e61eaa825d89ee65f6a1d4db9714c3710e7ed36c8fac1be73730e732f362
DIST eiconv-0.9.0.zip 101407 SHA256
fdaa09bcc79b556f2250c4693bc57c89ce474a5ea6ea12429cbb6c2d4ed3619b SHA512
44d0af378b9873dede92657c53557a565050cd4259598a1fe92e1c9bddc8219922ff093bfc20e380f3e39fc0d5648d6d6f72766a5847781cf2101dbd4b922fb6
WHIRLPOOL
97d97f527aaf4d0fb0176723bde464ab003b49b12acca1f657efe83f8c03186e6b4819f4aadedebb8e703e16cc4af23d317b6ebebe96a9a794e6aa78c8e6fc80
-DIST ejabberd-15.03.tar.xz 6274856 SHA256
3a6fd6e94d6f24575dcaff1aa7ca319944eb76970a9d3b6bf5f30819824143fc SHA512
b292b596094aeab576d9d4aadea47042eeda130881de5dd523985dc60cd0644726dae8d525364ec72992c0c45ba9e0673b7a6ffc2bc20613ba0092e2b285e16f
WHIRLPOOL
630feba542f5d4bac1e4c17f453b2298a500c0d18159e8f09a4f11e9d372f7ffbf6e2e600c0ee849c689868872644404c03ebfb375d4852f3bbbd966417d951e
DIST ejabberd-16.01.tgz 1651587 SHA256
e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 SHA512
f0614db0d0eaf6d4f25b75b8eefbcf93260549876535fd5d82498c75779d182b19ec249ffb9b1b168cb5a887e8e6933eb868892b4aa5cd2933b739d263adca8a
WHIRLPOOL
65bc13ba5e380a999ed2ae9c816856f90e24393343d16ae52349350687dfdb15857a3358d856de5694c30718cefc5513b9d3c75871bb368cac54547becc1607a
DIST ejabberd-16.04.tar.gz 1715963 SHA256
3d964fe74e438253c64c8498eb7465d2440823614a23df8d33bdf40126d72cc3 SHA512
5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2
WHIRLPOOL
d9018835aaa736040f63222c73b54ea65385532989390c007f4cb736b474da40d9fdceb6c377a251398fb6de87869a13dec0ac160fe9a0d081337efd35dc66b4
DIST ejabberd-2.1.13.tgz 1999853 SHA256
a80d1c72e435da31758261cb0c04fe750ac71fc3e33a3b606123efd3b3abc86d SHA512
9348271f0cf1d9a7e6c53204121568e77820afc50fff1271e7b7ef66c5c5d7d067034c46472250423c4e9052046b18c1c8178f09eda0b0bfe25a1eac465fd07b
WHIRLPOOL
2c366d2f7c4371db56f47f5492ef27028a589186eeddb7a6b4e8aac0537b1b80ee31a9760f0551063ce2c2a658b9b5eafb7ed25294e00eb69480231a599a7b10
diff --git a/net-im/ejabberd/ejabberd-15.03-r1.ebuild
b/net-im/ejabberd/ejabberd-15.03-r1.ebuild
deleted file mode 100644
index e8664d8..000
--- a/net-im/ejabberd/ejabberd-15.03-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils multilib pam ssl-cert systemd
-
-DESCRIPTION="The Erlang Jabber Daemon"
-HOMEPAGE="http://www.ejabberd.im/ https://github.com/processone/ejabberd/;
-SRC_URI="https://dev.gentoo.org/~radhermit/dist/${P}.tar.xz;
-# upstream tarball missing bundled erlang libs that are fetched via git
-#SRC_URI="https://www.process-one.net/downloads/downloads-action.php?file=/${PN}/${PV}/${P}.tgz
-> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-EJABBERD_MODULES="mod_bosh mod_irc mod_muc mod_proxy65 mod_pubsub"
-IUSE="captcha debug elixir ldap mysql nls odbc pam postgres riak redis tools
zlib ${EJABBERD_MODULES}"
-
-DEPEND=">=net-im/jabber-base-0.01
- >=dev-libs/expat-1.95
- >=dev-libs/libyaml-0.1.4
- >=dev-lang/erlang-15.2[ssl]
- odbc? ( dev-db/unixODBC )
- ldap? ( =net-nds/openldap-2* )
- >=dev-libs/openssl-0.9.8e:=
- captcha? ( media-gfx/imagemagick[truetype,png] )
- zlib? ( >=sys-libs/zlib-1.2.3 )"
-RDEPEND="${DEPEND}
- >=sys-apps/shadow-4.1.4.2-r3
- pam? ( virtual/pam )"
-
-# paths in net-im/jabber-base
-JABBER_ETC="${EPREFIX}/etc/jabber"
-#JABBER_RUN="/var/run/jabber"
-JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
-JABBER_LOG="${EPREFIX}/var/log/jabber"
-JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ejabberdctl.patch
-
- # don't install release notes (we'll do this manually)
- sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i
