diff --git a/.checkpackageignore b/.checkpackageignore index ef1c661812..0735b0c5da 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -459,7 +459,6 @@ package/genromfs/0001-build-system.patch Sob Upstream package/gensio/0001-Fix-missing-EVP_PKEY_ED25519-build-error-on-libressl.patch Upstream package/gerbera/S99gerbera Indent package/giblib/0001-fix-imlib2-detection.patch Upstream -package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch Upstream package/git-crypt/0001-fix-build-with-libressl-3.5.0.patch Upstream package/glorytun/0001-Add-support-for-Apple-silicon.patch Upstream package/glorytun/0002-aegis256.c-fix-aarch64-build-with-uclibc.patch Upstream diff --git a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch index 384457d0bd..ba8d426bea 100644 --- a/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch +++ b/package/giflib/0001-Makefile-add-targets-to-manage-static-building.patch @@ -8,8 +8,7 @@ targets to allow the user to build giflib when dynamic library support is not available or enable on the toolchain Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/giflib/code/merge-requests/7] +Upstream: https://sourceforge.net/p/giflib/code/merge-requests/7 --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) @@ -18,16 +17,19 @@ diff --git a/Makefile b/Makefile index b2bf6de..111f52f 100644 --- a/Makefile +++ b/Makefile -@@ -61,10 +61,17 @@ UTILS = $(INSTALLABLE) \ +@@ -91,13 +91,20 @@ LIBUTILSO = libutil.$(SOEXTENSION) + LIBUTILSOMAJOR = libutil.$(LIBMAJOR).$(SOEXTENSION) + endif - LDLIBS=libgif.a -lm - --all: libgif.so libgif.a libutil.so libutil.a $(UTILS) -+SHARED_LIBS = libgif.so libutil.so +-all: $(LIBGIFSO) libgif.a $(LIBUTILSO) libutil.a $(UTILS) ++SHARED_LIBS = $(LIBGIFSO) $(LIBUTILSO) +STATIC_LIBS = libgif.a libutil.a + +all: shared-lib static-lib $(UTILS) + ifeq ($(UNAME), Darwin) + else $(MAKE) -C doc + endif -$(UTILS):: libgif.a libutil.a +$(UTILS):: $(STATIC_LIBS) @@ -36,18 +38,18 @@ index b2bf6de..111f52f 100644 + +static-lib: $(STATIC_LIBS) - libgif.so: $(OBJECTS) $(HEADERS) - $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,libgif.so.$(LIBMAJOR) -o libgif.so $(OBJECTS) -@@ -79,7 +86,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) + $(LIBGIFSO): $(OBJECTS) $(HEADERS) + ifeq ($(UNAME), Darwin) +@@ -120,7 +127,7 @@ libutil.a: $(UOBJECTS) $(UHEADERS) $(AR) rcs libutil.a $(UOBJECTS) clean: -- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a libgif.so libutil.a libutil.so *.o +- rm -f $(UTILS) $(TARGET) libgetarg.a libgif.a $(LIBGIFSO) libutil.a $(LIBUTILSO) *.o + rm -f $(UTILS) $(TARGET) libgetarg.a $(SHARED_LIBS) $(STATIC_LIBS) *.o - rm -f libgif.so.$(LIBMAJOR).$(LIBMINOR).$(LIBPOINT) - rm -f libgif.so.$(LIBMAJOR) - rm -fr doc/*.1 *.html doc/staging -@@ -96,12 +103,15 @@ install-bin: $(INSTALLABLE) + rm -f $(LIBGIFSOVER) + rm -f $(LIBGIFSOMAJOR) + rm -fr doc/*.[17] *.html doc/staging +@@ -145,12 +152,15 @@ install-bin: $(INSTALLABLE) install-include: $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 644 gif_lib.h "$(DESTDIR)$(INCDIR)" @@ -57,13 +59,13 @@ index b2bf6de..111f52f 100644 $(INSTALL) -m 644 libgif.a "$(DESTDIR)$(LIBDIR)/libgif.a" +install-shared-lib: + $(INSTALL) -d "$(DESTDIR)$(LIBDIR)" - $(INSTALL) -m 755 libgif.so "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBVER)" - ln -sf libgif.so.$(LIBVER) "$(DESTDIR)$(LIBDIR)/libgif.so.$(LIBMAJOR)" - ln -sf libgif.so.$(LIBMAJOR) "$(DESTDIR)$(LIBDIR)/libgif.so" + $(INSTALL) -m 755 $(LIBGIFSO) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOVER)" + ln -sf $(LIBGIFSOVER) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSOMAJOR)" + ln -sf $(LIBGIFSOMAJOR) "$(DESTDIR)$(LIBDIR)/$(LIBGIFSO)" +install-lib: install-static-lib install-shared-lib install-man: - $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" - $(INSTALL) -m 644 doc/*.1 "$(DESTDIR)$(MANDIR)/man1" + $(INSTALL) -d "$(DESTDIR)$(MANDIR)/man1" "$(DESTDIR)$(MANDIR)/man7" + $(INSTALL) -m 644 $(MANUAL_PAGES_1:xml=1) "$(DESTDIR)$(MANDIR)/man1" -- -2.20.1 +2.43.0 diff --git a/package/giflib/0002-Fix-CVE-2022-28506.patch b/package/giflib/0002-Fix-CVE-2022-28506.patch deleted file mode 100644 index 35d5f60a95..0000000000 --- a/package/giflib/0002-Fix-CVE-2022-28506.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c0cca041fc4fb6748d8dff3675fe7a839253d668 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:24:32 -0700 -Subject: [PATCH] Fix CVE-2022-28506 - -From: giflib-5.2.1-17.fc39.src.rpm -Fixes https://nvd.nist.gov/vuln/detail/CVE-2022-28506 -Upstream: https://sourceforge.net/p/giflib/bugs/159/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gif2rgb.c b/gif2rgb.c -index 8d7c0ff..d9a469f 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -294,6 +294,11 @@ static void DumpScreen2RGB(char *FileName, int OneFileFlag, - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0, BufferP = Buffer; j < ScreenWidth; j++) { -+ /* Check if color is within color palete */ -+ if (GifRow[j] >= ColorMap->ColorCount) -+ { -+ GIF_EXIT(GifErrorString(D_GIF_ERR_IMAGE_DEFECT)); -+ } - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - *BufferP++ = ColorMapEntry->Red; - *BufferP++ = ColorMapEntry->Green; --- -2.43.0 - diff --git a/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch new file mode 100644 index 0000000000..f6816d0753 --- /dev/null +++ b/package/giflib/0002-Fix-several-defects-found-by-Coverity-scan.patch @@ -0,0 +1,59 @@ +From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 +From: Sandro Mani +Date: Tue, 5 Dec 2023 16:38:48 -0700 +Subject: [PATCH] Fix several defects found by Coverity scan + +From: giflib-5.2.1-17.fc39.src.rpm +Upstream: Not submitted + +Signed-off-by: Sandro Mani +Signed-off-by: Adam Duskett +[Fabrice: updated for 5.2.2] +Signed-off-by: Fabrice Fontaine +--- + gif2rgb.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/gif2rgb.c b/gif2rgb.c +index d9a469f..02cea41 100644 +--- a/gif2rgb.c ++++ b/gif2rgb.c +@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, + /* Open stdout for the output file: */ + if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, + EGifPutImageDesc(GifFile, 0, 0, Width, Height, false, NULL) == + GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + +@@ -187,6 +191,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + for (i = 0; i < Height; i++) { + if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + GifQprintf("\b\b\b\b%-4d", Height - i - 1); +@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, + + if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { + PrintGifError(Error); ++ free(OutputBuffer); ++ GifFreeMapObject(OutputColorMap); + exit(EXIT_FAILURE); + } + } +-- +2.43.0 + diff --git a/package/giflib/0003-Fix-CVE-2023-39742.patch b/package/giflib/0003-Fix-CVE-2023-39742.patch deleted file mode 100644 index 2ba01ac8a4..0000000000 --- a/package/giflib/0003-Fix-CVE-2023-39742.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4288b993ee9df6550a367fe06ede3c003dc7bbc6 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:35:40 -0700 -Subject: [PATCH] Fix CVE-2023-39742 - -From: giflib-5.2.1-17.fc39.src.rpm -Fix segmentation faults due to non correct checking for args -Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-39742 -Upstream: https://sourceforge.net/p/giflib/bugs/166/ - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - getarg.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/getarg.c b/getarg.c -index d569f6c..51fbe0b 100644 ---- a/getarg.c -+++ b/getarg.c -@@ -307,6 +307,12 @@ GAGetParmeters(void *Parameters[], - int i = 0, ScanRes; - - while (!(ISSPACE(CtrlStrCopy[i]))) { -+ -+ if ((*argv) == argv_end) { -+ GAErrorToken = Option; -+ return CMD_ERR_NumRead; -+ } -+ - switch (CtrlStrCopy[i + 1]) { - case 'd': /* Get signed integers. */ - ScanRes = sscanf(*((*argv)++), "%d", --- -2.43.0 - diff --git a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch b/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch deleted file mode 100644 index 1719769872..0000000000 --- a/package/giflib/0004-Fix-several-defects-found-by-Coverity-scan.patch +++ /dev/null @@ -1,61 +0,0 @@ -From a1c48b91cd1cf1e9bf7077709b69f4bfd4c4abc7 Mon Sep 17 00:00:00 2001 -From: Sandro Mani -Date: Tue, 5 Dec 2023 16:38:48 -0700 -Subject: [PATCH] Fix several defects found by Coverity scan - -From: giflib-5.2.1-17.fc39.src.rpm -Upstream: Not submitted - -Signed-off-by: Sandro Mani -Signed-off-by: Adam Duskett ---- - gif2rgb.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/gif2rgb.c b/gif2rgb.c -index d9a469f..02cea41 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -170,6 +170,8 @@ static void SaveGif(GifByteType *OutputBuffer, - /* Open stdout for the output file: */ - if ((GifFile = EGifOpenFileHandle(1, &Error)) == NULL) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -179,6 +181,8 @@ static void SaveGif(GifByteType *OutputBuffer, - EGifPutImageDesc(GifFile, - 0, 0, Width, Height, false, NULL) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - -@@ -187,8 +191,11 @@ static void SaveGif(GifByteType *OutputBuffer, - GifFile->Image.Width, GifFile->Image.Height); - - for (i = 0; i < Height; i++) { -- if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) -+ if (EGifPutLine(GifFile, Ptr, Width) == GIF_ERROR) { -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); -+ } - GifQprintf("\b\b\b\b%-4d", Height - i - 1); - - Ptr += Width; -@@ -196,6 +203,8 @@ static void SaveGif(GifByteType *OutputBuffer, - - if (EGifCloseFile(GifFile, &Error) == GIF_ERROR) { - PrintGifError(Error); -+ free(OutputBuffer); -+ GifFreeMapObject(OutputColorMap); - exit(EXIT_FAILURE); - } - } --- -2.43.0 - diff --git a/package/giflib/giflib.hash b/package/giflib/giflib.hash index 445e9c4b3d..f11d4f1505 100644 --- a/package/giflib/giflib.hash +++ b/package/giflib/giflib.hash @@ -1,5 +1,6 @@ # From http://sourceforge.net/projects/giflib/files -md5 6f03aee4ebe54ac2cc1ab3e4b0a049e5 giflib-5.2.1.tar.gz -sha1 c3f774dcbdf26afded7788979c8081d33c6426dc giflib-5.2.1.tar.gz +md5 913dd251492134e235ee3c9a91987a4d giflib-5.2.2.tar.gz +sha1 608ba98d2dd8d03dfa7476f434d57de50a33e10b giflib-5.2.2.tar.gz # Locally computed +sha256 be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb giflib-5.2.2.tar.gz sha256 0c9b7990ecdca88b676db232c226548ac408b279f550d424d996f0d83591dd8e COPYING diff --git a/package/giflib/giflib.mk b/package/giflib/giflib.mk index 3ac74f9244..770338507b 100644 --- a/package/giflib/giflib.mk +++ b/package/giflib/giflib.mk @@ -4,18 +4,13 @@ # ################################################################################ -GIFLIB_VERSION = 5.2.1 +GIFLIB_VERSION = 5.2.2 GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib GIFLIB_INSTALL_STAGING = YES GIFLIB_LICENSE = MIT GIFLIB_LICENSE_FILES = COPYING GIFLIB_CPE_ID_VALID = YES -# 0002-Fix-CVE-2022-28506.patch -GIFLIB_IGNORE_CVES = CVE-2022-28506 -# 0003-Fix-CVE-2023-39742.patch -GIFLIB_IGNORE_CVES += CVE-2023-39742 - ifeq ($(BR2_STATIC_LIBS),y) GIFLIB_BUILD_LIBS = static-lib GIFLIB_INSTALL_LIBS = install-static-lib