Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/prosody/
Date: Tue, 31 Jan 2023 15:17:45
Message-Id: 1675178127.f291034588016541a24f8ba5a1a9df9f778a72e4.conikost@gentoo
1 commit: f291034588016541a24f8ba5a1a9df9f778a72e4
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 31 03:13:57 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 31 15:15:27 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2910345
7
8 net-im/prosody: drop 0.12.1
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 net-im/prosody/Manifest | 1 -
13 net-im/prosody/prosody-0.12.1.ebuild | 164 -----------------------------------
14 2 files changed, 165 deletions(-)
15
16 diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
17 index 6b6b217d70db..52dda5957103 100644
18 --- a/net-im/prosody/Manifest
19 +++ b/net-im/prosody/Manifest
20 @@ -1,2 +1 @@
21 -DIST prosody-0.12.1.tar.gz 611898 BLAKE2B 0b65ffbd6d4703f9e5fbac80e8887a4a41297afd22a776fb2eaa718b309f46c55a9d78f1d3ea97d4434c6ea2ebfe7a9051532ceda25ad78611769bd031894084 SHA512 705d2bcd38ffb19e90dab19992711aebf3d81f7bca7f9791ae5149510d465ec837ddf26a8c547eff2f2d131e5a694ddc3d0aac0b8921df65808192ae00527a85
22 DIST prosody-0.12.2.tar.gz 614303 BLAKE2B f44f2106e3064b6ecb5d75718997ed980309e9debbd9f0b17eaeb3261d27421774097ba16bfd8d86d4bf1dd8f427c653b494b199676738d8781ffa37f9b73c5f SHA512 dd14d2740b67127e7edcf79db7d1fd81b4566d4a285430edb9dd7263ad109fdd6e581a1d93fcbf971f73fa5ba051ae7935a121d31e3e7448cacfcd8ecbd802bb
23
24 diff --git a/net-im/prosody/prosody-0.12.1.ebuild b/net-im/prosody/prosody-0.12.1.ebuild
25 deleted file mode 100644
26 index 569a5077e12b..000000000000
27 --- a/net-im/prosody/prosody-0.12.1.ebuild
28 +++ /dev/null
29 @@ -1,164 +0,0 @@
30 -# Copyright 1999-2022 Gentoo Authors
31 -# Distributed under the terms of the GNU General Public License v2
32 -
33 -EAPI=8
34 -
35 -LUA_COMPAT=( lua5-{1..4} luajit )
36 -LUA_REQ_USE="deprecated(+)"
37 -
38 -inherit lua-single systemd tmpfiles toolchain-funcs
39 -
40 -DESCRIPTION="Prosody is a modern XMPP communication server"
41 -HOMEPAGE="https://prosody.im/"
42 -SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
43 -
44 -LICENSE="MIT"
45 -SLOT="0"
46 -KEYWORDS="amd64 ~arm ~arm64 x86"
47 -IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib"
48 -REQUIRED_USE="
49 - ^^ ( icu idn )
50 - ${LUA_REQUIRED_USE}
51 -"
52 -RESTRICT="!test? ( test )"
53 -
54 -DEPEND="
55 - acct-group/prosody
56 - acct-user/prosody
57 - $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
58 - $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
59 - dev-lua/luarocks[${LUA_SINGLE_USEDEP}]
60 - $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
61 - $(lua_gen_cond_dep 'dev-lua/lua-unbound[${LUA_USEDEP}]')
62 - $(lua_gen_cond_dep 'dev-lua/readline[${LUA_USEDEP}]')
63 - icu? ( dev-libs/icu:= )
64 - idn? ( net-dns/libidn:= )
65 - ldap? ( $(lua_gen_cond_dep 'dev-lua/lualdap[${LUA_USEDEP}]') )
66 - libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
67 - dev-libs/openssl:0=
68 - lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
69 - mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
70 - postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
71 - sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
72 - ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
73 - zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
74 - ${LUA_DEPS}
75 -"
76 -
77 -RDEPEND="
78 - ${DEPEND}
79 - selinux? ( sec-policy/selinux-jabber )
80 -"
81 -
82 -BDEPEND="
83 - virtual/pkgconfig
84 - test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
85 -"
86 -
87 -PATCHES=( "${FILESDIR}/${PN}-0.12.0-gentoo.patch" )
88 -
89 -src_prepare() {
90 - default
91 -
92 - # Set correct plugin path for optional net-im/prosody-modules package
93 - sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
94 -}
95 -
96 -src_configure() {
97 - local myeconfargs=(
98 - --add-cflags="${CFLAGS}"
99 - --add-ldflags="${LDFLAGS}"
100 - --c-compiler="$(tc-getCC)"
101 - --datadir="${EPREFIX}/var/lib/prosody"
102 - --idn-library="$(usex idn 'idn' 'icu')"
103 - --libdir="${EPREFIX}/usr/$(get_libdir)"
104 - --linker="$(tc-getCC)"
105 - --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))"
106 - --no-example-certs
107 - --ostype="linux"
108 - --prefix="${EPREFIX}/usr"
109 - --runwith="${ELUA}"
110 - --sysconfdir="${EPREFIX}/etc/prosody"
111 - --with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
112 - --with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
113 - )
114 -
115 - # Since the configure script is handcrafted,
116 - # and yells at unknown options, do not use 'econf'.
117 - ./configure "${myeconfargs[@]}" || die
118 -
119 - rm makefile || die
120 - mv GNUmakefile Makefile || die
121 -}
122 -
123 -src_install() {
124 - default
125 -
126 - keepdir /var/lib/prosody
127 -
128 - newinitd "${FILESDIR}"/prosody.initd-r6 prosody
129 - systemd_newunit "${FILESDIR}"/prosody.service-r3 prosody.service
130 -
131 - newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r2 prosody.conf
132 -}
133 -
134 -pkg_postinst() {
135 - local migrate_to_prosody_user="false"
136 - tmpfiles_process prosody.conf
137 -
138 - if [[ ${REPLACING_VERSIONS} ]]; then
139 - for v in ${REPLACING_VERSIONS}; do
140 - if ver_test "${v}" -lt 0.12.0; then
141 - migrate_to_prosody_user="true"
142 - break
143 - fi
144 - done
145 - fi
146 -
147 - # Sarting with >=0.12.0, the prosody configuration is now in
148 - # /etc/prosody and no longer in /etc/jabber.
149 - # See if we need to migrate the configuration. Furthermore,
150 - # prosody no longer runs under the, shared via net-im/jabber-base,
151 - # 'jabber' use, but under its own user.
152 - # This increase isolation and hence robustness and security.
153 - if ${migrate_to_prosody_user}; then
154 - local -A dirs_to_migrate=(
155 - [/etc/jabber]=/etc/prosody
156 - [/var/log/jabber]=/var/log/prosody
157 - [/var/spool/jabber]=/var/lib/prosody
158 - )
159 -
160 - for src_dir in "${!dirs_to_migrate[@]}"; do
161 - local eroot_src_dir="${EROOT}/${src_dir}"
162 - local eroot_dst_dir="${EROOT}/${dirs_to_migrate[${src_dir}]}"
163 -
164 - cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
165 -
166 - if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
167 - rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
168 - fi
169 -
170 - if ! use prefix; then
171 - chown --recursive prosody:prosody "${eroot_dst_dir}" || die
172 - fi
173 - done
174 -
175 - # Update configuration file to match new pathes and permissions
176 - local mysedargs=(
177 - -e "'s#/etc/jabber#/etc/prosody#g'"
178 - -e "'s#/run/jabber#/run/prosody#g'"
179 - -e "'s#/var/log/jabber#/var/log/prosody#g'"
180 - -e "'s/prosody_user.*/prosody_user = \"prosody\";/g'"
181 - -e "'s/prosody_group.*/prosody_group = \"prosody\";/g'"
182 - -i /etc/prosody/prosody.cfg.lua
183 - )
184 -
185 - eval sed "${mysedargs[@]}" || die
186 -
187 - ewarn "Newer versions of the prosody (Gentoo) package use ${EROOT}/etc/prosody"
188 - ewarn "(just as upstream) and *not* anymore ${EROOT}/etc/jabber."
189 - ewarn "The files from ${EROOT}/etc/jabber where copied to ${EROOT}/etc/prosody."
190 - ewarn "Also prosody's spool directory became ${EROOT}/var/lib/prosody (was ${EROOT}/var/spool/jabbber)."
191 - ewarn "Please check your configuration."
192 - fi
193 -}