diff --git a/package/mnemoc/keepalived/keepalived.desc b/package/mnemoc/keepalived/keepalived.desc index 593727a7a..c0ffabf1b 100644 --- a/package/mnemoc/keepalived/keepalived.desc +++ b/package/mnemoc/keepalived/keepalived.desc @@ -7,7 +7,7 @@ [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! [COPY] [COPY] ROCK Linux: rock-src/package/mnemoc/keepalived/keepalived.desc -[COPY] ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf [COPY] [COPY] This program is free software; you can redistribute it and/or modify [COPY] it under the terms of the GNU General Public License as published by @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.1.6 +[V] 1.1.7 [P] X -----5---9 190.400 -[D] 538012670 keepalived-1.1.6.tar.gz http://keepalived.sourceforge.net/software/ +[D] 4183865723 keepalived-1.1.7.tar.gz http://keepalived.sourceforge.net/software/ diff --git a/package/mnemoc/keepalived/locations.patch b/package/mnemoc/keepalived/locations.patch index 68c8f03a1..9ff5e2c96 100644 --- a/package/mnemoc/keepalived/locations.patch +++ b/package/mnemoc/keepalived/locations.patch @@ -6,31 +6,28 @@ # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/mnemoc/keepalived/locations.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf +# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf # -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. +# 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. # # --- ROCK-COPYRIGHT-NOTE-END --- ---- ./keepalived/Makefile.in.orig 2004-02-22 15:08:11.000000000 +0100 -+++ ./keepalived/Makefile.in 2004-03-23 09:01:14.059074320 +0100 -@@ -93,8 +93,7 @@ +--- ./keepalived/Makefile.in.orig 2003-07-07 23:52:32.000000000 -0400 ++++ ./keepalived/Makefile.in 2003-07-08 00:08:40.000000000 -0400 +@@ -89,8 +89,7 @@ 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 $(sbindir) + install -m 700 $(BIN)/$(EXEC) $(sbindir)/ +- install -d $(sysconfdir)/init.d +- install -m 755 $(init_script) $(sysconfdir)/init.d/keepalived +- install -d $(sysconfdir)/keepalived/samples ++ install -d $(sysconfdir)/rc.d/init.d ++ install -m 755 $(init_script) $(sysconfdir)/rc.d/init.d/keepalived ++ install -d $(sysconfdir)/keepalived + install -m 644 $(conf_file) $(sysconfdir)/keepalived/ +- install -m 644 ../doc/samples/* $(sysconfdir)/keepalived/samples/