From 79c5c78115443df7c26b643aca38e4679950a6ab Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Wed, 12 Sep 2018 14:52:46 +0200
Subject: net/ipvsadm: add Virtual Server Administration Tool

Add the ipvsadm command line tool to set up, maintain or inspect the virtual
server table in the Linux kernel.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
 net/ipvsadm/patches/001-Makefile.patch     | 54 ++++++++++++++++++++++++++++++
 net/ipvsadm/patches/002-save-restore.patch | 34 +++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 net/ipvsadm/patches/001-Makefile.patch
 create mode 100644 net/ipvsadm/patches/002-save-restore.patch

(limited to 'net/ipvsadm/patches')

diff --git a/net/ipvsadm/patches/001-Makefile.patch b/net/ipvsadm/patches/001-Makefile.patch
new file mode 100644
index 000000000..e552cfcb3
--- /dev/null
+++ b/net/ipvsadm/patches/001-Makefile.patch
@@ -0,0 +1,54 @@
+--- a/Makefile
++++ b/Makefile
+@@ -35,7 +35,7 @@ ARCH		= $(shell uname -m)
+ RPMSOURCEDIR	= $(shell rpm --eval '%_sourcedir')
+ RPMSPECDIR	= $(shell rpm --eval '%_specdir')
+ 
+-CC		= gcc
++BUILD_ROOT	= $(DESTDIR)
+ INCLUDE		=
+ SBIN		= $(BUILD_ROOT)/sbin
+ MANDIR		= usr/man
+@@ -46,9 +46,9 @@ INSTALL		= install
+ STATIC_LIBS	= libipvs/libipvs.a
+ 
+ ifeq "${ARCH}" "sparc64"
+-    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
++    CFLAGS += -Wall -Wunused -Wstrict-prototypes -g -m64 -pipe -mcpu=ultrasparc -mcmodel=medlow
+ else
+-    CFLAGS = -Wall -Wunused -Wstrict-prototypes -g
++    CFLAGS += -Wall -Wunused -Wstrict-prototypes -g
+ endif
+ 
+ 
+@@ -83,8 +83,9 @@ DEFINES		+= $(shell if [ ! -f ../ip_vs.h
+ 
+ all:            libs ipvsadm
+ 
++$(STATIC_LIBS): libs
+ libs:
+-		make -C libipvs
++		$(MAKE) -C libipvs
+ 
+ ipvsadm:	$(OBJS) $(STATIC_LIBS)
+ 		$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+@@ -106,7 +107,7 @@ clean:
+ 		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
+ 
+--- a/libipvs/Makefile
++++ b/libipvs/Makefile
+@@ -1,7 +1,6 @@
+ # Makefile for libipvs
+ 
+-CC		= gcc
+-CFLAGS		= -Wall -Wunused -Wstrict-prototypes -g -fPIC
++CFLAGS		+= -Wall -Wunused -Wstrict-prototypes -g -fPIC
+ ifneq (0,$(HAVE_NL))
+ CFLAGS		+= -DLIBIPVS_USE_NL
+ CFLAGS		+= $(shell \
diff --git a/net/ipvsadm/patches/002-save-restore.patch b/net/ipvsadm/patches/002-save-restore.patch
new file mode 100644
index 000000000..34737a252
--- /dev/null
+++ b/net/ipvsadm/patches/002-save-restore.patch
@@ -0,0 +1,34 @@
+--- a/ipvsadm-restore
++++ b/ipvsadm-restore
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #      ipvsadm-restore - Restore IPVS rules
+ #
+ #      A very simple wrapper to restore IPVS rules
+@@ -11,6 +11,8 @@
+ #      This file:
+ #
+ #      ChangeLog
++#      M. Mozzarelli       :        Amended to use /bin/sh for compatibility
++#                          :        with embedded systems using busybox
+ #      Horms               :        Clear IPVS rules before adding from STDIN
+ #      Horms               :        Filter out "^#"
+ #
+--- a/ipvsadm-save
++++ b/ipvsadm-save
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #      ipvsadm-save - Save IPVS rules
+ #
+ #      A very simple wrapper to save IPVS rules
+@@ -12,6 +12,8 @@
+ #
+ #      ChangeLog
+ #
++#    M. Mozzarelli          :  Amended to use /bin/sh for compatibility
++#                           :  with embedded systems using busybox
+ #	 Wensong Zhang          :  Added the "-n" option and the help()
+ #
+ 
-- 
cgit v1.2.3