June 2017 - openSUSE Commits - openSUSE Mailing Lists

commit bundle-lang-common for openSUSE:Factory
by root＠hilbert.suse.de 30 Jun '17

30 Jun '17

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at 2017-06-30 12:09:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old) and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "bundle-lang-common" Fri Jun 30 12:09:18 2017 rev:224 rq: version:13.2 Changes: -------- bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change bundle-lang-other.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:23.850906514 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:23.854905951 +0200 @@ -20,16 +20,6 @@ Version: 13.2 Release: 0 Summary: Translations for a Group of Programs -#!BuildIgnore: xorg-x11-driver-input -#!BuildIgnore: NetworkManager-openvpn -#!BuildIgnore: NetworkManager-pptp -#!BuildIgnore: NetworkManager-vpnc -#!BuildIgnore: NetworkManager-openconnect -#!BuildIgnore: virtualbox-host-kmp-default -#!BuildIgnore: typelib-1_0-WebKit-1_0 -#!BuildIgnore: typelib-1_0-Vte-0_0 -#!BuildIgnore: gimp-unstable -#!BuildIgnore: gnuchess License: MIT Group: System/Localization Source0: bundle.sh @@ -75,6 +65,7 @@ BuildRequires: libpwquality-lang BuildRequires: libsecret-lang BuildRequires: libsoup-lang +BuildRequires: net-tools-lang BuildRequires: psmisc-lang BuildRequires: pulseaudio-lang BuildRequires: sed-lang @@ -89,6 +80,16 @@ BuildRequires: xkeyboard-config-lang # @BREQUIRES@ BuildRequires: xz-lang +#!BuildIgnore: NetworkManager-openconnect +#!BuildIgnore: NetworkManager-openvpn +#!BuildIgnore: NetworkManager-pptp +#!BuildIgnore: NetworkManager-vpnc +#!BuildIgnore: gimp-unstable +#!BuildIgnore: gnuchess +#!BuildIgnore: typelib-1_0-Vte-0_0 +#!BuildIgnore: typelib-1_0-WebKit-1_0 +#!BuildIgnore: virtualbox-host-kmp-default +#!BuildIgnore: xorg-x11-driver-input BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -208,6 +209,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:en) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:en) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:en) @@ -364,6 +368,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:de) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:de) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:de) @@ -520,6 +527,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:es) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:es) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:es) @@ -676,6 +686,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:it) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:it) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:it) @@ -832,6 +845,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:fr) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:fr) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:fr) @@ -988,6 +1004,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:ja) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:ja) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:ja) @@ -1144,6 +1163,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:zh) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:zh) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:zh) @@ -1300,6 +1322,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:nl) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:nl) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:nl) @@ -1456,6 +1481,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:cs) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:cs) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:cs) @@ -1648,6 +1676,10 @@ Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:pt) Provides: locale(libsoup:pt_BR) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:pt) +Provides: locale(net-tools:pt_BR) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:pt) @@ -1817,6 +1849,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:pl) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:pl) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:pl) @@ -1973,6 +2008,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:ca) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:ca) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:ca) @@ -2129,6 +2167,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:ar) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:ar) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:ar) @@ -2285,6 +2326,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:hu) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:hu) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:hu) @@ -2441,6 +2485,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:ko) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:ko) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:ko) @@ -2597,6 +2644,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:da) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:da) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:da) @@ -2753,6 +2803,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:sv) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:sv) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:sv) @@ -2909,6 +2962,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:ru) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:ru) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:ru) @@ -3065,6 +3121,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:fi) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:fi) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:fi) @@ -3221,6 +3280,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:nb) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:nb) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:nb) @@ -3268,7 +3330,6 @@ %package el Summary: Translations for a Group of Programs -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: group Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) Obsoletes: NetworkManager-lang < %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) @@ -3378,6 +3439,9 @@ Provides: libsoup-lang = %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Obsoletes: libsoup-lang < %(rpm -q --queryformat '%{VERSION}' libsoup-lang) Provides: locale(libsoup:el) +Provides: net-tools-lang = %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Obsoletes: net-tools-lang < %(rpm -q --queryformat '%{VERSION}' net-tools-lang) +Provides: locale(net-tools:el) Provides: psmisc-lang = %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Obsoletes: psmisc-lang < %(rpm -q --queryformat '%{VERSION}' psmisc-lang) Provides: locale(psmisc:el) @@ -3429,7 +3493,7 @@ %install mkdir -p %{buildroot} -cp %{SOURCE1} . +cp %SOURCE1 . packages="" # @PACKAGES@ packages="$packages xz-lang" @@ -3445,6 +3509,7 @@ packages="$packages sed-lang" packages="$packages pulseaudio-lang" packages="$packages psmisc-lang" +packages="$packages net-tools-lang" packages="$packages libsoup-lang" packages="$packages libsecret-lang" packages="$packages libpwquality-lang" @@ -3481,7 +3546,7 @@ packages="$packages NetworkManager-pptp-lang" packages="$packages NetworkManager-openvpn-lang" packages="$packages NetworkManager-lang" -bash %{SOURCE0} $packages +bash %SOURCE0 $packages if test common = kde; then # pretty evil hack to keep the symlinks working @@ -3567,7 +3632,7 @@ changed=1 while test "$changed" = 1; do changed=0 - list=`grep %dir $file | sed -e "s,%dir,,; s,%{lang}[^ ]*,," | while read dir; do dirname "$dir"; done | sort -u` + list=`grep %dir $file | sed -e "s,%dir,,; s,%lang[^ ]*,," | while read dir; do dirname "$dir"; done | sort -u` for dir in $list; do grep -q "$dir"\$ $file && continue rpm -qf $dir && continue @@ -3578,67 +3643,46 @@ done %files en -f taken.en -%defattr(-,root,root) %files de -f taken.de -%defattr(-,root,root) %files es -f taken.es -%defattr(-,root,root) %files it -f taken.it -%defattr(-,root,root) %files fr -f taken.fr -%defattr(-,root,root) %files ja -f taken.ja -%defattr(-,root,root) %files zh -f taken.zh -%defattr(-,root,root) %files nl -f taken.nl -%defattr(-,root,root) %files cs -f taken.cs -%defattr(-,root,root) %files pt -f taken.pt -%defattr(-,root,root) %files pl -f taken.pl -%defattr(-,root,root) %files ca -f taken.ca -%defattr(-,root,root) %files ar -f taken.ar -%defattr(-,root,root) %files hu -f taken.hu -%defattr(-,root,root) %files ko -f taken.ko -%defattr(-,root,root) %files da -f taken.da -%defattr(-,root,root) %files sv -f taken.sv -%defattr(-,root,root) %files ru -f taken.ru -%defattr(-,root,root) %files fi -f taken.fi -%defattr(-,root,root) %files nb -f taken.nb -%defattr(-,root,root) %files el -f taken.el -%defattr(-,root,root) #LANGUAGE_FILES ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:23.894900327 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:23.902899202 +0200 @@ -20,16 +20,6 @@ Version: 13.2 Release: 0 Summary: Translations for many GNOME programs -#!BuildIgnore: xorg-x11-driver-input -#!BuildIgnore: NetworkManager-openvpn -#!BuildIgnore: NetworkManager-pptp -#!BuildIgnore: NetworkManager-vpnc -#!BuildIgnore: NetworkManager-openconnect -#!BuildIgnore: virtualbox-host-kmp-default -#!BuildIgnore: typelib-1_0-WebKit-1_0 -#!BuildIgnore: typelib-1_0-Vte-0_0 -#!BuildIgnore: gimp-unstable -#!BuildIgnore: gnuchess License: MIT Group: System/Localization Source0: bundle.sh @@ -41,6 +31,7 @@ BuildRequires: NetworkManager-applet-lang BuildRequires: NetworkManager-openconnect-lang BuildRequires: baobab-lang +BuildRequires: bijiben-lang BuildRequires: caribou-lang BuildRequires: cheese-lang BuildRequires: clutter-gtk-lang @@ -99,7 +90,6 @@ BuildRequires: gtk-vnc-lang BuildRequires: gtksourceview-lang BuildRequires: gtkspell3-lang -BuildRequires: gucharmap-lang BuildRequires: gvfs-lang BuildRequires: iagno-lang BuildRequires: ibus-lang @@ -144,6 +134,16 @@ BuildRequires: yelp-lang # @BREQUIRES@ BuildRequires: zenity-lang +#!BuildIgnore: NetworkManager-openconnect +#!BuildIgnore: NetworkManager-openvpn +#!BuildIgnore: NetworkManager-pptp +#!BuildIgnore: NetworkManager-vpnc +#!BuildIgnore: gimp-unstable +#!BuildIgnore: gnuchess +#!BuildIgnore: typelib-1_0-Vte-0_0 +#!BuildIgnore: typelib-1_0-WebKit-1_0 +#!BuildIgnore: virtualbox-host-kmp-default +#!BuildIgnore: xorg-x11-driver-input BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -162,6 +162,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:en) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:en) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:en) @@ -333,9 +336,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:en) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:en) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:en) @@ -481,6 +481,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:de) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:de) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:de) @@ -652,9 +655,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:de) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:de) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:de) @@ -800,6 +800,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:es) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:es) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:es) @@ -971,9 +974,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:es) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:es) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:es) @@ -1119,6 +1119,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:it) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:it) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:it) @@ -1290,9 +1293,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:it) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:it) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:it) @@ -1438,6 +1438,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:fr) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:fr) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:fr) @@ -1609,9 +1612,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:fr) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:fr) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:fr) @@ -1757,6 +1757,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:ja) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:ja) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:ja) @@ -1928,9 +1931,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:ja) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:ja) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:ja) @@ -2076,6 +2076,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:zh) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:zh) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:zh) @@ -2247,9 +2250,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:zh) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:zh) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:zh) @@ -2395,6 +2395,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:nl) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:nl) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:nl) @@ -2566,9 +2569,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:nl) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:nl) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:nl) @@ -2714,6 +2714,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:cs) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:cs) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:cs) @@ -2885,9 +2888,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:cs) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:cs) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:cs) @@ -3036,6 +3036,10 @@ Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:pt) Provides: locale(baobab:pt_BR) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:pt) +Provides: locale(bijiben:pt_BR) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:pt) @@ -3264,10 +3268,6 @@ Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:pt) Provides: locale(gtkspell3:pt_BR) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:pt) -Provides: locale(gucharmap:pt_BR) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:pt) @@ -3456,6 +3456,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:pl) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:pl) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:pl) @@ -3627,9 +3630,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:pl) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:pl) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:pl) @@ -3775,6 +3775,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:ca) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:ca) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:ca) @@ -3946,9 +3949,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:ca) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:ca) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:ca) @@ -4094,6 +4094,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:ar) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:ar) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:ar) @@ -4265,9 +4268,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:ar) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:ar) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:ar) @@ -4413,6 +4413,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:hu) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:hu) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:hu) @@ -4584,9 +4587,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:hu) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:hu) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:hu) @@ -4732,6 +4732,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:ko) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:ko) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:ko) @@ -4903,9 +4906,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:ko) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:ko) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:ko) @@ -5051,6 +5051,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:da) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:da) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:da) @@ -5222,9 +5225,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:da) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:da) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:da) @@ -5370,6 +5370,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:sv) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:sv) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:sv) @@ -5541,9 +5544,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:sv) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:sv) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:sv) @@ -5689,6 +5689,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:ru) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:ru) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:ru) @@ -5860,9 +5863,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:ru) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:ru) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:ru) @@ -6008,6 +6008,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:fi) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:fi) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:fi) @@ -6179,9 +6182,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:fi) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:fi) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:fi) @@ -6327,6 +6327,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:nb) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:nb) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:nb) @@ -6498,9 +6501,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:nb) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:nb) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:nb) @@ -6636,7 +6636,6 @@ %package el Summary: Translations for many GNOME programs -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: group Provides: NetworkManager-applet-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-applet-lang) Obsoletes: NetworkManager-applet-lang < %(rpm -q --queryformat '%{VERSION}' NetworkManager-applet-lang) @@ -6647,6 +6646,9 @@ Provides: baobab-lang = %(rpm -q --queryformat '%{VERSION}' baobab-lang) Obsoletes: baobab-lang < %(rpm -q --queryformat '%{VERSION}' baobab-lang) Provides: locale(baobab:el) +Provides: bijiben-lang = %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Obsoletes: bijiben-lang < %(rpm -q --queryformat '%{VERSION}' bijiben-lang) +Provides: locale(bijiben:el) Provides: caribou-lang = %(rpm -q --queryformat '%{VERSION}' caribou-lang) Obsoletes: caribou-lang < %(rpm -q --queryformat '%{VERSION}' caribou-lang) Provides: locale(caribou:el) @@ -6818,9 +6820,6 @@ Provides: gtkspell3-lang = %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Obsoletes: gtkspell3-lang < %(rpm -q --queryformat '%{VERSION}' gtkspell3-lang) Provides: locale(gtkspell3:el) -Provides: gucharmap-lang = %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Obsoletes: gucharmap-lang < %(rpm -q --queryformat '%{VERSION}' gucharmap-lang) -Provides: locale(gucharmap:el) Provides: gvfs-lang = %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Obsoletes: gvfs-lang < %(rpm -q --queryformat '%{VERSION}' gvfs-lang) Provides: locale(gvfs:el) @@ -6960,7 +6959,7 @@ %install mkdir -p %{buildroot} -cp %{SOURCE1} . +cp %SOURCE1 . packages="" # @PACKAGES@ packages="$packages zenity-lang" @@ -7006,7 +7005,6 @@ packages="$packages ibus-lang" packages="$packages iagno-lang" packages="$packages gvfs-lang" -packages="$packages gucharmap-lang" packages="$packages gtkspell3-lang" packages="$packages gtksourceview-lang" packages="$packages gtk-vnc-lang" @@ -7064,10 +7062,11 @@ packages="$packages clutter-gtk-lang" packages="$packages cheese-lang" packages="$packages caribou-lang" +packages="$packages bijiben-lang" packages="$packages baobab-lang" packages="$packages NetworkManager-openconnect-lang" packages="$packages NetworkManager-applet-lang" -bash %{SOURCE0} $packages +bash %SOURCE0 $packages if test gnome = kde; then # pretty evil hack to keep the symlinks working @@ -7153,7 +7152,7 @@ changed=1 while test "$changed" = 1; do changed=0 - list=`grep %dir $file | sed -e "s,%dir,,; s,%{lang}[^ ]*,," | while read dir; do dirname "$dir"; done | sort -u` + list=`grep %dir $file | sed -e "s,%dir,,; s,%lang[^ ]*,," | while read dir; do dirname "$dir"; done | sort -u` for dir in $list; do grep -q "$dir"\$ $file && continue rpm -qf $dir && continue @@ -7164,67 +7163,46 @@ done %files en -f taken.en -%defattr(-,root,root) %files de -f taken.de -%defattr(-,root,root) %files es -f taken.es -%defattr(-,root,root) %files it -f taken.it -%defattr(-,root,root) %files fr -f taken.fr -%defattr(-,root,root) %files ja -f taken.ja -%defattr(-,root,root) %files zh -f taken.zh -%defattr(-,root,root) %files nl -f taken.nl -%defattr(-,root,root) %files cs -f taken.cs -%defattr(-,root,root) %files pt -f taken.pt -%defattr(-,root,root) %files pl -f taken.pl -%defattr(-,root,root) %files ca -f taken.ca -%defattr(-,root,root) %files ar -f taken.ar -%defattr(-,root,root) %files hu -f taken.hu -%defattr(-,root,root) %files ko -f taken.ko -%defattr(-,root,root) %files da -f taken.da -%defattr(-,root,root) %files sv -f taken.sv -%defattr(-,root,root) %files ru -f taken.ru -%defattr(-,root,root) %files fi -f taken.fi -%defattr(-,root,root) %files nb -f taken.nb -%defattr(-,root,root) %files el -f taken.el -%defattr(-,root,root) #LANGUAGE_FILES ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:23.938894140 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:23.946893015 +0200 @@ -20,16 +20,6 @@ Version: 13.2 Release: 0 Summary: Translations for a group of KDE applications -#!BuildIgnore: xorg-x11-driver-input -#!BuildIgnore: NetworkManager-openvpn -#!BuildIgnore: NetworkManager-pptp -#!BuildIgnore: NetworkManager-vpnc -#!BuildIgnore: NetworkManager-openconnect -#!BuildIgnore: virtualbox-host-kmp-default -#!BuildIgnore: typelib-1_0-WebKit-1_0 -#!BuildIgnore: typelib-1_0-Vte-0_0 -#!BuildIgnore: gimp-unstable -#!BuildIgnore: gnuchess License: MIT Group: System/Localization Source0: bundle.sh @@ -197,6 +187,16 @@ BuildRequires: spectacle-lang # @BREQUIRES@ BuildRequires: systemsettings5-lang +#!BuildIgnore: NetworkManager-openconnect +#!BuildIgnore: NetworkManager-openvpn +#!BuildIgnore: NetworkManager-pptp +#!BuildIgnore: NetworkManager-vpnc +#!BuildIgnore: gimp-unstable +#!BuildIgnore: gnuchess +#!BuildIgnore: typelib-1_0-Vte-0_0 +#!BuildIgnore: typelib-1_0-WebKit-1_0 +#!BuildIgnore: virtualbox-host-kmp-default +#!BuildIgnore: xorg-x11-driver-input BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -10216,7 +10216,6 @@ %package el Summary: summary -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" Group: group Provides: akonadi-calendar-lang = %(rpm -q --queryformat '%{VERSION}' akonadi-calendar-lang) Obsoletes: akonadi-calendar-lang < %(rpm -q --queryformat '%{VERSION}' akonadi-calendar-lang) @@ -10713,7 +10712,7 @@ %install mkdir -p %{buildroot} -cp %{SOURCE1} . +cp %SOURCE1 . packages="" # @PACKAGES@ packages="$packages systemsettings5-lang" @@ -10873,7 +10872,7 @@ packages="$packages akonadi-contact-lang" packages="$packages akonadi-calendar-tools-lang" packages="$packages akonadi-calendar-lang" -bash %{SOURCE0} $packages +bash %SOURCE0 $packages if test kde = kde; then # pretty evil hack to keep the symlinks working @@ -10959,7 +10958,7 @@ changed=1 while test "$changed" = 1; do changed=0 - list=`grep %dir $file | sed -e "s,%dir,,; s,%{lang}[^ ]*,," | while read dir; do dirname "$dir"; done | sort -u` + list=`grep %dir $file | sed -e "s,%dir,,; s,%lang[^ ]*,," | while read dir; do dirname "$dir"; done | sort -u` for dir in $list; do grep -q "$dir"\$ $file && continue rpm -qf $dir && continue @@ -10970,67 +10969,46 @@ done %files en -f taken.en -%defattr(-,root,root) %files de -f taken.de -%defattr(-,root,root) %files es -f taken.es -%defattr(-,root,root) %files it -f taken.it -%defattr(-,root,root) %files fr -f taken.fr -%defattr(-,root,root) %files ja -f taken.ja -%defattr(-,root,root) %files zh -f taken.zh -%defattr(-,root,root) %files nl -f taken.nl -%defattr(-,root,root) %files cs -f taken.cs -%defattr(-,root,root) %files pt -f taken.pt -%defattr(-,root,root) %files pl -f taken.pl -%defattr(-,root,root) %files ca -f taken.ca -%defattr(-,root,root) %files ar -f taken.ar -%defattr(-,root,root) %files hu -f taken.hu -%defattr(-,root,root) %files ko -f taken.ko -%defattr(-,root,root) %files da -f taken.da -%defattr(-,root,root) %files sv -f taken.sv -%defattr(-,root,root) %files ru -f taken.ru -%defattr(-,root,root) %files fi -f taken.fi -%defattr(-,root,root) %files nb -f taken.nb -%defattr(-,root,root) %files el -f taken.el -%defattr(-,root,root) #LANGUAGE_FILES ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:23.982887953 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:23.982887953 +0200 @@ -22,8 +22,7 @@ Summary: Translations for languages not covered by one of the bundle-lang-*-* packages License: MIT Group: System/GUI/KDE -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +Source0: README.other Provides: locale(aa;af;am;ang;as;az;be;bg;bn;bo;br;bs;byn) Provides: locale(csb;cy;dv;dz;ee;eo;et;eu) Provides: locale(fa;fo;fy;ga;gd;gez;gl;gn;gu;gv;haw;he;hi;hr) @@ -33,7 +32,8 @@ Provides: locale(rw;sa;se;si;sid;sk;sl;so;sp;sq;sr) Provides: locale(ss;st;sw;syr;ta;te;tg;th;ti;tig;tk;tl;tr;tt;ug;uk;ur;urd;uz) Provides: locale(ve;ven;vi;wa;wal;wo;xh;yi;yo;zu) -Source0: README.other +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This package collects translations for languages not covered by one of @@ -44,10 +44,10 @@ %build %install -install -D -m 644 %{SOURCE0} $RPM_BUILD_ROOT%_docdir/%name/README +install -D -m 644 %{SOURCE0} %{buildroot}%{_docdir}/%{name}/README %files %defattr(-,root,root) -%_docdir/%name +%{_docdir}/%{name} %changelog ++++++ bundle-lang.spec.in ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:24.074875017 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:24.074875017 +0200 @@ -1,7 +1,7 @@ # -# spec file for package bundle-lang-@SPEC@ +# spec file for package bundle-lang.spec # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,32 +15,33 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: bundle-lang-@SPEC@ -# @BREQUIRES@ -BuildRequires: fdupes -#!BuildIgnore: xorg-x11-driver-input -#!BuildIgnore: NetworkManager-openvpn -#!BuildIgnore: NetworkManager-pptp -#!BuildIgnore: NetworkManager-vpnc -#!BuildIgnore: NetworkManager-openconnect -#!BuildIgnore: virtualbox-host-kmp-default -#!BuildIgnore: typelib-1_0-WebKit-1_0 -#!BuildIgnore: typelib-1_0-Vte-0_0 -#!BuildIgnore: gimp-unstable -#!BuildIgnore: gnuchess -License: license -Group: group Version: 13.2 -Release: 1 +Release: 0 Summary: summary -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +License: license +Group: group Source0: bundle.sh Source1: list_langs.sh Source2: packages.txt Source3: attributes Source4: update_spec.pl Source5: update-list.sh +# @BREQUIRES@ +BuildRequires: fdupes +#!BuildIgnore: NetworkManager-openconnect +#!BuildIgnore: NetworkManager-openvpn +#!BuildIgnore: NetworkManager-pptp +#!BuildIgnore: NetworkManager-vpnc +#!BuildIgnore: gimp-unstable +#!BuildIgnore: gnuchess +#!BuildIgnore: typelib-1_0-Vte-0_0 +#!BuildIgnore: typelib-1_0-WebKit-1_0 +#!BuildIgnore: virtualbox-host-kmp-default +#!BuildIgnore: xorg-x11-driver-input +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description summary @@ -52,7 +53,7 @@ %build %install -mkdir -p $RPM_BUILD_ROOT +mkdir -p %{buildroot} cp %SOURCE1 . packages="" # @PACKAGES@ @@ -60,15 +61,15 @@ if test @SPEC@ = kde; then # pretty evil hack to keep the symlinks working - langs=`cd $RPM_BUILD_ROOT/usr/share/doc-bundle/kde/HTML && ls -1d *` + langs=`cd %{buildroot}%{_datadir}/doc-bundle/kde/HTML && ls -1d *` for lang in $langs; do - ln -s /usr/share/doc/kde/HTML/$lang/common $RPM_BUILD_ROOT/usr/share/doc-bundle/kde/HTML/$lang/common - echo /usr/share/doc-bundle/kde/HTML/$lang/common >> filelist.$lang + ln -s %{_datadir}/doc/kde/HTML/$lang/common %{buildroot}%{_datadir}/doc-bundle/kde/HTML/$lang/common + echo %{_datadir}/doc-bundle/kde/HTML/$lang/common >> filelist.$lang # we don't need the ../common symlinks (bnc#394343) - files=`cd $RPM_BUILD_ROOT && ls -1 /usr/share/doc-bundle/kde/HTML/$lang/*/common 2>/dev/null || true` - for f in $files; do - if test -L $RPM_BUILD_ROOT/$f; then - rm $RPM_BUILD_ROOT/$f + files=`cd %{buildroot} && ls -1 %{_datadir}/doc-bundle/kde/HTML/$lang/*/common 2>/dev/null || true` + for f in $files; do + if test -L %{buildroot}/$f; then + rm %{buildroot}/$f for i in filelist*; do grep -v $f $i > $i.new || true mv $i.new $i @@ -95,7 +96,7 @@ done fi taken_languages="@TAKEN_LANGUAGES@" -for suffix in CN TW; do +for suffix in CN TW; do cat filelist.zh_$suffix >> filelist.zh rm -f filelist.zh_$suffix done @@ -107,9 +108,9 @@ rm filelist.$lang done # special hack for a special problem (I hope) -if test -f $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png; then - rm $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png - cp $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png +if test -f %{buildroot}%{_datadir}/gnome/help-bundle/dia/eu/graphics/line_props.png; then + rm %{buildroot}%{_datadir}/gnome/help-bundle/dia/pl/graphics/line_props.png + cp %{buildroot}%{_datadir}/gnome/help-bundle/dia/eu/graphics/line_props.png %{buildroot}%{_datadir}/gnome/help-bundle/dia/pl/graphics/line_props.png fi # make sure there are no file symlinks in taken languages @@ -134,7 +135,7 @@ rm $file done -for i in $RPM_BUILD_ROOT/*; do +for i in %{buildroot}/*; do %fdupes $i done ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:24.118868830 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:24.118868830 +0200 @@ -34,7 +34,7 @@ baloo5-widgets-lang kde baobab-lang gnome bash-lang common -bijiben-lang gnome-extras +bijiben-lang gnome bluedevil5-lang kde blueproximity-lang gnome-extras brasero-lang gnome-extras @@ -58,6 +58,7 @@ d-feet-lang gnome-extras dasher-lang gnome-extras dconf-editor-lang gnome-extras +deja-dup-lang gnome-extras devhelp-lang gnome-extras dia-lang gnome-extras dialog-lang common @@ -199,6 +200,7 @@ gnote-lang gnome-extras gnucash-lang gnome-extras gnumeric-lang gnome-extras +gobby-lang gnome-extras goffice-0_8-lang gnome-extras goffice-lang gnome-extras gom-lang gnome @@ -244,7 +246,7 @@ gtkspell-lang gnome-extras gtkspell3-lang gnome gtranslator-lang gnome-extras -gucharmap-lang gnome +gucharmap-lang gnome-extras gupnp-tools-lang gnome-extras gvfs-lang gnome gwenview5-lang kde @@ -431,6 +433,7 @@ nautilus-sendto-lang gnome nautilus-share-lang gnome-extras nemiver-lang gnome-extras +net-tools-lang common net6-lang gnome-extras notification-daemon-lang gnome nuntius-lang gnome-extras ++++++ update-list.sh ++++++ --- /var/tmp/diff_new_pack.N6yZa3/_old 2017-06-30 12:09:24.134866580 +0200 +++ /var/tmp/diff_new_pack.N6yZa3/_new 2017-06-30 12:09:24.134866580 +0200 @@ -143,11 +143,10 @@ cp -lf bundle-lang-common.changes bundle-lang-$changes.changes done -#osc service localrun format_spec_file +osc service localrun format_spec_file echo "CHECKING" for spec in bundle-lang-gnome bundle-lang-kde bundle-lang-common; do - spec-cleaner -i ${spec}.spec osc buildinfo openSUSE:Factory $spec standard i586 $spec.spec | grep '<error>' done

1 0

commit tpm2.0-tools for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package tpm2.0-tools for openSUSE:Factory checked in at 2017-06-29 15:22:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tpm2.0-tools (Old) and /work/SRC/openSUSE:Factory/.tpm2.0-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "tpm2.0-tools" Thu Jun 29 15:22:20 2017 rev:6 rq:507025 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/tpm2.0-tools/tpm2.0-tools.changes 2017-06-21 13:57:32.304435316 +0200 +++ /work/SRC/openSUSE:Factory/.tpm2.0-tools.new/tpm2.0-tools.changes 2017-06-29 15:22:29.994421696 +0200 @@ -1,0 +2,7 @@ +Thu Jun 29 09:45:45 UTC 2017 - matthias.gerstner(a)suse.com + +- 0002-kdfa-use-openssl-for-hmac-not-tpm.patch: fixed unexpected leak of + cleartext password into the tpm when generating an HMAC in the context of + tpm_kdfa() (key derivation function) (bnc#1046402, CVE-2017-7524) + +------------------------------------------------------------------- New: ---- 0002-kdfa-use-openssl-for-hmac-not-tpm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tpm2.0-tools.spec ++++++ --- /var/tmp/diff_new_pack.XfqDNU/_old 2017-06-29 15:22:32.134119246 +0200 +++ /var/tmp/diff_new_pack.XfqDNU/_new 2017-06-29 15:22:32.142118116 +0200 @@ -29,6 +29,7 @@ # this fixes an error with an unexpectedly large number of PCRS (bnc#1044419) # there's no release containing this fix yet Patch2: 0001-tpm2_listpcrs-use-TPM2_GetCapability-to-determine-PC.patch +Patch3: 0002-kdfa-use-openssl-for-hmac-not-tpm.patch BuildRequires: autoconf-archive BuildRequires: automake BuildRequires: gcc-c++ @@ -52,6 +53,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build bash ./bootstrap ++++++ 0002-kdfa-use-openssl-for-hmac-not-tpm.patch ++++++ >From c5d72beaab1cbbbe68271f4bc4b6670d69985157 Mon Sep 17 00:00:00 2001 From: William Roberts <william.c.roberts(a)intel.com> Date: Wed, 21 Jun 2017 09:32:32 -0700 Subject: [PATCH] kdfa: use openssl for hmac not tpm While not reachable in the current code base tools, a potential security bug lurked in tpm_kdfa(). If using that routine for an hmac authorization, the hmac was calculated using the tpm. A user of an object wishing to authenticate via hmac, would expect that the password is never sent to the tpm. However, since the hmac calculation relies on password, and is performed by the tpm, the password ends up being sent in plain text to the tpm. The fix is to use openssl to generate the hmac on the host. Fixes: CVE-2017-7524 Signed-off-by: William Roberts <william.c.roberts(a)intel.com> --- Makefile.am | 4 +-- configure.ac | 3 ++- lib/tpm_kdfa.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++-------- lib/tpm_kdfa.h | 2 +- lib/tpm_session.c | 2 +- 5 files changed, 72 insertions(+), 15 deletions(-) Index: tpm2.0-tools-2.0.0/Makefile.am =================================================================== --- tpm2.0-tools-2.0.0.orig/Makefile.am +++ tpm2.0-tools-2.0.0/Makefile.am @@ -35,10 +35,10 @@ ACLOCAL_AMFLAGS = -I m4 INCLUDE_DIRS = -I$(srcdir)/src -I$(srcdir)/lib LIB_COMMON := lib/libcommon.a -AM_CFLAGS := $(INCLUDE_DIRS) $(TPM20_TSS_CFLAGS) $(EXTRA_CFLAGS) +AM_CFLAGS := $(INCLUDE_DIRS) $(TPM20_TSS_CFLAGS) $(EXTRA_CFLAGS) $(CRYPTO_FLAGS) AM_LDFLAGS := $(EXTRA_LDFLAGS) -LDADD = $(LIB_COMMON) $(TPM20_TSS_LIBS) $(TCTI_SOCK_LIBS) $(TCTI_DEV_LIBS) +LDADD = $(LIB_COMMON) $(TPM20_TSS_LIBS) $(TCTI_SOCK_LIBS) $(TCTI_DEV_LIBS) $(CRYPTO_LIBS) sbin_PROGRAMS = \ tools/tpm2_create \ Index: tpm2.0-tools-2.0.0/configure.ac =================================================================== --- tpm2.0-tools-2.0.0.orig/configure.ac +++ tpm2.0-tools-2.0.0/configure.ac @@ -49,7 +49,8 @@ AS_IF( [AC_MSG_ERROR( [no TCTIs: at least one TCTI library must be enabled], [1])]) -PKG_CHECK_MODULES([CURL],[libcurl libcrypto]) +PKG_CHECK_MODULES([CRYPTO],[libcrypto]) +PKG_CHECK_MODULES([CURL],[libcurl]) AC_ARG_ENABLE([unit], [AS_HELP_STRING([--enable-unit], [build cmocka unit tests (default is no)])], Index: tpm2.0-tools-2.0.0/lib/tpm_kdfa.c =================================================================== --- tpm2.0-tools-2.0.0.orig/lib/tpm_kdfa.c +++ tpm2.0-tools-2.0.0/lib/tpm_kdfa.c @@ -27,20 +27,40 @@ #include <sapi/tpm20.h> + #include <openssl/err.h> +#include <openssl/hmac.h> + #include "string-bytes.h" #include "tpm_hmac.h" +#include "log.h" + +static const EVP_MD *tpm_algorithm_to_openssl_digest(TPMI_ALG_HASH algorithm) { -TPM_RC tpm_kdfa(TSS2_SYS_CONTEXT *sapi_context, TPMI_ALG_HASH hashAlg, + switch(algorithm) { + case TPM_ALG_SHA1: + return EVP_sha1(); + case ALG_SHA256_VALUE: + return EVP_sha256(); + case TPM_ALG_SHA384: + return EVP_sha384(); + case TPM_ALG_SHA512: + return EVP_sha512(); + default: + return NULL; + } + /* no return, not possible */ +} + +TPM_RC tpm_kdfa(TPMI_ALG_HASH hashAlg, TPM2B *key, char *label, TPM2B *contextU, TPM2B *contextV, UINT16 bits, TPM2B_MAX_BUFFER *resultKey ) { - TPM2B_DIGEST tmpResult; TPM2B_DIGEST tpm2bLabel, tpm2bBits, tpm2b_i_2; UINT8 *tpm2bBitsPtr = &tpm2bBits.t.buffer[0]; UINT8 *tpm2b_i_2Ptr = &tpm2b_i_2.t.buffer[0]; TPM2B_DIGEST *bufferList[8]; UINT32 bitsSwizzled, i_Swizzled; - TPM_RC rval; + TPM_RC rval = TPM_RC_SUCCESS; int i, j; UINT16 bytes = bits / 8; @@ -64,8 +84,24 @@ TPM_RC tpm_kdfa(TSS2_SYS_CONTEXT *sapi_c i = 1; + const EVP_MD *md = tpm_algorithm_to_openssl_digest(hashAlg); + if (!md) { + LOG_ERR("Algorithm not supported for hmac: %x", hashAlg); + return TPM_RC_HASH; + } + + HMAC_CTX ctx; + HMAC_CTX_init(&ctx); + int rc = HMAC_Init_ex(&ctx, key->buffer, key->size, md, NULL); + if (!rc) { + LOG_ERR("HMAC Init failed: %s", ERR_error_string(rc, NULL)); + return TPM_RC_MEMORY; + } + + // TODO Why is this a loop? It appears to only execute once. while( resultKey->t.size < bytes ) { + TPM2B_DIGEST tmpResult; // Inner loop i_Swizzled = string_bytes_endian_convert_32( i ); @@ -77,21 +113,41 @@ TPM_RC tpm_kdfa(TSS2_SYS_CONTEXT *sapi_c bufferList[j++] = (TPM2B_DIGEST *)contextU; bufferList[j++] = (TPM2B_DIGEST *)contextV; bufferList[j++] = (TPM2B_DIGEST *)&(tpm2bBits.b); - bufferList[j++] = (TPM2B_DIGEST *)0; - rval = tpm_hmac(sapi_context, hashAlg, key, (TPM2B **)&( bufferList[0] ), &tmpResult ); - if( rval != TPM_RC_SUCCESS ) - { - return( rval ); + bufferList[j] = (TPM2B_DIGEST *)0; + + int c; + for(c=0; c < j; c++) { + TPM2B_DIGEST *digest = bufferList[c]; + int rc = HMAC_Update(&ctx, digest->b.buffer, digest->b.size); + if (!rc) { + LOG_ERR("HMAC Update failed: %s", ERR_error_string(rc, NULL)); + rval = TPM_RC_MEMORY; + goto err; + } } + unsigned size = sizeof(tmpResult.t.buffer); + int rc = HMAC_Final(&ctx, tmpResult.t.buffer, &size); + if (!rc) { + LOG_ERR("HMAC Final failed: %s", ERR_error_string(rc, NULL)); + rval = TPM_RC_MEMORY; + goto err; + } + + tmpResult.t.size = size; + bool res = string_bytes_concat_buffer(resultKey, &(tmpResult.b)); if (!res) { - return TSS2_SYS_RC_BAD_VALUE; + rval = TSS2_SYS_RC_BAD_VALUE; + goto err; } } // Truncate the result to the desired size. resultKey->t.size = bytes; - return TPM_RC_SUCCESS; +err: + HMAC_CTX_cleanup(&ctx); + + return rval; } Index: tpm2.0-tools-2.0.0/lib/tpm_kdfa.h =================================================================== --- tpm2.0-tools-2.0.0.orig/lib/tpm_kdfa.h +++ tpm2.0-tools-2.0.0/lib/tpm_kdfa.h @@ -42,7 +42,7 @@ * @param resultKey * @return */ -TPM_RC tpm_kdfa(TSS2_SYS_CONTEXT *sapi_context, TPMI_ALG_HASH hashAlg, +TPM_RC tpm_kdfa(TPMI_ALG_HASH hashAlg, TPM2B *key, char *label, TPM2B *contextU, TPM2B *contextV, UINT16 bits, TPM2B_MAX_BUFFER *resultKey ); Index: tpm2.0-tools-2.0.0/lib/tpm_session.c =================================================================== --- tpm2.0-tools-2.0.0.orig/lib/tpm_session.c +++ tpm2.0-tools-2.0.0/lib/tpm_session.c @@ -198,7 +198,7 @@ static TPM_RC StartAuthSession(TSS2_SYS_ } else { - rval = tpm_kdfa(sapi_context, session->authHash, &(key.b), label, &( session->nonceNewer.b ), + rval = tpm_kdfa(session->authHash, &(key.b), label, &( session->nonceNewer.b ), &( session->nonceOlder.b ), bytes * 8, (TPM2B_MAX_BUFFER *)&( session->sessionKey ) ); }

1 0

commit stress-ng for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package stress-ng for openSUSE:Factory checked in at 2017-06-29 15:22:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stress-ng (Old) and /work/SRC/openSUSE:Factory/.stress-ng.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "stress-ng" Thu Jun 29 15:22:12 2017 rev:15 rq:507020 version:0.08.07 Changes: -------- --- /work/SRC/openSUSE:Factory/stress-ng/stress-ng.changes 2017-06-23 09:18:47.890760975 +0200 +++ /work/SRC/openSUSE:Factory/.stress-ng.new/stress-ng.changes 2017-06-29 15:22:23.371357876 +0200 @@ -1,0 +2,5 @@ +Thu Jun 29 09:45:32 UTC 2017 - pgeorgiadis(a)suse.com + +- update to version 0.08.07 + +------------------------------------------------------------------- Old: ---- stress-ng-0.08.06.tar.gz New: ---- stress-ng-0.08.07.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stress-ng.spec ++++++ --- /var/tmp/diff_new_pack.JMysHl/_old 2017-06-29 15:22:24.991128919 +0200 +++ /var/tmp/diff_new_pack.JMysHl/_new 2017-06-29 15:22:24.995128353 +0200 @@ -18,7 +18,7 @@ Name: stress-ng -Version: 0.08.06 +Version: 0.08.07 Release: 0 Summary: Tool to load and stress a computer License: GPL-2.0 ++++++ stress-ng-0.08.06.tar.gz -> stress-ng-0.08.07.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/Makefile new/stress-ng-0.08.07/Makefile --- old/stress-ng-0.08.06/Makefile 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/Makefile 2017-06-28 12:10:09.000000000 +0200 @@ -16,7 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -VERSION=0.08.06 +VERSION=0.08.07 # # Codename "harmful hardware harasser" # @@ -273,7 +273,8 @@ HAVE_VECMATH=0 HAVE_ATOMIC=0 HAVE_LIB_SCTP=0 HAVE_ASM_NOP=0 \ HAVE_ALIGNED_64K=0 HAVE_ALIGNED_64=0 HAVE_ALIGNED_128=0 \ HAVE_AFFINITY=0 HAVE_MADVISE=0 HAVE_SEM_POSIX=0 HAVE_SEM_SYSV=0 \ - HAVE_MQ_POSIX=0 HAVE_MQ_SYSV=0 HAVE_SHM_SYSV=0 + HAVE_MQ_POSIX=0 HAVE_MQ_SYSV=0 HAVE_SHM_SYSV=0 HAVE_FANOTIFY=0 \ + HAVE_INOTIFY=0 # # Load in current config; use 'make clean' to clear this @@ -523,6 +524,22 @@ endif endif +ifndef $(HAVE_FANOTIFY) +HAVE_FANOTIFY = $(shell $(MAKE) --no-print-directory $(HAVE_NOT) have_fanotify) +ifeq ($(HAVE_FANOTIFY),1) + CONFIG_CFLAGS += -DHAVE_FANOTIFY +$(info autoconfig: using fanotify) +endif +endif + +ifndef $(HAVE_INOTIFY) +HAVE_INOTIFY = $(shell $(MAKE) --no-print-directory $(HAVE_NOT) have_inotify) +ifeq ($(HAVE_INOTIFY),1) + CONFIG_CFLAGS += -DHAVE_INOTIFY +$(info autoconfig: using inotify) +endif +endif + endif endif @@ -905,7 +922,7 @@ # # check if we can build using SYSV shared memory # -.PHONY: have_shm_sysv_ +.PHONY: have_shm_sysv have_shm_sysv: test-shm-sysv.c @$(CC) $(CPPFLAGS) test-shm-sysv.c -o test-shm-sysv 2> /dev/null || true @if [ -f test-shm-sysv ]; then \ @@ -916,6 +933,32 @@ @rm -rf test-shm-sysv # +# check if we can build using fanotify +# +.PHONY: have_fanotify +have_fanotify: test-fanotify.c + @$(CC) $(CPPFLAGS) test-fanotify.c -o test-fanotify 2> /dev/null || true + @if [ -f test-fanotify ]; then \ + echo 1 ;\ + else \ + echo 0 ;\ + fi + @rm -rf test-fanotify + +# +# check if we can build using inotify +# +.PHONY: have_inotify +have_inotify: test-inotify.c + @$(CC) $(CPPFLAGS) test-inotify.c -o test-inotify 2> /dev/null || true + @if [ -f test-inotify ]; then \ + echo 1 ;\ + else \ + echo 0 ;\ + fi + @rm -rf test-inotify + +# # extract the PER_* personality enums # personality.h: @@ -967,7 +1010,7 @@ test-aligned-128.c usr.bin.pulseaudio.eg perf-event.c \ test-affinity.c test-madvise.c test-sem-posix.c \ test-sem-sysv.c test-mq-posix.c test-mq-sysv.c \ - test-shm-sysv.c \ + test-shm-sysv.c test-fanotify.c test-inotify.c \ snapcraft smatchify.sh config TODO \ example-jobs stress-ng-$(VERSION) tar -zcf stress-ng-$(VERSION).tar.gz stress-ng-$(VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-cyclic.c new/stress-ng-0.08.07/stress-cyclic.c --- old/stress-ng-0.08.06/stress-cyclic.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-cyclic.c 2017-06-28 12:10:09.000000000 +0200 @@ -79,7 +79,7 @@ uint64_t cyclic_sleep; cyclic_sleep = get_uint64(opt); - check_range_bytes("cyclic-sleep", cyclic_sleep, + check_range("cyclic-sleep", cyclic_sleep, 1, NANOSECS); set_setting("cyclic-sleep", TYPE_ID_UINT64, &cyclic_sleep); } @@ -107,7 +107,7 @@ int32_t cyclic_prio; cyclic_prio = get_int32(opt); - check_range_bytes("cyclic-prio", cyclic_prio, 1, 100); + check_range("cyclic-prio", cyclic_prio, 1, 100); set_setting("cyclic-prio", TYPE_ID_INT32, &cyclic_prio); } @@ -116,7 +116,7 @@ uint64_t cyclic_dist; cyclic_dist = get_uint64(opt); - check_range_bytes("cyclic-dist", cyclic_dist, 1, 10000000); + check_range("cyclic-dist", cyclic_dist, 1, 10000000); set_setting("cyclic-dist", TYPE_ID_UINT64, &cyclic_dist); } @@ -262,6 +262,46 @@ return 0; } +#if _POSIX_C_SOURCE >= 200112L +/* + * stress_cyclic_pselect() + * measure latencies with pselect sleep + */ +static int stress_cyclic_pselect( + const args_t *args, + rt_stats_t *rt_stats, + uint64_t cyclic_sleep) +{ +#if defined(__linux__) + struct timespec t1, t2, t; + int ret; + + (void)args; + + t.tv_sec = cyclic_sleep / NANOSECS; + t.tv_nsec = cyclic_sleep % NANOSECS; + clock_gettime(CLOCK_REALTIME, &t1); + ret = pselect(0, NULL, NULL,NULL, &t, NULL); + clock_gettime(CLOCK_REALTIME, &t2); + if (ret == 0) { + int64_t delta_ns; + + delta_ns = ((t2.tv_sec - t1.tv_sec) * NANOSECS) + (t2.tv_nsec - t1.tv_nsec); + delta_ns -= cyclic_sleep; + + if (rt_stats->index < MAX_SAMPLES) + rt_stats->latencies[rt_stats->index++] = delta_ns; + + rt_stats->ns += (double)delta_ns; + } +#else + (void)args; + (void)rt_stats; + (void)cyclic_sleep; +#endif + return 0; +} +#endif #if defined(__linux__) static struct timespec itimer_time; @@ -435,6 +475,9 @@ { "itimer", stress_cyclic_itimer }, { "poll", stress_cyclic_poll }, { "posix_ns", stress_cyclic_posix_nanosleep }, +#if _POSIX_C_SOURCE >= 200112L + { "pselect", stress_cyclic_pselect }, +#endif { NULL, NULL } }; @@ -601,9 +644,11 @@ rlim.rlim_max = timeout; (void)setrlimit(RLIMIT_CPU, &rlim); +#if defined(RLIMIT_RTTIME) rlim.rlim_cur = 1000000 * timeout; rlim.rlim_max = 1000000 * timeout; (void)setrlimit(RLIMIT_RTTIME, &rlim); +#endif if (stress_sighandler(args->name, SIGXCPU, stress_rlimit_handler, &old_action_xcpu) < 0) goto tidy; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-dnotify.c new/stress-ng-0.08.07/stress-dnotify.c --- old/stress-ng-0.08.06/stress-dnotify.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-dnotify.c 2017-06-28 12:10:09.000000000 +0200 @@ -23,7 +23,7 @@ */ #include "stress-ng.h" -#if defined(__linux__) +#if defined(__linux__) && defined(F_NOTIFY) #include <sys/select.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-dup.c new/stress-ng-0.08.07/stress-dup.c --- old/stress-ng-0.08.06/stress-dup.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-dup.c 2017-06-28 12:10:09.000000000 +0200 @@ -81,6 +81,14 @@ pr_fail_err("dup2 with same fds"); break; } +#if defined(F_DUPFD) + /* POSIX.1-2001 fcntl() */ + + (void)close(fds[n]); + fds[n] = fcntl(fds[0], F_DUPFD, fds[0]); + if (fds[n] < 0) + break; +#endif if (!g_keep_stressing_flag) break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-fanotify.c new/stress-ng-0.08.07/stress-fanotify.c --- old/stress-ng-0.08.06/stress-fanotify.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-fanotify.c 2017-06-28 12:10:09.000000000 +0200 @@ -23,7 +23,7 @@ */ #include "stress-ng.h" -#if defined(__linux__) +#if defined(HAVE_FANOTIFY) #include <mntent.h> #include <sys/select.h> @@ -56,7 +56,7 @@ return 0; } -#if defined(__linux__) +#if defined(HAVE_FANOTIFY) /* * fanotify_event_init() * initialize fanotify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-get.c new/stress-ng-0.08.07/stress-get.c --- old/stress-ng-0.08.06/stress-get.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-get.c 2017-06-28 12:10:09.000000000 +0200 @@ -32,9 +32,9 @@ #include <sys/timex.h> #endif -#define check_do_run() \ +#define check_do_run() \ if (!g_keep_stressing_flag) \ - break; \ + break; \ #define GIDS_MAX (1024) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-inotify.c new/stress-ng-0.08.07/stress-inotify.c --- old/stress-ng-0.08.06/stress-inotify.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-inotify.c 2017-06-28 12:10:09.000000000 +0200 @@ -26,7 +26,7 @@ */ #include "stress-ng.h" -#if defined(__linux__) && NEED_GLIBC(2,9,0) +#if defined(HAVE_INOTIFY) && NEED_GLIBC(2,9,0) #include <sys/select.h> #include <sys/inotify.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-netlink-proc.c new/stress-ng-0.08.07/stress-netlink-proc.c --- old/stress-ng-0.08.06/stress-netlink-proc.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-netlink-proc.c 2017-06-28 12:10:09.000000000 +0200 @@ -99,6 +99,9 @@ case PROC_EVENT_FORK: case PROC_EVENT_EXEC: case PROC_EVENT_EXIT: + case PROC_EVENT_UID: + case PROC_EVENT_SID: + #endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0) case PROC_EVENT_COREDUMP: @@ -106,6 +109,9 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) case PROC_EVENT_COMM: #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) + case PROC_EVENT_PTRACE: +#endif inc_counter(args); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-ng.1 new/stress-ng-0.08.07/stress-ng.1 --- old/stress-ng-0.08.06/stress-ng.1 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-ng.1 2017-06-28 12:10:09.000000000 +0200 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH STRESS-NG 1 "June 1, 2017" +.TH STRESS-NG 1 "June 28, 2017" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -983,7 +983,9 @@ sleep for the specified time using the POSIX nanosleep(2) high resolution nanosleep. T} - +pselect T{ +sleep for the specified time using pselect(2) with null file descriptors. +T} .TE .TP .B \-\-cyclic\-policy [ fifo | rr ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-ng.c new/stress-ng-0.08.07/stress-ng.c --- old/stress-ng-0.08.06/stress-ng.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-ng.c 2017-06-28 12:10:09.000000000 +0200 @@ -3488,6 +3488,8 @@ int32_t ionice_level = UNDEFINED; /* ionice level */ int32_t i; uint32_t class = 0; + const uint32_t cpus_online = stress_get_processors_online(); + const uint32_t cpus_configured = stress_get_processors_configured(); /* --exec stressor uses this to exec itself and then exit early */ if ((argc == 2) && !strcmp(argv[1], "--exec-exit")) @@ -3561,10 +3563,10 @@ log_system_info(); log_system_mem_info(); - pr_dbg("%" PRId32 " processors online, %" PRId32 - " processors configured\n", - stress_get_processors_online(), - stress_get_processors_configured()); + pr_dbg("%" PRId32 " processor%s online, %" PRId32 + " processor%s configured\n", + cpus_online, cpus_online == 1 ? "" : "s", + cpus_configured, cpus_configured == 1 ? "" : "s"); /* * These two options enable all the stressors diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-rmap.c new/stress-ng-0.08.07/stress-rmap.c --- old/stress-ng-0.08.06/stress-rmap.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-rmap.c 2017-06-28 12:10:09.000000000 +0200 @@ -165,7 +165,7 @@ } /* - * Spawn of children workers + * Spawn children workers */ for (i = 0; i < RMAP_CHILD_MAX; i++) { pids[i] = fork(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-socket-fd.c new/stress-ng-0.08.07/stress-socket-fd.c --- old/stress-ng-0.08.06/stress-socket-fd.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-socket-fd.c 2017-06-28 12:10:09.000000000 +0200 @@ -134,17 +134,18 @@ static void stress_socket_client( const args_t *args, const pid_t ppid, - const size_t max_fd, + const ssize_t max_fd, const int socket_fd_port) { struct sockaddr *addr; (void)setpgid(0, g_pgrp); stress_parent_died_alarm(); + set_proc_name("sfd-client"); do { int fd, retries = 0, fds[max_fd]; - size_t i; + ssize_t i; socklen_t addr_len = 0; retry: if (!g_keep_stressing_flag) { @@ -201,7 +202,7 @@ const args_t *args, const pid_t pid, const pid_t ppid, - const size_t max_fd, + const ssize_t max_fd, const int socket_fd_port) { int fd, status; @@ -213,6 +214,7 @@ int rc = EXIT_SUCCESS; (void)setpgid(pid, g_pgrp); + set_proc_name("sfd-server"); if (stress_sig_stop_stressing(args->name, SIGALRM)) { rc = EXIT_FAILURE; @@ -247,7 +249,7 @@ do { int sfd = accept(fd, (struct sockaddr *)NULL, NULL); if (sfd >= 0) { - size_t i; + ssize_t i; for (i = 0; i < max_fd; i++) { int newfd; @@ -266,6 +268,7 @@ break; } (void)close(newfd); + msgs++; } } (void)close(sfd); @@ -297,13 +300,25 @@ int stress_sockfd(const args_t *args) { pid_t pid, ppid = getppid(); - const size_t max_fd = stress_get_file_limit(); + ssize_t max_fd = stress_get_file_limit(); int socket_fd_port = DEFAULT_SOCKET_FD_PORT; (void)get_setting("sockfd-port", &socket_fd_port); - pr_dbg("%s: process [%d] using socket port %d\n", - args->name, args->pid, socket_fd_port + args->instance); + /* + * When run as root, we really don't want to use up all + * the file descriptors. Limit ourselves to a head room + * so that we don't ever run out of memory + */ + if (geteuid() == 0) { + max_fd -= 64; + max_fd /= args->num_instances ? args->num_instances : 1; + if (max_fd < 0) + max_fd = 1; + } + + pr_dbg("%s: process [%d] using socket port %d and %zd file descriptors\n", + args->name, args->pid, socket_fd_port + args->instance, max_fd); again: pid = fork(); if (pid < 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/stress-softlockup.c new/stress-ng-0.08.07/stress-softlockup.c --- old/stress-ng-0.08.06/stress-softlockup.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/stress-softlockup.c 2017-06-28 12:10:09.000000000 +0200 @@ -167,9 +167,11 @@ rlim.rlim_max = timeout; (void)setrlimit(RLIMIT_CPU, &rlim); +#if defined(RLIMIT_RTTIME) rlim.rlim_cur = 1000000 * timeout; rlim.rlim_max = 1000000 * timeout; (void)setrlimit(RLIMIT_RTTIME, &rlim); +#endif if (stress_sighandler(args->name, SIGXCPU, stress_rlimit_handler, &old_action_xcpu) < 0) goto tidy; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/test-fanotify.c new/stress-ng-0.08.07/test-fanotify.c --- old/stress-ng-0.08.06/test-fanotify.c 1970-01-01 01:00:00.000000000 +0100 +++ new/stress-ng-0.08.07/test-fanotify.c 2017-06-28 12:10:09.000000000 +0200 @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2012-2017 Canonical, Ltd. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * This code is a complete clean re-write of the stress tool by + * Colin Ian King <colin.king(a)canonical.com> and attempts to be + * backwardly compatible with the stress tool by Amos Waterland + * <apw(a)rossby.metr.ou.edu> but has more stress tests and more + * functionality. + */ +#include "stress-ng.h" + +#if !defined(__linux__) +#error requires linux to build +#endif + +#include <mntent.h> +#include <sys/select.h> +#include <sys/fanotify.h> + +#if !defined(FAN_MARK_ADD) +#error missing fnotify FAN_MARK_ADD flag +#endif + +#if !defined(FAN_MARK_MOUNT) +#error missing fnotify FAN_MARK_MOUNT flag +#endif + +#if !defined(FAN_ACCESS) +#error missing fnotify FAN_ACCESS flag +#endif + +#if !defined(FAN_MODIFY) +#error missing fnotify FAN_MODIFY flag +#endif + +#if !defined(FAN_OPEN) +#error missing fnotify FAN_OPEN flag +#endif + +#if !defined(FAN_CLOSE) +#error missing fnotify FAN_CLOSE flag +#endif + +#if !defined(FAN_ONDIR) +#error missing fnotify FAN_ONDIR flag +#endif + +#if !defined(FAN_EVENT_ON_CHILD) +#error missing fnotify FAN_EVENT_ON_CHILD flag +#endif + +#if !defined(FAN_EVENT_OK) +#error missing fnotify FAN_EVENT_OK macro +#endif + +#if !defined(FAN_NOFD) +#error missing fnotify FAN_NOFD macro +#endif + +#define BUFFER_SIZE (4096) + +int main(void) +{ + int fan_fd, ret; + size_t len; + struct fanotify_event_metadata *metadata; + void *buffer; + + ret = posix_memalign(&buffer, BUFFER_SIZE, BUFFER_SIZE); + if (ret != 0 || buffer == NULL) + return -1; + + fan_fd = fanotify_init(0, 0); + if (fan_fd < 0) + return -1; + + ret = fanotify_mark(fan_fd, FAN_MARK_ADD | FAN_MARK_MOUNT, + FAN_ACCESS| FAN_MODIFY | FAN_OPEN | FAN_CLOSE | + FAN_ONDIR | FAN_EVENT_ON_CHILD, AT_FDCWD, "/"); + (void)ret; + + len = read(fan_fd, (void *)buffer, BUFFER_SIZE); + metadata = (struct fanotify_event_metadata *)buffer; + + while (FAN_EVENT_OK(metadata, len)) { + metadata = FAN_EVENT_NEXT(metadata, len); + } + + free(buffer); + (void)close(fan_fd); + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/test-inotify.c new/stress-ng-0.08.07/test-inotify.c --- old/stress-ng-0.08.06/test-inotify.c 1970-01-01 01:00:00.000000000 +0100 +++ new/stress-ng-0.08.07/test-inotify.c 2017-06-28 12:10:09.000000000 +0200 @@ -0,0 +1,111 @@ +/* + * Copyright (C) 2012-2017 Canonical, Ltd. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * This code is a complete clean re-write of the stress tool by + * Colin Ian King <colin.king(a)canonical.com> and attempts to be + * backwardly compatible with the stress tool by Amos Waterland + * <apw(a)rossby.metr.ou.edu> but has more stress tests and more + * functionality. + */ +#include <unistd.h> + +#if !defined(__linux__) +#error requires linux to build +#endif + +#include <sys/select.h> +#include <sys/inotify.h> + +#if !defined(IN_DELETE_SELF) +#error missing inotify IN_DELETE_SELF flag +#endif + +#if !defined(IN_MOVE_SELF) +#error missing inotify IN_MOVE_SELF flag +#endif + +#if !defined(IN_MOVED_TO) +#error missing inotify IN_MOVED_TO flag +#endif + +#if !defined(IN_MOVED_FROM) +#error missing inotify IN_MOVED_FROM flag +#endif + +#if !defined(IN_ATTRIB) +#error missing inotify IN_ATTRIB flag +#endif + +#if !defined(IN_ACCESS) +#error missing inotify IN_ACCESS flag +#endif + +#if !defined(IN_MODIFY) +#error missing inotify IN_MODIFY flag +#endif + +#if !defined(IN_CREATE) +#error missing inotify IN_CREATE flag +#endif + +#if !defined(IN_OPEN) +#error missing inotify IN_OPEN flag +#endif + +#if !defined(IN_CLOSE_WRITE) +#error missing inotify IN_CLOSE_WRITE flag +#endif + +#if !defined(IN_CLOSE_NOWRITE) +#error missing inotify IN_CLOSE_NOWRITE flag +#endif + +#if !defined(IN_DELETE) +#error missing inotify IN_DELETE flag +#endif + +#if !defined(IN_DELETE_SELF) +#error missing inotify IN_DELETE_SELF flag +#endif + +#define BUFFER_SIZE (4096) + +int main(void) +{ + int fd, ret, wd; + ssize_t len, i = 0; + char buffer[1024]; + + fd = inotify_init(); + if (fd < 0) + return -1; + + wd = inotify_add_watch(fd, "/", IN_ACCESS); + + len = read(fd, buffer, sizeof(buffer)); + if (len < 0) + return -1; + + while ((i >= 0) && (i <= len - (ssize_t)sizeof(struct inotify_event))) { + struct inotify_event *event = (struct inotify_event *)&buffer[i]; + i += sizeof(struct inotify_event) + event->len; + } + + (void)inotify_rm_watch(fd, wd); + (void)close(fd); + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/test-mq-sysv.c new/stress-ng-0.08.07/test-mq-sysv.c --- old/stress-ng-0.08.06/test-mq-sysv.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/test-mq-sysv.c 2017-06-28 12:10:09.000000000 +0200 @@ -67,7 +67,7 @@ strncpy(msg.msg, "TESTMSG", sizeof(msg.msg)); msg.mtype = 1; ret = msgsnd(msgq_id, &msg, sizeof(msg.msg), 0); - (void)msg; + (void)ret; ret = msgrcv(msgq_id, &msg, sizeof(msg.msg), 0, 0); (void)ret; ret = msgctl(msgq_id, IPC_STAT, &buf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stress-ng-0.08.06/test-sem-posix.c new/stress-ng-0.08.07/test-sem-posix.c --- old/stress-ng-0.08.06/test-sem-posix.c 2017-06-21 18:34:24.000000000 +0200 +++ new/stress-ng-0.08.07/test-sem-posix.c 2017-06-28 12:10:09.000000000 +0200 @@ -46,11 +46,17 @@ * based code */ ret = sem_init(&sem, 1, 1); + (void)ret; ret = sem_wait(&sem); + (void)ret; ret = sem_post(&sem); + (void)ret; ret = sem_trywait(&sem); + (void)ret; ret = sem_timedwait(&sem, &timeout); + (void)ret; ret = sem_destroy(&sem); + (void)ret; return 0; }

1 0

commit fio for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package fio for openSUSE:Factory checked in at 2017-06-29 15:21:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fio (Old) and /work/SRC/openSUSE:Factory/.fio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "fio" Thu Jun 29 15:21:57 2017 rev:38 rq:507004 version:2.21 Changes: -------- --- /work/SRC/openSUSE:Factory/fio/fio.changes 2017-05-29 22:19:54.721767291 +0200 +++ /work/SRC/openSUSE:Factory/.fio.new/fio.changes 2017-06-29 15:22:14.324636646 +0200 @@ -1,0 +2,7 @@ +Thu Jun 29 09:22:09 UTC 2017 - ktsamis(a)suse.com + +- Update to version 2.21: + * See http://brick.kernel.dk/snaps/fio-2.21.shortlog.txt +- Enabled tests + +------------------------------------------------------------------- Old: ---- fio-2.20.tar.bz2 fio-2.20.tar.bz2.asc New: ---- fio-2.21.tar.bz2 fio-2.21.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fio.spec ++++++ --- /var/tmp/diff_new_pack.qfwDcX/_old 2017-06-29 15:22:16.452335891 +0200 +++ /var/tmp/diff_new_pack.qfwDcX/_new 2017-06-29 15:22:16.456335326 +0200 @@ -18,7 +18,7 @@ Name: fio -Version: 2.20 +Version: 2.21 Release: 0 Summary: Flexible I/O Tester/benchmarker License: GPL-2.0 @@ -90,6 +90,9 @@ mandir="%{_mandir}" \ install +%check +make %{?_smp_mflags} test + %files %defattr(-,root,root) %doc COPYING README examples ++++++ fio-2.20.tar.bz2 -> fio-2.21.tar.bz2 ++++++ ++++ 2178 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/FIO-VERSION-GEN new/fio-2.21/FIO-VERSION-GEN --- old/fio-2.20/FIO-VERSION-GEN 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/FIO-VERSION-GEN 2017-06-15 20:25:03.000000000 +0200 @@ -1,7 +1,7 @@ #!/bin/sh GVF=FIO-VERSION-FILE -DEF_VER=fio-2.20 +DEF_VER=fio-2.21 LF=' ' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/HOWTO new/fio-2.21/HOWTO --- old/fio-2.20/HOWTO 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/HOWTO 2017-06-15 20:25:03.000000000 +0200 @@ -1072,10 +1072,11 @@ .. option:: offset=int - Start I/O at the given offset in the file. The data before the given offset - will not be touched. This effectively caps the file size at `real_size - - offset`. Can be combined with :option:`size` to constrain the start and - end range that I/O will be done within. + Start I/O at the provided offset in the file, given as either a fixed size or + a percentage. If a percentage is given, the next ``blockalign``-ed offset + will be used. Data before the given offset will not be touched. This + effectively caps the file size at `real_size - offset`. Can be combined with + :option:`size` to constrain the start and end range of the I/O workload. .. option:: offset_increment=int @@ -1290,7 +1291,7 @@ means default for reads, 8k for writes and trims. **bs=,8k,** - means default for reads, 8k for writes, and default for writes. + means default for reads, 8k for writes, and default for trims. .. option:: blocksize_range=irange[,irange][,irange], bsrange=irange[,irange][,irange] @@ -1400,11 +1401,18 @@ .. option:: buffer_pattern=str - If set, fio will fill the I/O buffers with this pattern. If not set, the - contents of I/O buffers is defined by the other options related to buffer - contents. The setting can be any pattern of bytes, and can be prefixed with - 0x for hex values. It may also be a string, where the string must then be - wrapped with ``""``, e.g.:: + If set, fio will fill the I/O buffers with this pattern or with the contents + of a file. If not set, the contents of I/O buffers are defined by the other + options related to buffer contents. The setting can be any pattern of bytes, + and can be prefixed with 0x for hex values. It may also be a string, where + the string must then be wrapped with ``""``. Or it may also be a filename, + where the filename must be wrapped with ``''`` in which case the file is + opened and read. Note that not all the file contents will be read if that + would cause the buffers to overflow. So, for example:: + + buffer_pattern='filename' + + or:: buffer_pattern="abcd" @@ -1418,7 +1426,7 @@ Also you can combine everything together in any order:: - buffer_pattern=0xdeadface"abcd"-12 + buffer_pattern=0xdeadface"abcd"-12'filename' .. option:: dedupe_percentage=int @@ -2467,6 +2475,7 @@ contents to one or more separate threads. If using this offload option, even sync I/O engines can benefit from using an :option:`iodepth` setting higher than 1, as it allows them to have I/O in flight while verifies are running. + Defaults to 0 async threads, i.e. verification is not asynchronous. .. option:: verify_async_cpus=str @@ -2503,7 +2512,7 @@ <type> is "local" for a local run, "sock" for a client/server socket connection, and "ip" (192.168.0.1, for instance) for a networked - client/server connection. + client/server connection. Defaults to true. .. option:: verify_state_load=bool @@ -2834,7 +2843,8 @@ .. option:: ignore_error=str Sometimes you want to ignore some errors during test in that case you can - specify error list for each error type. + specify error list for each error type, instead of only being able to + ignore the default 'non-fatal error' using :option:`continue_on_error`. ``ignore_error=READ_ERR_LIST,WRITE_ERR_LIST,VERIFY_ERR_LIST`` errors for given error type is separated with ':'. Error may be symbol ('ENOSPC', 'ENOMEM') or integer. Example:: @@ -2842,7 +2852,8 @@ ignore_error=EAGAIN,ENOSPC:122 This option will ignore EAGAIN from READ, and ENOSPC and 122(EDQUOT) from - WRITE. + WRITE. This option works by overriding :option:`continue_on_error` with + the list of errors for each error type if any. .. option:: error_dump=bool @@ -3224,6 +3235,11 @@ For disk utilization, all disks used by fio are shown. So for each disk there will be a disk utilization section. +Below is a single line containing short names for each of the fields in the +minimal output v3, separated by semicolons: + +terse_version_3;fio_version;jobname;groupid;error;read_kb;read_bandwidth;read_iops;read_runtime_ms;read_slat_min;read_slat_max;read_slat_mean;read_slat_dev;read_clat_max;read_clat_min;read_clat_mean;read_clat_dev;read_clat_pct01;read_clat_pct02;read_clat_pct03;read_clat_pct04;read_clat_pct05;read_clat_pct06;read_clat_pct07;read_clat_pct08;read_clat_pct09;read_clat_pct10;read_clat_pct11;read_clat_pct12;read_clat_pct13;read_clat_pct14;read_clat_pct15;read_clat_pct16;read_clat_pct17;read_clat_pct18;read_clat_pct19;read_clat_pct20;read_tlat_min;read_lat_max;read_lat_mean;read_lat_dev;read_bw_min;read_bw_max;read_bw_agg_pct;read_bw_mean;read_bw_dev;write_kb;write_bandwidth;write_iops;write_runtime_ms;write_slat_min;write_slat_max;write_slat_mean;write_slat_dev;write_clat_max;write_clat_min;write_clat_mean;write_clat_dev;write_clat_pct01;write_clat_pct02;write_clat_pct03;write_clat_pct04;write_clat_pct05;write_clat_pct06;write_clat_pct07;write_clat_pct08;write_clat_pct09;write_clat_pct10;write_clat_pct11;write_clat_pct12;write_clat_pct13;write_clat_pct14;write_clat_pct15;write_clat_pct16;write_clat_pct17;write_clat_pct18;write_clat_pct19;write_clat_pct20;write_tlat_min;write_lat_max;write_lat_mean;write_lat_dev;write_bw_min;write_bw_max;write_bw_agg_pct;write_bw_mean;write_bw_dev;cpu_user;cpu_sys;cpu_csw;cpu_mjf;pu_minf;iodepth_1;iodepth_2;iodepth_4;iodepth_8;iodepth_16;iodepth_32;iodepth_64;lat_2us;lat_4us;lat_10us;lat_20us;lat_50us;lat_100us;lat_250us;lat_500us;lat_750us;lat_1000us;lat_2ms;lat_4ms;lat_10ms;lat_20ms;lat_50ms;lat_100ms;lat_250ms;lat_500ms;lat_750ms;lat_1000ms;lat_2000ms;lat_over_2000ms;disk_name;disk_read_iops;disk_write_iops;disk_read_merges;disk_write_merges;disk_read_ticks;write_ticks;disk_queue_time;disk_util + Trace file format ----------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/Makefile new/fio-2.21/Makefile --- old/fio-2.20/Makefile 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/Makefile 2017-06-15 20:25:03.000000000 +0200 @@ -107,6 +107,9 @@ ifndef CONFIG_STRLCAT SOURCE += oslib/strlcat.c endif +ifndef CONFIG_HAVE_STRNDUP + SOURCE += oslib/strndup.c +endif ifndef CONFIG_GETOPT_LONG_ONLY SOURCE += oslib/getopt_long.c endif @@ -140,7 +143,7 @@ LDFLAGS += -rdynamic endif ifeq ($(CONFIG_TARGET_OS), Android) - SOURCE += diskutil.c fifo.c blktrace.c trim.c profiles/tiobench.c \ + SOURCE += diskutil.c fifo.c blktrace.c cgroup.c trim.c profiles/tiobench.c \ oslib/linux-dev-lookup.c LIBS += -ldl LDFLAGS += -rdynamic @@ -209,7 +212,8 @@ T_ZIPF_OBS = t/genzipf.o T_ZIPF_OBJS += t/log.o lib/ieee754.o lib/rand.o lib/pattern.o lib/zipf.o \ - lib/strntol.o lib/gauss.o t/genzipf.o oslib/strcasestr.o + lib/strntol.o lib/gauss.o t/genzipf.o oslib/strcasestr.o \ + oslib/strndup.o T_ZIPF_PROGS = t/fio-genzipf T_AXMAP_OBJS = t/axmap.o @@ -222,7 +226,7 @@ T_GEN_RAND_OBJS = t/gen-rand.o T_GEN_RAND_OBJS += t/log.o t/debug.o lib/rand.o lib/pattern.o lib/strntol.o \ - oslib/strcasestr.o + oslib/strcasestr.o oslib/strndup.o T_GEN_RAND_PROGS = t/gen-rand ifeq ($(CONFIG_TARGET_OS), Linux) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/blktrace.c new/fio-2.21/blktrace.c --- old/fio-2.20/blktrace.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/blktrace.c 2017-06-15 20:25:03.000000000 +0200 @@ -10,6 +10,7 @@ #include "flist.h" #include "fio.h" +#include "blktrace.h" #include "blktrace_api.h" #include "oslib/linux-dev-lookup.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/blktrace.h new/fio-2.21/blktrace.h --- old/fio-2.20/blktrace.h 1970-01-01 01:00:00.000000000 +0100 +++ new/fio-2.21/blktrace.h 2017-06-15 20:25:03.000000000 +0200 @@ -0,0 +1,23 @@ +#ifndef FIO_BLKTRACE_H +#define FIO_BLKTRACE_H + +#ifdef FIO_HAVE_BLKTRACE + +int is_blktrace(const char *, int *); +int load_blktrace(struct thread_data *, const char *, int); + +#else + +static inline int is_blktrace(const char *fname, int *need_swap) +{ + return 0; +} + +static inline int load_blktrace(struct thread_data *td, const char *fname, + int need_swap) +{ + return 1; +} + +#endif +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/cconv.c new/fio-2.21/cconv.c --- old/fio-2.20/cconv.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/cconv.c 2017-06-15 20:25:03.000000000 +0200 @@ -104,6 +104,7 @@ o->file_size_low = le64_to_cpu(top->file_size_low); o->file_size_high = le64_to_cpu(top->file_size_high); o->start_offset = le64_to_cpu(top->start_offset); + o->start_offset_percent = le32_to_cpu(top->start_offset_percent); for (i = 0; i < DDIR_RWDIR_CNT; i++) { o->bs[i] = le32_to_cpu(top->bs[i]); @@ -543,6 +544,7 @@ top->file_size_low = __cpu_to_le64(o->file_size_low); top->file_size_high = __cpu_to_le64(o->file_size_high); top->start_offset = __cpu_to_le64(o->start_offset); + top->start_offset_percent = __cpu_to_le32(o->start_offset_percent); top->trim_backlog = __cpu_to_le64(o->trim_backlog); top->offset_increment = __cpu_to_le64(o->offset_increment); top->number_ios = __cpu_to_le64(o->number_ios); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/diskutil.c new/fio-2.21/diskutil.c --- old/fio-2.20/diskutil.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/diskutil.c 2017-06-15 20:25:03.000000000 +0200 @@ -363,7 +363,7 @@ return 0; while ((dir = readdir(D)) != NULL) { - char full_path[256]; + char full_path[257]; if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/engines/binject.c new/fio-2.21/engines/binject.c --- old/fio-2.20/engines/binject.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/engines/binject.c 2017-06-15 20:25:03.000000000 +0200 @@ -59,11 +59,12 @@ return 0; } -static unsigned int binject_read_commands(struct thread_data *td, void *p, +static unsigned int binject_read_commands(struct thread_data *td, void *buf, int left, int *err) { struct fio_file *f; int i, ret, events; + char *p = buf; one_more: events = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/engines/sg.c new/fio-2.21/engines/sg.c --- old/fio-2.20/engines/sg.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/engines/sg.c 2017-06-15 20:25:03.000000000 +0200 @@ -124,7 +124,7 @@ } while (left) { - void *p; + char *p; dprint(FD_IO, "sgio_getevents: sd %p: left=%d\n", sd, left); @@ -184,7 +184,7 @@ if (hdr->info & SG_INFO_CHECK) { struct io_u *io_u; io_u = (struct io_u *)(hdr->usr_ptr); - memcpy((void*)&(io_u->hdr), (void*)hdr, sizeof(struct sg_io_hdr)); + memcpy(&io_u->hdr, hdr, sizeof(struct sg_io_hdr)); sd->events[i]->error = EIO; } } @@ -572,17 +572,17 @@ struct sg_io_hdr *hdr = &io_u->hdr; #define MAXERRDETAIL 1024 #define MAXMSGCHUNK 128 - char *msg, msgchunk[MAXMSGCHUNK], *ret = NULL; + char *msg, msgchunk[MAXMSGCHUNK]; int i; msg = calloc(1, MAXERRDETAIL); + strcpy(msg, ""); /* * can't seem to find sg_err.h, so I'll just echo the define values * so others can search on internet to find clearer clues of meaning. */ if (hdr->info & SG_INFO_CHECK) { - ret = msg; if (hdr->host_status) { snprintf(msgchunk, MAXMSGCHUNK, "SG Host Status: 0x%02x; ", hdr->host_status); strlcat(msg, msgchunk, MAXERRDETAIL); @@ -755,14 +755,14 @@ if (hdr->resid != 0) { snprintf(msgchunk, MAXMSGCHUNK, "SG Driver: %d bytes out of %d not transferred. ", hdr->resid, hdr->dxfer_len); strlcat(msg, msgchunk, MAXERRDETAIL); - ret = msg; } } - if (!ret) - ret = strdup("SG Driver did not report a Host, Driver or Device check"); + if (!(hdr->info & SG_INFO_CHECK) && !strlen(msg)) + strncpy(msg, "SG Driver did not report a Host, Driver or Device check", + MAXERRDETAIL - 1); - return ret; + return msg; } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/engines/splice.c new/fio-2.21/engines/splice.c --- old/fio-2.20/engines/splice.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/engines/splice.c 2017-06-15 20:25:03.000000000 +0200 @@ -32,7 +32,7 @@ struct fio_file *f = io_u->file; int ret, ret2, buflen; off_t offset; - void *p; + char *p; offset = io_u->offset; buflen = io_u->xfer_buflen; @@ -77,7 +77,8 @@ struct iovec iov; int ret , buflen, mmap_len; off_t offset; - void *p, *map; + void *map; + char *p; ret = 0; offset = io_u->offset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/engines/sync.c new/fio-2.21/engines/sync.c --- old/fio-2.20/engines/sync.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/engines/sync.c 2017-06-15 20:25:03.000000000 +0200 @@ -36,6 +36,7 @@ struct psyncv2_options { void *pad; unsigned int hipri; + unsigned int stream; }; static struct fio_option options[] = { @@ -49,6 +50,29 @@ .group = FIO_OPT_G_INVALID, }, { + .name = "stream", + .lname = "Stream ID", + .type = FIO_OPT_STR, + .off1 = offsetof(struct psyncv2_options, stream), + .help = "Set expected write life time", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_INVALID, + .posval = { + { .ival = "short", + .oval = RWF_WRITE_LIFE_SHORT, + }, + { .ival = "medium", + .oval = RWF_WRITE_LIFE_MEDIUM, + }, + { .ival = "long", + .oval = RWF_WRITE_LIFE_LONG, + }, + { .ival = "extreme", + .oval = RWF_WRITE_LIFE_EXTREME, + }, + }, + }, + { .name = NULL, }, }; @@ -134,6 +158,8 @@ if (o->hipri) flags |= RWF_HIPRI; + if (o->stream) + flags |= o->stream; iov->iov_base = io_u->xfer_buf; iov->iov_len = io_u->xfer_buflen; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/filesetup.c new/fio-2.21/filesetup.c --- old/fio-2.20/filesetup.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/filesetup.c 2017-06-15 20:25:03.000000000 +0200 @@ -833,12 +833,42 @@ uint64_t get_start_offset(struct thread_data *td, struct fio_file *f) { struct thread_options *o = &td->o; + unsigned long long align_bs; + unsigned long long offset; if (o->file_append && f->filetype == FIO_TYPE_FILE) return f->real_file_size; - return td->o.start_offset + - td->subjob_number * td->o.offset_increment; + if (o->start_offset_percent > 0) { + /* + * if blockalign is provided, find the min across read, write, + * and trim + */ + if (fio_option_is_set(o, ba)) { + align_bs = (unsigned long long) min(o->ba[DDIR_READ], o->ba[DDIR_WRITE]); + align_bs = min((unsigned long long) o->ba[DDIR_TRIM], align_bs); + } else { + /* else take the minimum block size */ + align_bs = td_min_bs(td); + } + + /* calculate the raw offset */ + offset = (f->real_file_size * o->start_offset_percent / 100) + + (td->subjob_number * o->offset_increment); + + /* + * block align the offset at the next available boundary at + * ceiling(offset / align_bs) * align_bs + */ + offset = (offset / align_bs + (offset % align_bs != 0)) * align_bs; + + } else { + /* start_offset_percent not set */ + offset = o->start_offset + + td->subjob_number * o->offset_increment; + } + + return offset; } /* @@ -986,7 +1016,14 @@ total_size = -1ULL; else { if (o->size_percent) { - f->io_size = (f->io_size * o->size_percent) / 100; + uint64_t file_size; + + file_size = f->io_size + f->file_offset; + f->io_size = (file_size * + o->size_percent) / 100; + if (f->io_size > (file_size - f->file_offset)) + f->io_size = file_size - f->file_offset; + f->io_size -= (f->io_size % td_min_bs(td)); } total_size += f->io_size; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/fio.1 new/fio-2.21/fio.1 --- old/fio-2.20/fio.1 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/fio.1 2017-06-15 20:25:03.000000000 +0200 @@ -1,4 +1,4 @@ -.TH fio 1 "March 2017" "User Manual" +.TH fio 1 "May 2017" "User Manual" .SH NAME fio \- flexible I/O tester .SH SYNOPSIS @@ -533,7 +533,7 @@ bs=8k,32k means 8k for reads, 32k for writes and trims bs=8k,32k, means 8k for reads, 32k for writes, and default for trims bs=,8k means default for reads, 8k for writes and trims -bs=,8k, means default for reads, 8k for writes, and default for writes +bs=,8k, means default for reads, 8k for writes, and default for trims .fi .TP .BI blocksize_range \fR=\fPirange[,irange][,irange] "\fR,\fB bsrange" \fR=\fPirange[,irange][,irange] @@ -611,13 +611,20 @@ size, fio can alternate random and zeroed data throughout the IO buffer. .TP .BI buffer_pattern \fR=\fPstr -If set, fio will fill the IO buffers with this pattern. If not set, the contents -of IO buffers is defined by the other options related to buffer contents. The -setting can be any pattern of bytes, and can be prefixed with 0x for hex -values. It may also be a string, where the string must then be wrapped with -"", e.g.: +If set, fio will fill the I/O buffers with this pattern or with the contents +of a file. If not set, the contents of I/O buffers are defined by the other +options related to buffer contents. The setting can be any pattern of bytes, +and can be prefixed with 0x for hex values. It may also be a string, where +the string must then be wrapped with ``""``. Or it may also be a filename, +where the filename must be wrapped with ``''`` in which case the file is +opened and read. Note that not all the file contents will be read if that +would cause the buffers to overflow. So, for example: .RS .RS +\fBbuffer_pattern\fR='filename' +.RS +or +.RE \fBbuffer_pattern\fR="abcd" .RS or @@ -632,7 +639,7 @@ Also you can combine everything together in any order: .LP .RS -\fBbuffer_pattern\fR=0xdeadface"abcd"-12 +\fBbuffer_pattern\fR=0xdeadface"abcd"-12'filename' .RE .RE .TP @@ -904,7 +911,11 @@ Default: true. .TP .BI offset \fR=\fPint -Offset in the file to start I/O. Data before the offset will not be touched. +Start I/O at the provided offset in the file, given as either a fixed size or a +percentage. If a percentage is given, the next \fBblockalign\fR-ed offset will +be used. Data before the given offset will not be touched. This effectively +caps the file size at (real_size - offset). Can be combined with \fBsize\fR to +constrain the start and end range of the I/O workload. .TP .BI offset_increment \fR=\fPint If this is provided, then the real offset becomes the @@ -2241,6 +2252,15 @@ .P .B text description (if provided in config - appears on newline) .RE +.P +Below is a single line containing short names for each of the fields in +the minimal output v3, separated by semicolons: +.RS +.P +.nf +terse_version_3;fio_version;jobname;groupid;error;read_kb;read_bandwidth;read_iops;read_runtime_ms;read_slat_min;read_slat_max;read_slat_mean;read_slat_dev;read_clat_max;read_clat_min;read_clat_mean;read_clat_dev;read_clat_pct01;read_clat_pct02;read_clat_pct03;read_clat_pct04;read_clat_pct05;read_clat_pct06;read_clat_pct07;read_clat_pct08;read_clat_pct09;read_clat_pct10;read_clat_pct11;read_clat_pct12;read_clat_pct13;read_clat_pct14;read_clat_pct15;read_clat_pct16;read_clat_pct17;read_clat_pct18;read_clat_pct19;read_clat_pct20;read_tlat_min;read_lat_max;read_lat_mean;read_lat_dev;read_bw_min;read_bw_max;read_bw_agg_pct;read_bw_mean;read_bw_dev;write_kb;write_bandwidth;write_iops;write_runtime_ms;write_slat_min;write_slat_max;write_slat_mean;write_slat_dev;write_clat_max;write_clat_min;write_clat_mean;write_clat_dev;write_clat_pct01;write_clat_pct02;write_clat_pct03;write_clat_pct04;write_clat_pct05;write_clat_pct06;write_clat_pct07;write_clat_pct08;write_clat_pct09;write_clat_pct10;write_clat_pct11;write_clat_pct12;write_clat_pct13;write_clat_pct14;write_clat_pct15;write_clat_pct16;write_clat_pct17;write_clat_pct18;write_clat_pct19;write_clat_pct20;write_tlat_min;write_lat_max;write_lat_mean;write_lat_dev;write_bw_min;write_bw_max;write_bw_agg_pct;write_bw_mean;write_bw_dev;cpu_user;cpu_sys;cpu_csw;cpu_mjf;pu_minf;iodepth_1;iodepth_2;iodepth_4;iodepth_8;iodepth_16;iodepth_32;iodepth_64;lat_2us;lat_4us;lat_10us;lat_20us;lat_50us;lat_100us;lat_250us;lat_500us;lat_750us;lat_1000us;lat_2ms;lat_4ms;lat_10ms;lat_20ms;lat_50ms;lat_100ms;lat_250ms;lat_500ms;lat_750ms;lat_1000ms;lat_2000ms;lat_over_2000ms;disk_name;disk_read_iops;disk_write_iops;disk_read_merges;disk_write_merges;disk_read_ticks;write_ticks;disk_queue_time;disk_util +.fi +.RE .SH TRACE FILE FORMAT There are two trace file format that you can encounter. The older (v1) format is unsupported since version 1.20-rc3 (March 2008). It will still be described @@ -2594,7 +2614,7 @@ .br These are typically located under /usr/share/doc/fio. -\fBHOWTO\fR: http://git.kernel.dk/?p=fio.git;a=blob_plain;f=HOWTO +\fBHOWTO\fR: http://git.kernel.dk/cgit/fio/plain/HOWTO .br -\fBREADME\fR: http://git.kernel.dk/?p=fio.git;a=blob_plain;f=README +\fBREADME\fR: http://git.kernel.dk/cgit/fio/plain/README .br diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/fio.h new/fio-2.21/fio.h --- old/fio-2.20/fio.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/fio.h 2017-06-15 20:25:03.000000000 +0200 @@ -149,7 +149,7 @@ unsigned int thread_number; unsigned int subjob_number; unsigned int groupid; - struct thread_stat ts; + struct thread_stat ts __attribute__ ((aligned)); int client_type; @@ -640,14 +640,6 @@ */ extern void reset_all_stats(struct thread_data *); -/* - * blktrace support - */ -#ifdef FIO_HAVE_BLKTRACE -extern int is_blktrace(const char *, int *); -extern int load_blktrace(struct thread_data *, const char *, int); -#endif - extern int io_queue_event(struct thread_data *td, struct io_u *io_u, int *ret, enum fio_ddir ddir, uint64_t *bytes_issued, int from_verify, struct timeval *comp_time); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/flist.h new/fio-2.21/flist.h --- old/fio-2.20/flist.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/flist.h 2017-06-15 20:25:03.000000000 +0200 @@ -2,13 +2,7 @@ #define _LINUX_FLIST_H #include <stdlib.h> - -#undef offsetof -#ifdef __compiler_offsetof -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif +#include <stddef.h> #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/init.c new/fio-2.21/init.c --- old/fio-2.20/init.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/init.c 2017-06-15 20:25:03.000000000 +0200 @@ -909,9 +909,9 @@ bool use64; if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE64) - use64 = 1; + use64 = true; else - use64 = 0; + use64 = false; init_rand_seed(&td->verify_state, td->rand_seeds[FIO_RAND_VER_OFF], use64); @@ -967,9 +967,9 @@ } if (td->o.random_generator == FIO_RAND_GEN_TAUSWORTHE64) - use64 = 1; + use64 = true; else - use64 = 0; + use64 = false; td_fill_rand_seeds_internal(td, use64); @@ -1080,8 +1080,12 @@ unsigned long seed; unsigned int i; - if (!td->o.rand_repeatable && !fio_option_is_set(&td->o, rand_seed)) - return init_random_state(td, td->rand_seeds, sizeof(td->rand_seeds)); + if (!td->o.rand_repeatable && !fio_option_is_set(&td->o, rand_seed)) { + int ret = init_random_seeds(td->rand_seeds, sizeof(td->rand_seeds)); + if (!ret) + td_fill_rand_seeds(td); + return ret; + } seed = td->o.rand_seed; for (i = 0; i < 4; i++) @@ -1376,7 +1380,7 @@ prev_group_jobs++; if (setup_random_seeds(td)) { - td_verror(td, errno, "init_random_state"); + td_verror(td, errno, "setup_random_seeds"); goto err; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/iolog.c new/fio-2.21/iolog.c --- old/fio-2.20/iolog.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/iolog.c 2017-06-15 20:25:03.000000000 +0200 @@ -19,6 +19,7 @@ #include "trim.h" #include "filelock.h" #include "smalloc.h" +#include "blktrace.h" static int iolog_flush(struct io_log *log); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/lib/output_buffer.c new/fio-2.21/lib/output_buffer.c --- old/fio-2.20/lib/output_buffer.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/lib/output_buffer.c 2017-06-15 20:25:03.000000000 +0200 @@ -3,7 +3,6 @@ #include <stdlib.h> #include "output_buffer.h" -#include "../log.h" #include "../minmax.h" #define BUF_INC 1024 @@ -18,6 +17,7 @@ void buf_output_free(struct buf_output *out) { free(out->buf); + buf_output_init(out); } size_t buf_output_add(struct buf_output *out, const char *buf, size_t len) @@ -40,16 +40,3 @@ out->buflen += len; return len; } - -size_t buf_output_flush(struct buf_output *out) -{ - size_t ret = 0; - - if (out->buflen) { - ret = log_info_buf(out->buf, out->buflen); - memset(out->buf, 0, out->max_buflen); - out->buflen = 0; - } - - return ret; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/lib/output_buffer.h new/fio-2.21/lib/output_buffer.h --- old/fio-2.20/lib/output_buffer.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/lib/output_buffer.h 2017-06-15 20:25:03.000000000 +0200 @@ -12,6 +12,5 @@ void buf_output_init(struct buf_output *out); void buf_output_free(struct buf_output *out); size_t buf_output_add(struct buf_output *out, const char *buf, size_t len); -size_t buf_output_flush(struct buf_output *out); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/lib/pattern.c new/fio-2.21/lib/pattern.c --- old/fio-2.20/lib/pattern.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/lib/pattern.c 2017-06-15 20:25:03.000000000 +0200 @@ -4,11 +4,74 @@ #include <limits.h> #include <errno.h> #include <assert.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <unistd.h> #include "strntol.h" #include "pattern.h" #include "../minmax.h" #include "../oslib/strcasestr.h" +#include "../oslib/strndup.h" + +/** + * parse_file() - parses binary file to fill buffer + * @beg - string input, extract filename from this + * @out - output buffer where parsed number should be put + * @out_len - length of the output buffer + * @filled - pointer where number of bytes successfully + * parsed will be put + * + * Returns the end pointer where parsing has been stopped. + * In case of parsing error or lack of bytes in output buffer + * NULL will be returned. + */ +static const char *parse_file(const char *beg, char *out, + unsigned int out_len, + unsigned int *filled) +{ + const char *end; + char *file; + int fd; + ssize_t count; + + if (!out_len) + goto err_out; + + assert(*beg == '\''); + beg++; + end = strchr(beg, '\''); + if (!end) + goto err_out; + + file = strndup(beg, end - beg); + if (file == NULL) + goto err_out; + + fd = open(file, O_RDONLY); + if (fd < 0) + goto err_free_out; + + count = read(fd, out, out_len); + if (count == -1) + goto err_free_close_out; + + *filled = count; + close(fd); + free(file); + + /* Catch up quote */ + return end + 1; + +err_free_close_out: + close(fd); +err_free_out: + free(file); +err_out: + return NULL; + +} /** * parse_string() - parses string in double quotes, like "abc" @@ -271,6 +334,9 @@ parsed_fmt = 0; switch (*beg) { + case '\'': + end = parse_file(beg, out, out_len, &filled); + break; case '"': end = parse_string(beg, out, out_len, &filled); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/libfio.c new/fio-2.21/libfio.c --- old/fio-2.20/libfio.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/libfio.c 2017-06-15 20:25:03.000000000 +0200 @@ -353,14 +353,17 @@ * can run into problems on archs that fault on unaligned fp * access (ARM). */ + compiletime_assert((offsetof(struct thread_data, ts) % sizeof(void *)) == 0, "ts"); compiletime_assert((offsetof(struct thread_stat, percentile_list) % 8) == 0, "stat percentile_list"); compiletime_assert((offsetof(struct thread_stat, total_run_time) % 8) == 0, "total_run_time"); compiletime_assert((offsetof(struct thread_stat, total_err_count) % 8) == 0, "total_err_count"); compiletime_assert((offsetof(struct thread_stat, latency_percentile) % 8) == 0, "stat latency_percentile"); + compiletime_assert((offsetof(struct thread_data, ts.clat_stat) % 8) == 0, "ts.clat_stat"); compiletime_assert((offsetof(struct thread_options_pack, zipf_theta) % 8) == 0, "zipf_theta"); compiletime_assert((offsetof(struct thread_options_pack, pareto_h) % 8) == 0, "pareto_h"); compiletime_assert((offsetof(struct thread_options_pack, percentile_list) % 8) == 0, "percentile_list"); compiletime_assert((offsetof(struct thread_options_pack, latency_percentile) % 8) == 0, "latency_percentile"); + compiletime_assert((offsetof(struct jobs_eta, m_rate) % 8) == 0, "m_rate"); err = endian_check(); if (err) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/log.c new/fio-2.21/log.c --- old/fio-2.20/log.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/log.c 2017-06-15 20:25:03.000000000 +0200 @@ -6,8 +6,16 @@ #include "fio.h" +#define LOG_START_SZ 512 + size_t log_info_buf(const char *buf, size_t len) { + /* + * buf could be NULL (not just ""). + */ + if (!buf) + return 0; + if (is_backend) { size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len); if (ret != -1) @@ -21,40 +29,66 @@ return fwrite(buf, len, 1, f_out); } -size_t log_valist(const char *str, va_list args) +static size_t valist_to_buf(char **buffer, const char *fmt, va_list src_args) { - char buffer[1024]; + size_t len, cur = LOG_START_SZ; + va_list args; + + do { + *buffer = calloc(1, cur); + + va_copy(args, src_args); + len = vsnprintf(*buffer, cur, fmt, args); + va_end(args); + + if (len < cur) + break; + + cur = len + 1; + free(*buffer); + } while (1); + + return len; +} + +size_t log_valist(const char *fmt, va_list args) +{ + char *buffer; size_t len; - len = vsnprintf(buffer, sizeof(buffer), str, args); + len = valist_to_buf(&buffer, fmt, args); + len = log_info_buf(buffer, len); + free(buffer); - return log_info_buf(buffer, min(len, sizeof(buffer) - 1)); + return len; } size_t log_info(const char *format, ...) { - char buffer[1024]; va_list args; - size_t len; + size_t ret; va_start(args, format); - len = vsnprintf(buffer, sizeof(buffer), format, args); + ret = log_valist(format, args); va_end(args); - return log_info_buf(buffer, min(len, sizeof(buffer) - 1)); + return ret; } size_t __log_buf(struct buf_output *buf, const char *format, ...) { - char buffer[1024]; + char *buffer; va_list args; size_t len; va_start(args, format); - len = vsnprintf(buffer, sizeof(buffer), format, args); + len = valist_to_buf(&buffer, format, args); va_end(args); - return buf_output_add(buf, buffer, min(len, sizeof(buffer) - 1)); + len = buf_output_add(buf, buffer, len); + free(buffer); + + return len; } int log_info_flush(void) @@ -67,33 +101,33 @@ size_t log_err(const char *format, ...) { - char buffer[1024]; + size_t ret, len; + char *buffer; va_list args; - size_t len; va_start(args, format); - len = vsnprintf(buffer, sizeof(buffer), format, args); + len = valist_to_buf(&buffer, format, args); va_end(args); - len = min(len, sizeof(buffer) - 1); if (is_backend) { - size_t ret = fio_server_text_output(FIO_LOG_ERR, buffer, len); + ret = fio_server_text_output(FIO_LOG_ERR, buffer, len); if (ret != -1) - return ret; + goto done; } if (log_syslog) { syslog(LOG_INFO, "%s", buffer); - return len; + ret = len; } else { - if (f_err != stderr) { - int fio_unused ret; - + if (f_err != stderr) ret = fwrite(buffer, len, 1, stderr); - } - return fwrite(buffer, len, 1, f_err); + ret = fwrite(buffer, len, 1, f_err); } + +done: + free(buffer); + return ret; } const char *log_get_level(int level) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/log.h new/fio-2.21/log.h --- old/fio-2.20/log.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/log.h 2017-06-15 20:25:03.000000000 +0200 @@ -16,13 +16,15 @@ extern size_t log_info_buf(const char *buf, size_t len); extern int log_info_flush(void); -#define log_buf(buf, format, args...) \ -do { \ - if ((buf) != NULL) \ - __log_buf(buf, format, ##args); \ - else \ - log_info(format, ##args); \ -} while (0) +#define log_buf(buf, format, args...) \ +({ \ + size_t __ret; \ + if ((buf) != NULL) \ + __ret = __log_buf(buf, format, ##args); \ + else \ + __ret = log_info(format, ##args); \ + __ret; \ +}) enum { FIO_LOG_DEBUG = 1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/options.c new/fio-2.21/options.c --- old/fio-2.20/options.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/options.c 2017-06-15 20:25:03.000000000 +0200 @@ -270,7 +270,8 @@ return 0; } -static int ignore_error_type(struct thread_data *td, int etype, char *str) +static int ignore_error_type(struct thread_data *td, enum error_type_bit etype, + char *str) { unsigned int i; int *error; @@ -282,7 +283,7 @@ } td->o.ignore_error_nr[etype] = 4; - error = malloc(4 * sizeof(struct bssplit)); + error = calloc(4, sizeof(int)); i = 0; while ((fname = strsep(&str, ":")) != NULL) { @@ -306,8 +307,9 @@ error[i] = -error[i]; } if (!error[i]) { - log_err("Unknown error %s, please use number value \n", + log_err("Unknown error %s, please use number value\n", fname); + td->o.ignore_error_nr[etype] = 0; free(error); return 1; } @@ -317,8 +319,10 @@ td->o.continue_on_error |= 1 << etype; td->o.ignore_error_nr[etype] = i; td->o.ignore_error[etype] = error; - } else + } else { + td->o.ignore_error_nr[etype] = 0; free(error); + } return 0; @@ -328,7 +332,8 @@ { struct thread_data *td = cb_data_to_td(data); char *str, *p, *n; - int type = 0, ret = 1; + int ret = 1; + enum error_type_bit type = 0; if (parse_dryrun()) return 0; @@ -1381,6 +1386,22 @@ return 0; } +static int str_offset_cb(void *data, unsigned long long *__val) +{ + struct thread_data *td = cb_data_to_td(data); + unsigned long long v = *__val; + + if (parse_is_percent(v)) { + td->o.start_offset = 0; + td->o.start_offset_percent = -1ULL - v; + dprint(FD_PARSE, "SET start_offset_percent %d\n", + td->o.start_offset_percent); + } else + td->o.start_offset = v; + + return 0; +} + static int str_size_cb(void *data, unsigned long long *__val) { struct thread_data *td = cb_data_to_td(data); @@ -1938,6 +1959,7 @@ .lname = "IO offset", .alias = "fileoffset", .type = FIO_OPT_STR_VAL, + .cb = str_offset_cb, .off1 = offsetof(struct thread_options, start_offset), .help = "Start IO from this offset", .def = "0", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/os/os-android.h new/fio-2.21/os/os-android.h --- old/fio-2.20/os/os-android.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/os/os-android.h 2017-06-15 20:25:03.000000000 +0200 @@ -32,6 +32,7 @@ #define FIO_HAVE_HUGETLB #define FIO_HAVE_BLKTRACE #define FIO_HAVE_CL_SIZE +#define FIO_HAVE_CGROUPS #define FIO_HAVE_FS_STAT #define FIO_HAVE_TRIM #define FIO_HAVE_GETTID @@ -59,19 +60,17 @@ #ifndef CONFIG_NO_SHM /* - * The Android NDK doesn't currently export <sys/shm.h>, so define the - * necessary stuff here. + * Bionic doesn't support SysV shared memeory, so implement it using ashmem */ - -#include <sys/shm.h> -#define SHM_HUGETLB 04000 - #include <stdio.h> #include <linux/ashmem.h> +#include <linux/shm.h> +#define shmid_ds shmid64_ds +#define SHM_HUGETLB 04000 #define ASHMEM_DEVICE "/dev/ashmem" -static inline int shmctl (int __shmid, int __cmd, struct shmid_ds *__buf) +static inline int shmctl(int __shmid, int __cmd, struct shmid_ds *__buf) { int ret=0; if (__cmd == IPC_RMID) @@ -84,7 +83,7 @@ return ret; } -static inline int shmget (key_t __key, size_t __size, int __shmflg) +static inline int shmget(key_t __key, size_t __size, int __shmflg) { int fd,ret; char keybuf[11]; @@ -98,7 +97,8 @@ if (ret < 0) goto error; - ret = ioctl(fd, ASHMEM_SET_SIZE, __size); + /* Stores size in first 8 bytes, allocate extra space */ + ret = ioctl(fd, ASHMEM_SET_SIZE, __size + sizeof(uint64_t)); if (ret < 0) goto error; @@ -109,21 +109,22 @@ return ret; } -static inline void *shmat (int __shmid, const void *__shmaddr, int __shmflg) +static inline void *shmat(int __shmid, const void *__shmaddr, int __shmflg) { - size_t *ptr, size = ioctl(__shmid, ASHMEM_GET_SIZE, NULL); - ptr = mmap(NULL, size + sizeof(size_t), PROT_READ | PROT_WRITE, MAP_SHARED, __shmid, 0); - *ptr = size; //save size at beginning of buffer, for use with munmap - return &ptr[1]; + size_t size = ioctl(__shmid, ASHMEM_GET_SIZE, NULL); + /* Needs to be 8-byte aligned to prevent SIGBUS on 32-bit ARM */ + uint64_t *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, __shmid, 0); + /* Save size at beginning of buffer, for use with munmap */ + *ptr = size; + return ptr + 1; } static inline int shmdt (const void *__shmaddr) { - size_t *ptr, size; - ptr = (size_t *)__shmaddr; - ptr--; - size = *ptr; //find mmap size which we stored at the beginning of the buffer - return munmap((void *)ptr, size + sizeof(size_t)); + /* Find mmap size which we stored at the beginning of the buffer */ + uint64_t *ptr = (uint64_t *)__shmaddr - 1; + size_t size = *ptr; + return munmap(ptr, size); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/os/os-linux.h new/fio-2.21/os/os-linux.h --- old/fio-2.20/os/os-linux.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/os/os-linux.h 2017-06-15 20:25:03.000000000 +0200 @@ -16,6 +16,8 @@ #include <linux/unistd.h> #include <linux/raw.h> #include <linux/major.h> +#include <linux/fs.h> +#include <scsi/sg.h> #include "./os-linux-syscall.h" #include "binject.h" @@ -258,6 +260,14 @@ return atoi(size); } +#ifdef __powerpc64__ +#define FIO_HAVE_CPU_ONLINE_SYSCONF +static inline unsigned int cpus_online(void) +{ + return sysconf(_SC_NPROCESSORS_CONF); +} +#endif + static inline unsigned long long get_fs_free_size(const char *path) { unsigned long long ret; @@ -309,6 +319,14 @@ #define RWF_SYNC 0x00000004 #endif +#ifndef RWF_WRITE_LIFE_SHIFT +#define RWF_WRITE_LIFE_SHIFT 4 +#define RWF_WRITE_LIFE_SHORT (1 << RWF_WRITE_LIFE_SHIFT) +#define RWF_WRITE_LIFE_MEDIUM (2 << RWF_WRITE_LIFE_SHIFT) +#define RWF_WRITE_LIFE_LONG (3 << RWF_WRITE_LIFE_SHIFT) +#define RWF_WRITE_LIFE_EXTREME (4 << RWF_WRITE_LIFE_SHIFT) +#endif + #ifndef CONFIG_PWRITEV2 #ifdef __NR_preadv2 static inline void make_pos_h_l(unsigned long *pos_h, unsigned long *pos_l, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/os/os-windows.h new/fio-2.21/os/os-windows.h --- old/fio-2.20/os/os-windows.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/os/os-windows.h 2017-06-15 20:25:03.000000000 +0200 @@ -116,7 +116,6 @@ ssize_t pread(int fildes, void *buf, size_t nbyte, off_t offset); ssize_t pwrite(int fildes, const void *buf, size_t nbyte, off_t offset); -extern void td_fill_rand_seeds(struct thread_data *); static inline int blockdev_size(struct fio_file *f, unsigned long long *bytes) { @@ -239,7 +238,7 @@ return 0; } -static inline int init_random_state(struct thread_data *td, unsigned long *rand_seeds, int size) +static inline int init_random_seeds(unsigned long *rand_seeds, int size) { HCRYPTPROV hCryptProv; @@ -258,7 +257,6 @@ } CryptReleaseContext(hCryptProv, 0); - td_fill_rand_seeds(td); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/os/os.h new/fio-2.21/os/os.h --- old/fio-2.20/os/os.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/os/os.h 2017-06-15 20:25:03.000000000 +0200 @@ -60,11 +60,6 @@ #endif #endif -#ifdef FIO_HAVE_SGIO -#include <linux/fs.h> -#include <scsi/sg.h> -#endif - #ifndef CONFIG_STRSEP #include "../oslib/strsep.h" #endif @@ -253,19 +248,6 @@ __cpu_to_le64(val); \ }) -#ifndef FIO_HAVE_BLKTRACE -static inline int is_blktrace(const char *fname, int *need_swap) -{ - return 0; -} -struct thread_data; -static inline int load_blktrace(struct thread_data *td, const char *fname, - int need_swap) -{ - return 1; -} -#endif - #define FIO_DEF_CL_SIZE 128 static inline int os_cache_line_size(void) @@ -316,12 +298,7 @@ #endif #ifdef FIO_USE_GENERIC_INIT_RANDOM_STATE -extern void td_fill_rand_seeds(struct thread_data *td); -/* - * Initialize the various random states we need (random io, block size ranges, - * read/write mix, etc). - */ -static inline int init_random_state(struct thread_data *td, unsigned long *rand_seeds, int size) +static inline int init_random_seeds(unsigned long *rand_seeds, int size) { int fd; @@ -336,7 +313,6 @@ } close(fd); - td_fill_rand_seeds(td); return 0; } #endif @@ -348,14 +324,6 @@ } #endif -#ifdef __powerpc64__ -#define FIO_HAVE_CPU_ONLINE_SYSCONF -static inline unsigned int cpus_online(void) -{ - return sysconf(_SC_NPROCESSORS_CONF); -} -#endif - #ifndef FIO_HAVE_CPU_ONLINE_SYSCONF static inline unsigned int cpus_online(void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/os/windows/install.wxs new/fio-2.21/os/windows/install.wxs --- old/fio-2.20/os/windows/install.wxs 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/os/windows/install.wxs 2017-06-15 20:25:03.000000000 +0200 @@ -10,7 +10,7 @@ <Product Id="*" Codepage="1252" Language="1033" Manufacturer="fio" Name="fio" - UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.20"> + UpgradeCode="2338A332-5511-43CF-B9BD-5C60496CCFCC" Version="2.21"> <Package Description="Flexible IO Tester" InstallerVersion="301" Keywords="Installer,MSI,Database" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/oslib/linux-dev-lookup.c new/fio-2.21/oslib/linux-dev-lookup.c --- old/fio-2.20/oslib/linux-dev-lookup.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/oslib/linux-dev-lookup.c 2017-06-15 20:25:03.000000000 +0200 @@ -20,7 +20,7 @@ return 0; while ((dir = readdir(D)) != NULL) { - char full_path[256]; + char full_path[257]; if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, "..")) continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/oslib/strndup.c new/fio-2.21/oslib/strndup.c --- old/fio-2.20/oslib/strndup.c 1970-01-01 01:00:00.000000000 +0100 +++ new/fio-2.21/oslib/strndup.c 2017-06-15 20:25:03.000000000 +0200 @@ -0,0 +1,18 @@ +#include <stdlib.h> +#include "strndup.h" + +#ifndef CONFIG_HAVE_STRNDUP + +char *strndup(const char *s, size_t n) +{ + char *str = malloc(n + 1); + + if (str) { + strncpy(str, s, n); + str[n] = '\0'; + } + + return str; +} + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/oslib/strndup.h new/fio-2.21/oslib/strndup.h --- old/fio-2.20/oslib/strndup.h 1970-01-01 01:00:00.000000000 +0100 +++ new/fio-2.21/oslib/strndup.h 2017-06-15 20:25:03.000000000 +0200 @@ -0,0 +1,7 @@ +#include <string.h> + +#ifndef CONFIG_HAVE_STRNDUP + +char *strndup(const char *s, size_t n); + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/server.c new/fio-2.21/server.c --- old/fio-2.20/server.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/server.c 2017-06-15 20:25:03.000000000 +0200 @@ -1279,7 +1279,7 @@ ret = getsockname(sk, sockaddr_p, &len); if (ret) { - log_err("fio: getsockaddr: %s\n", strerror(errno)); + log_err("fio: getsockname: %s\n", strerror(errno)); return -1; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/server.h new/fio-2.21/server.h --- old/fio-2.20/server.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/server.h 2017-06-15 20:25:03.000000000 +0200 @@ -49,7 +49,7 @@ }; enum { - FIO_SERVER_VER = 61, + FIO_SERVER_VER = 62, FIO_SERVER_MAX_FRAGMENT_PDU = 1024, FIO_SERVER_MAX_CMD_MB = 2048, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/stat.c new/fio-2.21/stat.c --- old/fio-2.20/stat.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/stat.c 2017-06-15 20:25:03.000000000 +0200 @@ -919,7 +919,8 @@ iops = (1000.0 * (uint64_t) ts->total_io_u[ddir]) / runt; } - json_object_add_value_int(dir_object, "io_bytes", ts->io_bytes[ddir] >> 10); + json_object_add_value_int(dir_object, "io_bytes", ts->io_bytes[ddir]); + json_object_add_value_int(dir_object, "io_kbytes", ts->io_bytes[ddir] >> 10); json_object_add_value_int(dir_object, "bw", bw); json_object_add_value_float(dir_object, "iops", iops); json_object_add_value_int(dir_object, "runtime", ts->runtime[ddir]); @@ -1825,8 +1826,10 @@ } for (i = 0; i < FIO_OUTPUT_NR; i++) { - buf_output_flush(&output[i]); - buf_output_free(&output[i]); + struct buf_output *out = &output[i]; + + log_info_buf(out->buf, out->buflen); + buf_output_free(out); } log_info_flush(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/stat.h new/fio-2.21/stat.h --- old/fio-2.20/stat.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/stat.h 2017-06-15 20:25:03.000000000 +0200 @@ -242,17 +242,17 @@ uint32_t nr_pending; uint32_t nr_setting_up; - uint32_t files_open; - uint64_t m_rate[DDIR_RWDIR_CNT], t_rate[DDIR_RWDIR_CNT]; - uint32_t m_iops[DDIR_RWDIR_CNT], t_iops[DDIR_RWDIR_CNT]; uint64_t rate[DDIR_RWDIR_CNT]; + uint32_t m_iops[DDIR_RWDIR_CNT], t_iops[DDIR_RWDIR_CNT]; uint32_t iops[DDIR_RWDIR_CNT]; uint64_t elapsed_sec; uint64_t eta_sec; uint32_t is_pow2; uint32_t unit_base; + uint32_t files_open; + /* * Network 'copy' of run_str[] */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/td_error.c new/fio-2.21/td_error.c --- old/fio-2.20/td_error.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/td_error.c 2017-06-15 20:25:03.000000000 +0200 @@ -20,8 +20,7 @@ if (!td->o.ignore_error[etype]) { td->o.ignore_error[etype] = __NON_FATAL_ERR; - td->o.ignore_error_nr[etype] = sizeof(__NON_FATAL_ERR) - / sizeof(int); + td->o.ignore_error_nr[etype] = ARRAY_SIZE(__NON_FATAL_ERR); } if (!(td->o.continue_on_error & (1 << etype))) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/td_error.h new/fio-2.21/td_error.h --- old/fio-2.20/td_error.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/td_error.h 2017-06-15 20:25:03.000000000 +0200 @@ -2,7 +2,8 @@ #define FIO_TD_ERROR_H /* - * What type of errors to continue on when continue_on_error is used + * What type of errors to continue on when continue_on_error is used, + * and what type of errors to ignore when ignore_error is used. */ enum error_type_bit { ERROR_TYPE_READ_BIT = 0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/thread_options.h new/fio-2.21/thread_options.h --- old/fio-2.20/thread_options.h 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/thread_options.h 2017-06-15 20:25:03.000000000 +0200 @@ -200,6 +200,7 @@ unsigned int numa_mem_prefer_node; char *numa_memnodes; unsigned int gpu_dev_id; + unsigned int start_offset_percent; unsigned int iolog; unsigned int rwmixcycle; @@ -469,7 +470,7 @@ uint8_t log_gz_cpumask[FIO_TOP_STR_MAX]; #endif uint32_t gpu_dev_id; - uint32_t pad; + uint32_t start_offset_percent; uint32_t cpus_allowed_policy; uint32_t iolog; uint32_t rwmixcycle; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/fio-2.20/verify.c new/fio-2.21/verify.c --- old/fio-2.20/verify.c 2017-05-19 16:25:27.000000000 +0200 +++ new/fio-2.21/verify.c 2017-06-15 20:25:03.000000000 +0200 @@ -271,6 +271,7 @@ fd = open(fname, O_CREAT | O_TRUNC | O_WRONLY, 0644); if (fd < 0) { perror("open verify buf file"); + free(ptr); return; }

1 0

commit a2ps for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package a2ps for openSUSE:Factory checked in at 2017-06-29 15:21:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/a2ps (Old) and /work/SRC/openSUSE:Factory/.a2ps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "a2ps" Thu Jun 29 15:21:49 2017 rev:43 rq:506990 version:4.14 Changes: -------- --- /work/SRC/openSUSE:Factory/a2ps/a2ps.changes 2017-06-05 18:51:17.221226420 +0200 +++ /work/SRC/openSUSE:Factory/.a2ps.new/a2ps.changes 2017-06-29 15:22:00.942528234 +0200 @@ -1,0 +2,5 @@ +Thu Jun 29 09:14:23 UTC 2017 - werner(a)suse.de + +- Be more flexible in patching man/a2ps.1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ a2ps.spec ++++++ --- /var/tmp/diff_new_pack.0DPWzL/_old 2017-06-29 15:22:04.422036398 +0200 +++ /var/tmp/diff_new_pack.0DPWzL/_new 2017-06-29 15:22:04.426035833 +0200 @@ -178,6 +178,8 @@ if test -e man/a2ps.1.rej ; then cat man/a2ps.1.rej exit 1 + else + sed -ri '/^\.B lt-a2ps/{s/lt-(a2ps)/\1/}' man/a2ps.1 || : fi %install ++++++ a2ps-4.14-manuals.diff ++++++ --- /var/tmp/diff_new_pack.0DPWzL/_old 2017-06-29 15:22:04.514023395 +0200 +++ /var/tmp/diff_new_pack.0DPWzL/_new 2017-06-29 15:22:04.518022830 +0200 @@ -1,18 +1,9 @@ --- - man/a2ps.1 | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) + man/a2ps.1 | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) --- man/a2ps.1 +++ man/a2ps.1 2014-08-07 14:32:29.000000000 +0000 -@@ -3,7 +3,7 @@ - .SH NAME - a2ps \- format files for printing on a PostScript printer - .SH SYNOPSIS --.B lt-a2ps -+.B a2ps - [\fIOPTION\fR]... [\fIFILE\fR]... - .SH DESCRIPTION - .\" Add any additional description here @@ -81,8 +81,7 @@ first fill (DIRECTION=) rows, or columns predefined font sizes and layouts for 1.. 9 virtuals .TP

1 0

commit xplayer for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package xplayer for openSUSE:Factory checked in at 2017-06-29 15:21:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xplayer (Old) and /work/SRC/openSUSE:Factory/.xplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xplayer" Thu Jun 29 15:21:39 2017 rev:11 rq:506988 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xplayer/xplayer.changes 2017-05-27 13:13:04.348399843 +0200 +++ /work/SRC/openSUSE:Factory/.xplayer.new/xplayer.changes 2017-06-29 15:21:51.871810402 +0200 @@ -1,0 +2,6 @@ +Wed Jun 28 19:20:44 UTC 2017 - sor.alexei(a)meowr.ru + +- Update to version 1.4.3: + * Update translations. + +------------------------------------------------------------------- Old: ---- xplayer-1.4.2.tar.gz New: ---- xplayer-1.4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xplayer.spec ++++++ --- /var/tmp/diff_new_pack.3n1ih1/_old 2017-06-29 15:21:53.011649282 +0200 +++ /var/tmp/diff_new_pack.3n1ih1/_new 2017-06-29 15:21:53.015648717 +0200 @@ -18,7 +18,7 @@ %bcond_without zeitgeist Name: xplayer -Version: 1.4.2 +Version: 1.4.3 Release: 0 Summary: Generic media player License: GPL-2.0+ and LGPL-2.1+ ++++++ xplayer-1.4.2.tar.gz -> xplayer-1.4.3.tar.gz ++++++ ++++ 1979 lines of diff (skipped)

1 0

commit coreboot-utils for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package coreboot-utils for openSUSE:Factory checked in at 2017-06-29 15:21:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coreboot-utils (Old) and /work/SRC/openSUSE:Factory/.coreboot-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "coreboot-utils" Thu Jun 29 15:21:13 2017 rev:23 rq:506986 version:4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/coreboot-utils/coreboot-utils.changes 2017-05-16 14:38:11.785793595 +0200 +++ /work/SRC/openSUSE:Factory/.coreboot-utils.new/coreboot-utils.changes 2017-06-29 15:21:38.405713871 +0200 @@ -1,0 +2,7 @@ +Fri Jun 16 12:00:39 UTC 2017 - alarrosa(a)suse.com + +- Add do-explicit-fallthrough.patch to fix a build failure with gcc7 + with an implicit fallthrough over switch cases (only on TW) +- Add -fPIC to no-pie.patch and remove -fno-pic to build with gcc7 + +------------------------------------------------------------------- New: ---- do-explicit-fallthrough.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coreboot-utils.spec ++++++ --- /var/tmp/diff_new_pack.s64XKZ/_old 2017-06-29 15:21:47.144478622 +0200 +++ /var/tmp/diff_new_pack.s64XKZ/_new 2017-06-29 15:21:47.144478622 +0200 @@ -26,6 +26,7 @@ Source0: http://www.coreboot.org/releases/coreboot-%{version}.tar.xz Patch1: no-pie.patch Patch2: k8resdump.diff +Patch3: do-explicit-fallthrough.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gcc-c++ BuildRequires: pciutils-devel @@ -40,8 +41,13 @@ %prep %setup -q -n coreboot-%{version} +%if 0%{?suse_version} > 1320 %patch1 -p1 +%endif %patch2 -p1 +%if 0%{?suse_version} > 1320 +%patch3 -p1 +%endif %build make %{?_smp_mflags} CFLAGS="%{optflags}" -C util/ectool ++++++ do-explicit-fallthrough.patch ++++++ Index: coreboot-4.5/util/cbfstool/lz4/lib/lz4frame.c =================================================================== --- coreboot-4.5.orig/util/cbfstool/lz4/lib/lz4frame.c +++ coreboot-4.5/util/cbfstool/lz4/lib/lz4frame.c @@ -1091,7 +1091,7 @@ size_t LZ4F_decompress(LZ4F_decompressio dctxPtr->tmpInTarget = minFHSize; /* minimum to attempt decode */ dctxPtr->dStage = dstage_storeHeader; } - + __attribute__ ((fallthrough)); case dstage_storeHeader: { size_t sizeToCopy = dctxPtr->tmpInTarget - dctxPtr->tmpInSize; ++++++ no-pie.patch ++++++ --- /var/tmp/diff_new_pack.s64XKZ/_old 2017-06-29 15:21:47.200470707 +0200 +++ /var/tmp/diff_new_pack.s64XKZ/_new 2017-06-29 15:21:47.200470707 +0200 @@ -8,8 +8,8 @@ PREFIX = @PREFIX@ -CFLAGS = @CFLAGS@ -fno-pic -LDFLAGS = @LDFLAGS@ -+CFLAGS = @CFLAGS@ -fno-pic -fno-PIE -+LDFLAGS = @LDFLAGS@ -no-pie ++CFLAGS = @CFLAGS@ -fPIC -fno-PIE ++LDFLAGS = @LDFLAGS@ -fPIC -no-pie TARGETS = geodegx2.o geodelx.o cs5536.o k8.o intel_pentium3_early.o intel_pentium3.o intel_pentium4_early.o intel_pentium4_later.o intel_core1.o intel_core2_early.o intel_core2_later.o intel_nehalem.o intel_atom.o SYSTEMS = linux.o darwin.o freebsd.o

1 0

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

29 Jun '17

Hello community, here is the log from the commit of package python-compizconfig for openSUSE:Factory checked in at 2017-06-29 15:21:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-compizconfig (Old) and /work/SRC/openSUSE:Factory/.python-compizconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-compizconfig" Thu Jun 29 15:21:00 2017 rev:7 rq:506985 version:0.8.14 Changes: -------- --- /work/SRC/openSUSE:Factory/python-compizconfig/python-compizconfig.changes 2017-05-16 14:46:59.195690384 +0200 +++ /work/SRC/openSUSE:Factory/.python-compizconfig.new/python-compizconfig.changes 2017-06-29 15:21:15.220991105 +0200 @@ -1,0 +2,5 @@ +Wed Jun 28 19:20:44 UTC 2017 - sor.alexei(a)meowr.ru + +- Fix building on openSUSE older than openSUSE Leap 15.x. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-compizconfig.spec ++++++ --- /var/tmp/diff_new_pack.1fJVtj/_old 2017-06-29 15:21:21.568093920 +0200 +++ /var/tmp/diff_new_pack.1fJVtj/_new 2017-06-29 15:21:21.568093920 +0200 @@ -38,7 +38,7 @@ Requires: compiz < 0.9 Obsoletes: ccs-python < %{version} Provides: ccs-python = %{version} -%if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200 +%if 0%{?suse_version} > 1320 BuildRequires: python2-Cython %else BuildRequires: python-Cython @@ -50,8 +50,8 @@ %if 0%{?suse_version} > 1320 || 0%{?sle_version} > 120200 %package -n python2-compizconfig Summary: Python bindings for libraries for compizconfig-settings -Group: Development/Libraries/Python # python-compizconfig was last used in openSUSE Leap 14.2. +Group: Development/Libraries/Python Provides: python-compizconfig = %{version} Obsoletes: python-compizconfig < %{version}

1 0

commit rubygem-facter for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package rubygem-facter for openSUSE:Factory checked in at 2017-06-29 15:20:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-facter (Old) and /work/SRC/openSUSE:Factory/.rubygem-facter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-facter" Thu Jun 29 15:20:51 2017 rev:9 rq:506981 version:2.4.6 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-facter/rubygem-facter.changes 2016-10-10 16:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-facter.new/rubygem-facter.changes 2017-06-29 15:21:06.330247844 +0200 @@ -1,0 +2,6 @@ +Tue Jun 27 16:12:10 UTC 2017 - kstreitova(a)suse.com + +- add facter-vlan_interfaces.patch in order to recognize VLAN + tagged interfaces correctly [bsc#1040363] + +------------------------------------------------------------------- New: ---- facter-vlan_interfaces.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-facter.spec ++++++ --- /var/tmp/diff_new_pack.Cu5C0T/_old 2017-06-29 15:21:08.173987224 +0200 +++ /var/tmp/diff_new_pack.Cu5C0T/_new 2017-06-29 15:21:08.173987224 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-facter # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,12 +37,13 @@ BuildRequires: %{rubygem gem2rpm} BuildRequires: update-alternatives Url: https://github.com/puppetlabs/facter -Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source: https://rubygems.org/gems/%{mod_full_name}.gem Source1: %{mod_name}.8 Source2: gem2rpm.yml # MANUAL Patch0: %{mod_name}-ip-interface.patch Patch1: %{mod_name}-detect-recent-opensuse.patch +Patch2: %{mod_name}-vlan_interfaces.patch # /MANUAL Summary: Facter, a system inventory tool License: Apache-2.0 @@ -56,6 +57,7 @@ %gem_unpack %patch0 -p1 %patch1 -p1 +%patch2 -p0 find -type f -print0 | xargs -0 touch -r %{S:0} %gem_build ++++++ facter-vlan_interfaces.patch ++++++ --- lib/facter/util/ip.rb.orig 2017-06-27 18:24:06.427331472 +0200 +++ lib/facter/util/ip.rb 2017-06-27 18:24:14.203440910 +0200 @@ -83,6 +83,7 @@ when 'Linux' output = Facter::Util::IP.exec_ip(["link"]) output.gsub!(/^\d+:\s*/, "") # delete leading number + output.gsub!(/@[^:]+/, "") # delete physical interface name in case of tagged vlan like "vlan100@bond0" when 'OpenBSD', 'NetBSD', 'FreeBSD', 'Darwin', 'GNU/kFreeBSD', 'DragonFly', 'AIX' output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"]) when 'SunOS' ++++++ gem2rpm.yml ++++++ --- /var/tmp/diff_new_pack.Cu5C0T/_old 2017-06-29 15:21:08.237978180 +0200 +++ /var/tmp/diff_new_pack.Cu5C0T/_new 2017-06-29 15:21:08.237978180 +0200 @@ -25,6 +25,8 @@ '%{mod_name}-ip-interface.patch': -p1 # PATCH-FIX-UPSTREAM - FACT-1496 '%{mod_name}-detect-recent-opensuse.patch': -p1 + # PATCH-FIX-SUSE - bsc#1040363 + '%{mod_name}-vlan_interfaces.patch': -p0 :post_install: |- mkdir -p %{buildroot}%{_sysconfdir}/%{mod_name}/facts.d install -Dm0444 %{SOURCE1} %{buildroot}%{_mandir}/man8/%{mod_name}.8

1 0

commit qpid-cpp for openSUSE:Factory
by root＠hilbert.suse.de 29 Jun '17

29 Jun '17

Hello community, here is the log from the commit of package qpid-cpp for openSUSE:Factory checked in at 2017-06-29 15:20:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qpid-cpp (Old) and /work/SRC/openSUSE:Factory/.qpid-cpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qpid-cpp" Thu Jun 29 15:20:15 2017 rev:7 rq:506946 version:1.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qpid-cpp/qpid-cpp.changes 2017-03-12 20:02:58.186503674 +0100 +++ /work/SRC/openSUSE:Factory/.qpid-cpp.new/qpid-cpp.changes 2017-06-29 15:20:55.431788385 +0200 @@ -1,0 +2,13 @@ +Wed Jun 28 11:10:28 UTC 2017 - mlin(a)suse.com + +- Add patches to fix build failure + * 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch + - Fix build problem in broker. + * 0001-QPID-7714-Suppress-very-verbose-warnings.patch + - Suppress warnings per gcc7. + * 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch + - Fix compile with newer nss and sasl. + * Suppress-maybe-uninitialized-warning.diff + - Suppress -Werror=maybe-uninitialized if gcc version great than 7. + +------------------------------------------------------------------- New: ---- 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch 0001-QPID-7714-Suppress-very-verbose-warnings.patch Suppress-maybe-uninitialized-warning.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qpid-cpp.spec ++++++ --- /var/tmp/diff_new_pack.aSpf9y/_old 2017-06-29 15:20:56.895581471 +0200 +++ /var/tmp/diff_new_pack.aSpf9y/_new 2017-06-29 15:20:56.899580906 +0200 @@ -31,6 +31,14 @@ Patch3: qpid-cpp-initdir.patch Patch4: %{name}-0.30-cmake.patch Patch5: %{name}-aarch64.patch +# PATCH-FIX-UPSTREAM 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch +Patch6: 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch +# PATCH-FIX-UPSTREAM 0001-QPID-7714-Suppress-very-verbose-warnings.patch +Patch7: 0001-QPID-7714-Suppress-very-verbose-warnings.patch +# PATCH-FIX-UPSTREAM 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch +Patch8: 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch +# PATCH-FIX-OPENSUSE Suppress-maybe-uninitialized-warning.diff +Patch9: Suppress-maybe-uninitialized-warning.diff %if 0%{?suse_version} > 1325 BuildRequires: libboost_program_options-devel BuildRequires: libboost_system-devel @@ -374,6 +382,10 @@ %patch3 -p1 -b .initdir %patch4 -p1 %patch5 -p2 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest" ++++++ 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch ++++++ >From f04bc169f11c99be50399341905186b3405a3130 Mon Sep 17 00:00:00 2001 From: Justin Ross <jross(a)apache.org> Date: Thu, 23 Mar 2017 05:53:51 -0700 Subject: [PATCH] QPID-7629: Use the CMake SYSTEM keyword when including headers for nss and sasl --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7bc6f2c22..6ee474f29 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -371,7 +371,7 @@ if (BUILD_SASL) qpid/sys/cyrus/CyrusSecurityLayer.h qpid/sys/cyrus/CyrusSecurityLayer.cpp ) - include_directories (${CYRUS_SASL_INCLUDE_DIR}) + include_directories (SYSTEM ${CYRUS_SASL_INCLUDE_DIR}) set(sasl_LIB ${CYRUS_SASL_LIBRARY}) set(HAVE_SASL 1) else (BUILD_SASL) @@ -451,7 +451,7 @@ if (BUILD_SSL) # Add include directories and link directories for NSS # unfortunately this doesn't get done automatically for # libraries detected by FindPkgConfig - include_directories(${ssl_INCLUDES}) + include_directories(SYSTEM ${ssl_INCLUDES}) link_directories(${ssl_LIBDIRS}) endif (BUILD_SSL) -- 2.12.3 ++++++ 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch ++++++ >From 25e73e5a4c33783ff3e25f24c78a3608b7c32ea6 Mon Sep 17 00:00:00 2001 From: Alan Conway <aconway(a)redhat.com> Date: Wed, 15 Feb 2017 18:29:12 -0500 Subject: [PATCH] QPID-7674: Broker bulid problem with GCC 7, add version check Only add the -Wno-implicit-fallthrough flag for GCC >= 7.0.0 --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Index: qpid-cpp-1.36.0/CMakeLists.txt =================================================================== --- qpid-cpp-1.36.0.orig/CMakeLists.txt +++ qpid-cpp-1.36.0/CMakeLists.txt @@ -142,8 +142,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) # -Wunreachable-code -Wpadded -Winline # -Wshadow - warns about boost headers. set (WARNING_FLAGS - "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations") + "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations") + if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7) + message("FIXME FLAGGING") + set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-implicit-fallthrough") + endif() set (CATCH_UNDEFINED "-Wl,--no-undefined") # gcc on SunOS uses native linker whose "-z defs" is too fussy if (CMAKE_SYSTEM_NAME STREQUAL SunOS) ++++++ 0001-QPID-7714-Suppress-very-verbose-warnings.patch ++++++ >From 874ecfaa2c168e211ee1f250d880e9d06cbad8ef Mon Sep 17 00:00:00 2001 From: Justin Ross <jross(a)apache.org> Date: Wed, 22 Mar 2017 05:41:08 -0700 Subject: [PATCH] QPID-7714: Suppress very verbose warnings --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: qpid-cpp-1.36.0/CMakeLists.txt =================================================================== --- qpid-cpp-1.36.0.orig/CMakeLists.txt +++ qpid-cpp-1.36.0/CMakeLists.txt @@ -142,7 +142,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) # -Wunreachable-code -Wpadded -Winline # -Wshadow - warns about boost headers. set (WARNING_FLAGS - "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations") + "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-deprecated-declarations") if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7) message("FIXME FLAGGING") @@ -154,7 +154,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) set (CATCH_UNDEFINED "") endif (CMAKE_SYSTEM_NAME STREQUAL SunOS) set (NOSTRICT_ALIASING "-fno-strict-aliasing") - set (COMPILER_FLAGS "-fvisibility-inlines-hidden") + set (COMPILER_FLAGS "-fvisibility-inlines-hidden -std=gnu++03") # gcc 4.1.2 on RHEL 5 needs -Wno-attributes to avoid an error that's fixed # in later gcc versions. execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion ++++++ Suppress-maybe-uninitialized-warning.diff ++++++ Index: qpid-cpp-1.36.0/CMakeLists.txt =================================================================== --- qpid-cpp-1.36.0.orig/CMakeLists.txt +++ qpid-cpp-1.36.0/CMakeLists.txt @@ -146,7 +146,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7) message("FIXME FLAGGING") - set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-implicit-fallthrough") + set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-implicit-fallthrough -Wno-error=maybe-uninitialized") endif() set (CATCH_UNDEFINED "-Wl,--no-undefined") # gcc on SunOS uses native linker whose "-z defs" is too fussy

1 0