From c9f004510d94fb26f30a12dfa017d2d6b5880461 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 27 Nov 2017 18:40:42 +0100 Subject: [PATCH] net-im/jabberd2: Drop old Package-Manager: Portage-2.3.14, Repoman-2.3.6 --- net-im/jabberd2/Manifest | 2 - .../files/jabberd2-2.3.4-optimization.patch | 21 -- .../files/jabberd2-2.3.4-websocket.patch | 31 --- net-im/jabberd2/jabberd2-2.3.4-r1.ebuild | 179 ----------------- net-im/jabberd2/jabberd2-2.5.0.ebuild | 185 ------------------ 5 files changed, 418 deletions(-) delete mode 100644 net-im/jabberd2/files/jabberd2-2.3.4-optimization.patch delete mode 100644 net-im/jabberd2/files/jabberd2-2.3.4-websocket.patch delete mode 100644 net-im/jabberd2/jabberd2-2.3.4-r1.ebuild delete mode 100644 net-im/jabberd2/jabberd2-2.5.0.ebuild diff --git a/net-im/jabberd2/Manifest b/net-im/jabberd2/Manifest index 15e9fcc9ae59..48debe270d0b 100644 --- a/net-im/jabberd2/Manifest +++ b/net-im/jabberd2/Manifest @@ -1,4 +1,2 @@ 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 BLAKE2B e6c66cc7490772a496face76ff0d57d950cf66798b326c1abf849a4a1cb2cec1cf1055d18bd97313cdc375e853568df17649026876de314ef319aee602b3b027 SHA512 845347d2b812f6232ac84771e276c0783636406d73ae3cedbc5c28119f33c40a1c995827050c0227d7260dadba81434692059ff5a0b911e1c0c92f821e33eeea 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 -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 - #include - -@@ -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,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,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!' -} -- 2.26.2