August 2016 - openSUSE Commits - openSUSE Mailing Lists

commit jsoncpp for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package jsoncpp for openSUSE:Factory checked in at 2016-08-03 11:38:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jsoncpp (Old) and /work/SRC/openSUSE:Factory/.jsoncpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "jsoncpp" Changes: -------- --- /work/SRC/openSUSE:Factory/jsoncpp/jsoncpp.changes 2016-07-07 15:08:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jsoncpp.new/jsoncpp.changes 2016-08-03 11:38:02.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jul 23 07:33:16 UTC 2016 - mpluskal(a)suse.com + +- Update to version 1.7.4: + * Fix pkg-config + +------------------------------------------------------------------- Old: ---- jsoncpp-1.7.3.tar.gz New: ---- jsoncpp-1.7.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jsoncpp.spec ++++++ --- /var/tmp/diff_new_pack.d4Agkh/_old 2016-08-03 11:38:03.000000000 +0200 +++ /var/tmp/diff_new_pack.d4Agkh/_new 2016-08-03 11:38:03.000000000 +0200 @@ -16,9 +16,9 @@ # -%define libname lib%{name}1 +%define sover 1 Name: jsoncpp -Version: 1.7.3 +Version: 1.7.4 Release: 0 Summary: C++ library that allows manipulating with JSON License: MIT @@ -42,7 +42,7 @@ %package devel Summary: Development files for %{name} Group: Development/Languages/C and C++ -Requires: %{libname} = %{version} +Requires: lib%{name}%{sover} = %{version} %description devel JSON is a lightweight data-interchange format. It can represent numbers, @@ -53,11 +53,11 @@ existing comment in unserialization/serialization steps, making it a convenient format to store user input files. -%package -n %{libname} +%package -n lib%{name}%{sover} Summary: Shared library for %{name} Group: System/Libraries -%description -n %{libname} +%description -n lib%{name}%{sover} JSON is a lightweight data-interchange format. It can represent numbers, strings, ordered sequences of values, and collections of name/value pairs. @@ -80,13 +80,13 @@ %cmake_install rm -rf %{buildroot}%{_libdir}/lib%{name}.a -%post -n %{libname} -p /sbin/ldconfig -%postun -n %{libname} -p /sbin/ldconfig +%post -n lib%{name}%{sover} -p /sbin/ldconfig +%postun -n lib%{name}%{sover} -p /sbin/ldconfig -%files -n %{libname} +%files -n lib%{name}%{sover} %defattr(-,root,root) %doc LICENSE -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{sover}* %files devel %defattr(-,root,root) ++++++ jsoncpp-1.7.3.tar.gz -> jsoncpp-1.7.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.7.3/CMakeLists.txt new/jsoncpp-1.7.4/CMakeLists.txt --- old/jsoncpp-1.7.3/CMakeLists.txt 2016-06-27 07:12:23.000000000 +0200 +++ new/jsoncpp-1.7.4/CMakeLists.txt 2016-07-09 20:27:28.000000000 +0200 @@ -64,7 +64,7 @@ #SET( JSONCPP_VERSION_MAJOR X ) #SET( JSONCPP_VERSION_MINOR Y ) #SET( JSONCPP_VERSION_PATCH Z ) -SET( JSONCPP_VERSION 1.7.3 ) +SET( JSONCPP_VERSION 1.7.4 ) jsoncpp_parse_version( ${JSONCPP_VERSION} JSONCPP_VERSION ) #IF(NOT JSONCPP_VERSION_FOUND) # MESSAGE(FATAL_ERROR "Failed to parse version string properly. Expect X.Y.Z") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.7.3/include/json/version.h new/jsoncpp-1.7.4/include/json/version.h --- old/jsoncpp-1.7.3/include/json/version.h 2016-06-27 07:12:23.000000000 +0200 +++ new/jsoncpp-1.7.4/include/json/version.h 2016-07-09 20:27:28.000000000 +0200 @@ -3,10 +3,10 @@ #ifndef JSON_VERSION_H_INCLUDED # define JSON_VERSION_H_INCLUDED -# define JSONCPP_VERSION_STRING "1.7.3" +# define JSONCPP_VERSION_STRING "1.7.4" # define JSONCPP_VERSION_MAJOR 1 # define JSONCPP_VERSION_MINOR 7 -# define JSONCPP_VERSION_PATCH 3 +# define JSONCPP_VERSION_PATCH 4 # define JSONCPP_VERSION_QUALIFIER # define JSONCPP_VERSION_HEXA ((JSONCPP_VERSION_MAJOR << 24) | (JSONCPP_VERSION_MINOR << 16) | (JSONCPP_VERSION_PATCH << 8)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.7.3/pkg-config/jsoncpp.pc.in new/jsoncpp-1.7.4/pkg-config/jsoncpp.pc.in --- old/jsoncpp-1.7.3/pkg-config/jsoncpp.pc.in 2016-06-27 07:12:23.000000000 +0200 +++ new/jsoncpp-1.7.4/pkg-config/jsoncpp.pc.in 2016-07-09 20:27:28.000000000 +0200 @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=${prefix} -libdir=@LIBRARY_INSTALL_DIR@ -includedir=@INCLUDE_INSTALL_DIR@ +libdir=${exec_prefix}/@LIBRARY_INSTALL_DIR@ +includedir=${prefix}/@INCLUDE_INSTALL_DIR@ Name: jsoncpp Description: A C++ library for interacting with JSON diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jsoncpp-1.7.3/version new/jsoncpp-1.7.4/version --- old/jsoncpp-1.7.3/version 2016-06-27 07:12:23.000000000 +0200 +++ new/jsoncpp-1.7.4/version 2016-07-09 20:27:28.000000000 +0200 @@ -1 +1 @@ -1.7.3 +1.7.4

1 0

commit libnfs for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package libnfs for openSUSE:Factory checked in at 2016-08-03 11:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnfs (Old) and /work/SRC/openSUSE:Factory/.libnfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnfs" Changes: -------- --- /work/SRC/openSUSE:Factory/libnfs/libnfs.changes 2016-04-28 17:00:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libnfs.new/libnfs.changes 2016-08-03 11:37:55.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jul 23 07:00:07 UTC 2016 - olaf(a)aepfle.de + +- Obsolete libnfs from PMBS + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnfs.spec ++++++ --- /var/tmp/diff_new_pack.NWw1Py/_old 2016-08-03 11:37:56.000000000 +0200 +++ /var/tmp/diff_new_pack.NWw1Py/_new 2016-08-03 11:37:56.000000000 +0200 @@ -16,15 +16,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define soname 8 Name: libnfs Version: 1.10.0 Release: 0 -License: LGPL-2.1+ and BSD-2-Clause and GPL-3.0+ Summary: Client library for accessing NFS shares over a network -Url: https://github.com/sahlberg/libnfs +License: LGPL-2.1+ and BSD-2-Clause and GPL-3.0+ Group: Productivity/Networking/NFS +Url: https://github.com/sahlberg/libnfs Source0: https://sites.google.com/site/libnfstarballs/li/libnfs-%{version}.tar.gz BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +60,9 @@ %package -n utils-libnfs Summary: Utilities for accessing NFS servers Group: Productivity/Networking/NFS +# Handle libnfs from packman, which contained both binaries and lib +Provides: libnfs = %{version} +Obsoletes: libnfs < %{version} %description -n utils-libnfs The utils-libnfs package contains simple client programs for

1 0

commit libmatroska for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package libmatroska for openSUSE:Factory checked in at 2016-08-03 11:37:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmatroska (Old) and /work/SRC/openSUSE:Factory/.libmatroska.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmatroska" Changes: -------- --- /work/SRC/openSUSE:Factory/libmatroska/libmatroska.changes 2016-07-21 07:54:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libmatroska.new/libmatroska.changes 2016-08-03 11:37:48.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 22 21:33:11 UTC 2016 - rpm(a)fthiessen.de + +- As the upstream does not track ABI changes we had to add some + additional version tracking. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmatroska.spec ++++++ --- /var/tmp/diff_new_pack.6CYlmj/_old 2016-08-03 11:37:50.000000000 +0200 +++ /var/tmp/diff_new_pack.6CYlmj/_new 2016-08-03 11:37:50.000000000 +0200 @@ -66,7 +66,14 @@ FAKE_BUILDTIMESTAMP=$(LC_ALL=C date -r %{SOURCE99} '+%%a %%b %%e %%H:%%M:%%S %%Y') sed -i "s/__TIMESTAMP__/\"$FAKE_BUILDTIMESTAMP\"/" matroska/KaxVersion.h %configure --disable-static -make %{?_smp_mflags} +# mkvmerge-9.3.0 built against libmatroska-1.4.5 running against +# libmatroska-1.4.4: symbol lookup error: mkvmerge: undefined symbol: +# _ZN11libmatroska14KaxVideoColour10ClassInfosE +# Force some additional versioning, since upstream did not track the ABI +# changes. Tag with the version of the most recent incompatible change. +echo "V_1.4.5 { global: *; };" > libmatroska.sym +make %{?_smp_mflags} \ + LDFLAGS="-Wl,--version-script=$PWD/libmatroska.sym" %install %make_install

1 0

commit zypper for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2016-08-03 11:37:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2016-07-21 07:54:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.zypper.new/zypper.changes 2016-08-03 11:37:40.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Jul 21 16:28:27 CEST 2016 - ma(a)suse.de + +- Differ between products without end-of-life data and those where + EOL is not yet known (FATE#320699) +- BuildRequires: libzypp-devel >= 16.2.1 +- version 1.13.5 + +------------------------------------------------------------------- Old: ---- zypper-1.13.4.tar.bz2 New: ---- zypper-1.13.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.i6AbrI/_old 2016-08-03 11:37:41.000000000 +0200 +++ /var/tmp/diff_new_pack.i6AbrI/_new 2016-08-03 11:37:41.000000000 +0200 @@ -22,7 +22,7 @@ BuildRequires: cmake >= 2.4.6 BuildRequires: gcc-c++ >= 4.7 BuildRequires: gettext-devel >= 0.15 -BuildRequires: libzypp-devel >= 16.1.0 +BuildRequires: libzypp-devel >= 16.2.1 BuildRequires: readline-devel >= 5.1 Requires: procps %if 0%{?suse_version} @@ -33,7 +33,7 @@ Summary: Command line software manager using libzypp License: GPL-2.0+ Group: System/Packages -Version: 1.13.4 +Version: 1.13.5 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.13.4.tar.bz2 -> zypper-1.13.5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.13.4.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new/zypper-1.13.5.tar.bz2 differ: char 11, line 1

1 0

commit libzypp for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2016-08-03 11:37:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2016-07-21 07:53:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2016-08-03 11:37:34.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jul 21 13:09:33 CEST 2016 - ma(a)suse.de + +- Rebuild .solv-files not matching the parsers LIBSOLV_TOOLVERSION +- BuildRequires: libsolv-devel >= 0.6.23 +- version 16.2.1 (0) + +------------------------------------------------------------------- +Mon Jul 18 16:36:25 CEST 2016 - ma(a)suse.de + +- Product: Offer tri-state hasEndOfLife details (FATE#320699) +- version 16.2.0 (0) + +------------------------------------------------------------------- Old: ---- libzypp-16.1.3.tar.bz2 New: ---- libzypp-16.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.R7QFeB/_old 2016-08-03 11:37:35.000000000 +0200 +++ /var/tmp/diff_new_pack.R7QFeB/_new 2016-08-03 11:37:35.000000000 +0200 @@ -19,7 +19,7 @@ %define force_gcc_46 0 Name: libzypp -Version: 16.1.3 +Version: 16.2.1 Release: 0 Url: git://gitorious.org/opensuse/libzypp.git Summary: Package, Patch, Pattern, and Product Management @@ -75,7 +75,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.6.19 +BuildRequires: libsolv-devel >= 0.6.23 %if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools ++++++ libzypp-16.1.3.tar.bz2 -> libzypp-16.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/VERSION.cmake new/libzypp-16.2.1/VERSION.cmake --- old/libzypp-16.1.3/VERSION.cmake 2016-07-14 19:05:04.000000000 +0200 +++ new/libzypp-16.2.1/VERSION.cmake 2016-07-21 13:13:04.000000000 +0200 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "16") SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_MINOR "1") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_MINOR "2") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 16.1.3 (0) +# LAST RELEASED: 16.2.1 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/libzypp.spec.cmake new/libzypp-16.2.1/libzypp.spec.cmake --- old/libzypp-16.1.3/libzypp.spec.cmake 2016-06-09 18:53:03.000000000 +0200 +++ new/libzypp-16.2.1/libzypp.spec.cmake 2016-07-20 15:41:07.000000000 +0200 @@ -75,7 +75,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.6.19 +BuildRequires: libsolv-devel >= 0.6.23 %if 0%{?suse_version} >= 1100 BuildRequires: libsolv-tools %requires_eq libsolv-tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/package/libzypp.changes new/libzypp-16.2.1/package/libzypp.changes --- old/libzypp-16.1.3/package/libzypp.changes 2016-07-14 19:05:04.000000000 +0200 +++ new/libzypp-16.2.1/package/libzypp.changes 2016-07-21 13:13:04.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jul 21 13:09:33 CEST 2016 - ma(a)suse.de + +- Rebuild .solv-files not matching the parsers LIBSOLV_TOOLVERSION +- BuildRequires: libsolv-devel >= 0.6.23 +- version 16.2.1 (0) + +------------------------------------------------------------------- +Mon Jul 18 16:36:25 CEST 2016 - ma(a)suse.de + +- Product: Offer tri-state hasEndOfLife details (FATE#320699) +- version 16.2.0 (0) + +------------------------------------------------------------------- Thu Jul 14 19:02:57 CEST 2016 - ma(a)suse.de - use more user friendly command names for "zypper ps" (bsc#980541) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/po/CMakeLists.txt new/libzypp-16.2.1/po/CMakeLists.txt --- old/libzypp-16.1.3/po/CMakeLists.txt 2016-05-20 14:36:58.000000000 +0200 +++ new/libzypp-16.2.1/po/CMakeLists.txt 2016-07-21 14:41:05.000000000 +0200 @@ -56,13 +56,13 @@ SET( SOURCE_POT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${POT_NAME}.pot ) ADD_CUSTOM_TARGET( translations ALL - COMMAND diff -u -I ^\#: -I ^.POT-Creation-Date: ${SOURCE_POT_FILE} ${POT_FILE} | grep '^[+-][^\#]' || true + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/PotfileDiff.sh ${SOURCE_POT_FILE} ${POT_FILE} | grep '^[+-][^+-]' || true DEPENDS ${GMO_FILES} + COMMENT ".pot file diff..." ) ADD_CUSTOM_TARGET( potfile_update - COMMAND diff -q -I ^\#: -I ^.POT-Creation-Date: ${SOURCE_POT_FILE} ${POT_FILE} - || ./PotfileUpadte.sh ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ./PotfileDiff.sh ${SOURCE_POT_FILE} ${POT_FILE} -q || ./PotfileUpadte.sh ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS translations COMMENT "Checking for uncommitted changes to the .pot file..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/po/PotfileDiff.sh new/libzypp-16.2.1/po/PotfileDiff.sh --- old/libzypp-16.1.3/po/PotfileDiff.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-16.2.1/po/PotfileDiff.sh 2016-07-21 14:41:05.000000000 +0200 @@ -0,0 +1,14 @@ +#! /bin/bash +set -e +function extract() { grep '^$msgid\|"$' "$1" | grep -v "POT-Creation-Date" | sort -u; } + +OLDTMP=$(mktemp) +trap " [ -f \"$OLDTMP\" ] && /bin/rm -f -- \"$OLDTMP\" " 0 1 2 3 13 15 +extract "$1" >"$OLDTMP" + +NEWTMP=$(mktemp) +trap " [ -f \"$NEWTMP\" ] && /bin/rm -f -- \"$NEWTMP\" " 0 1 2 3 13 15 +extract "$2" >"$NEWTMP" + +shift 2 # additional args for diff +diff -u0 "$@" "$OLDTMP" "$NEWTMP" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/po/ar.po new/libzypp-16.2.1/po/ar.po --- old/libzypp-16.1.3/po/ar.po 2016-07-11 20:01:06.000000000 +0200 +++ new/libzypp-16.2.1/po/ar.po 2016-07-17 15:01:05.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-03 15:55+0200\n" -"PO-Revision-Date: 2016-07-11 15:29+0000\n" +"PO-Revision-Date: 2016-07-17 10:30+0000\n" "Last-Translator: George Yacoub <george.yacoub(a)arabize.com>\n" "Language-Team: Arabic <https://l10n.opensuse.org/projects/libzypp/master/ar/>" "\n" @@ -676,7 +676,7 @@ #. :AFG:004: #: zypp/CountryCode.cc:161 msgid "Antigua and Barbuda" -msgstr "أنتيغوا و باربودا" +msgstr "أنتيغوا وباربودا" #. :ATG:028: #: zypp/CountryCode.cc:162 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/po/el.po new/libzypp-16.2.1/po/el.po --- old/libzypp-16.1.3/po/el.po 2016-07-11 04:01:05.000000000 +0200 +++ new/libzypp-16.2.1/po/el.po 2016-07-16 16:01:05.000000000 +0200 @@ -19,7 +19,7 @@ "Project-Id-Version: zypp.el\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-03 15:55+0200\n" -"PO-Revision-Date: 2016-07-10 23:49+0000\n" +"PO-Revision-Date: 2016-07-16 11:02+0000\n" "Last-Translator: Michail Vourlakos <mvourlakos(a)gmail.com>\n" "Language-Team: Greek <https://l10n.opensuse.org/projects/libzypp/master/el/>" "\n" @@ -4488,7 +4488,7 @@ #: zypp/solver/detail/SATResolver.cc:1318 #, c-format, boost-format msgid "downgrade of %s to %s" -msgstr "υποβάθμιση του %s από %s" +msgstr "υποβάθμιση του %s σε %s" #: zypp/solver/detail/SATResolver.cc:1325 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/po/pt_BR.po new/libzypp-16.2.1/po/pt_BR.po --- old/libzypp-16.1.3/po/pt_BR.po 2016-07-14 04:01:06.000000000 +0200 +++ new/libzypp-16.2.1/po/pt_BR.po 2016-07-19 21:01:07.000000000 +0200 @@ -14,7 +14,7 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-03 15:55+0200\n" -"PO-Revision-Date: 2016-07-13 23:30+0000\n" +"PO-Revision-Date: 2016-07-19 16:17+0000\n" "Last-Translator: Marcos Teofilo <mteofilo(a)tesbrasil.com>\n" "Language-Team: Portuguese (Brazil) " "<https://l10n.opensuse.org/projects/libzypp/master/pt_BR/>\n" @@ -52,7 +52,7 @@ #: zypp/Url.cc:326 zypp/Url.cc:340 msgid "Unable to parse Url components" -msgstr "Não foi possível analisar os componentes do URL" +msgstr "Não foi possível analisar os componentes da URL" #: zypp/thread/Mutex.cc:33 msgid "Can't initialize mutex attributes" @@ -114,7 +114,7 @@ #: zypp/CheckSum.cc:136 #, c-format, boost-format msgid "Dubious type '%s' for %u byte checksum '%s'" -msgstr "Tipo '%s' duvidoso da checksum '%s' de %u byte(s)" +msgstr "Tipo '%s' duvidoso da soma de verificação '%s' de %u byte(s)" #: zypp/target/TargetImpl.cc:310 msgid " executed" @@ -134,7 +134,7 @@ #: zypp/target/TargetImpl.cc:459 msgid " execution skipped while aborting" -msgstr " execução ignorada durante a interrupção" +msgstr " execução ignorada durante o cancelamento" #: zypp/target/TargetImpl.cc:514 zypp/target/TargetImpl.cc:534 #: zypp/target/TargetImpl.cc:562 zypp/target/TargetImpl.cc:599 @@ -154,7 +154,8 @@ #: zypp/target/hal/HalContext.cc:24 msgid "Sorry, but this version of libzypp was built without HAL support." -msgstr "Esta versão do libzypp foi criada sem o suporte ao HAL." +msgstr "" +"Desculpe, mas esta versão do libzypp foi compilada sem o suporte ao HAL." #: zypp/target/hal/HalContext.cc:117 msgid "HalContext not connected" @@ -220,7 +221,7 @@ #: zypp/target/rpm/RpmDb.cc:2024 #, c-format, boost-format msgid "rpm saved %s as %s, but it was impossible to determine the difference" -msgstr "o rpm salvou %s como %s, mas não foi possível determinar a diferença" +msgstr "o RPM salvou %s como %s, mas não foi possível determinar a diferença" #. %s = filenames #: zypp/target/rpm/RpmDb.cc:2026 @@ -282,12 +283,12 @@ #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2373 msgid "Signatures public key is not available" -msgstr "A chave de assinatura pública não está disponível" +msgstr "Chave pública das assinaturas não disponível" #. translators: possible rpm package signature check result [brief] #: zypp/target/rpm/RpmDb.cc:2375 msgid "File does not exist or signature can't be checked" -msgstr "O arquivo não existe ou a assinatura não pôde ser verificada" +msgstr "O arquivo não existe ou a assinatura não pode ser verificada" #: zypp/ProblemSolution.cc:114 msgid "Following actions will be done:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/Product.cc new/libzypp-16.2.1/zypp/Product.cc --- old/libzypp-16.1.3/zypp/Product.cc 2016-02-11 17:22:14.000000000 +0100 +++ new/libzypp-16.2.1/zypp/Product.cc 2016-07-18 16:41:07.000000000 +0200 @@ -214,6 +214,19 @@ Date Product::endOfLife() const { return Date( lookupNumAttribute( sat::SolvAttr::productEndOfLife ) );} + bool Product::hasEndOfLife() const + { return( lookupNumAttribute( sat::SolvAttr::productEndOfLife, -1 ) != -1 ); } + + bool Product::hasEndOfLife( Date & value ) const + { + Date res( lookupNumAttribute( sat::SolvAttr::productEndOfLife, -1 ) ); + if ( res == -1 ) + return false; + // else: + value = res; + return true; + } + std::vector<Repository::ContentIdentifier> Product::updateContentIdentifier() const { std::vector<Repository::ContentIdentifier> ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/Product.h new/libzypp-16.2.1/zypp/Product.h --- old/libzypp-16.1.3/zypp/Product.h 2016-02-11 17:22:14.000000000 +0100 +++ new/libzypp-16.2.1/zypp/Product.h 2016-07-18 16:41:07.000000000 +0200 @@ -97,9 +97,25 @@ /** The product flags */ std::list<std::string> flags() const; - /** The date when this Product goes out of support as indicated by it's medadata. */ + /** The date when this Product goes out of support as indicated by it's medadata. + * Use \ref hasEOfLife if it's important to distinguish whether the value + * is not defined in the metadata, or defined but empty/invalid/TBD. + */ Date endOfLife() const; + /** Return whether an EndOfLife value is actually defined in the metadata. + * A missing value (\c false) usually indicates that there will be no EOL, + * while an empty/invalid value indicates that there will be an EOL date, + * but it's not yet known (FATE#320699). + */ + bool hasEndOfLife() const; + /** \overload additionally returning the date (0 if TBD) + * false, ( unchanged ) : no EOL + * true, ( 0 ) : EOL is still TBD + * true, ( !=0 ) : a valid EOL date + */ + bool hasEndOfLife( Date & value ) const; + /** ContentIdentifier of required update repositories. */ std::vector<Repository::ContentIdentifier> updateContentIdentifier() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/RepoManager.cc new/libzypp-16.2.1/zypp/RepoManager.cc --- old/libzypp-16.1.3/zypp/RepoManager.cc 2016-06-15 12:37:04.000000000 +0200 +++ new/libzypp-16.2.1/zypp/RepoManager.cc 2016-07-21 13:13:04.000000000 +0200 @@ -18,6 +18,8 @@ #include <map> #include <algorithm> +#include <solv/solvversion.h> + #include "zypp/base/InputStream.h" #include "zypp/base/LogTools.h" #include "zypp/base/Gettext.h" @@ -1574,19 +1576,13 @@ { Repository repo = sat::Pool::instance().addRepoSolv( solvfile, info ); // test toolversion in order to rebuild solv file in case - // it was written by an old libsolv-tool parser. - // - // Known version strings used: - // - <no string> - // - "1.0" - // - sat::LookupRepoAttr toolversion( sat::SolvAttr::repositoryToolVersion, repo ); - if ( toolversion.begin().asString().empty() ) + // it was written by a different libsolv-tool parser. + const std::string & toolversion( sat::LookupRepoAttr( sat::SolvAttr::repositoryToolVersion, repo ).begin().asString() ); + if ( toolversion != LIBSOLV_TOOLVERSION ) { repo.eraseFromPool(); - ZYPP_THROW(Exception("Solv-file was created by old parser.")); + ZYPP_THROW(Exception(str::Str() << "Solv-file was created by '"<<toolversion<<"'-parser (want "<<LIBSOLV_TOOLVERSION<<").")); } - // else: up-to-date (or even newer). } catch ( const Exception & exp ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/base/String.h new/libzypp-16.2.1/zypp/base/String.h --- old/libzypp-16.1.3/zypp/base/String.h 2016-06-21 14:33:05.000000000 +0200 +++ new/libzypp-16.2.1/zypp/base/String.h 2016-07-21 15:37:05.000000000 +0200 @@ -1027,14 +1027,23 @@ /** Return whether \a str_r has prefix \a prefix_r. */ inline bool hasPrefix( const C_Str & str_r, const C_Str & prefix_r ) { return( ::strncmp( str_r, prefix_r, prefix_r.size() ) == 0 ); } + /** \overload Case insensitive */ + inline bool hasPrefixCI( const C_Str & str_r, const C_Str & prefix_r ) + { return( ::strncasecmp( str_r, prefix_r, prefix_r.size() ) == 0 ); } /** Strip a \a prefix_r from \a str_r and return the resulting string. */ inline std::string stripPrefix( const C_Str & str_r, const C_Str & prefix_r ) { return( hasPrefix( str_r, prefix_r ) ? str_r + prefix_r.size() : str_r.c_str() ); } + /** \overload Case insensitive */ + inline std::string stripPrefixCI( const C_Str & str_r, const C_Str & prefix_r ) + { return( hasPrefixCI( str_r, prefix_r ) ? str_r + prefix_r.size() : str_r.c_str() ); } /** Return whether \a str_r has suffix \a suffix_r. */ inline bool hasSuffix( const C_Str & str_r, const C_Str & suffix_r ) { return( str_r.size() >= suffix_r.size() && ::strncmp( str_r + str_r.size() - suffix_r.size() , suffix_r, suffix_r.size() ) == 0 ); } + /** \overload Case insensitive */ + inline bool hasSuffixCI( const C_Str & str_r, const C_Str & suffix_r ) + { return( str_r.size() >= suffix_r.size() && ::strncasecmp( str_r + str_r.size() - suffix_r.size() , suffix_r, suffix_r.size() ) == 0 ); } /** Strip a \a suffix_r from \a str_r and return the resulting string. */ inline std::string stripSuffix( const C_Str & str_r, const C_Str & suffix_r ) @@ -1043,6 +1052,14 @@ return std::string( str_r, str_r.size() - suffix_r.size() ); return str_r.c_str(); } + /** \overload Case insensitive */ + inline std::string stripSuffixCI( const C_Str & str_r, const C_Str & suffix_r ) + { + if ( hasSuffixCI( str_r, suffix_r ) ) + return std::string( str_r, str_r.size() - suffix_r.size() ); + return str_r.c_str(); + } + /** Return size of the common prefix of \a lhs and \a rhs. */ inline std::string::size_type commonPrefix( const C_Str & lhs, const C_Str & rhs ) { @@ -1053,13 +1070,31 @@ { ++lp, ++rp, ++ret; } return ret; } + /** \overload Case insensitive */ + inline std::string::size_type commonPrefixCI( const C_Str & lhs, const C_Str & rhs ) + { + const char * lp = lhs.c_str(); + const char * rp = rhs.c_str(); + std::string::size_type ret = 0; + while ( tolower(*lp) == tolower(*rp) && *lp != '\0' ) + { ++lp, ++rp, ++ret; } + return ret; + } + /** alias for \ref hasPrefix */ inline bool startsWith( const C_Str & str_r, const C_Str & prefix_r ) { return hasPrefix( str_r, prefix_r ); } + /** \overload Case insensitive */ + inline bool startsWithCI( const C_Str & str_r, const C_Str & prefix_r ) + { return hasPrefixCI( str_r, prefix_r ); } + /** alias for \ref hasSuffix */ inline bool endsWith( const C_Str & str_r, const C_Str & prefix_r ) { return hasSuffix( str_r, prefix_r ); } + /** \overload Case insensitive */ + inline bool endsWithCI( const C_Str & str_r, const C_Str & prefix_r ) + { return hasSuffixCI( str_r, prefix_r ); } //@} } // namespace str /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/sat/Solvable.cc new/libzypp-16.2.1/zypp/sat/Solvable.cc --- old/libzypp-16.1.3/zypp/sat/Solvable.cc 2016-02-11 17:22:14.000000000 +0100 +++ new/libzypp-16.2.1/zypp/sat/Solvable.cc 2016-07-18 16:41:07.000000000 +0200 @@ -155,6 +155,12 @@ return ::solvable_lookup_num( _solvable, attr.id(), 0 ); } + unsigned long long Solvable::lookupNumAttribute( const SolvAttr & attr, unsigned long long notfound_r ) const + { + NO_SOLVABLE_RETURN( notfound_r ); + return ::solvable_lookup_num( _solvable, attr.id(), notfound_r ); + } + bool Solvable::lookupBoolAttribute( const SolvAttr & attr ) const { NO_SOLVABLE_RETURN( false ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/sat/Solvable.h new/libzypp-16.2.1/zypp/sat/Solvable.h --- old/libzypp-16.1.3/zypp/sat/Solvable.h 2016-02-11 17:22:14.000000000 +0100 +++ new/libzypp-16.2.1/zypp/sat/Solvable.h 2016-07-18 16:41:07.000000000 +0200 @@ -337,6 +337,8 @@ * or 0 if it does not exists. */ unsigned long long lookupNumAttribute( const SolvAttr & attr ) const; + /** \overload returning custom notfound_r value */ + unsigned long long lookupNumAttribute( const SolvAttr & attr, unsigned long long notfound_r ) const; /** * returns the boolean attribute value for \ref attr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-16.1.3/zypp/sat/SolvableType.h new/libzypp-16.2.1/zypp/sat/SolvableType.h --- old/libzypp-16.1.3/zypp/sat/SolvableType.h 2016-02-11 17:22:14.000000000 +0100 +++ new/libzypp-16.2.1/zypp/sat/SolvableType.h 2016-07-18 16:41:07.000000000 +0200 @@ -133,6 +133,7 @@ bool lookupBoolAttribute( const SolvAttr & attr ) const { return satSolvable().lookupBoolAttribute( attr ); } detail::IdType lookupIdAttribute( const SolvAttr & attr ) const { return satSolvable().lookupIdAttribute( attr ); } unsigned long long lookupNumAttribute( const SolvAttr & attr ) const { return satSolvable().lookupNumAttribute( attr ); } + unsigned long long lookupNumAttribute( const SolvAttr & attr, unsigned long long notfound_r ) const { return satSolvable().lookupNumAttribute( attr, notfound_r ); } CheckSum lookupCheckSumAttribute( const SolvAttr & attr ) const { return satSolvable().lookupCheckSumAttribute( attr ); } OnMediaLocation lookupLocation() const { return satSolvable().lookupLocation(); } Solvable::IdType id() const { return satSolvable().id(); }

1 0

commit libsolv for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package libsolv for openSUSE:Factory checked in at 2016-08-03 11:37:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsolv (Old) and /work/SRC/openSUSE:Factory/.libsolv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libsolv" Changes: -------- --- /work/SRC/openSUSE:Factory/libsolv/libsolv.changes 2016-06-13 21:51:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libsolv.new/libsolv.changes 2016-08-03 11:37:28.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Jul 22 11:37:23 CEST 2016 - mls(a)suse.de + +- also scan /usr/share/metainfo for appdata files [bnc#989830] +- support tri-state product-endoflife [fate#320699] +- take lockstep into account when calculating unneeded packages +- ignore appplication extensions for now in appdata parser + [bnc#984332] +- add enabled features to solvversion.h +- take disfavors into account when auto-minimizing for recommended + packages +- change cleandeps code so that it keeps all providers +- make sure that all repos have different names in a testcase +- bump version to 0.6.23 + +------------------------------------------------------------------- Old: ---- libsolv-0.6.22.tar.bz2 New: ---- libsolv-0.6.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsolv.spec ++++++ --- /var/tmp/diff_new_pack.waVPwK/_old 2016-08-03 11:37:29.000000000 +0200 +++ /var/tmp/diff_new_pack.waVPwK/_new 2016-08-03 11:37:29.000000000 +0200 @@ -17,7 +17,7 @@ Name: libsolv -Version: 0.6.22 +Version: 0.6.23 Release: 0 Url: https://github.com/openSUSE/libsolv Source: libsolv-%{version}.tar.bz2 ++++++ libsolv-0.6.22.tar.bz2 -> libsolv-0.6.23.tar.bz2 ++++++ ++++ 2408 lines of diff (skipped)

1 0

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2016-08-03 11:37:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2016-07-18 21:18:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2016-08-03 11:37:23.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 21 11:50:27 UTC 2016 - mailaender(a)opensuse.org + +- add a screenshot to appdata.xml + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ thunderbird.appdata.xml ++++++ --- /var/tmp/diff_new_pack.PCqsQa/_old 2016-08-03 11:37:28.000000000 +0200 +++ /var/tmp/diff_new_pack.PCqsQa/_new 2016-08-03 11:37:28.000000000 +0200 @@ -1,9 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - - - <application> @@ -27,12 +25,7 @@ </ul> </description> <url type="homepage">http://www.mozilla.org/thunderbird/</url> -  -  </application>

1 0

commit obs-service-source_validator for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package obs-service-source_validator for openSUSE:Factory checked in at 2016-08-03 11:37:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-source_validator (Old) and /work/SRC/openSUSE:Factory/.obs-service-source_validator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-source_validator" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-source_validator/obs-service-source_validator.changes 2016-07-01 09:55:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-source_validator.new/obs-service-source_validator.changes 2016-08-03 11:37:17.000000000 +0200 @@ -2 +2,7 @@ -Fri Jun 17 13:54:23 UTC 2016 - opensuse-packaging(a)opensuse.org +Thu Jul 07 13:08:48 UTC 2016 - adrian(a)suse.de + +- Update to version 0.6+git20160707.a6ff89d: + + fix debian.series using patches with patch levels + +------------------------------------------------------------------- +Fri Jun 17 13:54:23 UTC 2016 - fschreiner(a)suse.de @@ -10 +16 @@ -Tue May 31 11:31:57 UTC 2016 - opensuse-packaging(a)opensuse.org +Tue May 31 11:31:57 UTC 2016 - fschreiner(a)suse.de @@ -21 +27 @@ -Mon Feb 22 17:29:48 UTC 2016 - opensuse-packaging(a)opensuse.org +Mon Feb 22 17:29:48 UTC 2016 - fschreiner(a)suse.de @@ -29 +35 @@ -Thu Feb 18 16:44:41 UTC 2016 - opensuse-packaging(a)opensuse.org +Thu Feb 18 16:44:41 UTC 2016 - fschreiner(a)suse.de Old: ---- obs-service-source_validator-0.6+git20160617.cfadcb0.tar.bz2 New: ---- obs-service-source_validator-0.6+git20160707.a6ff89d.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-source_validator.spec ++++++ --- /var/tmp/diff_new_pack.qH4ltH/_old 2016-08-03 11:37:18.000000000 +0200 +++ /var/tmp/diff_new_pack.qH4ltH/_new 2016-08-03 11:37:18.000000000 +0200 @@ -20,7 +20,7 @@ Summary: An OBS source service: running all the osc source-validator checks License: GPL-2.0+ Group: Development/Tools/Building -Version: 0.6+git20160617.cfadcb0 +Version: 0.6+git20160707.a6ff89d Release: 0 # use osc service dr to update Source: %{name}-%{version}.tar.bz2 ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.qH4ltH/_old 2016-08-03 11:37:18.000000000 +0200 +++ /var/tmp/diff_new_pack.qH4ltH/_new 2016-08-03 11:37:18.000000000 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/obs-service-source_validator.git</param> - <param name="changesrevision">cfadcb0e6fd0ebdd3b7688ffe2225c0cb7b197f5</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">a6ff89dec94d0c3b0854dfcfb2082f552dd2b3d8</param></service></servicedata> \ No newline at end of file ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.qH4ltH/_old 2016-08-03 11:37:18.000000000 +0200 +++ /var/tmp/diff_new_pack.qH4ltH/_new 2016-08-03 11:37:18.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-source-validator -Version: 0.6+git20160617.cfadcb0 +Version: 0.6+git20160707.a6ff89d Binary: obs-service-source-validator Maintainer: Hib Eris <hib(a)hiberis.nl> Architecture: all ++++++ obs-service-source_validator-0.6+git20160617.cfadcb0.tar.bz2 -> obs-service-source_validator-0.6+git20160707.a6ff89d.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-source_validator-0.6+git20160617.cfadcb0/20-files-present-and-referenced new/obs-service-source_validator-0.6+git20160707.a6ff89d/20-files-present-and-referenced --- old/obs-service-source_validator-0.6+git20160617.cfadcb0/20-files-present-and-referenced 2016-06-17 15:54:23.000000000 +0200 +++ new/obs-service-source_validator-0.6+git20160707.a6ff89d/20-files-present-and-referenced 2016-07-07 15:08:48.000000000 +0200 @@ -162,7 +162,10 @@ done # Add debian only patches to the allowed sources list. -test -f $DIR_TO_CHECK/debian.series && egrep -v -e '^$' -e '^ #' -e '^#' $DIR_TO_CHECK/debian.series >> $TMPDIR/sources +# but strip tailing -p1 arguments +test -f $DIR_TO_CHECK/debian.series && \ + sed -e '/^$/d' -e '/^#/d' -e 's,[ \t]*-p[0123456789]*$,,' \ + $DIR_TO_CHECK/debian.series >> $TMPDIR/sources test -f $TMPDIR/sources || cleanup_and_exit

1 0

commit poppler for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package poppler for openSUSE:Factory checked in at 2016-08-03 11:37:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler (Old) and /work/SRC/openSUSE:Factory/.poppler.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2016-07-14 09:42:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2016-08-03 11:37:02.000000000 +0200 @@ -1,0 +2,42 @@ +Fri Jul 29 15:13:51 UTC 2016 - jengelh(a)inai.de + +- The "poppler_soname" macro (and others) really just contained the + version (not the entire name), so rename to "popple_sover". + +------------------------------------------------------------------- +Tue Jul 26 17:12:15 UTC 2016 - zaitor(a)opensuse.org + +- Update to version 0.46.0: + + core: + - cairo: + . Fix bug in setAntialias(). + . Fix tiling patterns with BBox with non-zero x,y. + . Try finding glyphs in substitute fonts by unicode value + (fdo#96994). + - Added XRef modification flag. + - Added DocInfo setters & getters. + - Be less strict when parsing FitH Link destinations + (fdo#96661). + + utils: + - pdftocairo: + . Revert the use of groups for blending into white page. + . Use fprintf for printing errors. + - pdfinfo: Don't print pdf info when printing metadata, + javascript, or structure (fdo#96801). + + glib: + - Added document property setters & simplified getters. + - Make document metatag gobject properties writeable. + + cpp: + - Pass len to GooString constructor in + detail::ustring_to_unicode_GooString() (fdo#96426). + - Added functions to save a document. + - Added document property setters & getters. + + qt4: Added document property setters & simplified getters. + + qt5: Added document property setters & simplified getters. + + build system: + - configure: + . Don't use -fPIC on cygwin. + . Work with non gnu greps. +- Bump soname following upstream changes. + +------------------------------------------------------------------- poppler-qt5.changes: same change poppler.changes: same change Old: ---- poppler-0.45.0.tar.xz New: ---- poppler-0.46.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-qt.spec ++++++ --- /var/tmp/diff_new_pack.3C9UaB/_old 2016-08-03 11:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.3C9UaB/_new 2016-08-03 11:37:03.000000000 +0200 @@ -21,15 +21,15 @@ Name: poppler-qt %define _name poppler -Version: 0.45.0 +Version: 0.46.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 62 -%define poppler_cpp_soname 0 -%define poppler_glib_soname 8 -%define poppler_qt4_soname 4 -%define poppler_qt5_soname 1 +%define poppler_sover 63 +%define poppler_cpp_sover 0 +%define poppler_glib_sover 8 +%define poppler_qt4_sover 4 +%define poppler_qt5_sover 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ @@ -77,7 +77,7 @@ Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler%{poppler_soname} +%package -n libpoppler%{poppler_sover} Summary: PDF Rendering Library Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} @@ -85,27 +85,27 @@ Provides: poppler = %{version} Obsoletes: poppler < %{version} -%description -n libpoppler%{poppler_soname} +%description -n libpoppler%{poppler_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-cpp%{poppler_cpp_soname} +%package -n libpoppler-cpp%{poppler_cpp_sover} Summary: PDF Rendering Library Group: System/Libraries -%description -n libpoppler-cpp%{poppler_cpp_soname} +%description -n libpoppler-cpp%{poppler_cpp_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-glib%{poppler_glib_soname} +%package -n libpoppler-glib%{poppler_glib_sover} Summary: PDF Rendering Library - GLib Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-glib = %{version} Obsoletes: poppler-glib < %{version} -%description -n libpoppler-glib%{poppler_glib_soname} +%description -n libpoppler-glib%{poppler_glib_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -121,27 +121,27 @@ %if %build_qt -%package -n libpoppler-qt4-%{poppler_qt4_soname} +%package -n libpoppler-qt4-%{poppler_qt4_sover} Summary: PDF Rendering Library - Qt4 Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-qt4 = %{version} Obsoletes: poppler-qt4 < %{version} -%description -n libpoppler-qt4-%{poppler_qt4_soname} +%description -n libpoppler-qt4-%{poppler_qt4_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %endif %if %build_qt5 -%package -n libpoppler-qt5-%{poppler_qt5_soname} +%package -n libpoppler-qt5-%{poppler_qt5_sover} Summary: PDF Rendering Library - Qt5 Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} -%description -n libpoppler-qt5-%{poppler_qt5_soname} +%description -n libpoppler-qt5-%{poppler_qt5_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %endif @@ -149,7 +149,7 @@ %package tools Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # last version in openSUSE 11.1/SLE11 Provides: xpdf-tools = 3.02 Obsoletes: xpdf-tools < 3.02 @@ -162,8 +162,8 @@ %package -n libpoppler-devel Summary: PDF rendering library Group: Development/Libraries/C and C++ -Requires: libpoppler%{poppler_soname} = %{version} -Requires: libpoppler-cpp%{poppler_cpp_soname} = %{version} +Requires: libpoppler%{poppler_sover} = %{version} +Requires: libpoppler-cpp%{poppler_cpp_sover} = %{version} Requires: libstdc++-devel # Last appeared in OpenSUSE 10.3: Provides: poppler-devel = %{version} @@ -176,7 +176,7 @@ %package -n libpoppler-glib-devel Summary: PDF rendering library - GLib Wrapper Group: Development/Libraries/C and C++ -Requires: libpoppler-glib%{poppler_glib_soname} = %{version} +Requires: libpoppler-glib%{poppler_glib_sover} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-glib.so @@ -197,7 +197,7 @@ Summary: PDF rendering library - Qt4 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} +Requires: libpoppler-qt4-%{poppler_qt4_sover} = %{version} Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-qt4.so @@ -213,7 +213,7 @@ Summary: PDF rendering library - Qt5 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} +Requires: libpoppler-qt5-%{poppler_qt5_sover} = %{version} Requires: pkgconfig(Qt5Core) Requires: pkgconfig(Qt5Gui) Requires: pkgconfig(Qt5Widgets) @@ -266,54 +266,54 @@ echo > %SOURCE99 %if %build_qt -echo "libpoppler-qt4-%{poppler_qt4_soname}" >> %SOURCE99 +echo "libpoppler-qt4-%{poppler_qt4_sover}" >> %SOURCE99 %else %if %build_qt5 -echo "libpoppler-qt5-%{poppler_qt5_soname}" >> %SOURCE99 +echo "libpoppler-qt5-%{poppler_qt5_sover}" >> %SOURCE99 %else -echo "libpoppler%{poppler_soname}" >> %SOURCE99 -echo "libpoppler-glib%{poppler_glib_soname}" >> %SOURCE99 -echo "libpoppler-cpp%{poppler_cpp_soname}" >> %SOURCE99 +echo "libpoppler%{poppler_sover}" >> %SOURCE99 +echo "libpoppler-glib%{poppler_glib_sover}" >> %SOURCE99 +echo "libpoppler-cpp%{poppler_cpp_sover}" >> %SOURCE99 %endif %endif -%post -n libpoppler%{poppler_soname} -p /sbin/ldconfig +%post -n libpoppler%{poppler_sover} -p /sbin/ldconfig -%post -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig +%post -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig %if %build_qt -%post -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig +%post -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig %endif %if %build_qt5 -%post -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%post -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %endif -%postun -n libpoppler%{poppler_soname} -p /sbin/ldconfig +%postun -n libpoppler%{poppler_sover} -p /sbin/ldconfig -%postun -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig +%postun -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig -%post -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig +%post -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig -%postun -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig +%postun -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig %if %build_qt -%postun -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig +%postun -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig %endif %if %build_qt5 -%postun -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%postun -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %endif %if %build_qt -%files -n libpoppler-qt4-%{poppler_qt4_soname} +%files -n libpoppler-qt4-%{poppler_qt4_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_soname}* +%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_sover}* %files -n libpoppler-qt4-devel %defattr (-, root, root) @@ -325,9 +325,9 @@ %else %if %build_qt5 -%files -n libpoppler-qt5-%{poppler_qt5_soname} +%files -n libpoppler-qt5-%{poppler_qt5_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_soname}* +%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_sover}* %files -n libpoppler-qt5-devel %defattr (-, root, root) @@ -338,14 +338,14 @@ %else -%files -n libpoppler%{poppler_soname} +%files -n libpoppler%{poppler_sover} %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO -%{_libdir}/libpoppler.so.%{poppler_soname}* +%{_libdir}/libpoppler.so.%{poppler_sover}* -%files -n libpoppler-glib%{poppler_glib_soname} +%files -n libpoppler-glib%{poppler_glib_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-glib.so.%{poppler_glib_soname}* +%{_libdir}/libpoppler-glib.so.%{poppler_glib_sover}* %files -n typelib-1_0-Poppler-%{poppler_apipkg} %defattr (-, root, root) @@ -357,9 +357,9 @@ %{_bindir}/* %doc %{_mandir}/man1/*.* -%files -n libpoppler-cpp%{poppler_cpp_soname} +%files -n libpoppler-cpp%{poppler_cpp_sover} %defattr(-, root, root) -%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_soname}* +%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_sover}* %files -n libpoppler-devel %defattr (-, root, root) ++++++ poppler-qt5.spec ++++++ --- /var/tmp/diff_new_pack.3C9UaB/_old 2016-08-03 11:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.3C9UaB/_new 2016-08-03 11:37:03.000000000 +0200 @@ -21,15 +21,15 @@ Name: poppler-qt5 %define _name poppler -Version: 0.45.0 +Version: 0.46.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 62 -%define poppler_cpp_soname 0 -%define poppler_glib_soname 8 -%define poppler_qt4_soname 4 -%define poppler_qt5_soname 1 +%define poppler_sover 63 +%define poppler_cpp_sover 0 +%define poppler_glib_sover 8 +%define poppler_qt4_sover 4 +%define poppler_qt5_sover 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ @@ -77,7 +77,7 @@ Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler%{poppler_soname} +%package -n libpoppler%{poppler_sover} Summary: PDF Rendering Library Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} @@ -85,27 +85,27 @@ Provides: poppler = %{version} Obsoletes: poppler < %{version} -%description -n libpoppler%{poppler_soname} +%description -n libpoppler%{poppler_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-cpp%{poppler_cpp_soname} +%package -n libpoppler-cpp%{poppler_cpp_sover} Summary: PDF Rendering Library Group: System/Libraries -%description -n libpoppler-cpp%{poppler_cpp_soname} +%description -n libpoppler-cpp%{poppler_cpp_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-glib%{poppler_glib_soname} +%package -n libpoppler-glib%{poppler_glib_sover} Summary: PDF Rendering Library - GLib Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-glib = %{version} Obsoletes: poppler-glib < %{version} -%description -n libpoppler-glib%{poppler_glib_soname} +%description -n libpoppler-glib%{poppler_glib_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -121,27 +121,27 @@ %if %build_qt -%package -n libpoppler-qt4-%{poppler_qt4_soname} +%package -n libpoppler-qt4-%{poppler_qt4_sover} Summary: PDF Rendering Library - Qt4 Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-qt4 = %{version} Obsoletes: poppler-qt4 < %{version} -%description -n libpoppler-qt4-%{poppler_qt4_soname} +%description -n libpoppler-qt4-%{poppler_qt4_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %endif %if %build_qt5 -%package -n libpoppler-qt5-%{poppler_qt5_soname} +%package -n libpoppler-qt5-%{poppler_qt5_sover} Summary: PDF Rendering Library - Qt5 Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} -%description -n libpoppler-qt5-%{poppler_qt5_soname} +%description -n libpoppler-qt5-%{poppler_qt5_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %endif @@ -149,7 +149,7 @@ %package tools Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # last version in openSUSE 11.1/SLE11 Provides: xpdf-tools = 3.02 Obsoletes: xpdf-tools < 3.02 @@ -162,8 +162,8 @@ %package -n libpoppler-devel Summary: PDF rendering library Group: Development/Libraries/C and C++ -Requires: libpoppler%{poppler_soname} = %{version} -Requires: libpoppler-cpp%{poppler_cpp_soname} = %{version} +Requires: libpoppler%{poppler_sover} = %{version} +Requires: libpoppler-cpp%{poppler_cpp_sover} = %{version} Requires: libstdc++-devel # Last appeared in OpenSUSE 10.3: Provides: poppler-devel = %{version} @@ -176,7 +176,7 @@ %package -n libpoppler-glib-devel Summary: PDF rendering library - GLib Wrapper Group: Development/Libraries/C and C++ -Requires: libpoppler-glib%{poppler_glib_soname} = %{version} +Requires: libpoppler-glib%{poppler_glib_sover} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-glib.so @@ -197,7 +197,7 @@ Summary: PDF rendering library - Qt4 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} +Requires: libpoppler-qt4-%{poppler_qt4_sover} = %{version} Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-qt4.so @@ -213,7 +213,7 @@ Summary: PDF rendering library - Qt5 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} +Requires: libpoppler-qt5-%{poppler_qt5_sover} = %{version} Requires: pkgconfig(Qt5Core) Requires: pkgconfig(Qt5Gui) Requires: pkgconfig(Qt5Widgets) @@ -266,54 +266,54 @@ echo > %SOURCE99 %if %build_qt -echo "libpoppler-qt4-%{poppler_qt4_soname}" >> %SOURCE99 +echo "libpoppler-qt4-%{poppler_qt4_sover}" >> %SOURCE99 %else %if %build_qt5 -echo "libpoppler-qt5-%{poppler_qt5_soname}" >> %SOURCE99 +echo "libpoppler-qt5-%{poppler_qt5_sover}" >> %SOURCE99 %else -echo "libpoppler%{poppler_soname}" >> %SOURCE99 -echo "libpoppler-glib%{poppler_glib_soname}" >> %SOURCE99 -echo "libpoppler-cpp%{poppler_cpp_soname}" >> %SOURCE99 +echo "libpoppler%{poppler_sover}" >> %SOURCE99 +echo "libpoppler-glib%{poppler_glib_sover}" >> %SOURCE99 +echo "libpoppler-cpp%{poppler_cpp_sover}" >> %SOURCE99 %endif %endif -%post -n libpoppler%{poppler_soname} -p /sbin/ldconfig +%post -n libpoppler%{poppler_sover} -p /sbin/ldconfig -%post -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig +%post -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig %if %build_qt -%post -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig +%post -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig %endif %if %build_qt5 -%post -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%post -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %endif -%postun -n libpoppler%{poppler_soname} -p /sbin/ldconfig +%postun -n libpoppler%{poppler_sover} -p /sbin/ldconfig -%postun -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig +%postun -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig -%post -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig +%post -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig -%postun -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig +%postun -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig %if %build_qt -%postun -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig +%postun -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig %endif %if %build_qt5 -%postun -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%postun -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %endif %if %build_qt -%files -n libpoppler-qt4-%{poppler_qt4_soname} +%files -n libpoppler-qt4-%{poppler_qt4_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_soname}* +%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_sover}* %files -n libpoppler-qt4-devel %defattr (-, root, root) @@ -325,9 +325,9 @@ %else %if %build_qt5 -%files -n libpoppler-qt5-%{poppler_qt5_soname} +%files -n libpoppler-qt5-%{poppler_qt5_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_soname}* +%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_sover}* %files -n libpoppler-qt5-devel %defattr (-, root, root) @@ -338,14 +338,14 @@ %else -%files -n libpoppler%{poppler_soname} +%files -n libpoppler%{poppler_sover} %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO -%{_libdir}/libpoppler.so.%{poppler_soname}* +%{_libdir}/libpoppler.so.%{poppler_sover}* -%files -n libpoppler-glib%{poppler_glib_soname} +%files -n libpoppler-glib%{poppler_glib_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-glib.so.%{poppler_glib_soname}* +%{_libdir}/libpoppler-glib.so.%{poppler_glib_sover}* %files -n typelib-1_0-Poppler-%{poppler_apipkg} %defattr (-, root, root) @@ -357,9 +357,9 @@ %{_bindir}/* %doc %{_mandir}/man1/*.* -%files -n libpoppler-cpp%{poppler_cpp_soname} +%files -n libpoppler-cpp%{poppler_cpp_sover} %defattr(-, root, root) -%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_soname}* +%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_sover}* %files -n libpoppler-devel %defattr (-, root, root) ++++++ poppler.spec ++++++ --- /var/tmp/diff_new_pack.3C9UaB/_old 2016-08-03 11:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.3C9UaB/_new 2016-08-03 11:37:03.000000000 +0200 @@ -21,15 +21,15 @@ Name: poppler %define _name poppler -Version: 0.45.0 +Version: 0.46.0 Release: 0 # Actual version of poppler-data: %define poppler_data_version 0.4.6 -%define poppler_soname 62 -%define poppler_cpp_soname 0 -%define poppler_glib_soname 8 -%define poppler_qt4_soname 4 -%define poppler_qt5_soname 1 +%define poppler_sover 63 +%define poppler_cpp_sover 0 +%define poppler_glib_sover 8 +%define poppler_qt4_sover 4 +%define poppler_qt5_sover 1 %define poppler_api 0.18 %define poppler_apipkg 0_18 Url: http://poppler.freedesktop.org/ @@ -77,7 +77,7 @@ Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler%{poppler_soname} +%package -n libpoppler%{poppler_sover} Summary: PDF Rendering Library Group: System/Libraries Recommends: poppler-data >= %{poppler_data_version} @@ -85,27 +85,27 @@ Provides: poppler = %{version} Obsoletes: poppler < %{version} -%description -n libpoppler%{poppler_soname} +%description -n libpoppler%{poppler_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-cpp%{poppler_cpp_soname} +%package -n libpoppler-cpp%{poppler_cpp_sover} Summary: PDF Rendering Library Group: System/Libraries -%description -n libpoppler-cpp%{poppler_cpp_soname} +%description -n libpoppler-cpp%{poppler_cpp_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. -%package -n libpoppler-glib%{poppler_glib_soname} +%package -n libpoppler-glib%{poppler_glib_sover} Summary: PDF Rendering Library - GLib Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-glib = %{version} Obsoletes: poppler-glib < %{version} -%description -n libpoppler-glib%{poppler_glib_soname} +%description -n libpoppler-glib%{poppler_glib_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. @@ -121,27 +121,27 @@ %if %build_qt -%package -n libpoppler-qt4-%{poppler_qt4_soname} +%package -n libpoppler-qt4-%{poppler_qt4_sover} Summary: PDF Rendering Library - Qt4 Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-qt4 = %{version} Obsoletes: poppler-qt4 < %{version} -%description -n libpoppler-qt4-%{poppler_qt4_soname} +%description -n libpoppler-qt4-%{poppler_qt4_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %endif %if %build_qt5 -%package -n libpoppler-qt5-%{poppler_qt5_soname} +%package -n libpoppler-qt5-%{poppler_qt5_sover} Summary: PDF Rendering Library - Qt5 Wrapper Group: System/Libraries -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} -%description -n libpoppler-qt5-%{poppler_qt5_soname} +%description -n libpoppler-qt5-%{poppler_qt5_sover} Poppler is a PDF rendering library, forked from the xpdf PDF viewer developed by Derek Noonburg of Glyph and Cog, LLC. %endif @@ -149,7 +149,7 @@ %package tools Summary: PDF Rendering Library Tools Group: Productivity/Publishing/PDF -Requires: libpoppler%{poppler_soname} >= %{version} +Requires: libpoppler%{poppler_sover} >= %{version} # last version in openSUSE 11.1/SLE11 Provides: xpdf-tools = 3.02 Obsoletes: xpdf-tools < 3.02 @@ -162,8 +162,8 @@ %package -n libpoppler-devel Summary: PDF rendering library Group: Development/Libraries/C and C++ -Requires: libpoppler%{poppler_soname} = %{version} -Requires: libpoppler-cpp%{poppler_cpp_soname} = %{version} +Requires: libpoppler%{poppler_sover} = %{version} +Requires: libpoppler-cpp%{poppler_cpp_sover} = %{version} Requires: libstdc++-devel # Last appeared in OpenSUSE 10.3: Provides: poppler-devel = %{version} @@ -176,7 +176,7 @@ %package -n libpoppler-glib-devel Summary: PDF rendering library - GLib Wrapper Group: Development/Libraries/C and C++ -Requires: libpoppler-glib%{poppler_glib_soname} = %{version} +Requires: libpoppler-glib%{poppler_glib_sover} = %{version} Requires: typelib-1_0-Poppler-%{poppler_apipkg} = %{version} # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-glib.so @@ -197,7 +197,7 @@ Summary: PDF rendering library - Qt4 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt4-%{poppler_qt4_soname} = %{version} +Requires: libpoppler-qt4-%{poppler_qt4_sover} = %{version} Requires: libqt4-devel # Last appeared in OpenSUSE 10.3: Provides: poppler-devel:%{_libdir}/libpoppler-qt4.so @@ -213,7 +213,7 @@ Summary: PDF rendering library - Qt5 Wrapper Group: Development/Libraries/C and C++ Requires: libpoppler-devel = %{version} -Requires: libpoppler-qt5-%{poppler_qt5_soname} = %{version} +Requires: libpoppler-qt5-%{poppler_qt5_sover} = %{version} Requires: pkgconfig(Qt5Core) Requires: pkgconfig(Qt5Gui) Requires: pkgconfig(Qt5Widgets) @@ -266,54 +266,54 @@ echo > %SOURCE99 %if %build_qt -echo "libpoppler-qt4-%{poppler_qt4_soname}" >> %SOURCE99 +echo "libpoppler-qt4-%{poppler_qt4_sover}" >> %SOURCE99 %else %if %build_qt5 -echo "libpoppler-qt5-%{poppler_qt5_soname}" >> %SOURCE99 +echo "libpoppler-qt5-%{poppler_qt5_sover}" >> %SOURCE99 %else -echo "libpoppler%{poppler_soname}" >> %SOURCE99 -echo "libpoppler-glib%{poppler_glib_soname}" >> %SOURCE99 -echo "libpoppler-cpp%{poppler_cpp_soname}" >> %SOURCE99 +echo "libpoppler%{poppler_sover}" >> %SOURCE99 +echo "libpoppler-glib%{poppler_glib_sover}" >> %SOURCE99 +echo "libpoppler-cpp%{poppler_cpp_sover}" >> %SOURCE99 %endif %endif -%post -n libpoppler%{poppler_soname} -p /sbin/ldconfig +%post -n libpoppler%{poppler_sover} -p /sbin/ldconfig -%post -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig +%post -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig %if %build_qt -%post -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig +%post -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig %endif %if %build_qt5 -%post -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%post -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %endif -%postun -n libpoppler%{poppler_soname} -p /sbin/ldconfig +%postun -n libpoppler%{poppler_sover} -p /sbin/ldconfig -%postun -n libpoppler-glib%{poppler_glib_soname} -p /sbin/ldconfig +%postun -n libpoppler-glib%{poppler_glib_sover} -p /sbin/ldconfig -%post -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig +%post -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig -%postun -n libpoppler-cpp%{poppler_cpp_soname} -p /sbin/ldconfig +%postun -n libpoppler-cpp%{poppler_cpp_sover} -p /sbin/ldconfig %if %build_qt -%postun -n libpoppler-qt4-%{poppler_qt4_soname} -p /sbin/ldconfig +%postun -n libpoppler-qt4-%{poppler_qt4_sover} -p /sbin/ldconfig %endif %if %build_qt5 -%postun -n libpoppler-qt5-%{poppler_qt5_soname} -p /sbin/ldconfig +%postun -n libpoppler-qt5-%{poppler_qt5_sover} -p /sbin/ldconfig %endif %if %build_qt -%files -n libpoppler-qt4-%{poppler_qt4_soname} +%files -n libpoppler-qt4-%{poppler_qt4_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_soname}* +%{_libdir}/libpoppler-qt4.so.%{poppler_qt4_sover}* %files -n libpoppler-qt4-devel %defattr (-, root, root) @@ -325,9 +325,9 @@ %else %if %build_qt5 -%files -n libpoppler-qt5-%{poppler_qt5_soname} +%files -n libpoppler-qt5-%{poppler_qt5_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_soname}* +%{_libdir}/libpoppler-qt5.so.%{poppler_qt5_sover}* %files -n libpoppler-qt5-devel %defattr (-, root, root) @@ -338,14 +338,14 @@ %else -%files -n libpoppler%{poppler_soname} +%files -n libpoppler%{poppler_sover} %defattr (-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO -%{_libdir}/libpoppler.so.%{poppler_soname}* +%{_libdir}/libpoppler.so.%{poppler_sover}* -%files -n libpoppler-glib%{poppler_glib_soname} +%files -n libpoppler-glib%{poppler_glib_sover} %defattr (-, root, root) -%{_libdir}/libpoppler-glib.so.%{poppler_glib_soname}* +%{_libdir}/libpoppler-glib.so.%{poppler_glib_sover}* %files -n typelib-1_0-Poppler-%{poppler_apipkg} %defattr (-, root, root) @@ -357,9 +357,9 @@ %{_bindir}/* %doc %{_mandir}/man1/*.* -%files -n libpoppler-cpp%{poppler_cpp_soname} +%files -n libpoppler-cpp%{poppler_cpp_sover} %defattr(-, root, root) -%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_soname}* +%{_libdir}/libpoppler-cpp.so.%{poppler_cpp_sover}* %files -n libpoppler-devel %defattr (-, root, root) ++++++ poppler-0.45.0.tar.xz -> poppler-0.46.0.tar.xz ++++++ ++++ 4973 lines of diff (skipped)

1 0

commit ovmf for openSUSE:Factory
by root＠hilbert.suse.de 03 Aug '16

03 Aug '16

Hello community, here is the log from the commit of package ovmf for openSUSE:Factory checked in at 2016-08-03 11:36:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ovmf (Old) and /work/SRC/openSUSE:Factory/.ovmf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ovmf" Changes: -------- --- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2016-07-01 09:51:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ovmf.new/ovmf.changes 2016-08-03 11:36:53.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Jul 27 04:13:18 UTC 2016 - glin(a)suse.com + +- Update openssl to 1.0.2h (bsc#990612) + + Add the patch: ovmf-bsc990612-update-openssl-1.0.2h.patch + + Update the openssl tarball +- Add ovmf-bsc990773-remove-stale-boot-options.patch to remove the + stale boot options (bsc#990773) + +------------------------------------------------------------------- Old: ---- openssl-1.0.2g.tar.gz openssl-1.0.2g.tar.gz.asc New: ---- openssl-1.0.2h.tar.gz openssl-1.0.2h.tar.gz.asc ovmf-bsc990612-update-openssl-1.0.2h.patch ovmf-bsc990773-remove-stale-boot-options.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ovmf.spec ++++++ --- /var/tmp/diff_new_pack.HlhCzv/_old 2016-08-03 11:36:55.000000000 +0200 +++ /var/tmp/diff_new_pack.HlhCzv/_new 2016-08-03 11:36:55.000000000 +0200 @@ -19,7 +19,7 @@ # needssslcertforbuild %undefine _build_create_debug -%define openssl_version 1.0.2g +%define openssl_version 1.0.2h Name: ovmf Url: http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2 @@ -54,6 +54,15 @@ Patch7: %{name}-bsc980635-fix-http-crash.patch Patch8: %{name}-bsc982193-dont-restore-readonly-var.patch Patch9: %{name}-bsc982193-connect-xen-drivers.patch +# NOTE: edk2 retired NO_BUILTIN_VA_FUNCS right after the 1.0.2h patch, so the +# following commits may be necessary for the next openssl update: +# b2dc04a87fab89307240dc0f30b9a23bb5726c81 CryptoPkg: set new define to avoid MS ABI VA_LIST on GCC/X64 +# 48d5f9a551a93acb45f272dda879b0ab5a504e36 MdePkg: Enable new MS VA intrinsics for GNUC x86 64bits build +# 0676c285ba518ae81ca7f06278d4cc4958660864 EdkCompatibilityPkg: Enable new MS VA intrinsics for GNUC x86 64bits build +# 247093f45d94a3956cdd15c357fe7d6dca878df9 BaseTools/tools_def: enable Os optimization for GCC X64 builds +# 17ab1ec5accc866b77446f4e336e982bb5e1cc9f MdePkg CryptoPkg EdkCompatibilityPkg: retire NO_BUILTIN_VA_FUNCS define +Patch10: %{name}-bsc990612-update-openssl-1.0.2h.patch +Patch11: %{name}-bsc990773-remove-stale-boot-options.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes BuildRequires: gcc @@ -175,6 +184,8 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 +%patch11 -p1 # Intel has special patches for openssl pushd CryptoPkg/Library/OpensslLib/openssl-%{openssl_version} patch -p1 -i ../EDKII_openssl-%{openssl_version}.patch ++++++ ovmf-bsc990612-update-openssl-1.0.2h.patch ++++++ >From 535421d25307a1c212a5f514048229b8ab429d5d Mon Sep 17 00:00:00 2001 From: Qin Long <qin.long(a)intel.com> Date: Wed, 13 Jul 2016 13:27:11 +0800 Subject: [PATCH] CryptoPkg/OpensslLib: Upgrade OpenSSL version to 1.0.2h OpenSSL 1.0.2h was released with several severity fixes at 03-May-2016 (https://www.openssl.org/news/secadv/20160503.txt) Upgrade the supported OpenSSL version in CryptoPkg/OpensslLib to catch the latest release 1.0.2h. Cc: Ting Ye <ting.ye(a)intel.com> Cc: David Woodhouse <David.Woodhouse(a)intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qin Long <qin.long(a)intel.com> Reviewed-by: Ye Ting <ting.ye(a)intel.com> Tested-by: Laszlo Ersek <lersek(a)redhat.com> --- CryptoPkg/CryptoPkg.dec | 2 +- ...ssl-1.0.2g.patch => EDKII_openssl-1.0.2h.patch} | 97 ++++++++++------------ CryptoPkg/Library/OpensslLib/Install.cmd | 2 +- CryptoPkg/Library/OpensslLib/Install.sh | 2 +- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 2 +- CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt | 26 +++--- 6 files changed, 62 insertions(+), 69 deletions(-) rename CryptoPkg/Library/OpensslLib/{EDKII_openssl-1.0.2g.patch => EDKII_openssl-1.0.2h.patch} (95%) diff --git a/CryptoPkg/CryptoPkg.dec b/CryptoPkg/CryptoPkg.dec index e1cdb8e..c0885bb 100644 --- a/CryptoPkg/CryptoPkg.dec +++ b/CryptoPkg/CryptoPkg.dec @@ -24,7 +24,7 @@ [Defines] [Includes] Include - Library/OpensslLib/openssl-1.0.2g/include + Library/OpensslLib/openssl-1.0.2h/include [LibraryClasses] ## @libraryclass Provides basic library functions for cryptographic primitives. diff --git a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2g.patch b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2h.patch similarity index 95% rename from CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2g.patch rename to CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2h.patch index 25dbebc..559fc67 100644 --- a/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2g.patch +++ b/CryptoPkg/Library/OpensslLib/EDKII_openssl-1.0.2h.patch @@ -254,7 +254,7 @@ index d5a5514..bede55c 100644 goto err; diff --git a/crypto/bn/bn_prime.c b/crypto/bn/bn_prime.c -index 1d25687..e933ead 100644 +index 1d25687..ad641c3 100644 --- a/crypto/bn/bn_prime.c +++ b/crypto/bn/bn_prime.c @@ -131,7 +131,7 @@ @@ -277,7 +277,7 @@ index 1d25687..e933ead 100644 + mods = OPENSSL_malloc(sizeof(*mods) * NUMPRIMES); + if (mods == NULL) -+ goto err; ++ goto err; ctx = BN_CTX_new(); if (ctx == NULL) goto err; @@ -311,7 +311,7 @@ index 1d25687..e933ead 100644 again: diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h -index 8d926d5..41cf38e 100644 +index 8d926d5..c29e97d 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -118,8 +118,10 @@ typedef void conf_finish_func (CONF_IMODULE *md); @@ -329,9 +329,9 @@ index 8d926d5..41cf38e 100644 long CONF_get_number(LHASH_OF(CONF_VALUE) *conf, const char *group, const char *name); void CONF_free(LHASH_OF(CONF_VALUE) *conf); -+#ifndef OPENSSL_NO_FP_API ++# ifndef OPENSSL_NO_FP_API int CONF_dump_fp(LHASH_OF(CONF_VALUE) *conf, FILE *out); -+#endif ++# endif int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out); void OPENSSL_config(const char *config_name); @@ -349,9 +349,9 @@ index 8d926d5..41cf38e 100644 char *NCONF_get_string(const CONF *conf, const char *group, const char *name); int NCONF_get_number_e(const CONF *conf, const char *group, const char *name, long *result); -+#ifndef OPENSSL_NO_FP_API ++# ifndef OPENSSL_NO_FP_API int NCONF_dump_fp(const CONF *conf, FILE *out); -+#endif ++# endif int NCONF_dump_bio(const CONF *conf, BIO *out); # if 0 /* The following function has no error @@ -359,10 +359,10 @@ index 8d926d5..41cf38e 100644 int CONF_modules_load(const CONF *cnf, const char *appname, unsigned long flags); -+#ifndef OPENSSL_NO_STDIO ++# ifndef OPENSSL_NO_STDIO int CONF_modules_load_file(const char *filename, const char *appname, unsigned long flags); -+#endif ++# endif void CONF_modules_unload(int all); void CONF_modules_finish(void); void CONF_modules_free(void); @@ -684,10 +684,10 @@ index a5bd901..6488879 100644 /* BEGIN ERROR CODES */ /* diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c -index a882cb2..4eddb9a 100644 +index a882cb2..aace5fb 100644 --- a/crypto/dh/dh_kdf.c +++ b/crypto/dh/dh_kdf.c -@@ -51,13 +51,18 @@ +@@ -51,6 +51,9 @@ * ==================================================================== */ @@ -697,22 +697,21 @@ index a882cb2..4eddb9a 100644 #include <string.h> #include <openssl/dh.h> #include <openssl/evp.h> - #include <openssl/asn1.h> +@@ -58,6 +61,7 @@ #include <openssl/cms.h> -+ /* Key derivation from X9.42/RFC2631 */ +/* Uses CMS functions, hence the #ifdef wrapper. */ #define DH_KDF_MAX (1L << 30) -@@ -185,3 +190,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, +@@ -185,3 +189,4 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen, EVP_MD_CTX_cleanup(&mctx); return rv; } +#endif diff --git a/crypto/dh/dh_pmeth.c b/crypto/dh/dh_pmeth.c -index b58e3fa..c6288f6 100644 +index b58e3fa..926be98 100644 --- a/crypto/dh/dh_pmeth.c +++ b/crypto/dh/dh_pmeth.c @@ -207,7 +207,11 @@ static int pkey_dh_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) @@ -727,7 +726,7 @@ index b58e3fa..c6288f6 100644 return -2; dctx->kdf_type = p1; return 1; -@@ -448,7 +452,10 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, +@@ -448,7 +452,9 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, return ret; *keylen = ret; return 1; @@ -735,11 +734,10 @@ index b58e3fa..c6288f6 100644 + } +#ifndef OPENSSL_NO_CMS + else if (dctx->kdf_type == EVP_PKEY_DH_KDF_X9_42) { -+ unsigned char *Z = NULL; size_t Zlen = 0; if (!dctx->kdf_outlen || !dctx->kdf_oid) -@@ -479,7 +486,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, +@@ -479,7 +485,8 @@ static int pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, } return ret; } @@ -945,7 +943,7 @@ index 7a1c85d..7162c0f 100644 #undef BN_LLONG diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h -index d3b23fc..87b0b6a 100644 +index d3b23fc..5df6ffd 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -324,6 +324,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \ @@ -980,17 +978,16 @@ index d3b23fc..87b0b6a 100644 int i2d_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); -@@ -510,7 +514,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, +@@ -510,6 +514,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_fp(FILE *fp, EVP_PKEY **x, pem_password_cb *cb, int PEM_write_PKCS8PrivateKey(FILE *fp, EVP_PKEY *x, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cd, void *u); -- +#endif + EVP_PKEY *PEM_read_bio_Parameters(BIO *bp, EVP_PKEY **x); int PEM_write_bio_Parameters(BIO *bp, EVP_PKEY *x); - diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c -index a29821a..5525efd 100644 +index fe881d6..e25cc68 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -84,7 +84,7 @@ int pem_check_suffix(const char *pem_str, const char *suffix); @@ -1003,38 +1000,35 @@ index a29821a..5525efd 100644 * We should not ever call the default callback routine from windows. */ diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c -index 5747c73..fe465cc 100644 +index 5747c73..9edca4d 100644 --- a/crypto/pem/pem_pk8.c +++ b/crypto/pem/pem_pk8.c -@@ -69,10 +69,12 @@ +@@ -69,9 +69,11 @@ static int do_pk8pkey(BIO *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); -+ +#ifndef OPENSSL_NO_FP_API static int do_pk8pkey_fp(FILE *bp, EVP_PKEY *x, int isder, int nid, const EVP_CIPHER *enc, char *kstr, int klen, pem_password_cb *cb, void *u); -- +#endif + /* * These functions write a private key in PKCS#8 format: it is a "drop in" - * replacement for PEM_write_bio_PrivateKey() and friends. As usual if 'enc' diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c -index dc9b484..0bc3d43 100644 +index dc9b484..e75c4b2 100644 --- a/crypto/pkcs7/pk7_smime.c +++ b/crypto/pkcs7/pk7_smime.c -@@ -64,6 +64,9 @@ +@@ -64,6 +64,8 @@ #include <openssl/x509.h> #include <openssl/x509v3.h> -+ +#define BUFFERSIZE 4096 + static int pkcs7_copy_existing_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si); PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs, -@@ -254,7 +257,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, +@@ -254,7 +256,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, STACK_OF(PKCS7_SIGNER_INFO) *sinfos; PKCS7_SIGNER_INFO *si; X509_STORE_CTX cert_ctx; @@ -1043,7 +1037,7 @@ index dc9b484..0bc3d43 100644 int i, j = 0, k, ret = 0; BIO *p7bio = NULL; BIO *tmpin = NULL, *tmpout = NULL; -@@ -373,8 +376,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, +@@ -373,8 +375,12 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, tmpout = out; /* We now have to 'read' from p7bio to calculate digests etc. */ @@ -1057,7 +1051,7 @@ index dc9b484..0bc3d43 100644 if (i <= 0) break; if (tmpout) -@@ -405,6 +412,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, +@@ -405,6 +411,7 @@ int PKCS7_verify(PKCS7 *p7, STACK_OF(X509) *certs, X509_STORE *store, ret = 1; err: @@ -1065,7 +1059,7 @@ index dc9b484..0bc3d43 100644 if (tmpin == indata) { if (indata) BIO_pop(p7bio); -@@ -523,7 +531,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) +@@ -523,7 +530,7 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) { BIO *tmpmem; int ret, i; @@ -1074,7 +1068,7 @@ index dc9b484..0bc3d43 100644 if (!p7) { PKCS7err(PKCS7_F_PKCS7_DECRYPT, PKCS7_R_INVALID_NULL_POINTER); -@@ -567,24 +575,29 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) +@@ -567,24 +574,30 @@ int PKCS7_decrypt(PKCS7 *p7, EVP_PKEY *pkey, X509 *cert, BIO *data, int flags) } BIO_free_all(bread); return ret; @@ -1116,6 +1110,7 @@ index dc9b484..0bc3d43 100644 - BIO_free_all(tmpmem); - return ret; } ++ +err: + OPENSSL_free(buf); + BIO_free_all(tmpmem); @@ -1222,20 +1217,19 @@ index 4e06218..ddead3d 100644 const EVP_PKEY_ASN1_METHOD rsa_asn1_meths[] = { { diff --git a/crypto/srp/srp.h b/crypto/srp/srp.h -index 028892a..713fc54 100644 +index 028892a..4ed4bfe 100644 --- a/crypto/srp/srp.h +++ b/crypto/srp/srp.h -@@ -119,8 +119,9 @@ DECLARE_STACK_OF(SRP_gN) +@@ -119,7 +119,9 @@ DECLARE_STACK_OF(SRP_gN) SRP_VBASE *SRP_VBASE_new(char *seed_key); int SRP_VBASE_free(SRP_VBASE *vb); +#ifndef OPENSSL_NO_STDIO int SRP_VBASE_init(SRP_VBASE *vb, char *verifier_file); -- +#endif + /* This method ignores the configured seed and fails for an unknown user. */ SRP_user_pwd *SRP_VBASE_get_by_user(SRP_VBASE *vb, char *username); - /* NOTE: unlike in SRP_VBASE_get_by_user, caller owns the returned pointer.*/ diff --git a/crypto/srp/srp_vfy.c b/crypto/srp/srp_vfy.c index 26ad3e0..6be4cf2 100644 --- a/crypto/srp/srp_vfy.c @@ -1950,7 +1944,7 @@ index f6b3ff2..1dcbe36 100755 SEED,- SHA,- diff --git a/ssl/d1_both.c b/ssl/d1_both.c -index d1fc716..d5f661a 100644 +index 5d26c94..ee3f49b 100644 --- a/ssl/d1_both.c +++ b/ssl/d1_both.c @@ -1053,7 +1053,7 @@ int dtls1_send_change_cipher_spec(SSL *s, int a, int b) @@ -2002,15 +1996,14 @@ index 35cc27c..a1f5335 100644 } else { ret->sid_ctx_length = os.length; diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c -index a73f866..d534c0a 100644 +index f48ebae..ac4f08c 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c -@@ -855,12 +855,13 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) +@@ -857,12 +857,12 @@ int SSL_CTX_add_client_CA(SSL_CTX *ctx, X509 *x) return (add_client_CA(&(ctx->client_CA), x)); } +#ifndef OPENSSL_NO_STDIO -+ static int xname_cmp(const X509_NAME *const *a, const X509_NAME *const *b) { return (X509_NAME_cmp(*a, *b)); @@ -2020,7 +2013,7 @@ index a73f866..d534c0a 100644 /** * Load CA certs from a file into a ::STACK. Note that it is somewhat misnamed; * it doesn't really have anything to do with clients (except that a common use -@@ -928,7 +929,6 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) +@@ -930,7 +930,6 @@ STACK_OF(X509_NAME) *SSL_load_client_CA_file(const char *file) ERR_clear_error(); return (ret); } @@ -2028,7 +2021,7 @@ index a73f866..d534c0a 100644 /** * Add a file of certs to a stack. -@@ -1048,6 +1048,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, +@@ -1050,6 +1049,7 @@ int SSL_add_dir_cert_subjects_to_stack(STACK_OF(X509_NAME) *stack, CRYPTO_w_unlock(CRYPTO_LOCK_READDIR); return ret; } @@ -2108,7 +2101,7 @@ index baa3b59..1ee3f02 100644 if ($? == 0) { diff --git a/util/libeay.num b/util/libeay.num -index e5b3c6e..8d4185c 100755 +index 2094ab3..992abb2 100755 --- a/util/libeay.num +++ b/util/libeay.num @@ -4370,7 +4370,7 @@ DH_compute_key_padded 4732 EXIST::FUNCTION:DH @@ -2121,7 +2114,7 @@ index e5b3c6e..8d4185c 100755 EVP_des_ede3_wrap 4737 EXIST::FUNCTION:DES RSA_OAEP_PARAMS_it 4738 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:RSA diff --git a/util/mkdef.pl b/util/mkdef.pl -index c57c7f7..d4c3386 100755 +index b9b159a..9841498 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -97,6 +97,8 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF", @@ -2133,7 +2126,7 @@ index c57c7f7..d4c3386 100755 # RFC3779 "RFC3779", # TLS -@@ -142,7 +144,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; +@@ -144,7 +146,7 @@ my $no_md2; my $no_md4; my $no_md5; my $no_sha; my $no_ripemd; my $no_mdc2; my $no_rsa; my $no_dsa; my $no_dh; my $no_hmac=0; my $no_aes; my $no_krb5; my $no_ec; my $no_ecdsa; my $no_ecdh; my $no_engine; my $no_hw; my $no_fp_api; my $no_static_engine=1; my $no_gmp; my $no_deprecated; @@ -2141,8 +2134,8 @@ index c57c7f7..d4c3386 100755 +my $no_sct; my $no_rfc3779; my $no_psk; my $no_tlsext; my $no_cms; my $no_capieng; my $no_jpake; my $no_srp; my $no_ssl2; my $no_ec2m; my $no_nistp_gcc; my $no_nextprotoneg; my $no_sctp; my $no_srtp; my $no_ssl_trace; - my $no_unit_test; my $no_ssl3_method; -@@ -233,6 +235,7 @@ foreach (@ARGV, split(/ /, $options)) + my $no_unit_test; my $no_ssl3_method; my $no_ssl2_method; +@@ -235,6 +237,7 @@ foreach (@ARGV, split(/ /, $options)) elsif (/^no-engine$/) { $no_engine=1; } elsif (/^no-hw$/) { $no_hw=1; } elsif (/^no-gmp$/) { $no_gmp=1; } @@ -2150,7 +2143,7 @@ index c57c7f7..d4c3386 100755 elsif (/^no-rfc3779$/) { $no_rfc3779=1; } elsif (/^no-tlsext$/) { $no_tlsext=1; } elsif (/^no-cms$/) { $no_cms=1; } -@@ -1206,6 +1209,7 @@ sub is_valid +@@ -1209,6 +1212,7 @@ sub is_valid if ($keyword eq "FP_API" && $no_fp_api) { return 0; } if ($keyword eq "STATIC_ENGINE" && $no_static_engine) { return 0; } if ($keyword eq "GMP" && $no_gmp) { return 0; } diff --git a/CryptoPkg/Library/OpensslLib/Install.cmd b/CryptoPkg/Library/OpensslLib/Install.cmd index 51e5414..83d04d7 100755 --- a/CryptoPkg/Library/OpensslLib/Install.cmd +++ b/CryptoPkg/Library/OpensslLib/Install.cmd @@ -1,4 +1,4 @@ -cd openssl-1.0.2g +cd openssl-1.0.2h copy ..\opensslconf.h crypto if not exist include\openssl mkdir include\openssl copy e_os2.h include\openssl diff --git a/CryptoPkg/Library/OpensslLib/Install.sh b/CryptoPkg/Library/OpensslLib/Install.sh index 06f1dcd..95963ff 100755 --- a/CryptoPkg/Library/OpensslLib/Install.sh +++ b/CryptoPkg/Library/OpensslLib/Install.sh @@ -1,6 +1,6 @@ #!/bin/sh -cd openssl-1.0.2g +cd openssl-1.0.2h cp ../opensslconf.h crypto mkdir -p include/openssl cp e_os2.h include/openssl diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 8757100..361d30e 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -20,7 +20,7 @@ [Defines] MODULE_TYPE = BASE VERSION_STRING = 1.0 LIBRARY_CLASS = OpensslLib - DEFINE OPENSSL_PATH = openssl-1.0.2g + DEFINE OPENSSL_PATH = openssl-1.0.2h DEFINE OPENSSL_FLAGS = -DL_ENDIAN -DOPENSSL_SMALL_FOOTPRINT -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE # diff --git a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt index 7db1451..f836736 100644 --- a/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt +++ b/CryptoPkg/Library/OpensslLib/Patch-HOWTO.txt @@ -17,36 +17,36 @@ cryptography. This patch will enable openssl building under UEFI environment. ================================================================================ OpenSSL-Version ================================================================================ - Current supported OpenSSL version for UEFI Crypto Library is 1.0.2g. - http://www.openssl.org/source/openssl-1.0.2g.tar.gz + Current supported OpenSSL version for UEFI Crypto Library is 1.0.2h. + http://www.openssl.org/source/openssl-1.0.2h.tar.gz ================================================================================ HOW to Install Openssl for UEFI Building ================================================================================ -1. Download OpenSSL 1.0.2g from official website: - http://www.openssl.org/source/openssl-1.0.2g.tar.gz +1. Download OpenSSL 1.0.2h from official website: + http://www.openssl.org/source/openssl-1.0.2h.tar.gz - NOTE: Some web browsers may rename the downloaded TAR file to openssl-1.0.2g.tar.tar. - When you do the download, rename the "openssl-1.0.2g.tar.tar" to - "openssl-1.0.2g.tar.gz" or rename the local downloaded file with ".tar.tar" + NOTE: Some web browsers may rename the downloaded TAR file to openssl-1.0.2h.tar.tar. + When you do the download, rename the "openssl-1.0.2h.tar.tar" to + "openssl-1.0.2h.tar.gz" or rename the local downloaded file with ".tar.tar" extension to ".tar.gz". -2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-1.0.2g +2. Extract TAR into CryptoPkg/Library/OpenSslLib/openssl-1.0.2h NOTE: If you use WinZip to unpack the openssl source in Windows, please uncheck the WinZip smart CR/LF conversion option (WINZIP: Options --> Configuration --> Miscellaneous --> "TAR file smart CR/LF conversion"). -3. Apply this patch: EDKII_openssl-1.0.2g.patch, and make installation +3. Apply this patch: EDKII_openssl-1.0.2h.patch, and make installation For Windows Environment: ------------------------ 1) Make sure the patch utility has been installed in your machine. Install Cygwin or get the patch utility binary from http://gnuwin32.sourceforge.net/packages/patch.htm - 2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-1.0.2g - 3) patch -p1 -i ..\EDKII_openssl-1.0.2g.patch + 2) cd $(WORKSPACE)\CryptoPkg\Library\OpensslLib\openssl-1.0.2h + 3) patch -p1 -i ..\EDKII_openssl-1.0.2h.patch 4) cd .. 5) Install.cmd @@ -54,8 +54,8 @@ cryptography. This patch will enable openssl building under UEFI environment. ----------------------- 1) Make sure the patch utility has been installed in your machine. Patch utility is available from http://directory.fsf.org/project/patch/ - 2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-1.0.2g - 3) patch -p1 -i ../EDKII_openssl-1.0.2g.patch + 2) cd $(WORKSPACE)/CryptoPkg/Library/OpensslLib/openssl-1.0.2h + 3) patch -p1 -i ../EDKII_openssl-1.0.2h.patch 4) cd .. 5) ./Install.sh -- 2.9.2 ++++++ ovmf-bsc990773-remove-stale-boot-options.patch ++++++ >From 2eb358986052bd0104f6d16fbeb0a450658256fc Mon Sep 17 00:00:00 2001 From: Laszlo Ersek <lersek(a)redhat.com> Date: Fri, 8 Jul 2016 02:49:45 +0200 Subject: [PATCH] OvmfPkg/PlatformBootManagerLib: remove stale FvFile boot options Removes any boot options that point to binaries built into the firmware and have become stale due to any of the following: - DXEFV's base address or size changed (historical), - DXEFV's FvNameGuid changed, - the FILE_GUID of the pointed-to binary changed, - the referenced binary is no longer built into the firmware. For example, multiple such "EFI Internal Shell" boot options can coexist. They technically differ from each other, but may not describe any built-in shell binary exactly. Such options can accumulate in a varstore over time, and while they remain generally bootable (thanks to the efforts of BmGetFileBufferByFvFilePath()), they look bad. Filter out any stale options. This functionality is not added to QemuBootOrderLib, because it is independent from QEMU and fw_cfg. Cc: Ard Biesheuvel <ard.biesheuvel(a)linaro.org> Cc: Gary Lin <glin(a)suse.com> Cc: Jordan Justen <jordan.l.justen(a)intel.com> Cc: Ruiyu Ni <ruiyu.ni(a)intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek(a)redhat.com> Reviewed-by: Jordan Justen <jordan.l.justen(a)intel.com> --- .../Library/PlatformBootManagerLib/BdsPlatform.c | 130 +++++++++++++++++++++ .../PlatformBootManagerLib.inf | 1 + 2 files changed, 131 insertions(+) Index: ovmf-2015+git1462940744.321151f/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c =================================================================== --- ovmf-2015+git1462940744.321151f.orig/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ ovmf-2015+git1462940744.321151f/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -15,6 +15,7 @@ #include "BdsPlatform.h" #include <Guid/XenInfo.h> #include <Guid/RootBridgesConnectedEventGroup.h> +#include <Protocol/FirmwareVolume2.h> // @@ -149,6 +150,134 @@ PlatformRegisterFvBootOption ( EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount); } +/** + Remove all MemoryMapped(...)/FvFile(...) and Fv(...)/FvFile(...) boot options + whose device paths do not resolve exactly to an FvFile in the system. + + This removes any boot options that point to binaries built into the firmware + and have become stale due to any of the following: + - DXEFV's base address or size changed (historical), + - DXEFV's FvNameGuid changed, + - the FILE_GUID of the pointed-to binary changed, + - the referenced binary is no longer built into the firmware. + + EfiBootManagerFindLoadOption() used in PlatformRegisterFvBootOption() only + avoids exact duplicates. +**/ +VOID +RemoveStaleFvFileOptions ( + VOID + ) +{ + EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions; + UINTN BootOptionCount; + UINTN Index; + + BootOptions = EfiBootManagerGetLoadOptions (&BootOptionCount, + LoadOptionTypeBoot); + + for (Index = 0; Index < BootOptionCount; ++Index) { + EFI_DEVICE_PATH_PROTOCOL *Node1, *Node2, *SearchNode; + EFI_STATUS Status; + EFI_HANDLE FvHandle; + + // + // If the device path starts with neither MemoryMapped(...) nor Fv(...), + // then keep the boot option. + // + Node1 = BootOptions[Index].FilePath; + if (!(DevicePathType (Node1) == HARDWARE_DEVICE_PATH && + DevicePathSubType (Node1) == HW_MEMMAP_DP) && + !(DevicePathType (Node1) == MEDIA_DEVICE_PATH && + DevicePathSubType (Node1) == MEDIA_PIWG_FW_VOL_DP)) { + continue; + } + + // + // If the second device path node is not FvFile(...), then keep the boot + // option. + // + Node2 = NextDevicePathNode (Node1); + if (DevicePathType (Node2) != MEDIA_DEVICE_PATH || + DevicePathSubType (Node2) != MEDIA_PIWG_FW_FILE_DP) { + continue; + } + + // + // Locate the Firmware Volume2 protocol instance that is denoted by the + // boot option. If this lookup fails (i.e., the boot option references a + // firmware volume that doesn't exist), then we'll proceed to delete the + // boot option. + // + SearchNode = Node1; + Status = gBS->LocateDevicePath (&gEfiFirmwareVolume2ProtocolGuid, + &SearchNode, &FvHandle); + + if (!EFI_ERROR (Status)) { + // + // The firmware volume was found; now let's see if it contains the FvFile + // identified by GUID. + // + EFI_FIRMWARE_VOLUME2_PROTOCOL *FvProtocol; + MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *FvFileNode; + UINTN BufferSize; + EFI_FV_FILETYPE FoundType; + EFI_FV_FILE_ATTRIBUTES FileAttributes; + UINT32 AuthenticationStatus; + + Status = gBS->HandleProtocol (FvHandle, &gEfiFirmwareVolume2ProtocolGuid, + (VOID **)&FvProtocol); + ASSERT_EFI_ERROR (Status); + + FvFileNode = (MEDIA_FW_VOL_FILEPATH_DEVICE_PATH *)Node2; + // + // Buffer==NULL means we request metadata only: BufferSize, FoundType, + // FileAttributes. + // + Status = FvProtocol->ReadFile ( + FvProtocol, + &FvFileNode->FvFileName, // NameGuid + NULL, // Buffer + &BufferSize, + &FoundType, + &FileAttributes, + &AuthenticationStatus + ); + if (!EFI_ERROR (Status)) { + // + // The FvFile was found. Keep the boot option. + // + continue; + } + } + + // + // Delete the boot option. + // + Status = EfiBootManagerDeleteLoadOptionVariable ( + BootOptions[Index].OptionNumber, LoadOptionTypeBoot); + DEBUG_CODE ( + CHAR16 *DevicePathString; + + DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath, + FALSE, FALSE); + DEBUG (( + EFI_ERROR (Status) ? EFI_D_WARN : EFI_D_VERBOSE, + "%a: removing stale Boot#%04x %s: %r\n", + __FUNCTION__, + (UINT32)BootOptions[Index].OptionNumber, + DevicePathString == NULL ? L"<unavailable>" : DevicePathString, + Status + )); + if (DevicePathString != NULL) { + FreePool (DevicePathString); + } + ); + } + + EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount); +} + VOID PlatformRegisterOptionsAndKeys ( VOID @@ -1342,6 +1471,7 @@ Routine Description: PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE ); + RemoveStaleFvFileOptions (); SetBootOrderFromQemu (NULL); } Index: ovmf-2015+git1462940744.321151f/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf =================================================================== --- ovmf-2015+git1462940744.321151f.orig/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf +++ ovmf-2015+git1462940744.321151f/OvmfPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf @@ -77,6 +77,7 @@ gEfiDxeSmmReadyToLockProtocolGuid # PROTOCOL SOMETIMES_PRODUCED gEfiOEMBadgingProtocolGuid # PROTOCOL SOMETIMES_PRODUCED gEfiLoadedImageProtocolGuid # PROTOCOL SOMETIMES_PRODUCED + gEfiFirmwareVolume2ProtocolGuid # PROTOCOL SOMETIMES_CONSUMED [Guids] gEfiXenInfoGuid

1 0