opensourcemirror
/
ipfire-3.x
mirror of git://git.ipfire.org/ipfire-3.x.git
1
0
Fork 0
Code Issues Releases Wiki Activity

ipvsadm: Update to 1.28 

Introduces a patch to correct the build flags

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer 2016-09-26 17:41:25 -04:00
parent 22aec4c40f
commit 0146ea539f
4 changed files with 30 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipvsadm/ipvsadm.nm
View File

@ -4,7 +4,7 @@
###############################################################################
name = ipvsadm
version = 1.26
version = 1.28
release = 1
groups = Applications/System
@ -17,17 +17,17 @@ description
offered by the Linux kernel.
end
source_dl = http://www.linuxvirtualserver.org/software/kernel-2.6/
source_dl = https://kernel.org/pub/linux/utils/kernel/ipvsadm/
build
requires
libnl-devel
libnl3-devel
popt-devel
end
PARALLELISMFLAGS = # parallel build not supported
make_build_targets += CFLAGS="%{CFLAGS}"
make_build_targets += CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
make_install_targets += BUILD_ROOT="%{BUILDROOT}" \
SBIN="%{BUILDROOT}%{sbindir}" MANDIR="%{mandir}"

26
ipvsadm/patches/build-flags.patch Normal file
View File

@ -0,0 +1,26 @@
diff --git a/Makefile b/Makefile
index 91a2991..1d27655 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,7 @@ libs:
make -C libipvs
ipvsadm: $(OBJS) $(STATIC_LIBS)
- $(CC) $(CFLAGS) -o $@ $^ $(LIBS)
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
install: all
if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
diff --git a/libipvs/Makefile b/libipvs/Makefile
index f845c8b..46cd4eb 100644
--- a/libipvs/Makefile
+++ b/libipvs/Makefile
@@ -33,7 +33,7 @@ $(STATIC_LIB): libipvs.o ip_vs_nl_policy.o
ar rv $@ $^
$(SHARED_LIB): libipvs.o ip_vs_nl_policy.o
- $(CC) -shared -Wl,-soname,$@ -o $@ $^
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
%.o: %.c
$(CC) $(CFLAGS) $(INCLUDE) $(DEFINES) -c -o $@ $<

29
ipvsadm/patches/ipvsadm-1.26-list-daemon.patch
View File

@ -1,29 +0,0 @@
diff -Naupr ipvsadm-1.26.orig/ipvsadm.c ipvsadm-1.26/ipvsadm.c
--- ipvsadm-1.26.orig/ipvsadm.c 2011-02-06 20:38:57.000000000 -0600
+++ ipvsadm-1.26/ipvsadm.c 2012-03-26 16:58:42.796919112 -0500
@@ -1631,16 +1631,19 @@ void list_timeout(void)
static void list_daemon(void)
{
ipvs_daemon_t *u;
+ int i;
if (!(u = ipvs_get_daemon()))
exit(1);
- if (u[0].state & IP_VS_STATE_MASTER)
- printf("master sync daemon (mcast=%s, syncid=%d)\n",
- u[0].mcast_ifn, u[0].syncid);
- if (u[1].state & IP_VS_STATE_BACKUP)
- printf("backup sync daemon (mcast=%s, syncid=%d)\n",
- u[1].mcast_ifn, u[1].syncid);
+ for (i = 0; i < 2; i++) {
+ if (u[i].state & IP_VS_STATE_MASTER)
+ printf("master sync daemon (mcast=%s, syncid=%d)\n",
+ u[i].mcast_ifn, u[i].syncid);
+ if (u[i].state & IP_VS_STATE_BACKUP)
+ printf("backup sync daemon (mcast=%s, syncid=%d)\n",
+ u[i].mcast_ifn, u[i].syncid);
+ }
free(u);
}

20
ipvsadm/patches/ipvsadm-1.26-popt.patch
View File

@ -1,20 +0,0 @@
diff -Naupr ipvsadm-1.26.orig/Makefile ipvsadm-1.26/Makefile
--- ipvsadm-1.26.orig/Makefile 2011-02-08 01:24:23.000000000 +0100
+++ ipvsadm-1.26/Makefile 2011-07-09 23:22:54.834017156 +0200
@@ -63,15 +63,7 @@ RPMBUILD = $(shell \
fi )
ifeq (,$(FORCE_GETOPT))
-LIB_SEARCH = /lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib
-POPT_LIB = $(shell for i in $(LIB_SEARCH); do \
- if [ -f $$i/libpopt.a ]; then \
- if nm $$i/libpopt.a | fgrep -q poptGetContext; then \
- echo "-lpopt"; \
- break; \
- fi; \
- fi; \
-done)
+POPT_LIB = "-lpopt"
endif
ifneq (,$(POPT_LIB))