| 1 |
commit: fd115f21fea676352cff55337fd78486c6998897 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 7 23:35:00 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 7 23:35:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd115f21 |
| 7 |
|
| 8 |
sys-cluster/ipvsadm: drop old EAPI 4 ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-cluster/ipvsadm/Manifest | 1 - |
| 14 |
.../ipvsadm/files/ipvsadm-1.26-buildsystem.patch | 113 --------------------- |
| 15 |
.../files/ipvsadm-1.26-stack_smashing.patch | 32 ------ |
| 16 |
sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild | 64 ------------ |
| 17 |
4 files changed, 210 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/ipvsadm/Manifest b/sys-cluster/ipvsadm/Manifest |
| 20 |
index cc6ea43e31c..4107ba63500 100644 |
| 21 |
--- a/sys-cluster/ipvsadm/Manifest |
| 22 |
+++ b/sys-cluster/ipvsadm/Manifest |
| 23 |
@@ -1,3 +1,2 @@ |
| 24 |
-DIST ipvsadm-1.26.tar.gz 41700 BLAKE2B ef8b089bd4d21297ae6fde01a9214cf07633cc286765e6f8110b04589c5d9b6dc4624457899c4ea48ddd08b495a9c090b26d1dc5094b5fb7cafcd5342c729caf SHA512 873e23a6bdaabc153b00f1ede3853c947e8c8cfb4e18364d55197c74f26cc883ca469e074a90f377fbfd5e73e0cd6c1fe414c9f7a5c28b0d4431af58056eced4 |
| 25 |
DIST ipvsadm-1.27.tar.xz 38196 BLAKE2B 1b8a72b11c14a909b8b7459c459195d32bb7944ed4a01d963e2b85e8279c5d7d2fd095d9c23473c64dc15881a2b22b439b39c10b2019b3183f54e22535a258a9 SHA512 cf982b7981674c91d1b7516de7b55cf378b306ce4a53e13976b8eeb8610015c4fa4aa9d251bc4d329db8e05c1862863160af2d3c63b76263f290087cffdf1b80 |
| 26 |
DIST ipvsadm-1.28.tar.xz 38600 BLAKE2B 2a892f858324788b425f7c5aa6ce6a1548c6cd166977d1d36a5236061d1a6ce7e31f6bc1e24a7d53a57406e468271ccebc01330de6be9784c1a955b60eb89d16 SHA512 a1e10ce30751d9439f832e221e5c41b338f87dcc94a0b21329d908a9164f8882049af9d9d918b764b36c30e353d5b8db49d7088e60c24e4748713c06cccf7035 |
| 27 |
|
| 28 |
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index ba8e9450eb3..00000000000 |
| 31 |
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.26-buildsystem.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,113 +0,0 @@ |
| 34 |
---- a/Makefile |
| 35 |
-+++ b/Makefile |
| 36 |
-@@ -43,14 +43,13 @@ |
| 37 |
- INIT = $(BUILD_ROOT)/etc/rc.d/init.d |
| 38 |
- MKDIR = mkdir |
| 39 |
- INSTALL = install |
| 40 |
--STATIC_LIBS = libipvs/libipvs.a |
| 41 |
- |
| 42 |
- ifeq "${ARCH}" "sparc64" |
| 43 |
-- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow |
| 44 |
-+ CFLAGS := -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow |
| 45 |
- else |
| 46 |
-- CFLAGS = -Wall -Wunused -Wstrict-prototypes -g |
| 47 |
-+ CFLAGS := -g |
| 48 |
- endif |
| 49 |
-- |
| 50 |
-+OPTFLAGS += -Wall -Wunused -Wstrict-prototypes |
| 51 |
- |
| 52 |
- ##################################### |
| 53 |
- # No servicable parts below this line |
| 54 |
-@@ -94,10 +93,12 @@ |
| 55 |
- all: libs ipvsadm |
| 56 |
- |
| 57 |
- libs: |
| 58 |
-- make -C libipvs |
| 59 |
-+ $(MAKE) -C libipvs |
| 60 |
-+ |
| 61 |
-+$(OBJS): libs |
| 62 |
- |
| 63 |
--ipvsadm: $(OBJS) $(STATIC_LIBS) |
| 64 |
-- $(CC) $(CFLAGS) -o $@ $^ $(LIBS) |
| 65 |
-+ipvsadm: $(OBJS) |
| 66 |
-+ $(CC) $(LDFLAGS) $(OPTFLAGS) $(CFLAGS) -o $@ $^ -Llibipvs -lipvs $(LIBS) |
| 67 |
- |
| 68 |
--install: all |
| 69 |
-+install: |
| 70 |
- if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi |
| 71 |
-@@ -108,15 +109,13 @@ |
| 72 |
- $(INSTALL) -m 0644 ipvsadm.8 $(MAN) |
| 73 |
- $(INSTALL) -m 0644 ipvsadm-save.8 $(MAN) |
| 74 |
- $(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN) |
| 75 |
-- [ -d $(INIT) ] || $(MKDIR) -p $(INIT) |
| 76 |
-- $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm |
| 77 |
- |
| 78 |
- clean: |
| 79 |
- rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz |
| 80 |
- rm -rf debian/tmp |
| 81 |
- find . -name '*.[ao]' -o -name "*~" -o -name "*.orig" \ |
| 82 |
- -o -name "*.rej" -o -name core | xargs rm -f |
| 83 |
-- make -C libipvs clean |
| 84 |
-+ $(MAKE) -C libipvs clean |
| 85 |
- |
| 86 |
- distclean: clean |
| 87 |
- |
| 88 |
-@@ -149,4 +148,4 @@ |
| 89 |
- dpkg-buildpackage |
| 90 |
- |
| 91 |
- %.o: %.c |
| 92 |
-- $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< |
| 93 |
-+ $(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< |
| 94 |
---- a/libipvs/Makefile |
| 95 |
-+++ b/libipvs/Makefile |
| 96 |
-@@ -1,32 +1,39 @@ |
| 97 |
- # Makefile for libipvs |
| 98 |
- |
| 99 |
- CC = gcc |
| 100 |
--CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -fPIC |
| 101 |
-+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes |
| 102 |
- ifneq (0,$(HAVE_NL)) |
| 103 |
--CFLAGS += -DLIBIPVS_USE_NL |
| 104 |
-+DEFINES += -DLIBIPVS_USE_NL |
| 105 |
- endif |
| 106 |
- |
| 107 |
- INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \ |
| 108 |
- echo "-I../../."; fi;) |
| 109 |
--DEFINES = $(shell if [ ! -f ../../ip_vs.h ]; then \ |
| 110 |
-+DEFINES += $(shell if [ ! -f ../../ip_vs.h ]; then \ |
| 111 |
- echo "-DHAVE_NET_IP_VS_H"; fi;) |
| 112 |
- |
| 113 |
- .PHONY = all clean install dist distclean rpm rpms |
| 114 |
--STATIC_LIB = libipvs.a |
| 115 |
--SHARED_LIB = libipvs.so |
| 116 |
- |
| 117 |
--all: $(STATIC_LIB) $(SHARED_LIB) |
| 118 |
-+TARGETS = libipvs.so |
| 119 |
- |
| 120 |
--$(STATIC_LIB): libipvs.o ip_vs_nl_policy.o |
| 121 |
-+ifeq (1,$(STATIC_LIB)) |
| 122 |
-+TARGETS += libipvs.a |
| 123 |
-+endif |
| 124 |
-+ |
| 125 |
-+all: $(TARGETS) |
| 126 |
-+ |
| 127 |
-+libipvs.a: libipvs.o ip_vs_nl_policy.o |
| 128 |
- ar rv $@ $^ |
| 129 |
- |
| 130 |
--$(SHARED_LIB): libipvs.o ip_vs_nl_policy.o |
| 131 |
-- $(CC) -shared -Wl,-soname,$@ -o $@ $^ |
| 132 |
-+libipvs.so: libipvs.lo ip_vs_nl_policy.lo |
| 133 |
-+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^ |
| 134 |
-+ |
| 135 |
-+%.lo: %.c |
| 136 |
-+ $(CC) -fPIC $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< |
| 137 |
- |
| 138 |
- %.o: %.c |
| 139 |
-- $(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< |
| 140 |
-+ $(CC) $(OPTFLAGS) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $< |
| 141 |
- |
| 142 |
- clean: |
| 143 |
-- rm -f *.[ao] *~ *.orig *.rej core *.so |
| 144 |
-+ rm -f *.[ao] *~ *.orig *.rej core *.so *.lo |
| 145 |
- |
| 146 |
- distclean: clean |
| 147 |
|
| 148 |
diff --git a/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch b/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch |
| 149 |
deleted file mode 100644 |
| 150 |
index d36b0bf8abe..00000000000 |
| 151 |
--- a/sys-cluster/ipvsadm/files/ipvsadm-1.26-stack_smashing.patch |
| 152 |
+++ /dev/null |
| 153 |
@@ -1,32 +0,0 @@ |
| 154 |
-From 81529af388c0f0f4e4b169b7bcb285ef5e798f41 Mon Sep 17 00:00:00 2001 |
| 155 |
-From: Christian Ruppert <idl0r@g.o> |
| 156 |
-Date: Sat, 8 Oct 2011 02:05:37 +0200 |
| 157 |
-Subject: [PATCH] Fix stack smashing because of a typo |
| 158 |
- |
| 159 |
-IPVS_CMD_ATTR_MAX was the size of __IPVS_SVC_ATTR_MAX before, which has a |
| 160 |
-different size and thus it caused trouble. The right enum to use is |
| 161 |
-__IPVS_CMD_ATTR_MAX. |
| 162 |
- |
| 163 |
-Reported-by: Deniss Gaplevsky <slim@×××××.lv> |
| 164 |
-X-Gentoo-Bug: 371903 |
| 165 |
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/371903 |
| 166 |
---- |
| 167 |
- libipvs/ip_vs.h | 2 +- |
| 168 |
- 1 files changed, 1 insertions(+), 1 deletions(-) |
| 169 |
- |
| 170 |
-diff --git a/libipvs/ip_vs.h b/libipvs/ip_vs.h |
| 171 |
-index 9726a17..5e1d544 100644 |
| 172 |
---- a/libipvs/ip_vs.h |
| 173 |
-+++ b/libipvs/ip_vs.h |
| 174 |
-@@ -413,7 +413,7 @@ enum { |
| 175 |
- __IPVS_CMD_ATTR_MAX, |
| 176 |
- }; |
| 177 |
- |
| 178 |
--#define IPVS_CMD_ATTR_MAX (__IPVS_SVC_ATTR_MAX - 1) |
| 179 |
-+#define IPVS_CMD_ATTR_MAX (__IPVS_CMD_ATTR_MAX - 1) |
| 180 |
- |
| 181 |
- /* |
| 182 |
- * Attributes used to describe a service |
| 183 |
--- |
| 184 |
-1.7.3.4 |
| 185 |
- |
| 186 |
|
| 187 |
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild |
| 188 |
deleted file mode 100644 |
| 189 |
index ccaf28f7364..00000000000 |
| 190 |
--- a/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild |
| 191 |
+++ /dev/null |
| 192 |
@@ -1,64 +0,0 @@ |
| 193 |
-# Copyright 1999-2012 Gentoo Foundation |
| 194 |
-# Distributed under the terms of the GNU General Public License v2 |
| 195 |
- |
| 196 |
-EAPI=4 |
| 197 |
- |
| 198 |
-inherit eutils linux-info toolchain-funcs |
| 199 |
- |
| 200 |
-DESCRIPTION="utility to administer the IP virtual server services" |
| 201 |
-HOMEPAGE="http://linuxvirtualserver.org/" |
| 202 |
-SRC_URI="http://www.linuxvirtualserver.org/software/kernel-2.6/${P}.tar.gz" |
| 203 |
- |
| 204 |
-LICENSE="GPL-2" |
| 205 |
-SLOT="0" |
| 206 |
-KEYWORDS="amd64 ~ia64 ppc ppc64 s390 sparc x86" |
| 207 |
-IUSE="static-libs" |
| 208 |
- |
| 209 |
-RDEPEND=">=sys-libs/ncurses-5.2 |
| 210 |
- dev-libs/libnl:1.1 |
| 211 |
- >=dev-libs/popt-1.16" |
| 212 |
-DEPEND="${RDEPEND} |
| 213 |
- virtual/pkgconfig" |
| 214 |
- |
| 215 |
-pkg_pretend() { |
| 216 |
- if kernel_is 2 4; then |
| 217 |
- eerror "${P} supports only 2.6 series and later kernels, please try ${PN}-1.21 for 2.4 kernels" |
| 218 |
- die "wrong kernel version" |
| 219 |
- fi |
| 220 |
-} |
| 221 |
- |
| 222 |
-src_prepare() { |
| 223 |
- epatch "${FILESDIR}"/${P}-buildsystem.patch |
| 224 |
- epatch "${FILESDIR}/${P}-stack_smashing.patch" # bug 371903 |
| 225 |
- use static-libs && export STATIC=1 |
| 226 |
-} |
| 227 |
- |
| 228 |
-src_compile() { |
| 229 |
- emake -e \ |
| 230 |
- INCLUDE="-I.. -I." \ |
| 231 |
- CC="$(tc-getCC)" \ |
| 232 |
- HAVE_NL=1 \ |
| 233 |
- STATIC_LIB=${STATIC} \ |
| 234 |
- POPT_LIB="$(pkg-config --libs popt)" |
| 235 |
-} |
| 236 |
- |
| 237 |
-src_install() { |
| 238 |
- into / |
| 239 |
- dosbin ipvsadm ipvsadm-save ipvsadm-restore |
| 240 |
- |
| 241 |
- into /usr |
| 242 |
- doman ipvsadm.8 ipvsadm-save.8 ipvsadm-restore.8 |
| 243 |
- |
| 244 |
- newinitd "${FILESDIR}"/ipvsadm-init ipvsadm |
| 245 |
- keepdir /var/lib/ipvsadm |
| 246 |
- |
| 247 |
- use static-libs && dolib.a libipvs/libipvs.a |
| 248 |
- dolib.so libipvs/libipvs.so |
| 249 |
- |
| 250 |
- insinto /usr/include/ipvs |
| 251 |
- newins libipvs/libipvs.h ipvs.h |
| 252 |
-} |
| 253 |
- |
| 254 |
-pkg_postinst() { |
| 255 |
- einfo "You will need a kernel that has ipvs patches to use LVS." |
| 256 |
-} |
Archives