diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2007-04-28 07:24:35 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2007-04-28 07:24:35 +0000 |
commit | a4e0c64ab870b5f634eb46273bc4cd1f6606bc9b (patch) | |
tree | 9150c19cec29f48eac79bc5e050816fb21618154 /sys-cluster | |
parent | re-add manifest (diff) | |
download | gentoo-2-a4e0c64ab870b5f634eb46273bc4cd1f6606bc9b.tar.gz gentoo-2-a4e0c64ab870b5f634eb46273bc4cd1f6606bc9b.tar.bz2 gentoo-2-a4e0c64ab870b5f634eb46273bc4cd1f6606bc9b.zip |
Do a large cleanup of the keepalived ebuild, so that it will build without kernel sources present, and fix other things that could never have worked in the first place, like the init.d pointing to where the binary wasn't.
(Portage version: 2.1.2.4)
Diffstat (limited to 'sys-cluster')
5 files changed, 500 insertions, 1 deletions
diff --git a/sys-cluster/keepalived/ChangeLog b/sys-cluster/keepalived/ChangeLog index 5b4e2277ffad..d3dbc30767a5 100644 --- a/sys-cluster/keepalived/ChangeLog +++ b/sys-cluster/keepalived/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-cluster/keepalived # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.39 2007/04/26 06:41:56 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/ChangeLog,v 1.40 2007/04/28 07:24:35 robbat2 Exp $ + +*keepalived-1.1.13-r1 (28 Apr 2007) + + 28 Apr 2007; Robin H. Johnson <robbat2@gentoo.org> + +files/keepalived-1.1.13-do-not-need-kernel-sources.patch, + +files/keepalived-1.1.13-linux-2.6.21-ip_vs.h, + +keepalived-1.1.13-r1.ebuild: + Do a large cleanup of the keepalived ebuild, so that it will build without + kernel sources present, and fix other things that could never have worked in + the first place, like the init.d pointing to where the binary wasn't. 26 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; metadata.xml: Update for cluster herd split to hp-cluster and ha-cluster. diff --git a/sys-cluster/keepalived/files/digest-keepalived-1.1.13-r1 b/sys-cluster/keepalived/files/digest-keepalived-1.1.13-r1 new file mode 100644 index 000000000000..899c89d04da3 --- /dev/null +++ b/sys-cluster/keepalived/files/digest-keepalived-1.1.13-r1 @@ -0,0 +1,3 @@ +MD5 578bdb8e3ff4cca50fc877893bad658c keepalived-1.1.13.tar.gz 222220 +RMD160 63f0ee6d767eb90f8b8e0621e59ed3365a5b5d4d keepalived-1.1.13.tar.gz 222220 +SHA256 2545bd681580a97f9c5c9bbe6fe2f8a91988d0c5f063bba048148b52ccde2568 keepalived-1.1.13.tar.gz 222220 diff --git a/sys-cluster/keepalived/files/keepalived-1.1.13-do-not-need-kernel-sources.patch b/sys-cluster/keepalived/files/keepalived-1.1.13-do-not-need-kernel-sources.patch new file mode 100644 index 000000000000..2ea18265ad60 --- /dev/null +++ b/sys-cluster/keepalived/files/keepalived-1.1.13-do-not-need-kernel-sources.patch @@ -0,0 +1,142 @@ +diff -Nuar keepalived-1.1.13.orig/configure.in keepalived-1.1.13/configure.in +--- keepalived-1.1.13.orig/configure.in 2006-10-10 02:19:38.000000000 -0700 ++++ keepalived-1.1.13/configure.in 2007-04-27 23:18:22.463502718 -0700 +@@ -48,103 +48,14 @@ + 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_" +- IPVS_MAJOR="0" +- IPVS_MINOR="0" +- IPVS_PATCH="0" +- AC_MSG_WARN([keepalived will be built without LVS support.]) +- ]) +-fi +- +-if test "$IPVS_SUPPORT" = "_WITH_LVS_"; then +- AC_MSG_CHECKING([for IPVS version]) +- AC_TRY_RUN([ +- #include <stdlib.h> +- #include <stdio.h> +- #include <net/ip_vs.h> +- int main (void) { +- FILE *fp = fopen ("ipvsinfo", "w"); +- if (!fp) return 1; +- fprintf (fp, "%d\n%d\n%d\n", NVERSION(IP_VS_VERSION_CODE)); +- fclose (fp); +- return 0; +- } +- ], [ +- IPVS_MAJOR=`head -n 1 ipvsinfo | tail -n 1` +- IPVS_MINOR=`head -n 2 ipvsinfo | tail -n 1` +- IPVS_PATCH=`head -n 3 ipvsinfo | tail -n 1` +- ], [ +- IPVS_MAJOR="0" +- IPVS_MINOR="0" +- IPVS_PATCH="0" +- ], [ +- IPVS_MAJOR="0" +- IPVS_MINOR="0" +- IPVS_PATCH="0" +- ]) +- rm -f ipvsinfo +- AC_MSG_RESULT([$IPVS_MAJOR.$IPVS_MINOR.$IPVS_PATCH]) +- if test "$IPVS_MAJOR" = "0" -a "$IPVS_MINOR" = "0" -a "$IPVS_PATCH" = "0"; then +- AC_MSG_WARN([Cannot determine IPVS version.]) +- fi +-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]) +@@ -153,30 +64,7 @@ + dnl ----[ IPVS syncd support probe ]--- + dnl Sync daemon is supported since IPVS 0.9.2 for kernel 2.4 + +-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 "$IPVS_MAJOR" -ge 1 -a "$KERN" = "_KRNL_2_4_"; then +- IPVS_SYNCD="_HAVE_IPVS_SYNCD_" +- elif test "$IPVS_MINOR" -ge 9 -a "$IPVS_PATCH" -ge 2 -a "$KERN" = "_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/files/keepalived-1.1.13-linux-2.6.21-ip_vs.h b/sys-cluster/keepalived/files/keepalived-1.1.13-linux-2.6.21-ip_vs.h new file mode 100644 index 000000000000..57a9c71fdd5d --- /dev/null +++ b/sys-cluster/keepalived/files/keepalived-1.1.13-linux-2.6.21-ip_vs.h @@ -0,0 +1,262 @@ +/* This file is copied from the Linux kernel sources, as of 2.6.21. + * The IP_VS_VERSION_CODE has not changed in a very long time :-). + * The __KERNEL__ portion has been removed for size. + * Robin H. Johnson <robbat2@gentoo.org> + * 27 April 2007 + */ +/* + * IP Virtual Server + * data structure and functionality definitions + */ + +#ifndef _IP_VS_H +#define _IP_VS_H + +#include <asm/types.h> /* For __uXX types */ +#include <linux/types.h> /* For __beXX types in userland */ + +#define IP_VS_VERSION_CODE 0x010201 +#define NVERSION(version) \ + (version >> 16) & 0xFF, \ + (version >> 8) & 0xFF, \ + version & 0xFF + +/* + * Virtual Service Flags + */ +#define IP_VS_SVC_F_PERSISTENT 0x0001 /* persistent port */ +#define IP_VS_SVC_F_HASHED 0x0002 /* hashed entry */ + +/* + * Destination Server Flags + */ +#define IP_VS_DEST_F_AVAILABLE 0x0001 /* server is available */ +#define IP_VS_DEST_F_OVERLOAD 0x0002 /* server is overloaded */ + +/* + * IPVS sync daemon states + */ +#define IP_VS_STATE_NONE 0x0000 /* daemon is stopped */ +#define IP_VS_STATE_MASTER 0x0001 /* started as master */ +#define IP_VS_STATE_BACKUP 0x0002 /* started as backup */ + +/* + * IPVS socket options + */ +#define IP_VS_BASE_CTL (64+1024+64) /* base */ + +#define IP_VS_SO_SET_NONE IP_VS_BASE_CTL /* just peek */ +#define IP_VS_SO_SET_INSERT (IP_VS_BASE_CTL+1) +#define IP_VS_SO_SET_ADD (IP_VS_BASE_CTL+2) +#define IP_VS_SO_SET_EDIT (IP_VS_BASE_CTL+3) +#define IP_VS_SO_SET_DEL (IP_VS_BASE_CTL+4) +#define IP_VS_SO_SET_FLUSH (IP_VS_BASE_CTL+5) +#define IP_VS_SO_SET_LIST (IP_VS_BASE_CTL+6) +#define IP_VS_SO_SET_ADDDEST (IP_VS_BASE_CTL+7) +#define IP_VS_SO_SET_DELDEST (IP_VS_BASE_CTL+8) +#define IP_VS_SO_SET_EDITDEST (IP_VS_BASE_CTL+9) +#define IP_VS_SO_SET_TIMEOUT (IP_VS_BASE_CTL+10) +#define IP_VS_SO_SET_STARTDAEMON (IP_VS_BASE_CTL+11) +#define IP_VS_SO_SET_STOPDAEMON (IP_VS_BASE_CTL+12) +#define IP_VS_SO_SET_RESTORE (IP_VS_BASE_CTL+13) +#define IP_VS_SO_SET_SAVE (IP_VS_BASE_CTL+14) +#define IP_VS_SO_SET_ZERO (IP_VS_BASE_CTL+15) +#define IP_VS_SO_SET_MAX IP_VS_SO_SET_ZERO + +#define IP_VS_SO_GET_VERSION IP_VS_BASE_CTL +#define IP_VS_SO_GET_INFO (IP_VS_BASE_CTL+1) +#define IP_VS_SO_GET_SERVICES (IP_VS_BASE_CTL+2) +#define IP_VS_SO_GET_SERVICE (IP_VS_BASE_CTL+3) +#define IP_VS_SO_GET_DESTS (IP_VS_BASE_CTL+4) +#define IP_VS_SO_GET_DEST (IP_VS_BASE_CTL+5) /* not used now */ +#define IP_VS_SO_GET_TIMEOUT (IP_VS_BASE_CTL+6) +#define IP_VS_SO_GET_DAEMON (IP_VS_BASE_CTL+7) +#define IP_VS_SO_GET_MAX IP_VS_SO_GET_DAEMON + + +/* + * IPVS Connection Flags + */ +#define IP_VS_CONN_F_FWD_MASK 0x0007 /* mask for the fwd methods */ +#define IP_VS_CONN_F_MASQ 0x0000 /* masquerading/NAT */ +#define IP_VS_CONN_F_LOCALNODE 0x0001 /* local node */ +#define IP_VS_CONN_F_TUNNEL 0x0002 /* tunneling */ +#define IP_VS_CONN_F_DROUTE 0x0003 /* direct routing */ +#define IP_VS_CONN_F_BYPASS 0x0004 /* cache bypass */ +#define IP_VS_CONN_F_SYNC 0x0020 /* entry created by sync */ +#define IP_VS_CONN_F_HASHED 0x0040 /* hashed entry */ +#define IP_VS_CONN_F_NOOUTPUT 0x0080 /* no output packets */ +#define IP_VS_CONN_F_INACTIVE 0x0100 /* not established */ +#define IP_VS_CONN_F_OUT_SEQ 0x0200 /* must do output seq adjust */ +#define IP_VS_CONN_F_IN_SEQ 0x0400 /* must do input seq adjust */ +#define IP_VS_CONN_F_SEQ_MASK 0x0600 /* in/out sequence mask */ +#define IP_VS_CONN_F_NO_CPORT 0x0800 /* no client port set yet */ +#define IP_VS_CONN_F_TEMPLATE 0x1000 /* template, not connection */ + +/* Move it to better place one day, for now keep it unique */ +#define NFC_IPVS_PROPERTY 0x10000 + +#define IP_VS_SCHEDNAME_MAXLEN 16 +#define IP_VS_IFNAME_MAXLEN 16 + + +/* + * The struct ip_vs_service_user and struct ip_vs_dest_user are + * used to set IPVS rules through setsockopt. + */ +struct ip_vs_service_user { + /* virtual service addresses */ + u_int16_t protocol; + __be32 addr; /* virtual ip address */ + __be16 port; + u_int32_t fwmark; /* firwall mark of service */ + + /* virtual service options */ + char sched_name[IP_VS_SCHEDNAME_MAXLEN]; + unsigned flags; /* virtual service flags */ + unsigned timeout; /* persistent timeout in sec */ + __be32 netmask; /* persistent netmask */ +}; + + +struct ip_vs_dest_user { + /* destination server address */ + __be32 addr; + __be16 port; + + /* real server options */ + unsigned conn_flags; /* connection flags */ + int weight; /* destination weight */ + + /* thresholds for active connections */ + u_int32_t u_threshold; /* upper threshold */ + u_int32_t l_threshold; /* lower threshold */ +}; + + +/* + * IPVS statistics object (for user space) + */ +struct ip_vs_stats_user +{ + __u32 conns; /* connections scheduled */ + __u32 inpkts; /* incoming packets */ + __u32 outpkts; /* outgoing packets */ + __u64 inbytes; /* incoming bytes */ + __u64 outbytes; /* outgoing bytes */ + + __u32 cps; /* current connection rate */ + __u32 inpps; /* current in packet rate */ + __u32 outpps; /* current out packet rate */ + __u32 inbps; /* current in byte rate */ + __u32 outbps; /* current out byte rate */ +}; + + +/* The argument to IP_VS_SO_GET_INFO */ +struct ip_vs_getinfo { + /* version number */ + unsigned int version; + + /* size of connection hash table */ + unsigned int size; + + /* number of virtual services */ + unsigned int num_services; +}; + + +/* The argument to IP_VS_SO_GET_SERVICE */ +struct ip_vs_service_entry { + /* which service: user fills in these */ + u_int16_t protocol; + __be32 addr; /* virtual address */ + __be16 port; + u_int32_t fwmark; /* firwall mark of service */ + + /* service options */ + char sched_name[IP_VS_SCHEDNAME_MAXLEN]; + unsigned flags; /* virtual service flags */ + unsigned timeout; /* persistent timeout */ + __be32 netmask; /* persistent netmask */ + + /* number of real servers */ + unsigned int num_dests; + + /* statistics */ + struct ip_vs_stats_user stats; +}; + + +struct ip_vs_dest_entry { + __be32 addr; /* destination address */ + __be16 port; + unsigned conn_flags; /* connection flags */ + int weight; /* destination weight */ + + u_int32_t u_threshold; /* upper threshold */ + u_int32_t l_threshold; /* lower threshold */ + + u_int32_t activeconns; /* active connections */ + u_int32_t inactconns; /* inactive connections */ + u_int32_t persistconns; /* persistent connections */ + + /* statistics */ + struct ip_vs_stats_user stats; +}; + + +/* The argument to IP_VS_SO_GET_DESTS */ +struct ip_vs_get_dests { + /* which service: user fills in these */ + u_int16_t protocol; + __be32 addr; /* virtual address */ + __be16 port; + u_int32_t fwmark; /* firwall mark of service */ + + /* number of real servers */ + unsigned int num_dests; + + /* the real servers */ + struct ip_vs_dest_entry entrytable[0]; +}; + + +/* The argument to IP_VS_SO_GET_SERVICES */ +struct ip_vs_get_services { + /* number of virtual services */ + unsigned int num_services; + + /* service table */ + struct ip_vs_service_entry entrytable[0]; +}; + + +/* The argument to IP_VS_SO_GET_TIMEOUT */ +struct ip_vs_timeout_user { + int tcp_timeout; + int tcp_fin_timeout; + int udp_timeout; +}; + + +/* The argument to IP_VS_SO_GET_DAEMON */ +struct ip_vs_daemon_user { + /* sync daemon state (master/backup) */ + int state; + + /* multicast interface name */ + char mcast_ifn[IP_VS_IFNAME_MAXLEN]; + + /* SyncID we belong to */ + int syncid; +}; + + +#ifdef __KERNEL__ +/* This portion of the code removed for size. + * Robin H. Johnson <robbat2@gentoo.org> + * 27 April 2007 */ +#endif /* __KERNEL__ */ + +#endif /* _IP_VS_H */ diff --git a/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild b/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild new file mode 100644 index 000000000000..2374e06bdfb9 --- /dev/null +++ b/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/keepalived/keepalived-1.1.13-r1.ebuild,v 1.1 2007/04/28 07:24:35 robbat2 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}/${PN}-1.1.13-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 adds man/ + myconf="${myconf} --mandir=/usr/share" + + 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 +} + +pkg_postinst() { + elog "For internal debug support, compile with USE=debug via package.use" +} |