upg nilfs-utils pacman pkgconf run-parts
This commit is contained in:
parent
a452272ac4
commit
01d181e8fc
|
|
@ -6,10 +6,9 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=nilfs-utils
|
||||
pkgver=2.2.9
|
||||
pkgrel=02
|
||||
pkgver=2.2.10
|
||||
pkgrel=01
|
||||
pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
|
||||
arch=('x86_64')
|
||||
url="http://nilfs.sourceforge.net/"
|
||||
backup=('etc/nilfs_cleanerd.conf')
|
||||
depends=('util-linux')
|
||||
|
|
@ -18,7 +17,9 @@ source=(http://nilfs.sourceforge.net/download/$pkgname-$pkgver.tar.bz2)
|
|||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
sed -i -e 's#root_sbindir=/sbin#root_sbindir=/usr/bin#' configure
|
||||
./configure --sbindir=/usr/bin --with-libmount
|
||||
./configure \
|
||||
--sbindir=/usr/bin \
|
||||
--with-libmount
|
||||
make
|
||||
}
|
||||
|
||||
|
|
@ -27,12 +28,13 @@ package() {
|
|||
make DESTDIR="$pkgdir" sbindir=/usr/bin install LDCONFIG=/bin/true
|
||||
}
|
||||
|
||||
#---- license gpg-key sha256sums ----
|
||||
#---- arch license gpg-key & sha256sums ----
|
||||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL2' 'LGPL2.1')
|
||||
|
||||
sha256sums=(5df63998c2084182c8c608a29b47b1771b825b4b5fa7916c12cca2fcb7577a97) # nilfs-utils-2.2.9.tar.bz2
|
||||
|
||||
# 45490630e4c1496e94f744f40cf47cc50f0d548374806a323d3d232d43424b32 nilfs-utils-2.2.9-02-x86_64.pkg.tar.xz
|
||||
sha256sums=(969355f6990a73e104e329386f26e82c4e5e4faf5f7eb1b9eed513659bdf31eb) # nilfs-utils-2.2.10.tar.bz2
|
||||
|
||||
## ef420bccf62e02785fc214b283156f4ccc1c9aafbb1691af1b2e515e939019e0 nilfs-utils-2.2.10-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
|
||||
|
||||
pkgname=nilfs-utils
|
||||
pkgver=2.2.9
|
||||
pkgrel=2
|
||||
pkgver=2.2.10
|
||||
pkgrel=1
|
||||
pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
|
||||
arch=('x86_64')
|
||||
url="http://nilfs.sourceforge.net/"
|
||||
|
|
@ -11,7 +11,7 @@ license=('GPL2' 'LGPL2.1')
|
|||
backup=('etc/nilfs_cleanerd.conf')
|
||||
depends=('util-linux')
|
||||
source=(http://nilfs.sourceforge.net/download/$pkgname-$pkgver.tar.bz2)
|
||||
sha256sums=('5df63998c2084182c8c608a29b47b1771b825b4b5fa7916c12cca2fcb7577a97')
|
||||
sha256sums=('969355f6990a73e104e329386f26e82c4e5e4faf5f7eb1b9eed513659bdf31eb')
|
||||
|
||||
build() {
|
||||
cd $pkgname-$pkgver
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
pkgname=pacman
|
||||
pkgver=6.1.0
|
||||
pkgrel=01
|
||||
pkgrel=03
|
||||
pkgdesc="A library-based package manager with dependency support modified for joborun from arch"
|
||||
url="https://www.archlinux.org/pacman/"
|
||||
groups=(base jobbot)
|
||||
|
|
@ -29,6 +29,12 @@ backup=(etc/pacman.conf
|
|||
options=('strip')
|
||||
source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
|
||||
revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
|
||||
"$pkgname-fix-msg-unknown-key.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19226bc090d6fd0fb06.patch"
|
||||
"$pkgname-man-gitlab.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/95f148c2222db608a0d72d5c5577d0c71e7fa199.patch"
|
||||
"$pkgname-make-aligned-titles.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03.patch"
|
||||
"$pkgname-repo-add-parseopts.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac2228d4e6ac510b9008e.patch"
|
||||
"$pkgname-drop-result-warn.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76d62f2ac01aeccce48.patch"
|
||||
"$pkgname-fix-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/bae9594ac1806ce30f2af1de27c49bb101a00d44.patch"
|
||||
pacman.conf
|
||||
makepkg.conf)
|
||||
## install="pacman.install"
|
||||
|
|
@ -107,8 +113,14 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@a
|
|||
sha256sums=(5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9 # pacman-6.1.0.tar.xz
|
||||
d12ce27098e2426f8e482b4334e9d3dbe7f57524a536a289990f8b99e5e3a8aa # pacman-6.1.0.tar.xz.sig
|
||||
b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2 # revertme-makepkg-remove-libdepends-and-libprovides.patch
|
||||
94c987046c2ff232fa0d395cddc11644840d767806711e04ef34f876a9baf217 # pacman-fix-msg-unknown-key.patch
|
||||
0774d7035e34661f74b673d4b0a94be877bdc0158a555b873ec6bd4e2c936377 # pacman-man-gitlab.patch
|
||||
7bb64910265ce2590f593cdfd302076e49f67a68f8cc792a9aaac572d36fc842 # pacman-make-aligned-titles.patch
|
||||
2bbfe40539513ff5775aaf900644c8985ef618f5df9af856b9d571e2501365b0 # pacman-repo-add-parseopts.patch
|
||||
160515b741aadc876a67f213029f5f62a51ff072ea4aaeb687bbe614035bf72f # pacman-drop-result-warn.patch
|
||||
1f4e4cc54332e60c9da2bdabf9a80dc11db466535f1a0be298cbf654f0723721 # pacman-fix-debugedit.patch
|
||||
56afa185068a3941e5ff49836d69b1e5d8191521cc7e54b01feb0edac6d8e736 # pacman.conf
|
||||
3e5a8edab365c52b2e957681b8a567b9600afd1c24d037f538369c4935b52d5b) # makepkg.conf
|
||||
|
||||
## 4cba0a76e6ad69dfd23fa1cf65a488aa3426da11e1567f887e4e23ade733a27f pacman-6.1.0-01-x86_64.pkg.tar.lz
|
||||
## aa9e3c3e1cd31a6ad90ef5cbd7a36d494ee3b64cbef504ef750672392a14e9b0 pacman-6.1.0-03-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
pkgname=pacman
|
||||
pkgver=6.1.0
|
||||
pkgrel=1
|
||||
pkgrel=3
|
||||
pkgdesc="A library-based package manager with dependency support"
|
||||
arch=('x86_64')
|
||||
url="https://www.archlinux.org/pacman/"
|
||||
|
|
@ -21,11 +21,23 @@ validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@a
|
|||
'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
|
||||
source=(https://gitlab.archlinux.org/pacman/pacman/-/releases/v$pkgver/downloads/pacman-$pkgver.tar.xz{,.sig}
|
||||
revertme-makepkg-remove-libdepends-and-libprovides.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/354a300cd26bb1c7e6551473596be5ecced921de.patch
|
||||
"$pkgname-fix-msg-unknown-key.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/6bb95c8856437513ee0ab19226bc090d6fd0fb06.patch"
|
||||
"$pkgname-man-gitlab.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/95f148c2222db608a0d72d5c5577d0c71e7fa199.patch"
|
||||
"$pkgname-make-aligned-titles.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03.patch"
|
||||
"$pkgname-repo-add-parseopts.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/0571ee82bff0edbd5ffac2228d4e6ac510b9008e.patch"
|
||||
"$pkgname-drop-result-warn.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/111eed0251238a9d3f90e76d62f2ac01aeccce48.patch"
|
||||
"$pkgname-fix-debugedit.patch::https://gitlab.archlinux.org/pacman/pacman/-/commit/bae9594ac1806ce30f2af1de27c49bb101a00d44.patch"
|
||||
pacman.conf
|
||||
makepkg.conf)
|
||||
sha256sums=('5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9'
|
||||
'SKIP'
|
||||
'b3bce9d662e189e8e49013b818f255d08494a57e13fc264625f852f087d3def2'
|
||||
'94c987046c2ff232fa0d395cddc11644840d767806711e04ef34f876a9baf217'
|
||||
'0774d7035e34661f74b673d4b0a94be877bdc0158a555b873ec6bd4e2c936377'
|
||||
'7bb64910265ce2590f593cdfd302076e49f67a68f8cc792a9aaac572d36fc842'
|
||||
'2bbfe40539513ff5775aaf900644c8985ef618f5df9af856b9d571e2501365b0'
|
||||
'160515b741aadc876a67f213029f5f62a51ff072ea4aaeb687bbe614035bf72f'
|
||||
'1f4e4cc54332e60c9da2bdabf9a80dc11db466535f1a0be298cbf654f0723721'
|
||||
'656c4d4cb8cb12adbf178fc8cb2fd25f8c285d6572bbdbb24d865d00e0d5a85a'
|
||||
'2465d495cb275dce434eb3bfe4d293a223e301b968c14861aea42bc7c60404ef')
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
From 111eed0251238a9d3f90e76d62f2ac01aeccce48 Mon Sep 17 00:00:00 2001
|
||||
From: Allan McRae <allan@archlinux.org>
|
||||
Date: Wed, 13 Mar 2024 11:33:15 +1000
|
||||
Subject: [PATCH] Fix unused result warnings
|
||||
|
||||
Not actually a fix, as the pacman output will still be weird and
|
||||
we will not gracefully exit, but it does print an error message...
|
||||
|
||||
Signed-off-by: Allan McRae <allan@archlinux.org>
|
||||
---
|
||||
src/pacman/util.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/pacman/util.c b/src/pacman/util.c
|
||||
index 8a94e8caf..ebc210404 100644
|
||||
--- a/src/pacman/util.c
|
||||
+++ b/src/pacman/util.c
|
||||
@@ -428,10 +428,10 @@ static char *concat_list(alpm_list_t *lst, formatfn fn)
|
||||
}
|
||||
|
||||
if(tmp) {
|
||||
- asprintf(&output, "%s %s", tmp, str);
|
||||
+ pm_asprintf(&output, "%s %s", tmp, str);
|
||||
free(tmp);
|
||||
} else {
|
||||
- asprintf(&output, "%s", str);
|
||||
+ pm_asprintf(&output, "%s", str);
|
||||
}
|
||||
tmp = output;
|
||||
|
||||
@@ -441,7 +441,7 @@ static char *concat_list(alpm_list_t *lst, formatfn fn)
|
||||
}
|
||||
|
||||
if(!output) {
|
||||
- asprintf(&output, "%s", "");
|
||||
+ pm_asprintf(&output, "%s", "");
|
||||
}
|
||||
|
||||
return output;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From bae9594ac1806ce30f2af1de27c49bb101a00d44 Mon Sep 17 00:00:00 2001
|
||||
From: Morten Linderud <morten@linderud.pw>
|
||||
Date: Thu, 14 Mar 2024 23:04:59 +0100
|
||||
Subject: [PATCH] debugedit: only check for debugedit if we build a package
|
||||
|
||||
We only really need debugedit while building the package, while this
|
||||
check would run if you tried something like `makepkg --verifysource`.
|
||||
Use the same checks as we have for fakeroot to wrap debugedit so we
|
||||
don't beg for dependencies we don't need.
|
||||
|
||||
Fixes: 3ed08f97ecd5941c3f72e3e94f17826dd959f823
|
||||
|
||||
Signed-off-by: Morten Linderud <morten@linderud.pw>
|
||||
---
|
||||
scripts/libmakepkg/executable/debugedit.sh.in | 10 ++++++----
|
||||
1 file changed, 6 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/scripts/libmakepkg/executable/debugedit.sh.in b/scripts/libmakepkg/executable/debugedit.sh.in
|
||||
index a28c3d4e2..c62595c46 100644
|
||||
--- a/scripts/libmakepkg/executable/debugedit.sh.in
|
||||
+++ b/scripts/libmakepkg/executable/debugedit.sh.in
|
||||
@@ -29,10 +29,12 @@ source "$MAKEPKG_LIBRARY/util/option.sh"
|
||||
executable_functions+=('executable_debugedit')
|
||||
|
||||
executable_debugedit() {
|
||||
- if check_option "debug" "y"; then
|
||||
- if ! type -p debugedit >/dev/null; then
|
||||
- error "$(gettext "Cannot find the %s binary required for including source files in debug packages.")" "debugedit"
|
||||
- return 1
|
||||
+ if (( SOURCEONLY || BUILDPKG )); then
|
||||
+ if check_option "debug" "y"; then
|
||||
+ if ! type -p debugedit >/dev/null; then
|
||||
+ error "$(gettext "Cannot find the %s binary required for including source files in debug packages.")" "debugedit"
|
||||
+ return 1
|
||||
+ fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From 6bb95c8856437513ee0ab19226bc090d6fd0fb06 Mon Sep 17 00:00:00 2001
|
||||
From: Allan McRae <allan@archlinux.org>
|
||||
Date: Tue, 5 Mar 2024 07:25:11 +1000
|
||||
Subject: [PATCH] Fix error messages for unknown key in databases
|
||||
|
||||
Signed-off-by: Allan McRae <allan@archlinux.org>
|
||||
---
|
||||
lib/libalpm/be_local.c | 2 +-
|
||||
lib/libalpm/be_sync.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
|
||||
index 80b0e9d12..b4a7c35a1 100644
|
||||
--- a/lib/libalpm/be_local.c
|
||||
+++ b/lib/libalpm/be_local.c
|
||||
@@ -838,7 +838,7 @@ static int local_db_read(alpm_pkg_t *info, int inforeq)
|
||||
}
|
||||
FREELIST(lines);
|
||||
} else {
|
||||
- _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in sync database\n"), info->name, line);
|
||||
+ _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in local database\n"), info->name, line);
|
||||
alpm_list_t *lines = NULL;
|
||||
READ_AND_STORE_ALL(lines);
|
||||
FREELIST(lines);
|
||||
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
|
||||
index 24693976e..e47cdefe7 100644
|
||||
--- a/lib/libalpm/be_sync.c
|
||||
+++ b/lib/libalpm/be_sync.c
|
||||
@@ -692,7 +692,7 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive,
|
||||
}
|
||||
FREELIST(lines);
|
||||
} else {
|
||||
- _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in local database\n"), pkg->name, line);
|
||||
+ _alpm_log(db->handle, ALPM_LOG_WARNING, _("%s: unknown key '%s' in sync database\n"), pkg->name, line);
|
||||
alpm_list_t *lines = NULL;
|
||||
READ_AND_STORE_ALL(lines);
|
||||
FREELIST(lines);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,35 @@
|
|||
From 5e0496260b7d3f9c9fcf2b1c4899e4dbcc20ff03 Mon Sep 17 00:00:00 2001
|
||||
From: Ivan Shapovalov <intelfx@intelfx.name>
|
||||
Date: Wed, 13 Mar 2024 04:27:31 +0100
|
||||
Subject: [PATCH] make_aligned_titles: pass the correct buffer length
|
||||
|
||||
The third parameter to wcstombs() is the length of the output buffer
|
||||
(first parameter) in bytes. Take the correct sizeof() here.
|
||||
|
||||
This is not a problem in practice, but prevents _FORTIFY_SOURCE=3 from
|
||||
detecting a possible output buffer overflow (as the source buffer is
|
||||
bigger than the destination).
|
||||
|
||||
Fixes #104.
|
||||
|
||||
Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
|
||||
---
|
||||
src/pacman/package.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pacman/package.c b/src/pacman/package.c
|
||||
index b832663c0..95d0c4c4c 100644
|
||||
--- a/src/pacman/package.c
|
||||
+++ b/src/pacman/package.c
|
||||
@@ -140,7 +140,7 @@ static void make_aligned_titles(void)
|
||||
size_t padlen = maxcol - wcol[i];
|
||||
wmemset(wbuf[i] + wlen[i], L' ', padlen);
|
||||
wmemcpy(wbuf[i] + wlen[i] + padlen, title_suffix, ARRAYSIZE(title_suffix));
|
||||
- wcstombs(titles[i], wbuf[i], sizeof(wbuf[i]));
|
||||
+ wcstombs(titles[i], wbuf[i], sizeof(titles[i]));
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,56 @@
|
|||
From 95f148c2222db608a0d72d5c5577d0c71e7fa199 Mon Sep 17 00:00:00 2001
|
||||
From: Allan McRae <allan@archlinux.org>
|
||||
Date: Mon, 4 Mar 2024 13:39:37 +1000
|
||||
Subject: [PATCH] Update website to reflect gitlab usage
|
||||
|
||||
Signed-off-by: Allan McRae <allan@archlinux.org>
|
||||
---
|
||||
doc/index.asciidoc | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/doc/index.asciidoc b/doc/index.asciidoc
|
||||
index 10981a7a9..0bc123aff 100644
|
||||
--- a/doc/index.asciidoc
|
||||
+++ b/doc/index.asciidoc
|
||||
@@ -34,6 +34,8 @@ makepkg/repo-add/pacman toolchain via GnuPG and GPGME.
|
||||
Version 5.0 added support for pre/post-transaction hooks and sync database file
|
||||
list operations.
|
||||
|
||||
+Version 6.0 added support for parallel downloads.
|
||||
+
|
||||
Documentation
|
||||
-------------
|
||||
|
||||
@@ -192,7 +194,9 @@ Releases
|
||||
|
||||
|======
|
||||
|
||||
-Source code for all releases is available at
|
||||
+Source code for releases since moving to gitlab is available at
|
||||
+link:https://gitlab.archlinux.org/pacman/pacman/-/releases[].
|
||||
+Source code for historical releases is available at
|
||||
link:https://sources.archlinux.org/other/pacman/[]. To install, download the newest
|
||||
available source tarball, unpack it in a directory, and run the three magic
|
||||
commands:
|
||||
@@ -240,14 +244,10 @@ link:translation-help.html[translation-help].
|
||||
|
||||
Bugs
|
||||
----
|
||||
-If you find bugs (which is quite likely), please email them to the pacman-dev
|
||||
-mailing last at mailto:pacman-dev@lists.archlinux.org[] with specific information
|
||||
-such as your command-line, the nature of the bug, and even the package database
|
||||
-if it helps.
|
||||
-
|
||||
-You can also post a bug to the Arch Linux bug tracker
|
||||
-link:https://bugs.archlinux.org/index.php?project=3[Flyspray]. Be sure to file
|
||||
-bugs under the Pacman project.
|
||||
+If you find bugs (which is quite likely), please report them to the issue
|
||||
+tracker at link:https://gitlab.archlinux.org/pacman/pacman/-/issues[] with
|
||||
+specific information such as your command-line, the nature of the bug, and even
|
||||
+the package database if it helps.
|
||||
|
||||
Copyright
|
||||
---------
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From 0571ee82bff0edbd5ffac2228d4e6ac510b9008e Mon Sep 17 00:00:00 2001
|
||||
From: Christian Heusel <christian@heusel.eu>
|
||||
Date: Wed, 13 Mar 2024 17:38:56 +0100
|
||||
Subject: [PATCH] repo-add: fix parseopts missing arg to -k/--key
|
||||
|
||||
The current code treats -k/--key as a binary option which later makes it
|
||||
fail parsing the argument as then the end of arguments '--' is treated
|
||||
as the GPGKEY. We fix this by adding the appropriate specifier to the
|
||||
long and shortopt.
|
||||
|
||||
Closes https://gitlab.archlinux.org/pacman/pacman/-/issues/105
|
||||
|
||||
Fixes: 4f43ce3e ("repo-add: use parseopts from libmakepkg")
|
||||
Signed-off-by: Christian Heusel <christian@heusel.eu>
|
||||
---
|
||||
scripts/repo-add.sh.in | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
|
||||
index bdd549d20..39137f975 100644
|
||||
--- a/scripts/repo-add.sh.in
|
||||
+++ b/scripts/repo-add.sh.in
|
||||
@@ -605,8 +605,8 @@ trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT
|
||||
trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR
|
||||
|
||||
|
||||
-OPT_SHORT="knpqRsv"
|
||||
-OPT_LONG=('include-sigs' 'key' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
|
||||
+OPT_SHORT="k:npqRsv"
|
||||
+OPT_LONG=('include-sigs' 'key:' 'new' 'nocolor' 'quiet' 'prevent-downgrade' 'remove'
|
||||
'sign' 'verify')
|
||||
if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
|
||||
exit 1 # E_INVALID_OPTION
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -6,8 +6,8 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=pkgconf
|
||||
pkgver=2.1.0
|
||||
pkgrel=02
|
||||
pkgver=2.1.1
|
||||
pkgrel=01
|
||||
pkgdesc="Package compiler and linker metadata toolkit w/o i686 module"
|
||||
# old url="https://github.com/pkgconf/pkgconf"
|
||||
url="https://gitea.treehouse.systems/ariadne/pkgconf"
|
||||
|
|
@ -19,7 +19,7 @@ makedepends=(git meson)
|
|||
provides=(pkg-config pkgconfig libpkgconf.so)
|
||||
conflicts=(pkg-config)
|
||||
replaces=(pkg-config)
|
||||
_commit=61d39ad899867713e73752cf23c40f0275bf71c3 # tags/pkgconf-2.1.0
|
||||
_commit=b6e04e2d47b4ca093632b9efde6303a137ea0634 # tags/pkgconf-2.1.1
|
||||
source=("git+$url#commit=$_commit"
|
||||
i686-pc-linux-gnu.personality
|
||||
x86_64-pc-linux-gnu.personality)
|
||||
|
|
@ -27,17 +27,10 @@ source=("git+$url#commit=$_commit"
|
|||
pkgver() {
|
||||
cd $pkgname
|
||||
git describe --tags | sed 's/^pkgconf-//;s/[^-]*-g/r&/;s/-/+/g'
|
||||
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd $pkgname
|
||||
|
||||
# Fix --modversion (broke WebKitGTK build)
|
||||
# https://github.com/pkgconf/pkgconf/issues/317
|
||||
# https://github.com/pkgconf/pkgconf/issues/332
|
||||
git revert -n 97d907ba93b7e4eef67e4c0a80939421ad3183f0
|
||||
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
@ -69,11 +62,12 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=(custom:ISC)
|
||||
license=(ISC)
|
||||
|
||||
sha256sums=(SKIP
|
||||
6697c6db7deaae269ea75624a70e80949241f2cf59a537f31ecfcac726d90bc1 # i686-pc-linux-gnu.personality
|
||||
c8297817ba0b57d003878db247ff34b4c47a7594c9f67dcfe8ff8d6567956cd5) # x86_64-pc-linux-gnu.personality
|
||||
|
||||
## 991df4ae7c92b9306c45bf82e63e958e77fe13eee22b04d5d9483ed993659fbb pkgconf-2.1.0-02-x86_64.pkg.tar.lz
|
||||
## 2caf2f02f202ad38412bf3aae914dc011f45978fac52a8137e20bff32d3cbece pkgconf-2.1.1-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
# Contributor: Bartlomiej Piotrowski <nospam@bpiotrowski.pl>
|
||||
|
||||
pkgname=pkgconf
|
||||
pkgver=2.1.0
|
||||
pkgrel=2
|
||||
pkgver=2.1.1
|
||||
pkgrel=1
|
||||
pkgdesc="Package compiler and linker metadata toolkit"
|
||||
url="https://gitea.treehouse.systems/ariadne/pkgconf"
|
||||
license=(custom:ISC)
|
||||
license=(ISC)
|
||||
arch=(x86_64)
|
||||
depends=(
|
||||
glibc
|
||||
|
|
@ -26,7 +26,7 @@ provides=(
|
|||
)
|
||||
conflicts=(pkg-config)
|
||||
replaces=(pkg-config)
|
||||
_commit=61d39ad899867713e73752cf23c40f0275bf71c3 # tags/pkgconf-2.1.0
|
||||
_commit=b6e04e2d47b4ca093632b9efde6303a137ea0634 # tags/pkgconf-2.1.1
|
||||
source=(
|
||||
"git+$url#commit=$_commit"
|
||||
{x86_64,i686}-pc-linux-gnu.personality
|
||||
|
|
@ -42,11 +42,6 @@ pkgver() {
|
|||
|
||||
prepare() {
|
||||
cd pkgconf
|
||||
|
||||
# Fix --modversion (broke WebKitGTK build)
|
||||
# https://github.com/pkgconf/pkgconf/issues/317
|
||||
# https://github.com/pkgconf/pkgconf/issues/332
|
||||
git revert -n 97d907ba93b7e4eef67e4c0a80939421ad3183f0
|
||||
}
|
||||
|
||||
build() {
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@ git
|
|||
meson
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -6,25 +6,35 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=run-parts
|
||||
pkgver=5.5
|
||||
pkgrel=02
|
||||
pkgver=5.17
|
||||
pkgrel=01
|
||||
pkgdesc='run scripts or programs in a directory'
|
||||
url='https://packages.qa.debian.org/d/debianutils.html'
|
||||
source=("https://clint.pages.debian.net/debianutils-tarballs/artifacts/debianutils-${pkgver}.tar.gz"{,.sig})
|
||||
depends=('glibc')
|
||||
makedepends=('po4a')
|
||||
#source=("https://clint.pages.debian.net/debianutils-tarballs/artifacts/debianutils-${pkgver}.tar.gz"{,.sig})
|
||||
source=("http://deb.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.xz")
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
./configure --prefix=/usr
|
||||
make run-parts
|
||||
make -C po4a
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
install -D -m755 run-parts "$pkgdir/usr/bin/run-parts"
|
||||
install -D -m644 run-parts.8 "$pkgdir/usr/share/man/man8/run-parts.8"
|
||||
for l in po4a/*/run-parts.8; do
|
||||
install -D -m644 "${l}" "$pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8"
|
||||
|
||||
install -D -m0755 run-parts "${pkgdir}/usr/bin/run-parts"
|
||||
install -D -m0644 run-parts.8 "${pkgdir}/usr/share/man/man8/run-parts.8"
|
||||
for MAN in $(find po4a/ -name run-parts.8); do
|
||||
install -D -m644 "${MAN}" "$pkgdir/usr/share/man/${MAN:5:2}/man8/run-parts.8"
|
||||
done
|
||||
}
|
||||
|
||||
|
|
@ -32,12 +42,11 @@ package() {
|
|||
|
||||
arch=(x86_64)
|
||||
|
||||
license=('GPL')
|
||||
license=(GPL)
|
||||
|
||||
validpgpkeys=('2100A32C46F895AF3A08783AF6D3495BB0AE9A02')
|
||||
#validpgpkeys=('2100A32C46F895AF3A08783AF6D3495BB0AE9A02')
|
||||
|
||||
sha256sums=(3ec744186b8d016fb8b45915a40871a51f701937d80c467118f8cee6a9f517f2 # debianutils-5.5.tar.gz
|
||||
4a2a5aa81e69862256a75cd1f7f27cda4dde4414aeacccc31deb7149b9bbb161) # debianutils-5.5.tar.gz.sig
|
||||
sha256sums=(367654878388f532cd8a897fe64766e2d57ae4c60da1d4d8f20dcdf2fb0cbde8) # debianutils-5.17.tar.xz
|
||||
|
||||
## 4c1986b74d57375d8ed61800915ce6753a348e0a9654fad8c643bc7ee82d656d run-parts-5.5-02-x86_64.pkg.tar.lz
|
||||
## 041c54b6d354681b669255d6f73489ca7b18a1252ba59e26c146b41ce89d0290 run-parts-5.17-01-x86_64.pkg.tar.lz
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +1,37 @@
|
|||
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
|
||||
|
||||
pkgname=run-parts
|
||||
pkgver=5.5
|
||||
pkgver=5.17
|
||||
pkgrel=1
|
||||
pkgdesc='run scripts or programs in a directory'
|
||||
arch=('x86_64')
|
||||
url='https://packages.qa.debian.org/d/debianutils.html'
|
||||
license=('GPL')
|
||||
depends=('glibc')
|
||||
source=("https://clint.pages.debian.net/debianutils-tarballs/artifacts/debianutils-${pkgver}.tar.gz"{,.sig})
|
||||
sha256sums=('3ec744186b8d016fb8b45915a40871a51f701937d80c467118f8cee6a9f517f2'
|
||||
'SKIP')
|
||||
validpgpkeys=('2100A32C46F895AF3A08783AF6D3495BB0AE9A02')
|
||||
makedepends=('po4a')
|
||||
source=("http://deb.debian.org/debian/pool/main/d/debianutils/debianutils_${pkgver}.tar.xz")
|
||||
sha256sums=('367654878388f532cd8a897fe64766e2d57ae4c60da1d4d8f20dcdf2fb0cbde8')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
|
||||
autoreconf -fi
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
./configure --prefix=/usr
|
||||
make run-parts
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
|
||||
./configure --prefix=/usr
|
||||
make run-parts
|
||||
make -C po4a
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
install -D -m755 run-parts "$pkgdir/usr/bin/run-parts"
|
||||
install -D -m644 run-parts.8 "$pkgdir/usr/share/man/man8/run-parts.8"
|
||||
for l in po4a/*/run-parts.8; do
|
||||
install -D -m644 "${l}" "$pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8"
|
||||
done
|
||||
cd "$srcdir/debianutils-${pkgver}"
|
||||
|
||||
install -D -m0755 run-parts "${pkgdir}/usr/bin/run-parts"
|
||||
install -D -m0644 run-parts.8 "${pkgdir}/usr/share/man/man8/run-parts.8"
|
||||
for MAN in $(find po4a/ -name run-parts.8); do
|
||||
install -D -m644 "${MAN}" "$pkgdir/usr/share/man/${MAN:5:2}/man8/run-parts.8"
|
||||
done
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
rm -rf {pkg,src,*gz*}
|
||||
rm -rf {pkg,src,debianutils*tar.xz}
|
||||
|
|
|
|||
|
|
@ -1 +1,5 @@
|
|||
po4a
|
||||
autoconf
|
||||
automake
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,6 @@
|
|||
real 0m3.032s
|
||||
user 0m2.388s
|
||||
sys 0m0.353s
|
||||
|
||||
|
||||
real 0m11.676s
|
||||
user 0m9.311s
|
||||
sys 0m1.365s
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue