[systemd-commits] 2 commits - configure.ac man/systemd.unit.xml

[Zbigniew Jędrzejewski-Szmek]

 configure.ac         |    1 +
 man/systemd.unit.xml |    9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 05a2f6fefedd7254fd799502191d025d2908cf74
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Sat Apr 12 08:37:38 2014 +0300

    man: mention XDG_CONFIG_HOME in systemd.unit

diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 07a73fd..bcd4ba8 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -70,7 +70,8 @@
 <filename>...</filename>
                 </literallayout></para>
 
-                <para><literallayout><filename>$HOME/.config/systemd/user/*</filename>
+                <para><literallayout><filename>$XDG_CONFIG_HOME/systemd/user/*</filename>
+<filename>$HOME/.config/systemd/user/*</filename>
 <filename>/etc/systemd/user/*</filename>
 <filename>/run/systemd/user/*</filename>
 <filename>/usr/lib/systemd/user/*</filename>
@@ -320,8 +321,12 @@
                     </thead>
                     <tbody>
                       <row>
+                        <entry><filename>$XDG_CONFIG_HOME/systemd/user</filename></entry>
+                        <entry>User configuration (only used when $XDG_CONFIG_HOME is set)</entry>
+                      </row>
+                      <row>
                         <entry><filename>$HOME/.config/systemd/user</filename></entry>
-                        <entry>User configuration</entry>
+                        <entry>User configuration (only used when $XDG_CONFIG_HOME is not set)</entry>
                       </row>
                       <row>
                         <entry><filename>/etc/systemd/user</filename></entry>

commit aca33b078cd32c5416a7fa3d5020a5d461c130ee
Author: Cristian Rodríguez <crrodriguez at opensuse.org>
Date:   Fri Apr 11 22:57:02 2014 -0300

    build: if -fstack-protector-strong is available, use it.

diff --git a/configure.ac b/configure.ac
index 5074114..d40fb38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -156,6 +156,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
         -ffunction-sections \
         -fdata-sections \
         -fstack-protector \
+        -fstack-protector-strong \
         --param=ssp-buffer-size=4])
 AS_CASE([$CFLAGS], [*-O[[12345\ ]]*],
         [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\