diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-27 15:27:39 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-08-27 15:27:39 +0000 |
commit | 1bab606a9bd60187767bfafa8f697e8d04bf2a9a (patch) | |
tree | b09de38741e3ee44c0279ea0ec2b0b4c94b3ca5e /sys-cluster | |
parent | Version bump, fixes bug 334803 (diff) | |
download | historical-1bab606a9bd60187767bfafa8f697e8d04bf2a9a.tar.gz historical-1bab606a9bd60187767bfafa8f697e8d04bf2a9a.tar.bz2 historical-1bab606a9bd60187767bfafa8f697e8d04bf2a9a.zip |
Version bump. Per bug #322185. Thx to Hans Rakers for the patch. Remove profiler useflag since it alters just cflags.
Package-Manager: portage-2.2_rc68/cvs/Linux x86_64
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/keepalived/ChangeLog | 12 | ||||
-rw-r--r-- | sys-cluster/keepalived/Manifest | 5 | ||||
-rw-r--r-- | sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch | 110 | ||||
-rw-r--r-- | sys-cluster/keepalived/keepalived-1.1.20.ebuild | 65 |
4 files changed, 189 insertions, 3 deletions
diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog index d247972f80c1..1608931a3ba5 100644 --- a/sys-cluster/keepalived/ChangeLog +++ b/sys-cluster/keepalived/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-cluster/keepalived -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.63 2009/10/18 05:52:43 robbat2 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.64 2010/08/27 15:27:38 scarabeus Exp $ + +*keepalived-1.1.20 (27 Aug 2010) + + 27 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +keepalived-1.1.20.ebuild, + +files/keepalived-1.1.20-do-not-need-kernel-sources.patch: + Version bump. Per bug #322185. Thx to Hans Rakers for the patch. Remove + profiler useflag since it alters just cflags. *keepalived-1.1.19 (18 Oct 2009) diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest index 336a49fe6f23..2b42969e3856 100644 --- a/sys-cluster/keepalived/Manifest +++ b/sys-cluster/keepalived/Manifest @@ -4,11 +4,14 @@ AUX keepalived-1.1.13-linux-2.6.21-ip_vs.h 7549 RMD160 e6407ca157a3d7bcc810841b6 AUX keepalived-1.1.17-do-not-need-kernel-sources.patch 3022 RMD160 4dc8801417ee3e7e7f5f030cf03eff6adc312b74 SHA1 85389d6832ddf8c7d55267da8531bbceb69277e1 SHA256 61ffdb1c6dfc6ad34a03a76ad92c0401ed50234a882ad1d6d7d4fe38cd0a472a AUX keepalived-1.1.19-do-not-need-kernel-sources.patch 3408 RMD160 58fc563f55d8133204764d5df5259dab2a9b523b SHA1 06576c5e233d528d0732beada6a2b5b42c9abfa8 SHA256 3193a9c470d27959170cd17c09ede9fc5df0a9e7c91b7945e7bfd9a748c837fd AUX keepalived-1.1.19-gcc44-fixup.patch 2551 RMD160 5e315c502f26e825abf5e4b60d317571d0109b6a SHA1 a4853fe1e34e7115be1c38a220ca978aba49bb0d SHA256 4859a1b9039f5a72cd7f1197d2015cf241b5208a64e46fe44e375937e19d4aca +AUX keepalived-1.1.20-do-not-need-kernel-sources.patch 3277 RMD160 975f2a7aed51f3c538e158f6097e2c0663ccb82d SHA1 5f7cd816e6e5752315da06ffd762c9aed200a962 SHA256 b4a38f12714717016a7588dae8bd5d3717de0cc9a8d72f08b089e6ff0bd88bf4 DIST keepalived-1.1.15.tar.gz 227003 RMD160 5043db0e531fbed43a5488efb451d1e23a5267a5 SHA1 b51dcc7f2297f55ac58da62e1666a6c050195c10 SHA256 9d9291b0b24d9147a2a68c78c3227d996002ef6401340123f1dda3ddf8718b44 DIST keepalived-1.1.17.tar.gz 238195 RMD160 f82eb7d8757e19acca739456f4388d6bc7cd62fe SHA1 496c18f3fc20487b690c2bc822b18fac35de8284 SHA256 c6927bad8a4f0ac441cfa4e109605d5738cb39b31354e6ace6995dc6be57c08b DIST keepalived-1.1.19.tar.gz 241437 RMD160 d3d53dc6499fa6f573da3f34b683abdfab98b9f6 SHA1 4775fbb1f98a8bf54c0d5cdb5d7806e6744de82d SHA256 a3303a9b105912db6be0581296196aab1092852aa857b73604a359501dff5fe9 +DIST keepalived-1.1.20.tar.gz 233002 RMD160 49db329a4044f02fcf7874d49628e0a8034843e9 SHA1 cd04772c22ba38520b993acc4cfcb4d191889b6f SHA256 2e6d31bc8846fec00eb8d0bb20719a04bd34bb1144684bdb5e8085d9e1d3b8f2 EBUILD keepalived-1.1.15.ebuild 2490 RMD160 faa105b2d7422216131ebc169f792affd414f3d9 SHA1 cf4db4801b30aaa514d0ea200c5b76bb24911baa SHA256 e6b8878fbd1b34c42b712dac5f8aa205dbed6ecc81f3ffa5da43bb85b1b481e0 EBUILD keepalived-1.1.17.ebuild 2488 RMD160 7632886b1d939df7f4b9952050f9247c4792116a SHA1 7f3384f44c706b1c4653f832a78ee28d959e9baa SHA256 df883b7840475529647ce34d36186c3f81828f03eb549bf2db5ef548b8270d9b EBUILD keepalived-1.1.19.ebuild 2621 RMD160 ef7f48ad20aaafdad6f6406a12b2a5fded40db50 SHA1 ffaa6c19be29519198784cf35c1de49c8641eec3 SHA256 4c2c5c4aff65d6065270bd6f89ec55c7ef0777427b6d33be4ea37346e60bc119 -MISC ChangeLog 9675 RMD160 e07e94796805f5fbec7eb87a69254909ab540849 SHA1 321ec3b1af0daef84ad302e331a21fcf1e3f9338 SHA256 99c99a53c4ddc037b16630311c9ef32eff0478e6654c6027effb0c0032b7f462 +EBUILD keepalived-1.1.20.ebuild 1852 RMD160 ca65c760142b6311170352fa1f0183d3c63c294a SHA1 5a1b21955e8ff9d16a4ae5441c4e03ef752034e6 SHA256 d56add524fe2715482343294ba0f80e82b77b32c5d49afa6e7c7dedf2370480d +MISC ChangeLog 9979 RMD160 0afb8488120b3ecd911f6c1b91e90c3b05be87a1 SHA1 277f6628952c99e54fbb68393333ae379c9f44ac SHA256 b1b3982ef57bd48997e52faabae384fea1bd89e0bd503b772a970b16f2165b8d MISC metadata.xml 353 RMD160 bb97ddf008d2b8ec626960d0ef5509963d055993 SHA1 32027c725e0627c88081228eb9b09e1fa001c42c SHA256 4336bfedf26cb9bfbaf200475b8d1d598f972d12e52a50744eb034ece4cf3042 diff --git a/sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch new file mode 100644 index 000000000000..e56cc635907b --- /dev/null +++ b/sys-cluster/keepalived/files/keepalived-1.1.20-do-not-need-kernel-sources.patch @@ -0,0 +1,110 @@ +diff -urN keepalived-1.1.20-orig/configure.in keepalived-1.1.20/configure.in +--- keepalived-1.1.20-orig/configure.in 2009-11-05 18:23:04.000000000 +0100 ++++ keepalived-1.1.20/configure.in 2010-05-31 11:42:05.000000000 +0200 +@@ -51,103 +51,18 @@ + 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) && !defined(LINUX_VERSION_CODE) +- #include <linux/utsrelease.h> +- #endif +- int main (void) { +- FILE *fp = fopen ("linuxinfo", "w"); +- if (!fp) return 1; +- #if defined(UTS_RELEASE) +- fprintf (fp, "%s\n", UTS_RELEASE); +- #elif defined(LINUX_VERSION_CODE) +- fprintf (fp, "%d.%d.%d\n", LINUX_VERSION_CODE >> 16, (LINUX_VERSION_CODE >> 8) & 0xFF, LINUX_VERSION_CODE & 0xFF); +- #else +- fprintf (fp, "0.0.0\n"); /* Let's fail gently */ +- #endif +- 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 +- +- if test "$kernelversion" = "2.4"; then +- KERN="_KRNL_2_4_" +- AC_MSG_RESULT([2.4]) +- elif test "$kernelversion" = "2.6"; then +- KERN="_KRNL_2_6_" +- AC_MSG_RESULT([2.6]) +- else +- 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_6_" +- fi +- if test "$LINUX_MAJOR" = "0" -a "$LINUX_MINOR" = "0" -a "$LINUX_PATCH" = "0"; then +- AC_MSG_WARN([Cannot determine Linux Kernel version.]) +- fi +- fi +- ++KERN="_KRNL_2_6_" + 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.20.ebuild b/sys-cluster/keepalived/keepalived-1.1.20.ebuild new file mode 100644 index 000000000000..0851b974cccd --- /dev/null +++ b/sys-cluster/keepalived/keepalived-1.1.20.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.20.ebuild,v 1.1 2010/08/27 15:27:38 scarabeus Exp $ + +EAPI=3 + +inherit flag-o-matic autotools base + +DESCRIPTION="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" + +RDEPEND="dev-libs/popt + sys-apps/iproute2 + dev-libs/openssl" +DEPEND="${RDEPEND} + =sys-kernel/linux-headers-2.6*" + +PATCHES=( "${FILESDIR}"/${P}-do-not-need-kernel-sources.patch ) + +src_prepare() { + base_src_prepare + + # 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 + + eautoreconf +} + +src_configure() { + STRIP=/bin/true \ + econf \ + --enable-vrrp \ + $(use_enable debug) +} + +src_install() { + base_src_install + + newinitd "${FILESDIR}"/init-keepalived keepalived || die + + dodoc doc/keepalived.conf.SYNOPSIS || die + dodoc README CONTRIBUTORS INSTALL VERSION ChangeLog AUTHOR TODO || die + + docinto genhash + dodoc genhash/README genhash/AUTHOR genhash/ChangeLog genhash/VERSION || die + # This was badly named by upstream, it's more HOWTO than anything else. + newdoc INSTALL INSTALL+HOWTO || die + + # 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/ +} |