Jakub Klinkovský pushed to branch main at Arch Linux / Packaging / Packages /
doxygen
Commits:
9b9086bd by Jakub Klinkovský at 2024-05-25T13:35:45+02:00
upgpkg: 1.11.0-3: update patch to the version that was merged upstream
- - - - -
3 changed files:
- .SRCINFO
- 10891-fix-buffer-overflow.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = doxygen
pkgdesc = Documentation system for C++, C, Java, IDL and PHP
pkgver = 1.11.0
- pkgrel = 2
+ pkgrel = 3
url = http://www.doxygen.nl
arch = x86_64
license = GPL-2.0-or-later
@@ -25,9 +25,9 @@ pkgbase = doxygen
source =
doxygen-1.11.0.tar.gz::https://github.com/doxygen/doxygen/archive/Release_1_11_0.tar.gz
source = 10891-fix-buffer-overflow.patch
sha512sums =
68ab2c8cf570216a7e917f686ec79361179cdc9868966fcc2722ebab49032e2bc9ac60192f101793f978ad2d7236d83c461ab4d2477f7704cf32a003b87311fb
- sha512sums =
58fa168b709a5371db8fcaea4fff39809b4e81088f960d719ae05124f8fa8f574f5edc268e16cf5c3e5f5393251e467a163c9e99b1a7c719ba9b0e59a1b69518
+ sha512sums =
bb48499a17254853522f58246a837113c27a3a960ecc42042f411eeab19faa46587e3d7af6dbdaaca78ec90ccccba8cd2f9e0457688a6b96eaba4c5799070455
b2sums =
e98254aeec8ea7cedf6ec537e3d82cb898f55d435b95e58108c433f920432789fb7feba290b9a365f90ee56eec9120376b18ff26e31b1e4219b8f89f351daa8f
- b2sums =
c85889d6166c213b244134b668932aad8a879671e52be9e832926780a0216fbee66be331b62a84b994311c1d87bbba10c906acf1e436840fa540750e471229b5
+ b2sums =
500304f5727316ee3e6114076525100d30613de1821108c3ed805e862602252de0b9439c0384acad6ba9d175ccab2f84cccafba5942740282ef388613d9d39a5
pkgname = doxygen
depends = clang
=====================================
10891-fix-buffer-overflow.patch
=====================================
@@ -1,4 +1,4 @@
-From 53cdbc09aa3d1dcc83bccf2af0d9c349eb4d3c0b Mon Sep 17 00:00:00 2001
+From 28b51a7f199d003b309e9dab52457759d5fd7691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?=
<1289205+lahwa...@users.noreply.github.com>
Date: Thu, 23 May 2024 21:05:56 +0200
@@ -20,23 +20,22 @@ Arch Linux build system.
[1]
https://github.com/arrayfire/arrayfire/blob/0a25d36238aa1eee3b775d3584937ca65b0a1807/docs/pages/matrix_manipulation.md
[2]
https://github.com/doxygen/doxygen/commit/f4e37514325abe4aa6aeecbc96e9e3e027885aef
---
- src/markdown.cpp | 6 ++++++
- 1 file changed, 6 insertions(+)
+ src/markdown.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/src/markdown.cpp b/src/markdown.cpp
-index 10429edd57..f25d1b4c50 100644
+index 10429edd57..df00900b0d 100644
--- a/src/markdown.cpp
+++ b/src/markdown.cpp
-@@ -691,6 +691,12 @@ size_t
Markdown::Private::findEmphasisChar(std::string_view data, char c, size_t
- }
- }
-
+@@ -661,6 +661,11 @@ size_t
Markdown::Private::findEmphasisChar(std::string_view data, char c, size_t
+ data[i]!='\\' && data[i]!='@' &&
+ !(data[i]=='/' && data[i-1]=='<') && // html end tag
also ends emphasis
+ data[i]!='\n') i++;
+ // avoid overflow (unclosed emph token)
+ if (i==size)
+ {
+ return 0;
+ }
-+
- // skipping a code span
- if (data[i]=='`')
- {
+ //printf("findEmphasisChar: data=[%s] i=%d c=%c\n",data,i,data[i]);
+
+ // not counting escaped chars or characters that are unlikely
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgbase=doxygen
pkgname=(doxygen doxygen-docs)
pkgver=1.11.0
-pkgrel=2
+pkgrel=3
pkgdesc='Documentation system for C++, C, Java, IDL and PHP'
url='http://www.doxygen.nl'
arch=(x86_64)
@@ -32,9 +32,9 @@ makedepends=(
source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/doxygen/doxygen/archive/Release_${pkgver//./_}.tar.gz
10891-fix-buffer-overflow.patch)
sha512sums=('68ab2c8cf570216a7e917f686ec79361179cdc9868966fcc2722ebab49032e2bc9ac60192f101793f978ad2d7236d83c461ab4d2477f7704cf32a003b87311fb'
-
'58fa168b709a5371db8fcaea4fff39809b4e81088f960d719ae05124f8fa8f574f5edc268e16cf5c3e5f5393251e467a163c9e99b1a7c719ba9b0e59a1b69518')
+
'bb48499a17254853522f58246a837113c27a3a960ecc42042f411eeab19faa46587e3d7af6dbdaaca78ec90ccccba8cd2f9e0457688a6b96eaba4c5799070455')
b2sums=('e98254aeec8ea7cedf6ec537e3d82cb898f55d435b95e58108c433f920432789fb7feba290b9a365f90ee56eec9120376b18ff26e31b1e4219b8f89f351daa8f'
-
'c85889d6166c213b244134b668932aad8a879671e52be9e832926780a0216fbee66be331b62a84b994311c1d87bbba10c906acf1e436840fa540750e471229b5')
+
'500304f5727316ee3e6114076525100d30613de1821108c3ed805e862602252de0b9439c0384acad6ba9d175ccab2f84cccafba5942740282ef388613d9d39a5')
_pick() {
local p="$1" f d; shift
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/doxygen/-/commit/9b9086bd5b17d0db55ef568c4281877b52f75311
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/doxygen/-/commit/9b9086bd5b17d0db55ef568c4281877b52f75311
You're receiving this email because of your account on gitlab.archlinux.org.
