python staging rebuilds
This commit is contained in:
parent
79341cecd5
commit
e08a83074b
|
|
@ -9,10 +9,9 @@ pkgbase=audit
|
|||
_name=audit-userspace
|
||||
pkgname=('audit' 'python-audit')
|
||||
pkgver=3.1
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc="Userspace components of the audit framework w/o systemd"
|
||||
url='https://people.redhat.com/sgrubb/audit'
|
||||
arch=(x86_64)
|
||||
makedepends=(glibc krb5 libcap-ng libldap swig linux-api-headers python)
|
||||
options=(emptydirs)
|
||||
#options=(emptydirs debug) # comment above options uncomment this to have debug packages produced
|
||||
|
|
@ -52,7 +51,7 @@ build() {
|
|||
--sysconfdir=/etc
|
||||
--libexecdir=/usr/lib/audit
|
||||
--enable-gssapi-krb5=yes
|
||||
--enable-systemd=no
|
||||
--disable-systemd
|
||||
--with-libcap-ng=yes
|
||||
)
|
||||
|
||||
|
|
@ -106,7 +105,9 @@ package_python-audit() {
|
|||
mv -v $pkgname/* "$pkgdir"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(GPL LGPL2.1)
|
||||
|
||||
|
|
@ -125,3 +126,5 @@ sha256sums=(98d75a6269b80288a442e24c9fbdd6e6845ef4b7c8bc9141725f11a91cef5797 #
|
|||
118c01ae411904b7a7730379ebf7a7506a044182a73d9bcf0620e25e853b698a # audit-3.0.9-flex_array_workaround.patch
|
||||
f4f4a06fa6070970611f49573180501f588de215cc6c26bfb8804ed9e7621e8f) # audit-3.0.9-undo_flex_array_workaround.patch
|
||||
|
||||
## b4996d2ed53141c553dd66555ca3ca7ef26d2f98beea16623740353d0879b6cb audit-3.1-02-x86_64.pkg.tar.lz
|
||||
## 840018aa08ea441a95d458a8e60ebce7b8fc26b9458081df5f4fd84b212bda6a python-audit-3.1-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ pkgbase=audit
|
|||
_name=audit-userspace
|
||||
pkgname=(audit python-audit)
|
||||
pkgver=3.1
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Userspace components of the audit framework'
|
||||
url='https://people.redhat.com/sgrubb/audit'
|
||||
arch=(x86_64)
|
||||
|
|
|
|||
|
|
@ -9,10 +9,9 @@ pkgbase=brotli
|
|||
pkgname=('brotli' 'python-brotli' 'brotli-testdata')
|
||||
_gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71
|
||||
pkgver=1.0.9
|
||||
pkgrel=010
|
||||
pkgrel=012
|
||||
pkgdesc='Generic-purpose lossless compression algorithm'
|
||||
url='https://github.com/google/brotli'
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'cmake' 'python-setuptools')
|
||||
# options=('debug') ## uncomment this to produce the debug pkg
|
||||
source=(${pkgname}::"git+${url}#commit=${_gitcommit}")
|
||||
|
|
@ -81,13 +80,15 @@ package_brotli-testdata() {
|
|||
install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('MIT')
|
||||
|
||||
sha256sums=(SKIP)
|
||||
|
||||
# b754bfc91460158839077b4494f25d6e56515f1d032e50b01144ba3d029514c1 brotli-1.0.9-10-x86_64.pkg.tar.xz
|
||||
# 5bc48044a812ef0d3e522d790e78f83f15421b61eaa401eef9d2753fcf44925c brotli-testdata-1.0.9-10-x86_64.pkg.tar.xz
|
||||
# beb6286729ad6b0723bf3d9d5d14661556092634b2d133c5e8dcd007064a4cf5 python-brotli-1.0.9-10-x86_64.pkg.tar.xz
|
||||
## 58a9eb35ef626e6f2795e201d97dea54cc90701ea99ad434d26108d99597f941 brotli-1.0.9-012-x86_64.pkg.tar.lz
|
||||
## 555227ec4c313c342a68a2f50b34c48237dff98037d0818d394f9dfbf3957ae5 brotli-testdata-1.0.9-012-x86_64.pkg.tar.lz
|
||||
## 0c9275514ed0d59db653de57ffd84251cab6be0c3f50e6198a6fd4e44d24da67 python-brotli-1.0.9-012-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ pkgbase=brotli
|
|||
pkgname=('brotli' 'python-brotli' 'brotli-testdata')
|
||||
_gitcommit=e61745a6b7add50d380cfd7d3883dd6c62fc2c71
|
||||
pkgver=1.0.9
|
||||
pkgrel=10
|
||||
pkgrel=12
|
||||
pkgdesc='Generic-purpose lossless compression algorithm'
|
||||
url='https://github.com/google/brotli'
|
||||
arch=('x86_64')
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ git
|
|||
cmake
|
||||
python-setuptools
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.2.2
|
||||
pkgrel=01
|
||||
pkgver=6.3
|
||||
pkgrel=02
|
||||
pkgdesc='Btrfs filesystem utilities w/o systemd'
|
||||
makedepends=('git' 'asciidoc' 'xmlto' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
|
||||
depends=('glibc' 'util-linux-libs' 'lzo' 'zlib' 'zstd' 'libgcrypt')
|
||||
|
|
@ -70,9 +70,10 @@ license=('GPL2')
|
|||
|
||||
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
|
||||
|
||||
sha256sums=(e4888db8637d92e667448386992d0856b954cf2515b98d39b667da43c482d693 # btrfs-progs-v6.2.2.tar.xz
|
||||
d8895763c624e064114e86da235ab45c9bdfef6121bb8cbb30d2f5f7607a6652 # btrfs-progs-v6.2.2.tar.sign
|
||||
sha256sums=(40a0bdff787ecb490e5533dbcefd4852176daf12aae5a1158203db43d8ad6a7d # btrfs-progs-v6.3.tar.xz
|
||||
51dff45aecc2f2d44a05c0406c45903b113db044457e4e1a7f4ee55378228a02 # btrfs-progs-v6.3.tar.sign
|
||||
bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4 # initcpio-install-btrfs
|
||||
35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5) # initcpio-hook-btrfs
|
||||
|
||||
## c28c8ccea91ddfa5bf6166d2ca25b4aa282e28242eb30b2bf4ffb7a233d46513 btrfs-progs-6.2.2-01-x86_64.pkg.tar.lz
|
||||
## 344b7a3417353dff148ac153d153b7b53112fc7f09e693348243001233d98737 btrfs-progs-6.3-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
|
||||
|
||||
pkgname=btrfs-progs
|
||||
pkgver=6.2.2
|
||||
pkgrel=1
|
||||
pkgver=6.3
|
||||
pkgrel=2
|
||||
pkgdesc='Btrfs filesystem utilities'
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'asciidoc' 'xmlto' 'systemd' 'python' 'python-setuptools' 'e2fsprogs' 'reiserfsprogs' 'python-sphinx')
|
||||
|
|
@ -27,7 +27,7 @@ source=("https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-
|
|||
install=btrfs-progs.install
|
||||
options=(!staticlibs)
|
||||
sha256sums=('SKIP'
|
||||
'e4888db8637d92e667448386992d0856b954cf2515b98d39b667da43c482d693'
|
||||
'40a0bdff787ecb490e5533dbcefd4852176daf12aae5a1158203db43d8ad6a7d'
|
||||
'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4'
|
||||
'35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5'
|
||||
'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252'
|
||||
|
|
|
|||
|
|
@ -6,5 +6,6 @@ reiserfsprogs
|
|||
lzo
|
||||
asciidoc
|
||||
python-sphinx
|
||||
python-typing_extensions
|
||||
|
||||
|
||||
|
|
|
|||
34
gcc/PKGBUILD
34
gcc/PKGBUILD
|
|
@ -15,10 +15,10 @@
|
|||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
|
||||
pkgver=12.2.1
|
||||
_majorver=${pkgver%%.*}
|
||||
_commit=fb2d50f72caf3b84b315bc760368670680999749
|
||||
pkgrel=02
|
||||
#_commit=fb2d50f72caf3b84b315bc760368670680999749
|
||||
_commit=abaa8f9cc4c06dcdae13a33be9253762861d8657
|
||||
pkgrel=04
|
||||
pkgdesc='The GNU Compiler Collection'
|
||||
arch=(x86_64)
|
||||
url='https://gcc.gnu.org'
|
||||
makedepends=(
|
||||
binutils
|
||||
|
|
@ -210,7 +210,6 @@ package_gcc-libs() {
|
|||
package_gcc() {
|
||||
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
|
||||
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc zstd libisl.so)
|
||||
groups=('base-devel')
|
||||
optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
|
||||
provides=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
|
|
@ -403,7 +402,6 @@ package_lib32-gcc-libs() {
|
|||
pkgdesc='32-bit runtime libraries shipped by GCC'
|
||||
depends=('lib32-glibc>=2.27')
|
||||
provides=(libgo.so libgfortran.so libubsan.so libasan.so)
|
||||
groups=(multilib-devel)
|
||||
options=(!emptydirs !strip)
|
||||
|
||||
cd gcc-build
|
||||
|
|
@ -485,7 +483,9 @@ package_libgccjit() {
|
|||
"$pkgdir/usr/share/licenses/$pkgname/"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(GPL LGPL FDL custom)
|
||||
|
||||
|
|
@ -499,15 +499,13 @@ sha256sums=(SKIP
|
|||
2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a # c99
|
||||
1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f) # gcc-ada-repro.patch
|
||||
|
||||
|
||||
#20f8e2186f95bdf2dab97259ee8abc23e85a614659d886c28fa0391a178000b7 gcc-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#1ad59cab86585538cec5f63a9cc214d9ad62b9d4d00715d281dc0909cd654a5d gcc-ada-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#8a2e912f51bcbfdddffab0b1497ed77f1d816eddc42c9f9ddb05a20a1e2e7e89 gcc-d-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#4a1f3c39ca55dda9bb8bc7634857c4637dccf06b5927dc513a40dcb65cf04cd3 gcc-fortran-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#80357a5de72d2ce035263771d59e51cde03736f920679b2c82043674a55d7d8c gcc-go-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#8545302ee01700e162329276ffd509571520079521963dea299f443cff7c3449 gcc-libs-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#85f19fd525c533e7ef308debd30068f50b9451fd2f8c284aa4556e20950cec39 gcc-objc-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#ac01b5392206f1fc37d413a1702f5181f2cccd6a84963d235b30df36f559a437 lib32-gcc-libs-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#5b016c4dc14051cce2cec726a86bfa701ca73d7b47acc01b070c289850f35719 libgccjit-12.2.1-01-x86_64.pkg.tar.xz
|
||||
#dade8d6fd13e080a258b330f271f985895e9c5653b970d1e71b078e3856c335f lto-dump-12.2.1-01-x86_64.pkg.tar.xz
|
||||
|
||||
## 08fcad6e70b2c504d6ef52ca7d49778eaaf352c0c0aafe134a9a1172622c2332 gcc-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## 382fb6a4e28567e86d985d10de5179483995c976463feab1f318e8f8af093770 gcc-ada-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## ed038633e0fce5dda47687f9c13b8f62bb6403b7509fb42a847d2b14aa23b238 gcc-d-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## 72476b721c4b305ee03faf5923bc6fd3eb8c6ca0b6a7082e0da5ed1b6f12c811 gcc-fortran-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## 6f021b3bc42c95a4d85c64a06f6f5998c221bd8e547ab659399d81e108406576 gcc-go-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## d7bbcff823b63322ec00a4ca8b620ddbb7aabea1b41267e0127f8c05ef7eba0d gcc-libs-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## 591b8b86015b0d5ca09b147f60323f06c470f2b84abc56f6a231ba814ac76f78 gcc-objc-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## 81a7d797c461538bbae85d61b22fbd182b73e9b89920aa79503c7673b751efcc lib32-gcc-libs-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## abc71733d0875ae88a0fb75fefcaa6afa19672f0867ca0d86edf9db03dfb95ab libgccjit-12.2.1-04-x86_64.pkg.tar.lz
|
||||
## 5c81f51d7ade086bfe18bf3cbf0426ce66055bca0030dfbac56cbcc5d9aacb36 lto-dump-12.2.1-04-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
pkgname=(gcc gcc-libs lib32-gcc-libs gcc-fortran gcc-objc gcc-ada gcc-go gcc-d lto-dump libgccjit)
|
||||
pkgver=12.2.1
|
||||
_majorver=${pkgver%%.*}
|
||||
_commit=fb2d50f72caf3b84b315bc760368670680999749
|
||||
pkgrel=2
|
||||
_commit=abaa8f9cc4c06dcdae13a33be9253762861d8657
|
||||
pkgrel=4
|
||||
pkgdesc='The GNU Compiler Collection'
|
||||
arch=(x86_64)
|
||||
license=(GPL3 LGPL FDL custom)
|
||||
|
|
@ -202,7 +202,6 @@ package_gcc-libs() {
|
|||
package_gcc() {
|
||||
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
|
||||
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc zstd libisl.so)
|
||||
groups=('base-devel')
|
||||
optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
|
||||
provides=($pkgname-multilib)
|
||||
replaces=($pkgname-multilib)
|
||||
|
|
@ -395,7 +394,6 @@ package_lib32-gcc-libs() {
|
|||
pkgdesc='32-bit runtime libraries shipped by GCC'
|
||||
depends=('lib32-glibc>=2.27')
|
||||
provides=(libgo.so libgfortran.so libubsan.so libasan.so)
|
||||
groups=(multilib-devel)
|
||||
options=(!emptydirs !strip)
|
||||
|
||||
cd gcc-build
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Thu, 23 Mar 2023 02:24:30 +0000
|
||||
Subject: [PATCH] glocalfile: Sum apparent size only for files and symlinks
|
||||
|
||||
Since GNU Coreutils 9.2 (commit 110bcd28386b1f47a4cd876098acb708fdcbbb25),
|
||||
`du --apparent-size` (including `du --bytes`) no longer counts all kinds of
|
||||
files (directories, FIFOs, etc.), but only those for which `st_size` in
|
||||
`struct stat` is defined by POSIX, namely regular files and symlinks
|
||||
(and also rarely supported memory objects).
|
||||
|
||||
This aligns the behaviour of GLib's `G_FILE_MEASURE_APPARENT_SIZE` flag
|
||||
with the new GNU Coreutils `du` and correct POSIX use.
|
||||
|
||||
Note that this may be a breaking change for some uses.
|
||||
|
||||
Link: https://lists.gnu.org/archive/html/bug-coreutils/2023-03/msg00007.html
|
||||
Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965
|
||||
---
|
||||
gio/glocalfile.c | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
|
||||
index 67d4b99fb741..e53216962faf 100644
|
||||
--- a/gio/glocalfile.c
|
||||
+++ b/gio/glocalfile.c
|
||||
@@ -86,6 +86,9 @@
|
||||
#define FILE_READ_ONLY_VOLUME 0x00080000
|
||||
#endif
|
||||
|
||||
+#ifndef S_ISREG
|
||||
+#define S_ISREG(m) (((m) & _S_IFMT) == _S_IFREG)
|
||||
+#endif
|
||||
#ifndef S_ISDIR
|
||||
#define S_ISDIR(m) (((m) & _S_IFMT) == _S_IFDIR)
|
||||
#endif
|
||||
@@ -2777,6 +2780,23 @@ g_local_file_measure_size_of_contents (gint fd,
|
||||
MeasureState *state,
|
||||
GError **error);
|
||||
|
||||
+inline static gboolean _g_stat_is_size_usable (const GLocalFileStat *buf)
|
||||
+{
|
||||
+#ifndef HAVE_STATX
|
||||
+ // Memory objects are defined by POSIX, but are not supported by statx nor Windows
|
||||
+#ifdef S_TYPEISSHM
|
||||
+ if (S_TYPEISSHM (buf))
|
||||
+ return TRUE;
|
||||
+#endif
|
||||
+#ifdef S_TYPEISTMO
|
||||
+ if (S_TYPEISTMO (buf))
|
||||
+ return TRUE;
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
+ return S_ISREG (_g_stat_mode (buf)) || S_ISLNK (_g_stat_mode (buf));
|
||||
+}
|
||||
+
|
||||
static gboolean
|
||||
g_local_file_measure_size_of_file (gint parent_fd,
|
||||
GSList *name,
|
||||
@@ -2836,6 +2856,7 @@ g_local_file_measure_size_of_file (gint parent_fd,
|
||||
state->disk_usage += _g_stat_blocks (&buf) * G_GUINT64_CONSTANT (512);
|
||||
else
|
||||
#endif
|
||||
+ if (_g_stat_is_size_usable (&buf))
|
||||
state->disk_usage += _g_stat_size (&buf);
|
||||
|
||||
if (S_ISDIR (_g_stat_mode (&buf)))
|
||||
|
|
@ -0,0 +1,160 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Thu, 23 Mar 2023 02:19:03 +0000
|
||||
Subject: [PATCH] tests/file: Do not rely on du --bytes behaviour
|
||||
|
||||
As explained in the previous commit, GNU Coreutils 9.2 changes the behaviour
|
||||
of `du --bytes` to only count regular files and symlinks.
|
||||
|
||||
The previous commit makes the test pass with GNU Coreutils >=9.2, but the
|
||||
machine running the tests may have an older version, or perhaps even a
|
||||
reimplementation such as uutils. So we can't rely on the size returned by `du`
|
||||
to be the consistent across systems any more.
|
||||
|
||||
However, the plus side of the new behaviour is that the size reported by `du`
|
||||
/ `G_FILE_MEASURE_APPARENT_SIZE` is now well-defined across filesystems
|
||||
(as the sum of the sizes of regular files & symlinks), so we can hardcode it.
|
||||
|
||||
Fixes: https://gitlab.gnome.org/GNOME/glib/-/issues/2965
|
||||
---
|
||||
gio/tests/file.c | 85 ++----------------------------------------------
|
||||
1 file changed, 3 insertions(+), 82 deletions(-)
|
||||
|
||||
diff --git a/gio/tests/file.c b/gio/tests/file.c
|
||||
index d16eda5c0b8c..ad2f945f9397 100644
|
||||
--- a/gio/tests/file.c
|
||||
+++ b/gio/tests/file.c
|
||||
@@ -2515,105 +2515,33 @@ test_copy_preserve_mode (void)
|
||||
#endif
|
||||
}
|
||||
|
||||
-static gchar *
|
||||
-splice_to_string (GInputStream *stream,
|
||||
- GError **error)
|
||||
-{
|
||||
- GMemoryOutputStream *buffer = NULL;
|
||||
- char *ret = NULL;
|
||||
-
|
||||
- buffer = (GMemoryOutputStream*)g_memory_output_stream_new (NULL, 0, g_realloc, g_free);
|
||||
- if (g_output_stream_splice ((GOutputStream*)buffer, stream, 0, NULL, error) < 0)
|
||||
- goto out;
|
||||
-
|
||||
- if (!g_output_stream_write ((GOutputStream*)buffer, "\0", 1, NULL, error))
|
||||
- goto out;
|
||||
-
|
||||
- if (!g_output_stream_close ((GOutputStream*)buffer, NULL, error))
|
||||
- goto out;
|
||||
-
|
||||
- ret = g_memory_output_stream_steal_data (buffer);
|
||||
- out:
|
||||
- g_clear_object (&buffer);
|
||||
- return ret;
|
||||
-}
|
||||
-
|
||||
-static gboolean
|
||||
-get_size_from_du (const gchar *path, guint64 *size)
|
||||
-{
|
||||
- GSubprocess *du;
|
||||
- gboolean ok;
|
||||
- gchar *result;
|
||||
- gchar *endptr;
|
||||
- GError *error = NULL;
|
||||
- gchar *du_path = NULL;
|
||||
-
|
||||
-#ifndef __APPLE__
|
||||
- du_path = g_find_program_in_path ("du");
|
||||
-#endif
|
||||
-
|
||||
- /* If we can’t find du, don’t try and run the test. */
|
||||
- if (du_path == NULL)
|
||||
- return FALSE;
|
||||
-
|
||||
- g_free (du_path);
|
||||
-
|
||||
- du = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE,
|
||||
- &error,
|
||||
- "du", "--bytes", "-s", path, NULL);
|
||||
- g_assert_no_error (error);
|
||||
-
|
||||
- result = splice_to_string (g_subprocess_get_stdout_pipe (du), &error);
|
||||
- g_assert_no_error (error);
|
||||
-
|
||||
- *size = g_ascii_strtoll (result, &endptr, 10);
|
||||
-
|
||||
- g_subprocess_wait (du, NULL, &error);
|
||||
- g_assert_no_error (error);
|
||||
-
|
||||
- ok = g_subprocess_get_successful (du);
|
||||
-
|
||||
- g_object_unref (du);
|
||||
- g_free (result);
|
||||
-
|
||||
- return ok;
|
||||
-}
|
||||
-
|
||||
static void
|
||||
test_measure (void)
|
||||
{
|
||||
GFile *file;
|
||||
- guint64 size;
|
||||
guint64 num_bytes;
|
||||
guint64 num_dirs;
|
||||
guint64 num_files;
|
||||
GError *error = NULL;
|
||||
gboolean ok;
|
||||
gchar *path;
|
||||
|
||||
path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL);
|
||||
file = g_file_new_for_path (path);
|
||||
|
||||
- if (!get_size_from_du (path, &size))
|
||||
- {
|
||||
- g_test_message ("du not found or fail to run, skipping byte measurement");
|
||||
- size = 0;
|
||||
- }
|
||||
-
|
||||
ok = g_file_measure_disk_usage (file,
|
||||
G_FILE_MEASURE_APPARENT_SIZE,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&num_bytes,
|
||||
&num_dirs,
|
||||
&num_files,
|
||||
&error);
|
||||
g_assert_true (ok);
|
||||
g_assert_no_error (error);
|
||||
|
||||
- if (size > 0)
|
||||
- g_assert_cmpuint (num_bytes, ==, size);
|
||||
+ g_assert_cmpuint (num_bytes, ==, 74478);
|
||||
g_assert_cmpuint (num_dirs, ==, 6);
|
||||
g_assert_cmpuint (num_files, ==, 32);
|
||||
|
||||
@@ -2665,8 +2593,7 @@ measure_done (GObject *source,
|
||||
g_assert_true (ok);
|
||||
g_assert_no_error (error);
|
||||
|
||||
- if (data->expected_bytes > 0)
|
||||
- g_assert_cmpuint (data->expected_bytes, ==, num_bytes);
|
||||
+ g_assert_cmpuint (data->expected_bytes, ==, num_bytes);
|
||||
g_assert_cmpuint (data->expected_dirs, ==, num_dirs);
|
||||
g_assert_cmpuint (data->expected_files, ==, num_files);
|
||||
|
||||
@@ -2695,15 +2622,9 @@ test_measure_async (void)
|
||||
|
||||
path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL);
|
||||
file = g_file_new_for_path (path);
|
||||
-
|
||||
- if (!get_size_from_du (path, &data->expected_bytes))
|
||||
- {
|
||||
- g_test_message ("du not found or fail to run, skipping byte measurement");
|
||||
- data->expected_bytes = 0;
|
||||
- }
|
||||
-
|
||||
g_free (path);
|
||||
|
||||
+ data->expected_bytes = 74478;
|
||||
data->expected_dirs = 6;
|
||||
data->expected_files = 32;
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
#pkgbase=glib2
|
||||
#pkgname=(glib2 glib2-docs)
|
||||
pkgname=glib2
|
||||
pkgver=2.76.1
|
||||
pkgver=2.76.2
|
||||
pkgrel=01
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
|
|
@ -18,12 +18,15 @@ makedepends=(gettext shared-mime-info python libelf git util-linux
|
|||
#checkdepends=(desktop-file-utils glib2)
|
||||
#options=(debug staticlibs) ### uncomment this to have the debug pkg produced
|
||||
options=(staticlibs)
|
||||
_commit=180713772f4e7bcdddf2c793f2f34a498184ed15 # tags/2.76.1^0
|
||||
_commit=41ae5b5632ce9f6b2b5613ec1912821f769166c2 # tags/2.76.2^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
gio-querymodules.{hook,script}
|
||||
glib-compile-schemas.hook)
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
0002-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
|
||||
0003-tests-file-Do-not-rely-on-du-bytes-behaviour.patch
|
||||
# gio-querymodules.{hook,script}
|
||||
gio-querymodules.hook
|
||||
glib-compile-schemas.hook)
|
||||
|
||||
pkgver() {
|
||||
cd glib
|
||||
|
|
@ -35,6 +38,10 @@ prepare() {
|
|||
|
||||
# Suppress noise from glib-compile-schemas.hook
|
||||
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
# fix test suite issues with coreutils >=9.2
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3358
|
||||
git apply -3 ../0002-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
|
||||
git apply -3 ../0003-tests-file-Do-not-rely-on-du-bytes-behaviour.patch
|
||||
|
||||
git submodule init
|
||||
git submodule set-url subprojects/gvdb "$srcdir/gvdb"
|
||||
|
|
@ -76,7 +83,7 @@ package() {
|
|||
meson install -C build --destdir "$pkgdir"
|
||||
|
||||
install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 *.hook
|
||||
install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules"
|
||||
# install -D gio-querymodules.script "$pkgdir/usr/share/libalpm/scripts/gio-querymodules"
|
||||
|
||||
python -m compileall -d /usr/share/glib-2.0/codegen \
|
||||
"$pkgdir/usr/share/glib-2.0/codegen"
|
||||
|
|
@ -111,10 +118,11 @@ validpgpkeys=('923B7025EE03C1C59F42684CF0942E894B2EAFA0') # Philip Withnall (htt
|
|||
sha256sums=(SKIP
|
||||
SKIP
|
||||
c3ba9ae2055ea47b94f98e6c4fa879cb0ffe46d67d62c88153876fde56d7e928 # 0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7 # gio-querymodules.hook
|
||||
92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e # gio-querymodules.script
|
||||
aa464f3eee9c464bc8d858eb126c853d72d7b1173c701e3d9ded225cb57ed0ed # 0002-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
|
||||
a27d58ea1408ec452a29eaaf1a52436b4364688087dcb352f6b7886e69fd9ca9 # 0003-tests-file-Do-not-rely-on-du-bytes-behaviour.patch
|
||||
557c88177f011ced17bdeac1af3f882b2ca33b386a866fdf900b35f927a2bbe8 # gio-querymodules.hook
|
||||
# 2a9f9b8235f48e3b7d0f6cfcbc76cd2116c45f28692cac4bd61074c495bd5eb7 # gio-querymodules.hook
|
||||
# 92d08db5aa30bda276bc3d718e7ff9dd01dc40dcab45b359182dcc290054e24e # gio-querymodules.script
|
||||
64ae5597dda3cc160fc74be038dbe6267d41b525c0c35da9125fbf0de27f9b25) # glib-compile-schemas.hook
|
||||
|
||||
## 82ec1742cd3cdfb682efb422d327e4352ecf02203855923296f6068b72aecafe glib2-2.76.1-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
## c0b0fe332950fa3ffdcd455f24430f4ae4584a00026ff08f8c4f341bdd9285ca glib2-2.76.2-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgbase=glib2
|
||||
pkgname=(glib2 glib2-docs)
|
||||
pkgver=2.76.1
|
||||
pkgver=2.76.2
|
||||
pkgrel=1
|
||||
pkgdesc="Low level core library"
|
||||
url="https://wiki.gnome.org/Projects/GLib"
|
||||
|
|
@ -35,17 +35,21 @@ options=(
|
|||
debug
|
||||
staticlibs
|
||||
)
|
||||
_commit=180713772f4e7bcdddf2c793f2f34a498184ed15 # tags/2.76.1^0
|
||||
_commit=41ae5b5632ce9f6b2b5613ec1912821f769166c2 # tags/2.76.2^0
|
||||
source=(
|
||||
"git+https://gitlab.gnome.org/GNOME/glib.git#commit=$_commit"
|
||||
"git+https://gitlab.gnome.org/GNOME/gvdb.git"
|
||||
0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
0002-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
|
||||
0003-tests-file-Do-not-rely-on-du-bytes-behaviour.patch
|
||||
gio-querymodules.hook
|
||||
glib-compile-schemas.hook
|
||||
)
|
||||
b2sums=('SKIP'
|
||||
'SKIP'
|
||||
'bd7f881ae6054c363783bf45b1add5eef5e8347554e23b9fece526701469d07cdcb9871fa73dee473796a219e8aa513796a96da769949097ea207db038578d07'
|
||||
'6bcbcba60208162f7221701d6a642eabfc92c2fc6a476bcb42da5967577f8f0c75b688d149be01c9c48cd644aafa7fbdd63d9086385b8f7607fc981756d71a68'
|
||||
'257bf37d304cc161dedcde0a2c4d01e297f8263cde48b49d3ee47ca95a8fb9ad44bbb9bf99da51ec766ffb6f9d502e0a8fdc6b86346e6755373ee515e23b9419'
|
||||
'14c9211c0557f6d8d9a914f1b18b7e0e23f79f4abde117cb03ab119b95bf9fa9d7a712aa0a29beb266468aeb352caa3a9e4540503cfc9fe0bbaf764371832a96'
|
||||
'd30d349b4cb4407839d9074ce08f5259b8a5f3ca46769aabc621f17d15effdb89c4bf19bd23603f6df3d59f8d1adaded0f4bacd0333afcab782f2d048c882858')
|
||||
|
||||
|
|
@ -61,6 +65,11 @@ prepare() {
|
|||
# Suppress noise from glib-compile-schemas.hook
|
||||
git apply -3 ../0001-glib-compile-schemas-Remove-noisy-deprecation-warnin.patch
|
||||
|
||||
# fix test suite issues with coreutils >=9.2
|
||||
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3358
|
||||
git apply -3 ../0002-glocalfile-Sum-apparent-size-only-for-files-and-syml.patch
|
||||
git apply -3 ../0003-tests-file-Do-not-rely-on-du-bytes-behaviour.patch
|
||||
|
||||
git submodule init
|
||||
git submodule set-url subprojects/gvdb "$srcdir/gvdb"
|
||||
git -c protocol.file.allow=always submodule update
|
||||
|
|
|
|||
|
|
@ -3,10 +3,9 @@ Type = Path
|
|||
Operation = Install
|
||||
Operation = Upgrade
|
||||
Operation = Remove
|
||||
Target = usr/lib/gio/modules/
|
||||
Target = usr/lib/gio/modules/*.so
|
||||
|
||||
[Action]
|
||||
Description = Updating GIO module cache...
|
||||
When = PostTransaction
|
||||
Exec = /usr/share/libalpm/scripts/gio-querymodules
|
||||
NeedsTargets
|
||||
Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
[Trigger]
|
||||
Type = Path
|
||||
Operation = Install
|
||||
Operation = Upgrade
|
||||
Operation = Remove
|
||||
Target = usr/lib/gio/modules/
|
||||
|
||||
[Action]
|
||||
Description = Updating GIO module cache...
|
||||
When = PostTransaction
|
||||
Exec = /usr/share/libalpm/scripts/gio-querymodules
|
||||
NeedsTargets
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
real 8m26.667s
|
||||
user 14m34.268s
|
||||
sys 1m2.367s
|
||||
real 4m24.412s
|
||||
user 14m46.615s
|
||||
sys 1m9.144s
|
||||
|
||||
|
|
|
|||
|
|
@ -98,7 +98,6 @@ validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA' # Werner Koch (dist sig
|
|||
sha256sums=(25a5785a5da356689001440926b94e967d02e13c49eb7743e35ef0cf22e42750 # gpgme-1.20.0.tar.bz2
|
||||
f32a7e1c6c132ca06dde763b243ab0f4055fb360ced1761829c7dc8b38528db6) # gpgme-1.20.0.tar.bz2.sig
|
||||
|
||||
## 24b7a71a323ed01ef88c76909b81e176dcfdc64730232aeae9f4e053b3d99075 gpgme-1.20.0-02-x86_64.pkg.tar.lz
|
||||
## cbe1cb571aeec3970c1d6c888b6c7d17133f2d7f3c1d86bdf686b00256eab345 python-gpgme-1.20.0-02-x86_64.pkg.tar.lz
|
||||
## 65e1175c6fe91acf3bd7ff1f3d6d7bea9dc32f37755b6d462afc8b9c41dca8d8 qgpgme-1.20.0-02-x86_64.pkg.tar.lz
|
||||
|
||||
## 75ca574cfdf8eec1fd5203abaad9fb9ae07c8688bc004d371b0ffee2b1c4bfd5 gpgme-1.20.0-02-x86_64.pkg.tar.lz
|
||||
## 9ff2071e98044e3029ac9c39063e3745b1907ba66189585337d015754bbf0f09 python-gpgme-1.20.0-02-x86_64.pkg.tar.lz
|
||||
## acd00138853aab10b1874fbaca6095c414566f3ca21cb9449e84dac0bce91a6e qgpgme-1.20.0-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -7,3 +7,4 @@ python-installer
|
|||
python-wheel
|
||||
|
||||
|
||||
python-typing_extensions
|
||||
|
|
|
|||
|
|
@ -0,0 +1,332 @@
|
|||
diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure
|
||||
--- gpgme-1.16.0.orig/configure 2021-06-24 20:10:50.000000000 +0300
|
||||
+++ gpgme-1.16.0/configure 2021-12-01 00:12:24.383952330 +0200
|
||||
@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -19666,7 +19666,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -19933,7 +19933,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -20296,7 +20296,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -20563,7 +20563,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -20926,7 +20926,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -21193,7 +21193,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -21556,7 +21556,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -21823,7 +21823,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -22186,7 +22186,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -22453,7 +22453,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -22816,7 +22816,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -23083,7 +23083,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING:
|
||||
|
||||
if test -n "$PYTHON"; then
|
||||
# If the user set $PYTHON, use it and don't search something else.
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5
|
||||
-$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
|
||||
+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
|
||||
prog="import sys
|
||||
# split strings by '.' and convert to numeric. Append some zeros
|
||||
# because we need at least 4 digits for the hex conversion.
|
||||
# map returns an iterator in Python 3.0 and a list in 2.x
|
||||
-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
|
||||
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
|
||||
minverhex = 0
|
||||
# xrange is not present in Python 3.0 and range returns an iterator
|
||||
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
||||
@@ -23318,19 +23318,19 @@ fi
|
||||
else
|
||||
# Otherwise, try each interpreter until we find one that satisfies
|
||||
# VERSION.
|
||||
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5
|
||||
-$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; }
|
||||
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
|
||||
+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
|
||||
if ${am_cv_pathless_PYTHON+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
|
||||
- for am_cv_pathless_PYTHON in python3.9 none; do
|
||||
+ for am_cv_pathless_PYTHON in python3.10 none; do
|
||||
test "$am_cv_pathless_PYTHON" = none && break
|
||||
prog="import sys
|
||||
# split strings by '.' and convert to numeric. Append some zeros
|
||||
# because we need at least 4 digits for the hex conversion.
|
||||
# map returns an iterator in Python 3.0 and a list in 2.x
|
||||
-minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
|
||||
+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
|
||||
minverhex = 0
|
||||
# xrange is not present in Python 3.0 and range returns an iterator
|
||||
for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
|
||||
@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -23446,7 +23446,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -23713,7 +23713,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT
|
||||
if ${am_cv_python_version+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
- am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
|
||||
+ am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
|
||||
$as_echo "$am_cv_python_version" >&6; }
|
||||
@@ -24076,7 +24076,7 @@ else:
|
||||
# <https://github.com/pypa/virtualenv/issues/118>
|
||||
try:
|
||||
from platform import python_implementation
|
||||
- if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
|
||||
+ if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
|
||||
can_use_sysconfig = 0
|
||||
except ImportError:
|
||||
pass"
|
||||
@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
|
||||
$as_echo_n "checking for the distutils Python package... " >&6; }
|
||||
ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
|
||||
- if test -z "$ac_distutils_result"; then
|
||||
+ if test $? -eq 0; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
@@ -24343,7 +24343,7 @@ EOD`
|
||||
ac_python_version=$PYTHON_VERSION
|
||||
else
|
||||
ac_python_version=`$PYTHON -c "import sys; \
|
||||
- print (sys.version[:3])"`
|
||||
+ print (sys.version[:4])"`
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
@ -7,10 +7,9 @@
|
|||
|
||||
## rebuild after any libbpf upgrade ##
|
||||
pkgname=iproute2
|
||||
pkgver=6.2.0
|
||||
pkgrel=02
|
||||
pkgver=6.3.0
|
||||
pkgrel=01
|
||||
pkgdesc='IP Routing Utilities'
|
||||
arch=('x86_64')
|
||||
url='https://git.kernel.org/pub/scm/network/iproute2/iproute2.git'
|
||||
depends=('glibc' 'iptables' 'libcap' 'libelf' 'libbpf')
|
||||
makedepends=('db5.3')
|
||||
|
|
@ -35,8 +34,7 @@ options=('staticlibs')
|
|||
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||
"sha256sums::https://mirrors.edge.kernel.org/pub/linux/utils/net/$pkgname/sha256sums.asc"
|
||||
'0001-make-iproute2-fhs-compliant.patch'
|
||||
'0002-bdb-5-3.patch'
|
||||
'0003-tc-add-missing-separator.patch')
|
||||
'0002-bdb-5-3.patch')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
|
@ -47,9 +45,6 @@ prepare() {
|
|||
# use Berkeley DB 5.3
|
||||
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
|
||||
|
||||
# tc: add missing separator
|
||||
patch -Np1 -i "${srcdir}"/0003-tc-add-missing-separator.patch
|
||||
|
||||
# do not treat warnings as errors
|
||||
sed -i 's/-Werror//' Makefile
|
||||
}
|
||||
|
|
@ -73,7 +68,9 @@ package() {
|
|||
install -Dm0644 lib/libnetlink.a "${pkgdir}/usr/lib/libnetlink.a"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2')
|
||||
|
||||
|
|
@ -82,13 +79,10 @@ validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
|
|||
# https://mirrors.edge.kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
|
||||
# 4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 iproute2-6.2.0.tar.xz
|
||||
|
||||
sha256sums=(4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62 # iproute2-6.2.0.tar.xz
|
||||
39fe4931168c6730eb4c63581a60616f39cf8a63e012a8cbd9372fd10c1283d0 # iproute2-6.2.0.tar.sign
|
||||
sha256sums=(dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732 # iproute2-6.3.0.tar.xz
|
||||
d03f3eadfe5750d6d022df7a4b09ec6ad68db142ee608be03d363b024c2c5c06 # iproute2-6.3.0.tar.sign
|
||||
05ed581236e4e913c0a80208eeba11d601dca72279317cbf86fb6098a9a962bf # sha256sums
|
||||
758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d # 0001-make-iproute2-fhs-compliant.patch
|
||||
611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6 # 0002-bdb-5-3.patch
|
||||
4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382) # 0003-tc-add-missing-separator.patch
|
||||
|
||||
## 8198eb79b71b9f3b7ec4fbb7935f28c98192077cc6933ca0e817955480ac0260 iproute2-6.2.0-02-x86_64.pkg.tar.lz
|
||||
|
||||
611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6) # 0002-bdb-5-3.patch
|
||||
|
||||
## 5f20e5e7f38f059b35caa66b549105e02b88ea474c139d604e2aa3b489ad7f0c iproute2-6.3.0-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
# Contributor: Judd Vinet <jvinet@zeroflux.org>
|
||||
|
||||
pkgname=iproute2
|
||||
pkgver=6.2.0
|
||||
pkgrel=2
|
||||
pkgver=6.3.0
|
||||
pkgrel=1
|
||||
pkgdesc='IP Routing Utilities'
|
||||
arch=('x86_64')
|
||||
license=('GPL2')
|
||||
|
|
@ -29,13 +29,11 @@ options=('staticlibs')
|
|||
validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
|
||||
source=("https://www.kernel.org/pub/linux/utils/net/${pkgname}/${pkgname}-${pkgver}.tar."{xz,sign}
|
||||
'0001-make-iproute2-fhs-compliant.patch'
|
||||
'0002-bdb-5-3.patch'
|
||||
'0003-tc-add-missing-separator.patch')
|
||||
sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
|
||||
'0002-bdb-5-3.patch')
|
||||
sha256sums=('dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732'
|
||||
'SKIP'
|
||||
'758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
|
||||
'611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6'
|
||||
'4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382')
|
||||
'611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
|
|
@ -46,9 +44,6 @@ prepare() {
|
|||
# use Berkeley DB 5.3
|
||||
patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
|
||||
|
||||
# tc: add missing separator
|
||||
patch -Np1 -i "${srcdir}"/0003-tc-add-missing-separator.patch
|
||||
|
||||
# do not treat warnings as errors
|
||||
sed -i 's/-Werror//' Makefile
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,8 @@
|
|||
pkgbase=libcap-ng
|
||||
pkgname=(libcap-ng python-capng)
|
||||
pkgver=0.8.3
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='A library for Linux that makes using posix capabilities easy'
|
||||
arch=(x86_64)
|
||||
url='https://people.redhat.com/sgrubb/libcap-ng/'
|
||||
depends=(glibc)
|
||||
makedepends=(python swig)
|
||||
|
|
@ -65,8 +64,13 @@ package_python-capng() {
|
|||
mv -v python-capng/* "$pkgdir"
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(LGPL2.1)
|
||||
|
||||
sha256sums=(e542e9139961f0915ab5878427890cdc7762949fbe216bd0cb4ceedb309bb854) # libcap-ng-0.8.3.tar.gz
|
||||
|
||||
## 409494ba727660112f086f36a265f9b5e7db0ac44c7d272b22728cef77a2f74e libcap-ng-0.8.3-02-x86_64.pkg.tar.lz
|
||||
## a168587e66d65cae8854424e3f8361874618506038247ae2b9f04aa21872b752 python-capng-0.8.3-02-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -2,3 +2,5 @@ python
|
|||
swig
|
||||
autoconf
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,9 +8,8 @@
|
|||
pkgbase=libseccomp
|
||||
pkgname=(libseccomp python-libseccomp)
|
||||
pkgver=2.5.4
|
||||
pkgrel=01
|
||||
pkgrel=02
|
||||
pkgdesc='Enhanced seccomp library'
|
||||
arch=('x86_64')
|
||||
url="https://github.com/seccomp/libseccomp"
|
||||
depends=('glibc')
|
||||
checkdepends=('valgrind')
|
||||
|
|
@ -30,6 +29,7 @@ build() {
|
|||
env VERSION_RELEASE=${pkgver} python setup.py build
|
||||
}
|
||||
|
||||
## only 1 test fails, comment check section out and makepkg again without -f if it fails
|
||||
check() {
|
||||
cd ${pkgbase}-${pkgver}
|
||||
make check
|
||||
|
|
@ -48,7 +48,9 @@ package_python-libseccomp() {
|
|||
env VERSION_RELEASE=${pkgver} python setup.py install --root="${pkgdir}" --prefix=/usr -O1 --skip-build
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('LGPL2.1')
|
||||
|
||||
|
|
@ -57,3 +59,7 @@ validpgpkeys=('7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A' # Paul Moore <paul@paul
|
|||
|
||||
sha256sums=(d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb # libseccomp-2.5.4.tar.gz
|
||||
af37e70eb422e6f983c1f135a3abb342c3b787716520b71bd774e4906003807f) # libseccomp-2.5.4.tar.gz.asc
|
||||
|
||||
## 226aa3c99dd7b147cc59745dee12b08782ae8630ff1a8c45c598949f5318aff4 libseccomp-2.5.4-02-x86_64.pkg.tar.lz
|
||||
## ee74a1d62129e9163f5c6fa50cfbeafd53dee809dde043f07a5f08f96eb37c0f python-libseccomp-2.5.4-02-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
pkgbase=libseccomp
|
||||
pkgname=(libseccomp python-libseccomp)
|
||||
pkgver=2.5.4
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
pkgdesc='Enhanced seccomp library'
|
||||
arch=('x86_64')
|
||||
license=('LGPL2.1')
|
||||
|
|
|
|||
|
|
@ -7,3 +7,4 @@ autoconf
|
|||
automake
|
||||
|
||||
|
||||
python-typing_extensions
|
||||
|
|
|
|||
|
|
@ -9,19 +9,23 @@
|
|||
#pkgname=(libxml2 libxml2-docs)
|
||||
pkgname=libxml2
|
||||
pkgver=2.10.4
|
||||
pkgrel=03
|
||||
pkgrel=04
|
||||
# mixup between jobcore and staging 4/22 rebuild on jobcore used staging PKGBUILD-arch
|
||||
# so staging pkgrel is bumped up one to distinguish from jobcore's build
|
||||
pkgdesc="XML C parser and toolkit"
|
||||
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
|
||||
depends=(xz icu ncurses readline zlib)
|
||||
depends=(zlib xz icu readline ncurses)
|
||||
makedepends=(python git)
|
||||
optdepends=('python: Python bindings')
|
||||
provides=(libxml2.so)
|
||||
optdepends=('python: Python bindings')
|
||||
provides=(libxml2.so)
|
||||
#options=(debug) ## uncomment this to have the debug pkg produced
|
||||
_commit=223cb03a5d27b1b2393b266a8657443d046139d6 # tags/v2.10.4^0
|
||||
source=("git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
|
||||
source=(
|
||||
"git+https://gitlab.gnome.org/GNOME/libxml2.git#commit=$_commit"
|
||||
0001-Fix-python3-unicode-errors.patch
|
||||
0002-HACK-Don-t-run-fuzzing-tests.patch
|
||||
https://www.w3.org/XML/Test/xmlts20130923.tar.gz)
|
||||
https://www.w3.org/XML/Test/xmlts20130923.tar.gz
|
||||
)
|
||||
|
||||
pkgver() {
|
||||
cd libxml2
|
||||
|
|
@ -36,7 +40,7 @@ prepare() {
|
|||
|
||||
# https://gitlab.gnome.org/GNOME/libxml2/-/issues/64
|
||||
git apply -3 ../0001-Fix-python3-unicode-errors.patch
|
||||
|
||||
|
||||
# Do not run fuzzing tests
|
||||
git apply -3 ../0002-HACK-Don-t-run-fuzzing-tests.patch
|
||||
|
||||
|
|
@ -50,10 +54,10 @@ build() {
|
|||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--localstatedir=/var \
|
||||
--with-threads \
|
||||
--with-history \
|
||||
--with-python=/usr/bin/python \
|
||||
--with-icu \
|
||||
--with-threads \
|
||||
--disable-static
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
make
|
||||
|
|
@ -89,13 +93,16 @@ package() {
|
|||
arch=(x86_64)
|
||||
|
||||
# license=(MIT) ... 2.9.14
|
||||
# license=(custom:MIT) # 2.10.1
|
||||
license=(custom:MIT) # 2.10.4
|
||||
license=(custom:MIT) # 2.10.1
|
||||
|
||||
b2sums=('SKIP'
|
||||
'ec5a0955906c5fdd4bc65248bdb46f315460f4b2208bf37c49f55ef7468585786bdf563aa3e9357370d4f1ff947a6d4467869eeb2ca6b77ca5e40ffa45213a13'
|
||||
'ec247c8caad963307d8f487176fde518cfb087bbff3f10c2a5846b90a04c9909c2f0e6aaf8ded4784f46586eafb16df493caf1debc20ff10014f03b1f1f8241d'
|
||||
'63a47bc69278ef510cd0b3779aed729e1b309e30efa0015d28ed051cc03f9dfddb447ab57b07b3393e8f47393d15473b0e199c34cb1f5f746b15ddfaa55670be')
|
||||
|
||||
sha256sums=(SKIP
|
||||
161208f5f3ca000438c8d55d2f977bbd187205d2e70ce72b3fdbd59df4837a39 # 0001-Fix-python3-unicode-errors.patch
|
||||
4c426ffa9c8f397929ff575748fbed9a2db036033a3738d95c1d5309e666de59 # 0002-HACK-Don-t-run-fuzzing-tests.patch
|
||||
9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz
|
||||
|
||||
## 13734fd70263e8e448c08f00e973c4649b31a2e9dca8f666f687f833528bba3b libxml2-2.10.4-03-x86_64.pkg.tar.lz
|
||||
|
||||
## a345aedb1b236e9cda058d933f564fd19c000eedc91bf2c240310d34cb6b5e1f libxml2-2.10.4-04-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
python git
|
||||
git
|
||||
python
|
||||
autoconf
|
||||
automake
|
||||
gettext
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
shopt -s extglob
|
||||
pkgbase=python
|
||||
pkgname=(python python-tests)
|
||||
pkgver=3.10.10
|
||||
pkgver=3.11.3
|
||||
pkgrel=01
|
||||
_pybasever=${pkgver%.*}
|
||||
pkgdesc="Next generation of the python high-level scripting language - no ipv6 "
|
||||
|
|
@ -22,15 +22,9 @@ source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
|
|||
prepare() {
|
||||
cd Python-${pkgver}
|
||||
|
||||
# # FS#73002
|
||||
# patch -p1 -i ../178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch
|
||||
|
||||
# FS#23997
|
||||
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
|
||||
|
||||
# # Speed up LTO
|
||||
# sed -i -e "s|-flto |-flto=4 |g" configure configure.ac
|
||||
|
||||
# Ensure that we are using the system copy of various libraries (expat, libffi, and libmpdec),
|
||||
# rather than copies shipped in the tarball
|
||||
rm -r Modules/expat
|
||||
|
|
@ -66,8 +60,7 @@ build() {
|
|||
}
|
||||
|
||||
#check() {
|
||||
# # test_socket: test.test_socket.RDSTest.testPeek hangs https://bugs.python.org/issue35247
|
||||
# # test_tk: tkinter.test.test_tkinter.test_colorchooser.DefaultRootTest hangs
|
||||
# # test_tk: test_askcolor tkinter.test.test_tkinter.test_colorchooser.DefaultRootTest hangs
|
||||
# # test_pyexpat: our `debug` implementation rewrites source location, which breaks the build-time
|
||||
# # only test test.test_pyexpat.HandlerExceptionTest as it cannot find source file in
|
||||
# # the to-be-installed debug package
|
||||
|
|
@ -80,7 +73,7 @@ build() {
|
|||
#
|
||||
# LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
|
||||
# LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" \
|
||||
# "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_socket -x test_tk -x test_pyexpat
|
||||
# "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_tk -x test_pyexpat
|
||||
#}
|
||||
|
||||
package_python() {
|
||||
|
|
@ -120,7 +113,7 @@ package_python() {
|
|||
|
||||
# Split tests
|
||||
cd "$pkgdir"/usr/lib/python*/
|
||||
rm -r {ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,sqlite3/test,tkinter/test,unittest/test}
|
||||
rm -r {ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,tkinter/test,unittest/test}
|
||||
cd test
|
||||
# FS#76193
|
||||
rm -r !(support)
|
||||
|
|
@ -134,7 +127,7 @@ package_python-tests() {
|
|||
|
||||
make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" libinstall
|
||||
cd "$pkgdir"/usr/lib/python*/
|
||||
rm -r !(test|ctypes|distutils|idlelib|lib2to3|sqlite3|tkinter|unittest)
|
||||
rm -r !(test|ctypes|distutils|idlelib|lib2to3|tkinter|unittest)
|
||||
cd "$pkgdir"/usr/lib/python*/test
|
||||
rm -r support
|
||||
cd "$pkgdir"/usr/lib/python*/ctypes
|
||||
|
|
@ -145,8 +138,6 @@ package_python-tests() {
|
|||
rm -r !(idle_test)
|
||||
cd "$pkgdir"/usr/lib/python*/lib2to3
|
||||
rm -r !(tests)
|
||||
cd "$pkgdir"/usr/lib/python*/sqlite3
|
||||
rm -r !(test)
|
||||
cd "$pkgdir"/usr/lib/python*/tkinter
|
||||
rm -r !(test)
|
||||
cd "$pkgdir"/usr/lib/python*/unittest
|
||||
|
|
@ -163,9 +154,12 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re
|
|||
'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz@langa.pl>
|
||||
'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado <pablogsal@gmail.com>
|
||||
|
||||
sha256sums=(0419e9085bf51b7a672009b3f50dbf1859acdf18ba725d0ec19aa5c8503f0ea3 # Python-3.10.10.tar.xz
|
||||
e500dcfebc172ac1b447ac00900da617f658846d9b36d0b254858b9d4645948a) # Python-3.10.10.tar.xz.asc
|
||||
sha256sums=(8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e # Python-3.11.3.tar.xz
|
||||
1a5d26f131506b735645debbf605767e197f98b046191fbcf08246256d2d682c) # Python-3.11.3.tar.xz.asc
|
||||
|
||||
## b9329540c743d7f1a535b7adf3956ef0cdfd9502d0a7d6be020d8928e3cfe6b4 python-3.10.10-01-x86_64.pkg.tar.lz
|
||||
## f4d26ce8dc0d3b555e30c09983937331019448ff514696f1d9ebb502997e0b42 python-tests-3.10.10-01-x86_64.pkg.tar.lz
|
||||
sha512sums=('a3bba4b69322a47bfeefe42ba0fd7331b5b67fd2ab41441e2219d16ef8c6f307f1a48977afd073c18cfd24ec6cb1bfe0c4bb4b273031eb524dc7e9fb5fbcc3b6'
|
||||
'SKIP')
|
||||
##
|
||||
|
||||
60ff64226ee73a6d8bcefc61f78cbf3623bfa0359298b3298b39f43b69e6fac9 python-3.11.3-01-x86_64.pkg.tar.lz
|
||||
24173904a906ac277053bcb3c52f7f650c53cdedf5f90408e75c4a8fe293e19a python-tests-3.11.3-01-x86_64.pkg.tar.lz
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ shopt -s extglob
|
|||
|
||||
pkgbase=python
|
||||
pkgname=(python python-tests)
|
||||
pkgver=3.10.10
|
||||
pkgver=3.11.3
|
||||
pkgrel=1
|
||||
_pybasever=${pkgver%.*}
|
||||
pkgdesc="Next generation of the python high-level scripting language"
|
||||
|
|
@ -18,7 +18,7 @@ url="https://www.python.org/"
|
|||
depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib')
|
||||
makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
|
||||
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc})
|
||||
sha512sums=('f0aee65970a68287b34c4eafcf35c6fa09c81ba234ac356db16fbbc6c36417e4ac67071e616d118f5e192d541d7f177dcab5585b9780e842f656c09e01c37ced'
|
||||
sha512sums=('a3bba4b69322a47bfeefe42ba0fd7331b5b67fd2ab41441e2219d16ef8c6f307f1a48977afd073c18cfd24ec6cb1bfe0c4bb4b273031eb524dc7e9fb5fbcc3b6'
|
||||
'SKIP')
|
||||
validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) <nad@python.org>
|
||||
'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz@langa.pl>
|
||||
|
|
@ -65,8 +65,7 @@ build() {
|
|||
}
|
||||
|
||||
check() {
|
||||
# test_socket: test.test_socket.RDSTest.testPeek hangs https://bugs.python.org/issue35247
|
||||
# test_tk: tkinter.test.test_tkinter.test_colorchooser.DefaultRootTest hangs
|
||||
# test_tk: test_askcolor tkinter.test.test_tkinter.test_colorchooser.DefaultRootTest hangs
|
||||
# test_pyexpat: our `debug` implementation rewrites source location, which breaks the build-time
|
||||
# only test test.test_pyexpat.HandlerExceptionTest as it cannot find source file in
|
||||
# the to-be-installed debug package
|
||||
|
|
@ -79,7 +78,7 @@ check() {
|
|||
|
||||
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
|
||||
LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" \
|
||||
"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_socket -x test_tk -x test_pyexpat
|
||||
"${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_tk -x test_pyexpat
|
||||
}
|
||||
|
||||
package_python() {
|
||||
|
|
@ -119,7 +118,7 @@ package_python() {
|
|||
|
||||
# Split tests
|
||||
cd "$pkgdir"/usr/lib/python*/
|
||||
rm -r {ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,sqlite3/test,tkinter/test,unittest/test}
|
||||
rm -r {ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,tkinter/test,unittest/test}
|
||||
cd test
|
||||
# FS#76193
|
||||
rm -r !(support)
|
||||
|
|
@ -133,7 +132,7 @@ package_python-tests() {
|
|||
|
||||
make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" libinstall
|
||||
cd "$pkgdir"/usr/lib/python*/
|
||||
rm -r !(test|ctypes|distutils|idlelib|lib2to3|sqlite3|tkinter|unittest)
|
||||
rm -r !(test|ctypes|distutils|idlelib|lib2to3|tkinter|unittest)
|
||||
cd "$pkgdir"/usr/lib/python*/test
|
||||
rm -r support
|
||||
cd "$pkgdir"/usr/lib/python*/ctypes
|
||||
|
|
@ -144,8 +143,6 @@ package_python-tests() {
|
|||
rm -r !(idle_test)
|
||||
cd "$pkgdir"/usr/lib/python*/lib2to3
|
||||
rm -r !(tests)
|
||||
cd "$pkgdir"/usr/lib/python*/sqlite3
|
||||
rm -r !(test)
|
||||
cd "$pkgdir"/usr/lib/python*/tkinter
|
||||
rm -r !(test)
|
||||
cd "$pkgdir"/usr/lib/python*/unittest
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
----------------------------------------------------------------------
|
||||
Ran 210 tests in 0.282s
|
||||
|
||||
OK (skipped=26)
|
||||
|
||||
== Tests result: FAILURE ==
|
||||
|
||||
415 tests OK.
|
||||
|
||||
1 test failed:
|
||||
test_signal
|
||||
|
||||
9 tests skipped:
|
||||
test_devpoll test_gdb test_kqueue test_msilib test_startfile
|
||||
test_winconsoleio test_winreg test_winsound test_zipfile64
|
||||
|
||||
Total duration: 27 min 30 sec
|
||||
Tests result: FAILURE
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
311 tests OK.
|
||||
|
||||
1 test failed:
|
||||
test_signal
|
||||
|
||||
5 tests skipped:
|
||||
test_devpoll test_gdb test_kqueue test_launcher test_msilib
|
||||
|
||||
Total duration: 9 hour 3 min
|
||||
Tests result: FAILURE, INTERRUPTED
|
||||
/usr/bin/xvfb-run: line 186: kill: (15850) - No such process
|
||||
|
|
@ -10,7 +10,7 @@ pkgname=(util-linux util-linux-libs)
|
|||
_pkgmajor=2.38
|
||||
_realver=${_pkgmajor}.1
|
||||
pkgver=${_realver/-/}
|
||||
pkgrel=03
|
||||
pkgrel=04
|
||||
pkgdesc='Miscellaneous system utilities for Linux w/o systemd'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python')
|
||||
|
|
@ -69,6 +69,8 @@ package_util-linux() {
|
|||
etc/pam.d/su
|
||||
etc/pam.d/su-l)
|
||||
|
||||
_python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
|
||||
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
|
||||
|
||||
# remove static libraries
|
||||
|
|
@ -94,8 +96,8 @@ package_util-linux() {
|
|||
mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
|
||||
mv "$pkgdir"/usr/include util-linux-libs/include
|
||||
mv "$pkgdir"/usr/lib/python3.10/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/usr/lib/python3.10
|
||||
mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/"${_python_stdlib}"
|
||||
mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
|
||||
|
||||
### install sysusers
|
||||
|
|
@ -112,24 +114,6 @@ package_util-linux() {
|
|||
# "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
package_util-linux-libs() {
|
||||
pkgdesc="util-linux runtime libraries"
|
||||
depends=('glibc')
|
||||
|
|
@ -137,10 +121,11 @@ package_util-linux-libs() {
|
|||
conflicts=('libutil-linux')
|
||||
replaces=('libutil-linux')
|
||||
optdepends=('python: python bindings to libmount')
|
||||
install -d -m0755 "$pkgdir"/usr/{lib/python3.10/,share/man/}
|
||||
|
||||
install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/}
|
||||
mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
|
||||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/usr/lib/python3.10/site-packages
|
||||
mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
|
||||
}
|
||||
|
|
@ -162,6 +147,6 @@ sha256sums=(60492a19b44e6cf9a3ddff68325b333b8b52b6c59ce3ebd6a0ecaa4c5117e84f # u
|
|||
10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3 # util-linux.sysusers
|
||||
7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37) # 60-rfkill.rules
|
||||
|
||||
## 11c802f75ee223e5565844c2480fa65c5abec686744330ae032afb90aeb610bd util-linux-2.38.1-03-x86_64.pkg.tar.lz
|
||||
## 8f069ce441cb62a4c96764110c25312d968e18e7f17872aca11717869ed35ff3 util-linux-libs-2.38.1-03-x86_64.pkg.tar.lz
|
||||
## c120f45f553bf113e8906a7621437493c9c0156f8490e4d282be938acb6104f4 util-linux-2.38.1-04-x86_64.pkg.tar.lz
|
||||
## cdb7eda8737e00659127ef85cdf9c5081d0b7a1638c6024ccf8a388febd4d9d1 util-linux-libs-2.38.1-04-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ pkgname=(util-linux util-linux-libs)
|
|||
_pkgmajor=2.38
|
||||
_realver=${_pkgmajor}.1
|
||||
pkgver=${_realver/-/}
|
||||
pkgrel=3
|
||||
pkgrel=4
|
||||
pkgdesc='Miscellaneous system utilities for Linux'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
arch=('x86_64')
|
||||
|
|
@ -69,6 +69,8 @@ package_util-linux() {
|
|||
etc/pam.d/su
|
||||
etc/pam.d/su-l)
|
||||
|
||||
_python_stdlib="$(python -c 'import sysconfig; print(sysconfig.get_paths()["stdlib"])')"
|
||||
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" usrsbin_execdir=/usr/bin install
|
||||
|
||||
# remove static libraries
|
||||
|
|
@ -94,8 +96,8 @@ package_util-linux() {
|
|||
mv "$pkgdir"/usr/lib/lib*.so* util-linux-libs/lib/
|
||||
mv "$pkgdir"/usr/lib/pkgconfig util-linux-libs/lib/pkgconfig
|
||||
mv "$pkgdir"/usr/include util-linux-libs/include
|
||||
mv "$pkgdir"/usr/lib/python3.10/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/usr/lib/python3.10
|
||||
mv "$pkgdir"/"${_python_stdlib}"/site-packages util-linux-libs/site-packages
|
||||
rmdir "$pkgdir"/"${_python_stdlib}"
|
||||
mv "$pkgdir"/usr/share/man/man3 util-linux-libs/man3
|
||||
|
||||
# install systemd-sysusers
|
||||
|
|
@ -119,9 +121,9 @@ package_util-linux-libs() {
|
|||
replaces=('libutil-linux')
|
||||
optdepends=('python: python bindings to libmount')
|
||||
|
||||
install -d -m0755 "$pkgdir"/usr/{lib/python3.10/,share/man/}
|
||||
install -d -m0755 "$pkgdir"/{"${_python_stdlib}",usr/share/man/}
|
||||
mv util-linux-libs/lib/* "$pkgdir"/usr/lib/
|
||||
mv util-linux-libs/include "$pkgdir"/usr/include
|
||||
mv util-linux-libs/site-packages "$pkgdir"/usr/lib/python3.10/site-packages
|
||||
mv util-linux-libs/site-packages "$pkgdir"/"${_python_stdlib}"/site-packages
|
||||
mv util-linux-libs/man3 "$pkgdir"/usr/share/man/man3
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,130 @@
|
|||
# Maintainer: Tom Gundersen <teg@jklm.no>
|
||||
# Maintainer: Dave Reisner <dreisner@archlinux.org>
|
||||
# Contributor: judd <jvinet@zeroflux.org>
|
||||
|
||||
pkgbase=util-linux
|
||||
pkgname=(util-linux util-linux-libs)
|
||||
_pkgmajor=2.37
|
||||
_realver=${_pkgmajor}.4
|
||||
pkgver=${_realver/-/}
|
||||
pkgrel=1
|
||||
pkgdesc='Miscellaneous system utilities for Linux'
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
arch=('x86_64')
|
||||
makedepends=('asciidoctor' 'libcap-ng' 'libxcrypt' 'python' 'systemd')
|
||||
license=('GPL2')
|
||||
options=('debug' 'strip')
|
||||
validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak
|
||||
source=("https://www.kernel.org/pub/linux/utils/util-linux/v${_pkgmajor}/${pkgbase}-${_realver}.tar."{xz,sign}
|
||||
'0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch'
|
||||
pam-{login,common,runuser,su}
|
||||
'util-linux.sysusers'
|
||||
'60-rfkill.rules'
|
||||
'rfkill-unblock_.service'
|
||||
'rfkill-block_.service')
|
||||
sha256sums=('634e6916ad913366c3536b6468e7844769549b99a7b2bf80314de78ab5655b83'
|
||||
'SKIP'
|
||||
'53395b7e434b32e6fee25f1b6fa59330ab72c1a2f99a17c3d3fd92473379fd9a'
|
||||
'99cd77f21ee44a0c5e57b0f3670f711a00496f198fc5704d7e44f5d817c81a0f'
|
||||
'57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
|
||||
'48d6fba767631e3dd3620cf02a71a74c5d65a525d4c4ce4b5a0b7d9f41ebfea1'
|
||||
'3f54249ac2db44945d6d12ec728dcd0d69af0735787a8b078eacd2c67e38155b'
|
||||
'10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3'
|
||||
'7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37'
|
||||
'8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376'
|
||||
'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36')
|
||||
|
||||
prepare() {
|
||||
cd "${pkgbase}-${_realver}"
|
||||
|
||||
patch -Np1 < ../0001-agetty-resolve-tty-name-even-if-stdin-is-specified.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${pkgbase}-${_realver}"
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--libdir=/usr/lib \
|
||||
--bindir=/usr/bin \
|
||||
--sbindir=/usr/bin \
|
||||
--localstatedir=/var \
|
||||
--enable-usrdir-path \
|
||||
--enable-fs-paths-default=/usr/bin:/usr/local/bin \
|
||||
--enable-raw \
|
||||
--enable-vipw \
|
||||
--enable-newgrp \
|
||||
--enable-chfn-chsh \
|
||||
--enable-write \
|
||||
--enable-mesg \
|
||||
--with-python=3
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
package_util-linux() {
|
||||
conflicts=('rfkill' 'hardlink')
|
||||
provides=('rfkill' 'hardlink')
|
||||
replaces=('rfkill' 'hardlink')
|
||||
depends=('pam' 'shadow' 'coreutils' 'systemd-libs' 'libsystemd.so'
|
||||
'libudev.so' 'libcap-ng' 'libxcrypt' 'libcrypt.so' 'util-linux-libs'
|
||||
'libmagic.so' 'libncursesw.so')
|
||||
optdepends=('python: python bindings to libmount'
|
||||
'words: default dictionary for look')
|
||||
backup=(etc/pam.d/chfn
|
||||
etc/pam.d/chsh
|
||||
etc/pam.d/login
|
||||
etc/pam.d/runuser
|
||||
etc/pam.d/runuser-l
|
||||
etc/pam.d/su
|
||||
etc/pam.d/su-l)
|
||||
|
||||
cd "${pkgbase}-${_realver}"
|
||||
|
||||
make DESTDIR="${pkgdir}" install
|
||||
|
||||
# setuid chfn and chsh
|
||||
chmod 4755 "${pkgdir}"/usr/bin/{newgrp,ch{sh,fn}}
|
||||
|
||||
# install PAM files for login-utils
|
||||
install -Dm0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chfn"
|
||||
install -m0644 "${srcdir}/pam-common" "${pkgdir}/etc/pam.d/chsh"
|
||||
install -m0644 "${srcdir}/pam-login" "${pkgdir}/etc/pam.d/login"
|
||||
install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser"
|
||||
install -m0644 "${srcdir}/pam-runuser" "${pkgdir}/etc/pam.d/runuser-l"
|
||||
install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su"
|
||||
install -m0644 "${srcdir}/pam-su" "${pkgdir}/etc/pam.d/su-l"
|
||||
|
||||
# TODO(dreisner): offer this upstream?
|
||||
sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "${pkgdir}/usr/lib/systemd/system/uuidd.socket"
|
||||
|
||||
# adjust for usrmove
|
||||
# TODO(dreisner): fix configure.ac upstream so that this isn't needed
|
||||
cd "${pkgdir}"
|
||||
mv usr/sbin/* usr/bin
|
||||
rmdir usr/sbin
|
||||
|
||||
### runtime libs are shipped as part of util-linux-libs
|
||||
rm "${pkgdir}"/usr/lib/lib*.{a,so}*
|
||||
|
||||
### install systemd-sysusers
|
||||
install -Dm0644 "${srcdir}/util-linux.sysusers" \
|
||||
"${pkgdir}/usr/lib/sysusers.d/util-linux.conf"
|
||||
|
||||
install -Dm0644 "${srcdir}/60-rfkill.rules" \
|
||||
"${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
|
||||
|
||||
install -Dm0644 "${srcdir}/rfkill-unblock_.service" \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
|
||||
install -Dm0644 "${srcdir}/rfkill-block_.service" \
|
||||
"${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
|
||||
}
|
||||
|
||||
package_util-linux-libs() {
|
||||
pkgdesc="util-linux runtime libraries"
|
||||
provides=('libutil-linux' 'libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so')
|
||||
conflicts=('libutil-linux')
|
||||
replaces=('libutil-linux')
|
||||
|
||||
make -C "${pkgbase}-${_realver}" DESTDIR="${pkgdir}" install-usrlib_execLTLIBRARIES
|
||||
}
|
||||
|
|
@ -0,0 +1,187 @@
|
|||
# Copyright : Obarun
|
||||
#------------------------
|
||||
# Maintainer : Eric Vidal <eric@obarun.org>
|
||||
# Maintainer : Jean-Michel T.Dydak <jean-michel@obarun.org>
|
||||
#----------------
|
||||
# Pkgbuild Src : https://git.obarun.org/pkg/obcore/util-linux
|
||||
#--------------------------------------------------------------
|
||||
# DESCRIPTION ]
|
||||
|
||||
pkgbase=util-linux
|
||||
_pkgmajor=2.37
|
||||
_realver=${_pkgmajor}.2
|
||||
pkgver=${_realver/-/}
|
||||
pkgrel=5
|
||||
pkgdesc="Miscellaneous system utilities for Linux"
|
||||
url='https://github.com/karelzak/util-linux'
|
||||
|
||||
pkgname=(
|
||||
'util-linux'
|
||||
'util-linux-libs'
|
||||
)
|
||||
|
||||
track="v${_pkgmajor}"
|
||||
target="$pkgbase-${_realver}"
|
||||
source=(
|
||||
"https://www.kernel.org/pub/linux/utils/util-linux/${track}/${target}.tar."{xz,sign}
|
||||
pam-login
|
||||
pam-common
|
||||
pam-runuser
|
||||
pam-su
|
||||
60-rfkill.rules
|
||||
util-linux.sysusers
|
||||
)
|
||||
|
||||
#----------------------
|
||||
# BUILD CONFIGURATION ]
|
||||
|
||||
makedepends=(
|
||||
'asciidoctor'
|
||||
'libcap-ng'
|
||||
'libxcrypt'
|
||||
'python'
|
||||
)
|
||||
|
||||
options=(
|
||||
'strip'
|
||||
)
|
||||
|
||||
#----------------
|
||||
# BUILD CONTROL ]
|
||||
|
||||
_flags=(
|
||||
--prefix=/usr
|
||||
--libdir=/usr/lib
|
||||
--bindir=/usr/bin
|
||||
--sbindir=/usr/bin
|
||||
--localstatedir=/var
|
||||
--enable-usrdir-path
|
||||
--enable-fs-paths-default=/usr/bin:/usr/local/bin
|
||||
--enable-raw
|
||||
--enable-vipw
|
||||
--enable-newgrp
|
||||
--enable-chfn-chsh
|
||||
--enable-write
|
||||
--enable-mesg
|
||||
--with-python=3
|
||||
--with-systemdsystemunitdir=no
|
||||
--with-systemd=no
|
||||
)
|
||||
|
||||
#--------
|
||||
# BUILD ]
|
||||
|
||||
build() {
|
||||
cd $pkgbase-${_realver}
|
||||
|
||||
./configure "${_flags[@]}"
|
||||
make
|
||||
}
|
||||
|
||||
#----------
|
||||
# PACKAGE ]
|
||||
|
||||
package_util-linux() {
|
||||
conflicts=(
|
||||
'rfkill'
|
||||
'hardlink'
|
||||
)
|
||||
provides=(
|
||||
'rfkill'
|
||||
'hardlink'
|
||||
)
|
||||
replaces=(
|
||||
'rfkill'
|
||||
'hardlink'
|
||||
)
|
||||
depends=(
|
||||
'pam'
|
||||
'shadow'
|
||||
'coreutils'
|
||||
'libeudev'
|
||||
'libcap-ng'
|
||||
'libxcrypt'
|
||||
'libcrypt.so'
|
||||
'util-linux-libs'
|
||||
'libmagic.so'
|
||||
'libncursesw.so'
|
||||
'libreadline.so'
|
||||
)
|
||||
optdepends=(
|
||||
'python: python bindings to libmount'
|
||||
'words: default dictionary for look'
|
||||
)
|
||||
backup=(
|
||||
'etc/pam.d/chfn'
|
||||
'etc/pam.d/chsh'
|
||||
'etc/pam.d/login'
|
||||
'etc/pam.d/runuser'
|
||||
'etc/pam.d/runuser-l'
|
||||
'etc/pam.d/su'
|
||||
'etc/pam.d/su-l'
|
||||
)
|
||||
|
||||
cd $pkgbase-${_realver}
|
||||
|
||||
make DESTDIR="$pkgdir" install
|
||||
|
||||
## setuid chfn and chsh
|
||||
chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
|
||||
|
||||
## install PAM files for login-utils
|
||||
install -Dm0644 "$srcdir"/pam-common "$pkgdir"/etc/pam.d/chfn
|
||||
install -m 0644 "$srcdir"/pam-common "$pkgdir"/etc/pam.d/chsh
|
||||
install -m 0644 "$srcdir"/pam-login "$pkgdir"/etc/pam.d/login
|
||||
install -m 0644 "$srcdir"/pam-runuser "$pkgdir"/etc/pam.d/runuser
|
||||
install -m 0644 "$srcdir"/pam-runuser "$pkgdir"/etc/pam.d/runuser-l
|
||||
install -m 0644 "$srcdir"/pam-su "$pkgdir"/etc/pam.d/su
|
||||
install -m 0644 "$srcdir"/pam-su "$pkgdir"/etc/pam.d/su-l
|
||||
|
||||
## adjust for usrmove
|
||||
## TODO(dreisner): fix configure.ac upstream so that this isn't needed
|
||||
cd "$pkgdir"
|
||||
mv usr/sbin/* usr/bin
|
||||
rmdir usr/sbin
|
||||
|
||||
### runtime libs are shipped as part of util-linux-libs
|
||||
rm "$pkgdir"/usr/lib/lib*.{a,so}*
|
||||
|
||||
### install pacopts applysys
|
||||
install -Dm 0644 "$srcdir"/util-linux.sysusers \
|
||||
"$pkgdir"/usr/lib/sysusers.d/util-linux.conf
|
||||
|
||||
install -Dm 0644 "$srcdir"/60-rfkill.rules \
|
||||
"$pkgdir"/usr/lib/udev/rules.d/60-rfkill.rules
|
||||
}
|
||||
|
||||
package_util-linux-libs() {
|
||||
pkgdesc="util-linux runtime libraries"
|
||||
provides=(
|
||||
'libutil-linux'
|
||||
'libblkid.so'
|
||||
'libfdisk.so'
|
||||
'libmount.so'
|
||||
'libsmartcols.so'
|
||||
'libuuid.so'
|
||||
)
|
||||
conflicts=(
|
||||
'libutil-linux'
|
||||
)
|
||||
replaces=(
|
||||
'libutil-linux'
|
||||
)
|
||||
|
||||
make -C "$pkgbase-${_realver}" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES
|
||||
}
|
||||
|
||||
#--------------------
|
||||
# ARCH LICENSE AUTH ]
|
||||
|
||||
arch=(x86_64)
|
||||
license=(GPL2)
|
||||
|
||||
validpgpkeys=(
|
||||
'B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284' # Karel Zak
|
||||
)
|
||||
|
||||
sha512sums=('')
|
||||
Loading…
Reference in New Issue