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

[Dave Reisner]

    Date: Tuesday, September 25, 2012 @ 22:02:28
  Author: dreisner
Revision: 167135

upgpkg: systemd 192-1

Modified:
  systemd/trunk/PKGBUILD
Deleted:
  systemd/trunk/0001-journal-bring-mmap-cache-prototype-in-sync.patch

-------------------------------------------------------+
 0001-journal-bring-mmap-cache-prototype-in-sync.patch |   24 ----------------
 PKGBUILD                                              |   15 ++++------
 2 files changed, 7 insertions(+), 32 deletions(-)

Deleted: 0001-journal-bring-mmap-cache-prototype-in-sync.patch
===================================================================
--- 0001-journal-bring-mmap-cache-prototype-in-sync.patch	2012-09-26 01:37:00 UTC (rev 167134)
+++ 0001-journal-bring-mmap-cache-prototype-in-sync.patch	2012-09-26 02:02:28 UTC (rev 167135)
@@ -1,24 +0,0 @@
-From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Sat, 22 Sep 2012 00:16:13 +0200
-Subject: [PATCH] journal: bring mmap cache prototype in sync
-
----
- src/journal/mmap-cache.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
-index de34634..0c42fb8 100644
---- a/src/journal/mmap-cache.h
-+++ b/src/journal/mmap-cache.h
-@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
- MMapCache* mmap_cache_ref(MMapCache *m);
- MMapCache* mmap_cache_unref(MMapCache *m);
- 
--int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
-+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
- void mmap_cache_close_fd(MMapCache *m, int fd);
- void mmap_cache_close_context(MMapCache *m, unsigned context);
--- 
-1.7.12.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-26 01:37:00 UTC (rev 167134)
+++ PKGBUILD	2012-09-26 02:02:28 UTC (rev 167135)
@@ -3,7 +3,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=191
+pkgver=192
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -11,20 +11,19 @@
 makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
              'pam' 'quota-tools' 'xz')
+checkdepends=('python')
 options=('!libtool')
 source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
-        '0001-journal-bring-mmap-cache-prototype-in-sync.patch'
         'use-split-usr-path.patch')
-md5sums=('a5e4bfaf900a9e2480827feaf58556cb'
+md5sums=('e8692055923e87f7f9cb634d44314edb'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
          '5543be25f205f853a21fa5ee68e03f0d'
-         'ab42d779d640c6f986f48d326b7f0555'
          'fd5b5f04ab0a847373d357555129d4c0')
 
 build() {
@@ -36,10 +35,6 @@
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
 
-  # i686 build fail
-  # upstream commit: e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb
-  patch -Np1 <"$srcdir/0001-journal-bring-mmap-cache-prototype-in-sync.patch"
-
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
@@ -55,6 +50,10 @@
   make
 }
 
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
 package_systemd() {
   pkgdesc="system and service manager"
   depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'