rpms/ucarp/EL-4 ucarp.init, NONE, 1.1 vip-common.conf, NONE, 1.1 vip-down, NONE, 1.1 vip-up, NONE, 1.1 sources, 1.3, 1.4 ucarp.spec, 1.3, 1.4 vip-001.conf.example, 1.1, 1.2

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/ucarp/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7030/EL-4

Modified Files:
	sources ucarp.spec vip-001.conf.example 
Added Files:
	ucarp.init vip-common.conf vip-down vip-up 
Log Message:
1.1 and 1.3 were never build, updating to 1.5 and building, BZ 510287.



***** Error reading new file: [Errno 2] No such file or directory: 'ucarp.init'

--- NEW FILE vip-common.conf ---
# Common VIP settings which can be overridden in individual vip-<nnnn>.conf
PASSWORD="love"
BIND_INTERFACE="eth0"
SOURCE_ADDRESS=""

# If you have extra options to add, see "ucarp --help" output
OPTIONS="--shutdown --preempt"



--- NEW FILE vip-down ---
#!/bin/sh
exec 2>/dev/null

/sbin/ip address del "$2"/32 dev "$1"



--- NEW FILE vip-up ---
#!/bin/sh
exec 2>/dev/null

/sbin/ip address add "$2"/32 dev "$1"



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	13 Jan 2005 18:13:20 -0000	1.3
+++ sources	8 Jul 2009 17:41:05 -0000	1.4
@@ -1 +1 @@
-f907752bd1654a6e8aa42e717aee9774  ucarp-1.1.tar.bz2
+5b50ca5553bc520f4e639964c9ad5056  ucarp-1.5.tar.bz2


Index: ucarp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/EL-4/ucarp.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ucarp.spec	13 Jan 2005 18:13:20 -0000	1.3
+++ ucarp.spec	8 Jul 2009 17:41:06 -0000	1.4
@@ -1,18 +1,25 @@
 Summary: Common Address Redundancy Protocol (CARP) for Unix
 Name: ucarp
-Version: 1.1
-Release: 1
-License: BSD
+Version: 1.5
+Release: 1%{?dist}
+# See the COPYING file which details everything
+License: MIT and BSD
 Group: System Environment/Daemons
 URL: http://www.ucarp.org/
-Source0: ftp://ftp.ucarp.org/pub/ucarp/ucarp-%{version}.tar.bz2
-Source1: carp.init
+Source0: http://download.pureftpd.org/pub/ucarp/ucarp-%{version}.tar.bz2
+Source1: ucarp.init
 Source2: vip-001.conf.example
+Source3: vip-common.conf
+Source4: vip-up
+Source5: vip-down
+#Source6: vip-helper.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
-BuildRequires: libpcap, gettext
+BuildRequires: gettext
+BuildRequires: autoconf, automake, libtool
+BuildRequires: libpcap-devel
 
 %description
 UCARP allows a couple of hosts to share common virtual IP addresses in order
@@ -25,7 +32,7 @@ need for any dedicated extra network lin
 
 
 %prep
-%setup
+%setup -q
 
 
 %build
@@ -35,66 +42,124 @@ need for any dedicated extra network lin
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall
+%{__make} install DESTDIR=%{buildroot}
 %find_lang %{name}
 
 # Install the init script
-%{__install} -D -m 0755 %{SOURCE1} \
-    %{buildroot}/etc/rc.d/init.d/carp
+%{__install} -D -p -m 0755 %{SOURCE1} \
+    %{buildroot}/etc/rc.d/init.d/ucarp
 
-# Install the example config file
-%{__install} -D -m 0600 %{SOURCE2} \
-    %{buildroot}/etc/sysconfig/carp/vip-001.conf.example
-
-# Install trivial interface up/down scripts
-%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-up
-#!/bin/sh
-# We could use ifup directly, but it complains if the address is already used
-#/sbin/ifup $1
-. /etc/sysconfig/network-scripts/ifcfg-$1
-#exec /sbin/ip addr add ${IPADDR}/${NETMASK} dev "$1"
-exec /sbin/ifconfig $1 ${IPADDR} netmask ${NETMASK} up
-EOF
-%{__cat} << 'EOF' > %{buildroot}/etc/sysconfig/carp/vip-down
-#!/bin/sh
-#. /etc/sysconfig/network-scripts/ifcfg-$1
-#exec /sbin/ip addr del ${IPADDR}/${NETMASK} dev "$1"
-exec /sbin/ifconfig $1 down
-EOF
+%{__mkdir_p} %{buildroot}/etc/ucarp
+%{__mkdir_p} %{buildroot}%{_libexecdir}/ucarp
+
+# Install the example config files
+%{__install} -D -p -m 0600 %{SOURCE2} %{SOURCE3} \
+    %{buildroot}/etc/ucarp/
+
+# Install helper scripts
+%{__install} -D -p -m 0700 %{SOURCE4} %{SOURCE5} \
+    %{buildroot}%{_libexecdir}/ucarp/
 
 
 %clean
 %{__rm} -rf %{buildroot}
 
 
-%post
-if [ $1 -eq 1 ]; then
-    /sbin/chkconfig --add carp
+%pre
+# Legacy, in case we update from an older package where the service was "carp"
+if [ -f /etc/rc.d/init.d/carp ]; then
+    /sbin/service carp stop &>/dev/null || :
+    /sbin/chkconfig --del carp
 fi
 
+%post
+/sbin/chkconfig --add ucarp
+
 %preun
 if [ $1 -eq 0 ]; then
-    /sbin/service carp stop >/dev/null 2>&1 || :
-    /sbin/chkconfig --del carp
+    /sbin/service ucarp stop &>/dev/null || :
+    /sbin/chkconfig --del ucarp
 fi
 
 %postun
 if [ $1 -ge 1 ]; then
-    /sbin/service carp condrestart >/dev/null 2>&1 || :
+    /sbin/service ucarp condrestart &>/dev/null || :
 fi
 
 
 %files -f %{name}.lang
-%defattr(-, root, root, 0755)
-%doc AUTHORS COPYING ChangeLog NEWS README examples/linux/*.sh
-/etc/rc.d/init.d/carp
-/etc/sysconfig/carp/vip-001.conf.example
-%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-up
-%attr(0700, root, root) %config(noreplace) /etc/sysconfig/carp/vip-down
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog NEWS README
+/etc/rc.d/init.d/ucarp
+%attr(0700,root,root) %dir /etc/ucarp/
+%config(noreplace) /etc/ucarp/vip-common.conf
+/etc/ucarp/vip-001.conf.example
+%{_libexecdir}/ucarp/
 %{_sbindir}/ucarp
 
-
 %changelog
+* Mon Apr 13 2009 Jon Ciesla <limb at jcomserv.net> - 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 <rel-eng at lists.fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb  3 2008 Matthias Saou <http://freshrpms.net/> 1.4-1
+- Update to 1.4.
+- Rip out all of the "list" stuff and 255.255.255.255 address hack (#427495).
+- Change from INITLOG (now deprecated) to LOGGER in the init script.
+- Move helper scripts to /usr/libexec/ucarp/.
+
+* Thu Aug 23 2007 Matthias Saou <http://freshrpms.net/> 1.2-9
+- Rebuild for new BuildID feature.
+
+* Sun Aug  5 2007 Matthias Saou <http://freshrpms.net/> 1.2-8
+- Update License field.
+
+* Fri Feb  2 2007 Matthias Saou <http://freshrpms.net/> 1.2-7
+- Rename service from carp to ucarp, to be more consistent.
+- Move /etc/sysconfig/carp to /etc/ucarp since it has become a config directory
+  of its own.
+
+* Wed Nov 29 2006 Matthias Saou <http://freshrpms.net/> 1.2-6
+- Rebuild against new libpcap.
+
+* Mon Nov 13 2006 Matthias Saou <http://freshrpms.net/> 1.2-5
+- Include all improvements from Denis Ovsienko (#200395).
+
+* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 1.2-4
+- FC6 rebuild.
+
+* Tue Aug 22 2006 Matthias Saou <http://freshrpms.net/> 1.2-3
+- Update to 1.3 snapshot, which includes the ARP fix, as well as fixes for the
+  segfaults reported in #200400 and #201596.
+- Add autoconf, automake and libtool build reqs for the 1.3 patch.
+
+* Thu Jul 27 2006 Matthias Saou <http://freshrpms.net/> 1.2-3
+- Fix init script for recent find versions (#200395).
+
+* Thu Jun 22 2006 Matthias Saou <http://freshrpms.net/> 1.2-2
+- Include ARP patch backported from 1.3 snapshot (#196095).
+- Make libpcap build requirement conditional to be able to share spec file.
+
+* Wed Jun 21 2006 Matthias Saou <http://freshrpms.net/> 1.2-1
+- Update to 1.2.
+- BuildRequire libpcap-devel instead of libpcap now that it has been split.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 1.1-5
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.1-4
+- Rebuild for new gcc/glibc.
+
+* Thu Nov 17 2005 Matthias Saou <http://freshrpms.net/> 1.1-3
+- Rebuild against new libpcap library.
+
+* Fri Apr  1 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.1-2
+- Add %%dir entry for /etc/sysconfig/carp directory.
+
 * Thu Jan 13 2005 Matthias Saou <http://freshrpms.net/> 1.1-1
 - Update to 1.1.
 - Update source location.


Index: vip-001.conf.example
===================================================================
RCS file: /cvs/pkgs/rpms/ucarp/EL-4/vip-001.conf.example,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- vip-001.conf.example	9 Nov 2004 02:50:47 -0000	1.1
+++ vip-001.conf.example	8 Jul 2009 17:41:06 -0000	1.2
@@ -1,20 +1,10 @@
 # Virtual IP configuration file for UCARP
 # The number (from 001 to 255) in the name of the file is the identifier
-# $Id$
 
-# Set the same password on all mamchines sharing the same virtual IP
-PASSWORD="love"
+# In the simple scenario, you want a single virtual IP address from the _same_
+# network to be taken over by one of the routers.
+VIP_ADDRESS="10.0.0.254"
 
-# You are required to have an IPADDR= line in the configuration file for
-# this interface (so no DHCP allowed)
-BIND_INTERFACE="eth0"
-
-# Do *NOT* use a main interface for the virtual IP, use an ethX:Y alias
-# with the corresponding /etc/sysconfig/network-scripts/ifcfg-ethX:Y file
-# already configured and ith ONBOOT=no
-VIP_INTERFACE="eth0:0"
-
-# If you have extra options to add, see "ucarp --help" output
-# (the lower the "-k <val>" the higher priority and "-P" to become master ASAP)
-OPTIONS="-k 128 -P"
+# In more complex scenarios, check the "vip-common" file for values to override
+# and how to add options.