[arch-commits] Commit in pacman/trunk (PKGBUILD pacman-5.0.1-roundup.patch)
Christian Hesse
eworm at archlinux.org
Tue Jun 13 12:12:27 UTC 2017
Date: Tuesday, June 13, 2017 @ 12:12:26
Author: eworm
Revision: 298723
upgpkg: pacman 5.0.2-1
new upstream release
Modified:
pacman/trunk/PKGBUILD
Deleted:
pacman/trunk/pacman-5.0.1-roundup.patch
----------------------------+
PKGBUILD | 26 ++----
pacman-5.0.1-roundup.patch | 174 -------------------------------------------
2 files changed, 9 insertions(+), 191 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-06-13 12:03:16 UTC (rev 298722)
+++ PKGBUILD 2017-06-13 12:12:26 UTC (rev 298723)
@@ -4,8 +4,8 @@
# Maintainer: Dave Reisner <dreisner at archlinux.org>
pkgname=pacman
-pkgver=5.0.1
-pkgrel=5
+pkgver=5.0.2
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
@@ -20,27 +20,19 @@
replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
options=('strip' 'debug')
+validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan at archlinux.org>
+ 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew at archlinux.org>
source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
- pacman-5.0.1-roundup.patch
pacman.conf.i686
pacman.conf.x86_64
makepkg.conf)
-md5sums=('377a2664d6007d72d6d8a126add83bcf'
- 'SKIP'
- '1a6573187531068d38cb4478cd20368c'
- 'bdb40c76225c2fd8874bd34b6a3f6ad7'
- 'c511ee4c7a86a37e8841440ede89300d'
- 'f5b59fe5f016eebd9590318530bbd996')
-validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD') # Allan McRae <allan at archlinux.org>
+sha256sums=('dfd36086ad68564bcd977f4a1fafe51dd328acd4a95093ac4bf1249be9c41f0e'
+ 'SKIP'
+ 'cb76123c15ca9f2a467ebecb72af611f618fcc8431cf8b437d40fa2e61c23590'
+ '95b3b2416402059cf6acf3e046082e7ce261e2b88629231dbf579a4200d8a63b'
+ '56a016d6a5404ab6dd7b8fd39027ef422dd14ad07c768853863a1e03dcc9a3e0')
-prepare() {
- cd "$pkgname-$pkgver"
-
- # v5.0.1..pacman-5.0.1..c2f97580
- patch -p1 -i $srcdir/pacman-5.0.1-roundup.patch
-}
-
build() {
cd "$pkgname-$pkgver"
Deleted: pacman-5.0.1-roundup.patch
===================================================================
--- pacman-5.0.1-roundup.patch 2017-06-13 12:03:16 UTC (rev 298722)
+++ pacman-5.0.1-roundup.patch 2017-06-13 12:12:26 UTC (rev 298723)
@@ -1,174 +0,0 @@
-diff --git a/NEWS b/NEWS
-index 07aa028..b7298bf 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,5 +1,22 @@
- VERSION DESCRIPTION
- -----------------------------------------------------------------------------
-+5.0.1 - fix alignment issues with wide character locales (FS#47980)
-+ - fix removal of .pacnew files (FS#47993)
-+ - fix triggering of Install hooks (FS#47996)
-+ - fix handling of stdin scripts called by pacman
-+ - hook activity is logged
-+ - documentataion updates for alpm-hooks (FS#48080)
-+ - makepkg:
-+ - increase robustness of variable array checks
-+ - makepkg -g does not perform current architecture checks
-+ - do not run prepare() with --noextract
-+ - all directories in the packaging directory are cleared
-+ before each build
-+ - fix translations issues (FS#48057, FS#48298)
-+ - repo-add:
-+ - fix checking for non-existent database
-+ - contrib:
-+ - zsh_completion: updated makepkg options
- 5.0.0 - pacman can run hooks pre- and post-transaction. See the
- alpm-hooks(5) man page for details and an example hook (FS#2985)
- - pacman can now sync and read .files databases (-Fy) and do basic
-diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
-index e410481..4b4a22c 100644
---- a/doc/PKGBUILD.5.txt
-+++ b/doc/PKGBUILD.5.txt
-@@ -52,10 +52,10 @@ similar to `$_basekernver`.
- +
- The `pkgver` variable can be automatically updated by providing a `pkgver()`
- function in the PKGBUILD that outputs the new package version.
--This is run after downloading and extracting the sources so it can use those
--files in determining the new `pkgver`.
--This is most useful when used with sources from version control systems (see
--below).
-+This is run after downloading and extracting the sources and running the
-+`prepare()` function (if present), so it can use those files in determining the
-+new `pkgver`. This is most useful when used with sources from version control
-+systems (see below).
-
- *pkgrel*::
- This is the release number specific to the Arch Linux release. This
-diff --git a/scripts/libmakepkg/tidy/emptydirs.sh.in b/scripts/libmakepkg/tidy/emptydirs.sh.in
-index 32b8d8c..85ab39d 100644
---- a/scripts/libmakepkg/tidy/emptydirs.sh.in
-+++ b/scripts/libmakepkg/tidy/emptydirs.sh.in
-@@ -33,6 +33,7 @@ tidy_remove+=('tidy_emptydirs')
- tidy_emptydirs() {
- if check_option "emptydirs" "n"; then
- msg2 "$(gettext "Removing empty directories...")"
-- find . -depth -type d -exec rmdir '{}' + 2>/dev/null
-+ # we are unable to use '-empty' as it is non-POSIX and not support by all find variants
-+ find . -depth -type d -exec rmdir '{}' \; 2>/dev/null
- fi
- }
-diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh
-index 675e75d..f9f1c20 100644
---- a/scripts/libmakepkg/util/util.sh
-+++ b/scripts/libmakepkg/util/util.sh
-@@ -46,7 +46,7 @@ is_array() {
- local shellopts=$(shopt -p)
- shopt -s extglob
-
-- if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
-+ if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then
- ret=0
- fi
-
-diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
-index 30d2704..0db0952 100644
---- a/scripts/pacman-key.sh.in
-+++ b/scripts/pacman-key.sh.in
-@@ -483,7 +483,7 @@ verify_sig() {
- local ret=0
- for sig; do
- msg "Checking %s..." "$sig"
-- if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE)$'; then
-+ if ! "${GPG_PACMAN[@]}" --status-fd 1 --verify "$sig" | grep -qE '^\[GNUPG:\] TRUST_(FULLY|ULTIMATE).*$'; then
- error "$(gettext "The signature identified by %s could not be verified.")" "$sig"
- ret=1
- fi
-diff --git a/src/pacman/check.c b/src/pacman/check.c
-index 0fe74e8..d282cc2 100644
---- a/src/pacman/check.c
-+++ b/src/pacman/check.c
-@@ -254,7 +254,6 @@ int check_pkg_full(alpm_pkg_t *pkg)
- const char *root, *pkgname;
- size_t errors = 0;
- size_t rootlen;
-- char filepath[PATH_MAX];
- struct archive *mtree;
- struct archive_entry *entry = NULL;
- size_t file_count = 0;
-@@ -267,7 +266,6 @@ int check_pkg_full(alpm_pkg_t *pkg)
- pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), root, "");
- return 1;
- }
-- strcpy(filepath, root);
-
- pkgname = alpm_pkg_get_name(pkg);
- mtree = alpm_pkg_mtree_open(pkg);
-@@ -282,6 +280,8 @@ int check_pkg_full(alpm_pkg_t *pkg)
- while(alpm_pkg_mtree_next(pkg, mtree, &entry) == ARCHIVE_OK) {
- struct stat st;
- const char *path = archive_entry_pathname(entry);
-+ char filepath[PATH_MAX];
-+ int filepath_len;
- mode_t type;
- size_t file_errors = 0;
- int backup = 0;
-@@ -292,31 +292,37 @@ int check_pkg_full(alpm_pkg_t *pkg)
- path += 2;
- }
-
-- if(strcmp(path, ".INSTALL") == 0) {
-- char filename[PATH_MAX];
-- snprintf(filename, PATH_MAX, "%slocal/%s-%s/install",
-- alpm_option_get_dbpath(config->handle) + 1,
-- pkgname, alpm_pkg_get_version(pkg));
-- archive_entry_set_pathname(entry, filename);
-- path = archive_entry_pathname(entry);
-- } else if(strcmp(path, ".CHANGELOG") == 0) {
-- char filename[PATH_MAX];
-- snprintf(filename, PATH_MAX, "%slocal/%s-%s/changelog",
-- alpm_option_get_dbpath(config->handle) + 1,
-- pkgname, alpm_pkg_get_version(pkg));
-- archive_entry_set_pathname(entry, filename);
-- path = archive_entry_pathname(entry);
-- } else if(*path == '.') {
-- continue;
-- }
-+ if(*path == '.') {
-+ const char *dbfile = NULL;
-
-- file_count++;
-+ if(strcmp(path, ".INSTALL") == 0) {
-+ dbfile = "install";
-+ } else if(strcmp(path, ".CHANGELOG") == 0) {
-+ dbfile = "changelog";
-+ } else {
-+ continue;
-+ }
-
-- if(rootlen + 1 + strlen(path) > PATH_MAX) {
-- pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
-- continue;
-+ /* Do not append root directory as alpm_option_get_dbpath is already
-+ * an absoute path */
-+ filepath_len = snprintf(filepath, PATH_MAX, "%slocal/%s-%s/%s",
-+ alpm_option_get_dbpath(config->handle),
-+ pkgname, alpm_pkg_get_version(pkg), dbfile);
-+ if(filepath_len >= PATH_MAX) {
-+ pm_printf(ALPM_LOG_WARNING, _("path too long: %slocal/%s-%s/%s\n"),
-+ alpm_option_get_dbpath(config->handle),
-+ pkgname, alpm_pkg_get_version(pkg), dbfile);
-+ continue;
-+ }
-+ } else {
-+ filepath_len = snprintf(filepath, PATH_MAX, "%s%s", root, path);
-+ if(filepath_len >= PATH_MAX) {
-+ pm_printf(ALPM_LOG_WARNING, _("path too long: %s%s\n"), root, path);
-+ continue;
-+ }
- }
-- strcpy(filepath + rootlen, path);
-+
-+ file_count++;
-
- exists = check_file_exists(pkgname, filepath, rootlen, &st);
- if(exists == 1) {
More information about the arch-commits
mailing list