From mboxrd@z Thu Jan 1 00:00:00 1970 From: git@ipfire.org To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4960c9123246d13c04347551b179b45d9dae39d1 Date: Wed, 07 Jun 2017 11:01:28 +0100 Message-ID: <20170607100129.562241078E83@git01.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7565385275595843078==" List-Id: --===============7565385275595843078== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4960c9123246d13c04347551b179b45d9dae39d1 (commit) via 2ee623a89ad42306001d454c4638a561cf9685c2 (commit) via b98ca5fa2d75d0ce5f03786f91a5ecaed625e914 (commit) via 8be68155071b6465a589fdfc429662ba4d833435 (commit) via 6872b9e0a851b4dccb68872f7cafbb1392b0cde3 (commit) via ac442269ccd3eb699c108427a7c470184374240b (commit) via 35d4925c744595bd1c2088b1e2a7d73cb708eec0 (commit) via c0694233c319e5a6c388b8644b9736593635ab40 (commit) via d31ef401a65514b0f62791a03d3f06c4bceca692 (commit) via 8e700473ac31eea7e24a78626a69de38bf5b3ab8 (commit) via 5dd7cec068f0e7478712f18ed23f20b2d05beb71 (commit) via 14c9349c80eb33bee7c063ba40fd0a310c00daf1 (commit) via 1a533a1cd1ddf00735be07c9a283a9309d356e1e (commit) via cb0969580b75480f1829cee8e0057b27ea23d395 (commit) via 2be66b3d8551f0b0ee8b7309b9c955e29f48a7a1 (commit) from 7103cbf60b639941b0966b21846e17fe1b36d3a4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4960c9123246d13c04347551b179b45d9dae39d1 Author: Michael Tremer Date: Wed Jun 7 10:58:02 2017 +0100 Run strip with tools from the host system =20 Signed-off-by: Michael Tremer commit 2ee623a89ad42306001d454c4638a561cf9685c2 Author: Michael Tremer Date: Wed Jun 7 10:34:58 2017 +0100 stripper: Fix for newer versions of file =20 The output has changed and this patch will now ignore any additional output. =20 Signed-off-by: Michael Tremer commit b98ca5fa2d75d0ce5f03786f91a5ecaed625e914 Author: Michael Tremer Date: Wed Jun 7 10:34:43 2017 +0100 stripper: Abort if stripping fails =20 Signed-off-by: Michael Tremer commit 8be68155071b6465a589fdfc429662ba4d833435 Author: Matthias Fischer Date: Sat Jun 3 15:45:24 2017 +0200 libgpg-error: Update to 1.27 =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 6872b9e0a851b4dccb68872f7cafbb1392b0cde3 Author: Matthias Fischer Date: Sat Jun 3 15:38:40 2017 +0200 libgcrypt: Update to 1.7.7 =20 For details see: https://github.com/gpg/libgcrypt/commits/master =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit ac442269ccd3eb699c108427a7c470184374240b Author: Marcel Lorenz Date: Tue Jun 6 14:30:58 2017 +0200 libarchive: update to 3.3.1 =20 https://www.libarchive.org/ =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit 35d4925c744595bd1c2088b1e2a7d73cb708eec0 Author: Marcel Lorenz Date: Tue Jun 6 14:14:01 2017 +0200 7zip: update to 16.02 =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit c0694233c319e5a6c388b8644b9736593635ab40 Author: Marcel Lorenz Date: Tue Jun 6 10:52:00 2017 +0200 grep: update to 2.27 =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit d31ef401a65514b0f62791a03d3f06c4bceca692 Author: Marcel Lorenz Date: Tue Jun 6 10:32:00 2017 +0200 gawk: update to 4.1.4 =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit 8e700473ac31eea7e24a78626a69de38bf5b3ab8 Author: Marcel Lorenz Date: Tue Jun 6 10:25:37 2017 +0200 remove old bash 3.2 patches =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit 5dd7cec068f0e7478712f18ed23f20b2d05beb71 Author: Marcel Lorenz Date: Tue Jun 6 10:07:57 2017 +0200 pkg-config: update to 2.29.2 =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit 14c9349c80eb33bee7c063ba40fd0a310c00daf1 Author: Marcel Lorenz Date: Tue Jun 6 10:02:11 2017 +0200 bc: update to 1.07.1 =20 https://www.gnu.org/software/bc/ =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit 1a533a1cd1ddf00735be07c9a283a9309d356e1e Author: Marcel Lorenz Date: Tue Jun 6 09:57:22 2017 +0200 flex: update to 2.6.4 =20 https://github.com/westes/flex/releases =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit cb0969580b75480f1829cee8e0057b27ea23d395 Author: Marcel Lorenz Date: Tue Jun 6 09:22:09 2017 +0200 ccache: update to 3.3.4 =20 https://ccache.samba.org/releasenotes.html#_ccache_3_3_4 =20 Signed-off-by: Marcel Lorenz Signed-off-by: Michael Tremer commit 2be66b3d8551f0b0ee8b7309b9c955e29f48a7a1 Author: Matthias Fischer Date: Mon Jun 5 15:24:55 2017 +0200 Cosmetic fix for 'make-functions'-output =20 '$LAST_STAGE_TIME'-output got overwritten by the following 'version/optio= ns/time/status'-line. =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bc | 8 +- config/rootfiles/common/flex | 7 +- config/rootfiles/common/gawk | 46 ++++- config/rootfiles/common/libarchive | 6 +- config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/common/libgpg-error | 5 +- config/rootfiles/packages/7zip | 212 ++++++++++---------= -- lfs/7zip | 11 +- lfs/bc | 14 +- lfs/ccache | 6 +- lfs/flex | 9 +- lfs/gawk | 35 ++-- lfs/grep | 4 +- lfs/libarchive | 6 +- lfs/libgcrypt | 6 +- lfs/libgpg-error | 6 +- lfs/pkg-config | 5 +- lfs/strip | 2 +- make.sh | 2 +- src/patches/bash/bash32-052 | 104 ---------- src/patches/bash/bash32-053 | 54 ------ src/patches/gawk-3.1.5-segfault_fix-1.patch | 43 ----- src/patches/p7zip_change_install_folder.patch | 10 + src/patches/pkg-config-0.29-glib-compile-fix.patch | 29 --- src/stripper | 10 +- tools/make-functions | 2 +- 26 files changed, 216 insertions(+), 428 deletions(-) delete mode 100644 src/patches/bash/bash32-052 delete mode 100644 src/patches/bash/bash32-053 delete mode 100644 src/patches/gawk-3.1.5-segfault_fix-1.patch create mode 100644 src/patches/p7zip_change_install_folder.patch delete mode 100644 src/patches/pkg-config-0.29-glib-compile-fix.patch Difference in files: diff --git a/config/rootfiles/common/bc b/config/rootfiles/common/bc index 145c177..2e983a8 100644 --- a/config/rootfiles/common/bc +++ b/config/rootfiles/common/bc @@ -1,6 +1,6 @@ usr/bin/bc usr/bin/dc -#usr/info/bc.info -#usr/info/dc.info -#usr/man/man1/bc.1 -#usr/man/man1/dc.1 +#usr/share/info/bc.info +#usr/share/info/dc.info +#usr/share/man/man1/bc.1 +#usr/share/man/man1/dc.1 diff --git a/config/rootfiles/common/flex b/config/rootfiles/common/flex index 65b5588..2cb3286 100644 --- a/config/rootfiles/common/flex +++ b/config/rootfiles/common/flex @@ -7,18 +7,13 @@ #usr/lib/libfl.so usr/lib/libfl.so.2 usr/lib/libfl.so.2.0.0 -#usr/lib/libfl_pic.a -#usr/lib/libfl_pic.la -#usr/lib/libfl_pic.so -usr/lib/libfl_pic.so.2 -usr/lib/libfl_pic.so.2.0.0 #usr/lib/libl.a #usr/share/doc/flex #usr/share/doc/flex/AUTHORS #usr/share/doc/flex/COPYING #usr/share/doc/flex/NEWS #usr/share/doc/flex/ONEWS -#usr/share/doc/flex/README +#usr/share/doc/flex/README.md #usr/share/info/flex.info #usr/share/info/flex.info-1 #usr/share/info/flex.info-2 diff --git a/config/rootfiles/common/gawk b/config/rootfiles/common/gawk index 2a39be6..f9e1e8a 100644 --- a/config/rootfiles/common/gawk +++ b/config/rootfiles/common/gawk @@ -1,18 +1,24 @@ usr/bin/awk usr/bin/gawk -#usr/bin/gawk-3.1.5 +#usr/bin/gawk-4.1.4 #usr/bin/igawk -#usr/bin/pgawk -#usr/bin/pgawk-3.1.5 -#usr/info/dir -#usr/info/gawk.info -#usr/info/gawkinet.info +#usr/include/gawkapi.h #usr/lib/awk #usr/lib/awk/grcat #usr/lib/awk/pwcat -#usr/man/man1/gawk.1 -#usr/man/man1/igawk.1 -#usr/man/man1/pgawk.1 +#usr/lib/gawk +usr/lib/gawk/filefuncs.so +usr/lib/gawk/fnmatch.so +usr/lib/gawk/fork.so +usr/lib/gawk/inplace.so +usr/lib/gawk/ordchr.so +usr/lib/gawk/readdir.so +usr/lib/gawk/readfile.so +usr/lib/gawk/revoutput.so +usr/lib/gawk/revtwoway.so +usr/lib/gawk/rwarray.so +usr/lib/gawk/testext.so +usr/lib/gawk/time.so #usr/share/awk #usr/share/awk/assert.awk #usr/share/awk/bits2str.awk @@ -22,14 +28,34 @@ usr/bin/gawk #usr/share/awk/getopt.awk #usr/share/awk/gettime.awk #usr/share/awk/group.awk +#usr/share/awk/inplace.awk #usr/share/awk/join.awk #usr/share/awk/libintl.awk -#usr/share/awk/nextfile.awk #usr/share/awk/noassign.awk #usr/share/awk/ord.awk #usr/share/awk/passwd.awk +#usr/share/awk/processarray.awk +#usr/share/awk/quicksort.awk #usr/share/awk/readable.awk +#usr/share/awk/readfile.awk #usr/share/awk/rewind.awk #usr/share/awk/round.awk +#usr/share/awk/shellquote.awk #usr/share/awk/strtonum.awk +#usr/share/awk/walkarray.awk #usr/share/awk/zerofile.awk +#usr/share/info/gawk.info +#usr/share/info/gawkinet.info +#usr/share/man/man1/gawk.1 +#usr/share/man/man1/igawk.1 +#usr/share/man/man3/filefuncs.3am +#usr/share/man/man3/fnmatch.3am +#usr/share/man/man3/fork.3am +#usr/share/man/man3/inplace.3am +#usr/share/man/man3/ordchr.3am +#usr/share/man/man3/readdir.3am +#usr/share/man/man3/readfile.3am +#usr/share/man/man3/revoutput.3am +#usr/share/man/man3/revtwoway.3am +#usr/share/man/man3/rwarray.3am +#usr/share/man/man3/time.3am diff --git a/config/rootfiles/common/libarchive b/config/rootfiles/common/lib= archive index 80daa2d..c190eef 100644 --- a/config/rootfiles/common/libarchive +++ b/config/rootfiles/common/libarchive @@ -1,15 +1,15 @@ -#usr/bin/bsdcpio #usr/bin/bsdcat +#usr/bin/bsdcpio #usr/bin/bsdtar #usr/include/archive.h #usr/include/archive_entry.h #usr/lib/libarchive.la #usr/lib/libarchive.so #usr/lib/libarchive.so.13 -#usr/lib/libarchive.so.13.2.1 +#usr/lib/libarchive.so.13.3.1 #usr/lib/pkgconfig/libarchive.pc -#usr/share/man/man1/bsdcpio.1 #usr/share/man/man1/bsdcat.1 +#usr/share/man/man1/bsdcpio.1 #usr/share/man/man1/bsdtar.1 #usr/share/man/man3/archive_entry.3 #usr/share/man/man3/archive_entry_acl.3 diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libg= crypt index 4706343..725593f 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.1.3 +usr/lib/libgcrypt.so.20.1.7 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/man/man1/hmac256.1 diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/l= ibgpg-error index 92ac1f3..6945f34 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -1,10 +1,11 @@ usr/bin/gpg-error #usr/bin/gpg-error-config #usr/include/gpg-error.h +#usr/include/gpgrt.h #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.19.1 +usr/lib/libgpg-error.so.0.22.0 #usr/share/aclocal/gpg-error.m4 #usr/share/common-lisp #usr/share/common-lisp/source @@ -14,6 +15,8 @@ usr/lib/libgpg-error.so.0.19.1 #usr/share/common-lisp/source/gpg-error/gpg-error.asd #usr/share/common-lisp/source/gpg-error/gpg-error.lisp #usr/share/info/gpgrt.info +#usr/share/libgpg-error +#usr/share/libgpg-error/errorref.txt #usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index d3a5c38..bcf0322 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -1,106 +1,106 @@ -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 = # +# Copyright (C) 2007-2016 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 15.14.1 +VER =3D 16.02 =20 THISAPP =3D p7zip_$(VER) DL_FILE =3D $(THISAPP)_src_all.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) PROG =3D 7zip -PAK_VER =3D 6 +PAK_VER =3D 7 =20 DEPS =3D "" =20 @@ -44,7 +44,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 92cca093312b5a71a7be7dc7d1d32509 +$(DL_FILE)_MD5 =3D a0128d661cfe7cc8c121e73519c54fbf =20 install : $(TARGET) =20 @@ -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/lfs/bc b/lfs/bc index 28b27cb..51dd084 100644 --- a/lfs/bc +++ b/lfs/bc @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # +# Copyright (C) 2007-2017 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 1.06 +VER =3D 1.07.1 =20 THISAPP =3D bc-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D d44b5dddebd8a7a7309aea6c36fda117 +$(DL_FILE)_MD5 =3D cda93857418655ea43590736fc3ca9fc =20 install : $(TARGET) =20 @@ -69,12 +69,8 @@ $(subst %,%_MD5,$(objects)) : =20 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && sed -i '/PROTO.*readline/d' bc/scan.l - cd $(DIR_APP) && sed -i '/flex -I8/s/8//' configure - cd $(DIR_APP) && sed -i '/stdlib/a #include ' lib/number.c - cd $(DIR_APP) && sed -i 's/program.*save/static &/' bc/load.c - cd $(DIR_APP) && ./configure --prefix=3D/usr --with-readline + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=3D/usr --with-readline --mandir=3D/us= r/share/man --infodir=3D/usr/share/info cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/ccache b/lfs/ccache index 9fbb728..43f4df7 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2016 IPFire Team = # +# Copyright (C) 2007-2017 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 3.2.3 +VER =3D 3.3.4 =20 THISAPP =3D ccache-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -48,7 +48,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 608c78632086a4a051514722d6067a7b +$(DL_FILE)_MD5 =3D 95ab3c56284129cc2a32460c23069516 =20 install : $(TARGET) =20 diff --git a/lfs/flex b/lfs/flex index 3101c86..4b1a75b 100644 --- a/lfs/flex +++ b/lfs/flex @@ -24,10 +24,10 @@ =20 include Config =20 -VER =3D 2.6.1 +VER =3D 2.6.4 =20 THISAPP =3D flex-$(VER) -DL_FILE =3D $(THISAPP).tar.xz +DL_FILE =3D $(THISAPP).tar.gz DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D cd3c86290fc2676a641aefafeb10848a +$(DL_FILE)_MD5 =3D 2882e3179748cc9f9c23ec593d6adc8d =20 install : $(TARGET) =20 @@ -70,7 +70,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=3D/usr --disable-nls + cd $(DIR_APP) && HELP2MAN=3D/tools/bin/true \ + ./configure --prefix=3D/usr --disable-nls cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install ifeq "$(ROOT)" "" diff --git a/lfs/gawk b/lfs/gawk index c8cb892..62bad01 100644 --- a/lfs/gawk +++ b/lfs/gawk @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2016 IPFire Team = # +# Copyright (C) 2007-2015 IPFire Team = # # = # # 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 = # @@ -18,35 +18,29 @@ # = # ############################################################################= ### =20 + ############################################################################= ### # Definitions ############################################################################= ### =20 include Config =20 -VER =3D 3.1.5 +VER =3D 4.1.4 =20 THISAPP =3D gawk-$(VER) -DL_FILE =3D $(THISAPP).tar.bz2 +DL_FILE =3D $(THISAPP).tar.xz DL_FROM =3D $(URL_IPFIRE) DIR_APP =3D $(DIR_SRC)/$(THISAPP) =20 # Normal build or /tools build. -# ifeq "$(ROOT)" "" - TARGET =3D $(DIR_INFO)/$(THISAPP) - EXTRA_CONFIG =3D --prefix=3D/usr --libexecdir=3D/usr/lib --disable-nls - EXTRA_MAKE =3D - EXTRA_INSTALL =3D + TARGET =3D $(DIR_INFO)/$(THISAPP) + EXTRA_CONFIG =3D --prefix=3D/usr --libexecdir=3D/usr/lib --disable-nls else - TARGET =3D $(DIR_INFO)/$(THISAPP)-tools - EXTRA_CONFIG =3D --prefix=3D/tools --disable-nls --build=3D$(BUILDTARGET) - EXTRA_MAKE =3D=20 - EXTRA_INSTALL =3D=20 + TARGET =3D $(DIR_INFO)/$(THISAPP)-tools + EXTRA_CONFIG =3D --prefix=3D/tools --disable-nls endif =20 -EXTRA_CONFIG +=3D ac_cv_func_working_mktime=3Dyes - ############################################################################= ### # Top-level Rules ############################################################################= ### @@ -55,7 +49,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 5703f72d0eea1d463f735aad8222655f +$(DL_FILE)_MD5 =3D 4e7dbc81163e60fd4f0b52496e7542c9 =20 install : $(TARGET) =20 @@ -84,14 +78,9 @@ $(subst %,%_MD5,$(objects)) : =20 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) -ifeq "$(ROOT)" "" - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-segfault_fi= x-1.patch -endif + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && echo "#define HAVE_LANGINFO_CODESET 1" >> config.h - cd $(DIR_APP) && echo "#define HAVE_LC_MESSAGES 1" >> config.h - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/grep b/lfs/grep index 32a6748..5ac45c1 100644 --- a/lfs/grep +++ b/lfs/grep @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 2.24 +VER =3D 2.27 =20 THISAPP =3D grep-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -51,7 +51,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D f1c980134c04692a90078e87283074b6 +$(DL_FILE)_MD5 =3D 6138dd227c39d4a25f81eea76a44d4cb =20 install : $(TARGET) =20 diff --git a/lfs/libarchive b/lfs/libarchive index 58b4b6e..2c34225 100644 --- a/lfs/libarchive +++ b/lfs/libarchive @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2016 IPFire Team = # +# Copyright (C) 2017 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 3.2.1 +VER =3D 3.3.1 =20 THISAPP =3D libarchive-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D afa257047d1941a565216edbf0171e72 +$(DL_FILE)_MD5 =3D d2af45480aa5b0db5b5f3919cd0ea65e =20 install : $(TARGET) =20 diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 5a06032..5d5572c 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2016 IPFire Team = # +# Copyright (C) 2007-2017 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 1.7.3 +VER =3D 1.7.7 =20 THISAPP =3D libgcrypt-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D c869e542cc13a1c28d8055487bf7f5c4 +$(DL_FILE)_MD5 =3D d1769481b1b506a632fd66c5e5f62e41 =20 install : $(TARGET) =20 diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 84af2aa..ac618dc 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2016 IPFire Team = # +# Copyright (C) 2007-2017 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 1.24 +VER =3D 1.27 =20 THISAPP =3D libgpg-error-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D feb42198c0aaf3b28eabe8f41a34b983 +$(DL_FILE)_MD5 =3D 5217ef3e76a7275a2a3b569a12ddc989 =20 install : $(TARGET) =20 diff --git a/lfs/pkg-config b/lfs/pkg-config index 8523d8a..36fb40a 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -24,7 +24,7 @@ =20 include Config =20 -VER =3D 0.29.1 +VER =3D 0.29.2 =20 THISAPP =3D pkg-config-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -50,7 +50,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D f739a28cae4e0ca291f82d1d41ef107d +$(DL_FILE)_MD5 =3D f6e931e319531b736fadc017f470e68a =20 install : $(TARGET) =20 @@ -80,7 +80,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP)/glib && patch -Np1 < $(DIR_SRC)/src/patches/pkg-config-0.29-g= lib-compile-fix.patch ifeq "$(ROOT)" "" else mkdir -pv /tools/lib/pkgconfig diff --git a/lfs/strip b/lfs/strip index d07ff43..237f4d2 100644 --- a/lfs/strip +++ b/lfs/strip @@ -49,6 +49,6 @@ $(TARGET) : # Don't strip VDR binaries, because they use a weird plugin system # which does not work when unneeded symbols get stripped from # /usr/sbin/vdr. - STRIP=3D"/tools/bin/strip" $(DIR_SRC)/src/stripper / \ + $(DIR_SRC)/src/stripper $(ROOT) \ --exclude=3D/usr/src --exclude=3D/tools \ --exclude=3D/usr/sbin/vdr --exclude=3D/usr/lib/vdr diff --git a/make.sh b/make.sh index 9c4c6ca..a0f2dff 100755 --- a/make.sh +++ b/make.sh @@ -895,7 +895,7 @@ buildinstaller() { export LOGFILE lfsmake2 memtest lfsmake2 installer - lfsmake2 strip + lfsmake1 strip } =20 buildpackages() { diff --git a/src/patches/bash/bash32-052 b/src/patches/bash/bash32-052 deleted file mode 100644 index 78e7d92..0000000 --- a/src/patches/bash/bash32-052 +++ /dev/null @@ -1,104 +0,0 @@ - BASH PATCH REPORT - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Bash-Release: 3.2 -Patch-ID: bash32-052 - -Bug-Reported-by: Stephane Chazelas -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -Under certain circumstances, bash will execute user code while processing the -environment for exported function definitions. - -Patch (apply with `patch -p0'): - -*** ../bash-3.2.51/builtins/common.h 2006-03-06 09:38:44.000000000 -0500 ---- builtins/common.h 2014-09-16 19:08:02.000000000 -0400 -*************** -*** 34,37 **** ---- 34,39 ---- - =20 - /* Flags for describe_command, shared between type.def and command.def */ -+ #define SEVAL_FUNCDEF 0x080 /* only allow function definitions */ -+ #define SEVAL_ONECMD 0x100 /* only allow a single command */ - #define CDESC_ALL 0x001 /* type -a */ - #define CDESC_SHORTDESC 0x002 /* command -V */ -*** ../bash-3.2.51/builtins/evalstring.c 2008-11-15 17:47:04.000000000 -0500 ---- builtins/evalstring.c 2014-09-16 19:08:02.000000000 -0400 -*************** -*** 235,238 **** ---- 235,246 ---- - struct fd_bitmap *bitmap; - =20 -+ if ((flags & SEVAL_FUNCDEF) && command->type !=3D cm_function_def) -+ { -+ internal_warning ("%s: ignoring function definition attempt", from_fil= e); -+ should_jump_to_top_level =3D 0; -+ last_result =3D last_command_exit_value =3D EX_BADUSAGE; -+ break; -+ } -+=20 - bitmap =3D new_fd_bitmap (FD_BITMAP_SIZE); - begin_unwind_frame ("pe_dispose"); -*************** -*** 292,295 **** ---- 300,306 ---- - dispose_fd_bitmap (bitmap); - discard_unwind_frame ("pe_dispose"); -+=20 -+ if (flags & SEVAL_ONECMD) -+ break; - } - } -*** ../bash-3.2.51/variables.c 2008-11-15 17:15:06.000000000 -0500 ---- variables.c 2014-09-16 19:10:39.000000000 -0400 -*************** -*** 319,328 **** - strcpy (temp_string + char_index + 1, string); - =20 -! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST); -!=20 -! /* Ancient backwards compatibility. Old versions of bash exported -! functions like name()=3D() {...} */ -! if (name[char_index - 1] =3D=3D ')' && name[char_index - 2] =3D=3D '(') -! name[char_index - 2] =3D '\0'; - =20 - if (temp_var =3D find_function (name)) ---- 319,326 ---- - strcpy (temp_string + char_index + 1, string); - =20 -! /* Don't import function names that are invalid identifiers from the -! environment. */ -! if (legal_identifier (name)) -! parse_and_execute (temp_string, name, SEVAL_NONINT|SEVAL_NOHIST|SEVAL= _FUNCDEF|SEVAL_ONECMD); - =20 - if (temp_var =3D find_function (name)) -*************** -*** 333,340 **** - else - report_error (_("error importing function definition for `%s'"), name= ); --=20 -- /* ( */ -- if (name[char_index - 1] =3D=3D ')' && name[char_index - 2] =3D=3D '\0') -- name[char_index - 2] =3D '('; /* ) */ - } - #if defined (ARRAY_VARS) ---- 331,334 ---- -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - =20 -! #define PATCHLEVEL 51 - =20 - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - =20 -! #define PATCHLEVEL 52 - =20 - #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/bash/bash32-053 b/src/patches/bash/bash32-053 deleted file mode 100644 index e7efce7..0000000 --- a/src/patches/bash/bash32-053 +++ /dev/null @@ -1,54 +0,0 @@ - BASH PATCH REPORT - =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D - -Bash-Release: 3.2 -Patch-ID: bash32-053 - -Bug-Reported-by: Tavis Ormandy -Bug-Reference-ID: -Bug-Reference-URL: http://twitter.com/taviso/statuses/514887394294652929 - -Bug-Description: - -Under certain circumstances, bash can incorrectly save a lookahead character= and -return it on a subsequent call, even when reading a new line. - -Patch: - -*** ../bash-3.2.52/parse.y 2008-04-29 21:24:55.000000000 -0400 ---- parse.y 2014-09-25 16:18:41.000000000 -0400 -*************** -*** 2504,2507 **** ---- 2504,2509 ---- - word_desc_to_read =3D (WORD_DESC *)NULL; - =20 -+ eol_ungetc_lookahead =3D 0; -+=20 - last_read_token =3D '\n'; - token_to_read =3D '\n'; -*** ../bash-3.2.52/y.tab.c 2006-09-25 08:15:16.000000000 -0400 ---- y.tab.c 2014-09-25 20:28:17.000000000 -0400 -*************** -*** 3833,3836 **** ---- 3833,3838 ---- - word_desc_to_read =3D (WORD_DESC *)NULL; - =20 -+ eol_ungetc_lookahead =3D 0; -+=20 - last_read_token =3D '\n'; - token_to_read =3D '\n'; -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - =20 -! #define PATCHLEVEL 52 - =20 - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - =20 -! #define PATCHLEVEL 53 - =20 - #endif /* _PATCHLEVEL_H_ */ diff --git a/src/patches/gawk-3.1.5-segfault_fix-1.patch b/src/patches/gawk-3= .1.5-segfault_fix-1.patch deleted file mode 100644 index aa2f17b..0000000 --- a/src/patches/gawk-3.1.5-segfault_fix-1.patch +++ /dev/null @@ -1,43 +0,0 @@ -Submitted By: Matthew Burgess -Date: 2005-09-24 -Initial Package Version: 3.1.5 -Upstream Status: From Upstream -Origin: http://lists.gnu.org/archive/html/bug-gnu-utils/2005-08/msg00047.html -Description: Fixes a bug which causes gawk to segfault when operating on a n= on-existent file. - -diff -Naur gawk-3.1.5.orig/io.c gawk-3.1.5/io.c ---- gawk-3.1.5.orig/io.c 2005-07-26 18:07:43.000000000 +0000 -+++ gawk-3.1.5/io.c 2005-09-24 14:43:13.771380264 +0000 -@@ -2480,9 +2480,12 @@ - { - struct stat sbuf; - struct open_hook *oh; -+ int iop_malloced =3D FALSE; -=20 -- if (iop =3D=3D NULL) -+ if (iop =3D=3D NULL) { - emalloc(iop, IOBUF *, sizeof(IOBUF), "iop_alloc"); -+ iop_malloced =3D TRUE; -+ } - memset(iop, '\0', sizeof(IOBUF)); - iop->flag =3D 0; - iop->fd =3D fd; -@@ -2495,7 +2498,8 @@ - } -=20 - if (iop->fd =3D=3D INVALID_HANDLE) { -- free(iop); -+ if (iop_malloced) -+ free(iop); - return NULL; - } - if (isatty(iop->fd)) -@@ -2503,7 +2507,7 @@ - iop->readsize =3D iop->size =3D optimal_bufsize(iop->fd, & sbuf); - iop->sbuf =3D sbuf; - if (do_lint && S_ISREG(sbuf.st_mode) && sbuf.st_size =3D=3D 0) -- lintwarn(_("data file `%s' is empty"), name); -+ lintwarn(_("data file `%s' is empty"), name); - errno =3D 0; - iop->count =3D iop->scanoff =3D 0; - emalloc(iop->buf, char *, iop->size +=3D 2, "iop_alloc"); diff --git a/src/patches/p7zip_change_install_folder.patch b/src/patches/p7zi= p_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 +=20 +-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 diff --git a/src/patches/pkg-config-0.29-glib-compile-fix.patch b/src/patches= /pkg-config-0.29-glib-compile-fix.patch deleted file mode 100644 index a092882..0000000 --- a/src/patches/pkg-config-0.29-glib-compile-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0817af40e8c74c721c30f6ef482b1f53d12044c7 Mon Sep 17 00:00:00 2001 -From: coypu -Date: Mon, 8 Feb 2016 00:06:06 +0200 -Subject: gdate: Suppress string format literal warning - -Newer versions of GCC emit an error here, but we know it's safe. -https://bugzilla.gnome.org/761550 ---- - glib/gdate.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/glib/gdate.c b/glib/gdate.c -index 4aece02..cdc735c 100644 ---- a/glib/gdate.c -+++ b/glib/gdate.c -@@ -2494,7 +2494,10 @@ g_date_strftime (gchar *s, - * recognize whether strftime actually failed or just returned "". - */ - tmpbuf[0] =3D '\1'; -+ #pragma GCC diagnostic push -+ #pragma GCC diagnostic ignored "-Wformat-nonliteral" - tmplen =3D strftime (tmpbuf, tmpbufsize, locale_format, &tm); -+ #pragma GCC diagnostic pop -=20 - if (tmplen =3D=3D 0 && tmpbuf[0] !=3D '\0') - { ---=20 -cgit v0.12 - diff --git a/src/stripper b/src/stripper index 2b4feaf..d73848f 100755 --- a/src/stripper +++ b/src/stripper @@ -43,15 +43,15 @@ function _strip() { for dir in ${dirs}; do # Strip shared objects. find ${dir} -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \ - | file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | + | file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped.*/\1/p' | while read file; do - _strip ${file} - done + _strip ${file} || exit $? + done || exit $? =20 # Strip static archives. find ${dir} -name \*.a -a -exec file {} \; \ | grep 'current ar archive' | sed -n -e 's/^\(.*\):[ ]*current ar archive= /\1/p' | while read file; do - _strip ${file} - done + _strip ${file} || exit $? + done || exit $? done diff --git a/tools/make-functions b/tools/make-functions index 8e40163..508f5f2 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -225,7 +225,7 @@ beautify() STAGE_TIME_START=3D`date +%s` echo -ne "${BOLD}*** (${BUILD_ARCH}) ${MESSAGE}${NORMAL}" if [ "$LAST_STAGE_TIME" ]; then - echo -ne "${DONE} (Last stage took $LAST_STAGE_TIME secs)${NORMAL}" + echo -ne "${DONE} (Last stage took $LAST_STAGE_TIME secs)${NORMAL}\n" fi echo -ne "${BOLD}${SET_VER_COL} version${SET_OPT_COL} options${SET_T= IME_COL} time (sec)${SET_RESULT_COL} status${NORMAL}\n" ;; hooks/post-receive -- IPFire 2.x development tree --===============7565385275595843078==--