|
Hello,
The attached patch shows the differences of the two ipvsadm-1.24
packages on the webpage. One can be found under the 2.6.x section and
one under the 2.4.x section. Judging from the diff there is really no
reason to keep those separate.
Please unify the sources or explain the differences.
Best regards,
Roberto Nibali, ratz
--
echo
'[q]sa[ln0=aln256%Pln256/snlbx]sb3135071790101768542287578439snlbxq' | dc
diff -Nur ipvsadm-1.24-2.4.x/ipvsadm.c ipvsadm-1.24-2.6.x/ipvsadm.c
--- ipvsadm-1.24-2.4.x/ipvsadm.c 2003-07-05 07:32:38.000000000 +0200
+++ ipvsadm-1.24-2.6.x/ipvsadm.c 2004-01-10 10:39:03.000000000 +0100
@@ -2,7 +2,7 @@
* ipvsadm - IP Virtual Server ADMinistration program
* for IPVS NetFilter Module in kernel 2.4
*
- * Version: $Id: ipvsadm.c,v 1.25 2003/07/05 05:32:38 wensong Exp $
+ * Version: $Id: ipvsadm.c,v 1.26 2004/01/10 09:39:03 wensong Exp $
*
* Authors: Wensong Zhang <wensong@xxxxxxxxxxxxxxxxxxxxxx>
* Peter Kese <peter.kese@xxxxxx>
@@ -1669,7 +1669,7 @@
if (!(dname = addrport_to_anyname(&daddr, ntohs(e->port),
se->protocol, format)))
exit(1);
- if ((!format & FMT_RULE))
+ if (!(format & FMT_RULE))
dname[28] = '\0';
if (format & FMT_RULE) {
diff -Nur ipvsadm-1.24-2.4.x/ipvsadm.spec ipvsadm-1.24-2.6.x/ipvsadm.spec
--- ipvsadm-1.24-2.4.x/ipvsadm.spec 2003-07-05 17:55:43.000000000 +0200
+++ ipvsadm-1.24-2.6.x/ipvsadm.spec 2004-01-10 16:42:21.000000000 +0100
@@ -3,7 +3,7 @@
Summary: Utility to administer the Linux Virtual Server
Name: ipvsadm
Version: 1.24
-Release: 2
+Release: 4
Copyright: GNU General Public Licence
URL: http://www.LinuxVirtualServer.org/
Group: Applications/System
@@ -14,7 +14,7 @@
%description
ipvsadm is a utility to administer the IP Virtual Server services
-offered by the Linux kernel augmented with the IP Virtual Server patch.
+offered by the latest Linux kernel 2.6.x.
%prep
@@ -51,6 +51,9 @@
%changelog
+* Sat Dec 20 2003 Wensong Zhang <wensong@xxxxxxxxxxxx>
+- tidy up the description
+
* Sat Apr 5 2003 Wensong Zhang <wensong@xxxxxxxxxxxx>
- Removed the unnecessary Docdir setting.
diff -Nur ipvsadm-1.24-2.4.x/ipvsadm.spec.in ipvsadm-1.24-2.6.x/ipvsadm.spec.in
--- ipvsadm-1.24-2.4.x/ipvsadm.spec.in 2003-04-05 10:57:49.000000000 +0200
+++ ipvsadm-1.24-2.6.x/ipvsadm.spec.in 2003-12-20 10:12:56.000000000 +0100
@@ -14,7 +14,7 @@
%description
ipvsadm is a utility to administer the IP Virtual Server services
-offered by the Linux kernel augmented with the IP Virtual Server patch.
+offered by the latest Linux kernel 2.6.x.
%prep
@@ -51,6 +51,9 @@
%changelog
+* Sat Dec 20 2003 Wensong Zhang <wensong@xxxxxxxxxxxx>
+- tidy up the description
+
* Sat Apr 5 2003 Wensong Zhang <wensong@xxxxxxxxxxxx>
- Removed the unnecessary Docdir setting.
diff -Nur ipvsadm-1.24-2.4.x/Makefile ipvsadm-1.24-2.6.x/Makefile
--- ipvsadm-1.24-2.4.x/Makefile 2003-07-05 07:32:38.000000000 +0200
+++ ipvsadm-1.24-2.6.x/Makefile 2004-01-10 10:39:03.000000000 +0100
@@ -2,7 +2,7 @@
# ipvsadm - IP Virtual Server ADMinistration program
# for IPVS NetFilter Module in kernel 2.4
#
-# Version: $Id: Makefile,v 1.29 2003/07/05 05:32:38 wensong Exp $
+# Version: $Id: Makefile,v 1.31 2004/01/10 09:39:03 wensong Exp $
#
# Authors: Wensong Zhang <wensong@xxxxxxxxxxxx>
# Peter Kese <peter.kese@xxxxxx>
@@ -26,7 +26,7 @@
NAME = ipvsadm
VERSION = $(shell cat VERSION)
-RELEASE = 2
+RELEASE = 4
SCHEDULERS = "$(shell cat SCHEDULERS)"
PROGROOT = $(shell basename `pwd`)
|
