community/keepalived: upgrade to 1.3.7

2 files changed, 5 insertions, 61 deletions

diff --git a/community/keepalived/APKBUILD b/community/keepalived/APKBUILD
index 78ec4532d01..544fb4728df 100644
--- a/community/keepalived/APKBUILD
+++ b/community/keepalived/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=keepalived
-pkgver=1.2.24
-pkgrel=1
+pkgver=1.3.7
+pkgrel=0
 pkgdesc="Health Checking for Linux Virtual Server & High-Availability"
 url="http://www.keepalived.org/"
 arch="all"
@@ -17,7 +17,6 @@ subpackages="$pkgname-doc $pkgname-sample-config:samples:noarch
 source="http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
 	$pkgname.confd
-	fix-configure.patch
 	"
 builddir="$srcdir/$pkgname-$pkgver"
 
@@ -88,7 +87,7 @@ snmp() {
 	install -m700 -D bin/keepalived "$subpkgdir"/usr/sbin/keepalived
 
 	mkdir -p "$subpkgdir"/usr/share/snmp/mibs
-	install -m644 doc/*-MIB "$subpkgdir"/usr/share/snmp/mibs/
+	install -m644 doc/*-MIB.txt "$subpkgdir"/usr/share/snmp/mibs/
 }
 
 samples() {
@@ -98,15 +97,6 @@ samples() {
 	mv "$pkgdir"/etc/keepalived/samples "$subpkgdir"/etc/keepalived/
 }
 
-md5sums="e878312095b7dcab91ad06e257822247  keepalived-1.2.24.tar.gz
-ad67cf11d9fc60f55eff562728a16863  keepalived.initd
-252a289af5b7c7ec6f0cb3fe48f57486  keepalived.confd
-a2283ead67c71ec937a64cfecbb3eb66  fix-configure.patch"
-sha256sums="3071804478077e606197a2348b5733d7d53af2843906af5e0d544945565c36ef  keepalived-1.2.24.tar.gz
-535bcfe41410a86e6640bf8c8c8ddb31546ba83476fceef8e0799121737ee5c2  keepalived.initd
-4e655777aa3d6afa6cd746e84aa87fbb356c6d4cac9846c3a2f8805d65763497  keepalived.confd
-0ccc131d013959b430f44ad9a7e9fa5ddbe068cfe2af31ed72d30e8ef394a77e  fix-configure.patch"
-sha512sums="a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5  keepalived-1.2.24.tar.gz
+sha512sums="61ea5a6914325dc69d3951330fc1332a08bf2073e079c6ea14ee9dee44a772ba2fd10fc61701c668ae5dcfd739c451d421bde9a73abbed6f76a9085b235cb077  keepalived-1.3.7.tar.gz
 12361313dd044269150c9ea1a4ffc6987075b0106dfdd4b3804b1852d2a47f608d954ab473419474747b475c98fade3779800be8147134969016817cfa050ee4  keepalived.initd
-413cb05aa2d1d8c0f552398bb5d511ee022b4d07f5b18217350c1159d013f2d26d87ae63d2977329ec78d7416760e84c4048a5ad20a1f63ef2bc3a1a84c3a41a  keepalived.confd
-6d24889d83bc3ec6d4d8636380477576ffb6439dc49ff0b59be50a5afe41d1050bbad6f938fc9b5cb4b9cc64b8de9d6c058d8ef1bb721420140ae467656b5429  fix-configure.patch"
+413cb05aa2d1d8c0f552398bb5d511ee022b4d07f5b18217350c1159d013f2d26d87ae63d2977329ec78d7416760e84c4048a5ad20a1f63ef2bc3a1a84c3a41a  keepalived.confd"
diff --git a/community/keepalived/fix-configure.patch b/community/keepalived/fix-configure.patch
deleted file mode 100644
index 14c43d8048a..00000000000
--- a/community/keepalived/fix-configure.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 4b6ceb48080044d675bc67ac93a86513b61eea63 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 19 Nov 2016 01:43:24 +0100
-Subject: [PATCH] Fix illegal syntax in configure script
-
-Indirect expansion (`${!foo}`) is a bashism, it's not POSIX-sh
-compatible and is not supported by common shells except Bash and ZSH!
-Configure script should be portable, hence strictly POSIX compliant.
-Moreover it has shebang /bin/sh.
-
-Sent to upstream: https://github.com/acassen/keepalived/pull/456
----
- configure    | 4 ++--
- configure.ac | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure b/configure
-index bfd0acb..c6085e2 100755
---- a/configure
-+++ b/configure
-@@ -7087,8 +7087,8 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- for flag in RTA_ENCAP RTA_EXPIRES RTA_NEWDST RTA_PREF RTA_VIA FRA_OIFNAME FRA_SUPPRESS_PREFIXLEN FRA_SUPPRESS_IFGROUP FRA_TUN_ID RTAX_CC_ALGO RTAX_QUICKACK; do
--  decl_var=ac_cv_have_decl_$flag
--  if test ${!decl_var} = yes; then
-+  eval decl_var=\$ac_cv_have_decl_$flag
-+  if test ${decl_var} = yes; then
-     BUILD_OPTIONS="$BUILD_OPTIONS "${flag}
-   fi
- done
-diff --git a/configure.ac b/configure.ac
-index 2496be1..15ffc40 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -422,8 +422,8 @@ AC_CHECK_DECLS([RTA_VIA, FRA_OIFNAME], [], [],
-     #include <sys/socket.h>
-     #include <linux/fib_rules.h>]])
- for flag in RTA_ENCAP RTA_EXPIRES RTA_NEWDST RTA_PREF RTA_VIA FRA_OIFNAME FRA_SUPPRESS_PREFIXLEN FRA_SUPPRESS_IFGROUP FRA_TUN_ID RTAX_CC_ALGO RTAX_QUICKACK; do
--  decl_var=ac_cv_have_decl_$flag
--  if test ${!decl_var} = yes; then
-+  AS_VAR_COPY([decl_var], [ac_cv_have_decl_$flag])
-+  if test ${decl_var} = yes; then
-     add_build_opt[${flag}]
-   fi
- done