consolekit: 1.2.3 -> 1.2.4

3 files changed, 5 insertions, 74 deletions

diff --git a/consolekit/.signature b/consolekit/.signature
index cf22146c0..8a41bbebe 100644
--- a/consolekit/.signature
+++ b/consolekit/.signature
@@ -1,8 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Z/gRxFvxmLQhnw91xpzTv1aM5B6KtZkuuoZuY1jOw2gkXyZITz1xGELRB6T0QlnSrHHKPIQBf6w7npfaR/PNwA=
-SHA256 (Pkgfile) = 12ed4e8c2205a933845cece9bb92d4b32040e16e946de311d96f6e1d611d5676
+RWSE3ohX2g5d/d2pMAThHDJUZUTwK8bFr0sCqSihdFUznKBjVd+gRCPM0oKXtf5oXWm+0cNWXv2ybobTTWBDgNNBK53p5AR3uwU=
+SHA256 (Pkgfile) = b2e28d3df3d0b2ebd9d5465a201e92b8983452205f4d83cbf0667a2be32bd923
 SHA256 (.footprint) = 4f82ae4068647763cb9f461dd4ee201db0589fe0e2c7019e773cfdcc9719e4f4
-SHA256 (ConsoleKit2-1.2.3.tar.gz) = 86157dc2042d6a2568e5b63e8a2bf82aedfa9cd171850aaf36e373d4a52d1c29
+SHA256 (ConsoleKit2-1.2.4.tar.gz) = 7c5ca07cc7ecb2743446c4ab5a66ae02667acab6214268d76f0fdf73eaf141e8
 SHA256 (system-session) = 599613516a16ac997a4121b4f20dd3a9c8480403614848f1aa97a0a0f1c6a236
 SHA256 (pam-foreground-compat.ck) = ca94a7640cc7c2e3bf9222b6060f01dc8f83ca3444aa430f23d08db6dcb02e34
-SHA256 (warning-to-debug.patch) = 33774890f29c0386f7926e2e72c645afd23d61d64adf520e9ec9804d092a7540
diff --git a/consolekit/Pkgfile b/consolekit/Pkgfile
index 113df8b71..d76b8dc3f 100644
--- a/consolekit/Pkgfile
+++ b/consolekit/Pkgfile
@@ -5,16 +5,14 @@
 # Optional: polkit
 
 name=consolekit
-version=1.2.3
+version=1.2.4
 release=1
 source=(https://github.com/ConsoleKit2/ConsoleKit2/archive/$version/ConsoleKit2-$version.tar.gz
-  system-session pam-foreground-compat.ck warning-to-debug.patch)
+  system-session pam-foreground-compat.ck)
 
 build() {
   cd ConsoleKit2-$version
 
-  patch -p1 -i $SRC/warning-to-debug.patch
-
   NOCONFIGURE=1 ./autogen.sh
   ./configure \
     --prefix=/usr \
diff --git a/consolekit/warning-to-debug.patch b/consolekit/warning-to-debug.patch
deleted file mode 100644
index 9fa1532f7..000000000
--- a/consolekit/warning-to-debug.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 02d49b8a1beef4db7f6425a71b62d12f90805c6a Mon Sep 17 00:00:00 2001
-From: TimB87 <tbier@posteo.de>
-Date: Mon, 10 Jun 2019 15:51:02 +0200
-Subject: [PATCH] make consolekit2 not spam the syslog with an unimportant
- error
-
----
- src/ck-sysdeps-linux.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/ck-sysdeps-linux.c b/src/ck-sysdeps-linux.c
-index bdace2e..c0d07b6 100644
---- a/src/ck-sysdeps-linux.c
-+++ b/src/ck-sysdeps-linux.c
-@@ -561,7 +561,7 @@ ck_unix_pid_get_env (pid_t       pid,
-                                    &length,
-                                    &error);
-         if (! res) {
--                g_warning ("Couldn't read %s: %s", path, error->message);
-+                g_debug ("Couldn't read %s: %s", path, error->message);
-                 g_error_free (error);
-                 goto out;
-         }
-@@ -665,13 +665,13 @@ ck_unix_pid_get_login_session_id (pid_t  pid,
-                                    &length,
-                                    &error);
-         if (! res) {
--                g_warning ("Couldn't read %s: %s", path, error->message);
-+                g_debug ("Couldn't read %s: %s", path, error->message);
-                 g_error_free (error);
-                 goto out;
-         }
- 
-         if (contents[0] == '\0') {
--                g_warning ("Couldn't read %s: empty file", path);
-+                g_debug ("Couldn't read %s: empty file", path);
-                 goto out;
-         }
- 
-@@ -683,7 +683,7 @@ ck_unix_pid_get_login_session_id (pid_t  pid,
-         }
- 
-         if (errno == ERANGE) {
--                g_warning ("Couldn't read %s: %s", path, g_strerror (errno));
-+                g_debug ("Couldn't read %s: %s", path, g_strerror (errno));
-                 goto out;
-         }
- 
-@@ -819,7 +819,7 @@ linux_get_used_swap (void)
-         /* get memory data */
-         ret = g_file_get_contents (filename, &contents, NULL, &error);
-         if (!ret) {
--                g_warning ("failed to open %s: %s", filename, error->message);
-+                g_debug ("failed to open %s: %s", filename, error->message);
-                 g_error_free (error);
-                 goto out;
-         }
-@@ -889,7 +889,7 @@ linux_supports_sleep_state (const gchar *state)
-         g_debug ("excuting command: %s", command);
-         ret = g_spawn_command_line_sync (command, NULL, NULL, &exit_status, &error);
-         if (!ret) {
--                g_warning ("failed to run script: %s", error->message);
-+                g_debug ("failed to run script: %s", error->message);
-                 g_error_free (error);
-                 goto out;
-         }