Please delete patches that are not needed any more.

Best,
-Michael

On Fri, 2016-09-02 at 15:22 +0200, Marcel Lorenz wrote:
> ---
>  config/rootfiles/packages/7zip                | 213 +++++++++++++----------
> ---
>  lfs/7zip                                      |  11 +-
>  src/patches/p7zip_change_install_folder.patch |  10 ++
>  3 files changed, 122 insertions(+), 112 deletions(-)
>  create mode 100644 src/patches/p7zip_change_install_folder.patch
> 
> 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 @@
>  #############################################################################
> ##
>  #                                                                            
>  #
>  # IPFire.org - A linux based
> firewall                                         #
> -# Copyright (C) 2007-2016  IPFire Team  <info(a)ipfire.org>                    
>  #
> +# Copyright (C) 2007-2016 IPFire Team  <info(a)ipfire.org>                     
>  #
>  #                                                                            
>  #
>  # This program is free software: you can redistribute it and/or
> modify        #
>  # it under the terms of the GNU General Public License as published
> by        #
> @@ -24,7 +24,7 @@
>  
>  include Config
>  
> -VER        = 15.14.1
> +VER        = 16.02
>  
>  THISAPP    = p7zip_$(VER)
>  DL_FILE    = $(THISAPP)_src_all.tar.bz2
> @@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = 7zip
> -PAK_VER    = 6
> +PAK_VER    = 7
>  
>  DEPS       = ""
>  
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>  
>  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>  
> -$(DL_FILE)_MD5 = 92cca093312b5a71a7be7dc7d1d32509
> +$(DL_FILE)_MD5 = a0128d661cfe7cc8c121e73519c54fbf
>  
>  install : $(TARGET)
>  
> @@ -77,8 +77,7 @@ dist:
>  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>  	@$(PREBUILD)
>  	@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
>  	cd $(DIR_APP) && make 7z $(MAKETUNING)
>  	cd $(DIR_APP) && make install
>  	@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 = mkdir -p
> + 
> +-DEST_HOME=/usr/local
> ++DEST_HOME=/usr
> + DEST_BIN=$(DEST_HOME)/bin
> + DEST_SHARE=$(DEST_HOME)/lib/p7zip
> + DEST_SHARE_DOC=$(DEST_HOME)/share/doc/p7zip