From c8f46dbb7fd9265e88c525bf21c0a114932a6924 Mon Sep 17 00:00:00 2001
From: Christian Wiese <morfoh@opensde.org>
Date: Fri, 14 Mar 2008 02:49:10 +0200
Subject: [PATCH] [keepalived] Updated (1.1.13 -> 1.1.15)

---
 .../keepalived-1.1.13-types_h.patch           | 36 ------------------
 .../keepalived-1.1.15-no-samples.patch        | 29 +++++++++++++++
 network/keepalived/keepalived.desc            |  6 +--
 network/keepalived/locations.patch            | 37 -------------------
 4 files changed, 32 insertions(+), 76 deletions(-)
 delete mode 100644 network/keepalived/keepalived-1.1.13-types_h.patch
 create mode 100644 network/keepalived/keepalived-1.1.15-no-samples.patch
 delete mode 100644 network/keepalived/locations.patch

diff --git a/network/keepalived/keepalived-1.1.13-types_h.patch b/network/keepalived/keepalived-1.1.13-types_h.patch
deleted file mode 100644
index fb3cbb084..000000000
--- a/network/keepalived/keepalived-1.1.13-types_h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../keepalived/keepalived-1.1.13-types_h.patch
-# Copyright (C) 2007 The OpenSDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
---- keepalived-1.1.13/keepalived/vrrp/vrrp_arp.c.orig	2007-08-06 22:57:11.000000000 +0200
-+++ keepalived-1.1.13/keepalived/vrrp/vrrp_arp.c	2007-08-06 22:55:40.000000000 +0200
-@@ -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/network/keepalived/keepalived-1.1.15-no-samples.patch b/network/keepalived/keepalived-1.1.15-no-samples.patch
new file mode 100644
index 000000000..4ff996155
--- /dev/null
+++ b/network/keepalived/keepalived-1.1.15-no-samples.patch
@@ -0,0 +1,29 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../keepalived/keepalived-1.1.15-no-samples.patch
+# Copyright (C) 2008 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+--- keepalived-1.1.15/keepalived/Makefile.in.orig	2008-03-14 01:28:47.000000000 +0200
++++ keepalived-1.1.15/keepalived/Makefile.in	2008-03-14 02:44:19.000000000 +0200
+@@ -104,9 +104,8 @@
+ 	install -m 755 etc/init.d/keepalived.init $(DESTDIR)$(init_dir)/keepalived
+ 	install -d $(DESTDIR)$(sysconf_dir)
+ 	install -m 755 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived
+-	install -d $(DESTDIR)$(sysconfdir)/keepalived/samples
++	install -d $(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)/man5
+ 	install -d $(DESTDIR)$(mandir)/man8
+ 	install -m 644 ../doc/man/man5/keepalived.conf.5 $(DESTDIR)$(mandir)/man5
diff --git a/network/keepalived/keepalived.desc b/network/keepalived/keepalived.desc
index 9398f3687..dc447c3da 100644
--- a/network/keepalived/keepalived.desc
+++ b/network/keepalived/keepalived.desc
@@ -3,7 +3,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../keepalived/keepalived.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY]
@@ -37,10 +37,10 @@
 
 [L] GPL
 [S] Stable
-[V] 1.1.13
+[V] 1.1.15
 [P] X -----5---9 190.400
 
 [CV-URL] http://www.keepalived.org/download.html
 
-[D] 1913935697 keepalived-1.1.13.tar.gz http://www.keepalived.org/software/
+[D] 1675769540 keepalived-1.1.15.tar.gz http://www.keepalived.org/software/
 
diff --git a/network/keepalived/locations.patch b/network/keepalived/locations.patch
deleted file mode 100644
index 2ed867d1a..000000000
--- a/network/keepalived/locations.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../keepalived/locations.patch
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-# Copyright (C) 1998 - 2004 Clifford Wolf
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-
-init.d dir is inside rc.d/, and we don't want samples on $sysconfdir
-Alejandro
-
---- ./keepalived/Makefile.in.orig	2005-02-14 11:02:39.000000000 -0300
-+++ ./keepalived/Makefile.in	2005-02-15 09:35:06.445206336 -0300
-@@ -96,11 +96,10 @@
- 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 -d $(DESTDIR)$(sysconfdir)/keepalived/samples
-+	install -d $(DESTDIR)$(sysconfdir)/rc.d/init.d
-+	install -m 755 $(init_script) $(DESTDIR)$(sysconfdir)/rc.d/init.d/keepalived
-+	install -d $(DESTDIR)$(sysconfdir)/keepalived
- 	install -m 644 $(conf_file) $(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