Merge branch '104-purge-obsolete-packages' into 'master'
Resolve "Purge obsolete packages" Closes #104 See merge request !177
This commit is contained in:
commit
092b17b61b
14 changed files with 0 additions and 624 deletions
|
|
@ -1,11 +0,0 @@
|
|||
01 Sep 2016; Manuel Friedli <manuel@fritteli.ch> certbot-apache-0.8.1.ebuild:
|
||||
app-crypt/certbot-apache: updated to EAPI="6"
|
||||
|
||||
*certbot-apache-0.8.1 (27 Jul 2016)
|
||||
|
||||
27 Jul 2016; Manuel Friedli <manuel@fritteli.ch> +certbot-apache-0.8.1.ebuild,
|
||||
-certbot-apache-0.6.0.ebuild:
|
||||
app-crypt/certbot-apache: updated ebuild to version 0.8.1
|
||||
|
||||
07 Jun 2016; Manuel Friedli <manuel@fritteli.ch> +ChangeLog:
|
||||
Added ChangeLog
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
DIST certbot-apache-0.8.1.tar.gz 698305 SHA256 1fb4834eba306a656f26257f86ed298df354cdecb1b0bde316a9d23a1e19db01 SHA512 8b21d270b5ee847086369b956b3346fdddd50ab0e4490d988e7ca535f4d4101e2859e99bc5f77ac920afd3a6a9210e407b155c89c28d282dc0544735a27e3eaa WHIRLPOOL 909a3f6f63fac84bf6fe8fb35b9aba46c06912af01d5f702eee5b6aeab49d4f2a92fa05e4f060da11ac6cbc89047e92457f626d6c82aa0de0f1127ca79924fc7
|
||||
EBUILD certbot-apache-0.8.1.ebuild 1053 SHA256 d2c7775e21cd00f8fd54d98b2eaae7255129b789bf11d32d5e635f7946f937eb SHA512 b8139993cb87c29cc770f3ad805b774f8f55b857b8107368d3e61e5303a24a00860cb42121c944e23461b327b15bc73545218e6a11531e83b80b0ba3b55c33eb WHIRLPOOL 45e83df0a0218908a56dc6cd5ee39968e7b9294152ec8b0e978e76582b3c6fd3ea6c0b9ca20566ebf629f59466dc49621e0b751b466dc99089b8379533abb977
|
||||
MISC ChangeLog 423 SHA256 89d7085631bd6683ca7dce3e5f2720e750a90c5478d73751ed309b907be3c917 SHA512 f7dca2055667bdb30a5f3050a6aac5c9846d03ec07c50194bdd52cd403f1fafb28410e627856ea8d9aec76d13adc2c6ab8ef0d78a13504c8c5d5b759d88810dc WHIRLPOOL b91ee179ed46d140ded29095329499b7320ab70286bc7c1598c4ae54ff2b5240ebd7d08f7dff4ac98d3b300bb9795f2f92eab5e157066a875f23044777f82bc1
|
||||
MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="6"
|
||||
PYTHON_COMPAT=(python2_7)
|
||||
|
||||
MY_PN="certbot"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
|
||||
inherit git-r3 distutils-r1
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
inherit distutils-r1
|
||||
KEYWORDS="~amd64"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Apache plugin for letsencrypt"
|
||||
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="app-crypt/certbot[${PYTHON_USEDEP}]
|
||||
app-crypt/acme[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/python-augeas[${PYTHON_USEDEP}]
|
||||
dev-python/zope-component[${PYTHON_USEDEP}]
|
||||
dev-python/zope-interface[${PYTHON_USEDEP}]"
|
||||
DEPEND="test? ( ${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}] )
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
S=${WORKDIR}/${MY_P}/${PN}
|
||||
|
||||
python_test() {
|
||||
nosetests -w ${PN/-/_}/tests || die
|
||||
}
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
05 Sep 2016; Manuel Friedli <manuel@fritteli.ch> jabberd2-2.3.6.ebuild,
|
||||
jabberd2-2.4.0.ebuild:
|
||||
net-im/jabberd2: fixed jabberd2 ebuilds for EAPI="6"
|
||||
|
||||
01 Sep 2016; Manuel Friedli <manuel@fritteli.ch> jabberd2-2.3.6.ebuild,
|
||||
jabberd2-2.4.0.ebuild:
|
||||
net-im/jabberd2: updated to EAPI="6"
|
||||
|
||||
*jabberd2-2.4.0 (07 Aug 2016)
|
||||
|
||||
07 Aug 2016; Manuel Friedli <manuel@fritteli.ch> +jabberd2-2.4.0.ebuild:
|
||||
net-im/jabberd2: added ebuild for jabberd2-2.4.0, as this version is not yet
|
||||
in the official tree.
|
||||
|
||||
*jabberd2-2.3.6 (06 Aug 2016)
|
||||
|
||||
06 Aug 2016; Manuel Friedli <manuel@fritteli.ch> +files/jabberd2-2.3.1.pamd,
|
||||
+files/jabberd2-2.3.2.init, +files/jabberd2-2.3.2.logrotate,
|
||||
+files/jabberd2-2.3.4-optimization.patch, +jabberd2-2.3.6.ebuild,
|
||||
+metadata.xml:
|
||||
net-im/jabberd2: added ebuild for version 2.3.6, which is missing in the
|
||||
official tree
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
AUX jabberd2-2.3.1.pamd 158 SHA256 eba4b5cc68b3dd327cfa1afdadbe5adf6d9383f4c79c7661169a4339e40b9a7b SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 WHIRLPOOL 2289538542300efe78a261285359c6e5ad9151cc01123e3c5579cc72393ce94308d713e38d73bc418c5bc9d7f7a200469568b7b3187b576b3efa8efa19dda919
|
||||
AUX jabberd2-2.3.2.init 1897 SHA256 a04c000fb56506abadad9df488368c09d34743414336a37d2596b640381aeff6 SHA512 eb91268d9edcfcd3a5610bdd4b9b9abe93f1092bb2bc4a76f47bad29ec1c2afbc74b029115c5c111d8c9a4fbab139366b050a9bee78a870b4e12cbed8511b39b WHIRLPOOL 8695d980c2f2af483815ff8fb2c7c7dbff6cdfb06e31a52c2bc027aa6ef8553fcc513205b2fc7ce5e1cacaffb1a56320303e1dd2853d907e7ba5b41ba7c797df
|
||||
AUX jabberd2-2.3.2.logrotate 197 SHA256 bca314e2555e113ee0916d33060c27332381cc3cd633e00e3d092b1f7b0bd149 SHA512 1e3d74612dd08df2014af2ae0f0681e78c9902644dfbf37100369591803f2cf757d27967f7e9c99d3503cff8480ace7ce4b14303028d25866ebbd4ecf882d7c0 WHIRLPOOL c74129c39e571b811212e7d08d94c461c327f58510d9efa7cd1c96888524730024330c1c46accaafa7888b75d4af98302a91c35a4543928d0fb5e7eacebe6f2b
|
||||
AUX jabberd2-2.3.4-optimization.patch 627 SHA256 8a10c307846425d0ca8f987c8f46c1559f57d7fb4a448744a93637ece01577bd SHA512 2f38d9eb597f7bea21082a56eee1e28474cc66b56d5dd7de45853c98a5cdecbe7d1e5ff951b6b1395f7c27a9a2ec13c4552031b711d882fbd946338116b7d83e WHIRLPOOL aa67b5f0cbb50a81b789ced5efd0f22a2b199a4d51d1c242cde17f8317b1c2fe00d54ba0b73654bc0f7dd4fd027df83646afe5401a7f665d174faae163151be5
|
||||
AUX jabberd2-2.3.6-configure.patch 593 SHA256 39d3cdbcf57ff2247c4ca21cc130f56173a7f0db9f37f71048cae4cd9a043e15 SHA512 15e12903af39209e94b2ee42b802f93d5dc9f5d5f6dc646b65402d4445e046df02fe8150be675024a2b7f4d8f21f2cd2af1976a28c81d429be2e91c3845a327a WHIRLPOOL ef49fd6dd2158804bbd7bb93994089d2f301878ba7dcfa2d93ad77e6c4cbaa52c26e61f6191013b911ca8852f6e3d64faea2fea248dc5ddbcf5f0808cd759faf
|
||||
DIST jabberd-2.3.6.tar.xz 1503864 SHA256 33cbf58135f856f5e6e6a7769623fedfda21f0c5f88b3b687a22e04ad915c051 SHA512 c5efa443865028874e1c1f15937064edef4c1699afb14b55963e3cd86930a67dffed7830ab1ae77522cbf797ef9ab89d044ccb28ac65904ffa7e79dee155e8aa WHIRLPOOL 43f6c02d67c792fa1391cc87e7f4d60b6fe7089d8dc7796d54e0e25f1815ad29921eeb97aeb554b015261b7e5f83cd33d076abb61e60ff9fe9441971cb85bdcb
|
||||
DIST jabberd-2.4.0.tar.xz 1507452 SHA256 1101571f4a94d7ec5a82839e9e2abee51f3983e3b9c416f1b7f2f738ebebdee1 SHA512 eb621d2d76806361f54db49d1d3b2be0e0b5559f8ec64bc8ce8cd10f1455e8f4b98395cf790f969cb8ef63f2fa83f5974c5b70aaa82bbe670e1aa15a3d5a0a0b WHIRLPOOL f6e64febfc72e0d18f2063027cc764361601ab379e41bdb27a7d01f35d472a35632203f0905de8d61ef5f633f53dfa950310c20e9d7d8b69b922ed641793721c
|
||||
EBUILD jabberd2-2.3.6.ebuild 5285 SHA256 57c7f54b83717caa39e24ea1bc00ff4ce289f4fd59f85463cc0df40d736601b7 SHA512 16a91f71e2750ce7fe4271813d6d6ee1084a8642e960e345680bf074844d6b4f58a1dc2f5b1827e9dfac523de75c6b45abefc175931abf72a5f34edd1fd63041 WHIRLPOOL 26cf7b5c0478c4138f4a3b4dbc791c224a1d3a6e5e7a09d3553b81d2e5e116917ab220b9f8fb7fe812e70daa3e4add542efb9b2b41d00d9635cc5553954370e1
|
||||
EBUILD jabberd2-2.4.0.ebuild 5243 SHA256 63c36662fde486180095f3a30ce632f101ccaf2d0cd171e2efaac028da6e1b68 SHA512 a885e83675395032b6c4520942c5353249963d7bfe4ad724a751f51c323fcf806ba1874e71ae26a0d90dfef3738fc4d8709a26d57483f522062e7521f34b020c WHIRLPOOL 0274ca40ea97e9330c34e8c4c99e166ef201fcb2e6d8bbc9ad9d2d0e7354139bc1e7998da44771a7746d4894cb40819bd73dcf5f8541e9e1e53dd41349590380
|
||||
MISC ChangeLog 857 SHA256 523e0b6fc4ac894fbec45cff6a48da6f67a2280383d3b7d3e20d59451acce43d SHA512 88ccc8a823e554e619d4115e4d10b6ba8bbbf317d9353fad37f163bea99c190e5f58dce111fbb7b710fbafa58d758d157a4a54613d3ba04226b159924bb02a43 WHIRLPOOL 5fd52a4af3629d0a655edb523a5104cf880d671443a6e1883be8c54098d6aa21d875a93c72643401f730405d2ff5b69bbe8e005c2fa7df35b8edfc2f53c7d8d1
|
||||
MISC metadata.xml 593 SHA256 2df14144b7494cbdfb6b57348ec1599feab6f013af1f07a8510143a129f358ff SHA512 a792868eb1059fb173ac83ff864b7645e636c5d8c94564198fdd1c1f5f8f7c99b53a8ecf5d8604b4d467739e5af645d0d7e0205a2220d17c9de1ab413d0ce3bc WHIRLPOOL 79fd7f5fdd2e4536659b35c809ae10d4ac2aedfd718fbf918c4b13f2d1b7ff265b9dce1df2c59f6537c3a76202b54c2c9e051e9a811d121b0bca94100c474f26
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#%PAM-1.0
|
||||
|
||||
auth required pam_nologin.so
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
session include system-auth
|
||||
|
|
@ -1,97 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
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 '<pidfile>' | 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
|
||||
|
||||
}
|
||||
|
|
@ -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
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
Re-allow the use of O3/Os, since it seems to have been an old compiler
|
||||
bug.
|
||||
|
||||
See https://github.com/jabberd2/jabberd2/issues/34
|
||||
|
||||
--- configure.ac
|
||||
+++ configure.ac
|
||||
@@ -23,13 +23,6 @@
|
||||
LIBS="$LIBS $lt_cv_dlopen_libs"
|
||||
fi
|
||||
|
||||
-# check for optimisation level
|
||||
-AC_MSG_CHECKING([CFLAGS optimization level])
|
||||
-[if echo $CFLAGS | grep '.*-O[3s].*' >/dev/null 2>&1; then]
|
||||
- AC_MSG_ERROR([maximum allowed optimization level is -O2])
|
||||
-fi
|
||||
-AC_MSG_RESULT([fine])
|
||||
-
|
||||
# extra paths
|
||||
AC_ARG_WITH([extra_include_path], AC_HELP_STRING([--with-extra-include-path],
|
||||
[use additional include paths]),
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 4f52c86..d481583 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -80,10 +80,6 @@ if test "x-$want_mio_debug" = "x-yes" ; then
|
||||
AC_DEFINE(MIO_DEBUG,1,[Define to 1 if you want to enable managed IO debug output.])
|
||||
fi
|
||||
|
||||
-# Colorized build output
|
||||
-AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="${CFLAGS} -fdiagnostics-color"],
|
||||
- [AX_CHECK_COMPILE_FLAG([-fcolor-diagnostics], [CFLAGS="${CFLAGS} -fcolor-diagnostics"])])
|
||||
-
|
||||
# Two-step header checking. First check for headers which don't
|
||||
# require any other headers.
|
||||
AC_HEADER_DIRENT
|
||||
|
|
@ -1,182 +0,0 @@
|
|||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools db-use eutils flag-o-matic pam
|
||||
|
||||
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 ~ppc ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib"
|
||||
REQUIRED_USE="memdebug? ( debug )"
|
||||
|
||||
# broken
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-libs/expat
|
||||
net-libs/udns
|
||||
net-dns/libidn
|
||||
virtual/gsasl
|
||||
berkdb? ( >=sys-libs/db-4.1.25:= )
|
||||
ldap? ( net-nds/openldap )
|
||||
mysql? (
|
||||
virtual/libmysqlclient:=
|
||||
virtual/mysql:=
|
||||
)
|
||||
pam? ( virtual/pam )
|
||||
postgres? ( dev-db/postgresql:= )
|
||||
ssl? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
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
|
||||
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</\1>,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
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-2.3.4-optimization.patch \
|
||||
"${FILESDIR}"/${P}-configure.patch
|
||||
|
||||
eautoreconf
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# --enable-pool-debug is currently broken
|
||||
econf \
|
||||
--sysconfdir=/etc/jabber \
|
||||
$(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) \
|
||||
--enable-pipe \
|
||||
--enable-anon \
|
||||
--enable-fs \
|
||||
$(use_enable websocket) \
|
||||
$(use_enable experimental) \
|
||||
$(use_enable test tests) \
|
||||
$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
|
||||
$(use_with zlib)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
|
||||
default
|
||||
prune_libtool_files --modules
|
||||
|
||||
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.3.2.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!'
|
||||
}
|
||||
|
|
@ -1,181 +0,0 @@
|
|||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit autotools db-use eutils flag-o-matic pam
|
||||
|
||||
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 ~ppc ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test websocket zlib"
|
||||
REQUIRED_USE="memdebug? ( debug )"
|
||||
|
||||
# broken
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="dev-libs/expat
|
||||
net-libs/udns
|
||||
net-dns/libidn
|
||||
virtual/gsasl
|
||||
berkdb? ( >=sys-libs/db-4.1.25:= )
|
||||
ldap? ( net-nds/openldap )
|
||||
mysql? (
|
||||
virtual/libmysqlclient:=
|
||||
virtual/mysql:=
|
||||
)
|
||||
pam? ( virtual/pam )
|
||||
postgres? ( dev-db/postgresql:= )
|
||||
ssl? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
|
||||
libressl? ( dev-libs/libressl:= )
|
||||
)
|
||||
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
|
||||
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</\1>,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
|
||||
|
||||
epatch "${FILESDIR}"/${PN}-2.3.6-configure.patch
|
||||
|
||||
eautoreconf
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# --enable-pool-debug is currently broken
|
||||
econf \
|
||||
--sysconfdir=/etc/jabber \
|
||||
$(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) \
|
||||
--enable-pipe \
|
||||
--enable-anon \
|
||||
--enable-fs \
|
||||
$(use_enable websocket) \
|
||||
$(use_enable experimental) \
|
||||
$(use_enable test tests) \
|
||||
$(usex berkdb "--with-extra-include-path=$(db_includedir)" "") \
|
||||
$(use_with zlib)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local i
|
||||
|
||||
default
|
||||
prune_libtool_files --modules
|
||||
|
||||
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.3.2.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!'
|
||||
}
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="experimental">Enable experimental features such as TLS Everywhere.</flag>
|
||||
<flag name="memdebug">Enable nad and pool debug. Requires USE="debug" to be set.</flag>
|
||||
<flag name="websocket">Enable WebSocket support on C2S port.</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">jabberd2/jabberd2</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in a new issue