upg itstool postfix python-zipp valgrind
This commit is contained in:
parent
fd193a967e
commit
2cb0b10c24
|
|
@ -0,0 +1,73 @@
|
|||
From 32c7d07664dc37765100285d1202d488cd6a27e8 Mon Sep 17 00:00:00 2001
|
||||
From: Nils Philippsen <nils@tiptoe.de>
|
||||
Date: Mon, 9 Oct 2023 14:26:43 +0200
|
||||
Subject: [PATCH] Fix insufficiently quoted regular expressions
|
||||
|
||||
These went under the radar until Python 3.12 started warning about them.
|
||||
|
||||
Signed-off-by: Nils Philippsen <nils@tiptoe.de>
|
||||
---
|
||||
itstool.in | 14 +++++++-------
|
||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/itstool.in b/itstool.in
|
||||
index c21ad4b..4452616 100755
|
||||
--- a/itstool.in
|
||||
+++ b/itstool.in
|
||||
@@ -220,7 +220,7 @@ class Message (object):
|
||||
if not isinstance(text, ustr_type):
|
||||
text = ustr(text, 'utf-8')
|
||||
self._message[-1] += text.replace('&', '&').replace('<', '<').replace('>', '>')
|
||||
- if re.sub('\s+', ' ', text).strip() != '':
|
||||
+ if re.sub(r'\s+', ' ', text).strip() != '':
|
||||
self._empty = False
|
||||
|
||||
def add_entity_ref (self, name):
|
||||
@@ -318,7 +318,7 @@ class Message (object):
|
||||
message += '<_:%s-%i/>' % (msg.name, placeholder)
|
||||
placeholder += 1
|
||||
if not self._preserve:
|
||||
- message = re.sub('\s+', ' ', message).strip()
|
||||
+ message = re.sub(r'\s+', ' ', message).strip()
|
||||
return message
|
||||
|
||||
def get_preserve_space (self):
|
||||
@@ -456,9 +456,9 @@ class LocNote (object):
|
||||
if self._preserve_space:
|
||||
return self.locnote
|
||||
else:
|
||||
- return re.sub('\s+', ' ', self.locnote).strip()
|
||||
+ return re.sub(r'\s+', ' ', self.locnote).strip()
|
||||
elif self.locnoteref is not None:
|
||||
- return '(itstool) link: ' + re.sub('\s+', ' ', self.locnoteref).strip()
|
||||
+ return '(itstool) link: ' + re.sub(r'\s+', ' ', self.locnoteref).strip()
|
||||
return ''
|
||||
|
||||
|
||||
@@ -889,7 +889,7 @@ class Document (object):
|
||||
trans = translations.ugettext('_\x04translator-credits')
|
||||
if trans is None or trans == 'translator-credits':
|
||||
return
|
||||
- regex = re.compile('(.*) \<(.*)\>, (.*)')
|
||||
+ regex = re.compile(r'(.*) \<(.*)\>, (.*)')
|
||||
for credit in trans.split('\n'):
|
||||
match = regex.match(credit)
|
||||
if not match:
|
||||
@@ -924,7 +924,7 @@ class Document (object):
|
||||
prevnode = None
|
||||
if node.prev is not None and node.prev.type == 'text':
|
||||
prevtext = node.prev.content
|
||||
- if re.sub('\s+', '', prevtext) == '':
|
||||
+ if re.sub(r'\s+', '', prevtext) == '':
|
||||
prevnode = node.prev
|
||||
for lang in sorted(list(translations.keys()), reverse=True):
|
||||
locale = self.get_its_locale_filter(node)
|
||||
@@ -1468,7 +1468,7 @@ def match_locale(extrange, locale):
|
||||
localei += 1
|
||||
return True
|
||||
|
||||
-_locale_pattern = re.compile('([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?')
|
||||
+_locale_pattern = re.compile(r'([a-zA-Z0-9-]+)(_[A-Za-z0-9]+)?(@[A-Za-z0-9]+)?(\.[A-Za-z0-9]+)?')
|
||||
def convert_locale (locale):
|
||||
# Automatically convert POSIX-style locales to BCP47
|
||||
match = _locale_pattern.match(locale)
|
||||
|
|
@ -7,27 +7,31 @@
|
|||
|
||||
pkgname=itstool
|
||||
pkgver=2.0.7
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
epoch=1
|
||||
pkgdesc="XML to PO and back again"
|
||||
arch=(any)
|
||||
url="http://itstool.org/"
|
||||
depends=(python libxml2 docbook-xml)
|
||||
makedepends=(git)
|
||||
_commit=f1c6544dcd83a73a5ccea9e0c48cf9a47e006190 # tags/2.0.7^0
|
||||
source=("git+https://github.com/itstool/itstool#commit=$_commit"
|
||||
0001-Fix-the-crash-from-912099.patch)
|
||||
#_commit=f1c6544dcd83a73a5ccea9e0c48cf9a47e006190 # tags/2.0.7^0
|
||||
#source=("git+https://github.com/itstool/itstool#commit=$_commit"
|
||||
source=("git+https://github.com/itstool/itstool?signed#tag=$pkgver"
|
||||
0001-Fix-the-crash-from-912099.patch
|
||||
0002-Fix-insufficiently-quoted-regular-expressions.patch)
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
git describe --tags | sed 's/-/+/g'
|
||||
}
|
||||
#pkgver() {
|
||||
# cd $pkgname
|
||||
# git describe --tags | sed 's/-/+/g'
|
||||
#}
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
|
||||
# https://src.fedoraproject.org/rpms/itstool/blob/rawhide/f/itstool-2.0.5-fix-crash-wrong-encoding.patch
|
||||
git apply -3 ../0001-Fix-the-crash-from-912099.patch
|
||||
# Fix insufficiently quoted regular expressions / Python 3.12
|
||||
## https://github.com/itstool/itstool/pull/51
|
||||
git apply -3 ../0002-Fix-insufficiently-quoted-regular-expressions.patch
|
||||
|
||||
autoreconf -fvi
|
||||
}
|
||||
|
|
@ -48,16 +52,27 @@ package() {
|
|||
make DESTDIR="$pkgdir" install
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
license=(GPL3)
|
||||
arch=(x86_64)
|
||||
|
||||
license=(GPL-3.0-only)
|
||||
|
||||
validpgpkeys=(4E03CB89E1C8ED8E049367ABE5D9AD24CC3ADF80) # Shaun McCance <shaunm@redhat.com>
|
||||
|
||||
b2sums=('316a27ad8c76d789e773298a656d9d2516277f65be968e583e953c886f94d0e2a2af49fedc79c0652571affac7851e5dd1b671dfb92b0db3537b9495c1a95616'
|
||||
'42e496c4d0aa3c5561d259c970cb9f43835e50c94b273bc01b4e388d1d6d16f05dc00cfded631cd8fdf2c1bf28f6ec64c1e626b5bdc50c15abfa7020d398673a'
|
||||
'da79a18dee20e10c9b9e49824a09a00cab4b22abab83f3cb00d0d899216d0cf8b9d56b79f46714360312e87ec04501f6fedb3e2b8e2dcabca18c8777361f6490')
|
||||
sha256sums=(SKIP
|
||||
b43cea38118aaefa6724136d142dcc7099cd6de04cf2e226f53d4310dfe207cc) # 0001-Fix-the-crash-from-912099.patch
|
||||
|
||||
b43cea38118aaefa6724136d142dcc7099cd6de04cf2e226f53d4310dfe207cc # 0001-Fix-the-crash-from-912099.patch
|
||||
4e64a2e884f9d4cbc493732fcbde9f1d5bed534f9a66330bbcc1cbeb54808c1e) # 0002-Fix-insufficiently-quoted-regular-expressions.patch
|
||||
|
||||
# Note to packager:
|
||||
ls -l *pkg.tar.lz
|
||||
echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
|
||||
#ls -l *pkg.tar.lz
|
||||
#echo "you must rename this package to meet SF naming before you move to the repo"
|
||||
#mv $(ls -l $pkgname*pkg.tar.lz) $pkgname-$epoch_$pkgver-$pkgrel-$arch.pkg.tar.lz >pkg-mv.log
|
||||
##
|
||||
##
|
||||
## 19f86e404570823331e47431cc4785c42fea4ef2dc2ad90f44772e97a035c439 itstool-1_2.0.7-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,24 +3,29 @@
|
|||
|
||||
pkgname=itstool
|
||||
pkgver=2.0.7
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
epoch=1
|
||||
pkgdesc="XML to PO and back again"
|
||||
arch=(any)
|
||||
url="http://itstool.org/"
|
||||
license=(GPL3)
|
||||
depends=(python libxml2 docbook-xml)
|
||||
arch=(any)
|
||||
license=(GPL-3.0-only)
|
||||
depends=(
|
||||
docbook-xml
|
||||
libxml2
|
||||
python
|
||||
)
|
||||
makedepends=(git)
|
||||
_commit=f1c6544dcd83a73a5ccea9e0c48cf9a47e006190 # tags/2.0.7^0
|
||||
source=("git+https://github.com/itstool/itstool#commit=$_commit"
|
||||
0001-Fix-the-crash-from-912099.patch)
|
||||
sha256sums=('SKIP'
|
||||
'b43cea38118aaefa6724136d142dcc7099cd6de04cf2e226f53d4310dfe207cc')
|
||||
|
||||
pkgver() {
|
||||
cd $pkgname
|
||||
git describe --tags | sed 's/-/+/g'
|
||||
}
|
||||
source=(
|
||||
"git+https://github.com/itstool/itstool?signed#tag=$pkgver"
|
||||
0001-Fix-the-crash-from-912099.patch
|
||||
0002-Fix-insufficiently-quoted-regular-expressions.patch
|
||||
)
|
||||
b2sums=('316a27ad8c76d789e773298a656d9d2516277f65be968e583e953c886f94d0e2a2af49fedc79c0652571affac7851e5dd1b671dfb92b0db3537b9495c1a95616'
|
||||
'42e496c4d0aa3c5561d259c970cb9f43835e50c94b273bc01b4e388d1d6d16f05dc00cfded631cd8fdf2c1bf28f6ec64c1e626b5bdc50c15abfa7020d398673a'
|
||||
'da79a18dee20e10c9b9e49824a09a00cab4b22abab83f3cb00d0d899216d0cf8b9d56b79f46714360312e87ec04501f6fedb3e2b8e2dcabca18c8777361f6490')
|
||||
validpgpkeys=(
|
||||
4E03CB89E1C8ED8E049367ABE5D9AD24CC3ADF80 # Shaun McCance <shaunm@redhat.com>
|
||||
)
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
|
|
@ -28,6 +33,10 @@ prepare() {
|
|||
# https://src.fedoraproject.org/rpms/itstool/blob/rawhide/f/itstool-2.0.5-fix-crash-wrong-encoding.patch
|
||||
git apply -3 ../0001-Fix-the-crash-from-912099.patch
|
||||
|
||||
# Fix insufficiently quoted regular expressions / Python 3.12
|
||||
## https://github.com/itstool/itstool/pull/51
|
||||
git apply -3 ../0002-Fix-insufficiently-quoted-regular-expressions.patch
|
||||
|
||||
autoreconf -fvi
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
python
|
||||
libxml2
|
||||
docbook-xml
|
||||
|
||||
git
|
||||
autoconf
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
gpg --recv-key E5D9AD24CC3ADF80
|
||||
|
|
@ -5,11 +5,10 @@
|
|||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
# last build due to license restrictions, we have other alternatives #
|
||||
pkgbase=postfix
|
||||
pkgname=(postfix postfix-{cdb,ldap,lmdb,mongodb,mysql,pcre,pgsql,sqlite})
|
||||
pkgver=3.9.0
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="Fast, easy to administer, secure mail server w/o systemd - now (3.8.3) BSD4 clause and copyrights "
|
||||
url="http://www.postfix.org/"
|
||||
depends=(glibc)
|
||||
|
|
@ -272,13 +271,12 @@ sha256sums=(56f5e420e7c25455a4e96c19b672f80f9a0a35fb5becc9247c9e3d5dcc617f34 #
|
|||
63f39147887336bdd173fb9425998f0a0c6f00a31241f922a255c157bfd8d02e # postfix.sysusers
|
||||
825106bc3a6db8872160c5d65be04ad92828a043b8c8decc531341f0fe4a5742) # postfix.tmpfiles
|
||||
|
||||
## 532d5c11298043be2218f5d20a1d6ede3c81cf2a6bda7139b1cdc899db602ca4 postfix-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## 084057e79f522b7c20107ac45da0044ffad28325311c8edf7d24a85e533f208d postfix-cdb-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## 25c92b465adff206ce192507a1aafacbc4a0253ee201f64e863f18241e2a1a43 postfix-ldap-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## cd210418339c699b93c894399dd741bffcdefc12c098e5e3d51610a4649c2202 postfix-lmdb-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## 88421747afc9f0d3bc6f912d743158e0dde0b07ce69335d45967f2ac1296ad94 postfix-mongodb-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## 491f393b0b95c1952ee111fcb69f5a15506e15600daadb2f49b5e002fb0fd45a postfix-mysql-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## 507b4cce2bc2d7fee84fa45d8a0a8902caffde9d0bb02562e71d214f7390d540 postfix-pcre-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## 470fd2df6eea9df9a211e64cc7a692db9f840f607f99a8e5b6fed43519388f34 postfix-pgsql-3.9.0-01-x86_64.pkg.tar.lz
|
||||
## d8bce4f3c3ccd45a7a0d49a7e26169c2c6035e6bf6ef0c34363c1409168e6904 postfix-sqlite-3.9.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 6d56ff4bc7dddbbd8e676cad2cefbf817f6534bc783a347596efdf877684a182 postfix-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## 814e05a049cc37796ea2a9bb6997a92a80554368734a7096e791661218c82ea1 postfix-cdb-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## a64f557c6dfa2d9f8ac65f6f0c54f6b8d9024ecbf278fd625517f5dda5791630 postfix-ldap-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## 8dcc4e18b5e41228dcf9ea987ac3e82354345d747ddccc4637cb8520e48b5c1d postfix-lmdb-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## 9acf305045be6b2991968c4ac612780febe097cbb1dfa900c951ff99f80ed57a postfix-mongodb-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## bedae37df3134992f6ced19e73954db51969fe7e5bc420e60997339f46d12017 postfix-mysql-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## 2c8e4a185461bed7c08eca85ed004e582515e8bdd86daa16c91caadbcafbede1 postfix-pcre-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## 00c52446530208a917549d8848044f2424fc31593b3cb6da66de622eeb7e8097 postfix-pgsql-3.9.0-02-x86_64.pkg.tar.lz
|
||||
## 6c766277cf5b18a4c679fd8b41ae15ba2dd3e6ee03b06ccdf0a9d37f576c5b35 postfix-sqlite-3.9.0-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ pkgname=(
|
|||
postfix-{cdb,ldap,lmdb,mongodb,mysql,pcre,pgsql,sqlite}
|
||||
)
|
||||
pkgver=3.9.0
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc="Fast, easy to administer, secure mail server"
|
||||
arch=(x86_64)
|
||||
url="https://www.postfix.org/"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=python-zipp
|
||||
pkgver=3.17.0
|
||||
_commit=5c59b561f5b79631a846b8823d5033cc1407b511
|
||||
pkgver=3.18.1
|
||||
#_commit=5c59b561f5b79631a846b8823d5033cc1407b511
|
||||
pkgrel=02
|
||||
pkgdesc="Pathlib-compatible object wrapper for zip files"
|
||||
url="https://github.com/jaraco/zipp"
|
||||
|
|
@ -17,7 +17,8 @@ makedepends=('git' 'python-build' 'python-installer' 'python-setuptools-scm' 'py
|
|||
checkdepends=('python-pytest' 'python-pytest-enabler' 'python-pytest-mypy'
|
||||
'python-jaraco.itertools' 'python-more-itertools' 'python-big-o' 'python-pytest-ignore-flaky')
|
||||
#source=("https://github.com/jaraco/zipp/archive/v$pkgver/$pkgname-$pkgver.tar.gz")
|
||||
source=("git+https://github.com/jaraco/zipp.git#commit=$_commit")
|
||||
#source=("git+https://github.com/jaraco/zipp.git#commit=$_commit")
|
||||
source=("git+https://github.com/jaraco/zipp.git#tag=v$pkgver")
|
||||
#export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
|
||||
|
||||
build() {
|
||||
|
|
@ -42,7 +43,8 @@ arch=(x86_64)
|
|||
|
||||
license=('MIT')
|
||||
|
||||
sha512sums=('7a192eedd85e5aab7d9d2329d65b1f8638b50b1718c8924102d16d1aee888bf67692ba6f82fb23f2347a738de93b640934217c62f757102394f9e87b2b70db83')
|
||||
sha256sums=(SKIP)
|
||||
|
||||
## 94f7c3974b24e06580d6c21da9752c978a403681ffcba5d247215451b3fc4fed python-zipp-3.17.0-02-x86_64.pkg.tar.lz
|
||||
## bccda8eb62b463469ea506494592e47d4d1e34d47a4a429a321b58cde6adc140 python-zipp-3.18.1-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
# Maintainer: Felix Yan <felixonmars@archlinux.org>
|
||||
|
||||
pkgname=python-zipp
|
||||
pkgver=3.17.0
|
||||
_commit=5c59b561f5b79631a846b8823d5033cc1407b511
|
||||
pkgver=3.18.1
|
||||
pkgrel=2
|
||||
pkgdesc="Pathlib-compatible object wrapper for zip files"
|
||||
url="https://github.com/jaraco/zipp"
|
||||
|
|
@ -12,8 +11,8 @@ depends=('python')
|
|||
makedepends=('git' 'python-build' 'python-installer' 'python-setuptools-scm' 'python-wheel')
|
||||
checkdepends=('python-pytest' 'python-pytest-enabler' 'python-pytest-mypy' 'python-jaraco.itertools'
|
||||
'python-more-itertools' 'python-big-o' 'python-pytest-ignore-flaky')
|
||||
source=("git+https://github.com/jaraco/zipp.git#commit=$_commit")
|
||||
sha512sums=('SKIP')
|
||||
source=("git+https://github.com/jaraco/zipp.git#tag=v$pkgver")
|
||||
sha512sums=('7a192eedd85e5aab7d9d2329d65b1f8638b50b1718c8924102d16d1aee888bf67692ba6f82fb23f2347a738de93b640934217c62f757102394f9e87b2b70db83')
|
||||
|
||||
build() {
|
||||
cd zipp
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 0m6.862s
|
||||
user 0m5.576s
|
||||
sys 0m0.766s
|
||||
real 0m11.998s
|
||||
user 0m10.778s
|
||||
sys 0m0.575s
|
||||
|
||||
|
|
|
|||
|
|
@ -5,18 +5,9 @@
|
|||
# Website : https://pozol.eu
|
||||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
# README
|
||||
# this package requires glibc-debug to run the check() function
|
||||
# as -debug packages are not available in [core], it has to be applied manually
|
||||
# whenever the tests shall run
|
||||
#
|
||||
# For a fresh build:
|
||||
# pkgctl build -I ../../glibc/trunk/glibc-debug*.pkg.tar.zst
|
||||
# pkgctl build
|
||||
|
||||
pkgname=valgrind
|
||||
pkgver=3.22.0
|
||||
pkgrel=03
|
||||
pkgver=3.23.0
|
||||
pkgrel=01
|
||||
pkgdesc='Tool to help find memory-management problems in programs'
|
||||
url='https://valgrind.org/'
|
||||
depends=('glibc' 'perl' 'debuginfod')
|
||||
|
|
@ -29,11 +20,7 @@ provides=('valgrind-multilib')
|
|||
replaces=('valgrind-multilib')
|
||||
options=('!emptydirs' '!strip')
|
||||
source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
|
||||
valgrind-3.7.0-respect-flags.patch
|
||||
# https://sourceware.org/git/?p=valgrind.git;a=commit;h=372d09fd9a8d76847c81092ebff71c80fd6c145d
|
||||
# dropped changes to NEWS as that did not apply
|
||||
valgrind_3_22_0_s390x-linux_memfd_secret.patch
|
||||
valgrind_3_22_0_fchmodat2_syscall.patch)
|
||||
valgrind-3.7.0-respect-flags.patch)
|
||||
options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252
|
||||
|
||||
prepare() {
|
||||
|
|
@ -41,11 +28,6 @@ prepare() {
|
|||
patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
|
||||
sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
|
||||
|
||||
# can be dropped with the next release, see
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/valgrind/-/issues/2
|
||||
patch -Np1 < ../valgrind_3_22_0_s390x-linux_memfd_secret.patch
|
||||
patch -Np1 < ../valgrind_3_22_0_fchmodat2_syscall.patch
|
||||
|
||||
autoreconf -ifv
|
||||
}
|
||||
|
||||
|
|
@ -67,45 +49,19 @@ build() {
|
|||
make -C docs man-pages
|
||||
}
|
||||
|
||||
#check() {
|
||||
# cd valgrind-${pkgver}
|
||||
# # only run if glibc-debug is supplied manually
|
||||
# if ! pacman -Q glibc-debug; then echo -e "\033[1;31mcheck() not run, supply glibc-debug if unintended!\033[0m"; return 0; fi
|
||||
check() {
|
||||
cd valgrind-${pkgver}
|
||||
# only run if glibc-debug is supplied manually
|
||||
if ! pacman -Q glibc-debug; then echo -e "\033[1;31mcheck() not run, supply glibc-debug if unintended!\033[0m"; return 0; fi
|
||||
|
||||
# Make sure a basic binary runs. There should be no errors.
|
||||
# ./vg-in-place --error-exitcode=1 /bin/true
|
||||
./vg-in-place --error-exitcode=1 /bin/true
|
||||
|
||||
# Make sure no extra FLAGS leak through, the testsuite
|
||||
# sets all flags necessary. See also configure above.
|
||||
# make check CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
|
||||
make check CPPFLAGS= CFLAGS= CXXFLAGS= LDFLAGS=
|
||||
|
||||
# XXX: run full regtest but only report issues some tests fail duo
|
||||
# current toolchain and expectations, take a manual look if its fine
|
||||
#echo "===============TESTING==================="
|
||||
#make regtest || true
|
||||
|
||||
# Make sure test failures show up in build.log
|
||||
# Gather up the diffs (at most the first 20 lines for each one)
|
||||
#local f max_lines=20 diff_files=()
|
||||
#mapfile -d '' diff_files < <(find . -name '*.diff' -print0 | sort -z)
|
||||
#if (( ${#diff_files[@]} == 0 )); then
|
||||
#echo "Congratulations, all tests passed!"
|
||||
#else
|
||||
#warning "Some tests failed!"
|
||||
#for f in "${diff_files[@]}"; do
|
||||
#echo "================================================="
|
||||
#echo "${f}"
|
||||
#echo "================================================="
|
||||
#if (( $(wc -l < "${f}") < ${max_lines} )); then
|
||||
#cat "${f}"
|
||||
#else
|
||||
#head -n ${max_lines} "${f}"
|
||||
#echo "<truncated beyond ${max_lines} lines>"
|
||||
#fi
|
||||
#done | tee diffs
|
||||
#fi
|
||||
#echo "===============END TESTING==============="
|
||||
#}
|
||||
}
|
||||
|
||||
package() {
|
||||
cd valgrind-${pkgver}
|
||||
|
|
@ -127,16 +83,15 @@ license=('GPL-2.0-or-later')
|
|||
validpgpkeys=(0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward <jseward@acm.org>
|
||||
EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A) # Mark Wielaard <mjw@gnu.org>
|
||||
|
||||
b2sums=('80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514'
|
||||
sha512sums=('27d038faaaf6154cace2df18c3573291393548ba0738dbb6aba58eab6324c5beaa95fc5f3c0271663ca071baf829b15d806f7e81074f7cf087bef20ea0ed3117'
|
||||
'SKIP'
|
||||
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c')
|
||||
b2sums=('9312761b0531006725f13270984b26c48f71ebe66e355b04410d7c01773c9b78ec21db3259cab398e58b3b68f93f5f074db06efe1f359bd7cf423515576191a4'
|
||||
'SKIP'
|
||||
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a'
|
||||
'5af1f467c8d22334e14e6c2878120550ce5f1e36b61f8180601b8673493a85cca8a0c3a804c281ab51fb04fe5e3706edeb897bbd5486f87d9143f472cd4c46b5'
|
||||
'305234e118eeb389c95ca8afa45239b0386199dee6f5058a3ddca06a91b2069e1b9831ac5e31badf6d8bd0d43eef3f260d95b976a509d73284149a64d9ea0563')
|
||||
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a')
|
||||
sha256sums=(c5c34a3380457b9b75606df890102e7df2c702b9420c2ebef9540f8b5d56264d # valgrind-3.23.0.tar.bz2
|
||||
ac6559fe68bb63a8c742b8e0a1387ccbef41822e332114aa686eaf17d8db04e5 # valgrind-3.23.0.tar.bz2.asc
|
||||
4e6be3a1799c17a6e843ab1966a3a68ac0ffa83d4b2230ce1b607518c42a31a2) # valgrind-3.7.0-respect-flags.patch.1
|
||||
|
||||
sha256sums=(c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c # valgrind-3.22.0.tar.bz2
|
||||
b41c4d660811d7b9d57579cbbaa1bf63a5ce2fff1dce5651985eab32d70348ca # valgrind-3.22.0.tar.bz2.asc
|
||||
4e6be3a1799c17a6e843ab1966a3a68ac0ffa83d4b2230ce1b607518c42a31a2 # valgrind-3.7.0-respect-flags.patch
|
||||
083cab680d79842ab36407dac9d728583cb1f0b69ec38cc14d69292701f2eece # valgrind_3_22_0_s390x-linux_memfd_secret.patch
|
||||
4361ea14580638a056edc04da9eebde9c471575b70161eca7cf79643a9955e3b) # valgrind_3_22_0_fchmodat2_syscall.patch
|
||||
## e24b16f15a2d303a59803ed9c36f9d88d427316c7c58289ac89c9fbb8f3f62f3 valgrind-3.23.0-01-x86_64.pkg.tar.lz
|
||||
|
||||
## 0106da9eef9bf34807cea976e15ba3edd11cf06a5c72578e500031b2cdb10f36 valgrind-3.22.0-03-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@
|
|||
# pkgctl build
|
||||
|
||||
pkgname=valgrind
|
||||
pkgver=3.22.0
|
||||
pkgrel=3
|
||||
pkgver=3.23.0
|
||||
pkgrel=1
|
||||
pkgdesc='Tool to help find memory-management problems in programs'
|
||||
arch=('x86_64')
|
||||
license=('GPL-2.0-or-later')
|
||||
|
|
@ -31,25 +31,17 @@ provides=('valgrind-multilib')
|
|||
replaces=('valgrind-multilib')
|
||||
options=('!emptydirs' '!strip')
|
||||
source=(https://sourceware.org/pub/valgrind/valgrind-${pkgver}.tar.bz2{,.asc}
|
||||
valgrind-3.7.0-respect-flags.patch
|
||||
# https://sourceware.org/git/?p=valgrind.git;a=commit;h=372d09fd9a8d76847c81092ebff71c80fd6c145d
|
||||
# dropped changes to NEWS as that did not apply
|
||||
valgrind_3_22_0_s390x-linux_memfd_secret.patch
|
||||
valgrind_3_22_0_fchmodat2_syscall.patch)
|
||||
valgrind-3.7.0-respect-flags.patch)
|
||||
validpgpkeys=(
|
||||
0E9FFD0C16A1856CF9C7C690BA0166E698FA6035 # Julian Seward <jseward@acm.org>
|
||||
EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A # Mark Wielaard <mjw@gnu.org>
|
||||
)
|
||||
sha512sums=('2904c13f68245bbafcea70998c6bd20725271300a7e94b6751ca00916943595fc3fac8557da7ea8db31b54a43f092823a0a947bc142829da811d074e1fe49777'
|
||||
sha512sums=('27d038faaaf6154cace2df18c3573291393548ba0738dbb6aba58eab6324c5beaa95fc5f3c0271663ca071baf829b15d806f7e81074f7cf087bef20ea0ed3117'
|
||||
'SKIP'
|
||||
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c'
|
||||
'6393ddf84eec93cc9b3e20f9c43a8f3ef37436980c9d91350ebd27d5c41057fe982308ba5d194feddaea4a75a4a9ef14fb404388cc9f4628edbe9ef58787afba'
|
||||
'1e22b75b95252583774916dab9dcbc8663495107e15dd1ddf397744b288265fcffd1f456d306bc610989a1f650ae66a8ebeb84d253be312db2ab9fdc9fe1407f')
|
||||
b2sums=('80024371b3e70521996077fba24e233097a6190477ced1b311cd41fead687dcc2511ac0ef723792488f4af08867dff3e1f474816fda09c1604b89059e31c2514'
|
||||
'e0cec39381cefeca09ae4794cca309dfac7c8693e6315e137e64f5c33684598726d41cfbb4edf764fe985503b13ff596184ca5fc32b159d500ec092e4cf8838c')
|
||||
b2sums=('9312761b0531006725f13270984b26c48f71ebe66e355b04410d7c01773c9b78ec21db3259cab398e58b3b68f93f5f074db06efe1f359bd7cf423515576191a4'
|
||||
'SKIP'
|
||||
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a'
|
||||
'5af1f467c8d22334e14e6c2878120550ce5f1e36b61f8180601b8673493a85cca8a0c3a804c281ab51fb04fe5e3706edeb897bbd5486f87d9143f472cd4c46b5'
|
||||
'305234e118eeb389c95ca8afa45239b0386199dee6f5058a3ddca06a91b2069e1b9831ac5e31badf6d8bd0d43eef3f260d95b976a509d73284149a64d9ea0563')
|
||||
'af556fdf3c02e37892bfe9afebc954cf2f1b2fa9b75c1caacfa9f3b456ebc02bf078475f9ee30079b3af5d150d41415a947c3d04235c1ea8412cf92b959c484a')
|
||||
options=(!lto) # https://bugs.kde.org/show_bug.cgi?id=338252
|
||||
|
||||
prepare() {
|
||||
|
|
@ -57,11 +49,6 @@ prepare() {
|
|||
patch -Np1 < ../valgrind-3.7.0-respect-flags.patch
|
||||
sed -i 's|sgml/docbook/xsl-stylesheets|xml/docbook/xsl-stylesheets-1.79.2-nons|' docs/Makefile.am
|
||||
|
||||
# can be dropped with the next release, see
|
||||
# https://gitlab.archlinux.org/archlinux/packaging/packages/valgrind/-/issues/2
|
||||
patch -Np1 < ../valgrind_3_22_0_s390x-linux_memfd_secret.patch
|
||||
patch -Np1 < ../valgrind_3_22_0_fchmodat2_syscall.patch
|
||||
|
||||
autoreconf -ifv
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
valgrind 3.23.0-01 (Sun 28 Apr 2024 09:13:33 PM UTC)
|
||||
|
||||
3.22.0-03
|
||||
real 0m2.793s
|
||||
user 0m2.540s
|
||||
sys 0m0.481s
|
||||
real 25m39.138s
|
||||
user 26m15.289s
|
||||
sys 0m29.524s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue