diff options
Diffstat (limited to 'net-im/jabberd2')
-rw-r--r-- | net-im/jabberd2/Manifest | 10 | ||||
-rw-r--r-- | net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch | 21 | ||||
-rw-r--r-- | net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch | 31 | ||||
-rw-r--r-- | net-im/jabberd2/jabberd2-2.3.4-r1.ebuild | 179 | ||||
-rw-r--r-- | net-im/jabberd2/jabberd2-2.5.0.ebuild | 185 | ||||
-rw-r--r-- | net-im/jabberd2/jabberd2-2.6.1.ebuild | 8 |
6 files changed, 7 insertions, 427 deletions
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index 29248818ac2c..b622ce064c92 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -1,15 +1,9 @@ AUX jabberd2-2.3.1.pamd 158 BLAKE2B f92e86a1df67595956537043f3dfe1f3d5241dd67f785a9cf5d8ac7958c9caedf9e09bdb630ebac0774c497fbdfe5f2e40308340eb5c8781b2da523b8682fa5a SHA512 a52bec9577f028f1141002d0ffaaf11615699a67a7b3677774d7e8aa6595c8291cb6ebcdc0f874e54f700e3b437ae05e05b8d7c8c717dee15cb7d908a954b979 AUX jabberd2-2.3.2.init 1890 BLAKE2B 7c035f149bdca36e2f69a736b9a70e289e3fe57b51126c0824d12eb5347ed6966eb68b833cda05fab36448163cdd1ef5793047e6ada34ece1e3c9e1fff9d2246 SHA512 bfd6ae287f89714b79b4050656cb503b0ee8429413e5d307e1b7feecc6a5aed33d362b86f0877d2ab176c7f90697201b833ff564cb01e5bcd284fbae7ff3f1f2 AUX jabberd2-2.3.2.logrotate 197 BLAKE2B fda6fbf48c70913229f5729606c069ee3bca78ba6235cc83e41ac5f2a304828c869611e30b2accc566928ee800ef9e1ddd0566bdb4c64a04653f0a730809a85a SHA512 1e3d74612dd08df2014af2ae0f0681e78c9902644dfbf37100369591803f2cf757d27967f7e9c99d3503cff8480ace7ce4b14303028d25866ebbd4ecf882d7c0 -AUX jabberd2-2.3.4-optimization.patch 631 BLAKE2B d8f295e887e5e9e1a5465b61dd5f4a04c1baf453f8e8f2df1c7d85667d249c01fc156f7b1885ee32679b912eb70aaf60f7a0b8ff6b97a5ae30c3b32a095be168 SHA512 d4ddd733d5b945fc12ecbb824d40b378dbfec4064fb64396c437495e9b1694ce29c139f377331ef09f4e19c82a7d3b7512e537d14604d8b5a345f3a84f829688 -AUX jabberd2-2.3.4-websocket.patch 860 BLAKE2B 86644f988de9a235a881ef25407c7c350e883ec49b0291b2f26fb656645f424fa4873ad51fd9770bb6c5bc11c5fcba7d59c8f1256723282f5a0f8aca21caf35d SHA512 e417b96d248be6c05e098e4dcbc2654907621acf3f594cf8ef4d13a7007e23438092d5942c9a3d78fa585150efd69c62426f82ec4d221f96b039c92d42545ea0 AUX jabberd2-2.5.0.init 1906 BLAKE2B aec00b17bf41584a707d69745082abb33a4e9982a0027fad5956ea5ed6a1a5f49f27af9fef6457e04a088169bfa73733dca5eb2dcf67dea081f0593eeb869c8f SHA512 1d46b543f8b477a1db5cf1d23a57ba77cfae7e7752c6f4fdd98ba5ee42c0ba28422b7175ebce4383ec9de2f03655072d4892dac0429fe24fc85f27ff8bdb35f1 DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463 -DIST jabberd-2.3.4.tar.xz 1482736 SHA256 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 SHA512 593c1a80de52447fa18e448627bdbf85605e8a406129808cd2081576c26d65df3315c5fc91b37d5e832e1a89b4083d873b2db1e65d6ad76fa5b9b4f125786b7f WHIRLPOOL 67a0e96a872a08975d981e1697fab5cf154b4cbea4c698d41d250c1314bc7303a3c15e871fc8b3c4f3769acd91773734ef61b880900132e435d17f9bde587b08 -DIST jabberd-2.5.0.tar.xz 1507916 SHA256 9ec4a8be6c01fe68cccee347e08aab34399205ecfe3557985debc368b86aeb8a SHA512 e1298f42a199bb31cea324f239368327a259eaaa3e4624eac5b6aca983f32467c47248c57e4621fd7f7eb64a3b86d760f5e9a57b4307174d820d20e77ae3229e WHIRLPOOL 4479955ba6f2511fda98660f51d1355532bf8f26c23a74b8aa892810d45c3ff3cdfbb7398d501c44048082e2d4dc50eb88dc135595ef0b35ba1c06c7dbe91d57 -DIST jabberd-2.6.1.tar.xz 1542156 SHA256 c22d45bd4105b344351cbbfd6da99755182f64120747d18e91b6267a73775099 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea WHIRLPOOL d8b3d9d1f51e90ba5ca2a8b7b44133938014b7084112d1ea3ae31426948d345aa1470055c4944f1c3c90145d31b4e8f67a23b372ad7a30ebf2305f335547d478 +DIST jabberd-2.6.1.tar.xz 1542156 BLAKE2B e6c66cc7490772a496face76ff0d57d950cf66798b326c1abf849a4a1cb2cec1cf1055d18bd97313cdc375e853568df17649026876de314ef319aee602b3b027 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea EBUILD jabberd2-2.3.3-r2.ebuild 4774 BLAKE2B f6cbce8265a10973c76c420a07315dda67a03f60285e14fa94483a5856f8987536c8cc22938c262376ebcf380b2048cd9f959169cc464889cce3ed516770a2b9 SHA512 871a4e298148851aab80a1bf810a0725c5107e07020bcafc99a15ab5b24290ca6aed10d74422c97b44de84aa185bc16b3101cfa99187f44d346af173f3a44d70 -EBUILD jabberd2-2.3.4-r1.ebuild 5255 BLAKE2B a3115205538fb058fdd45013488e0746438b8418ba8e169ce68502c062c15bbbc6e3b711bd71dcd68218241cc1e5179691d984a50ee8be7c48b55fc5966f135b SHA512 9262776b94634a9453df7e755d671b1bfbcb7d4c9eb5a31979981c6f632c21168031901d3f164945de7d6bc4e6a256a6e84cba87a7c1cd118280d3a009071316 -EBUILD jabberd2-2.5.0.ebuild 5228 BLAKE2B 6216d2363b7adb05e32f9d0e49733b7200492bbb0d8f1cc6d05c8b920124035e78ded6e43a9595ab2daaec106e5d748bb21c49404cdcf483adf1501b2bf3c89d SHA512 1586e2204e31efe8a0d34e0ba8ab501d0df717e906b1ea33e686cc182390f230293673a9ff291a51d2ba85f529ee684f11a7cd0f1d0883a24a88d6ab1dd58509 -EBUILD jabberd2-2.6.1.ebuild 5210 BLAKE2B 2facdf2be6a92c76a410dfe4c33d7da3906838b3e3f0c4c6fcb09a0cb8996db2768a2fe4905306359f5b622d63a6bf2e6071519a83af7c521bc99fcb76cda48e SHA512 d5f92e3915c441d0213f0b88fc77616a9b5a5e5fe70d8159a9a4874ffee519bac3e8cd32732dccc69b25437c037dfa15372278bcef9e30b989c429ae5da915d7 +EBUILD jabberd2-2.6.1.ebuild 5351 BLAKE2B c00ae4feb859365b3885ec830f2f8ab3862b2ece42ca827714d0f1c90f6ed5f7d837c91a024147f0da787473bc8b60463ef2fdf0cd263a69470828467c4b14b7 SHA512 ff81099795ba1b2e9c7a78054851317cd8d3c987d78f584b08aa0cd51cf133476a939973057142f6325cd797af1d0958cf0bdb1d8e9572d8246eb0f75bfb7871 MISC metadata.xml 518 BLAKE2B d86b5ae0a12af23bc24ef841c9968ce8d5dee646412fd9240610403b9700bda781a8cb09cc2ecf0707c70b318a9a79f83e7891da45d27b8b202b1ad133d63a4a SHA512 bd66d981f192750c15e96c89c80dd6fa6f88dec6893dae286f71f8e569dfa117b01df0008d1a9995ed5f635c09824c70ae48127c4cb4570f8d5cd0939071b2df diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch b/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch deleted file mode 100644 index d320b9d1f349..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch +++ /dev/null @@ -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 - ---- a/configure.ac -+++ b/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]), diff --git a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch b/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch deleted file mode 100644 index a6f932ccb481..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b861b9c72adc732cbdfbac4eb8a4205126227f6b Mon Sep 17 00:00:00 2001 -From: Tomasz Sterna <tomek@xiaoka.com> -Date: Fri, 30 Oct 2015 12:40:32 +0100 -Subject: [PATCH] Enable USE_WEBSOCKET check in SX plugins - ---- - sx/plugins.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sx/plugins.h b/sx/plugins.h -index b5d3934..65dae93 100644 ---- a/sx/plugins.h -+++ b/sx/plugins.h -@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st { - JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args); - - /* websocket wrapper plugin */ --//#ifdef USE_WEBSOCKET -+#ifdef USE_WEBSOCKET - #include <http_parser.h> - #include <util/util.h> - -@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st { - xht headers; - void *frame; - } *_sx_websocket_conn_t; --//#endif -+#endif - - #ifdef __cplusplus - } diff --git a/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild deleted file mode 100644 index 1c60a6353293..000000000000 --- a/net-im/jabberd2/jabberd2-2.3.4-r1.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -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}"/${P}-optimization.patch \ - "${FILESDIR}"/${P}-websocket.patch - eautoreconf -} - -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!' -} diff --git a/net-im/jabberd2/jabberd2-2.5.0.ebuild b/net-im/jabberd2/jabberd2-2.5.0.ebuild deleted file mode 100644 index de2059dd8a06..000000000000 --- a/net-im/jabberd2/jabberd2-2.5.0.ebuild +++ /dev/null @@ -1,185 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 - sys-devel/autoconf-archive - virtual/pkgconfig - test? ( dev-libs/check )" - -DOCS=( AUTHORS README ) - -#PATCHES=( -#) - -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 - - 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 - - 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.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/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild index cf3d63e5a4cb..cc3915cf4b4a 100644 --- a/net-im/jabberd2/jabberd2-2.6.1.ebuild +++ b/net-im/jabberd2/jabberd2-2.6.1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools db-use eutils flag-o-matic pam +inherit autotools db-use eutils flag-o-matic pam systemd DESCRIPTION="Open Source Jabber Server" HOMEPAGE="http://jabberd2.org" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jabberd2/jabberd2/releases/download/jabberd-${PV}/ja LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd" +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 )" @@ -136,7 +136,9 @@ src_configure() { src_install() { local i - default + # Fix systemd unit files installation path, bug #626026 + emake systemddir="$(systemd_get_systemunitdir)" DESTDIR="${D}" install + einstalldocs prune_libtool_files --modules keepdir /var/spool/jabber/{fs,db} |