December 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libraw for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package libraw for openSUSE:Factory checked in at 2015-12-01 09:17:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libraw (Old) and /work/SRC/openSUSE:Factory/.libraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libraw" Changes: -------- --- /work/SRC/openSUSE:Factory/libraw/libraw.changes 2015-06-17 16:15:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libraw.new/libraw.changes 2015-12-01 09:17:50.000000000 +0100 @@ -1,0 +2,27 @@ +Fri Nov 13 16:27:05 UTC 2015 - jengelh(a)inai.de + +- Update to new upstream release 0.17.0 +* Fixed dcraw.c ljpeg_start possibly buffer overrun +* C API extension to support 3DLut Creator +* More metadata parsing/extraction: XMP packet extracted (if + exists), DNG Color information parsed, GPS data (partially) + parsed, EXIF/Makernotes parsed for used optics (for both RAW + files and DNG converted by Adobe convertor). +* Exif/Makernotes parser callback (called for each processed tag) +* Sony ARW2.3 decoder: params.sony_arw2_hack removed, decoded data + are always in 0...17k range (note the difference with dcraw!); + Additional processing options for Sony lossy compression techincal + analysis. +* Dcraw 9.26 imported (but some changes not approved because Libraw + does it better) with some exceptions: no Pentax K3-II frame + selection code; and no built-in JPEG decompressor. +* Many improvements in data decoding/processing: Correct decoding + of black level values from metadata for many formats, LibRaw does + not rely on hardcoded black levels. +* 224 camera models added to supported camera list. Some of them are + new (released since LibRaw 0.16 come out), some was supported + before, but missed from the list. +* Fujifilm F700/S20Pro second frame support +- Add retval.diff to resolve new compiler warnings + +------------------------------------------------------------------- Old: ---- LibRaw-0.16.2.tar.gz New: ---- LibRaw-0.17.0.tar.gz retval.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libraw.spec ++++++ --- /var/tmp/diff_new_pack.eA7KQv/_old 2015-12-01 09:17:51.000000000 +0100 +++ /var/tmp/diff_new_pack.eA7KQv/_new 2015-12-01 09:17:51.000000000 +0100 @@ -19,8 +19,8 @@ %define tar_name LibRaw Name: libraw -%define lname libraw10 -Version: 0.16.2 +%define lname libraw15 +Version: 0.17.0 Release: 0 Summary: Library for reading RAW files obtained from digital photo cameras License: CDDL-1.0 or LGPL-2.1 @@ -29,6 +29,7 @@ #Git-Clone: git://github.com/LibRaw/LibRaw Source: http://www.libraw.org/data/%tar_name-%version.tar.gz +Patch1: retval.diff BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjasper-devel @@ -95,6 +96,7 @@ %prep %setup -qn %tar_name-%version +%patch -P 1 -p1 %build export CXXFLAGS="%optflags -fPIC" @@ -103,6 +105,7 @@ make %{?_smp_mflags} %install +find doc -type f -name "*.html" -exec chmod a-x "{}" "+" mv doc manual # The source tree has these with execute permissions for some reason chmod -x Changelog.txt LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf ++++++ LibRaw-0.16.2.tar.gz -> LibRaw-0.17.0.tar.gz ++++++ ++++ 79118 lines of diff (skipped) ++++++ retval.diff ++++++ From: Jan Engelhardt <jengelh(a)inai.de> Date: 2015-11-13 17:24:03.127632735 +0100 rpmlint says: I: Program returns random data in a function E: libraw no-return-in-nonvoid-function internal/dcraw_common.cpp:1710 gcc: internal/dcraw_common.cpp: In member function 'int LibRaw::phase_one_correct()': internal/dcraw_common.cpp:1710:1: warning: control reaches end of non-void function [-Wreturn-type] --- internal/dcraw_common.cpp | 1 + 1 file changed, 1 insertion(+) Index: LibRaw-0.17.0/internal/dcraw_common.cpp =================================================================== --- LibRaw-0.17.0.orig/internal/dcraw_common.cpp +++ LibRaw-0.17.0/internal/dcraw_common.cpp @@ -1707,6 +1707,7 @@ int CLASS phase_one_correct() return LIBRAW_CANCELLED_BY_CALLBACK; } #endif + return 0; } void CLASS phase_one_load_raw()

1 0

commit gssdp for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package gssdp for openSUSE:Factory checked in at 2015-12-01 09:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gssdp (Old) and /work/SRC/openSUSE:Factory/.gssdp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gssdp" Changes: -------- --- /work/SRC/openSUSE:Factory/gssdp/gssdp.changes 2015-01-08 23:05:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gssdp.new/gssdp.changes 2015-12-01 09:17:45.000000000 +0100 @@ -1,0 +2,10 @@ +Sun Nov 22 15:22:47 UTC 2015 - zaitor(a)opensuse.org + +- Update to version 0.14.12: + + Fix issues with names of loopback device on *BSD. + + Move gtest code one level up and examples to their own folder. + + Fix a possible NULL derefence in gssdp-device-sniffer. + + Remove use of gnome-common for building. + + Bugs fixed: bgo#743070. + +------------------------------------------------------------------- Old: ---- gssdp-0.14.11.tar.xz New: ---- gssdp-0.14.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gssdp.spec ++++++ --- /var/tmp/diff_new_pack.4tcB1J/_old 2015-12-01 09:17:46.000000000 +0100 +++ /var/tmp/diff_new_pack.4tcB1J/_new 2015-12-01 09:17:46.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gssdp # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: gssdp -Version: 0.14.11 +Version: 0.14.12 Release: 0 Summary: Library for resource discovery and announcement over SSDP License: LGPL-2.0+ ++++++ gssdp-0.14.11.tar.xz -> gssdp-0.14.12.tar.xz ++++++ ++++ 11150 lines of diff (skipped)

1 0

commit libX11 for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package libX11 for openSUSE:Factory checked in at 2015-12-01 09:17:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libX11 (Old) and /work/SRC/openSUSE:Factory/.libX11.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libX11" Changes: -------- --- /work/SRC/openSUSE:Factory/libX11/libX11.changes 2015-03-16 09:37:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libX11.new/libX11.changes 2015-12-01 09:17:39.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Nov 23 15:42:49 UTC 2015 - msrb(a)suse.com + +- U_fix_for_Xlib_32-bit_request_number_issues.patch + * Fix for overflow of requet number on 32bit platforms. + (bnc#845916) + +------------------------------------------------------------------- New: ---- U_fix_for_Xlib_32-bit_request_number_issues.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libX11.spec ++++++ --- /var/tmp/diff_new_pack.93Y1wV/_old 2015-12-01 09:17:40.000000000 +0100 +++ /var/tmp/diff_new_pack.93Y1wV/_new 2015-12-01 09:17:40.000000000 +0100 @@ -34,6 +34,7 @@ Patch9: p_xlib_skip_ext_env.diff # PATCH-FIX-UPSTREAM en-locales.diff fdo#48596 bnc#388711 -- Add missing data for more en locales Patch15: en-locales.diff +Patch16: U_fix_for_Xlib_32-bit_request_number_issues.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf >= 2.60 @@ -141,6 +142,7 @@ %patch7 -p0 %patch9 -p0 %patch15 -p0 +%patch16 -p1 %build # Got patches which change auto*files ++++++ U_fix_for_Xlib_32-bit_request_number_issues.patch ++++++ ++++ 718 lines (skipped)

1 0

commit rubygem-yast-rake for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package rubygem-yast-rake for openSUSE:Factory checked in at 2015-12-01 09:17:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-yast-rake (Old) and /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rubygem-yast-rake" Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-yast-rake/rubygem-yast-rake.changes 2015-10-25 15:10:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.rubygem-yast-rake.new/rubygem-yast-rake.changes 2015-12-01 09:17:33.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 23 14:55:57 UTC 2015 - jreidinger(a)suse.com + +- fix build target for sle12sp2 (bnc#0) +- 0.2.6 + +------------------------------------------------------------------- +Wed Oct 28 15:18:23 UTC 2015 - ancor(a)suse.com + +- added target sle12sp2 ( needed for SP1 maintenance bnc#1) +- 0.2.5 + +------------------------------------------------------------------- Old: ---- yast-rake-0.2.4.gem New: ---- yast-rake-0.2.6.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-yast-rake.spec ++++++ --- /var/tmp/diff_new_pack.rpa5Di/_old 2015-12-01 09:17:34.000000000 +0100 +++ /var/tmp/diff_new_pack.rpa5Di/_new 2015-12-01 09:17:34.000000000 +0100 @@ -17,7 +17,7 @@ Name: rubygem-yast-rake -Version: 0.2.4 +Version: 0.2.6 Release: 0 %define mod_name yast-rake %define mod_full_name %{mod_name}-%{version} ++++++ yast-rake-0.2.4.gem -> yast-rake-0.2.6.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/VERSION new/VERSION --- old/VERSION 2015-10-20 13:07:48.000000000 +0200 +++ new/VERSION 2015-10-20 13:07:48.000000000 +0200 @@ -1 +1 @@ -0.2.4 +0.2.6 Files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/data/targets.yml new/data/targets.yml --- old/data/targets.yml 2015-10-20 13:07:48.000000000 +0200 +++ new/data/targets.yml 2015-10-20 13:07:48.000000000 +0200 @@ -10,9 +10,14 @@ obs_project: "YaST:openSUSE:42.1" :sle12sp1: obs_api: "https://api.suse.de/" - obs_project: "Devel:YaST:Head" + obs_project: "Devel:YaST:SLE-12-SP1" obs_sr_project: "SUSE:SLE-12-SP1:GA" obs_target: "SLE-12-SP1" +:sle12sp2: + obs_api: "https://api.suse.de/" + obs_project: "Devel:YaST:Head" + obs_sr_project: "SUSE:SLE-12-SP2:GA" + obs_target: "SLE-12-SP2-GA" :factory: obs_project: "YaST:Head" obs_sr_project: "openSUSE:Factory" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/tasks/spellcheck_task.rb new/lib/tasks/spellcheck_task.rb --- old/lib/tasks/spellcheck_task.rb 2015-10-20 13:07:48.000000000 +0200 +++ new/lib/tasks/spellcheck_task.rb 2015-10-20 13:07:48.000000000 +0200 @@ -140,20 +140,40 @@ success = true lines.each_with_index do |text, index| - misspelled = speller.list_misspelled([text]) - config["dictionary"] + misspelled = misspelled_on_line(text) next if misspelled.empty? success = false - misspelled.each { |word| text.gsub!(word, Rainbow(word).red) } if colorize? - puts "#{file}:#{index + 1}: \"#{text}\"" - - misspelled.each { |word| puts " #{word.inspect} => #{speller.suggest(word)}" } - puts + print_misspelled(misspelled, index, text) end success end + def print_misspelled(list, index, text) + list.each { |word| text.gsub!(word, Rainbow(word).red) } if colorize? + puts "#{file}:#{index + 1}: \"#{text}\"" + + list.each { |word| puts " #{word.inspect} => #{speller.suggest(word)}" } + puts + end + + def misspelled_on_line(text) + switch_block_tag if block_line?(text) + return [] if inside_block + speller.list_misspelled([text]) - config["dictionary"] + end + + def block_line?(line) + line =~ /^\s*```/ + end + + def switch_block_tag + @inside_block = !@inside_block + end + + attr_reader :inside_block + # run the task def run_task if files_to_check.all? { |file| check_file(file) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2015-10-20 13:08:00.000000000 +0200 +++ new/metadata 2015-11-23 18:08:37.000000000 +0100 @@ -1,14 +1,14 @@ --- !ruby/object:Gem::Specification name: yast-rake version: !ruby/object:Gem::Version - version: 0.2.4 + version: 0.2.6 platform: ruby authors: - Josef Reidinger autorequire: bindir: bin cert_chain: [] -date: 2015-10-20 00:00:00.000000000 Z +date: 2015-11-23 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake

1 0

commit linuxrc for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package linuxrc for openSUSE:Factory checked in at 2015-12-01 09:17:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/linuxrc (Old) and /work/SRC/openSUSE:Factory/.linuxrc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "linuxrc" Changes: -------- --- /work/SRC/openSUSE:Factory/linuxrc/linuxrc.changes 2015-11-12 19:37:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.linuxrc.new/linuxrc.changes 2015-12-01 09:17:25.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Nov 23 14:44:09 UTC 2015 - snwint(a)suse.com + +- adjust buffer size to sane value +- document new logging behavior +- fix typo +- remove old stderr handling code +- log also function names +- rewrite linuxrc logging function +- 5.0.63 + +------------------------------------------------------------------- Old: ---- linuxrc-5.0.62.tar.xz New: ---- linuxrc-5.0.63.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.XCAads/_old 2015-12-01 09:17:26.000000000 +0100 +++ /var/tmp/diff_new_pack.XCAads/_new 2015-12-01 09:17:26.000000000 +0100 @@ -25,7 +25,7 @@ Summary: SUSE Installation Program License: GPL-3.0+ Group: System/Boot -Version: 5.0.62 +Version: 5.0.63 Release: 0 Source: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ linuxrc-5.0.62.tar.xz -> linuxrc-5.0.63.tar.xz ++++++ ++++ 4364 lines of diff (skipped)

1 0

commit python3-tornado for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package python3-tornado for openSUSE:Factory checked in at 2015-12-01 09:17:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-tornado (Old) and /work/SRC/openSUSE:Factory/.python3-tornado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-tornado" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-tornado/python3-tornado.changes 2015-09-30 05:52:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-tornado.new/python3-tornado.changes 2015-12-01 09:17:16.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Nov 11 10:12:03 UTC 2015 - toddrme2178(a)gmail.com + +- python3-singledispatch is required for python 3.3 and earler + (which is only still present on openSUSE 13.1) +- python3-Twisted is now available. + +------------------------------------------------------------------- +Sat Nov 7 05:42:00 UTC 2015 - arun(a)gmx.de + +- specfile: + * require backports_abc>=0.4 + +- update to version 4.3: + see http://www.tornadoweb.org/en/stable/releases/v4.3.0.html + +------------------------------------------------------------------- Old: ---- tornado-4.2.1.tar.gz New: ---- tornado-4.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-tornado.spec ++++++ --- /var/tmp/diff_new_pack.mpUAVR/_old 2015-12-01 09:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.mpUAVR/_new 2015-12-01 09:17:17.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-tornado -Version: 4.2.1 +Version: 4.3 Release: 0 Url: http://www.tornadoweb.org Summary: Open source version of scalable, non-blocking web server that power FriendFeed @@ -25,17 +25,23 @@ Group: Development/Languages/Python Source: https://pypi.python.org/packages/source/t/tornado/tornado-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: python3-devel +BuildRequires: python3-backports_abc >= 0.4 BuildRequires: python3-certifi +BuildRequires: python3-devel BuildRequires: python3-pycurl BuildRequires: python3-simplejson -# Not yet available for python 3 -# BuildRequires: python3-Twisted +Requires: python3-backports_abc >= 0.4 Requires: python3-certifi Requires: python3-simplejson Recommends: python3-pycurl Recommends: python3-Twisted %if 0%{?suse_version} +%if 0%{?suse_version} <= 1310 +BuildRequires: python3-singledispatch +Requires: python3-singledispatch +%else +BuildRequires: python3-Twisted +%endif BuildRequires: fdupes %endif ++++++ tornado-4.2.1.tar.gz -> tornado-4.3.tar.gz ++++++ ++++ 7390 lines of diff (skipped)

1 0

commit python3-setuptools for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package python3-setuptools for openSUSE:Factory checked in at 2015-12-01 09:17:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-setuptools (Old) and /work/SRC/openSUSE:Factory/.python3-setuptools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-setuptools" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-setuptools/python3-setuptools.changes 2015-11-05 11:35:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-setuptools.new/python3-setuptools.changes 2015-12-01 09:17:06.000000000 +0100 @@ -1,0 +2,30 @@ +Sun Nov 29 20:12:42 UTC 2015 - arun(a)gmx.de + +- update to version 18.7: + * Update dependency on certify. + * Pull Request #160: Improve detection of gui script in + "easy_install._adjust_header". + * Made "test.test_args" a non-data property; alternate fix + for the issue reported in Pull Request #155. + * Issue #453: In "ez_setup" bootstrap module, unload all + "pkg_resources" modules following download. + * Pull Request #158: Honor `PEP-488 + <https://www.python.org/dev/peps/pep-0488/>`_ when excluding + files for namespace packages. + * Issue #419 and Pull Request #144: Add experimental support for + reading the version info from distutils-installed metadata rather + than using the version in the filename. + +------------------------------------------------------------------- +Wed Nov 25 06:55:49 UTC 2015 - arun(a)gmx.de + +- update to version 18.6.1: + * Issue #464: Correct regression in invocation of superclass on + old-style class on Python 2. + +- changes from version 18.6: + * Issue #439: When installing entry_point scripts under development, + omit the version number of the package, allowing any version of + the package to be used. + +------------------------------------------------------------------- Old: ---- setuptools-18.5.tar.gz New: ---- setuptools-18.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-setuptools.spec ++++++ --- /var/tmp/diff_new_pack.QHyw2b/_old 2015-12-01 09:17:07.000000000 +0100 +++ /var/tmp/diff_new_pack.QHyw2b/_new 2015-12-01 09:17:07.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-setuptools -Version: 18.5 +Version: 18.7 Release: 0 Url: http://pypi.python.org/pypi/setuptools Summary: Easily download, build, install, upgrade, and uninstall Python packages ++++++ setuptools-18.5.tar.gz -> setuptools-18.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/CHANGES.txt new/setuptools-18.7/CHANGES.txt --- old/setuptools-18.5/CHANGES.txt 2015-11-02 01:18:54.000000000 +0100 +++ new/setuptools-18.7/CHANGES.txt 2015-11-28 20:17:50.000000000 +0100 @@ -2,6 +2,40 @@ CHANGES ======= + +---- +18.7 +---- + +* Update dependency on certify. +* Pull Request #160: Improve detection of gui script in + ``easy_install._adjust_header``. +* Made ``test.test_args`` a non-data property; alternate fix + for the issue reported in Pull Request #155. +* Issue #453: In ``ez_setup`` bootstrap module, unload all + ``pkg_resources`` modules following download. +* Pull Request #158: Honor `PEP-488 + <https://www.python.org/dev/peps/pep-0488/>`_ when excluding + files for namespace packages. +* Issue #419 and Pull Request #144: Add experimental support for + reading the version info from distutils-installed metadata rather + than using the version in the filename. + +------ +18.6.1 +------ + +* Issue #464: Correct regression in invocation of superclass on old-style + class on Python 2. + +---- +18.6 +---- + +* Issue #439: When installing entry_point scripts under development, + omit the version number of the package, allowing any version of the + package to be used. + ---- 18.5 ---- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/DEVGUIDE.txt new/setuptools-18.7/DEVGUIDE.txt --- old/setuptools-18.5/DEVGUIDE.txt 2015-06-18 14:36:06.000000000 +0200 +++ new/setuptools-18.7/DEVGUIDE.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -The canonical development guide can be found in docs/developer-guide.txt. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/PKG-INFO new/setuptools-18.7/PKG-INFO --- old/setuptools-18.5/PKG-INFO 2015-11-02 01:19:45.000000000 +0100 +++ new/setuptools-18.7/PKG-INFO 2015-11-28 23:57:49.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools -Version: 18.5 +Version: 18.7 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://bitbucket.org/pypa/setuptools Author: Python Packaging Authority diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/docs/developer-guide.txt new/setuptools-18.7/docs/developer-guide.txt --- old/setuptools-18.5/docs/developer-guide.txt 2015-08-07 19:08:28.000000000 +0200 +++ new/setuptools-18.7/docs/developer-guide.txt 2015-11-28 20:13:40.000000000 +0100 @@ -92,9 +92,10 @@ The primary tests are run using py.test. To run the tests:: - $ python setup.py ptr + $ python setup.py test -Or install py.test into your environment and run ``py.test``. +Or install py.test into your environment and run ``PYTHONPATH=. py.test`` +or ``python -m pytest``. Under continuous integration, additional tests may be run. See the ``.travis.yml`` file for full details on the tests run under Travis-CI. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/docs/pkg_resources.txt new/setuptools-18.7/docs/pkg_resources.txt --- old/setuptools-18.5/docs/pkg_resources.txt 2015-08-07 19:08:28.000000000 +0200 +++ new/setuptools-18.7/docs/pkg_resources.txt 2015-11-28 20:13:40.000000000 +0100 @@ -592,7 +592,7 @@ The syntax of a requirement specifier can be defined in EBNF as follows:: - requirement ::= project_name versionspec? extras? + requirement ::= project_name extras? versionspec? versionspec ::= comparison version (',' comparison version)* comparison ::= '<' | '<=' | '!=' | '==' | '>=' | '>' | '~=' | '===' extras ::= '[' extralist? ']' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/docs/setuptools.txt new/setuptools-18.7/docs/setuptools.txt --- old/setuptools-18.5/docs/setuptools.txt 2015-09-19 18:00:35.000000000 +0200 +++ new/setuptools-18.7/docs/setuptools.txt 2015-11-28 20:13:40.000000000 +0100 @@ -112,10 +112,16 @@ ) As you can see, it doesn't take much to use setuptools in a project. -Just by doing the above, this project will be able to produce eggs, upload to +Run that script in your project folder, alongside the Python packages +you have developed. + +Invoke that script to produce eggs, upload to PyPI, and automatically include all packages in the directory where the setup.py lives. See the `Command Reference`_ section below to see what -commands you can give to this setup script. +commands you can give to this setup script. For example, +to produce a source distribution, simply invoke:: + + python setup.py sdist Of course, before you release your project to PyPI, you'll want to add a bit more information to your setup script to help people find or learn about your diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/ez_setup.py new/setuptools-18.7/ez_setup.py --- old/setuptools-18.5/ez_setup.py 2015-10-11 03:14:27.000000000 +0200 +++ new/setuptools-18.7/ez_setup.py 2015-11-28 23:57:43.000000000 +0100 @@ -30,7 +30,7 @@ except ImportError: USER_SITE = None -DEFAULT_VERSION = "18.5" +DEFAULT_VERSION = "18.7" DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/" DEFAULT_SAVE_DIR = os.curdir @@ -125,7 +125,7 @@ # Remove previously-imported pkg_resources if present (see # https://bitbucket.org/pypa/setuptools/pull-request/7/ for details). if 'pkg_resources' in sys.modules: - del sys.modules['pkg_resources'] + _unload_pkg_resources() import setuptools setuptools.bootstrap_install_from = egg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/pkg_resources/__init__.py new/setuptools-18.7/pkg_resources/__init__.py --- old/setuptools-18.5/pkg_resources/__init__.py 2015-11-01 18:12:10.000000000 +0100 +++ new/setuptools-18.7/pkg_resources/__init__.py 2015-11-28 20:13:44.000000000 +0100 @@ -1716,7 +1716,7 @@ path = self.module_path old = None while path!=old: - if path.lower().endswith('.egg'): + if _is_unpacked_egg(path): self.egg_name = os.path.basename(path) self.egg_info = os.path.join(path, 'EGG-INFO') self.egg_root = path @@ -2099,7 +2099,7 @@ # don't yield nested distros return for subitem in metadata.resource_listdir('/'): - if subitem.endswith('.egg'): + if _is_unpacked_egg(subitem): subpath = os.path.join(path_item, subitem) for dist in find_eggs_in_zip(zipimport.zipimporter(subpath), subpath): yield dist @@ -2115,8 +2115,7 @@ path_item = _normalize_cached(path_item) if os.path.isdir(path_item) and os.access(path_item, os.R_OK): - if path_item.lower().endswith('.egg'): - # unpacked egg + if _is_unpacked_egg(path_item): yield Distribution.from_filename( path_item, metadata=PathMetadata( path_item, os.path.join(path_item,'EGG-INFO') @@ -2136,7 +2135,7 @@ yield Distribution.from_location( path_item, entry, metadata, precedence=DEVELOP_DIST ) - elif not only and lower.endswith('.egg'): + elif not only and _is_unpacked_egg(entry): dists = find_distributions(os.path.join(path_item, entry)) for dist in dists: yield dist @@ -2283,6 +2282,14 @@ _cache[filename] = result = normalize_path(filename) return result +def _is_unpacked_egg(path): + """ + Determine if given path appears to be an unpacked egg. + """ + return ( + path.lower().endswith('.egg') + ) + def _set_parent_ns(packageName): parts = packageName.split('.') name = parts.pop() @@ -2466,6 +2473,18 @@ return location +def _version_from_file(lines): + """ + Given an iterable of lines from a Metadata file, return + the value of the Version field, if present, or None otherwise. + """ + is_version_line = lambda line: line.lower().startswith('version:') + version_lines = filter(is_version_line, lines) + line = next(iter(version_lines), '') + _, _, value = line.partition(':') + return safe_version(value.strip()) or None + + class Distribution(object): """Wrap an actual or potential sys.path entry w/metadata""" PKG_INFO = 'PKG-INFO' @@ -2483,22 +2502,29 @@ self._provider = metadata or empty_provider @classmethod - def from_location(cls, location, basename, metadata=None,**kw): + def from_location(cls, location, basename, metadata=None, **kw): project_name, version, py_version, platform = [None]*4 + dist_path = os.path.join(location, basename) basename, ext = os.path.splitext(basename) if ext.lower() in _distributionImpl: - # .dist-info gets much metadata differently + cls = _distributionImpl[ext.lower()] + match = EGG_NAME(basename) if match: project_name, version, py_version, platform = match.group( - 'name','ver','pyver','plat' + 'name', 'ver', 'pyver', 'plat' ) - cls = _distributionImpl[ext.lower()] + + version = cls._version_from_metadata(dist_path) or version return cls( location, metadata, project_name=project_name, version=version, py_version=py_version, platform=platform, **kw ) + @staticmethod + def _version_from_metadata(dist_path): + pass + @property def hashcmp(self): return ( @@ -2584,13 +2610,11 @@ try: return self._version except AttributeError: - for line in self._get_metadata(self.PKG_INFO): - if line.lower().startswith('version:'): - self._version = safe_version(line.split(':',1)[1].strip()) - return self._version - else: + version = _version_from_file(self._get_metadata(self.PKG_INFO)) + if version is None: tmpl = "Missing 'Version:' header and/or %s file" raise ValueError(tmpl % self.PKG_INFO, self) + return version @property def _dep_map(self): @@ -2795,6 +2819,30 @@ return [dep for dep in self._dep_map if dep] +class EggInfoDistribution(Distribution): + + @staticmethod + def _version_from_metadata(dist_path): + """ + Packages installed by distutils (e.g. numpy or scipy), + which uses an old safe_version, and so + their version numbers can get mangled when + converted to filenames (e.g., 1.11.0.dev0+2329eae to + 1.11.0.dev0_2329eae). These distributions will not be + parsed properly + downstream by Distribution and safe_version, so + take an extra step and try to get the version number from + the metadata file itself instead of the filename. + """ + if not os.path.isfile(dist_path): + return + try: + with open(dist_path) as strm: + return _version_from_file(strm) + except IOError: + pass + + class DistInfoDistribution(Distribution): """Wrap an actual or potential sys.path entry w/metadata, .dist-info style""" PKG_INFO = 'METADATA' @@ -2860,7 +2908,7 @@ _distributionImpl = { '.egg': Distribution, - '.egg-info': Distribution, + '.egg-info': EggInfoDistribution, '.dist-info': DistInfoDistribution, } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/pkg_resources/tests/test_pkg_resources.py new/setuptools-18.7/pkg_resources/tests/test_pkg_resources.py --- old/setuptools-18.5/pkg_resources/tests/test_pkg_resources.py 2015-08-07 19:08:28.000000000 +0200 +++ new/setuptools-18.7/pkg_resources/tests/test_pkg_resources.py 2015-11-28 20:13:44.000000000 +0100 @@ -5,9 +5,15 @@ import datetime import time import subprocess +import stat +import distutils.dist +import distutils.command.install_egg_info + +import pytest import pkg_resources + try: unicode except NameError: @@ -109,3 +115,49 @@ ) cmd = [sys.executable, '-c', '; '.join(lines)] subprocess.check_call(cmd) + + + +class TestDeepVersionLookupDistutils(object): + + @pytest.fixture + def env(self, tmpdir): + """ + Create a package environment, similar to a virtualenv, + in which packages are installed. + """ + class Environment(str): + pass + + env = Environment(tmpdir) + tmpdir.chmod(stat.S_IRWXU) + subs = 'home', 'lib', 'scripts', 'data', 'egg-base' + env.paths = dict( + (dirname, str(tmpdir / dirname)) + for dirname in subs + ) + list(map(os.mkdir, env.paths.values())) + return env + + def create_foo_pkg(self, env, version): + """ + Create a foo package installed (distutils-style) to env.paths['lib'] + as version. + """ + attrs = dict(name='foo', version=version) + dist = distutils.dist.Distribution(attrs) + iei_cmd = distutils.command.install_egg_info.install_egg_info(dist) + iei_cmd.initialize_options() + iei_cmd.install_dir = env.paths['lib'] + iei_cmd.finalize_options() + iei_cmd.run() + + def test_version_resolved_from_egg_info(self, env): + version = '1.11.0.dev0+2329eae' + self.create_foo_pkg(env, version) + + # this requirement parsing will raise a VersionConflict unless the + # .egg-info file is parsed (see #419 on BitBucket) + req = pkg_resources.Requirement.parse('foo>=1.9') + dist = pkg_resources.WorkingSet([env.paths['lib']]).find(req) + assert dist.version == version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/pytest.ini new/setuptools-18.7/pytest.ini --- old/setuptools-18.5/pytest.ini 2015-08-07 19:08:28.000000000 +0200 +++ new/setuptools-18.7/pytest.ini 2015-11-28 20:13:40.000000000 +0100 @@ -1,3 +1,3 @@ [pytest] -addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt +addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt --ignore scripts/upload-old-releases-as-zip.py norecursedirs=dist build *.egg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setup.cfg new/setuptools-18.7/setup.cfg --- old/setuptools-18.5/setup.cfg 2015-11-02 01:19:45.000000000 +0100 +++ new/setuptools-18.7/setup.cfg 2015-11-28 23:57:49.000000000 +0100 @@ -1,7 +1,7 @@ [egg_info] tag_build = -tag_date = 0 tag_svn_revision = 0 +tag_date = 0 [aliases] release = egg_info -RDb '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setup.py new/setuptools-18.7/setup.py --- old/setuptools-18.5/setup.py 2015-10-22 22:57:25.000000000 +0200 +++ new/setuptools-18.7/setup.py 2015-11-28 20:13:40.000000000 +0100 @@ -150,10 +150,10 @@ """).strip().splitlines(), extras_require={ "ssl:sys_platform=='win32'": "wincertstore==0.2", - "certs": "certifi==2015.04.28", + "certs": "certifi==2015.11.20", }, dependency_links=[ - 'https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz…', + 'https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz…', 'https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip…', ], scripts=[], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/command/develop.py new/setuptools-18.7/setuptools/command/develop.py --- old/setuptools-18.5/setuptools/command/develop.py 2015-09-27 13:52:43.000000000 +0200 +++ new/setuptools-18.7/setuptools/command/develop.py 2015-11-28 20:13:40.000000000 +0100 @@ -167,3 +167,30 @@ script_text = f.read() f.close() self.install_script(dist, script_name, script_text, script_path) + + def install_wrapper_scripts(self, dist): + dist = VersionlessRequirement(dist) + return easy_install.install_wrapper_scripts(self, dist) + + +class VersionlessRequirement(object): + """ + Adapt a pkg_resources.Distribution to simply return the project + name as the 'requirement' so that scripts will work across + multiple versions. + + >>> dist = Distribution(project_name='foo', version='1.0') + >>> str(dist.as_requirement()) + 'foo==1.0' + >>> adapted_dist = VersionlessRequirement(dist) + >>> str(adapted_dist.as_requirement()) + 'foo' + """ + def __init__(self, dist): + self.__dist = dist + + def __getattr__(self, name): + return getattr(self.__dist, name) + + def as_requirement(self): + return self.project_name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/command/easy_install.py new/setuptools-18.7/setuptools/command/easy_install.py --- old/setuptools-18.5/setuptools/command/easy_install.py 2015-09-27 14:07:28.000000000 +0200 +++ new/setuptools-18.7/setuptools/command/easy_install.py 2015-11-28 20:13:40.000000000 +0100 @@ -20,6 +20,7 @@ from distutils.command.install import INSTALL_SCHEMES, SCHEME_KEYS from distutils import log, dir_util from distutils.command.build_scripts import first_line_re +from distutils.spawn import find_executable import sys import os import zipimport @@ -760,9 +761,10 @@ return dst def install_wrapper_scripts(self, dist): - if not self.exclude_scripts: - for args in ScriptWriter.best().get_args(dist): - self.write_script(*args) + if self.exclude_scripts: + return + for args in ScriptWriter.best().get_args(dist): + self.write_script(*args) def install_script(self, dist, script_name, script_text, dev_path=None): """Generate a legacy script wrapper and install it""" @@ -2125,8 +2127,8 @@ blockers = [name + x for x in old] yield name + ext, header + script_text, 't', blockers - @staticmethod - def _adjust_header(type_, orig_header): + @classmethod + def _adjust_header(cls, type_, orig_header): """ Make sure 'pythonw' is used for gui and and 'python' is used for console (regardless of what sys.executable is). @@ -2137,11 +2139,19 @@ pattern, repl = repl, pattern pattern_ob = re.compile(re.escape(pattern), re.IGNORECASE) new_header = pattern_ob.sub(string=orig_header, repl=repl) + return new_header if cls._use_header(new_header) else orig_header + + @staticmethod + def _use_header(new_header): + """ + Should _adjust_header use the replaced header? + + On non-windows systems, always use. On + Windows systems, only use the replaced header if it resolves + to an executable on the system. + """ clean_header = new_header[2:-1].strip('"') - if sys.platform == 'win32' and not os.path.exists(clean_header): - # the adjusted version doesn't exist, so return the original - return orig_header - return new_header + return sys.platform != 'win32' or find_executable(clean_header) class WindowsExecutableLauncherWriter(WindowsScriptWriter): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/command/install_lib.py new/setuptools-18.7/setuptools/command/install_lib.py --- old/setuptools-18.5/setuptools/command/install_lib.py 2015-06-18 14:36:06.000000000 +0200 +++ new/setuptools-18.7/setuptools/command/install_lib.py 2015-11-28 20:13:40.000000000 +0100 @@ -79,6 +79,8 @@ base = os.path.join('__pycache__', '__init__.' + imp.get_tag()) yield base + '.pyc' yield base + '.pyo' + yield base + '.opt-1.pyc' + yield base + '.opt-2.pyc' def copy_tree( self, infile, outfile, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/command/test.py new/setuptools-18.7/setuptools/command/test.py --- old/setuptools-18.5/setuptools/command/test.py 2015-10-11 02:41:31.000000000 +0200 +++ new/setuptools-18.7/setuptools/command/test.py 2015-11-28 20:13:40.000000000 +0100 @@ -41,6 +41,17 @@ return tests[0] # don't create a nested suite for only one return +# adapted from jaraco.classes.properties:NonDataProperty +class NonDataProperty(object): + def __init__(self, fget): + self.fget = fget + + def __get__(self, obj, objtype=None): + if obj is None: + return self + return self.fget(obj) + + class test(Command): """Command to run unit tests after in-place build""" @@ -78,7 +89,7 @@ if self.test_runner is None: self.test_runner = getattr(self.distribution, 'test_runner', None) - @property + @NonDataProperty def test_args(self): return list(self._test_args()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/py31compat.py new/setuptools-18.7/setuptools/py31compat.py --- old/setuptools-18.5/setuptools/py31compat.py 2015-06-18 14:36:06.000000000 +0200 +++ new/setuptools-18.7/setuptools/py31compat.py 2015-11-28 20:13:40.000000000 +0100 @@ -20,7 +20,7 @@ import shutil import tempfile class TemporaryDirectory(object): - """" + """ Very simple temporary directory context manager. Will try to delete afterward, but will also ignore OS and similar errors on deletion. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/tests/test_develop.py new/setuptools-18.7/setuptools/tests/test_develop.py --- old/setuptools-18.5/setuptools/tests/test_develop.py 2015-08-07 19:08:28.000000000 +0200 +++ new/setuptools-18.7/setuptools/tests/test_develop.py 2015-11-28 20:13:40.000000000 +0100 @@ -1,13 +1,17 @@ """develop tests """ import os -import shutil import site import sys -import tempfile +import io + +import pytest from setuptools.command.develop import develop from setuptools.dist import Distribution +from . import contexts +from setuptools.compat import PY3 + SETUP_PY = """\ from setuptools import setup @@ -21,65 +25,52 @@ INIT_PY = """print "foo" """ -class TestDevelopTest: - - def setup_method(self, method): - if hasattr(sys, 'real_prefix'): - return - - # Directory structure - self.dir = tempfile.mkdtemp() - os.mkdir(os.path.join(self.dir, 'foo')) - # setup.py - setup = os.path.join(self.dir, 'setup.py') - f = open(setup, 'w') +(a)pytest.yield_fixture +def temp_user(monkeypatch): + with contexts.tempdir() as user_base: + with contexts.tempdir() as user_site: + monkeypatch.setattr('site.USER_BASE', user_base) + monkeypatch.setattr('site.USER_SITE', user_site) + yield + + +(a)pytest.yield_fixture +def test_env(tmpdir, temp_user): + target = tmpdir + foo = target.mkdir('foo') + setup = target / 'setup.py' + if setup.isfile(): + raise ValueError(dir(target)) + with setup.open('w') as f: f.write(SETUP_PY) - f.close() - self.old_cwd = os.getcwd() - # foo/__init__.py - init = os.path.join(self.dir, 'foo', '__init__.py') - f = open(init, 'w') + init = foo / '__init__.py' + with init.open('w') as f: f.write(INIT_PY) - f.close() + with target.as_cwd(): + yield target - os.chdir(self.dir) - self.old_base = site.USER_BASE - site.USER_BASE = tempfile.mkdtemp() - self.old_site = site.USER_SITE - site.USER_SITE = tempfile.mkdtemp() - - def teardown_method(self, method): - if hasattr(sys, 'real_prefix') or (hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix): - return - - os.chdir(self.old_cwd) - shutil.rmtree(self.dir) - shutil.rmtree(site.USER_BASE) - shutil.rmtree(site.USER_SITE) - site.USER_BASE = self.old_base - site.USER_SITE = self.old_site - - def test_develop(self): - if hasattr(sys, 'real_prefix'): - return - dist = Distribution( - dict(name='foo', - packages=['foo'], - use_2to3=True, - version='0.0', - )) + +class TestDevelop: + in_virtualenv = hasattr(sys, 'real_prefix') + in_venv = hasattr(sys, 'base_prefix') and sys.base_prefix != sys.prefix + @pytest.mark.skipif(in_virtualenv or in_venv, + reason="Cannot run when invoked in a virtualenv or venv") + def test_2to3_user_mode(self, test_env): + settings = dict( + name='foo', + packages=['foo'], + use_2to3=True, + version='0.0', + ) + dist = Distribution(settings) dist.script_name = 'setup.py' cmd = develop(dist) cmd.user = 1 cmd.ensure_finalized() cmd.install_dir = site.USER_SITE cmd.user = 1 - old_stdout = sys.stdout - #sys.stdout = StringIO() - try: + with contexts.quiet(): cmd.run() - finally: - sys.stdout = old_stdout # let's see if we got our egg link at the right place content = os.listdir(site.USER_SITE) @@ -87,17 +78,37 @@ assert content == ['easy-install.pth', 'foo.egg-link'] # Check that we are using the right code. - egg_link_file = open(os.path.join(site.USER_SITE, 'foo.egg-link'), 'rt') - try: + fn = os.path.join(site.USER_SITE, 'foo.egg-link') + with io.open(fn) as egg_link_file: path = egg_link_file.read().split()[0].strip() - finally: - egg_link_file.close() - init_file = open(os.path.join(path, 'foo', '__init__.py'), 'rt') - try: + fn = os.path.join(path, 'foo', '__init__.py') + with io.open(fn) as init_file: init = init_file.read().strip() - finally: - init_file.close() - if sys.version < "3": - assert init == 'print "foo"' - else: - assert init == 'print("foo")' + + expected = 'print("foo")' if PY3 else 'print "foo"' + assert init == expected + + def test_console_scripts(self, tmpdir): + """ + Test that console scripts are installed and that they reference + only the project by name and not the current version. + """ + pytest.skip("TODO: needs a fixture to cause 'develop' " + "to be invoked without mutating environment.") + settings = dict( + name='foo', + packages=['foo'], + version='0.0', + entry_points={ + 'console_scripts': [ + 'foocmd = foo:foo', + ], + }, + ) + dist = Distribution(settings) + dist.script_name = 'setup.py' + cmd = develop(dist) + cmd.ensure_finalized() + cmd.install_dir = tmpdir + cmd.run() + #assert '0.0' not in foocmd_text diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/tests/test_egg_info.py new/setuptools-18.7/setuptools/tests/test_egg_info.py --- old/setuptools-18.5/setuptools/tests/test_egg_info.py 2015-08-07 19:08:29.000000000 +0200 +++ new/setuptools-18.7/setuptools/tests/test_egg_info.py 2015-11-28 20:13:44.000000000 +0100 @@ -8,7 +8,11 @@ from . import contexts -class TestEggInfo: +class Environment(str): + pass + + +class TestEggInfo(object): setup_script = DALS(""" from setuptools import setup @@ -33,8 +37,6 @@ @pytest.yield_fixture def env(self): - class Environment(str): pass - with contexts.tempdir(prefix='setuptools-test.') as env_dir: env = Environment(env_dir) os.chmod(env_dir, stat.S_IRWXU) @@ -49,8 +51,7 @@ f.write(DALS(""" [egg_info] egg-base = %(egg-base)s - """ % env.paths - )) + """ % env.paths)) yield env def test_egg_base_installed_egg_info(self, tmpdir_cwd, env): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools/version.py new/setuptools-18.7/setuptools/version.py --- old/setuptools-18.5/setuptools/version.py 2015-10-11 03:14:27.000000000 +0200 +++ new/setuptools-18.7/setuptools/version.py 2015-11-28 23:57:43.000000000 +0100 @@ -1 +1 @@ -__version__ = '18.5' +__version__ = '18.7' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools.egg-info/PKG-INFO new/setuptools-18.7/setuptools.egg-info/PKG-INFO --- old/setuptools-18.5/setuptools.egg-info/PKG-INFO 2015-11-02 01:19:43.000000000 +0100 +++ new/setuptools-18.7/setuptools.egg-info/PKG-INFO 2015-11-28 23:57:47.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: setuptools -Version: 18.5 +Version: 18.7 Summary: Easily download, build, install, upgrade, and uninstall Python packages Home-page: https://bitbucket.org/pypa/setuptools Author: Python Packaging Authority diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools.egg-info/SOURCES.txt new/setuptools-18.7/setuptools.egg-info/SOURCES.txt --- old/setuptools-18.5/setuptools.egg-info/SOURCES.txt 2015-11-02 01:19:45.000000000 +0100 +++ new/setuptools-18.7/setuptools.egg-info/SOURCES.txt 2015-11-28 23:57:49.000000000 +0100 @@ -1,5 +1,4 @@ CHANGES.txt -DEVGUIDE.txt MANIFEST.in README.txt bootstrap.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools.egg-info/dependency_links.txt new/setuptools-18.7/setuptools.egg-info/dependency_links.txt --- old/setuptools-18.5/setuptools.egg-info/dependency_links.txt 2015-11-02 01:19:43.000000000 +0100 +++ new/setuptools-18.7/setuptools.egg-info/dependency_links.txt 2015-11-28 23:57:47.000000000 +0100 @@ -1,2 +1,2 @@ -https://pypi.python.org/packages/source/c/certifi/certifi-2015.04.28.tar.gz#md5=12c7c3a063b2ff97a0f8291d8de41e8c +https://pypi.python.org/packages/source/c/certifi/certifi-2015.11.20.tar.gz#md5=25134646672c695c1ff1593c2dd75d08 https://pypi.python.org/packages/source/w/wincertstore/wincertstore-0.2.zip… diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setuptools-18.5/setuptools.egg-info/requires.txt new/setuptools-18.7/setuptools.egg-info/requires.txt --- old/setuptools-18.5/setuptools.egg-info/requires.txt 2015-11-02 01:19:43.000000000 +0100 +++ new/setuptools-18.7/setuptools.egg-info/requires.txt 2015-11-28 23:57:47.000000000 +0100 @@ -1,6 +1,6 @@ [certs] -certifi==2015.04.28 +certifi==2015.11.20 [ssl:sys_platform=='win32'] wincertstore==0.2

1 0

commit dracut for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package dracut for openSUSE:Factory checked in at 2015-12-01 09:17:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dracut (Old) and /work/SRC/openSUSE:Factory/.dracut.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dracut" Changes: -------- --- /work/SRC/openSUSE:Factory/dracut/dracut.changes 2015-11-12 19:36:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.dracut.new/dracut.changes 2015-12-01 09:17:02.000000000 +0100 @@ -2 +2,111 @@ -Thu Nov 12 08:52:54 UTC 2015 - fvogt@localhost +Thu Nov 26 10:22:11 UTC 2015 - fvogt(a)suse.com + +- Don't require bind-utils, it conflicts with + minimal-base-conflicts + +------------------------------------------------------------------- +Thu Nov 26 08:56:50 UTC 2015 - fvogt(a)suse.com + +- Add warning about pkgconfig file to rpmlintrc's ignore list +- Fix spec file: + - Add dracut-catimages manpage to dracut-tools + - Fix summary of dracut-tools subpackage + +------------------------------------------------------------------- +Thu Nov 26 08:48:13 UTC 2015 - fvogt(a)suse.com + +- Remove 0400-use_fstab_systemd.patch +- Move dracut-catimages, /boot/dracut and /var/lib/dracut into + dracut-tools subpackage +- Cleanup spec file + +------------------------------------------------------------------- +Thu Nov 26 07:51:48 UTC 2015 - fvogt(a)suse.com + +- Refresh patches with line offsets: + 0017-45ifcfg-use-distro-specific-scripts.patch + 0048-40network-Only-enable-network-interfaces-if-explicit.patch + 0088-91zipl-Add-new-module-to-update-s390x-configuration.patch + 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch + 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch + 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch + 0182-fix-include-parsing.patch + 0183-fix_add_drivers_hang.patch + 0203-no-fail-builtin-module.patc + +------------------------------------------------------------------- +Wed Nov 25 15:55:01 UTC 2015 - fvogt(a)suse.com + +- Update to dracut-044 +- Patches upstream, removed here: + 0119-Reset-IFS-variable.patch + 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch + 0122-Get_kernel_version_from_gz_file_for_arm.patch + 0165-Order-root-fsck-after-pre-mount.patch + 0184-fix_lvm_wc_warning.patch + 0185-dracut.sh-remove-_EARLY-from-CONFIG_MICROCODE_-check.patch + 0401-mount_option_mountpoint.patch + +- Updated/Refreshed patches: + 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch + 0019-40network-Fix-race-condition-when-wait-for-networks.patch + 0056-81cio_ignore-handle-cio_ignore-commandline.patch + 0058-dracut-add-warning-when-including-unsupported-module.patch + 0066-40network-always-start-netroot-in-ifup.sh.patch + 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch + 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch + 0125-40network-separate-mask-and-prefix.patch + 0131-40network-handle-prefixed-IP-addresses-correctly.patch + 0132-40network-fixup-static-network-configuration.patch + 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch + 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch + 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch + 0159-network-Try-to-load-xennet.patch + 0202-dracut_dmraid_use_udev.patch + 0203-no-fail-builtin-module.patch + 0402-driver-fail-summary.patch + +------------------------------------------------------------------- +Wed Nov 25 08:06:02 UTC 2015 - fvogt(a)suse.com + +- Fix 0202-dracut_dmraid_use_udev.patch: + - Statement was missing a program to execute + +------------------------------------------------------------------- +Tue Nov 24 13:38:45 UTC 2015 - fvogt(a)suse.com + +- Add 0206-nfs_dns_alias.patch to fix boo#955592: + - Fix dracut run on nfs root where NFS host is a DNS ALIAS +- Require bind-utils. host is used in some lines + +------------------------------------------------------------------- +Thu Nov 19 09:18:31 CET 2015 - tiwai(a)suse.de + +- Fix the wrong kernel config check for microcode with 4.4 kernel + (boo#955712): + 0185-dracut.sh-remove-_EARLY-from-CONFIG_MICROCODE_-check.patch + +------------------------------------------------------------------- +Tue Nov 17 14:08:10 UTC 2015 - fvogt(a)suse.com + +- Disable 0400-use_fstab_systemd.patch + - Fully implementing this would take ages + - Fix boo#948771 + +------------------------------------------------------------------- +Tue Nov 17 13:14:26 UTC 2015 - fvogt(a)suse.com + +- Add numbers to the filename of all patches: +fips_add_aesni-intel.patch -> 0138-fips_add_aesni-intel.patch +dracut_fix_multipath_without_config.patch -> 0200-dracut_fix_multipath_without_config.patch +fix_nfs_with_ip_instead_of_hostname.patch -> 0201-fix_nfs_with_ip_instead_of_hostname.patch +dracut_dmraid_use_udev.patch -> 0202-dracut_dmraid_use_udev.patch +dracut_dont_use_dpkg_defaults_on_SUSE.patch -> 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch + +------------------------------------------------------------------- +Mon Nov 16 10:09:03 UTC 2015 - fvogt(a)suse.com + +- Update description in dracut.spec + +------------------------------------------------------------------- +Thu Nov 12 08:52:54 UTC 2015 - fvogt(a)suse.com Old: ---- 0119-Reset-IFS-variable.patch 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch 0122-Get_kernel_version_from_gz_file_for_arm.patch 0165-Order-root-fsck-after-pre-mount.patch 0184-fix_lvm_wc_warning.patch 0400-use_fstab_systemd.patch 0401-mount_option_mountpoint.patch dracut-043.tar.xz dracut_dmraid_use_udev.patch dracut_dont_use_dpkg_defaults_on_SUSE.patch dracut_fix_multipath_without_config.patch fips_add_aesni-intel.patch fix_nfs_with_ip_instead_of_hostname.patch New: ---- 0138-fips_add_aesni-intel.patch 0200-dracut_fix_multipath_without_config.patch 0201-fix_nfs_with_ip_instead_of_hostname.patch 0202-dracut_dmraid_use_udev.patch 0206-nfs_dns_alias.patch 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch dracut-044.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dracut.spec ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -19,7 +19,7 @@ %define dracutlibdir %{_libexecdir}/dracut Name: dracut -Version: 043 +Version: 044 Release: 0 Summary: Initramfs generator using udev License: GPL-2.0+ and LGPL-2.1+ @@ -32,11 +32,9 @@ Source5: purge-kernels.service Source6: dracut-installkernel -# Sent mainline +#Network: Patch12: 0019-40network-Fix-race-condition-when-wait-for-networks.patch Patch13: 0066-40network-always-start-netroot-in-ifup.sh.patch - -#Network: Patch15: 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch Patch17: 0017-45ifcfg-use-distro-specific-scripts.patch Patch48: 0048-40network-Only-enable-network-interfaces-if-explicit.patch @@ -82,7 +80,7 @@ Patch57: 0057-01fips-Include-some-more-hmacs.patch Patch126: 0126-01fips-Add-drbg-module-to-force-loaded-modules.patch Patch137: 0137-Switch-from-Mozilla-NSS-sha256hmac-checking-to-fipsc.patch -Patch138: fips_add_aesni-intel.patch +Patch138: 0138-fips_add_aesni-intel.patch # Others Patch20: 0020-00warpclock-Set-correct-timezone.patch @@ -90,23 +88,18 @@ Patch59: 0059-99suse-Add-SUSE-specific-initrd-parsing.patch Patch90: 0090-dracut-caps-Remove-whole-caps-module.patch Patch91: 0091-dracut-biosdevname-In-SUSE-biosdevname-package-is-in.patch -Patch119: 0119-Reset-IFS-variable.patch -Patch120: 0120-mkinitrd-suse.sh-Bail-out-with-exit-1-if-initrd-cann.patch Patch121: 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch -Patch122: 0122-Get_kernel_version_from_gz_file_for_arm.patch Patch130: 0130-nfs-Always-add-all-kernel-modules-for-kdump.patch Patch144: 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch Patch150: 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch Patch158: 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch Patch163: 0163-Install-etc-sysconfig-console-to-see-specific-fonts.patch Patch164: 0164-Fix-initramfs-ver.img-vs-initrd-ver-in-dracut-initra.patch -Patch165: 0165-Order-root-fsck-after-pre-mount.patch Patch168: 0168-remove_plymouth_logo_file.patch Patch180: 0180-i18n_add_correct_fontmaps.patch Patch181: 0181-no_systemd_cryptsetup.patch Patch182: 0182-fix-include-parsing.patch Patch183: 0183-fix_add_drivers_hang.patch -Patch184: 0184-fix_lvm_wc_warning.patch # Still needed Patch133: 0133-Allow-multiple-configurations-per-network-interface-.patch @@ -116,20 +109,19 @@ # Submit mainline asap Patch128: 0128-90lvm-Install-dm-snapshot-module.patch -Patch200: dracut_fix_multipath_without_config.patch -Patch201: fix_nfs_with_ip_instead_of_hostname.patch -Patch202: dracut_dmraid_use_udev.patch +Patch200: 0200-dracut_fix_multipath_without_config.patch +Patch201: 0201-fix_nfs_with_ip_instead_of_hostname.patch +Patch202: 0202-dracut_dmraid_use_udev.patch Patch203: 0203-no-fail-builtin-module.patch Patch204: 0204-mkinitrd-fix-monster.patch Patch205: 0205-mdraid_ignore_hostonly.patch +Patch206: 0206-nfs_dns_alias.patch -## fix for SUSE systems which have dpkg installed anyway -Patch300: dracut_dont_use_dpkg_defaults_on_SUSE.patch +## SUSE-specific fixes +Patch300: 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch Patch301: 0301-include_sysconfig_language.patch # New features/improvements -Patch400: 0400-use_fstab_systemd.patch -Patch401: 0401-mount_option_mountpoint.patch Patch402: 0402-driver-fail-summary.patch BuildRequires: asciidoc @@ -137,9 +129,11 @@ BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt BuildRequires: suse-module-tools -BuildRequires: pkgconfig(systemd) >= 199 -Requires: /usr/bin/get_kernel_version +BuildRequires: pkgconfig(systemd) >= 219 +Requires: %{_bindir}/get_kernel_version Requires: bash +# systemd-sysvinit provides: poweroff, reboot, halt +Requires: binutils Requires: coreutils Requires: cpio Requires: file @@ -150,9 +144,7 @@ Requires: modutils Requires: pigz Requires: sed -Requires: systemd >= 200 -# systemd-sysvinit provides: poweroff, reboot, halt -Requires: binutils +Requires: systemd >= 219 Requires: systemd-sysvinit Requires: udev > 166 Requires: util-linux >= 2.21 @@ -164,11 +156,10 @@ %{?systemd_requires} %description -Dracut contains tools to create a bootable initramfs for 2.6 Linux kernels. -Unlike existing implementations, dracut does hard-code as little as possible -into the initramfs. Dracut contains various modules which are driven by the -event-based udev. Having root on MD, DM, LVM2, LUKS is supported as well as -NFS, iSCSI, NBD, FCoE with the dracut-network package. +Dracut contains tools to create a bootable initramfs for Linux kernels >= 2.6. +Dracut contains various modules which are driven by the event-based udev +and systemd. Having root on MD, DM, LVM2, LUKS is supported as well as +NFS, iSCSI, NBD, FCoE. %package fips Summary: Dracut modules to build a dracut initramfs with an integrity check @@ -183,6 +174,14 @@ initramfs with dracut, which does an integrity check of the kernel and its cryptography during startup. +%package tools +Summary: Tools to build a local initramfs +Group: System/Base +Requires: %{name} = %{version}-%{release} + +%description tools +This package contains tools to assemble the local initrd and host configuration. + %prep %setup -q %patch12 -p1 @@ -226,10 +225,7 @@ %patch116 -p1 %patch117 -p1 %patch118 -p1 -%patch119 -p1 -%patch120 -p1 %patch121 -p1 -%patch122 -p1 %patch123 -p1 %patch124 -p1 %patch125 -p1 @@ -256,14 +252,12 @@ %patch159 -p1 %patch163 -p1 %patch164 -p1 -%patch165 -p1 %patch168 -p1 %patch180 -p1 # disabled, as it breaks encrypted / on LVM - dimstar, 20151001 #patch181 -p1 %patch182 -p1 %patch183 -p1 -%patch184 -p1 %patch200 -p1 %patch201 -p1 @@ -271,12 +265,11 @@ %patch203 -p1 %patch204 -p1 %patch205 -p1 +%patch206 -p1 %patch300 -p1 %patch301 -p1 -%patch400 -p1 -%patch401 -p1 %patch402 -p1 %build @@ -291,31 +284,33 @@ echo -e "#!/bin/bash\nDRACUT_VERSION=%{version}-%{release}" > %{buildroot}/%{dracutlibdir}/dracut-version.sh -# we do not support dash in the initramfs -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash -rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox +# use 00systemd-bootchart instead rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00bootchart -# remove gentoo specific modules -rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash +# not supported +rm -fr %{buildroot}/%{dracutlibdir}/modules.d/00dash +rm -fr %{buildroot}/%{dracutlibdir}/modules.d/05busybox -# IMA modules are not supported currently. +# with systemd IMA and selinux modules do not make sense rm -fr %{buildroot}/%{dracutlibdir}/modules.d/96securityfs rm -fr %{buildroot}/%{dracutlibdir}/modules.d/97masterkey rm -fr %{buildroot}/%{dracutlibdir}/modules.d/98integrity +# remove gentoo specific modules +rm -fr %{buildroot}%{dracutlibdir}/modules.d/50gensplash + mkdir -p %{buildroot}/boot/dracut mkdir -p %{buildroot}%{_localstatedir}/lib/dracut/overlay mkdir -p %{buildroot}%{_localstatedir}/log touch %{buildroot}%{_localstatedir}/log/dracut.log install -m 0644 dracut.conf.d/suse.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/01-dist.conf - install -m 0644 dracut.conf.d/fips.conf.example %{buildroot}%{_sysconfdir}/dracut.conf.d/40-fips.conf %ifarch %ix86 x86_64 echo 'early_microcode="yes"' > %{buildroot}%{_sysconfdir}/dracut.conf.d/02-early-microcode.conf %endif + rm %{buildroot}%{_bindir}/mkinitrd # moved to /sbin mkdir -p %{buildroot}/sbin @@ -372,35 +367,34 @@ %{dracutlibdir}/modules.d/01fips %{dracutlibdir}/modules.d/02fips-aesni +%files tools +%{_bindir}/dracut-catimages +%{_mandir}/man8/dracut-catimages.8* +%dir /boot/dracut +%dir %{_localstatedir}/lib/dracut +%dir %{_localstatedir}/lib/dracut/overlay + %files %defattr(-,root,root,0755) %doc README HACKING TODO COPYING AUTHORS NEWS dracut.html dracut.png dracut.svg %{_bindir}/dracut -%{_bindir}/dracut-catimages %{_bindir}/lsinitrd /sbin/purge-kernels /sbin/installkernel /sbin/mkinitrd /sbin/mkinitrd_setup %config %{_sysconfdir}/bash_completion.d/lsinitrd -/usr/share/pkgconfig/dracut.pc -%dir %{dracutlibdir} -%dir %{dracutlibdir}/modules.d -%{dracutlibdir}/skipcpio -%{dracutlibdir}/dracut-functions.sh -%{dracutlibdir}/dracut-functions -%{dracutlibdir}/dracut-version.sh -%{dracutlibdir}/dracut-logger.sh -%{dracutlibdir}/dracut-initramfs-restore -%{dracutlibdir}/dracut-install +%{_datadir}/pkgconfig/dracut.pc + %config(noreplace) %{_sysconfdir}/dracut.conf +%dir %{_sysconfdir}/dracut.conf.d %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} %config %{_sysconfdir}/dracut.conf.d/01-dist.conf %endif %ifarch %ix86 x86_64 %config %{_sysconfdir}/dracut.conf.d/02-early-microcode.conf %endif -%dir %{_sysconfdir}/dracut.conf.d + %{_mandir}/man8/dracut.8* %{_mandir}/man8/mkinitrd.8* %{_mandir}/man1/lsinitrd.1* @@ -417,21 +411,31 @@ %{_mandir}/man8/dracut-pre-mount.service.8.* %{_mandir}/man8/dracut-shutdown.service.8.* %{_mandir}/man5/dracut.conf.5* -%{_mandir}/man8/dracut-catimages.8* + %dir %{_libexecdir}/kernel %dir %{_libexecdir}/kernel/install.d %{_libexecdir}/kernel/install.d/50-dracut.install %{_libexecdir}/kernel/install.d/51-dracut-rescue.install -%dir %{dracutlibdir}/modules.d/00systemd-bootchart -%dir %{dracutlibdir}/modules.d/03rescue + +%dir %{dracutlibdir} +%{dracutlibdir}/skipcpio +%{dracutlibdir}/dracut-functions.sh +%{dracutlibdir}/dracut-init.sh +%{dracutlibdir}/dracut-functions +%{dracutlibdir}/dracut-version.sh +%{dracutlibdir}/dracut-logger.sh +%{dracutlibdir}/dracut-initramfs-restore +%{dracutlibdir}/dracut-install + +%dir %{dracutlibdir}/modules.d %{dracutlibdir}/modules.d/00bash -%{dracutlibdir}/modules.d/00systemd-bootchart/module-setup.sh +%{dracutlibdir}/modules.d/00systemd-bootchart %{dracutlibdir}/modules.d/00warpclock %{dracutlibdir}/modules.d/00systemd %{dracutlibdir}/modules.d/01systemd-initrd %{dracutlibdir}/modules.d/02systemd-networkd %{dracutlibdir}/modules.d/03modsign -%{dracutlibdir}/modules.d/03rescue/module-setup.sh +%{dracutlibdir}/modules.d/03rescue %{dracutlibdir}/modules.d/04watchdog %{dracutlibdir}/modules.d/10i18n %{dracutlibdir}/modules.d/30convertfs @@ -494,21 +498,20 @@ %{dracutlibdir}/modules.d/99uefi-lib # executable fixups +%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh +%attr(0755,root,root) %{dracutlibdir}/modules.d/90livenet/livenet-generator.sh %attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/parse-dcssblk.sh %attr(0755,root,root) %{dracutlibdir}/modules.d/95dcssblk/module-setup.sh +%attr(0755,root,root) %{dracutlibdir}/modules.d/95fcoe/cleanup-fcoe.sh %attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/parse-suse-initrd.sh %attr(0755,root,root) %{dracutlibdir}/modules.d/99suse/module-setup.sh -%attr(0755,root,root) %{dracutlibdir}/modules.d/00warpclock/warpclock.sh %config(noreplace) %{_sysconfdir}/logrotate.d/dracut -%attr(0644,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log +%attr(0640,root,root) %ghost %config(missingok,noreplace) %{_localstatedir}/log/dracut.log %dir %{_unitdir}/initrd.target.wants +%dir %{_unitdir}/sysinit.target.wants %{_unitdir}/*.service %{_unitdir}/*/*.service -%dir %{_unitdir}/sysinit.target.wants %config %{_sysconfdir}/bash_completion.d/dracut -%dir /boot/dracut -%dir %{_localstatedir}/lib/dracut -%dir %{_localstatedir}/lib/dracut/overlay %changelog ++++++ 0015-40network-replace-dhclient-with-wickedd-dhcp-supplic.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -20,19 +20,19 @@ delete mode 100644 modules.d/40network/dhclient.conf delete mode 100755 modules.d/40network/kill-dhclient.sh -Index: dracut-042/modules.d/40network/dhclient.conf +Index: dracut-044/modules.d/40network/dhclient.conf =================================================================== ---- dracut-042.orig/modules.d/40network/dhclient.conf 2015-06-11 17:39:47.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- dracut-044.orig/modules.d/40network/dhclient.conf ++++ /dev/null @@ -1,3 +0,0 @@ -request subnet-mask, broadcast-address, time-offset, routers, - domain-name, domain-name-servers, domain-search, host-name, - root-path, interface-mtu; -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:05.645160455 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:05.945177534 +0200 -@@ -86,21 +86,106 @@ else +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -87,6 +87,70 @@ else [ -e /tmp/net.$(cat /sys/class/net/$netif/address).did-setup ] && exit 0 fi @@ -103,8 +103,9 @@ # Run dhclient do_dhcp() { # dhclient-script will mark the netif up and generate the online - # event for nfsroot - # XXX add -V vendor class and option parsing per kernel +@@ -98,28 +162,35 @@ do_dhcp() { + local _DHCPRETRY=$(getargs rd.net.dhcp.retry=) + _DHCPRETRY=${_DHCPRETRY:-1} - [ -e /tmp/dhclient.$netif.pid ] && return 0 + [ -f /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} ] && return 0 @@ -122,7 +123,7 @@ + ip $1 addr flush dev "$netif" if ! iface_has_link $netif; then -- echo "No carrier detected" +- warn "No carrier detected on interface $netif" - return 1 + warn "No carrier detected" + warn "Trying to set $netif up..." @@ -132,10 +133,22 @@ + return 1 + fi fi -+ - echo "Starting dhcp for interface $netif" -- dhclient "$@" -1 -q -cf /etc/dhclient.conf -pf /tmp/dhclient.$netif.pid -lf /tmp/dhclient.$netif.lease $netif \ -- || echo "dhcp failed" + +- while [ $_COUNT -lt $_DHCPRETRY ]; do +- info "Starting dhcp for interface $netif" +- dhclient "$@" \ +- ${_timeout:+-timeout $_timeout} \ +- -q \ +- -cf /etc/dhclient.conf \ +- -pf /tmp/dhclient.$netif.pid \ +- -lf /tmp/dhclient.$netif.lease \ +- $netif \ +- && return 0 +- _COUNT=$(($_COUNT+1)) +- [ $_COUNT -lt $_DHCPRETRY ] && sleep 1 +- done +- warn "dhcp for interface $netif failed" +- return 1 + $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} + dhcp_apply $1 || return $? + @@ -144,7 +157,7 @@ } load_ipv6() { -@@ -226,8 +311,6 @@ if [ -e /tmp/team.info ]; then +@@ -262,8 +333,6 @@ if [ -e /tmp/team.info ]; then fi fi @@ -153,10 +166,10 @@ if [ -e /tmp/bridge.info ]; then . /tmp/bridge.info # start bridge if necessary -Index: dracut-042/modules.d/40network/kill-dhclient.sh +Index: dracut-044/modules.d/40network/kill-dhclient.sh =================================================================== ---- dracut-042.orig/modules.d/40network/kill-dhclient.sh 2015-06-11 17:39:47.000000000 +0200 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- dracut-044.orig/modules.d/40network/kill-dhclient.sh ++++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - @@ -173,10 +186,10 @@ - read PID < $f; - kill -9 $PID >/dev/null 2>&1 -done -Index: dracut-042/modules.d/40network/module-setup.sh +Index: dracut-044/modules.d/40network/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24 18:02:05.949177762 +0200 +--- dracut-044.orig/modules.d/40network/module-setup.sh ++++ dracut-044/modules.d/40network/module-setup.sh @@ -1,10 +1,13 @@ #!/bin/bash ++++++ 0017-45ifcfg-use-distro-specific-scripts.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -16,11 +16,11 @@ modules.d/45ifcfg/module-setup.sh | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:05.945177534 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:06.605215110 +0200 -@@ -184,6 +184,7 @@ do_dhcp() { +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -189,6 +189,7 @@ do_dhcp() { $dhclient --test $netif > /tmp/leaseinfo.${netif}.dhcp.ipv${1:1:1} dhcp_apply $1 || return $? @@ -28,10 +28,10 @@ echo $netif > /tmp/setup_net_${netif}.ok return 0 } -Index: dracut-042/modules.d/45ifcfg/module-setup.sh +Index: dracut-044/modules.d/45ifcfg/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/45ifcfg/module-setup.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/45ifcfg/module-setup.sh 2015-06-24 18:02:06.605215110 +0200 +--- dracut-044.orig/modules.d/45ifcfg/module-setup.sh ++++ dracut-044/modules.d/45ifcfg/module-setup.sh @@ -2,7 +2,13 @@ # called by dracut ++++++ 0019-40network-Fix-race-condition-when-wait-for-networks.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -17,11 +17,11 @@ modules.d/40network/net-genrules.sh | 3 +++ 1 file changed, 3 insertions(+) -Index: dracut-042/modules.d/40network/net-genrules.sh +Index: dracut-044/modules.d/40network/net-genrules.sh =================================================================== ---- dracut-042.orig/modules.d/40network/net-genrules.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/40network/net-genrules.sh 2015-06-24 18:02:05.357144086 +0200 -@@ -96,6 +96,9 @@ command -v fix_bootif >/dev/null || . /l +--- dracut-044.orig/modules.d/40network/net-genrules.sh ++++ dracut-044/modules.d/40network/net-genrules.sh +@@ -95,6 +95,9 @@ command -v fix_bootif >/dev/null || . /l cond='ACTION=="add", SUBSYSTEM=="net"' # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh echo "$cond, $runcmd" > /etc/udev/rules.d/91-default-net.rules ++++++ 0048-40network-Only-enable-network-interfaces-if-explicit.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -16,11 +16,11 @@ modules.d/40network/net-genrules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: dracut-042/modules.d/40network/net-genrules.sh +Index: dracut-044/modules.d/40network/net-genrules.sh =================================================================== ---- dracut-042.orig/modules.d/40network/net-genrules.sh 2015-06-24 18:02:05.357144086 +0200 -+++ dracut-042/modules.d/40network/net-genrules.sh 2015-06-24 18:02:07.521267259 +0200 -@@ -95,8 +95,8 @@ command -v fix_bootif >/dev/null || . /l +--- dracut-044.orig/modules.d/40network/net-genrules.sh ++++ dracut-044/modules.d/40network/net-genrules.sh +@@ -94,8 +94,8 @@ command -v fix_bootif >/dev/null || . /l else cond='ACTION=="add", SUBSYSTEM=="net"' # if you change the name of "91-default-net.rules", also change modules.d/80cms/cmssetup.sh ++++++ 0056-81cio_ignore-handle-cio_ignore-commandline.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -32,12 +32,12 @@ Signed-off-by: Thomas Renninger <trenn(a)suse.de> -Index: dracut-042/dracut.cmdline.7.asc +Index: dracut-044/dracut.cmdline.7.asc =================================================================== ---- dracut-042.orig/dracut.cmdline.7.asc 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/dracut.cmdline.7.asc 2015-06-24 18:02:08.125301648 +0200 -@@ -869,6 +869,21 @@ NOTE: There must be enough free RAM avai - This method is very suitable for diskless boots. +--- dracut-044.orig/dracut.cmdline.7.asc ++++ dracut-044/dracut.cmdline.7.asc +@@ -948,6 +948,21 @@ that memory is given back to the kernel + anymore. +CIO_IGNORE @@ -58,10 +58,10 @@ Plymouth Boot Splash ~~~~~~~~~~~~~~~~~~~~ **plymouth.enable=0**:: -Index: dracut-042/modules.d/81cio_ignore/module-setup.sh +Index: dracut-044/modules.d/81cio_ignore/module-setup.sh =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dracut-042/modules.d/81cio_ignore/module-setup.sh 2015-06-24 18:02:08.125301648 +0200 +--- /dev/null ++++ dracut-044/modules.d/81cio_ignore/module-setup.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -103,10 +103,10 @@ + inst_hook cmdline 20 "$moddir/parse-cio_accept.sh" + inst_multiple cio_ignore +} -Index: dracut-042/modules.d/81cio_ignore/parse-cio_accept.sh +Index: dracut-044/modules.d/81cio_ignore/parse-cio_accept.sh =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dracut-042/modules.d/81cio_ignore/parse-cio_accept.sh 2015-06-24 18:02:08.125301648 +0200 +--- /dev/null ++++ dracut-044/modules.d/81cio_ignore/parse-cio_accept.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- ++++++ 0058-dracut-add-warning-when-including-unsupported-module.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -20,16 +20,16 @@ Signed-off-by: Jeff Mahoney <jeffm(a)suse.com> --- - dracut-functions.sh | 21 +++++++++++++++++++++ + dracut-init.sh | 21 +++++++++++++++++++++ dracut.8.asc | 11 +++++++++++ dracut.sh | 5 +++++ 3 files changed, 37 insertions(+) -Index: dracut-042/dracut-functions.sh +Index: dracut-044/dracut-init.sh =================================================================== ---- dracut-042.orig/dracut-functions.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:08.741336717 +0200 -@@ -1436,6 +1436,17 @@ for_each_module_dir() { +--- dracut-044.orig/dracut-init.sh ++++ dracut-044/dracut-init.sh +@@ -849,6 +849,17 @@ for_each_module_dir() { done } @@ -47,7 +47,7 @@ # Install a single kernel module along with any firmware it may require. # $1 = full path to kernel module to install install_kmod_with_fw() { -@@ -1498,6 +1509,10 @@ install_kmod_with_fw() { +@@ -910,6 +921,10 @@ install_kmod_with_fw() { fi fi done @@ -58,7 +58,7 @@ return 0 } -@@ -1544,6 +1559,12 @@ dracut_kernel_post() { +@@ -956,6 +971,12 @@ dracut_kernel_post() { inst_simple "$_modpath" "/lib/modules/$kernel/${_destpath}" || exit $? done < "$DRACUT_KERNEL_LAZY_HASHDIR/lazylist.dep" fi @@ -71,11 +71,11 @@ ) & _pid=$(jobs -p | while read a || [ -n "$a" ]; do printf ":$a";done) _pid=${_pid##*:} -Index: dracut-042/dracut.8.asc +Index: dracut-044/dracut.8.asc =================================================================== ---- dracut-042.orig/dracut.8.asc 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/dracut.8.asc 2015-06-24 18:02:08.741336717 +0200 -@@ -479,6 +479,17 @@ will not be able to boot. +--- dracut-044.orig/dracut.8.asc ++++ dracut-044/dracut.8.asc +@@ -490,6 +490,17 @@ will not be able to boot. Specifies the kernel image, which to include in the UEFI executable. The default is _/lib/modules/<KERNEL-VERSION>/vmlinuz_ or _/boot/vmlinuz-<KERNEL-VERSION>_ @@ -93,11 +93,11 @@ FILES ----- _/var/log/dracut.log_:: -Index: dracut-042/dracut.sh +Index: dracut-044/dracut.sh =================================================================== ---- dracut-042.orig/dracut.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/dracut.sh 2015-06-24 18:02:08.745336946 +0200 -@@ -193,6 +193,9 @@ Creates initial ramdisk images for prelo +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -203,6 +203,9 @@ Creates initial ramdisk images for prelo --printsize Print out the module install size --sshkey [SSHKEY] Add ssh key to initramfs (use with ssh-client module) --logfile [FILE] Logfile to use (overrides configuration setting) @@ -105,21 +105,21 @@ + using a kernel that is configured to check the + support status of a module before loading. --reproducible Create reproducible images + --no-reproducible Do not create reproducible images --loginstall [DIR] Log all files installed from the host to [DIR] - --uefi Create an UEFI executable with the kernel cmdline and -@@ -391,6 +394,7 @@ rearrange_params() +@@ -360,6 +363,7 @@ rearrange_params() --long noimageifnotneeded \ --long early-microcode \ --long no-early-microcode \ + --long check-supported \ --long reproducible \ + --long no-reproducible \ --long loginstall: \ - --long uefi \ -@@ -583,6 +587,7 @@ while :; do +@@ -556,6 +560,7 @@ while :; do --printsize) printsize="yes";; --regenerate-all) regenerate_all="yes";; --noimageifnotneeded) noimageifnotneeded="yes";; + --check-supported) check_supported="yes" ;; --reproducible) reproducible_l="yes";; + --no-reproducible) reproducible_l="no";; --uefi) uefi="yes";; - --uefi-stub) ++++++ 0066-40network-always-start-netroot-in-ifup.sh.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:04.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:04.000000000 +0100 @@ -16,23 +16,32 @@ modules.d/40network/ifup.sh | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:05.645160455 +0200 -@@ -338,21 +338,15 @@ for p in $(getargs ip=); do +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -373,27 +373,20 @@ for p in $(getargs ip=); do + do_static ;; esac done +- ret=$? - > /tmp/net.${netif}.up + if [ $? -eq 0 ]; then + > /tmp/net.${netif}.up +- if [ -e /sys/class/net/${netif}/address ]; then +- > /tmp/net.$(cat /sys/class/net/${netif}/address).up +- fi ++ if [ -e /sys/class/net/${netif}/address ]; then ++ > /tmp/net.$(cat /sys/class/net/${netif}/address).up ++ fi + - case $autoconf in - dhcp|on|any|dhcp6) - ;; - *) -- if [ $? -eq 0 ]; then +- if [ $ret -eq 0 ]; then - setup_net $netif - source_hook initqueue/online $netif - if [ -z "$manualup" ]; then ++++++ 0088-91zipl-Add-new-module-to-update-s390x-configuration.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -19,11 +19,11 @@ create mode 100644 modules.d/91zipl/module-setup.sh create mode 100644 modules.d/91zipl/parse-zipl.sh -Index: dracut-042/dracut.cmdline.7.asc +Index: dracut-044/dracut.cmdline.7.asc =================================================================== ---- dracut-042.orig/dracut.cmdline.7.asc 2015-06-24 18:02:08.125301648 +0200 -+++ dracut-042/dracut.cmdline.7.asc 2015-06-24 18:02:12.621557615 +0200 -@@ -884,6 +884,20 @@ CIO_IGNORE +--- dracut-044.orig/dracut.cmdline.7.asc ++++ dracut-044/dracut.cmdline.7.asc +@@ -963,6 +963,20 @@ CIO_IGNORE rd.cio_accept=0.0.0180,0.0.0800,0.0.0801,0.0.0802 -- @@ -44,10 +44,10 @@ Plymouth Boot Splash ~~~~~~~~~~~~~~~~~~~~ **plymouth.enable=0**:: -Index: dracut-042/modules.d/91zipl/install_zipl_cmdline.sh +Index: dracut-044/modules.d/91zipl/install_zipl_cmdline.sh =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dracut-042/modules.d/91zipl/install_zipl_cmdline.sh 2015-06-24 18:02:12.621557615 +0200 +--- /dev/null ++++ dracut-044/modules.d/91zipl/install_zipl_cmdline.sh @@ -0,0 +1,33 @@ +#!/bin/bash + @@ -82,10 +82,10 @@ +> /tmp/install.zipl.cmdline-done + +exit 0 -Index: dracut-042/modules.d/91zipl/module-setup.sh +Index: dracut-044/modules.d/91zipl/module-setup.sh =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dracut-042/modules.d/91zipl/module-setup.sh 2015-06-24 18:02:12.621557615 +0200 +--- /dev/null ++++ dracut-044/modules.d/91zipl/module-setup.sh @@ -0,0 +1,45 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- @@ -132,10 +132,10 @@ + fi + dracut_need_initqueue +} -Index: dracut-042/modules.d/91zipl/parse-zipl.sh +Index: dracut-044/modules.d/91zipl/parse-zipl.sh =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ dracut-042/modules.d/91zipl/parse-zipl.sh 2015-06-24 18:02:12.621557615 +0200 +--- /dev/null ++++ dracut-044/modules.d/91zipl/parse-zipl.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- ++++++ 0094-Implement-shortcut-ip-ifname-static-for-static-confi.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -15,11 +15,11 @@ modules.d/40network/parse-ip-opts.sh | 8 +++++++- 3 files changed, 24 insertions(+), 2 deletions(-) -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:12.961576972 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:13.849627528 +0200 -@@ -399,6 +399,18 @@ for p in $(getargs ip=); do +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -421,6 +421,18 @@ for p in $(getargs ip=); do [ "$use_bridge" != 'true' ] && \ [ "$use_vlan" != 'true' ] && continue @@ -36,9 +36,9 @@ + fi + # setup nameserver - namesrv="$dns1 $dns2 $(getargs nameserver)" - for s in $namesrv; do -@@ -412,7 +424,7 @@ for p in $(getargs ip=); do + for s in "$dns1" "$dns2" $(getargs nameserver); do + [ -n "$s" ] || continue +@@ -434,7 +446,7 @@ for p in $(getargs ip=); do for autoopt in $(str_replace "$autoconf" "," " "); do case $autoopt in @@ -47,10 +47,10 @@ do_dhcp -4 ;; dhcp6) load_ipv6 -Index: dracut-042/modules.d/40network/module-setup.sh +Index: dracut-044/modules.d/40network/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-24 18:02:05.949177762 +0200 -+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24 18:02:13.849627528 +0200 +--- dracut-044.orig/modules.d/40network/module-setup.sh ++++ dracut-044/modules.d/40network/module-setup.sh @@ -51,6 +51,10 @@ install() { _arch=$(uname -m) @@ -62,11 +62,11 @@ inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \ {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*" -Index: dracut-042/modules.d/40network/parse-ip-opts.sh +Index: dracut-044/modules.d/40network/parse-ip-opts.sh =================================================================== ---- dracut-042.orig/modules.d/40network/parse-ip-opts.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/40network/parse-ip-opts.sh 2015-06-24 18:02:13.849627528 +0200 -@@ -67,7 +67,13 @@ for p in $(getargs ip=); do +--- dracut-044.orig/modules.d/40network/parse-ip-opts.sh ++++ dracut-044/modules.d/40network/parse-ip-opts.sh +@@ -69,7 +69,13 @@ for p in $(getargs ip=); do for autoopt in $(str_replace "$autoconf" "," " "); do case $autoopt in error) die "Error parsing option 'ip=$p'";; ++++++ 0121-Adjust-initramfs-kernel.img-to-SUSE-default-initrd-k.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -13,11 +13,11 @@ lsinitrd.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: dracut-042/dracut.sh +Index: dracut-044/dracut.sh =================================================================== ---- dracut-042.orig/dracut.sh 2015-06-24 18:02:08.745336946 +0200 -+++ dracut-042/dracut.sh 2015-06-24 18:02:21.906086174 +0200 -@@ -658,7 +658,7 @@ if ! [[ $outfile ]]; then +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -632,7 +632,7 @@ if ! [[ $outfile ]]; then if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then outfile="/boot/${MACHINE_ID}/$kernel/initrd" else @@ -26,10 +26,10 @@ fi fi -Index: dracut-042/lsinitrd.sh +Index: dracut-044/lsinitrd.sh =================================================================== ---- dracut-042.orig/lsinitrd.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/lsinitrd.sh 2015-06-24 18:02:21.906086174 +0200 +--- dracut-044.orig/lsinitrd.sh ++++ dracut-044/lsinitrd.sh @@ -89,7 +89,7 @@ else && [[ -d /boot/${MACHINE_ID} || -L /boot/${MACHINE_ID} ]] ; then image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd" ++++++ 0124-40network-Update-iBFT-scanning-code-to-handle-IPv6.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -13,11 +13,11 @@ modules.d/40network/net-lib.sh | 48 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) -Index: dracut-042/modules.d/40network/net-lib.sh +Index: dracut-044/modules.d/40network/net-lib.sh =================================================================== ---- dracut-042.orig/modules.d/40network/net-lib.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/40network/net-lib.sh 2015-06-24 18:02:22.802137185 +0200 -@@ -213,20 +213,51 @@ ibft_to_cmdline() { +--- dracut-044.orig/modules.d/40network/net-lib.sh ++++ dracut-044/modules.d/40network/net-lib.sh +@@ -241,23 +241,54 @@ ibft_to_cmdline() { [ -e /tmp/net.${dev}.has_ibft_config ] && continue @@ -53,10 +53,13 @@ # skip not assigned ip adresses [ "$ip" = "0.0.0.0" ] && continue [ -e ${iface}/gateway ] && gw=$(read a < ${iface}/gateway; echo $a) + [ "$gateway" = "0.0.0.0" ] && unset $gateway [ -e ${iface}/subnet-mask ] && mask=$(read a < ${iface}/subnet-mask; echo $a) + [ -e ${iface}/prefix-len ] && prefix=$(read a < ${iface}/prefix-len; echo $a) [ -e ${iface}/primary-dns ] && dns1=$(read a < ${iface}/primary-dns; echo $a) + [ "$dns1" = "0.0.0.0" ] && unset $dns1 [ -e ${iface}/secondary-dns ] && dns2=$(read a < ${iface}/secondary-dns; echo $a) + [ "$dns2" = "0.0.0.0" ] && unset $dns2 [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a) - if [ -n "$ip" ] && [ -n "$mask" ]; then + if [ "$family" = "ipv6" ] ; then @@ -73,7 +76,7 @@ echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}" else warn "${iface} does not contain a valid iBFT configuration" -@@ -405,6 +436,13 @@ ip_to_var() { +@@ -436,6 +467,13 @@ ip_to_var() { esac ;; esac ++++++ 0125-40network-separate-mask-and-prefix.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -18,12 +18,12 @@ modules.d/40network/parse-ip-opts.sh | 2 +- 3 files changed, 45 insertions(+), 8 deletions(-) -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:13.849627528 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:23.090153581 +0200 -@@ -222,13 +222,14 @@ do_static() { - linkup $netif +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -240,9 +240,10 @@ do_static() { + [ -n "$macaddr" ] && ip link set address $macaddr dev $netif [ -n "$mtu" ] && ip link set mtu $mtu dev $netif + [ -n "$mask" -a -z "$prefix" ] && prefix=$(mask_to_prefix $mask) @@ -33,13 +33,17 @@ + ip addr add $ip/$prefix ${srv:+peer $srv} dev $netif wait_for_ipv6_dad $netif else + if ! arping -f -q -D -c 2 -I $netif $ip; then +@@ -250,7 +251,7 @@ do_static() { + return 1 + fi ip addr flush dev $netif - ip addr add $ip/$mask ${srv:+peer $srv} brd + dev $netif + ip addr add $ip/$prefix ${srv:+peer $srv} brd + dev $netif fi [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw -@@ -404,7 +405,7 @@ for p in $(getargs ip=); do +@@ -426,7 +427,7 @@ for p in $(getargs ip=); do # Pull in existing static configuration . /etc/sysconfig/network/ifcfg-${netif} ip=${IPADDR} @@ -48,7 +52,7 @@ mtu=${MTU} server=${REMOTE_IPADDR} gw=${GATEWAY} -@@ -418,7 +419,7 @@ for p in $(getargs ip=); do +@@ -440,7 +441,7 @@ for p in $(getargs ip=); do done # Store config for later use @@ -57,12 +61,12 @@ eval '[ "$'$i'" ] && echo '$i'="$'$i'"' done > /tmp/net.$netif.override -Index: dracut-042/modules.d/40network/net-lib.sh +Index: dracut-044/modules.d/40network/net-lib.sh =================================================================== ---- dracut-042.orig/modules.d/40network/net-lib.sh 2015-06-24 18:02:22.802137185 +0200 -+++ dracut-042/modules.d/40network/net-lib.sh 2015-06-24 18:02:23.090153581 +0200 -@@ -7,6 +7,35 @@ get_ip() { - ip=${ip##* } +--- dracut-044.orig/modules.d/40network/net-lib.sh ++++ dracut-044/modules.d/40network/net-lib.sh +@@ -20,6 +20,35 @@ get_ip() { + echo $ip } +mask_to_prefix() { @@ -97,7 +101,7 @@ iface_for_remote_addr() { set -- $(ip -o route get to $1) echo $5 -@@ -204,7 +233,7 @@ ibft_to_cmdline() { +@@ -232,7 +261,7 @@ ibft_to_cmdline() { for iface in /sys/firmware/ibft/ethernet*; do local mac="" dev="" local dhcp="" ip="" gw="" mask="" hostname="" @@ -106,7 +110,7 @@ [ -e ${iface}/mac ] || continue mac=$(read a < ${iface}/mac; echo $a) -@@ -249,6 +278,7 @@ ibft_to_cmdline() { +@@ -280,6 +309,7 @@ ibft_to_cmdline() { [ -e ${iface}/hostname ] && hostname=$(read a < ${iface}/hostname; echo $a) if [ "$family" = "ipv6" ] ; then if [ -n "$ip" ] ; then @@ -114,7 +118,7 @@ [ -n "$prefix" ] || prefix=64 ip="[${ip}/${prefix}]" mask= -@@ -256,6 +286,11 @@ ibft_to_cmdline() { +@@ -287,6 +317,11 @@ ibft_to_cmdline() { if [ -n "$gw" ] ; then gw="[${gw}]" fi @@ -126,7 +130,7 @@ fi if [ -n "$ip" ] && [ -n "$mask" -o -n "$prefix" ]; then echo "ip=$ip::$gw:$mask:$hostname:$dev:none${dns1:+:$dns1}${dns2:+:$dns2}" -@@ -264,6 +299,7 @@ ibft_to_cmdline() { +@@ -295,6 +330,7 @@ ibft_to_cmdline() { warn "ip-addr=$ip" warn "gateway=$gw" warn "subnet-mask=$mask" @@ -134,7 +138,7 @@ warn "hostname=$hostname" fi else -@@ -411,7 +447,7 @@ ip_to_var() { +@@ -442,7 +478,7 @@ ip_to_var() { fi done @@ -143,7 +147,7 @@ case $# in 0) autoconf="error" ;; 1) autoconf=$1 ;; -@@ -439,7 +475,7 @@ ip_to_var() { +@@ -470,7 +506,7 @@ ip_to_var() { # Extract prefix length from CIDR notation case $ip in */*) @@ -152,11 +156,11 @@ ip=${ip%/*} ;; esac -Index: dracut-042/modules.d/40network/parse-ip-opts.sh +Index: dracut-044/modules.d/40network/parse-ip-opts.sh =================================================================== ---- dracut-042.orig/modules.d/40network/parse-ip-opts.sh 2015-06-24 18:02:13.849627528 +0200 -+++ dracut-042/modules.d/40network/parse-ip-opts.sh 2015-06-24 18:02:23.090153581 +0200 -@@ -77,7 +77,7 @@ for p in $(getargs ip=); do +--- dracut-044.orig/modules.d/40network/parse-ip-opts.sh ++++ dracut-044/modules.d/40network/parse-ip-opts.sh +@@ -79,7 +79,7 @@ for p in $(getargs ip=); do none|off) [ -z "$ip" ] && \ die "For argument 'ip=$p'\nValue '$autoopt' without static configuration does not make sense" ++++++ 0131-40network-handle-prefixed-IP-addresses-correctly.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -14,25 +14,29 @@ modules.d/40network/ifup.sh | 8 ++++++++ 1 file changed, 8 insertions(+) -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:23.090153581 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:27.658413647 +0200 -@@ -223,11 +223,19 @@ do_static() { +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -241,7 +241,13 @@ do_static() { [ -n "$macaddr" ] && ip link set address $macaddr dev $netif [ -n "$mtu" ] && ip link set mtu $mtu dev $netif [ -n "$mask" -a -z "$prefix" ] && prefix=$(mask_to_prefix $mask) +- if strglobin $ip '*:*:*'; then + if [ "${ip##*/}" != "${ip}" ] ; then + prefix="${ip##*/}" + ip="${ip%/*}" + fi - if strglobin $ip '*:*:*'; then ++if strglobin $ip '*:*:*'; then + # Always assume /64 prefix for IPv6 + [ -z "$prefix" ] && prefix=64 # note no ip addr flush for ipv6 ip addr add $ip/$prefix ${srv:+peer $srv} dev $netif wait_for_ipv6_dad $netif - else +@@ -250,6 +256,8 @@ do_static() { + warn "Duplicate address detected for $ip for interface $netif." + return 1 + fi + # Assume /24 prefix for IPv4 + [ -z "$prefix" ] && prefix=24 ip addr flush dev $netif ++++++ 0132-40network-fixup-static-network-configuration.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -18,11 +18,11 @@ modules.d/40network/net-lib.sh | 6 +++++- 3 files changed, 20 insertions(+), 1 deletion(-) -Index: dracut-042/modules.d/40network/ifup.sh +Index: dracut-044/modules.d/40network/ifup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/ifup.sh 2015-06-24 18:02:27.658413647 +0200 -+++ dracut-042/modules.d/40network/ifup.sh 2015-06-24 18:02:27.950430272 +0200 -@@ -241,6 +241,19 @@ do_static() { +--- dracut-044.orig/modules.d/40network/ifup.sh ++++ dracut-044/modules.d/40network/ifup.sh +@@ -263,6 +263,19 @@ if strglobin $ip '*:*:*'; then fi [ -n "$gw" ] && echo ip route replace default via $gw dev $netif > /tmp/net.$netif.gw @@ -42,10 +42,10 @@ [ -n "$hostname" ] && echo "echo $hostname > /proc/sys/kernel/hostname" > /tmp/net.$netif.hostname return 0 -Index: dracut-042/modules.d/40network/module-setup.sh +Index: dracut-044/modules.d/40network/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/40network/module-setup.sh 2015-06-24 18:02:13.849627528 +0200 -+++ dracut-042/modules.d/40network/module-setup.sh 2015-06-24 18:02:27.950430272 +0200 +--- dracut-044.orig/modules.d/40network/module-setup.sh ++++ dracut-044/modules.d/40network/module-setup.sh @@ -53,6 +53,8 @@ install() { [[ $hostonly ]] && { ++++++ 0138-fips_add_aesni-intel.patch ++++++ Index: dracut-042/modules.d/01fips/module-setup.sh =================================================================== --- dracut-042.orig/modules.d/01fips/module-setup.sh 2015-06-26 09:52:08.837700391 +0200 +++ dracut-042/modules.d/01fips/module-setup.sh 2015-06-26 09:53:16.613565464 +0200 @@ -20,7 +20,7 @@ installkernel() { _fipsmodules+="sha384 sha512 sha512_generic tcrypt tea tnepres twofish wp256 wp384 wp512 xeta xtea xts zlib" _fipsmodules+="aes_s390 des_s390 prng sha256_s390 sha_common des_check_key ghash_s390 sha1_s390 sha512_s390" _fipsmodules+="sha512-ssse3 sha1-ssse3 sha256-ssse3 " - _fipsmodules+="ghash-clmulni-intel " + _fipsmodules+="ghash-clmulni-intel aesni-intel " _fipsmodules+="drbg" ++++++ 0144-90crypt-Fixed-crypttab_contains-to-also-work-with-de.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -17,20 +17,14 @@ modules.d/90crypt/module-setup.sh | 4 ++++ 2 files changed, 13 insertions(+) -Index: dracut-042/modules.d/90crypt/crypt-lib.sh +Index: dracut-044/modules.d/90crypt/crypt-lib.sh =================================================================== ---- dracut-042.orig/modules.d/90crypt/crypt-lib.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/90crypt/crypt-lib.sh 2015-06-24 18:02:28.878483104 +0200 -@@ -5,11 +5,20 @@ command -v getarg >/dev/null || . /lib/d - # check if the crypttab contains an entry for a LUKS UUID - crypttab_contains() { - local luks="$1" -+ local _uuid _line - local l d rest - if [ -f /etc/crypttab ]; then - while read l d rest || [ -n "$l" ]; do - strstr "${l##luks-}" "${luks##luks-}" && return 0 - strstr "$d" "${luks##luks-}" && return 0 +--- dracut-044.orig/modules.d/90crypt/crypt-lib.sh ++++ dracut-044/modules.d/90crypt/crypt-lib.sh +@@ -16,6 +16,14 @@ crypttab_contains() { + [ "$dev" -ef "$_dev" ] && return 0 + done + fi + if [ -e /usr/lib/dracut/modules.d/90crypt/block_uuid.map ]; then + # search for line starting with $d + _line=$(sed -n "\,^$d .*$,{p}" /usr/lib/dracut/modules.d/90crypt/block_uuid.map) @@ -42,11 +36,11 @@ done < /etc/crypttab fi return 1 -Index: dracut-042/modules.d/90crypt/module-setup.sh +Index: dracut-044/modules.d/90crypt/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/90crypt/module-setup.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/90crypt/module-setup.sh 2015-06-24 18:02:28.882483333 +0200 -@@ -63,6 +63,8 @@ install() { +--- dracut-044.orig/modules.d/90crypt/module-setup.sh ++++ dracut-044/modules.d/90crypt/module-setup.sh +@@ -64,6 +64,8 @@ install() { inst_hook cleanup 30 "$moddir/crypt-cleanup.sh" fi @@ -55,7 +49,7 @@ if [[ $hostonly ]] && [[ -f /etc/crypttab ]]; then # filter /etc/crypttab for the devices we need while read _mapper _dev _rest || [ -n "$_mapper" ]; do -@@ -72,6 +73,8 @@ install() { +@@ -73,6 +75,8 @@ install() { [[ $_dev == UUID=* ]] && \ _dev="/dev/disk/by-uuid/${_dev#UUID=}" @@ -64,12 +58,12 @@ for _hdev in "${!host_fs_types[@]}"; do [[ ${host_fs_types[$_hdev]} == "crypto_LUKS" ]] || continue if [[ $_hdev -ef $_dev ]] || [[ /dev/block/$_hdev -ef $_dev ]]; then -@@ -84,6 +87,8 @@ install() { +@@ -85,6 +89,8 @@ install() { fi inst_simple "$moddir/crypt-lib.sh" "/lib/dracut-crypt-lib.sh" + inst_simple $uuid_map_file "/usr/lib/dracut/modules.d/90crypt/block_uuid.map" + rm -f $uuid_map_file - inst_multiple -o \ - $systemdutildir/system-generators/systemd-cryptsetup-generator \ + if dracut_module_included "systemd"; then + inst_multiple -o \ ++++++ 0150-Find-kernel-modules-in-extra-and-weak-updates-path-a.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -5,14 +5,14 @@ Signed-off-by: Thomas Renninger <trenn(a)suse.de> --- - dracut-functions.sh | 2 +- + dracut-init.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -Index: dracut-042/dracut-functions.sh +Index: dracut-044/dracut-init.sh =================================================================== ---- dracut-042.orig/dracut-functions.sh 2015-06-24 18:02:08.741336717 +0200 -+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:29.194501095 +0200 -@@ -1657,7 +1657,7 @@ find_kernel_modules_by_path () { +--- dracut-044.orig/dracut-init.sh ++++ dracut-044/dracut-init.sh +@@ -1058,7 +1058,7 @@ find_kernel_modules_by_path () { _OLDIFS=$IFS IFS=: while read a rest || [ -n "$a" ]; do ++++++ 0157-Add-boot-zipl-to-host-devs-if-it-is-a-mount-point.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -10,11 +10,11 @@ dracut.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -Index: dracut-042/dracut.sh +Index: dracut-044/dracut.sh =================================================================== ---- dracut-042.orig/dracut.sh 2015-06-24 18:02:21.906086174 +0200 -+++ dracut-042/dracut.sh 2015-06-24 18:02:29.490517947 +0200 -@@ -1191,6 +1191,7 @@ if [[ $hostonly ]]; then +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -1121,6 +1121,7 @@ if [[ $hostonly ]]; then "/usr/lib64" \ "/boot" \ "/boot/efi" \ ++++++ 0158-Add-SUSE-kernel-module-dependencies-in-etc-modprobe..patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -7,15 +7,15 @@ CC: Jan Loeser <jloeser(a)suse.de> --- - dracut-functions.sh | 6 +++++- + dracut-init.sh | 6 +++++- dracut.sh | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-) -Index: dracut-042/dracut-functions.sh +Index: dracut-044/dracut-init.sh =================================================================== ---- dracut-042.orig/dracut-functions.sh 2015-06-24 18:02:29.194501095 +0200 -+++ dracut-042/dracut-functions.sh 2015-06-24 18:02:29.782534571 +0200 -@@ -1740,8 +1740,14 @@ instmods() { +--- dracut-044.orig/dracut-init.sh ++++ dracut-044/dracut-init.sh +@@ -1141,8 +1141,14 @@ instmods() { --set-version $kernel ${_moddirname} $_mpargs ((_ret+=$?)) else @@ -31,11 +31,11 @@ fi ;; esac -Index: dracut-042/dracut.sh +Index: dracut-044/dracut.sh =================================================================== ---- dracut-042.orig/dracut.sh 2015-06-24 18:02:29.490517947 +0200 -+++ dracut-042/dracut.sh 2015-06-24 18:02:29.782534571 +0200 -@@ -855,6 +855,18 @@ if [[ -n "$logfile" ]];then +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -767,6 +767,18 @@ if [[ -n "$logfile" ]];then fi fi @@ -52,5 +52,5 @@ +done <<< "$(grep -h "^# SUSE INITRD: " /etc/modprobe.d/[0-9][0-9]*.conf)" + # handle compression options. - [[ $compress ]] || compress="gzip" - case $compress in + if [[ $_no_compress_l = "cat" ]]; then + compress="cat" ++++++ 0159-network-Try-to-load-xennet.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -10,16 +10,16 @@ modules.d/40network/module-setup.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -Index: dracut-042/modules.d/90kernel-network-modules/module-setup.sh +Index: dracut-044/modules.d/90kernel-network-modules/module-setup.sh =================================================================== ---- dracut-042.orig/modules.d/90kernel-network-modules/module-setup.sh 2015-06-11 17:39:47.000000000 +0200 -+++ dracut-042/modules.d/90kernel-network-modules/module-setup.sh 2015-06-24 18:02:30.094552334 +0200 +--- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh ++++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh @@ -61,7 +61,7 @@ installkernel() { =drivers/net/phy \ =drivers/net/team \ =drivers/net/ethernet \ - ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net + ecb arc4 bridge stp llc ipv6 bonding 8021q af_packet virtio_net xennet + hostonly="" instmods iscsi_ibft crc32c iscsi_boot_sysfs } - # called by dracut ++++++ 0182-fix-include-parsing.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -12,11 +12,11 @@ dracut.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) -Index: dracut-043/dracut.sh +Index: dracut-044/dracut.sh =================================================================== ---- dracut-043.orig/dracut.sh -+++ dracut-043/dracut.sh -@@ -310,11 +310,17 @@ dropindirs_sort() +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -279,11 +279,17 @@ dropindirs_sort() rearrange_params() { # Workaround -i, --include taking 2 arguments ++++++ 0183-fix_add_drivers_hang.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -10,11 +10,11 @@ dracut.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dracut.sh b/dracut.sh -index 44b8a3d..11a4a2e 100755 ---- a/dracut.sh -+++ b/dracut.sh -@@ -1501,7 +1501,7 @@ if [[ $no_kernel != yes ]]; then +Index: dracut-044/dracut.sh +=================================================================== +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -1441,7 +1441,7 @@ if [[ $no_kernel != yes ]]; then hostonly='' instmods $drivers fi @@ -23,6 +23,3 @@ hostonly='' instmods -c $add_drivers fi if [[ $force_drivers ]]; then --- -2.5.1 - ++++++ 0200-dracut_fix_multipath_without_config.patch ++++++ From: Hannes Reinecke <hare(a)suse.de> If rootfs is on multipath, but platform does not have an /etc/multipath.conf file which is not urgently needed, they system will not boot, due to: multipathd is not started and rootfs and swap are not found: systemctl status multipathd.service * multipathd.service - Device-Mapper Multipath Device Controller Loaded: loaded (/usr/lib/systemd/system/multipathd.service; disabled; vendor preset: enabled) Active: inactive (dead) Condition: start condition failed at Thu 2015-05-07 11:49:11 CEST; 7min ago ConditionPathExists=/etc/multipath.conf was not met and exit to dracut shell. Index: dracut-042/modules.d/90multipath/multipathd.service =================================================================== --- dracut-042.orig/modules.d/90multipath/multipathd.service 2015-06-11 17:39:47.000000000 +0200 +++ dracut-042/modules.d/90multipath/multipathd.service 2015-06-24 18:02:36.298905539 +0200 @@ -6,7 +6,6 @@ Conflicts=shutdown.target ConditionKernelCommandLine=!nompath ConditionKernelCommandLine=!rd.multipath=0 ConditionKernelCommandLine=!rd_NO_MULTIPATH -ConditionPathExists=/etc/multipath.conf [Service] Type=simple ++++++ 0201-fix_nfs_with_ip_instead_of_hostname.patch ++++++ Index: dracut-041/modules.d/95nfs/module-setup.sh =================================================================== --- dracut-041.orig/modules.d/95nfs/module-setup.sh 2015-05-20 13:37:53.910262273 +0200 +++ dracut-041/modules.d/95nfs/module-setup.sh 2015-05-21 16:16:35.742683551 +0200 @@ -51,9 +51,9 @@ ### ip= ### if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device = \[.*\] ]]; then - nfs_address="$nfs_device" + nfs_address="${nfs_device%%:*}" else - lookup=$(host $(echo ${nfs_device%%:*})| head -n1) + lookup=$(host "${nfs_device%%:*}"| head -n1) nfs_address=${lookup##* } fi ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev $[^ ]*$.*/\1/p') ++++++ 0202-dracut_dmraid_use_udev.patch ++++++ From: Hannes Reinecke <hare(a)suse.com> Use udev rules to create dmraid /dev/mapper/ devices https://bugzilla.opensuse.org/show_bug.cgi?id=905746 --- modules.d/90dmraid/dmraid.sh | 3 --- modules.d/90dmraid/module-setup.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) Index: dracut-044/modules.d/90dmraid/dmraid.sh =================================================================== --- dracut-044.orig/modules.d/90dmraid/dmraid.sh +++ dracut-044/modules.d/90dmraid/dmraid.sh @@ -33,8 +33,6 @@ if [ -n "$DM_RAIDS" ] || getargbool 0 rd if [ "${s##$r}" != "$s" ]; then info "Activating $s" dmraid -ay -i -p --rm_partitions "$s" 2>&1 | vinfo - [ -e "/dev/mapper/$s" ] && kpartx -a "/dev/mapper/$s" 2>&1 | vinfo - udevsettle fi done done Index: dracut-044/modules.d/90dmraid/module-setup.sh =================================================================== --- dracut-044.orig/modules.d/90dmraid/module-setup.sh +++ dracut-044/modules.d/90dmraid/module-setup.sh @@ -74,6 +74,8 @@ install() { inst "$moddir/dmraid.sh" /sbin/dmraid_scan + inst_rules 66-kpartx.rules 67-kpartx-compat.rules + inst_libdir_file "libdmraid-events*.so*" inst_rules "$moddir/61-dmraid-imsm.rules" ++++++ 0203-no-fail-builtin-module.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -7,14 +7,14 @@ Signed-off-by: Fabian Vogt <fvogt(a)suse.com> --- - dracut-functions.sh | 5 +++++ + dracut-init.sh | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/dracut-functions.sh b/dracut-functions.sh -index b666446..e5be295 100755 ---- a/dracut-functions.sh -+++ b/dracut-functions.sh -@@ -1721,6 +1721,11 @@ instmods() { +Index: dracut-044/dracut-init.sh +=================================================================== +--- dracut-044.orig/dracut-init.sh ++++ dracut-044/dracut-init.sh +@@ -1122,6 +1122,11 @@ instmods() { return 0 fi @@ -26,6 +26,3 @@ # If we are building a host-specific initramfs and this # module is not already loaded, move on to the next one. [[ $hostonly ]] \ --- -2.6.2 - ++++++ 0206-nfs_dns_alias.patch ++++++ From: Fabian Vogt <fvogt(a)suse.com> Subject: NFS: Support host being a DNS ALIAS The "host" command may also print something else than "asdf.local.lan has address 1.2.3.4", like: "rootserver.local.net is an alias for rainbow.local.net.". So "head -n1" is not enough. Fixes boo#955592 --- modules.d/95nfs/module-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: dracut-043/modules.d/95nfs/module-setup.sh =================================================================== --- dracut-043.orig/modules.d/95nfs/module-setup.sh +++ dracut-043/modules.d/95nfs/module-setup.sh @@ -53,7 +53,7 @@ cmdline() { if [[ $nfs_device = [0-9]*\.[0-9]*\.[0-9]*.[0-9]* ]] || [[ $nfs_device = \[.*\] ]]; then nfs_address="${nfs_device%%:*}" else - lookup=$(host "${nfs_device%%:*}"| head -n1) + lookup=$(host "${nfs_device%%:*}"| grep " address " | head -n1) nfs_address=${lookup##* } fi ifname=$(ip -o route get to $nfs_address | sed -n 's/.*dev $[^ ]*$.*/\1/p') ++++++ 0300-dracut_dont_use_dpkg_defaults_on_SUSE.patch ++++++ Index: b/modules.d/50plymouth/module-setup.sh =================================================================== --- a/modules.d/50plymouth/module-setup.sh +++ b/modules.d/50plymouth/module-setup.sh @@ -14,9 +14,10 @@ depends() { # called by dracut install() { PKGLIBDIR="/usr/lib/plymouth" - if type -P dpkg-architecture &>/dev/null; then - PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" - fi + # breaks if dpkg is installed on openSUSE + #if type -P dpkg-architecture &>/dev/null; then + # PKGLIBDIR="/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth" + #fi [ -x /usr/libexec/plymouth/plymouth-populate-initrd ] && PKGLIBDIR="/usr/libexec/plymouth" if grep -q nash ${PKGLIBDIR}/plymouth-populate-initrd \ ++++++ 0402-driver-fail-summary.patch ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -15,15 +15,15 @@ Signed-off-by: Fabian Vogt <fvogt(a)suse.com> --- - dracut-functions.sh | 11 ++++------- + dracut-init.sh | 11 ++++------- dracut.sh | 9 +++++++++ 2 files changed, 13 insertions(+), 7 deletions(-) -Index: dracut-043/dracut-functions.sh +Index: dracut-044/dracut-init.sh =================================================================== ---- dracut-043.orig/dracut-functions.sh -+++ dracut-043/dracut-functions.sh -@@ -1676,14 +1676,16 @@ instmods() { +--- dracut-044.orig/dracut-init.sh ++++ dracut-044/dracut-init.sh +@@ -1077,14 +1077,16 @@ instmods() { [[ $no_kernel = yes ]] && return # called [sub]functions inherit _fderr local _fderr=9 @@ -41,7 +41,7 @@ _silent=yes shift fi -@@ -1765,7 +1767,7 @@ instmods() { +@@ -1166,7 +1168,7 @@ instmods() { while read _mod || [ -n "$_mod" ]; do inst1mod "${_mod%.ko*}" || { if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then @@ -50,7 +50,7 @@ fi } done -@@ -1773,7 +1775,7 @@ instmods() { +@@ -1174,7 +1176,7 @@ instmods() { while (($# > 0)); do # filenames as arguments inst1mod ${1%.ko*} || { if [[ "$_check" == "yes" ]] && [[ "$_silent" == "no" ]]; then @@ -59,11 +59,11 @@ fi } shift -Index: dracut-043/dracut.sh +Index: dracut-044/dracut.sh =================================================================== ---- dracut-043.orig/dracut.sh -+++ dracut-043/dracut.sh -@@ -420,6 +420,12 @@ verbosity_mod_l=0 +--- dracut-044.orig/dracut.sh ++++ dracut-044/dracut.sh +@@ -390,6 +390,12 @@ verbosity_mod_l=0 unset kernel unset outfile @@ -76,9 +76,9 @@ rearrange_params "$@" eval set -- "$TEMP" -@@ -1789,6 +1795,15 @@ if ! ( +@@ -1740,6 +1746,15 @@ if ! ( + exit 1 fi - dinfo "*** Creating initrd image file '$outfile' done ***" +if [[ -s $tmp_dracut_failed_drivers ]]; then + dwarn "Some kernel modules could not be included" @@ -91,4 +91,4 @@ + if (( maxloglvl >= 5 )); then if [[ $allowlocal ]]; then - "$dracutbasedir/lsinitrd.sh" "$outfile"| ddebug + "$dracutbasedir/lsinitrd.sh" "${DRACUT_TMPDIR}/initramfs.img"| ddebug ++++++ dracut-043.tar.xz -> dracut-044.tar.xz ++++++ ++++ 9586 lines of diff (skipped) ++++++ dracut-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.HViWCv/_old 2015-12-01 09:17:05.000000000 +0100 +++ /var/tmp/diff_new_pack.HViWCv/_new 2015-12-01 09:17:05.000000000 +0100 @@ -1,3 +1,4 @@ addFilter("suse-missing-rclink") addFilter("explicit-lib-dependency") addFilter("systemd-service-without-service_*_*") +addFilter("devel-file-in-non-devel-package .* /usr/share/pkgconfig/dracut.pc") \ No newline at end of file

1 0

commit deltarpm for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package deltarpm for openSUSE:Factory checked in at 2015-12-01 09:16:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deltarpm (Old) and /work/SRC/openSUSE:Factory/.deltarpm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "deltarpm" Changes: -------- --- /work/SRC/openSUSE:Factory/deltarpm/deltarpm.changes 2013-06-13 16:24:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.deltarpm.new/deltarpm.changes 2015-12-01 09:16:57.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 24 15:44:56 CET 2015 - ro(a)suse.de + +- update to version 3.6.1 + - remove upstreamed patch deltarpm-zlibcppflags.diff + - fix off-by-one error in delta generation code (bnc#948504) + This could lead to a segfault in rare circumstances. + - Return error rather than crashing if we can't allocate memory + - add newline in missing prelink error + - do not finish applydeltarpm jobs when in the middle of a request + - fix zlibcppflags typo + +------------------------------------------------------------------- Old: ---- deltarpm-3.6.tar.bz2 deltarpm-zlibcppflags.diff New: ---- deltarpm-3.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deltarpm.spec ++++++ --- /var/tmp/diff_new_pack.Hph6HA/_old 2015-12-01 09:16:58.000000000 +0100 +++ /var/tmp/diff_new_pack.Hph6HA/_new 2015-12-01 09:16:58.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package deltarpm # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,17 +17,15 @@ Name: deltarpm -Version: 3.6 +Version: 3.6.1 Release: 0 Summary: Tools to Create and Apply deltarpms License: BSD-3-Clause Group: System/Packages -Url: ftp://ftp.suse.com/pub/projects/deltarpm -Source: deltarpm-3.6.tar.bz2 +Url: https://github.com/rpm-software-management/deltarpm/ +Source: deltarpm-3.6.1.tar.bz2 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: patch.sles8 -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: deltarpm-zlibcppflags.diff BuildRequires: libbz2-devel BuildRequires: python-devel BuildRequires: rpm-devel @@ -59,7 +57,6 @@ %if 0%{?suse_version} < 900 %patch0 %endif -%patch1 %build make CC="gcc" CFLAGS="%{optflags}" rpmdumpheader="/usr/lib/rpm/rpmdumpheader" %{?_smp_mflags} ++++++ deltarpm-3.6.tar.bz2 -> deltarpm-3.6.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deltarpm-3.6/Makefile new/deltarpm-3.6.1/Makefile --- old/deltarpm-3.6/Makefile 2013-06-07 17:02:18.000000000 +0200 +++ new/deltarpm-3.6.1/Makefile 2015-01-12 14:39:47.000000000 +0100 @@ -40,7 +40,7 @@ PYCFLAGS=`$$PY-config --cflags`; \ if [ ! -f "python$$PYVER/$@" ]; then \ mkdir -p python$$PYVER ;\ - $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflag) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\ + $(CC) $(CFLAGS) $$PYCFLAGS $(zlibcppflags) -fPIC -c -o python$$PYVER/deltarpmmodule.o deltarpmmodule.c ;\ $(CC) $(LDFLAGS) -o python$$PYVER/$@ python$$PYVER/deltarpmmodule.o $^ -shared -Wl,-soname,_deltarpmmodule.so $(LDLIBS); \ fi; \ fi; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deltarpm-3.6/delta.c new/deltarpm-3.6.1/delta.c --- old/deltarpm-3.6/delta.c 2013-06-07 17:02:18.000000000 +0200 +++ new/deltarpm-3.6.1/delta.c 2015-01-12 14:39:47.000000000 +0100 @@ -366,7 +366,7 @@ { if (memcmp(new + scan + HSIZE *3, old + pos2 - 1, HSIZE)) { - ssx2 = (ssx2 == prime) ? 0 : ssx2 + 1; + ssx2 = (ssx2 == prime - 1) ? 0 : ssx2 + 1; pos2 = hash[ssx2]; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deltarpm-3.6/deltarpmmodule.c new/deltarpm-3.6.1/deltarpmmodule.c --- old/deltarpm-3.6/deltarpmmodule.c 2013-06-07 17:02:18.000000000 +0200 +++ new/deltarpm-3.6.1/deltarpmmodule.c 2015-01-12 14:39:47.000000000 +0100 @@ -46,6 +46,11 @@ if (d.seq) { char *tmp = calloc(d.seql * 2 + 1, sizeof(char)); int i; + + if(tmp == NULL) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } for (i = 0; i < d.seql; i++) { char buf[3]; @@ -54,6 +59,10 @@ } o = PyString_FromString(tmp); free(tmp); + if(o == NULL) { + PyErr_SetFromErrno(PyExc_SystemError); + return NULL; + } PyDict_SetItemString(dict, "seq", o); Py_DECREF(o); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deltarpm-3.6/drpmsync new/deltarpm-3.6.1/drpmsync --- old/deltarpm-3.6/drpmsync 2013-06-07 17:02:18.000000000 +0200 +++ new/deltarpm-3.6.1/drpmsync 2015-01-12 14:39:47.000000000 +0100 @@ -2686,6 +2686,7 @@ return if $sock_isopen; my $tcpproto = getprotobyname('tcp'); socket(S, PF_INET, SOCK_STREAM, $tcpproto) || die("socket: $!\n"); + setsockopt(S, SOL_SOCKET, SO_KEEPALIVE, pack("l",1)) || die("setsockopt: $!\n"); connect(S, sockaddr_in($syncport, $syncaddr)) || die("connect: $!\n"); $sock_isopen = 1; } @@ -2974,7 +2975,8 @@ } elsif ($type eq 'FISO') { $ans = copytofile(*S, "$tmpnam.fiso", $ans, $anssize, $ctx); $ans = finishreq(*S, $ans, $ctx, $id); - return 'FISO', [ $tmpnam, undef, substr($extra, 0, 12) ]; + $d = [ $tmpnam, undef, substr($extra, 0, 12) ]; + return ('FISO', $d); } elsif ($type eq 'RPM ') { $sabytes -= $anssize; my $delta; @@ -2982,36 +2984,49 @@ die("nothing to do?\n") if $nrpm == 0 && $ndrpm == 0; my @deltas; my $dextra = substr($extra, 12 + 16); + my @renames; while ($ndrpm > 0) { $delta = $tmpnam; $delta =~ s/[^\/]*$//; $delta .= substr($dextra, 12, 32 * 3); - # end old job if we have a delta conflict - checkjob() if $runningjob && -e $delta; my $size = hex(substr($dextra, 12 + 3 * 32, 8)); die("delta rpm bigger than answer? $size > $anssize\n") if $size > $anssize; + push @deltas, $delta; + # conflict with running job? + if ($runningjob && -e $delta) { + push @renames, $delta; + $delta .= ".tmp"; + } $ans = copytofile(*S, $delta, $ans, $size, $ctx); $anssize -= $size; fixmodetime($delta, substr($dextra, 0, 12)); $dextra = substr($dextra, 12 + 32 * 3 + 8); - push @deltas, $delta; $ndrpm--; } - if ($nrpm == 1) { + if ($nrpm) { $ans = copytofile_seek(*S, $tmpnam, $extractoff, $ans, $anssize, $ctx); - $ans = finishreq(*S, $ans, $ctx, $id); - return 'RPM ', [ $dto->[0] ], @deltas if $rextract; + } else { + die("junk at end of answer\n") if $anssize; + } + $ans = finishreq(*S, $ans, $ctx, $id); + if (@renames) { + checkjob(); + for (@renames) { + rename("$_.tmp", $_) || die("rename $_.tmp $_: $!\n"); + } + } + if (!$nrpm) { + $d = [ undef, undef, substr($extra, 0, 12) ]; + } elsif ($rextract) { + $d = [ $dto->[0] ]; + } else { fixmodetime($tmpnam, substr($extra, 0, 12)); my @s = stat($tmpnam); die("$tmpnam: $!\n") unless @s; $sabytes += $s[7]; $d = [ $dto->[0], "$s[9]/$s[7]/$s[1]", sprintf("1%03x%08x", ($s[2] & 07777), $s[9]), rpminfo($tmpnam) ]; - } else { - die("junk at end of answer\n") if $anssize; - $ans = finishreq(*S, $ans, $ctx, $id); - $d = [ undef, undef, substr($extra, 0, 12) ]; } - return 'RPM ', $d, @deltas; + return ('RPM ', $d, @deltas); } else { die("received strange answer type: $type\n"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/deltarpm-3.6/prelink.c new/deltarpm-3.6.1/prelink.c --- old/deltarpm-3.6/prelink.c 2013-06-07 17:02:18.000000000 +0200 +++ new/deltarpm-3.6.1/prelink.c 2015-01-12 14:39:47.000000000 +0100 @@ -130,7 +130,7 @@ if (stat("/usr/sbin/prelink", &stb)) { perror("/usr/sbin/prelink"); - fprintf(stderr, "prelink not installed, cannot undo prelinking"); + fprintf(stderr, "prelink not installed, cannot undo prelinking\n"); exit(1); } strcpy(template, "/tmp/deltarpm.XXXXXX");

1 0

commit gpg2 for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package gpg2 for openSUSE:Factory checked in at 2015-12-01 09:16:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gpg2 (Old) and /work/SRC/openSUSE:Factory/.gpg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gpg2" Changes: -------- --- /work/SRC/openSUSE:Factory/gpg2/gpg2.changes 2015-10-20 16:20:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gpg2.new/gpg2.changes 2015-12-01 09:16:52.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 24 10:27:58 UTC 2015 - vcizek(a)suse.com + +- enable tests for PPC64 again, + the problem from bsc#935887 went away + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gpg2.spec ++++++ --- /var/tmp/diff_new_pack.mnYEiH/_old 2015-12-01 09:16:53.000000000 +0100 +++ /var/tmp/diff_new_pack.mnYEiH/_new 2015-12-01 09:16:53.000000000 +0100 @@ -142,10 +142,8 @@ %check %if ! 0%{?qemu_user_space_build} -%ifnarch ppc64 make %{?_smp_mflags} check %endif -%endif %post %install_info --info-dir=%{_infodir} %{_infodir}/gnupg.info.gz

1 0