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 d1ee557242b8428a190759467a98048f62a0451d (commit) via ec79b46309035de6edd2ac24e33895fce3fffc04 (commit) via 9e08985ed812cd8c31415522789620e2c797f76b (commit) via 614e2c8518475239b27d8d6a8f91b8d5f4ac69d0 (commit) via d154063e9603b792fd592ca501cf8228a62861e5 (commit) via 1dbd47ee061c3c38429c7accb76c3e7aafa435d8 (commit) via a3ebd7c206622eece9a36fbb1f2cbc70128994fa (commit) via 8e78605e4ec210f9b9951ce68fffd1830664725e (commit) from 178c7a6adc97fbbb436ca142734c70152e43b4b5 (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 d1ee557242b8428a190759467a98048f62a0451d Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 9 15:01:38 2021 +0000

core155: Ship qpdf

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit ec79b46309035de6edd2ac24e33895fce3fffc04 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Feb 8 20:57:10 2021 +0100

qpdf: Update to 10.1.0

- Update qpdf from 10.0.1 to 10.1.0 - Update rootfile - Changelog 2021-01-05 Jay Berkenbilt ejb@ql.org * 10.1.0: release 2021-01-04 Jay Berkenbilt ejb@ql.org * When qpdf CLI extracts pages, it now only attempts to remove unreferenced resources from the pages that it is keeping. This change dramatically reduces the time it takes to extract a small number of pages from a large, complex file. * Move getNext()->write() calls in some pipelines to ensure that state gates properly reset even if the next pipeline's write throws an exception (fuzz issue 28262). 2021-01-03 Jay Berkenbilt ejb@ql.org * Don't include -o nospace with zsh completion setup so file completion works normally. Fixes #473. 2021-01-02 Jay Berkenbilt ejb@ql.org * Make QPDFPageObjectHelper methods pipeContents, parseContents, and addContentTokenFilter work with form XObjects. * Rename some QPDFPageObjectHelper methods and make them support form XObjects as well as pages. The old names will be preserved from compatibility. - pipePageContents -> pipeContents - parsePageContents -> parseContents * Add QPDFObjectHandle::parseAsContents to apply ParserCallbacks to a form XObject. * QPDFPageObjectHelper::externalizeInlineImages can be called with form XObjects as well as pages. * Bug fix: QPDFPageObjectHelper::externalizeInlineImages was not descending into form XObjects on a page. It now does this by default. In the extremely unlikely event that anyone was actually depending on the old behavior, it is available by passing shallow=true to the externalizeInlineImages call. * Bug fix: QPDFObjectHandle::filterPageContents was broken for pages with an array of content streams. This caused externalize-inline-images to also be broken for this case. 2021-01-01 Jay Berkenbilt ejb@ql.org * Add methods to QPDFPageObjectHelper: forEachXObject, forEachImage, forEachFormXObject to call a function on each XObject (or image or form XObject) in a page or form XObject, possibly recursing into nested form XObjects. * Add method QPDFPageObjectHelper::getFormXObjects to return a map of keys to form XObjects (non-recursively) from a page or form XObject. * Add method QPDFObjectHandle::isImage to test whether an object is an image. 2020-12-31 Jay Berkenbilt ejb@ql.org * QPDFPageObjectHelper::removeUnreferencedResources can now be called with a QPDFPageObjectHelper created from a form XObject. The method already recursed into form XObjects. * Rename some QPDFPageObjectHelper methods and make them support form XObjects as well as pages. The old names will be preserved from compatibility. - getPageImages -> getImages - filterPageContents -> filterContents * Add QPDFObjectHandle::isFormXObject to test whether an object is a form XObject. 2020-12-30 Jay Berkenbilt ejb@ql.org * Add QPDFPageObjectHelper::flattenRotation and --flatten-rotation option to the qpdf CLI. The flattenRotation method removes any /Rotate key from a page dictionary and implements the same rotation by modifying the page's contents such that the various page boxes are altered and the page renders identically. This can be used to work around buggy PDF applications that don't properly handle page rotation. The --flatten-rotation option to the qpdf CLI calls flattenRotation for every page. 2020-12-26 Jay Berkenbilt ejb@ql.org * Add QPDFObjectHandle::setFilterOnWrite, which can be used to tell QPDFWriter not to filter a stream on output even if it can. You can use this to prevent QPDFWriter from touching a stream (either uncompressing or compressing) that you have optimized or otherwise ensured looks exactly the way you want it, even if decode level or stream compression would otherwise cause QPDFWriter to modify the stream. * Add ostream << for QPDFObjGen. (Don't ask why it took 7.5 years for me to decide to do this.) 2020-12-25 Jay Berkenbilt ejb@ql.org * Refactor write code to eliminate an extra full traversal of objects in the file and to remove assumptions that preclude stream references from appearing in /DecodeParms of filterable streams. This results in an approximately 8% performance reduction in write times. 2020-12-23 Jay Berkenbilt ejb@ql.org * Allow library users to provide their own decoders for stream filters by deriving classes from QPDFStreamFilter and registering them using QPDF::registerStreamFilter. Registered stream filters provide code to validate and interpret /DecodeParms for a specific /Filter and also to provide a pipeline that will decode. Note that it is possible to encode to a filter type that is not supported even without this feature. See examples/pdf-custom-filter.cc for an example of using custom stream filters. 2020-12-22 Jay Berkenbilt ejb@ql.org * Add QPDFObjectHandle::makeDirect(bool allow_streams) -- if allow_streams is true, preserve indirect references to streams rather than throwing an exception. This allows the object to be made as direct as possible while preserving stream references. 2020-12-20 Jay Berkenbilt ejb@ql.org * Add qpdf_register_progress_reporter method to C API, corresponding to QPDFWriter::registerProgressReporter. Fixes #487. 2020-11-28 Jay Berkenbilt ejb@ql.org * Add new functions to the C API for manipulating QPDFObjectHandles. The new functions allow creation and modification of objects, which brings a lot of additional power to the C API. See include/qpdf/qpdf-c.h for details and examples/pdf-c-objects.c for a simple example. 2020-11-21 Jay Berkenbilt ejb@ql.org * 10.0.4: release * Fix QIntC::range_check to handle negative numbers properly (fuzz issue 26994). 2020-11-11 Jay Berkenbilt ejb@ql.org * Treat a direct page object as a runtime error rather than a logic error since it is actually possible to create a file that has this (fuzz issue 27393). 2020-11-09 Jay Berkenbilt ejb@ql.org * Handle "." appearing in --pages not preceded by a numeric range as a special case in command-line parsing code. 2020-11-04 Jay Berkenbilt ejb@ql.org * Ignore the value of the offset/generation field in an xref entry for a deleted object. Also attempt file recovery on lower-level exceptions thrown while reading the xref table. Fixes #482. 2020-10-31 Jay Berkenbilt ejb@ql.org * 10.0.3: release * Don't enter extension initialization in QPDFWriter on a direct object. Fixes stack overflow in pathological case of /Root being a direct object (fuzz issue 26761). * My previous fix to #449 (handling foreign streams with indirect objects in /Filter and/or /DecodeParms) was incorrect and caused other problems. There is a now a correct fix to the original problem. Fixes #478. 2020-10-27 Jay Berkenbilt ejb@ql.org * 10.0.2: release 2020-10-25 Jay Berkenbilt ejb@ql.org * When signing distribution files, generate sha256 checksums instead of md5, sha1, and sha512. sha256 seems to be more widely used, and there's no reason to use md5 or sha1 anymore. * Official Windows releases are now built using the openssl crypto provider. The native provider is still available for selection at runtime using the QPDF_CRYPTO_PROVIDER environment variable. * Bug fix: --no-warn was not suppressing some warnings that might be generated by --split-pages. 2020-10-23 Jay Berkenbilt ejb@ql.org * Bug fix: when concatenating content streams, insert a newline if needed to prevent the last token from the old stream from being merged with the first token of the new stream. Qpdf was mistakenly concatenating the streams without regard to the specification that content streams are to be broken on token boundaries. Fixes #444. * fix-qdf: handle empty streams better with ignore newline by treating them as empty even though, technically, a blank line would be required inside the Stream. This just makes it easier to add place-holder empty streams while editing qdf files by hand. 2020-10-22 Jay Berkenbilt ejb@ql.org * Fix memory leak that could occur if objects in object streams were resolved more than once and the objects within the object streams contained circular references. This leak could be triggered when qpdf was run with --object-streams=generate on files that already had object streams containing circular references (fuzz issue 23642). * Add QIntC::range_check for checking to see whether adding two numbers together will cause an overflow. * Fix loop detection problem when traversing page thumbnails during optimization (fuzz issue 23172). 2020-10-21 Jay Berkenbilt ejb@ql.org * Bug fix: properly handle copying foreign streams that have indirect /Filter or /DecodeParms keys when stream data has been replaced. The circumstances leading to this bug are very unusual but would cause qpdf to either generate an internal error or some other kind of warning situation if it would occur. Fixes #449. * Qpdf's build and CI has been migrated from Azure Pipelines (Azure DevOps) to GitHub Actions. * Remove some fuzz files that triggered Mal/PDFEx-H with some virus scanners. There's plenty of coverage in the fuzz corpus without these files, and it's a nuisance to have virus checkers remove them. Fixes #460. * Ensure that numeric conversion is not affected by the user's global locale setting. Fixes #459. * Add qpdf-<version>-linux-x86_64.zip to the list of built distributions. This is a simple zip file that contains just the qpdf executables and the dependent shared libraries that would not ordinarily be present on a base system. This minimal binary distribution works as is when used as a Lambda layer in AWS and could be suitable for inclusion in a docker image or other standalone Linux/x86_64 environment where you want minimal support for running the qpdf executable. Fixes #352. 2020-10-20 Jay Berkenbilt ejb@ql.org * Add --warning-exit-0 option to the qpdf command line. When specified, qpdf will exit with a status of 0 rather than 3 when there are warnings without errors. Combine with --no-warn to completely ignore warnings. * Bug fix: fix further cases in which errors were written to stdout. Fixes #438. * Build option: add --disable-rpath option to ./configure, which disables passing -rpath to the linker when building shared libraries with libtool. Fixes #422. 2020-10-16 Jay Berkenbilt ejb@ql.org * Accept pull request that improves how the Windows native crypto provider is obtained. * Accept pull request that improves performance in processing files in memory. * Accept pull requests that improve openssl configuration and error reporting. * Build using GitHub Actions. The intention is that this will replace Azure Pipelines as the official CI for qpdf for the next release. 2020-10-15 Jay Berkenbilt ejb@ql.org * Make many minor improvements to the build process and code health, including fixing a lgtm warning and compiler warnings from newer version of gcc and MSVC toolchains. Add several cosmetic improvements to build output in CI. * Added LL_FMT to config.h.in. This is populated automatically by autoconf, but if build with your own build system, you may need to define it as whatever the format string needed by printf for long long is. Usually this is "%lld", but it can be "%I64d" for some older Windows-based compilers. 2020-04-29 Jay Berkenbilt ejb@ql.org * Bug fix: qpdf --check was writing errors and warnings reported by checkLinearization to stdout instead of stderr. Fixes #438.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 9e08985ed812cd8c31415522789620e2c797f76b Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Feb 8 20:56:58 2021 +0100

mpage: Update to 2.5.7

- Update mpage from 2.5.6 to 2.5.7 - No change to rootfile - Slight tuning of patch needed due to changes in source file - Changelog June 2017 - Released version 2.5.7 - Relicensed code under GPLv2 or later

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 614e2c8518475239b27d8d6a8f91b8d5f4ac69d0 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Feb 8 20:56:40 2021 +0100

lzo: Update to 2.10

- Update lzo from 2.09 to 2.10 - Update rootfile - Changelog Changes in 2.10 (01 Mar 2017) * Improve CMake build support. * Add support for pkg-config. * Do not redefine "snprintf" so that the examples build with MSVC 2015. * Assorted cleanups.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit d154063e9603b792fd592ca501cf8228a62861e5 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 9 11:52:11 2021 +0000

core155: Ship LZ4

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 1dbd47ee061c3c38429c7accb76c3e7aafa435d8 Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Feb 8 20:56:29 2021 +0100

lz4: Update to 1.9.3

- Update lz4 from 1.9.2 to 1.9.3 - Updated rootfile - Removed old patches and updated to new version name - Changelog v1.9.3 perf: highly improved speed in kernel space, by @terrelln perf: faster speed with Visual Studio, thanks to @wolfpld and @remittor perf: improved dictionary compression speed, by @felixhandte perf: fixed LZ4_compress_HC_destSize() ratio, detected by @hsiangkao perf: reduced stack usage in high compression mode, by @Yanpas api : LZ4_decompress_safe_partial() supports unknown compressed size, requested by @jfkthame api : improved LZ4F_compressBound() with automatic flushing, by Christopher Harvie api : can (de)compress to/from NULL without UBs api : fix alignment test on 32-bit systems (state initialization) api : fix LZ4_saveDictHC() in corner case scenario, detected by @IgorKorkin cli : `-l` legacy format is now compatible with `-m` multiple files, by Filipe Calasans cli : benchmark mode supports dictionary, by @rkoradi cli : fix --fast with large argument, detected by @picoHz build: link to user-defined memory functions with LZ4_USER_MEMORY_FUNCTIONS, suggested by Yuriy Levchenko build: contrib/cmake_unofficial/ moved to build/cmake/ build: visual/* moved to build/ build: updated meson script, by @neheb build: tinycc support, by Anton Kochkov install: Haiku support, by Jerome Duval doc : updated LZ4 frame format, clarify EndMark

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit a3ebd7c206622eece9a36fbb1f2cbc70128994fa Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Feb 9 11:50:08 2021 +0000

core155: Ship lcms2

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit 8e78605e4ec210f9b9951ce68fffd1830664725e Author: Adolf Belka adolf.belka@ipfire.org Date: Mon Feb 8 20:56:11 2021 +0100

lcms2: Update to 2.12

- Update lcms2 from 2.9 to 2.12 - Updated rootfile - Changelog ----------------------- 2.12 Maintenance release ----------------------- Added new build-in sigmoidal tone curve Added XCode 12 project Added support for multichannel input up to 15 channels Fix LUT8 write matrix Fix version mess on 10/11 Fix tools & samples xgetopt Fix warnings on different function pointers Fix matlab MEX compilation plugin: cleanup and better SSE detection plugin: add lab to any on float plugin: it can now be compiled as C++ recover PDF documentation, but try to keep it under a resonable size. Prevent a rare but possible out-of-bounds read in postscript generator Remove unused variables ----------------------- 2.11 Maintenance release ----------------------- Fixed __cpuid() on fast float plugin to allow gnu gcc Fixed copy alpha bounds check Fixed data race condition on contexts pool Fixed LUT16 write matrix on multichannel V2 profiles ----------------------- 2.10 Featured release ----------------------- Added a compilation toggle to remove "register" keyword in API. Previously commercial, fast_float plug-in is now released as open source under GPL3 license. MD5 functions are now accesible through plug-in API. Added support for Visual Studio 2019 Bug fixing.

Signed-off-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/lcms2 | 6 ++-- config/rootfiles/common/lz4 | 2 +- config/rootfiles/common/lzo | 1 + config/rootfiles/common/qpdf | 4 +-- .../{oldcore/110 => core/155}/filelists/lcms2 | 0 .../{oldcore/118 => core/155}/filelists/lz4 | 0 .../{oldcore/110 => core/155}/filelists/qpdf | 0 lfs/lcms2 | 4 +-- lfs/lz4 | 6 ++-- lfs/lzo | 4 +-- lfs/mpage | 4 +-- lfs/qpdf | 4 +-- src/patches/lz4-1.8.1.2_mod_install_path.patch | 36 ---------------------- ...path.patch => lz4-1.9.3_mod_install_path.patch} | 14 ++++----- src/patches/mpage25-config.patch | 16 +++++----- 15 files changed, 34 insertions(+), 67 deletions(-) copy config/rootfiles/{oldcore/110 => core/155}/filelists/lcms2 (100%) copy config/rootfiles/{oldcore/118 => core/155}/filelists/lz4 (100%) copy config/rootfiles/{oldcore/110 => core/155}/filelists/qpdf (100%) delete mode 100644 src/patches/lz4-1.8.1.2_mod_install_path.patch rename src/patches/{lz4-1.9.2_mod_install_path.patch => lz4-1.9.3_mod_install_path.patch} (61%)

Difference in files: diff --git a/config/rootfiles/common/lcms2 b/config/rootfiles/common/lcms2 index 2ea591550..5a7d2f276 100644 --- a/config/rootfiles/common/lcms2 +++ b/config/rootfiles/common/lcms2 @@ -5,11 +5,13 @@ #usr/bin/transicc #usr/include/lcms2.h #usr/include/lcms2_plugin.h -#usr/lib/liblcms2.a #usr/lib/liblcms2.la #usr/lib/liblcms2.so usr/lib/liblcms2.so.2 -usr/lib/liblcms2.so.2.0.8 +usr/lib/liblcms2.so.2.0.12 #usr/lib/pkgconfig/lcms2.pc #usr/share/man/man1/jpgicc.1 +#usr/share/man/man1/linkicc.1 +#usr/share/man/man1/psicc.1 #usr/share/man/man1/tificc.1 +#usr/share/man/man1/transicc.1 diff --git a/config/rootfiles/common/lz4 b/config/rootfiles/common/lz4 index ab03c65f7..9a8abcd2b 100644 --- a/config/rootfiles/common/lz4 +++ b/config/rootfiles/common/lz4 @@ -9,7 +9,7 @@ usr/bin/lz4 #usr/lib/liblz4.a #usr/lib/liblz4.so usr/lib/liblz4.so.1 -usr/lib/liblz4.so.1.9.2 +usr/lib/liblz4.so.1.9.3 #usr/lib/pkgconfig/liblz4.pc #usr/share/man/man1/lz4.1 #usr/share/man/man1/lz4c.1 diff --git a/config/rootfiles/common/lzo b/config/rootfiles/common/lzo index 4ebc05cdb..92e7327ca 100644 --- a/config/rootfiles/common/lzo +++ b/config/rootfiles/common/lzo @@ -16,6 +16,7 @@ usr/lib/liblzo2.so usr/lib/liblzo2.so.2 usr/lib/liblzo2.so.2.0.0 +#usr/lib/pkgconfig/lzo2.pc #usr/share/doc/lzo-2.09 #usr/share/doc/lzo-2.09/AUTHORS #usr/share/doc/lzo-2.09/COPYING diff --git a/config/rootfiles/common/qpdf b/config/rootfiles/common/qpdf index 9f6d18ee6..581ba243f 100644 --- a/config/rootfiles/common/qpdf +++ b/config/rootfiles/common/qpdf @@ -41,6 +41,7 @@ usr/bin/qpdf #usr/include/qpdf/QPDFPageDocumentHelper.hh #usr/include/qpdf/QPDFPageLabelDocumentHelper.hh #usr/include/qpdf/QPDFPageObjectHelper.hh +#usr/include/qpdf/QPDFStreamFilter.hh #usr/include/qpdf/QPDFSystemError.hh #usr/include/qpdf/QPDFTokenizer.hh #usr/include/qpdf/QPDFWriter.hh @@ -50,11 +51,10 @@ usr/bin/qpdf #usr/include/qpdf/RandomDataProvider.hh #usr/include/qpdf/Types.h #usr/include/qpdf/qpdf-c.h -#usr/lib/libqpdf.a #usr/lib/libqpdf.la #usr/lib/libqpdf.so usr/lib/libqpdf.so.28 -usr/lib/libqpdf.so.28.0.1 +usr/lib/libqpdf.so.28.1.0 #usr/lib/pkgconfig/libqpdf.pc #usr/share/doc/qpdf #usr/share/doc/qpdf/qpdf-manual.html diff --git a/config/rootfiles/core/155/filelists/lcms2 b/config/rootfiles/core/155/filelists/lcms2 new file mode 120000 index 000000000..f72a39451 --- /dev/null +++ b/config/rootfiles/core/155/filelists/lcms2 @@ -0,0 +1 @@ +../../../common/lcms2 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/lz4 b/config/rootfiles/core/155/filelists/lz4 new file mode 120000 index 000000000..65c31802e --- /dev/null +++ b/config/rootfiles/core/155/filelists/lz4 @@ -0,0 +1 @@ +../../../common/lz4 \ No newline at end of file diff --git a/config/rootfiles/core/155/filelists/qpdf b/config/rootfiles/core/155/filelists/qpdf new file mode 120000 index 000000000..2d6c43dec --- /dev/null +++ b/config/rootfiles/core/155/filelists/qpdf @@ -0,0 +1 @@ +../../../common/qpdf \ No newline at end of file diff --git a/lfs/lcms2 b/lfs/lcms2 index d3173f3ff..d4c01cbac 100644 --- a/lfs/lcms2 +++ b/lfs/lcms2 @@ -24,7 +24,7 @@

include Config

-VER = 2.9 +VER = 2.12

THISAPP = lcms2-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 8de1b7724f578d2995c8fdfa35c3ad0e +$(DL_FILE)_MD5 = 8cb583c8447461896320b43ea9a688e0

install : $(TARGET)

diff --git a/lfs/lz4 b/lfs/lz4 index 17b10cfed..b09191c5e 100644 --- a/lfs/lz4 +++ b/lfs/lz4 @@ -24,7 +24,7 @@

include Config

-VER = 1.9.2 +VER = 1.9.3

THISAPP = lz4-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 3898c56c82fb3d9455aefd48db48eaad +$(DL_FILE)_MD5 = 3a1ab1684e14fc1afc66228ce61b2db3

install : $(TARGET)

@@ -74,7 +74,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.2_mod_install_path.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lz4-1.9.3_mod_install_path.patch

cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/lzo b/lfs/lzo index 58f25577d..93fe66d5c 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -24,7 +24,7 @@

include Config

-VER = 2.09 +VER = 2.10

THISAPP = lzo-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = c7ffc9a103afe2d1bba0b015e7aa887f +$(DL_FILE)_MD5 = 39d3f3f9c55c87b1e5d6888e1420f4b5

install : $(TARGET)

diff --git a/lfs/mpage b/lfs/mpage index 55a1eac65..e4376619c 100644 --- a/lfs/mpage +++ b/lfs/mpage @@ -24,7 +24,7 @@

include Config

-VER = 2.5.6 +VER = 2.5.7

THISAPP = mpage-$(VER) DL_FILE = $(THISAPP).tgz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 489663c9246e47915cea931348e5175d +$(DL_FILE)_MD5 = 8d94338445345a554fd3bc664d48525a

install : $(TARGET)

diff --git a/lfs/qpdf b/lfs/qpdf index 600454bc3..af934c647 100644 --- a/lfs/qpdf +++ b/lfs/qpdf @@ -24,7 +24,7 @@

include Config

-VER = 10.0.1 +VER = 10.1.0

THISAPP = qpdf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = eb7fb7c6cd5d3036bf4f7a5e3f44d995 +$(DL_FILE)_MD5 = 6d72264ff68a9807418af4d7fc613e95

install : $(TARGET)

diff --git a/src/patches/lz4-1.8.1.2_mod_install_path.patch b/src/patches/lz4-1.8.1.2_mod_install_path.patch deleted file mode 100644 index 8b9646e1c..000000000 --- a/src/patches/lz4-1.8.1.2_mod_install_path.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Nur lz4-1.8.1.2.orig/lib/Makefile lz4-1.8.1.2/lib/Makefile ---- lz4-1.8.1.2.orig/lib/Makefile 2018-01-21 07:24:41.881357925 +0000 -+++ lz4-1.8.1.2/lib/Makefile 2018-01-21 07:25:44.823444081 +0000 -@@ -120,7 +120,7 @@ - # directory variables : GNU conventions prefer lowercase - # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html - # support both lower and uppercase (BSD), use uppercase in script --prefix ?= /usr/local -+prefix ?= /usr - PREFIX ?= $(prefix) - exec_prefix ?= $(PREFIX) - libdir ?= $(exec_prefix)/lib -diff -Nur lz4-1.8.1.2.orig/NEWS lz4-1.8.1.2/NEWS ---- lz4-1.8.1.2.orig/NEWS 2018-01-21 07:24:41.809360114 +0000 -+++ lz4-1.8.1.2/NEWS 2018-01-21 07:26:00.838957106 +0000 -@@ -96,7 +96,7 @@ - New : lz4 cli supports long commands (suggested by Takayuki Matsuoka) - New : lz4frame & lz4cli frame content size support - New : lz4frame supports skippable frames, as requested by Sergey Cherepanov --Changed: Default "make install" directory is /usr/local, as notified by Ron Johnson -+Changed: Default "make install" directory is /usr, as notified by Ron Johnson - New : lz4 cli supports "pass-through" mode, requested by Neil Wilson - New : datagen can generate sparse files - New : scan-build tests, thanks to kind help by Takayuki Matsuoka -diff -Nur lz4-1.8.1.2.orig/programs/Makefile lz4-1.8.1.2/programs/Makefile ---- lz4-1.8.1.2.orig/programs/Makefile 2018-01-21 07:24:41.881357925 +0000 -+++ lz4-1.8.1.2/programs/Makefile 2018-01-21 07:26:24.562235766 +0000 -@@ -121,7 +121,7 @@ - # directory variables : GNU conventions prefer lowercase - # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html - # support both lower and uppercase (BSD), use uppercase in script --prefix ?= /usr/local -+prefix ?= /usr - PREFIX ?= $(prefix) - exec_prefix ?= $(PREFIX) - bindir ?= $(exec_prefix)/bin diff --git a/src/patches/lz4-1.9.2_mod_install_path.patch b/src/patches/lz4-1.9.3_mod_install_path.patch similarity index 61% rename from src/patches/lz4-1.9.2_mod_install_path.patch rename to src/patches/lz4-1.9.3_mod_install_path.patch index 2eee0462e..3b674c4d8 100644 --- a/src/patches/lz4-1.9.2_mod_install_path.patch +++ b/src/patches/lz4-1.9.3_mod_install_path.patch @@ -1,6 +1,6 @@ -diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile ---- lz4-1.9.2.orig/lib/Makefile 2019-10-29 08:14:03.167415441 +0000 -+++ lz4-1.9.2/lib/Makefile 2019-10-29 08:14:43.243864994 +0000 +diff -au lz4-1.9.3/lib/Makefile.orig lz4-1.9.3/lib/Makefile +--- lz4-1.9.3/lib/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 ++++ lz4-1.9.3/lib/Makefile 2021-02-08 13:05:10.478443593 +0100 @@ -144,7 +144,7 @@ # directory variables : GNU conventions prefer lowercase # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html @@ -10,10 +10,10 @@ diff -Nur lz4-1.9.2.orig/lib/Makefile lz4-1.9.2/lib/Makefile prefix ?= $(PREFIX) EXEC_PREFIX ?= $(prefix) exec_prefix ?= $(EXEC_PREFIX) -diff -Nur lz4-1.9.2.orig/programs/Makefile lz4-1.9.2/programs/Makefile ---- lz4-1.9.2.orig/programs/Makefile 2019-10-29 08:14:03.177415386 +0000 -+++ lz4-1.9.2/programs/Makefile 2019-10-29 08:14:30.267268628 +0000 -@@ -132,7 +132,7 @@ +diff -au lz4-1.9.3/programs/Makefile.orig lz4-1.9.3/programs/Makefile +--- lz4-1.9.3/programs/Makefile.orig 2020-11-16 05:59:35.000000000 +0100 ++++ lz4-1.9.3/programs/Makefile 2021-02-08 13:05:55.475676260 +0100 +@@ -146,7 +146,7 @@ # directory variables : GNU conventions prefer lowercase # see https://www.gnu.org/prep/standards/html_node/Makefile-Conventions.html # support both lower and uppercase (BSD), use lowercase in script diff --git a/src/patches/mpage25-config.patch b/src/patches/mpage25-config.patch index fefc54766..55bf34caf 100644 --- a/src/patches/mpage25-config.patch +++ b/src/patches/mpage25-config.patch @@ -1,7 +1,7 @@ -diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile ---- mpage-2.5.6/Makefile.config 2004-05-30 21:38:31.000000000 +0200 -+++ mpage-2.5.6/Makefile 2009-03-27 11:11:14.652186064 +0100 -@@ -40,7 +40,7 @@ CC=gcc +diff -aup mpage-2.5.7/Makefile.orig mpage-2.5.7/Makefile +--- mpage-2.5.7/Makefile.orig 2017-06-28 10:07:41.000000000 +0200 ++++ mpage-2.5.7/Makefile 2021-02-08 13:35:23.219223469 +0100 +@@ -48,7 +48,7 @@ CC=gcc # See glob.c for all possibilities # # PAGESIZE=Letter @@ -10,7 +10,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile

# # Define your spooler type -@@ -50,7 +50,7 @@ PAGESIZE=A4 +@@ -58,7 +58,7 @@ PAGESIZE=A4 SPOOL_TYPE=BSD_SPOOLER

# PREFIX=e:/usr # OS/2 type @@ -19,7 +19,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile #PREFIX=/usr BINDIR=$(PREFIX)/bin LIBDIR=$(PREFIX)/share -@@ -73,7 +73,7 @@ SHEETMARGIN=18 +@@ -81,7 +81,7 @@ SHEETMARGIN=18 # DEFAULT_DUPLEX=0

@@ -28,7 +28,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile

############################################################################ -@@ -107,7 +107,7 @@ O = .o +@@ -115,7 +115,7 @@ O = .o # If you are using gcc, you probably don't need to change anything here.

# Linux: @@ -37,7 +37,7 @@ diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile

# AIX (xlC on aix 4): #CFLAGS = -O2 -s $(DEFS) -@@ -183,5 +183,4 @@ install: +@@ -191,5 +191,4 @@ install: if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi cp mpage$(E) $(BINDIR) cp mpage.1 $(MANDIR)

hooks/post-receive -- IPFire 2.x development tree