Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/
Date: Thu, 08 Jul 2021 18:37:08
Message-Id: 1625769391.bbd7526cbd8a9568a897fd1e56e89743bef46aef.flow@gentoo
1 commit: bbd7526cbd8a9568a897fd1e56e89743bef46aef
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 8 17:33:24 2021 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 8 18:36:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd7526c
7
8 net-im/ejabberd: drop 20.07
9
10 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
11
12 net-im/ejabberd/Manifest | 1 -
13 net-im/ejabberd/ejabberd-20.07.ebuild | 292 ----------------------------------
14 2 files changed, 293 deletions(-)
15
16 diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
17 index 752106fe147..a3cfc05ea25 100644
18 --- a/net-im/ejabberd/Manifest
19 +++ b/net-im/ejabberd/Manifest
20 @@ -1,3 +1,2 @@
21 DIST ejabberd-20.04.tar.gz 2022319 BLAKE2B 02ce782bc58a808f38dff58715204059c51762187abff7f5c77ff08eb13330b66485234eb2204c4336770d75303417ee74077466a07e701aa512158ff641a578 SHA512 7c478bbd73577e06f21e26804f4eb57deb52a0ebdd12e45034e810314cb73bb2ec60b55c6f266271eb45d5ebc135a39c498a29706d6d1f5087fd2b509a8844ca
22 -DIST ejabberd-20.07.tar.gz 2029485 BLAKE2B c6d9e177b150135595c4670b96386e752d795fab219619edbd5f887975b1edfc79bfe2606b57d2edb34af9fe15c8a545dc70b8d50faa7f667bac5fcef985bb4c SHA512 d31bea2bcf83c2404104a1153664abceda900dca1ef86216970eac32115da521826ee1b80b020d21dafbdff2cfee8b210de6e68ba795068f7fc51545e0e381fc
23 DIST ejabberd-21.04.tar.gz 1560934 BLAKE2B 85e7a381b9fdb1274b8aff04ba98587d31aaba6e0c99b0bd5b8ad28f776a7e6dfd8c4425f57591962e69387d42e3416855fa94e914638352af1853f81e88315e SHA512 4f7f645dbca35187c412e75fe90bcb96b87fc71beb073e0b913155e78832499f57218b1c42e0adf139a24cf1e235b4d1d123214a472aabf093a65f5d136b9579
24
25 diff --git a/net-im/ejabberd/ejabberd-20.07.ebuild b/net-im/ejabberd/ejabberd-20.07.ebuild
26 deleted file mode 100644
27 index a3250c01187..00000000000
28 --- a/net-im/ejabberd/ejabberd-20.07.ebuild
29 +++ /dev/null
30 @@ -1,292 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=6
35 -
36 -SSL_CERT_MANDATORY=1
37 -
38 -inherit eutils pam rebar ssl-cert systemd tmpfiles
39 -
40 -DESCRIPTION="Robust, scalable and extensible XMPP server"
41 -HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
42 -SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
43 - -> ${P}.tar.gz"
44 -
45 -LICENSE="GPL-2"
46 -SLOT="0"
47 -KEYWORDS="~amd64 ~arm ~ia64 ~sparc ~x86"
48 -REQUIRED_USE="mssql? ( odbc )"
49 -# TODO: Add 'tools' flag.
50 -IUSE="captcha debug full-xml hipe ldap mssql mysql odbc pam postgres redis
51 - roster-gw sip sqlite +stun zlib"
52 -
53 -RESTRICT="test"
54 -
55 -# TODO: Add dependencies for 'tools' flag enabled.
56 -# TODO: tools? (
57 -# TODO: >=dev-erlang/luerl-0.3
58 -# TODO: )
59 -DEPEND=">=dev-lang/erlang-19.3[hipe(-)?,odbc?,ssl]
60 - >=dev-erlang/cache_tab-1.0.25
61 - >=dev-erlang/eimp-1.0.17
62 - >=dev-erlang/fast_tls-1.1.8
63 - >=dev-erlang/fast_xml-1.1.43
64 - >=dev-erlang/fast_yaml-1.0.27
65 - >=dev-erlang/yconf-1.0.7
66 - >=dev-erlang/jiffy-1.0.5
67 - >=dev-erlang/jose-1.9.0
68 - >=dev-erlang/lager-3.6.10
69 - >=dev-erlang/p1_oauth2-0.6.7
70 - >=dev-erlang/p1_utils-1.0.20
71 - >=dev-erlang/stringprep-1.0.22
72 - >=dev-erlang/xmpp-1.4.9
73 - >=dev-erlang/pkix-1.0.6
74 - >=dev-erlang/mqtree-1.0.10
75 - >=dev-erlang/idna-6.0.0
76 - >=dev-erlang/p1_acme-1.0.8
77 - >=dev-erlang/base64url-1.0
78 - >=net-im/jabber-base-0.01
79 - ldap? ( =net-nds/openldap-2* )
80 - mysql? ( >=dev-erlang/p1_mysql-1.0.16 )
81 - odbc? ( dev-db/unixODBC )
82 - pam? ( >=dev-erlang/epam-1.0.9 )
83 - postgres? ( >=dev-erlang/p1_pgsql-1.1.10 )
84 - redis? ( >=dev-erlang/eredis-1.0.8 )
85 - sip? ( >=dev-erlang/esip-1.0.37 )
86 - sqlite? ( >=dev-erlang/sqlite3-1.1.8 )
87 - stun? ( >=dev-erlang/stun-1.0.37 )
88 - zlib? ( >=dev-erlang/ezlib-1.0.8 )"
89 -RDEPEND="${DEPEND}
90 - captcha? ( media-gfx/imagemagick[truetype,png] )"
91 -
92 -DOCS=( CHANGELOG.md README.md )
93 -PATCHES=( "${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
94 - "${FILESDIR}/${PN}-17.04-0002-Dont-overwrite-service-file.patch")
95 -
96 -EJABBERD_CERT="${EPREFIX}/etc/ssl/ejabberd/server.pem"
97 -# Paths in net-im/jabber-base
98 -JABBER_ETC="${EPREFIX}/etc/jabber"
99 -JABBER_LOG="${EPREFIX}/var/log/jabber"
100 -JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
101 -
102 -# Adjust example configuration file to Gentoo.
103 -# - Use our sample certificate.
104 -adjust_config() {
105 - sed -rne "/^#?\s+certfiles:/{p;a\ - ${EJABBERD_CERT}" -e ":a;n;/^#?\s+-/ba};p" \
106 - -i "${S}/ejabberd.yml.example" \
107 - || die 'failed to adjust example config'
108 - sed -re 's/^#\s+(certfiles)/\1/' \
109 - -i "${S}/ejabberd.yml.example" \
110 - || die 'failed to adjust example config'
111 -}
112 -
113 -# Set paths to ejabberd lib directory consistently to point always to directory
114 -# suffixed with version.
115 -correct_ejabberd_paths() {
116 - sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
117 - -i "${S}/Makefile.in" \
118 - || die 'failed to set ejabberd path in Makefile.in'
119 - sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
120 - -i "${S}/ejabberdctl.template" \
121 - || die 'failed to set ejabberd path in ejabberdctl.template'
122 -}
123 -
124 -# Get epam-wrapper from 'files' directory and correct path to lib directory in
125 -# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
126 -# file exists there already.
127 -customize_epam_wrapper() {
128 - local epam_wrapper_src="$1"
129 - local epam_wrapper_dst="${S}/epam-wrapper"
130 -
131 - [[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
132 - sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
133 - "${epam_wrapper_src}" >"${epam_wrapper_dst}" \
134 - || die 'failed to install epam-wrapper'
135 -}
136 -
137 -# Check if we are missing a default certificate.
138 -ejabberd_cert_missing() {
139 - if grep -qs "^\s\+- ${EJABBERD_CERT}" "${EROOT%/}${JABBER_ETC}/ejabberd.yml"; then
140 - if [[ -f "${EROOT%/}${EJABBERD_CERT}" ]]; then
141 - # default certificate is present in config and exists - not installing
142 - return 1
143 - else
144 - # default certificate is present in config
145 - # but doesn't exist - need to install one
146 - return 0
147 - fi
148 - fi
149 - # no default certificate in config - not installing
150 - return 1
151 -}
152 -
153 -# Generate and install sample ejabberd certificate. It's installed into
154 -# EJABBERD_CERT path.
155 -ejabberd_cert_install() {
156 - SSL_ORGANIZATION="${SSL_ORGANIZATION:-ejabberd XMPP Server}"
157 - install_cert "${EJABBERD_CERT%.*}"
158 - chown root:jabber "${EROOT%/}${EJABBERD_CERT}" || die
159 - chmod 0440 "${EROOT%/}${EJABBERD_CERT}" || die
160 -}
161 -
162 -# Get path to ejabberd lib directory.
163 -#
164 -# This is the path ./configure script Base for this path is path set in
165 -# ./configure script which is /usr/lib by default. If libdir is explicitely set
166 -# to something else than this should be adjusted here as well.
167 -get_ejabberd_path() {
168 - echo "/usr/$(get_libdir)/${P}"
169 -}
170 -
171 -# Make ejabberd.service for systemd from upstream provided template.
172 -make_ejabberd_service() {
173 - sed -r \
174 - -e 's!@ctlscriptpath@!/usr/sbin!g' \
175 - -e 's!^(User|Group)=(.*)!\1=jabber!' \
176 - -e 's!^(After)=(.*)!\1=epmd.service network.target!' \
177 - -e '/^After=/ a Requires=epmd.service' \
178 - "${PN}.service.template" >"${PN}.service" \
179 - || die 'failed to make ejabberd.service'
180 -}
181 -
182 -# Set paths to defined by net-im/jabber-base.
183 -set_jabberbase_paths() {
184 - sed -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
185 - -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
186 - -e "/^SPOOLDIR[[:space:]]*=/{s:@localstatedir@/lib/ejabberd:${JABBER_SPOOL}:}" \
187 - -i "${S}/Makefile.in" \
188 - || die 'failed to set paths in Makefile.in'
189 - sed -e "s|\(ETC_DIR:=\"\){{sysconfdir}}[^\"]*|\1${JABBER_ETC}|" \
190 - -e "s|\(LOGS_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_LOG}|" \
191 - -e "s|\(SPOOL_DIR:=\"\){{localstatedir}}[^\"]*|\1${JABBER_SPOOL}|" \
192 - -i "${S}/ejabberdctl.template" \
193 - || die 'failed to set paths ejabberdctl.template'
194 -}
195 -
196 -# Skip installing docs because it's only COPYING that's installed by Makefile.
197 -skip_docs() {
198 - gawk -i inplace '
199 -/# Documentation/, /^[[:space:]]*#?[[:space:]]*$/ {
200 - if ($0 ~ /^[[:space:]]*#?[[:space:]]*$/) {
201 - print $0;
202 - } else {
203 - next;
204 - }
205 -}
206 -1
207 -' "${S}/Makefile.in" || die 'failed to remove docs section from Makefile.in'
208 -}
209 -
210 -src_prepare() {
211 - default
212 -
213 - rebar_remove_deps
214 - correct_ejabberd_paths
215 - set_jabberbase_paths
216 - make_ejabberd_service
217 - skip_docs
218 - adjust_config
219 - customize_epam_wrapper "${FILESDIR}/epam-wrapper"
220 -
221 - rebar_fix_include_path fast_xml
222 - rebar_fix_include_path p1_utils
223 - rebar_fix_include_path xmpp
224 -
225 - # Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
226 - # rather than its parent which is default. That way ejabberd directory
227 - # takes precedence is module lookup.
228 - local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
229 - sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
230 - -i "${S}/ejabberdctl.template" \
231 - || die 'failed to set ERL_LIBS in ejabberdctl.template'
232 -
233 - sed -e "s|\(AC_INIT(ejabberd, \)m4_esyscmd([^)]*)|\1[$PV]|" \
234 - -i configure.ac || die "Failed to write correct version to configure"
235 - # eautoreconf # required in case of download from github
236 -}
237 -
238 -src_configure() {
239 - econf \
240 - --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
241 - --enable-user=jabber \
242 - --disable-system-deps \
243 - $(use_enable debug) \
244 - $(use_enable full-xml) \
245 - $(use_enable hipe) \
246 - $(use_enable mssql) \
247 - $(use_enable mysql) \
248 - $(use_enable odbc) \
249 - $(use_enable pam) \
250 - $(use_enable postgres pgsql) \
251 - $(use_enable redis) \
252 - $(use_enable roster-gw roster-gateway-workaround) \
253 - $(use_enable sqlite) \
254 - $(use_enable sip) \
255 - $(use_enable stun) \
256 - $(use_enable zlib)
257 -
258 - # more options to support
259 - # --enable-elixir requires https://github.com/elixir-lang/elixir
260 -}
261 -
262 -src_compile() {
263 - emake REBAR='rebar -v' src
264 -}
265 -
266 -src_install() {
267 - default
268 -
269 - keepdir /var/lib/lock/ejabberdctl
270 - rm -rf "${ED%/}/var/log" || die
271 - rm -rf "${ED%/}/var/spool" || die
272 -
273 - if use pam; then
274 - local epam_path="$(get_ejabberd_path)/priv/bin/epam"
275 -
276 - pamd_mimic_system xmpp auth account || die "cannot create pam.d file"
277 - into "$(get_ejabberd_path)/priv"
278 - newbin epam-wrapper epam
279 - fi
280 -
281 - newconfd "${FILESDIR}/${PN}.confd" "${PN}"
282 - newinitd "${FILESDIR}/${PN}.initd" "${PN}"
283 - systemd_dounit "${PN}.service"
284 - dotmpfiles "${FILESDIR}/${PN}.tmpfiles.conf"
285 -
286 - insinto /etc/logrotate.d
287 - newins "${FILESDIR}/${PN}.logrotate" "${PN}"
288 -}
289 -
290 -pkg_preinst() {
291 - if use pam; then
292 - einfo "Adding jabber user to epam group to allow ejabberd to use PAM" \
293 - "authentication"
294 - # See
295 - # <https://docs.ejabberd.im/admin/configuration/#pam-authentication>.
296 - # epam binary is installed by dev-erlang/epam package, therefore SUID
297 - # is set by that package. Instead of jabber group it uses epam group,
298 - # therefore we need to add jabber user to epam group.
299 - usermod -a -G epam jabber || die
300 - fi
301 -}
302 -
303 -pkg_postinst() {
304 - if [[ ! ${REPLACING_VERSIONS} ]]; then
305 - echo
306 - elog "For configuration instructions, please see"
307 - elog " https://docs.ejabberd.im/"
308 - echo
309 - fi
310 - if [[ " ${REPLACING_VERSIONS} " =~ \ 17\. ]]; then
311 - ewarn If you are updating from an older version like 17.x
312 - ewarn you may need to add an access_rules section to your
313 - ewarn ejabberd.yml config file.
314 - ewarn Otherwise authentication will be broken and users
315 - ewarn will not be able to log in.
316 - echo
317 - fi
318 -
319 - if ejabberd_cert_missing; then
320 - ejabberd_cert_install
321 - fi
322 -}