From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- net-im/prosody/Manifest | 8 +- net-im/prosody/files/prosody-0.11.7-gentoo.patch | 29 ------- net-im/prosody/files/prosody.initd-r5 | 44 ---------- net-im/prosody/files/prosody.service-r2 | 13 --- net-im/prosody/files/prosody.tmpfilesd-r1 | 1 - net-im/prosody/prosody-0.11.13.ebuild | 102 ----------------------- net-im/prosody/prosody-0.12.0.ebuild | 2 +- 7 files changed, 2 insertions(+), 197 deletions(-) delete mode 100644 net-im/prosody/files/prosody-0.11.7-gentoo.patch delete mode 100644 net-im/prosody/files/prosody.initd-r5 delete mode 100644 net-im/prosody/files/prosody.service-r2 delete mode 100644 net-im/prosody/files/prosody.tmpfilesd-r1 delete mode 100644 net-im/prosody/prosody-0.11.13.ebuild (limited to 'net-im/prosody') diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index 12cffc0ca87a..7730d2b373be 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -1,13 +1,7 @@ -AUX prosody-0.11.7-gentoo.patch 1419 BLAKE2B 30a1ef43f6d3b00a07f621dc701e97ba45fb8b6d6ed67f95e5feff7bad32a4d037f0d00301c60bb05e1d5cb85bc1b78451ca0a989d7fda893f8b433ee50cc2f5 SHA512 9f5490ce156ef7d69f8daee7f274edc4d56da93dcbcfaf1a28f33ee8a0b5c6cb6a8f4f6f50cfd0cd3defad1ae90603803e6328ca3e160c4b3fa6aeadbd7104f3 AUX prosody-0.12.0-gentoo.patch 1447 BLAKE2B e61e747c393b0b70795db0fc63e24abf684ceb3dbdc10c7567e59774f8cd1fbf8da50f749661ee567dcaa8dca5a04a25ff8b1705164da95bdf675f4d7d9639a2 SHA512 8914cc41b102a5f01f640cbb9188bb9c3e522f21f45ce753efebdfeb5b1313ff856af42731eea9822c62a1f21768d950091371150f5dc7a9dac93331f089e032 -AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b4ed2efb6df4c5ea5bb4ff43947bdb29d09b263a7eb0ed7ffeda8425723f4e0a76387245ae02a2661f SHA512 56e8e5524c6b383355bb1106ffaac614196dd48a8d9fd1f62ece87fbe6278f7d2ea7a683027dd6dcfeb2bc7331d84e95868f8c0501dfc7e11ef77aa08ebdde17 AUX prosody.initd-r6 1114 BLAKE2B a988b584eb49d21261776fa0a651dc01d3943a5a75c9bfeb5462c373bfb38cf0bbb3e48ae36990d9079932c5af7296d1970de928b2d027d01001c630982edfe3 SHA512 b72ebe1fa53a884f2074aae4871c10daccafdaa6bbef2b2400d2954a667c5794c9a9d2568a36c28850b05b1cc2fe97c4beef899a4b26ecacb027c9b90ed6f24f -AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1 AUX prosody.service-r3 439 BLAKE2B abd128f236f2c28f54542388a38aaa3d0e5030510dddc16240273de90c13ddee62d01d26d7c9e1be0635dc59ad9ca5e93a30f2b5fa42106489a95d26a037314a SHA512 b540e5d4389439cdd2886f9ccaf189d20ffcaf29a982a26e4ed296b0c529df95aade88751d22919cb36b27db94530dade754044d50cee2e5244d37983b933517 -AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599 AUX prosody.tmpfilesd-r2 39 BLAKE2B 1e004bf2bf1495d219c12bea1973206fae135fb4a5b453c6692f0143413626ec83889bb84b5086a6e507d3b8af14877b3820f3d9560df17e1ca49e2cbee85e0b SHA512 81b855c6bf496f0e6f20c41b8be5538c4edd1fbc6e4f2ca6e9a2d0a06bd5237223a4d42bcbdb75746cb01e46ff0eb36dac6952d9c076c6a72d1bbd733aca07eb -DIST prosody-0.11.13.tar.gz 439816 BLAKE2B 8ace9001fe93d6349c744d17c7bccbf18c8704615cea856efcadd2de54430a64241cf7930345163e7bb6067aa4731da15dde4fc7f3ddb868b0680facc5368230 SHA512 7616785536b7b51767a26963a80c961ef2403609e1e78dda3f88cf68c00d5bb899278c70a22b006b58c36c62cbb1bbd390a9298bad5b8d6524928a1cd5457813 DIST prosody-0.12.0.tar.gz 610330 BLAKE2B 14694ee95dc6eb6d053278a9d7718fd7487fe7ef862b4e2ee0d57f2b60cdeb22d1c74eac4a4df7447ea3e9ff57fb3734a9c9997f2767ed3aa04682f265b82185 SHA512 b7144a413a5bc72b1e677504d5ced6583c7399c8334b39b4c9157da60f951300832b34a1d47703a0b217caa4f1d3a0f52ab59cef08b27c6b43e876e1dffca3ce -EBUILD prosody-0.11.13.ebuild 2857 BLAKE2B 0d8254cac3b9616f02c374f308efaa073b77ca204952f788db5785409028b6dd8f162c7267f09de11e3327f83b434c23af57cda997594c2b4ec06f62d7cd091a SHA512 2603123885f1e0f696835c26a06e052b11998205d6cb78030222280760201f368facccd573fe767a2754ce0b378223a180fa3b545858a93aec715c7aa3f6d24d -EBUILD prosody-0.12.0.ebuild 5131 BLAKE2B 32986fdee941501782c3a6f211401e0b53b404e5823d466bd3b89ec16a475d8b5f5fd874c028167ace137d7856556b3010341f3878b846210b63440c6ba35520 SHA512 52c336be8e9a097c0d3a76b487d63b37cbd4d925107e7cc6b9ee187a05612ca03f53fba9aa6c98044c134d06f303a4e13802e7421c081ec2d7a7fdfbfcdedb9f +EBUILD prosody-0.12.0.ebuild 5129 BLAKE2B 75cdba4ad8d2ea935d800385b1397d90dd3df43a5f03e0e6d3afec15001d8897b6eb271f7c91843b19ca672d46642b92f9f20d5ac00f57fe7ed73a0f9658f7df SHA512 c2fa2d60436e6b8d433b069f3f9266369ed87bd73142a07364e555c748169f25bb1c2c45504a427d827cac8b52a3d2ce6c74fce9674d9b4c7cb22f9fe7d0e536 MISC metadata.xml 670 BLAKE2B 448bf5ede2b6f09940c51fdff4642e18be22d9c3dac637271c7c8bcfde1b4af0853e2623c55c00efcd8757ef863ac37fdb895606e572911a62a1c9d5f32cc693 SHA512 6177b8e3d2ed1aeeae2f369dc693283a3f811953f71be0e004eea402aa421d89973dbefe79c8fd198e9f9f82e4b345552dc3a2c3597c05927dc1a518cacbaf1d diff --git a/net-im/prosody/files/prosody-0.11.7-gentoo.patch b/net-im/prosody/files/prosody-0.11.7-gentoo.patch deleted file mode 100644 index e571066874b7..000000000000 --- a/net-im/prosody/files/prosody-0.11.7-gentoo.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/prosody.cfg.lua.dist -+++ b/prosody.cfg.lua.dist -@@ -17,6 +17,15 @@ - -- Settings in this section apply to the whole server and are the default settings - -- for any virtual hosts - -+-- Prosody will use this user and group for launching the service. -+-- Gentoo uses by default jabber:jabber (uid:gid) for all Jabber related services. -+prosody_user = "jabber" -+prosody_group = "jabber" -+ -+-- Prosody will create this pid file after it has been successfully started. -+-- Please don't change that path, as it's being used by the Gentoo init scripts. -+pidfile = "/run/jabber/prosody.pid" -+ - -- This is a (by default, empty) list of accounts that are admins - -- for the server. Note that you must create the accounts separately - -- (see https://prosody.im/doc/creating_accounts for info) -@@ -30,7 +39,9 @@ - -- Prosody will always look in its source directory for modules, but - -- this option allows you to specify additional locations where Prosody - -- will look for modules first. For community modules, see https://modules.prosody.im/ ----plugin_paths = {} -+-- The default included path is for the optional net-im/prosody-modules package, -+-- which provides additional community maintained modules. -+plugin_paths = { "/usr/GENTOO_LIBDIR/prosody/community-modules" }; - - -- This is the list of modules Prosody will load on startup. - -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too. diff --git a/net-im/prosody/files/prosody.initd-r5 b/net-im/prosody/files/prosody.initd-r5 deleted file mode 100644 index 54e37be5bd8c..000000000000 --- a/net-im/prosody/files/prosody.initd-r5 +++ /dev/null @@ -1,44 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -name="Prosody XMPP server" -extra_started_commands="reload" -jabber_pid="/run/jabber" -jabber_logs="/var/log/jabber" -pidfile="${jabber_pid}/prosody.pid" -prosody_config="/etc/jabber/prosody.cfg.lua" - -command="/usr/bin/prosody" -commandctl="/usr/bin/prosodyctl" -command_group="jabber" -command_user="jabber" - -checkconfig() { - if [ ! -f "${prosody_config}" ]; then - eerror "Please create ${prosody_config} before starting Prosody!" - return 1 - fi - - ${commandctl} check config - return $? -} - -depend() { - need net - provide jabber-server - use dns postgresql -} - -reload() { - ebegin "Reloading configuration" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} - -start_pre() { - checkconfig || return 1 - - checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_logs}" - checkpath -d -m 0750 -o "${command_user}:${command_group}" -q "${jabber_pid}" -} diff --git a/net-im/prosody/files/prosody.service-r2 b/net-im/prosody/files/prosody.service-r2 deleted file mode 100644 index 81408beefe53..000000000000 --- a/net-im/prosody/files/prosody.service-r2 +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Prosody XMPP server -After=network.target - -[Service] -Group=jabber -PIDFile=/run/jabber/prosody.pid -ExecStart=/usr/bin/prosody -ExecReload=/bin/kill -HUP $MAINPID -User=jabber - -[Install] -WantedBy=multi-user.target diff --git a/net-im/prosody/files/prosody.tmpfilesd-r1 b/net-im/prosody/files/prosody.tmpfilesd-r1 deleted file mode 100644 index 7fcdd539decc..000000000000 --- a/net-im/prosody/files/prosody.tmpfilesd-r1 +++ /dev/null @@ -1 +0,0 @@ -d /run/jabber 750 jabber jabber - - diff --git a/net-im/prosody/prosody-0.11.13.ebuild b/net-im/prosody/prosody-0.11.13.ebuild deleted file mode 100644 index 1b9f77dd5703..000000000000 --- a/net-im/prosody/prosody-0.11.13.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..3} luajit ) -LUA_REQ_USE="deprecated(+)" - -inherit lua-single systemd tmpfiles toolchain-funcs - -DESCRIPTION="Prosody is a modern XMPP communication server" -HOMEPAGE="https://prosody.im/" -SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" -IUSE="icu +idn +libevent mysql postgres selinux +sqlite +ssl test +zlib" -REQUIRED_USE=" - ^^ ( icu idn ) - ${LUA_REQUIRED_USE} -" -RESTRICT="!test? ( test )" - -DEPEND=" - $(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]') - $(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]') - $(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]') - net-im/jabber-base - icu? ( dev-libs/icu:= ) - idn? ( net-dns/libidn:= ) - libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') ) - dev-libs/openssl:0= - lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') ) - mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') ) - postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') ) - sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') ) - ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') ) - zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') ) - ${LUA_DEPS} -" - -RDEPEND=" - ${DEPEND} - selinux? ( sec-policy/selinux-jabber ) -" - -BDEPEND=" - virtual/pkgconfig - test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') ) -" - -PATCHES=( "${FILESDIR}/${PN}-0.11.7-gentoo.patch" ) - -src_prepare() { - default - - # Set correct plugin path for optional net-im/prosody-modules package - sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die -} - -src_configure() { - local myeconfargs=( - --add-cflags="${CFLAGS}" - --add-ldflags="${LDFLAGS}" - --c-compiler="$(tc-getCC)" - --datadir="${EPREFIX}/var/spool/jabber" - --idn-library="$(usex idn 'idn' 'icu')" - --libdir="${EPREFIX}/usr/$(get_libdir)" - --linker="$(tc-getCC)" - --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))" - --no-example-certs - --ostype="linux" - --prefix="${EPREFIX}/usr" - --runwith="${ELUA}" - --sysconfdir="${EPREFIX}/etc/jabber" - --with-lua-include="${EPREFIX}/$(lua_get_include_dir)" - --with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)" - ) - - # Since the configure script is handcrafted, - # and yells at unknown options, do not use 'econf'. - ./configure "${myeconfargs[@]}" || die - - rm makefile || die - mv GNUmakefile Makefile || die -} - -src_install() { - default - - keepdir /var/spool/jabber - - newinitd "${FILESDIR}"/prosody.initd-r5 prosody - systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service - - newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf -} - -pkg_postinst() { - tmpfiles_process prosody.conf -} diff --git a/net-im/prosody/prosody-0.12.0.ebuild b/net-im/prosody/prosody-0.12.0.ebuild index e9cab9fb7d64..569a5077e12b 100644 --- a/net-im/prosody/prosody-0.12.0.ebuild +++ b/net-im/prosody/prosody-0.12.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="icu +idn +libevent ldap mysql postgres selinux +sqlite +ssl test +zlib" REQUIRED_USE=" ^^ ( icu idn ) -- cgit v1.2.3