Hello community, here is the log from the commit of package p7zip for openSUSE:Factory checked in at 2018-01-30 15:39:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/p7zip (Old) and /work/SRC/openSUSE:Factory/.p7zip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "p7zip" Tue Jan 30 15:39:31 2018 rev:37 rq:570632 version:16.02 Changes: -------- --- /work/SRC/openSUSE:Factory/p7zip/p7zip.changes 2017-08-17 11:43:22.464050207 +0200 +++ /work/SRC/openSUSE:Factory/.p7zip.new/p7zip.changes 2018-01-30 15:39:32.276234584 +0100 @@ -1,0 +2,9 @@ +Mon Jan 29 11:22:30 UTC 2018 - [email protected] + +- remove CPP/7zip/Compress/Rar* files from the tar archive as they + have incompatible license [bnc#1077978] + * also remove DOC/unRarLicense.txt + * add p7zip_16.02_norar.patch to adjust makefile according to it + * remove no longer used Codecs + +------------------------------------------------------------------- Old: ---- p7zip_16.02_src_all.tar.bz2 New: ---- p7zip_16.02_norar.patch p7zip_16.02_src_all-norar.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ p7zip.spec ++++++ --- /var/tmp/diff_new_pack.BpEy55/_old 2018-01-30 15:39:33.172192754 +0100 +++ /var/tmp/diff_new_pack.BpEy55/_new 2018-01-30 15:39:33.176192568 +0100 @@ -1,7 +1,7 @@ # # spec file for package p7zip # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -26,8 +26,19 @@ License: LGPL-2.1+ Group: Productivity/Archiving/Compression Url: http://p7zip.sourceforge.net/ -Source: http://downloads.sourceforge.net/project/p7zip/p7zip/%{version}/p7zip_%{version}_src_all.tar.bz2 +# Update note: RAR sources need to be removed from the package because of the incompatibe licence +# Run the following commands after each package update to remove them +# export VERSION=16.02 +# wget http://downloads.sourceforge.net/project/p7zip/p7zip/${VERSION}/p7zip_${VERSION}_src_all.tar.bz2 +# tar xjvf p7zip_${VERSION}_src_all.tar.bz2 +# rm -rf p7zip_${VERSION}/CPP/7zip/Compress/Rar* +# rm -rf p7zip_${VERSION}/DOC/unRarLicense.txt +# tar cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION} +# rm -rf p7zip_${VERSION}_src_all.tar.bz2 +Source: p7zip_%{version}_src_all-norar.tar.bz2 Patch1: CVE-2016-9296.patch +# PATCH-FIX-SUSE bnc#1077978 [email protected] -- adjust makefile not to use CPP/7zip/Compress/Rar* files +Patch2: p7zip_16.02_norar.patch BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with buildgui} @@ -69,6 +80,7 @@ %prep %setup -q -n %{name}_%{version} %patch1 -p1 +%patch2 -p1 %ifarch x86_64 cp makefile.linux_amd64_asm makefile.machine @@ -145,7 +157,6 @@ %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/Codecs %{_libdir}/%{name}/[0-9a-z]* -%{_libdir}/%{name}/Codecs/* %{_bindir}/7z %{_bindir}/7za %doc ChangeLog DOC/*.txt ++++++ p7zip_16.02_norar.patch ++++++ Index: p7zip_16.02/makefile =================================================================== --- p7zip_16.02.orig/makefile +++ p7zip_16.02/makefile @@ -31,7 +31,6 @@ depend: $(MAKE) -C CPP/7zip/UI/Client7z depend $(MAKE) -C CPP/7zip/UI/Console depend $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend - $(MAKE) -C CPP/7zip/Compress/Rar depend $(MAKE) -C CPP/7zip/UI/GUI depend $(MAKE) -C CPP/7zip/UI/FileManager depend @@ -42,7 +41,6 @@ sfx: common common7z:common $(MKDIR) bin/Codecs $(MAKE) -C CPP/7zip/Bundles/Format7zFree all - $(MAKE) -C CPP/7zip/Compress/Rar all lzham:common $(MKDIR) bin/Codecs @@ -67,7 +65,6 @@ clean_C: $(MAKE) -C CPP/7zip/UI/FileManager clean $(MAKE) -C CPP/7zip/UI/GUI clean $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean - $(MAKE) -C CPP/7zip/Compress/Rar clean $(MAKE) -C CPP/7zip/Compress/Lzham clean $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean
