From ed8624db7fdf813bbd2a7c36987494fd732c1825 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 21 Apr 2008 23:52:23 +0000 Subject: [PATCH 1/4] Initialize branch F-9 for ucarp --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..1c26f78 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-9 From 3a5141f811df47c3c59115993147caaccd323184 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Mon, 13 Apr 2009 14:17:12 +0000 Subject: [PATCH 2/4] 1.5. --- sources | 2 +- ucarp.init | 10 ++++++++++ ucarp.spec | 11 +++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 377eabe..5c48d2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e1765de2eea1bb59c9ad9c8596f4f89 ucarp-1.4.tar.bz2 +5b50ca5553bc520f4e639964c9ad5056 ucarp-1.5.tar.bz2 diff --git a/ucarp.init b/ucarp.init index edaf06d..c7f6296 100755 --- a/ucarp.init +++ b/ucarp.init @@ -4,6 +4,16 @@ # chkconfig: - 91 09 # description: Starts and stops the common address redundancy protocol daemon +### BEGIN INIT INFO +# Provides: lsb-ucarp +# Required-Start: $local_fs $network $remote_fs +# Required-Stop: $local_fs $network $remote_fs +# Default-Start: +# Default-Stop: 0 1 6 +# Short-Description: start and stop ucarp +# Description: Common Address Redundancy Protocol (CARP) for Unix +### END INIT INFO + # Source function library. . /etc/init.d/functions diff --git a/ucarp.spec b/ucarp.spec index 27b0d95..0da0a6f 100644 --- a/ucarp.spec +++ b/ucarp.spec @@ -1,6 +1,6 @@ Summary: Common Address Redundancy Protocol (CARP) for Unix Name: ucarp -Version: 1.4 +Version: 1.5 Release: 1%{?dist} # See the COPYING file which details everything License: MIT and BSD @@ -97,8 +97,15 @@ fi %{_libexecdir}/ucarp/ %{_sbindir}/ucarp - %changelog +* Mon Apr 13 2009 Jon Ciesla - 1.5-1 +- Update to 1.5 BZ 458767. +- Added LSB header to init script, BZ 247082. +- New upstream should address BZ 427495, 449266, 455394. + +* Wed Feb 25 2009 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 3 2008 Matthias Saou 1.4-1 - Update to 1.4. - Rip out all of the "list" stuff and 255.255.255.255 address hack (#427495). From 2ac0eced7c778d3b9010f7a538c6807d028313f0 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:13:16 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 503525f..d64a615 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ucarp SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From b88b8ecfb34693b698d69ee1f78bcf7efc447ef6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:36:23 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d64a615..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ucarp -# $Id$ -NAME := ucarp -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 1c26f78..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-9