diff options
| -rw-r--r-- | sys-cluster/ipvsadm/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/Manifest | 5 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/files/ipvsadm-1.25-build-fixup.diff | 78 | ||||
| -rw-r--r-- | sys-cluster/ipvsadm/ipvsadm-1.25.ebuild | 67 |
4 files changed, 157 insertions, 2 deletions
diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog index b46848ced798..1d9a04f0ee09 100644 --- a/sys-cluster/ipvsadm/ChangeLog +++ b/sys-cluster/ipvsadm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-cluster/ipvsadm # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.38 2009/09/23 20:40:53 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.39 2009/10/10 17:39:51 robbat2 Exp $ + +*ipvsadm-1.25 (10 Oct 2009) + + 10 Oct 2009; Robin H. Johnson <robbat2@gentoo.org> +ipvsadm-1.25.ebuild, + +files/ipvsadm-1.25-build-fixup.diff: + Version bump as requested in bug #288436. Lots of build fixes included: + parallel fix, CFLAGS, real -fPIC, libnl, no more kernel sources needed. 23 Sep 2009; Patrick Lauer <patrick@gentoo.org> ipvsadm-1.21-r1.ebuild: Remove virtual/libc diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest index c39904062ca7..3aa0c7ca230f 100644 --- a/sys-cluster/ipvsadm/Manifest +++ b/sys-cluster/ipvsadm/Manifest @@ -1,7 +1,10 @@ +AUX ipvsadm-1.25-build-fixup.diff 2396 RMD160 e6a02b59140a19b301c6aa55d05ec67cedc5880f SHA1 4c45dbfd6eb597356db2d3bbda1ef157e336f47c SHA256 66c3d721e7a3e06e2d4d99121b372925e93e99078751a2be26c22d1ca3d0e9ec AUX ipvsadm-init 764 RMD160 447562aeb699ab12d97d088e97678c2ac98d7e5c SHA1 ce953d9013b3a5b0e35cc5901376d9bf54fd51f4 SHA256 296c44030f502882c361ff9ceff14fe1377150e9aae8dc6a9ddaa4bd94275868 DIST ipvsadm-1.21-11.tar.gz 34030 RMD160 2476f127bfd76313a7e32d0f6d2d4225164ef872 SHA1 368630ac25a772221deb101ee86b87a5341a5bab SHA256 7b85020f84d4648166bce480d747d82ac5c9113f9a222e3de7eb92b7af0598fa DIST ipvsadm-1.24.tar.gz 32007 RMD160 6647adb3914e69bd2a6924b5a0f675b670cd57ed SHA1 6bb6ce422745d0fe6409d91df7820fd5e7d2eeeb SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a +DIST ipvsadm-1.25.tar.gz 62248 RMD160 24f071a0ac431a47c8003d0af294f97f4dfdfbec SHA1 a23aadff85ccb55294ab2f4ca93a1869b8d22e2b SHA256 902c16a6458519fa5dd04457abe0c9edbd2ae4ae0334735634c6617c6eefeb69 EBUILD ipvsadm-1.21-r1.ebuild 1415 RMD160 bb267edda1dde5c0b165a78173e99849e086ebf9 SHA1 9ea71f7b1d82d2af66a2964299f865463e7c6181 SHA256 2b93fc2e4fdbdb44f6f5fb9e01ca0e70fb93d5ab83151611bc10d8f7e510429e EBUILD ipvsadm-1.24.ebuild 1516 RMD160 d509ea8d826ebad0869b23f7edcfeea284d7179f SHA1 7ec697bc0fd81d9dc4f29b20ab0a2ccae75dcbc8 SHA256 62906aca333ea00da374549de3a8393398d6461b085e39e7fb4fb20f35132f2b -MISC ChangeLog 4661 RMD160 e324834603668ee6802443ef8803a2ccb26f3f05 SHA1 13c779cac719262dab15a1575b612ea8309bcf9a SHA256 2026f9a535276d87e888b4fdb48c833a8b11d2b9f626f3216f761bb74ae75b5f +EBUILD ipvsadm-1.25.ebuild 1655 RMD160 9719e2b56ddd4cf22469a8b077f05ecf5bc6dc2e SHA1 8cb2ab52fd52fa456fc4f19f51e66f890d32a0c7 SHA256 aab7c7be49f72a826c57a0843cd579513718bdccbc0b1322db7987091c48ceac +MISC ChangeLog 4954 RMD160 cb31cf9e1932c1b68c43a1a46488a1113ea54dcc SHA1 db3e8cfc0ca99e08f8d19238d1cfaeb5462120eb SHA256 d6ca8f8bf6850423a06d216a0a29602961e37ec0f1da6ffc340a8a7b30662bbc MISC metadata.xml 338 RMD160 6a0b3d8db242801ec28383227a30a6de1bd19f07 SHA1 cbb841da3f9ed920ea69d8942256e9905a506239 SHA256 548ca1b886f774b9099b26854a9d4fd5505a1e09a3d39634bfcc10692fe7fd22 diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.25-build-fixup.diff b/sys-cluster/ipvsadm/files/ipvsadm-1.25-build-fixup.diff new file mode 100644 index 000000000000..dee72895c200 --- /dev/null +++ b/sys-cluster/ipvsadm/files/ipvsadm-1.25-build-fixup.diff @@ -0,0 +1,78 @@ +diff -Nuar --exclude '*.spec' ipvsadm-1.25.orig/libipvs/Makefile ipvsadm-1.25/libipvs/Makefile +--- ipvsadm-1.25.orig/libipvs/Makefile 2008-09-21 10:02:03.000000000 +0000 ++++ ipvsadm-1.25/libipvs/Makefile 2009-10-10 17:28:48.000000000 +0000 +@@ -1,14 +1,14 @@ + # Makefile for libipvs + + CC = gcc +-CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -fPIC + ifneq (0,$(HAVE_NL)) +-CFLAGS += -DLIBIPVS_USE_NL ++DEFINES += -DLIBIPVS_USE_NL + endif + + INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \ + echo "-I../../."; fi;) +-DEFINES = $(shell if [ ! -f ../../ip_vs.h ]; then \ ++DEFINES += $(shell if [ ! -f ../../ip_vs.h ]; then \ + echo "-DHAVE_NET_IP_VS_H"; fi;) + + .PHONY = all clean install dist distclean rpm rpms +@@ -24,7 +24,7 @@ + $(CC) -shared -Wl,-soname,$@ -o $@ $^ + + %.o: %.c +- $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< ++ $(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< + + clean: + rm -f *.[ao] *~ *.orig *.rej core *.so +diff -Nuar --exclude '*.spec' ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile +--- ipvsadm-1.25.orig/Makefile 2008-09-23 16:14:46.000000000 +0000 ++++ ipvsadm-1.25/Makefile 2009-10-10 17:33:55.000000000 +0000 +@@ -45,11 +45,11 @@ + STATIC_LIBS = libipvs/libipvs.a + + ifeq "${ARCH}" "sparc64" +- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow ++ CFLAGS := -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow + else +- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g ++ CFLAGS := -g + endif +- ++OPTFLAGS += -Wall -Wunused -Wstrict-prototypes + + ##################################### + # No servicable parts below this line +@@ -92,10 +92,12 @@ + all: libs ipvsadm + + libs: +- make -C libipvs ++ $(MAKE) -C libipvs ++ ++$(STATIC_LIBS): libs + + ipvsadm: $(OBJS) $(STATIC_LIBS) +- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) ++ $(CC) $(OPTFLAGS) $(CFLAGS) -o $@ $^ $(LIBS) + + install: all + if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi +@@ -115,7 +117,7 @@ + rm -rf debian/tmp + find . -name '*.[ao]' -o -name "*~" -o -name "*.orig" \ + -o -name "*.rej" -o -name core | xargs rm -f +- make -C libipvs clean ++ $(MAKE) -C libipvs clean + + distclean: clean + +@@ -148,4 +150,4 @@ + dpkg-buildpackage + + %.o: %.c +- $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< ++ $(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< diff --git a/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild new file mode 100644 index 000000000000..740a9182eee9 --- /dev/null +++ b/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.25.ebuild,v 1.1 2009/10/10 17:39:51 robbat2 Exp $ + +EAPI=2 +inherit linux-info toolchain-funcs eutils + +DESCRIPTION="utility to administer the IP virtual server services offered by the Linux kernel" +HOMEPAGE="http://linuxvirtualserver.org/" +SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.6/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc64 ~s390 ~sparc ~x86" +IUSE="" + +RDEPEND=">=sys-libs/ncurses-5.2 + dev-libs/libnl" +DEPEND="${RDEPEND}" + +pkg_setup() { + if kernel_is 2 4; then + eerror "${P} supports only 2.6 kernels, please try ${PN}-1.21 for 2.4 kernels" + die "wrong kernel version" + fi +} + +src_prepare() { + epatch "${FILESDIR}"/ipvsadm-1.25-build-fixup.diff +} + +src_compile() { + emake \ + INCLUDE="-I.. -I." \ + CFLAGS="${CFLAGS}" \ + CC="$(tc-getCC)" \ + HAVE_NL=1 \ + || die "error compiling source" +} + +src_install() { + into / + dosbin ipvsadm ipvsadm-save ipvsadm-restore || die + + into /usr + doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8 || die + + newinitd "${FILESDIR}"/ipvsadm-init ipvsadm + keepdir /var/lib/ipvsadm + + diropts -m 755 -o root -g root + dodir /usr/$(get_libdir) + dodir /usr/include/ipvs + + insopts -m 644 -o root -g root + insinto /usr/$(get_libdir) + dolib.a libipvs/libipvs.a || die + dolib.so libipvs/libipvs.so || die + + insinto /usr/include/ipvs + newins libipvs/libipvs.h ipvs.h || die +} + +pkg_postinst() { + einfo "You will need a kernel that has ipvs patches to use LVS." + einfo "This version is specifically for 2.6 kernels." +} |