From bd6348ecc4ecd693897af9c90f9e627551580e2b Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Mon, 22 Oct 2007 09:33:00 +0000
Subject: [PATCH] Update to latest upstream sources, identical except for the
 included spec.

---
 keepalived-1.1.13-iflabel.patch  | 153 -------------------------------
 keepalived-1.1.13-makefile.patch |  77 ----------------
 keepalived-1.1.13-types.patch    |  21 -----
 keepalived.spec                  |   5 +-
 sources                          |   2 +-
 5 files changed, 5 insertions(+), 253 deletions(-)
 delete mode 100644 keepalived-1.1.13-iflabel.patch
 delete mode 100644 keepalived-1.1.13-makefile.patch
 delete mode 100644 keepalived-1.1.13-types.patch

diff --git a/keepalived-1.1.13-iflabel.patch b/keepalived-1.1.13-iflabel.patch
deleted file mode 100644
index df8f680..0000000
--- a/keepalived-1.1.13-iflabel.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-Index: doc/keepalived.conf.SYNOPSIS
-===================================================================
-RCS file: /sourceforge/cvs/abrazo/base/os/packages/keepalived/doc/keepalived.conf.SYNOPSIS,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 keepalived.conf.SYNOPSIS
---- doc/keepalived.conf.SYNOPSIS	27 Nov 2006 15:27:50 -0000	1.1.1.2
-+++ doc/keepalived.conf.SYNOPSIS	27 Nov 2006 16:50:00 -0000
-@@ -165,8 +165,8 @@
-         auth_pass <STRING>		# Password string
-     }
-     virtual_ipaddress {			# VRRP IP addres block
--        <IP ADDRESS>/<MASK> brd <IP ADDRESS> dev <STRING> scope <SCOPE>
--        <IP ADDRESS>/<MASK> brd <IP ADDRESS> dev <STRING> scope <SCOPE>
-+        <IP ADDRESS>/<MASK> brd <IP ADDRESS> dev <STRING> scope <SCOPE> label <LABEL>
-+        <IP ADDRESS>/<MASK> brd <IP ADDRESS> dev <STRING> scope <SCOPE> label <LABEL>
-         ...
-     }
-     virtual_ipaddress_excluded {       	# VRRP IP excluded from VRRP
-@@ -198,6 +198,10 @@
- 	* nowhere
- 	* global
- 
-+LABEL is optional and creates a name for the alias. For compatibility with
-+"ifconfig", it should be of the form <realdev>:<anytext>, for example
-+eth0:1 for an alias on eth0.
-+
- When a weight is specified in track_interface, instead of setting the vrrp
- instance to the FAULT state in case of failure, its priority will be
- increased by the weight when the interface is up (for positive weights),
-Index: doc/man/man5/keepalived.conf.5
-===================================================================
-RCS file: /sourceforge/cvs/abrazo/base/os/packages/keepalived/doc/man/man5/keepalived.conf.5,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 keepalived.conf.5
---- doc/man/man5/keepalived.conf.5	1 Aug 2006 15:49:31 -0000	1.1.1.1
-+++ doc/man/man5/keepalived.conf.5	27 Nov 2006 16:50:00 -0000
-@@ -199,9 +199,9 @@
-     #With the same entries on other machines,

-     #the opposite transition will be occuring.

-     virtual_ipaddress {

--        <IPADDR>/<MASK> brd <IPADDR> dev <STRING> scope <SCOPE>

-+        <IPADDR>/<MASK> brd <IPADDR> dev <STRING> scope <SCOPE> label <LABEL>

-         192.168.200.17/24 dev eth1

--        192.168.200.18/24 dev eth2

-+        192.168.200.18/24 dev eth2 label eth2:1

-     }

- 

-     #VRRP IP excluded from VRRP

-Index: doc/samples/keepalived.conf.vrrp
-===================================================================
-RCS file: /sourceforge/cvs/abrazo/base/os/packages/keepalived/doc/samples/keepalived.conf.vrrp,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 keepalived.conf.vrrp
---- doc/samples/keepalived.conf.vrrp	1 Aug 2006 15:49:31 -0000	1.1.1.1
-+++ doc/samples/keepalived.conf.vrrp	27 Nov 2006 16:50:00 -0000
-@@ -26,7 +26,10 @@
-     virtual_ipaddress {
-         192.168.200.16
-         192.168.200.17
--        192.168.200.18
-+
-+        # optional label. should be of the form "realdev:sometext" for
-+        # compatibility with ifconfig.
-+        192.168.200.18 label eth0:1
-     }
- }
- 
-Index: keepalived/etc/keepalived/keepalived.conf
-===================================================================
-RCS file: /sourceforge/cvs/abrazo/base/os/packages/keepalived/keepalived/etc/keepalived/keepalived.conf,v
-retrieving revision 1.1.1.1
-diff -u -r1.1.1.1 keepalived.conf
---- keepalived/etc/keepalived/keepalived.conf	1 Aug 2006 15:49:31 -0000	1.1.1.1
-+++ keepalived/etc/keepalived/keepalived.conf	27 Nov 2006 16:50:00 -0000
-@@ -25,7 +25,7 @@
-     virtual_ipaddress {
-         192.168.200.16
-         192.168.200.17
--        192.168.200.18
-+        192.168.200.18 label eth0:3
-     }
- }
- 
-Index: keepalived/include/vrrp_ipaddress.h
-===================================================================
-RCS file: /sourceforge/cvs/abrazo/base/os/packages/keepalived/keepalived/include/vrrp_ipaddress.h,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 vrrp_ipaddress.h
---- keepalived/include/vrrp_ipaddress.h	27 Nov 2006 15:27:50 -0000	1.1.1.2
-+++ keepalived/include/vrrp_ipaddress.h	27 Nov 2006 16:50:00 -0000
-@@ -46,6 +46,7 @@
- 	interface *ifp;		/* Interface owning IP address */
- 	int scope;		/* the ip address scope */
- 	int set;		/* TRUE if addr is set */
-+	char *label;		/* Alias name, e.g. eth0:1 */
- } ip_address;
- 
- #define IPADDRESS_DEL 0
-Index: keepalived/vrrp/vrrp_ipaddress.c
-===================================================================
-RCS file: /sourceforge/cvs/abrazo/base/os/packages/keepalived/keepalived/vrrp/vrrp_ipaddress.c,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 vrrp_ipaddress.c
---- keepalived/vrrp/vrrp_ipaddress.c	27 Nov 2006 15:27:50 -0000	1.1.1.2
-+++ keepalived/vrrp/vrrp_ipaddress.c	27 Nov 2006 16:50:00 -0000
-@@ -53,6 +53,9 @@
- 	if (ipaddr->broadcast)
- 		addattr_l(&req.n, sizeof (req), IFA_BROADCAST,
- 			  &ipaddr->broadcast, sizeof (ipaddr->broadcast));
-+	if (ipaddr->label)
-+		addattr_l(&req.n, sizeof (req), IFA_LABEL,
-+                          ipaddr->label, strlen(ipaddr->label) + 1);
- 
- 	if (netlink_talk(&nl_cmd, &req.n) < 0)
- 		status = -1;
-@@ -90,18 +93,23 @@
- void
- free_ipaddress(void *if_data_obj)
- {
--	FREE(if_data_obj);
-+	ip_address *ip_addr = if_data_obj;
-+
-+	FREE_PTR(ip_addr->label);
-+	FREE(ip_addr);
- }
- void
- dump_ipaddress(void *if_data_obj)
- {
- 	ip_address *ip_addr = if_data_obj;
--	syslog(LOG_INFO, "     %s/%d brd %s dev %s scope %s"
-+	syslog(LOG_INFO, "     %s/%d brd %s dev %s scope %s%s%s"
- 	       , inet_ntop2(ip_addr->addr)
- 	       , ip_addr->mask
- 	       , inet_ntop2(ip_addr->broadcast)
- 	       , IF_NAME(if_get_by_ifindex(ip_addr->ifindex))
--	       , netlink_scope_n2a(ip_addr->scope));
-+	       , netlink_scope_n2a(ip_addr->scope)
-+               , ip_addr->label ? " label " : ""
-+               , ip_addr->label ? ip_addr->label : "");
- }
- void
- alloc_ipaddress(list ip_list, vector strvec, interface *ifp)
-@@ -139,6 +147,10 @@
- 			new->scope = netlink_scope_a2n(VECTOR_SLOT(strvec, ++i));
- 		} else if (!strcmp(str, "broadcast") || !strcmp(str, "brd")) {
- 			inet_ston(VECTOR_SLOT(strvec, ++i), &new->broadcast);
-+		} else if (!strcmp(str, "label")) {
-+			new->label = ALLOC(IFNAMSIZ);
-+			strncpy(new->label, VECTOR_SLOT(strvec, ++i), IFNAMSIZ);
-+			new->label[IFNAMSIZ-1] = '\0';
- 		} else {
- 			if (inet_ston(VECTOR_SLOT(strvec, i), &ipaddr)) {
- 				inet_ston(VECTOR_SLOT(strvec, i), &new->addr);
diff --git a/keepalived-1.1.13-makefile.patch b/keepalived-1.1.13-makefile.patch
deleted file mode 100644
index 4bb22dc..0000000
--- a/keepalived-1.1.13-makefile.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Naupr keepalived-1.1.13.orig/genhash/Makefile.in keepalived-1.1.13/genhash/Makefile.in
---- keepalived-1.1.13.orig/genhash/Makefile.in	2006-10-11 11:46:49.000000000 +0200
-+++ keepalived-1.1.13/genhash/Makefile.in	2007-03-22 16:25:45.000000000 +0100
-@@ -7,7 +7,8 @@ BIN  = ../bin
- 
- prefix      = @prefix@
- exec_prefix = @exec_prefix@
--bindir     = @bindir@
-+bindir      = @bindir@
-+mandir      = @mandir@
- 
- CC = @CC@
- STRIP = @STRIP@
-@@ -39,13 +40,13 @@ distclean: clean
- 
- uninstall:
- 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
--	rm -f $(DESTDIR)@mandir@/man/man1/genhash.1
-+	rm -f $(DESTDIR)$(mandir)/man1/genhash.1
- 
- install:
- 	install -d $(DESTDIR)$(bindir)
- 	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(bindir)/
--	install -d $(DESTDIR)@mandir@/man/man1
--	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)@mandir@/man/man1
-+	install -d $(DESTDIR)$(mandir)/man1
-+	install -m 644 ../doc/man/man1/genhash.1 $(DESTDIR)$(mandir)/man1
- 
- mrproper: clean distclean
- 	rm -f config.*
-diff -Naupr keepalived-1.1.13.orig/keepalived/Makefile.in keepalived-1.1.13/keepalived/Makefile.in
---- keepalived-1.1.13.orig/keepalived/Makefile.in	2006-10-11 11:46:32.000000000 +0200
-+++ keepalived-1.1.13/keepalived/Makefile.in	2007-03-22 16:26:03.000000000 +0100
-@@ -14,8 +14,9 @@ prefix      = @prefix@
- exec_prefix = @exec_prefix@
- sbindir     = @sbindir@
- sysconfdir  = @sysconfdir@
--init_script = etc/init.d/keepalived.init
--conf_file   = etc/keepalived/keepalived.conf
-+mandir      = @mandir@
-+init_dir    = $(sysconfdir)/rc.d/init.d
-+conf_dir    = $(sysconfdir)/keepalived
- 
- CC = @CC@
- STRIP = @STRIP@
-@@ -89,20 +90,20 @@ mrproper: distclean
- 
- uninstall:
- 	rm -f $(DESTDIR)$(sbindir)/$(EXEC)
-+	rm -f $(DESTDIR)$(init_dir)/keepalived.init
- 	rm -rf $(DESTDIR)$(sysconfdir)/keepalived
--	rm -f $(DESTDIR)$(init_dir)/$(init_script)
--	rm -f $(DESTDIR)@mandir@/man/man5/keepalived.conf.5
--	rm -f $(DESTDIR)@mandir@/man/man8/keepalived.8
-+	rm -f $(DESTDIR)$(mandir)/man/man5/keepalived.conf.5
-+	rm -f $(DESTDIR)$(mandir)/man/man8/keepalived.8
- 
- install:
- 	install -d $(DESTDIR)$(sbindir)
--	install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
--	install -d $(DESTDIR)$(sysconfdir)/init.d
--	install -m 755 $(init_script) $(DESTDIR)$(sysconfdir)/init.d/keepalived
-+	install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/
-+	install -d $(DESTDIR)$(init_dir)
-+	install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
- 	install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
--	install -m 644 $(conf_file) $(DESTDIR)$(sysconfdir)/keepalived/
-+	install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/
- 	install -m 644 ../doc/samples/* $(DESTDIR)$(sysconfdir)/keepalived/samples/
--	install -d $(DESTDIR)@mandir@/man/man5
--	install -d $(DESTDIR)@mandir@/man/man8
--	install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)@mandir@/man/man5
--	install -m 644 ../doc/man/man8/keepalived.8 $(DESTDIR)@mandir@/man/man8
-+	install -d $(DESTDIR)$(mandir)/man5
-+	install -d $(DESTDIR)$(mandir)/man8
-+	install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)$(mandir)/man5
-+	install -m 644 ../doc/man/man8/keepalived.8 $(DESTDIR)$(mandir)/man8
diff --git a/keepalived-1.1.13-types.patch b/keepalived-1.1.13-types.patch
deleted file mode 100644
index 3e3a2f6..0000000
--- a/keepalived-1.1.13-types.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naupr keepalived-1.1.13.orig/keepalived/vrrp/vrrp_arp.c keepalived-1.1.13/keepalived/vrrp/vrrp_arp.c
---- keepalived-1.1.13.orig/keepalived/vrrp/vrrp_arp.c	2006-10-11 11:44:59.000000000 +0200
-+++ keepalived-1.1.13/keepalived/vrrp/vrrp_arp.c	2007-03-22 16:22:29.000000000 +0100
-@@ -22,14 +22,14 @@
-  * Copyright (C) 2001-2006 Alexandre Cassen, <acassen@linux-vs.org>
-  */
- 
--/* system includes */
--#include <linux/if_packet.h>
--
- /* local includes */
- #include "vrrp_arp.h"
- #include "memory.h"
- #include "utils.h"
- 
-+/* system includes */
-+#include <linux/if_packet.h>
-+
- /* global vars */
- char *garp_buffer;
- int garp_fd;
diff --git a/keepalived.spec b/keepalived.spec
index 12ff40f..857b256 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -4,7 +4,7 @@
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
 Version: 1.1.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
@@ -100,6 +100,9 @@ fi
 
 
 %changelog
+* Mon Oct 22 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-2
+- Update to latest upstream sources, identical except for the included spec.
+
 * Mon Sep 17 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-1
 - Update to 1.1.15.
 - Remove merged genhashman and include patches.
diff --git a/sources b/sources
index 1527613..9726841 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b47f94bfcf5d77976c3068608a8680a5  keepalived-1.1.15.tar.gz
+4c93f5d8b6bfabe84b02828a5bbb7aa0  keepalived-1.1.15.tar.gz