version bump

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 200 insertions, 13 deletions

diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog
index 037342ce08e0..0081b121bf3e 100644
--- a/sys-cluster/keepalived/ChangeLog
+++ b/sys-cluster/keepalived/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/keepalived
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.59 2008/05/17 17:19:22 armin76 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.60 2009/02/16 14:32:42 wschlich Exp $
+
+*keepalived-1.1.16 (16 Feb 2009)
+
+  16 Feb 2009; Wolfram Schlich <wschlich@gentoo.org>
+  +files/keepalived-1.1.16-do-not-need-kernel-sources.patch,
+  +keepalived-1.1.16.ebuild:
+  version bump
 
   17 May 2008; Raúl Porcel <armin76@gentoo.org> keepalived-1.1.15.ebuild:
   ia64/sparc stable wrt #213995
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 3d1a45bc7a52..1d684ee0f527 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,21 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX init-keepalived 741 RMD160 7c01c24d94758cc93fe1c13f89dbc566187ee444 SHA1 90287f22be2a60af28d166481ce21ee497abf06b SHA256 eaae345df0c529fdfe5cf70e2a2626c280ecb483cfe8953b992fda29b5c7e063
 AUX keepalived-1.1.13-do-not-need-kernel-sources.patch 4226 RMD160 e42b1c1e713fa0e98947e69d9721d365586ab02f SHA1 01616ee6bbdc0ea1d5fa3b0aed13209e0d883357 SHA256 d63ee9a8e1b6eff05539ed08cf37bc07b3d485c7a6af33f2e494de97a22a8d00
 AUX keepalived-1.1.13-linux-2.6.21-ip_vs.h 7549 RMD160 e6407ca157a3d7bcc810841b6f5937cd7d477b0e SHA1 42386dd7a767704d0af9987578185d3fc8ccfd30 SHA256 67cb638f17e1189aedc0f464622744867549c91d637d38cdfd8d824aae841aea
+AUX keepalived-1.1.16-do-not-need-kernel-sources.patch 3022 RMD160 d226a3ba17ad138b218aca75b00fa3b19cca82ff SHA1 2021181de4a22d9df0b35358b6f30d43b5d069cc SHA256 90444a5886f3df225052cc51e59762340b3d1f367c11858ccb49b4d9ca9da3b7
 DIST keepalived-1.1.12.tar.gz 215811 RMD160 b42383b9ad71cd9bad511c8269a8bdd0774ae7dd SHA1 6ce5760d348fd1100fe89ad7a06d964ba1574cbb SHA256 ece1092af12c978ffd64d8795d4acaf5c329796f2a6678231f3a9c91f3dc9718
 DIST keepalived-1.1.13.tar.gz 222220 RMD160 63f0ee6d767eb90f8b8e0621e59ed3365a5b5d4d SHA1 360df575c12e6d700068766f731b14d35746d45e SHA256 2545bd681580a97f9c5c9bbe6fe2f8a91988d0c5f063bba048148b52ccde2568
 DIST keepalived-1.1.15.tar.gz 227003 RMD160 5043db0e531fbed43a5488efb451d1e23a5267a5 SHA1 b51dcc7f2297f55ac58da62e1666a6c050195c10 SHA256 9d9291b0b24d9147a2a68c78c3227d996002ef6401340123f1dda3ddf8718b44
+DIST keepalived-1.1.16.tar.gz 237676 RMD160 b383364ec09d172963cd13040cf0a24710f97ceb SHA1 0bd8b03a9e3f2bc94291ea9d9c68f8bde22321f1 SHA256 a64f6b9a28a2bdb7128907a44966585550bddf943277099b2a48d21a35011f31
 EBUILD keepalived-1.1.12.ebuild 1462 RMD160 1a3dcf865e50b1e3e349c57e2dbd498e1cf7fe93 SHA1 c2f28cd59515fe21b817c6108074044a891204ad SHA256 7d2de5248fc0409bbb79ad58d53c7c1150035354d1cfc2ea7b08f02d59d179d4
 EBUILD keepalived-1.1.13-r1.ebuild 2388 RMD160 52812e631029908ba97821d884b23756675df5ef SHA1 1d7f345b84ecd0e45aba77657f1f3d64a9944959 SHA256 ade996e3598ffafef81ea3ad57ec319c6a13cfd21e8471cf16b5c15b4c58c8dc
 EBUILD keepalived-1.1.15.ebuild 2489 RMD160 184be8e11c2230304413e001bb8dbeddbc815206 SHA1 b6b6526d35e2ae53872dd0153e37f4be594980a3 SHA256 2e7b0b8b052799ba0057b05197ba8ff7a8a6d5228cf0828aa6d1557fa5843524
-MISC ChangeLog 8830 RMD160 5f3cb3422a29190e9f9f2fdfdc1d1a22d6505be3 SHA1 672b24a82b900660bb5a140d321e306097eb79ab SHA256 648c7d9d3c69c6e78051528cc47f4a2e91742aba10d5a06da4dddde0ee813dba
+EBUILD keepalived-1.1.16.ebuild 2491 RMD160 58efd42157b9b9fc0dbd93ba8b8baa5442b14a5d SHA1 1fa2d59a7770d8dd395aba297f5e3228e976c3f7 SHA256 c7ed066984c0dab48c66cc1b2acff2bbd3cfaf889975bc0c58f4ab081e06ed65
+MISC ChangeLog 9024 RMD160 e6e9331474802f0c9b395d70f164c901f6e472cc SHA1 f606a09501577260aec04bf3784bb16db148cb14 SHA256 954b56fcf31dfa213ccf5d01da4ff394a8ad18c5108ae9d5e36ce66ef99d2652
 MISC metadata.xml 353 RMD160 bb97ddf008d2b8ec626960d0ef5509963d055993 SHA1 32027c725e0627c88081228eb9b09e1fa001c42c SHA256 4336bfedf26cb9bfbaf200475b8d1d598f972d12e52a50744eb034ece4cf3042
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7rQQACgkQ67wieSYcaxd8tgCfXQWpDgMrr7WaVmIuQykPkONC
-GaQAmQF+0KxxTKS1+WsWNvn/7as2DtTV
-=Lv1P
------END PGP SIGNATURE-----
diff --git a/sys-cluster/keepalived/files/keepalived-1.1.16-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.16-do-not-need-kernel-sources.patch
new file mode 100644
index 000000000000..d9fba417790a
--- /dev/null
+++ b/sys-cluster/keepalived/files/keepalived-1.1.16-do-not-need-kernel-sources.patch
@@ -0,0 +1,103 @@
+diff -urN keepalived-1.1.16.orig/configure.in keepalived-1.1.16/configure.in
+--- keepalived-1.1.16.orig/configure.in	2009-02-15 21:12:21.000000000 +0100
++++ keepalived-1.1.16/configure.in	2009-02-16 15:07:20.023468087 +0100
+@@ -48,95 +48,20 @@
+ AC_CHECK_LIB(popt, poptGetContext,,AC_MSG_ERROR([Popt libraries is required]))
+ 
+ dnl ----[ Kernel version check ]----
+-CPPFLAGS="$CPPFLAGS -I$kernelinc"
+-AC_MSG_CHECKING([for kernel version])
+-AC_TRY_RUN([
+-    #include <stdlib.h>
+-    #include <stdio.h>
+-    #include <linux/version.h>
+-    #if !defined(UTS_RELEASE)
+-    #include <linux/utsrelease.h>
+-    #endif
+-    int main (void) {
+-      FILE *fp = fopen ("linuxinfo", "w");
+-      if (!fp) return 1;
+-      fprintf (fp, "%s\n", UTS_RELEASE);
+-      fclose (fp); 
+-      return 0;
+-    } 
+-  ], [
+-    LINUX_MAJOR=`cat linuxinfo | cut -d'.' -f1`
+-    LINUX_MINOR=`cat linuxinfo | cut -d'.' -f2`
+-    LINUX_PATCH=`cat linuxinfo | cut -d'.' -f3`
+-  ], [
+-    LINUX_MAJOR="0"
+-    LINUX_MINOR="0"
+-    LINUX_PATCH="0"
+-  ], [
+-    LINUX_MAJOR="0"
+-    LINUX_MINOR="0"
+-    LINUX_PATCH="0"
+-  ])
+-  rm -f linuxinfo
+-  AC_MSG_RESULT([$LINUX_MAJOR.$LINUX_MINOR.$LINUX_PATCH])
+-  if test "$LINUX_MINOR" = "6"; then
+-    KERN="_KRNL_2_6_"
+-  elif test "$LINUX_MINOR" = "4"; then
+-    KERN="_KRNL_2_4_"
+-  else
+-    KERN="_KRNL_2_2_"
+-  fi
+-  if test "$LINUX_MAJOR" = "0" -a "$LINUX_MINOR" = "0" -a "$LINUX_PATCH" = "0"; then
+-    AC_MSG_WARN([Cannot determine Linux Kernel version.])
+-  fi
+-
+-AC_CHECK_FILE($kernelpath/net/core/link_watch.c, [
+-                LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
+-              ], [
+-                LINKWATCH_SUPPORT="_WITHOUT_LINKWATCH_"
+-              ])
+-
++KERN="_KRNL_2_6_"
++LINKWATCH_SUPPORT="_WITH_LINKWATCH_"
+ AC_SUBST(LINKWATCH_SUPPORT)
+ AC_SUBST(KERN)
+ 
+ dnl ----[ Checks for LVS and VRRP support ]----
+-IPVS_SUPPORT="_WITHOUT_LVS_"
+-if test "$enable_lvs" != "no"; then
+-  AC_CHECK_HEADER([net/ip_vs.h],
+-    [IPVS_SUPPORT="_WITH_LVS_"],
+-    [
+-      IPVS_SUPPORT="_WITHOUT_LVS_"
+-      AC_MSG_WARN([keepalived will be built without LVS support.])
+-    ])
+-fi  
++IPVS_SUPPORT="_WITH_LVS_"
+ 
+ if test "$IPVS_SUPPORT" = "_WITHOUT_LVS_" -a "$enable_vrrp" = "no"; then
+   AC_MSG_ERROR([keepalived MUST be compiled at least with LVS or VRRP framework])
+ fi
+ 
+ dnl ----[ IPVS syncd support probe ]---
+-IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
+-if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then
+-  AC_MSG_CHECKING([for IPVS syncd support])
+-  if test "$KERN" = "_KRNL_2_6_"; then
+-    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
+-  elif test "_KRNL_2_4_"; then
+-    IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
+-  else
+-    IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
+-  fi
+-
+-  if test "${IPVS_SUPPORT}" = "_WITHOUT_LVS_" -o "$enable_lvs_syncd" = "no"; then
+-    IPVS_SYNCD="_WITHOUT_IPVS_SYNCD_"
+-  fi
+-
+-  if test "$IPVS_SYNCD" = "_HAVE_IPVS_SYNCD_"; then
+-    AC_MSG_RESULT([yes])
+-  else
+-    AC_MSG_RESULT([no])
+-  fi
+-fi
+-
++IPVS_SYNCD="_HAVE_IPVS_SYNCD_"
+ AC_SUBST(IPVS_SYNCD)
+ 
+ dnl ----[ Checks for kernel netlink support ]----
diff --git a/sys-cluster/keepalived/keepalived-1.1.16.ebuild b/sys-cluster/keepalived/keepalived-1.1.16.ebuild
new file mode 100644
index 000000000000..c8be83e170c3
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-1.1.16.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.16.ebuild,v 1.1 2009/02/16 14:32:42 wschlich Exp $
+
+inherit flag-o-matic autotools
+
+DESCRIPTION="add a strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="debug profile"
+
+RDEPEND="dev-libs/popt
+	sys-apps/iproute2
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	=sys-kernel/linux-headers-2.6*"
+
+src_unpack() {
+	unpack ${A}
+
+	# This patch allows us to avoid needing kernel sources for the configure phase
+	EPATCH_OPTS="-p1 -d${S}" epatch \
+		"${FILESDIR}"/${P}-do-not-need-kernel-sources.patch
+	cd "${S}"
+	eautoreconf
+
+	# Prepare a suitable copy of the IPVS headers
+	# So that we don't need kernel sources at all!
+	mkdir -p "${S}"/include/net || die "Failed to prepare ipvs header directory"
+	cp -f "${FILESDIR}"/${PN}-1.1.13-linux-2.6.21-ip_vs.h \
+		"${S}"/include/net/ip_vs.h || die "Failed to add ipvs header"
+
+	# Ensure that keepalived can find the header that we are injecting
+	append-flags -I"${S}"/include
+}
+
+src_compile() {
+	local myconf
+
+	myconf="--enable-vrrp"
+
+	# This is not an error
+	# The upstream makefile used to add man/, but doesn't anymore
+	myconf="${myconf} --mandir=/usr/share/man"
+
+	use debug && myconf="${myconf} --enable-debug"
+
+	# disable -fomit-frame-pointer for profiling
+	if use profile; then
+		filter-flags -fomit-frame-pointer
+		myconf="${myconf} --enable-profile"
+	fi
+
+	econf ${myconf} STRIP=/bin/true || die "configure failed"
+	emake || die "emake failed (myconf=${myconf})"
+}
+
+src_install() {
+	# Not parallel safe
+	emake -j1 install DESTDIR="${D}" || die "emake install failed"
+
+	newinitd "${FILESDIR}"/init-keepalived keepalived
+
+	dodoc doc/keepalived.conf.SYNOPSIS
+	dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO
+
+	docinto genhash
+	dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION
+	# This was badly named by upstream, it's more HOWTO than anything else.
+	newdoc INSTALL INSTALL+HOWTO
+
+	# Security risk to bundle SSL certs
+	rm -f "${D}"/etc/keepalived/samples/*.pem
+	# Clean up sysvinit files
+	rm -rf "${D}"/etc/sysconfig "${D}"/etc/rc.d/
+}
+
+pkg_postinst() {
+	elog "For internal debug support, compile with USE=debug via package.use"
+}