Skip to content

Commit

Permalink
mtr: Fix crash in report mode due to string_fortified.
Browse files Browse the repository at this point in the history
I was made aware of this issue by a Discord user who tried to find out why
duckduckgo was misbehaving with their routing. They were using the `-w` flag.
I tried to generate a similar report and ended up running into the same issue.
I was running Arch Linux however! Turns out traviscross/mtr#508 is related and
the there mentioned fix also works here.

Refs traviscross/mtr#508.
  • Loading branch information
icedream committed Jul 19, 2024
1 parent c680471 commit cbd043c
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 0 deletions.
1 change: 1 addition & 0 deletions .sources
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ linux-firmware https://gitlab.archlinux.org/archlinux/packaging/packages/linux-f
logo-ls https://aur.archlinux.org/logo-ls.git
matchbox https://aur.archlinux.org/matchbox.git
mixxx-git https://aur.archlinux.org/mixxx-git.git
mtr https://gitlab.archlinux.org/archlinux/packaging/packages/mtr.git
olive-git https://aur.archlinux.org/olive-git.git
r8125-dkms https://aur.archlinux.org/r8125-dkms.git
rtlsdr-airband-git https://aur.archlinux.org/rtlsdr-airband-git.git
Expand Down
13 changes: 13 additions & 0 deletions mtr
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
patch#pkgbuild#../mtr.patches/0001-Add-patches.patch

add#source#https://github.com/traviscross/mtr/commit/5908af4c19188cb17b62f23368b6ef462831a0cb.patch
add#b2sums#1fa2e80aa2ded851e6edefb4f07bf0c7091ed4ac1cf6bd44908f93c4851a392dd8bfb24fd370a06c93b25b710e0addc907591741323bf4109b140f4612368bc7
add#sha512sums#01b84482a1b1570cce392ab74a0dafcd1017e3990e5d74ba26e04d913ee499d8ff586512f53ee87a9488b2bba4869ce905e036307aee4c9af87f16285f71625f

# add +icedream.1 to final package version without disturbing the script
replace#global#pkgver=#_pkgver=
replace#global#$pkgver#\$_pkgver
replace#global#${pkgver}#\${_pkgver}
replace#global#echo $_pkgver#echo $pkgver
replace#global#echo ${_pkgver}#echo ${pkgver}
addline#global#_pkgver=#pkgver=\${_pkgver}+icedream.1
Empty file added mtr.files/.gitkeep
Empty file.
16 changes: 16 additions & 0 deletions mtr.patches/0001-Add-patches.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/PKGBUILD b/PKGBUILD
index e5a4af0..4643163 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,6 +24,11 @@ sha512sums=('a7d69e0c551a10ae80a650a34588119e6c6b124a8c2c93d3de29e5daa6ef99f9217
b2sums=('3c972675b97945b96562802c5d0f10de963160682c93c0ea2991b72eca33d136d18948c5e746ca3dfb280ebc9c3ab154e7774f8409ed4e5f7470a8feb128e71b')

prepare() {
+ (cd "${pkgbase}-${pkgver}"
+ for patch in "${srcdir}"/*.patch; do
+ patch -p1 -i "${patch}"
+ done
+ )
(cd ${pkgbase}-${pkgver}
echo "${pkgver}" > .tarball-version
autoreconf -fiv

0 comments on commit cbd043c

Please sign in to comment.