Update to 1.26 (#676167).
This commit is contained in:
Matthias Saou
parent
58510ed9c3
commit
506db94ef8
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
ipvsadm-1.25.tar.gz
|
ipvsadm-1.25.tar.gz
|
||||||
|
/ipvsadm-1.26.tar.gz
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
diff -Naupr ipvsadm-1.24.orig/Makefile ipvsadm-1.24/Makefile
|
|
||||||
--- ipvsadm-1.24.orig/Makefile 2004-01-10 10:39:03.000000000 +0100
|
|
||||||
+++ ipvsadm-1.24/Makefile 2007-08-24 16:08:21.000000000 +0200
|
|
||||||
@@ -87,16 +87,15 @@ ipvsadm: $(OBJS) $(STATIC_LIBS)
|
|
||||||
|
|
||||||
install: all
|
|
||||||
if [ ! -d $(SBIN) ]; then $(MKDIR) -p $(SBIN); fi
|
|
||||||
- $(INSTALL) -m 0755 -s ipvsadm $(SBIN)
|
|
||||||
+ $(INSTALL) -m 0755 ipvsadm $(SBIN)
|
|
||||||
$(INSTALL) -m 0755 ipvsadm-save $(SBIN)
|
|
||||||
$(INSTALL) -m 0755 ipvsadm-restore $(SBIN)
|
|
||||||
[ -d $(MAN) ] || $(MKDIR) -p $(MAN)
|
|
||||||
$(INSTALL) -m 0644 ipvsadm.8 $(MAN)
|
|
||||||
$(INSTALL) -m 0644 ipvsadm-save.8 $(MAN)
|
|
||||||
$(INSTALL) -m 0644 ipvsadm-restore.8 $(MAN)
|
|
||||||
- if [ -d $(INIT) ]; then \
|
|
||||||
- $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm; \
|
|
||||||
- fi
|
|
||||||
+ [ -d $(INIT) ] || $(MKDIR) -p $(INIT)
|
|
||||||
+ $(INSTALL) -m 0755 ipvsadm.sh $(INIT)/ipvsadm
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f ipvsadm $(NAME).spec $(NAME)-$(VERSION).tar.gz
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -Naupr ipvsadm-1.25.orig/libipvs/libipvs.c ipvsadm-1.25/libipvs/libipvs.c
|
|
||||||
--- ipvsadm-1.25.orig/libipvs/libipvs.c 2008-09-23 18:13:56.000000000 +0200
|
|
||||||
+++ ipvsadm-1.25/libipvs/libipvs.c 2010-04-29 16:47:11.924157647 +0200
|
|
||||||
@@ -747,7 +747,7 @@ static int ipvs_dests_parse_cb(struct nl
|
|
||||||
d->entrytable[i].l_threshold = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_L_THRESH]);
|
|
||||||
d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_ACTIVE_CONNS]);
|
|
||||||
d->entrytable[i].inactconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_INACT_CONNS]);
|
|
||||||
- d->entrytable[i].activeconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
|
|
||||||
+ d->entrytable[i].persistconns = nla_get_u32(dest_attrs[IPVS_DEST_ATTR_PERSIST_CONNS]);
|
|
||||||
d->entrytable[i].af = d->af;
|
|
||||||
|
|
||||||
if (ipvs_parse_stats(&(d->entrytable[i].stats),
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff -Naupr ipvsadm-1.25.orig/Makefile ipvsadm-1.25/Makefile
|
|
||||||
--- ipvsadm-1.25.orig/Makefile 2008-09-23 18:14:46.000000000 +0200
|
|
||||||
+++ ipvsadm-1.25/Makefile 2008-12-22 20:03:53.793372130 +0100
|
|
||||||
@@ -62,14 +62,7 @@ RPMBUILD = $(shell \
|
|
||||||
fi )
|
|
||||||
|
|
||||||
ifeq (,$(FORCE_GETOPT))
|
|
||||||
-LIB_SEARCH = /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"; \
|
|
||||||
- fi; \
|
|
||||||
- fi; \
|
|
||||||
-done)
|
|
||||||
+POPT_LIB = "-lpopt"
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq (,$(POPT_LIB))
|
|
||||||
20
ipvsadm-1.26-popt.patch
Normal file
20
ipvsadm-1.26-popt.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
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))
|
||||||
14
ipvsadm.spec
14
ipvsadm.spec
@ -1,15 +1,13 @@
|
|||||||
Summary: Utility to administer the Linux Virtual Server
|
Summary: Utility to administer the Linux Virtual Server
|
||||||
Name: ipvsadm
|
Name: ipvsadm
|
||||||
Version: 1.25
|
Version: 1.26
|
||||||
Release: 6%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://www.linuxvirtualserver.org/software/ipvs.html
|
URL: http://www.linuxvirtualserver.org/software/ipvs.html
|
||||||
Source0: http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-%{version}.tar.gz
|
Source0: http://www.linuxvirtualserver.org/software/kernel-2.6/ipvsadm-%{version}.tar.gz
|
||||||
Source1: ipvsadm.init
|
Source1: ipvsadm.init
|
||||||
Patch0: ipvsadm-1.24-Makefile.patch
|
Patch0: ipvsadm-1.26-popt.patch
|
||||||
Patch1: ipvsadm-1.25-popt.patch
|
|
||||||
Patch2: ipvsadm-1.25-activeconns.patch
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
Buildrequires: libnl-devel
|
Buildrequires: libnl-devel
|
||||||
Buildrequires: popt-devel
|
Buildrequires: popt-devel
|
||||||
@ -24,8 +22,6 @@ offered by the Linux kernel.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -67,6 +63,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jul 9 2011 Matthias Saou <http://freshrpms.net/> 1.26-1
|
||||||
|
- Update to 1.26 (#676167).
|
||||||
|
- Remove upstreamed Makefile and activeconns patchs, rebase popt patch.
|
||||||
|
|
||||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-6
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25-6
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user