Mon Aug 13 00:02:34 UTC 2012

6 files changed, 105 insertions, 30 deletions

diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index 65386def0..2dd18b16f 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -3,13 +3,14 @@
 
 pkgname='cronie'
 pkgver=1.4.8
-pkgrel=2
+pkgrel=3
 pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
 url='https://fedorahosted.org/cronie/'
 license=('custom:BSD')
 arch=('i686' 'x86_64')
 depends=('pam' 'bash' 'run-parts')
-optdepends=('smtp-server: sending cron job output via email')
+optdepends=('pm-utils: defer anacron when on battery power'
+            'smtp-server: sending cron job output via email')
 
 source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'cron.deny'
@@ -65,4 +66,7 @@ package() {
 	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
 
 	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
+
+	# Provide native service for arch-daemons generator
+	ln -s cronie.service "$pkgdir/usr/lib/systemd/system/crond.service"
 }
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index d2e97be57..d9a1f8643 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164510 2012-08-01 10:29:03Z stephane $
+# $Id: PKGBUILD 165136 2012-08-11 13:41:56Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=krb5
-pkgver=1.10.2
-pkgrel=3
+pkgver=1.10.3
+pkgrel=1
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64')
 url="http://web.mit.edu/kerberos/"
@@ -20,9 +20,8 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-si
         krb5-kpropd
         krb5-kpropd.service
         krb5-kpropd@.service
-        krb5-kpropd.socket
-        MITKRB5-SA-2012-001.patch)
-sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d'
+        krb5-kpropd.socket)
+sha1sums=('04ab9837e5d1958158bcb30bd6480201089a0cbb'
           '78b759d566b1fdefd9bbcd06df14f07f12effe96'
           '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
           'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
@@ -31,8 +30,7 @@ sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d'
           '7f402078fa65bb9ff1beb6cbbbb017450df78560'
           '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
           '023a8164f8ee7066ac814486a68bc605e79f6101'
-          'f3677d30dbbd7106c581379c2c6ebb1bf7738912'
-          '7b32dd24e68dc801efb8be280083e4d8067e392a')
+          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
 options=('!emptydirs')
 
 build() {
@@ -48,9 +46,6 @@ build() {
    # FS#25384
    sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
 
-   # Fix KDC heap corruption and crash vulnerabilities
-   patch -Np2 -i ../../MITKRB5-SA-2012-001.patch
-
    export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
    export CPPFLAGS+=" -I/usr/include/et"
    ./configure --prefix=/usr \
diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD
index 2e38d8051..c33ea55e4 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 162089 2012-06-19 15:44:03Z allan $
+# $Id: PKGBUILD 165168 2012-08-11 22:51:08Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=logrotate
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
 pkgdesc="Rotates system logs automatically"
 arch=('i686' 'x86_64')
 url="https://fedorahosted.org/logrotate/"
@@ -12,23 +12,21 @@ groups=('base')
 depends=('popt' 'cron' 'gzip')
 backup=('etc/logrotate.conf')
 source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
-        'logrotate-3.8.1-noasprintf.patch'
+        'noasprintf.patch'
+        'paths.patch'
         'logrotate.conf'
         'logrotate.cron.daily')
-md5sums=('bd2e20d8dc644291b08f9215397d28a5'
-         'fc8e4e15211d8aefd431d0e2e96223c4'
+md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
+         'cd76976b5ce37d328b452c806b55a015'
+         'e76526bcd6fc33c9d921e1cb1eff1ffb'
          '462a5f364717461537eb2ae6394ad23e'
          'aa8ac8283908b6114483a293adcb650f')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
 
-  patch -p1 -i "$srcdir"/logrotate-3.8.1-noasprintf.patch
-
-  sed -e 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\
-      -e 's|#define COMPRESS_COMMAND .*|#define COMPRESS_COMMAND "/usr/bin/gzip"|'\
-      -e 's|#define UNCOMPRESS_COMMAND .*|#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"|'\
-      -i config.h
+  patch -p0 -i "$srcdir/noasprintf.patch"
+  patch -p0 -i "$srcdir/paths.patch"
 
   make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
 }
@@ -40,7 +38,7 @@ check() {
 
 package() {
   cd "$srcdir/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir" MANDIR="usr/share/man" install
+  make PREFIX="$pkgdir" MANDIR="/usr/share/man" install
 
   install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
   install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
diff --git a/core/logrotate/noasprintf.patch b/core/logrotate/noasprintf.patch
new file mode 100644
index 000000000..3df943b64
--- /dev/null
+++ b/core/logrotate/noasprintf.patch
@@ -0,0 +1,53 @@
+--- 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/logrotate/paths.patch b/core/logrotate/paths.patch
new file mode 100644
index 000000000..83166b095
--- /dev/null
+++ b/core/logrotate/paths.patch
@@ -0,0 +1,25 @@
+--- config.h	2012-08-01 12:56:47.000000000 +0200
++++ config.h	2012-08-03 09:53:05.025039199 +0200
+@@ -27,11 +27,11 @@
+  * Default settings for Linux - leave these last.
+  */
+ #ifndef DEFAULT_MAIL_COMMAND
+-#define DEFAULT_MAIL_COMMAND "/bin/mail"
++#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
+ #endif
+ 
+ #ifndef COMPRESS_COMMAND
+-#define COMPRESS_COMMAND "/bin/gzip"
++#define COMPRESS_COMMAND "/usr/bin/gzip"
+ #endif
+ 
+ #ifndef COMPRESS_EXT
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ #ifndef UNCOMPRESS_COMMAND
+-#define UNCOMPRESS_COMMAND "/bin/gunzip"
++#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
+ #endif
+ 
+ #ifndef STATEFILE
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 58b94e7fb..f8fe56971 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 160587 2012-06-02 10:54:59Z bluewind $
+# $Id: PKGBUILD 165149 2012-08-11 20:00:01Z bluewind $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: kevin <kevin.archlinux.org>
 # Contributor: judd <jvinet.zeroflux.org>
 # Contributor: francois <francois.archlinux.org> 
 pkgname=perl
-pkgver=5.16.0
-pkgrel=2
+pkgver=5.16.1
+pkgrel=1
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -19,7 +19,7 @@ perlbin.csh
 provides.pl)
 install=perl.install
 options=('makeflags' '!purge')
-md5sums=('15a2f95fb27231e10998240f13acf961'
+md5sums=('b87358e2c461a898cfd7c334e7dd8993'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
          '999c3eea6464860704abbb055a0f0896')