[systemd-commits] 2 commits - Makefile.am NEWS configure.ac src/libsystemd

[Lennart Poettering]

 Makefile.am                      |   10 ++++++----
 NEWS                             |    4 ++++
 configure.ac                     |    2 +-
 src/libsystemd/libsystemd.sym.m4 |   11 ++++++++++-
 4 files changed, 21 insertions(+), 6 deletions(-)

New commits:
commit cd14eda3212f9109c98a77cd5fee4168010d80da
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 11 15:32:20 2014 +0200

    NEWS: mention that resolved's resolv.conf fragment moved

diff --git a/NEWS b/NEWS
index 71fa3a9..54d9e9e 100644
--- a/NEWS
+++ b/NEWS
@@ -54,6 +54,10 @@ CHANGES WITH 214:
           very new kernels. On older kernels, please consider adding
           the kernel modules to /etc/load-modules.d/ as a work-around.
 
+        * The resolv.conf file systemd-resolved generates has been
+          moved to /run/systemd/resolve/, if you have a symlink from
+          /etc/resolv.conf it might be necessary to correct it.
+
         * Two new service settings ProtectedHome= and ProtectedSystem=
           have been added. When enabled they will make the user data
           (such as /home) inaccessible or read-only and the system

commit 42a04ee69c7242377cd9eb39444352cd4deb4bb1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 11 15:30:28 2014 +0200

    build-sys: update library versions

diff --git a/Makefile.am b/Makefile.am
index 8514ec9..959c121 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,12 @@ LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
+LIBSYSTEMD_CURRENT=3
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=3
+
+# The following four libraries only exist for compatibility reasons,
+# their version info should not be bumped anymore
 LIBSYSTEMD_LOGIN_CURRENT=9
 LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=9
@@ -59,10 +65,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_CURRENT=2
-LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=2
-
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
diff --git a/configure.ac b/configure.ac
index 4ba0abf..faf7f72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 AC_PREREQ([2.64])
 
 AC_INIT([systemd],
-        [213],
+        [214],
         [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd],
         [systemd],
         [http://www.freedesktop.org/wiki/Software/systemd])
diff --git a/src/libsystemd/libsystemd.sym.m4 b/src/libsystemd/libsystemd.sym.m4
index 61952d7..b4e3035 100644
--- a/src/libsystemd/libsystemd.sym.m4
+++ b/src/libsystemd/libsystemd.sym.m4
@@ -140,8 +140,17 @@ global:
 LIBSYSTEMD_213 {
 global:
         sd_uid_get_display;
+} LIBSYSTEMD_211;
+
+LIBSYSTEMD_214 {
+global:
+        sd_pid_notify;
+        sd_pid_notifyf;
+} LIBSYSTEMD_213;
 
 m4_ifdef(`ENABLE_KDBUS',
+LIBSYSTEMD_FUTURE {
+global:
         /* sd-bus */
         sd_bus_default;
         sd_bus_default_user;
@@ -431,5 +440,5 @@ m4_ifdef(`ENABLE_KDBUS',
         sd_resolve_query_get_userdata;
         sd_resolve_query_set_userdata;
         sd_resolve_query_get_resolve;
+} LIBSYSTEMD_214;
 )
-} LIBSYSTEMD_211;