* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2015-08-16 13:47 Julian Ospald
0 siblings, 0 replies; 11+ messages in thread
From: Julian Ospald @ 2015-08-16 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 6745a49a8922fa8847fb9aea39d7da7b987e768c
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 13:45:47 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 13:46:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6745a49a
net-im/jabberd2: version bump to 2.3.3
Gentoo-Bug: 539534
net-im/jabberd2/Manifest | 1 +
net-im/jabberd2/jabberd2-2.3.3.ebuild | 157 ++++++++++++++++++++++++++++++++++
2 files changed, 158 insertions(+)
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 9e461ed..176fa40 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,2 +1,3 @@
DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
+DIST jabberd-2.3.3.tar.xz 1457340 SHA256 c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 SHA512 c3c8d6829c3bc61555280d90edc1bef0228e4cec2684ba283373075883ef64bfa5e9118dad96d7a1193bb2afb6b2e7c78e24267e6feb6e7b191138bf8c79a7da WHIRLPOOL 0c590d79905ff95d2e18362065e0ba4e2341fdc95a61d3e157993d7d16976480b81f2f4b0479516538b1c5c0c9b496b446383da89c2e17539f8f9cb59db62463
diff --git a/net-im/jabberd2/jabberd2-2.3.3.ebuild b/net-im/jabberd2/jabberd2-2.3.3.ebuild
new file mode 100644
index 0000000..af82c89
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.3.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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 memdebug mysql pam postgres sqlite ssl test 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/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ ssl? ( >=dev-libs/openssl-1.0.1:0 )
+ sqlite? ( dev-db/sqlite:3 )
+ 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}
+
+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/c2s\.pid/jabberd2-c2s\.pid/' \
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+ etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+ # https://github.com/jabberd2/jabberd2/issues/34
+ replace-flags -O[3s] -O2
+
+ # --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 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!'
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2015-10-16 19:29 Julian Ospald
0 siblings, 0 replies; 11+ messages in thread
From: Julian Ospald @ 2015-10-16 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 4611e73baf38a00855a105e1b0a7fdf0957aa132
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 19:24:13 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 19:28:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4611e73b
net-im/jabberd2: add libressl support
net-im/jabberd2/jabberd2-2.3.3-r1.ebuild | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
index 62311a9..46f641a 100644
--- a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
@@ -13,7 +13,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"
-IUSE="berkdb debug experimental ldap memdebug mysql pam postgres sqlite ssl test zlib"
+IUSE="berkdb debug experimental ldap libressl memdebug mysql pam postgres sqlite ssl test zlib"
REQUIRED_USE="memdebug? ( debug )"
# broken
@@ -28,7 +28,10 @@ DEPEND="dev-libs/expat
mysql? ( virtual/mysql )
pam? ( virtual/pam )
postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ )
sqlite? ( dev-db/sqlite:3 )
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2015-10-16 19:29 Julian Ospald
0 siblings, 0 replies; 11+ messages in thread
From: Julian Ospald @ 2015-10-16 19:29 UTC (permalink / raw
To: gentoo-commits
commit: e4cb298d2de5f3b24f154cf0a5612a8f06ef4df9
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 19:20:57 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 19:28:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4cb298d
net-im/jabberd2: rm old 2.3.3
net-im/jabberd2/jabberd2-2.3.3.ebuild | 157 ----------------------------------
1 file changed, 157 deletions(-)
diff --git a/net-im/jabberd2/jabberd2-2.3.3.ebuild b/net-im/jabberd2/jabberd2-2.3.3.ebuild
deleted file mode 100644
index af82c89..0000000
--- a/net-im/jabberd2/jabberd2-2.3.3.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 memdebug mysql pam postgres sqlite ssl test 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/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- ssl? ( >=dev-libs/openssl-1.0.1:0 )
- sqlite? ( dev-db/sqlite:3 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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!'
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2015-10-16 19:29 Julian Ospald
0 siblings, 0 replies; 11+ messages in thread
From: Julian Ospald @ 2015-10-16 19:29 UTC (permalink / raw
To: gentoo-commits
commit: 7f11f335b062d10a0a9369bbd7d503f0d37e5234
Author: Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 16 19:20:36 2015 +0000
Commit: Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Fri Oct 16 19:28:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f11f335
net-im/jabberd2: add missing [-bindist] to dev-libs/openssl
Gentoo-Bug: 563268
net-im/jabberd2/jabberd2-2.3.3-r1.ebuild | 157 +++++++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
new file mode 100644
index 0000000..62311a9
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit 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 memdebug mysql pam postgres sqlite ssl test 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/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* )
+ ssl? ( >=dev-libs/openssl-1.0.1:0[-bindist] )
+ sqlite? ( dev-db/sqlite:3 )
+ 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}
+
+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/c2s\.pid/jabberd2-c2s\.pid/' \
+ -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
+ -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
+ -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
+ etc/*.xml.dist.in || die "renaming pid files failed!"
+}
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
+ # https://github.com/jabberd2/jabberd2/issues/34
+ replace-flags -O[3s] -O2
+
+ # --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 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!'
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2016-05-02 22:24 Austin English
0 siblings, 0 replies; 11+ messages in thread
From: Austin English @ 2016-05-02 22:24 UTC (permalink / raw
To: gentoo-commits
commit: 467b55d6512a0aba06ac49ec0f88a19b52dc7985
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 18:46:13 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon May 2 22:21:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=467b55d6
net-im/jabberd2: remove old versions
Package-Manager: portage-2.2.26
net-im/jabberd2/jabberd2-2.3.1-r1.ebuild | 156 ---------------------------
net-im/jabberd2/jabberd2-2.3.2-r1.ebuild | 157 ---------------------------
net-im/jabberd2/jabberd2-2.3.2.ebuild | 157 ---------------------------
net-im/jabberd2/jabberd2-2.3.3-r1.ebuild | 160 ---------------------------
net-im/jabberd2/jabberd2-2.3.4.ebuild | 180 -------------------------------
5 files changed, 810 deletions(-)
diff --git a/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
deleted file mode 100644
index 67b1f04..0000000
--- a/net-im/jabberd2/jabberd2-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 ldap memdebug mysql pam postgres sqlite ssl test 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/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- ssl? ( >=dev-libs/openssl-1.0.1:0 )
- sqlite? ( dev-db/sqlite:3 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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}/${P}.init" jabberd
- newpamd "${FILESDIR}/${P}.pamd" jabberd
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${P}.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.3.2-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
deleted file mode 100644
index aecb34c..0000000
--- a/net-im/jabberd2/jabberd2-2.3.2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 memdebug mysql pam postgres sqlite ssl test 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/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- ssl? ( >=dev-libs/openssl-1.0.1:0 )
- sqlite? ( dev-db/sqlite:3 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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.3.2.ebuild b/net-im/jabberd2/jabberd2-2.3.2.ebuild
deleted file mode 100644
index 31e3784..0000000
--- a/net-im/jabberd2/jabberd2-2.3.2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 memdebug mysql pam postgres sqlite ssl test 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/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- ssl? ( >=dev-libs/openssl-1.0.1:0 )
- sqlite? ( dev-db/sqlite:3 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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.1.init" jabberd
- newpamd "${FILESDIR}/${PN}-2.3.1.pamd" jabberd
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}-2.3.1.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.3.3-r1.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
deleted file mode 100644
index 46f641a..0000000
--- a/net-im/jabberd2/jabberd2-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 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/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 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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.3.4.ebuild b/net-im/jabberd2/jabberd2-2.3.4.ebuild
deleted file mode 100644
index ee6f078..0000000
--- a/net-im/jabberd2/jabberd2-2.3.4.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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!'
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2016-07-01 8:29 Agostino Sarubbo
0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2016-07-01 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 34f5b43aeedf0fa379f89d658c81407cf9bb4e3f
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 1 08:29:25 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 08:29:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f5b43a
net-im/jabberd2: amd64 stable wrt bug #539534
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-im/jabberd2/jabberd2-2.3.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
index 1389115..f5e13ec 100644
--- a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
+++ b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
@@ -12,7 +12,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 zlib"
REQUIRED_USE="memdebug? ( debug )"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2016-07-01 8:30 Agostino Sarubbo
0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2016-07-01 8:30 UTC (permalink / raw
To: gentoo-commits
commit: f2788a75c6301ef67db85873ba19406d4123a507
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 1 08:30:48 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 1 08:30:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2788a75
net-im/jabberd2: x86 stable wrt bug #539534
Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-im/jabberd2/jabberd2-2.3.3-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
index f5e13ec..96337dd 100644
--- a/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
+++ b/net-im/jabberd2/jabberd2-2.3.3-r2.ebuild
@@ -12,7 +12,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 zlib"
REQUIRED_USE="memdebug? ( debug )"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2016-11-19 16:45 Thomas Deutschmann
0 siblings, 0 replies; 11+ messages in thread
From: Thomas Deutschmann @ 2016-11-19 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 574c5385652099a0587e8607c3e46ed8d2965a54
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 16:44:55 2016 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 16:45:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=574c5385
net-im/jabberd2: Drop old vulnerable versions (bug #539534)
Package-Manager: portage-2.3.2
net-im/jabberd2/Manifest | 2 -
net-im/jabberd2/jabberd2-2.3.1-r2.ebuild | 156 ------------------------------
net-im/jabberd2/jabberd2-2.3.2-r2.ebuild | 157 -------------------------------
3 files changed, 315 deletions(-)
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 6398f31..6d37dbc 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,4 +1,2 @@
-DIST jabberd-2.3.1.tar.xz 1460088 SHA256 feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 SHA512 93a594ac4a39643c66e330ef4912ecee8071fdc3e3f460514d0bff60b2031caa2ef5eaad00dede59e4a4d6f7b8e5b52d56daa3959f3b341082933d175cb49b2c WHIRLPOOL 667c576cf7915dc80b2b044e0e0483ef9ef5268daec069542013accf7089acf1428310521f4b1dd144b2a3ebde7a5ec2d70b50a065c76588c8e7de7d9da50136
-DIST jabberd-2.3.2.tar.xz 1473436 SHA256 ceb1f427fde5bf3d1acf2275a2ea3c8c680470ee1aa2be2dda66092d60cd3d50 SHA512 10b00dc4409b59dd30ab85a3c42e4b7b10d1d733d0e73eac5984c6b0bb1edbbca29e3a5e56f86d9a0b94acd3f582ab0575db9387abd345edb154fe5ac7765e03 WHIRLPOOL 42a88b8a53dd8fb22b3157103f307c2d2635953b530536777e35a2e1a46a03351e54c93e192b793f276a98fc6b1699628ca2f8a1284a2f2f4d9db3210f579183
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
diff --git a/net-im/jabberd2/jabberd2-2.3.1-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.1-r2.ebuild
deleted file mode 100644
index 17cab15..00000000
--- a/net-im/jabberd2/jabberd2-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 ldap memdebug mysql pam postgres sqlite ssl test 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/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- ssl? ( >=dev-libs/openssl-1.0.1:0 )
- sqlite? ( dev-db/sqlite:3 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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}/${P}.init" jabberd
- newpamd "${FILESDIR}/${P}.pamd" jabberd
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${P}.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.3.2-r2.ebuild b/net-im/jabberd2/jabberd2-2.3.2-r2.ebuild
deleted file mode 100644
index bc2e94b..00000000
--- a/net-im/jabberd2/jabberd2-2.3.2-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit 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 memdebug mysql pam postgres sqlite ssl test 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/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql )
- ssl? ( >=dev-libs/openssl-1.0.1:0 )
- sqlite? ( dev-db/sqlite:3 )
- 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}
-
-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/c2s\.pid/jabberd2-c2s\.pid/' \
- -e '/pidfile/s/router\.pid/jabberd2-router\.pid/' \
- -e '/pidfile/s/s2s\.pid/jabberd2-s2s\.pid/' \
- -e '/pidfile/s/sm\.pid/jabberd2-sm\.pid/' \
- etc/*.xml.dist.in || die "renaming pid files failed!"
-}
-
-src_configure() {
- # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3
- # https://github.com/jabberd2/jabberd2/issues/34
- replace-flags -O[3s] -O2
-
- # --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 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!'
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2017-07-22 10:08 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2017-07-22 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 647746d92449ee90a7bf7f78c089c7e8354397c8
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 10:08:21 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 10:08:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=647746d9
net-im/jabberd2: Bump to version 2.6.1
Package-Manager: Portage-2.3.6, Repoman-2.3.3
net-im/jabberd2/Manifest | 1 +
net-im/jabberd2/jabberd2-2.6.1.ebuild | 188 ++++++++++++++++++++++++++++++++++
2 files changed, 189 insertions(+)
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index 030fdf124dd..c1aa4a4aa25 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,3 +1,4 @@
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
diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild
new file mode 100644
index 00000000000..cf3d63e5a4c
--- /dev/null
+++ b/net-im/jabberd2/jabberd2-2.6.1.ebuild
@@ -0,0 +1,188 @@
+# 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 )"
+
+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!'
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2017-11-27 17:41 Pacho Ramos
0 siblings, 0 replies; 11+ messages in thread
From: Pacho Ramos @ 2017-11-27 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 663ce89d5bde05af717bf759284c2f8b43746b5c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 17:39:24 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 17:41:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663ce89d
net-im/jabberd2: Fix systemd unit files installation path, bug #626026
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-im/jabberd2/Manifest | 2 +-
net-im/jabberd2/jabberd2-2.6.1.ebuild | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest
index c1aa4a4aa25..15e9fcc9ae5 100644
--- a/net-im/jabberd2/Manifest
+++ b/net-im/jabberd2/Manifest
@@ -1,4 +1,4 @@
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
diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild
index cf3d63e5a4c..e6768d3b65c 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"
@@ -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}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/
@ 2017-11-29 11:19 Agostino Sarubbo
0 siblings, 0 replies; 11+ messages in thread
From: Agostino Sarubbo @ 2017-11-29 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 9b0db0bc0a56d27a2ba791dca4324eec5c510333
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 11:19:02 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 11:19:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0db0bc
net-im/jabberd2: amd64 stable wrt bug #623806
Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-im/jabberd2/jabberd2-2.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-im/jabberd2/jabberd2-2.6.1.ebuild b/net-im/jabberd2/jabberd2-2.6.1.ebuild
index e6768d3b65c..cc3915cf4b4 100644
--- a/net-im/jabberd2/jabberd2-2.6.1.ebuild
+++ b/net-im/jabberd2/jabberd2-2.6.1.ebuild
@@ -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 )"
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2017-11-29 11:19 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-29 11:19 [gentoo-commits] repo/gentoo:master commit in: net-im/jabberd2/ Agostino Sarubbo
-- strict thread matches above, loose matches on Subject: below --
2017-11-27 17:41 Pacho Ramos
2017-07-22 10:08 Lars Wendler
2016-11-19 16:45 Thomas Deutschmann
2016-07-01 8:30 Agostino Sarubbo
2016-07-01 8:29 Agostino Sarubbo
2016-05-02 22:24 Austin English
2015-10-16 19:29 Julian Ospald
2015-10-16 19:29 Julian Ospald
2015-10-16 19:29 Julian Ospald
2015-08-16 13:47 Julian Ospald
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox