Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2016-04-04 21:43:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-04-03 23:06:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-mini.changes 2016-04-04 21:43:59.000000000 +0200 @@ -2,43 +1,0 @@ -Sat Mar 26 15:59:36 UTC 2016 - [email protected] - -- Add two patches which address logind/networkd disappearing from - dbus (and busctl) even while the units and processes continue - running. - 0001-core-fix-bus-name-synchronization-after-daemon-reloa.patch - 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch - -------------------------------------------------------------------- -Mon Mar 14 18:04:10 UTC 2016 - [email protected] - -- drop all compiler/linker option customizations: - - -pipe option is used by default since day 0 - - get rid of cflags() function which is not needed - - --hash-size has no impact specially in runtime - - IOW, use the default options for the compiler and the linker, - there's no point in making systemd different from other package in - this regards. - -------------------------------------------------------------------- -Mon Mar 14 17:26:00 UTC 2016 - [email protected] - -- use %make_build instead of 'make %{?_smp_mflags}' - -------------------------------------------------------------------- -Mon Mar 14 16:36:32 UTC 2016 - [email protected] - -- be more strict on own lib version requirements - -------------------------------------------------------------------- -Mon Mar 14 16:11:49 UTC 2016 - [email protected] - -- systemd should require udev with the exact same version - -------------------------------------------------------------------- -Thu Mar 10 08:01:57 UTC 2016 - [email protected] - -- Modify patch handle-numlock-value-in-etc-sysconfig-keyboard.patch - to allow that open, seek, and read of /dev/mem may fail e.g. - on XEN based virtual guests (bsc#961120) - -------------------------------------------------------------------- @@ -51,14 +7,0 @@ - -------------------------------------------------------------------- -Thu Feb 4 11:05:37 UTC 2016 - [email protected] - -- require curl and bzip2 to build importd -- curl also causes building of journal-upload. That one has rather - unusal certificate usage, set it's ca root to /etc/pki/systemd - instead of the built-in default /etc/ssl as journal-remote and - journal-upload think they kan put stuff in /etc/ssl/certs then but - that directory is managed by p11-kit and doesn't serve the purpose - those programs think. -- /var/lib/systemd/random-seed is a file -- own /var/lib/machines -- add systemd-228-nspawn-make-journal-linking-non-fatal-in-try-and-auto.diff systemd.changes: same change Old: ---- 0001-core-fix-bus-name-synchronization-after-daemon-reloa.patch 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch systemd-228-nspawn-make-journal-linking-non-fatal-in-try-and-auto.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.UCBQC1/_old 2016-04-04 21:44:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UCBQC1/_new 2016-04-04 21:44:02.000000000 +0200 @@ -92,9 +92,6 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools -# curl and bzip2 are required for building importd -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(libcurl) %if %{with python} BuildRequires: python %endif @@ -105,7 +102,7 @@ BuildRequires: pkgconfig(usbutils) >= 0.82 # the buildignore is important for bootstrapping #!BuildIgnore: udev -Requires: udev = %{version}-%{release} +Requires: udev >= 172 Recommends: %{name}-bash-completion Requires: dbus-1 >= 1.4.0 Requires: kbd @@ -253,12 +250,6 @@ Patch524: 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch # PATCH-FIX-UPSTREAM (bsc#966535) Patch525: 0001-core-exclude-.slice-units-from-systemctl-isolate.patch -# PATCH-FIX-UPSTREAM -- fixed after 228 -Patch526: systemd-228-nspawn-make-journal-linking-non-fatal-in-try-and-auto.diff -# PATCH-FIX-UPSTREAM -- fixed after 228 -Patch527: 0001-core-fix-bus-name-synchronization-after-daemon-reloa.patch -# PATCH-FIX-UPSTREAM -- fixed after 228 -Patch528: 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch # UDEV PATCHES # ============ @@ -333,7 +324,7 @@ Summary: Development headers for systemd License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libsystemd0%{?mini} = %{version}-%{release} +Requires: libsystemd0%{?mini} = %version Requires: systemd-rpm-macros %if 0%{?bootstrap} Provides: systemd-devel = %version-%release @@ -347,7 +338,7 @@ Summary: System V init tools License: LGPL-2.1+ Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: sbin_init Conflicts: otherproviders(sbin_init) Provides: sysvinit:/sbin/init @@ -597,12 +588,9 @@ %patch520 -p1 %patch521 -p1 %patch522 -p1 -%patch523 -p1 +%patch523 -p0 %patch524 -p1 -%patch525 -p1 -%patch526 -p1 -%patch527 -p1 -%patch528 -p1 +%patch525 -p0 # udev patches %patch1002 -p1 @@ -635,6 +623,38 @@ %endif %build +cflags () +{ + local flag=$1; shift + local var=$1; shift + local gold + test -n "${flag}" -a -n "${var}" || return + case "${!var}" in + *${flag}*) return + esac + if type ld.gold > /dev/null 2>&1 ; then + gold=-Wl,-fuse-ld=gold + fi + set -o noclobber + case "$flag" in + -Wl,*) + if echo 'int main () { return 0; }' | \ + ${CC:-gcc} -Werror $gold $flag -o /dev/null -xc - > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + rm -f ldtest.c + ;; + *) + if ${CC:-gcc} -Werror $gold $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + if ${CXX:-g++} -Werror $gold $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + esac + set +o noclobber +} + # # Be sure that fresh build libudev is linked as otherwise no errors are found # @@ -646,19 +666,17 @@ }' Makefile.am sh autogen.sh +export V=e export CFLAGS="%{optflags}" +export LDFLAGS %if 0%{?suse_version} == 1315 CFLAGS="$CFLAGS -DNET_IFNAMES=1" %else CFLAGS="$CFLAGS -DNET_IFNAMES=0" %endif - -# certificate-root is set to /etc/pki/systemd instead of the -# built-in default /etc/ssl as journal-remote and journal-upload -# think they kan put stuff in /etc/ssl/certs then but that -# directory is managed by p11-kit and doesn't serve the purpose -# those programs think -# +cflags -pipe CFLAGS +cflags -Wl,-O2 LDFLAGS +cflags -Wl,--hash-size=8599 LDFLAGS # keep split-usr until all packages have moved their systemd rules to /usr %configure \ --with-ntp-servers="0.opensuse.pool.ntp.org 1.opensuse.pool.ntp.org 2.opensuse.pool.ntp.org 3.opensuse.pool.ntp.org" \ @@ -668,12 +686,10 @@ --with-dbussessionservicedir=%{_datadir}/dbus-1/services \ --with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \ --with-dbusinterfacedir=%{_datadir}/dbus-1/interfaces \ - --with-certificate-root=/etc/pki/systemd \ %if 0%{?bootstrap} --disable-myhostname \ --disable-manpages \ --disable-machined \ - --disable-importd \ %else --enable-manpages \ %if %{with python} @@ -700,10 +716,9 @@ --disable-resolved \ %endif --disable-kdbus - -%make_build V=e +make %{?_smp_mflags} %if ! 0%{?bootstrap} -%make_build V=e update-man-list man +make %{?_smp_mflags} update-man-list man %endif %install @@ -832,10 +847,7 @@ ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight -> %{buildroot}%{_localstatedir}/lib/systemd/random-seed - -# machined -mkdir -p %{buildroot}%{_localstatedir}/lib/machines +mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed %fdupes -s %{buildroot}%{_mandir} @@ -1297,7 +1309,6 @@ %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %if !0%{?bootstrap} %config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf -%config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf %endif %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf @@ -1404,7 +1415,6 @@ %{_datadir}/zsh/site-functions/* %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed -%dir %{_localstatedir}/lib/machines %if %{with resolved} %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_sysconfdir}/systemd/resolved.conf @@ -1412,13 +1422,6 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname %endif -%if ! 0%{?bootstrap} -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf -%{_prefix}/lib/systemd/import-pubring.gpg -%{_prefix}/lib/systemd/system/org.freedesktop.import1.busname -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif %if ! 0%{?bootstrap} %files bash-completion -f files.completion ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.UCBQC1/_old 2016-04-04 21:44:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UCBQC1/_new 2016-04-04 21:44:02.000000000 +0200 @@ -87,9 +87,6 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools -# curl and bzip2 are required for building importd -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(libcurl) %if %{with python} BuildRequires: python %endif @@ -100,7 +97,7 @@ BuildRequires: pkgconfig(usbutils) >= 0.82 # the buildignore is important for bootstrapping #!BuildIgnore: udev -Requires: udev = %{version}-%{release} +Requires: udev >= 172 Recommends: %{name}-bash-completion Requires: dbus-1 >= 1.4.0 Requires: kbd @@ -248,12 +245,6 @@ Patch524: 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch # PATCH-FIX-UPSTREAM (bsc#966535) Patch525: 0001-core-exclude-.slice-units-from-systemctl-isolate.patch -# PATCH-FIX-UPSTREAM -- fixed after 228 -Patch526: systemd-228-nspawn-make-journal-linking-non-fatal-in-try-and-auto.diff -# PATCH-FIX-UPSTREAM -- fixed after 228 -Patch527: 0001-core-fix-bus-name-synchronization-after-daemon-reloa.patch -# PATCH-FIX-UPSTREAM -- fixed after 228 -Patch528: 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch # UDEV PATCHES # ============ @@ -328,7 +319,7 @@ Summary: Development headers for systemd License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libsystemd0%{?mini} = %{version}-%{release} +Requires: libsystemd0%{?mini} = %version Requires: systemd-rpm-macros %if 0%{?bootstrap} Provides: systemd-devel = %version-%release @@ -342,7 +333,7 @@ Summary: System V init tools License: LGPL-2.1+ Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: sbin_init Conflicts: otherproviders(sbin_init) Provides: sysvinit:/sbin/init @@ -592,12 +583,9 @@ %patch520 -p1 %patch521 -p1 %patch522 -p1 -%patch523 -p1 +%patch523 -p0 %patch524 -p1 -%patch525 -p1 -%patch526 -p1 -%patch527 -p1 -%patch528 -p1 +%patch525 -p0 # udev patches %patch1002 -p1 @@ -630,6 +618,38 @@ %endif %build +cflags () +{ + local flag=$1; shift + local var=$1; shift + local gold + test -n "${flag}" -a -n "${var}" || return + case "${!var}" in + *${flag}*) return + esac + if type ld.gold > /dev/null 2>&1 ; then + gold=-Wl,-fuse-ld=gold + fi + set -o noclobber + case "$flag" in + -Wl,*) + if echo 'int main () { return 0; }' | \ + ${CC:-gcc} -Werror $gold $flag -o /dev/null -xc - > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + rm -f ldtest.c + ;; + *) + if ${CC:-gcc} -Werror $gold $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + if ${CXX:-g++} -Werror $gold $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then + eval $var=\${$var:+\$$var\ }$flag + fi + esac + set +o noclobber +} + # # Be sure that fresh build libudev is linked as otherwise no errors are found # @@ -641,19 +661,17 @@ }' Makefile.am sh autogen.sh +export V=e export CFLAGS="%{optflags}" +export LDFLAGS %if 0%{?suse_version} == 1315 CFLAGS="$CFLAGS -DNET_IFNAMES=1" %else CFLAGS="$CFLAGS -DNET_IFNAMES=0" %endif - -# certificate-root is set to /etc/pki/systemd instead of the -# built-in default /etc/ssl as journal-remote and journal-upload -# think they kan put stuff in /etc/ssl/certs then but that -# directory is managed by p11-kit and doesn't serve the purpose -# those programs think -# +cflags -pipe CFLAGS +cflags -Wl,-O2 LDFLAGS +cflags -Wl,--hash-size=8599 LDFLAGS # keep split-usr until all packages have moved their systemd rules to /usr %configure \ --with-ntp-servers="0.opensuse.pool.ntp.org 1.opensuse.pool.ntp.org 2.opensuse.pool.ntp.org 3.opensuse.pool.ntp.org" \ @@ -663,12 +681,10 @@ --with-dbussessionservicedir=%{_datadir}/dbus-1/services \ --with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \ --with-dbusinterfacedir=%{_datadir}/dbus-1/interfaces \ - --with-certificate-root=/etc/pki/systemd \ %if 0%{?bootstrap} --disable-myhostname \ --disable-manpages \ --disable-machined \ - --disable-importd \ %else --enable-manpages \ %if %{with python} @@ -695,10 +711,9 @@ --disable-resolved \ %endif --disable-kdbus - -%make_build V=e +make %{?_smp_mflags} %if ! 0%{?bootstrap} -%make_build V=e update-man-list man +make %{?_smp_mflags} update-man-list man %endif %install @@ -827,10 +842,7 @@ ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight -> %{buildroot}%{_localstatedir}/lib/systemd/random-seed - -# machined -mkdir -p %{buildroot}%{_localstatedir}/lib/machines +mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed %fdupes -s %{buildroot}%{_mandir} @@ -1292,7 +1304,6 @@ %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %if !0%{?bootstrap} %config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf -%config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf %endif %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf @@ -1399,7 +1410,6 @@ %{_datadir}/zsh/site-functions/* %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed -%dir %{_localstatedir}/lib/machines %if %{with resolved} %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_sysconfdir}/systemd/resolved.conf @@ -1407,13 +1417,6 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname %endif -%if ! 0%{?bootstrap} -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf -%{_prefix}/lib/systemd/import-pubring.gpg -%{_prefix}/lib/systemd/system/org.freedesktop.import1.busname -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif %if ! 0%{?bootstrap} %files bash-completion -f files.completion ++++++ 0001-core-exclude-.slice-units-from-systemctl-isolate.patch ++++++ --- /var/tmp/diff_new_pack.UCBQC1/_old 2016-04-04 21:44:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UCBQC1/_new 2016-04-04 21:44:02.000000000 +0200 @@ -11,8 +11,8 @@ diff --git src/core/scope.c src/core/scope.c index c5d0ece..361695c 100644 ---- a/src/core/scope.c -+++ b/src/core/scope.c +--- src/core/scope.c ++++ src/core/scope.c @@ -50,8 +50,7 @@ static void scope_init(Unit *u) { assert(u->load_state == UNIT_STUB); @@ -25,8 +25,8 @@ static void scope_done(Unit *u) { diff --git src/core/slice.c src/core/slice.c index d65364c..667f61b 100644 ---- a/src/core/slice.c -+++ b/src/core/slice.c +--- src/core/slice.c ++++ src/core/slice.c @@ -34,6 +34,13 @@ static const UnitActiveState state_translation_table[_SLICE_STATE_MAX] = { [SLICE_ACTIVE] = UNIT_ACTIVE }; ++++++ handle-numlock-value-in-etc-sysconfig-keyboard.patch ++++++ --- /var/tmp/diff_new_pack.UCBQC1/_old 2016-04-04 21:44:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UCBQC1/_new 2016-04-04 21:44:02.000000000 +0200 @@ -134,7 +134,7 @@ "COMPOSETABLE", &vc_compose_table, NULL); if (r < 0 && r != -ENOENT) -@@ -421,6 +428,35 @@ int main(int argc, char **argv) { +@@ -421,6 +428,32 @@ int main(int argc, char **argv) { disable_capslock = vc_kbd_disable_caps_lock && strcasecmp(vc_kbd_disable_caps_lock, "YES") == 0; @@ -146,31 +146,28 @@ + + fdmem = open ("/dev/mem", O_RDONLY); + if (fdmem < 0) { -+ log_warning_errno(errno, "Failed to open /dev/mem: %m"); -+ goto finish; ++ log_error("Failed to open /dev/mem: %m"); ++ return EXIT_FAILURE; + } + + if (lseek(fdmem, BIOS_DATA_AREA + BDA_KEYBOARD_STATUS_FLAGS_4, SEEK_SET) == (off_t) -1) { -+ log_warning_errno(errno, "Failed to seek /dev/mem: %m"); -+ goto finish; ++ log_error("Failed to seek /dev/mem: %m"); ++ return EXIT_FAILURE; + } + + if (read(fdmem, &c, sizeof(char)) == -1) { -+ log_warning_errno(errno, "Failed to read /dev/mem: %m"); -+ goto finish; ++ log_error("Failed to read /dev/mem: %m"); ++ return EXIT_FAILURE; + } + + if (c & BDA_KSF4_NUMLOCK_MASK) + numlock = true; -+ finish: -+ if (fdmem >= 0) -+ close(fdmem); + } +#endif /* x86 */ #endif /* HAVE_SYSV_COMPAT */ r = parse_env_file("/etc/vconsole.conf", NEWLINE, -@@ -456,6 +492,10 @@ int main(int argc, char **argv) { +@@ -456,6 +489,10 @@ int main(int argc, char **argv) { font_ok = font_load_and_wait(vc, vc_font, vc_font_map, vc_font_unimap) > 0; keyboard_ok = keyboard_load_and_wait(vc, vc_keymap, vc_keymap_toggle, utf8, disable_capslock) > 0; ++++++ let-vconsole-setup-get-properties-only-once-to-copy-them.patch ++++++ --- /var/tmp/diff_new_pack.UCBQC1/_old 2016-04-04 21:44:02.000000000 +0200 +++ /var/tmp/diff_new_pack.UCBQC1/_new 2016-04-04 21:44:02.000000000 +0200 @@ -9,8 +9,8 @@ src/vconsole/vconsole-setup.c | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) ---- a/src/vconsole/vconsole-setup.c -+++ b/src/vconsole/vconsole-setup.c 2015-09-23 12:34:33.854018750 +0000 +--- src/vconsole/vconsole-setup.c ++++ src/vconsole/vconsole-setup.c 2015-09-23 12:34:33.854018750 +0000 @@ -202,8 +202,13 @@ static void font_copy_to_all_vcs(int fd) unsigned short map16[E_TABSZ]; struct unimapdesc unimapd;
