From 0c8cb0106e6daf223ef7dd0e705f5dcafe0827ae Mon Sep 17 00:00:00 2001
From: Eivind Uggedal <eivind@uggedal.com>
Date: Sat, 12 Sep 2015 18:57:54 +0000
Subject: main/conntrack-tools: upgrade to 1.4.3

---
 main/conntrack-tools/APKBUILD                | 14 +++-----
 main/conntrack-tools/musl-fix-includes.patch | 51 ----------------------------
 2 files changed, 5 insertions(+), 60 deletions(-)
 delete mode 100644 main/conntrack-tools/musl-fix-includes.patch

diff --git a/main/conntrack-tools/APKBUILD b/main/conntrack-tools/APKBUILD
index 7d428dc492..d38b77dc57 100644
--- a/main/conntrack-tools/APKBUILD
+++ b/main/conntrack-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=conntrack-tools
-pkgver=1.4.2
-pkgrel=2
+pkgver=1.4.3
+pkgrel=0
 pkgdesc="Connection tracking userspace tools"
 url="http://conntrack-tools.netfilter.org"
 arch="all"
@@ -12,7 +12,6 @@ makedepends="linux-headers libnfnetlink-dev libnetfilter_conntrack-dev bison fle
 	libmnl-dev libnetfilter_cttimeout-dev libnetfilter_cthelper-dev
 	libnetfilter_queue-dev libtirpc-dev"
 source="http://www.netfilter.org/projects/conntrack-tools/files/$pkgname-$pkgver.tar.bz2
-	musl-fix-includes.patch
 	conntrackd.initd
 	conntrackd.confd
 	"
@@ -51,15 +50,12 @@ package() {
 		"$pkgdir"/etc/conntrackd/conntrackd.conf
 }
 
-md5sums="b1f9d006e7bf000a77395ff7cd3fac16  conntrack-tools-1.4.2.tar.bz2
-3054920c89481b6cb78199ee3d99c1a8  musl-fix-includes.patch
+md5sums="966a5d8f846ddf5304bcd12685c0707f  conntrack-tools-1.4.3.tar.bz2
 30bafeed166c9af8f3f0e084984431b4  conntrackd.initd
 8ebf3838b69d20e6bb4a173844502039  conntrackd.confd"
-sha256sums="e5c423dc077f9ca8767eaa6cf40446943905711c6a8fe27f9cc1977d4d6aa11e  conntrack-tools-1.4.2.tar.bz2
-72dbbe2188f2a47123327c2ee37e41fefc60bab6c3f0e678ff55ee697414dc4d  musl-fix-includes.patch
+sha256sums="af3ccc60356cfedf941065fdaaf9cd5e51f3df7484f56858af37106feecf3f57  conntrack-tools-1.4.3.tar.bz2
 089fe7ceea1bb514f71ce8fa26a2fa82fc6246e8e4d1128df3ed8e1b6a9e84f4  conntrackd.initd
 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7  conntrackd.confd"
-sha512sums="1fed742593caf8bbac96a58df8f7e806d1c0f1dfea8fc601d65aa89b4243b1022949a2bf03ab0ca25994a13e50b3b1ee43a31827e0dc4da1399801ddac623d56  conntrack-tools-1.4.2.tar.bz2
-c4e8f8336a0c27bdecfb41c3f98a174fa6781b6e1098eb969010c2d85fec4d45193077c30c86c25cde85459505d43be35fac6f7fcd2795a8e5f1f60062846127  musl-fix-includes.patch
+sha512sums="be76a0ddb7470249c58ceab72cb94ffc05f5cc6d740a0755c9c782e948b4234eb1da4f7c7df1f14e4125cca9f12f3b4d2dcd444fe011941952aa3eeb13cb72c3  conntrack-tools-1.4.3.tar.bz2
 1d8e6d6eec79233b276d12e78c5d184d356df85ede299bfa9f6967ace30987f3b2f8c8077a1e2f9123a817f2805fdb9bf8fa9ec441882a112d83cabf84932e16  conntrackd.initd
 fd8cfab207867844db6671a8395efadca792d6085c3436381e574dc52f3b4e41d9526b3db6114dd98e534a5419ca19f291d21c091f8cf0426024d73d18133e6f  conntrackd.confd"
diff --git a/main/conntrack-tools/musl-fix-includes.patch b/main/conntrack-tools/musl-fix-includes.patch
deleted file mode 100644
index ca5feb1b72..0000000000
--- a/main/conntrack-tools/musl-fix-includes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- conntrack-tools-1.4.2.orig/include/bitops.h
-+++ conntrack-tools-1.4.2/include/bitops.h
-@@ -1,7 +1,7 @@
- #ifndef _BITOPS_H_
- #define _BITOPS_H_
- 
--#include <stdlib.h>
-+#include <sys/types.h>
- 
- static inline void set_bit_u32(int nr, u_int32_t *addr)
- {
---- conntrack-tools-1.4.2.orig/include/conntrackd.h
-+++ conntrack-tools-1.4.2/include/conntrackd.h
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
- #include <syslog.h>
-+#include <sys/select.h>
- 
- /* UNIX facilities */
- #define CT_FLUSH_MASTER		0	/* flush kernel conntrack table */
---- conntrack-tools-1.4.2.orig/include/mcast.h
-+++ conntrack-tools-1.4.2/include/mcast.h
-@@ -2,6 +2,7 @@
- #define _MCAST_H_
- 
- #include <stdint.h>
-+#include <sys/select.h>
- #include <netinet/in.h>
- #include <net/if.h>
- 
---- conntrack-tools-1.4.2.orig/include/tcp.h
-+++ conntrack-tools-1.4.2/include/tcp.h
-@@ -2,6 +2,7 @@
- #define _TCP_H_
- 
- #include <stdint.h>
-+#include <sys/select.h>
- #include <netinet/in.h>
- 
- struct tcp_conf {
---- conntrack-tools-1.4.2.orig/include/udp.h
-+++ conntrack-tools-1.4.2/include/udp.h
-@@ -2,6 +2,7 @@
- #define _UDP_H_
- 
- #include <stdint.h>
-+#include <sys/select.h>
- #include <netinet/in.h>
- 
- struct udp_conf {
-- 
cgit v1.2.3