August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit java-1_8_0-openjdk for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package java-1_8_0-openjdk for openSUSE:Factory checked in at 2017-08-29 11:38:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-1_8_0-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-1_8_0-openjdk" Tue Aug 29 11:38:49 2017 rev:50 rq:518519 version:1.8.0.144 Changes: -------- --- /work/SRC/openSUSE:Factory/java-1_8_0-openjdk/java-1_8_0-openjdk.changes 2017-08-10 13:45:49.082484110 +0200 +++ /work/SRC/openSUSE:Factory/.java-1_8_0-openjdk.new/java-1_8_0-openjdk.changes 2017-08-29 11:38:50.548595540 +0200 @@ -1,0 +2,8 @@ +Wed Aug 23 09:54:09 UTC 2017 - fstrba(a)suse.com + +- Added patch: + * java-1_8_0-openjdk-linuxfilestore.patch + - Fix bsc#1032647, bsc#1052009 with btrfs subvolumes and + overlayfs + +------------------------------------------------------------------- New: ---- java-1_8_0-openjdk-linuxfilestore.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-1_8_0-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.mhgi11/_old 2017-08-29 11:38:53.096237598 +0200 +++ /var/tmp/diff_new_pack.mhgi11/_new 2017-08-29 11:38:53.108235912 +0200 @@ -170,7 +170,7 @@ Version: %{javaver}.%{updatever} Release: 0 Summary: OpenJDK 8 Runtime Environment -License: Apache-1.1 and Apache-2.0 and GPL-1.0+ and GPL-2.0 and GPL-2.0-with-classpath-exception and LGPL-2.0 and MPL-1.0 and MPL-1.1 and SUSE-Public-Domain and W3C +License: Apache-1.1 AND Apache-2.0 AND GPL-1.0+ AND GPL-2.0 AND GPL-2.0-with-classpath-exception AND LGPL-2.0 AND MPL-1.0 AND MPL-1.1 AND SUSE-Public-Domain AND W3C Group: Development/Languages/Java Url: http://openjdk.java.net/ Source0: http://icedtea.classpath.org/download/source/icedtea-%{icedtea_version}.tar… @@ -206,6 +206,7 @@ Patch1001: java-1_8_0-openjdk-suse-desktop-files.patch Patch2000: java-1_8_0-openjdk-gcc6.patch Patch2001: disable-doclint-by-default.patch +Patch2002: java-1_8_0-openjdk-linuxfilestore.patch BuildRequires: alsa-lib-devel BuildRequires: autoconf BuildRequires: automake @@ -258,7 +259,6 @@ Provides: jre1.6.x Provides: jre1.7.x Provides: jre1.8.x -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with bootstrap} BuildRequires: java-bootstrap-devel >= 1.7.0 %else @@ -444,10 +444,15 @@ for file in tapset/*.in; do OUTPUT_FILE=`echo $file | sed -e s:\.in$::g` +%ifnarch %{arm} sed -e s:@ABS_SERVER_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/server/libjvm.so:g $file > $file.1 -# TODO find out which architectures other than ix86 have a client vm +%else + sed -e '/@ABS_SERVER_LIBJVM_SO@/d' $file > $file.1 +%endif + +# TODO find out which architectures other than ix86 and arm have a client vm -%ifarch %{ix86} +%ifarch %{ix86} %{arm} sed -e s:@ABS_CLIENT_LIBJVM_SO@:%{_jvmdir}/%{jredir}/lib/%{archinstall}/client/libjvm.so:g $file.1 > $OUTPUT_FILE %else sed -e '/@ABS_CLIENT_LIBJVM_SO@/d' $file.1 > $OUTPUT_FILE @@ -566,6 +571,8 @@ patch -p0 -i %{PATCH2000} patch -p0 -i %{PATCH2001} +patch -p0 -i %{PATCH2002} + (cd openjdk/common/autoconf bash ./autogen.sh ) @@ -1059,20 +1066,22 @@ fi %files -f %{name}.files -%defattr(-,root,root) %dir %{_jvmdir}/%{jredir}/lib/%{archinstall} %dir %{_datadir}/icons/hicolor %{_datadir}/icons/hicolor/*x*/apps/java-%{javaver}.png %files headless -f %{name}.files-headless -%defattr(-,root,root,-) %dir %{_jvmdir} %dir %{_jvmdir}/%{jredir}/ %dir %{_jvmdir}/%{jredir}/bin %dir %{_jvmdir}/%{jredir}/lib %dir %{_jvmdir}/%{jredir}/lib/%{archinstall} %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/jli +%ifnarch %{arm} %dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/server +%else +%dir %{_jvmdir}/%{jredir}/lib/%{archinstall}/client +%endif %dir %{_jvmdir}/%{jredir}/lib/cmm %dir %{_jvmdir}/%{jredir}/lib/desktop %dir %{_jvmdir}/%{jredir}/lib/ext @@ -1117,7 +1126,6 @@ %{_jvmdir}/%{jredir}/lib/security/local_policy.jar %files devel -%defattr(-,root,root,-) %dir %{_jvmdir}/%{sdkdir}/bin %dir %{_jvmdir}/%{sdkdir}/include %dir %{_jvmdir}/%{sdkdir}/lib @@ -1168,20 +1176,16 @@ %endif %files demo -f %{name}-demo.files -%defattr(-,root,root,-) %files src -%defattr(-,root,root,-) %{_jvmdir}/%{sdkdir}/src.zip %files javadoc -%defattr(0644,root,root,0755) %dir %{_javadocdir} %dir %{_javadocdir}/%{sdklnk} %{_javadocdir}/%{sdklnk}/* %files accessibility -%defattr(-,root,root) %dir %{_jvmdir}/%{jredir}/lib/ext %config(noreplace) %{_jvmdir}/%{jredir}/lib/accessibility.properties %ghost %{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so ++++++ java-1_8_0-openjdk-linuxfilestore.patch ++++++ --- openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:40:26.690809603 +0200 +++ openjdk/jdk/src/solaris/classes/sun/nio/fs/LinuxFileStore.java 2017-08-23 11:44:28.314815334 +0200 @@ -74,8 +74,16 @@ } catch (UnixException x) { x.rethrowAsIOException(parent); } - if (attrs.dev() != dev()) - break; + if (attrs.dev() != dev()) { + + // step 3: lookup mounted file systems (use /proc/mounts to ensure we + // find the file system even when not in /etc/mtab) + byte[] dir = path.asByteArray(); + for (UnixMountEntry entry: fs.getMountEntries("/proc/mounts")) { + if (Arrays.equals(dir, entry.dir())) + return entry; + } + } path = parent; parent = parent.getParent(); }

1 0

commit mediastreamer2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package mediastreamer2 for openSUSE:Factory checked in at 2017-08-29 11:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mediastreamer2 (Old) and /work/SRC/openSUSE:Factory/.mediastreamer2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mediastreamer2" Tue Aug 29 11:38:39 2017 rev:22 rq:511963 version:2.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer2.changes 2017-06-28 10:34:58.370527092 +0200 +++ /work/SRC/openSUSE:Factory/.mediastreamer2.new/mediastreamer2.changes 2017-08-29 11:38:41.485868848 +0200 @@ -1,0 +2,12 @@ +Fri Jul 21 13:30:37 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 2.16.1 (changes since 2.15.1): + * Add sound card driven ticker. + * Sound card flow control improvements. +- Enable documentation installation. +- Switch from building with autotools to cmake. +- Add mediastreamer2-fix-pkgconfig.patch: Install mediastreamer.pc. +- Add mediastreamer2-fix-xv.patch: Fix Xv by linking with Xext. +- Build with optional TurboJpeg and Bcg729 dependencies. + +------------------------------------------------------------------- Old: ---- mediastreamer-2.15.1.tar.gz New: ---- mediastreamer-2.16.1.tar.gz mediastreamer2-fix-pkgconfig.patch mediastreamer2-fix-xv.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mediastreamer2.spec ++++++ --- /var/tmp/diff_new_pack.vyiBSL/_old 2017-08-29 11:38:42.953662623 +0200 +++ /var/tmp/diff_new_pack.vyiBSL/_new 2017-08-29 11:38:42.957662062 +0200 @@ -19,10 +19,10 @@ %define _name mediastreamer %define sobase libmediastreamer_base %define sovoip libmediastreamer_voip -%define sover 7 +%define sover 10 %bcond_without ffmpeg Name: mediastreamer2 -Version: 2.15.1 +Version: 2.16.1 Release: 0 Summary: Audio/Video real-time streaming License: GPL-2.0+ @@ -30,35 +30,43 @@ Url: https://linphone.org/technical-corner/mediastreamer2/overview Source: https://linphone.org/releases/sources/%{_name}/%{_name}-%{version}.tar.gz Source99: baselibs.conf -BuildRequires: autoconf -BuildRequires: automake +# PATCH-FIX-OPENSUSE mediastreamer2-fix-pkgconfig.patch sor.alexei(a)meowr.ru -- Install mediastreamer.pc. +Patch0: mediastreamer2-fix-pkgconfig.patch +# PATCH-FIX-OPENSUSE mediastreamer2-fix-xv.patch sor.alexei(a)meowr.ru -- Fix Xv by linking with Xext. +Patch1: mediastreamer2-fix-xv.patch +BuildRequires: bcmatroska2-devel +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: gawk BuildRequires: gcc-c++ -BuildRequires: intltool +BuildRequires: graphviz BuildRequires: libgsm-devel BuildRequires: libpcap-devel BuildRequires: libsrtp-devel -BuildRequires: libtool BuildRequires: libv4l-devel BuildRequires: libvpx-devel BuildRequires: pkgconfig +BuildRequires: python BuildRequires: spandsp-devel BuildRequires: vim BuildRequires: pkgconfig(alsa) -BuildRequires: pkgconfig(bctoolbox) -BuildRequires: pkgconfig(libbzrtp) >= 1.0.4 -BuildRequires: pkgconfig(libebml) -BuildRequires: pkgconfig(libmatroska) +BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 +BuildRequires: pkgconfig(libbcg729) +BuildRequires: pkgconfig(libbzrtp) >= 1.0.6 BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libupnp) BuildRequires: pkgconfig(opus) -BuildRequires: pkgconfig(ortp) >= 1.0.0 +BuildRequires: pkgconfig(ortp) >= 1.0.2 BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(speexdsp) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xv) -Recommends: %{name}-lang +Obsoletes: %{name}-lang +%if 0%{?suse_version} > 1320 +BuildRequires: libjpeg-devel +%endif %if %{with ffmpeg} BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glu) @@ -71,8 +79,6 @@ real-time streaming and processing. Written in pure C, it is based upon the oRTP library. -%lang_package - %package -n %{sobase}%{sover} Summary: Audio/video real-time streaming library, base part Group: System/Libraries @@ -97,6 +103,7 @@ Requires: %{name} = %{version} Requires: %{sobase}%{sover} = %{version} Requires: %{sovoip}%{sover} = %{version} +Requires: bcmatroska2-devel %description devel Mediastreamer2 is a GPL licensed library to make audio and video @@ -108,25 +115,28 @@ %prep %setup -q -n %{_name}-%{version} +%patch0 -p1 +%patch1 -p1 %build -NOCONFIGURE=1 ./autogen.sh -%configure \ - --enable-external-ortp \ - --enable-zrtp \ -%if %{without ffmpeg} - --disable-non-free-codecs \ - --disable-video \ +%cmake \ +%if %{with ffmpeg} + -DCMAKE_INCLUDE_PATH=%{_includedir}/ffmpeg \ +%else + -DENABLE_NON_FREE_CODECS=OFF \ + -DENABLE_VIDEO=OFF \ %endif - --disable-strict \ - --disable-static + -DENABLE_ZRTP=ON \ + -DENABLE_STRICT=OFF \ + -DENABLE_STATIC=OFF make %{?_smp_mflags} V=1 %install -%make_install +%cmake_install -%find_lang %{_name} -find %{buildroot} -type f -name "*.la" -delete -print +mkdir -p %{buildroot}%{_docdir}/%{name}/ +mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \ + %{buildroot}%{_docdir}/%{name}/ %post -n %{sobase}%{sover} -p /sbin/ldconfig @@ -137,29 +147,26 @@ %postun -n %{sovoip}%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README.md +%doc %{_docdir}/%{name}/ +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120000 %{_bindir}/mediastream -%{_bindir}/msaudiocmp -%{_bindir}/pcap_playback +%{_bindir}/mkvstream %dir %{_datadir}/images/ %{_datadir}/images/nowebcamCIF.jpg - -%files lang -f %{_name}.lang -%defattr(-,root,root) +%endif %files -n %{sobase}%{sover} -%defattr(-,root,root) %{_libdir}/%{sobase}.so.%{sover}* %files -n %{sovoip}%{sover} -%defattr(-,root,root) %{_libdir}/%{sovoip}.so.%{sover}* %files devel -%defattr(-,root,root) %{_includedir}/mediastreamer2/ +%{_bindir}/mediastreamer2_tester %{_libdir}/libmediastreamer_*.so -%{_libdir}/pkgconfig/mediastreamer.pc +%{_datadir}/mediastreamer2_tester/ +%{_datadir}/Mediastreamer2/ +%{_libdir}/pkgconfig/%{_name}.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.vyiBSL/_old 2017-08-29 11:38:43.129637899 +0200 +++ /var/tmp/diff_new_pack.vyiBSL/_new 2017-08-29 11:38:43.133637337 +0200 @@ -1,2 +1,2 @@ -libmediastreamer_base7 -libmediastreamer_voip7 +libmediastreamer_base10 +libmediastreamer_voip10 ++++++ mediastreamer-2.15.1.tar.gz -> mediastreamer-2.16.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/mediastreamer2/mediastreamer-2.15.1.tar.gz /work/SRC/openSUSE:Factory/.mediastreamer2.new/mediastreamer-2.16.1.tar.gz differ: char 5, line 1 ++++++ mediastreamer2-fix-pkgconfig.patch ++++++ --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -556,6 +556,27 @@ if(MEDIASTREAMER2_CPPFLAGS) add_definitions(${MEDIASTREAMER2_CPPFLAGS}) endif() + +set(MS_PUBLIC_PACKAGES "ortp bctoolbox") +if(ENABLE_ZRTP) + set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libbzrtp") +endif() +if(ENABLE_FFMPEG) + set(MS_PRIVATE_PACKAGES "${MS_PRIVATE_PACKAGES} libavcodec libavutil libswscale") +endif() +if(ENABLE_FIXED_POINT) + set(MS_PUBLIC_CFLAGS "-DMS_FIXED_POINT") +else(ENABLE_FIXED_POINT) + set(MS_PUBLIC_CFLAGS ) +endif() +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${prefix}/bin) +set(libdir ${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/include) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/mediastreamer.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mediastreamer.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") + + set(STRICT_OPTIONS_CPP ) set(STRICT_OPTIONS_C ) set(STRICT_OPTIONS_OBJC "-Wno-error") --- a/mediastreamer.pc.in +++ b/mediastreamer.pc.in @@ -5,7 +5,8 @@ includedir=@includedir@ Name: mediastreamer Description: A mediastreaming library for telephony applications -Requires: ortp bctoolbox +Requires: @MS_PUBLIC_PACKAGES@ +Requires.private: @MS_PRIVATE_PACKAGES@ Version: @MEDIASTREAMER_VERSION@ Libs: -L@libdir@ -lmediastreamer_base -lmediastreamer_voip Cflags: -I@includedir@ @MS_PUBLIC_CFLAGS@ ++++++ mediastreamer2-fix-xv.patch ++++++ --- a/cmake/FindXext.cmake +++ b/cmake/FindXext.cmake @@ -0,0 +1,48 @@ +############################################################################ +# FindXext.txt +# Copyright (C) 2014 Belledonne Communications, Grenoble France +# +############################################################################ +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +############################################################################ +# +# - Find the Xext include file and library +# +# XEXT_FOUND - system has Xext +# XEXT_INCLUDE_DIRS - the Xext include directory +# XEXT_LIBRARIES - The libraries needed to use Xext + +find_path(XEXT_INCLUDE_DIRS + NAMES X11/extensions/Xext.h + PATH_SUFFIXES include +) +if(XEXT_INCLUDE_DIRS) + set(HAVE_X11_EXTENSIONS_XEXT_H 1) +endif() + +find_library(XEXT_LIBRARIES + NAMES Xext + PATH_SUFFIXES lib +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(XEXT + DEFAULT_MSG + XEXT_INCLUDE_DIRS XEXT_LIBRARIES HAVE_X11_EXTENSIONS_XEXT_H +) + +mark_as_advanced(XEXT_INCLUDE_DIRS XEXT_LIBRARIES HAVE_X11_EXTENSIONS_XEXT_H) --- a/cmake/FindXv.cmake +++ b/cmake/FindXv.cmake @@ -30,6 +30,7 @@ include(CheckIncludeFile) include(CheckSymbolExists) find_package(X11 REQUIRED) +find_package(Xext REQUIRED) set(_XV_ROOT_PATHS ${CMAKE_INSTALL_PREFIX} @@ -55,7 +56,7 @@ if(XV_H_INCLUDE_DIR AND XVLIB_H_INCLUDE_ set(XV_INCLUDE_DIRS ${XV_H_INCLUDE_DIR} ${XVLIB_H_INCLUDE_DIR}) endif() -set(XV_INCLUDE_DIRS ${XV_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}) +set(XV_INCLUDE_DIRS ${XV_INCLUDE_DIRS} ${XEXT_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}) list(REMOVE_DUPLICATES XV_INCLUDE_DIRS) find_library(XV_LIBRARIES @@ -72,7 +73,7 @@ if(XV_LIBRARIES) cmake_pop_check_state() endif() -set(XV_LIBRARIES ${XV_LIBRARIES} ${X11_LIBRARIES}) +set(XV_LIBRARIES ${XV_LIBRARIES} ${XEXT_LIBRARIES} ${X11_LIBRARIES}) list(REMOVE_DUPLICATES XV_LIBRARIES) include(FindPackageHandleStandardArgs)

1 0

commit ortp for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package ortp for openSUSE:Factory checked in at 2017-08-29 11:38:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ortp (Old) and /work/SRC/openSUSE:Factory/.ortp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ortp" Tue Aug 29 11:38:34 2017 rev:13 rq:511962 version:1.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ortp/ortp.changes 2017-07-17 09:02:11.407717759 +0200 +++ /work/SRC/openSUSE:Factory/.ortp.new/ortp.changes 2017-08-29 11:38:34.782810625 +0200 @@ -1,0 +2,7 @@ +Thu Jul 20 11:20:31 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 1.0.2: + * Bug fixes. +- Enable documentation installation. + +------------------------------------------------------------------- Old: ---- ortp-1.0.1.tar.gz New: ---- ortp-1.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ortp.spec ++++++ --- /var/tmp/diff_new_pack.utU4B1/_old 2017-08-29 11:38:35.970643735 +0200 +++ /var/tmp/diff_new_pack.utU4B1/_new 2017-08-29 11:38:35.986641487 +0200 @@ -20,7 +20,7 @@ %define soname libortp %define sover 13 Name: ortp -Version: 1.0.1 +Version: 1.0.2 Release: 0 Summary: Real-time Transport Protocol Stack License: GPL-2.0+ @@ -28,11 +28,13 @@ Url: https://linphone.org/technical-corner/ortp/overview Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz Source99: baselibs.conf -Patch1: deps.diff +# PATCH-FIX-OPENSUSE deps.diff +Patch0: deps.diff BuildRequires: cmake >= 3.0 +BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(bctoolbox) >= 0.5.0 +BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 %description oRTP is a LGPL licensed C library implementing the RTP protocol @@ -62,19 +64,23 @@ develop programs using the oRTP library. %prep -%setup -q -%patch -P 1 -p1 +%setup -q -n %{name}-%{version}-0 +%patch0 -p1 %build %cmake \ -DENABLE_TESTS=ON \ -DENABLE_STATIC=OFF \ - -DENABLE_STRICT=OFF \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo + -DENABLE_STRICT=OFF make %{?_smp_mflags} V=1 %install %cmake_install + +mkdir -p %{buildroot}%{_docdir}/%{name}/ +mv -T %{buildroot}%{_datadir}/doc/%{name}-%{version}/ \ + %{buildroot}%{_docdir}/%{name}/ + sed -i "s|%{_prefix}/lib|%{_libdir}|g" %{buildroot}%{_libdir}/pkgconfig/%{name}.pc %post -n %{soname}%{sover} -p /sbin/ldconfig @@ -82,8 +88,7 @@ %postun -n %{soname}%{sover} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYING +%doc %{_docdir}/%{name}/ %{_bindir}/mrtprecv %{_bindir}/mrtpsend %{_bindir}/rtprecv @@ -94,15 +99,12 @@ %{_bindir}/tevrtpsend %files -n %{soname}%{sover} -%defattr(-,root,root) %{_libdir}/%{soname}.so.%{sover}* %files devel -%defattr(-,root,root) -%doc AUTHORS COPYING NEWS README.md -%{_datadir}/oRTP/ %{_includedir}/%{name}/ %{_libdir}/%{soname}.so +%{_datadir}/oRTP/ %{_libdir}/pkgconfig/%{name}.pc %changelog ++++++ ortp-1.0.1.tar.gz -> ortp-1.0.2.tar.gz ++++++ ++++ 1997 lines of diff (skipped)

1 0

commit bzrtp for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package bzrtp for openSUSE:Factory checked in at 2017-08-29 11:38:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bzrtp (Old) and /work/SRC/openSUSE:Factory/.bzrtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bzrtp" Tue Aug 29 11:38:28 2017 rev:6 rq:511961 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/bzrtp/bzrtp.changes 2017-06-28 10:34:46.508205310 +0200 +++ /work/SRC/openSUSE:Factory/.bzrtp.new/bzrtp.changes 2017-08-29 11:38:29.383569217 +0200 @@ -1,0 +2,6 @@ +Fri Jul 21 12:20:04 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 1.0.6: + * Bug fixes. + +------------------------------------------------------------------- Old: ---- bzrtp-1.0.5.tar.gz New: ---- bzrtp-1.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bzrtp.spec ++++++ --- /var/tmp/diff_new_pack.AlIOBd/_old 2017-08-29 11:38:30.515410193 +0200 +++ /var/tmp/diff_new_pack.AlIOBd/_new 2017-08-29 11:38:30.531407946 +0200 @@ -16,9 +16,9 @@ # -%define lname libbzrtp0 +%define sover 0 Name: bzrtp -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: ZRTP keys exchange protocol implementation License: GPL-2.0+ @@ -31,19 +31,20 @@ BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: pkgconfig(bctoolbox) >= 0.5.0 +BuildRequires: pkgconfig(bctoolbox) >= 0.6.0 BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(sqlite3) %description bzrtp is a FOSS implementation of ZRTP keys exchange protocol. The library written in C 89, is fully portable, and can be executed on many platforms including x86 and ARM processors. -%package -n %{lname} +%package -n lib%{name}%{sover} Summary: ZRTP keys exchange protocol implementation Group: System/Libraries -%description -n %{lname} +%description -n lib%{name}%{sover} bzrtp is a FOSS implementation of ZRTP keys exchange protocol. The library written in C 89, is fully portable, and can be executed on many platforms including x86 and ARM processors. @@ -51,7 +52,7 @@ %package devel Summary: Development files of libbzrtp Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: lib%{name}%{sover} = %{version} %description devel The libbzrtp development package includes the header files, @@ -71,20 +72,18 @@ %install %cmake_install -%post -n %{lname} -p /sbin/ldconfig +%post -n lib%{name}%{sover} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%postun -n lib%{name}%{sover} -p /sbin/ldconfig -%files -n %{lname} -%defattr(-,root,root) +%files -n lib%{name}%{sover} %doc AUTHORS COPYING NEWS README.md -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{sover}* %files devel -%defattr(-,root,root) %{_includedir}/%{name}/ -%{_datadir}/%{name}/ %{_libdir}/lib%{name}.so +%{_datadir}/%{name}/ %{_libdir}/pkgconfig/lib%{name}.pc %changelog ++++++ bzrtp-1.0.5.tar.gz -> bzrtp-1.0.6.tar.gz ++++++ ++++ 4815 lines of diff (skipped)

1 0

commit bctoolbox for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package bctoolbox for openSUSE:Factory checked in at 2017-08-29 11:38:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bctoolbox (Old) and /work/SRC/openSUSE:Factory/.bctoolbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bctoolbox" Tue Aug 29 11:38:23 2017 rev:4 rq:511946 version:0.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/bctoolbox/bctoolbox.changes 2017-06-28 10:35:24.986761579 +0200 +++ /work/SRC/openSUSE:Factory/.bctoolbox.new/bctoolbox.changes 2017-08-29 11:38:24.468259817 +0200 @@ -1,0 +2,11 @@ +Thu Jul 20 11:20:31 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 0.6.0: + * Add API to escape/unescape strings (SIP, VCARD). + * Bug fixes. +- Add bctoolbox-fix-pkgconfig.patch instead of requiring + pkgconfig(bcunit) and pkgconfig(zlib). +- Add bctoolbox-fix-no-git.patch sor.alexei(a)meowr.ru: Fix building + of dependent applications out-of-git. + +------------------------------------------------------------------- Old: ---- bctoolbox-0.5.1.tar.gz New: ---- bctoolbox-0.6.0.tar.gz bctoolbox-fix-no-git.patch bctoolbox-fix-pkgconfig.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bctoolbox.spec ++++++ --- /var/tmp/diff_new_pack.hrtxRT/_old 2017-08-29 11:38:25.384131137 +0200 +++ /var/tmp/diff_new_pack.hrtxRT/_new 2017-08-29 11:38:25.384131137 +0200 @@ -18,14 +18,18 @@ %define sover 1 Name: bctoolbox -Version: 0.5.1 +Version: 0.6.0 Release: 0 Summary: Utility library for software from Belledonne Communications License: GPL-2.0+ Group: Development/Libraries/C and C++ Url: https://linphone.org/ -Source0: https://linphone.org/releases/sources/bctoolbox/%{name}-%{version}.tar.gz +Source: https://linphone.org/releases/sources/%{name}/%{name}-%{version}.tar.gz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE bctoolbox-fix-pkgconfig.patch +Patch0: bctoolbox-fix-pkgconfig.patch +# PATCH-FIX-OPENSUSE bctoolbox-fix-no-git.patch sor.alexei(a)meowr.ru -- Fix building of dependent applications out-of-git. +Patch1: bctoolbox-fix-no-git.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: mbedtls-devel @@ -44,8 +48,6 @@ Requires: lib%{name}%{sover} = %{version} Requires: lib%{name}-tester%{sover} = %{version} Requires: mbedtls-devel -Requires: pkgconfig(bcunit) -Requires: pkgconfig(zlib) %description devel Utilities library used by Belledonne Communications softwares like @@ -75,35 +77,37 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build %cmake \ - -DMBEDTLS_V2=yes \ - -DENABLE_TESTS_COMPONENT=yes \ - -DENABLE_TESTS=yes \ - -DENABLE_STATIC=no + -DMBEDTLS_V2=YES \ + -DENABLE_TESTS_COMPONENT=YES \ + -DENABLE_TESTS=YES \ + -DENABLE_STATIC=NO %make_jobs %install %cmake_install %post -n lib%{name}%{sover} -p /sbin/ldconfig + %postun -n lib%{name}%{sover} -p /sbin/ldconfig + %post -n lib%{name}-tester%{sover} -p /sbin/ldconfig + %postun -n lib%{name}-tester%{sover} -p /sbin/ldconfig %files -n lib%{name}%{sover} -%defattr(-,root,root) %doc COPYING %{_libdir}/lib%{name}.so.%{sover}* %files -n lib%{name}-tester%{sover} -%defattr(-,root,root) %doc COPYING %{_libdir}/lib%{name}-tester.so.%{sover}* %files devel -%defattr(-,root,root) %doc AUTHORS COPYING README.md %{_libdir}/pkgconfig/%{name}.pc %{_libdir}/lib%{name}.so ++++++ bctoolbox-0.5.1.tar.gz -> bctoolbox-0.6.0.tar.gz ++++++ ++++ 3260 lines of diff (skipped) ++++++ bctoolbox-fix-no-git.patch ++++++ --- a/cmake/BcGitVersion.cmake +++ b/cmake/BcGitVersion.cmake @@ -49,6 +49,7 @@ elseif(GIT_REVISION) configure_file("${TEMPLATE_DIR}/gitversion.h.in" "${OUTPUT_DIR}/gitversion.h" @ONLY) else() if(NOT EXISTS "${OUTPUT_DIR}/gitversion.h") - execute_process(COMMAND ${CMAKE_COMMAND} -E touch "${OUTPUT_DIR}/gitversion.h") + set(PROJECT_GIT_VERSION "unknown") + configure_file("${TEMPLATE_DIR}/gitversion.h.in" "${OUTPUT_DIR}/gitversion.h" @ONLY) endif() endif() ++++++ bctoolbox-fix-pkgconfig.patch ++++++ --- a/bctoolbox.pc.in +++ b/bctoolbox.pc.in @@ -8,3 +8,4 @@ Version: @PROJECT_VERSION@ Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lbctoolbox Libs.private: @LIBS_PRIVATE@ Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@ +Requires.private: bcunit zlib

1 0

commit kernel-source for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package kernel-source for openSUSE:Factory checked in at 2017-08-29 11:37:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kernel-source (Old) and /work/SRC/openSUSE:Factory/.kernel-source.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kernel-source" Tue Aug 29 11:37:51 2017 rev:376 rq:518720 version:4.12.9 Changes: -------- --- /work/SRC/openSUSE:Factory/kernel-source/dtb-aarch64.changes 2017-08-19 10:56:05.743179919 +0200 +++ /work/SRC/openSUSE:Factory/.kernel-source.new/dtb-aarch64.changes 2017-08-29 11:37:52.732718670 +0200 @@ -1,0 +2,36 @@ +Fri Aug 25 09:00:32 CEST 2017 - jslaby(a)suse.cz + +- Linux 4.12.9 (bnc#1012628 bsc#1052580 bnc#1049599). +- Delete + patches.drivers/ALSA-usb-audio-Apply-sample-rate-quirk-to-Sennheiser. +- Delete patches.fixes/debug-fix-WARN_ON_ONCE-for-modules.patch. +- Update config files. +- commit f2ab6ba + +------------------------------------------------------------------- +Wed Aug 23 09:36:44 CEST 2017 - tiwai(a)suse.de + +- ALSA: hda - Add stereo mic quirk for Lenovo G50-70 (17aa:3978) + (bsc#1020657). +- commit d300598 + +------------------------------------------------------------------- +Wed Aug 23 09:11:31 CEST 2017 - jslaby(a)suse.cz + +- Bluetooth: hidp: fix possible might sleep error in + hidp_session_thread (bnc#1014351). +- commit fa3a4f0 + +------------------------------------------------------------------- +Tue Aug 22 20:12:04 CEST 2017 - tiwai(a)suse.de + +- ALSA: ice1712: Add support for STAudio ADCIII (bsc#1048934). +- commit 53a20a8 + +------------------------------------------------------------------- +Tue Aug 22 19:53:54 CEST 2017 - tiwai(a)suse.de + +- ALSA: hda - Implement mic-mute LED mode enum (bsc#1055013). +- commit b870486 + +------------------------------------------------------------------- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dtb-aarch64.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:02.027412760 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:02.039411075 +0200 @@ -17,7 +17,7 @@ %define srcversion 4.12 -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif dtb-armv6l.spec: same change dtb-armv7l.spec: same change ++++++ kernel-64kb.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:02.575335777 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:02.587334091 +0200 @@ -18,7 +18,7 @@ %define srcversion 4.12 -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-docs.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:02.947283518 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:02.983278460 +0200 @@ -16,7 +16,7 @@ # -%define patchversion 4.12.8 +%define patchversion 4.12.9 %define variant %{nil} %include %_sourcedir/kernel-spec-macros @@ -37,9 +37,9 @@ Summary: Kernel Documentation (man pages) License: GPL-2.0 Group: Documentation/Man -Version: 4.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-lpae.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.047269470 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.059267784 +0200 @@ -18,7 +18,7 @@ %define srcversion 4.12 -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-obs-build.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.151254860 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.179250927 +0200 @@ -19,7 +19,7 @@ #!BuildIgnore: post-build-checks -%define patchversion 4.12.8 +%define patchversion 4.12.9 %define variant %{nil} %define vanilla_only 0 @@ -57,9 +57,9 @@ Summary: package kernel and initrd for OBS VM builds License: GPL-2.0 Group: SLES -Version: 4.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-obs-qa.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.279236878 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.311232383 +0200 @@ -17,7 +17,7 @@ # needsrootforbuild -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-pae.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.415217773 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.423216649 +0200 @@ -18,7 +18,7 @@ %define srcversion 4.12 -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.463211030 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.471209906 +0200 @@ -18,7 +18,7 @@ %define srcversion 4.12 -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.527202039 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.527202039 +0200 @@ -24,10 +24,10 @@ Summary: Kernel Symbol Versions (modversions) License: GPL-2.0 Group: Development/Sources -Version: 4.12.8 +Version: 4.12.9 %if %using_buildservice %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif ++++++ kernel-syzkaller.spec ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:03.575195296 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:03.583194172 +0200 @@ -18,7 +18,7 @@ %define srcversion 4.12 -%define patchversion 4.12.8 +%define patchversion 4.12.9 %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.12.8 +Version: 4.12.9 %if 0%{?is_kotd} -Release: <RELEASE>.g4d7933a +Release: <RELEASE>.gf2ab6ba %else Release: 0 %endif kernel-vanilla.spec: same change kernel-zfcpdump.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/arm64/default new/config/arm64/default --- old/config/arm64/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/arm64/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.12.0 Kernel Configuration +# Linux/arm64 4.12.9 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv6hl/default new/config/armv6hl/default --- old/config/armv6hl/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/armv6hl/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.12.0 Kernel Configuration +# Linux/arm 4.12.9 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/default new/config/armv7hl/default --- old/config/armv7hl/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/armv7hl/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.12.0 Kernel Configuration +# Linux/arm 4.12.9 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/armv7hl/lpae new/config/armv7hl/lpae --- old/config/armv7hl/lpae 2017-07-28 07:45:21.000000000 +0200 +++ new/config/armv7hl/lpae 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.12.0 Kernel Configuration +# Linux/arm 4.12.9 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/default new/config/i386/default --- old/config/i386/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/i386/default 2017-08-25 09:08:45.000000000 +0200 @@ -74,7 +74,6 @@ CONFIG_FPGA_BRIDGE=m # CONFIG_FPGA_MGR_ICE40_SPI is not set CONFIG_FPGA_REGION=m -# CONFIG_FRAME_POINTER_UNWINDER is not set # CONFIG_FSL_EDMA is not set CONFIG_GPIO_104_DIO_48E=m CONFIG_GPIO_104_IDIO_16=m diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/i386/pae new/config/i386/pae --- old/config/i386/pae 2017-07-28 07:45:21.000000000 +0200 +++ new/config/i386/pae 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 4.12.0 Kernel Configuration +# Linux/i386 4.12.9 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64/default new/config/ppc64/default --- old/config/ppc64/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/ppc64/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.12.0 Kernel Configuration +# Linux/powerpc 4.12.9 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/ppc64le/default new/config/ppc64le/default --- old/config/ppc64le/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/ppc64le/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/powerpc 4.12.0 Kernel Configuration +# Linux/powerpc 4.12.9 Kernel Configuration # CONFIG_PPC64=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/default new/config/s390x/default --- old/config/s390x/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/s390x/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 4.12.0 Kernel Configuration +# Linux/s390 4.12.9 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/s390x/zfcpdump new/config/s390x/zfcpdump --- old/config/s390x/zfcpdump 2017-07-28 07:45:21.000000000 +0200 +++ new/config/s390x/zfcpdump 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 4.12.0 Kernel Configuration +# Linux/s390 4.12.9 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/config/x86_64/default new/config/x86_64/default --- old/config/x86_64/default 2017-07-28 07:45:21.000000000 +0200 +++ new/config/x86_64/default 2017-08-25 09:08:45.000000000 +0200 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.12.0 Kernel Configuration +# Linux/x86_64 4.12.9 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -7840,6 +7840,7 @@ CONFIG_HEADERS_CHECK=y CONFIG_DEBUG_SECTION_MISMATCH=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y +CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_STACK_VALIDATION=y CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y CONFIG_MAGIC_SYSRQ=y ++++++ patches.drivers.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa new/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa --- old/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa 2017-08-25 09:08:45.000000000 +0200 @@ -0,0 +1,32 @@ +From bbba6f9d3da357bbabc6fda81e99ff5584500e76 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Wed, 23 Aug 2017 09:30:17 +0200 +Subject: [PATCH] ALSA: hda - Add stereo mic quirk for Lenovo G50-70 + (17aa:3978) +References: bsc#1020657 +Git-commit: bbba6f9d3da357bbabc6fda81e99ff5584500e76 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +Patch-mainline: Queued in subsystem maintainer repository + +Lenovo G50-70 (17aa:3978) with Conexant codec chip requires the +similar workaround for the inverted stereo dmic like other Lenovo +models. + +Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1020657 +Cc: <stable(a)vger.kernel.org> +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/patch_conexant.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/pci/hda/patch_conexant.c ++++ b/sound/pci/hda/patch_conexant.c +@@ -947,6 +947,7 @@ static const struct snd_pci_quirk cxt506 + SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC), ++ SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), + SND_PCI_QUIRK_VENDOR(0x17aa, "Thinkpad", CXT_FIXUP_THINKPAD_ACPI), + SND_PCI_QUIRK(0x1c06, 0x2011, "Lemote A1004", CXT_PINCFG_LEMOTE_A1004), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum new/patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum --- old/patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum 2017-08-25 09:08:45.000000000 +0200 @@ -0,0 +1,149 @@ +From 62a939477173fabfe9f52114fab878a00b87f9a3 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Tue, 22 Aug 2017 16:52:10 +0200 +Subject: [PATCH] ALSA: hda - Implement mic-mute LED mode enum +References: bsc#1055013 +Git-commit: 62a939477173fabfe9f52114fab878a00b87f9a3 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +Patch-mainline: Queued in subsystem maintainer repository + +Dell laptops have another LED for mic-mute in addition to the master +mute. The former is tied with the capture switch (in a reverse way) +while the latter is tied with the master playback switch. We already +have an enum control to change the behavior for the master mute LED in +different ways, e.g. keeping always off or turning off at mute. But, +the mic-mute LED has no such management but its behavior is +hard-coded. + +This patch implements an enum control to change the mic-mute LED +behavior like what we have for the master mute LED. The ctl provides +four modes: keep-on, keep-off, follow-capture and follow-mute. The +default mode is the last one, follow-mute, which follows the capture +mute, i.e. LED turning on when the capture is off, and turning off +when the capture is active. + +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/hda/dell_wmi_helper.c | 87 +++++++++++++++++++++++++++++++++++++--- + 1 file changed, 81 insertions(+), 6 deletions(-) + +--- a/sound/pci/hda/dell_wmi_helper.c ++++ b/sound/pci/hda/dell_wmi_helper.c +@@ -5,12 +5,47 @@ + #if IS_ENABLED(CONFIG_DELL_LAPTOP) + #include <linux/dell-led.h> + ++enum { ++ MICMUTE_LED_ON, ++ MICMUTE_LED_OFF, ++ MICMUTE_LED_FOLLOW_CAPTURE, ++ MICMUTE_LED_FOLLOW_MUTE, ++}; ++ ++static int dell_led_mode = MICMUTE_LED_FOLLOW_MUTE; ++static int dell_capture; + static int dell_led_value; + static int (*dell_micmute_led_set_func)(int); + static void (*dell_old_cap_hook)(struct hda_codec *, + struct snd_kcontrol *, + struct snd_ctl_elem_value *); + ++static void call_micmute_led_update(void) ++{ ++ int val; ++ ++ switch (dell_led_mode) { ++ case MICMUTE_LED_ON: ++ val = 1; ++ break; ++ case MICMUTE_LED_OFF: ++ val = 0; ++ break; ++ case MICMUTE_LED_FOLLOW_CAPTURE: ++ val = dell_capture; ++ break; ++ case MICMUTE_LED_FOLLOW_MUTE: ++ default: ++ val = !dell_capture; ++ break; ++ } ++ ++ if (val == dell_led_value) ++ return; ++ dell_led_value = val; ++ dell_micmute_led_set_func(dell_led_value); ++} ++ + static void update_dell_wmi_micmute_led(struct hda_codec *codec, + struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +@@ -22,15 +57,54 @@ static void update_dell_wmi_micmute_led( + return; + if (strcmp("Capture Switch", ucontrol->id.name) == 0 && ucontrol->id.index == 0) { + /* TODO: How do I verify if it's a mono or stereo here? */ +- int val = (ucontrol->value.integer.value[0] || ucontrol->value.integer.value[1]) ? 0 : 1; +- if (val == dell_led_value) +- return; +- dell_led_value = val; +- if (dell_micmute_led_set_func) +- dell_micmute_led_set_func(dell_led_value); ++ dell_capture = (ucontrol->value.integer.value[0] || ++ ucontrol->value.integer.value[1]); ++ call_micmute_led_update(); + } + } + ++static int dell_mic_mute_led_mode_info(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_info *uinfo) ++{ ++ static const char * const texts[] = { ++ "On", "Off", "Follow Capture", "Follow Mute", ++ }; ++ ++ return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(texts), texts); ++} ++ ++static int dell_mic_mute_led_mode_get(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ ucontrol->value.enumerated.item[0] = dell_led_mode; ++ return 0; ++} ++ ++static int dell_mic_mute_led_mode_put(struct snd_kcontrol *kcontrol, ++ struct snd_ctl_elem_value *ucontrol) ++{ ++ unsigned int mode; ++ ++ mode = ucontrol->value.enumerated.item[0]; ++ if (mode > MICMUTE_LED_FOLLOW_MUTE) ++ mode = MICMUTE_LED_FOLLOW_MUTE; ++ if (mode == dell_led_mode) ++ return 0; ++ dell_led_mode = mode; ++ call_micmute_led_update(); ++ return 1; ++} ++ ++static const struct snd_kcontrol_new dell_mic_mute_mode_ctls[] = { ++ { ++ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, ++ .name = "Mic Mute-LED Mode", ++ .info = dell_mic_mute_led_mode_info, ++ .get = dell_mic_mute_led_mode_get, ++ .put = dell_mic_mute_led_mode_put, ++ }, ++ {} ++}; + + static void alc_fixup_dell_wmi(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +@@ -55,6 +129,7 @@ static void alc_fixup_dell_wmi(struct hd + dell_old_cap_hook = spec->gen.cap_sync_hook; + spec->gen.cap_sync_hook = update_dell_wmi_micmute_led; + removefunc = false; ++ add_mixer(spec, dell_mic_mute_mode_ctls); + } + } + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII new/patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII --- old/patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII 2017-08-25 09:08:45.000000000 +0200 @@ -0,0 +1,107 @@ +From e8a91ae18bdc0bcedd2a07e42e66ca09dc2105d2 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai <tiwai(a)suse.de> +Date: Mon, 21 Aug 2017 16:13:27 +0200 +Subject: [PATCH] ALSA: ice1712: Add support for STAudio ADCIII +References: bsc#1048934 +Git-commit: e8a91ae18bdc0bcedd2a07e42e66ca09dc2105d2 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +Patch-mainline: Queued in subsystem maintainer repository + +STAudio ADCIII has the same SSID as Hoontech STDSP24, but requires a +slightly different configuration. This patch allows user to choose +this model via model=staudio option to set the proper configuration +for the board. + +Bugzilla: http://bugzilla.suse.com/show_bug.cgi?id=1048934 +Signed-off-by: Takashi Iwai <tiwai(a)suse.de> + +--- + sound/pci/ice1712/hoontech.c | 39 ++++++++++++++++++++++++++++++++++----- + sound/pci/ice1712/hoontech.h | 1 + + 2 files changed, 35 insertions(+), 5 deletions(-) + +--- a/sound/pci/ice1712/hoontech.c ++++ b/sound/pci/ice1712/hoontech.c +@@ -166,7 +166,7 @@ static void snd_ice1712_stdsp24_midi2(st + mutex_unlock(&ice->gpio_mutex); + } + +-static int snd_ice1712_hoontech_init(struct snd_ice1712 *ice) ++static int hoontech_init(struct snd_ice1712 *ice, bool staudio) + { + struct hoontech_spec *spec; + int box, chn; +@@ -203,7 +203,10 @@ static int snd_ice1712_hoontech_init(str + ICE1712_STDSP24_3_INSEL(spec->boxbits, 0); + + /* let's go - activate only functions in first box */ +- spec->config = 0; ++ if (staudio) ++ spec->config = ICE1712_STDSP24_MUTE; ++ else ++ spec->config = 0; + /* ICE1712_STDSP24_MUTE | + ICE1712_STDSP24_INSEL | + ICE1712_STDSP24_DAREAR; */ +@@ -226,9 +229,16 @@ static int snd_ice1712_hoontech_init(str + ICE1712_STDSP24_BOX_CHN4 | + ICE1712_STDSP24_BOX_MIDI1 | + ICE1712_STDSP24_BOX_MIDI2; +- spec->boxconfig[1] = +- spec->boxconfig[2] = +- spec->boxconfig[3] = 0; ++ if (staudio) { ++ spec->boxconfig[1] = ++ spec->boxconfig[2] = ++ spec->boxconfig[3] = spec->boxconfig[0]; ++ } else { ++ spec->boxconfig[1] = ++ spec->boxconfig[2] = ++ spec->boxconfig[3] = 0; ++ } ++ + snd_ice1712_stdsp24_darear(ice, + (spec->config & ICE1712_STDSP24_DAREAR) ? 1 : 0); + snd_ice1712_stdsp24_mute(ice, +@@ -248,6 +258,16 @@ static int snd_ice1712_hoontech_init(str + return 0; + } + ++static int snd_ice1712_hoontech_init(struct snd_ice1712 *ice) ++{ ++ return hoontech_init(ice, false); ++} ++ ++static int snd_ice1712_staudio_init(struct snd_ice1712 *ice) ++{ ++ return hoontech_init(ice, true); ++} ++ + /* + * AK4524 access + */ +@@ -351,5 +371,14 @@ struct snd_ice1712_card_info snd_ice1712 + .model = "ez8", + .chip_init = snd_ice1712_ez8_init, + }, ++ { ++ /* STAudio ADCIII has the same SSID as Hoontech StA DSP24, ++ * thus identified only via the explicit model option ++ */ ++ .subvendor = ICE1712_SUBDEVICE_STAUDIO_ADCIII, /* a dummy id */ ++ .name = "STAudio ADCIII", ++ .model = "staudio", ++ .chip_init = snd_ice1712_staudio_init, ++ }, + { } /* terminator */ + }; +--- a/sound/pci/ice1712/hoontech.h ++++ b/sound/pci/ice1712/hoontech.h +@@ -34,6 +34,7 @@ + #define ICE1712_SUBDEVICE_STDSP24_VALUE 0x00010010 /* A dummy id for Hoontech SoundTrack Audio DSP 24 Value */ + #define ICE1712_SUBDEVICE_STDSP24_MEDIA7_1 0x16141217 /* Hoontech ST Audio DSP24 Media 7.1 */ + #define ICE1712_SUBDEVICE_EVENT_EZ8 0x00010001 /* A dummy id for EZ8 */ ++#define ICE1712_SUBDEVICE_STAUDIO_ADCIII 0x00010002 /* A dummy id for STAudio ADCIII */ + + extern struct snd_ice1712_card_info snd_ice1712_hoontech_cards[]; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.drivers/ALSA-usb-audio-Apply-sample-rate-quirk-to-Sennheiser new/patches.drivers/ALSA-usb-audio-Apply-sample-rate-quirk-to-Sennheiser --- old/patches.drivers/ALSA-usb-audio-Apply-sample-rate-quirk-to-Sennheiser 2017-08-15 09:17:14.000000000 +0200 +++ new/patches.drivers/ALSA-usb-audio-Apply-sample-rate-quirk-to-Sennheiser 1970-01-01 01:00:00.000000000 +0100 @@ -1,36 +0,0 @@ -From a8e800fe0f68bc28ce309914f47e432742b865ed Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai(a)suse.de> -Date: Mon, 14 Aug 2017 14:35:50 +0200 -Subject: [PATCH] ALSA: usb-audio: Apply sample rate quirk to Sennheiser - headset -Git-commit: a8e800fe0f68bc28ce309914f47e432742b865ed -Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git -Patch-mainline: Queued in subsystem maintainer repository -References: bsc#1052580 - -A Senheisser headset requires the typical sample-rate quirk for -avoiding spurious errors from inquiring the current sample rate like: - usb 1-1: 2:1: cannot get freq at ep 0x4 - usb 1-1: 3:1: cannot get freq at ep 0x83 - -The USB ID 1395:740a has to be added to the entries in -snd_usb_get_sample_rate_quirk(). - -Bugzilla: https://bugzilla.suse.com/show_bug.cgi?id=1052580 -Cc: <stable(a)vger.kernel.org> -Signed-off-by: Takashi Iwai <tiwai(a)suse.de> - ---- - sound/usb/quirks.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/sound/usb/quirks.c -+++ b/sound/usb/quirks.c -@@ -1142,6 +1142,7 @@ bool snd_usb_get_sample_rate_quirk(struc - case USB_ID(0x0556, 0x0014): /* Phoenix Audio TMX320VC */ - case USB_ID(0x05A3, 0x9420): /* ELP HD USB Camera */ - case USB_ID(0x074D, 0x3553): /* Outlaw RR2150 (Micronas UAC3553B) */ -+ case USB_ID(0x1395, 0x740a): /* Sennheiser DECT */ - case USB_ID(0x1901, 0x0191): /* GE B850V3 CP2114 audio interface */ - case USB_ID(0x1de7, 0x0013): /* Phoenix Audio MT202exe */ - case USB_ID(0x1de7, 0x0014): /* Phoenix Audio TMX320 */ ++++++ patches.fixes.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/Bluetooth-hidp-fix-possible-might-sleep-error-in-hid.patch new/patches.fixes/Bluetooth-hidp-fix-possible-might-sleep-error-in-hid.patch --- old/patches.fixes/Bluetooth-hidp-fix-possible-might-sleep-error-in-hid.patch 1970-01-01 01:00:00.000000000 +0100 +++ new/patches.fixes/Bluetooth-hidp-fix-possible-might-sleep-error-in-hid.patch 2017-08-25 09:08:45.000000000 +0200 @@ -0,0 +1,129 @@ +From: Jeffy Chen <jeffy.chen(a)rock-chips.com> +Date: Tue, 27 Jun 2017 17:34:44 +0800 +Subject: Bluetooth: hidp: fix possible might sleep error in + hidp_session_thread +Git-commit: 5da8e47d849d3d37b14129f038782a095b9ad049 +Patch-mainline: v4.13-rc1 +References: bnc#1014351 + +It looks like hidp_session_thread has same pattern as the issue reported in +old rfcomm: + + while (1) { + set_current_state(TASK_INTERRUPTIBLE); + if (condition) + break; + // may call might_sleep here + schedule(); + } + __set_current_state(TASK_RUNNING); + +Which fixed at: + dfb2fae Bluetooth: Fix nested sleeps + +So let's fix it at the same way, also follow the suggestion of: +https://lwn.net/Articles/628628/ + +Signed-off-by: Jeffy Chen <jeffy.chen(a)rock-chips.com> +Tested-by: AL Yu-Chen Cho <acho(a)suse.com> +Tested-by: Rohit Vaswani <rvaswani(a)nvidia.com> +Signed-off-by: Marcel Holtmann <marcel(a)holtmann.org> +Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> +--- + net/bluetooth/hidp/core.c | 33 ++++++++++++++++++++++----------- + 1 file changed, 22 insertions(+), 11 deletions(-) + +--- a/net/bluetooth/hidp/core.c ++++ b/net/bluetooth/hidp/core.c +@@ -36,6 +36,7 @@ + #define VERSION "1.2" + + static DECLARE_RWSEM(hidp_session_sem); ++static DECLARE_WAIT_QUEUE_HEAD(hidp_session_wq); + static LIST_HEAD(hidp_session_list); + + static unsigned char hidp_keycode[256] = { +@@ -1068,12 +1069,12 @@ static int hidp_session_start_sync(struc + * Wake up session thread and notify it to stop. This is asynchronous and + * returns immediately. Call this whenever a runtime error occurs and you want + * the session to stop. +- * Note: wake_up_process() performs any necessary memory-barriers for us. ++ * Note: wake_up_interruptible() performs any necessary memory-barriers for us. + */ + static void hidp_session_terminate(struct hidp_session *session) + { + atomic_inc(&session->terminate); +- wake_up_process(session->task); ++ wake_up_interruptible(&hidp_session_wq); + } + + /* +@@ -1180,7 +1181,9 @@ static void hidp_session_run(struct hidp + struct sock *ctrl_sk = session->ctrl_sock->sk; + struct sock *intr_sk = session->intr_sock->sk; + struct sk_buff *skb; ++ DEFINE_WAIT_FUNC(wait, woken_wake_function); + ++ add_wait_queue(&hidp_session_wq, &wait); + for (;;) { + /* + * This thread can be woken up two ways: +@@ -1188,12 +1191,10 @@ static void hidp_session_run(struct hidp + * session->terminate flag and wakes this thread up. + * - Via modifying the socket state of ctrl/intr_sock. This + * thread is woken up by ->sk_state_changed(). +- * +- * Note: set_current_state() performs any necessary +- * memory-barriers for us. + */ +- set_current_state(TASK_INTERRUPTIBLE); + ++ /* Ensure session->terminate is updated */ ++ smp_mb__before_atomic(); + if (atomic_read(&session->terminate)) + break; + +@@ -1227,11 +1228,22 @@ static void hidp_session_run(struct hidp + hidp_process_transmit(session, &session->ctrl_transmit, + session->ctrl_sock); + +- schedule(); ++ wait_woken(&wait, TASK_INTERRUPTIBLE, MAX_SCHEDULE_TIMEOUT); + } ++ remove_wait_queue(&hidp_session_wq, &wait); + + atomic_inc(&session->terminate); +- set_current_state(TASK_RUNNING); ++ ++ /* Ensure session->terminate is updated */ ++ smp_mb__after_atomic(); ++} ++ ++static int hidp_session_wake_function(wait_queue_t *wait, ++ unsigned int mode, ++ int sync, void *key) ++{ ++ wake_up_interruptible(&hidp_session_wq); ++ return false; + } + + /* +@@ -1244,7 +1256,8 @@ static void hidp_session_run(struct hidp + static int hidp_session_thread(void *arg) + { + struct hidp_session *session = arg; +- wait_queue_t ctrl_wait, intr_wait; ++ DEFINE_WAIT_FUNC(ctrl_wait, hidp_session_wake_function); ++ DEFINE_WAIT_FUNC(intr_wait, hidp_session_wake_function); + + BT_DBG("session %p", session); + +@@ -1254,8 +1267,6 @@ static int hidp_session_thread(void *arg + set_user_nice(current, -15); + hidp_set_timer(session); + +- init_waitqueue_entry(&ctrl_wait, current); +- init_waitqueue_entry(&intr_wait, current); + add_wait_queue(sk_sleep(session->ctrl_sock->sk), &ctrl_wait); + add_wait_queue(sk_sleep(session->intr_sock->sk), &intr_wait); + /* This memory barrier is paired with wq_has_sleeper(). See diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches.fixes/debug-fix-WARN_ON_ONCE-for-modules.patch new/patches.fixes/debug-fix-WARN_ON_ONCE-for-modules.patch --- old/patches.fixes/debug-fix-WARN_ON_ONCE-for-modules.patch 2017-08-13 09:33:59.000000000 +0200 +++ new/patches.fixes/debug-fix-WARN_ON_ONCE-for-modules.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,239 +0,0 @@ -From: Josh Poimboeuf <jpoimboe(a)redhat.com> -Date: Sat, 15 Jul 2017 00:10:58 -0500 -Subject: debug: fix WARN_ON_ONCE() for modules -Patch-mainline: not yet, submitted on 15th Jul 2017 -References: bnc#1049599 - -Mike Galbraith reported a situation where a WARN_ON_ONCE() call in DRM -code turned into an oops. As it turns out, WARN_ON_ONCE() seems to be -completely broken when called from a module. - -The bug was introduced with the following commit: - - 19d436268dde ("debug: Add _ONCE() logic to report_bug()") - -That commit changed WARN_ON_ONCE() to move its 'once' logic into the bug -trap handler. It requires a writable bug table so that the BUGFLAG_DONE -bit can be written to the flags to indicate the first warning has -occurred. - -The bug table was made writable for vmlinux, which relies on -vmlinux.lds.S and vmlinux.lds.h for laying out the sections. However, -it wasn't made writable for modules, which rely on the ELF section -header flags. - -Reported-by: Mike Galbraith <efault(a)gmx.de> -Fixes: 19d436268dde ("debug: Add _ONCE() logic to report_bug()") -Signed-off-by: Josh Poimboeuf <jpoimboe(a)redhat.com> -Signed-off-by: Jiri Slaby <jslaby(a)suse.cz> ---- - arch/arm/include/asm/bug.h | 2 +- - arch/arm64/include/asm/bug.h | 2 +- - arch/blackfin/include/asm/bug.h | 4 ++-- - arch/mn10300/include/asm/bug.h | 2 +- - arch/parisc/include/asm/bug.h | 6 +++--- - arch/powerpc/include/asm/bug.h | 8 ++++---- - arch/s390/include/asm/bug.h | 4 ++-- - arch/sh/include/asm/bug.h | 4 ++-- - arch/x86/include/asm/bug.h | 4 ++-- - 9 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h -index 4e6e88a6b2f4..2244a94ed9c9 100644 ---- a/arch/arm/include/asm/bug.h -+++ b/arch/arm/include/asm/bug.h -@@ -37,7 +37,7 @@ do { \ - ".pushsection .rodata.str, \"aMS\", %progbits, 1\n" \ - "2:\t.asciz " #__file "\n" \ - ".popsection\n" \ -- ".pushsection __bug_table,\"a\"\n" \ -+ ".pushsection __bug_table,\"aw\"\n" \ - ".align 2\n" \ - "3:\t.word 1b, 2b\n" \ - "\t.hword " #__line ", 0\n" \ -diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h -index 366448eb0fb7..a02a57186f56 100644 ---- a/arch/arm64/include/asm/bug.h -+++ b/arch/arm64/include/asm/bug.h -@@ -36,7 +36,7 @@ - #ifdef CONFIG_GENERIC_BUG - - #define __BUG_ENTRY(flags) \ -- ".pushsection __bug_table,\"a\"\n\t" \ -+ ".pushsection __bug_table,\"aw\"\n\t" \ - ".align 2\n\t" \ - "0: .long 1f - 0b\n\t" \ - _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ -diff --git a/arch/blackfin/include/asm/bug.h b/arch/blackfin/include/asm/bug.h -index 8d9b1eba89c4..76b2e82ee730 100644 ---- a/arch/blackfin/include/asm/bug.h -+++ b/arch/blackfin/include/asm/bug.h -@@ -21,7 +21,7 @@ - #define _BUG_OR_WARN(flags) \ - asm volatile( \ - "1: .hword %0\n" \ -- " .section __bug_table,\"a\",@progbits\n" \ -+ " .section __bug_table,\"aw\",@progbits\n" \ - "2: .long 1b\n" \ - " .long %1\n" \ - " .short %2\n" \ -@@ -38,7 +38,7 @@ - #define _BUG_OR_WARN(flags) \ - asm volatile( \ - "1: .hword %0\n" \ -- " .section __bug_table,\"a\",@progbits\n" \ -+ " .section __bug_table,\"aw\",@progbits\n" \ - "2: .long 1b\n" \ - " .short %1\n" \ - " .org 2b + %2\n" \ -diff --git a/arch/mn10300/include/asm/bug.h b/arch/mn10300/include/asm/bug.h -index aa6a38886391..811414fb002d 100644 ---- a/arch/mn10300/include/asm/bug.h -+++ b/arch/mn10300/include/asm/bug.h -@@ -21,7 +21,7 @@ do { \ - asm volatile( \ - " syscall 15 \n" \ - "0: \n" \ -- " .section __bug_table,\"a\" \n" \ -+ " .section __bug_table,\"aw\" \n" \ - " .long 0b,%0,%1 \n" \ - " .previous \n" \ - : \ -diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h -index d2742273a685..07ea467f22fc 100644 ---- a/arch/parisc/include/asm/bug.h -+++ b/arch/parisc/include/asm/bug.h -@@ -27,7 +27,7 @@ - do { \ - asm volatile("\n" \ - "1:\t" PARISC_BUG_BREAK_ASM "\n" \ -- "\t.pushsection __bug_table,\"a\"\n" \ -+ "\t.pushsection __bug_table,\"aw\"\n" \ - "2:\t" ASM_WORD_INSN "1b, %c0\n" \ - "\t.short %c1, %c2\n" \ - "\t.org 2b+%c3\n" \ -@@ -50,7 +50,7 @@ - do { \ - asm volatile("\n" \ - "1:\t" PARISC_BUG_BREAK_ASM "\n" \ -- "\t.pushsection __bug_table,\"a\"\n" \ -+ "\t.pushsection __bug_table,\"aw\"\n" \ - "2:\t" ASM_WORD_INSN "1b, %c0\n" \ - "\t.short %c1, %c2\n" \ - "\t.org 2b+%c3\n" \ -@@ -64,7 +64,7 @@ - do { \ - asm volatile("\n" \ - "1:\t" PARISC_BUG_BREAK_ASM "\n" \ -- "\t.pushsection __bug_table,\"a\"\n" \ -+ "\t.pushsection __bug_table,\"aw\"\n" \ - "2:\t" ASM_WORD_INSN "1b\n" \ - "\t.short %c0\n" \ - "\t.org 2b+%c1\n" \ -diff --git a/arch/powerpc/include/asm/bug.h b/arch/powerpc/include/asm/bug.h -index 0151af6c2a50..87fcc1948817 100644 ---- a/arch/powerpc/include/asm/bug.h -+++ b/arch/powerpc/include/asm/bug.h -@@ -18,7 +18,7 @@ - #include <asm/asm-offsets.h> - #ifdef CONFIG_DEBUG_BUGVERBOSE - .macro EMIT_BUG_ENTRY addr,file,line,flags -- .section __bug_table,"a" -+ .section __bug_table,"aw" - 5001: PPC_LONG \addr, 5002f - .short \line, \flags - .org 5001b+BUG_ENTRY_SIZE -@@ -29,7 +29,7 @@ - .endm - #else - .macro EMIT_BUG_ENTRY addr,file,line,flags -- .section __bug_table,"a" -+ .section __bug_table,"aw" - 5001: PPC_LONG \addr - .short \flags - .org 5001b+BUG_ENTRY_SIZE -@@ -42,14 +42,14 @@ - sizeof(struct bug_entry), respectively */ - #ifdef CONFIG_DEBUG_BUGVERBOSE - #define _EMIT_BUG_ENTRY \ -- ".section __bug_table,\"a\"\n" \ -+ ".section __bug_table,\"aw\"\n" \ - "2:\t" PPC_LONG "1b, %0\n" \ - "\t.short %1, %2\n" \ - ".org 2b+%3\n" \ - ".previous\n" - #else - #define _EMIT_BUG_ENTRY \ -- ".section __bug_table,\"a\"\n" \ -+ ".section __bug_table,\"aw\"\n" \ - "2:\t" PPC_LONG "1b\n" \ - "\t.short %2\n" \ - ".org 2b+%3\n" \ -diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h -index 1bbd9dbfe4e0..ce9cc123988b 100644 ---- a/arch/s390/include/asm/bug.h -+++ b/arch/s390/include/asm/bug.h -@@ -14,7 +14,7 @@ - ".section .rodata.str,\"aMS\",@progbits,1\n" \ - "2: .asciz \""__FILE__"\"\n" \ - ".previous\n" \ -- ".section __bug_table,\"a\"\n" \ -+ ".section __bug_table,\"aw\"\n" \ - "3: .long 1b-3b,2b-3b\n" \ - " .short %0,%1\n" \ - " .org 3b+%2\n" \ -@@ -30,7 +30,7 @@ - asm volatile( \ - "0: j 0b+2\n" \ - "1:\n" \ -- ".section __bug_table,\"a\"\n" \ -+ ".section __bug_table,\"aw\"\n" \ - "2: .long 1b-2b\n" \ - " .short %0\n" \ - " .org 2b+%1\n" \ -diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h -index c9828f785ca0..5b5086367639 100644 ---- a/arch/sh/include/asm/bug.h -+++ b/arch/sh/include/asm/bug.h -@@ -24,14 +24,14 @@ - */ - #ifdef CONFIG_DEBUG_BUGVERBOSE - #define _EMIT_BUG_ENTRY \ -- "\t.pushsection __bug_table,\"a\"\n" \ -+ "\t.pushsection __bug_table,\"aw\"\n" \ - "2:\t.long 1b, %O1\n" \ - "\t.short %O2, %O3\n" \ - "\t.org 2b+%O4\n" \ - "\t.popsection\n" - #else - #define _EMIT_BUG_ENTRY \ -- "\t.pushsection __bug_table,\"a\"\n" \ -+ "\t.pushsection __bug_table,\"aw\"\n" \ - "2:\t.long 1b\n" \ - "\t.short %O3\n" \ - "\t.org 2b+%O4\n" \ -diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h -index 39e702d90cdb..aa6b2023d8f8 100644 ---- a/arch/x86/include/asm/bug.h -+++ b/arch/x86/include/asm/bug.h -@@ -35,7 +35,7 @@ - #define _BUG_FLAGS(ins, flags) \ - do { \ - asm volatile("1:\t" ins "\n" \ -- ".pushsection __bug_table,\"a\"\n" \ -+ ".pushsection __bug_table,\"aw\"\n" \ - "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ - "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ - "\t.word %c1" "\t# bug_entry::line\n" \ -@@ -52,7 +52,7 @@ do { \ - #define _BUG_FLAGS(ins, flags) \ - do { \ - asm volatile("1:\t" ins "\n" \ -- ".pushsection __bug_table,\"a\"\n" \ -+ ".pushsection __bug_table,\"aw\"\n" \ - "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ - "\t.word %c0" "\t# bug_entry::flags\n" \ - "\t.org 2b+%c1\n" \ --- -2.13.3 - ++++++ patches.kernel.org.tar.bz2 ++++++ ++++ 1697 lines of diff (skipped) ++++++ series.conf ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:06.022851399 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:06.022851399 +0200 @@ -35,6 +35,7 @@ patches.kernel.org/patch-4.12.5-6 patches.kernel.org/patch-4.12.6-7 patches.kernel.org/patch-4.12.7-8 + patches.kernel.org/patch-4.12.8-9 ######################################################## # Build fixes that apply to the vanilla kernel too. @@ -83,7 +84,6 @@ # Scheduler / Core ######################################################## patches.suse/setuid-dumpable-wrongdir - patches.fixes/debug-fix-WARN_ON_ONCE-for-modules.patch ######################################################## # Architecture-specific patches. These used to be all @@ -222,6 +222,7 @@ ######################################################## # Networking Core ######################################################## + patches.fixes/Bluetooth-hidp-fix-possible-might-sleep-error-in-hid.patch ######################################################## # Netfilter @@ -390,7 +391,9 @@ ########################################################## # Sound ########################################################## - patches.drivers/ALSA-usb-audio-Apply-sample-rate-quirk-to-Sennheiser + patches.drivers/ALSA-hda-Implement-mic-mute-LED-mode-enum + patches.drivers/ALSA-ice1712-Add-support-for-STAudio-ADCIII + patches.drivers/ALSA-hda-Add-stereo-mic-quirk-for-Lenovo-G50-70-17aa ######################################################## # Char / serial ++++++ source-timestamp ++++++ --- /var/tmp/diff_new_pack.kUcVi8/_old 2017-08-29 11:38:06.094841285 +0200 +++ /var/tmp/diff_new_pack.kUcVi8/_new 2017-08-29 11:38:06.098840723 +0200 @@ -1,3 +1,3 @@ -2017-08-17 07:30:12 +0200 -GIT Revision: 4d7933acbc9135d6000d0b377baa0e9184fcff8f +2017-08-25 09:08:45 +0200 +GIT Revision: f2ab6bac1f2487d0cd66b24bdf61355a63c85142 GIT Branch: stable

1 0

commit python-Pillow for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package python-Pillow for openSUSE:Factory checked in at 2017-08-29 11:37:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Pillow (Old) and /work/SRC/openSUSE:Factory/.python-Pillow.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-Pillow" Tue Aug 29 11:37:16 2017 rev:26 rq:518130 version:4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Pillow/python-Pillow.changes 2017-08-17 11:43:32.394648611 +0200 +++ /work/SRC/openSUSE:Factory/.python-Pillow.new/python-Pillow.changes 2017-08-29 11:37:29.383999188 +0200 @@ -1,0 +2,57 @@ +Tue Aug 22 11:52:50 UTC 2017 - tbechtold(a)suse.com + +- fix conditional build with tk (bsc#1054719) + +------------------------------------------------------------------- +Mon Aug 21 10:06:47 UTC 2017 - tbechtold(a)suse.com + +- update to 4.2.1: + - CI: Fix version specification and test on CI for PyPy/Windows #2608 + - Doc: Clarified Image.save:append_images documentation #2604 + - CI: Amazon Linux and Centos6 docker images added to TravisCI #2585 + - Image.alpha_composite added #2595 + - Complex Text Support #2576 + - Added threshold parameter to ImageDraw.floodfill #2599 + - Added dBATCH parameter to ghostscript command #2588 + - JPEG: Adjust buffer size when icc_profile > MAXBLOCK #2596 + - Specify Pillow Version in one place #2517 + - CI: Change the owner of the TRAVIS_BUILD_DIR, fixing broken docker runs #2587 + - Fix truncated PNG loading for some images, Fix memory leak on truncated PNG images. #2541, #2598 + - Add decompression bomb check to Image.crop #2410 + - ImageFile: Ensure that the `err_code` variable is initialized in case of exception. #2363 + - Tiff: Support append_images for saving multipage TIFFs #2406 + - Doc: Clarify that draft is only implemented for JPEG and PCD #2409 + - Test: MicImagePlugin #2447 + - Use round() instead of floor() to eliminate zero coefficients in resample #2558 + - Remove deprecated code #2549 + - Added append_images to PDF saving #2526 + - Remove unused function core image function new_array #2548 + - Remove unnecessary calls to dict.keys() #2551 + - Add more ImageDraw.py tests and remove unused Draw.c code #2533 + - Test: More tests for ImageMorph #2554 + - Test: McIDAS area file #2552 + - Update Feature Detection #2520 + - CI: Update pypy on TravisCI #2573 + - ImageMorph: Fix wrong expected size of MRLs read from disk #2561 + - Docs: Update install docs for FreeBSD #2546 + - Build: Ignore OpenJpeg 1.5 on FreeBSD #2544 + - Remove 'not yet implemented' methods from PIL 1.1.4 #2538 + - Dependencies: Update FreeType to 2.8, LibTIFF to 4.0.8 and libimagequant to 2.9.1 #2535 #2537 #2540 + - Raise TypeError and not also UnboundLocalError in ImageFile.Parser() #2525 + - Test: Use Codecov for coverage #2528 + - Use PNG for Image.show() #2527 + - Remove WITH_DEBUG compilation flag #2522 + - Fix return value on parameter parse error in _webp.c #2521 + - Set executable flag on scripts with shebang line #2295 + - Flake8 #2460 + - Doc: Release Process Changes #2516 + - CI: Added region for s3 deployment on appveyor #2515 + - Doc: Updated references to point to existing files #2507 + - Return copy on Image crop if crop dimensions match the image #2471 + - Test: Optimize CI speed #2464, #2466 + - Undef PySlice_GetIndicesEx, see https://bugs.python.org/issue29943 #2493 + - Fix for file with DPI in EXIF but not metadata, and XResolution is an int rather than tuple #2484 + - Docs: Removed broken download counter badge #2487 + - Docs: Fixed rst syntax error #2477 + +------------------------------------------------------------------- Old: ---- Pillow-4.1.0.tar.gz New: ---- Pillow-4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Pillow.spec ++++++ --- /var/tmp/diff_new_pack.tl6ZsY/_old 2017-08-29 11:37:32.395576057 +0200 +++ /var/tmp/diff_new_pack.tl6ZsY/_new 2017-08-29 11:37:32.399575496 +0200 @@ -25,7 +25,7 @@ %define oldpython python %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-Pillow -Version: 4.1.0 +Version: 4.2.1 Release: 0 Summary: Python Imaging Library (Fork) License: HPND @@ -154,7 +154,8 @@ %{python_sitearch}/PIL %{python_sitearch}/PIL.pth %{python_sitearch}/Pillow-%{version}-py%{python_version}.egg-info -%if 0%{?is_opensuse} + +%if %{with tk} %exclude %{python_sitearch}/PIL/ImageTk* %exclude %{python_sitearch}/PIL/_imagingtk* %pycache_only %exclude %{python_sitearch}/PIL/__pycache__/ImageTk.* ++++++ Pillow-4.1.0.tar.gz -> Pillow-4.2.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-Pillow/Pillow-4.1.0.tar.gz /work/SRC/openSUSE:Factory/.python-Pillow.new/Pillow-4.2.1.tar.gz differ: char 5, line 1

1 0

commit perl-Text-Diff for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package perl-Text-Diff for openSUSE:Factory checked in at 2017-08-29 11:37:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Text-Diff (Old) and /work/SRC/openSUSE:Factory/.perl-Text-Diff.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Text-Diff" Tue Aug 29 11:37:00 2017 rev:18 rq:517969 version:1.45 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Text-Diff/perl-Text-Diff.changes 2016-03-16 10:24:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Text-Diff.new/perl-Text-Diff.changes 2017-08-29 11:37:02.955712404 +0200 @@ -1,0 +2,10 @@ +Sat Aug 19 06:21:46 UTC 2017 - coolo(a)suse.com + +- updated to 1.45 + see /usr/share/doc/packages/perl-Text-Diff/Changes + + 1.45 2017-08-16 NEILB + - Typo fixed in doc. Patch from Lucas Kanashiro++. RT#112564 + - Documentation improvements PR from David Gutteridge++. + +------------------------------------------------------------------- Old: ---- Text-Diff-1.44.tar.gz New: ---- Text-Diff-1.45.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Text-Diff.spec ++++++ --- /var/tmp/diff_new_pack.0PdNTo/_old 2017-08-29 11:37:04.931434811 +0200 +++ /var/tmp/diff_new_pack.0PdNTo/_new 2017-08-29 11:37:04.955431440 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Text-Diff # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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,14 +17,14 @@ Name: perl-Text-Diff -Version: 1.44 +Version: 1.45 Release: 0 %define cpan_name Text-Diff Summary: Perform diffs on files and record sets License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Text-Diff/ -Source0: http://www.cpan.org/authors/id/N/NE/NEILB/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/N/NE/NEILB/%{cpan_name}-%{version}.tar… Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +44,7 @@ Relies on Algorithm::Diff for, well, the algorithm. This may not produce the same exact diff as a system's local 'diff' executable, but it will be a valid diff and comprehensible by 'patch'. We haven't seen any differences -between Algorithm::Diff's logic and GNU diff's, but we have not examined +between Algorithm::Diff's logic and GNU 'diff''s, but we have not examined them to make sure they are indeed identical. *Note*: If you don't want to import the 'diff' function, do one of the @@ -54,7 +54,7 @@ require Text::Diff; -That's a pretty rare occurence, so 'diff()' is exported by default. +That's a pretty rare occurrence, so 'diff()' is exported by default. If you pass a filename, but the file can't be read, then 'diff()' will 'croak'. @@ -76,6 +76,7 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes LICENSE README +%doc Changes README +%license LICENSE %changelog ++++++ Text-Diff-1.44.tar.gz -> Text-Diff-1.45.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Diff-1.44/Changes new/Text-Diff-1.45/Changes --- old/Text-Diff-1.44/Changes 2016-02-27 00:04:12.000000000 +0100 +++ new/Text-Diff-1.45/Changes 2017-08-16 20:39:01.000000000 +0200 @@ -1,5 +1,9 @@ Revision history for Perl module Text::Diff +1.45 2017-08-16 NEILB + - Typo fixed in doc. Patch from Lucas Kanashiro++. RT#112564 + - Documentation improvements PR from David Gutteridge++. + 1.44 2016-02-26 NEILB - Fixed the handling of text without a trailing newline. This module now adds the same text that the diff tool does, "\n\\ No newline at end of diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Diff-1.44/META.json new/Text-Diff-1.45/META.json --- old/Text-Diff-1.44/META.json 2016-02-27 00:05:49.000000000 +0100 +++ new/Text-Diff-1.45/META.json 2017-08-16 20:39:27.000000000 +0200 @@ -4,7 +4,7 @@ "Adam Kennedy <adamk(a)cpan.org>" ], "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 7.02, CPAN::Meta::Converter version 2.150005", + "generated_by" : "ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150005", "license" : [ "perl_5" ], @@ -44,6 +44,6 @@ "url" : "https://github.com/neilbowers/Text-Diff" } }, - "version" : "1.44", + "version" : "1.45", "x_serialization_backend" : "JSON::PP version 2.27203" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Diff-1.44/META.yml new/Text-Diff-1.45/META.yml --- old/Text-Diff-1.44/META.yml 2016-02-27 00:05:49.000000000 +0100 +++ new/Text-Diff-1.45/META.yml 2017-08-16 20:39:27.000000000 +0200 @@ -7,7 +7,7 @@ configure_requires: ExtUtils::MakeMaker: '0' dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 7.02, CPAN::Meta::Converter version 2.150005' +generated_by: 'ExtUtils::MakeMaker version 7.24, CPAN::Meta::Converter version 2.150005' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -23,5 +23,5 @@ perl: '5.006' resources: repository: https://github.com/neilbowers/Text-Diff -version: '1.44' +version: '1.45' x_serialization_backend: 'CPAN::Meta::YAML version 0.016' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Text-Diff-1.44/lib/Text/Diff.pm new/Text-Diff-1.45/lib/Text/Diff.pm --- old/Text-Diff-1.44/lib/Text/Diff.pm 2016-02-27 00:04:33.000000000 +0100 +++ new/Text-Diff-1.45/lib/Text/Diff.pm 2017-08-16 20:37:46.000000000 +0200 @@ -7,7 +7,7 @@ use Exporter (); use Algorithm::Diff (); -our $VERSION = '1.44'; +our $VERSION = '1.45'; our @ISA = qw/ Exporter /; our @EXPORT = qw/ diff /; @@ -423,8 +423,8 @@ Relies on L<Algorithm::Diff> for, well, the algorithm. This may not produce the same exact diff as a system's local C<diff> executable, but it will be a valid diff and comprehensible by C<patch>. We haven't seen any differences -between Algorithm::Diff's logic and GNU diff's, but we have not examined them -to make sure they are indeed identical. +between L<Algorithm::Diff>'s logic and GNU C<diff>'s, but we have not examined +them to make sure they are indeed identical. B<Note>: If you don't want to import the C<diff> function, do one of the following: @@ -433,27 +433,28 @@ require Text::Diff; -That's a pretty rare occurence, so C<diff()> is exported by default. +That's a pretty rare occurrence, +so C<diff()> is exported by default. If you pass a filename, but the file can't be read, then C<diff()> will C<croak>. =head1 OPTIONS -diff() takes two parameters from which to draw input and a set of -options to control it's output. The options are: +C<diff()> takes two parameters from which to draw input and a set of +options to control its output. The options are: =over =item FILENAME_A, MTIME_A, FILENAME_B, MTIME_B -The name of the file and the modification time "files" +The name of the file and the modification time "files". -These are filled in automatically for each file when diff() is passed a +These are filled in automatically for each file when C<diff()> is passed a filename, unless a defined value is passed in. If a filename is not passed in and FILENAME_A and FILENAME_B are not provided -or C<undef>, the header will not be printed. +or are C<undef>, the header will not be printed. Unused on C<OldStyle> diffs. @@ -462,7 +463,7 @@ The index of the first line / element. These default to 1 for all parameter types except ARRAY references, for which the default is 0. This is because ARRAY references are presumed to be data structures, while the -others are line oriented text. +others are line-oriented text. =item STYLE @@ -474,9 +475,9 @@ Defaults to "Unified" (unlike standard C<diff>, but Unified is what's most often used in submitting patches and is the most human readable of the three. -If the package indicated by the STYLE has no hunk() method, c<diff()> will +If the package indicated by the STYLE has no C<hunk()> method, C<diff()> will load it automatically (lazy loading). Since all such packages should inherit -from Text::Diff::Base, this should be marvy. +from C<Text::Diff::Base>, this should be marvy. Styles may be specified as class names (C<STYLE =E<gt> 'Foo'>), in which case they will be C<new()>ed with no parameters, @@ -514,21 +515,23 @@ =back B<Note>: if neither C<FILENAME_> option is defined, the header will not be -printed. If at one is present, the other and both MTIME_ options must be -present or "Use of undefined variable" warnings will be generated (except +printed. If at least one is present, the other and both C<MTIME_> options must +be present or "Use of undefined variable" warnings will be generated (except on C<OldStyle> diffs, which ignores these options). =head1 Formatting Classes These functions implement the output formats. They are grouped in to classes -so diff() can use class names to call the correct set of output routines and so -that you may inherit from them easily. There are no constructors or instance -methods for these classes, though subclasses may provide them if need be. - -Each class has file_header(), hunk_header(), hunk(), and footer() methods -identical to those documented in the Text::Diff::Unified section. header() is -called before the hunk() is first called, footer() afterwards. The default -footer function is an empty method provided for overloading: +so C<diff()> can use class names to call the correct set of output routines and +so that you may inherit from them easily. There are no constructors or +instance methods for these classes, though subclasses may provide them if need +be. + +Each class has C<file_header()>, C<hunk_header()>, C<hunk()>, and C<footer()> +methods identical to those documented in the C<Text::Diff::Unified> section. +C<header()> is called before the C<hunk()> is first called, C<footer()> +afterwards. The default footer function is an empty method provided for +overloading: sub footer { return "End of patch\n" } @@ -563,12 +566,12 @@ =over -=item file_header +=item Text::Diff::Unified::file_header $s = Text::Diff::Unified->file_header( $options ); Returns a string containing a unified header. The sole parameter is the -options hash passed in to diff(), containing at least: +C<options> hash passed in to C<diff()>, containing at least: FILENAME_A => $fn1, MTIME_A => $mtime1, @@ -582,11 +585,11 @@ to override the default prefixes (default values shown). -=item hunk_header +=item Text::Diff::Unified::hunk_header Text::Diff::Unified->hunk_header( \@ops, $options ); -Returns a string containing the output of one hunk of unified diff. +Returns a string containing the heading of one hunk of unified diff. =item Text::Diff::Unified::hunk @@ -668,7 +671,7 @@ 12 13 -Note: hunk_header() returns only "***************\n". +Note: C<hunk_header()> returns only "***************\n". =head2 Text::Diff::OldStyle @@ -681,23 +684,23 @@ 12d12 < 11d -Note: no file_header(). +Note: no C<file_header()>. =head1 LIMITATIONS Must suck both input files entirely in to memory and store them with a normal amount of Perlish overhead (one array location) per record. This is implied by -the implementation of Algorithm::Diff, which takes two arrays. If -Algorithm::Diff ever offers an incremental mode, this can be changed (contact -the maintainers of Algorithm::Diff and Text::Diff if you need this; it -shouldn't be too terribly hard to tie arrays in this fashion). - -Does not provide most of the more refined GNU diff options: recursive directory -tree scanning, ignoring blank lines / whitespace, etc., etc. These can all be -added as time permits and need arises, many are rather easy; patches quite -welcome. +the implementation of L<Algorithm::Diff>, which takes two arrays. If +L<Algorithm::Diff> ever offers an incremental mode, this can be changed +(contact the maintainers of L<Algorithm::Diff> and C<Text::Diff> if you need +this; it shouldn't be too terribly hard to tie arrays in this fashion). + +Does not provide most of the more refined GNU C<diff> options: recursive +directory tree scanning, ignoring blank lines / whitespace, etc., etc. These +can all be added as time permits and need arises, many are rather easy; patches +quite welcome. -Uses closures internally, this may lead to leaks on C<perl> versions 5.6.1 and +Uses closures internally, this may lead to leaks on Perl versions 5.6.1 and prior if used many times over a process' life time. =head1 SEE ALSO

1 0

commit perl-Net-DNS for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package perl-Net-DNS for openSUSE:Factory checked in at 2017-08-29 11:36:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Net-DNS (Old) and /work/SRC/openSUSE:Factory/.perl-Net-DNS.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Net-DNS" Tue Aug 29 11:36:55 2017 rev:48 rq:517968 version:1.12 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Net-DNS/perl-Net-DNS.changes 2017-07-04 11:52:57.339291551 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Net-DNS.new/perl-Net-DNS.changes 2017-08-29 11:36:56.912561479 +0200 @@ -1,0 +2,6 @@ +Sat Aug 19 05:53:41 UTC 2017 - coolo(a)suse.com + +- updated to 1.12 + see /usr/share/doc/packages/perl-Net-DNS/Changes + +------------------------------------------------------------------- Old: ---- Net-DNS-1.11.tar.gz New: ---- Net-DNS-1.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Net-DNS.spec ++++++ --- /var/tmp/diff_new_pack.lEoOSY/_old 2017-08-29 11:36:58.392353565 +0200 +++ /var/tmp/diff_new_pack.lEoOSY/_new 2017-08-29 11:36:58.412350755 +0200 @@ -17,7 +17,7 @@ Name: perl-Net-DNS -Version: 1.11 +Version: 1.12 Release: 0 %define cpan_name Net-DNS Summary: Perl Interface to the Domain Name System @@ -38,7 +38,7 @@ Requires: perl(Time::Local) >= 1.19 Recommends: perl(Digest::BubbleBabble) >= 0.01 Recommends: perl(Digest::GOST) >= 0.06 -Recommends: perl(IO::Socket::IP) >= 0.32 +Recommends: perl(IO::Socket::IP) >= 0.38 Recommends: perl(Net::LibIDN) >= 0.12 Recommends: perl(Scalar::Util) >= 1.25 %{perl_requires} ++++++ Net-DNS-1.11.tar.gz -> Net-DNS-1.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/Changes new/Net-DNS-1.12/Changes --- old/Net-DNS-1.11/Changes 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/Changes 2017-08-18 12:20:26.000000000 +0200 @@ -1,4 +1,18 @@ -$Id: Changes 1581 2017-06-26 11:46:03Z willem $ -*-text-*- +$Id: Changes 1592 2017-08-18 10:02:44Z willem $ -*-text-*- + + +**** 1.12 Aug 18, 2017 + +Fix rt.cpan.org #122586 + + Persistent UDP reports false timeouts + +Fix rt.cpan.org #122352 + + bgsend(): TCP retry can stall for IO::Socket::IP before 0.38 + +Feature + CDS / CDNSKEY: Implement RFC8078 erratum 5049. **** 1.11 Jun 26, 2017 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/META.json new/Net-DNS-1.12/META.json --- old/Net-DNS-1.11/META.json 2017-06-26 13:58:47.000000000 +0200 +++ new/Net-DNS-1.12/META.json 2017-08-18 12:20:39.000000000 +0200 @@ -34,7 +34,7 @@ "recommends" : { "Digest::BubbleBabble" : "0.01", "Digest::GOST" : "0.06", - "IO::Socket::IP" : "0.32", + "IO::Socket::IP" : "0.38", "Net::LibIDN" : "0.12", "Scalar::Util" : "1.25" }, @@ -52,6 +52,6 @@ } }, "release_status" : "stable", - "version" : "1.11", + "version" : "1.12", "x_serialization_backend" : "JSON::PP version 2.27400" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/META.yml new/Net-DNS-1.12/META.yml --- old/Net-DNS-1.11/META.yml 2017-06-26 13:58:47.000000000 +0200 +++ new/Net-DNS-1.12/META.yml 2017-08-18 12:20:39.000000000 +0200 @@ -20,7 +20,7 @@ recommends: Digest::BubbleBabble: '0.01' Digest::GOST: '0.06' - IO::Socket::IP: '0.32' + IO::Socket::IP: '0.38' Net::LibIDN: '0.12' Scalar::Util: '1.25' requires: @@ -33,5 +33,5 @@ Test::More: '0.52' Time::Local: '1.19' perl: '5.006' -version: '1.11' +version: '1.12' x_serialization_backend: 'CPAN::Meta::YAML version 0.011' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/Makefile.PL new/Net-DNS-1.12/Makefile.PL --- old/Net-DNS-1.11/Makefile.PL 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/Makefile.PL 2017-08-18 12:20:26.000000000 +0200 @@ -1,5 +1,5 @@ # -# $Id: Makefile.PL 1573 2017-06-12 11:03:59Z willem $ -*-perl-*- +# $Id: Makefile.PL 1591 2017-08-18 09:58:18Z willem $ -*-perl-*- # @@ -61,7 +61,7 @@ 'Digest::BubbleBabble' => 0.01, 'Digest::GOST' => 0.06, 'IO::Socket::INET6' => 2.51, - 'IO::Socket::IP' => 0.32, + 'IO::Socket::IP' => 0.38, 'Net::LibIDN' => 0.12, 'Scalar::Util' => 1.25, ); @@ -84,6 +84,16 @@ delete $optional{'IO::Socket::INET6'} if USE_SOCKET_IP; # exclude redundant dependency +print <<EOT if !USE_SOCKET_IP && USE_SOCKET_INET6; +# +# This Net::DNS installation uses the IO::Socket::INET6 package +# which has been superseded by IO::Socket::IP. +# +# IPv6 support using IO::Socket::INET6 will be discontinued in +# a future release. +# +EOT + # clean up existing makefile unlink('Makefile'); @@ -223,14 +233,14 @@ my %install_type = qw(perl INSTALLPRIVLIB site INSTALLSITELIB vendor INSTALLVENDORLIB); my $install_site = join '', '$(DESTDIR)$(', $install_type{$self->{INSTALLDIRS}}, ')'; for ($install_site) { - s/\$$([A-Z_]+)$/$self->{$1}/g while /\$$/; # expand Makefile macros + s/\$\(([A-Z_]+)$/$self->{$1}/eg while /\$\(/; # expand Makefile macros s|([/])[/]+|$1|g; # remove gratuitous //s } - eval { require Net::DNS }; + eval 'require Net::DNS'; my $nameregex = '\W+Net\WDNS.pm$'; - my @installed = grep $_ =~ m/$nameregex/i, values %INC; + my @installed = grep m/$nameregex/io, values %INC; my %noinstall; foreach (@installed) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/Packet.pm new/Net-DNS-1.12/lib/Net/DNS/Packet.pm --- old/Net-DNS-1.11/lib/Net/DNS/Packet.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/Packet.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::Packet; # -# $Id: Packet.pm 1546 2017-03-06 09:27:31Z willem $ +# $Id: Packet.pm 1584 2017-07-28 16:15:17Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1546 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1584 $)[1]; =head1 NAME @@ -727,7 +727,7 @@ to truncate the packet and set the TC bit according to the rules of RFC2181 Section 9. -The minimum maximum length that is honoured is 512 octets. +The smallest length limit that is honoured is 512 octets. =cut @@ -760,8 +760,7 @@ $size = UDPSZ unless $size > UDPSZ; $size -= $sigrr->_size if $sigrr; - my $data = pack 'x' x 12; # header placeholder - my $hdsz = length $data; + my $data = pack 'x' x HEADER_LENGTH; # header placeholder $self->{count} = []; my $tc; @@ -810,7 +809,7 @@ my @part = qw(question answer authority additional); my @size = map scalar( @{$self->{$_}} ), @part; - pack 'n6 a*', $self->header->id, $self->{status}, @size, substr( $data, $hdsz ); + pack 'n6 a*', $self->header->id, $self->{status}, @size, substr( $data, HEADER_LENGTH ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/CDNSKEY.pm new/Net-DNS-1.12/lib/Net/DNS/RR/CDNSKEY.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/CDNSKEY.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/CDNSKEY.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::RR::CDNSKEY; # -# $Id: CDNSKEY.pm 1580 2017-06-26 11:44:49Z willem $ +# $Id: CDNSKEY.pm 1586 2017-08-15 09:01:57Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1580 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1586 $)[1]; use strict; @@ -20,28 +20,18 @@ use integer; -sub _encode_rdata { ## encode rdata as wire-format octet string - my $self = shift; - - return $self->SUPER::_encode_rdata() if $self->{algorithm}; - return defined $self->{algorithm} ? pack( 'xxH*x', '03' ) : ''; +sub algorithm { + my ( $self, $arg ) = @_; + return $self->SUPER::algorithm($arg) if $arg; + return $self->SUPER::algorithm() unless defined $arg; + @{$self}{qw(flags protocol algorithm)} = ( 0, 3, 0 ); } -sub _format_rdata { ## format rdata portion of RR string. +sub key { my $self = shift; - - return $self->SUPER::_format_rdata() if $self->{algorithm}; - return defined $self->{algorithm} ? '0 3 0 0' : ''; -} - - -sub algorithm { - my ( $self, $arg ) = @_; - - return $self->SUPER::algorithm($arg) if $arg; - @{$self}{qw(flags protocol algorithm keybin)} = ( 0, 3, 0, '' ) if defined $arg; - return $self->SUPER::algorithm(); + return $self->SUPER::key(@_) unless defined( $_[0] ) && length( $_[0] ) < 2; + return $self->SUPER::keybin( $_[0] ? '' : chr(0) ); } @@ -104,6 +94,6 @@ =head1 SEE ALSO -L<perl>, L<Net::DNS>, L<Net::DNS::RR>, L<Net::DNS::RR::DNSKEY>, RFC7344, RFC8087 +L<perl>, L<Net::DNS>, L<Net::DNS::RR>, L<Net::DNS::RR::DNSKEY>, RFC7344, RFC8078(erratum 5049) =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/CDS.pm new/Net-DNS-1.12/lib/Net/DNS/RR/CDS.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/CDS.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/CDS.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::RR::CDS; # -# $Id: CDS.pm 1580 2017-06-26 11:44:49Z willem $ +# $Id: CDS.pm 1586 2017-08-15 09:01:57Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1580 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1586 $)[1]; use strict; @@ -20,36 +20,24 @@ use integer; -sub _encode_rdata { ## encode rdata as wire-format octet string - my $self = shift; - - return $self->SUPER::_encode_rdata() if $self->{algorithm}; - return defined $self->{algorithm} ? pack 'x4' : ''; -} - - -sub _format_rdata { ## format rdata portion of RR string. - my $self = shift; - - return $self->SUPER::_format_rdata() if $self->{algorithm}; - return defined $self->{algorithm} ? '0 0 0 0' : ''; -} - - sub algorithm { my ( $self, $arg ) = @_; - return $self->SUPER::algorithm($arg) if $arg; - @{$self}{qw(keytag algorithm digtype digestbin)} = ( 0, 0, 0, '' ) if defined $arg; - return $self->SUPER::algorithm(); + return $self->SUPER::algorithm() unless defined $arg; + @{$self}{qw(keytag algorithm digtype)} = ( 0, 0, 0 ); } sub digtype { my ( $self, $arg ) = @_; + $self->SUPER::digtype( $arg ? $arg : () ); +} + - return $self->SUPER::digtype($arg) if $arg; - return $self->SUPER::digtype(); +sub digest { + my $self = shift; + return $self->SUPER::digest(@_) unless defined( $_[0] ) && length( $_[0] ) < 2; + return $self->SUPER::digestbin( $_[0] ? '' : chr(0) ); } @@ -112,6 +100,6 @@ =head1 SEE ALSO -L<perl>, L<Net::DNS>, L<Net::DNS::RR>, L<Net::DNS::RR::DS>, RFC7344, RFC8087 +L<perl>, L<Net::DNS>, L<Net::DNS::RR>, L<Net::DNS::RR::DS>, RFC7344, RFC8078(erratum 5049) =cut diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/CERT.pm new/Net-DNS-1.12/lib/Net/DNS/RR/CERT.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/CERT.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/CERT.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::RR::CERT; # -# $Id: CERT.pm 1567 2017-05-19 09:52:52Z willem $ +# $Id: CERT.pm 1582 2017-07-07 21:45:14Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1567 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1582 $)[1]; use strict; @@ -42,7 +42,7 @@ # { my @algbyname = ( - 'DELETE' => 0, # [RFC4034][RFC4398][RFC8087] + 'DELETE' => 0, # [RFC4034][RFC4398][RFC8078] 'RSAMD5' => 1, # [RFC3110][RFC4034] 'DH' => 2, # [RFC2539] 'DSA' => 3, # [RFC3755][RFC2536] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/DNSKEY.pm new/Net-DNS-1.12/lib/Net/DNS/RR/DNSKEY.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/DNSKEY.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/DNSKEY.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::RR::DNSKEY; # -# $Id: DNSKEY.pm 1567 2017-05-19 09:52:52Z willem $ +# $Id: DNSKEY.pm 1586 2017-08-15 09:01:57Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1567 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1586 $)[1]; use strict; @@ -28,7 +28,7 @@ # { my @algbyname = ( - 'DELETE' => 0, # [RFC4034][RFC4398][RFC8087] + 'DELETE' => 0, # [RFC4034][RFC4398][RFC8078] 'RSAMD5' => 1, # [RFC3110][RFC4034] 'DH' => 2, # [RFC2539] 'DSA' => 3, # [RFC3755][RFC2536] @@ -54,7 +54,7 @@ my %algbyval = reverse @algbyname; - my @algrehash = map /^\d/ ? ($_) x 3 : do { s/[\W]//g; uc($_) }, @algbyname; + my @algrehash = map /^\d/ ? ($_) x 3 : do { s/[\W_]//g; uc($_) }, @algbyname; my %algbyname = @algrehash; # work around broken cperl sub _algbyname { @@ -77,15 +77,16 @@ my $self = shift; my ( $data, $offset ) = @_; - my $keylength = $self->{rdlength} - 4; - @{$self}{qw(flags protocol algorithm keybin)} = unpack "\@$offset n C2 a$keylength", $$data; + my $rdata = substr $$data, $offset, $self->{rdlength}; + $self->{keybin} = unpack '@4 a*', $rdata; + @{$self}{qw(flags protocol algorithm)} = unpack 'n C*', $rdata; } sub _encode_rdata { ## encode rdata as wire-format octet string my $self = shift; - return '' unless $self->{algorithm}; + return '' unless defined $self->{algorithm}; pack 'n C2 a*', @{$self}{qw(flags protocol algorithm keybin)}; } @@ -93,20 +94,22 @@ sub _format_rdata { ## format rdata portion of RR string. my $self = shift; - return '' unless $self->{algorithm}; - $self->_annotation( 'Key ID =', $self->keytag ); + my $algorithm = $self->{algorithm}; + return '' unless defined $algorithm; + $self->_annotation( 'Key ID =', $self->keytag ) if $algorithm; return $self->SUPER::_format_rdata() unless BASE64; - my @base64 = split /\s+/, MIME::Base64::encode( $self->{keybin} ); - my @rdata = ( @{$self}{qw(flags protocol algorithm)}, @base64 ); + my @base64 = split /\s+/, MIME::Base64::encode( $self->{keybin} ) || '-'; + my @rdata = ( @{$self}{qw(flags protocol)}, $algorithm, @base64 ); } sub _parse_rdata { ## populate RR from rdata in argument list my $self = shift; - $self->flags(shift); + my $flags = shift; ## avoid destruction by CDNSKEY algorithm(0) $self->protocol(shift); - return unless $self->algorithm(shift); + $self->algorithm(shift); + $self->flags($flags); $self->key(@_); } @@ -171,7 +174,7 @@ unless ( ref($self) ) { ## class method or simple function my $argn = pop; - return $argn =~ /[^0-9]/ ? _algbyname($argn) : _algbyval($argn); + return $argn =~ /\D/ ? _algbyname($argn) : _algbyval($argn); } return $self->{algorithm} unless defined $arg; @@ -182,9 +185,8 @@ sub key { my $self = shift; - - $self->keybin( MIME::Base64::decode( join "", @_ ) ) if scalar @_; - MIME::Base64::encode( $self->keybin(), "" ) if defined wantarray; + return MIME::Base64::encode( $self->keybin(), "" ) unless scalar @_; + $self->keybin( MIME::Base64::decode( join "", @_ ) ); } @@ -196,7 +198,7 @@ } -sub publickey { &key; } +sub publickey { shift->key(@_); } sub privatekeyname { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/DS.pm new/Net-DNS-1.12/lib/Net/DNS/RR/DS.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/DS.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/DS.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::RR::DS; # -# $Id: DS.pm 1567 2017-05-19 09:52:52Z willem $ +# $Id: DS.pm 1586 2017-08-15 09:01:57Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1567 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1586 $)[1]; use strict; @@ -39,7 +39,7 @@ # { my @algbyname = ( - 'DELETE' => 0, # [RFC4034][RFC4398][RFC8087] + 'DELETE' => 0, # [RFC4034][RFC4398][RFC8078] 'RSAMD5' => 1, # [RFC3110][RFC4034] 'DH' => 2, # [RFC2539] 'DSA' => 3, # [RFC3755][RFC2536] @@ -65,7 +65,7 @@ my %algbyval = reverse @algbyname; - my @algrehash = map /^\d/ ? ($_) x 3 : do { s/[\W]//g; uc($_) }, @algbyname; + my @algrehash = map /^\d/ ? ($_) x 3 : do { s/[\W_]//g; uc($_) }, @algbyname; my %algbyname = @algrehash; # work around broken cperl sub _algbyname { @@ -101,8 +101,8 @@ my %digestbyval = reverse @digestbyname; - my @digestrehash = map /^\d/ ? ($_) x 3 : do { s/[\W]//g; uc($_) }, @digestbyname, @digestalias; - my %digestbyname = @digestrehash; # work around broken cperl + my @digestrehash = map /^\d/ ? ($_) x 3 : do { s/[\W_]//g; uc($_) }, @digestbyname; + my %digestbyname = ( @digestalias, @digestrehash ); # work around broken cperl sub _digestbyname { my $arg = shift; @@ -124,15 +124,16 @@ my $self = shift; my ( $data, $offset ) = @_; - my $length = $self->{rdlength} - 4; - @{$self}{qw(keytag algorithm digtype digestbin)} = unpack "\@$offset n C2 a$length", $$data; + my $rdata = substr $$data, $offset, $self->{rdlength}; + $self->{digestbin} = unpack '@4 a*', $rdata; + @{$self}{qw(keytag algorithm digtype)} = unpack 'n C*', $rdata; } sub _encode_rdata { ## encode rdata as wire-format octet string my $self = shift; - return '' unless $self->{algorithm}; + return '' unless defined $self->{algorithm}; pack 'n C2 a*', @{$self}{qw(keytag algorithm digtype digestbin)}; } @@ -140,9 +141,9 @@ sub _format_rdata { ## format rdata portion of RR string. my $self = shift; - return '' unless $self->{algorithm}; - $self->_annotation( $self->babble ) if BABBLE; - my @digest = split /(\S{64})/, $self->digest; + return '' unless defined $self->{algorithm}; + $self->_annotation( $self->babble ) if BABBLE && $self->{algorithm}; + my @digest = split /(\S{64})/, $self->digest || '-'; my @rdata = ( @{$self}{qw(keytag algorithm digtype)}, @digest ); } @@ -150,8 +151,9 @@ sub _parse_rdata { ## populate RR from rdata in argument list my $self = shift; - $self->keytag(shift); - return unless $self->algorithm(shift); + my $keytag = shift; ## avoid destruction by CDS algorithm(0) + $self->algorithm(shift); + $self->keytag($keytag); $self->digtype(shift); $self->digest(@_); } @@ -195,10 +197,8 @@ sub digest { my $self = shift; - my @args = map { /[^0-9A-Fa-f]/ ? croak "corrupt hexadecimal" : $_ } @_; - - $self->digestbin( pack "H*", join "", @args ) if scalar @args; - unpack "H*", $self->digestbin() if defined wantarray; + return unpack "H*", $self->digestbin() unless scalar @_; + $self->digestbin( pack "H*", map /[^\dA-F]/i ? croak "corrupt hex" : $_, join "", @_ ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/RRSIG.pm new/Net-DNS-1.12/lib/Net/DNS/RR/RRSIG.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/RRSIG.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/RRSIG.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::RR::RRSIG; # -# $Id: RRSIG.pm 1567 2017-05-19 09:52:52Z willem $ +# $Id: RRSIG.pm 1582 2017-07-07 21:45:14Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1567 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1582 $)[1]; use strict; @@ -91,7 +91,7 @@ # { my @algbyname = ( - 'DELETE' => 0, # [RFC4034][RFC4398][RFC8087] + 'DELETE' => 0, # [RFC4034][RFC4398][RFC8078] 'RSAMD5' => 1, # [RFC3110][RFC4034] 'DH' => 2, # [RFC2539] 'DSA' => 3, # [RFC3755][RFC2536] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/RR/SIG.pm new/Net-DNS-1.12/lib/Net/DNS/RR/SIG.pm --- old/Net-DNS-1.11/lib/Net/DNS/RR/SIG.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/RR/SIG.pm 2017-08-18 12:20:26.000000000 +0200 @@ -15,9 +15,9 @@ package Net::DNS::RR::SIG; # -# $Id: SIG.pm 1567 2017-05-19 09:52:52Z willem $ +# $Id: SIG.pm 1582 2017-07-07 21:45:14Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1567 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1582 $)[1]; use strict; @@ -123,7 +123,7 @@ # { my @algbyname = ( - 'DELETE' => 0, # [RFC4034][RFC4398][RFC8087] + 'DELETE' => 0, # [RFC4034][RFC4398][RFC8078] 'RSAMD5' => 1, # [RFC3110][RFC4034] 'DH' => 2, # [RFC2539] 'DSA' => 3, # [RFC3755][RFC2536] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/Resolver/Base.pm new/Net-DNS-1.12/lib/Net/DNS/Resolver/Base.pm --- old/Net-DNS-1.11/lib/Net/DNS/Resolver/Base.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/Resolver/Base.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::Resolver::Base; # -# $Id: Base.pm 1573 2017-06-12 11:03:59Z willem $ +# $Id: Base.pm 1588 2017-08-17 12:41:15Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1573 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1588 $)[1]; # @@ -293,8 +293,6 @@ push @iplist, _cname_addr( $packet, $names ); } - $self->errorstring( $defres->errorstring ); - my %unique = map( ( $_ => $_ ), @iplist ); my @address = values(%unique); # tainted @@ -358,8 +356,9 @@ sub errorstring { my $self = shift; - $self->{errorstring} = shift if scalar @_; - return $self->{errorstring}; + my $text = shift || return $self->{errorstring}; + $self->_diag( 'errorstring:', $text ); + return $self->{errorstring} = $text; } @@ -420,11 +419,11 @@ sub _send_tcp { - my ( $self, $packet, $packet_data ) = @_; + my ( $self, $query, $query_data ) = @_; $self->_reset_errorstring; - my $tcp_packet = pack 'n a*', length($packet_data), $packet_data; + my $tcp_packet = pack 'n a*', length($query_data), $query_data; my @ns = $self->nameservers(); my $lastanswer; my $timeout = $self->{tcp_timeout}; @@ -444,31 +443,32 @@ $self->answerfrom($ip); $self->_diag( 'answer from', "[$ip]", length($buffer), 'bytes' ); - my $ans = $self->_decode_reply( \$buffer, $packet ) || next; - - $ans->answerfrom($ip); - $lastanswer = $ans; + my $reply = Net::DNS::Packet->decode( \$buffer, $self->{debug} ); + $self->errorstring($@); + next unless $self->_accept_reply( $reply, $query ); + $reply->answerfrom($ip); - my $rcode = $ans->header->rcode; - last if $rcode eq 'NOERROR'; - last if $rcode eq 'NXDOMAIN'; - $self->errorstring($rcode); - } + if ( $self->{tsig_rr} && !$reply->verify($query) ) { + $self->errorstring( $reply->verifyerr ); + next; + } - return unless $lastanswer; + $lastanswer = $reply; - if ( $self->{tsig_rr} && !$lastanswer->verify($packet) ) { - $self->_diag( $self->errorstring( $lastanswer->verifyerr ) ); - return; + my $rcode = $reply->header->rcode; + $self->errorstring($rcode); # historical quirk + return $reply if $rcode eq 'NOERROR'; + return $reply if $rcode eq 'NXDOMAIN'; } - $self->errorstring( $lastanswer->header->rcode ); # historical quirk + $self->{errorstring} = $lastanswer->header->rcode if $lastanswer; + $self->errorstring('query timed out') unless $self->{errorstring}; return $lastanswer; } sub _send_udp { - my ( $self, $packet, $packet_data ) = @_; + my ( $self, $query, $query_data ) = @_; $self->_reset_errorstring; @@ -476,7 +476,6 @@ my $port = $self->{port}; my $retrans = $self->{retrans} || 1; my $retry = $self->{retry} || 1; - my $select = IO::Select->new(); my $servers = scalar(@ns); my $timeout = $servers ? do { no integer; $retrans / $servers } : 0; my $lastanswer; @@ -485,9 +484,11 @@ RETRY: for ( 1 .. $retry ) { # assumed to be a small number # Try each nameserver. + my $select = IO::Select->new(); + NAMESERVER: foreach my $ns (@ns) { - # Construct an array of 3 element arrays + # state vector replaces corresponding element of @ns array unless ( ref $ns ) { my $socket = $self->_create_udp_socket($ns) || next; my $dst_sockaddr = $self->_create_dst_sockaddr( $ns, $port ); @@ -499,53 +500,53 @@ $self->_diag( 'udp send', "[$ip]:$port" ); - $socket->send( $packet_data, 0, $dst_sockaddr ); + $select->add($socket); + $socket->send( $query_data, 0, $dst_sockaddr ); $self->errorstring( $$ns[3] = $! ); # handle failure to detect taint inside socket->send() die 'Insecure dependency while running with -T switch' if TESTS && Scalar::Util::tainted($dst_sockaddr); - $select->add($socket); - + my $reply; while ( my ($socket) = $select->can_read($timeout) ) { - $select->remove($socket); - my $peer = $socket->peerhost; $self->answerfrom($peer); my $buffer = _read_udp( $socket, $self->_packetsz ); $self->_diag( "answer from [$peer]", length($buffer), 'bytes' ); - my $ans = $self->_decode_reply( \$buffer, $packet ) || next; - - $ans->answerfrom($peer); - $lastanswer = $ans; - - my $rcode = $ans->header->rcode; - last if $rcode eq 'NOERROR'; - last if $rcode eq 'NXDOMAIN'; + my $packet = Net::DNS::Packet->decode( \$buffer, $self->{debug} ); + $self->errorstring($@); + next unless $self->_accept_reply( $packet, $query ); + $reply = $packet; + $reply->answerfrom($peer); + last; + } #SELECT LOOP - $self->errorstring( $$ns[3] = $rcode ); - } #SELECTOR LOOP + next unless $reply; - next unless $lastanswer; - - if ( $self->{tsig_rr} && !$lastanswer->verify($packet) ) { - my $error = $$ns[3] = $lastanswer->verifyerr; - $self->_diag( $self->errorstring($error) ); + if ( $self->{tsig_rr} && !$reply->verify($query) ) { + $self->errorstring( $$ns[3] = $reply->verifyerr ); next; } - $self->errorstring( $lastanswer->header->rcode ); # historical quirk - return $lastanswer; + $lastanswer = $reply; + + my $rcode = $reply->header->rcode; + $self->errorstring($rcode); # historical quirk + return $reply if $rcode eq 'NOERROR'; + return $reply if $rcode eq 'NXDOMAIN'; + $$ns[3] = $rcode; } #NAMESERVER LOOP + no integer; $timeout += $timeout; } #RETRY LOOP - $self->_diag( $self->errorstring('query timed out') ) unless $lastanswer; - return; + $self->{errorstring} = $lastanswer->header->rcode if $lastanswer; + $self->errorstring('query timed out') unless $self->{errorstring}; + return $lastanswer; } @@ -582,7 +583,6 @@ return $socket; } - $self->_diag( $self->errorstring ); return undef; } @@ -612,7 +612,6 @@ return $socket; } - $self->_diag( $self->errorstring ); return undef; } @@ -648,9 +647,8 @@ sub bgread { - my ( $self, $handle ) = @_; while (&bgbusy) { # side effect: TCP retry - IO::Select->new($handle)->can_read(0.02); # cut CPU by 3 orders of magnitude + IO::Select->new( $_[1] )->can_read(0.02); # use 3 orders of magnitude less CPU } &_bgread; } @@ -673,7 +671,10 @@ my $buffer = $dgram ? _read_udp( $handle, $self->_packetsz ) : _read_tcp($handle); $self->_diag( "answer from [$peer]", length($buffer), 'bytes' ); - my $reply = $self->_decode_reply( \$buffer, $query ) || return; + my $reply = Net::DNS::Packet->decode( \$buffer, $self->{debug} ); + $self->errorstring($@); + return unless $self->_accept_reply( $reply, $query ); + $reply->answerfrom($peer); return $reply unless $self->{tsig_rr} && !$reply->verify($query); $self->errorstring( $reply->verifyerr ); @@ -681,19 +682,16 @@ } -sub _decode_reply { - my ( $self, $bufref, $query ) = @_; - - my $reply = Net::DNS::Packet->decode( $bufref, $self->{debug} ); - $self->errorstring($@); +sub _accept_reply { + my ( $self, $reply, $query ) = @_; return unless $reply; my $header = $reply->header; return unless $header->qr; - return $reply unless $query; # SpamAssassin 3.4.1 workaround - return ( $header->id != $query->header->id ) ? undef : $reply; + return 1 unless $query; # SpamAssassin 3.4.1 workaround + return $header->id == $query->header->id; } @@ -896,8 +894,8 @@ unless USE_SOCKET_INET6 && $ip6_addr; } - $self->{persistent}{$sock_key} = $self->{persistent_tcp} ? $socket : undef; $self->errorstring("no socket $sock_key $!") unless $socket; + $self->{persistent}{$sock_key} = $self->{persistent_tcp} ? $socket : undef; return $socket; } @@ -937,8 +935,8 @@ unless USE_SOCKET_INET6 && $ip6_addr; } - $self->{persistent}{$sock_key} = $self->{persistent_udp} ? $socket : undef; $self->errorstring("no socket $sock_key $!") unless $socket; + $self->{persistent}{$sock_key} = $self->{persistent_udp} ? $socket : undef; return $socket; } @@ -959,20 +957,14 @@ } if USE_SOCKET_IP; -BEGIN { - import Socket6 qw(AI_NUMERICHOST) if USE_SOCKET_INET6; -} - -my @inet6 = ( AF_INET6, SOCK_DGRAM, 0, AI_NUMERICHOST ) if USE_SOCKET_INET6; +my $inet6 = [AF_INET6, SOCK_DGRAM, 0, Socket6::AI_NUMERICHOST()] if USE_SOCKET_INET6; sub _create_dst_sockaddr { ## create UDP destination sockaddr structure my ( $self, $ip, $port ) = @_; unless (USE_SOCKET_IP) { - return ( Socket6::getaddrinfo( $ip, $port, @inet6 ) )[3] - if USE_SOCKET_INET6 && _ipv6($ip); - - return sockaddr_in( $port, inet_aton($ip) ); # NB: errors raised in socket->send + return sockaddr_in( $port, inet_aton($ip) ) unless _ipv6($ip); + return ( Socket6::getaddrinfo( $ip, $port, @$inet6 ) )[3] if USE_SOCKET_INET6; } ( Socket::getaddrinfo( $ip, $port, _ipv6($ip) ? $hints6 : $hints4 ) )[1]->{addr} @@ -984,15 +976,17 @@ sub _ipv4 { for (shift) { - return /^[0-9.]+\.[0-9]+$/; # dotted digits + return if m/[^.0-9]/; # dots and digits only + return m/\.\d+\./; # dots separated by digits } } sub _ipv6 { for (shift) { - return 1 if /^[:0-9a-f]+:[0-9a-f]*$/i; # mixed : and hexdigits - return 1 if /^[:0-9a-f]+:[0-9.]+$/i; # prefix + dotted digits - return /^[:0-9a-f]+:[0-9a-f]*[%].+$/i; # RFC4007 scoped address + return unless m/:.*:/; # must contain two colons + return 1 unless m/[^:0-9A-Fa-f]/; # colons and hexdigits only + return 1 if m/^[:.0-9A-Fa-f]+\%.+$/; # RFC4007 scoped address + return m/^[:0-9A-Fa-f]+:[.0-9]+$/; # prefix : dotted digits } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS/Resolver.pm new/Net-DNS-1.12/lib/Net/DNS/Resolver.pm --- old/Net-DNS-1.11/lib/Net/DNS/Resolver.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS/Resolver.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,9 +1,9 @@ package Net::DNS::Resolver; # -# $Id: Resolver.pm 1576 2017-06-19 12:39:09Z willem $ +# $Id: Resolver.pm 1590 2017-08-18 09:56:05Z willem $ # -our $VERSION = (qw$LastChangedRevision: 1576 $)[1]; +our $VERSION = (qw$LastChangedRevision: 1590 $)[1]; =head1 NAME @@ -307,9 +307,6 @@ Errors are indicated by returning C<undef> in which case the reason for failure may be determined using C<errorstring()>. -The program may determine when the handle is ready for reading by -calling C<bgbusy()>. - The response L<Net::DNS::Packet> object is obtained by calling C<bgread()>. B<BEWARE>: @@ -319,13 +316,14 @@ =head2 bgread + $handle = $resolver->bgsend( 'www.example.com' ); $packet = $resolver->bgread($handle); Reads the answer from a background query. The argument is the handle returned by C<bgsend()>. Returns a L<Net::DNS::Packet> object or C<undef> if no response was -received or timeout occurred. +received before the timeout interval expired. =head2 bgbusy @@ -388,6 +386,14 @@ The default is true. +=head2 domain + + $domain = $resolver->domain; + $resolver->domain( 'domain.example' ); + +Gets or sets the resolver default domain. + + =head2 igntc print 'igntc flag: ', $resolver->igntc, "\n"; @@ -524,7 +530,7 @@ $resolver->udppacketsize(2048); Get or set the UDP packet size. -If set to a value greater than the default DNS packet size, +If set to a value not less than the default DNS packet size, an EDNS extension will be added indicating support for large UDP datagram. @@ -548,14 +554,6 @@ received in response to a query. -=head2 answersize - - print 'size of last answer: ', $resolver->answersize, "\n"; - -Returns the size in bytes of the most recent packet received in -response to a query. - - =head2 errorstring print 'query status: ', $resolver->errorstring, "\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/lib/Net/DNS.pm new/Net-DNS-1.12/lib/Net/DNS.pm --- old/Net-DNS-1.11/lib/Net/DNS.pm 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/lib/Net/DNS.pm 2017-08-18 12:20:26.000000000 +0200 @@ -1,13 +1,13 @@ package Net::DNS; # -# $Id: DNS.pm 1581 2017-06-26 11:46:03Z willem $ +# $Id: DNS.pm 1592 2017-08-18 10:02:44Z willem $ # require 5.006; our $VERSION; -$VERSION = '1.11'; +$VERSION = '1.12'; $VERSION = eval $VERSION; -our $SVNVERSION = (qw$LastChangedRevision: 1581 $)[1]; +our $SVNVERSION = (qw$LastChangedRevision: 1592 $)[1]; =head1 NAME diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/t/00-version.t new/Net-DNS-1.12/t/00-version.t --- old/Net-DNS-1.11/t/00-version.t 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/t/00-version.t 2017-08-18 12:20:26.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: 00-version.t 1573 2017-06-12 11:03:59Z willem $ -*-perl-*- +# $Id: 00-version.t 1582 2017-07-07 21:45:14Z willem $ -*-perl-*- use strict; use Test::More; @@ -35,28 +35,26 @@ } -END { +eval { my %macro; # extract Makefile macros open MAKEFILE, 'Makefile' or die $!; while (<MAKEFILE>) { - next if /^#/; - next unless /^([A-Z_]+)\s+=\s+(.*)$/; - $macro{$1} = $2; + $macro{$1} = $2 if /^([A-Z_]+)\s+=\s+(.*)$/; } close MAKEFILE; my %install_type = qw(perl INSTALLPRIVLIB site INSTALLSITELIB vendor INSTALLVENDORLIB); my $install_site = join '', '$(DESTDIR)$(', $install_type{$macro{INSTALLDIRS}}, ')'; for ($install_site) { - s/\$$([A-Z_]+)$/$macro{$1}/g while /\$$/; # expand Makefile macros + s/\$\(([A-Z_]+)$/$macro{$1}/eg while /\$\(/; # expand Makefile macros s|([/])[/]+|$1|g; # remove gratuitous //s } - local @INC = grep $_ !~ m/\bblib\W(arch|lib)$/i, @INC; - eval { require Net::DNS }; + local @INC = grep !m/\bblib\W(arch|lib)$/i, @INC; + eval 'require Net::DNS'; my $nameregex = '\W+Net\WDNS.pm$'; - my @installed = grep $_ =~ m/$nameregex/i, values %INC; + my @installed = grep m/$nameregex/io, values %INC; my %noinstall; foreach (@installed) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/t/01-resolver.t new/Net-DNS-1.12/t/01-resolver.t --- old/Net-DNS-1.11/t/01-resolver.t 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/t/01-resolver.t 2017-08-18 12:20:26.000000000 +0200 @@ -1,7 +1,7 @@ -# $Id: 01-resolver.t 1573 2017-06-12 11:03:59Z willem $ -*-perl-*- +# $Id: 01-resolver.t 1590 2017-08-18 09:56:05Z willem $ -*-perl-*- use strict; -use Test::More tests => 26; +use Test::More tests => 28; BEGIN { @@ -87,19 +87,22 @@ { my $resolver = Net::DNS::Resolver->new(); - foreach my $value (qw(1.2.3.4 ::1 ::1.2.3.4)) { - is( $resolver->srcaddr($value), $value, "\$resolver->srcaddr($value)" ); + foreach my $ip (qw(127.0.0.1 ::1 fe80::1234%1)) { + is( $resolver->srcaddr($ip), $ip, "\$resolver->srcaddr($ip)" ); } } { ## exercise possibly unused socket code + ## check for smoke and flames only my $resolver = Net::DNS::Resolver->new(); - foreach my $value (qw(127.0.0.1 ::1)) { - my $udp = eval { $resolver->_create_udp_socket($value) }; - ok( !$@, "resolver->_create_udp_socket($value)" ); - my $tcp = eval { $resolver->_create_tcp_socket($value) }; - ok( !$@, "resolver->_create_tcp_socket($value)" ); + foreach my $ip (qw(127.0.0.1 ::1 ::ffff:127.0.0.1)) { + eval { $resolver->_create_udp_socket($ip) }; + ok( !$@, "\$resolver->_create_udp_socket($ip)" ); + eval { $resolver->_create_dst_sockaddr( $ip, 53 ) }; + #ok( !$@, "\$resolver->_create_dst_sockaddr($ip,53)" ); # Windows! + eval { $resolver->_create_tcp_socket($ip) }; + ok( !$@, "\$resolver->_create_tcp_socket($ip)" ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/t/05-CDNSKEY.t new/Net-DNS-1.12/t/05-CDNSKEY.t --- old/Net-DNS-1.11/t/05-CDNSKEY.t 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/t/05-CDNSKEY.t 2017-08-18 12:20:26.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: 05-CDNSKEY.t 1526 2017-01-16 09:17:54Z willem $ -*-perl-*- +# $Id: 05-CDNSKEY.t 1586 2017-08-15 09:01:57Z willem $ -*-perl-*- # use strict; @@ -15,7 +15,7 @@ exit; } -plan tests => 33; +plan tests => 35; my $name = 'CDNSKEY.example'; @@ -102,15 +102,31 @@ { - my $rr = new Net::DNS::RR("$name $type 0 3 0 0"); - is( $rr->rdstring(), '0 3 0 0', "DNSKEY delete: $name. $type 0 3 0 0" ); - is( $rr->flags(), 0, 'DNSKEY delete: flags 0' ); - is( $rr->protocol(), 3, 'DNSKEY delete: protocol 3' ); - is( $rr->algorithm(), 0, 'DNSKEY delete: algorithm 0' ); - is( $rr->keybin(), '', 'DNSKEY delete: key empty' ); + my @arg = qw(0 3 0 AA==); # per RFC8078(4), erratum 5049 + my $rr = new Net::DNS::RR("$name. $type @arg"); + ok( ref($rr), "DNSKEY delete: $name. $type @arg" ); + is( $rr->flags(), 0, 'DNSKEY delete: flags 0' ); + is( $rr->protocol(), 3, 'DNSKEY delete: protocol 3' ); + is( $rr->algorithm(), 0, 'DNSKEY delete: algorithm 0' ); - my $rdata = $rr->rdata(); - is( unpack( 'H*', $rdata ), '00000300', 'DNSKEY delete: rdata wire-format' ); + is( $rr->string(), "$name.\tIN\t$type\t@arg", 'DNSKEY delete: presentation format' ); + + my $rdata = unpack 'H*', $rr->rdata(); + is( $rdata, '0000030000', 'DNSKEY delete: rdata wire-format' ); +} + + +{ + my @arg = qw(0 3 0 0); # per RFC8078(4) as published + my $rr = new Net::DNS::RR("$name. $type @arg"); + is( $rr->rdstring(), '0 3 0 AA==', 'DNSKEY delete: accept old format' ); +} + + +{ + my @arg = qw(0 0 0 -); # unexpected empty field + my $rr = new Net::DNS::RR("$name. $type @arg"); + is( $rr->rdstring(), '0 3 0 -', 'DNSKEY delete: represent empty key' ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/t/05-CDS.t new/Net-DNS-1.12/t/05-CDS.t --- old/Net-DNS-1.11/t/05-CDS.t 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/t/05-CDS.t 2017-08-18 12:20:26.000000000 +0200 @@ -1,7 +1,7 @@ -# $Id: 05-CDS.t 1526 2017-01-16 09:17:54Z willem $ -*-perl-*- +# $Id: 05-CDS.t 1586 2017-08-15 09:01:57Z willem $ -*-perl-*- use strict; -use Test::More tests => 29; +use Test::More tests => 31; use Net::DNS; @@ -82,15 +82,31 @@ { - my $rr = new Net::DNS::RR("$name. $type 0 0 0 0"); - is( $rr->rdstring(), '0 0 0 0', "DS delete: $name. $type 0 0 0 0" ); - is( $rr->keytag(), 0, 'DS delete: keytag 0' ); - is( $rr->algorithm(), 0, 'DS delete: algorithm 0' ); - is( $rr->digtype(), 0, 'DS delete: digtype 0' ); - is( $rr->digest(), '', 'DS delete: digest empty' ); + my @arg = qw(0 0 0 00); # per RFC8078(4), erratum 5049 + my $rr = new Net::DNS::RR("$name. $type @arg"); + ok( ref($rr), "DS delete: $name. $type @arg" ); + is( $rr->keytag(), 0, 'DS delete: keytag 0' ); + is( $rr->algorithm(), 0, 'DS delete: algorithm 0' ); + is( $rr->digtype(), 0, 'DS delete: digtype 0' ); - my $rdata = $rr->rdata(); - is( unpack( 'H*', $rdata ), '00000000', 'DS delete: rdata wire-format' ); + is( $rr->string(), "$name.\tIN\t$type\t@arg", 'DS delete: presentation format' ); + + my $rdata = unpack 'H*', $rr->rdata(); + is( $rdata, '0000000000', 'DS delete: rdata wire-format' ); +} + + +{ + my @arg = qw(0 0 0 0); # per RFC8078(4) as published + my $rr = new Net::DNS::RR("$name. $type @arg"); + is( $rr->rdstring(), '0 0 0 00', 'DS delete: accept old format' ); +} + + +{ + my @arg = qw(0 0 0 -); # unexpected empty field + my $rr = new Net::DNS::RR("$name. $type @arg"); + is( $rr->rdstring(), '0 0 0 -', 'DS delete: represent empty digest' ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/t/08-IPv4.t new/Net-DNS-1.12/t/08-IPv4.t --- old/Net-DNS-1.11/t/08-IPv4.t 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/t/08-IPv4.t 2017-08-18 12:20:26.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: 08-IPv4.t 1567 2017-05-19 09:52:52Z willem $ -*-perl-*- +# $Id: 08-IPv4.t 1584 2017-07-28 16:15:17Z willem $ -*-perl-*- use strict; use Test::More; @@ -542,7 +542,7 @@ { ## exercise error paths in _send_???() and bgbusy() - my $resolver = Net::DNS::Resolver->new( nameservers => $IP ); + my $resolver = Net::DNS::Resolver->new( nameservers => $IP, retry => 1 ); my $packet = $resolver->_make_query_packet(qw(net-dns.org SOA)); my $mismatch = $resolver->_make_query_packet(qw(net-dns.org SOA)); @@ -553,20 +553,18 @@ } -{ ## exercise error paths in _decode_reply() +{ ## exercise error paths in _accept_reply() my $resolver = Net::DNS::Resolver->new( nameservers => $NOIP ); - my $corrupt = ''; - ok( !$resolver->_decode_reply( \$corrupt ), '_decode_reply() corrupt reply' ); - my $query = new Net::DNS::Packet(qw(net-dns.org SOA IN)); - my $qdata = $query->data; - ok( !$resolver->_decode_reply( \$qdata ), '_decode_reply() qr not set' ); - my $reply = new Net::DNS::Packet(qw(net-dns.org SOA IN)); $reply->header->qr(1); - my $rdata = $reply->data; - ok( !$resolver->_decode_reply( \$rdata, $query ), '_decode_reply() id mismatch' ); + + ok( !$resolver->_accept_reply(undef), '_accept_reply() corrupt reply' ); + + ok( !$resolver->_accept_reply($query), '_accept_reply() qr not set' ); + + ok( !$resolver->_accept_reply( $reply, $query ), '_accept_reply() id mismatch' ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Net-DNS-1.11/t/08-IPv6.t new/Net-DNS-1.12/t/08-IPv6.t --- old/Net-DNS-1.11/t/08-IPv6.t 2017-06-26 13:58:36.000000000 +0200 +++ new/Net-DNS-1.12/t/08-IPv6.t 2017-08-18 12:20:26.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: 08-IPv6.t 1567 2017-05-19 09:52:52Z willem $ -*-perl-*- +# $Id: 08-IPv6.t 1584 2017-07-28 16:15:17Z willem $ -*-perl-*- use strict; use Test::More; @@ -545,7 +545,7 @@ { ## exercise error paths in _send_???() and bgbusy() - my $resolver = Net::DNS::Resolver->new( nameservers => $IP ); + my $resolver = Net::DNS::Resolver->new( nameservers => $IP, retry => 1 ); my $packet = $resolver->_make_query_packet(qw(net-dns.org SOA)); my $mismatch = $resolver->_make_query_packet(qw(net-dns.org SOA)); @@ -556,20 +556,18 @@ } -{ ## exercise error paths in _decode_reply() +{ ## exercise error paths in _accept_reply() my $resolver = Net::DNS::Resolver->new( nameservers => $NOIP ); - my $corrupt = ''; - ok( !$resolver->_decode_reply( \$corrupt ), '_decode_reply() corrupt reply' ); - my $query = new Net::DNS::Packet(qw(net-dns.org SOA IN)); - my $qdata = $query->data; - ok( !$resolver->_decode_reply( \$qdata ), '_decode_reply() qr not set' ); - my $reply = new Net::DNS::Packet(qw(net-dns.org SOA IN)); $reply->header->qr(1); - my $rdata = $reply->data; - ok( !$resolver->_decode_reply( \$rdata, $query ), '_decode_reply() id mismatch' ); + + ok( !$resolver->_accept_reply(undef), '_accept_reply() corrupt reply' ); + + ok( !$resolver->_accept_reply($query), '_accept_reply() qr not set' ); + + ok( !$resolver->_accept_reply( $reply, $query ), '_accept_reply() id mismatch' ); }

1 0

commit cronie for openSUSE:Factory
by root＠hilbert.suse.de 29 Aug '17

29 Aug '17

Hello community, here is the log from the commit of package cronie for openSUSE:Factory checked in at 2017-08-29 11:36:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cronie (Old) and /work/SRC/openSUSE:Factory/.cronie.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cronie" Tue Aug 29 11:36:50 2017 rev:64 rq:517956 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/cronie/cronie.changes 2017-04-07 13:52:37.001326334 +0200 +++ /work/SRC/openSUSE:Factory/.cronie.new/cronie.changes 2017-08-29 11:36:51.349343123 +0200 @@ -1,0 +2,5 @@ +Mon Aug 21 09:31:32 CEST 2017 - kukuk(a)suse.de + +- Require group trusted if we use them + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cronie.spec ++++++ --- /var/tmp/diff_new_pack.KML8tT/_old 2017-08-29 11:36:52.765144200 +0200 +++ /var/tmp/diff_new_pack.KML8tT/_new 2017-08-29 11:36:52.789140828 +0200 @@ -58,6 +58,9 @@ Requires(post): %fillup_prereq Requires(post): permissions Requires(pre): cron +%if 0%{?suse_version} >= 1330 +Requires(pre): group(trusted) +%endif Recommends: smtp_daemon Suggests: postfix Conflicts: cron <= 4.1

1 0