1 |
commit: 93e94c71b6c61e9472cfee0357e7a63ed78588fe |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 21 16:49:41 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 21 19:56:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93e94c71 |
7 |
|
8 |
net-im/ejabberd: drop 21.12-r2 |
9 |
|
10 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
11 |
|
12 |
net-im/ejabberd/Manifest | 2 - |
13 |
net-im/ejabberd/ejabberd-21.12-r2.ebuild | 222 ------------------------------- |
14 |
2 files changed, 224 deletions(-) |
15 |
|
16 |
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest |
17 |
index e8815deaf151..df8cc1d38ab8 100644 |
18 |
--- a/net-im/ejabberd/Manifest |
19 |
+++ b/net-im/ejabberd/Manifest |
20 |
@@ -1,4 +1,2 @@ |
21 |
-DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c |
22 |
-DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1 |
23 |
DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865 |
24 |
DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da |
25 |
|
26 |
diff --git a/net-im/ejabberd/ejabberd-21.12-r2.ebuild b/net-im/ejabberd/ejabberd-21.12-r2.ebuild |
27 |
deleted file mode 100644 |
28 |
index 51848cda5a6c..000000000000 |
29 |
--- a/net-im/ejabberd/ejabberd-21.12-r2.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,222 +0,0 @@ |
32 |
-# Copyright 1999-2022 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-inherit pam rebar systemd verify-sig |
38 |
- |
39 |
-DESCRIPTION="Robust, scalable and extensible XMPP server" |
40 |
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/" |
41 |
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz |
42 |
- -> ${P}.tar.gz |
43 |
- verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )" |
44 |
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc |
45 |
- |
46 |
-LICENSE="GPL-2" |
47 |
-SLOT="0" |
48 |
-KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86" |
49 |
-REQUIRED_USE="mssql? ( odbc )" |
50 |
-# TODO: Add 'tools' flag. |
51 |
-IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis |
52 |
- roster-gw selinux sip sqlite +stun zlib" |
53 |
- |
54 |
-RESTRICT="test" |
55 |
- |
56 |
-# TODO: Add dependencies for 'tools' flag enabled. |
57 |
-# TODO: tools? ( |
58 |
-# TODO: >=dev-erlang/luerl-0.3 |
59 |
-# TODO: ) |
60 |
-DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl] |
61 |
- >=dev-erlang/cache_tab-1.0.29 |
62 |
- >=dev-erlang/eimp-1.0.21 |
63 |
- >=dev-erlang/fast_tls-1.1.13 |
64 |
- >=dev-erlang/fast_xml-1.1.48 |
65 |
- >=dev-erlang/fast_yaml-1.0.32 |
66 |
- >=dev-erlang/yconf-1.0.12 |
67 |
- >=dev-erlang/jiffy-1.0.5 |
68 |
- >=dev-erlang/jose-1.11.2 |
69 |
- >=dev-erlang/lager-3.9.1 |
70 |
- >=dev-erlang/p1_oauth2-0.6.10 |
71 |
- >=dev-erlang/p1_utils-1.0.23 |
72 |
- >=dev-erlang/stringprep-1.0.27 |
73 |
- >=dev-erlang/xmpp-1.5.6 |
74 |
- >=dev-erlang/pkix-1.0.8 |
75 |
- >=dev-erlang/mqtree-1.0.14 |
76 |
- >=dev-erlang/idna-6.0.0-r1 |
77 |
- >=dev-erlang/p1_acme-1.0.16 |
78 |
- >=dev-erlang/base64url-1.0.1 |
79 |
- ldap? ( =net-nds/openldap-2* ) |
80 |
- mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) |
81 |
- odbc? ( dev-db/unixODBC ) |
82 |
- pam? ( >=dev-erlang/epam-1.0.12 ) |
83 |
- postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) |
84 |
- redis? ( >=dev-erlang/eredis-1.2.0 ) |
85 |
- sip? ( >=dev-erlang/esip-1.0.45 ) |
86 |
- sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) |
87 |
- stun? ( >=dev-erlang/stun-1.0.47 ) |
88 |
- zlib? ( >=dev-erlang/ezlib-1.0.10 )" |
89 |
-RDEPEND="${DEPEND} |
90 |
- >=acct-user/ejabberd-2[pam?] |
91 |
- captcha? ( media-gfx/imagemagick[truetype,png] ) |
92 |
- selinux? ( sec-policy/selinux-jabber ) |
93 |
-" |
94 |
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )" |
95 |
- |
96 |
-DOCS=( CHANGELOG.md README.md ) |
97 |
-PATCHES=( |
98 |
- "${FILESDIR}/${PN}-19.08-ejabberdctl.patch" |
99 |
- "${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch" |
100 |
-) |
101 |
- |
102 |
-# Set paths to ejabberd lib directory consistently to point always to directory |
103 |
-# suffixed with version. |
104 |
-correct_ejabberd_paths() { |
105 |
- sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \ |
106 |
- -i "${S}/Makefile.in" \ |
107 |
- || die 'failed to set ejabberd path in Makefile.in' |
108 |
- sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \ |
109 |
- -i "${S}/ejabberdctl.template" \ |
110 |
- || die 'failed to set ejabberd path in ejabberdctl.template' |
111 |
-} |
112 |
- |
113 |
-# Get epam-wrapper from 'files' directory and correct path to lib directory in |
114 |
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper |
115 |
-# file exists there already. |
116 |
-customize_epam_wrapper() { |
117 |
- local epam_wrapper_src="${1}" |
118 |
- local epam_wrapper_dst="${S}/epam-wrapper" |
119 |
- |
120 |
- [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists' |
121 |
- sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \ |
122 |
- "${epam_wrapper_src}" >"${epam_wrapper_dst}" \ |
123 |
- || die 'failed to install epam-wrapper' |
124 |
-} |
125 |
- |
126 |
-# Get path to ejabberd lib directory. |
127 |
-# |
128 |
-# This is the path ./configure script Base for this path is path set in |
129 |
-# ./configure script which is /usr/lib by default. If libdir is explicitely set |
130 |
-# to something else than this should be adjusted here as well. |
131 |
-get_ejabberd_path() { |
132 |
- echo "/usr/$(get_libdir)/${P}" |
133 |
-} |
134 |
- |
135 |
-src_prepare() { |
136 |
- default |
137 |
- |
138 |
- rebar_remove_deps |
139 |
- correct_ejabberd_paths |
140 |
- customize_epam_wrapper "${FILESDIR}/epam-wrapper" |
141 |
- |
142 |
- rebar_fix_include_path fast_xml |
143 |
- rebar_fix_include_path p1_utils |
144 |
- rebar_fix_include_path xmpp |
145 |
- |
146 |
- # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory |
147 |
- # rather than its parent which is default. That way ejabberd directory |
148 |
- # takes precedence is module lookup. |
149 |
- local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)" |
150 |
- sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \ |
151 |
- -i "${S}/ejabberdctl.template" \ |
152 |
- || die 'failed to set ERL_LIBS in ejabberdctl.template' |
153 |
-} |
154 |
- |
155 |
-src_configure() { |
156 |
- econf \ |
157 |
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ |
158 |
- --localstatedir="${EPREFIX}/var" \ |
159 |
- --enable-user=${PN} \ |
160 |
- $(use_enable debug) \ |
161 |
- $(use_enable full-xml) \ |
162 |
- $(use_enable mssql) \ |
163 |
- $(use_enable mysql) \ |
164 |
- $(use_enable odbc) \ |
165 |
- $(use_enable pam) \ |
166 |
- $(use_enable postgres pgsql) \ |
167 |
- $(use_enable redis) \ |
168 |
- $(use_enable roster-gw roster-gateway-workaround) \ |
169 |
- $(use_enable sqlite) \ |
170 |
- $(use_enable sip) \ |
171 |
- $(use_enable stun) \ |
172 |
- $(use_enable zlib) |
173 |
- |
174 |
- # more options to support |
175 |
- # --enable-elixir requires https://github.com/elixir-lang/elixir |
176 |
-} |
177 |
- |
178 |
-src_compile() { |
179 |
- emake REBAR='rebar -v' src |
180 |
-} |
181 |
- |
182 |
-src_install() { |
183 |
- default |
184 |
- |
185 |
- if use pam; then |
186 |
- local epam_path="$(get_ejabberd_path)/priv/bin/epam" |
187 |
- |
188 |
- pamd_mimic_system xmpp auth account |
189 |
- into "$(get_ejabberd_path)/priv" |
190 |
- newbin epam-wrapper epam |
191 |
- fi |
192 |
- |
193 |
- newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
194 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
195 |
- systemd_dounit "${PN}.service" |
196 |
- |
197 |
- insinto /etc/logrotate.d |
198 |
- newins "${FILESDIR}/${PN}.logrotate" "${PN}" |
199 |
- |
200 |
- keepdir /var/{lib,log}/ejabberd |
201 |
-} |
202 |
- |
203 |
-pkg_postinst() { |
204 |
- local migrate_to_ejabberd_user=false |
205 |
- |
206 |
- if [[ ! ${REPLACING_VERSIONS} ]]; then |
207 |
- echo |
208 |
- elog "For configuration instructions, please see" |
209 |
- elog " https://docs.ejabberd.im/" |
210 |
- echo |
211 |
- else |
212 |
- for v in ${REPLACING_VERSIONS}; do |
213 |
- if ver_test "${v}" -lt 21.04-r1; then |
214 |
- migrate_to_ejabberd_user=true |
215 |
- break |
216 |
- fi |
217 |
- done |
218 |
- fi |
219 |
- |
220 |
- # Sarting with >=21.04-r1, the ejabberd configuration is now in |
221 |
- # /etc/ejabberd and no longer in /etc/jabber. See if we need to |
222 |
- # migrate the configuration. Furthermore, ejabberd no longer runs |
223 |
- # under the, shared via net-im/jabber-base, 'jabber' use, but under |
224 |
- # its own user. This increase isolation and hence robustness and |
225 |
- # security. |
226 |
- if $migrate_to_ejabberd_user; then |
227 |
- ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd" |
228 |
- ewarn "(just as upstream) and *not* /etc/jabber." |
229 |
- ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd." |
230 |
- ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)." |
231 |
- ewarn "Please check your configuration, and finish the migration by stopping ejabberd" |
232 |
- ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd." |
233 |
- |
234 |
- local -A dirs_to_migrate=( |
235 |
- [/etc/jabber]=/etc/ejabberd |
236 |
- [/var/spool/jabber]=/var/lib/ejabberd |
237 |
- ) |
238 |
- |
239 |
- for src_dir in "${!dirs_to_migrate[@]}"; do |
240 |
- local eroot_src_dir="${EROOT}${src_dir}" |
241 |
- local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}" |
242 |
- |
243 |
- cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}" |
244 |
- |
245 |
- if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then |
246 |
- rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die |
247 |
- fi |
248 |
- if ! use prefix; then |
249 |
- chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die |
250 |
- fi |
251 |
- done |
252 |
- fi |
253 |
-} |