February 2018 - openSUSE Commits - openSUSE Mailing Lists

commit xorg-x11-libs for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package xorg-x11-libs for openSUSE:Factory checked in at 2018-02-01 21:27:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-libs (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-libs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-libs" Thu Feb 1 21:27:41 2018 rev:127 rq:571487 version:7.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-libs/xorg-x11-libs.changes 2014-05-05 21:11:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-libs.new/xorg-x11-libs.changes 2018-02-01 21:27:56.469133246 +0100 @@ -1,0 +2,15 @@ +Wed Jan 31 16:31:43 UTC 2018 - sndirsch(a)suse.com + +- raised version number of package; improved definitions for + provide/obsolete of xorg-x11-util-devel so makedepend, lndir, + gccmakedep, xorg-cf-files and xorg-sgml-doctools no longer + conflict with xorg-x11-devel package (bsc#1077489) + +------------------------------------------------------------------- +Mon Jan 29 11:28:16 UTC 2018 - sndirsch(a)suse.com + +- Directly require packages, which were required by + xorg-x11-util-devel meta package; provide/obsolete + xorg-x11-util-devel now (bsc#1077489) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-libs.spec ++++++ --- /var/tmp/diff_new_pack.lyD6a9/_old 2018-02-01 21:27:57.065105392 +0100 +++ /var/tmp/diff_new_pack.lyD6a9/_new 2018-02-01 21:27:57.065105392 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-libs # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xorg-x11-libs -Version: 7.6 +Version: 7.6.1 Release: 0 Summary: Compatibility metapackage for X.Org libraries License: GPL-2.0+ and MIT @@ -42,8 +42,10 @@ Provides: XFree86-devel Provides: xorg-x11-compat70-devel Provides: xorg-x11-man +Provides: xorg-x11-util-devel = 7.6.1 Obsoletes: xorg-x11-compat70-devel Obsoletes: xorg-x11-man +Obsoletes: xorg-x11-util-devel < 7.6.1 # bug437293 %ifarch ppc64 Obsoletes: xorg-x11-devel-64bit @@ -107,8 +109,15 @@ Requires: xorg-x11-fonts-devel Requires: xorg-x11-libxcb-devel Requires: xorg-x11-libxkbfile-devel -Requires: xorg-x11-util-devel Requires: xorg-x11-xtrans-devel +# Directly require packages, which were required by xorg-x11-util-devel +# meta package (bsc#1077489) +Requires: gccmakedep +Requires: imake +Requires: lndir +Requires: makedepend +Requires: xorg-cf-files +Requires: xorg-sgml-doctools %description -n xorg-x11-devel This package is a compatibility metapackage. It used to contain the

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2018-02-01 21:27:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Thu Feb 1 21:27:18 2018 rev:404 rq:571520 version:4.15.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2018-01-31 19:48:59.913548906 +0100 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2018-02-01 21:27:25.446583179 +0100 @@ -1,0 +2,26 @@ +Wed Jan 31 07:51:04 CET 2018 - jslaby(a)suse.cz + +- Update to 4.15-final. +- Eliminated 5 patches. +- Config changes: + - Security: + - GENERIC_CPU_VULNERABILITIES=y +- commit 978c9b0 + +------------------------------------------------------------------- +Tue Jan 30 13:15:01 CET 2018 - mkubecek(a)suse.cz + +- Update + patches.kernel.org/4.14.14-036-RDS-Heap-OOB-write-in-rds_message_alloc_sgs.… + upstream references (add CVE-2018-5332 bsc#1075621). +- commit 510de01 + +------------------------------------------------------------------- +Tue Jan 30 13:13:54 CET 2018 - mkubecek(a)suse.cz + +- Update + patches.kernel.org/4.14.14-037-RDS-null-pointer-dereference-in-rds_atomic_f… + upstream references (add CVE-2018-5333 bsc#1075617). +- commit e6cf845 + +------------------------------------------------------------------- @@ -24 +50 @@ -- commit 6f87133 +- commit 13295d4 @@ -135,0 +162,115 @@ +Thu Jan 25 08:23:15 CET 2018 - jslaby(a)suse.cz + +- x86/cpufeature: Move processor tracing out of scattered features + (bsc#1068032 CVE-2017-5753). +- Refresh + patches.suse/0001-x86-cpufeatures-Add-CPUID_7_EDX-CPUID-leaf.patch. +- Refresh + patches.suse/0007-x86-speculation-Add-basic-IBPB-Indirect-Branch-Predi.patch. +- commit 8d8b718 + +------------------------------------------------------------------- +Wed Jan 24 20:19:27 CET 2018 - jslaby(a)suse.cz + +- x86/retpoline: Add LFENCE to the retpoline/RSB filling RSB + macros (bsc#1068032 CVE-2017-5753). +- commit 8dc7c71 + +------------------------------------------------------------------- +Wed Jan 24 20:17:09 CET 2018 - jslaby(a)suse.cz + +- x86/vmx: Direct access to MSR_IA32_SPEC_CTRL (bsc#1068032 + CVE-2017-5753). +- x86/ibrs: Add new helper macros to save/restore + MSR_IA32_SPEC_CTRL (bsc#1068032 CVE-2017-5753). +- x86/enter: Use IBRS on syscall and interrupts (bsc#1068032 + CVE-2017-5753). +- x86/enter: Create macros to restrict/unrestrict Indirect Branch + Speculation (bsc#1068032 CVE-2017-5753). +- x86/idle: Control Indirect Branch Speculation in idle + (bsc#1068032 CVE-2017-5753). +- x86: Simplify spectre_v2 command line parsing (bsc#1068032 + CVE-2017-5753). +- x86/speculation: Add inlines to control Indirect Branch + Speculation (bsc#1068032 CVE-2017-5753). +- x86/speculation: Add basic IBRS support infrastructure + (bsc#1068032 CVE-2017-5753). +- x86/mm: Only flush indirect branches when switching into non + dumpable process (bsc#1068032 CVE-2017-5753). +- x86/speculation: Use Indirect Branch Prediction Barrier in + context switch (bsc#1068032 CVE-2017-5753). +- x86/kvm: Add IBPB support (bsc#1068032 CVE-2017-5753). +- x86/speculation: Add basic IBPB (Indirect Branch Prediction + Barrier) support (bsc#1068032 CVE-2017-5753). +- x86/cpufeature: Blacklist SPEC_CTRL on early Spectre v2 + microcodes (bsc#1068032 CVE-2017-5753). +- x86/pti: Do not enable PTI on processors which are not + vulnerable to Meltdown (bsc#1068032 CVE-2017-5753). +- x86/msr: Add definitions for new speculation control MSRs + (bsc#1068032 CVE-2017-5753). +- x86/cpufeatures: Add AMD feature bits for Speculation Control + (bsc#1068032 CVE-2017-5753). +- x86/cpufeatures: Add Intel feature bits for Speculation Control + (bsc#1068032 CVE-2017-5753). +- x86/cpufeatures: Add CPUID_7_EDX CPUID leaf (bsc#1068032 + CVE-2017-5753). +- x86/retpoline: Optimize inline assembler for vmexit_fill_RSB + (bsc#1068032 CVE-2017-5753). +- x86/retpoline: Fill RSB on context switch for affected CPUs + (bsc#1068032 CVE-2017-5753). +- commit e36ab4f + +------------------------------------------------------------------- +Wed Jan 24 19:41:00 CET 2018 - jslaby(a)suse.cz + +- Documentation: document array_ptr (bsc#1068032 CVE-2017-5715). +- asm/nospec, array_ptr: sanitize speculative array de-references + (bsc#1068032 CVE-2017-5715). +- x86: implement array_ptr_mask() (bsc#1068032 CVE-2017-5715). +- x86: introduce __uaccess_begin_nospec and ifence (bsc#1068032 + CVE-2017-5715). +- x86, __get_user: use __uaccess_begin_nospec (bsc#1068032 + CVE-2017-5715). +- x86, get_user: use pointer masking to limit speculation + (bsc#1068032 CVE-2017-5715). +- x86: narrow out of bounds syscalls to sys_read under speculation + (bsc#1068032 CVE-2017-5715). +- vfs, fdtable: prevent bounds-check bypass via speculative + execution (bsc#1068032 CVE-2017-5715). +- kvm, x86: update spectre-v1 mitigation (bsc#1068032 + CVE-2017-5715). +- nl80211: sanitize array index in parse_txq_params (bsc#1068032 + CVE-2017-5715). +- Delete + patches.suse/0003-locking-barriers-introduce-new-observable-speculatio.patch. +- Delete + patches.suse/0004-bpf-prevent-speculative-execution-in-eBPF-interprete.patch. +- Delete + patches.suse/0005-x86-bpf-jit-prevent-speculative-execution-when-JIT-i.patch. +- Delete + patches.suse/0006-uvcvideo-prevent-speculative-execution.patch. +- Delete + patches.suse/0007-carl9170-prevent-speculative-execution.patch. +- Delete + patches.suse/0008-p54-prevent-speculative-execution.patch. +- Delete + patches.suse/0009-qla2xxx-prevent-speculative-execution.patch. +- Delete + patches.suse/0010-cw1200-prevent-speculative-execution.patch. +- Delete + patches.suse/0011-Thermal-int340x-prevent-speculative-execution.patch. +- Delete + patches.suse/0012-ipv4-prevent-speculative-execution.patch. +- Delete + patches.suse/0013-ipv6-prevent-speculative-execution.patch. +- Delete patches.suse/0014-fs-prevent-speculative-execution.patch. +- Delete + patches.suse/0015-net-mpls-prevent-speculative-execution.patch. +- Delete + patches.suse/0016-udf-prevent-speculative-execution.patch. +- Delete + patches.suse/0017-userns-prevent-speculative-execution.patch. + Replace by the potential upstream solution. +- commit 804f8a1 + +------------------------------------------------------------------- @@ -339,0 +481,7 @@ +Mon Jan 22 13:29:31 CET 2018 - msuchanek(a)suse.de + +- rpm/mkspec-dtb: Remove COPYING file (bsc#1076905). + It conflicts between different versions of dtb package. +- commit 0e5fcf9 + +------------------------------------------------------------------- @@ -394,0 +543,21 @@ +Thu Jan 18 11:20:11 CET 2018 - jslaby(a)suse.cz + +- Update config files (bsc#1068032 CVE-2017-5715). + Enable RETPOLINE -- the compiler is capable of them already. +- commit 5d5345e + +------------------------------------------------------------------- +Wed Jan 17 16:02:16 CET 2018 - rjschwei(a)suse.com + +- kernel-obs-build.spec.in: enable xfs module + This allows the public cloud team to build images with XFS + as root filesystem +- commit 95a2d6f + +------------------------------------------------------------------- +Wed Jan 17 15:19:38 CET 2018 - msuchanek(a)suse.de + +- macros.kernel-source: pass -f properly in module subpackage (boo#1076393). +- commit 66bd9b8 + +------------------------------------------------------------------- @@ -627,0 +797,11 @@ +Mon Jan 15 15:08:48 CET 2018 - jeffm(a)suse.com + +- Update to 4.15-rc8. +- Eliminated 3 patches. +- Config changes: + - Security: + - BPF_JIT_ALWAYS_ON=y + - RETPOLINE=n (depends on gcc with -mindirect-branch=thunk-extern) +- commit 05e4405 + +------------------------------------------------------------------- @@ -651 +831,9 @@ -- commit 77de35d +- commit 0eca303 + +------------------------------------------------------------------- +Thu Jan 11 19:57:16 CET 2018 - matwey.kornilov(a)gmail.com + +- config: arm64: Enable Aardvark PCIe controller + Aardvark PCIe controller is a part of Marvel Armada 3700 SoC. + This option is required to support PCIe for JeOS-espressobin. ++++ 280 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes dtb-armv6l.changes: same change dtb-armv7l.changes: same change kernel-64kb.changes: same change kernel-debug.changes: same change kernel-default.changes: same change kernel-docs.changes: same change kernel-lpae.changes: same change kernel-obs-build.changes: same change kernel-obs-qa.changes: same change kernel-pae.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-syzkaller.changes: same change kernel-vanilla.changes: same change kernel-zfcpdump.changes: same change Old: ---- linux-4.14.tar.xz New: ---- linux-4.15.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.705262423 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.709262236 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb}) Name: dtb-aarch64 -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -362,6 +362,7 @@ for dts in al/*.dts allwinner/*.dts altera/*.dts amd/*.dts amlogic/*.dts apm/*.dts arm/*.dts broadcom/*.dts cavium/*.dts exynos/*.dts freescale/*.dts hisilicon/*.dts lg/*.dts marvell/*.dts mediatek/*.dts nvidia/*.dts qcom/*.dts renesas/*.dts rockchip/*.dts socionext/*.dts sprd/*.dts xilinx/*.dts zte/*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) + # install -m 644 COPYING %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir @@ -540,7 +541,6 @@ %files -n dtb-al %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/al @@ -552,7 +552,6 @@ %files -n dtb-allwinner %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/allwinner @@ -564,7 +563,6 @@ %files -n dtb-altera %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/altera @@ -576,7 +574,6 @@ %files -n dtb-amd %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/amd @@ -588,7 +585,6 @@ %files -n dtb-amlogic %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/amlogic @@ -600,7 +596,6 @@ %files -n dtb-apm %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/apm @@ -612,7 +607,6 @@ %files -n dtb-arm %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/arm @@ -624,7 +618,6 @@ %files -n dtb-broadcom %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/broadcom @@ -636,7 +629,6 @@ %files -n dtb-cavium %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/cavium @@ -648,7 +640,6 @@ %files -n dtb-exynos %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/exynos @@ -660,7 +651,6 @@ %files -n dtb-freescale %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/freescale @@ -672,7 +662,6 @@ %files -n dtb-hisilicon %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/hisilicon @@ -684,7 +673,6 @@ %files -n dtb-lg %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/lg @@ -696,7 +684,6 @@ %files -n dtb-marvell %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/marvell @@ -708,7 +695,6 @@ %files -n dtb-mediatek %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/mediatek @@ -720,7 +706,6 @@ %files -n dtb-nvidia %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/nvidia @@ -732,7 +717,6 @@ %files -n dtb-qcom %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/qcom @@ -744,7 +728,6 @@ %files -n dtb-renesas %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/renesas @@ -756,7 +739,6 @@ %files -n dtb-rockchip %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/rockchip @@ -768,7 +750,6 @@ %files -n dtb-socionext %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/socionext @@ -780,7 +761,6 @@ %files -n dtb-sprd %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/sprd @@ -792,7 +772,6 @@ %files -n dtb-xilinx %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/xilinx @@ -804,7 +783,6 @@ %files -n dtb-zte %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %dir %{dtbdir}/zte ++++++ dtb-armv6l.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.745260554 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.749260367 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb}) Name: dtb-armv6l -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -159,6 +159,7 @@ for dts in bcm2835*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) + # install -m 644 COPYING %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir @@ -183,7 +184,6 @@ %files -n dtb-bcm2835 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/bcm2835*.dtb ++++++ dtb-armv7l.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.773259245 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.777259058 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -29,9 +29,9 @@ %(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes,group-source-files.pl,split-modules,modversions,kabi.pl,mkspec,compute-PATCHVERSION.sh,arch-symbols,log.sh,try-disable-staging-driver,compress-vmlinux.sh,mkspec-dtb}) Name: dtb-armv7l -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -530,6 +530,7 @@ for dts in am335x-*.dts am3517*.dts am57xx-*.dts armada-370-*.dts armada-375-*.dts armada-385-*.dts armada-388-*.dts armada-398-*.dts armada-xp-*.dts bcm2836*.dts dove-*.dts exynos4*.dts exynos5*.dts imx5*.dts imx6*.dts imx7*.dts keystone-*.dts meson6-*.dts meson8-*.dts meson8b-*.dts omap3*.dts omap4*.dts omap5*.dts qcom-*.dts rk3*.dts socfpga_*.dts ste-*.dts sun4i-*.dts sun5i-*.dts sun6i-*.dts sun7i-*.dts sun8i-*.dts sun9i-*.dts tegra20-*.dts tegra30-*.dts tegra114-*.dts tegra124-*.dts vexpress-*.dts vf500-*.dts vf610-*.dts xenvm-*.dts zynq-*.dts ; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) + # install -m 644 COPYING %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir @@ -841,7 +842,6 @@ %files -n dtb-am335x %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/am335x-*.dtb @@ -852,7 +852,6 @@ %files -n dtb-am3517 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/am3517*.dtb @@ -863,7 +862,6 @@ %files -n dtb-am57xx %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/am57xx-*.dtb @@ -874,7 +872,6 @@ %files -n dtb-armada-370 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-370-*.dtb @@ -885,7 +882,6 @@ %files -n dtb-armada-375 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-375-*.dtb @@ -896,7 +892,6 @@ %files -n dtb-armada-385 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-385-*.dtb @@ -907,7 +902,6 @@ %files -n dtb-armada-388 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-388-*.dtb @@ -918,7 +912,6 @@ %files -n dtb-armada-398 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-398-*.dtb @@ -929,7 +922,6 @@ %files -n dtb-armada-xp %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/armada-xp-*.dtb @@ -940,7 +932,6 @@ %files -n dtb-bcm2836 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/bcm2836*.dtb @@ -951,7 +942,6 @@ %files -n dtb-dove %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/dove-*.dtb @@ -962,7 +952,6 @@ %files -n dtb-exynos4 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/exynos4*.dtb @@ -973,7 +962,6 @@ %files -n dtb-exynos5 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/exynos5*.dtb @@ -984,7 +972,6 @@ %files -n dtb-imx5 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/imx5*.dtb @@ -995,7 +982,6 @@ %files -n dtb-imx6 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/imx6*.dtb @@ -1006,7 +992,6 @@ %files -n dtb-imx7 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/imx7*.dtb @@ -1017,7 +1002,6 @@ %files -n dtb-keystone %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/keystone-*.dtb @@ -1028,7 +1012,6 @@ %files -n dtb-meson6 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/meson6-*.dtb @@ -1039,7 +1022,6 @@ %files -n dtb-meson8 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/meson8-*.dtb @@ -1050,7 +1032,6 @@ %files -n dtb-meson8b %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/meson8b-*.dtb @@ -1061,7 +1042,6 @@ %files -n dtb-omap3 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/omap3*.dtb @@ -1072,7 +1052,6 @@ %files -n dtb-omap4 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/omap4*.dtb @@ -1083,7 +1062,6 @@ %files -n dtb-omap5 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/omap5*.dtb @@ -1094,7 +1072,6 @@ %files -n dtb-qcom %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/qcom-*.dtb @@ -1105,7 +1082,6 @@ %files -n dtb-rk3 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/rk3*.dtb @@ -1116,7 +1092,6 @@ %files -n dtb-socfpga %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/socfpga_*.dtb @@ -1127,7 +1102,6 @@ %files -n dtb-ste %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/ste-*.dtb @@ -1138,7 +1112,6 @@ %files -n dtb-sun4i %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun4i-*.dtb @@ -1149,7 +1122,6 @@ %files -n dtb-sun5i %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun5i-*.dtb @@ -1160,7 +1132,6 @@ %files -n dtb-sun6i %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun6i-*.dtb @@ -1171,7 +1142,6 @@ %files -n dtb-sun7i %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun7i-*.dtb @@ -1182,7 +1152,6 @@ %files -n dtb-sun8i %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun8i-*.dtb @@ -1193,7 +1162,6 @@ %files -n dtb-sun9i %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/sun9i-*.dtb @@ -1204,7 +1172,6 @@ %files -n dtb-tegra2 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra20-*.dtb @@ -1215,7 +1182,6 @@ %files -n dtb-tegra3 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra30-*.dtb @@ -1226,7 +1192,6 @@ %files -n dtb-tegra114 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra114-*.dtb @@ -1237,7 +1202,6 @@ %files -n dtb-tegra124 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/tegra124-*.dtb @@ -1248,7 +1212,6 @@ %files -n dtb-vexpress %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/vexpress-*.dtb @@ -1259,7 +1222,6 @@ %files -n dtb-vf500 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/vf500-*.dtb @@ -1270,7 +1232,6 @@ %files -n dtb-vf6 %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/vf610-*.dtb @@ -1281,7 +1242,6 @@ %files -n dtb-xenvm %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/xenvm-*.dtb @@ -1292,7 +1252,6 @@ %files -n dtb-zynq %endif %defattr(-,root,root) -%doc COPYING %ghost /boot/dtb %dir %{dtbdir} %{dtbdir}/zynq-*.dtb ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.809257563 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.813257376 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with 64kb PAGE_SIZE License: GPL-2.0 Group: System/Kernel -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -1164,10 +1164,10 @@ Group: System/Kernel Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor Provides: multiversion(kernel) -Provides: kernel-default-kgraft -Provides: kernel-xen-kgraft -Obsoletes: kernel-default-kgraft < 4.12 -Obsoletes: kernel-xen-kgraft < 4.12 +Provides: kernel-default-kgraft = %version +Provides: kernel-xen-kgraft = %version +Obsoletes: kernel-default-kgraft < %version +Obsoletes: kernel-xen-kgraft < %version %description livepatch This is a metapackage that pulls in the matching kernel-livepatch package for a kernel-debug.spec: same change ++++++ kernel-default.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.905253076 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.909252889 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: The Standard Kernel License: GPL-2.0 Group: System/Kernel -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -1279,10 +1279,10 @@ Group: System/Kernel Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor Provides: multiversion(kernel) -Provides: kernel-default-kgraft -Provides: kernel-xen-kgraft -Obsoletes: kernel-default-kgraft < 4.12 -Obsoletes: kernel-xen-kgraft < 4.12 +Provides: kernel-default-kgraft = %version +Provides: kernel-xen-kgraft = %version +Obsoletes: kernel-default-kgraft < %version +Obsoletes: kernel-xen-kgraft < %version %description livepatch This is a metapackage that pulls in the matching kernel-livepatch package for a ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.941251394 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.945251207 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -31,9 +31,9 @@ Summary: Kernel Documentation License: GPL-2.0 Group: Documentation/Man -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.969250085 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:53.973249898 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel for LPAE enabled systems License: GPL-2.0 Group: System/Kernel -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -1158,10 +1158,10 @@ Group: System/Kernel Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor Provides: multiversion(kernel) -Provides: kernel-default-kgraft -Provides: kernel-xen-kgraft -Obsoletes: kernel-default-kgraft < 4.12 -Obsoletes: kernel-xen-kgraft < 4.12 +Provides: kernel-default-kgraft = %version +Provides: kernel-xen-kgraft = %version +Obsoletes: kernel-default-kgraft < %version +Obsoletes: kernel-xen-kgraft < %version %description livepatch This is a metapackage that pulls in the matching kernel-livepatch package for a ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:53.997248776 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.001248589 +0100 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.14.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -32,13 +32,20 @@ %if 0%{?suse_version} %if %vanilla_only -BuildRequires: kernel-vanilla %define kernel_flavor -vanilla %else -BuildRequires: kernel-default +%ifarch %ix86 +%define kernel_flavor -pae +%else +%ifarch armv7l armv7hl +%define kernel_flavor -lpae +%else %define kernel_flavor -default %endif %endif +%endif +%endif +BuildRequires: kernel%kernel_flavor %if 0%{?rhel_version} BuildRequires: kernel @@ -57,9 +64,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -109,7 +116,7 @@ # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth" +export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do @@ -139,7 +146,7 @@ -m "$KERNEL_MODULES" \ -k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm -B %else -dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p'` +dracut --host-only --no-hostonly-cmdline --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p'` %endif #cleanup ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.021247655 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.025247468 +0100 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.14.15 +%define patchversion 4.15.0 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -36,9 +36,9 @@ Summary: Basic QA tests for the kernel License: GPL-2.0 Group: SLES -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.049246346 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.053246159 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel with PAE Support License: GPL-2.0 Group: System/Kernel -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -1228,10 +1228,10 @@ Group: System/Kernel Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor Provides: multiversion(kernel) -Provides: kernel-default-kgraft -Provides: kernel-xen-kgraft -Obsoletes: kernel-default-kgraft < 4.12 -Obsoletes: kernel-xen-kgraft < 4.12 +Provides: kernel-default-kgraft = %version +Provides: kernel-xen-kgraft = %version +Obsoletes: kernel-default-kgraft < %version +Obsoletes: kernel-xen-kgraft < %version %description livepatch This is a metapackage that pulls in the matching kernel-livepatch package for a ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.089244477 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.093244290 +0100 @@ -17,8 +17,8 @@ # icecream 0 -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -30,9 +30,9 @@ Summary: The Linux Kernel Sources License: GPL-2.0 Group: Development/Sources -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.137242234 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.137242234 +0100 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.14.15 +Version: 4.15.0 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif ++++++ kernel-syzkaller.spec ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.157241299 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.165240925 +0100 @@ -17,8 +17,8 @@ # needssslcertforbuild -%define srcversion 4.14 -%define patchversion 4.14.15 +%define srcversion 4.15 +%define patchversion 4.15.0 %define variant %{nil} %define vanilla_only 0 @@ -58,9 +58,9 @@ Summary: Kernel used for fuzzing by syzkaller License: GPL-2.0 Group: System/Kernel -Version: 4.14.15 +Version: 4.15.0 %if 0%{?is_kotd} -Release: <RELEASE>.g9a6fca5 +Release: <RELEASE>.gac01747 %else Release: 0 %endif @@ -1161,10 +1161,10 @@ Group: System/Kernel Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor Provides: multiversion(kernel) -Provides: kernel-default-kgraft -Provides: kernel-xen-kgraft -Obsoletes: kernel-default-kgraft < 4.12 -Obsoletes: kernel-xen-kgraft < 4.12 +Provides: kernel-default-kgraft = %version +Provides: kernel-xen-kgraft = %version +Obsoletes: kernel-default-kgraft < %version +Obsoletes: kernel-xen-kgraft < %version %description livepatch This is a metapackage that pulls in the matching kernel-livepatch package for a kernel-vanilla.spec: same change kernel-zfcpdump.spec: same change ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.453227465 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.457227278 +0100 @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=4.14 +SRCVERSION=4.15 # variant of the kernel-source package, either empty or "-rt" VARIANT= # buildservice projects to build the kernel against ++++++ config.tar.bz2 ++++++ ++++ 7419 lines of diff (skipped) ++++++ dtb.spec.in.in ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.733214379 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.733214379 +0100 @@ -89,6 +89,7 @@ for dts in $ALL_SUPPORTED_DTB; do target=${dts%*.dts} install -m 700 -d %{buildroot}%{dtbdir}/$(dirname $target) + # install -m 644 COPYING %{buildroot}%{dtbdir}/$(dirname $target) install -m 644 $target.dtb %{buildroot}%{dtbdir}/$(dirname $target) %ifarch aarch64 # HACK: work around U-Boot ignoring vendor dir ++++++ kernel-binary.spec.in ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.809210827 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.813210640 +0100 @@ -978,10 +978,10 @@ Group: System/Kernel Requires: kernel-livepatch-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor Provides: multiversion(kernel) -Provides: kernel-default-kgraft -Provides: kernel-xen-kgraft -Obsoletes: kernel-default-kgraft < 4.12 -Obsoletes: kernel-xen-kgraft < 4.12 +Provides: kernel-default-kgraft = %version +Provides: kernel-xen-kgraft = %version +Obsoletes: kernel-default-kgraft < %version +Obsoletes: kernel-xen-kgraft < %version %description livepatch This is a metapackage that pulls in the matching kernel-livepatch package for a ++++++ kernel-obs-build.spec.in ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:54.909206154 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:54.913205967 +0100 @@ -32,13 +32,20 @@ %if 0%{?suse_version} %if %vanilla_only -BuildRequires: kernel-vanilla %define kernel_flavor -vanilla %else -BuildRequires: kernel-default +%ifarch %ix86 +%define kernel_flavor -pae +%else +%ifarch armv7l armv7hl +%define kernel_flavor -lpae +%else %define kernel_flavor -default %endif %endif +%endif +%endif +BuildRequires: kernel%kernel_flavor %if 0%{?rhel_version} BuildRequires: kernel @@ -109,7 +116,7 @@ # a longer list to have them also available for qemu cross builds where x86_64 kernel runs in eg. arm env. # this list of modules where available on build workers of build.opensuse.org, so we stay compatible. -export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth" +export KERNEL_MODULES="loop dm-mod dm-snapshot binfmt-misc fuse kqemu squashfs ext2 ext3 ext4 reiserfs btrfs xfs nf_conntrack_ipv6 binfmt_misc virtio_pci virtio_mmio virtio_blk virtio_rng fat vfat nls_cp437 nls_iso8859-1 ibmvscsi sd_mod e1000 ibmveth" # manually load all modules to make sure they're available for i in $KERNEL_MODULES; do @@ -139,7 +146,7 @@ -m "$KERNEL_MODULES" \ -k /boot/%{kernel_name}-*-default -M /boot/System.map-*-default -i /tmp/initrd.kvm -B %else -dracut --host-only --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p'` +dracut --host-only --no-hostonly-cmdline --drivers="$KERNEL_MODULES" --force /tmp/initrd.kvm `echo /boot/%{kernel_name}-*%{kernel_flavor} | sed -n -e 's,[^-]*-$.*'%{kernel_flavor}'$,\1,p'` %endif #cleanup ++++++ linux-4.14.tar.xz -> linux-4.15.tar.xz ++++++ /work/SRC/openSUSE:Factory/kernel-source/linux-4.14.tar.xz /work/SRC/openSUSE:Factory/.kernel-source.new/linux-4.15.tar.xz differ: char 15, line 1 ++++++ macros.kernel-source ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:55.169194003 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:55.169194003 +0100 @@ -19,7 +19,7 @@ krel=$(make -s -C /usr/src/linux-obj/%_target_cpu/$flavor kernelrelease) \ kver=${krel%%-*} \ flavors_to_build="$flavors_to_build $flavor" \ - echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name} -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-p} %{-b} %{-c:-c} $flavor $kver" \ + echo "%%_suse_kernel_module_subpackage -n %{-n*}%{!-n:%name} -v %{-v*}%{!-v:%version} -r %{-r*}%{!-r:%release} %{-f} %{-p} %{-b} %{-c:-c} $flavor $kver" \ done \ echo "%%global flavors_to_build${flavors_to_build:-%%nil}" \ echo "%%{expand:%%(test -z '%flavors_to_build' && echo %%%%internal_kmp_error)}" \ ++++++ mkspec-dtb ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:55.225191385 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:55.229191198 +0100 @@ -161,7 +161,6 @@ "%files -n $PKG_NAME\n" . "%endif\n" . "%defattr(-,root,root)\n" . - "%doc COPYING\n" . "%ghost /boot/dtb\n" . "%dir %{dtbdir}\n" . $dtb_subdir . ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 134527 lines of diff (skipped) ++++++ patches.suse.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0001-x86-cpufeatures-Add-CPUID_7_EDX-CPUID-leaf.patch new/patches.suse/0001-x86-cpufeatures-Add-CPUID_7_EDX-CPUID-leaf.patch --- old/patches.suse/0001-x86-cpufeatures-Add-CPUID_7_EDX-CPUID-leaf.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0001-x86-cpufeatures-Add-CPUID_7_EDX-CPUID-leaf.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 0715cb3212839630877817e59cb46bee3f2bf341 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 This is a pure feature bits leaf. We have two AVX512 feature bits in it already which were handled as scattered bits, and I'm about to add three @@ -87,9 +87,9 @@ */ --- a/arch/x86/include/asm/disabled-features.h +++ b/arch/x86/include/asm/disabled-features.h -@@ -71,6 +71,7 @@ +@@ -77,6 +77,7 @@ #define DISABLED_MASK15 0 - #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57) + #define DISABLED_MASK16 (DISABLE_PKU|DISABLE_OSPKE|DISABLE_LA57|DISABLE_UMIP) #define DISABLED_MASK17 0 -#define DISABLED_MASK_CHECK BUILD_BUG_ON_ZERO(NCAPINTS != 18) +#define DISABLED_MASK18 0 @@ -109,7 +109,7 @@ #endif /* _ASM_X86_REQUIRED_FEATURES_H */ --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c -@@ -745,6 +745,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c) +@@ -769,6 +769,7 @@ void get_cpu_cap(struct cpuinfo_x86 *c) cpuid_count(0x00000007, 0, &eax, &ebx, &ecx, &edx); c->x86_capability[CPUID_7_0_EBX] = ebx; c->x86_capability[CPUID_7_ECX] = ecx; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch new/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch --- old/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0002-futex-futex_wake_op-fix-sign_extend32-sign-bits.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -From: Jiri Slaby <jslaby(a)suse.cz> -Date: Mon, 23 Oct 2017 13:13:24 +0200 -Subject: futex: futex_wake_op, fix sign_extend32 sign bits -Patch-mainline: submitted on 2017/10/23 -References: bnc#1064590 - -sign_extend32 counts the sign bit parameter from 0, not from 1. So we -have to use "11" for 12th bit, not "12". - -This mistake means we have not allowed negative op and cmp args since -commit 30d6e0a4190d ("futex: Remove duplicated code and fix undefined -behaviour") till now. - -Fixes: 30d6e0a4190d ("futex: Remove duplicated code and fix undefined behaviour") -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> -Cc: Ingo Molnar <mingo(a)redhat.com> -Cc: Peter Zijlstra <peterz(a)infradead.org> -Cc: Darren Hart <dvhart(a)infradead.org> -Cc: Linus Torvalds <torvalds(a)linux-foundation.org> ---- - kernel/futex.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/kernel/futex.c -+++ b/kernel/futex.c -@@ -1561,8 +1561,8 @@ static int futex_atomic_op_inuser(unsign - { - unsigned int op = (encoded_op & 0x70000000) >> 28; - unsigned int cmp = (encoded_op & 0x0f000000) >> 24; -- int oparg = sign_extend32((encoded_op & 0x00fff000) >> 12, 12); -- int cmparg = sign_extend32(encoded_op & 0x00000fff, 12); -+ int oparg = sign_extend32((encoded_op & 0x00fff000) >> 12, 11); -+ int cmparg = sign_extend32(encoded_op & 0x00000fff, 11); - int oldval, ret; - - if (encoded_op & (FUTEX_OP_OPARG_SHIFT << 28)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0002-x86-cpufeatures-Add-Intel-feature-bits-for-Speculati.patch new/patches.suse/0002-x86-cpufeatures-Add-Intel-feature-bits-for-Speculati.patch --- old/patches.suse/0002-x86-cpufeatures-Add-Intel-feature-bits-for-Speculati.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0002-x86-cpufeatures-Add-Intel-feature-bits-for-Speculati.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 4df4ced97da5c1e14a488ddfd7ebafe213b54ba3 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Add three feature bits exposed by new microcode on Intel CPUs for speculation control. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0003-x86-cpufeatures-Add-AMD-feature-bits-for-Speculation.patch new/patches.suse/0003-x86-cpufeatures-Add-AMD-feature-bits-for-Speculation.patch --- old/patches.suse/0003-x86-cpufeatures-Add-AMD-feature-bits-for-Speculation.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0003-x86-cpufeatures-Add-AMD-feature-bits-for-Speculation.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 2618db59c2c6061694463fb1811716fdf0912776 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 AMD exposes the PRED_CMD/SPEC_CTRL MSRs slightly differently to Intel. See http://lkml.kernel.org/r/2b3e25cc-286d-8bd0-aeaf-9ac4aae39de8@amd.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0004-x86-msr-Add-definitions-for-new-speculation-control-.patch new/patches.suse/0004-x86-msr-Add-definitions-for-new-speculation-control-.patch --- old/patches.suse/0004-x86-msr-Add-definitions-for-new-speculation-control-.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0004-x86-msr-Add-definitions-for-new-speculation-control-.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 5054290b87d0a542f1588c3690d24d6c27db7894 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Add MSR and bit definitions for SPEC_CTRL, PRED_CMD and ARCH_CAPABILITIES. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0005-x86-pti-Do-not-enable-PTI-on-processors-which-are-no.patch new/patches.suse/0005-x86-pti-Do-not-enable-PTI-on-processors-which-are-no.patch --- old/patches.suse/0005-x86-pti-Do-not-enable-PTI-on-processors-which-are-no.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0005-x86-pti-Do-not-enable-PTI-on-processors-which-are-no.patch 2018-01-31 07:59:46.000000000 +0100 @@ -5,7 +5,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 1665d40b7240918ef63c0a3db9154b5c3305a298 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Some old Atoms, anything in family 5 or 4, and newer CPUs when they advertise the IA32_ARCH_CAPABILITIES MSR and it has the RDCL_NO bit set, are not vulnerable. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0005-x86-stacktrace-orc-mark-it-as-reliable.patch new/patches.suse/0005-x86-stacktrace-orc-mark-it-as-reliable.patch --- old/patches.suse/0005-x86-stacktrace-orc-mark-it-as-reliable.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0005-x86-stacktrace-orc-mark-it-as-reliable.patch 2018-01-31 07:59:46.000000000 +0100 @@ -21,7 +21,7 @@ --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -171,7 +171,7 @@ config X86 +@@ -172,7 +172,7 @@ config X86 select HAVE_PERF_USER_STACK_DUMP select HAVE_RCU_TABLE_FREE select HAVE_REGS_AND_STACK_ACCESS_API diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0006-x86-cpufeature-Blacklist-SPEC_CTRL-on-early-Spectre-.patch new/patches.suse/0006-x86-cpufeature-Blacklist-SPEC_CTRL-on-early-Spectre-.patch --- old/patches.suse/0006-x86-cpufeature-Blacklist-SPEC_CTRL-on-early-Spectre-.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0006-x86-cpufeature-Blacklist-SPEC_CTRL-on-early-Spectre-.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 807b29d5bd1e4971f04812d4c207ee8151522eaf Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 We don't refuse to load the affected microcodes; just refuse to use SPEC_CTRL if they're detected. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0007-x86-speculation-Add-basic-IBPB-Indirect-Branch-Predi.patch new/patches.suse/0007-x86-speculation-Add-basic-IBPB-Indirect-Branch-Predi.patch --- old/patches.suse/0007-x86-speculation-Add-basic-IBPB-Indirect-Branch-Predi.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0007-x86-speculation-Add-basic-IBPB-Indirect-Branch-Predi.patch 2018-01-31 07:59:46.000000000 +0100 @@ -5,7 +5,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 94edcab6f527728e0936147c905b62ca5a232c58 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Expose indirect_branch_prediction_barrier() for use in subsequent patches. @@ -35,7 +35,7 @@ --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h -@@ -218,5 +218,18 @@ static inline void vmexit_fill_RSB(void) +@@ -215,5 +215,18 @@ static inline void vmexit_fill_RSB(void) #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0008-x86-kvm-Add-IBPB-support.patch new/patches.suse/0008-x86-kvm-Add-IBPB-support.patch --- old/patches.suse/0008-x86-kvm-Add-IBPB-support.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0008-x86-kvm-Add-IBPB-support.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 44edbb289056e36b10a3756652196e69476c6457 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Add MSR passthrough for MSR_IA32_PRED_CMD and place branch predictor barriers on switching between VMs to avoid inter VM specte-v2 attacks. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0009-x86-speculation-Use-Indirect-Branch-Prediction-Barri.patch new/patches.suse/0009-x86-speculation-Use-Indirect-Branch-Prediction-Barri.patch --- old/patches.suse/0009-x86-speculation-Use-Indirect-Branch-Prediction-Barri.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0009-x86-speculation-Use-Indirect-Branch-Prediction-Barri.patch 2018-01-31 07:59:46.000000000 +0100 @@ -5,7 +5,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: a4c996dcc365b5d50453903df0f72bdee17b1a5b Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 [peterz: comment] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0010-x86-mm-Only-flush-indirect-branches-when-switching-i.patch new/patches.suse/0010-x86-mm-Only-flush-indirect-branches-when-switching-i.patch --- old/patches.suse/0010-x86-mm-Only-flush-indirect-branches-when-switching-i.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0010-x86-mm-Only-flush-indirect-branches-when-switching-i.patch 2018-01-31 07:59:46.000000000 +0100 @@ -5,7 +5,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: eb052500e0d28e8b90d4a7de0f6303f54224b84f Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Flush indirect branches when switching into a process that marked itself non dumpable. This protects high value processes like gpg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0011-x86-speculation-Add-basic-IBRS-support-infrastructur.patch new/patches.suse/0011-x86-speculation-Add-basic-IBRS-support-infrastructur.patch --- old/patches.suse/0011-x86-speculation-Add-basic-IBRS-support-infrastructur.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0011-x86-speculation-Add-basic-IBRS-support-infrastructur.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 227c845f041e1b86ba25425a31393af032795543 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Not functional yet; just add the handling for it in the Spectre v2 mitigation selection, and the X86_FEATURE_IBRS flag which will control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0012-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch new/patches.suse/0012-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch --- old/patches.suse/0012-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0012-x86-speculation-Add-inlines-to-control-Indirect-Bran.patch 2018-01-31 07:59:46.000000000 +0100 @@ -7,7 +7,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 0022cdd96fe7cbac0d900a525f9690f82e9d328c Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 XX: I am utterly unconvinced that having "friendly, self-explanatory" names for the IBRS-frobbing inlines is useful. There be dragons diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0013-x86-Simplify-spectre_v2-command-line-parsing.patch new/patches.suse/0013-x86-Simplify-spectre_v2-command-line-parsing.patch --- old/patches.suse/0013-x86-Simplify-spectre_v2-command-line-parsing.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0013-x86-Simplify-spectre_v2-command-line-parsing.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: aac293424e30098bf91d86ddbe92ebd85b7867e2 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 [dwmw2: Don't allow IBRS if no CPU support] Signed-off-by: KarimAllah Ahmed <karahmed(a)amazon.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0014-x86-idle-Control-Indirect-Branch-Speculation-in-idle.patch new/patches.suse/0014-x86-idle-Control-Indirect-Branch-Speculation-in-idle.patch --- old/patches.suse/0014-x86-idle-Control-Indirect-Branch-Speculation-in-idle.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0014-x86-idle-Control-Indirect-Branch-Speculation-in-idle.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 98fb68267f4d4e4d91ef449f4b4143ac4004b382 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Indirect Branch Speculation (IBS) is controlled per physical core. If one thread disables it then it's disabled for the core. If a thread enters idle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0015-x86-enter-Create-macros-to-restrict-unrestrict-Indir.patch new/patches.suse/0015-x86-enter-Create-macros-to-restrict-unrestrict-Indir.patch --- old/patches.suse/0015-x86-enter-Create-macros-to-restrict-unrestrict-Indir.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0015-x86-enter-Create-macros-to-restrict-unrestrict-Indir.patch 2018-01-31 07:59:46.000000000 +0100 @@ -5,7 +5,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 5328486188fb080dab86fa05c98d307378b61b4f Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Create macros to control Indirect Branch Speculation. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0016-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch new/patches.suse/0016-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch --- old/patches.suse/0016-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0016-x86-enter-Use-IBRS-on-syscall-and-interrupts.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: f473ac94b4e13d8583a9ada1b4c8defd382ca4a4 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Stop Indirect Branch Speculation on every user space to kernel space transition and reenable it when returning to user space./ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0017-x86-ibrs-Add-new-helper-macros-to-save-restore-MSR_I.patch new/patches.suse/0017-x86-ibrs-Add-new-helper-macros-to-save-restore-MSR_I.patch --- old/patches.suse/0017-x86-ibrs-Add-new-helper-macros-to-save-restore-MSR_I.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0017-x86-ibrs-Add-new-helper-macros-to-save-restore-MSR_I.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: e987e4ee03081997b8385ac90dc2aa0bee2a6ee8 Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Add some helper macros to save/restore MSR_IA32_SPEC_CTRL. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/0018-x86-vmx-Direct-access-to-MSR_IA32_SPEC_CTRL.patch new/patches.suse/0018-x86-vmx-Direct-access-to-MSR_IA32_SPEC_CTRL.patch --- old/patches.suse/0018-x86-vmx-Direct-access-to-MSR_IA32_SPEC_CTRL.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/0018-x86-vmx-Direct-access-to-MSR_IA32_SPEC_CTRL.patch 2018-01-31 07:59:46.000000000 +0100 @@ -4,7 +4,7 @@ Git-repo: git://git.infradead.org/users/dwmw2/linux-retpoline.git Git-commit: 1ee306bcac933ae1778c412f52b8f93ce81aafeb Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1068032 CVE-2017-5715 +References: bsc#1068032 CVE-2017-5753 Add direct access to MSR_IA32_SPEC_CTRL from a guest. Also save/restore IBRS values during exits and guest resume path. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/VFS-Handle-lazytime-in-do_mount.patch new/patches.suse/VFS-Handle-lazytime-in-do_mount.patch --- old/patches.suse/VFS-Handle-lazytime-in-do_mount.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/VFS-Handle-lazytime-in-do_mount.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,37 +0,0 @@ -From c737a3cd87a122fc7f85307e9b6ea17c5bf09f57 Mon Sep 17 00:00:00 2001 -From: Markus Trippelsdorf <markus(a)trippelsdorf.de> -Date: Tue, 19 Sep 2017 12:37:24 +0200 -Subject: [PATCH] VFS: Handle lazytime in do_mount() -Patch-mainline: Submitted, https://patchwork.kernel.org/patch/9958653/ -References: boo#1068256 - -Since commit e462ec50cb5fa ("VFS: Differentiate mount flags (MS_*) from -internal superblock flags") the lazytime mount option didn't get passed -on anymore. - -Fix the issue by handling the option in do_mount(). - -Signed-off-by: Markus Trippelsdorf <markus(a)trippelsdorf.de> -Reviewed-by: Lukas Czerner <lczerner(a)redhat.com> -Acked-by: Goldwyn Rodrigues <rgoldwyn(a)suse.com> ---- - fs/namespace.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/fs/namespace.c b/fs/namespace.c -index 23cdf6c62895..9c254f515fb6 100644 ---- a/fs/namespace.c -+++ b/fs/namespace.c -@@ -2826,7 +2826,8 @@ long do_mount(const char *dev_name, const char __user *dir_name, - SB_DIRSYNC | - SB_SILENT | - SB_POSIXACL | -- SB_I_VERSION); -+ SB_I_VERSION | -+ SB_LAZYTIME); - - if (flags & MS_REMOUNT) - retval = do_remount(&path, flags, sb_flags, mnt_flags, --- -2.13.6 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch new/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch --- old/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/btrfs-8447-serialize-subvolume-mounts-with-potentially-mi.patch 2018-01-31 07:59:46.000000000 +0100 @@ -16,7 +16,7 @@ --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c -@@ -1284,6 +1284,7 @@ static struct dentry *mount_subvol(const +@@ -1409,6 +1409,7 @@ static struct dentry *mount_subvol(const struct vfsmount *mnt = NULL; char *newargs; int ret; @@ -24,7 +24,7 @@ newargs = setup_root_args(data); if (!newargs) { -@@ -1291,6 +1292,24 @@ static struct dentry *mount_subvol(const +@@ -1416,6 +1417,24 @@ static struct dentry *mount_subvol(const goto out; } @@ -48,8 +48,8 @@ + mnt = vfs_kern_mount(&btrfs_fs_type, flags, device_name, newargs); if (PTR_ERR_OR_ZERO(mnt) == -EBUSY) { - if (flags & MS_RDONLY) { -@@ -1302,6 +1321,7 @@ static struct dentry *mount_subvol(const + if (flags & SB_RDONLY) { +@@ -1427,6 +1446,7 @@ static struct dentry *mount_subvol(const if (IS_ERR(mnt)) { root = ERR_CAST(mnt); mnt = NULL; @@ -57,7 +57,7 @@ goto out; } -@@ -1310,10 +1330,13 @@ static struct dentry *mount_subvol(const +@@ -1435,10 +1455,13 @@ static struct dentry *mount_subvol(const up_write(&mnt->mnt_sb->s_umount); if (ret < 0) { root = ERR_PTR(ret); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch new/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch --- old/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/btrfs-fs-super.c-add-new-super-block-devices-super_block_d.patch 2018-01-31 07:59:46.000000000 +0100 @@ -28,8 +28,8 @@ --- a/fs/super.c +++ b/fs/super.c -@@ -154,6 +154,59 @@ static void destroy_super_rcu(struct rcu - schedule_work(&s->destroy_work); +@@ -137,6 +137,59 @@ static unsigned long super_cache_count(s + return total_objects; } +static bool super_dev_match(struct super_block *sb, dev_t dev) @@ -85,18 +85,18 @@ +} +EXPORT_SYMBOL_GPL(remove_anon_sbdev); + - /** - * destroy_super - frees a superblock - * @s: superblock to free -@@ -166,6 +219,7 @@ static void destroy_super(struct super_b + static void destroy_super_work(struct work_struct *work) + { + struct super_block *s = container_of(work, struct super_block, +@@ -164,6 +217,7 @@ static void destroy_unused_super(struct + list_lru_destroy(&s->s_dentry_lru); list_lru_destroy(&s->s_inode_lru); security_sb_free(s); - WARN_ON(!list_empty(&s->s_mounts)); + WARN_ON(!list_empty(&s->s_sbdevs)); put_user_ns(s->s_user_ns); kfree(s->s_subtype); - call_rcu(&s->rcu, destroy_super_rcu); -@@ -214,6 +268,7 @@ static struct super_block *alloc_super(s + /* no delays needed */ +@@ -213,6 +267,7 @@ static struct super_block *alloc_super(s spin_lock_init(&s->s_inode_list_lock); INIT_LIST_HEAD(&s->s_inodes_wb); spin_lock_init(&s->s_inode_wblist_lock); @@ -104,7 +104,7 @@ if (list_lru_init_memcg(&s->s_dentry_lru)) goto fail; -@@ -780,7 +835,7 @@ rescan: +@@ -777,7 +832,7 @@ rescan: list_for_each_entry(sb, &super_blocks, s_list) { if (hlist_unhashed(&sb->s_instances)) continue; @@ -115,7 +115,7 @@ down_read(&sb->s_umount); --- a/include/linux/fs.h +++ b/include/linux/fs.h -@@ -1305,6 +1305,14 @@ struct sb_writers { +@@ -1334,6 +1334,14 @@ struct sb_writers { struct percpu_rw_semaphore rw_sem[SB_FREEZE_LEVELS]; }; @@ -130,7 +130,7 @@ struct super_block { struct list_head s_list; /* Keep this first */ dev_t s_dev; /* search index; _not_ kdev_t */ -@@ -1331,6 +1339,7 @@ struct super_block { +@@ -1360,6 +1368,7 @@ struct super_block { const struct fscrypt_operations *s_cop; struct hlist_bl_head s_anon; /* anonymous dentries for (nfs) exporting */ @@ -138,7 +138,7 @@ struct list_head s_mounts; /* list of mounts; _not_ for fs use */ struct block_device *s_bdev; struct backing_dev_info *s_bdi; -@@ -2088,6 +2097,17 @@ void deactivate_locked_super(struct supe +@@ -2134,6 +2143,17 @@ void deactivate_locked_super(struct supe int set_anon_super(struct super_block *s, void *data); int get_anon_bdev(dev_t *); void free_anon_bdev(dev_t); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/crasher.patch new/patches.suse/crasher.patch --- old/patches.suse/crasher.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/crasher.patch 2018-01-31 07:59:46.000000000 +0100 @@ -28,7 +28,7 @@ --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -590,6 +590,12 @@ config DEVPORT +@@ -575,6 +575,12 @@ config DEVPORT source "drivers/s390/char/Kconfig" @@ -43,7 +43,7 @@ depends on TILE --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -52,6 +52,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ +@@ -51,6 +51,7 @@ obj-$(CONFIG_PCMCIA) += pcmcia/ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o obj-$(CONFIG_TCG_TPM) += tpm/ @@ -236,12 +236,12 @@ + return 0; +} + -+static void crash_timer_cb(unsigned long unused) ++static void crash_timer_cb(struct timer_list *unused) +{ + crash_now(); +} + -+static DEFINE_TIMER(crash_timer, crash_timer_cb, 0, 0); ++static DEFINE_TIMER(crash_timer, crash_timer_cb); + +static int __init crasher_init(void) +{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch new/patches.suse/dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch --- old/patches.suse/dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,46 +0,0 @@ -From: Mohamed Ghannam <simo.ghannam(a)gmail.com> -Date: Tue, 5 Dec 2017 20:58:35 +0000 -Subject: dccp: CVE-2017-8824: use-after-free in DCCP code -Patch-mainline: v4.15-rc3 -Git-commit: 69c64866ce072dea1d1e59a0d61e0f66c0dffb76 -References: CVE-2017-8824 bsc#1070771 - -Whenever the sock object is in DCCP_CLOSED state, -dccp_disconnect() must free dccps_hc_tx_ccid and -dccps_hc_rx_ccid and set to NULL. - -Signed-off-by: Mohamed Ghannam <simo.ghannam(a)gmail.com> -Reviewed-by: Eric Dumazet <edumazet(a)google.com> -Signed-off-by: David S. Miller <davem(a)davemloft.net> -Acked-by: Michal Kubecek <mkubecek(a)suse.cz> - ---- - net/dccp/proto.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/net/dccp/proto.c b/net/dccp/proto.c -index b68168fcc06a..9d43c1f40274 100644 ---- a/net/dccp/proto.c -+++ b/net/dccp/proto.c -@@ -259,6 +259,7 @@ int dccp_disconnect(struct sock *sk, int flags) - { - struct inet_connection_sock *icsk = inet_csk(sk); - struct inet_sock *inet = inet_sk(sk); -+ struct dccp_sock *dp = dccp_sk(sk); - int err = 0; - const int old_state = sk->sk_state; - -@@ -278,6 +279,10 @@ int dccp_disconnect(struct sock *sk, int flags) - sk->sk_err = ECONNRESET; - - dccp_clear_xmit_timers(sk); -+ ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk); -+ ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk); -+ dp->dccps_hc_rx_ccid = NULL; -+ dp->dccps_hc_tx_ccid = NULL; - - __skb_queue_purge(&sk->sk_receive_queue); - __skb_queue_purge(&sk->sk_write_queue); --- -2.15.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dm-mpath-accept-failed-paths new/patches.suse/dm-mpath-accept-failed-paths --- old/patches.suse/dm-mpath-accept-failed-paths 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/dm-mpath-accept-failed-paths 2018-01-31 07:59:46.000000000 +0100 @@ -13,9 +13,9 @@ Signed-off-by: Hannes Reinecke <hare(a)suse.de> --- - drivers/md/dm-mpath.c | 112 +++++++++++++++++++++++++++++++++++++------------- - drivers/md/dm-mpath.h | 1 - drivers/md/dm-table.c | 3 + + drivers/md/dm-mpath.c | 112 +++++++++++++++++++++++++++++++++++++------------- + drivers/md/dm-mpath.h | 1 + + drivers/md/dm-table.c | 3 ++ 3 files changed, 88 insertions(+), 28 deletions(-) --- a/drivers/md/dm-mpath.c @@ -40,7 +40,7 @@ if (unlikely(READ_ONCE(m->current_pg) != pg)) { /* Only update current_pgpath if pg changed */ spin_lock_irqsave(&m->lock, flags); -@@ -469,7 +473,7 @@ static int multipath_clone_and_map(struc +@@ -501,7 +505,7 @@ static int multipath_clone_and_map(struc struct pgpath *pgpath; struct block_device *bdev; struct dm_mpath_io *mpio = get_mpio(map_context); @@ -49,7 +49,7 @@ struct request *clone; /* Do we need to select a new pgpath? */ -@@ -493,12 +497,16 @@ static int multipath_clone_and_map(struc +@@ -525,12 +529,16 @@ static int multipath_clone_and_map(struc mpio->pgpath = pgpath; mpio->nr_bytes = nr_bytes; @@ -70,16 +70,16 @@ if (queue_dying) { atomic_inc(&m->pg_init_in_progress); activate_or_offline_path(pgpath); -@@ -552,7 +560,7 @@ static int __multipath_map_bio(struct mu +@@ -584,7 +592,7 @@ static int __multipath_map_bio(struct mu return DM_MAPIO_SUBMITTED; } - if (!pgpath) { + if (!pgpath || !pgpath->path.dev) { - if (test_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags)) + if (must_push_back_bio(m)) return DM_MAPIO_REQUEUE; dm_report_EIO(m); -@@ -734,6 +742,7 @@ static struct pgpath *parse_path(struct +@@ -757,6 +765,7 @@ static struct pgpath *parse_path(struct { int r; struct pgpath *p; @@ -87,7 +87,7 @@ struct multipath *m = ti->private; struct request_queue *q = NULL; const char *attached_handler_name; -@@ -748,17 +757,40 @@ static struct pgpath *parse_path(struct +@@ -771,17 +780,40 @@ static struct pgpath *parse_path(struct if (!p) return ERR_PTR(-ENOMEM); @@ -133,7 +133,7 @@ retain: attached_handler_name = scsi_dh_attached_handler_name(q, GFP_KERNEL); if (attached_handler_name) { -@@ -782,7 +814,7 @@ retain: +@@ -805,7 +837,7 @@ retain: } } @@ -142,7 +142,7 @@ r = scsi_dh_attach(q, m->hw_handler_name); if (r == -EBUSY) { char b[BDEVNAME_SIZE]; -@@ -810,10 +842,16 @@ retain: +@@ -833,10 +865,16 @@ retain: r = ps->type->add_path(ps, &p->path, as->argc, as->argv, &ti->error); if (r) { @@ -160,7 +160,7 @@ return p; bad: -@@ -1158,10 +1196,10 @@ static int fail_path(struct pgpath *pgpa +@@ -1181,10 +1219,10 @@ static int fail_path(struct pgpath *pgpa spin_lock_irqsave(&m->lock, flags); @@ -173,7 +173,7 @@ pgpath->pg->ps.type->fail_path(&pgpath->pg->ps, &pgpath->path); pgpath->is_active = false; -@@ -1173,7 +1211,7 @@ static int fail_path(struct pgpath *pgpa +@@ -1196,7 +1234,7 @@ static int fail_path(struct pgpath *pgpa m->current_pgpath = NULL; dm_path_uevent(DM_UEVENT_PATH_FAILED, m->ti, @@ -182,7 +182,7 @@ schedule_work(&m->trigger_event); -@@ -1198,7 +1236,13 @@ static int reinstate_path(struct pgpath +@@ -1221,7 +1259,13 @@ static int reinstate_path(struct pgpath if (pgpath->is_active) goto out; @@ -197,7 +197,7 @@ r = pgpath->pg->ps.type->reinstate_path(&pgpath->pg->ps, &pgpath->path); if (r) -@@ -1216,7 +1260,7 @@ static int reinstate_path(struct pgpath +@@ -1239,7 +1283,7 @@ static int reinstate_path(struct pgpath } dm_path_uevent(DM_UEVENT_PATH_REINSTATED, m->ti, @@ -206,7 +206,7 @@ schedule_work(&m->trigger_event); -@@ -1240,6 +1284,9 @@ static int action_dev(struct multipath * +@@ -1263,6 +1307,9 @@ static int action_dev(struct multipath * struct pgpath *pgpath; struct priority_group *pg; @@ -216,7 +216,7 @@ list_for_each_entry(pg, &m->priority_groups, list) { list_for_each_entry(pgpath, &pg->pgpaths, list) { if (pgpath->path.dev == dev) -@@ -1436,12 +1483,15 @@ out: +@@ -1459,12 +1506,15 @@ out: static void activate_or_offline_path(struct pgpath *pgpath) { @@ -237,7 +237,7 @@ } static void activate_path_work(struct work_struct *work) -@@ -1693,7 +1743,7 @@ static void multipath_status(struct dm_t +@@ -1720,7 +1770,7 @@ static void multipath_status(struct dm_t pg->ps.type->info_args); list_for_each_entry(p, &pg->pgpaths, list) { @@ -246,7 +246,7 @@ p->is_active ? "A" : "F", p->fail_count); if (pg->ps.type->status) -@@ -1719,7 +1769,7 @@ static void multipath_status(struct dm_t +@@ -1746,7 +1796,7 @@ static void multipath_status(struct dm_t pg->ps.type->table_args); list_for_each_entry(p, &pg->pgpaths, list) { @@ -255,7 +255,7 @@ if (pg->ps.type->status) sz += pg->ps.type->status(&pg->ps, &p->path, type, result + sz, -@@ -1806,7 +1856,7 @@ static int multipath_prepare_ioctl(struc +@@ -1833,7 +1883,7 @@ static int multipath_prepare_ioctl(struc if (!current_pgpath) current_pgpath = choose_pgpath(m, 0); @@ -264,7 +264,7 @@ if (!test_bit(MPATHF_QUEUE_IO, &m->flags)) { *bdev = current_pgpath->path.dev->bdev; *mode = current_pgpath->path.dev->mode; -@@ -1852,6 +1902,8 @@ static int multipath_iterate_devices(str +@@ -1879,6 +1929,8 @@ static int multipath_iterate_devices(str list_for_each_entry(pg, &m->priority_groups, list) { list_for_each_entry(p, &pg->pgpaths, list) { @@ -273,7 +273,7 @@ ret = fn(ti, p->path.dev, ti->begin, ti->len, data); if (ret) goto out; -@@ -1864,8 +1916,12 @@ out: +@@ -1891,8 +1943,12 @@ out: static int pgpath_busy(struct pgpath *pgpath) { @@ -299,7 +299,7 @@ }; --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c -@@ -504,6 +504,9 @@ void dm_put_device(struct dm_target *ti, +@@ -505,6 +505,9 @@ void dm_put_device(struct dm_target *ti, struct list_head *devices = &ti->table->devices; struct dm_dev_internal *dd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/dm-table-switch-to-readonly new/patches.suse/dm-table-switch-to-readonly --- old/patches.suse/dm-table-switch-to-readonly 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/dm-table-switch-to-readonly 2018-01-31 07:59:46.000000000 +0100 @@ -15,9 +15,21 @@ drivers/md/dm.c | 17 +++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) +--- a/drivers/md/dm-table.c ++++ b/drivers/md/dm-table.c +@@ -451,6 +451,9 @@ int dm_get_device(struct dm_target *ti, + return r; + } + ++ if (dd->dm_dev->mode != mode) ++ t->mode = dd->dm_dev->mode; ++ + refcount_set(&dd->count, 1); + list_add(&dd->list, &t->devices); + goto out; --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -397,16 +397,25 @@ int dm_deleting_md(struct mapped_device +@@ -301,16 +301,25 @@ int dm_deleting_md(struct mapped_device static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -44,7 +56,7 @@ goto out; } -@@ -416,7 +425,7 @@ static int dm_blk_open(struct block_devi +@@ -319,7 +328,7 @@ static int dm_blk_open(struct block_devi out: spin_unlock(&_minor_lock); @@ -53,7 +65,7 @@ } static void dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -752,7 +761,12 @@ int dm_get_table_device(struct mapped_de +@@ -678,7 +687,12 @@ int dm_get_table_device(struct mapped_de td->dm_dev.mode = mode; td->dm_dev.bdev = NULL; @@ -67,7 +79,7 @@ mutex_unlock(&md->table_devices_lock); kfree(td); return r; -@@ -2347,6 +2361,10 @@ static struct dm_table *__bind(struct ma +@@ -1926,6 +1940,10 @@ static struct dm_table *__bind(struct ma md->immutable_target_type = dm_table_get_immutable_target_type(t); dm_table_set_restrictions(t, q, limits); @@ -78,15 +90,3 @@ if (old_map) dm_sync_table(md); ---- a/drivers/md/dm-table.c -+++ b/drivers/md/dm-table.c -@@ -404,6 +404,9 @@ int dm_get_device(struct dm_target *ti, - return r; - } - -+ if (dd->dm_dev->mode != mode) -+ t->mode = dd->dm_dev->mode; -+ - atomic_set(&dd->count, 0); - list_add(&dd->list, &t->devices); - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/netfilter-nfnetlink_cthelper-Add-missing-permission-.patch new/patches.suse/netfilter-nfnetlink_cthelper-Add-missing-permission-.patch --- old/patches.suse/netfilter-nfnetlink_cthelper-Add-missing-permission-.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/netfilter-nfnetlink_cthelper-Add-missing-permission-.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,82 +0,0 @@ -From: Kevin Cernekee <cernekee(a)chromium.org> -Date: Sun, 3 Dec 2017 12:12:45 -0800 -Subject: netfilter: nfnetlink_cthelper: Add missing permission checks -Patch-mainline: 4.15-rc4 -Git-commit: 4b380c42f7d00a395feede754f0bc2292eebe6e5 -References: CVE-2017-17448 bsc#1071693 - -The capability check in nfnetlink_rcv() verifies that the caller -has CAP_NET_ADMIN in the namespace that "owns" the netlink socket. -However, nfnl_cthelper_list is shared by all net namespaces on the -system. An unprivileged user can create user and net namespaces -in which he holds CAP_NET_ADMIN to bypass the netlink_net_capable() -check: - - $ nfct helper list - nfct v1.4.4: netlink error: Operation not permitted - $ vpnns -- nfct helper list - { - .name = ftp, - .queuenum = 0, - .l3protonum = 2, - .l4protonum = 6, - .priv_data_len = 24, - .status = enabled, - }; - -Add capable() checks in nfnetlink_cthelper, as this is cleaner than -trying to generalize the solution. - -Signed-off-by: Kevin Cernekee <cernekee(a)chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> -Acked-by: Michal Kubecek <mkubecek(a)suse.cz> - ---- - net/netfilter/nfnetlink_cthelper.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c -index 41628b393673..d33ce6d5ebce 100644 ---- a/net/netfilter/nfnetlink_cthelper.c -+++ b/net/netfilter/nfnetlink_cthelper.c -@@ -17,6 +17,7 @@ - #include <linux/types.h> - #include <linux/list.h> - #include <linux/errno.h> -+#include <linux/capability.h> - #include <net/netlink.h> - #include <net/sock.h> - -@@ -407,6 +408,9 @@ static int nfnl_cthelper_new(struct net *net, struct sock *nfnl, - struct nfnl_cthelper *nlcth; - int ret = 0; - -+ if (!capable(CAP_NET_ADMIN)) -+ return -EPERM; -+ - if (!tb[NFCTH_NAME] || !tb[NFCTH_TUPLE]) - return -EINVAL; - -@@ -611,6 +615,9 @@ static int nfnl_cthelper_get(struct net *net, struct sock *nfnl, - struct nfnl_cthelper *nlcth; - bool tuple_set = false; - -+ if (!capable(CAP_NET_ADMIN)) -+ return -EPERM; -+ - if (nlh->nlmsg_flags & NLM_F_DUMP) { - struct netlink_dump_control c = { - .dump = nfnl_cthelper_dump_table, -@@ -678,6 +685,9 @@ static int nfnl_cthelper_del(struct net *net, struct sock *nfnl, - struct nfnl_cthelper *nlcth, *n; - int j = 0, ret; - -+ if (!capable(CAP_NET_ADMIN)) -+ return -EPERM; -+ - if (tb[NFCTH_NAME]) - helper_name = nla_data(tb[NFCTH_NAME]); - --- -2.15.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/netfilter-xt_osf-Add-missing-permission-checks.patch new/patches.suse/netfilter-xt_osf-Add-missing-permission-checks.patch --- old/patches.suse/netfilter-xt_osf-Add-missing-permission-checks.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/netfilter-xt_osf-Add-missing-permission-checks.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -From: Kevin Cernekee <cernekee(a)chromium.org> -Date: Tue, 5 Dec 2017 15:42:41 -0800 -Subject: netfilter: xt_osf: Add missing permission checks -Patch-mainline: 4.15-rc4 -Git-commit: 916a27901de01446bcf57ecca4783f6cff493309 -References: CVE-2017-17450 bsc#1071695 - -The capability check in nfnetlink_rcv() verifies that the caller -has CAP_NET_ADMIN in the namespace that "owns" the netlink socket. -However, xt_osf_fingers is shared by all net namespaces on the -system. An unprivileged user can create user and net namespaces -in which he holds CAP_NET_ADMIN to bypass the netlink_net_capable() -check: - - vpnns -- nfnl_osf -f /tmp/pf.os - - vpnns -- nfnl_osf -f /tmp/pf.os -d - -These non-root operations successfully modify the systemwide OS -fingerprint list. Add new capable() checks so that they can't. - -Signed-off-by: Kevin Cernekee <cernekee(a)chromium.org> -Signed-off-by: Pablo Neira Ayuso <pablo(a)netfilter.org> -Acked-by: Michal Kubecek <mkubecek(a)suse.cz> - ---- - net/netfilter/xt_osf.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/net/netfilter/xt_osf.c b/net/netfilter/xt_osf.c -index 36e14b1f061d..a34f314a8c23 100644 ---- a/net/netfilter/xt_osf.c -+++ b/net/netfilter/xt_osf.c -@@ -19,6 +19,7 @@ - #include <linux/module.h> - #include <linux/kernel.h> - -+#include <linux/capability.h> - #include <linux/if.h> - #include <linux/inetdevice.h> - #include <linux/ip.h> -@@ -70,6 +71,9 @@ static int xt_osf_add_callback(struct net *net, struct sock *ctnl, - struct xt_osf_finger *kf = NULL, *sf; - int err = 0; - -+ if (!capable(CAP_NET_ADMIN)) -+ return -EPERM; -+ - if (!osf_attrs[OSF_ATTR_FINGER]) - return -EINVAL; - -@@ -115,6 +119,9 @@ static int xt_osf_remove_callback(struct net *net, struct sock *ctnl, - struct xt_osf_finger *sf; - int err = -ENOENT; - -+ if (!capable(CAP_NET_ADMIN)) -+ return -EPERM; -+ - if (!osf_attrs[OSF_ATTR_FINGER]) - return -EINVAL; - --- -2.15.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/revert-futex-Prevent-overflow-by-strengthen-input-va.patch new/patches.suse/revert-futex-Prevent-overflow-by-strengthen-input-va.patch --- old/patches.suse/revert-futex-Prevent-overflow-by-strengthen-input-va.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/revert-futex-Prevent-overflow-by-strengthen-input-va.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -From: Jiri Slaby <jslaby(a)suse.cz> -Date: Thu, 25 Jan 2018 14:17:07 +0100 -Subject: Revert "futex: Prevent overflow by strengthen input validation" -Patch-mainline: submitted 25/1/2018 -References: 4.14.15-fix - -This reverts commit 17ae6ccfe5dd85605dc44534348b506f95d16a61, upstream -commit fbe0e839d1e22d88810f3ee3e2f1479be4c0aa4a. It breaks strace's -tests: -futex(0x7ff568b44ffc, 0x3, 0xfacefeed, 0xbadda7a0ca7b100d, 0x7ff568b44ffc, 0x9caffee1) = -1: Invalid argument - -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - kernel/futex.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/kernel/futex.c b/kernel/futex.c -index 52b3f47031..29ac5b64e7 100644 ---- a/kernel/futex.c -+++ b/kernel/futex.c -@@ -1878,9 +1878,6 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags, - struct futex_q *this, *next; - DEFINE_WAKE_Q(wake_q); - -- if (nr_wake < 0 || nr_requeue < 0) -- return -EINVAL; -- - /* - * When PI not supported: return -ENOSYS if requeue_pi is true, - * consequently the compiler knows requeue_pi is always false past --- -2.15.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/revert-module-Add-retpoline-tag-to-VERMAGIC.patch new/patches.suse/revert-module-Add-retpoline-tag-to-VERMAGIC.patch --- old/patches.suse/revert-module-Add-retpoline-tag-to-VERMAGIC.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/revert-module-Add-retpoline-tag-to-VERMAGIC.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -From: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> -Date: Wed, 24 Jan 2018 15:28:17 +0100 -Subject: Revert "module: Add retpoline tag to VERMAGIC" -Git-commit: 5132ede0fe8092b043dae09a7cc32b8ae7272baa -Patch-mainline: v4.15 -References: fix loading of KMPs - -This reverts commit 6cfb521ac0d5b97470883ff9b7facae264b7ab12. - -Turns out distros do not want to make retpoline as part of their "ABI", -so this patch should not have been merged. Sorry Andi, this was my -fault, I suggested it when your original patch was the "correct" way of -doing this instead. - -Reported-by: Jiri Kosina <jikos(a)kernel.org> -Fixes: 6cfb521ac0d5 ("module: Add retpoline tag to VERMAGIC") -Acked-by: Andi Kleen <ak(a)linux.intel.com> -Cc: Thomas Gleixner <tglx(a)linutronix.de> -Cc: David Woodhouse <dwmw(a)amazon.co.uk> -Cc: rusty(a)rustcorp.com.au -Cc: arjan.van.de.ven(a)intel.com -Cc: jeyu(a)kernel.org -Cc: stable <stable(a)vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> -Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - include/linux/vermagic.h | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h -index 853291714ae0..bae807eb2933 100644 ---- a/include/linux/vermagic.h -+++ b/include/linux/vermagic.h -@@ -31,17 +31,11 @@ - #else - #define MODULE_RANDSTRUCT_PLUGIN - #endif --#ifdef RETPOLINE --#define MODULE_VERMAGIC_RETPOLINE "retpoline " --#else --#define MODULE_VERMAGIC_RETPOLINE "" --#endif - - #define VERMAGIC_STRING \ - UTS_RELEASE " " \ - MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ - MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ - MODULE_ARCH_VERMAGIC \ -- MODULE_RANDSTRUCT_PLUGIN \ -- MODULE_VERMAGIC_RETPOLINE -+ MODULE_RANDSTRUCT_PLUGIN - --- -2.16.1 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/scsi-libfc-fix-ELS-request-handling.patch new/patches.suse/scsi-libfc-fix-ELS-request-handling.patch --- old/patches.suse/scsi-libfc-fix-ELS-request-handling.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/scsi-libfc-fix-ELS-request-handling.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ -From b998b7a35e03adad919b42c729e54e40aa7d1556 Mon Sep 17 00:00:00 2001 -From: Martin Wilck <mwilck(a)suse.com> -Date: Sat, 25 Nov 2017 19:21:56 +0100 -Subject: [PATCH] scsi: libfc: fix ELS request handling -Patch-mainline: 4.15-rc4 -Git-commit: fe55e79536a37348dcb0b7177ee5fda6deccb99a -References: bsc#1069801 - -The modification of fc_lport_recv_els_req() in commit fcabb09e59a7 -(merged in 4.12-rc1) caused certain requests not to be handled at all. -Fix that. - -Fixes: fcabb09e59a7 "scsi: libfc: directly call ELS request handlers" -Signed-off-by: Martin Wilck <mwilck(a)suse.com> -Reviewed-by: Johannes Thumshirn <jthumshirn(a)suse.de> ---- - drivers/scsi/libfc/fc_lport.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c -index 2fd0ec651170..787e82435241 100644 ---- a/drivers/scsi/libfc/fc_lport.c -+++ b/drivers/scsi/libfc/fc_lport.c -@@ -904,10 +904,14 @@ static void fc_lport_recv_els_req(struct fc_lport *lport, - case ELS_FLOGI: - if (!lport->point_to_multipoint) - fc_lport_recv_flogi_req(lport, fp); -+ else -+ fc_rport_recv_req(lport, fp); - break; - case ELS_LOGO: - if (fc_frame_sid(fp) == FC_FID_FLOGI) - fc_lport_recv_logo_req(lport, fp); -+ else -+ fc_rport_recv_req(lport, fp); - break; - case ELS_RSCN: - lport->tt.disc_recv_req(lport, fp); --- -2.15.0 - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/supported-flag new/patches.suse/supported-flag --- old/patches.suse/supported-flag 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/supported-flag 2018-01-31 07:59:46.000000000 +0100 @@ -29,7 +29,7 @@ --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4220,6 +4220,14 @@ +@@ -4191,6 +4191,14 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -46,7 +46,7 @@ (default -1 = authorized except for wireless USB, --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt -@@ -975,6 +975,18 @@ can be ORed together: +@@ -963,6 +963,18 @@ can be ORed together: signature. 16384 - A soft lockup has previously occurred on the system. 32768 - The kernel has been live patched. @@ -67,7 +67,7 @@ --- a/Makefile +++ b/Makefile -@@ -405,6 +405,11 @@ KBUILD_CFLAGS_MODULE := -DMODULE +@@ -409,6 +409,11 @@ KBUILD_AFLAGS_MODULE := -DMODULE KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds GCC_PLUGINS_CFLAGS := @@ -76,12 +76,12 @@ +CFLAGS += -DUNSUPPORTED_MODULES=2 +endif + - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) - KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) + export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC + export CPP AR NM STRIP OBJCOPY OBJDUMP HOSTLDFLAGS HOST_LOADLIBES + export MAKE AWK GENKSYMS INSTALLKERNEL PERL PYTHON UTS_MACHINE --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -487,6 +487,9 @@ extern int panic_on_unrecovered_nmi; +@@ -458,6 +458,9 @@ extern int panic_on_unrecovered_nmi; extern int panic_on_io_nmi; extern int panic_on_warn; extern int sysctl_panic_on_rcu_stall; @@ -91,22 +91,6 @@ extern int sysctl_panic_on_stackoverflow; extern bool crash_kexec_post_notifiers; -@@ -551,6 +554,15 @@ extern enum system_states { - #define TAINT_LIVEPATCH 15 - #define TAINT_FLAGS_COUNT 16 - -+#ifdef CONFIG_SUSE_KERNEL_SUPPORTED -+/* -+ * Take the upper bits to hopefully allow them -+ * to stay the same for more than one release. -+ */ -+#define TAINT_NO_SUPPORT 30 -+#define TAINT_EXTERNAL_SUPPORT 31 -+#endif -+ - struct taint_flag { - char c_true; /* character printed when tainted */ - char c_false; /* character printed when not tainted */ --- a/include/linux/module.h +++ b/include/linux/module.h @@ -496,6 +496,9 @@ bool is_module_address(unsigned long add @@ -234,14 +218,14 @@ +static void setup_modinfo_supported(struct module *mod, const char *s) +{ + if (!s) { -+ mod->taints |= (1 << TAINT_NO_SUPPORT); ++ mod->taints |= (1 << TAINT_AUX); + return; + } + + if (strcmp(s, "external") == 0) -+ mod->taints |= (1 << TAINT_EXTERNAL_SUPPORT); ++ return; + else if (strcmp(s, "yes")) -+ mod->taints |= (1 << TAINT_NO_SUPPORT); ++ mod->taints |= (1 << TAINT_AUX); +} + +static ssize_t show_modinfo_supported(struct module_attribute *mattr, @@ -270,14 +254,12 @@ #ifdef CONFIG_MODULE_UNLOAD &modinfo_refcnt, #endif -@@ -1808,9 +1860,36 @@ static int mod_sysfs_setup(struct module +@@ -1808,9 +1860,34 @@ static int mod_sysfs_setup(struct module add_sect_attrs(mod, info); add_notes_attrs(mod, info); +#ifdef CONFIG_SUSE_KERNEL_SUPPORTED -+ if (mod->taints & (1 << TAINT_EXTERNAL_SUPPORT)) -+ add_taint(TAINT_EXTERNAL_SUPPORT, LOCKDEP_STILL_OK); -+ else if (mod->taints & (1 << TAINT_NO_SUPPORT)) { ++ if (mod->taints & (1 << TAINT_AUX)) { + if (suse_unsupported == 0) { + printk(KERN_WARNING "%s: module not supported by " + "SUSE, refusing to load. To override, echo " @@ -285,7 +267,7 @@ + err = -ENOEXEC; + goto out_remove_attrs; + } -+ add_taint(TAINT_NO_SUPPORT, LOCKDEP_STILL_OK); ++ add_taint(TAINT_AUX, LOCKDEP_STILL_OK); + if (suse_unsupported == 1) { + printk(KERN_WARNING "%s: module is not supported by " + "SUSE. Our support organization may not be " @@ -317,31 +299,9 @@ } #ifdef CONFIG_MODVERSIONS ---- a/kernel/panic.c -+++ b/kernel/panic.c -@@ -322,6 +322,10 @@ const struct taint_flag taint_flags[TAIN - { 'E', ' ', true }, /* TAINT_UNSIGNED_MODULE */ - { 'L', ' ', false }, /* TAINT_SOFTLOCKUP */ - { 'K', ' ', true }, /* TAINT_LIVEPATCH */ -+#ifdef CONFIG_SUSE_KERNEL_SUPPORTED -+ { 'N', ' ', true }, /* TAINT_NO_SUPPORT */ -+ { 'X', ' ', true }, /* TAINT_EXTERNAL_SUPPORT */ -+#endif - }; - - /** -@@ -343,6 +347,8 @@ const struct taint_flag taint_flags[TAIN - * 'E' - Unsigned module has been loaded. - * 'L' - A soft lockup has previously occurred. - * 'K' - Kernel has been live patched. -+ * 'N' - Unsuported modules loaded. -+ * 'X' - Modules with external support loaded. - * - * The string is overwritten by the next call to print_tainted(). - */ --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -791,6 +791,15 @@ static struct ctl_table kern_table[] = { +@@ -790,6 +790,15 @@ static struct ctl_table kern_table[] = { .extra1 = &pid_max_min, .extra2 = &pid_max_max, }, @@ -359,7 +319,7 @@ .data = &panic_on_oops, --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost -@@ -79,7 +79,11 @@ modpost = scripts/mod/modpost +@@ -78,7 +78,11 @@ modpost = scripts/mod/modpost $(if $(KBUILD_EXTMOD),-o $(modulesymfile)) \ $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S) \ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E) \ @@ -374,7 +334,7 @@ --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1941,6 +1941,50 @@ static char *remove_dot(char *s) +@@ -1940,6 +1940,50 @@ static char *remove_dot(char *s) return s; } @@ -425,7 +385,7 @@ static void read_symbols(char *modname) { const char *symname; -@@ -2173,6 +2217,15 @@ static void add_staging_flag(struct buff +@@ -2160,6 +2204,15 @@ static void add_staging_flag(struct buff buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n"); } @@ -441,7 +401,7 @@ /** * Record CRCs for unresolved symbols **/ -@@ -2320,6 +2373,15 @@ static void write_if_changed(struct buff +@@ -2307,6 +2360,15 @@ static void write_if_changed(struct buff fclose(file); } @@ -457,7 +417,7 @@ /* parse Module.symvers file. line format: * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something] **/ -@@ -2416,12 +2478,15 @@ int main(int argc, char **argv) +@@ -2403,12 +2465,15 @@ int main(int argc, char **argv) struct buffer buf = { }; char *kernel_read = NULL, *module_read = NULL; char *dump_write = NULL, *files_source = NULL; @@ -474,7 +434,7 @@ switch (opt) { case 'i': kernel_read = optarg; -@@ -2465,11 +2530,20 @@ int main(int argc, char **argv) +@@ -2452,11 +2517,20 @@ int main(int argc, char **argv) case 'E': sec_mismatch_fatal = 1; break; @@ -495,7 +455,7 @@ if (kernel_read) read_dump(kernel_read, 1); if (module_read) -@@ -2507,6 +2581,9 @@ int main(int argc, char **argv) +@@ -2493,6 +2567,9 @@ int main(int argc, char **argv) add_header(&buf, mod); add_intree_flag(&buf, !external_module); add_staging_flag(&buf, mod->name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/suse-hv-guest-os-id.patch new/patches.suse/suse-hv-guest-os-id.patch --- old/patches.suse/suse-hv-guest-os-id.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/suse-hv-guest-os-id.patch 2018-01-31 07:59:46.000000000 +0100 @@ -15,7 +15,7 @@ --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c -@@ -112,6 +112,8 @@ void hyperv_init(void) +@@ -113,6 +113,8 @@ void hyperv_init(void) { u64 guest_id; union hv_x64_msr_hypercall_contents hypercall_msr; @@ -24,7 +24,7 @@ if (x86_hyper_type != X86_HYPER_MS_HYPERV) return; -@@ -131,7 +133,7 @@ void hyperv_init(void) +@@ -122,7 +124,7 @@ void hyperv_init(void) * 1. Register the guest ID * 2. Enable the hypercall and register the hypercall page */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/uapi-add-a-compatibility-layer-between-linux-uio-h-and-glibc new/patches.suse/uapi-add-a-compatibility-layer-between-linux-uio-h-and-glibc --- old/patches.suse/uapi-add-a-compatibility-layer-between-linux-uio-h-and-glibc 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/uapi-add-a-compatibility-layer-between-linux-uio-h-and-glibc 2018-01-31 07:59:46.000000000 +0100 @@ -36,15 +36,15 @@ #if defined(_SYS_XATTR_H) #define __UAPI_DEF_XATTR 0 @@ -205,6 +212,9 @@ - #define __UAPI_DEF_IPX_CONFIG_DATA 1 #define __UAPI_DEF_IPX_ROUTE_DEF 1 + #endif +/* Definitions for uio.h */ +#define __UAPI_DEF_IOVEC 1 + /* Definitions for xattr.h */ + #ifndef __UAPI_DEF_XATTR #define __UAPI_DEF_XATTR 1 - --- a/include/uapi/linux/uio.h +++ b/include/uapi/linux/uio.h @@ -9,15 +9,18 @@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.suse/x86-stacktrace-Avoid-recording-save_stack_trace-wrap.patch new/patches.suse/x86-stacktrace-Avoid-recording-save_stack_trace-wrap.patch --- old/patches.suse/x86-stacktrace-Avoid-recording-save_stack_trace-wrap.patch 2018-01-29 09:15:43.000000000 +0100 +++ new/patches.suse/x86-stacktrace-Avoid-recording-save_stack_trace-wrap.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,75 +0,0 @@ -From: Vlastimil Babka <vbabka(a)suse.cz> -Date: Fri, 29 Sep 2017 11:23:35 +0200 -Subject: x86/stacktrace: Avoid recording save_stack_trace() wrappers -Git-commit: 77072f09eab19326dd2424c8dad0a443341a228f -Patch-mainline: 4.15-rc1 -References: bnc#1058115 - -The save_stack_trace() and save_stack_trace_tsk() wrappers of -__save_stack_trace() add themselves to the call stack, and thus appear in the -recorded stacktraces. This is redundant and wasteful when we have limited space -to record the useful part of the backtrace with e.g. page_owner functionality. - -Fix this by making sure __save_stack_trace() is noinline (which matches the -current gcc decision) and bumping the skip in the wrappers -(save_stack_trace_tsk() only when called for the current task). This is similar -to what was done for arm in 3683f44c42e9 ("ARM: stacktrace: avoid listing -stacktrace functions in stacktrace") and is pending for arm64. - -Also make sure that __save_stack_trace_reliable() doesn't get this problem in -the future by marking it __always_inline (which matches current gcc decision), -per Josh Poimboeuf. - -Signed-off-by: Vlastimil Babka <vbabka(a)suse.cz> -Acked-by: Josh Poimboeuf <jpoimboe(a)redhat.com> -Cc: Linus Torvalds <torvalds(a)linux-foundation.org> -Cc: Miroslav Benes <mbenes(a)suse.cz> -Cc: Peter Zijlstra <peterz(a)infradead.org> -Cc: Thomas Gleixner <tglx(a)linutronix.de> -Link: http://lkml.kernel.org/r/20170929092335.2744-1-vbabka@suse.cz -Signed-off-by: Ingo Molnar <mingo(a)kernel.org> -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - arch/x86/kernel/stacktrace.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - ---- a/arch/x86/kernel/stacktrace.c -+++ b/arch/x86/kernel/stacktrace.c -@@ -30,7 +30,7 @@ static int save_stack_address(struct sta - return 0; - } - --static void __save_stack_trace(struct stack_trace *trace, -+static void noinline __save_stack_trace(struct stack_trace *trace, - struct task_struct *task, struct pt_regs *regs, - bool nosched) - { -@@ -56,6 +56,7 @@ static void __save_stack_trace(struct st - */ - void save_stack_trace(struct stack_trace *trace) - { -+ trace->skip++; - __save_stack_trace(trace, current, NULL, false); - } - EXPORT_SYMBOL_GPL(save_stack_trace); -@@ -70,6 +71,8 @@ void save_stack_trace_tsk(struct task_st - if (!try_get_task_stack(tsk)) - return; - -+ if (tsk == current) -+ trace->skip++; - __save_stack_trace(trace, tsk, NULL, true); - - put_task_stack(tsk); -@@ -88,8 +91,9 @@ EXPORT_SYMBOL_GPL(save_stack_trace_tsk); - } \ - }) - --static int __save_stack_trace_reliable(struct stack_trace *trace, -- struct task_struct *task) -+static int __always_inline -+__save_stack_trace_reliable(struct stack_trace *trace, -+ struct task_struct *task) - { - struct unwind_state state; - struct pt_regs *regs; ++++++ series.conf ++++++ ++++ 1556 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kernel-source/series.conf ++++ and /work/SRC/openSUSE:Factory/.kernel-source.new/series.conf ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.6xbGKJ/_old 2018-02-01 21:27:56.205145584 +0100 +++ /var/tmp/diff_new_pack.6xbGKJ/_new 2018-02-01 21:27:56.209145398 +0100 @@ -1,3 +1,3 @@ -2018-01-29 09:15:43 +0100 -GIT Revision: 9a6fca576ed483a18c4ef64b85e247fcb33e4c1b +2018-01-31 08:03:28 +0100 +GIT Revision: ac017470b9f9e7c85b28bb48f40b3116c8fe68c7 GIT Branch: stable

1 0

commit spice for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package spice for openSUSE:Factory checked in at 2018-02-01 21:26:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spice (Old) and /work/SRC/openSUSE:Factory/.spice.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "spice" Thu Feb 1 21:26:55 2018 rev:27 rq:571469 version:0.14.0 Changes: -------- --- /work/SRC/openSUSE:Factory/spice/spice.changes 2017-11-03 16:31:44.533159980 +0100 +++ /work/SRC/openSUSE:Factory/.spice.new/spice.changes 2018-02-01 21:26:56.907917043 +0100 @@ -1,0 +2,26 @@ +Tue Jan 30 22:20:12 UTC 2018 - jengelh(a)inai.de + +- Correct RPM group for shared library. + +------------------------------------------------------------------- +Tue Jan 30 14:44:37 UTC 2018 - tchvatal(a)suse.com + +- Split the sle condition again for exact features to allow their + override + +------------------------------------------------------------------- +Thu Jan 18 12:12:33 UTC 2018 - tchvatal(a)suse.com + +- Enable smartcards on sle15 as the supportlib is available + * Condition it using name everywhere instead of suse versions + and join together with lz4 +- Format with spec-cleaner +- Convert dependencies to pkgconfig style +- Install documentation and license file +- Add configure arguments to most of the options to not rely on + autotools automatic behavior + * Also enable gstreamer and lz4 options +- Drop the not needed python dependencies, they are needed only + when building from git snapshot + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spice.spec ++++++ --- /var/tmp/diff_new_pack.4QjjfC/_old 2018-02-01 21:26:57.879871615 +0100 +++ /var/tmp/diff_new_pack.4QjjfC/_new 2018-02-01 21:26:57.883871427 +0100 @@ -1,7 +1,7 @@ # # spec file for package spice # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,7 +16,18 @@ # -# Common info +%define libname libspice-server1 +%if 0%{?suse_version} >=1330 || 0%{?is_opensuse} +%bcond_without libcard +%if 0%{?suse_version} < 1330 +%bcond_with lz4 +%else +%bcond_without lz4 +%endif +%else +%bcond_with libcard +%bcond_with lz4 +%endif Name: spice Version: 0.14.0 Release: 0 @@ -26,46 +37,47 @@ Url: http://www.spice-space.org/ Source: http://spice-space.org/download/releases/%{name}-%{version}.tar.bz2 Source99: %{name}.rpmlintrc - -# Build-time parameters -BuildRequires: alsa-devel -BuildRequires: celt051-devel -BuildRequires: cyrus-sasl-devel BuildRequires: gcc-c++ -%if 0%{?is_opensuse} -BuildRequires: libcacard-devel -%endif BuildRequires: libjpeg-devel -BuildRequires: libopenssl-devel -BuildRequires: libpixman-1-0-devel >= 0.17.7 BuildRequires: pkgconfig -BuildRequires: python-pyparsing -BuildRequires: python-six -BuildRequires: spice-protocol-devel >= 0.12.11 -BuildRequires: zlib-devel +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(celt051) BuildRequires: pkgconfig(glib-2.0) >= 2.28 +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: pkgconfig(gstreamer-app-1.0) +BuildRequires: pkgconfig(gstreamer-video-1.0) +BuildRequires: pkgconfig(libsasl2) +BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(opus) +BuildRequires: pkgconfig(orc-0.4) +BuildRequires: pkgconfig(pixman-1) >= 0.17.7 +BuildRequires: pkgconfig(spice-protocol) >= 0.12.11 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xrender) -# Install-time parameters +BuildRequires: pkgconfig(zlib) Requires: celt051 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if %{with libcard} +BuildRequires: pkgconfig(libcacard) +%endif +%if %{with lz4} +BuildRequires: pkgconfig(liblz4) +%endif %description The SPICE package provides the SPICE server library and client. These components are used to provide access to a remote machine's display and devices. -%package -n libspice-server1 +%package -n %{libname} Summary: Library for SPICE-server -Group: Productivity/Networking/Other +Group: System/Libraries Obsoletes: spice-client < %{version}-%{release} -%description -n libspice-server1 +%description -n %{libname} Library for SPICE-server The SPICE server is used to expose a remote machine's display and devices. @@ -73,7 +85,7 @@ %package -n libspice-server-devel Summary: Development files for building SPICE-server Group: Development/Languages/C and C++ -Requires: libspice-server1 = %{version} +Requires: %{libname} = %{version} %description -n libspice-server-devel Development files for building SPICE-server. @@ -85,28 +97,32 @@ %build %configure \ + --disable-silent-rules \ --disable-static \ -%if 0%{?is_opensuse} - --enable-smartcard -%else - --disable-smartcard + --disable-werror \ +%if %{with libcard} + --enable-smartcard \ +%endif +%if %{with lz4} + --enable-lz4 \ %endif - LDFLAGS="-Wl,--as-needed -Wl,--strip-all" + --enable-celt051 \ + --enable-gstreamer make %{?_smp_mflags} %install -make %{?_smp_mflags} DESTDIR=%{buildroot} install +%make_install find %{buildroot} -type f -name "*.la" -delete -print -%post -n libspice-server1 -p /sbin/ldconfig -%postun -n libspice-server1 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%files -n libspice-server1 -%defattr(-,root,root) +%files -n %{libname} +%doc NEWS README ChangeLog +%license COPYING %{_libdir}/libspice-server.so.* %files -n libspice-server-devel -%defattr(-,root,root) %{_libdir}/pkgconfig/spice-server.pc %{_includedir}/spice-server/ %{_libdir}/libspice-server.so

1 0

commit kactivitymanagerd for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package kactivitymanagerd for openSUSE:Factory checked in at 2018-02-01 21:26:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivitymanagerd (Old) and /work/SRC/openSUSE:Factory/.kactivitymanagerd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kactivitymanagerd" Thu Feb 1 21:26:36 2018 rev:36 rq:570883 version:5.11.95 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivitymanagerd/kactivitymanagerd.changes 2018-01-22 16:07:29.056906282 +0100 +++ /work/SRC/openSUSE:Factory/.kactivitymanagerd.new/kactivitymanagerd.changes 2018-02-01 21:26:37.644817390 +0100 @@ -1,0 +2,6 @@ +Tue Jan 30 08:33:52 UTC 2018 - wbauer(a)tmo.at + +- Require libQt5Sql5-sqlite, apparently it crashes without it, and + even if not it would probably not work properly (boo#1078173) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivitymanagerd.spec ++++++ --- /var/tmp/diff_new_pack.3Shazd/_old 2018-02-01 21:26:38.296786917 +0100 +++ /var/tmp/diff_new_pack.3Shazd/_new 2018-02-01 21:26:38.300786730 +0100 @@ -57,7 +57,7 @@ Recommends: %{name}-imports = %{version} Recommends: %{name}-lang # for kactivitymanagerd_plugin_sqlite.so -Recommends: libQt5Sql5-sqlite +Requires: libQt5Sql5-sqlite Provides: kactivities4 = %{version} Provides: kactivities5 = 5.20.0 Obsoletes: kactivities4 < %{version}

1 0

commit plasma5-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package plasma5-openSUSE for openSUSE:Factory checked in at 2018-02-01 21:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-openSUSE (Old) and /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma5-openSUSE" Thu Feb 1 21:26:30 2018 rev:64 rq:570866 version:15.0~git20180116T134836~c3ce1b2 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-openSUSE/plasma5-openSUSE.changes 2018-01-22 16:07:01.538193862 +0100 +++ /work/SRC/openSUSE:Factory/.plasma5-openSUSE.new/plasma5-openSUSE.changes 2018-02-01 21:26:32.301067156 +0100 @@ -1,0 +2,8 @@ +Sun Jan 28 13:34:08 UTC 2018 - wbauer(a)tmo.at + +- Provide the KDE4 branding and plasma5-desktop-branding-openSUSE + in version 43 and obsolete (or conflict with) < 43 to prevent + upgrade problems from Leap 42 to 15, which has a lower version + (boo#1077854) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Er4hB3/_old 2018-02-01 21:26:32.913038553 +0100 +++ /var/tmp/diff_new_pack.Er4hB3/_new 2018-02-01 21:26:32.921038179 +0100 @@ -48,6 +48,7 @@ BuildRequires: oxygen5-icon-theme BuildRequires: plasma5-desktop >= %{plasma_version} BuildRequires: plasma5-desktop-branding-upstream >= %{plasma_version} +#!BuildIgnore: kwin5 BuildRequires: plasma5-workspace >= %{plasma_version} BuildRequires: plasma5-workspace-branding-upstream >= %{plasma_version} BuildRequires: rsync @@ -66,14 +67,14 @@ Supplements: packageand(plasma5-workspace:branding-openSUSE) Provides: plasma5-workspace-branding = %{plasma_version} %if 0%{?suse_version} >= 1315 && 0%{?suse_version} != 1320 -Provides: kdebase4-openSUSE = %{version} -Provides: kdebase4-openSUSE-lang = %{version} -Provides: kdebase4-runtime-branding-openSUSE = %{version} -Provides: kdebase4-workspace-branding-openSUSE = %{version} -Obsoletes: kdebase4-openSUSE < %{version} -Obsoletes: kdebase4-openSUSE-lang < %{version} -Obsoletes: kdebase4-runtime-branding-openSUSE < %{version} -Obsoletes: kdebase4-workspace-branding-openSUSE < %{version} +Provides: kdebase4-openSUSE = 43 +Provides: kdebase4-openSUSE-lang = 43 +Provides: kdebase4-runtime-branding-openSUSE = 43 +Provides: kdebase4-workspace-branding-openSUSE = 43 +Obsoletes: kdebase4-openSUSE < 43 +Obsoletes: kdebase4-openSUSE-lang < 43 +Obsoletes: kdebase4-runtime-branding-openSUSE < 43 +Obsoletes: kdebase4-workspace-branding-openSUSE < 43 %else Conflicts: kdebase4-openSUSE Conflicts: kdebase4-workspace-branding-openSUSE @@ -97,10 +98,10 @@ Group: System/GUI/KDE Requires: wallpaper-branding-openSUSE Requires(pre): coreutils -Conflicts: kdebase4-openSUSE < %{version} -Conflicts: kdebase4-workspace-branding-openSUSE < %{version} -Provides: plasma5-desktop-branding-openSUSE = %{version} -Obsoletes: plasma5-desktop-branding-openSUSE < %{version} +Conflicts: kdebase4-openSUSE < 43 +Conflicts: kdebase4-workspace-branding-openSUSE < 43 +Provides: plasma5-desktop-branding-openSUSE = 43 +Obsoletes: plasma5-desktop-branding-openSUSE < 43 %description -n plasma5-theme-openSUSE This package contains the Plasma 5 Look-and-feel package for openSUSE.

1 0

commit snapper for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package snapper for openSUSE:Factory checked in at 2018-02-01 21:26:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/snapper (Old) and /work/SRC/openSUSE:Factory/.snapper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "snapper" Thu Feb 1 21:26:25 2018 rev:98 rq:570571 version:0.5.4 Changes: -------- --- /work/SRC/openSUSE:Factory/snapper/snapper.changes 2018-01-20 11:25:17.744347310 +0100 +++ /work/SRC/openSUSE:Factory/.snapper.new/snapper.changes 2018-02-01 21:26:27.429294863 +0100 @@ -1,0 +2,13 @@ +Mon Jan 29 11:32:56 CET 2018 - aschnell(a)suse.com + +- create subvolume instead of snapshot for initial system + (bsc#1077240) +- version 0.5.4 + +------------------------------------------------------------------- +Fri Jan 26 14:36:20 CET 2018 - aschnell(a)suse.com + +- improved error handling for systemd services + (gh#openSUSE/snapper#382) + +------------------------------------------------------------------- @@ -11 +24 @@ -- 0.5.3 +- version 0.5.3 Old: ---- snapper-0.5.3.tar.bz2 New: ---- snapper-0.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ snapper.spec ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.105263268 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.105263268 +0100 @@ -22,7 +22,7 @@ %endif Name: snapper -Version: 0.5.3 +Version: 0.5.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: snapper-%{version}.tar.bz2 ++++++ debian.tar.gz ++++++ ++++++ snapper-0.5.3.tar.bz2 -> snapper-0.5.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/Makefile.in new/snapper-0.5.4/Makefile.in --- old/snapper-0.5.3/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -327,6 +327,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/VERSION new/snapper-0.5.4/VERSION --- old/snapper-0.5.3/VERSION 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/VERSION 2018-01-29 01:00:00.000000000 +0100 @@ -1 +1 @@ -0.5.3 +0.5.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/client/Makefile.in new/snapper-0.5.4/client/Makefile.in --- old/snapper-0.5.3/client/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/client/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -353,6 +353,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/client/installation-helper.cc new/snapper-0.5.4/client/installation-helper.cc --- old/snapper-0.5.3/client/installation-helper.cc 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/client/installation-helper.cc 2018-01-29 01:00:00.000000000 +0100 @@ -1,5 +1,6 @@ /* * Copyright (c) 2015 Novell, Inc. + * Copyright (c) 2018 SUSE LLC * * All Rights Reserved. * @@ -90,18 +91,30 @@ btrfs.createConfig(); - cout << "creating snapshot" << endl; + cout << "creating subvolume" << endl; Snapper snapper("root", tmp_mount.getFullname()); SCD scd; scd.read_only = false; + scd.empty = true; scd.description = description; scd.cleanup = cleanup; scd.userdata = userdata; Snapshots::iterator snapshot = snapper.createSingleSnapshot(scd); + cout << "again copying config-file" << endl; + + string ris = tmp_mount.getFullname() + snapshot->snapshotDir(); + + mkdir((ris + "/etc").c_str(), 0777); + mkdir((ris + "/etc/snapper").c_str(), 0777); + mkdir((ris + "/etc/snapper/configs").c_str(), 0777); + + system(("/bin/cp " + tmp_mount.getFullname() + "/etc/snapper/configs/root " + ris + + "/etc/snapper/configs").c_str()); + cout << "setting default subvolume" << endl; snapper.getFilesystem()->setDefault(snapshot->getNum()); @@ -132,6 +145,8 @@ subvol_option += "/"; subvol_option += ".snapshots"; + mkdir((root_prefix + "/.snapshots").c_str(), 0777); + SDir s_dir(root_prefix + "/.snapshots"); if (!s_dir.mount(device, "btrfs", 0, "subvol=" + subvol_option)) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/client/systemd-helper.cc new/snapper-0.5.4/client/systemd-helper.cc --- old/snapper-0.5.3/client/systemd-helper.cc 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/client/systemd-helper.cc 2018-01-29 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2014-2015] Novell, Inc. - * Copyright (c) 2016 SUSE LLC + * Copyright (c) [2016,2018] SUSE LLC * * All Rights Reserved. * @@ -39,9 +39,36 @@ using namespace std; -void +// cout and cerr are visible with 'journalctl' and 'systemctl status +// snapper-<name>.service'. + + +bool +call_with_error_check(std::function<void()> func) +{ + try + { + func(); + return true; + } + catch (const DBus::ErrorException& e) + { + cerr << error_description(e) << endl; + return false; + } + catch (const DBus::FatalException& e) + { + cerr << "failure (" << e.what() << ")." << endl; + return false; + } +} + + +bool timeline(ProxySnappers* snappers, const map<string, string>& userdata) { + bool ok = true; + map<string, ProxyConfig> configs = snappers->getConfigs(); for (const map<string, ProxyConfig>::value_type value : configs) { @@ -57,15 +84,25 @@ scd.cleanup = "timeline"; scd.userdata = userdata; - snapper->createSingleSnapshot(scd); + cout << "running timeline for '" << value.first << "'." << endl; + + if (!call_with_error_check([snapper, scd](){ snapper->createSingleSnapshot(scd); })) + { + cerr << "timeline for '" << value.first << "' failed." << endl; + ok = false; + } } } + + return ok; } -void +bool cleanup(ProxySnappers* snappers) { + bool ok = true; + map<string, ProxyConfig> configs = snappers->getConfigs(); for (const map<string, ProxyConfig>::value_type value : configs) { @@ -76,21 +113,41 @@ map<string, string>::const_iterator pos1 = raw.find("NUMBER_CLEANUP"); if (pos1 != raw.end() && pos1->second == "yes") { - do_cleanup_number(snapper, false); + cout << "running number cleanup for '" << value.first << "'." << endl; + + if (!call_with_error_check([snapper](){ do_cleanup_number(snapper, false); })) + { + cerr << "number cleanup for '" << value.first << "' failed." << endl; + ok = false; + } } map<string, string>::const_iterator pos2 = raw.find("TIMELINE_CLEANUP"); if (pos2 != raw.end() && pos2->second == "yes") { - do_cleanup_timeline(snapper, false); + cout << "running timeline cleanup for '" << value.first << "'." << endl; + + if (!call_with_error_check([snapper](){ do_cleanup_timeline(snapper, false); })) + { + cerr << "timeline cleanup for '" << value.first << "' failed." << endl; + ok = false; + } } map<string, string>::const_iterator pos3 = raw.find("EMPTY_PRE_POST_CLEANUP"); if (pos3 != raw.end() && pos3->second == "yes") { - do_cleanup_empty_pre_post(snapper, false); + cout << "running empty-pre-post cleanup for '" << value.first << "'." << endl; + + if (!call_with_error_check([snapper](){ do_cleanup_empty_pre_post(snapper, false); })) + { + cerr << "empty-pre-post cleanup for " << value.first << " failed." << endl; + ok = false; + } } } + + return ok; } @@ -128,24 +185,24 @@ if ((opt = opts.find("userdata")) != opts.end()) userdata = read_userdata(opt->second); - try - { + bool ok = true; + + if (!call_with_error_check([do_timeline, do_cleanup, userdata, &ok]() { + ProxySnappers snappers(ProxySnappers::createDbus()); if (do_timeline) - timeline(&snappers, userdata); + if (!timeline(&snappers, userdata)) + ok = false; if (do_cleanup) - cleanup(&snappers); - } - catch (const DBus::ErrorException& e) - { - cerr << error_description(e) << endl; - exit(EXIT_FAILURE); - } - catch (const DBus::FatalException& e) + if (!cleanup(&snappers)) + ok = false; + + })) { - cerr << _("Failure") << " (" << e.what() << ")." << endl; - exit(EXIT_FAILURE); + ok = false; } + + exit(ok ? EXIT_SUCCESS : EXIT_FAILURE); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/client/utils/Makefile.in new/snapper-0.5.4/client/utils/Makefile.in --- old/snapper-0.5.3/client/utils/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/client/utils/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -277,6 +277,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/configure new/snapper-0.5.4/configure --- old/snapper-0.5.3/configure 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/configure 2018-01-29 01:00:00.000000000 +0100 @@ -634,6 +634,7 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +SYSCONFIG LIBVERSION_INFO LIBVERSION_PATCHLEVEL LIBVERSION_MINOR @@ -16483,6 +16484,8 @@ CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat=2 -Wmissing-prototypes -Wno-unused-parameter" CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wno-unused-parameter" +SYSCONFIG=/etc/sysconfig + # Check whether --with-conf was given. if test "${with_conf+set}" = set; then : @@ -16493,11 +16496,12 @@ if test "x$with_conf" != xno; then : - CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${with_conf}\"'" -else - CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"/etc/sysconfig\"'" + SYSCONFIG="${with_conf}" fi +CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${SYSCONFIG}\"'" + + # Check whether --enable-btrfs was given. if test "${enable_btrfs+set}" = set; then : enableval=$enable_btrfs; with_btrfs=$enableval @@ -17034,6 +17038,7 @@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/configure.ac new/snapper-0.5.4/configure.ac --- old/snapper-0.5.3/configure.ac 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/configure.ac 2018-01-29 01:00:00.000000000 +0100 @@ -58,11 +58,15 @@ CFLAGS="${CFLAGS} -std=c99 -Wall -Wextra -Wformat=2 -Wmissing-prototypes -Wno-unused-parameter" CXXFLAGS="${CXXFLAGS} -std=c++11 -Wall -Wextra -Wformat=2 -Wnon-virtual-dtor -Wno-unused-parameter" +SYSCONFIG=/etc/sysconfig + AC_ARG_WITH([conf], AC_HELP_STRING([--with-conf], [Use a custom sysconfig directory (default is /etc/sysconfig)]), [with_conf=$withval], [with_conf=no]) -AS_IF([test "x$with_conf" != xno], [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${with_conf}\"'"], - [CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"/etc/sysconfig\"'"]) +AS_IF([test "x$with_conf" != xno], [SYSCONFIG="${with_conf}"]) + +CPPFLAGS="${CPPFLAGS} -DCONFDIR='\"${SYSCONFIG}\"'" + AC_ARG_ENABLE([btrfs], AC_HELP_STRING([--disable-btrfs],[Disable Btrfs internal snapshots support]), [with_btrfs=$enableval],[with_btrfs=yes]) @@ -151,6 +155,7 @@ AC_SUBST(LIBVERSION_MINOR) AC_SUBST(LIBVERSION_PATCHLEVEL) AC_SUBST(LIBVERSION_INFO) +AC_SUBST(SYSCONFIG) AC_SUBST(docdir) AC_OUTPUT( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/data/Makefile.in new/snapper-0.5.4/data/Makefile.in --- old/snapper-0.5.3/data/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/data/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -209,6 +209,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/dbus/Makefile.in new/snapper-0.5.4/dbus/Makefile.in --- old/snapper-0.5.3/dbus/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/dbus/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -278,6 +278,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/doc/Makefile.in new/snapper-0.5.4/doc/Makefile.in --- old/snapper-0.5.3/doc/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/doc/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -250,6 +250,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/doc/snapper.xml.in new/snapper-0.5.4/doc/snapper.xml.in --- old/snapper-0.5.3/doc/snapper.xml.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/doc/snapper.xml.in 2018-01-29 01:00:00.000000000 +0100 @@ -686,7 +686,7 @@ <title>FILES</title> <variablelist> <varlistentry> - <term><filename>/etc/sysconfig/snapper</filename></term> + <term><filename>@SYSCONFIG@/snapper</filename></term> <listitem> <para>Global configuration file.</para> </listitem> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/examples/Makefile.in new/snapper-0.5.4/examples/Makefile.in --- old/snapper-0.5.3/examples/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/examples/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -269,6 +269,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/examples/c/Makefile.in new/snapper-0.5.4/examples/c/Makefile.in --- old/snapper-0.5.3/examples/c/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/examples/c/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -262,6 +262,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/examples/c++-lib/Makefile.in new/snapper-0.5.4/examples/c++-lib/Makefile.in --- old/snapper-0.5.3/examples/c++-lib/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/examples/c++-lib/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -284,6 +284,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/pam/Makefile.in new/snapper-0.5.4/pam/Makefile.in --- old/snapper-0.5.3/pam/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/pam/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -292,6 +292,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/po/Makefile.in new/snapper-0.5.4/po/Makefile.in --- old/snapper-0.5.3/po/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/po/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -209,6 +209,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/po/hu.po new/snapper-0.5.4/po/hu.po --- old/snapper-0.5.3/po/hu.po 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/po/hu.po 2018-01-29 01:00:00.000000000 +0100 @@ -5,15 +5,16 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 16:24+0200\n" -"PO-Revision-Date: 2013-01-11 20:24+0100\n" -"Last-Translator: Kalman Kemenczy <kkemenczy(a)opensuse.org>\n" -"Language-Team: Hungarian <kde-l10n-hu(a)kde.org>\n" +"PO-Revision-Date: 2018-01-26 20:03+0000\n" +"Last-Translator: Robert Taisz <robert.taisz(a)emerald.hu>\n" +"Language-Team: Hungarian " +"<https://l10n.opensuse.org/projects/snapper/master/hu/>\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.2\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 2.18\n" #: ../client/snapper.cc:457 msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs." @@ -754,7 +755,7 @@ #: ../client/snapper.cc:537 ../client/snapper.cc:584 ../client/snapper.cc:632 msgid "Userdata" -msgstr "Userdata" +msgstr "Felhasználói adatok" # SLE12 #: ../client/misc.cc:134 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/po/pl.po new/snapper-0.5.4/po/pl.po --- old/snapper-0.5.3/po/pl.po 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/po/pl.po 2018-01-29 01:00:00.000000000 +0100 @@ -10,8 +10,8 @@ "Project-Id-Version: @PACKAGE@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 16:24+0200\n" -"PO-Revision-Date: 2016-10-05 18:00+0000\n" -"Last-Translator: Mariusz Fik <fisiu(a)opensuse.org>\n" +"PO-Revision-Date: 2018-01-25 14:05+0000\n" +"Last-Translator: Ewelina Michalowska <ewelina.michalowska(a)stgambit.com>\n" "Language-Team: Polish <https://l10n.opensuse.org/projects/snapper/master/pl/>" "\n" "Language: pl\n" @@ -20,7 +20,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.6\n" +"X-Generator: Weblate 2.18\n" #: ../client/snapper.cc:457 msgid "\t--all-configs, -a\t\tList snapshots from all accessible configs." @@ -152,7 +152,7 @@ #: ../client/snapper.cc:271 msgid "\tsnapper create-config <subvolume>" -msgstr "\tsnapper create-config <subvolume>" +msgstr "\tsnapper create-config <podwolumen>" #: ../client/snapper.cc:881 msgid "\tsnapper delete <number>" @@ -192,7 +192,7 @@ #: ../client/snapper.cc:421 msgid "\tsnapper set-config <configdata>" -msgstr "\tsnapper set-config <configdata>" +msgstr "\tsnapper set-config <dane_konfiguracyjne>" #: ../client/snapper.cc:1027 msgid "\tsnapper status <number1>..<number2>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/scripts/Makefile.in new/snapper-0.5.4/scripts/Makefile.in --- old/snapper-0.5.3/scripts/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/scripts/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -239,6 +239,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/server/Makefile.in new/snapper-0.5.4/server/Makefile.in --- old/snapper-0.5.3/server/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/server/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -282,6 +282,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Btrfs.cc new/snapper-0.5.4/snapper/Btrfs.cc --- old/snapper-0.5.3/snapper/Btrfs.cc 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Btrfs.cc 2018-01-29 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2011-2015] Novell, Inc. - * Copyright (c) [2016-2017] SUSE LLC + * Copyright (c) [2016-2018] SUSE LLC * * All Rights Reserved. * @@ -305,8 +305,8 @@ void - Btrfs::createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, - bool quota) const + Btrfs::createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, bool quota, + bool empty) const { if (num_parent == 0) { @@ -315,8 +315,11 @@ try { - create_snapshot(subvolume_dir.fd(), info_dir.fd(), "snapshot", read_only, - quota ? qgroup : no_qgroup); + if (empty) + create_subvolume(info_dir.fd(), "snapshot"); + else + create_snapshot(subvolume_dir.fd(), info_dir.fd(), "snapshot", read_only, + quota ? qgroup : no_qgroup); } catch (const runtime_error& e) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Btrfs.h new/snapper-0.5.4/snapper/Btrfs.h --- old/snapper-0.5.3/snapper/Btrfs.h 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Btrfs.h 2018-01-29 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2011-2015] Novell, Inc. - * Copyright (c) [2016-2017] SUSE LLC + * Copyright (c) [2016-2018] SUSE LLC * * All Rights Reserved. * @@ -68,7 +68,7 @@ SDir openGeneralDir() const; virtual void createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, - bool quota) const; + bool quota, bool empty) const; virtual void createSnapshotOfDefault(unsigned int num, bool read_only, bool quota) const; virtual void deleteSnapshot(unsigned int num) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Ext4.cc new/snapper-0.5.4/snapper/Ext4.cc --- old/snapper-0.5.3/snapper/Ext4.cc 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Ext4.cc 2018-01-29 01:00:00.000000000 +0100 @@ -164,7 +164,8 @@ void - Ext4::createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, bool quota) const + Ext4::createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, bool quota, + bool empty) const { if (num_parent != 0 || !read_only) throw std::logic_error("not implemented"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Ext4.h new/snapper-0.5.4/snapper/Ext4.h --- old/snapper-0.5.3/snapper/Ext4.h 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Ext4.h 2018-01-29 01:00:00.000000000 +0100 @@ -50,8 +50,8 @@ virtual SDir openInfosDir() const; virtual SDir openSnapshotDir(unsigned int num) const; - virtual void createSnapshot(unsigned int num, unsigned int num_parent, - bool read_only, bool quota) const; + virtual void createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, + bool quota, bool empty) const; virtual void deleteSnapshot(unsigned int num) const; virtual bool isSnapshotMounted(unsigned int num) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Filesystem.h new/snapper-0.5.4/snapper/Filesystem.h --- old/snapper-0.5.3/snapper/Filesystem.h 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Filesystem.h 2018-01-29 01:00:00.000000000 +0100 @@ -69,7 +69,7 @@ virtual SDir openSnapshotDir(unsigned int num) const = 0; virtual void createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, - bool quota) const = 0; + bool quota, bool empty) const = 0; virtual void createSnapshotOfDefault(unsigned int num, bool read_only, bool quota) const; virtual void deleteSnapshot(unsigned int num) const = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Lvm.cc new/snapper-0.5.4/snapper/Lvm.cc --- old/snapper-0.5.3/snapper/Lvm.cc 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Lvm.cc 2018-01-29 01:00:00.000000000 +0100 @@ -259,7 +259,8 @@ void - Lvm::createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, bool quota) const + Lvm::createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, bool quota, + bool empty) const { if (num_parent != 0 || !read_only) throw std::logic_error("not implemented"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Lvm.h new/snapper-0.5.4/snapper/Lvm.h --- old/snapper-0.5.3/snapper/Lvm.h 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Lvm.h 2018-01-29 01:00:00.000000000 +0100 @@ -96,8 +96,8 @@ virtual SDir openInfosDir() const; virtual SDir openSnapshotDir(unsigned int num) const; - virtual void createSnapshot(unsigned int num, unsigned int num_parent, - bool read_only, bool quota) const; + virtual void createSnapshot(unsigned int num, unsigned int num_parent, bool read_only, + bool quota, bool empty) const; virtual void deleteSnapshot(unsigned int num) const; virtual bool isSnapshotMounted(unsigned int num) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Makefile.in new/snapper-0.5.4/snapper/Makefile.in --- old/snapper-0.5.3/snapper/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -352,6 +352,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Snapshot.cc new/snapper-0.5.4/snapper/Snapshot.cc --- old/snapper-0.5.3/snapper/Snapshot.cc 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Snapshot.cc 2018-01-29 01:00:00.000000000 +0100 @@ -522,12 +522,13 @@ void - Snapshot::createFilesystemSnapshot(unsigned int num_parent, bool read_only) const + Snapshot::createFilesystemSnapshot(unsigned int num_parent, bool read_only, bool empty) const { if (isCurrent()) SN_THROW(IllegalSnapshotException()); - snapper->getFilesystem()->createSnapshot(num, num_parent, read_only, !cleanup.empty()); + snapper->getFilesystem()->createSnapshot(num, num_parent, read_only, !cleanup.empty(), + empty); } @@ -561,9 +562,9 @@ snapshot.uid = scd.uid; snapshot.description = scd.description; snapshot.cleanup = scd.cleanup; - snapshot.userdata =scd. userdata; + snapshot.userdata = scd.userdata; - return createHelper(snapshot, getSnapshotCurrent(), scd.read_only); + return createHelper(snapshot, getSnapshotCurrent(), scd.read_only, scd.empty); } @@ -633,7 +634,8 @@ Snapshots::iterator - Snapshots::createHelper(Snapshot& snapshot, const_iterator parent, bool read_only) + Snapshots::createHelper(Snapshot& snapshot, const_iterator parent, bool read_only, + bool empty) { // parent == end indicates the btrfs default subvolume. Unclean, but // adding a special snapshot like current needs too many API changes. @@ -641,7 +643,7 @@ try { if (parent != end()) - snapshot.createFilesystemSnapshot(parent->getNum(), read_only); + snapshot.createFilesystemSnapshot(parent->getNum(), read_only, empty); else snapshot.createFilesystemSnapshotOfDefault(read_only); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/snapper/Snapshot.h new/snapper-0.5.4/snapper/Snapshot.h --- old/snapper-0.5.3/snapper/Snapshot.h 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/snapper/Snapshot.h 2018-01-29 01:00:00.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (c) [2011-2015] Novell, Inc. - * Copyright (c) 2016 SUSE LLC + * Copyright (c) [2016,2018] SUSE LLC * * All Rights Reserved. * @@ -150,7 +150,7 @@ void writeInfo() const; - void createFilesystemSnapshot(unsigned int num_parent, bool read_only) const; + void createFilesystemSnapshot(unsigned int num_parent, bool read_only, bool empty) const; void createFilesystemSnapshotOfDefault(bool read_only) const; void deleteFilesystemSnapshot() const; @@ -181,9 +181,16 @@ { public: - SCD() : SMD(), read_only(true), uid(0) {} + SCD() : SMD(), read_only(true), empty(false), uid(0) {} bool read_only; + + /** + * Create an empty snapshot. For btrfs this creates a subvolume + * instead of a snapshot, for other filesystem types ignored. + */ + bool empty; + uid_t uid; }; @@ -236,7 +243,8 @@ iterator createPreSnapshot(const SCD& scd); iterator createPostSnapshot(const_iterator pre, const SCD& scd); - iterator createHelper(Snapshot& snapshot, const_iterator parent, bool read_only); + iterator createHelper(Snapshot& snapshot, const_iterator parent, bool read_only, + bool empty = false); void modifySnapshot(iterator snapshot, const SMD& smd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/testsuite/Makefile.in new/snapper-0.5.4/testsuite/Makefile.in --- old/snapper-0.5.3/testsuite/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/testsuite/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -495,6 +495,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/testsuite-cmp/Makefile.in new/snapper-0.5.4/testsuite-cmp/Makefile.in --- old/snapper-0.5.3/testsuite-cmp/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/testsuite-cmp/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -262,6 +262,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/snapper-0.5.3/testsuite-real/Makefile.in new/snapper-0.5.4/testsuite-real/Makefile.in --- old/snapper-0.5.3/testsuite-real/Makefile.in 2018-01-15 01:00:00.000000000 +0100 +++ new/snapper-0.5.4/testsuite-real/Makefile.in 2018-01-29 01:00:00.000000000 +0100 @@ -374,6 +374,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSCONFIG = @SYSCONFIG@ TOUCHBIN = @TOUCHBIN@ VERSION = @VERSION@ XSLTPROC = @XSLTPROC@ ++++++ snapper-Debian_7.0.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.669236907 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.669236907 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-Debian_8.0.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.689235973 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.689235973 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-Debian_9.0.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.705235225 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.709235038 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_14.04.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.725234290 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.725234290 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_14.10.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.745233355 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.745233355 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_15.04.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.761232608 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.761232608 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_15.10.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.777231860 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.777231860 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_16.04.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.797230925 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.797230925 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_16.10.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.813230177 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.813230177 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_17.04.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.833229243 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.833229243 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2 ++++++ snapper-xUbuntu_17.10.dsc ++++++ --- /var/tmp/diff_new_pack.grmmwz/_old 2018-02-01 21:26:28.849228495 +0100 +++ /var/tmp/diff_new_pack.grmmwz/_new 2018-02-01 21:26:28.853228308 +0100 @@ -1,6 +1,6 @@ Format: 1.0 Source: snapper -Version: 0.5.3 +Version: 0.5.4 Binary: snapper Maintainer: Arvin Schnell <aschnell(a)suse.com> Architecture: any @@ -11,4 +11,4 @@ # 423a20ae6e882d44e65a4eff97f2269f 630905 snapper-0.2.8.tar.gz # Files: -6744b7031ba5cc972c3363cd5b8b2d81 578441 snapper-0.5.3.tar.bz2 +b300732e2d269dec4b51c3cdc1630337 579218 snapper-0.5.4.tar.bz2

1 0

commit libpng16 for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package libpng16 for openSUSE:Factory checked in at 2018-02-01 21:26:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpng16 (Old) and /work/SRC/openSUSE:Factory/.libpng16.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpng16" Thu Feb 1 21:26:04 2018 rev:37 rq:571330 version:1.6.34 Changes: -------- --- /work/SRC/openSUSE:Factory/libpng16/libpng16.changes 2017-08-12 19:42:49.729133282 +0200 +++ /work/SRC/openSUSE:Factory/.libpng16.new/libpng16.changes 2018-02-01 21:26:05.706310202 +0100 @@ -1,0 +2,126 @@ +Wed Jan 31 09:57:56 UTC 2018 - pgajdos(a)suse.com + +- check with -j1 + +------------------------------------------------------------------- +Tue Jan 30 21:56:04 UTC 2018 - jengelh(a)inai.de + +- Fix SRPM group and grammar issues. + +------------------------------------------------------------------- +Tue Jan 30 15:32:19 UTC 2018 - pgajdos(a)suse.com + +- removed obsoleted Obsoletes + +------------------------------------------------------------------- +Sun Jan 28 02:00:45 UTC 2018 - avindra(a)opensuse.org + +- update to 1.6.34: + * Removed contrib/pngsuite/i*.png; some of these were incorrect + and caused test failures. +- includes 1.6.33: + * Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added + missing parenthesis in contrib/pngminus/pnm2png.c + * Fixed off-by-one error in png_do_check_palette_indexes() + * Initialize png_handler.row_ptr in libpng_read_fuzzer.cc + to fix shortlived oss-fuzz issue 3234. + * Compute a larger limit on IDAT because some applications write + a deflate buffer for each row + * Use current date (DATE) instead of release-date (RDATE) in last + changed date of contrib/oss-fuzz files. + * Enabled ARM support in CMakeLists.txt + * Fixed incorrect typecast of some arguments to png_malloc() and + png_calloc() that were png_uint_32 instead of png_alloc_size_t + * Use pnglibconf.h.prebuilt when building for ANDROID with cmake + * Initialize memory allocated by png_inflate to zero, using + memset, to stop an oss-fuzz "use of uninitialized value" + detection in png_set_text_2() due to truncated iTXt or zTXt + chunk. + * Initialize memory allocated by png_read_buffer to zero, using + memset, to stop an oss-fuzz "use of uninitialized value" + detection in png_icc_check_tag_table() due to truncated iCCP + chunk. + * Removed redundant tests + * Added an interlaced version of each file in contrib/pngsuite. + * Relocate new memset() call in pngrutil.c + * Add support for loading images with associated alpha in the + Simplified API + * Revert contrib/oss-fuzz/libpng_read_fuzzer.cc to libpng-1.6.32 + state + * Initialize png_handler.row_ptr in libpng_read_fuzzer.cc + * Add end_info structure and png_read_end() to the libpng fuzzer +- includes 1.6.32: + * Avoid possible NULL dereference in png_handle_eXIf when + benign_errors are allowed. Avoid leaking the input buffer + "eXIf_buf". + * Eliminated png_ptr->num_exif member from pngstruct.h and added + num_exif to arguments for png_get_eXIf() and png_set_eXIf(). + * Added calls to png_handle_eXIf(() in pngread.c and + png_write_eXIf() in pngwrite.c, and made various other fixes + to png_write_eXIf(). + * Changed name of png_get_eXIF and png_set_eXIf() to + png_get_eXIf_1() and png_set_eXIf_1(), respectively, to avoid + breaking API compatibility with libpng-1.6.31. + * Updated contrib/libtests/pngunknown.c with eXIf chunk. + * Initialized btoa[] in pngstest.c + * Stop memory leak when returning from png_handle_eXIf() with an + error + * Replaced local eXIf_buf with info_ptr-eXIf_buf in png_handle_eXIf(). + * Update libpng.3 and libpng-manual.txt about eXIf functions. + * Restored png_get_eXIf() and png_set_eXIf() to maintain API + compatability. + * Removed png_get_eXIf_1() and png_set_eXIf_1(). + * Check length of all chunks except IDAT against user limit to + fix an OSS-fuzz issue (Fixes CVE-2017-12652) + * Check length of IDAT against maximum possible IDAT size, + accounting for height, rowbytes, interlacing and zlib/deflate + overhead. + * Restored png_get_eXIf_1() and png_set_eXIf_1(), because + strlen(eXIf_buf) does not work (the eXIf chunk data can + contain zeroes). + * Revised symlink creation, no longer using deprecated cmake + LOCATION feature + * Fixed five-byte error in the calculation of IDAT maximum + possible size. + * Moved chunk-length check into a png_check_chunk_length() + private function + * Moved bad pngs from tests to contrib/libtests/crashers + * Moved testing of bad pngs into a separate + tests/pngtest-badpngs script + * Added the --xfail (expected FAIL) option to pngtest.c. It + writes XFAIL in the output but PASS for the libpng test. + * Require cmake-3.0.2 in CMakeLists.txt + * Fix "const" declaration info_ptr argument to png_get_eXIf_1() + and the num_exif argument to png_get_eXIf_1() + * Added "eXIf" to "chunks_to_ignore[]" in png_set_keep_unknown_chunks(). + * Added huge_IDAT.png and empty_ancillary_chunks.png to + testpngs/crashers. + * Make pngtest --strict, --relax, --xfail options imply -m + (multiple). + * Removed unused chunk_name parameter from png_check_chunk_length(). + * Relocated setting free_me for eXIf data, to stop an OSS-fuzz' + leak. + * Initialize profile_header[] in png_handle_iCCP() to fix + OSS-fuzz issue. + * Initialize png_ptr->row_buf[0] to 255 in png_read_row() to fix + OSS-fuzz UMR. + * Attempt to fix a UMR in png_set_text_2() to fix OSS-fuzz issue. + * Increase minimum zlib stream from 9 to 14 in png_handle_iCCP(), + to account for the minimum 'deflate' stream, and relocate the + test to a point after the keyword has been read. + * Check that the eXIf chunk has at least 2 bytes and begins with + "II" or "MM". + * Added a set of "huge_xxxx_chunk.png" files to + contrib/testpngs/crashers, one for each known chunk type, with + length = 2GB-1. + * Check for 0 return from png_get_rowbytes() and added some + (size_t) typecasts in contrib/pngminus/*.c to stop some Coverity + issues (162705, 162706, and 162707). + * Renamed chunks in contrib/testpngs/crashers to avoid having + files whose names differ only in case; this causes problems with + some platforms + * Added contrib/oss-fuzz directory which contains files used by + the oss-fuzz project +- cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- libpng-1.6.31.tar.xz libpng-1.6.31.tar.xz.asc New: ---- libpng-1.6.34.tar.xz libpng-1.6.34.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpng16.spec ++++++ --- /var/tmp/diff_new_pack.7tqzgM/_old 2018-02-01 21:26:06.482273933 +0100 +++ /var/tmp/diff_new_pack.7tqzgM/_new 2018-02-01 21:26:06.486273746 +0100 @@ -1,7 +1,7 @@ # # spec file for package libpng16 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,67 +19,53 @@ # %define major 1 %define minor 6 -%define micro 31 +%define micro 34 %define branch %{major}%{minor} %define libname libpng%{branch}-%{branch} - +%define debug_package_requires %{libname} = %{version}-%{release} Name: libpng16 -Url: http://www.libpng.org/pub/png/libpng.html Version: %{major}.%{minor}.%{micro} Release: 0 Summary: Library for the Portable Network Graphics Format (PNG) License: Zlib -Group: System/Libraries +Group: Development/Libraries/C and C++ +Url: http://www.libpng.org/pub/png/libpng.html Source0: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{version}.tar.xz Source1: ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-%{version}.tar.xz.a… Source2: libpng16.keyring Source3: rpm-macros.libpng-tools Source4: baselibs.conf -#BuildRequires: gpg-offline BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define debug_package_requires %{libname} = %{version}-%{release} %package -n %{libname} Summary: Library for the Portable Network Graphics Format (PNG) -# bug437293 Group: System/Libraries -%ifarch ppc64 -Obsoletes: libpng-64bit -%endif -# -Obsoletes: libpng < %{version} -Provides: libpng = %{version}-%{release} %package devel -Summary: Development Tools for applications which will use the Libpng +Summary: Development tools for applications which will use libpng Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: glibc-devel -Requires: pkg-config +Requires: pkgconfig Requires: zlib-devel Recommends: libpng%{branch}-compat-devel -# bug437293 -%ifarch ppc64 -Obsoletes: libpng-devel-64bit -%endif # %package compat-devel -Summary: Development Tools for applications which will use the Libpng +Summary: Development tools for applications which will use libpng Group: Development/Libraries/C and C++ Requires: libpng%{branch}-devel = %{version} +Conflicts: libpng-devel Provides: libpng-devel = %{version} Obsoletes: libpng-devel < 1.2.44 -Conflicts: otherproviders(libpng-devel) %package tools Summary: Tools for Manipulating PNG Images Group: Productivity/Graphics/Other +Conflicts: libpng-tools Provides: libpng-tools = %{version} -Conflicts: otherproviders(libpng-tools) %description libpng is the official reference library for the Portable Network @@ -108,11 +94,11 @@ PNG files. %prep -%setup -n libpng-%{version} +%setup -q -n libpng-%{version} %build # PNG_SAFE_LIMITS_SUPPORTED: http://www.openwall.com/lists/oss-security/2015/01/10/1 -export CFLAGS="%optflags -O3 -DPNG_SAFE_LIMITS_SUPPORTED -DPNG_SKIP_SETJMP_CHECK $(getconf LFS_CFLAGS)" +export CFLAGS="%{optflags} -O3 -DPNG_SAFE_LIMITS_SUPPORTED -DPNG_SKIP_SETJMP_CHECK $(getconf LFS_CFLAGS)" export LDFLAGS="-Wl,-z,relro,-z,now" %configure \ @@ -120,25 +106,22 @@ make %{?_smp_mflags} %check -make check +make -j1 check %install -make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT/%{_libdir}/libpng*.la +%make_install +rm %{buildroot}/%{_libdir}/libpng*.la mkdir -p %{buildroot}%{_sysconfdir}/rpm cp -a %{SOURCE3} \ %{buildroot}%{_sysconfdir}/rpm/macros.libpng-tools %post -n %{libname} -p /sbin/ldconfig - %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%defattr(-,root,root) %{_libdir}/libpng%{branch}.so.* %files devel -%defattr(-,root,root) %{_bindir}/libpng%{branch}-config %{_includedir}/libpng%{branch} %{_libdir}/libpng%{branch}.so @@ -146,17 +129,15 @@ %doc CHANGES README TODO ANNOUNCE LICENSE libpng-*.txt %files compat-devel -%defattr(-,root,root) %{_bindir}/libpng-config %{_includedir}/*.h %{_libdir}/libpng.so %{_libdir}/pkgconfig/libpng.pc -%doc %{_mandir}/man3/libpng.3.gz -%doc %{_mandir}/man3/libpngpf.3.gz -%doc %{_mandir}/man5/png.5.gz +%{_mandir}/man3/libpng.3%{ext_man} +%{_mandir}/man3/libpngpf.3%{ext_man} +%{_mandir}/man5/png.5%{ext_man} %files tools -%defattr(-,root,root) %{_bindir}/png-fix-itxt %{_bindir}/pngfix %{_sysconfdir}/rpm/macros.libpng-tools ++++++ libpng-1.6.31.tar.xz -> libpng-1.6.34.tar.xz ++++++ ++++ 3154 lines of diff (skipped)

1 0

commit multipath-tools for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2018-02-01 21:25:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "multipath-tools" Thu Feb 1 21:25:59 2018 rev:97 rq:571225 version:0.7.3+38+suse.a16beed5280a Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2018-01-30 15:37:47.553123882 +0100 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2018-02-01 21:26:00.822538472 +0100 @@ -1,0 +2,8 @@ +Tue Jan 30 20:00:31 UTC 2018 - mwilck(a)suse.com + +- Update to version 0.7.3+38+suse.a16beed5280a: + * kpartx: don't delete partitions from partitions (bsc#1078362) + * hwtable: add latest updates (bsc#1078363) + * multipathd.service: set TasksMax=infinity (bsc#1060616) + +------------------------------------------------------------------- Old: ---- multipath-tools-0.7.3+31+suse.6804bb73f72d.tar.xz New: ---- multipath-tools-0.7.3+38+suse.a16beed5280a.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.s7ur1Y/_old 2018-02-01 21:26:01.650499773 +0100 +++ /var/tmp/diff_new_pack.s7ur1Y/_new 2018-02-01 21:26:01.650499773 +0100 @@ -97,7 +97,7 @@ Name: multipath-tools Url: http://christophe.varoqui.free.fr/ -Version: 0.7.3+31+suse.6804bb73f72d +Version: 0.7.3+38+suse.a16beed5280a Release: 0 Summary: Tools to Manage Multipathed Devices with the device-mapper License: GPL-2.0 @@ -258,7 +258,9 @@ /%{_lib}/libmpathcmd.so.0 /%{_lib}/libmpathpersist.so.0 /%{_lib}/multipath +%if 0%{?with_rados} == 1 %exclude /%{_lib}/multipath/libcheckrbd.so +%endif /sbin/multipath /sbin/multipathd /sbin/mpathpersist ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.s7ur1Y/_old 2018-02-01 21:26:01.706497156 +0100 +++ /var/tmp/diff_new_pack.s7ur1Y/_new 2018-02-01 21:26:01.706497156 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/multipath-tools.git</param> - <param name="changesrevision">6804bb73f72dae11bd90b7cfdf22fa77a865ab80</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">a16beed5280a3ecfd97a2815c03d2230c28f1243</param></service></servicedata> \ No newline at end of file ++++++ multipath-tools-0.7.3+31+suse.6804bb73f72d.tar.xz -> multipath-tools-0.7.3+38+suse.a16beed5280a.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.7.3+31+suse.6804bb73f72d/kpartx/del-part-nodes.rules new/multipath-tools-0.7.3+38+suse.a16beed5280a/kpartx/del-part-nodes.rules --- old/multipath-tools-0.7.3+31+suse.6804bb73f72d/kpartx/del-part-nodes.rules 2018-01-23 17:40:39.000000000 +0100 +++ new/multipath-tools-0.7.3+38+suse.a16beed5280a/kpartx/del-part-nodes.rules 2018-01-30 20:45:31.000000000 +0100 @@ -12,6 +12,7 @@ SUBSYSTEM!="block", GOTO="end_del_part_nodes" KERNEL!="sd*|dasd*|rbd*", GOTO="end_del_part_nodes" ACTION!="add|change", GOTO="end_del_part_nodes" +ENV{DEVTYPE}=="partition", GOTO="end_del_part_nodes" IMPORT{cmdline}="dont_del_part_nodes" ENV{dont_del_part_nodes}=="1", GOTO="end_del_part_nodes" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.7.3+31+suse.6804bb73f72d/libmultipath/hwtable.c new/multipath-tools-0.7.3+38+suse.a16beed5280a/libmultipath/hwtable.c --- old/multipath-tools-0.7.3+31+suse.6804bb73f72d/libmultipath/hwtable.c 2018-01-23 17:40:39.000000000 +0100 +++ new/multipath-tools-0.7.3+38+suse.a16beed5280a/libmultipath/hwtable.c 2018-01-30 20:45:31.000000000 +0100 @@ -582,15 +582,15 @@ }, { /* XIV Storage System / FlashSystem A9000/A9000R */ - .vendor = "IBM", - .product = "2810XIV", + .vendor = "(XIV|IBM)", + .product = "(NEXTRA|2810XIV)", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, }, { - /* FlashSystem 710/720/810/820/840/900 */ - .vendor = "IBM", - .product = "FlashSystem", + /* TMS RamSan / FlashSystem 710/720/810/820/840/900 */ + .vendor = "(TMS|IBM)", + .product = "(RamSan|FlashSystem)", .pgpolicy = MULTIBUS, }, { @@ -968,7 +968,8 @@ /* OceanStor V3 */ .vendor = "HUAWEI", .product = "XSG1", - .pgpolicy = MULTIBUS, + .pgpolicy = GROUP_BY_PRIO, + .prio_name = PRIO_ALUA, }, /* * Red Hat @@ -1091,6 +1092,13 @@ .pgpolicy = MULTIBUS, .no_path_retry = 30, }, + { + /* Magnitude family */ + .vendor = "(XIOTECH|XIOtech)", + .product = "Magnitude", + .pgpolicy = MULTIBUS, + .no_path_retry = 30, + }, /* * Violin Memory */ @@ -1181,6 +1189,16 @@ .no_path_retry = 30, }, /* + * AccelStor + */ + { + /* NeoSapphire */ + .vendor = "AStor", + .product = "NeoSapphire", + .pgpolicy = MULTIBUS, + .no_path_retry = 30, + }, + /* * EOL */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/multipath-tools-0.7.3+31+suse.6804bb73f72d/multipathd/multipathd.service new/multipath-tools-0.7.3+38+suse.a16beed5280a/multipathd/multipathd.service --- old/multipath-tools-0.7.3+31+suse.6804bb73f72d/multipathd/multipathd.service 2018-01-23 17:40:39.000000000 +0100 +++ new/multipath-tools-0.7.3+38+suse.a16beed5280a/multipathd/multipathd.service 2018-01-30 20:45:31.000000000 +0100 @@ -16,6 +16,7 @@ ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath ExecStart=/sbin/multipathd -d -s ExecReload=/sbin/multipathd reconfigure +TasksMax=infinity [Install] WantedBy=sysinit.target

1 0

commit python-pycurl for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package python-pycurl for openSUSE:Factory checked in at 2018-02-01 21:25:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pycurl (Old) and /work/SRC/openSUSE:Factory/.python-pycurl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-pycurl" Thu Feb 1 21:25:54 2018 rev:19 rq:571200 version:7.43.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pycurl/python-pycurl.changes 2017-12-10 18:17:09.620008195 +0100 +++ /work/SRC/openSUSE:Factory/.python-pycurl.new/python-pycurl.changes 2018-02-01 21:25:56.386745805 +0100 @@ -1,0 +2,8 @@ +Tue Jan 30 16:01:27 UTC 2018 - vcizek(a)suse.com + +- Since version 7.58.0, curl may be compiled with libssh instead of + libssh2 which differ in supported functionality (bsc#1078329) + * add pycurl-libssh.patch +- update license + +------------------------------------------------------------------- New: ---- pycurl-libssh.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pycurl.spec ++++++ --- /var/tmp/diff_new_pack.NNncJy/_old 2018-02-01 21:25:57.158709723 +0100 +++ /var/tmp/diff_new_pack.NNncJy/_new 2018-02-01 21:25:57.166709349 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-pycurl # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,12 +22,14 @@ Version: 7.43.0.1 Release: 0 Summary: PycURL -- cURL library module -License: LGPL-2.1+ and MIT +License: LGPL-2.1+ AND MIT Group: Development/Languages/Python Url: http://pycurl.sourceforge.net/ Source: https://files.pythonhosted.org/packages/source/p/pycurl/pycurl-%{version}.t… # PATCH-FIX-OPENSUSE increase_test_timeout.diff -- Increase the timeout in a test so it doesn't fail when obs is overloaded Patch0: increase_test_timeout.diff +# PATCH-FIX-UPSTREAM handle difference between libssh and libssh2 +Patch1: pycurl-libssh.patch BuildRequires: %{python_module bottle} BuildRequires: %{python_module devel} BuildRequires: %{python_module flaky} @@ -61,6 +63,7 @@ %prep %setup -q -n pycurl-%{version} %patch0 -p1 +%patch1 -p1 %build export CFLAGS="%{optflags}" ++++++ pycurl-libssh.patch ++++++ Index: pycurl-7.43.0.1/tests/ssh_key_cb_test.py =================================================================== --- pycurl-7.43.0.1.orig/tests/ssh_key_cb_test.py 2017-12-03 20:03:17.000000000 +0100 +++ pycurl-7.43.0.1/tests/ssh_key_cb_test.py 2018-01-30 16:56:42.499858079 +0100 @@ -30,8 +30,11 @@ class SshKeyCbTest(unittest.TestCase): def keyfunction(known_key, found_key, match): return pycurl.KHSTAT_FINE - self.curl.setopt(pycurl.SSH_KNOWNHOSTS, '.known_hosts') - self.curl.setopt(pycurl.SSH_KEYFUNCTION, keyfunction) + try: + self.curl.setopt(pycurl.SSH_KNOWNHOSTS, '.known_hosts') + self.curl.setopt(pycurl.SSH_KEYFUNCTION, keyfunction) + except pycurl.error as e: + self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0]) try: self.curl.perform() @@ -44,8 +47,11 @@ class SshKeyCbTest(unittest.TestCase): def keyfunction(known_key, found_key, match): return pycurl.KHSTAT_REJECT - self.curl.setopt(pycurl.SSH_KNOWNHOSTS, '.known_hosts') - self.curl.setopt(pycurl.SSH_KEYFUNCTION, keyfunction) + try: + self.curl.setopt(pycurl.SSH_KNOWNHOSTS, '.known_hosts') + self.curl.setopt(pycurl.SSH_KEYFUNCTION, keyfunction) + except pycurl.error as e: + self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0]) try: self.curl.perform() @@ -58,8 +64,11 @@ class SshKeyCbTest(unittest.TestCase): def keyfunction(known_key, found_key, match): return 'bogus' - self.curl.setopt(pycurl.SSH_KNOWNHOSTS, '.known_hosts') - self.curl.setopt(pycurl.SSH_KEYFUNCTION, keyfunction) + try: + self.curl.setopt(pycurl.SSH_KNOWNHOSTS, '.known_hosts') + self.curl.setopt(pycurl.SSH_KEYFUNCTION, keyfunction) + except pycurl.error as e: + self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0]) try: self.curl.perform() @@ -77,8 +86,14 @@ class SshKeyCbUnsetTest(unittest.TestCas @util.min_libcurl(7, 19, 6) def test_keyfunction_none(self): - self.curl.setopt(pycurl.SSH_KEYFUNCTION, None) + try: + self.curl.setopt(pycurl.SSH_KEYFUNCTION, None) + except pycurl.error as e: + self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0]) @util.min_libcurl(7, 19, 6) def test_keyfunction_unset(self): - self.curl.unsetopt(pycurl.SSH_KEYFUNCTION) + try: + self.curl.unsetopt(pycurl.SSH_KEYFUNCTION) + except pycurl.error as e: + self.assertEqual(pycurl.E_UNKNOWN_OPTION, e.args[0])

1 0

commit webkit2gtk3 for openSUSE:Factory
by root＠hilbert.suse.de 01 Feb '18

01 Feb '18

Hello community, here is the log from the commit of package webkit2gtk3 for openSUSE:Factory checked in at 2018-02-01 21:25:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/webkit2gtk3 (Old) and /work/SRC/openSUSE:Factory/.webkit2gtk3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "webkit2gtk3" Thu Feb 1 21:25:48 2018 rev:52 rq:571158 version:2.18.6 Changes: -------- --- /work/SRC/openSUSE:Factory/webkit2gtk3/webkit2gtk3.changes 2018-01-26 13:36:14.122441995 +0100 +++ /work/SRC/openSUSE:Factory/.webkit2gtk3.new/webkit2gtk3.changes 2018-02-01 21:25:49.543065686 +0100 @@ -1,0 +2,6 @@ +Tue Jan 30 17:12:00 CET 2018 - ro(a)suse.de + +- even on recent codestreams there is no binutils gold on s390 + only on s390x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webkit2gtk3.spec ++++++ --- /var/tmp/diff_new_pack.tYSkDa/_old 2018-02-01 21:25:51.034995951 +0100 +++ /var/tmp/diff_new_pack.tYSkDa/_new 2018-02-01 21:25:51.034995951 +0100 @@ -32,6 +32,10 @@ %ifarch s390 s390x %define _gold_linker 0 %endif +%else +%ifarch s390 +%define _gold_linker 0 +%endif %endif Name: webkit2gtk3

1 0