upg btrfs-progs icu libassuan procps-ng util-linux

This commit is contained in:
joborun linux 2023-06-21 20:46:04 +03:00
parent 8117c70bf6
commit 6b87f00c3c
18 changed files with 434 additions and 88 deletions

View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=btrfs-progs
pkgver=6.3.1
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')
@ -68,11 +68,12 @@ arch=(x86_64)
license=('GPL2')
validpgpkeys=(F2B41200C54EFB30380C1756C565D5F9D76D583B) # "David Sterba <dsterba@suse.cz>"
validpgpkeys=('F2B41200C54EFB30380C1756C565D5F9D76D583B')
sha256sums=(9ad98394c7936c3650445a134103a0db6ad3bf6f163917dfff49ff77614b3f14 # btrfs-progs-v6.3.1.tar.xz
03e5923842239dc4ad130908e112cbd1d74daa94574fa4d6162f8ad29227bdd1 # btrfs-progs-v6.3.1.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
## ea01309ed277ed411b1b30e4d59a6aadc84873d15479c574be4dc5f5dd912534 btrfs-progs-6.3.1-01-x86_64.pkg.tar.lz
## 344b7a3417353dff148ac153d153b7b53112fc7f09e693348243001233d98737 btrfs-progs-6.3-02-x86_64.pkg.tar.lz

View file

@ -3,8 +3,8 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=btrfs-progs
pkgver=6.3.1
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'
'9ad98394c7936c3650445a134103a0db6ad3bf6f163917dfff49ff77614b3f14'
'40a0bdff787ecb490e5533dbcefd4852176daf12aae5a1158203db43d8ad6a7d'
'bbe60b35d1b1e2efc1308a8f54f1fdc6808240a81c5f5b4d75321b7ee86e41f4'
'35efeee8590d6d60c711ae9cdc918e4841ab61d10cb02359e65e36ebff95ffc5'
'eaa7af92d28bfa8940bb551560fd7be777f9f175292eaa72b5f6ef00fb240252'

117
icu/ICU-22356.patch Normal file
View file

@ -0,0 +1,117 @@
From 4fd9d6ce9a951e66e727b296138f22cd05479de1 Mon Sep 17 00:00:00 2001
From: Fredrik Roubert <roubert@google.com>
Date: Tue, 18 Apr 2023 23:39:28 +0200
Subject: [PATCH] ICU-22356 Use ConstChar16Ptr to safely cast from UChar* to
char16_t*.
This is necessary for this header file to be usable by clients that
define UCHAR_TYPE as a type not compatible with char16_t, eg. uint16_t.
---
icu4c/source/common/unicode/ures.h | 9 +++++----
icu4c/source/test/intltest/Makefile.in | 2 +-
icu4c/source/test/intltest/intltest.vcxproj | 1 +
icu4c/source/test/intltest/intltest.vcxproj.filters | 3 +++
icu4c/source/test/intltest/uchar_type_build_test.cpp | 7 +++++++
5 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 icu4c/source/test/intltest/uchar_type_build_test.cpp
diff --git a/icu4c/source/common/unicode/ures.h b/icu4c/source/common/unicode/ures.h
index cc25b6e49cd..babc01d426a 100644
--- a/icu4c/source/common/unicode/ures.h
+++ b/icu4c/source/common/unicode/ures.h
@@ -25,6 +25,7 @@
#ifndef URES_H
#define URES_H
+#include "unicode/char16ptr.h"
#include "unicode/utypes.h"
#include "unicode/uloc.h"
@@ -812,7 +813,7 @@ inline UnicodeString
ures_getUnicodeString(const UResourceBundle *resB, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
- const char16_t *r = ures_getString(resB, &len, status);
+ const char16_t *r = ConstChar16Ptr(ures_getString(resB, &len, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
@@ -837,7 +838,7 @@ inline UnicodeString
ures_getNextUnicodeString(UResourceBundle *resB, const char ** key, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
- const char16_t* r = ures_getNextString(resB, &len, key, status);
+ const char16_t* r = ConstChar16Ptr(ures_getNextString(resB, &len, key, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
@@ -859,7 +860,7 @@ inline UnicodeString
ures_getUnicodeStringByIndex(const UResourceBundle *resB, int32_t indexS, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
- const char16_t* r = ures_getStringByIndex(resB, indexS, &len, status);
+ const char16_t* r = ConstChar16Ptr(ures_getStringByIndex(resB, indexS, &len, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
@@ -882,7 +883,7 @@ inline UnicodeString
ures_getUnicodeStringByKey(const UResourceBundle *resB, const char* key, UErrorCode* status) {
UnicodeString result;
int32_t len = 0;
- const char16_t* r = ures_getStringByKey(resB, key, &len, status);
+ const char16_t* r = ConstChar16Ptr(ures_getStringByKey(resB, key, &len, status));
if(U_SUCCESS(*status)) {
result.setTo(true, r, len);
} else {
diff --git a/icu4c/source/test/intltest/Makefile.in b/icu4c/source/test/intltest/Makefile.in
index 8007d3c1880..f57f8d995f4 100644
--- a/icu4c/source/test/intltest/Makefile.in
+++ b/icu4c/source/test/intltest/Makefile.in
@@ -70,7 +70,7 @@ numbertest_parse.o numbertest_doubleconversion.o numbertest_skeletons.o \
static_unisets_test.o numfmtdatadriventest.o numbertest_range.o erarulestest.o \
formattedvaluetest.o formatted_string_builder_test.o numbertest_permutation.o \
units_data_test.o units_router_test.o units_test.o displayoptions_test.o \
-numbertest_simple.o
+numbertest_simple.o uchar_type_build_test.o
DEPS = $(OBJECTS:.o=.d)
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 0985ba1e808..71ce1254038 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -291,6 +291,7 @@
<ClCompile Include="units_data_test.cpp" />
<ClCompile Include="units_router_test.cpp" />
<ClCompile Include="units_test.cpp" />
+ <ClCompile Include="uchar_type_build_test.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="colldata.h" />
diff --git a/icu4c/source/test/intltest/intltest.vcxproj.filters b/icu4c/source/test/intltest/intltest.vcxproj.filters
index ffe9bc1467d..5d8777c5aaf 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj.filters
+++ b/icu4c/source/test/intltest/intltest.vcxproj.filters
@@ -568,6 +568,9 @@
<ClCompile Include="units_test.cpp">
<Filter>formatting</Filter>
</ClCompile>
+ <ClCompile Include="uchar_type_build_test.cpp">
+ <Filter>configuration</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="itrbbi.h">
diff --git a/icu4c/source/test/intltest/uchar_type_build_test.cpp b/icu4c/source/test/intltest/uchar_type_build_test.cpp
new file mode 100644
index 00000000000..ca9335441a3
--- /dev/null
+++ b/icu4c/source/test/intltest/uchar_type_build_test.cpp
@@ -0,0 +1,7 @@
+// © 2023 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html#License
+
+// ICU-22356 Test that client code can be built with UCHAR_TYPE redefined.
+#undef UCHAR_TYPE
+#define UCHAR_TYPE uint16_t
+#include "unicode/ures.h"

View file

@ -5,19 +5,27 @@
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
## **** This is not on testing yet, it is not ready to be used till its dependents are built ***
## the current stable version is 72.1 and the patch is ommitted
pkgname=icu
pkgver=72.1
pkgrel=02
pkgver=73.2
pkgrel=01
pkgdesc="International Components for Unicode library"
arch=(x86_64)
groups=( jobbot )
url="https://icu.unicode.org"
depends=('gcc-libs' 'sh')
depends=('gcc-libs' 'glibc' 'sh')
makedepends=('python')
provides=(libicu{data,i18n,io,test,tu,uc}.so)
# options=('debug') ### uncomment this for debug pkg
source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc})
# https://github.com/unicode-org/icu/releases/download/release-71-1/SHASUM512.txt
source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc}
https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt)
#prepare() {
# cd icu/source
# # https://unicode-org.atlassian.net/browse/ICU-22356
# patch -Np3 -i ../../ICU-22356.patch
#}
build() {
cd icu/source
@ -28,21 +36,10 @@ build() {
make
}
#
#ALL TESTS SUMMARY:
#ok: testdata intltest iotest
#===== ERRS: cintltst
#make[1]: *** [Makefile:91: check-recursive] Error 1
#make[1]: Target 'check' not remade because of errors.
#make[1]: Leaving directory '/src/pkg/jobcore/icu/src/icu/source/test'
#make: *** [Makefile:153: check-recursive] Error 2
#make: Target 'check' not remade because of errors.
#
#check() {
# cd icu/source
# make -k check
#}
#
check() {
cd icu/source
make -k check
}
package() {
cd icu/source
@ -52,19 +49,29 @@ package() {
install -Dm644 "${srcdir}"/icu/LICENSE "${pkgdir}"/usr/share/licenses/icu/LICENSE
}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('custom:icu')
#validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"
#validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"
#validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"
validpgpkeys+=('FFA9129A180D765B7A5BEA1C9B432B27D1BA20D7') # "Fredrik Roubert <fredrik@roubert.name>"
#validpgpkeys+=('E4098B78AFC94394F3F49AA903996C7C83F12F11') # "keybase.io/srl295 <srl295@keybase.io>"
#validpgpkeys+=('4569BBC09DA846FC91CBD21CE1BBA44593CF2AE0') # "Steven R. Loomis (codesign-qormi) <srloomis@us.ibm.com>"
#validpgpkeys=('0E51E7F06EF719FBD072782A5F56E5AFA63CCD33') #"Craig Cornelius (For use with ICU releases) <ccornelius@google.com>"
validpgpkeys=('3DA35301A7C330257B8755754058F67406EAA6AB') # Craig Cornelius <ccornelius@google.com>
# https://github.com/unicode-org/icu/releases/download/release-71-1/SHASUM512.txt
sha512sums=('76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62'
'SKIP'
SKIP)
sha256sums=(a2d2d38217092a7ed56635e34467f92f976b370e20182ad325edea6681a71d68 # icu4c-72_1-src.tgz
87b6ff610d587292cec0444fa8cbbfb12994cb89bade40578f5ba6470de245c7) # icu4c-72_1-src.tgz.asc
## https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt
## 76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 icu4c-73_2-src.tgz
sha256sums=(818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1 # icu4c-73_2-src.tgz
ee0759320a3093fb3bd55345bfc38acc1b660414b9dde0ce36779616eda76ca7 # icu4c-73_2-src.tgz.asc
645fb72d95d845bf994724ea7d9c51a9109c0d65abd514e77ec444bc25b22ce2) # SHASUM512.txt
## d44ea5460e66d83d649329afcabadbff22c182b1fb67b92d5619b31d4e6b210f icu-73.2-01-x86_64.pkg.tar.lz

View file

@ -2,19 +2,18 @@
# Contributor: Art Gramlich <art@gramlich-net.com>
pkgname=icu
pkgver=72.1
pkgrel=2
pkgver=73.2
pkgrel=1
pkgdesc="International Components for Unicode library"
arch=(x86_64)
url="https://icu.unicode.org"
license=('custom:icu')
depends=('gcc-libs' 'sh')
depends=('gcc-libs' 'glibc' 'sh')
makedepends=('python')
provides=(libicu{data,i18n,io,test,tu,uc}.so)
options=('debug')
source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${pkgname}4c-${pkgver//./_}-src.tgz{,.asc})
# https://github.com/unicode-org/icu/releases/download/release-71-1/SHASUM512.txt
sha512sums=('848c341b37c0ff077e34a95d92c6200d5aaddd0ee5e06134101a74e04deb08256a5e817c8aefab020986abe810b7827dd7b2169a60dacd250c298870518dcae8'
# https://github.com/unicode-org/icu/releases/download/release-73-2/SHASUM512.txt
sha512sums=('76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62'
'SKIP')
#validpgpkeys=('BA90283A60D67BA0DD910A893932080F4FB419E3') # "Steven R. Loomis (filfla-signing) <srloomis@us.ibm.com>"
#validpgpkeys+=('9731166CD8E23A83BEE7C6D3ACA5DBE1FD8FABF1') # "Steven R. Loomis (ICU Project) <srl@icu-project.org>"

8
icu/SHASUM512.txt Normal file
View file

@ -0,0 +1,8 @@
8512947da7b2a927627abed6bd7e04218cd4fcd02d44eb72a82ffa87aedabfc3be5d3152e9fba33a769ef35e2db55764c2ab8f5bd65b4e89aa9c15b33392e078 icu4c-73_2-data-bin-b.zip
420c2f5090927dab13f5449da3b0ec7bf86a91ea8723f177aca2907a8eea9bcb4c3475b66c54355ae320001813db57a00afdab00bd85b8c36d39adedcab80bfc icu4c-73_2-data-bin-l.zip
7f25816de4062fe79eaf350cb5230747643b9bb08c60443b4e1b2d79eb1ce3192ae9a767107171b85bda4cfc1969035ce09cebc81add0590eb4d61ca33aa0730 icu4c-73_2-data.zip
e150045c0db9c5d560ca088feaf34b472380ce9c45232217d55447328ac456afed03a3c06bd687bd6e80bdad9cc530368b3699f42b96a9ea9ad3c2bfc02d7fa1 icu4c-73_2-docs.zip
985f36c59cf005300156f4c288c3e93e7b5facd63d26682374b916500e016103284bae63211d9d8f8b31c8e7ccceee98684565e949a243289db1b8c4710263d7 icu4c-73_2-src.zip
73bb91e28d994fdc39d9fa403f21e365fa27117ed9af2d433ca31df9dc8945f16218c193883c798a5e30925386220a005b1a3c81a125f57dd61ab673bfd280f0 icu4c-73_2-Fedora_Linux37-x64.tgz
76dd782db6205833f289d7eb68b60860dddfa3f614f0ba03fe7ec13117077f82109f0dc1becabcdf4c8a9c628b94478ab0a46134bdb06f4302be55f74027ce62 icu4c-73_2-src.tgz
0cea92c89601548ccc5406edd91251389c66d8dde429027a41693edc83d20be0c46380f30824f5228bad023b038c96138a09527903d795e452c24840f1744338 icu4c-73_2-Ubuntu22.04-x64.tgz

View file

@ -1,4 +1,3 @@
python

View file

@ -1,2 +1,2 @@
gpg -v --recv-key 5F56E5AFA63CCD33
gpg -v --recv-keys 4058F67406EAA6AB
gpg -v --recv-key 9B432B27D1BA20D7
gpg -v --recv-key 4058F67406EAA6AB

View file

@ -1,6 +1,6 @@
real 7m23.806s
user 6m23.429s
sys 0m26.221s
real 6m1.173s
user 7m3.137s
sys 0m11.966s

View file

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libassuan
pkgver=2.5.5
pkgrel=02
pkgver=2.5.6
pkgrel=01
pkgdesc='IPC library used by some GnuPG related software'
url="https://www.gnupg.org/related_software/libassuan/"
depends=('glibc' 'libgpg-error')
@ -39,8 +39,12 @@ license=('GPL3')
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)"
sha256sums=(8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4 # libassuan-2.5.5.tar.bz2
0f284f9c74386306eff77b1ffa9d36d2689bd1d93290870f5365513bd3ee3669) # libassuan-2.5.5.tar.bz2.sig
sha512sums=('dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee'
'SKIP')
b2sums=('462af1eab69e157f65f8134a492cde01dd1e0ee00609f2c2585e742fb9c5532b3fd96054b4fb7449e305690f70aa7a120085db42e2de2e3b0ef8b1603e7e5846'
'SKIP')
## 3db52174ed23654d3fd5817e5ab99eab199739ebf8ceee6db72d960a0aee0e55 libassuan-2.5.5-02-x86_64.pkg.tar.lz
sha256sums=(e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426 # libassuan-2.5.6.tar.bz2
e601a5ecd89e66a09d09ca405f4e419a6271aacf2ea27ba8ba93c0b61e638bc1) # libassuan-2.5.6.tar.bz2.sig
## 52a72b25ad03f0597bd4639b766666001d7fa864c869975debed7903cb165d2d libassuan-2.5.6-01-x86_64.pkg.tar.lz

View file

@ -3,8 +3,8 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libassuan
pkgver=2.5.5
pkgrel=2
pkgver=2.5.6
pkgrel=1
pkgdesc='IPC library used by some GnuPG related software'
arch=(x86_64)
url="https://www.gnupg.org/related_software/libassuan/"
@ -12,9 +12,9 @@ license=(GPL3)
depends=(glibc libgpg-error sh)
provides=(libassuan.so)
source=(https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
sha512sums=('70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403'
sha512sums=('dcca942d222a2c226a7e34ba7988ee0c3c55bd6032166eb472caf2053db89aeeea7a40e93d8c2887c7ee73c5f838e8b0725e8cfb595accc1606646559362f7ee'
'SKIP')
b2sums=('24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d'
b2sums=('462af1eab69e157f65f8134a492cde01dd1e0ee00609f2c2585e742fb9c5532b3fd96054b4fb7449e305690f70aa7a120085db42e2de2e3b0ef8b1603e7e5846'
'SKIP')
validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)"

View file

@ -5,11 +5,13 @@
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
### *** this is from staging rebuilt on icu from staging DO NOT USE YET *** ###
#pkgbase=libxml2
#pkgname=(libxml2 libxml2-docs)
pkgname=libxml2
pkgver=2.10.4
pkgrel=04
pkgrel=06
# 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"
@ -105,4 +107,6 @@ sha256sums=(SKIP
4c426ffa9c8f397929ff575748fbed9a2db036033a3738d95c1d5309e666de59 # 0002-HACK-Don-t-run-fuzzing-tests.patch
9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f) # xmlts20130923.tar.gz
## a345aedb1b236e9cda058d933f564fd19c000eedc91bf2c240310d34cb6b5e1f libxml2-2.10.4-04-x86_64.pkg.tar.lz
## bfb32da211ceae95615a07a03da970ea8a6b6076f2aa7c6160acaecf9ffa71fd libxml2-2.10.4-06-x86_64.pkg.tar.lz
bfb32da211ceae95615a07a03da970ea8a6b6076f2aa7c6160acaecf9ffa71fd libxml2-2.10.4-06-x86_64.pkg.tar.lz
9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f xmlts20130923.tar.gz

View file

@ -10,7 +10,7 @@ pkgname=(
libxml2-docs
)
pkgver=2.10.4
pkgrel=3
pkgrel=6
pkgdesc="XML C parser and toolkit"
url="https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home"
arch=(x86_64)

View file

@ -1,31 +1,31 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=procps-ng
pkgver=3.3.17
pkgver=4.0.3
pkgrel=01
pkgdesc='Utilities for monitoring your system and its processes w/o systemd'
url='https://gitlab.com/procps-ng/procps'
arch=(x86_64)
depends=(glibc ncurses libncursesw.so)
conflicts=(procps sysvinit-tools)
provides=(procps sysvinit-tools libprocps.so)
provides=(procps sysvinit-tools libproc2.so)
replaces=(procps sysvinit-tools)
options=('!emptydirs')
source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc}
'sysctl.conf')
prepare() {
cd procps-$pkgver
sed 's:<ncursesw/:<:g' -i watch.c
cd procps-ng-$pkgver
sed 's:<ncursesw/:<:g' -i src/watch.c
}
build() {
cd procps-$pkgver
cd procps-ng-$pkgver
./configure \
--prefix=/usr \
--exec-prefix=/ \
@ -42,18 +42,21 @@ build() {
}
package() {
cd procps-$pkgver
cd procps-ng-$pkgver
make DESTDIR="$pkgdir" install
install -Dm644 "${srcdir}/sysctl.conf" "$pkgdir/etc/sysctl.conf"
}
#---- license gpg-key sha256sums ----
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=(GPL LGPL)
validpgpkeys=(5D3DF0F538B327C0AA7A77A2022166C0FF3C84E3 # Craig Small <csmall@debian.org>
5D2FB320B825D93904D205193938F96BDF50FEA5) # Craig Small <csmall@debian.org>
validpgpkeys=(5D2FB320B825D93904D205193938F96BDF50FEA5) # Craig Small <csmall@debian.org>
sha256sums=(4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4 # procps-ng-3.3.17.tar.xz
433aaad6098d8018ff4b7b4a20fdc0e25f55372ece6ca4f0009325f686c03499 # procps-ng-3.3.17.tar.xz.asc
sha256sums=(303c8ec4f96ae18d8eaef86c2bd0986938764a45dc505fe0a0af868c674dba92 # procps-ng-4.0.3.tar.xz
954700968c51367407cfdd0e13398038a127b716a5cb0996c354928b646a6700 # procps-ng-4.0.3.tar.xz.asc
1bba9d009539f9fe18c19f5c4f4272da276f5c13c8b21e7291baf2374deb5d24) # sysctl.conf
## 33084a1a5031f4285dc1a788627724be4c435835ed8fab6a916511ed6dfb8997 procps-ng-4.0.3-01-x86_64.pkg.tar.lz

View file

@ -1,10 +1,11 @@
# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Christian Hesse <eworm@archlinux.org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=procps-ng
pkgver=3.3.17
pkgver=4.0.3
pkgrel=1
pkgdesc='Utilities for monitoring your system and its processes'
url='https://gitlab.com/procps-ng/procps'
@ -13,26 +14,23 @@ arch=(x86_64)
depends=(glibc ncurses libncursesw.so systemd-libs)
makedepends=(systemd)
conflicts=(procps sysvinit-tools)
provides=(procps sysvinit-tools libprocps.so)
provides=(procps sysvinit-tools libproc2.so)
replaces=(procps sysvinit-tools)
options=('!emptydirs')
validpgpkeys=('5D2FB320B825D93904D205193938F96BDF50FEA5') # Craig Small <csmall@debian.org>
source=(https://downloads.sourceforge.net/project/$pkgname/Production/${pkgname}-${pkgver}.tar.xz{,.asc})
sha256sums=('4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4'
sha256sums=('303c8ec4f96ae18d8eaef86c2bd0986938764a45dc505fe0a0af868c674dba92'
'SKIP')
b2sums=('43aa1a21d4f0725b1c02457f343cf1fc66bc1771b25c6eaf689c9775c190e90545bfac1729f027abc4d3d13de37ffac4828554b5b25e12bcf6af9540de1695f3'
b2sums=('138995397aa2ae742a457a4b2ddd65f67ba29d2eb9bd330a6e44f3cb65e93fc87122f3bd4cc8d10c0d73c7981a3d0d0472949d2d3b83c582cd0376c713698d1f'
'SKIP')
validpgpkeys=(
'5D3DF0F538B327C0AA7A77A2022166C0FF3C84E3' # Craig Small <csmall@debian.org>
'5D2FB320B825D93904D205193938F96BDF50FEA5' # Craig Small <csmall@debian.org>
)
prepare() {
cd procps-$pkgver
sed 's:<ncursesw/:<:g' -i watch.c
cd procps-ng-$pkgver
sed 's:<ncursesw/:<:g' -i src/watch.c
}
build() {
cd procps-$pkgver
cd procps-ng-$pkgver
./configure \
--prefix=/usr \
--exec-prefix=/ \
@ -49,8 +47,6 @@ build() {
}
package() {
cd procps-$pkgver
cd procps-ng-$pkgver
make DESTDIR="$pkgdir" install
}
# vim: ts=2 sw=2 et:

View file

@ -1 +1,2 @@

View file

@ -0,0 +1,208 @@
From 60d457f52991e6f6472171035974ce7a3ae621f3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 14:09:02 +0200
Subject: [PATCH 1/8] meson: install chfn setuid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index af9add457..eebf9df8f 100644
--- a/meson.build
+++ b/meson.build
@@ -896,6 +896,7 @@ exe = executable(
link_with : [lib_common, logindefs_c],
dependencies : chfn_chsh_deps,
install_dir : usrbin_exec_dir,
+ install_mode : 'rwsr-xr-x',
install : opt,
build_by_default : opt)
--
2.41.0
From a13574b1de21d7fd9a0ad63790a7452c369e46e5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 14:09:02 +0200
Subject: [PATCH 2/8] meson: install chsh setuid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index eebf9df8f..eae42f01a 100644
--- a/meson.build
+++ b/meson.build
@@ -909,6 +909,7 @@ exe2 = executable(
link_with : lib_common,
dependencies : chfn_chsh_deps,
install_dir : usrbin_exec_dir,
+ install_mode : 'rwsr-xr-x',
install : opt,
build_by_default : opt)
if opt and not is_disabler(exe)
--
2.41.0
From fb8c224eae4e28502e05770d35c8e3b8509a9b69 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 14:09:02 +0200
Subject: [PATCH 3/8] meson: install su setuid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index eae42f01a..6da9821c0 100644
--- a/meson.build
+++ b/meson.build
@@ -997,6 +997,7 @@ exe = executable(
lib_pam_misc,
lib_util,
realtime_libs],
+ install_mode : 'rwsr-xr-x',
install : opt,
build_by_default : opt)
if opt and not is_disabler(exe)
--
2.41.0
From cb3dee5a14da552a935680584d2fc5c37cb3a913 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 14:09:02 +0200
Subject: [PATCH 4/8] meson: install newgrp setuid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index 6da9821c0..a28e3eb9b 100644
--- a/meson.build
+++ b/meson.build
@@ -1013,6 +1013,7 @@ exe = executable(
include_directories : includes,
dependencies : [lib_crypt],
install_dir : usrbin_exec_dir,
+ install_mode : 'rwsr-xr-x',
install : opt,
build_by_default : opt)
if opt and not is_disabler(exe)
--
2.41.0
From 8f49b3693d6f1db36d5ecb7328965686362deaa3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 14:09:02 +0200
Subject: [PATCH 5/8] meson: install mount setuid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index a28e3eb9b..e8231991a 100644
--- a/meson.build
+++ b/meson.build
@@ -1630,6 +1630,7 @@ exe = executable(
lib_smartcols,
lib_mount],
dependencies : lib_selinux,
+ install_mode : 'rwsr-xr-x',
install : opt,
build_by_default : opt)
exe2 = executable(
--
2.41.0
From 1cb3c90ca5de6ffb43f8a40605118a8d84a0c6f3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 14:09:02 +0200
Subject: [PATCH 6/8] meson: install umount setuid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index e8231991a..74c15b243 100644
--- a/meson.build
+++ b/meson.build
@@ -1639,6 +1639,7 @@ exe2 = executable(
include_directories : includes,
link_with : [lib_common,
lib_mount],
+ install_mode : 'rwsr-xr-x',
install : opt,
build_by_default : opt)
if opt and not is_disabler(exe)
--
2.41.0
From 07641fd93c4829696c1e2101642fee32ad998025 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 15:02:57 +0200
Subject: [PATCH 7/8] meson: install wall setgid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index 74c15b243..8020f7d69 100644
--- a/meson.build
+++ b/meson.build
@@ -2390,6 +2390,7 @@ exe = executable(
include_directories : includes,
link_with : [lib_common],
install_dir : usrbin_exec_dir,
+ install_mode : 'rwxr-sr-x',
install : opt,
build_by_default : opt)
if opt
--
2.41.0
From cee78467bea45f7a4f890f0c65bd59441bd42697 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 9 Jun 2023 15:04:00 +0200
Subject: [PATCH 8/8] meson: install write setgid
... as this requires elevated privileges.
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index 8020f7d69..2b59e2f01 100644
--- a/meson.build
+++ b/meson.build
@@ -2409,6 +2409,7 @@ exe = executable(
include_directories : includes,
link_with : [lib_common],
install_dir : usrbin_exec_dir,
+ install_mode : 'rwxr-sr-x',
install : opt,
build_by_default : opt)
if opt
--
2.41.0

View file

@ -2,7 +2,6 @@ asciidoctor
python
git
meson
libutempter
bash-completion
cmake
cryptsetup