[arch-commits] Commit in systemd/trunk (2 files)

[Dave Reisner]

    Date: Friday, April 19, 2013 @ 22:39:02
  Author: dreisner
Revision: 183261

upgpkg: systemd 202-2

- backport fix for libnss-myhostname (FS#34854)

Added:
  systemd/trunk/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
Modified:
  systemd/trunk/PKGBUILD

--------------------------------------------------------------+
 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch |   36 ++++++++++
 PKGBUILD                                                     |    6 +
 2 files changed, 41 insertions(+), 1 deletion(-)

Added: 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch
===================================================================
--- 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch	                        (rev 0)
+++ 0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch	2013-04-19 20:39:02 UTC (rev 183261)
@@ -0,0 +1,36 @@
+From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner at archlinux.org>
+Date: Fri, 19 Apr 2013 16:31:25 -0400
+Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used
+
+---
+ src/nss-myhostname/nss-myhostname.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c
+index 16ccb3e..8699098 100644
+--- a/src/nss-myhostname/nss-myhostname.c
++++ b/src/nss-myhostname/nss-myhostname.c
+@@ -25,7 +25,6 @@
+ #include <netdb.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <assert.h>
+ #include <unistd.h>
+ #include <net/if.h>
+ #include <stdlib.h>
+@@ -35,6 +34,11 @@
+ #include "macro.h"
+ #include "util.h"
+ 
++/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as
++ * libnss_myhostname will be linked into arbitrary programs which will, in turn
++ * attempt to write to the journal via log_dispatch() */
++#include <assert.h>
++
+ /* We use 127.0.0.2 as IPv4 address. This has the advantage over
+  * 127.0.0.1 that it can be translated back to the local hostname. For
+  * IPv6 we use ::1 which unfortunately will not translate back to the
+-- 
+1.8.2.1
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-19 15:28:29 UTC (rev 183260)
+++ PKGBUILD	2013-04-19 20:39:02 UTC (rev 183261)
@@ -4,7 +4,7 @@
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=202
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,11 +16,13 @@
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
+        '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch'
         'use-split-usr-path.patch')
 md5sums=('3136c6912d3ee1f6d4deb16234783731'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
+         '3090c0b9b19b76731b4cf9c01c10c534'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -28,6 +30,8 @@
 
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
+
+  patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch"
 }
 
 build() {