gentoo resync : 16.09.2020

5 files changed, 1 insertions, 218 deletions

diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest
index 62014b9b6592..9afd967f70d9 100644
--- a/sys-cluster/ipvsadm/Manifest
+++ b/sys-cluster/ipvsadm/Manifest
@@ -1,12 +1,8 @@
-AUX ipvsadm-1.26-buildsystem.patch 2989 BLAKE2B 2f92374f9759a32e354d4954958d50cac4988d0d4243a86ea8771cc6034bbfea5d746bb15bbebbf10336989ca550fff90f10b3340554690642e9a055c854488b SHA512 0802a919c947fed04774ec4034fba22036011e51802369d7c3c6a44ec7d118011aeac0ce3f7e2cb607efff133242c782ac8708b4ec3bb890c0013ad5d14863f8
-AUX ipvsadm-1.26-stack_smashing.patch 912 BLAKE2B 8b22cd9dff9da2691342a3f680e96f821144ce39510c380ef32c455c3b6fcab14fe6749fb4b58beafcacdd959ec6ad1cff369368a61d3f8c81790ce21cd394f3 SHA512 b1b50914003e0bf8688bb7e2fe011242f2ec11df70e890f4af578780367c0d38718a47a942a0cef48088a85b36276896508a8b5d580d7a15a29ae20d5ae46b4c
 AUX ipvsadm-1.27-buildsystem.patch 3624 BLAKE2B d7a1f68a505d8c64fdbcdb5589a9b6b1e7afd5a4e7dfc131a741f1644433484efa795f51cee2fa6d5f6ca77e6a7312e75276d0a4e40f38f9aefc0f532dd0ce31 SHA512 e6e94a84f3a59a2ddb73c924f28e7e6799530aa5187d499c1b002ea1caa379c728dc96493e481d9e351e14209d5424de73c7deeb4f1e1d9846eb088fb160535d
 AUX ipvsadm-1.27-fix-daemon-state.patch 2001 BLAKE2B efc15ede85aae2c069399c0137c6ec5142bbcc35054b2de32e20cbbdc216e32c3628e4821d1da93f0d14580c67714cbd310147cbca776652301fbc5a275490dc SHA512 4898672423f2b53776bedde1b5d7a7dce27d8d66aeec6b749149209c6acabcfa8cc53b4f3342107f9a783c5a4afe88f4e8b10d25771c49d86b0def8777834c22
 AUX ipvsadm-init 649 BLAKE2B 9414395d1093c1bff940982f90e7416fef6d74e9972b5416d571fe8a41363c03c9a4ff819cd2be578911a7c6c021cc7f52910371030a479a58800b8eb4f3d2ff SHA512 3fb2467fc157599fbf308e27f39f0cb4164e3d36423500d89c7fbedec3ba6f5c7b3cbe52b077811011fc0faef73072a0bf3b204d728841773ef2a520c03130f7
-DIST ipvsadm-1.26.tar.gz 41700 BLAKE2B ef8b089bd4d21297ae6fde01a9214cf07633cc286765e6f8110b04589c5d9b6dc4624457899c4ea48ddd08b495a9c090b26d1dc5094b5fb7cafcd5342c729caf SHA512 873e23a6bdaabc153b00f1ede3853c947e8c8cfb4e18364d55197c74f26cc883ca469e074a90f377fbfd5e73e0cd6c1fe414c9f7a5c28b0d4431af58056eced4
 DIST ipvsadm-1.27.tar.xz 38196 BLAKE2B 1b8a72b11c14a909b8b7459c459195d32bb7944ed4a01d963e2b85e8279c5d7d2fd095d9c23473c64dc15881a2b22b439b39c10b2019b3183f54e22535a258a9 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80
 DIST ipvsadm-1.28.tar.xz 38600 BLAKE2B 2a892f858324788b425f7c5aa6ce6a1548c6cd166977d1d36a5236061d1a6ce7e31f6bc1e24a7d53a57406e468271ccebc01330de6be9784c1a955b60eb89d16 SHA512 a1e10ce30751d9439f832e221e5c41b338f87dcc94a0b21329d908a9164f8882049af9d9d918b764b36c30e353d5b8db49d7088e60c24e4748713c06cccf7035
-EBUILD ipvsadm-1.26-r2.ebuild 1469 BLAKE2B 70a3df9dd2fbcfea970db49634b1ab5d3423771407836f0610fe564506c4b44bdba4e431fe686387f00ecdb2a31d727a6eb08bb62db3eec924694e30deb70bdd SHA512 7a72a98e4b398101178bc182f1ce02cea6e6fd2bbac245d5b106de16e1fb5bc5803c4f3d7689c43d5c1d662828dd89cbb6e5bdc229f32df095151b69cceb04f1
 EBUILD ipvsadm-1.27-r1.ebuild 1737 BLAKE2B 9d566bb116e2ceaebb0d4c9976a2dadc6600fe37621dcacc9d8a3afbbb92d84e400742578ccfb61a5c4cd9d32d03dc8eca67363d286923239889103d56738402 SHA512 483e0cc7225ce09627a9d0fdf0bf89d0d2d2c1b305608f065909cd88f8cb5b4cffb5ab71da29292385ea2d7d8e305f663aff306f720008517315fbc33493e2e3
 EBUILD ipvsadm-1.28.ebuild 1647 BLAKE2B 8cd4abf89d8839d7bae690bed5ebd9cf78900700d892d93cb6e7b9b854f1d680bb622ef311ba5cad20204f6f3bd184f90c45090c599aac585a98765f7cf5a00f SHA512 0132f04eb777f8289ab98edff96a90e3d07309993bbbc892c9c5f2f0f1e1b238253a86dd8383aeff5c8446c8e0cb4f108f8159692ba0d659852568d49155b906
-MISC metadata.xml 366 BLAKE2B a293a113f5ae803fd517708791f7d3cf6e1322502d853c87f074981745f901487b31d89d7337a1f0dc34d636d4aeecd26917bd492b30f50b6166b33ccb10b124 SHA512 6cdf615e2158872ea3081ba02996989acd1fa9a02286946acc1b972c717943eba27b2733dc7c33ff782624017adc140fd125cf04f1d989e006c2541eb159f256
+MISC metadata.xml 263 BLAKE2B c9db7dc7f12c1017bee420587681f80a838eba2efed271c5a1fafa4595993917ea14b69fcc865a225561fa736bd93d9bfdac7b830a50d78707428d7fec4e987e SHA512 6ec307d6a3827ce21f67f8565a79a13d2833215571c459f42f06b8dd9184e1a41fa06b1cce8b3cf3555f4f875d9e366dd34ee786b6881dc18fb7d0b2d5c2acd5
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch
deleted file mode 100644
index ba8e9450eb35..000000000000
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch
+++ /dev/null
@@ -1,113 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -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
-@@ -94,10 +93,12 @@
- 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
-@@ -108,15 +109,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
- 
-@@ -149,4 +148,4 @@
- 		dpkg-buildpackage
- 
- %.o:	%.c
--		$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
-+		$(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<
---- a/libipvs/Makefile
-+++ b/libipvs/Makefile
-@@ -1,32 +1,39 @@
- # 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
- 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
--STATIC_LIB	= libipvs.a
--SHARED_LIB	= libipvs.so
- 
--all:		$(STATIC_LIB) $(SHARED_LIB)
-+TARGETS = libipvs.so
- 
--$(STATIC_LIB):	libipvs.o ip_vs_nl_policy.o
-+ifeq (1,$(STATIC_LIB))
-+TARGETS += libipvs.a
-+endif
-+
-+all:		$(TARGETS)
-+
-+libipvs.a:	libipvs.o ip_vs_nl_policy.o
- 		ar rv $@ $^
- 
--$(SHARED_LIB):	libipvs.o ip_vs_nl_policy.o
--		$(CC) -shared -Wl,-soname,$@ -o $@ $^
-+libipvs.so:	libipvs.lo ip_vs_nl_policy.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 --git a/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch
deleted file mode 100644
index d36b0bf8abe4..000000000000
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 81529af388c0f0f4e4b169b7bcb285ef5e798f41 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Sat, 8 Oct 2011 02:05:37 +0200
-Subject: [PATCH] Fix stack smashing because of a typo
-
-IPVS_CMD_ATTR_MAX was the size of __IPVS_SVC_ATTR_MAX before, which has a
-different size and thus it caused trouble. The right enum to use is
-__IPVS_CMD_ATTR_MAX.
-
-Reported-by: Deniss Gaplevsky <slim@inbox.lv>
-X-Gentoo-Bug: 371903
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/371903
----
- libipvs/ip_vs.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h
-index 9726a17..5e1d544 100644
---- a/libipvs/ip_vs.h
-+++ b/libipvs/ip_vs.h
-@@ -413,7 +413,7 @@ enum {
- 	__IPVS_CMD_ATTR_MAX,
- };
- 
--#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1)
-+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1)
- 
- /*
-  * Attributes used to describe a service
--- 
-1.7.3.4
-
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
deleted file mode 100644
index ccaf28f73640..000000000000
--- a/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils linux-info toolchain-funcs
-
-DESCRIPTION="utility to administer the IP virtual server services"
-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 ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	dev-libs/libnl:1.1
-	>=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}"/${P}-buildsystem.patch
-	epatch "${FILESDIR}/${P}-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_LIB=${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."
-}
diff --git a/sys-cluster/ipvsadm/metadata.xml b/sys-cluster/ipvsadm/metadata.xml
index 7ca6574ca7b4..f3834ba82253 100644
--- a/sys-cluster/ipvsadm/metadata.xml
+++ b/sys-cluster/ipvsadm/metadata.xml
@@ -5,8 +5,4 @@
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>
   </maintainer>
-  
-  <longdescription>
-    Administration tools for linux virtual server clusters
-  </longdescription>
 </pkgmetadata>