New release. Upstream has moved to kernel.org; update the build system fixes to apply.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 215 insertions, 14 deletions

diff --git a/sys-cluster/ipvsadm/ChangeLog b/sys-cluster/ipvsadm/ChangeLog
index 919fd837759d..540391912822 100644
--- a/sys-cluster/ipvsadm/ChangeLog
+++ b/sys-cluster/ipvsadm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/ipvsadm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.58 2012/05/04 07:20:31 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ChangeLog,v 1.59 2013/11/02 06:40:02 robbat2 Exp $
+
+*ipvsadm-1.27 (02 Nov 2013)
+
+  02 Nov 2013; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ipvsadm-1.27-buildsystem.patch, +ipvsadm-1.27.ebuild:
+  New release. Upstream has moved to kernel.org; update the build system fixes
+  to apply.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> ipvsadm-1.26-r2.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
@@ -206,4 +213,3 @@
 
   24 Feb 2003; Zach Welch <zwelch@gentoo.org> ipvsadm-1.21.ebuild files/digest-ipvsadm-1.21 :
   New ebuild from bug 15706; Brett Simpson <simpsonb@impmail.dnsalias.com>
-
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index 7fdedec7d647..e8912922596c 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,11 +1,14 @@
-AUX ipvsadm-1.26-buildsystem.patch 2989 RMD160 669c160e624995c8ac85787ec3b3435422a01b7f SHA1 58f72bcf13ed839e6b748c27a2176ac81ce29026 SHA256 88391e5122dbb7d8c92385647b2e8856bf7ad7231cfb2e73eda4e422addce198
-AUX ipvsadm-1.26-stack_smashing.patch 912 RMD160 b30256a31e77bc96a0ce37a9bc8d7a2a5f52ff0c SHA1 ca858b08f9acfa47aaa4920ee1c9274e7523a1e1 SHA256 78cf4f4d79fb2a39afdb532e46793c4e700fa08ecacd9fa2577d53b5ced389bd
-AUX ipvsadm-init 763 RMD160 ea17855665868a204f5f6b75e4fd2d5b89a3999e SHA1 f21095e34b2ba81b4b5ce0277f959c1dc418fc58 SHA256 3dfaa6cb9ef4db6428424bb8097daa3f202bb51d5acf6a864c3829eeacb3e76f
-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.26.tar.gz 41700 RMD160 7be7dcd00bdd640bbe9ab498180bb632d9c0d02d SHA1 fd23f6d81d4ac2a353db1fed694eaa5f2ff3ac6b SHA256 6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d
-EBUILD ipvsadm-1.21-r1.ebuild 1296 RMD160 6ddbc4b56efa78ee974b90cc5dc8add52ea41e51 SHA1 107c72988256a0bac31be8d7ac9e45e1d19190f6 SHA256 c6ebaf3186b461fd6e1a3d4c982d0505d64af7eb533ec03e579fafd55e145865
-EBUILD ipvsadm-1.24.ebuild 1390 RMD160 e3cd293f63b919ac691937a73e4bdb3044f71f6e SHA1 57dbd26d94bdd2fb623873dfc87e04ee9d545a83 SHA256 4af7355f2aa495346c3941bbbd3240bf10085a8188b7ff47c2d728f0c3365d12
-EBUILD ipvsadm-1.26-r2.ebuild 1585 RMD160 890041fe20df58cfd3f5919e67b94f7e7ce7e664 SHA1 50e0e34c57a693dd67c646db8f7aeb0c4c2f4a68 SHA256 4269b6750881c3fd3d0cb5fd5d9dbfd584e182df83c0ba2d941be9f0b271e06f
-MISC ChangeLog 8053 RMD160 324b938f4dd4f6c0d3a8a9ba4251d4b5ebce2410 SHA1 6b0f39f7bd0d8e740060def200e7da0ffbedab71 SHA256 edd28fe0f10dbb1cee478f79305f1cad1ee3fb4e7df2c8881614058f8697d4a8
-MISC metadata.xml 265 RMD160 d5a540823bf95c48407b6404d973473db9cab6d9 SHA1 b0e94d9558b9b83e49f5af440d81e26516f0c00c SHA256 e6d5d2ea1a07e2e00194e0a485c66904b09fefb05427e9373d184ab3161fcdda
+AUX ipvsadm-1.26-buildsystem.patch 2989 SHA256 88391e5122dbb7d8c92385647b2e8856bf7ad7231cfb2e73eda4e422addce198 SHA512 0802a919c947fed04774ec4034fba22036011e51802369d7c3c6a44ec7d118011aeac0ce3f7e2cb607efff133242c782ac8708b4ec3bb890c0013ad5d14863f8 WHIRLPOOL a5a723095f5dd158490f9d6e68a9288da65e5c16a789494863dadb1d2c786e0e1816e1b39a826a475c54f0413d3c508a5d5303cb129bed9d6e0e1640a8ac4881
+AUX ipvsadm-1.26-stack_smashing.patch 912 SHA256 78cf4f4d79fb2a39afdb532e46793c4e700fa08ecacd9fa2577d53b5ced389bd SHA512 b1b50914003e0bf8688bb7e2fe011242f2ec11df70e890f4af578780367c0d38718a47a942a0cef48088a85b36276896508a8b5d580d7a15a29ae20d5ae46b4c WHIRLPOOL 267d1580c793b6f9d90b39147cccc4c4dcdfdb67999884070e1fde279c72e77c9bbfa35f2adeb104c9ae0046e2d6f75598fd7de9205b56259c4caa2268427b12
+AUX ipvsadm-1.27-buildsystem.patch 3845 SHA256 6bdd76114fa80216aba0d470abfc348db7342a8c624d895590a22ec031eadc86 SHA512 480d885b49a912dc83a99dd48cd360262a34684916ac1300093252a76a0244189606c0b01779b9ec0e9a5cb4a5cb721373d319ada3086d7b373afe223bf047ac WHIRLPOOL daf5c8fde5657b74b46b18f0c763489432282f908e89be9b24d83a469cb3b7966ca791cc31501cdf1b8af2af20f335167ae0f4d7197c52576be1cde67be7c1b0
+AUX ipvsadm-init 763 SHA256 3dfaa6cb9ef4db6428424bb8097daa3f202bb51d5acf6a864c3829eeacb3e76f SHA512 44d95535b6b11338cac9353f2d84636828d9acc563a45f7d35b5eb22c1a3961e7242fc8e71c9e86986e0721cc5f2f7e60f32428118a0d55eb2482e19da039b6c WHIRLPOOL 602b269b5ba3eaa597acda1e4341c35e375ed64db54b711abdc12281c8527f19c26564a3681c098596af349a50e29ef513620b926b4a4770b24308f780a37223
+DIST ipvsadm-1.21-11.tar.gz 34030 SHA256 7b85020f84d4648166bce480d747d82ac5c9113f9a222e3de7eb92b7af0598fa
+DIST ipvsadm-1.24.tar.gz 32007 SHA256 773cbada48061e3afafaeaa2800d5382b8ff638b2c929293c14a793112a0642a
+DIST ipvsadm-1.26.tar.gz 41700 SHA256 6d6c46fecb1c532a892616b4445c73b71730e8790d5630f60269fd9cbee0eb2d SHA512 873e23a6bdaabc153b00f1ede3853c947e8c8cfb4e18364d55197c74f26cc883ca469e074a90f377fbfd5e73e0cd6c1fe414c9f7a5c28b0d4431af58056eced4 WHIRLPOOL 5f62ad434c7da3359adbfae1cdde230769f19f0c82a190d7ef6fc8ba340d5e761875a778ad9a1dd7162d385b8ebda89c589b7179d53d495c79e82056e46bce9a
+DIST ipvsadm-1.27.tar.xz 38196 SHA256 d360fb4dcf591e0a8a918831e2c02b1dc03e3c17ee1e60d0d70de9455238b3f8 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80 WHIRLPOOL fbb69043813ccba929bb044c9d7854b67e8d656ae08209f17e21d3d237ea4690cd8ea7a1e2806ce6b07f847eb9796e93649c7f5231d2356e8519696b5a504b73
+EBUILD ipvsadm-1.21-r1.ebuild 1296 SHA256 c6ebaf3186b461fd6e1a3d4c982d0505d64af7eb533ec03e579fafd55e145865 SHA512 0987370ec6c8daece3eeb8220960c1fbb1601f8c8d5b72cad5e9a0ac4cc19bdb1faa6c68fa9733f78ca744b72863b6e8eea2e0b5816a8ca269e8cd99f23c6e07 WHIRLPOOL dccb13b0237590ce693a0071e3fe6ebd9ccc9436a4d3005155b9fb0b5fdfc83b7b222c8b983115d7de948ab1febca67bc448b83164adca5fe3340cf8e79a83c7
+EBUILD ipvsadm-1.24.ebuild 1390 SHA256 4af7355f2aa495346c3941bbbd3240bf10085a8188b7ff47c2d728f0c3365d12 SHA512 9976f4e98757fb288d1155be5b9d6af3086d7ecd3034c54b1c2e9643b79839ae2cc24f2eed550c3bcd9ff9a584300f9d587b51f74bea941917eeb882b870ab07 WHIRLPOOL c6f6e2b13b4cdff48423c62c5fc02aa9981ff1a95be59f5e7f0aa643c4cb83ab51c13bca2f3b7d64da441d48ce22b9e13a5a730115e15aa3579820821135772b
+EBUILD ipvsadm-1.26-r2.ebuild 1585 SHA256 4269b6750881c3fd3d0cb5fd5d9dbfd584e182df83c0ba2d941be9f0b271e06f SHA512 3f29eb5eab3af14a9a1d4264ecaad2bc80778d32439c234a9e4e6a3a245f6275264d3c779fd194ea2a017c23dd589367ea09d2794f535485e3408959ddc5350e WHIRLPOOL 50cccadeeb15437dbe5778f00191f579c3dc9fc8ffdd9420a1b65de96ac67f671a28db40782d886283ee497f83971dd4223faf068a022b89c3b83cd05d6292fc
+EBUILD ipvsadm-1.27.ebuild 1629 SHA256 66b76810ea29f48c506f370bc640d52ae78bef3225738b8f2d90c2ead10c7519 SHA512 c6fe49294c20013a4d260a2926481812dc04f0da83e1df26f3cfdd35100517f5bdfce541142b73ec8240497bda2379b4c2c3856570ed0ad4fd4287b405378aeb WHIRLPOOL 740b7299500da98cfaf7951345155a0fe4d521cb1439f8b072ccdb734e16c4517133f04b10352fc4c3cae3be9b6a800ceda9bf9463e9dd08fa9d84b010e13428
+MISC ChangeLog 8290 SHA256 d55a18b1d8ab80221cb3b55a386e1f8f8c984c93c81e524e688b5a760d3d8ff8 SHA512 0e1e1200537c0cd92c1e68dc3074a8b5c5f3d5942aab7ba4446a270d7b86b1e47833677ea05934286dac0a07ce7cbd274092e010551cb46f849496de736d4548 WHIRLPOOL 15edc33bdce4c72577ad2d326b43b9c53e237c167f2159443782393ed6fc43832d2a9915db3bd5d9bebb65a5bfc6b702adc43252149f747cf007157ff626520f
+MISC metadata.xml 265 SHA256 e6d5d2ea1a07e2e00194e0a485c66904b09fefb05427e9373d184ab3161fcdda SHA512 dbfb05fc749fe4054b1e49ceacc75dd8e6d5b804abd4928f5d38e0e96caa7ad7817de7246275a3c4aabff79f0db8f90252380761f2bb0786c70da0b531ddf02f WHIRLPOOL 6ec1181688c423dd6895171f4cf7fa9a3012be94f5918dbfda2188d477ce59a659df232d1ae368e50fc1da34b35697d49394f63015ca1a711da5cc972f890aef
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
new file mode 100644
index 000000000000..50a50f2e00a7
--- /dev/null
+++ b/sys-cluster/ipvsadm/files/ipvsadm-1.27-buildsystem.patch
@@ -0,0 +1,125 @@
+diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/libipvs/Makefile ipvsadm-1.27/libipvs/Makefile
+--- ipvsadm-1.27.orig/libipvs/Makefile	2013-09-06 01:37:27.000000000 -0700
++++ ipvsadm-1.27/libipvs/Makefile	2013-11-01 23:31:14.359495884 -0700
+@@ -1,9 +1,9 @@
+ # Makefile for libipvs
+ 
+ CC		= gcc
+-CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
++#OPTFLAGS		= -Wall -Wunused -Wstrict-prototypes
+ ifneq (0,$(HAVE_NL))
+-CFLAGS		+= -DLIBIPVS_USE_NL
++DEFINES		+= -DLIBIPVS_USE_NL
+ CFLAGS		+= $(shell \
+ 		if which pkg-config > /dev/null 2>&1; then \
+ 		  if   pkg-config --cflags libnl-3.0  2> /dev/null; then :; \
+@@ -15,7 +15,7 @@
+ 
+ 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;)
+ DEFINES		+= $(shell if which pkg-config > /dev/null 2>&1; then \
+ 			 if   pkg-config --exists libnl-3.0; then :; \
+@@ -24,21 +24,31 @@
+ 			 then echo "-DFALLBACK_LIBNL1"; fi; fi)
+ 
+ .PHONY		= all clean install dist distclean rpm rpms
++
+ STATIC_LIB	= libipvs.a
+ SHARED_LIB	= libipvs.so
+ 
+-all:		$(STATIC_LIB) $(SHARED_LIB)
++TARGETS = $(SHARED_LIB)
++ifeq (1,$(STATIC))
++TARGETS += $(STATIC_LIB)
++endif
++all: $(TARGETS)
++
++SOURCES = libipvs.c ip_vs_nl_policy.c
+ 
+-$(STATIC_LIB):	libipvs.o ip_vs_nl_policy.o
++$(STATIC_LIB):	$(SOURCES:%.c=%.o)
+ 		ar rv $@ $^
+ 
+-$(SHARED_LIB):	libipvs.o ip_vs_nl_policy.o
+-		$(CC) -shared -Wl,-soname,$@ -o $@ $^
++$(SHARED_LIB):	$(SOURCES:%.c=%.lo)
++		$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
++
++%.lo:		%.c
++		$(CC) -fPIC $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
+ 
+ %.o:		%.c
+-		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
++		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
+ 
+ clean:
+-		rm -f *.[ao] *~ *.orig *.rej core *.so
++		rm -f *.[ao] *~ *.orig *.rej core *.so *.lo
+ 
+ distclean:	clean
+diff -Nuar -Nuar --exclude '*.orig' --exclude '*.rej' ipvsadm-1.27.orig/Makefile ipvsadm-1.27/Makefile
+--- ipvsadm-1.27.orig/Makefile	2013-09-06 01:37:27.000000000 -0700
++++ ipvsadm-1.27/Makefile	2013-11-01 23:31:44.259015958 -0700
+@@ -43,14 +43,13 @@
+ INIT		= $(BUILD_ROOT)/etc/rc.d/init.d
+ MKDIR		= mkdir
+ INSTALL		= install
+-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
+@@ -84,12 +83,14 @@
+ all:            libs ipvsadm
+ 
+ libs:
+-		make -C libipvs
++		$(MAKE) -C libipvs
++
++$(OBJS):	libs
+ 
+-ipvsadm:	$(OBJS) $(STATIC_LIBS)
+-		$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
++ipvsadm:	$(OBJS)
++		$(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ -Llibipvs -lipvs $(LIBS)
+ 
+-install:        all
++install:
+ 		if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
+ 		$(INSTALL) -m 0755 ipvsadm $(SBIN)
+ 		$(INSTALL) -m 0755 ipvsadm-save $(SBIN)
+@@ -98,15 +99,13 @@
+ 		$(INSTALL) -m 0644 ipvsadm.8 $(MAN)
+ 		$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
+ 		$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
+-		[ -d $(INIT) ] || $(MKDIR) -p $(INIT)
+-		$(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm
+ 
+ clean:
+ 		rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
+ 		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
+ 
+@@ -139,4 +138,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.27.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild
new file mode 100644
index 000000000000..e4a024aacfee
--- /dev/null
+++ b/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ipvsadm/ipvsadm-1.27.ebuild,v 1.1 2013/11/02 06:40:02 robbat2 Exp $
+
+EAPI=4
+
+inherit eutils linux-info toolchain-funcs
+
+DESCRIPTION="utility to administer the IP virtual server services"
+HOMEPAGE="http://linuxvirtualserver.org/"
+SRC_URI="https://kernel.org/pub/linux/utils/kernel/ipvsadm/ipvsadm-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	dev-libs/libnl
+	>=dev-libs/popt-1.16"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if kernel_is 2 4; then
+		eerror "${P} supports only 2.6 series and later kernels, please try ${PN}-1.21 for 2.4 kernels"
+		die "wrong kernel version"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.27-buildsystem.patch
+	# Merged upstream in 1.27
+	#epatch "${FILESDIR}"/${PN}-1.26-stack_smashing.patch # bug 371903 
+
+	use static-libs && export STATIC=1
+}
+
+src_compile() {
+	emake -e \
+		INCLUDE="-I.. -I." \
+		CC="$(tc-getCC)" \
+		HAVE_NL=1 \
+		STATIC=${STATIC} \
+		POPT_LIB="$(pkg-config --libs popt)"
+}
+
+src_install() {
+	into /
+	dosbin ipvsadm ipvsadm-save ipvsadm-restore
+
+	into /usr
+	doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8
+
+	newinitd "${FILESDIR}"/ipvsadm-init ipvsadm
+	keepdir /var/lib/ipvsadm
+
+	use static-libs && dolib.a libipvs/libipvs.a
+	dolib.so libipvs/libipvs.so
+
+	insinto /usr/include/ipvs
+	newins libipvs/libipvs.h ipvs.h
+}
+
+pkg_postinst() {
+	einfo "You will need a kernel that has ipvs patches to use LVS."
+}