Mon May 13 01:16:27 PDT 2013

7 files changed, 18 insertions, 116 deletions

diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 0faf735c5..e18bb22cd 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179636 2013-03-08 23:40:39Z foutrelis $
+# $Id: PKGBUILD 185217 2013-05-12 09:08:11Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
-pkgver=3.8
-pkgrel=3
+pkgver=3.10
+pkgrel=1
 pkgdesc="nl80211 based CLI configuration utility for wireless devices"
 arch=("i686" "x86_64")
 url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -11,7 +11,7 @@ license=("GPL")
 depends=("libnl")
 makedepends=("linux-api-headers")
 source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('50c07d5fcf38240b3912fb6950f6ec566b8d27c321cbdacc1de53fc3be96af9a')
+sha256sums=('456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index c648eda47..2e200ea46 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -1,25 +1,21 @@
-# $Id: PKGBUILD 179638 2013-03-08 23:40:41Z foutrelis $
+# $Id: PKGBUILD 185218 2013-05-12 09:08:12Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=libpcap
-pkgver=1.3.0
-pkgrel=3
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="A system-independent interface for user-level packet capture"
 arch=('i686' 'x86_64')
 url="http://www.tcpdump.org/"
 license=('BSD')
 depends=('glibc' 'libnl' 'sh' 'libusbx')
 makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        libnl32.patch)
-sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9'
-            'a078cf1c0f36151cc84a0da7c25ad81fef87afa6bece58c990c62886a7beef99'
-            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
+source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig})
+sha256sums=('7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406'
+            'SKIP')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/libnl32.patch"
-  autoreconf -f -i
   ./configure --prefix=/usr --enable-ipv6 --with-libnl
   make
 }
diff --git a/core/libpcap/libnl32.patch b/core/libpcap/libnl32.patch
deleted file mode 100644
index 633fd003e..000000000
--- a/core/libpcap/libnl32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in
---- libpcap-1.2.1/configure.in	2012-01-02 01:47:37.000000000 +0100
-+++ libpcap-1.2.1-libnl32/configure.in	2012-02-09 19:29:29.405603749 +0100
-@@ -433,12 +433,13 @@
- 		#
- 		# Try libnl 2.x first.
- 		#
--		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		AC_CHECK_LIB(nl-3, nl_socket_alloc,
- 		[
- 			#
- 			# Yes, we have libnl 2.x.
- 			#
--			LIBS="-lnl-genl -lnl $LIBS"
-+			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
-+			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
- 		],
diff --git a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch b/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
deleted file mode 100644
index dee8e549e..000000000
--- a/core/systemd/0001-login-add-missing-_public_-to-sd_get_machine_names.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4d5fb96252d289e7899bc0bb87262127d19de949 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Tue, 7 May 2013 12:47:30 +0200
-Subject: [PATCH] login: add missing _public_ to sd_get_machine_names()
-
----
- src/login/sd-login.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/login/sd-login.c b/src/login/sd-login.c
-index 66c4487..d0dc42f 100644
---- a/src/login/sd-login.c
-+++ b/src/login/sd-login.c
-@@ -591,7 +591,7 @@ _public_ int sd_get_uids(uid_t **users) {
-         return r;
- }
- 
--int sd_get_machine_names(char ***machines) {
-+_public_ int sd_get_machine_names(char ***machines) {
-         _cleanup_closedir_ DIR *d = NULL;
-         _cleanup_strv_free_ char **l = NULL;
-         _cleanup_free_ char *md = NULL;
--- 
-1.8.2.2
-
diff --git a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch b/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
deleted file mode 100644
index 186a9c554..000000000
--- a/core/systemd/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0ee8d63649ab475fe2a16b2d62b5a5e2a8a69829 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Tue, 7 May 2013 11:35:23 -0400
-Subject: [PATCH] systemd-sleep: it is not an error if the config file is
- missing
-
----
- src/shared/sleep-config.c | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
-
-diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c
-index 73a3acb..cd3238b 100644
---- a/src/shared/sleep-config.c
-+++ b/src/shared/sleep-config.c
-@@ -47,19 +47,16 @@ int parse_sleep_config(const char *verb, char ***modes, char ***states) {
-         FILE _cleanup_fclose_ *f;
- 
-         f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
--        if (!f) {
--                if (errno == ENOENT)
--                        return 0;
--
--                log_warning("Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
--                return 0;
-+        if (!f)
-+                log_full(errno == ENOENT ? LOG_DEBUG: LOG_WARNING,
-+                         "Failed to open configuration file " PKGSYSCONFDIR "/sleep.conf: %m");
-+        else {
-+                r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
-+                                 config_item_table_lookup, (void*) items, false, false, NULL);
-+                if (r < 0)
-+                        log_warning("Failed to parse configuration file: %s", strerror(-r));
-         }
- 
--        r = config_parse(NULL, PKGSYSCONFDIR "/sleep.conf", f, "Sleep\0",
--                         config_item_table_lookup, (void*) items, false, false, NULL);
--        if (r < 0)
--                log_warning("Failed to parse configuration file: %s", strerror(-r));
--
-         if (streq(verb, "suspend")) {
-                 /* empty by default */
-                 *modes = suspend_mode;
--- 
-1.8.2.2
-
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 9db7a26e4..e9546663e 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=203
-pkgrel=2
+pkgver=204
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
@@ -16,15 +16,11 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-login-add-missing-_public_-to-sd_get_machine_names.patch'
-        '0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch'
         'use-split-usr-path.patch')
-md5sums=('b5a124ae8aee2b9fa357f912e87e9048'
+md5sums=('a07619bb19f48164fbf0761d12fd39a8'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         '8504a59afaa5d52fa6b5b26fc89873cf'
-         '988cf83af952990ff48d3b97bcf06845'
          '76bf83fe34c5b40533abc5dc940576a6')
 
 prepare() {
@@ -32,9 +28,6 @@ prepare() {
 
   # hang onto this until we do the /{,s}bin merge
   patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  patch -Np1 <"$srcdir/0001-login-add-missing-_public_-to-sd_get_machine_names.patch"
-  patch -Np1 <"$srcdir/0002-systemd-sleep-it-is-not-an-error-if-the-config-file-.patch"
 }
 
 build() {
@@ -91,9 +84,6 @@ package_systemd() {
 
   printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
 
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
   # fix .so links in manpage stubs
   find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \
       -exec sed -ri '1s|^\.so (.*)\.([0-9]+)|.so man\2/\1.\2|' {} +
diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install
index 53cd4b4af..508b384c3 100644
--- a/core/systemd/systemd.install
+++ b/core/systemd/systemd.install
@@ -82,6 +82,11 @@ post_upgrade() {
     printf '==> Persistent net naming rules have been shipped as disabled.\n'
     printf '    See /etc/udev/rules.d/80-net-name-slot.rules for more detail\n'
   fi
+
+  if [ "$(vercmp 204-1 "$2")" -eq 1 ]; then
+    printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
+    printf '    bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
+  fi
 }
 
 # vim:set ts=2 sw=2 et: