From patchwork Sat Jul 6 10:31:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3179 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 16D563F102 for ; Sat, 6 Jul 2024 12:31:21 +0200 (CEST) Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-52ea1a947aesf2573140e87.1 for ; Sat, 06 Jul 2024 03:31:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720261880; cv=pass; d=google.com; s=arc-20160816; b=IJxfttK2Fx3dh+x40qenhbchwi1lKrvSp9TBJLOaL+8nd5sIKaUNdMlqpU7A47pQlO YQnG0IAsZPOyXxSoUllyNZhUtpDutsmyb/lZdKWGVIbVt0fIXD32/vmf8UbGB5GTcdz+ NZyUome2iGirJwT2J8Z4/ctfXo04ZzStwp0NRCehT0KCdKhjlznA2T92r0tC0K+udtIb RbnR5WSXVZ44X4BkZSadIopWCqrHJs1tPbwX7sb/oGi3BjBSAMPUJNxIpJlUJ9PsmNOw ro+Nc3yj90TC4Dtsn55y/tQ5aPdDmpVakQtafCNhjet8rOIWHswyvZ0XJwKAhr8AQx1I sPKg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=PwSN4TD/sAyoo3fxlPmCnpgCZMZ82OhkTJITM48Q7rs=; fh=7liI8LbOhGB02UjJ1O/r2nBQRrxvuOWdxbQrbpK48vQ=; b=Nzs7IxMmqO5zVjR7cg6pMTF4yLELj14Ys/gBtDafhQABv4KJRAZjQ3i6A0/9TusiJX N6esN/ZSEaLlai+EtCBdvf2cGWAYMSl3kVwJ/VCrmO3vd/CFilyfnGF6xPzJQ68GMYAP WStBOt/jljq7ynITsFBgkP15O1vCNbsVQJn4Ur+7rwXoRufYNYugSyADaSw8OTnuMrEp yYDakNS35bC+CErPWzSPGCPJzSExiJCvqK60hzSsl6bvdHCDP/wQ/pZNX/ut7a7WD48u 0Fzz5WuuwDVUzH1b5XeA2oaBJ3g1ckZCxdiCPxuen/coGZT/chmJ4ma30E3NJ9UbTxn+ F71g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=K7p9tOfm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1720261880; x=1720866680; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=PwSN4TD/sAyoo3fxlPmCnpgCZMZ82OhkTJITM48Q7rs=; b=A1cCTR5SAcmSGpStJidmK4lPBEVkg5Z5fmM0IE4KRD3f2FlPii0HYV+cyePbDqTJfV Qt22+a3rdsHTOWYI0v4ZyLLUS+TA0csjixqrIr2hQ2UXasHi90M8TmObcMDWP/aV9Q9n HiWVEDugoPUUwcwQFMGNxTXVUS4JO9gNp1Rig= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720261880; x=1720866680; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=PwSN4TD/sAyoo3fxlPmCnpgCZMZ82OhkTJITM48Q7rs=; b=wzzmpjhhjfy4gXG4h3X3x3qqWA7URP4lyvcs2gs8i8Qt++/6DFYmOZ+nTncd1BfQMi +dsSLpe4O+3O90xpynQS4TnUSGPCelVzZvJ/aUloBMgbyqg9n4PVxAfbk2uoGhGRypeD 3yycnUEv0OWibllh9yqLXQpcXliJH4Ovu7umlUaB/h/NTwLlKiUurww6kt9Tewxbyby7 wErLXJJwL70orglAQjDUCak/Gl7bjDdkVpWlHOhaaPmwalh37RlrkVXvi05Whsh691vJ 0QCb0BZgtIAGMr6GCHQ8SNDCLGNfvDoVMz85CvtBXrNiJr6HWG+SPkgVnRooGtS6yEVX ALsg== X-Forwarded-Encrypted: i=2; AJvYcCXD01Ccyxg+jxILsVZO11rmkcZU5EPqwZn5gSTANcZxK+KZgMhVDlJPUeqqYWAr1/wHkPo+Ni81Li8foJTJOjwiMHkah3n8xcb+Ok7ou60Xzzs1FSoHnU2shhlE2g== X-Gm-Message-State: AOJu0Ywk+GsqjRn/iRjfgNrezSOhoSIRERhyPC8Re1cdJ6tewS+a3SMk FzUePV+RmkW4O4ITne3XcHbPpiyHVcL+mNROfaXNH4GRlybkFhrYw5qU1HF4nUWoDA== X-Google-Smtp-Source: AGHT+IEVIuvPAFFwP38LaJZN3po9Lru6kc7Omt8+yylEGB1RHduLUnRUzpFQbIHgdPQWZdwzXh1d0A== X-Received: by 2002:a05:6512:10cc:b0:52e:a699:2c8c with SMTP id 2adb3069b0e04-52ea6992d0fmr3456398e87.45.1720261879996; Sat, 06 Jul 2024 03:31:19 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6512:3608:b0:52c:dc57:d9e1 with SMTP id 2adb3069b0e04-52e9f30f733ls1059791e87.2.-pod-prod-02-eu; Sat, 06 Jul 2024 03:31:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXCdAhgSGGoPS9/akP2ZztZ8gjAuONeLTPSyha/EJHFexaL+47ZQYk/WKrcKtJRpc83woh9DcWHu/+o2mJxT371LRw0POtkLOr0VIis5fZqvCdr X-Received: by 2002:a05:6512:31ce:b0:52e:a60e:3a01 with SMTP id 2adb3069b0e04-52ea60e3befmr3582309e87.61.1720261878134; Sat, 06 Jul 2024 03:31:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720261878; cv=none; d=google.com; s=arc-20160816; b=KfeSamsQib767SOy0Nhs2jgoy5pvHVlZ2qvyGAB2TDF+Eumgigy6jJ3zGJsQ5H30/j dqsXq/zqN+yjBjO/VV0zRWLSZd1+QLol/+dQP4MDIU76ffQGYf97Xva4Xhdw1iybs31+ U45RQs59gquvG65+gDv3s6rCuc29V1uwdsse2iJ2dGRhrnTL8N5wuygyzTybUEGDcO/Y eVD+AcFHv5JVaMC/Unv+BPRUa7nTRH73GfwGhfTbUgNzGoC+Q51inAsUxRIiYaScrErb 8Vzk3cqYQ5YF8UTSn+laEnZBExqy/rH/MTYDUMseHpE+2zWlp49L3aPKeVpaf4oFdR6n MpmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=0+tlr+6qkpjUrW5RtFISMViQ8xGnt6Er3qk/0nzeLf4=; fh=zzAJxnqI/nbHujtkf4f1nS6mOB+pjNwpf5Eg0oDc9ng=; b=JtfnifHMpOm9WiPhbDeprIe/WZflejXfow7TCyHzGkBkbtsY9a3HsNdzoI/8xoerUY KQY0MnkY5L+FIJtjDEkBsyCgAlCQrefDAcHh8z90w4s59un2IatWLw+2nGIqbQjRVRsA Sf05qjN+FBuxsztTxKVYjsuMfPZ/KfLOgzH4QSQehWRT+1Uh0mpMHAjG4Avk3wY+Ob4J 1XxO7wKisVHwUB6Y/xwhZhuX0n4ZrG4DS5ML7Sdd5aCKaXgghyU5uRB+/bqIQ0dsMcst O1TLuXqzW1c0BK5SDxqxltSbv1st3ywCHP9evLOWxJQX9rDH98o8Ptud4CJKz6EMXfbg qN0w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=K7p9tOfm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 2adb3069b0e04-52ea0b34e5csor1276281e87.8.2024.07.06.03.31.18 for (Google Transport Security); Sat, 06 Jul 2024 03:31:18 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCU9nQ6QDc9FKirD8wuLiQ+KtvcodyHzoJWXN6cfiB36+D3fjaz0fntV7oNzZaiw6sk/aI+zVcyfpUHgmJfpNV/mhVSwg7rLtmfxlIbNNJVbT6ub X-Received: by 2002:a05:6512:313b:b0:52c:e040:7d9 with SMTP id 2adb3069b0e04-52ea06e8479mr4495335e87.59.1720261877292; Sat, 06 Jul 2024 03:31:17 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab08cec4sm749145166b.152.2024.07.06.03.31.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jul 2024 03:31:16 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Gregory Dymarek , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/janus-gateway: update the patches to be applied with fuzz 0 Date: Sat, 6 Jul 2024 12:31:11 +0200 Message-ID: <20240706103111.3489071-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=K7p9tOfm; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, janus-gateway fails to build with output: Applying 0002-Add-test-for-Wunused-but-set-variable.patch using patch: patching file src/Makefile.am Hunk #1 succeeded at 132 (offset -19 lines). patching file configure.ac Hunk #1 succeeded at 12 (offset -1 lines). Hunk #2 FAILED at 67. 1 out of 2 hunks FAILED -- saving rejects to file configure.ac.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- .checkpackageignore | 1 - ...Add-test-for-Wunused-but-set-variable.patch | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index 0a1d2627455e..9e9c493711e1 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -767,7 +767,6 @@ package/irrlicht/0002-makefile-override-LDFLAGS-and-remove-obsolete-X11R6-.patch package/iucode-tool/S00iucode-tool lib_sysv.Variables package/iwd/S40iwd Shellcheck lib_sysv.Variables package/janus-gateway/0001-disable-ssp.patch lib_patch.Upstream -package/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch lib_patch.Upstream package/jose/0001-lib-hsh.c-rename-hsh-local-variable.patch lib_patch.Upstream package/jose/0002-man-add-option-to-skip-building-man-pages.patch lib_patch.Upstream package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream 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 31796d6e28ed..4596577af390 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 @@ -20,8 +20,10 @@ Signed-off-by: Bernd Kuhls Signed-off-by: Adam Duskett [rebased against v1.0.3) Signed-off-by: Fabrice Fontaine -[Upstream status: rejected -(https://github.com/meetecho/janus-gateway/pull/1789)] +Upstream: rejected (https://github.com/meetecho/janus-gateway/pull/1789) +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi + --- Makefile.am | 1 + configure.ac | 6 ++- @@ -30,10 +32,10 @@ Signed-off-by: Fabrice Fontaine create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/src/Makefile.am b/src/Makefile.am -index f961fdb..3ddbe59 100644 +index 96d361e53be0..a8bfd17c930c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -151,6 +151,7 @@ janus_CFLAGS = \ +@@ -132,6 +132,7 @@ janus_CFLAGS = \ -DEVENTDIR=\"$(eventdir)\" \ -DLOGGERDIR=\"$(loggerdir)\" \ -DCONFDIR=\"$(confdir)\" \ @@ -42,10 +44,10 @@ index f961fdb..3ddbe59 100644 $(NULL) diff --git a/configure.ac b/configure.ac -index ca17a29..beef91a 100644 +index c37c85b7ab06..5afe0ef0bbff 100644 --- a/configure.ac +++ b/configure.ac -@@ -13,6 +13,9 @@ AM_SILENT_RULES([yes]) +@@ -12,6 +12,9 @@ AM_SILENT_RULES([yes]) AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC @@ -55,7 +57,7 @@ index ca17a29..beef91a 100644 LT_PREREQ([2.2]) LT_INIT -@@ -64,8 +67,7 @@ clang*) +@@ -65,8 +68,7 @@ cc*) CFLAGS="$CFLAGS \ -Wcast-align \ -Wno-override-init \ @@ -64,7 +66,7 @@ index ca17a29..beef91a 100644 + -Wunsafe-loop-optimizations" esac - JANUS_VERSION=103 + JANUS_VERSION=1102 diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0