diff options
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/ipvsadm/Manifest | 1 | ||||
-rw-r--r-- | sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch | 113 | ||||
-rw-r--r-- | sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch | 32 | ||||
-rw-r--r-- | sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild | 64 |
4 files changed, 0 insertions, 210 deletions
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest index cc6ea43e31cb..4107ba63500b 100644 --- a/sys-cluster/ipvsadm/Manifest +++ b/sys-cluster/ipvsadm/Manifest @@ -1,3 +1,2 @@ -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 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." -} |