Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2013-05-28 07:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2013-05-27 10:03:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2013-05-28 07:43:37.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 24 11:37:49 UTC 2013 - [email protected] + +- Do no ship defaults for sysctl, they should be part of aaa_base + (currently in procps). +- Add hostname-setup-shortname.patch: ensure shortname is set as + hostname (bnc#820213). + +------------------------------------------------------------------- systemd.changes: same change New: ---- hostname-setup-shortname.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.TKYfIp/_old 2013-05-28 07:43:39.000000000 +0200 +++ /var/tmp/diff_new_pack.TKYfIp/_new 2013-05-28 07:43:39.000000000 +0200 @@ -156,6 +156,8 @@ Patch39: systemd-tmp-safe-defaults.patch # PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 [email protected] -- handle /boot/sysctl.conf-<kernel_release> file Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch +# PATCH-FIX-OPENSUSE hostname-setup-shortname.patch bnc#820213 [email protected] -- Do not set anything beyond first dot as hostname +Patch41: hostname-setup-shortname.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -403,6 +405,7 @@ %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 %build autoreconf -fiv @@ -519,7 +522,11 @@ # kernel.core_pattern setting until systemd-coredump is a part of an actual # systemd release and it's made clear how to get the core dumps out of the # journal. -rm -f %{buildroot}%{_libdir}/../lib/sysctl.d/50-coredump.conf +rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-coredump.conf + +# do not ship sysctl defaults in systemd package, will be part of +# aaa_base (in procps for now) +rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf # remove README file for now rm -f %{buildroot}/etc/init.d/README @@ -822,7 +829,6 @@ %dir %{_sysconfdir}/binfmt.d %dir %{_libexecdir}/sysctl.d -%{_libexecdir}/sysctl.d/50-default.conf %dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/systemd ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.TKYfIp/_old 2013-05-28 07:43:39.000000000 +0200 +++ /var/tmp/diff_new_pack.TKYfIp/_new 2013-05-28 07:43:39.000000000 +0200 @@ -151,6 +151,8 @@ Patch39: systemd-tmp-safe-defaults.patch # PATCH-FIX-OPENSUSE sysctl-handle-boot-sysctl.conf-kernel_release.patch bnc#809420 [email protected] -- handle /boot/sysctl.conf-<kernel_release> file Patch40: sysctl-handle-boot-sysctl.conf-kernel_release.patch +# PATCH-FIX-OPENSUSE hostname-setup-shortname.patch bnc#820213 [email protected] -- Do not set anything beyond first dot as hostname +Patch41: hostname-setup-shortname.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -398,6 +400,7 @@ %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 %build autoreconf -fiv @@ -514,7 +517,11 @@ # kernel.core_pattern setting until systemd-coredump is a part of an actual # systemd release and it's made clear how to get the core dumps out of the # journal. -rm -f %{buildroot}%{_libdir}/../lib/sysctl.d/50-coredump.conf +rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-coredump.conf + +# do not ship sysctl defaults in systemd package, will be part of +# aaa_base (in procps for now) +rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf # remove README file for now rm -f %{buildroot}/etc/init.d/README @@ -817,7 +824,6 @@ %dir %{_sysconfdir}/binfmt.d %dir %{_libexecdir}/sysctl.d -%{_libexecdir}/sysctl.d/50-default.conf %dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/systemd ++++++ hostname-setup-shortname.patch ++++++ Index: systemd-202/src/core/hostname-setup.c =================================================================== --- systemd-202.orig/src/core/hostname-setup.c +++ systemd-202/src/core/hostname-setup.c @@ -32,7 +32,7 @@ #include "fileio.h" static int read_and_strip_hostname(const char *path, char **hn) { - char *s; + char *s, *domain; int r; assert(path); @@ -49,6 +49,11 @@ static int read_and_strip_hostname(const return -ENOENT; } + /* strip any leftover of a domain name */ + if (domain = strchr(s, '.')) { + *domain = NULL; + } + *hn = s; return 0; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
