packages: ipvsadm/ipvsadm.spec, ipvsadm/ipvsadm-make.patch - up to 1.26

[zbyniu]

Author: zbyniu                       Date: Fri Mar 18 12:46:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.26

---- Files affected:
packages/ipvsadm:
   ipvsadm.spec (1.25 -> 1.26) , ipvsadm-make.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: packages/ipvsadm/ipvsadm.spec
diff -u packages/ipvsadm/ipvsadm.spec:1.25 packages/ipvsadm/ipvsadm.spec:1.26
--- packages/ipvsadm/ipvsadm.spec:1.25	Sat Jan 29 01:06:46 2011
+++ packages/ipvsadm/ipvsadm.spec	Fri Mar 18 13:45:56 2011
@@ -2,15 +2,14 @@
 Summary:	Utility to administer the Linux Virtual Server
 Summary(pl.UTF-8):	Narzędzie do administracji wirtualnymi serwerami
 Name:		ipvsadm
-Version:	1.25
+Version:	1.26
 Release:	1
 License:	GPL
 Group:		Applications/System
 Source0:	http://www.linuxvirtualserver.org/software/kernel-2.6/%{name}-%{version}.tar.gz
-# Source0-md5:	772a053f5fe888cd25784c5f55d31fc3
+# Source0-md5:	eac3ba3f62cd4dea2da353aeddd353a8
 Source1:	%{name}-ip_vs.h
 Patch0:		%{name}-make.patch
-Patch1:		%{name}-activeconn.patch
 URL:		http://www.LinuxVirtualServer.org/
 BuildRequires:	libnl-devel
 BuildRequires:	popt-devel
@@ -36,7 +35,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
 
 cp -f %{SOURCE1} ip_vs.h
 
@@ -72,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/03/18 12:45:56  zbyniu
+- up to 1.26
+
 Revision 1.25  2011/01/29 00:06:46  sparky
 - dropped pre-cvs changelog
 

================================================================
Index: packages/ipvsadm/ipvsadm-make.patch
diff -u packages/ipvsadm/ipvsadm-make.patch:1.4 packages/ipvsadm/ipvsadm-make.patch:1.5
--- packages/ipvsadm/ipvsadm-make.patch:1.4	Tue Jan 13 02:14:24 2009
+++ packages/ipvsadm/ipvsadm-make.patch	Fri Mar 18 13:45:56 2011
@@ -21,15 +21,16 @@
  endif
  
  
-@@ -60,14 +60,7 @@
+@@ -60,15 +60,7 @@
  	fi )
  
  ifeq (,$(FORCE_GETOPT))
--LIB_SEARCH = /lib /usr/lib /usr/local/lib
+-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)
@@ -40,21 +41,12 @@
 @@ -78,7 +71,7 @@
  LIBS		= $(POPT_LIB)
  DEFINES		= -DVERSION=\"$(VERSION)\" -DSCHEDULERS=\"$(SCHEDULERS)\" \
- 		  $(POPT_DEFINE)
+		  -DPE_LIST=\"$(PE_LIST)\" $(POPT_DEFINE)
 -DEFINES		+= $(shell if [ ! -f ../ip_vs.h ]; then	\
 +DEFINES		+= $(shell if [ ! -f ip_vs.h ]; then	\
  		     echo "-DHAVE_NET_IP_VS_H"; fi;)
  
  
-@@ -94,7 +87,7 @@
- 
- 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)
 --- 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,14 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipvsadm/ipvsadm.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipvsadm/ipvsadm-make.patch?r1=1.4&r2=1.5&f=u