commit 51f04a91160c014b634f480968c751a1a9d762ce
Author: Jakub Bogusz <[email protected]>
Date: Mon Sep 9 21:02:50 2013 +0200
- updated to 1.27
- updated make patch
ipvsadm-make.patch | 31 +++++++++----------------------
ipvsadm.spec | 19 ++++++++++++-------
2 files changed, 21 insertions(+), 29 deletions(-)
---
diff --git a/ipvsadm.spec b/ipvsadm.spec
index 8978316..6cd0e15 100644
--- a/ipvsadm.spec
+++ b/ipvsadm.spec
@@ -1,19 +1,22 @@
+# TODO: PLDify init script
Summary: Utility to administer the Linux Virtual Server
Summary(pl.UTF-8): Narzędzie do administracji wirtualnymi serwerami
Name: ipvsadm
-Version: 1.26
-Release: 3
+Version: 1.27
+Release: 1
License: GPL v2+
Group: Applications/System
-Source0:
http://www.linuxvirtualserver.org/software/kernel-2.6/%{name}-%{version}.tar.gz
-# Source0-md5: eac3ba3f62cd4dea2da353aeddd353a8
+Source0:
https://www.kernel.org/pub/linux/utils/kernel/ipvsadm/%{name}-%{version}.tar.xz
+# Source0-md5: 9decaaaad2fd637ed06cffd954e66cf3
Patch0: %{name}-make.patch
URL: http://www.LinuxVirtualServer.org/
-BuildRequires: libnl-devel
+BuildRequires: libnl-devel >= 3.2
BuildRequires: popt-devel
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
Conflicts: ipvsadm24
Conflicts: piranha <= 0.4.14
-#Conflicts: kernel < 2.6.?
+Requires: uname(release) >= 2.6
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -52,10 +55,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
+%doc MAINTAINERS README
%attr(755,root,root) %{_sbindir}/ipvsadm
%attr(755,root,root) %{_sbindir}/ipvsadm-save
%attr(755,root,root) %{_sbindir}/ipvsadm-restore
+#%attr(754,root,root) /etc/rc.d/init.d/ipvsadm
+#%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ipvsadm
%{_mandir}/man8/ipvsadm.8*
%{_mandir}/man8/ipvsadm-save.8*
%{_mandir}/man8/ipvsadm-restore.8*
diff --git a/ipvsadm-make.patch b/ipvsadm-make.patch
index 3750ff9..c4d0337 100644
--- a/ipvsadm-make.patch
+++ b/ipvsadm-make.patch
@@ -21,23 +21,6 @@
endif
-@@ -60,15 +60,7 @@
- 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))
@@ -78,7 +71,5 @@
LIBS = $(POPT_LIB)
DEFINES = -DVERSION=\"$(VERSION)\"
-DSCHEDULERS=\"$(SCHEDULERS)\" \
@@ -46,9 +29,9 @@
- echo "-DHAVE_NET_IP_VS_H"; fi;)
---- ipvsadm-1.24/libipvs/Makefile.orig 2002-12-19 14:53:07.000000000 +0100
-+++ ipvsadm-1.24/libipvs/Makefile 2005-06-06 21:25:13.995125232 +0200
-@@ -1,14 +1,10 @@
+--- ipvsadm-1.27/libipvs/Makefile.orig 2013-09-09 20:55:27.408302252 +0200
++++ ipvsadm-1.27/libipvs/Makefile 2013-09-09 20:57:00.548298367 +0200
+@@ -1,7 +1,7 @@
# Makefile for libipvs
CC = gcc
@@ -56,11 +39,15 @@
+CFLAGS = $(OPT) -Wall -Wunused -Wstrict-prototypes -fPIC
ifneq (0,$(HAVE_NL))
CFLAGS += -DLIBIPVS_USE_NL
+ CFLAGS += $(shell \
+@@ -13,10 +13,6 @@
+ fi)
endif
-INCLUDE += $(shell if [ -f ../../ip_vs.h ]; then \
- echo "-I../../."; fi;)
-DEFINES = $(shell if [ ! -f ../../ip_vs.h ]; then \
- echo "-DHAVE_NET_IP_VS_H"; fi;)
-
- .PHONY = all clean install dist distclean rpm rpms
+ DEFINES += $(shell if which pkg-config > /dev/null 2>&1; then \
+ if pkg-config --exists libnl-3.0; then :; \
+ elif pkg-config --exists libnl-2.0; then :; \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ipvsadm.git/commitdiff/51f04a91160c014b634f480968c751a1a9d762ce
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
