This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3e7718a232d3a356488ef061f145da869ea3c809 (commit) via 73fef61592ea709ebdb00d65d6260c6171e40db7 (commit) from b9605c0741ed04dbd13b063fdca7ea8712643f70 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3e7718a232d3a356488ef061f145da869ea3c809 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 22:29:52 2011 +0200
keepalived: New package.
commit 73fef61592ea709ebdb00d65d6260c6171e40db7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Oct 25 21:13:29 2011 +0200
pakfire: Update to 0.9.17.
-----------------------------------------------------------------------
Summary of changes: keepalived/keepalived.nm | 75 ++++++++++++++++++++ .../patches/keepalived-1.1.14-installmodules.patch | 20 +++++ .../keepalived-1.1.19-fix-ipvs-loading.patch | 12 +++ .../patches/keepalived-1.2.2-ip_vs.h-pathfix.patch | 12 +++ keepalived/systemd/keepalived.service | 11 +++ pakfire/pakfire.nm | 4 +- 6 files changed, 132 insertions(+), 2 deletions(-) create mode 100644 keepalived/keepalived.nm create mode 100644 keepalived/patches/keepalived-1.1.14-installmodules.patch create mode 100644 keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch create mode 100644 keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch create mode 100644 keepalived/systemd/keepalived.service
Difference in files: diff --git a/keepalived/keepalived.nm b/keepalived/keepalived.nm new file mode 100644 index 0000000..d66ded8 --- /dev/null +++ b/keepalived/keepalived.nm @@ -0,0 +1,75 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team info@ipfire.org # +############################################################################### + +name = keepalived +version = 1.2.2 +release = 1 + +groups = Applications/System +url = http://www.keepalived.org/ +license = GPLv2+ +summary = High Availability monitor built upon LVS, VRRP and service pollers. + +description + The main goal of the keepalived project is to add a strong & robust keepalive + facility to the Linux Virtual Server project. This project is written in C with + multilayer TCP/IP stack checks. Keepalived implements a framework based on + three family checks : Layer3, Layer4 & Layer5/7. This framework gives the + daemon the ability to check the state of an LVS server pool. When one of the + servers of the LVS server pool is down, keepalived informs the linux kernel via + a setsockopt call to remove this server entry from the LVS topology. In + addition keepalived implements an independent VRRPv2 stack to handle director + failover. So in short keepalived is a userspace daemon for LVS cluster nodes + healthchecks and LVS directors failover. +end + +source_dl = http://www.keepalived.org/software/ + +build + requires + libnl-devel + openssl-devel + popt-devel + end + + configure_options += \ + --sysconfdir=/etc + +# --with-kernel-dir=$(ls -1d --sort t /lib/modules/*/build | head 1) + + make_targets += STRIP=/bin/true + + test + # A build could silently have LVS support disabled if the kernel includes can't + # be properly found, we need to avoid that. + if ! grep -q "IPVS_SUPPORT='_WITH_LVS_'" config.log; then + echo "ERROR: We do not want keeepalived lacking LVS support." + exit 1 + fi + end + + install_cmds + rm -rvf %{BUILDROOT}/etc/rc.d \ + %{BUILDROOT}/etc/keepalived/samples + end +end + +packages + package %{name} + postin + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + end + + postun + /bin/systemctl --no-reload disabled keepalived.service >/dev/null 2>&1 || : + /bin/systemctl stop keepalived.service >/dev/null 2>&1 || : + end + + postup + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl try-restart keepalived.service >/dev/null 2>&1 || : + end + end +end diff --git a/keepalived/patches/keepalived-1.1.14-installmodules.patch b/keepalived/patches/keepalived-1.1.14-installmodules.patch new file mode 100644 index 0000000..a5fc93c --- /dev/null +++ b/keepalived/patches/keepalived-1.1.14-installmodules.patch @@ -0,0 +1,20 @@ +diff -Naupr keepalived-1.1.14.orig/keepalived/Makefile.in keepalived-1.1.14/keepalived/Makefile.in +--- keepalived-1.1.14.orig/keepalived/Makefile.in 2007-09-13 15:44:39.000000000 +0200 ++++ keepalived-1.1.14/keepalived/Makefile.in 2007-09-14 12:38:43.000000000 +0200 +@@ -99,13 +99,13 @@ uninstall: + + install: + install -d $(DESTDIR)$(sbindir) +- install -m 700 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/ ++ install -m 755 $(BIN)/$(EXEC) $(DESTDIR)$(sbindir)/ + install -d $(DESTDIR)$(init_dir) + 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 -m 644 etc/init.d/keepalived.sysconfig $(DESTDIR)$(sysconf_dir)/keepalived + install -d $(DESTDIR)$(sysconfdir)/keepalived/samples +- install -m 644 etc/keepalived/keepalived.conf $(DESTDIR)$(sysconfdir)/keepalived/ ++ install -m 640 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 diff --git a/keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch b/keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch new file mode 100644 index 0000000..912914b --- /dev/null +++ b/keepalived/patches/keepalived-1.1.19-fix-ipvs-loading.patch @@ -0,0 +1,12 @@ +diff -Naupr keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c keepalived-1.1.19/keepalived/check/ipvswrapper.c +--- keepalived-1.1.19.orig/keepalived/check/ipvswrapper.c 2009-09-28 13:03:40.000000000 +0200 ++++ keepalived-1.1.19/keepalived/check/ipvswrapper.c 2009-11-24 22:41:56.220195007 +0100 +@@ -789,7 +789,7 @@ string_to_number(const char *s, int min, + static int + modprobe_ipvs(void) + { +- char *argv[] = { "/sbin/modprobe", "-s", "-k", "--", "ip_vs", NULL }; ++ char *argv[] = { "/sbin/modprobe", "-s", "--", "ip_vs", NULL }; + int child; + int status; + int rc; diff --git a/keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch b/keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch new file mode 100644 index 0000000..468fc0e --- /dev/null +++ b/keepalived/patches/keepalived-1.2.2-ip_vs.h-pathfix.patch @@ -0,0 +1,12 @@ +diff -up keepalived-1.2.2/configure.pathfix keepalived-1.2.2/configure +--- keepalived-1.2.2/configure.pathfix 2011-09-19 12:31:19.615258629 -0400 ++++ keepalived-1.2.2/configure 2011-09-19 12:31:38.872000057 -0400 +@@ -3973,7 +3973,7 @@ $as_echo "$as_me: WARNING: Cannot determ + + IPVS_SUPPORT="_WITHOUT_LVS_" + if test "$enable_lvs" != "no"; then +- ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" ++ ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" + if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then : + IPVS_SUPPORT="_WITH_LVS_" + else diff --git a/keepalived/systemd/keepalived.service b/keepalived/systemd/keepalived.service new file mode 100644 index 0000000..edb5b7f --- /dev/null +++ b/keepalived/systemd/keepalived.service @@ -0,0 +1,11 @@ +[Unit] +Description=LVS and VRRP High Availability Monitor +After=syslog.target network.target + +[Service] +Type=forking +EnvironmentFile=-/etc/sysconfig/keepalived +ExecStart=/usr/sbin/keepalived $KEEPALIVED_OPTIONS + +[Install] +WantedBy=multi-user.target diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm index 2de1850..ca8cf44 100644 --- a/pakfire/pakfire.nm +++ b/pakfire/pakfire.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pakfire -version = 0.9.16 -release = 2 +version = 0.9.17 +release = 1
maintainer = Michael Tremer michael.tremer@ipfire.org groups = System/Packaging
hooks/post-receive -- IPFire 3.x development tree