Skip to content

Commit 416f177

Browse files
committed
Cherry pick security fixes
1 parent 3b2c691 commit 416f177

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

packages/linux/openocd/build-openocd.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ export CFLAGS=-static
66
export LDFLAGS=-static
77

88
cd openocd
9+
10+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/55281d9ef4bd1b45bd4b645b0536bc1972eef3a5.patch | git apply -v
11+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/e3d44750d6384115b32e44471574c5024eb95900.patch | git apply -v
12+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/dad9e7f4039ef962cfc336e2e4285f71e0cbeb37.patch | git apply -v
13+
914
./bootstrap
1015
./configure --disable-werror
1116
make clean

packages/macos/openocd/build-openocd.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ set -euo pipefail
44

55
cd openocd
66

7+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/55281d9ef4bd1b45bd4b645b0536bc1972eef3a5.patch | git apply -v
8+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/e3d44750d6384115b32e44471574c5024eb95900.patch | git apply -v
9+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/dad9e7f4039ef962cfc336e2e4285f71e0cbeb37.patch | git apply -v
10+
711
./bootstrap
812
# See https://github.com/raspberrypi/openocd/issues/30
913
# ./configure --disable-werror CAPSTONE_CFLAGS="$(pkg-config capstone --cflags | sed s/.capstone\$//)"

packages/windows/openocd/build-openocd.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ INSTALLDIR="openocd-install"
77

88
cd openocd
99

10+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/55281d9ef4bd1b45bd4b645b0536bc1972eef3a5.patch | git apply -v
11+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/e3d44750d6384115b32e44471574c5024eb95900.patch | git apply -v
12+
curl -L https://github.com/tom-van/openocd-rp2350-riscv/commit/dad9e7f4039ef962cfc336e2e4285f71e0cbeb37.patch | git apply -v
13+
1014
./bootstrap
1115
./configure --disable-werror --enable-internal-jimtcl
1216
make clean

0 commit comments

Comments
 (0)