diff options
| -rw-r--r-- | net-im/jabberd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/jabberd/Manifest | 22 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch | 2 | ||||
| -rw-r--r-- | net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch | 14 | ||||
| -rw-r--r-- | net-im/jabberd/jabberd-1.6.1.1-r1.ebuild | 67 |
5 files changed, 58 insertions, 53 deletions
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog index bac061b638e4..f8b6036bbf2f 100644 --- a/net-im/jabberd/ChangeLog +++ b/net-im/jabberd/ChangeLog @@ -1,11 +1,13 @@ # ChangeLog for net-im/jabberd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.128 2012/05/19 14:14:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.129 2012/05/19 14:43:37 ssuominen Exp $ 19 May 2012; Samuli Suominen <ssuominen@gentoo.org> jabberd-1.6.1.1-r1.ebuild, +files/jabberd-1.6.1.1-underlinking.patch: Link against -lgcrypt because $(top_builddir)/jabberd/gcrypt_init.c is using - function gcry_control() wrt #412871 by Ted Rodgers + function gcry_control() wrt #412871 by Ted Rodgers. Link against -lcrypt + because otherwise jabberd will fail to start with undefined symbol crypt() + wrt #345255 by Emil Wojak. 04 May 2012; Jeff Horelick <jdhore@gentoo.org> jabberd-1.4.4-r3.ebuild, jabberd-1.6.1.1-r1.ebuild: diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest index 511e51769f9d..07af3d84f54c 100644 --- a/net-im/jabberd/Manifest +++ b/net-im/jabberd/Manifest @@ -10,27 +10,27 @@ AUX jabberd-1.4.4-xdb_file.c-rev1107.patch 539 RMD160 dbfca4d0801291f1b1c10e12ac AUX jabberd-1.4.4-xdb_sql.c-rev1211.patch 882 RMD160 48c9f7ad6f4c10c26c9aa89730434a3632de3f75 SHA1 8519d7920e75c3273efe766f3336c588808e0778 SHA256 5dda2f6b8c86b0b02d569f3436d2d0b23d352926649469b2f4041a94535a6c10 AUX jabberd-1.4.4.init 554 RMD160 83098dfae23a67267dffeb5609e572b501fa9a8e SHA1 630cd9c50c20a73992b9891051e02350f6abcba9 SHA256 769e4ee4e193a1d63fe4839f923fb2a6339489a677595ba75986e19cb1ba39ac AUX jabberd-1.6.1.1-glibc-2.10.patch 1516 RMD160 60c187eee722527eaabf122fe34ba4ee6ffc3b34 SHA1 a2ffdcdb343d5d2d4510836907690e0a3c4b7845 SHA256 aa61e2d9d795875e4f44c2a2c9cbaf5076be5750c90dbd63e3d5d7263d54bc0f -AUX jabberd-1.6.1.1-gnutls2.2.patch 1698 RMD160 6b3a6a93b85baf477cd0502ec9aeb7cd96f19d23 SHA1 58512abfdb53c16dc598b3ca505da1573f8f3a35 SHA256 c678a2d0fe729ec3a7c6373fc6993b4fbc170c8516f375e3ed260492202535e3 +AUX jabberd-1.6.1.1-gnutls2.2.patch 1729 RMD160 250fe48b83686e329853716226dc217b56b36ee0 SHA1 a0352a758d4aed0461da462ab30aa00b88961046 SHA256 6fe16f73f5f4705f1e2c5a138774e65dceec89b189b23805f70ddaf13b2d2960 AUX jabberd-1.6.1.1-libtool2.2.patch 311 RMD160 be0d831c8c2990f29e88abe5cc1da9567edb2bac SHA1 0c8e9a7fa6616d50123539ac146a557e89091a32 SHA256 7199217ba9b28bab8186a5728bac55806ad199b5b1d41f3f3a97d87a4b00650b AUX jabberd-1.6.1.1-parallel-make.patch 483 RMD160 eeda213fec4e3861390d69e59dbb54c3cb4db3d7 SHA1 4dc316c5f36b5dc4f0d3eb09dce47038679db419 SHA256 37adc27da7cbce3c77eeb672a64697d3fd6bc51ababdc9269e20fa6e5d1a5f7c AUX jabberd-1.6.1.1-sandbox.patch 620 RMD160 a5aee0352d90dbe45dd4c13320813535255bd29a SHA1 6387cc19c18ff6633bdfda7fd3351c23093f6808 SHA256 f37a8271593942ef005ce333a733c72ed6eb21d9adb68a5b88cef00c5a89cc76 AUX jabberd-1.6.1.1-undefineddebug.patch 1332 RMD160 1a9607a48f39f29544cf9b4b9c4543bd8ede7f43 SHA1 b928d25eca52352e625a819eb95f9802e0f0eaf0 SHA256 b91b6194f9220524c26cfb2ca1a9e1d733d47ec3858c9dd55620fbdfa5de37f0 -AUX jabberd-1.6.1.1-underlinking.patch 656 RMD160 8d3f1b0abd5d2775bd194ce5e84b655bef0e1dfe SHA1 8fd1e3a4cc9e5b7134d5b212c17a88946358e3dd SHA256 630ed514b83145dffa85f23fcfd5cfbf27cde1f9c80e6f217baa2635b8c3e3fe +AUX jabberd-1.6.1.1-underlinking.patch 1150 RMD160 55194c97290c849e371c6126d84c66c6ab09a4aa SHA1 69750527ad4214c40a6b0641b404740681acebbe SHA256 e6cdd793c6ad990343e5b114e719234663c27e830c052fb2b986b9dd31531318 AUX jabberd-1.6.1.1.init 556 RMD160 4ff905ca3bf4b13c3c1f057fe81ff86c49e994e3 SHA1 3790fbf4c6ec924619d9db17ed458fe0469a4bc2 SHA256 cd455d97526470b002c666b0b22ccb7351b94ac9e2ce52a8063a87a2d5fc1226 DIST jabberd-1.4.4.tar.gz 613479 RMD160 3273d0711fb6f0f6b95749d8bdb1ac5004aed074 SHA1 5fa5b561740720591997ed189609403af8c796c2 SHA256 72e23766e737588ed8d77ca7565a8f4b2bba73967c02e9b7ee4d2122d198a0af DIST jabberd14-1.6.1.1.tar.gz 834112 RMD160 0d3df653b6362f8e580c59ae1b4c9c6467b0bee5 SHA1 8b7ba77c9e02e9de7125e898900ff0ba5d65986e SHA256 8bba7f8e8781a088679bdcf0e46348a29da45de3eec2421f73575c5a6b8ddc31 EBUILD jabberd-1.4.4-r3.ebuild 3031 RMD160 68c59544284df908d2f6f9b2dad640f0170f7532 SHA1 92920535d35ce980272457b5eecf7b0d1dc685f4 SHA256 45137615b2608e116d24feb60c45cede24ab919078533b21f6616f63ecdb60df -EBUILD jabberd-1.6.1.1-r1.ebuild 3379 RMD160 8529da4da18e943fd44436c2b3643400b549a13a SHA1 69d373942b15b8d6f6bd96d14f211ad616b97aca SHA256 f43b70b32d244987a7afe614d64e2eb2e6393e4fca82c88ad01150ef35a01b40 -MISC ChangeLog 20696 RMD160 d69f55382771ea4aa9721ae4c808914d4cd7a330 SHA1 8fde632c704a273aef75f8330ddc3af7e8ebe9f9 SHA256 1d5dcf1181fdac50bae67b8118b9d97bbe150bca106607c63c9c6aa548eee1e3 +EBUILD jabberd-1.6.1.1-r1.ebuild 3138 RMD160 7e8252378ac5fac92dc8fc115f8e3806ef656543 SHA1 bfb7fb87bb0fa7410408e0d0eca1f47451052a24 SHA256 7bca6ea4ed12bf53e48b91e88b982488316dbfd8be66f5fc8c90c7093526d23c +MISC ChangeLog 20824 RMD160 7c2d513ce0d3cc1d153f9c88e2cf9afb614e07be SHA1 2ad467e2b1d655fabf773428e4441bd1c5192713 SHA256 deab49eb277e345b302262ee097795f6e8a3be44057826aa663ef8c651393e38 MISC metadata.xml 160 RMD160 a6ad0c05d64e31840114207dd45b62f889cbbe59 SHA1 be796d9ed970ebab12c2e943b724542bec95a3fe SHA256 11f74b4a52d7818d4a23729cf0dafa198080e898f1fc34aa63f639975f892940 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPt6rMAAoJEEdUh39IaPFNkvQH/0WFOIo41e6r0oBaHsC1kK5N -xYAPh5V9JvzaYG12RAJobT60dpMqGzQxFRazgQa2Lmg5R8EOUdiTEX125TnsrLUL -4GAiZhf3bCnT9cjwXNcnKP4+OapKdDE2RjcGo1sS+2yyOLUyh/gI9qLD9NlU4IeC -pb4BDS0tMhk++mYtrPTguLdraAaaz4S0NFBbPDt8RHyCFJy7jYvUjhCMzq/QfPqM -Y3ZqjYsiVEgnAoul8c1O3wt2nvH4hl7pJMGmjZ/Z+NQ53VHjisZ7dV/H5ShGUA0S -RcOLb+ujbGHsjT00vyVOLppltY2sx5wEzd8Xe7aIjRrxHYWOvdbsSOEH0lAx3fY= -=VFL0 +iQEcBAEBAgAGBQJPt7GNAAoJEEdUh39IaPFNyb4H/Rl+IsoW+aiPUCkjLDqCz+yc +GIGsWLYD1+pajGv6+w4iMA9nyAfgnWHxuFlZPt4NCin/bjpJVF5F5JcwtguEJL+k +p5VHTPPTpZ7LVwf+GJzB1YviulVrd7hD8YGme3Q1oV8IH2KUHJuDMKlz0opNSK4e +2GE+Na575oFOy4M+RmcRHufxMRGeLIf28CoLJFicwQdgw9YT7zSb39S0TZviKd9t +bt1zRtwdml0cjCNKHWahn2HTIc9I5sqGfH+jZ2YtFETb/7XJp5JUmVfiKiT/R6wA +PSkUql4TfVjjRd4R5Et895P+6kK79IJbXVNC6EU4ekAIGPtVYyUOg6wiBK+Ughs= +=7xR6 -----END PGP SIGNATURE----- diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch b/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch index ebf9eaa6a6c5..80f10f12f8df 100644 --- a/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch +++ b/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch @@ -1,3 +1,5 @@ +http://bugs.gentoo.org/200616 + --- jabberd/mio_tls.cc.orig 2008-03-06 10:21:01.669677189 +0100 +++ jabberd/mio_tls.cc 2008-03-06 10:35:04.744064592 +0100 @@ -612,7 +612,7 @@ diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch b/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch index 5626246d291f..dc7e7e88e764 100644 --- a/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch +++ b/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch @@ -1,5 +1,4 @@ -$(top_builddir)/jabberd/gcrypt_init.c is using function gcry_control() so we need to link against -lgcrypt - +http://bugs.gentoo.org/345255 http://bugs.gentoo.org/412871 --- jabberd/Makefile.am @@ -11,3 +10,14 @@ http://bugs.gentoo.org/412871 -libjabberd_la_LIBADD = -lexpat $(top_builddir)/jabberd/lib/libjabberdlib.la +libjabberd_la_LIBADD = -lexpat -lgcrypt $(top_builddir)/jabberd/lib/libjabberdlib.la libjabberd_la_LDFLAGS = @LDFLAGS@ @VERSION_INFO@ -export-dynamic -version-info 2:0:0 +--- jsm/Makefile.am ++++ jsm/Makefile.am +@@ -6,7 +6,7 @@ + noinst_HEADERS = jsm.h + + libjabberdsm_la_SOURCES = authreg.cc deliver.cc jsm.cc modules.cc offline.cc server.cc sessions.cc serialization.cc users.cc util.cc +-libjabberdsm_la_LIBADD = $(top_builddir)/jsm/modules/libjabberdsmmods.la $(top_builddir)/jabberd/libjabberd.la ++libjabberdsm_la_LIBADD = $(top_builddir)/jsm/modules/libjabberdsmmods.la $(top_builddir)/jabberd/libjabberd.la -lcrypt + libjabberdsm_la_LDFLAGS = @LDFLAGS@ @VERSION_INFO@ -module -version-info 2:0:0 + + INCLUDES = -I../jabberd -I../jabberd/lib diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild index 55d2888263bd..91c4e6f35f88 100644 --- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild +++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild @@ -1,31 +1,34 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.20 2012/05/19 14:14:48 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.21 2012/05/19 14:43:37 ssuominen Exp $ -WANT_AUTOMAKE="1.9" +EAPI=4 +WANT_AUTOMAKE=1.9 inherit autotools eutils DESCRIPTION="Open-source Jabber server" HOMEPAGE="http://www.jabber.org" SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz" -SLOT="0" LICENSE="GPL-2" +SLOT="0" KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd" IUSE="ipv6 mysql postgres" -RDEPEND=">=net-im/jabber-base-0.01 +RDEPEND="dev-libs/expat dev-libs/libgcrypt + dev-libs/popt >=dev-libs/pth-1.4.0 - dev-libs/expat net-dns/libidn - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-server ) + >=net-im/jabber-base-0.01 net-libs/gnutls - dev-libs/popt" + mysql? ( virtual/mysql ) + postgres? ( dev-db/postgresql-server )" DEPEND="${RDEPEND} - virtual/pkgconfig - !net-im/jabberd2" + !net-im/jabberd2 + virtual/pkgconfig" + +DOCS="mysql.sql pgsql_createdb.sql README* UPGRADE" S=${WORKDIR}/jabberd14-${PV} @@ -37,24 +40,20 @@ pkg_setup() { fi } -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-glibc-2.10.patch - - #Shamelessly stolen from Freebsd - epatch "${FILESDIR}"/${P}-gnutls2.2.patch - ## Gentoo bug #200616 - epatch "${FILESDIR}"/${P}-sandbox.patch - epatch "${FILESDIR}"/${P}-parallel-make.patch - epatch "${FILESDIR}"/${P}-undefineddebug.patch - epatch "${FILESDIR}"/${P}-libtool2.2.patch - epatch "${FILESDIR}"/${P}-underlinking.patch +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-glibc-2.10.patch \ + "${FILESDIR}"/${P}-gnutls2.2.patch \ + "${FILESDIR}"/${P}-sandbox.patch \ + "${FILESDIR}"/${P}-parallel-make.patch \ + "${FILESDIR}"/${P}-undefineddebug.patch \ + "${FILESDIR}"/${P}-libtool2.2.patch \ + "${FILESDIR}"/${P}-underlinking.patch eautoreconf } -src_compile() { +src_configure() { unset LC_ALL LC_CTYPE econf \ @@ -63,33 +62,27 @@ src_compile() { $(use ipv6 && echo --enable-ipv6) \ $(use_with mysql) \ $(use_with postgres postgresql) - - emake || die "emake failed" } src_install() { - emake DESTDIR="${D}" install || die "make install failed" + default - newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed" + newinitd "${FILESDIR}"/${P}.init jabber # net-im/jabber-base provides needed directories - rm -rf "${D}/var" - mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml" - mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist" + rm -rf "${ED}"/var + mv "${ED}"/etc/jabber/jabber.xml "${ED}"/etc/jabber/jabberd.xml + mv "${ED}"/etc/jabber/jabber.xml.dist "${ED}"/etc/jabber/jabberd.xml.dist sed -i \ -e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \ -e 's,/var/lib/log/jabberd,/var/log/jabber,g' \ -e 's,/var/lib/run/jabberd,/var/run/jabber,g' \ -e 's,jabber.pid,jabberd14.pid,g' \ - "${D}"/etc/jabber/jabberd.xml{,.dist} \ - || die "sed failed" - - dodoc README* mysql.sql pgsql_createdb.sql UPGRADE || die "dodoc failed" + "${ED}"/etc/jabber/jabberd.xml{,.dist} || die } pkg_postinst() { - echo elog 'The various IM transports for jabber are now separate packages,' elog 'which you will need to install separately if you want them:' @@ -111,6 +104,4 @@ pkg_postinst() { ewarn 'If you wish to continue to use the filespool backend, read' ewarn 'README.filespool.' echo - ebeep - } |