diff --git a/.checkpackageignore b/.checkpackageignore index 11f9e2384a..494de2a880 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -462,7 +462,6 @@ package/irqbalance/S13irqbalance Shellcheck lib_sysv.Indent lib_sysv.Variables package/irrlicht/0001-override-CPPFLAGS-CXXFLAGS-and-CFLAGS-in-Makefile.patch lib_patch.Upstream package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch lib_patch.Upstream package/iucode-tool/S00iucode-tool lib_sysv.Variables -package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream package/keyutils/0001-fix-install-rule.patch lib_patch.Upstream package/keyutils/0002-cifs.patch lib_patch.Sob lib_patch.Upstream diff --git a/package/janus-gateway/0001-disable-ssp.patch b/package/janus-gateway/0001-disable-ssp.patch index 0c9b006ed9..6d3d8f6ccd 100644 --- a/package/janus-gateway/0001-disable-ssp.patch +++ b/package/janus-gateway/0001-disable-ssp.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Do not force SSP usage The toolchain may not support SSP, so do not enforce its usage, let the package user pass the appropriate CFLAGS to enable SSP if needed. +Upstream: https://github.com/meetecho/janus-gateway/pull/1801 (rejected) + Signed-off-by: Gregory Dymarek Signed-off-by: Thomas Petazzoni -(rebased against v0.1.0) -Signed-off-by: Bernd Kuhls +(rebased against v1.4.1) +Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett -[Upstream status: rejected -(https://github.com/meetecho/janus-gateway/pull/1801)] --- configure.ac | 1 - 1 file changed, 1 deletion(-) @@ -22,14 +22,14 @@ diff --git a/configure.ac b/configure.ac index 257ea8c..ca17a29 100644 --- a/configure.ac +++ b/configure.ac -@@ -20,7 +20,6 @@ LT_INIT +@@ -19,7 +19,6 @@ LT_INIT # Common CFLAGS CFLAGS="$CFLAGS \ -fPIC \ - -fstack-protector-all \ -fstrict-aliasing \ - -ggdb3 \ -pthread \ + -Wall \ -- 2.20.1 diff --git a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch index 4596577af3..7905bb8bf2 100644 --- a/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ b/package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch @@ -14,8 +14,8 @@ and uses it to detect if the -Wunused-but-set-variable option is supported, and only uses it in this case. Signed-off-by: Thomas Petazzoni -(rebased against v0.1.0) -Signed-off-by: Bernd Kuhls +(rebased against v1.4.1) +Signed-off-by: Bernd Kuhls (rebased against v0.6.3) Signed-off-by: Adam Duskett [rebased against v1.0.3) @@ -35,7 +35,7 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 96d361e53be0..a8bfd17c930c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -132,6 +132,7 @@ janus_CFLAGS = \ +@@ -134,6 +134,7 @@ janus_CFLAGS = \ -DEVENTDIR=\"$(eventdir)\" \ -DLOGGERDIR=\"$(loggerdir)\" \ -DCONFDIR=\"$(confdir)\" \ @@ -57,16 +57,16 @@ index c37c85b7ab06..5afe0ef0bbff 100644 LT_PREREQ([2.2]) LT_INIT -@@ -65,8 +68,7 @@ cc*) +@@ -63,8 +66,7 @@ cc*) + # Specific gcc flags CFLAGS="$CFLAGS \ - -Wcast-align \ -Wno-override-init \ - -Wunsafe-loop-optimizations \ - -Wunused-but-set-variable" + -Wunsafe-loop-optimizations" esac - JANUS_VERSION=1102 + JANUS_VERSION=1401 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash index a147a8afff..2683b32356 100644 --- a/package/janus-gateway/janus-gateway.hash +++ b/package/janus-gateway/janus-gateway.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f721d62a22b38ba3a341a5502f06b8b3a5a4f7bd0e9cc6c53de257fe99695e17 janus-gateway-1.1.2.tar.gz +sha256 cba1e7aac44f4458701c5e14698e791a0eee13ecacbdacc71b4245716c442c08 janus-gateway-1.4.1.tar.gz sha256 91d04c97fa1da3fcd28205873276358aafc071c5b00a9ea8c49dd06d487a9dc6 COPYING diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk index 0b4db458f6..0c10cd751a 100644 --- a/package/janus-gateway/janus-gateway.mk +++ b/package/janus-gateway/janus-gateway.mk @@ -4,7 +4,7 @@ # ################################################################################ -JANUS_GATEWAY_VERSION = 1.1.2 +JANUS_GATEWAY_VERSION = 1.4.1 JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,v$(JANUS_GATEWAY_VERSION)) JANUS_GATEWAY_LICENSE = GPL-3.0 with OpenSSL exception JANUS_GATEWAY_LICENSE_FILES = COPYING