upg too many to list

add openssl-1.1
This commit is contained in:
joborun linux 2022-11-15 17:49:16 +02:00
parent 2378a3db58
commit e352639182
139 changed files with 3414 additions and 605 deletions

View File

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=archlinux-keyring
_tag='171cae152fb553d4af401756a7276f30aad89d2e' # git rev-parse ${pkgver}
pkgver=20220927
_tag='d1aa3e130fab0c2c602d7c41b8aa34689ccbe466' # git rev-parse ${pkgver}
pkgver=20221110
pkgrel=01
pkgdesc='Arch Linux PGP keyring'
arch=(any)
@ -54,3 +54,5 @@ validpgpkeys=('02FD1C7A934E614545849F19A6234074498E9CEE' # Christian Hesse <ewo
sha256sums=(SKIP)
# 2c75b7b00708630292a1d89fd90cafd64da423f56556fffc143362a32d20934f archlinux-keyring-20221110-01-any.pkg.tar.xz

View File

@ -2,8 +2,8 @@
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
pkgname=archlinux-keyring
_tag='171cae152fb553d4af401756a7276f30aad89d2e' # git rev-parse ${pkgver}
pkgver=20220927
_tag='d1aa3e130fab0c2c602d7c41b8aa34689ccbe466' # git rev-parse ${pkgver}
pkgver=20221110
pkgrel=1
pkgdesc='Arch Linux PGP keyring'
arch=('any')

View File

@ -6,7 +6,7 @@
pkgname=autoconf
pkgver=2.71
pkgrel=01
pkgrel=02
pkgdesc="A GNU tool for automatically configuring source code"
arch=('any')
url="https://www.gnu.org/software/autoconf"
@ -47,3 +47,4 @@ validpgpkeys=('82F854F3CE73174B8B63174091FCC32B6769AA64') # Zack Weinberg
sha256sums=(f14c83cfebcc9427f2c3cea7258bd90df972d92eb26752da4ddad81c87a0faa4 # autoconf-2.71.tar.xz
f33796ff686c45ee946d5862f46b776cf69cad68bf6861ce20847459a3a18a44) # autoconf-2.71.tar.xz.sig

View File

@ -7,7 +7,7 @@
pkgname=base
pkgver=10.0
pkgrel=01
pkgrel=02
pkgdesc='Minimal set of packages to define a basic JOBORun Linux installation'
url='http://pozol.eu'
groups=( jobbase )
@ -54,6 +54,7 @@ package() {
)
cd "$pkgdir"
mkdir -m777 "$pkgdir"/src
install -Dm644 "$srcdir"/README.txt "$pkgdir"/src/README.txt
}

View File

@ -7,7 +7,7 @@
pkgname=coreutils
pkgver=9.1
pkgrel=01
pkgrel=03
pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system'
arch=('x86_64')
url='https://www.gnu.org/software/coreutils/'
@ -37,10 +37,10 @@ build() {
make
}
check() {
cd $pkgname-$pkgver
make check
}
#check() {
# cd $pkgname-$pkgver
# make check
#}
package() {
cd $pkgname-$pkgver
@ -55,3 +55,4 @@ validpgpkeys=('6C37DC12121A5006BC1DB804DF6FD971306037D9') # Pádraig Brady
sha256sums=(61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423 # coreutils-9.1.tar.xz
233a235598eebaf4a1e843ee0bc3e2b3d6885557ab5be9ee36f3e5d15f920d67) # coreutils-9.1.tar.xz.sig

View File

@ -5,7 +5,7 @@
pkgname=coreutils
pkgver=9.1
pkgrel=1
pkgrel=3
pkgdesc='The basic file, shell and text manipulation utilities of the GNU operating system'
arch=('x86_64')
license=('GPL3')

View File

@ -7,7 +7,7 @@
pkgname=cryptsetup
pkgver=2.5.0
pkgrel=03
pkgrel=04
pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
arch=(x86_64)
url='https://gitlab.com/cryptsetup/cryptsetup/'
@ -57,5 +57,6 @@ validpgpkeys=('2A2918243FDE46648D0686F9D9B0577BD93E98FC') # Milan Broz <gmazylan
sha256sums=(9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542 # cryptsetup-2.5.0.tar.xz
3e1b88afb4198ef7d0f28163f0b1f880320cc0b1af7408aa037705cb27f5915f # cryptsetup-2.5.0.tar.sign
29a3f1db5b86a8e6b7c914125e2c46711d6d5985bbf4089e158e06af551c8307 # hooks-encrypt
817686b47e5ffd32913bcae7efe717f3377a48062b6311549d4440cfd3eadf17 # install-encrypt
5d68a359fd85b5132456f96c2405916de5009efc8e7edf51aef6bf2d2ffd0bd5) # install-sd-encrypt
2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd # install-encrypt
24cd81419c8f3fd8341dfa3c4616946180a16ea762b6ea7576d2214f83f875db) # install-sd-encrypt

View File

@ -3,7 +3,7 @@
pkgname=cryptsetup
pkgver=2.5.0
pkgrel=3
pkgrel=4
pkgdesc='Userspace setup tool for transparent encryption of block devices using dm-crypt'
arch=(x86_64)
license=('GPL')
@ -21,8 +21,8 @@ source=("https://www.kernel.org/pub/linux/utils/cryptsetup/v${pkgver%.*}/${pkgna
sha256sums=('9184a6ebbd9ce7eb211152e7f741a6c82f2d1cc0e24a84ec9c52939eee0f0542'
'SKIP'
'29a3f1db5b86a8e6b7c914125e2c46711d6d5985bbf4089e158e06af551c8307'
'817686b47e5ffd32913bcae7efe717f3377a48062b6311549d4440cfd3eadf17'
'5d68a359fd85b5132456f96c2405916de5009efc8e7edf51aef6bf2d2ffd0bd5')
'2b71c6c56ef81e5bf4f49dcc08dbd1651b46bda51a8f75a0a342b344b2d0eccd'
'24cd81419c8f3fd8341dfa3c4616946180a16ea762b6ea7576d2214f83f875db')
build() {
cd "${srcdir}"/$pkgname-${pkgver}

View File

@ -24,6 +24,9 @@ build() {
# cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
add_binary '/usr/lib/libgcc_s.so.1'
# cryptsetup loads the legacy provider which is required for whirlpool
add_binary '/usr/lib/ossl-modules/legacy.so'
add_runscript
}

View File

@ -34,6 +34,9 @@ build() {
# cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
add_binary '/usr/lib/libgcc_s.so.1'
# cryptsetup loads the legacy provider which is required for whirlpool
add_binary '/usr/lib/ossl-modules/legacy.so'
# add libraries dlopen()ed by systemd-cryptsetup
for LIB in fido2 tss2-{{esys,rc,mu},tcti-'*'}; do
for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do

268
curl/0001-noproxy.patch Normal file
View File

@ -0,0 +1,268 @@
commit efc286b7a62af0568fdcbf3c68791c9955182128
Author: Daniel Stenberg <daniel@haxx.se>
Date: Thu Oct 27 13:54:27 2022 +0200
noproxy: also match with adjacent comma
If the host name is an IP address and the noproxy string contained that
IP address with a following comma, it would erroneously not match.
Extended test 1614 to verify this combo as well.
Reported-by: Henning Schild
Fixes #9813
Closes #9814
diff --git a/lib/noproxy.c b/lib/noproxy.c
index 3409dab6f..58bc69a2d 100644
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -192,18 +192,22 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
/* FALLTHROUGH */
case TYPE_IPV6: {
const char *check = token;
- char *slash = strchr(check, '/');
+ char *slash;
unsigned int bits = 0;
char checkip[128];
+ if(tokenlen >= sizeof(checkip))
+ /* this cannot match */
+ break;
+ /* copy the check name to a temp buffer */
+ memcpy(checkip, check, tokenlen);
+ checkip[tokenlen] = 0;
+ check = checkip;
+
+ slash = strchr(check, '/');
/* if the slash is part of this token, use it */
- if(slash && (slash < &check[tokenlen])) {
+ if(slash) {
bits = atoi(slash + 1);
- /* copy the check name to a temp buffer */
- if(tokenlen >= sizeof(checkip))
- break;
- memcpy(checkip, check, tokenlen);
- checkip[ slash - check ] = 0;
- check = checkip;
+ *slash = 0; /* null terminate there */
}
if(type == TYPE_IPV6)
match = Curl_cidr6_match(name, check, bits);
diff --git a/tests/data/test1614 b/tests/data/test1614
index 4a9d54eb6..73bdbb4e0 100644
--- a/tests/data/test1614
+++ b/tests/data/test1614
@@ -16,7 +16,7 @@ unittest
proxy
</features>
<name>
-cidr comparisons
+noproxy and cidr comparisons
</name>
</client>
<errorcode>
diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c
index 60285450c..c2f563a0d 100644
--- a/tests/unit/unit1614.c
+++ b/tests/unit/unit1614.c
@@ -77,6 +77,20 @@ UNITTEST_START
{ NULL, NULL, 0, FALSE} /* end marker */
};
struct noproxy list[]= {
+ { "127.0.0.1", "127.0.0.1,localhost", TRUE},
+ { "127.0.0.1", "127.0.0.1,localhost,", TRUE},
+ { "127.0.0.1", "127.0.0.1/8,localhost,", TRUE},
+ { "127.0.0.1", "127.0.0.1/28,localhost,", TRUE},
+ { "127.0.0.1", "127.0.0.1/31,localhost,", TRUE},
+ { "127.0.0.1", "localhost,127.0.0.1", TRUE},
+ { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
+ "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
+ "0.0.1.127.0.0.1.127.0.0." /* 128 bytes "address" */, FALSE},
+ { "127.0.0.1", "localhost,127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1."
+ "127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127.0.0.1.127."
+ "0.0.1.127.0.0.1.127.0.0" /* 127 bytes "address" */, FALSE},
+ { "localhost", "localhost,127.0.0.1", TRUE},
+ { "localhost", "127.0.0.1,localhost", TRUE},
{ "foobar", "barfoo", FALSE},
{ "foobar", "foobar", TRUE},
{ "192.168.0.1", "foobar", FALSE},
commit b830f9ba9e94acf672cd191993ff679fa888838b
Author: Daniel Stenberg <daniel@haxx.se>
Date: Fri Oct 28 10:51:49 2022 +0200
noproxy: fix tail-matching
Also ignore trailing dots in both host name and comparison pattern.
Regression in 7.86.0 (from 1e9a538e05c0)
Extended test 1614 to verify better.
Reported-by: Henning Schild
Fixes #9821
Closes #9822
diff --git a/lib/noproxy.c b/lib/noproxy.c
index 58bc69a2d..2832ae166 100644
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -153,9 +153,14 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
}
else {
unsigned int address;
+ namelen = strlen(name);
if(1 == Curl_inet_pton(AF_INET, name, &address))
type = TYPE_IPV4;
- namelen = strlen(name);
+ else {
+ /* ignore trailing dots in the host name */
+ if(name[namelen - 1] == '.')
+ namelen--;
+ }
}
while(*p) {
@@ -177,12 +182,23 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
if(tokenlen) {
switch(type) {
case TYPE_HOST:
- if(*token == '.') {
- ++token;
- --tokenlen;
- /* tailmatch */
- match = (tokenlen <= namelen) &&
- strncasecompare(token, name + (namelen - tokenlen), namelen);
+ /* ignore trailing dots in the token to check */
+ if(token[tokenlen - 1] == '.')
+ tokenlen--;
+
+ if(tokenlen && (*token == '.')) {
+ /* A: example.com matches '.example.com'
+ B: www.example.com matches '.example.com'
+ C: nonexample.com DOES NOT match '.example.com'
+ */
+ if((tokenlen - 1) == namelen)
+ /* case A, exact match without leading dot */
+ match = strncasecompare(token + 1, name, namelen);
+ else if(tokenlen < namelen)
+ /* case B, tailmatch with leading dot */
+ match = strncasecompare(token, name + (namelen - tokenlen),
+ tokenlen);
+ /* case C passes through, not a match */
}
else
match = (tokenlen == namelen) &&
diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c
index c2f563a0d..8f62b70d4 100644
--- a/tests/unit/unit1614.c
+++ b/tests/unit/unit1614.c
@@ -77,6 +77,15 @@ UNITTEST_START
{ NULL, NULL, 0, FALSE} /* end marker */
};
struct noproxy list[]= {
+ { "www.example.com", "localhost,.example.com,.example.de", TRUE},
+ { "www.example.com.", "localhost,.example.com,.example.de", TRUE},
+ { "example.com", "localhost,.example.com,.example.de", TRUE},
+ { "example.com.", "localhost,.example.com,.example.de", TRUE},
+ { "www.example.com", "localhost,.example.com.,.example.de", TRUE},
+ { "www.example.com", "localhost,www.example.com.,.example.de", TRUE},
+ { "example.com", "localhost,example.com,.example.de", TRUE},
+ { "example.com.", "localhost,example.com,.example.de", TRUE},
+ { "www.example.com", "localhost,example.com,.example.de", FALSE},
{ "127.0.0.1", "127.0.0.1,localhost", TRUE},
{ "127.0.0.1", "127.0.0.1,localhost,", TRUE},
{ "127.0.0.1", "127.0.0.1/8,localhost,", TRUE},
commit b1953c1933b369b1217ef0f16053e26da63488c3
Author: Daniel Stenberg <daniel@haxx.se>
Date: Sun Nov 6 23:19:51 2022 +0100
noproxy: tailmatch like in 7.85.0 and earlier
A regfression in 7.86.0 (via 1e9a538e05c010) made the tailmatch work
differently than before. This restores the logic to how it used to work:
All names listed in NO_PROXY are tailmatched against the used domain
name, if the lengths are identical it needs a full match.
Update the docs, update test 1614.
Reported-by: Stuart Henderson
Fixes #9842
Closes #9858
diff --git a/docs/libcurl/opts/CURLOPT_NOPROXY.3 b/docs/libcurl/opts/CURLOPT_NOPROXY.3
index 5e4c32130..dc3cf7c10 100644
--- a/docs/libcurl/opts/CURLOPT_NOPROXY.3
+++ b/docs/libcurl/opts/CURLOPT_NOPROXY.3
@@ -40,10 +40,6 @@ list is matched as either a domain which contains the hostname, or the
hostname itself. For example, "ample.com" would match ample.com, ample.com:80,
and www.ample.com, but not www.example.com or ample.com.org.
-If the name in the \fInoproxy\fP list has a leading period, it is a domain
-match against the provided host name. This way ".example.com" will switch off
-proxy use for both "www.example.com" as well as for "foo.example.com".
-
Setting the \fInoproxy\fP string to "" (an empty string) will explicitly
enable the proxy for all host names, even if there is an environment variable
set for it.
diff --git a/lib/noproxy.c b/lib/noproxy.c
index 2832ae166..fb856e4fa 100644
--- a/lib/noproxy.c
+++ b/lib/noproxy.c
@@ -187,22 +187,24 @@ bool Curl_check_noproxy(const char *name, const char *no_proxy)
tokenlen--;
if(tokenlen && (*token == '.')) {
- /* A: example.com matches '.example.com'
- B: www.example.com matches '.example.com'
- C: nonexample.com DOES NOT match '.example.com'
- */
- if((tokenlen - 1) == namelen)
- /* case A, exact match without leading dot */
- match = strncasecompare(token + 1, name, namelen);
- else if(tokenlen < namelen)
- /* case B, tailmatch with leading dot */
- match = strncasecompare(token, name + (namelen - tokenlen),
- tokenlen);
- /* case C passes through, not a match */
+ /* ignore leading token dot as well */
+ token++;
+ tokenlen--;
}
- else
- match = (tokenlen == namelen) &&
- strncasecompare(token, name, namelen);
+ /* A: example.com matches 'example.com'
+ B: www.example.com matches 'example.com'
+ C: nonexample.com DOES NOT match 'example.com'
+ */
+ if(tokenlen == namelen)
+ /* case A, exact match */
+ match = strncasecompare(token, name, namelen);
+ else if(tokenlen < namelen) {
+ /* case B, tailmatch domain */
+ match = (name[namelen - tokenlen - 1] == '.') &&
+ strncasecompare(token, name + (namelen - tokenlen),
+ tokenlen);
+ }
+ /* case C passes through, not a match */
break;
case TYPE_IPV4:
/* FALLTHROUGH */
diff --git a/tests/unit/unit1614.c b/tests/unit/unit1614.c
index 8f62b70d4..523d102bf 100644
--- a/tests/unit/unit1614.c
+++ b/tests/unit/unit1614.c
@@ -85,7 +85,8 @@ UNITTEST_START
{ "www.example.com", "localhost,www.example.com.,.example.de", TRUE},
{ "example.com", "localhost,example.com,.example.de", TRUE},
{ "example.com.", "localhost,example.com,.example.de", TRUE},
- { "www.example.com", "localhost,example.com,.example.de", FALSE},
+ { "nexample.com", "localhost,example.com,.example.de", FALSE},
+ { "www.example.com", "localhost,example.com,.example.de", TRUE},
{ "127.0.0.1", "127.0.0.1,localhost", TRUE},
{ "127.0.0.1", "127.0.0.1,localhost,", TRUE},
{ "127.0.0.1", "127.0.0.1/8,localhost,", TRUE},

View File

@ -8,7 +8,7 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
pkgver=7.86.0
pkgrel=01
pkgrel=04
pkgdesc='An URL retrieval utility and library - w/o ipv6 & zstd'
arch=('x86_64')
url='https://curl.haxx.se'
@ -18,7 +18,8 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
'openssl' 'zlib')
makedepends=('patchelf')
provides=('libcurl.so')
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
'0001-noproxy.patch')
_configure_options=(
--prefix='/usr'
@ -36,11 +37,11 @@ _configure_options=(
--with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
)
#prepare() {
# cd "${srcdir}/${pkgbase}-${pkgver}"
#
# patch -Np1 < ../0001-select-do-not-return-fatal-error-on-EINTR-from-poll.patch
#}
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -Np1 < "${srcdir}"/0001-noproxy.patch
}
build() {
mkdir build-curl{,-compat,-gnutls}
@ -134,5 +135,7 @@ license=('MIT')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
sha256sums=(3dfdd39ba95e18847965cd3051ea6d22586609d9011d91df7bc5521288987a82 # curl-7.86.0.tar.gz
8e31713d4513023e44a2034af660b2af6240a8501cadf153f96431cd34f5fc31) # curl-7.86.0.tar.gz.asc
8e31713d4513023e44a2034af660b2af6240a8501cadf153f96431cd34f5fc31 # curl-7.86.0.tar.gz.asc
b8b5a41f7528118d9b8a39b5c867821c172add3867ceb4a6ce1397fbe7052ee6) # 0001-noproxy.patch

View File

@ -7,7 +7,7 @@
pkgbase=curl
pkgname=(curl libcurl-compat libcurl-gnutls)
pkgver=7.86.0
pkgrel=1
pkgrel=4
pkgdesc='An URL retrieval utility and library'
arch=('x86_64')
url='https://curl.haxx.se'
@ -18,9 +18,11 @@ depends=('ca-certificates' 'brotli' 'libbrotlidec.so' 'krb5' 'libgssapi_krb5.so'
'openssl' 'zlib' 'zstd' 'libzstd.so')
makedepends=('patchelf')
provides=('libcurl.so')
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc})
source=("https://curl.haxx.se/download/${pkgname}-${pkgver}.tar.gz"{,.asc}
'0001-noproxy.patch')
sha512sums=('b2d30b4d145a3621862a0f5e6378b5099ba92f4be6e92f4e070ec1299fc5eacba851bf993efd613b366fb81642f3f5cccb6e02adcd472dccc9c5e65c1a51812c'
'SKIP')
'SKIP'
'f9ef254d08e2d0db3675b3b677a93447445db41eb5b24291d1e62f36a132ef241b4b3909a0712b2ab2fe2e298e7052f5173176631d94f70b56967e83ea915cbb')
validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg
_configure_options=(
@ -37,6 +39,12 @@ _configure_options=(
--with-ca-bundle='/etc/ssl/certs/ca-certificates.crt'
)
prepare() {
cd "${srcdir}/${pkgbase}-${pkgver}"
patch -Np1 < "${srcdir}"/0001-noproxy.patch
}
build() {
mkdir build-curl{,-compat,-gnutls}

View File

@ -1,4 +1,3 @@
patchelf

View File

@ -8,7 +8,7 @@
pkgbase=eudev
pkgname=(eudev libeudev)
pkgver=3.2.11
pkgrel=04
pkgrel=05
_udev_ver=243
# This is the old official gentoo fork source location
@ -71,7 +71,7 @@ package_eudev() {
provides=("udev=${_udev_ver}" "eudev")
conflicts=(eudev-git udev eudev-libgudev)
replaces=(udev mdevd smdev nldev)
replaces=(udev smdev nldev)
cd $pkgbase-$pkgver
@ -110,4 +110,3 @@ sha256sums=(19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b # e
77dd1fd318b4456409aceb077f060b87944defb07cf39d29ad1968dc6f361875 # initcpio_install
846e9ddbb95c8394ba7efe75107cc1308426921bc042f5d6b48fa4c2dcbac151) # udev-hwdb.hook

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=fakeroot
pkgver=1.29
pkgver=1.30.1
pkgrel=01
pkgdesc='Tool for simulating superuser privileges w/o systemd'
arch=('x86_64')
@ -32,10 +32,10 @@ build() {
po4a -k 0 --rm-backups --variable 'srcdir=../doc/' po4a/po4a.cfg
}
#check() {
# cd $pkgname-$pkgver
# make check
#}
check() {
cd $pkgname-$pkgver
make check
}
package() {
cd $pkgname-$pkgver
@ -53,6 +53,5 @@ package() {
license=('GPL')
sha256sums=(8fbbafb780c9173e3ace4a04afbc1d900f337f3216883939f5c7db3431be7c20) # fakeroot_1.29.orig.tar.gz
sha256sums=(32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75) # fakeroot_1.30.1.orig.tar.gz

View File

@ -3,7 +3,7 @@
# Contributor: Jochem Kossen <j.kossen@home.nl>
pkgname=fakeroot
pkgver=1.29
pkgver=1.30.1
pkgrel=1
pkgdesc='Tool for simulating superuser privileges'
arch=('x86_64')
@ -15,7 +15,7 @@ depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
makedepends=('systemd' 'po4a')
checkdepends=('sharutils')
source=("https://deb.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz")
sha256sums=('8fbbafb780c9173e3ace4a04afbc1d900f337f3216883939f5c7db3431be7c20')
sha256sums=('32ebb1f421aca0db7141c32a8c104eb95d2b45c393058b9435fbf903dd2b6a75')
build() {
cd $pkgname-$pkgver

116
fakeroot/config Normal file
View File

@ -0,0 +1,116 @@
`configure' configures fakeroot 1.30.1 to adapt to many kinds of systems.
Usage: ./configure [OPTION]... [VAR=VALUE]...
To assign environment variables (e.g., CC, CFLAGS...), specify them as
VAR=VALUE. See below for descriptions of some of the useful variables.
Defaults for the options are specified in brackets.
Configuration:
-h, --help display this help and exit
--help=short display options specific to this package
--help=recursive display the short help of all the included packages
-V, --version display version information and exit
-q, --quiet, --silent do not print `checking ...' messages
--cache-file=FILE cache test results in FILE [disabled]
-C, --config-cache alias for `--cache-file=config.cache'
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or `..']
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[/usr/local]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[PREFIX]
By default, `make install' will install all the files in
`/usr/local/bin', `/usr/local/lib' etc. You can specify
an installation prefix other than `/usr/local' using `--prefix',
for instance `--prefix=$HOME'.
For better control, use the options below.
Fine tuning of the installation directories:
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/fakeroot]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
--psdir=DIR ps documentation [DOCDIR]
Program names:
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
--program-transform-name=PROGRAM run sed PROGRAM on installed program names
System types:
--build=BUILD configure for building on BUILD [guessed]
--host=HOST cross-compile to build programs to run on HOST [BUILD]
--target=TARGET configure for building compilers for TARGET [HOST]
Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
both]
--with-aix-soname=aix|svr4|both
shared library versioning (aka "SONAME") variant to
provide on AIX, [default=aix].
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
--with-sysroot[=DIR] Search for dependent libraries within DIR (or the
compiler's sysroot if not specified).
--with-ipc[=IPCTYPE] method of IPC to use: either sysv (default) or tcp
--with-dbformat[=DBFORMAT]
database format to use: either inode (default) or
path
Some influential environment variables:
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
LT_SYS_LIBRARY_PATH
User-defined run-time library search path.
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <clint@debian.org>.

View File

@ -7,7 +7,7 @@
pkgname=filesystem
pkgver=2022.11.3
pkgrel=01
pkgrel=04
pkgdesc='Base Joborun Linux file system'
arch=('x86_64')
groups=( jobbot )
@ -16,13 +16,14 @@ depends=('iana-etc')
backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf'
'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/resolv.conf.pacnew' 'etc/securetty'
'etc/shadow' 'etc/shells')
'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid')
source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release'
'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells'
'subuid' 'subgid' 'sysusers' 'tmpfiles' 'modprobe.d.usb-load-ehci-first')
# 'env-generator' 'archlinux-logo.svg' 'archlinux-logo.png'
# 'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg')
'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release'
'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells'
'subuid' 'subgid' 'sysusers' 'tmpfiles' 'modprobe.d.usb-load-ehci-first'
'jobo-release')
# 'env-generator' 'joborun-linux-logo.svg' 'joborun-linux-logo.png'
# 'joborun-linux-logo-text.svg' 'joborun-linux-logo-text-dark.svg')
package() {
cd "$pkgdir"
@ -43,7 +44,7 @@ package() {
# setup /etc and /usr/share/factory/etc
install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf \
passwd securetty shells profile; do
passwd securetty shells profile subuid subgid; do
install -m644 "$srcdir"/$f etc/
install -m644 "$srcdir"/$f usr/share/factory/etc/
done
@ -55,7 +56,7 @@ package() {
done
install -D -m644 "$srcdir"/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
touch etc/jobo-release
install -Dm644 "$srcdir"/jobo-release etc/jobo-release
touch etc/arch-release
install -m644 "$srcdir"/locale.sh etc/profile.d/locale.sh
install -Dm644 "$srcdir"/os-release usr/lib/os-release
@ -83,10 +84,8 @@ package() {
# add lib symlinks
ln -s usr/lib lib
[[ $CARCH = 'x86_64' ]] && {
ln -s usr/lib lib64
ln -s lib usr/lib64
}
# add bin symlinks
ln -s usr/bin bin
@ -99,27 +98,23 @@ package() {
done
ln -s ../man usr/local/share/man
# setup systemd-sysusers
install -D -m644 "$srcdir"/sysusers usr/lib/sysusers.d/arch.conf
# setup systemd-sysusers wrapper
install -D -m644 "$srcdir"/sysusers usr/lib/sysusers.d/joborun.conf
# setup systemd-tmpfiles
install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/arch.conf
# setup systemd-tmpfiles wrapper
install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/joborun.conf
# setup systemd.environment-generator
# install -D -m755 "$srcdir"/env-generator usr/lib/systemd/system-environment-generators/10-arch
# add logo
## install -D -m644 "$srcdir"/archlinux-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps
## # add logo
## install -D -m644 "$srcdir"/joborun-linux-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps
}
#---- license gpg-key sha256sums ----
license=('GPL')
sha256sums=(e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82 # crypttab
115d324c8518affc7bec5559579d85f8f5491646b6110ea9567a586a26a76da9 # fstab
d37b07963e75603f7056b8a78ec0706b925dfaa2790ece382c8c8483ff1d5f15 # group
327c61df6b9dcfabfe06ff4477b3a9cae7f9ca7e463f78f8cbc739b57e9448e1 # group
5003d01f30a868d6e79010a9313d43481701b5c59fbe7252fb33760d043878f1 # gshadow
250cfbb9a2b5e3cc9879ab2080eb3c7875fbe66eb375ce3f96eee335654a4979 # host.conf
8a63876eaf11641bbecdf2dea934c14e730dd4daceb32a5b172d08887a263f73 # hosts
@ -131,7 +126,7 @@ sha256sums=(e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82 # c
b5ad863843339840665b80b21656bc04402a824c01f9bc5c3e5974c8182113f5 # os-release
aa9df866acb6a56ad72aca7cd215642ed8c55ba9a01d205c667ed082bc997568 # passwd
5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0 # profile
7c4e71febc2a24677be465bd377034c653174ee1e0334dd3507b780c9ff7962d # resolv.conf
297113b9e11af3e73756482eaca6ad188e210d8cd537e66881225f6feeec1e3a # resolv.conf
d88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b # securetty
1d77352db51f1edc46eb868307530d1c02de1ee77cfa14902bc0430aad91384b # shadow
268e414ace5dd1579e5a3085a45a969c3d580d734182166f85d02411d3be6f7d # shells
@ -139,5 +134,7 @@ sha256sums=(e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82 # c
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 # subuid
ec207f224fdd6f29d2a333b2e9be211ef44f21a2bff0c0c6d7ea6d1b72b70eee # sysusers
618ac097441c1f2daffc9967e5c3cd18ea8866f776db62d04bf401c53907b1c9 # tmpfiles
90fb123aa8c0176bc144322b585bb889181c437542ddbe546af43e11b95be6ab) # modprobe.d.usb-load-ehci-first
90fb123aa8c0176bc144322b585bb889181c437542ddbe546af43e11b95be6ab # modprobe.d.usb-load-ehci-first
040a7eafddb19c6df188a84616441cc1bf052b50f4c131df692b143270d7770c) # jobo-release

View File

@ -1,8 +1,8 @@
# Maintainer: Sébastien Luttringer
# Maintainer: artoo <artoo@artixlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
pkgname=filesystem
pkgver=2021.12.07
pkgver=2022.10.18
pkgrel=1
pkgdesc='Base Artix Linux files'
arch=('x86_64')
@ -12,36 +12,39 @@ depends=('iana-etc')
backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf'
'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
'etc/shadow' 'etc/shells')
source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release'
'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl'
'sysusers' 'tmpfiles' 'artixlinux.svg' 'artixlinux.png'
'artixlinux-logo.svg' 'artixlinux-logo.png')
'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid')
source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'profile'
'passwd' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' 'sysusers'
'tmpfiles' 'subuid' 'subgid' 'artixlinux-logo.svg' 'artixlinux-logo.png'
'artixlinux-logo-text.svg' 'artixlinux-logo-text-dark.svg')
sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'
'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
'244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a'
'90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273'
'4d7b647169063dfedbff5e1e22cee77bd1a4183dbcfd5e802e68939da4bbf733'
'd9cd8a77d9e0aa5e90d7f4ed74c8745c17b525e720e28e4c44364150003c35f9'
'fe86e5d282e55658fdc9c383eabbabb0ba2d791be04814082230ac8a9c056452'
'9e5f1c492e6ad1c246ae71a55a4ff0eca9909bbbc2c6034fd70f31ab86c868eb'
'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5'
'8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
'aa4dc5b2374fb32863e3bc1ce20a2de2d34fe4eed1cd63c599bc82fab21463cc'
'fe9bb5b7ef357e38ef2efb5bee32a0ac495f55cb14d573e0e1b59a6ede43213d'
'5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
'62855224620a1e6dcfb2373460387bf0b7870ebe0595a61bbbc74919710d7641'
'1aa33ce150ddb33b815f0b45425948e16020fcfb0a54ecc997b49778d5643978'
'f86a0b98d5fee4aae0e11a61fa0a1a4061927d5ca80753329285f87376acf2b6'
'5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
'5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
'6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c'
'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
'89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
'd6b0e95e3cdf663d3383f883301f5ed6cf900cccb7cba0c268ab8f6e78177d16'
'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742'
'7b8fffc06755488931ce2aa4d3f9547be650d9e873323b7171515004d02e83c1'
'f52db4a98fbfdd6d957068ea0e631240c9a138df859fc43d902bf97b0759459d'
'5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07'
'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
'02302481e97d88b2bd548bbfe54aadd1611fd3aa09911fd8b7eb1208cde4351d'
'1242caf07c6c3aa4ac600b5f2401a7422c85cbdc9ed9ef41357b068355c6a45b')
'1242caf07c6c3aa4ac600b5f2401a7422c85cbdc9ed9ef41357b068355c6a45b'
'7b8fffc06755488931ce2aa4d3f9547be650d9e873323b7171515004d02e83c1'
'7b8fffc06755488931ce2aa4d3f9547be650d9e873323b7171515004d02e83c1')
package() {
cd "$pkgdir"
@ -61,7 +64,7 @@ package() {
# setup /etc and /usr/share/factory/etc
install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \
passwd resolv.conf securetty shells profile; do
passwd resolv.conf securetty shells profile subuid subgid; do
install -m644 "$srcdir"/$f etc/
install -m644 "$srcdir"/$f usr/share/factory/etc/
done
@ -122,7 +125,7 @@ package() {
install -D -m644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/artix.conf
# add logo
install -D -m644 "$srcdir"/artixlinux{,-logo}.{svg,png} usr/share/pixmaps
install -D -m644 "$srcdir"/artixlinux-logo{.png,.svg,-text.svg,-text-dark.svg} usr/share/pixmaps
}
# vim:set ts=2 sw=2 et:

View File

@ -4,8 +4,8 @@
pkgname=filesystem
pkgver=2021.10.13
pkgrel=2
pkgver=2022.11.02
pkgrel=1
pkgdesc='Base Obarun filesystem'
arch=(x86_64)
license=('GPL')
@ -13,33 +13,34 @@ url='https://www.obarun.org'
#install='filesystem.install'
depends=('iana-etc')
backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/motd' 'etc/nsswitch.conf'
'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf'
'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
'etc/shadow' 'etc/shells')
source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release'
'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells'
'sysusers' 'tmpfiles' 'modprobe.d.usb-load-ehci-first')
'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid')
source=('crypttab' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts' 'profile'
'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release'
'passwd' 'resolv.conf' 'securetty' 'shadow' 'shells'
'sysusers' 'tmpfiles' 'subuid' 'subgid' 'modprobe.d.usb-load-ehci-first')
md5sums=('0672783048ee312d2fc768402fdb3488'
'693c97f2c9a519bb97a17008e92c2b74'
'26a96329a5523e5c11c50be58e6758c8'
'e411df94c344a6dbf6634f75ea59a5dc'
'7c944ff2ac3b4fc5e3c2f3e9aa1ed802'
'4c8ed1804d6ff26714530dd43341b7a1'
'448fe7cbcb566e8d318dc0db0c9cb710'
'7a72f9ff248e284e2cedcd9c59542758'
'5deb9f890a4d08a245e9752ede77271e'
'a9cabd3090a240bafbb05ce443d991df'
'd41d8cd98f00b204e9800998ecf8427e'
'162cf609205e52a862fb1838d5df2be6'
'8649a132297ee9fe3805b26a4d032f2d'
'd49e3834aa82c71f71f058f23467bd6f'
'448fe7cbcb566e8d318dc0db0c9cb710'
'1e025adcb3b94399bc74858440453501'
'f04bcb2803afc4dcb95670fe87343b4d'
'1e867e07ad9a04f40fa9e5e4aa1f1624'
'6e0cf9e2ec97a424dfb11d41d2ef3c91'
'dff1b18db07570fd69f55f91f501ef0a'
'0267a3a463f35eec8a31f40a720dfd86'
'3268792b7d2d08340f394b585d38b798'
'd41d8cd98f00b204e9800998ecf8427e'
'd41d8cd98f00b204e9800998ecf8427e'
'a8a962370cd0128465d514e6a1f74130')
package() {
@ -62,7 +63,7 @@ package() {
# setup /etc and /usr/share/factory/etc
install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf passwd resolv.conf securetty shells profile subuid subgid; do
install -m644 "$srcdir"/$f etc/
install -m644 "$srcdir"/$f usr/share/factory/etc/
done
@ -96,7 +97,7 @@ package() {
#
# setup /usr hierarchy
#
for d in bin include lib share/misc src; do
for d in bin include lib share/{misc,pixmaps} src; do
install -d -m755 usr/$d
done
for d in {1..8}; do

View File

@ -1,3 +1,4 @@
root:x:0:root
wheel:x:10:
nobody:x:99:
users:x:100:

1
filesystem/jobo-release Normal file
View File

@ -0,0 +1 @@
gamma-1024

View File

@ -1,15 +1,12 @@
#Selecting DNS among 185.121.177.177 169.239.202.202 172.98.193.42...
#Waiting for 185.121.177.177...
#Using 116.203.98.109 as API host
#https://api.opennicproject.org/geoip/?list&ipv=4&res=200&adm=0&bl&wl
#Pinging 29 hosts to determine the top ones...resulting in 18 responsive hosts
#Selected top 8 hosts:
#Pinging 37 hosts to determine the top ones...resulting in 31 responsive hosts
#Selected top 7 hosts:
nameserver 94.247.43.254
nameserver 89.163.140.67
nameserver 94.16.114.254
nameserver 128.76.152.2
nameserver 178.254.22.166
nameserver 212.83.46.246
nameserver 54.36.111.116
nameserver 195.10.195.195
nameserver 94.16.114.254
nameserver 194.36.144.87
nameserver 192.71.166.92
rotate

View File

@ -7,11 +7,10 @@
pkgname=gettext
pkgver=0.21.1
pkgrel=02
pkgrel=03
pkgdesc="GNU internationalization library"
url="https://www.gnu.org/software/gettext/"
arch=(x86_64)
groups=(base-devel)
#depends=(gcc-libs acl sh glib2 libunistring libcroco)
depends=(gcc-libs acl sh libunistring libxml2)
makedepends=(gettext emacs-git git)

View File

@ -7,7 +7,7 @@
pkgname=gnutls
pkgver=3.7.8
pkgrel=01
pkgrel=04
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('x86_64')
url="https://www.gnutls.org/"
@ -40,7 +40,7 @@ build() {
--enable-openssl-compatibility \
--enable-guile --with-guile-site-dir=no \
--with-default-trust-store-pkcs11="pkcs11:"
# --disable-dependency-tracking
# --enable-ktls \ # breaks testsuite
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@ -73,3 +73,5 @@ validpgpkeys=('5D46CB0F763405A7053556F47A75A648B3F9220C') # "Zoltan Fridrich <zf
sha256sums=(c58ad39af0670efe6a8aee5e3a8b2331a1200418b64b7c51977fb396d4617114 # gnutls-3.7.8.tar.xz
f355275b86b8a9d257b8a8a81370b7879d361113cb87c3cead2d1be5e69d19fa) # gnutls-3.7.8.tar.xz.sig
# d3bc88ee0b1fbb4d51e55b7a5af402a16ea69228e354da932c6b27c82ac0d613 gnutls-3.7.8-04-x86_64.pkg.tar.xz

View File

@ -3,7 +3,7 @@
pkgname=gnutls
pkgver=3.7.8
pkgrel=1
pkgrel=4
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('x86_64')
license=('GPL3' 'LGPL2.1')

View File

@ -2,3 +2,4 @@ net-tools
tpm2-tss
tpm2-tools

View File

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=guile
pkgver=2.2.7
pkgrel=03
pkgver=3.0.8
pkgrel=02
pkgdesc='Portable, embeddable Scheme implementation written in C'
url='https://www.gnu.org/software/guile/'
arch=(x86_64)
@ -15,11 +15,11 @@ groups=( jobbot )
depends=(gmp libltdl ncurses texinfo libunistring gc libffi)
source=(https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
prepare() {
cd $pkgname-$pkgver
sed -e '/test-out-of-memory/d' -i test-suite/standalone/Makefile.am # Disable test known to fail https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966301
autoreconf -if
}
#prepare() {
# cd $pkgname-$pkgver
# sed -e '/test-out-of-memory/d' -i test-suite/standalone/Makefile.am # Disable test known to fail https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966301
# autoreconf -if
#}
build() {
cd $pkgname-$pkgver
@ -37,7 +37,7 @@ build() {
package() {
make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/libguile-2.?.so.*-gdb.scm
rm "$pkgdir"/usr/lib/libguile-3.?.so.*-gdb.scm
}
#---- license gpg-key sha256sums ----
@ -48,6 +48,7 @@ validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5' # Ludovic Courtès <lud
'FF478FB264DE32EC296725A3DDC0F5358812F8F2' # Andy Wingo
'4FD4D288D445934E0A14F9A5A8803732E4436885') # Andy Wingo <wingo@pobox.com>"
sha256sums=(44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007 # guile-2.2.7.tar.gz
cf4b0fcf9859abf7048876f48f01ec716b3d6d912385dbbf2197eaa42dafaa08) #guile-2.2.7.tar.gz.sig
sha256sums=(f25ae0c26e911af1b5005292d4f56621879f74d6958b30741cf67d8b6feb2016 # guile-3.0.8.tar.gz
5848bc109fffeddd06dd1f4d1e9cec5d90b5850668c40467cd0eaad7764a0614) # guile-3.0.8.tar.gz.sig

View File

@ -1,9 +1,9 @@
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=guile
pkgver=2.2.7
pkgver=3.0.8
pkgrel=2
pkgdesc='Portable, embeddable Scheme implementation written in C'
url='https://www.gnu.org/software/guile/'
@ -14,15 +14,9 @@ source=(https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5' # Ludovic Courtès <ludo@gnu.org>
'FF478FB264DE32EC296725A3DDC0F5358812F8F2' # Andy Wingo
'4FD4D288D445934E0A14F9A5A8803732E4436885') # Andy Wingo <wingo@pobox.com>"
sha256sums=('44b4c5fbbe257ccdebea18420212c9b3e90c3c86a54920d8554039fc6769a007'
sha256sums=('f25ae0c26e911af1b5005292d4f56621879f74d6958b30741cf67d8b6feb2016'
'SKIP')
prepare() {
cd $pkgname-$pkgver
sed -e '/test-out-of-memory/d' -i test-suite/standalone/Makefile.am # Disable test known to fail https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=966301
autoreconf -if
}
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr \
@ -39,5 +33,5 @@ check() {
package() {
make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/libguile-2.?.so.*-gdb.scm
rm "$pkgdir"/usr/lib/libguile-3.?.so.*-gdb.scm
}

View File

@ -1,4 +1,4 @@
autoconf
automake
gettext

View File

@ -1 +1,2 @@
gpg -v --recv-key 090B11993D9AEBB5
gpg -v --recv-keys A8803732E4436885

View File

@ -1,4 +1,12 @@
real 1m32.750s
user 2m20.658s
sys 0m13.843s
2.2.7 ver
real 20m4.225s
user 19m47.658s
sys 0m27.535s
3.0.8 ver
real 42m34.145s
user 57m33.325s
sys 1m12.433s

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=hwdata
pkgver=0.363
pkgver=0.364
pkgrel=01
pkgdesc="hardware identification databases"
makedepends=('git')
@ -38,4 +38,3 @@ validpgpkeys=('3C40194FB79138CE0F78FD4919C2F062574F5403') # Vitezslav Crhonek
sha256sums=(SKIP)

View File

@ -1,6 +1,6 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=hwdata
pkgver=0.363
pkgver=0.364
pkgrel=1
pkgdesc="hardware identification databases"
makedepends=('git')

View File

@ -1,2 +1,3 @@
git

View File

@ -6,7 +6,7 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=iana-etc
pkgver=20221025
pkgver=20221107
_ports=service-names-port-numbers-${pkgver}
_protocols=protocol-numbers-20220928
pkgrel=01
@ -54,7 +54,7 @@ BEGIN { print "# Full data: /usr/share/iana-etc/port-numbers.iana\n" }
license=('custom:none')
sha256sums=(96a6267cf5cfcf0fd3de4943e5dfe002926c4fe84a33f3e44d451abece4c810d # service-names-port-numbers-20221025.xml
sha256sums=(181e4f5c4cc3b8fc1c2551d6c6eadd675ec07c84845e200482a896386e0c4f68 # service-names-port-numbers-20221107.xml
e02f1db3ec99126deb869fe132e02183935ad88561b80a7d3885dfb55d11b247 # protocol-numbers-20220928.xml
dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb) # LICENSE

View File

@ -3,7 +3,7 @@
# Maintainer: Jelle van der Waa <jelle@archlinux.org>
pkgname=iana-etc
pkgver=20221025
pkgver=20221107
_ports=service-names-port-numbers-${pkgver}
_protocols=protocol-numbers-20220928
pkgrel=1
@ -15,7 +15,7 @@ backup=('etc/'{protocols,services})
source=("https://sources.archlinux.org/other/packages/iana-etc/${_ports}.xml"
"https://sources.archlinux.org/other/packages/iana-etc/${_protocols}.xml"
'LICENSE')
sha256sums=('96a6267cf5cfcf0fd3de4943e5dfe002926c4fe84a33f3e44d451abece4c810d'
sha256sums=('181e4f5c4cc3b8fc1c2551d6c6eadd675ec07c84845e200482a896386e0c4f68'
'e02f1db3ec99126deb869fe132e02183935ad88561b80a7d3885dfb55d11b247'
'dd37e92942d5a4024f1c77df49d61ca77fc6284691814903a741785df61f78cb')

View File

@ -1,2 +1,4 @@

View File

@ -8,7 +8,7 @@
pkgname=jobbot
pkgdesc='Minimal set of packages to maintain the building chroot for JOBORun Linux'
pkgver=0.3
pkgrel=01
pkgrel=02
groups=( jobbot )
arch=(x86_64)
source=( README-jobbot.txt Qsq ckchroot)
@ -21,7 +21,7 @@ depends=( acl archlinux-keyring obarun-keyring joborun-keyring attr audit bash
libgpg-error libidn2 libisl libksba libldap libmnl libmpc libnetfilter_conntrack
libnfnetlink libnftnl libnghttp2 libnl libp11-kit libpcap libpsl libsasl libseccomp
libsecret libssh2 libtasn1 libtirpc libtool libunistring libverto libxcrypt licenses linux-api-headers
lz4 m4 make mpfr nano ncurses nettle npth numactl openssl opensysusers p11-kit package-query pacman
lz4 m4 make mpfr nano ncurses nettle npth numactl openssl openssl-1.1 opensysusers p11-kit package-query pacman
pacman-contrib pacman-mirrorlist pam pambase patch pciutils pcre pcre2 perl pinentry
pkgconf procps-ng psmisc readline sed shadow sqlite sudo tar texinfo tzdata util-linux
util-linux-libs wget which xz yajl zlib zsh zstd )
@ -40,7 +40,7 @@ package() {
license=('ISC')
sha256sums=(7f0b1d6bff4b8ce726c9acf68e86f6cc88dc9c7e60b6567048427c9f26dd3bfd # README-jobbot.txt
bcfa9d7c4f2e926050ca80b28be3c393ec8538d8be1f33df04f28ede6dc3c78c # Qsq
sha256sums=(7f0b1d6bff4b8ce726c9acf68e86f6cc88dc9c7e60b6567048427c9f26dd3bfd # README-jobbot.txt
8a9a5542d4d462aa5ba9dc16363f9fbbe8483ffd72e96fe434bab1a32de34700 # Qsq
50febbb21bb779f43b93c7f8e65ba4cbff0c6b32cddd45ecb9118fc801581d99) # ckchroot

View File

@ -100,6 +100,7 @@ npth
numactl
obarun-keyring
openssl
openssl-1.1
opensysusers
p11-kit
package-query

View File

@ -7,7 +7,7 @@
pkgname=kmod
pkgver=30
pkgrel=01
pkgrel=03
pkgdesc="Linux kernel module management tools and library"
arch=('x86_64')
url='https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git'
@ -91,3 +91,4 @@ sha256sums=(f897dd72698dc6ac1ef03255cd0a5734ad932318e4adbaebc7338ef2f5202f9f # k
c11c2a0f66ea405493e8617689ca10818dc81dd1dddc19bdb220c8b2917119c1 # depmod.hook
d2cd04a09feba30e1376144a8110ec7521892acb0940c3c4ba459aeecf0452ed) # depmod.script

View File

@ -2,7 +2,7 @@
pkgname=kmod
pkgver=30
pkgrel=1
pkgrel=3
pkgdesc="Linux kernel module management tools and library"
arch=('x86_64')
url='https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git'

View File

@ -1,4 +1,5 @@
linux-lts-headers
automake
autoconf

View File

@ -7,7 +7,7 @@
pkgname=ldns
pkgver=1.8.3
pkgrel=01
pkgrel=02
pkgdesc='Fast DNS library supporting recent RFCs'
url='https://www.nlnetlabs.nl/projects/ldns/'
arch=('x86_64')
@ -44,3 +44,5 @@ validpgpkeys=('DC34EE5DB2417BCC151E5100E5F8F8212F77A498') # Willem Toorop
sha256sums=(c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860 # ldns-1.8.3.tar.gz
b872fb26a76591af93a73c0dda6532d5dc4c236fec05512f81e81cb2687ef65f) # ldns-1.8.3.tar.gz.asc

View File

@ -4,7 +4,7 @@
pkgname=ldns
pkgver=1.8.3
pkgrel=1
pkgrel=2
pkgdesc='Fast DNS library supporting recent RFCs'
url='https://www.nlnetlabs.nl/projects/ldns/'
license=('custom:BSD')

View File

@ -0,0 +1,40 @@
From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 25 Jul 2022 10:56:53 -0700
Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is present
These headers are in conflict and only one is needed by
archive_read_disk_posix.c therefore include linux/fs.h if it exists
otherwise include sys/mount.h
It also helps compiling with glibc 2.36
where sys/mount.h conflicts with linux/mount.h see [1]
[1] https://sourceware.org/glibc/wiki/Release/2.36
---
libarchive/archive_read_disk_posix.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 2b39e672..a96008db 100644
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
#endif
#ifdef HAVE_LINUX_FS_H
#include <linux/fs.h>
+#elif HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
#endif
/*
* Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.

View File

@ -7,22 +7,24 @@
pkgname=libarchive
pkgver=3.6.1
pkgrel=02
pkgrel=05
pkgdesc='Multi-format archive and compression library'
arch=('x86_64')
url='https://libarchive.org/'
depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd' 'libcrypto.so')
provides=('libarchive.so')
#options=('debug')
source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
'0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch'
'0002-Validate-entry_bytes_remaining-in-pax_attribute.patch')
'0002-Validate-entry_bytes_remaining-in-pax_attribute.patch'
'0003-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 < ../0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch
patch -Np1 < ../0002-Validate-entry_bytes_remaining-in-pax_attribute.patch
patch -Np1 < ../0003-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
}
build() {
@ -54,9 +56,11 @@ license=('BSD')
validpgpkeys=(A5A45B12AD92D964B89EEE2DEC560C81CEC2276E) # Martin Matuska <mm@FreeBSD.org>
sha256sums=(5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 # libarchive-3.6.1.tar.xz
7d881045e203c871b095376709e5c5dc37aab045e88fa9de0d517cdbe1c5bc58 # libarchive-3.6.1.tar.xz.asc
bc52b2b2b99915894b436c97872d5d50e94c8c7483865a028fad9a710c837fa7 # 0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch
38c8d9b00f3259558e67e6fdf790ccbf8ecbba2de101476c2416d87b1679bcb9) # 0002-Validate-entry_bytes_remaining-in-pax_attribute.patch
sha256sums=(5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6 # libarchive-3.6.1.tar.xz
7d881045e203c871b095376709e5c5dc37aab045e88fa9de0d517cdbe1c5bc58 # libarchive-3.6.1.tar.xz.asc
bc52b2b2b99915894b436c97872d5d50e94c8c7483865a028fad9a710c837fa7 # 0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch
38c8d9b00f3259558e67e6fdf790ccbf8ecbba2de101476c2416d87b1679bcb9 # 0002-Validate-entry_bytes_remaining-in-pax_attribute.patch
99c85a9b8e6c16131cefaf1040d5fa15cd565ecf8c71c1f644c8fa47fe1306dc) # 0003-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch

View File

@ -3,28 +3,32 @@
pkgname=libarchive
pkgver=3.6.1
pkgrel=2
pkgrel=5
pkgdesc='Multi-format archive and compression library'
arch=('x86_64')
url='https://libarchive.org/'
license=('BSD')
depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'xz' 'zlib' 'zstd')
depends=('acl' 'libacl.so' 'bzip2' 'expat' 'lz4' 'openssl' 'libcrypto.so' 'xz'
'zlib' 'zstd')
provides=('libarchive.so')
options=('debug')
validpgpkeys=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E') # Martin Matuska <mm@FreeBSD.org>
source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}
'0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch'
'0002-Validate-entry_bytes_remaining-in-pax_attribute.patch')
'0002-Validate-entry_bytes_remaining-in-pax_attribute.patch'
'0003-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch')
sha256sums=('5a411aceb978f43e626f0c2d1812ddd8807b645ed892453acabd532376c148e6'
'SKIP'
'bc52b2b2b99915894b436c97872d5d50e94c8c7483865a028fad9a710c837fa7'
'38c8d9b00f3259558e67e6fdf790ccbf8ecbba2de101476c2416d87b1679bcb9')
'38c8d9b00f3259558e67e6fdf790ccbf8ecbba2de101476c2416d87b1679bcb9'
'99c85a9b8e6c16131cefaf1040d5fa15cd565ecf8c71c1f644c8fa47fe1306dc')
prepare() {
cd "${pkgname}-${pkgver}"
patch -Np1 < ../0001-libarchive-Handle-a-calloc-returning-NULL-fixes-1754.patch
patch -Np1 < ../0002-Validate-entry_bytes_remaining-in-pax_attribute.patch
patch -Np1 < ../0003-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
}
build() {

View File

@ -1 +1,2 @@

View File

@ -1,13 +1,14 @@
#!/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 |---------------------------------------
pkgbase=libevent
pkgname=(libevent libevent-docs)
pkgname=(libevent) # libevent-docs)
pkgver=2.1.12
pkgrel=02
pkgrel=04
pkgdesc="An event notification library"
arch=('x86_64')
url="https://libevent.org/"
@ -15,12 +16,17 @@ depends=('openssl')
makedepends=(cmake ninja python zlib doxygen)
#options=(debug) ### uncomment this line to have the debug pkg produced
source=(https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/$pkgbase-$pkgver-stable.tar.gz{,.asc}
EVENT__SIZEOF_TIME_T.patch)
EVENT__SIZEOF_TIME_T.patch
libevent-2.1.12-openssl-compat.patch)
prepare() {
cd libevent-$pkgver-stable
# Fix Firefox build
patch -Np1 -i ../EVENT__SIZEOF_TIME_T.patch
# Fix build with OpenSSL 3.0
patch -Np1 -i ../libevent-2.1.12-openssl-compat.patch
}
build() {
@ -51,12 +57,14 @@ package_libevent() {
install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 libevent-$pkgver-stable/LICENSE
}
package_libevent-docs() {
pkgdesc+=" (documentation)"
depends=()
mv doc/* "$pkgdir"
}
## uncomment the following block to make your own libevent-docs pkg, otherwise just use arch's
#package_libevent-docs() {
# pkgdesc+=" (documentation)"
# depends=()
#
# mv doc/* "$pkgdir"
#}
#
#---- license gpg-key sha256sums ----
@ -68,5 +76,6 @@ validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA'
sha256sums=(92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb # libevent-2.1.12-stable.tar.gz
3cd3d764777540305813495912cd5f7ea7d16edb456d6c88b331a1aa8974dfc2 # libevent-2.1.12-stable.tar.gz.asc
945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf) # EVENT__SIZEOF_TIME_T.patch
945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf # EVENT__SIZEOF_TIME_T.patch
e41527c55f6dacc6453b13eeeea2664798496896b796abcd2a5c8304c9eb2bae) # libevent-2.1.12-openssl-compat.patch

View File

@ -4,7 +4,7 @@
pkgbase=libevent
pkgname=(libevent libevent-docs)
pkgver=2.1.12
pkgrel=2
pkgrel=4
pkgdesc="Event notification library"
url="https://libevent.org/"
arch=(x86_64)
@ -15,10 +15,12 @@ options=(debug)
source=(
https://github.com/libevent/libevent/releases/download/release-$pkgver-stable/libevent-$pkgver-stable.tar.gz{,.asc}
EVENT__SIZEOF_TIME_T.patch
libevent-2.1.12-openssl-compat.patch
)
sha256sums=('92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb'
'SKIP'
'945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf')
'945fc885b15692721bc7ae52f5774ef4fab8cc0f6108baa8860ab368de8675cf'
'e41527c55f6dacc6453b13eeeea2664798496896b796abcd2a5c8304c9eb2bae')
validpgpkeys=('B35BF85BF19489D04E28C33C21194EBB165733EA'
'9E3AC83A27974B84D1B3401DB86086848EF8686D')
@ -27,6 +29,9 @@ prepare() {
# Fix Firefox build
patch -Np1 -i ../EVENT__SIZEOF_TIME_T.patch
# Fix build with OpenSSL 3.0
patch -Np1 -i ../libevent-2.1.12-openssl-compat.patch
}
build() {

View File

@ -1,5 +1,6 @@
cmake python
cmake
python
ninja
doxygen

View File

@ -0,0 +1,74 @@
commit 7f4684c0d362fefee8697ceed3f4f8642ed147ce
Author: William Marlow <william.marlow@ibm.com>
Date: Sat Jun 18 21:43:31 2022 +0100
Initial OpenSSL 3.0 support
* Don't use deprecated functions when building against OpenSSL 3.0.
* Recognise that OpenSSL 3.0 can signal a dirty shutdown as a protocol.
error in addition to the expected IO error produced by OpenSSL 1.1.1
* Update regress_mbedtls.c for compatibility with OpenSSL 3
(cherry picked from commit 29c420c418aeb497e5e8b7abd45dee39194ca5fc)
Conflicts:
bufferevent_openssl.c
sample/becat.c
test/regress_mbedtls.c
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index b51b834b..520e2d6f 100644
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -514,7 +514,9 @@ conn_closed(struct bufferevent_openssl *bev_ssl, int when, int errcode, int ret)
put_error(bev_ssl, errcode);
break;
case SSL_ERROR_SSL:
- /* Protocol error. */
+ /* Protocol error; possibly a dirty shutdown. */
+ if (ret == 0 && SSL_is_init_finished(bev_ssl->ssl) == 0)
+ dirty_shutdown = 1;
put_error(bev_ssl, errcode);
break;
case SSL_ERROR_WANT_X509_LOOKUP:
diff --git a/sample/le-proxy.c b/sample/le-proxy.c
index 13e0e2ae..e9af3c68 100644
--- a/sample/le-proxy.c
+++ b/sample/le-proxy.c
@@ -112,10 +112,15 @@ eventcb(struct bufferevent *bev, short what, void *ctx)
ERR_reason_error_string(err);
const char *lib = (const char*)
ERR_lib_error_string(err);
+#if OPENSSL_VERSION_MAJOR >= 3
+ fprintf(stderr,
+ "%s in %s\n", msg, lib);
+#else
const char *func = (const char*)
ERR_func_error_string(err);
fprintf(stderr,
"%s in %s %s\n", msg, lib, func);
+#endif
}
if (errno)
perror("connection error");
diff --git a/test/regress_ssl.c b/test/regress_ssl.c
index 37dc334d..490be9b2 100644
--- a/test/regress_ssl.c
+++ b/test/regress_ssl.c
@@ -374,7 +374,16 @@ eventcb(struct bufferevent *bev, short what, void *ctx)
++n_connected;
ssl = bufferevent_openssl_get_ssl(bev);
tt_assert(ssl);
+#if OPENSSL_VERSION_MAJOR >= 3
+ /* SSL_get1_peer_certificate() means we want
+ * to increase the reference count on the cert
+ * and so we will need to free it ourselves later
+ * when we're done with it. The non-reference count
+ * increasing version is not available in OpenSSL 1.1.1. */
+ peer_cert = SSL_get1_peer_certificate(ssl);
+#else
peer_cert = SSL_get_peer_certificate(ssl);
+#endif
if (type & REGRESS_OPENSSL_SERVER) {
tt_assert(peer_cert == NULL);
} else {

View File

@ -7,12 +7,12 @@
pkgname=libidn2
pkgver=2.3.4
pkgrel=01
pkgrel=03
pkgdesc="Free software implementation of IDNA2008, Punycode and TR46"
arch=('x86_64')
url="https://www.gnu.org/software/libidn/#libidn2"
depends=('libunistring')
makedepends=('ruby-ronn')
makedepends=('ruby-ronn-ng')
provides=('libidn2.so')
source=(https://ftp.gnu.org/gnu/libidn/$pkgname-$pkgver.tar.gz{,.sig})
@ -26,6 +26,7 @@ build() {
./configure \
--prefix=/usr \
--disable-static
# --disable-dependency-tracking
make
}
@ -33,7 +34,10 @@ check() {
cd $pkgname-$pkgver
make check
}
package() {
depends+=('libunistring.so')
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
@ -47,4 +51,3 @@ validpgpkeys=('B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE') # Simon Josefsson <sim
sha256sums=(93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f # libidn2-2.3.4.tar.gz
c55c8cd14f398186407808f188ed5325faa01a62d88e79bb700bd8c839f75ceb) # libidn2-2.3.4.tar.gz.sig

View File

@ -3,13 +3,13 @@
pkgname=libidn2
pkgver=2.3.4
pkgrel=1
pkgrel=3
pkgdesc="Free software implementation of IDNA2008, Punycode and TR46"
arch=('x86_64')
url="https://www.gnu.org/software/libidn/#libidn2"
license=('GPL2' 'LGPL3')
depends=('libunistring')
makedepends=('ruby-ronn')
makedepends=('ruby-ronn-ng')
provides=('libidn2.so')
source=(https://ftp.gnu.org/gnu/libidn/$pkgname-$pkgver.tar.gz{,.sig})
sha256sums=('93caba72b4e051d1f8d4f5a076ab63c99b77faee019b72b9783b267986dbb45f'
@ -34,6 +34,8 @@ check() {
make check
}
package() {
depends+=('libunistring.so')
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}

View File

@ -1,16 +1,17 @@
#!/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=libpsl
pkgver=0.21.1
pkgrel=01
pkgrel=03
pkgdesc='Public Suffix List library'
url='https://github.com/rockdaboot/libpsl'
arch=('x86_64')
depends=('libidn2' 'libidn2.so' 'libunistring')
depends=('libidn2' 'libunistring')
makedepends=('libxslt' 'python' 'publicsuffix-list' 'gtk-doc')
provides=('libpsl.so')
source=(https://github.com/rockdaboot/libpsl/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
@ -41,6 +42,8 @@ check() {
}
package() {
depends+=('libidn2.so' 'libunistring.so')
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
@ -51,3 +54,4 @@ package() {
license=('MIT')
sha256sums=(ac6ce1e1fbd4d0254c4ddb9d37f1fa99dec83619c1253328155206b896210d4c) # libpsl-0.21.1.tar.gz

View File

@ -3,12 +3,12 @@
pkgname=libpsl
pkgver=0.21.1
pkgrel=1
pkgrel=3
pkgdesc='Public Suffix List library'
url='https://github.com/rockdaboot/libpsl'
arch=('x86_64')
license=('MIT')
depends=('libidn2' 'libidn2.so' 'libunistring')
depends=('libidn2' 'libunistring')
makedepends=('libxslt' 'python' 'publicsuffix-list' 'gtk-doc')
provides=('libpsl.so')
source=(https://github.com/rockdaboot/libpsl/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz)
@ -41,6 +41,8 @@ check() {
}
package() {
depends+=('libidn2.so' 'libunistring.so')
cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -Dm 644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"

View File

@ -1,4 +1,8 @@
libxslt python publicsuffix-list gtk-doc
libxslt
python
publicsuffix-list
gtk-doc
autoconf
gettext
automake

View File

@ -13,7 +13,7 @@
_name=cyrus-sasl
pkgname=libsasl
pkgver=2.1.28
pkgrel=02 ## rebuilt against Obarun's updated postgresql
pkgrel=04 ## rebuilt against Obarun's updated postgresql
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library w/o systemd"
arch=('x86_64')
url="https://www.cyrusimap.org/sasl/"
@ -96,3 +96,5 @@ validpgpkeys=(829F339F8C296FE80F409D93E3D7C118C7B9F46A # Partha Susarla <mail@s
sha256sums=(7ccfc6abd01ed67c1a0924b353e526f1b766b21f42d4562ee635a8ebfc5bb38c # cyrus-sasl-2.1.28.tar.gz
e6169548f42234eb2b1af9719415016a57116835b8ea494596f52743b49971fd) # cyrus-sasl-2.1.28.tar.gz.sig

View File

@ -9,7 +9,7 @@
_name=cyrus-sasl
pkgname=libsasl
pkgver=2.1.28
pkgrel=1
pkgrel=3
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=(x86_64)
url="https://www.cyrusimap.org/sasl/"

View File

@ -3,3 +3,6 @@ mariadb-libs
automake
autoconf
gettext

View File

@ -1,12 +1,13 @@
#!/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=libssh2
pkgver=1.10.0
pkgrel=01
pkgrel=03
pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
url="https://www.libssh2.org/"
arch=('x86_64')
@ -41,3 +42,4 @@ validpgpkeys=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2' # Daniel Stenberg
sha256sums=(2d64e90f3ded394b91d3a2e774ca203a4179f69aebee03003e5a6fa621e41d51 # libssh2-1.10.0.tar.gz
75702eaf490fa8c1e69b889c5c6366c2c3f3b089bc715f9f9be081c88f115f81) # libssh2-1.10.0.tar.gz.asc

View File

@ -6,7 +6,7 @@
pkgname=libssh2
pkgver=1.10.0
pkgrel=1
pkgrel=3
pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts"
url="https://www.libssh2.org/"
arch=('x86_64')

View File

@ -1 +1,3 @@

View File

@ -6,8 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=libunistring
pkgver=1.0
pkgrel=01
pkgver=1.1
pkgrel=02
pkgdesc='Library for manipulating Unicode strings and C strings'
url='https://www.gnu.org/software/libunistring/'
arch=(x86_64)
@ -16,11 +16,11 @@ makedepends=(gcc)
provides=('libunistring.so')
source=(https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.xz{,.sig})
prepare() {
cd $pkgname-$pkgver
# https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=cca32830b5
sed -i '/pragma weak pthread_create/d' tests/glthread/thread.h
}
#prepare() {
# cd $pkgname-$pkgver
# # https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=cca32830b5
# sed -i '/pragma weak pthread_create/d' tests/glthread/thread.h
#}
build() {
cd $pkgname-$pkgver
@ -43,5 +43,7 @@ license=(GPL)
validpgpkeys=(462225C3B46F34879FC8496CD605848ED7E69871 # Daiki Ueno <ueno@unixuser.org>
9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D) # Bruno Haible (Open Source Development) <bruno@clisp.org>
sha256sums=(5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741 # libunistring-1.0.tar.xz
c1c2ae60eb971593da92e65384a5f1b181717e7b9654854f139f350c6cbe235d) # libunistring-1.0.tar.xz.sig
sha256sums=(827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98 # libunistring-1.1.tar.xz
dadae6c38f85f9e8776231436c601c386924ceb44d511456c61c9be73608933d) # libunistring-1.1.tar.xz.sig

View File

@ -6,8 +6,8 @@
# Contributor: Patrick McCarty <pnorcks at gmail dot com>
pkgname=libunistring
pkgver=1.0
pkgrel=1
pkgver=1.1
pkgrel=2
pkgdesc='Library for manipulating Unicode strings and C strings'
url='https://www.gnu.org/software/libunistring/'
arch=(x86_64)
@ -17,17 +17,11 @@ provides=('libunistring.so')
source=(https://ftp.gnu.org/gnu/$pkgname/${pkgname}-${pkgver}.tar.xz{,.sig})
validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871' # Daiki Ueno <ueno@unixuser.org>
'9001B85AF9E1B83DF1BDA942F5BE8B267C6A406D') # Bruno Haible (Open Source Development) <bruno@clisp.org>
sha256sums=('5bab55b49f75d77ed26b257997e919b693f29fd4a1bc22e0e6e024c246c72741'
sha256sums=('827c1eb9cb6e7c738b171745dac0888aa58c5924df2e59239318383de0729b98'
'SKIP')
b2sums=('8208fe33d4ac2f015b0efb56b0c7dd87afc4bb1c6ca4eb3ded86d7e2101d7b7f68bfd8991af4b6dd408282ec73f134ee0b884e761ff6d52e8a1e398326aec420'
b2sums=('721adc90884006480055b95d0fa06cd862417aa02b467f1e14688292ad9c11f1e33520b14ed5dc2d2724c6df8713d3af1e8032014259d8355156cb72edfcb983'
'SKIP')
prepare() {
cd $pkgname-$pkgver
# https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=cca32830b5
sed -i '/pragma weak pthread_create/d' tests/glthread/thread.h
}
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr

View File

@ -1,2 +1,3 @@

View File

@ -7,7 +7,7 @@
pkgname=links
pkgver=2.28
pkgrel=01
pkgrel=02
pkgdesc='A text WWW browser, similar to Lynx - gfx enabled in xlinks'
arch=('x86_64')
url='http://links.twibright.com/'

View File

@ -3,7 +3,7 @@
pkgname=links
pkgver=2.28
pkgrel=1
pkgrel=2
pkgdesc='A text WWW browser, similar to Lynx'
arch=('x86_64')
url='http://links.twibright.com/'

View File

@ -7,10 +7,9 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
#_tag='890c0635554075e122ef5437b5dfb28ff6fcb128' # git rev-parse v${pkgver//./_}
_tag='82b36d78165764dda7d44d104737a95054348a02' # git rev-parse v${pkgver//./_}pkgver=2.03.16
pkgver=2.03.16
pkgrel=03
_tag='0ea00227b96a383479139e72db9168448eee48c9' # git rev-parse v${pkgver//./_}
pkgver=2.03.17
pkgrel=01
arch=('x86_64')
url='https://sourceware.org/lvm2/'
makedepends=('git' 'thin-provisioning-tools')
@ -132,5 +131,9 @@ validpgpkeys=('88437EF5C077BD113D3B7224228191C1567E2C17' # Alasdair G Kergon <a
sha256sums=(SKIP
e9ab9207b805cab702a666a2deb754583e6acd4c46973898ebb4170b563f0eec # 0001-udev-initcpio.patch
def6e03aa1629bbc0ca1ee5e84e620366daf779f037eab2fda47487a8471729b # lvm2_install
# 8870091ef70b5ea18b18bfcc770f8bda7dcd9d7cc2cc4fe5e4c3ac1f35bbb66a # lvm2_install
e10f24b57582d6e2da71f7c80732a62e0ee2e3b867fe84591ccdb53e80fa92e0) # 11-dm-initramfs.rules
# 5292e1b20eb0c4a8b6108c997ccd96bb163d5fcbc7582080a59acee0b472e8e7 device-mapper-2.03.17-01-x86_64.pkg.tar.xz
# 6677167b10e88a968264d3d563acab201c81f6a8119a0350cc8f9e843df80a9b lvm2-2.03.17-01-x86_64.pkg.tar.xz

View File

@ -3,9 +3,9 @@
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
_tag='82b36d78165764dda7d44d104737a95054348a02' # git rev-parse v${pkgver//./_}
pkgver=2.03.16
pkgrel=2
_tag='0ea00227b96a383479139e72db9168448eee48c9' # git rev-parse v${pkgver//./_}
pkgver=2.03.17
pkgrel=1
arch=('x86_64')
url='https://sourceware.org/lvm2/'
license=('GPL2' 'LGPL2.1')

View File

@ -1,12 +1,13 @@
#!/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=make
pkgver=4.3
pkgrel=03
pkgrel=05
pkgdesc="GNU make utility to maintain groups of programs"
arch=('x86_64')
url="https://www.gnu.org/software/make"
@ -16,7 +17,7 @@ source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz"{,.sig})
build() {
cd "${pkgname}-${pkgver}"
./configure --prefix=/usr
./configure --prefix=/usr --disable-dependency-tracking
make
}
@ -38,3 +39,4 @@ validpgpkeys=('6D4EEB02AD834703510B117680CB727A20C79BB2') # Paul Smith
sha256sums=(de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82 # make-4.3.tar.lz
183f259bc2da1745eb086d17863f61303b100b07e1d8026601904f029bcd717d) # make-4.3.tar.lz.sig

View File

@ -4,7 +4,7 @@
pkgname=make
pkgver=4.3
pkgrel=3
pkgrel=5
pkgdesc="GNU make utility to maintain groups of programs"
arch=('x86_64')
url="https://www.gnu.org/software/make"

View File

@ -1 +1,2 @@

View File

@ -7,7 +7,7 @@
pkgname=mkinitcpio
pkgver=32
pkgrel=02
pkgrel=03
pkgdesc="Modular initramfs image creation utility"
#url='https://github.com/archlinux/mkinitcpio'
url="https://sources.archlinux.org/other"
@ -23,10 +23,11 @@ optdepends=('zstd: Use zstd compression for the initramfs image'
'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
provides=("mkinitcpio=$pkgver-$pkgrel"
'initramfs')
backup=('etc/mkinitcpio.conf')
#backup=('etc/mkinitcpio.conf')
source=("$url/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
nosystemd.patch
"fix-strip.patch::https://github.com/archlinux/mkinitcpio/commit/dece596d569ca90af902bf2403227b478b629c03.patch")
"fix-strip.patch::https://github.com/archlinux/mkinitcpio/commit/dece596d569ca90af902bf2403227b478b629c03.patch"
mkinitcpio.conf)
prepare() {
cd "${pkgname}-${pkgver}"
@ -41,6 +42,8 @@ check() {
package() {
make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
rm -f "${pkgdir}"/usr/lib/initcpio/install/sd-*
rm -f "${pkgdir}/etc/mkinitcpio.conf"
install -Dm644 "${srcdir}/mkinitcpio.conf" "${pkgdir}/etc/mkinitcpio.conf"
}
#---- license gpg-key sha256sums ----
@ -52,6 +55,8 @@ validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB' # Giancarlo Razzolin
sha256sums=(f167d0b9831a5b6ae388525ebc92cea3a4766429e16ee2b56dbaa8d3b7c73ab2 # mkinitcpio-32.tar.gz
0def1b0543f75140a499ac1d3e6085f8f7d5a4443fecc319dbf08878cac9be2e # mkinitcpio-32.tar.gz.sig
c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd # nosystemd.patch
d5ca05e3f2b338f6ac988461ba9bd60c030e7cb092aecf90b43d5a470e7e3652) # fix-strip.patch
c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd # nosystemd.patch
d5ca05e3f2b338f6ac988461ba9bd60c030e7cb092aecf90b43d5a470e7e3652 # fix-strip.patch
c8ec2debd54233927dd97bd25ef4ac00e1ac850f9b34a3d414e1a66608c36040) # mkinitcpio.conf

View File

@ -0,0 +1,68 @@
# vim:set ft=sh
# MODULES
# The following modules are loaded before any boot hooks are
# run. Advanced users may wish to specify all system modules
# in this array. For instance:
# MODULES=(piix ide_disk reiserfs)
MODULES=()
# BINARIES
# This setting includes any additional binaries a given user may
# wish into the CPIO image. This is run last, so it may be used to
# override the actual binaries included by a given hook
# BINARIES are dependency parsed, so you may safely ignore libraries
BINARIES=()
# FILES
# This setting is similar to BINARIES above, however, files are added
# as-is and are not parsed in any way. This is useful for config files.
FILES=()
# HOOKS
# This is the most important setting in this file. The HOOKS control the
# modules and scripts added to the image, and what happens at boot time.
# Order is important, and it is recommended that you do not change the
# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
# help on a given hook.
# 'base' is _required_ unless you know precisely what you are doing.
# 'udev' is _required_ in order to automatically load modules
# 'filesystems' is _required_ unless you specify your fs modules in MODULES
# Examples:
## This setup specifies all modules in the MODULES setting above.
## No raid, lvm2, or encrypted root is needed.
# HOOKS=(base)
#
## This setup will autodetect all modules for your system and should
## work as a sane default
# HOOKS=(base udev autodetect block filesystems)
#
## This setup will generate a 'full' image which supports most systems.
## No autodetection is done.
# HOOKS=(base udev block filesystems)
#
## This setup assembles a pata mdadm array with an encrypted root FS.
## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
# HOOKS=(base udev block mdadm encrypt filesystems)
#
## This setup loads an lvm2 volume group on a usb device.
# HOOKS=(base udev block lvm2 filesystems)
#
## NOTE: If you have /usr on a separate partition, you MUST include the
# usr, fsck and shutdown hooks.
HOOKS=(base udev autodetect modconf block filesystems keyboard fsck)
# COMPRESSION
# Use this to compress the initramfs image. By default, zstd compression
## joborun linux wants to revert this default behavior and adds its own mkinitcpio.conf file
# is used. Use 'cat' to create an uncompressed image.
#COMPRESSION="zstd"
#COMPRESSION="gzip"
#COMPRESSION="bzip2"
#COMPRESSION="lzma"
COMPRESSION="xz"
#COMPRESSION="lzop"
#COMPRESSION="lz4"
# COMPRESSION_OPTIONS
# Additional options for the compressor
COMPRESSION_OPTIONS=( -T0 )

View File

@ -7,7 +7,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.84
pkgver=3.85
pkgrel=01
pkgdesc="Network Security Services - zstd mandatory here!"
@ -16,7 +16,7 @@ arch=(x86_64)
depends=('nspr>=4.35' sqlite zlib sh 'p11-kit>=0.23.19')
makedepends=(perl python gyp mercurial)
#options=(debug) # uncomment this if you need to build the nss debug pkg
_revision=89975de900203c7a8aaf8457311b8c1ebfda7b22
_revision=5c42853e23d7d56ebf25943f6c2d95270e18492a
source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision"
certdata2pem.py bundle.sh)

View File

@ -3,7 +3,7 @@
pkgbase=nss
pkgname=(nss ca-certificates-mozilla)
pkgver=3.84
pkgver=3.85
pkgrel=1
pkgdesc="Network Security Services"
url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
@ -12,7 +12,7 @@ license=(MPL GPL)
depends=('nspr>=4.35' sqlite zlib sh 'p11-kit>=0.23.19')
makedepends=(perl python gyp mercurial)
options=(debug)
_revision=89975de900203c7a8aaf8457311b8c1ebfda7b22
_revision=5c42853e23d7d56ebf25943f6c2d95270e18492a
source=("hg+https://hg.mozilla.org/projects/nss#revision=$_revision"
certdata2pem.py bundle.sh)
sha256sums=('SKIP'

View File

@ -9,7 +9,7 @@ pkgbase=openldap
pkgname=('openldap' 'libldap')
pkgdesc='Lightweight Directory Access Protocol (LDAP) client, libraries, and server, w/o ipv6 & systemd'
pkgver=2.6.3
pkgrel=01
pkgrel=03
arch=(x86_64)
url='https://www.openldap.org'
source=($url/software/download/OpenLDAP/openldap-release/$pkgbase-$pkgver.tgz{,.asc}
@ -61,12 +61,9 @@ build() {
--disable-wt \
--enable-overlays=mod \
--with-cyrus-sasl \
--with-threads \
--disable-ndb \
--disable-systemd
--with-threads
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
# build extra modules
@ -79,10 +76,15 @@ build() {
done
}
check() {
cd $pkgbase-$pkgver
make test
}
#
# if a test fails comment this out and makepkg without the -f option
#
#check() {
# cd $pkgbase-$pkgver
# make test
#}
#
#
package_libldap() {
pkgdesc='Lightweight Directory Access Protocol (LDAP) client libraries without ipv6'

View File

@ -4,7 +4,7 @@
pkgbase=openldap
pkgname=('openldap' 'libldap')
pkgver=2.6.3
pkgrel=1
pkgrel=2
arch=('x86_64')
url="https://www.openldap.org/"
license=('custom')

View File

@ -7,7 +7,7 @@
pkgname=openssh
pkgver=9.1p1
pkgrel=02
pkgrel=03
pkgdesc='SSH protocol implementation for remote login, command execution and file transfer w/o systemd'
arch=('x86_64')
url='https://www.openssh.com/portable.html'

View File

@ -6,7 +6,7 @@
pkgname=openssh
pkgver=9.1p1
pkgrel=1
pkgrel=3
pkgdesc="SSH protocol implementation for remote login, command execution and file transfer"
arch=('x86_64')
url='https://www.openssh.com/portable.html'

View File

@ -1,6 +1,7 @@
real 3m19.968s
user 3m11.783s
sys 0m9.530s
real 5m50.037s
user 5m27.527s
sys 0m11.301s

91
openssl-1.1/PKGBUILD Normal file
View File

@ -0,0 +1,91 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobcore/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=openssl-1.1
_pkgname=openssl
_ver=1.1.1s
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=02
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('x86_64')
url='https://www.openssl.org'
depends=('glibc')
provides=('libcrypto.so' 'libssl.so')
makedepends=('perl')
source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc}
'ca-dir.patch')
prepare() {
cd "$srcdir/$_pkgname-$_ver"
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
}
build() {
cd "$srcdir/$_pkgname-$_ver"
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib/openssl-1.1 \
shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
make depend
make
}
check() {
cd "$srcdir/$_pkgname-$_ver"
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i "$srcdir/ca-dir.patch"
make test
patch -p0 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from th patched .in file.
make apps/CA.pl
}
package() {
cd "$srcdir/$_pkgname-$_ver"
make DESTDIR="$pkgdir" install_sw
# Move some files around
install -m755 -d "$pkgdir/usr/include/openssl-1.1"
mv "$pkgdir/usr/include/openssl" "$pkgdir/usr/include/openssl-1.1/"
mv "$pkgdir/usr/lib/openssl-1.1/libcrypto.so.1.1" "$pkgdir/usr/lib/"
mv "$pkgdir/usr/lib/openssl-1.1/libssl.so.1.1" "$pkgdir/usr/lib/"
ln -sf ../libssl.so.1.1 "$pkgdir/usr/lib/openssl-1.1/libssl.so"
ln -sf ../libcrypto.so.1.1 "$pkgdir/usr/lib/openssl-1.1/libcrypto.so"
mv "$pkgdir/usr/bin/openssl" "$pkgdir/usr/bin/openssl-1.1"
# Update includedir in .pc files
sed -e 's|/include$|/include/openssl-1.1|' -i "$pkgdir"/usr/lib/openssl-1.1/pkgconfig/*.pc
rm -rf "$pkgdir"/{etc,usr/bin/c_rehash}
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
#---- license gpg-key sha256sums ----
license=('custom:BSD')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C')
sha256sums=(c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa # openssl-1.1.1s.tar.gz
e5da0dc35025bb2c59d9438f4c83615e7470261d9c3127135dadbc226d6c8a32 # openssl-1.1.1s.tar.gz.asc
75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2) # ca-dir.patch

78
openssl-1.1/PKGBUILD-arch Normal file
View File

@ -0,0 +1,78 @@
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl-1.1
_pkgname=openssl
_ver=1.1.1s
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=2
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('x86_64')
url='https://www.openssl.org'
license=('custom:BSD')
depends=('glibc')
provides=('libcrypto.so' 'libssl.so')
makedepends=('perl')
source=("https://www.openssl.org/source/${_pkgname}-${_ver}.tar.gz"{,.asc}
'ca-dir.patch')
sha256sums=('c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa'
'SKIP'
'75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C')
prepare() {
cd "$srcdir/$_pkgname-$_ver"
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
}
build() {
cd "$srcdir/$_pkgname-$_ver"
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib/openssl-1.1 \
shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
make depend
make
}
check() {
cd "$srcdir/$_pkgname-$_ver"
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i "$srcdir/ca-dir.patch"
make test
patch -p0 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from th patched .in file.
make apps/CA.pl
}
package() {
cd "$srcdir/$_pkgname-$_ver"
make DESTDIR="$pkgdir" install_sw
# Move some files around
install -m755 -d "$pkgdir/usr/include/openssl-1.1"
mv "$pkgdir/usr/include/openssl" "$pkgdir/usr/include/openssl-1.1/"
mv "$pkgdir/usr/lib/openssl-1.1/libcrypto.so.1.1" "$pkgdir/usr/lib/"
mv "$pkgdir/usr/lib/openssl-1.1/libssl.so.1.1" "$pkgdir/usr/lib/"
ln -sf ../libssl.so.1.1 "$pkgdir/usr/lib/openssl-1.1/libssl.so"
ln -sf ../libcrypto.so.1.1 "$pkgdir/usr/lib/openssl-1.1/libcrypto.so"
mv "$pkgdir/usr/bin/openssl" "$pkgdir/usr/bin/openssl-1.1"
# Update includedir in .pc files
sed -e 's|/include$|/include/openssl-1.1|' -i "$pkgdir"/usr/lib/openssl-1.1/pkgconfig/*.pc
rm -rf "$pkgdir"/{etc,usr/bin/c_rehash}
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}

31
openssl-1.1/ca-dir.patch Normal file
View File

@ -0,0 +1,31 @@
--- apps/CA.pl.in 2019-09-10 15:13:07.000000000 +0200
+++ apps/CA.pl.in 2019-10-06 09:34:23.960864556 +0200
@@ -33,7 +33,7 @@
my $PKCS12 = "$openssl pkcs12";
# default openssl.cnf file has setup as per the following
-my $CATOP = "./demoCA";
+my $CATOP = "/etc/ssl";
my $CAKEY = "cakey.pem";
my $CAREQ = "careq.pem";
my $CACERT = "cacert.pem";
--- apps/openssl.cnf 2019-09-10 15:13:07.000000000 +0200
+++ apps/openssl.cnf 2019-10-06 09:34:23.960864556 +0200
@@ -42,7 +42,7 @@
####################################################################
[ CA_default ]
-dir = ./demoCA # Where everything is kept
+dir = /etc/ssl # Where everything is kept
certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.
@@ -325,7 +325,7 @@
[ tsa_config1 ]
# These are used by the TSA reply generation only.
-dir = ./demoCA # TSA root directory
+dir = /etc/ssl # TSA root directory
serial = $dir/tsaserial # The current serial number (mandatory)
crypto_device = builtin # OpenSSL engine to use for signing
signer_cert = $dir/tsacert.pem # The TSA signing certificate

1
openssl-1.1/clean Normal file
View File

@ -0,0 +1 @@
rm -rvf {src,pkg,*gz*}

4
openssl-1.1/deps Normal file
View File

@ -0,0 +1,4 @@

3
openssl-1.1/key Normal file
View File

@ -0,0 +1,3 @@
gpg -v --recv-key D9C4D26D0E604491
gpg --recv-keys D5E9E43F7DF9EE8C
gpg -v --recv-keys 527466A21CA79E6D

5
openssl-1.1/time Normal file
View File

@ -0,0 +1,5 @@
real 5m27.372s
user 7m32.313s
sys 1m37.248s

1
openssl/NOTE-----NOTE Normal file
View File

@ -0,0 +1 @@
before building openssl 3 to replace 1.1 you must first build and install openssl-1.1 which is a new package for core/jobcore otherwise several utilities will fail when replacing openssl. Then you should rebuild cryptsetup and coreutils ...

View File

@ -6,12 +6,8 @@
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=openssl
_ver=1.1.1q
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
## Joborun: All this manouver with _ver instead of pkgver is for naming the pkg 1.1.1.l instead of 1.1.1l
## Does it really affect alphanumeric order as 1l, while 1.l works better? Just in case you were wondering, I decided to leave it in tact.
pkgrel=01
pkgver=3.0.7
pkgrel=02
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('x86_64')
url='https://www.openssl.org'
@ -19,23 +15,24 @@ depends=('glibc')
makedepends=('perl')
optdepends=('ca-certificates' 'perl')
replaces=('openssl-perl' 'openssl-doc')
provides=('libcrypto.so' 'libssl.so')
backup=('etc/ssl/openssl.cnf')
source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
source=("https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
'ca-dir.patch')
prepare() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$pkgver"
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
patch -Np1 -i "$srcdir/ca-dir.patch"
}
build() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$pkgver"
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \
shared enable-ktls enable-ec_nistp_64_gcc_128 linux-x86_64 \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
make depend
@ -43,34 +40,36 @@ build() {
}
check() {
cd "$srcdir/$pkgbase-$_ver"
cd "$srcdir/$pkgbase-$pkgver"
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i "$srcdir/ca-dir.patch"
patch -Rp1 -i "$srcdir/ca-dir.patch"
make test
make HARNESS_JOBS=$(nproc) test
patch -p0 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from th patched .in file.
patch -Np1 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from the patched .in file.
make apps/CA.pl
}
package() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs install_man_docs
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
}
#---- license gpg-key sha256sums ----
license=('custom:BSD')
## license=('custom:BSD') ### license change
license=('Apache')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
validpgpkeys=(8657ABB260F056B1E5190839D9C4D26D0E604491
7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C
A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C)
sha256sums=(d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca # openssl-1.1.1q.tar.gz
3ca1d670075b9dcd213071c701a5334cf6a206cf7686ae6db4e79db3090ad9ad # openssl-1.1.1q.tar.gz.asc
75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2) # ca-dir.patch
sha256sums=(83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e # openssl-3.0.7.tar.gz
18be1d820b25ed5c7d8efe4fdba0b947925273ca114bbd78faecbd99a52df203 # openssl-3.0.7.tar.gz.asc
0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7) # ca-dir.patch

View File

@ -1,40 +1,40 @@
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
_ver=1.1.1q
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1
pkgver=3.0.7
pkgrel=2
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('x86_64')
url='https://www.openssl.org'
license=('custom:BSD')
license=('Apache')
depends=('glibc')
makedepends=('perl')
optdepends=('ca-certificates' 'perl')
replaces=('openssl-perl' 'openssl-doc')
provides=('libcrypto.so' 'libssl.so')
backup=('etc/ssl/openssl.cnf')
source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"{,.asc}
'ca-dir.patch')
sha256sums=('d7939ce614029cdff0b6c20f0e2e5703158a489a72b2507b8bd51bf8c8fd10ca'
source=("https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
'ca-dir.patch')
sha256sums=('83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e'
'SKIP'
'75aa8c2c638c8a3ebfd9fa146fc61c7ff878fc997dc6aa10d39e4b2415d669b2')
'0a32d9ca68e8d985ce0bfef6a4c20b46675e06178cc2d0bf6d91bd6865d648b7')
validpgpkeys=('8657ABB260F056B1E5190839D9C4D26D0E604491'
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C')
'7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C'
'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C')
prepare() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$pkgver"
# set ca dir to /etc/ssl by default
patch -p0 -i "$srcdir/ca-dir.patch"
patch -Np1 -i "$srcdir/ca-dir.patch"
}
build() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$pkgver"
# mark stack as non-executable: http://bugs.archlinux.org/task/12434
./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 \
shared enable-ktls enable-ec_nistp_64_gcc_128 linux-x86_64 \
"-Wa,--noexecstack ${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
make depend
@ -42,23 +42,23 @@ build() {
}
check() {
cd "$srcdir/$pkgbase-$_ver"
cd "$srcdir/$pkgbase-$pkgver"
# the test fails due to missing write permissions in /etc/ssl
# revert this patch for make test
patch -p0 -R -i "$srcdir/ca-dir.patch"
patch -Rp1 -i "$srcdir/ca-dir.patch"
make test
make HARNESS_JOBS=$(nproc) test
patch -p0 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from th patched .in file.
patch -Np1 -i "$srcdir/ca-dir.patch"
# re-run make to re-generate CA.pl from the patched .in file.
make apps/CA.pl
}
package() {
cd "$srcdir/$pkgname-$_ver"
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" MANDIR=/usr/share/man MANSUFFIX=ssl install_sw install_ssldirs install_man_docs
install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
}

View File

@ -1,17 +1,17 @@
--- apps/CA.pl.in 2019-09-10 15:13:07.000000000 +0200
+++ apps/CA.pl.in 2019-10-06 09:34:23.960864556 +0200
@@ -33,7 +33,7 @@
--- a/apps/CA.pl.in
+++ b/apps/CA.pl.in
@@ -29,7 +29,7 @@
my $PKCS12 = "$openssl pkcs12";
# default openssl.cnf file has setup as per the following
# Default values for various configuration settings.
-my $CATOP = "./demoCA";
+my $CATOP = "/etc/ssl";
my $CAKEY = "cakey.pem";
my $CAREQ = "careq.pem";
my $CACERT = "cacert.pem";
--- apps/openssl.cnf 2019-09-10 15:13:07.000000000 +0200
+++ apps/openssl.cnf 2019-10-06 09:34:23.960864556 +0200
@@ -42,7 +42,7 @@
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -79,7 +79,7 @@
####################################################################
[ CA_default ]
@ -20,7 +20,7 @@
certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.
@@ -325,7 +325,7 @@
@@ -309,7 +309,7 @@
[ tsa_config1 ]
# These are used by the TSA reply generation only.

View File

@ -1,2 +1,3 @@
gpg -v --recv-key D9C4D26D0E604491
gpg --recv-keys D5E9E43F7DF9EE8C
gpg -v --recv-keys 527466A21CA79E6D

View File

@ -7,7 +7,7 @@
pkgname=pacman
pkgver=6.0.2
pkgrel=02
pkgrel=05
pkgdesc="A library-based package manager with dependency support"
arch=('x86_64')
url="https://www.archlinux.org/pacman/"
@ -94,4 +94,3 @@ sha256sums=(7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 #
aa2e113eba452b9d9fef85aa87333370ae2d3bb0e06df4b0776e04c3ec76d028 # pacman.conf
7e1af6a61b1b8565b5d608ba77b435e55585ad8acb7b106585458124a020c462) # makepkg.conf

View File

@ -0,0 +1,26 @@
From 86981383a2f4380bda26311831be94cdc743649b Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Sun, 9 Oct 2022 13:43:31 +1000
Subject: [PATCH] Fix missing if
Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/libmakepkg/tidy/strip.sh.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
index a3b6cd3a..69c9f041 100644
--- a/scripts/libmakepkg/tidy/strip.sh.in
+++ b/scripts/libmakepkg/tidy/strip.sh.in
@@ -73,7 +73,7 @@ strip_file() {
file="${srcdir}/${t}"
dest="${dbgsrc}/${t}"
mkdir -p "${dest%/*}"
- [[ -f "$file" ]]; then
+ if [[ -f "$file" ]]; then
cp -- "$file" "$dest"
fi
done < <(source_files "$binary")
--
GitLab

View File

@ -0,0 +1,34 @@
From efd0c24c07b86be014a4edb5a8ece021b87e3900 Mon Sep 17 00:00:00 2001
From: Allan McRae <allan@archlinux.org>
Date: Sat, 8 Oct 2022 21:07:45 +1000
Subject: [PATCH] Always create directories outputted from debugedit in debug
packages
The debugedit call to list all source files may include things like
build/<...>. We have been filtering out these <> files, but they can
point to the build directory which is important to be available for
relative source paths stored in the .debug files.
Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/libmakepkg/tidy/strip.sh.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
index 91c66f13..17526a34 100644
--- a/scripts/libmakepkg/tidy/strip.sh.in
+++ b/scripts/libmakepkg/tidy/strip.sh.in
@@ -72,8 +72,8 @@ strip_file() {
while IFS= read -r t; do
file="${srcdir}/${t}"
dest="${dbgsrc}/${t}"
- if [[ -f "$file" ]] && ! [[ -f $dest ]]; then
- mkdir -p "${dest%/*}"
+ mkdir -p "${dest%/*}"
+ [[ -f "$file" ]]; then
cp -- "$file" "$dest"
fi
done < <(source_files "$binary")
--
GitLab

View File

@ -0,0 +1,47 @@
From 478af273dfe24ded197ec54ae977ddc3719d74a0 Mon Sep 17 00:00:00 2001
From: Morten Linderud <morten@linderud.pw>
Date: Thu, 6 Oct 2022 12:03:14 +0200
Subject: [PATCH] strip: fix unique source paths
`${pkgbase}` was added to the wrong invocation. This ensures we are
producing correct debug packages.
Example from the package:
/usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.c
/usr/src/debug/pacman/pacman-6.0.2/src/pacman/callback.h
/usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.c
/usr/src/debug/pacman/pacman-6.0.2/src/pacman/check.h
Fixes: 776b7c1e75f2 ("debugflags: Ensure we have unique source paths")
Signed-off-by: Morten Linderud <morten@linderud.pw>
Signed-off-by: Allan McRae <allan@archlinux.org>
---
scripts/libmakepkg/tidy/strip.sh.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in
index 17526a34..4453b638 100644
--- a/scripts/libmakepkg/tidy/strip.sh.in
+++ b/scripts/libmakepkg/tidy/strip.sh.in
@@ -47,7 +47,7 @@ source_files() {
LANG=C debugedit --no-recompute-build-id \
--base-dir "${srcdir}" \
- --dest-dir "${dbgsrcdir}/${pkgbase}" \
+ --dest-dir "${dbgsrcdir}" \
--list-file /dev/stdout "$1" \
| sort -zu | tr '\0' '\n'
}
@@ -141,7 +141,7 @@ tidy_strip() {
if check_option "debug" "y"; then
dbgdir="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@/usr/lib/debug"
- dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}"
+ dbgsrcdir="${DBGSRCDIR:-/usr/src/debug}/${pkgbase}"
dbgsrc="$pkgdirbase/$pkgbase-@DEBUGSUFFIX@$dbgsrcdir"
mkdir -p "$dbgdir" "$dbgsrc"
fi
--
GitLab

Some files were not shown because too many files have changed in this diff Show More