From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] 7zip: update to 16.02 Date: Wed, 07 Jun 2017 10:10:42 +0100 Message-ID: <1496826642.4077.14.camel@ipfire.org> In-Reply-To: <20170606121401.23977-1-marcel.lorenz@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6737566425123150109==" List-Id: --===============6737566425123150109== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This patch had a trailing empty line in the rootfile. Git warns about this when committing. Please make sure to avoid these things. I fixed this for you now and merged the patch. -Michael On Tue, 2017-06-06 at 14:14 +0200, Marcel Lorenz wrote: > Signed-off-by: Marcel Lorenz > --- > =C2=A0config/rootfiles/packages/7zip=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0| 213 +++++++++++++-= --------- > --- > =C2=A0lfs/7zip=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0|=C2=A0=C2=A011 +- > =C2=A0src/patches/p7zip_change_install_folder.patch |=C2=A0=C2=A010 ++ > =C2=A03 files changed, 122 insertions(+), 112 deletions(-) > =C2=A0create mode 100644 src/patches/p7zip_change_install_folder.patch >=20 > diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip > index d3a5c38..d8f4630 100644 > --- a/config/rootfiles/packages/7zip > +++ b/config/rootfiles/packages/7zip > @@ -1,106 +1,107 @@ > -usr/local/bin/7z > -usr/local/lib/p7zip > -#usr/local/lib/p7zip/7z > -#usr/local/lib/p7zip/7z.so > -#usr/local/lib/p7zip/Codecs > -usr/local/lib/p7zip/Codecs/Rar.so > -#usr/local/man/man1/7z.1 > -#usr/local/man/man1/7za.1 > -#usr/local/man/man1/7zr.1 > -#usr/local/share/doc/p7zip > -#usr/local/share/doc/p7zip/ChangeLog > -#usr/local/share/doc/p7zip/DOC > -#usr/local/share/doc/p7zip/DOC/7zC.txt > -#usr/local/share/doc/p7zip/DOC/7zFormat.txt > -#usr/local/share/doc/p7zip/DOC/License.txt > -#usr/local/share/doc/p7zip/DOC/MANUAL > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/about.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/menu.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/options.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/plugins/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/fm/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/general > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/7z.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/faq.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/formats.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/index.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/license.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/performance.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/style.css > -#usr/local/share/doc/p7zip/DOC/MANUAL/general/thanks.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/start.htm > -#usr/local/share/doc/p7zip/DOC/MANUAL/style.css > -#usr/local/share/doc/p7zip/DOC/Methods.txt > -#usr/local/share/doc/p7zip/DOC/copying.txt > -#usr/local/share/doc/p7zip/DOC/lzma.txt > -#usr/local/share/doc/p7zip/DOC/readme.txt > -#usr/local/share/doc/p7zip/DOC/src-history.txt > -#usr/local/share/doc/p7zip/DOC/unRarLicense.txt > -#usr/local/share/doc/p7zip/README > +usr/bin/7z > +usr/lib/p7zip > +#usr/lib/p7zip/7z > +#usr/lib/p7zip/7z.so > +#usr/lib/p7zip/Codecs > +usr/lib/p7zip/Codecs/Rar.so > +#usr/man/man1/7z.1 > +#usr/man/man1/7za.1 > +#usr/man/man1/7zr.1 > +#usr/share/doc/p7zip > +#usr/share/doc/p7zip/ChangeLog > +#usr/share/doc/p7zip/DOC > +#usr/share/doc/p7zip/DOC/7zC.txt > +#usr/share/doc/p7zip/DOC/7zFormat.txt > +#usr/share/doc/p7zip/DOC/License.txt > +#usr/share/doc/p7zip/DOC/MANUAL > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/add.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/bench.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/delete.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/extract_full.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/hash.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/list.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/rename.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/test.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/commands/update.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/exit_codes.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_exclude.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_include.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ar_no.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bb.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/bs.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/charset.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/email.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/exclude.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/include.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/large_pages.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/list_tech.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/method.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/output_dir.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/overwrite.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/password.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/recurse.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sa.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scc.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/scrc.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sdel.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sfx.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/shared.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sni.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/sns.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/spf.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/ssc.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdin.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stdout.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stl.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stop_switch.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/stx.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/type.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/update.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/volume.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/working_dir.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/switches/yes.htm > +#usr/share/doc/p7zip/DOC/MANUAL/cmdline/syntax.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/about.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/benchmark.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/menu.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/options.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/add.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/extract.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/7-zip/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/fm/plugins/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/fm/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/general > +#usr/share/doc/p7zip/DOC/MANUAL/general/7z.htm > +#usr/share/doc/p7zip/DOC/MANUAL/general/faq.htm > +#usr/share/doc/p7zip/DOC/MANUAL/general/formats.htm > +#usr/share/doc/p7zip/DOC/MANUAL/general/index.htm > +#usr/share/doc/p7zip/DOC/MANUAL/general/license.htm > +#usr/share/doc/p7zip/DOC/MANUAL/general/performance.htm > +#usr/share/doc/p7zip/DOC/MANUAL/general/style.css > +#usr/share/doc/p7zip/DOC/MANUAL/general/thanks.htm > +#usr/share/doc/p7zip/DOC/MANUAL/start.htm > +#usr/share/doc/p7zip/DOC/MANUAL/style.css > +#usr/share/doc/p7zip/DOC/Methods.txt > +#usr/share/doc/p7zip/DOC/copying.txt > +#usr/share/doc/p7zip/DOC/lzma.txt > +#usr/share/doc/p7zip/DOC/readme.txt > +#usr/share/doc/p7zip/DOC/src-history.txt > +#usr/share/doc/p7zip/DOC/unRarLicense.txt > +#usr/share/doc/p7zip/README > + > diff --git a/lfs/7zip b/lfs/7zip > index 847f89f..fbf63b3 100644 > --- a/lfs/7zip > +++ b/lfs/7zip > @@ -1,7 +1,7 @@ > =C2=A0#####################################################################= ######## > ## > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# IPFire.org - A linux based > firewall=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > -# Copyright (C) 2007-2016=C2=A0=C2=A0IPFire Team=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > +# Copyright (C) 2007-2016 IPFire Team=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0#=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 > =C2=A0# > =C2=A0# This program is free software: you can redistribute it and/or > modify=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > =C2=A0# it under the terms of the GNU General Public License as published > by=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0# > @@ -24,7 +24,7 @@ > =C2=A0 > =C2=A0include Config > =C2=A0 > -VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 15.14.1 > +VER=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 16.02 > =C2=A0 > =C2=A0THISAPP=C2=A0=C2=A0=C2=A0=C2=A0=3D p7zip_$(VER) > =C2=A0DL_FILE=C2=A0=C2=A0=C2=A0=C2=A0=3D $(THISAPP)_src_all.tar.bz2 > @@ -32,7 +32,7 @@ DL_FROM=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D 7zip > -PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 6 > +PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 7 > =C2=A0 > =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "" > =C2=A0 > @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) > =C2=A0 > =C2=A0$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) > =C2=A0 > -$(DL_FILE)_MD5 =3D 92cca093312b5a71a7be7dc7d1d32509 > +$(DL_FILE)_MD5 =3D a0128d661cfe7cc8c121e73519c54fbf > =C2=A0 > =C2=A0install : $(TARGET) > =C2=A0 > @@ -77,8 +77,7 @@ dist: > =C2=A0$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 @$(PREBUILD) > =C2=A0 @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) > - cd $(DIR_APP) patch -Np1 < $(DIR_SRC)/src/patches/p7zip/CVE-2016- > 2334.patch > - cd $(DIR_APP) patch -Np1 < $(DIR_SRC)/src/patches/p7zip/CVE-2016- > 2335.patch > + cd $(DIR_APP) && cd $(DIR_APP) && patch -Np1 < > $(DIR_SRC)/src/patches/p7zip_change_install_folder.patch > =C2=A0 cd $(DIR_APP) && make 7z $(MAKETUNING) > =C2=A0 cd $(DIR_APP) && make install > =C2=A0 @rm -rf $(DIR_APP) > diff --git a/src/patches/p7zip_change_install_folder.patch > b/src/patches/p7zip_change_install_folder.patch > new file mode 100644 > index 0000000..4a83343 > --- /dev/null > +++ b/src/patches/p7zip_change_install_folder.patch > @@ -0,0 +1,10 @@ > +--- p7zip_15.14.1/makefile.common > ++++ p7zip_15.14.1/makefile.common > +@@ -1,6 +1,6 @@ > + MKDIR =3D mkdir -p > +=C2=A0 > +-DEST_HOME=3D/usr/local > ++DEST_HOME=3D/usr > + DEST_BIN=3D$(DEST_HOME)/bin > + DEST_SHARE=3D$(DEST_HOME)/lib/p7zip > + DEST_SHARE_DOC=3D$(DEST_HOME)/share/doc/p7zip --===============6737566425123150109== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlpOOE1TQUFvSkVJQjU4UDl2a0FrSHRzSVFBS2QrUDJTenVoRERraTRmWVhwdkt3ZHoK OS80ZStrUUdkekt1Tmw4NTB4eG1NOXdrNzVNcjF1d0xsU0QwZW85L0FzY2hOaTZET3owZjNmNGN6 ajNwSzY1egpRMGVzTndkTXlTRnYvamVpL2JvODljWVNjQ2QzZTI0Uk9zT21iV09lVE1DTnBZeisy Szg2R3p6T1NTbThRS3RzCnk4cWgzUXFlVXZZQ2xzbWpXeHIxMzhnUjkvY2JJYUVZMXNEMW96MHB5 TnpPL0V1T0l4WmtVWEVJZi9NMFN6dGUKL2h2eTVFZEZ2SnpQQkRnekdKT2MvNGhVSGJxYUxwaFpM K3hYckVqcjZYRVBqNzlzY0cvNDkxMGFaQ1ZwZm5MdgpaMXB6cjZOOERvM2Q1Ykxnb21OOEFmWlpq a3VhWWowelF3MFdsVTJUaFlnbGhmUmpFVmtuN1BZUG9jNjJETkpOCnpJKzlwOGEzU2dvNEpRUmdv NkIwaUtmcUh1ZmVjSVNzM2hwcFU5eWNEOE5EODNhbUZWTExNYm9uem9vT3I5azgKbG4yd3RUeVBx bVlFWG1CZVkwSmlzMzBBZlM0TU41MmZaUnoxeWN1U3JIWnlTd3JlYVpKMEl3a3VKZCs0VXNTagp0 UXA4bENuM2F2Mlc2ZmJIUWFKUGoySGYyUjlqdGdxQjhJajdURXBPTWY5VDJzVnBFQjEyam9PZEpB RzVlQ1c5CnRLdDJNR1VhQ3BkQ1B1UGRrSHh6SWxlMjJzT0cxNjJpc2NVUjJVYThGTHhiYllWWUFR NWYwVXJvOUdRTzEyQVkKNENFdG9qWmw3c0tKS3ZzTTdJVWtzRm1hMmVTNWEzeWpBWFFERUxtblpl dm83eUNpc2RMdjZlMi9Cekd0cmVMcwpSUVkzK3I1OURCVVJXNEh2NjBBdQo9RlE0UAotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============6737566425123150109==--