From d24efed392d631f973bd78e7a7d8a97e20bbd9d3 Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Mon, 17 Sep 2007 09:31:01 +0000
Subject: [PATCH] Update to 1.1.15.

---
 .cvsignore                         |  2 +-
 keepalived-1.1.14-genhashman.patch | 20 -------------
 keepalived-1.1.14-include.patch    | 45 ------------------------------
 keepalived.spec                    | 16 +++++------
 sources                            |  2 +-
 5 files changed, 10 insertions(+), 75 deletions(-)
 delete mode 100644 keepalived-1.1.14-genhashman.patch
 delete mode 100644 keepalived-1.1.14-include.patch

diff --git a/.cvsignore b/.cvsignore
index abd2e27..6f4397f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-keepalived-1.1.14.tar.gz
+keepalived-1.1.15.tar.gz
diff --git a/keepalived-1.1.14-genhashman.patch b/keepalived-1.1.14-genhashman.patch
deleted file mode 100644
index 9263b76..0000000
--- a/keepalived-1.1.14-genhashman.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naupr keepalived-1.1.14.orig/genhash/Makefile.in keepalived-1.1.14/genhash/Makefile.in
---- keepalived-1.1.14.orig/genhash/Makefile.in	2007-09-13 16:47:12.000000000 +0200
-+++ keepalived-1.1.14/genhash/Makefile.in	2007-09-13 18:48:23.000000000 +0200
-@@ -39,13 +39,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 --git a/keepalived-1.1.14-include.patch b/keepalived-1.1.14-include.patch
deleted file mode 100644
index 3f946d9..0000000
--- a/keepalived-1.1.14-include.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naupr keepalived-1.1.14.orig/lib/parser.c keepalived-1.1.14/lib/parser.c
---- keepalived-1.1.14.orig/lib/parser.c	2007-09-13 17:14:16.000000000 +0200
-+++ keepalived-1.1.14/lib/parser.c	2007-09-14 16:14:26.000000000 +0200
-@@ -33,6 +33,7 @@
- 
- /* global vars */
- vector keywords;
-+vector current_keywords;
- FILE *current_stream;
- char *current_conf_file;
- int reload = 0;
-@@ -213,7 +214,7 @@ void read_conf_file(char *conf_file)
- 		char *confpath = strdup(globbuf.gl_pathv[i]);
- 		dirname(confpath);
- 		chdir(confpath);
--		process_stream(keywords);
-+		process_stream(current_keywords);
- 		fclose(stream);
- 
- 		chdir(prev_path);
-@@ -388,6 +389,8 @@ process_stream(vector keywords_vec)
- 	char *str;
- 	char *buf;
- 	vector strvec;
-+	vector prev_keywords = current_keywords;
-+	current_keywords = keywords_vec;
- 
- 	buf = zalloc(MAXBUF);
- 	while (read_line(buf, MAXBUF)) {
-@@ -423,6 +426,7 @@ process_stream(vector keywords_vec)
- 		free_strvec(strvec);
- 	}
- 
-+	current_keywords = prev_keywords;
- 	free(buf);
- 	return;
- }
-@@ -442,6 +446,7 @@ init_data(char *conf_file, vector (*init
- #endif
- 
- 	/* Stream handling */
-+	current_keywords = keywords;
- 	read_conf_file((conf_file) ? conf_file : CONF);
- 	free_keywords(keywords);
- }
diff --git a/keepalived.spec b/keepalived.spec
index cebb804..12ff40f 100644
--- a/keepalived.spec
+++ b/keepalived.spec
@@ -3,15 +3,13 @@
 
 Summary: HA monitor built upon LVS, VRRP and service pollers
 Name: keepalived
-Version: 1.1.14
-Release: 2%{?dist}
+Version: 1.1.15
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.keepalived.org/
 Source: http://www.keepalived.org/software/keepalived-%{version}.tar.gz
-Patch0: keepalived-1.1.14-genhashman.patch
-Patch1: keepalived-1.1.14-installmodes.patch
-Patch2: keepalived-1.1.14-include.patch
+Patch0: keepalived-1.1.14-installmodes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
@@ -39,9 +37,7 @@ healthchecks and LVS directors failover.
 
 %prep
 %setup -q
-%patch0 -p1 -b .genhashman
-%patch1 -p1 -b .installmodes
-%patch2 -p1 -b .include
+%patch0 -p1 -b .installmodes
 # Fix file mode (600 as of 1.1.13)
 %{__chmod} a+r doc/samples/sample.misccheck.smbcheck.sh
 # Included as doc, so disable its dependencies
@@ -104,6 +100,10 @@ fi
 
 
 %changelog
+* Mon Sep 17 2007 Matthias Saou <http://freshrpms.net/> 1.1.15-1
+- Update to 1.1.15.
+- Remove merged genhashman and include patches.
+
 * Fri Sep 14 2007 Matthias Saou <http://freshrpms.net/> 1.1.14-2
 - Include patch from Shinji Tanaka to fix conf include from inside some
   directives like vrrp_instance.
diff --git a/sources b/sources
index 9530a7f..1527613 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a60f1c48a15153baccc0b04855d0e23  keepalived-1.1.14.tar.gz
+b47f94bfcf5d77976c3068608a8680a5  keepalived-1.1.15.tar.gz