Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/luaposix/PKGBUILD
	extra/mesa/PKGBUILD

4 files changed, 8 insertions, 64 deletions

diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index e4e360c9c..0243b31ed 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185626 2013-05-16 13:54:50Z pierre $
+# $Id: PKGBUILD 188802 2013-06-21 12:38:33Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
-pkgver=3.8.4
-pkgrel=2
+pkgver=3.8.5
+pkgrel=1
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/logrotate/"
@@ -13,12 +13,10 @@ depends=('popt' 'gzip' 'acl')
 optdepends=('cron: scheduled log rotation')
 backup=('etc/logrotate.conf')
 source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
-        'noasprintf.patch'
         'paths.patch'
         'logrotate.conf'
         'logrotate.cron.daily')
-md5sums=('7be7f1eabea33a1d0483438a6e33d634'
-         'cd76976b5ce37d328b452c806b55a015'
+md5sums=('d3c13e2a963a55c584cfaa83e96b173d'
          'e76526bcd6fc33c9d921e1cb1eff1ffb'
          '86209d257c8b8bc0ae34d6f6ef057c0f'
          '3909380f8a55fa160f62ed976a8bef4b')
@@ -26,7 +24,6 @@ md5sums=('7be7f1eabea33a1d0483438a6e33d634'
 build() {
 	cd "$srcdir/${pkgname}-${pkgver}"
 
-	patch -p0 -i "$srcdir/noasprintf.patch"
 	patch -p0 -i "$srcdir/paths.patch"
 
 	make WITH_ACL=yes RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
diff --git a/core/logrotate/noasprintf.patch b/core/logrotate/noasprintf.patch
deleted file mode 100644
index 3df943b64..000000000
--- a/core/logrotate/noasprintf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- config.c	2011-06-21 04:12:02.000000000 -0400
-+++ config.c	2011-07-12 13:47:36.274319050 -0400
-@@ -41,39 +41,6 @@
- #include "asprintf.c"
- #endif
- 
--#if !defined(asprintf)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
---- logrotate.h	2011-06-21 04:12:02.000000000 -0400
-+++ logrotate.h	2011-07-12 13:47:38.949285608 -0400
-@@ -66,8 +66,5 @@ extern int numLogs;
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/core/ppp/PKGBUILD b/core/ppp/PKGBUILD
index dcd2e72b8..1994cd8db 100644
--- a/core/ppp/PKGBUILD
+++ b/core/ppp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188198 2013-06-12 15:53:29Z thomas $
+# $Id: PKGBUILD 188844 2013-06-22 15:33:40Z thomas $
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 pkgname=ppp
 pkgver=2.4.5
-pkgrel=7
+pkgrel=8
 pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
 arch=(i686 x86_64 'mips64el') 
 url="http://www.samba.org/ppp/"
@@ -23,7 +23,7 @@ md5sums=('4621bc56167b6953ec4071043fe0ec57'
          '7a9259a8f038073eeea7e4552ff1849f'
          'e4beb16ed600b61336d50b2bd2df7cd5'
          '529b924f644f80cf30d72a966abc7419'
-         '0a79f6427e28426d42b76f7207c531e1'
+         '0e2eeb1af125a46291999162dcc9004a'
          '3a5d56ac23e36cdbf48187813c8ec981'
          '4cbd0a9af01c27067450ec7d3f5fa673'
          'b75c2fbc4afa9f2d8108b680c88c7036'
diff --git a/core/ppp/ip-up.d.dns.sh b/core/ppp/ip-up.d.dns.sh
index 47e4ca41f..0fc737eca 100644
--- a/core/ppp/ip-up.d.dns.sh
+++ b/core/ppp/ip-up.d.dns.sh
@@ -3,7 +3,7 @@
 if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then
   if [ -x /usr/bin/resolvconf ]; then
     /usr/bin/resolvconf -a ${IFNAME} </etc/ppp/resolv.conf
-  elif
+  else
     [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME}
     mv /etc/ppp/resolv.conf /etc/resolv.conf
     chmod 644 /etc/resolv.conf