main/[various]: rebuild against mysql-5.5

* collectd
* dovecot
* freeradius
* kamailio
* lua-sql-mysql
* nagios-plugins
* perl-dbd-mysql
* postfix
* zabbix

10 files changed, 14 insertions, 12 deletions

diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index c732de88ee..f3bbdbe603 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: 
 pkgname=collectd
 pkgver=4.10.3
-pkgrel=0
+pkgrel=1
 pkgdesc="The system statistics collection daemon"
 url="http://collectd.org"
 arch="all"
diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index 22414ed042..25e52f3f98 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=dovecot
 pkgver=2.0.11
-pkgrel=0
+pkgrel=1
 pkgdesc="IMAP and POP3 server"
 url="http://www.dovecot.org/"
 arch="all"
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index ccdd878b84..da2d3528d9 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -41,6 +41,8 @@ prepare() {
 	sed -i 's%run_dir = .*%run_dir = \$\{localstatedir\}/run/radius%' \
 		raddb/radiusd.conf.in || return 1
 
+	rm -f libtool.m4
+	libtoolize --force -c || return 1
 	aclocal && ./autogen.sh || return 1
 }
 
@@ -55,8 +57,8 @@ build() {
 		--disable-static \
 		--enable-shared \
 		--disable-ltdl-install \
-		--with-system-libltdl \
 		--with-system-libtool \
+		--with-system-libltdl \
 		--with-udpfromto \
 		|| return 1
 
diff --git a/main/kamailio/APKBUILD b/main/kamailio/APKBUILD
index 9aaafb82f8..d0221decc2 100644
--- a/main/kamailio/APKBUILD
+++ b/main/kamailio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=kamailio
 pkgver=3.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Open Source SIP Server"
 url="http://www.kamailio.org/"
 pkgusers="kamailio"
diff --git a/main/lua-sql-mysql/APKBUILD b/main/lua-sql-mysql/APKBUILD
index cdf36f1cc3..7980797efb 100644
--- a/main/lua-sql-mysql/APKBUILD
+++ b/main/lua-sql-mysql/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=lua-sql-mysql
 _name=luasql-mysql
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="MySQL driver for LuaSQL (luasql-mysql)"
 url="http://www.keplerproject.org/luasql/"
 arch="all"
diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index f4ac98f6c1..57e275ec0f 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=nagios-plugins
 pkgver=1.4.15
-pkgrel=3
+pkgrel=4
 pkgdesc="Plugins for Nagios to check services on hosts"
 url="http://nagiosplugins.org"
 arch="all"
diff --git a/main/perl-dbd-mysql/APKBUILD b/main/perl-dbd-mysql/APKBUILD
index 913fd86626..9bc8ab997c 100644
--- a/main/perl-dbd-mysql/APKBUILD
+++ b/main/perl-dbd-mysql/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=perl-dbd-mysql
 _realpkgname=DBD-mysql
 pkgver=4.018
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl CPAN DBD::Mysql module"
 url="http://search.cpan.org/dist/${_realpkgname}"
 arch="all"
diff --git a/main/postfix/APKBUILD b/main/postfix/APKBUILD
index abb05a5a22..409dafaa2b 100644
--- a/main/postfix/APKBUILD
+++ b/main/postfix/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=postfix
 pkgver=2.8.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Secure and fast drop-in replacement for Sendmail (MTA)"
 url="http://www.postfix.org/"
 arch="all"
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 4abde50b9d..ace94f1701 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <natanael.copa@gmail.com>
 pkgname=zabbix
 pkgver=1.8.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="www.zabbix.com"
 arch="all"
@@ -156,7 +156,7 @@ md5sums="969ce09317c98b205bc96157e16f5c8c  zabbix-1.8.4.tar.gz
 9832a81e134c8e2c11e2a06b7adbf88f  zabbix_trapper.conf
 0310b92afb3f35c1075fff53db737212  zabbix_proxy.conf
 721c18077fa739f956340afca9f067f4  zabbix_agentd.conf
-d13166483792401be2d25b37b0170b82  zabbix-dn_skipname.patch
+a55a4d0b2e13c97c280006ba4bee0afa  zabbix-dn_skipname.patch
 8d1d2e53479173aac0df0c38a4d6afda  zabbix-getloadavg.patch
 e42394e798ab98a8ff4babe68e04633a  zabbix-server.initd
 88374bba8a8fdfabfcfe9be6dd12095f  zabbix-agentd.initd
diff --git a/main/zabbix/zabbix-dn_skipname.patch b/main/zabbix/zabbix-dn_skipname.patch
index df75e914a1..5d20639713 100644
--- a/main/zabbix/zabbix-dn_skipname.patch
+++ b/main/zabbix/zabbix-dn_skipname.patch
@@ -6,12 +6,12 @@ index c8956a6..645fd8c 100644
  
  #include "net.h"
  
-+#if defined(__UCLIBC__) && defined(HAVE_RES_QUERY)
++#if defined(__UCLIBC__)
 +/*
 + * Skip over a compressed domain name. Return the size or -1.
 + */
 +int
-+__dn_skipname(const u_char *comp_dn, const u_char *eom)
++dn_skipname(const u_char *comp_dn, const u_char *eom)
 +{
 +       const u_char *cp;
 +       int n;