George Hu pushed to branch main at Arch Linux / Packaging / Packages / marisa
Commits:
67303334 by George Hu at 2026-02-08T15:41:05+08:00
Remove fix-format-security.patch
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- REUSE.toml
- − fix-format-security.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -10,9 +10,7 @@ pkgbase = marisa
makedepends = swig
makedepends = python-setuptools
source =
marisa-trie-0.2.6.tar.gz::https://github.com/s-yata/marisa-trie/archive/v0.2.6.tar.gz
- source = fix-format-security.patch
sha512sums =
c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d
- sha512sums =
3583f23c55ccd46cefbd757ef3f82dc7a90f14c64ecf69a99ab3467ca1e6aeddf9822be4c4dffcdbb8841d79fe116cfb8eff0e9b44abaadbcbf8d50a10ab1ec9
pkgname = marisa
pkgdesc = Static and space-efficient trie data structure library
=====================================
PKGBUILD
=====================================
@@ -9,17 +9,12 @@ arch=('x86_64')
url="https://github.com/s-yata/marisa-trie";
license=('BSD-2-Clause OR LGPL-2.1-or-later')
makedepends=('python' 'ruby' 'perl' 'swig' 'python-setuptools')
-source=("marisa-trie-$pkgver.tar.gz::https://github.com/s-yata/marisa-trie/archive/v$pkgver.tar.gz";
- fix-format-security.patch)
-sha512sums=('c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d'
-
'3583f23c55ccd46cefbd757ef3f82dc7a90f14c64ecf69a99ab3467ca1e6aeddf9822be4c4dffcdbb8841d79fe116cfb8eff0e9b44abaadbcbf8d50a10ab1ec9')
+source=("marisa-trie-$pkgver.tar.gz::https://github.com/s-yata/marisa-trie/archive/v$pkgver.tar.gz";)
+sha512sums=('c094e4b22e1457efdd20f2b978ee421b53e36ed94e4fdbd8944136c0ba23da4f6ba9fe3a2c64729c1426aee4dbe8098bfa5eebb943ae7fdaa4eec760485c564d')
prepare() {
cd marisa-trie-$pkgver
autoreconf -i
-
- # https://github.com/s-yata/marisa-trie/pull/45
- patch -Np1 -i ../fix-format-security.patch
}
build() {
=====================================
REUSE.toml
=====================================
@@ -20,10 +20,3 @@ path = [
]
SPDX-FileCopyrightText = "Arch Linux contributors"
SPDX-License-Identifier = "0BSD"
-
-[[annotations]]
-path = [
- "fix-format-security.patch",
-]
-SPDX-FileCopyrightText = "marisa contributors"
-SPDX-License-Identifier = "0BSD"
=====================================
fix-format-security.patch deleted
=====================================
@@ -1,22 +0,0 @@
-From 5813d3b189512202b698aa4851e21b382acd003b Mon Sep 17 00:00:00 2001
-From: Xeonacid <[email protected]>
-Date: Sat, 5 Feb 2022 08:51:43 +0800
-Subject: [PATCH] Fix format security
-
----
- bindings/ruby/marisa-swig_wrap.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bindings/ruby/marisa-swig_wrap.cxx
b/bindings/ruby/marisa-swig_wrap.cxx
-index eae2304..ddc346d 100644
---- a/bindings/ruby/marisa-swig_wrap.cxx
-+++ b/bindings/ruby/marisa-swig_wrap.cxx
-@@ -1402,7 +1402,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
- /* Error manipulation */
-
- #define SWIG_ErrorType(code)
SWIG_Ruby_ErrorType(code)
--#define SWIG_Error(code, msg)
rb_raise(SWIG_Ruby_ErrorType(code), msg)
-+#define SWIG_Error(code, msg)
rb_raise(SWIG_Ruby_ErrorType(code), "%s", msg)
- #define SWIG_fail goto fail
-
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/marisa/-/commit/67303334ea81062abbad7bf2f9832993a14ea2a0
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/marisa/-/commit/67303334ea81062abbad7bf2f9832993a14ea2a0
You're receiving this email because of your account on gitlab.archlinux.org.
