diff options
Diffstat (limited to 'legacy')
| -rw-r--r-- | legacy/heimdal/CVE-2017-17439.patch | 45 | ||||
| -rw-r--r-- | legacy/kalarmcal/build-with-kf5-kholidays.patch | 11 | ||||
| -rw-r--r-- | legacy/libvpx/libm-pc.patch | 11 | ||||
| -rw-r--r-- | legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch | 84 | ||||
| -rw-r--r-- | legacy/telegram/rlottie.patch | 16 |
5 files changed, 0 insertions, 167 deletions
diff --git a/legacy/heimdal/CVE-2017-17439.patch b/legacy/heimdal/CVE-2017-17439.patch deleted file mode 100644 index 8c3273971..000000000 --- a/legacy/heimdal/CVE-2017-17439.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 749d377fa357351a7bbba51f8aae72cdf0629592 Mon Sep 17 00:00:00 2001 -From: Viktor Dukhovni <viktor@twosigma.com> -Date: Tue, 5 Dec 2017 18:49:50 -0500 -Subject: [PATCH] Security: Avoid NULL structure pointer member dereference - -This can happen in the error path when processing malformed AS -requests with a NULL client name. Bug originally introduced on -Fri Feb 13 09:26:01 2015 +0100 in commit: - - a873e21d7c06f22943a90a41dc733ae76799390d - - kdc: base _kdc_fast_mk_error() on krb5_mk_error_ext() - -Original patch by Jeffrey Altman <jaltman@secure-endpoints.com> - -(cherry picked from commit 1a6a6e462dc2ac6111f9e02c6852ddec4849b887) ---- - kdc/kerberos5.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/kdc/kerberos5.c b/kdc/kerberos5.c -index 95a74927f7..675b406b82 100644 ---- a/kdc/kerberos5.c -+++ b/kdc/kerberos5.c -@@ -2226,15 +2226,17 @@ _kdc_as_rep(kdc_request_t r, - /* - * In case of a non proxy error, build an error message. - */ -- if(ret != 0 && ret != HDB_ERR_NOT_FOUND_HERE && reply->length == 0) { -+ if (ret != 0 && ret != HDB_ERR_NOT_FOUND_HERE && reply->length == 0) { - ret = _kdc_fast_mk_error(context, r, - &error_method, - r->armor_crypto, - &req->req_body, - ret, r->e_text, - r->server_princ, -- &r->client_princ->name, -- &r->client_princ->realm, -+ r->client_princ ? -+ &r->client_princ->name : NULL, -+ r->client_princ ? -+ &r->client_princ->realm : NULL, - NULL, NULL, - reply); - if (ret) diff --git a/legacy/kalarmcal/build-with-kf5-kholidays.patch b/legacy/kalarmcal/build-with-kf5-kholidays.patch deleted file mode 100644 index 0d5bd88f8..000000000 --- a/legacy/kalarmcal/build-with-kf5-kholidays.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kalarmcal-17.12.2/CMakeLists.txt.old 2018-02-06 00:37:47.000000000 +0000 -+++ kalarmcal-17.12.2/CMakeLists.txt 2018-03-04 22:17:25.340681117 +0000 -@@ -26,7 +26,7 @@ - set(KALARM_LIB_VERSION ${PIM_VERSION}) - - set(CALENDARCORE_LIB_VERSION "5.7.2") --set(HOLIDAY_LIB_VERSION "5.7.2") -+set(HOLIDAY_LIB_VERSION "5.6.2") - set(IDENTITYMANAGER_LIB_VERSION "5.7.2") - set(AKONADI_LIB_VERSION "5.7.2") - ecm_setup_version(PROJECT VARIABLE_PREFIX KALARMCAL diff --git a/legacy/libvpx/libm-pc.patch b/legacy/libvpx/libm-pc.patch deleted file mode 100644 index 87f07a398..000000000 --- a/legacy/libvpx/libm-pc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./libs.mk.orig -+++ ./libs.mk -@@ -241,7 +241,7 @@ - $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@ - $(qexec)echo 'Requires:' >> $@ - $(qexec)echo 'Conflicts:' >> $@ -- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@ -+ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@ - $(qexec)echo 'Cflags: -I$${includedir}' >> $@ - INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc - INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc diff --git a/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch b/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch deleted file mode 100644 index 26f89bb54..000000000 --- a/legacy/openjdk7/icedtea-jdk-no-lib-nsl-uclibc.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- openjdk.orig/hotspot/agent/src/os/solaris/dbx/Makefile -+++ openjdk/hotspot/agent/src/os/solaris/dbx/Makefile -@@ -50,7 +50,7 @@ - CFLAGS_32bit := -xarch=v8 - CFLAGS_64bit := -xarch=v9 - CFLAGS := -PIC -xO3 $(INCLUDES) --LIBS := -lsocket -lnsl -lrtld_db -+LIBS := -lsocket -lrtld_db - LDFLAGS := -G - - ifneq "$(ARCH)" "i486" ---- openjdk.orig/jdk/make/java/hpi/hpi_common.gmk -+++ openjdk/jdk/make/java/hpi/hpi_common.gmk -@@ -86,5 +86,5 @@ - # Things that must be linked in. - # - ifneq ($(PLATFORM), windows) --OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl -+OTHER_LDLIBS += $(LIBSOCKET) $(LIBM) -ldl - endif ---- openjdk.orig/jdk/make/java/java/Makefile -+++ openjdk/jdk/make/java/java/Makefile -@@ -205,7 +205,7 @@ - OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \ - -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib - else --OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \ -+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -ldl \ - -L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH) - endif - ---- openjdk.orig/jdk/make/java/java_hprof_demo/Makefile -+++ openjdk/jdk/make/java/java_hprof_demo/Makefile -@@ -83,7 +83,7 @@ - ifeq ($(PLATFORM), windows) - OTHER_LDLIBS += wsock32.lib winmm.lib - else -- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -+ OTHER_LDLIBS += $(LIBSOCKET) -ldl - endif - - # ---- openjdk.orig/jdk/make/java/net/Makefile -+++ openjdk/jdk/make/java/net/Makefile -@@ -97,7 +97,7 @@ - # Will not compile at warning level 3 if warnings are fatal - COMPILER_WARNINGS_FATAL=false - else -- OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB) -+ OTHER_LDLIBS = $(LIBSOCKET) -ldl $(JVMLIB) - endif - ifeq ($(PLATFORM), linux) - OTHER_LDLIBS += -lpthread ---- openjdk.orig/jdk/make/jpda/transport/socket/Makefile -+++ openjdk/jdk/make/jpda/transport/socket/Makefile -@@ -42,11 +42,11 @@ - endif - - ifeq ($(PLATFORM), linux) -- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread -+ OTHER_LDLIBS += $(LIBSOCKET) -lpthread - endif - - ifeq ($(PLATFORM), solaris) -- OTHER_LDLIBS += -lnsl $(LIBSOCKET) -+ OTHER_LDLIBS += $(LIBSOCKET) - endif - - ifeq ($(PLATFORM), windows) ---- openjdk.orig/jdk/make/mkdemo/jvmti/hprof/Makefile -+++ openjdk/jdk/make/mkdemo/jvmti/hprof/Makefile -@@ -39,10 +39,10 @@ - EXTRA_LIBS += wsock32.lib winmm.lib - endif - ifeq ($(PLATFORM), solaris) -- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -+ OTHER_LDLIBS += $(LIBSOCKET) -ldl - endif - ifeq ($(PLATFORM), linux) -- OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread -+ OTHER_LDLIBS += $(LIBSOCKET) -ldl -lpthread - endif - - # diff --git a/legacy/telegram/rlottie.patch b/legacy/telegram/rlottie.patch deleted file mode 100644 index 6bd2ff6c3..000000000 --- a/legacy/telegram/rlottie.patch +++ /dev/null @@ -1,16 +0,0 @@ -No CMake config exists for rlottie; use pkgconf instead. - ---- a/cmake/external/rlottie/CMakeLists.txt 2020-01-17 18:21:17.000000000 +0100 -+++ b/cmake/external/rlottie/CMakeLists.txt 2020-01-18 00:37:40.280438388 +0100 -@@ -8,8 +8,9 @@ - add_library(external_rlottie INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_rlottie ALIAS external_rlottie) - -- find_package(rlottie REQUIRED) -- target_link_libraries(external_rlottie INTERFACE rlottie::rlottie) -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(RLOTTIE REQUIRED rlottie) -+ target_link_libraries(external_rlottie INTERFACE ${RLOTTIE_LIBRARIES}) - else() - add_library(external_rlottie OBJECT) - add_library(desktop-app::external_rlottie ALIAS external_rlottie) |