From bef28c3c4617875eb642d36b1ca514e2800b6adb Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 11 Mar 2024 19:38:05 +0000 Subject: net-im/jabberd2: treeclean --- net-im/jabberd2/Manifest | 1 - net-im/jabberd2/files/jabberd2-2.3.1.pamd | 6 - net-im/jabberd2/files/jabberd2-2.3.2.init | 96 ------------- net-im/jabberd2/files/jabberd2-2.3.2.logrotate | 8 -- net-im/jabberd2/files/jabberd2-2.5.0.init | 90 ------------ net-im/jabberd2/jabberd2-2.7.0.ebuild | 185 ------------------------- net-im/jabberd2/metadata.xml | 15 -- 7 files changed, 401 deletions(-) delete mode 100644 net-im/jabberd2/Manifest delete mode 100644 net-im/jabberd2/files/jabberd2-2.3.1.pamd delete mode 100644 net-im/jabberd2/files/jabberd2-2.3.2.init delete mode 100644 net-im/jabberd2/files/jabberd2-2.3.2.logrotate delete mode 100644 net-im/jabberd2/files/jabberd2-2.5.0.init delete mode 100644 net-im/jabberd2/jabberd2-2.7.0.ebuild delete mode 100644 net-im/jabberd2/metadata.xml (limited to 'net-im') diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest deleted file mode 100644 index 058d6670..00000000 --- a/net-im/jabberd2/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST jabberd-2.7.0.tar.xz 1560872 BLAKE2B a286bafb671b6880d3d5289efb19d802c6ff22e225052fcaf937e33e1eb2e847b707f53d8e26cf6cd8b22def681d446558d4d45ce98ff0e22c7196b66a2b1ead SHA512 2a5d134572330a38366a17cf8b3fc6fadf56eddf604003d75cd976bd385b5d8392b01dc149e3a2962be3c340eb23429e83db25b608b9ab84f328603d3ba447da diff --git a/net-im/jabberd2/files/jabberd2-2.3.1.pamd b/net-im/jabberd2/files/jabberd2-2.3.1.pamd deleted file mode 100644 index 2c5a5347..00000000 --- a/net-im/jabberd2/files/jabberd2-2.3.1.pamd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 - -auth required pam_nologin.so -auth include system-auth -account include system-auth -session include system-auth diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.init b/net-im/jabberd2/files/jabberd2-2.3.2.init deleted file mode 100644 index c33f23ed..00000000 --- a/net-im/jabberd2/files/jabberd2-2.3.2.init +++ /dev/null @@ -1,96 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="reload" - -depend() { - need net - use mysql postgresql slapd - provide jabber-server -} - -stopJabberServices() { - - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Stopping ${service}" - start-stop-daemon \ - --stop \ - --pidfile ${pidfile} - eend $? - fi - done - eoutdent - -} - -start_pre() { - checkpath -d -o jabber /var/run/jabber -} - -start() { - - einfo "Starting Jabber Server ..." - local services executable cfgfile pidfile - services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') - eindent - for service in ${services}; do - - cfgfile=$(echo ${service} | cut -d ':' -f 2) - service=$(echo ${service} | cut -d ':' -f 1) - if [ ! -f "${cfgfile}" ]; then - if [ -f "/etc/jabber/${service}.xml" ]; then - cfgfile="/etc/jabber/${service}.xml" - else - eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" - stopJabberServices - return 1 - fi - fi - - executable=/usr/bin/${service} - - if [ ! -f "${executable}" ]; then - eerror "Can't find executable: ${executable}" - stopJabberServices - return 1 - fi - - ebegin "Starting ${service} (${cfgfile})" - pidfile="$(grep -v ^# ${cfgfile} | grep '' | sed 's#<.\?pidfile>##g')" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec /usr/bin/${service} \ - --pid ${pidfile} \ - -- -c ${cfgfile} - eend $? - - done - eoutdent - -} - -reload() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Reloading ${service}" - kill -HUP $(cat ${pidfile}) - eend $? - fi - done - eoutdent -} - -stop() { - - einfo "Stopping Jabber Server" - stopJabberServices - -} diff --git a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate b/net-im/jabberd2/files/jabberd2-2.3.2.logrotate deleted file mode 100644 index fcec0f7a..00000000 --- a/net-im/jabberd2/files/jabberd2-2.3.2.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/jabber/c2s.log /var/log/jabber/s2s.log /var/log/jabber/sm.log /var/log/jabber/router.log { - su jabber jabber - sharedscripts - missingok - postrotate - /etc/init.d/jabberd reload - endscript -} diff --git a/net-im/jabberd2/files/jabberd2-2.5.0.init b/net-im/jabberd2/files/jabberd2-2.5.0.init deleted file mode 100644 index 307b153b..00000000 --- a/net-im/jabberd2/files/jabberd2-2.5.0.init +++ /dev/null @@ -1,90 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="reload" - -depend() { - need net - use mysql postgresql slapd - provide jabber-server -} - -stopJabberServices() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Stopping ${service}" - start-stop-daemon \ - --stop \ - --pidfile ${pidfile} - eend $? - fi - done - eoutdent -} - -start_pre() { - checkpath -d -o jabber /var/run/jabber -} - -start() { - einfo "Starting Jabber Server ..." - local services executable cfgfile pidfile - services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}') - eindent - for service in ${services}; do - - cfgfile=$(echo ${service} | cut -d ':' -f 2) - service=$(echo ${service} | cut -d ':' -f 1) - if [ ! -f "${cfgfile}" ]; then - if [ -f "/etc/jabber/${service}.xml" ]; then - cfgfile="/etc/jabber/${service}.xml" - else - eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml" - stopJabberServices - return 1 - fi - fi - - executable="/usr/bin/$(echo ${service} | cut -d '.' -f 1)" - - if [ ! -f "${executable}" ]; then - eerror "Can't find executable: ${executable}" - stopJabberServices - return 1 - fi - - ebegin "Starting ${service} (${cfgfile})" - pidfile="$(grep -v ^# ${cfgfile} | grep '' | sed 's#<.\?pidfile>##g')" - start-stop-daemon \ - --background \ - --start \ - --user jabber:jabber \ - --exec ${executable} \ - --pid ${pidfile} \ - -- -c ${cfgfile} - eend $? - - done - eoutdent -} - -reload() { - eindent - for pidfile in /var/run/jabber/*.pid; do - if [ -f "${pidfile}" ]; then - service=$(basename ${pidfile} .pid) - ebegin "Reloading ${service}" - kill -HUP $(cat ${pidfile}) - eend $? - fi - done - eoutdent -} - -stop() { - einfo "Stopping Jabber Server" - stopJabberServices -} diff --git a/net-im/jabberd2/jabberd2-2.7.0.ebuild b/net-im/jabberd2/jabberd2-2.7.0.ebuild deleted file mode 100644 index 7c8951d3..00000000 --- a/net-im/jabberd2/jabberd2-2.7.0.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools db-use flag-o-matic pam systemd - -DESCRIPTION="Open Source Jabber Server" -HOMEPAGE="http://jabberd2.org" -SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/jabberd-${PV}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64" -IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test websocket zlib" -REQUIRED_USE="memdebug? ( debug )" -RESTRICT="!test? ( test )" - -DEPEND="virtual/libcrypt - dev-libs/expat - net-libs/udns - net-dns/libidn - net-misc/gsasl:= - berkdb? ( >=sys-libs/db-4.1.25:= ) - ldap? ( net-nds/openldap ) - mysql? ( - dev-db/mysql-connector-c:= - virtual/mysql:= - ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:= ) - ssl? ( >=dev-libs/openssl-1.0.1:0 ) - sqlite? ( dev-db/sqlite:3 ) - websocket? ( net-libs/http-parser:= ) - zlib? ( sys-libs/zlib ) -" -RDEPEND=" - ${DEPEND} - >=net-im/jabber-base-0.01 -" -DEPEND=" - ${DEPEND} - app-arch/xz-utils - dev-build/autoconf-archive - virtual/pkgconfig - test? ( dev-libs/check ) -" - -DOCS=( AUTHORS README ) - -S="${WORKDIR}/jabberd-${PV}" - -pkg_pretend() { - if is-flagq '-O[3s]' ; then - ewarn "O3/Os compiler flags have been known to cause problems" - ewarn "with old gcc version. Be aware that this could break" - ewarn "port binding. Make sure to test this." - ewarn "See https://github.com/jabberd2/jabberd2/issues/34" - fi -} - -src_prepare() { - # Fix some default directory locations - sed -i \ - -e 's,@localstatedir@/@package@/pid/,/var/run/@package@/,g' \ - -e 's,@localstatedir@/@package@/run/pbx,/var/run/@package@/pbx,g' \ - -e 's,@localstatedir@/@package@/log/,/var/log/@package@/,g' \ - -e 's,@localstatedir@/lib/jabberd2/fs,@localstatedir@/@package@/fs,g' \ - -e 's,@localstatedir@,/var/spool,g' \ - -e 's,@package@,jabber,g' \ - etc/{sm,router,c2s,s2s}.xml.dist.in || die "fixing default directory locations failed!" - - # If the package wasn't merged with sqlite then default to use berkdb - use sqlite || - sed -i \ - -e 's,<\(module\|driver\)>sqlite<\/\1>,<\1>db,g' \ - etc/{c2s,sm}.xml.dist.in || die "setting berkdb as default failed!" - - # avoid file collision with x11-misc/screen-message wrt #453994 - sed -i \ - -e 's/@jabberd_router_bin@/jabberd2-router/' \ - -e 's/@jabberd_c2s_bin@/jabberd2-c2s/' \ - -e 's/@jabberd_s2s_bin@/jabberd2-s2s/' \ - -e 's/@jabberd_sm_bin@/jabberd2-sm/' \ - etc/jabberd*.in || die "fixing file collisions failed!" - - # rename pid files wrt #241472 - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-c2s\.pid/' \ - etc/c2s.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-router\.pid/' \ - etc/router.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-s2s\.pid/' \ - etc/s2s.xml.dist.in || die - sed -i \ - -e '/pidfile/s/${id}\.pid/jabberd2-sm\.pid/' \ - etc/sm.xml.dist.in || die - - default - - eautoreconf -} - -src_configure() { - # --enable-pool-debug is currently broken - myeconfargs=( - --sysconfdir=/etc/jabber - --enable-pipe - --enable-anon - --enable-fs - $(usex debug "--enable-debug" "") - $(usex memdebug "--enable-nad-debug" "") - $(use_enable ssl) - $(use_enable mysql) - $(use_enable postgres pgsql) - $(use_enable sqlite) - $(use_enable berkdb db) - $(use_enable ldap) - $(use_enable pam) - $(use_enable websocket) - $(use_enable experimental) - $(use_enable test tests) - $(usex berkdb "--with-extra-include-path=$(db_includedir)" "") - $(use_with zlib) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local i - - # Fix systemd unit files installation path, bug #626026 - emake systemddir="$(systemd_get_systemunitdir)" DESTDIR="${D}" install - einstalldocs - find "${ED}" -name '*.la' -delete || die - - keepdir /var/spool/jabber/{fs,db} - fowners jabber:jabber /usr/bin/{jabberd,router,sm,c2s,s2s} \ - /var/spool/jabber/{fs,db} - fperms 770 /var/spool/jabber/{fs,db} - fperms 750 /usr/bin/{jabberd,router,sm,c2s,s2s} - - # avoid file collision with x11-misc/screen-message wrt #453994 - for i in router sm c2s s2s ; do - einfo "renaming /usr/bin/${i} to /usr/bin/jabberd2-${i}" - mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/jabberd2-${i} || die - done - - newinitd "${FILESDIR}/${PN}-2.5.0.init" jabberd - newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd - insinto /etc/logrotate.d - newins "${FILESDIR}/${PN}-2.3.2.logrotate" jabberd - - docompress -x /usr/share/doc/${PF}/tools - docinto tools - dodoc tools/db-setup{.mysql,.pgsql,.sqlite} \ - tools/{migrate-jd14dir-2-sqlite.pl,pipe-auth.pl} - - # remove useless upstart files wrt #498900 - rm -rf "${ED}"/usr/etc -} - -pkg_postinst() { - if use pam; then - echo - ewarn 'Jabberd-2 PAM authentication requires your unix usernames to' - ewarn 'be in the form of "contactname@jabberdomain". This behavior' - ewarn 'is likely to change in future versions of jabberd-2. It may' - ewarn 'be advisable to avoid PAM authentication for the time being.' - echo - fi - - if use sqlite || use mysql || use postgres; then - echo - einfo "You will need to setup or update your database using the" - einfo "scripts in /usr/share/doc/${PF}/tools/" - echo - fi - - ewarn 'If you are upgrading from <=jabberd2-2.2.17 then you might have' - ewarn 'to update /etc/jabber/jabberd.cfg via etc-update because' - ewarn 'the binaries have been renamed to avoid file collisions!' -} diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml deleted file mode 100644 index ab20f28a..00000000 --- a/net-im/jabberd2/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Enable experimental features such - as TLS Everywhere. - Enable nad and pool debug. - Requires USE="debug" to be set. - Enable WebSocket support on C2S port. - - - jabberd2/jabberd2 - - -- cgit v1.2.3