December 2019 - openSUSE Commits - openSUSE Mailing Lists

commit rust for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package rust for openSUSE:Factory checked in at 2019-12-30 13:46:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust (Old) and /work/SRC/openSUSE:Factory/.rust.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rust" Mon Dec 30 13:46:33 2019 rev:45 rq:752417 version:1.39.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rust/rust.changes 2019-10-25 18:41:17.239849350 +0200 +++ /work/SRC/openSUSE:Factory/.rust.new.6675/rust.changes 2019-12-30 13:48:09.401300961 +0100 @@ -1,0 +2,43 @@ +Fri Nov 29 14:43:11 UTC 2019 - Neal Gompa <ngompa13(a)gmail.com> + +- Rename README to README.suse-maint and add it as a source + to stop factory-auto from declining submissions automatically + +------------------------------------------------------------------- +Mon Nov 25 13:25:52 UTC 2019 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Re-format the spec file +- Add a README to explain the update process +- Add _service file for download the assets and re-base the patches + +------------------------------------------------------------------- +Fri Nov 8 23:43:13 UTC 2019 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Add hopefully-fix-rustdoc-build.patch to fix rustdoc compilation + +------------------------------------------------------------------- +Thu Nov 7 15:33:25 UTC 2019 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Update to version 1.39.0 + + Language + - You can now create async functions and blocks with async fn, + async move {}, and async {} respectively, and you can now call + .await on async expressions. + - You can now use certain attributes on function, closure, and + function pointer parameters. + - You can now take shared references to bind-by-move patterns in + the if guards of match arms. + + Compiler + - Added tier 3 support for the i686-unknown-uefi target. + - Added tier 3 support for the sparc64-unknown-openbsd target. + - rustc will now trim code snippets in diagnostics to fit in your + terminal. + - You can now pass --show-output argument to test binaries to + print the output of successful tests. + + For more details: + https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1390-2019… +- Drop patches already merged in upstream: + + rust-61206-assume-tarball-llvm-is-fresh.patch + + add-option-to-allow-warnings.patch + +------------------------------------------------------------------- Old: ---- add-option-to-allow-warnings.patch rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz rust-1.37.0-i686-unknown-linux-gnu.tar.xz rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz rust-1.37.0-powerpc64-unknown-linux-gnu.tar.xz rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz rust-1.37.0-s390x-unknown-linux-gnu.tar.xz rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz rust-61206-assume-tarball-llvm-is-fresh.patch rustc-1.38.0-src.tar.xz New: ---- README.suse-maint _service hopefully-fix-rustdoc-build.patch rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz rust-1.38.0-i686-unknown-linux-gnu.tar.xz rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz rust-1.38.0-s390x-unknown-linux-gnu.tar.xz rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz rustc-1.39.0-src.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rust.spec ++++++ --- /var/tmp/diff_new_pack.14NHmx/_old 2019-12-30 13:48:53.901338981 +0100 +++ /var/tmp/diff_new_pack.14NHmx/_new 2019-12-30 13:48:53.901338981 +0100 @@ -1,7 +1,7 @@ # # spec file for package rust # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # Copyright (c) 2019 Luke Jones, luke(a)ljones.dev # # All modifications and additions to the file contributed by third parties @@ -17,38 +17,49 @@ # -%global version_current 1.38.0 -%global version_previous 1.37.0 -%global version_bootstrap 1.37.0 -# some sub-packages are versioned independantly -%global rustfmt_version 1.0.3 +%global version_current 1.39.0 +%global version_previous 1.38.0 +%global version_bootstrap 1.38.0 + +# some sub-packages are versioned independently +%global rustfmt_version 1.4.8 %global clippy_version 0.0.212 + # Build the rust target triple. # Some rust arches don't match what SUSE labels them. %global rust_arch %{_arch} %global abi gnu + %ifarch armv7hl %global rust_arch armv7 %global abi gnueabihf %endif + %ifarch armv6hl %global rust_arch arm %global abi gnueabihf %endif + %ifarch ppc %global rust_arch powerpc %endif + %ifarch ppc64 %global rust_arch powerpc64 %endif + %ifarch ppc64le %global rust_arch powerpc64le %endif -# Must restrict the x86 build to i686 since i586 is currently unsupported + +# Must restrict the x86 build to i686 since i586 is currently +# unsupported %ifarch %{ix86} %global rust_arch i686 %endif + %global rust_triple %{rust_arch}-unknown-linux-%{abi} + # All sources and bootstraps are fetched form here %global dl_url https://static.rust-lang.org/dist @@ -56,10 +67,10 @@ %global common_libdir %{_prefix}/lib %global rustlibdir %{common_libdir}/rustlib -# Will build with distro LLVM by default, but the following -# versions do not have a version new enough, >= 6.0 -# add --without bundled_llvm option, i.e. enable bundled_llvm by default -# Leap 42 to 42.3, SLE12 SP1 to SLE12 SP3, Leap 15.0, SLE15 SP0 +# Will build with distro LLVM by default, but the following versions +# do not have a version new enough, >= 6.0 add --without bundled_llvm +# option, i.e. enable bundled_llvm by default Leap 42 to 42.3, SLE12 +# SP1 to SLE12 SP3, Leap 15.0, SLE15 SP0 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 150000 %bcond_without bundled_llvm %endif @@ -71,9 +82,6 @@ %bcond_without rls %endif -# enable the --with-rust_bootstrap flag -%bcond_with rust_bootstrap - # Debuginfo can exhaust memory on these architecture workers %ifarch %{arm} %{ix86} %define codegen_units --set rust.codegen-units=2 @@ -103,13 +111,16 @@ # Exclude implicitly-scanned Provides, especially the libLLVM.so ones: %global __provides_exclude_from ^%{rustlibdir}/.*$ +# enable the --with-rust_bootstrap flag +%bcond_with rust_bootstrap + Name: rust Version: %{version_current} Release: 0 Summary: A systems programming language License: MIT OR Apache-2.0 Group: Development/Languages/Rust -Url: https://www.rust-lang.org +URL: https://www.rust-lang.org Source0: %{dl_url}/rustc-%{version}-src.tar.xz Source99: %{name}-rpmlintrc Source100: %{dl_url}/rust-%{version_bootstrap}-x86_64-unknown-linux-gnu.tar.xz @@ -120,13 +131,22 @@ Source106: %{dl_url}/rust-%{version_bootstrap}-powerpc64le-unknown-linux-gnu.tar.xz Source107: %{dl_url}/rust-%{version_bootstrap}-s390x-unknown-linux-gnu.tar.xz Source108: %{dl_url}/rust-%{version_bootstrap}-powerpc-unknown-linux-gnu.tar.xz +# Make factory-auto stop complaining... +Source1000: README.suse-maint # PATCH-FIX-OPENSUSE: edit src/librustc_llvm/build.rs to ignore GCC incompatible flag Patch0: ignore-Wstring-conversion.patch -# PATCH-FIX-UPSTREAM: Fix bug with timestamps which caused LLVM to rebuild - https://github.com/rust-lang/rust/issues/61206 -Patch1: rust-61206-assume-tarball-llvm-is-fresh.patch -# PATCH-FIX-UPSTREAM: Adds an option to ignore warnings, primaraily used in this build to allow v1.38 to bootstrap itself -Patch2: add-option-to-allow-warnings.patch +# PATCH-FIX-UPSTREAM: fix rustdoc compilation: https://github.com/rust-lang/rust/issues/66224 +Patch1: hopefully-fix-rustdoc-build.patch BuildRequires: ccache +BuildRequires: curl +BuildRequires: fdupes +BuildRequires: git +BuildRequires: pkgconfig +BuildRequires: procps +BuildRequires: python3-base +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) # Leap 42 to 42.3, SLE12 SP1, SP2 %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120200 # In these distros cmake is 2.x, so we need cmake3 for building llvm. @@ -135,8 +155,6 @@ # cmake got upgraded to 3.5 in SLE-12 SP2 BuildRequires: cmake %endif -BuildRequires: curl -BuildRequires: fdupes # In all of SLE12, the default gcc is 4.8. Rust's LLVM wants 5.1 at least. # So, we'll just use gcc7. %if 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500 @@ -144,74 +162,67 @@ %else BuildRequires: gcc-c++ %endif -BuildRequires: git -BuildRequires: pkgconfig -BuildRequires: procps -BuildRequires: python3-base -BuildRequires: pkgconfig(libcurl) -# The following requires must mirror: -# LIBSSH2_SYS_USE_PKG_CONFIG +# The following requires must mirror: LIBSSH2_SYS_USE_PKG_CONFIG %if !%with rust_bootstrap || 0%{?sle_version} >= 120000 && 0%{?sle_version} <= 120500 BuildRequires: pkgconfig(libssh2) >= 1.4.3 %endif -BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(zlib) -# The compiler is not generally useful without the std library installed -# And the std library is exactly specific to the version of the compiler -Requires: %{name}-std-static = %{version} -Recommends: %{name}-doc -Recommends: cargo -Conflicts: rust -Conflicts: rustc-bootstrap -# Restrict the architectures as building rust relies on being initially -# bootstrapped before we can build the n+1 release -ExclusiveArch: x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x %{ix86} -%ifarch %{ix86} -ExclusiveArch: i686 -%endif -# Real LLVM minimum version should be 7.x, but rust has a fallback mode +# Real LLVM minimum version should be 7.x, but rust has a fallback +# mode %if !%with bundled_llvm BuildRequires: llvm-devel >= 6.0 %endif %if !%with rust_bootstrap -# We will now package cargo using the version number of rustc since -# it is being built from rust sources. Old cargo packages have a 0.x number +# We will now package cargo using the version number of rustc since it +# is being built from rust sources. Old cargo packages have a 0.x +# number BuildRequires: cargo <= %{version_current} BuildRequires: cargo >= %{version_previous} BuildRequires: rust <= %{version_current} BuildRequires: rust >= %{version_previous} -# This must be bumped to rust-std-static after 1.27.2 is in mainstream BuildRequires: rust-std-static <= %{version_current} BuildRequires: rust-std-static >= %{version_previous} %endif +# The compiler is not generally useful without the std library +# installed and the std library is exactly specific to the version of +# the compiler +Requires: %{name}-std-static = %{version} +Recommends: %{name}-doc +Recommends: cargo +Conflicts: rust +Conflicts: rustc-bootstrap +# Restrict the architectures as building rust relies on being +# initially bootstrapped before we can build the n+1 release +ExclusiveArch: x86_64 %{arm} aarch64 ppc ppc64 ppc64le s390x %{ix86} +%ifarch %{ix86} +ExclusiveArch: i686 +%endif %description -Rust is a systems programming language focused on three goals: -safety, speed, and concurrency. It maintains these goals without -having a garbage collector, making it a useful language for a -number of use cases other languages are not good at: embedding -in other languages, programs with specific space and time -requirements, and writing low-level code, like device drivers -and operating systems. It improves on current languages targeting -this space by having a number of compile-time safety checks -that produce no runtime overhead, while eliminating all -data races. Rust also aims to achieve "zero-cost abstractions", -even though some of these abstractions feel like those of a -high-level language. Even then, Rust still allows precise -control like a low-level language would. +Rust is a systems programming language focused on three goals: safety, +speed, and concurrency. It maintains these goals without having a +garbage collector, making it a useful language for a number of use +cases other languages are not good at: embedding in other languages, +programs with specific space and time requirements, and writing +low-level code, like device drivers and operating systems. It improves +on current languages targeting this space by having a number of +compile-time safety checks that produce no runtime overhead, while +eliminating all data races. Rust also aims to achieve "zero-cost +abstractions", even though some of these abstractions feel like those +of a high-level language. Even then, Rust still allows precise control +like a low-level language would. %package -n rust-std-static Summary: Standard library for Rust License: MIT OR Apache-2.0 Group: Development/Languages/Rust Requires: %{name} = %{version} -Obsoletes: rust-std < %{version} Conflicts: rust-std < %{version} +Obsoletes: rust-std < %{version} Provides: rust-std = %{version} %description -n rust-std-static -This package includes the standard libraries for building -applications written in Rust. +This package includes the standard libraries for building applications +written in Rust. %package -n rust-doc Summary: Rust documentation @@ -263,8 +274,8 @@ The RLS provides a server that runs in the background, providing IDEs, editors, and other tools with information about Rust programs. It supports functionality such as 'goto definition', symbol search, -reformatting, and code completion, and enables renaming and refactorings. -It can be used with an IDE such as Gnome-Builder. +reformatting, and code completion, and enables renaming and +refactorings. It can be used with an IDE such as Gnome-Builder. %package -n rust-analysis Summary: Compiler analysis data for the Rust standard library @@ -273,9 +284,10 @@ Requires: rust-std-static = %{version} %description -n rust-analysis -This package contains analysis data files produced with rustc's -Zsave-analysis -feature for the Rust standard library. The RLS (Rust Language Server) uses this -data to provide information about the Rust standard library. +This package contains analysis data files produced with rustc's +-Zsave-analysis feature for the Rust standard library. The RLS (Rust +Language Server) uses this data to provide information about the Rust +standard library. %package -n rustfmt Summary: Code formatting tool for Rust lang @@ -283,6 +295,8 @@ Group: Development/Languages/Rust Requires: %{name} = %{version} Requires: cargo = %{version} +Provides: cargo-fmt = %{rustfmt_version} +Provides: rustfmt = %{rustfmt_version} %if 0%{?suse_version} && 0%{?suse_version} < 1500 # Legacy SUSE-only form Supplements: packageand(%{name}:cargo) @@ -290,8 +304,6 @@ # Standard form Supplements: (%{name} and cargo) %endif -Provides: cargo-fmt = %{rustfmt_version} -Provides: rustfmt = %{rustfmt_version} %description -n rustfmt A tool for formatting Rust code according to style guidelines. @@ -313,11 +325,11 @@ License: MIT OR Apache-2.0 Group: Development/Languages/Rust Requires: %{name} = %{version} -Obsoletes: cargo < %{version} Conflicts: cargo < %{version} -Provides: rustc:%{_bindir}/cargo = %{version} -Obsoletes: cargo-vendor < %{version} +Obsoletes: cargo < %{version} Conflicts: cargo-vendor < %{version} +Obsoletes: cargo-vendor < %{version} +Provides: rustc:%{_bindir}/cargo = %{version} %description -n cargo Cargo downloads dependencies of Rust projects and compiles it. @@ -376,7 +388,6 @@ %patch0 -p1 %patch1 -p1 -%patch2 -p1 # use python3 sed -i -e "1s|#!.*|#!%{_bindir}/python3|" x.py @@ -589,7 +600,7 @@ %if %{with rls} %files -n rls -%if 0%{?suse_version} == 1315 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %doc src/tools/rls/LICENSE-{APACHE,MIT} %else %license src/tools/rls/LICENSE-{APACHE,MIT} @@ -602,7 +613,7 @@ %{rustlibdir}/%{rust_triple}/analysis/ %files -n rustfmt -%if 0%{?suse_version} == 1315 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %doc src/tools/rustfmt/LICENSE-{APACHE,MIT} %else %license src/tools/rustfmt/LICENSE-{APACHE,MIT} @@ -612,7 +623,7 @@ %{_bindir}/rustfmt %files -n clippy -%if 0%{?suse_version} == 1315 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %doc src/tools/clippy/LICENSE-{APACHE,MIT} %else %license src/tools/clippy/LICENSE-{APACHE,MIT} @@ -622,7 +633,7 @@ %{_bindir}/clippy-driver %files -n cargo -%if 0%{?suse_version} == 1315 +%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} %doc src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY} %else %license src/tools/cargo/LICENSE-{APACHE,MIT,THIRD-PARTY} ++++++ README.suse-maint ++++++ # Automatic updating via _service Edit the spec file, and update the variables related with the version (in format X.YY.Z): - *version_current*: for the new version of Rust - *version_previous*: for the previous version of Rust - *version_bootstrap*: for the version used to compile Rust, it recommended to use the same version that *version_previous* - *rustfmt_version*: for the version of rustfmt cli, check the tarball to find the correct version - *clippy_version*: for the version of clippy, check the tarball to find the correct version After that, we can execute the service file: osc service disabledrun If `osc` complains about a missing service component, double check that the components are installed. For example, for Tumbleweed: zypper in obs-service-download_files obs-service-refresh_patches Finally, update the changelog based on the releases notes: https://github.com/rust-lang/rust/blob/master/RELEASES.md # Updating to a new version from upstream (Original link: https://en.opensuse.org/Rust) Branch the rust package in the devel:languages:rust project. You'll need to download precompiled binaries for the compiler used for bootstrapping, and the actual source code for the compiler. In the "Other Installation Methods" page listed below, note that it shows links to .tar.gz packages and their .tar.gz.asc GPG signatures, but .tar.xz versions are also available. *Binaries for bootstrapping* - Go to the "Other Installation Methods" page from rust-lang.org and scroll down to the "Standalone installers" section. Download the following: - rust-<version>-aarch64-unknown-linux-gnu.tar.xz - rust-<version>-armv7-unknown-linux-gnueabihf.tar.xz - rust-<version>-i686-unknown-linux-gnu.tar.xz - rust-<version>-powerpc64le-unknown-linux-gnu.tar.xz - rust-<version>-powerpc64-unknown-linux-gnu.tar.xz - rust-<version>-s390x-unknown-linux-gnu.tar.xz - rust-<version>-x86_64-unknown-linux-gnu.tar.xz *Compiler source code* - From the same page, but now in the "Source code" section, download this: rustc-<version>-src.tar.xz Update those files in the source RPM. Check that all the patches still apply. Update the version number in rust.spec. Add the release notes to rust.changes.++++++ _service ++++++ <services> <service mode="disabled" name="download_files"> <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="refresh_patches"> <param name="changesgenerate">enable</param> <param name="ignorefuzz">enable</param> </service> </services> ++++++ hopefully-fix-rustdoc-build.patch ++++++ >From 73369f32621f6a844a80a8513ae3ded901e4a406 Mon Sep 17 00:00:00 2001 From: Mark Rousskov <mark.simulacrum(a)gmail.com> Date: Tue, 5 Nov 2019 11:16:46 -0500 Subject: [PATCH] Hopefully fix rustdoc build It's super unclear why this broke when we switched to beta but not previously -- but at least it's hopefully fixed now. --- src/bootstrap/builder.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) Index: rustc-1.39.0-src/src/bootstrap/builder.rs =================================================================== --- rustc-1.39.0-src.orig/src/bootstrap/builder.rs +++ rustc-1.39.0-src/src/bootstrap/builder.rs @@ -875,7 +875,18 @@ impl<'a> Builder<'a> { // things still build right, please do! match mode { Mode::Std => metadata.push_str("std"), - _ => {}, + // When we're building rustc tools, they're built with a search path + // that contains things built during the rustc build. For example, + // bitflags is built during the rustc build, and is a dependency of + // rustdoc as well. We're building rustdoc in a different target + // directory, though, which means that Cargo will rebuild the + // dependency. When we go on to build rustdoc, we'll look for + // bitflags, and find two different copies: one built during the + // rustc step and one that we just built. This isn't always a + // problem, somehow -- not really clear why -- but we know that this + // fixes things. + Mode::ToolRustc => metadata.push_str("tool-rustc"), + _ => {} } cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata); ++++++ ignore-Wstring-conversion.patch ++++++ --- /var/tmp/diff_new_pack.14NHmx/_old 2019-12-30 13:48:53.969339039 +0100 +++ /var/tmp/diff_new_pack.14NHmx/_new 2019-12-30 13:48:53.969339039 +0100 @@ -1,17 +1,17 @@ -*** rustc-1.30.0-src/src/librustc_llvm/build.rs 2018-10-25 09:00:01.000000000 +1300 ---- rust-patch/src/librustc_llvm/build.rs 2018-11-05 07:31:35.672765505 +1300 -*************** -*** 147,152 **** ---- 147,158 ---- - continue; - } - -+ // hack to avoid flag on openSUSE which is incompatible with GCC -+ if flag.starts_with("-W") && flag.contains("string-conversion") { -+ continue; -+ } -+ -+ - cfg.flag(flag); - } - +Index: rustc-1.39.0-src/src/librustc_llvm/build.rs +=================================================================== +--- rustc-1.39.0-src.orig/src/librustc_llvm/build.rs ++++ rustc-1.39.0-src/src/librustc_llvm/build.rs +@@ -137,6 +137,12 @@ fn main() { + continue; + } + ++ // hack to avoid flag on openSUSE which is incompatible with GCC ++ if flag.starts_with("-W") && flag.contains("string-conversion") { ++ continue; ++ } ++ ++ + cfg.flag(flag); + } + ++++++ rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz -> rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-aarch64-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-aarch64-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz -> rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-armv7-unknown-linux-gnueabihf.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-armv7-unknown-linux-gnueabihf.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-i686-unknown-linux-gnu.tar.xz -> rust-1.38.0-i686-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-i686-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-i686-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz -> rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-powerpc-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz -> rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-powerpc-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-powerpc64-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz -> rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-powerpc64le-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-powerpc64le-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-s390x-unknown-linux-gnu.tar.xz -> rust-1.38.0-s390x-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-s390x-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-s390x-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz -> rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rust-1.37.0-x86_64-unknown-linux-gnu.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rust-1.38.0-x86_64-unknown-linux-gnu.tar.xz differ: char 8, line 1 ++++++ rustc-1.38.0-src.tar.xz -> rustc-1.39.0-src.tar.xz ++++++ /work/SRC/openSUSE:Factory/rust/rustc-1.38.0-src.tar.xz /work/SRC/openSUSE:Factory/.rust.new.6675/rustc-1.39.0-src.tar.xz differ: char 15, line 1

1 0

commit 000product for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-12-30 12:37:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Mon Dec 30 12:37:09 2019 rev:1951 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE-MicroOS.product ++++++ --- /var/tmp/diff_new_pack.TKAXbK/_old 2019-12-30 12:37:13.651881678 +0100 +++ /var/tmp/diff_new_pack.TKAXbK/_new 2019-12-30 12:37:13.651881678 +0100 @@ -6,7 +6,7 @@ <name>openSUSE-MicroOS</name> <releasepkgname>openSUSE-MicroOS-release</releasepkgname> <endoflife/> - <version>20191229</version> + <version>20191230</version>  <release>0</release> <productline>openSUSE-MicroOS</productline>

1 0

commit 000product for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-12-30 12:37:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Mon Dec 30 12:37:07 2019 rev:1950 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE.product ++++++ --- /var/tmp/diff_new_pack.MeKYXq/_old 2019-12-30 12:37:11.151880337 +0100 +++ /var/tmp/diff_new_pack.MeKYXq/_new 2019-12-30 12:37:11.155880339 +0100 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20191229</version> + <version>20191230</version> <release>0</release> <productline>openSUSE</productline>

1 0

commit 000product for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package 000product for openSUSE:Factory checked in at 2019-12-30 12:37:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000product (Old) and /work/SRC/openSUSE:Factory/.000product.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000product" Mon Dec 30 12:37:04 2019 rev:1949 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ openSUSE-MicroOS-dvd5-dvd-x86_64.kiwi: same change openSUSE-MicroOS-dvd5-kubic-dvd-x86_64.kiwi: same change openSUSE-cd-mini-i586.kiwi: same change openSUSE-cd-mini-x86_64.kiwi: same change openSUSE-dvd5-dvd-i586.kiwi: same change openSUSE-dvd5-dvd-x86_64.kiwi: same change openSUSE-ftp-ftp-i586_x86_64.kiwi: same change stub.kiwi: same change ++++++ openSUSE-Addon-NonOss.product ++++++ --- /var/tmp/diff_new_pack.UG1D0E/_old 2019-12-30 12:37:08.807879079 +0100 +++ /var/tmp/diff_new_pack.UG1D0E/_new 2019-12-30 12:37:08.807879079 +0100 @@ -4,7 +4,7 @@ <product> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20191229</version> + <version>20191230</version> <release>0</release> <summary>openSUSE NonOSS Addon</summary> <shortsummary>non oss addon</shortsummary>

1 0

commit libratbag for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package libratbag for openSUSE:Factory checked in at 2019-12-30 12:35:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libratbag (Old) and /work/SRC/openSUSE:Factory/.libratbag.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libratbag" Mon Dec 30 12:35:42 2019 rev:7 rq:760020 version:0.12 Changes: -------- --- /work/SRC/openSUSE:Factory/libratbag/libratbag.changes 2019-11-12 11:58:05.783514282 +0100 +++ /work/SRC/openSUSE:Factory/.libratbag.new.6675/libratbag.changes 2019-12-30 12:35:45.835834557 +0100 @@ -1,0 +2,12 @@ +Mon Dec 30 10:22:00 UTC 2019 - marix(a)marix.org + +- Update to version 0.12: + * Logitech devices now work when connected via Bluetooh + * Default verbosity level changed to raw + * Added and improved devices: + + Roccat Kone Pure + + Logitech M585/M590 + * Fixed devices: + + Logitech G305 + +------------------------------------------------------------------- Old: ---- libratbag-0.11.tar.xz New: ---- libratbag-0.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libratbag.spec ++++++ --- /var/tmp/diff_new_pack.29DJwb/_old 2019-12-30 12:35:46.555834943 +0100 +++ /var/tmp/diff_new_pack.29DJwb/_new 2019-12-30 12:35:46.559834945 +0100 @@ -18,7 +18,7 @@ Name: libratbag -Version: 0.11 +Version: 0.12 Release: 0 Summary: Configuration library for gaming mice License: MIT ++++++ _service ++++++ --- /var/tmp/diff_new_pack.29DJwb/_old 2019-12-30 12:35:46.579834956 +0100 +++ /var/tmp/diff_new_pack.29DJwb/_new 2019-12-30 12:35:46.579834956 +0100 @@ -2,7 +2,7 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/libratbag/libratbag.git</param> <param name="scm">git</param> - <param name="revision">v0.11</param> + <param name="revision">v0.12</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.29DJwb/_old 2019-12-30 12:35:46.591834962 +0100 +++ /var/tmp/diff_new_pack.29DJwb/_new 2019-12-30 12:35:46.595834965 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/libratbag/libratbag.git</param> - <param name="changesrevision">ce377fc36c2c35ab79446a580aa2141a4c7eff01</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">5357d4cbc2b18a15d0ea62e144b5bc664aa7d3f7</param></service></servicedata> \ No newline at end of file ++++++ libratbag-0.11.tar.xz -> libratbag-0.12.tar.xz ++++++ ++++ 2275 lines of diff (skipped)

1 0

commit clementine for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package clementine for openSUSE:Factory checked in at 2019-12-30 12:35:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clementine (Old) and /work/SRC/openSUSE:Factory/.clementine.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "clementine" Mon Dec 30 12:35:37 2019 rev:55 rq:760012 version:1.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/clementine/clementine.changes 2019-10-14 12:43:33.222378341 +0200 +++ /work/SRC/openSUSE:Factory/.clementine.new.6675/clementine.changes 2019-12-30 12:35:38.983830880 +0100 @@ -1,0 +2,26 @@ +Mon Dec 30 07:28:00 UTC 2019 - Dave Plater <davejplater(a)gmail.com> + +- Update to release version 1.3.9, first release since 2016. +- Upstream changes: + *Fix gpodder sync memory leaks in success cases. + *Fix resuming playback position on startup + *Remove obsolete forced setting of XDG_CONFIG_HOME + *Fix multiple triggers of shortcut actions + *Fix a few more gst plugins + *Use AWS mirror for eoan & disco too + *Fix edit tag dialog + *Change remaining group by defaults to album artist + *Fix updating song count + *Add check for valid birthTime() + *Remove watch for removed subdirectories + *Remove qt4 dependency + +------------------------------------------------------------------- +Sun Nov 10 12:54:34 UTC 2019 - Dave Plater <davejplater(a)gmail.com> + +- Update to git snapshot 1.3.1+git20191110 +- Upstream changes: + *Replace QString::null with QString() + *qt5 branch is now master. + +------------------------------------------------------------------- Old: ---- clementine-1.3.1+git20191004.tar.gz New: ---- clementine-1.3.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clementine.spec ++++++ --- /var/tmp/diff_new_pack.wdo5o9/_old 2019-12-30 12:35:40.843831878 +0100 +++ /var/tmp/diff_new_pack.wdo5o9/_new 2019-12-30 12:35:40.867831891 +0100 @@ -16,9 +16,9 @@ # -%define rev 664c5a31f9cf519af5a4c3adcb30dbbc73d037d6 +%define rev 240ba7b487e7132f14053e643866307b323b5f01 -%bcond_without git +%bcond_with git %if 0%{?suse_version} > 1500 %bcond_without manpage @@ -26,18 +26,19 @@ %bcond_with manpage %endif %bcond_without qt5 +%define gname Clementine Name: clementine -Version: 1.3.1+git20191004 +Version: 1.3.9 Release: 0 Summary: A music player inspired by Amarok 1.4 License: GPL-3.0-or-later Group: Productivity/Multimedia/Sound/Players Url: https://clementine-player.org/ %if %{without git} -#Source: https://github.com/clementine-player/Clementine/releases/download/%%{versio… +Source: https://github.com/clementine-player/%{gname}/archive/%{version}.tar.gz#/%{… %else -Source0: https://github.com/clementine-player/Clementine/archive/%{rev}.tar.gz#/%{na… +#Source0: https://github.com/clementine-player/Clementine/archive/%%{rev}.tar.gz#/%%{… %endif # PATCH-FEATURE-UPSTREAM uudisks2-support-for-devicemanager.patch Patch1: clementine-udisks-headers.patch @@ -140,9 +141,9 @@ %prep %if %{without git} -%setup -q +%setup -q -n %{gname}-%{version} %else -%setup -q -n Clementine-%{rev} +%setup -q -n %{gname}-%{rev} %endif %autopatch -p1 ++++++ clementine-1.3.1+git20191004.tar.gz -> clementine-1.3.9.tar.gz ++++++ /work/SRC/openSUSE:Factory/clementine/clementine-1.3.1+git20191004.tar.gz /work/SRC/openSUSE:Factory/.clementine.new.6675/clementine-1.3.9.tar.gz differ: char 12, line 1

1 0

commit php7-xdebug for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package php7-xdebug for openSUSE:Factory checked in at 2019-12-30 12:35:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php7-xdebug (Old) and /work/SRC/openSUSE:Factory/.php7-xdebug.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php7-xdebug" Mon Dec 30 12:35:36 2019 rev:11 rq:760010 version:2.9.0 Changes: -------- --- /work/SRC/openSUSE:Factory/php7-xdebug/php7-xdebug.changes 2019-12-21 12:34:46.835460224 +0100 +++ /work/SRC/openSUSE:Factory/.php7-xdebug.new.6675/php7-xdebug.changes 2019-12-30 12:35:36.799829708 +0100 @@ -1,0 +2,5 @@ +Tue Dec 24 16:46:09 UTC 2019 - munix9(a)googlemail.com + +- fix enabling extension in xdebug.ini + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php7-xdebug.spec ++++++ --- /var/tmp/diff_new_pack.e65tyi/_old 2019-12-30 12:35:37.323829989 +0100 +++ /var/tmp/diff_new_pack.e65tyi/_new 2019-12-30 12:35:37.327829991 +0100 @@ -59,7 +59,7 @@ %setup -q -n %{pkg_name}-%{pkg_version} %build -sed -i -e "s|; This is a generated file, do not modify by hand|zend_extension = \"xdebug.so\"|g" xdebug.ini +sed -i '1s|^|; comment out next line to disable xdebug extension in php\nzend_extension=xdebug.so\n\n|' xdebug.ini export CFLAGS="%{optflags} -fvisibility=hidden" %{__phpize} %configure --enable-xdebug

1 0

commit wavemon for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package wavemon for openSUSE:Factory checked in at 2019-12-30 12:35:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wavemon (Old) and /work/SRC/openSUSE:Factory/.wavemon.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wavemon" Mon Dec 30 12:35:34 2019 rev:26 rq:760009 version:0.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/wavemon/wavemon.changes 2019-05-20 10:29:45.657889144 +0200 +++ /work/SRC/openSUSE:Factory/.wavemon.new.6675/wavemon.changes 2019-12-30 12:35:35.583829056 +0100 @@ -1,0 +2,15 @@ +Mon Dec 30 00:03:35 UTC 2019 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 0.9.1 + Fixes + * Compatibility: + - replace non-portable on_exit with portable at_exit + - address gcc8 compiler warnings; + * Scan Screen: + - fix memory leak in scan handler + * Info Screen: + - fix logic around uninitialized variable + * Configuration Screen: + - fix numerical key issue on ARM 32bit (Raspberri Pi 2) + +------------------------------------------------------------------- Old: ---- wavemon-0.9.0.tar.gz New: ---- wavemon-0.9.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wavemon.spec ++++++ --- /var/tmp/diff_new_pack.ZzNEMN/_old 2019-12-30 12:35:36.159829365 +0100 +++ /var/tmp/diff_new_pack.ZzNEMN/_new 2019-12-30 12:35:36.163829367 +0100 @@ -17,7 +17,7 @@ Name: wavemon -Version: 0.9.0 +Version: 0.9.1 Release: 0 Summary: An ncurses monitoring application for wireless network devices License: GPL-2.0-or-later ++++++ wavemon-0.9.0.tar.gz -> wavemon-0.9.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/conf_scr.c new/wavemon-0.9.1/conf_scr.c --- old/wavemon-0.9.0/conf_scr.c 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/conf_scr.c 2019-12-30 00:45:44.000000000 +0100 @@ -51,7 +51,7 @@ break; case t_list: assert(item->list && item->list[*item->v.i]); - strncpy(s, item->list[*item->v.i], sizeof(s)); + strncpy(s, item->list[*item->v.i], sizeof(s)-1); /* Fall through, dummy statements to pacify gcc -Wall */ case t_sep: case t_func: @@ -90,7 +90,7 @@ } } -static void change_item(int inum, char sign) +static void change_item(int inum, int sign) { struct conf_item *item = ll_get(conf_items, inum); int tmp; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/configure new/wavemon-0.9.1/configure --- old/wavemon-0.9.0/configure 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/configure 2019-12-30 00:45:44.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wavemon 0.9.0. +# Generated by GNU Autoconf 2.69 for wavemon 0.9.1. # # Report bugs to <https://github.com/uoaerg/wavemon>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='wavemon' PACKAGE_TARNAME='wavemon-current' -PACKAGE_VERSION='0.9.0' -PACKAGE_STRING='wavemon 0.9.0' +PACKAGE_VERSION='0.9.1' +PACKAGE_STRING='wavemon 0.9.1' PACKAGE_BUGREPORT='https://github.com/uoaerg/wavemon' PACKAGE_URL='https://github.com/uoaerg/wavemon' @@ -1261,7 +1261,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wavemon 0.9.0 to adapt to many kinds of systems. +\`configure' configures wavemon 0.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1327,7 +1327,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wavemon 0.9.0:";; + short | recursive ) echo "Configuration of wavemon 0.9.1:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wavemon configure 0.9.0 +wavemon configure 0.9.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1848,7 +1848,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wavemon $as_me 0.9.0, which was +It was created by wavemon $as_me 0.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4974,7 +4974,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wavemon $as_me 0.9.0, which was +This file was extended by wavemon $as_me 0.9.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5028,7 +5028,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wavemon config.status 0.9.0 +wavemon config.status 0.9.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/configure.ac new/wavemon-0.9.1/configure.ac --- old/wavemon-0.9.0/configure.ac 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/configure.ac 2019-12-30 00:45:44.000000000 +0100 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.64) -AC_INIT([wavemon], [0.9.0], [https://github.com/uoaerg/wavemon], [wavemon-current], +AC_INIT([wavemon], [0.9.1], [https://github.com/uoaerg/wavemon], [wavemon-current], [https://github.com/uoaerg/wavemon]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/info_scr.c new/wavemon-0.9.1/info_scr.c --- old/wavemon-0.9.0/info_scr.c 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/info_scr.c 2019-12-30 00:45:44.000000000 +0100 @@ -78,7 +78,7 @@ char tmp[0x100]; int line; bool noise_data_valid; - int sig_qual = -1, sig_qual_max, sig_level; + int sig_qual = -1, sig_qual_max = 0, sig_level = 0; noise_data_valid = iw_nl80211_have_survey_data(&linkstat.data); sig_level = linkstat.data.signal; @@ -175,7 +175,7 @@ static void display_stats(void) { - char tmp[0x100]; + char tmp[0x120]; /* * Interface RX stats diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/iw_if.c new/wavemon-0.9.1/iw_if.c --- old/wavemon-0.9.0/iw_if.c 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/iw_if.c 2019-12-30 00:45:44.000000000 +0100 @@ -87,11 +87,13 @@ return if_set_up_or_down(ifname, false); } -/** Exit handler to restore interface 'down' state on exit via on_exit(3). */ -void if_set_down_on_exit(int rc, void *arg) +/** Exit handler to restore interface 'down' state on exit via atexit(3). */ +void if_set_down_on_exit(void) { - if (if_set_down(arg) < 0) { - err_msg("unable to restore %s interface state - set down manually", arg); + const char *ifname = conf_ifname(); + + if (ifname && if_set_down(ifname) < 0) { + err_msg("unable to restore %s interface state - set down manually", ifname); } } @@ -109,7 +111,7 @@ info->flags = if_get_flags(skfd, ifname); - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); + strncpy(ifr.ifr_name, ifname, IFNAMSIZ-1); if (ioctl(skfd, SIOCGIFMTU, &ifr) == 0) info->mtu = ifr.ifr_mtu; @@ -185,7 +187,7 @@ err_sys("%s: can not open socket", __func__); memset(info, 0, sizeof(*info)); - strncpy(iwr.ifr_name, ifname, IFNAMSIZ); + strncpy(iwr.ifr_name, ifname, IFNAMSIZ-1); if (ioctl(skfd, SIOCGIWNAME, &iwr) < 0) err_sys("can not open device '%s'", ifname); @@ -272,7 +274,7 @@ err_sys("%s: can not open socket", __func__); memset(range, 0, sizeof(struct iw_range)); - strncpy(iwr.ifr_name, ifname, IFNAMSIZ); + strncpy(iwr.ifr_name, ifname, IFNAMSIZ-1); iwr.u.data.pointer = (caddr_t) range; iwr.u.data.length = sizeof(struct iw_range); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/iw_if.h new/wavemon-0.9.1/iw_if.h --- old/wavemon-0.9.0/iw_if.h 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/iw_if.h 2019-12-30 00:45:44.000000000 +0100 @@ -76,7 +76,7 @@ }; extern bool if_is_up(const char *ifname); extern int if_set_up(const char *ifname); -extern void if_set_down_on_exit(int rc, void *arg); +extern void if_set_down_on_exit(void); extern void if_getinf(const char *ifname, struct if_info *info); /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/iw_scan.c new/wavemon-0.9.1/iw_scan.c --- old/wavemon-0.9.0/iw_scan.c 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/iw_scan.c 2019-12-30 00:45:44.000000000 +0100 @@ -143,7 +143,7 @@ int scan_dump_handler(struct nl_msg *msg, void *arg) { struct scan_result *sr = (struct scan_result *)arg; - struct scan_entry *new = calloc(1, sizeof(*new)); + struct scan_entry *new; struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); struct nlattr *tb[NL80211_ATTR_MAX + 1]; struct nlattr *bss[NL80211_BSS_MAX + 1]; @@ -430,7 +430,7 @@ if (if_set_up(conf_ifname()) < 0) err_sys("Can not bring up interface '%s'", conf_ifname()); - if (on_exit(if_set_down_on_exit, (void *)conf_ifname()) < 0) + if (atexit(if_set_down_on_exit) < 0) snprintf(sr->msg, sizeof(sr->msg), "Warning: unable to restore %s down state on exit", conf_ifname()); break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wavemon-0.9.0/wavemon.h new/wavemon-0.9.1/wavemon.h --- old/wavemon-0.9.0/wavemon.h 2018-12-30 02:08:25.000000000 +0100 +++ new/wavemon-0.9.1/wavemon.h 2019-12-30 00:45:44.000000000 +0100 @@ -174,7 +174,7 @@ int *dep; /* dependency */ bool hidden; /* only allow to set via wavemonrc */ - double min, /* value boundaries */ + int min, /* value boundaries */ max, inc; /* increment for value changes */ @@ -387,7 +387,7 @@ /* Integer units - similar to %g for float. */ static inline char *int_counts(uint32_t count) { - static char result[0x100]; + static char result[0x10]; if (count < 1000) sprintf(result, "%u", count);

1 0

commit nginx for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package nginx for openSUSE:Factory checked in at 2019-12-30 12:35:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nginx (Old) and /work/SRC/openSUSE:Factory/.nginx.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nginx" Mon Dec 30 12:35:29 2019 rev:44 rq:759966 version:1.17.7 Changes: -------- --- /work/SRC/openSUSE:Factory/nginx/nginx.changes 2019-12-02 11:38:04.206457257 +0100 +++ /work/SRC/openSUSE:Factory/.nginx.new.6675/nginx.changes 2019-12-30 12:35:32.939827637 +0100 @@ -1,0 +2,22 @@ +Sat Dec 28 11:03:16 UTC 2019 - Илья Индиго <ilya(a)ilya.pp.ua> + +- Refresh spec-file via spec-cleaner. +- Add in service-file Wants=network-online.target (boo#1155690) +- Update to 1.17.7 + * https://nginx.org/en/CHANGES + * A segmentation fault might occur on start or during + reconfiguration if the "rewrite" directive with an empty + replacement string was used in the configuration. + * A segmentation fault might occur in a worker process if the + "break" directive was used with the "alias" directive or with + the "proxy_pass" directive with a URI. + * The "Location" response header line might contain garbage if + the request URI was rewritten to the one containing a null character. + * Requests with bodies were handled incorrectly when returning redirections + with the "error_page" directive; the bug had appeared in 0.7.12. + * Socket leak when using HTTP/2. + * A timeout might occur while handling pipelined requests in an + SSL connection; the bug had appeared in 1.17.5. + * Bugfix in the ngx_http_dav_module. + +------------------------------------------------------------------- Old: ---- nginx-1.17.6.tar.gz nginx-1.17.6.tar.gz.asc New: ---- nginx-1.17.7.tar.gz nginx-1.17.7.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nginx.spec ++++++ --- /var/tmp/diff_new_pack.JQGplW/_old 2019-12-30 12:35:34.851828663 +0100 +++ /var/tmp/diff_new_pack.JQGplW/_new 2019-12-30 12:35:34.855828665 +0100 @@ -1,7 +1,7 @@ # # spec file for package nginx # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,43 @@ # -%bcond_with cpp_test -%bcond_with google_perftools - +%{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim/%(readlink %{_datadir}/vim/current)} +%define pkg_name nginx +%define ngx_prefix %{_prefix} +%define ngx_sbin_path %{_sbindir}/nginx +%define ngx_module_dir %{_libdir}/nginx/modules +%define ngx_conf_dir %{_sysconfdir}/nginx +%define ngx_conf_path %{ngx_conf_dir}/nginx.conf +%define ngx_log_dir %{_localstatedir}/log/nginx +%define ngx_error_log %{ngx_log_dir}/error.log +%define ngx_access_log %{ngx_log_dir}/access.log +%define ngx_home %{_localstatedir}/lib/nginx +%define ngx_tmp_http %{ngx_home}/tmp/ +%define ngx_tmp_proxy %{ngx_home}/proxy/ +%define ngx_tmp_fcgi %{ngx_home}/fastcgi/ +%define ngx_tmp_scgi %{ngx_home}/scgi/ +%define ngx_tmp_uwsgi %{ngx_home}/uwsgi/ +%define ngx_user_group nginx +%define ngx_doc_dir %{_docdir}/%{name} +%define ngx_fancyindex_version 0.4.2 +%define ngx_fancyindex_module_path ngx-fancyindex-%{ngx_fancyindex_version} +%define headers_more_nginx_version 0.33 +%define headers_more_nginx_module_path headers-more-nginx-module-%{headers_more_nginx_version} +%define nginx_upstream_check_version 0.3.0 +%define nginx_upstream_check_module_path nginx_upstream_check_module-%{nginx_upstream_check_version} +%define nginx_rtmp_version 1.2.1 +%define nginx_rtmp_module_path nginx-rtmp-module-%{nginx_rtmp_version} +%define src_install_dir %{_prefix}/src/%{name} %if 0%{?is_opensuse} %bcond_without extra_modules %else %bcond_with extra_modules %endif - %if 0%{?suse_version} != 1315 || 0%{?is_opensuse} %bcond_without libatomic %else %bcond_with libatomic %endif - %if 0%{?suse_version} > 1220 %bcond_without http2 %bcond_without pcre_jit @@ -40,25 +62,8 @@ %bcond_with pcre_jit %bcond_with systemd %endif - -%{!?vim_data_dir:%global vim_data_dir /usr/share/vim/%(readlink /usr/share/vim/current)} - -%define pkg_name nginx -%define ngx_prefix %{_prefix} -%define ngx_sbin_path %{_sbindir}/nginx -%define ngx_module_dir %{_libdir}/nginx/modules -%define ngx_conf_dir %{_sysconfdir}/nginx -%define ngx_conf_path %{ngx_conf_dir}/nginx.conf -%define ngx_log_dir %{_localstatedir}/log/nginx -%define ngx_error_log %{ngx_log_dir}/error.log -%define ngx_access_log %{ngx_log_dir}/access.log -%define ngx_home %{_localstatedir}/lib/nginx -%define ngx_tmp_http %{ngx_home}/tmp/ -%define ngx_tmp_proxy %{ngx_home}/proxy/ -%define ngx_tmp_fcgi %{ngx_home}/fastcgi/ -%define ngx_tmp_scgi %{ngx_home}/scgi/ -%define ngx_tmp_uwsgi %{ngx_home}/uwsgi/ -%define ngx_user_group nginx +%bcond_with cpp_test +%bcond_with google_perftools # %if %{with systemd} %define ngx_pid_path /run/nginx.pid @@ -67,25 +72,10 @@ %define ngx_pid_path %{_localstatedir}/run/nginx.pid %define ngx_lock_path %{_localstatedir}/run/nginx.lock %endif -%define ngx_doc_dir %{_datadir}/doc/packages/%{name} # Name: nginx -Version: 1.17.6 +Version: 1.17.7 Release: 0 -%define ngx_fancyindex_version 0.4.2 -%define ngx_fancyindex_module_path ngx-fancyindex-%{ngx_fancyindex_version} - -%define headers_more_nginx_version 0.33 -%define headers_more_nginx_module_path headers-more-nginx-module-%{headers_more_nginx_version} - -%define nginx_upstream_check_version 0.3.0 -%define nginx_upstream_check_module_path nginx_upstream_check_module-%{nginx_upstream_check_version} - -%define nginx_rtmp_version 1.2.1 -%define nginx_rtmp_module_path nginx-rtmp-module-%{nginx_rtmp_version} - -%define src_install_dir /usr/src/%{name} - Summary: A HTTP server and IMAP/POP3 proxy server License: BSD-2-Clause Group: Productivity/Networking/Web/Proxy @@ -99,7 +89,7 @@ Source6: https://github.com/yaoweibin/nginx_upstream_check_module/archive/v%{nginx_u… Source7: https://github.com/arut/nginx-rtmp-module/archive/v%{nginx_rtmp_version}/%{… Source100: nginx.rpmlintrc -Source101: http://nginx.org/download/nginx-%{version}.tar.gz.asc +Source101: https://nginx.org/download/nginx-%{version}.tar.gz.asc Source102: https://nginx.org/keys/mdounin.key#/%{name}.keyring # PATCH-FIX-UPSTREAM nginx-1.11.2-no_Werror.patch Patch0: nginx-1.11.2-no_Werror.patch @@ -115,6 +105,8 @@ Patch5: check_1.9.2+.patch BuildRequires: gcc-c++ BuildRequires: gd-devel +# +BuildRequires: libGeoIP-devel BuildRequires: libxslt-devel BuildRequires: openssl-devel BuildRequires: pcre-devel @@ -122,15 +114,13 @@ BuildRequires: vim BuildRequires: zlib-devel %requires_eq perl -Requires(pre): pwdutils +Requires(pre): shadow Recommends: logrotate Recommends: vim-plugin-nginx -Conflicts: otherproviders(nginx) +Conflicts: nginx Provides: http_daemon Provides: httpd # -BuildRequires: libGeoIP-devel -# %if %{with google_perftools} BuildRequires: google-perftools-devel %endif @@ -154,10 +144,11 @@ %package -n vim-plugin-nginx Summary: VIM support for nginx config files Group: Productivity/Text/Editors +%requires_eq vim %if 0%{?suse_version} > 1110 BuildArch: noarch %endif -%requires_eq vim + %description -n vim-plugin-nginx nginx [engine x] is a HTTP server and IMAP/POP3 proxy server written by Igor Sysoev. It has been running on many heavily loaded Russian sites for more than two years. @@ -192,6 +183,7 @@ %endif %build +# FIXME: you should use the %%configure macro ./configure \ --prefix=%{ngx_prefix}/ \ --sbin-path=%{ngx_sbin_path} \ ++++++ nginx-1.17.6.tar.gz -> nginx-1.17.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/CHANGES new/nginx-1.17.7/CHANGES --- old/nginx-1.17.6/CHANGES 2019-11-19 15:19:02.000000000 +0100 +++ new/nginx-1.17.7/CHANGES 2019-12-24 16:00:14.000000000 +0100 @@ -1,4 +1,29 @@ +Changes with nginx 1.17.7 24 Dec 2019 + + *) Bugfix: a segmentation fault might occur on start or during + reconfiguration if the "rewrite" directive with an empty replacement + string was used in the configuration. + + *) Bugfix: a segmentation fault might occur in a worker process if the + "break" directive was used with the "alias" directive or with the + "proxy_pass" directive with a URI. + + *) Bugfix: the "Location" response header line might contain garbage if + the request URI was rewritten to the one containing a null character. + + *) Bugfix: requests with bodies were handled incorrectly when returning + redirections with the "error_page" directive; the bug had appeared in + 0.7.12. + + *) Bugfix: socket leak when using HTTP/2. + + *) Bugfix: a timeout might occur while handling pipelined requests in an + SSL connection; the bug had appeared in 1.17.5. + + *) Bugfix: in the ngx_http_dav_module. + + Changes with nginx 1.17.6 19 Nov 2019 *) Feature: the $proxy_protocol_server_addr and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/CHANGES.ru new/nginx-1.17.7/CHANGES.ru --- old/nginx-1.17.6/CHANGES.ru 2019-11-19 15:19:01.000000000 +0100 +++ new/nginx-1.17.7/CHANGES.ru 2019-12-24 16:00:12.000000000 +0100 @@ -1,4 +1,29 @@ +Изменения в nginx 1.17.7 24.12.2019 + + *) Исправление: на старте или во время переконфигурации мог произойти + segmentation fault, если в конфигурации использовалась директива + rewrite с пустой строкой замены. + + *) Исправление: в рабочем процессе мог произойти segmentation fault, + если директива break использовалась совместно с директивой alias или + директивой proxy_pass с URI. + + *) Исправление: строка Location заголовка ответа могла содержать мусор, + если URI запроса был изменён на URI, содержащий нулевой символ. + + *) Исправление: при возврате перенаправлений с помощью директивы + error_page запросы с телом обрабатывались некорректно; ошибка + появилась в 0.7.12. + + *) Исправление: утечки сокетов при использовании HTTP/2. + + *) Исправление: при обработке pipelined-запросов по SSL-соединению мог + произойти таймаут; ошибка появилась в 1.17.5. + + *) Исправление: в модуле ngx_http_dav_module. + + Изменения в nginx 1.17.6 19.11.2019 *) Добавление: переменные $proxy_protocol_server_addr и diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/man/nginx.8 new/nginx-1.17.7/man/nginx.8 --- old/nginx-1.17.6/man/nginx.8 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/man/nginx.8 2019-12-24 16:00:09.000000000 +0100 @@ -1,5 +1,5 @@ .\" -.\" Copyright (C) 2010 Sergey A. Osokin +.\" Copyright (C) 2010, 2019 Sergey A. Osokin .\" Copyright (C) Nginx, Inc. .\" All rights reserved. .\" @@ -25,7 +25,7 @@ .\" SUCH DAMAGE. .\" .\" -.Dd June 16, 2015 +.Dd December 5, 2019 .Dt NGINX 8 .Os .Sh NAME @@ -42,7 +42,8 @@ .Nm (pronounced .Dq engine x ) -is an HTTP and reverse proxy server, as well as a mail proxy server. +is an HTTP and reverse proxy server, a mail proxy server, and a generic +TCP/UDP proxy server. It is known for its high performance, stability, rich feature set, simple configuration, and low resource consumption. .Pp @@ -82,15 +83,15 @@ .It Cm reload .Dv SIGHUP .El +.It Fl T +Same as +.Fl t , +but additionally dump configuration files to standard output. .It Fl t Do not run, just test the configuration file. .Nm checks the configuration file syntax and then tries to open files referenced in the configuration file. -.It Fl T -Same as -.Fl t , -but additionally dump configuration files to standard output. .It Fl V Print the .Nm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/core/nginx.h new/nginx-1.17.7/src/core/nginx.h --- old/nginx-1.17.6/src/core/nginx.h 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/core/nginx.h 2019-12-24 16:00:09.000000000 +0100 @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1017006 -#define NGINX_VERSION "1.17.6" +#define nginx_version 1017007 +#define NGINX_VERSION "1.17.7" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/event/ngx_event.c new/nginx-1.17.7/src/event/ngx_event.c --- old/nginx-1.17.6/src/event/ngx_event.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/event/ngx_event.c 2019-12-24 16:00:09.000000000 +0100 @@ -238,8 +238,6 @@ } if (!ngx_queue_empty(&ngx_posted_next_events)) { - ngx_queue_add(&ngx_posted_events, &ngx_posted_next_events); - ngx_queue_init(&ngx_posted_next_events); timer = 0; } @@ -263,6 +261,7 @@ } ngx_event_process_posted(cycle, &ngx_posted_events); + ngx_event_process_posted_next(cycle, &ngx_posted_next_events); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/event/ngx_event_openssl.c new/nginx-1.17.7/src/event/ngx_event_openssl.c --- old/nginx-1.17.6/src/event/ngx_event_openssl.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/event/ngx_event_openssl.c 2019-12-24 16:00:09.000000000 +0100 @@ -43,7 +43,6 @@ #endif static ngx_int_t ngx_ssl_handle_recv(ngx_connection_t *c, int n); static void ngx_ssl_write_handler(ngx_event_t *wev); -static void ngx_ssl_next_read_handler(ngx_event_t *rev); #ifdef SSL_READ_EARLY_DATA_SUCCESS static ssize_t ngx_ssl_write_early(ngx_connection_t *c, u_char *data, size_t size); @@ -2018,11 +2017,6 @@ c->read->available = 0; c->read->ready = 0; - if (c->ssl->next_read_handler == NULL) { - c->ssl->next_read_handler = c->read->handler; - c->read->handler = ngx_ssl_next_read_handler; - } - ngx_post_event(c->read, &ngx_posted_next_events); } @@ -2328,31 +2322,6 @@ } -static void -ngx_ssl_next_read_handler(ngx_event_t *rev) -{ - ngx_connection_t *c; - - c = rev->data; - - ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "SSL next read handler"); - - rev->handler = c->ssl->next_read_handler; - c->ssl->next_read_handler = NULL; - - if (!rev->ready) { - rev->ready = 1; - rev->available = -1; - } - - if (rev->posted) { - ngx_delete_posted_event(rev); - } - - rev->handler(rev); -} - - /* * OpenSSL has no SSL_writev() so we copy several bufs into our 16K buffer * before the SSL_write() call to decrease a SSL overhead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/event/ngx_event_openssl.h new/nginx-1.17.7/src/event/ngx_event_openssl.h --- old/nginx-1.17.6/src/event/ngx_event_openssl.h 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/event/ngx_event_openssl.h 2019-12-24 16:00:09.000000000 +0100 @@ -86,7 +86,6 @@ ngx_event_handler_pt saved_read_handler; ngx_event_handler_pt saved_write_handler; - ngx_event_handler_pt next_read_handler; u_char early_buf; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/event/ngx_event_posted.c new/nginx-1.17.7/src/event/ngx_event_posted.c --- old/nginx-1.17.6/src/event/ngx_event_posted.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/event/ngx_event_posted.c 2019-12-24 16:00:09.000000000 +0100 @@ -34,3 +34,29 @@ ev->handler(ev); } } + + +void +ngx_event_process_posted_next(ngx_cycle_t *cycle, ngx_queue_t *posted) +{ + ngx_queue_t *q; + ngx_event_t *ev; + + while (!ngx_queue_empty(posted)) { + + q = ngx_queue_head(posted); + ev = ngx_queue_data(q, ngx_event_t, queue); + + ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, + "posted next event %p", ev); + + ngx_delete_posted_event(ev); + + if (!ev->ready) { + ev->ready = 1; + ev->available = -1; + } + + ev->handler(ev); + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/event/ngx_event_posted.h new/nginx-1.17.7/src/event/ngx_event_posted.h --- old/nginx-1.17.6/src/event/ngx_event_posted.h 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/event/ngx_event_posted.h 2019-12-24 16:00:09.000000000 +0100 @@ -39,6 +39,7 @@ void ngx_event_process_posted(ngx_cycle_t *cycle, ngx_queue_t *posted); +void ngx_event_process_posted_next(ngx_cycle_t *cycle, ngx_queue_t *posted); extern ngx_queue_t ngx_posted_accept_events; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/modules/ngx_http_dav_module.c new/nginx-1.17.7/src/http/modules/ngx_http_dav_module.c --- old/nginx-1.17.6/src/http/modules/ngx_http_dav_module.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/modules/ngx_http_dav_module.c 2019-12-24 16:00:09.000000000 +0100 @@ -56,7 +56,7 @@ static ngx_int_t ngx_http_dav_depth(ngx_http_request_t *r, ngx_int_t dflt); static ngx_int_t ngx_http_dav_error(ngx_log_t *log, ngx_err_t err, ngx_int_t not_found, char *failed, u_char *path); -static ngx_int_t ngx_http_dav_location(ngx_http_request_t *r, u_char *path); +static ngx_int_t ngx_http_dav_location(ngx_http_request_t *r); static void *ngx_http_dav_create_loc_conf(ngx_conf_t *cf); static char *ngx_http_dav_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child); @@ -285,7 +285,7 @@ } if (status == NGX_HTTP_CREATED) { - if (ngx_http_dav_location(r, path.data) != NGX_OK) { + if (ngx_http_dav_location(r) != NGX_OK) { ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR); return; } @@ -312,7 +312,7 @@ ngx_file_info_t fi; ngx_http_dav_loc_conf_t *dlcf; - if (r->headers_in.content_length_n > 0) { + if (r->headers_in.content_length_n > 0 || r->headers_in.chunked) { ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "DELETE with body is unsupported"); return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; @@ -495,7 +495,7 @@ size_t root; ngx_str_t path; - if (r->headers_in.content_length_n > 0) { + if (r->headers_in.content_length_n > 0 || r->headers_in.chunked) { ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, "MKCOL with body is unsupported"); return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; @@ -513,7 +513,6 @@ } *(p - 1) = '\0'; - r->uri.len--; ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http mkcol path: \"%s\"", path.data); @@ -521,7 +520,7 @@ if (ngx_create_dir(path.data, ngx_dir_access(dlcf->access)) != NGX_FILE_ERROR) { - if (ngx_http_dav_location(r, path.data) != NGX_OK) { + if (ngx_http_dav_location(r) != NGX_OK) { return NGX_HTTP_INTERNAL_SERVER_ERROR; } @@ -550,7 +549,9 @@ ngx_http_dav_copy_ctx_t copy; ngx_http_dav_loc_conf_t *dlcf; - if (r->headers_in.content_length_n > 0) { + if (r->headers_in.content_length_n > 0 || r->headers_in.chunked) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "COPY and MOVE with body are unsupported"); return NGX_HTTP_UNSUPPORTED_MEDIA_TYPE; } @@ -1069,35 +1070,16 @@ static ngx_int_t -ngx_http_dav_location(ngx_http_request_t *r, u_char *path) +ngx_http_dav_location(ngx_http_request_t *r) { - u_char *location; - ngx_http_core_loc_conf_t *clcf; - r->headers_out.location = ngx_list_push(&r->headers_out.headers); if (r->headers_out.location == NULL) { return NGX_ERROR; } - clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); - - if (!clcf->alias && clcf->root_lengths == NULL) { - location = path + clcf->root.len; - - } else { - location = ngx_pnalloc(r->pool, r->uri.len); - if (location == NULL) { - ngx_http_clear_location(r); - return NGX_ERROR; - } - - ngx_memcpy(location, r->uri.data, r->uri.len); - } - r->headers_out.location->hash = 1; ngx_str_set(&r->headers_out.location->key, "Location"); - r->headers_out.location->value.len = r->uri.len; - r->headers_out.location->value.data = location; + r->headers_out.location->value = r->uri; return NGX_OK; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/modules/ngx_http_index_module.c new/nginx-1.17.7/src/http/modules/ngx_http_index_module.c --- old/nginx-1.17.6/src/http/modules/ngx_http_index_module.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/modules/ngx_http_index_module.c 2019-12-24 16:00:09.000000000 +0100 @@ -163,7 +163,7 @@ name = ngx_http_map_uri_to_path(r, &path, &root, reserve); if (name == NULL) { - return NGX_ERROR; + return NGX_HTTP_INTERNAL_SERVER_ERROR; } allocated = path.data + path.len - name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/modules/ngx_http_rewrite_module.c new/nginx-1.17.7/src/http/modules/ngx_http_rewrite_module.c --- old/nginx-1.17.6/src/http/modules/ngx_http_rewrite_module.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/modules/ngx_http_rewrite_module.c 2019-12-24 16:00:09.000000000 +0100 @@ -318,6 +318,11 @@ value = cf->args->elts; + if (value[2].len == 0) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "empty replacement"); + return NGX_CONF_ERROR; + } + ngx_memzero(&rc, sizeof(ngx_regex_compile_t)); rc.pattern = value[1]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/modules/ngx_http_static_module.c new/nginx-1.17.7/src/http/modules/ngx_http_static_module.c --- old/nginx-1.17.6/src/http/modules/ngx_http_static_module.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/modules/ngx_http_static_module.c 2019-12-24 16:00:09.000000000 +0100 @@ -157,8 +157,8 @@ len = r->uri.len + 1; - if (!clcf->alias && clcf->root_lengths == NULL && r->args.len == 0) { - location = path.data + clcf->root.len; + if (!clcf->alias && r->args.len == 0) { + location = path.data + root; *last = '/'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/modules/ngx_http_upstream_keepalive_module.c new/nginx-1.17.7/src/http/modules/ngx_http_upstream_keepalive_module.c --- old/nginx-1.17.6/src/http/modules/ngx_http_upstream_keepalive_module.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/modules/ngx_http_upstream_keepalive_module.c 2019-12-24 16:00:09.000000000 +0100 @@ -275,6 +275,7 @@ c->idle = 0; c->sent = 0; + c->data = NULL; c->log = pc->log; c->read->log = pc->log; c->write->log = pc->log; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/ngx_http_core_module.c new/nginx-1.17.7/src/http/ngx_http_core_module.c --- old/nginx-1.17.6/src/http/ngx_http_core_module.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/ngx_http_core_module.c 2019-12-24 16:00:09.000000000 +0100 @@ -1843,7 +1843,8 @@ } } - last = ngx_cpystrn(last, r->uri.data + alias, r->uri.len - alias + 1); + last = ngx_copy(last, r->uri.data + alias, r->uri.len - alias); + *last = '\0'; return last; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/ngx_http_script.c new/nginx-1.17.7/src/http/ngx_http_script.c --- old/nginx-1.17.6/src/http/ngx_http_script.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/ngx_http_script.c 2019-12-24 16:00:09.000000000 +0100 @@ -1470,7 +1470,14 @@ void ngx_http_script_break_code(ngx_http_script_engine_t *e) { - e->request->uri_changed = 0; + ngx_http_request_t *r; + + r = e->request; + + if (r->uri_changed) { + r->valid_location = 0; + r->uri_changed = 0; + } e->ip = ngx_http_script_exit; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/ngx_http_special_response.c new/nginx-1.17.7/src/http/ngx_http_special_response.c --- old/nginx-1.17.6/src/http/ngx_http_special_response.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/ngx_http_special_response.c 2019-12-24 16:00:09.000000000 +0100 @@ -623,6 +623,12 @@ return ngx_http_named_location(r, &uri); } + r->expect_tested = 1; + + if (ngx_http_discard_request_body(r) != NGX_OK) { + r->keepalive = 0; + } + location = ngx_list_push(&r->headers_out.headers); if (location == NULL) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/nginx-1.17.6/src/http/v2/ngx_http_v2.c new/nginx-1.17.7/src/http/v2/ngx_http_v2.c --- old/nginx-1.17.6/src/http/v2/ngx_http_v2.c 2019-11-19 15:18:58.000000000 +0100 +++ new/nginx-1.17.7/src/http/v2/ngx_http_v2.c 2019-12-24 16:00:09.000000000 +0100 @@ -178,6 +178,7 @@ static ngx_int_t ngx_http_v2_terminate_stream(ngx_http_v2_connection_t *h2c, ngx_http_v2_stream_t *stream, ngx_uint_t status); static void ngx_http_v2_close_stream_handler(ngx_event_t *ev); +static void ngx_http_v2_retry_close_stream_handler(ngx_event_t *ev); static void ngx_http_v2_handle_connection_handler(ngx_event_t *rev); static void ngx_http_v2_idle_handler(ngx_event_t *rev); static void ngx_http_v2_finalize_connection(ngx_http_v2_connection_t *h2c, @@ -4288,8 +4289,9 @@ fc = stream->request->connection; if (stream->queued) { - fc->write->handler = ngx_http_v2_close_stream_handler; - fc->read->handler = ngx_http_empty_handler; + fc->error = 1; + fc->write->handler = ngx_http_v2_retry_close_stream_handler; + fc->read->handler = ngx_http_v2_retry_close_stream_handler; return; } @@ -4409,6 +4411,22 @@ ngx_http_v2_close_stream(r->stream, 0); } + + +static void +ngx_http_v2_retry_close_stream_handler(ngx_event_t *ev) +{ + ngx_connection_t *fc; + ngx_http_request_t *r; + + fc = ev->data; + r = fc->data; + + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0, + "http2 retry close stream handler"); + + ngx_http_v2_close_stream(r->stream, 0); +} static void ++++++ nginx.service ++++++ --- /var/tmp/diff_new_pack.JQGplW/_old 2019-12-30 12:35:35.163828830 +0100 +++ /var/tmp/diff_new_pack.JQGplW/_new 2019-12-30 12:35:35.163828830 +0100 @@ -1,6 +1,7 @@ [Unit] Description=The nginx HTTP and reverse proxy server -After=network.target remote-fs.target nss-lookup.target +After=network-online.target remote-fs.target nss-lookup.target +Wants=network-online.target [Service] PIDFile=/run/nginx.pid

1 0

commit knot for openSUSE:Factory
by root 30 Dec '19

30 Dec '19

Hello community, here is the log from the commit of package knot for openSUSE:Factory checked in at 2019-12-30 12:35:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/knot (Old) and /work/SRC/openSUSE:Factory/.knot.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "knot" Mon Dec 30 12:35:25 2019 rev:32 rq:759965 version:1.6.8 Changes: -------- --- /work/SRC/openSUSE:Factory/knot/knot.changes 2018-01-13 21:47:25.314705803 +0100 +++ /work/SRC/openSUSE:Factory/.knot.new.6675/knot.changes 2019-12-30 12:35:25.731823769 +0100 @@ -1,0 +2,6 @@ +Thu Dec 19 14:59:52 UTC 2019 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- BuildRequire pkgconfig(libsystemd) instead of systemd-devel: + Allow OBS to shortcut through the -mini flavors. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ knot.spec ++++++ --- /var/tmp/diff_new_pack.3MNTjm/_old 2019-12-30 12:35:27.007824454 +0100 +++ /var/tmp/diff_new_pack.3MNTjm/_new 2019-12-30 12:35:27.011824456 +0100 @@ -1,7 +1,7 @@ # # spec file for package knot # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -39,9 +39,9 @@ Release: 0 %define pkg_name knot Summary: An authoritative DNS daemon -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Networking/DNS/Servers -Url: http://www.knot-dns.cz +URL: http://www.knot-dns.cz Source0: https://secure.nic.cz/files/knot-dns/%{pkg_name}-%{version}.tar.xz Source1: knot.conf Source2: knot.service @@ -75,7 +75,7 @@ %endif %if %{with systemd} %define has_systemd 1 -BuildRequires: systemd-devel +BuildRequires: pkgconfig(libsystemd) %{?systemd_requires} %endif Conflicts: knot2

1 0