- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] makepkg: Disallow forward slashes in pkgver
by Allan McRae 06 Dec '16

06 Dec '16

From: Steef Hegeman <steefhegeman(a)hotmail.com> scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in now raises an error when pkgver contains forward slashes. pkgver containing a forward slash results in a package filename containing a forward slash, which isn't a valid filename. Signed-off-by: Steef Hegeman <steefhegeman(a)hotmail.com> --- >From bugtracker (FS#51481) doc/PKGBUILD.5.txt | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 08ef3e4..4c1ef4b 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -48,7 +48,7 @@ similar to `$_basekernver`. *pkgver*:: The version of the software as released from the author (e.g., '2.7.1'). - The variable is not allowed to contain colons or hyphens. + The variable is not allowed to contain colons, forward slashes or hyphens. + The `pkgver` variable can be automatically updated by providing a `pkgver()` function in the PKGBUILD that outputs the new package version. diff --git a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in index 09041d1..8d22a11 100644 --- a/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in @@ -35,8 +35,8 @@ check_pkgver() { return 1 fi - if [[ $1 = *[[:space:]:-]* ]]; then - error "$(gettext "%s is not allowed to contain colons, hyphens or whitespace.")" "pkgver" + if [[ $1 = *[[:space:]/:-]* ]]; then + error "$(gettext "%s is not allowed to contain colons, forward slashes, hyphens or whitespace.")" "pkgver" return 1 fi } -- 2.10.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-117-gc40ee73
by allan＠archlinux.org 05 Dec '16

05 Dec '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via c40ee73bc40d239702d288f922e50db1a82915d4 (commit) via fc756c3c70d39fc8c58deb85a0ffd759634cd773 (commit) via 36f456ccaee64c41b6ae27f885700521f9b7c2e9 (commit) via 97459e9eb786f44f45837ac3e62639e9ebd3a09c (commit) via 46324d9b26bd4bf5624dd8743bcd2b8f9dc5616d (commit) via e83e868a77865d42a33076605f9a90a165f7c93a (commit) via c3b954e7b93140aa85559fa350582160f3c0a72b (commit) via e3e9cc14a52062e2c3e0f4e2c4c6dec8efc68be4 (commit) via 5dd764eb47e0109407702a4064e74dc25df3c982 (commit) via 46101bea1c1232621fa80409586b5eeeaefdac47 (commit) via d3dc2002634637bd3635c460c68885bdd755292a (commit) via 7114ca6208d3dffe685b994f0802c90727303fc8 (commit) via 263e65dbb3c841c70766e9509f0dcbdd1186c366 (commit) via 0b30edacd4c163b4fa5990d06cca71053248123b (commit) via 90f1dd165769f3a0e7f7275d3e9c72e902325146 (commit) via 9ce2c9b1872b44cebe1ce54c2a7398fbbc31fc6a (commit) via cef0d726b454fcd93fc3d42ee7372c1f290db758 (commit) via e7fc5608667ce0c0d5b48c6c838c65ff288f254b (commit) via 37b73fe4fbec05e86959d234413510463ea35141 (commit) via 0dbc55a35738d0e3718f99a428253140f282ef9a (commit) from 5fbb361261d6a697f891dc4bfc4e504c4ca363bf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c40ee73bc40d239702d288f922e50db1a82915d4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 3 09:53:26 2016 -0500 be_local: remove unused error return LAZY_LOAD has completely ignored the errret value since commit 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fc756c3c70d39fc8c58deb85a0ffd759634cd773 Author: Christian Hesse <mail(a)eworm.de> Date: Fri Dec 2 11:58:01 2016 +0100 add generated scripts to gitignore These files are generated at build time. Ignore in git. Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36f456ccaee64c41b6ae27f885700521f9b7c2e9 Author: Alastair Hughes <hobbitalastair(a)gmail.com> Date: Sat Aug 20 08:52:39 2016 +1200 Make DUFLAGS be overrideable during configure Not all du implementations on linux accept --apparent-size, so let the user configure the arguments passed to du if required. This fixes FS#47943. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 97459e9eb786f44f45837ac3e62639e9ebd3a09c Author: Allan McRae <allan(a)archlinux.org> Date: Fri Dec 2 15:57:18 2016 +1000 Suppress more output messages on successful -D options with -q Suppress output on successful use of --asdeps and --asexplicit. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46324d9b26bd4bf5624dd8743bcd2b8f9dc5616d Author: Patrick Eigensatz <patrickeigensatz(a)gmail.com> Date: Fri Oct 7 21:45:07 2016 +0200 Give a "success!" message on database check 'pacman -Dk' prints a "success!" message if there were no errors. It is possible to suppress the output using the '-q / --quiet' flag. This implements the feature discussed at https://bugs.archlinux.org/task/50087 Signed-off-by: Patrick Eigensatz <patrick.eigensatz(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e83e868a77865d42a33076605f9a90a165f7c93a Author: Martin Kühne <mysatyre(a)gmail.com> Date: Mon Oct 17 16:40:37 2016 +0200 Parametrise the different ways in which the payload is reset In FS#43434, Downloads which fail and are restarted on a different server will resume and may display a negative download speed. The payload's progress in libalpm was not properly reset which ultimately caused terminal noise because the line width calculation assumes positive download speeds. This patch fixes the incomplete reset of the payload by mimicing what be_sync.c:alpm_db_update() does over in sync.c:download_single_file(). The new dload.c:_alpm_dload_payload_reset_for_retry() extends beyond the current behavior by updating initial_size and prevprogress for this case. This makes pacman reset the progress properly in the next invocation of the callback and display positive download speeds. Fixes FS#43434. Signed-off-by: Martin Kühne <mysatyre(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c3b954e7b93140aa85559fa350582160f3c0a72b Author: Christian Hesse <mail(a)eworm.de> Date: Fri Nov 11 21:18:35 2016 +0100 libalpm/signing: support EDDSA from gpgme 1.7.0 Signed-off-by: Christian Hesse <mail(a)eworm.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e3e9cc14a52062e2c3e0f4e2c4c6dec8efc68be4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:17 2016 -0400 makepkg: reject packages with newlines in paths libalpm's local database format does not support paths with newlines. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5dd764eb47e0109407702a4064e74dc25df3c982 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:16 2016 -0400 makepkg: abort on lint_package errors Allows lint_package to prevent makepkg from creating an invalid package. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46101bea1c1232621fa80409586b5eeeaefdac47 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:15 2016 -0400 makepkg: reject package data with newlines The PKGINFO format cannot handle values that contain newlines. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d3dc2002634637bd3635c460c68885bdd755292a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Nov 5 18:08:14 2016 -0400 makepkg: fix find_lib{depends, provides} results Neither function was checking for the existence of actual results before calling printf, resulting in them returning a list with a single empty value if there were no depends/provides. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 7114ca6208d3dffe685b994f0802c90727303fc8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Nov 7 10:21:22 2016 -0500 dload: use curl's keepalive mechanism This does exactly the same thing as it code it replaces, but punt to curl to do it for brevity. Requires curl 7.25.0, which we already cover. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 263e65dbb3c841c70766e9509f0dcbdd1186c366 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Dec 25 13:11:54 2014 -0500 makepkg: unset potentially architecture-specific vars I'm not convinced this is a worthwhile goal, but let's follow suit. Since we can't know the names of all the vars that might exist, unset them by pattern. commit 0b30edacd4c163b4fa5990d06cca71053248123b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 21:12:50 2014 -0500 makepkg: fix quoting in calls to dependency checking commit 90f1dd165769f3a0e7f7275d3e9c72e902325146 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 20:20:02 2014 -0500 makepkg: fix quoting in calls to check_deps The inside needs quoting, and this is separate from the declartion, which does not (in these cases). commit 9ce2c9b1872b44cebe1ce54c2a7398fbbc31fc6a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 09:04:53 2014 -0500 makepkg: make run_function_safe more robust Use shopt to set/reset errexit and errtrace, which lets us: 1) be more vigilant, resetting anything the user might do to us in PKGBUILD functions. 2) use human-readable words (errexit vs. -e) On top of this, introduce a new save/restore for the shell's other shopts. A user should not have any expectations that what happens in one function is available in another function, if it isn't explicitly defined in the PKGBUILD. While this change does not make that assertion, it gets us closer. We also replace a variable which comes from out of nowhere (pkgfunc) with the positional parameter containing the same value. Quoting is adjusted to make the expansion happen at the time the trap is set, rather than later on. commit cef0d726b454fcd93fc3d42ee7372c1f290db758 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Dec 22 08:44:55 2014 -0500 makepkg: remove vestiges of global errexit These 'set +E' diversions haven't been needed since global errexit was disabled in dca10b062f2 (January 2012). commit e7fc5608667ce0c0d5b48c6c838c65ff288f254b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Oct 31 10:19:31 2016 -0400 makepkg.conf: add -g to default curl options This disables globbing, which should never be used in source URL specifications as it would lead to mismatches in the checksum mapping and un-checked sources. commit 37b73fe4fbec05e86959d234413510463ea35141 Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Tue Oct 25 21:02:02 2016 +0200 Make sure all proper scripts are installed instead of the wrappers After 1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee all scripts that were changed to using the wrapper for in-tree use have the wrappers installed to the system instead of the actual script, so change the install command to support all wrapped scripts instead of just makepkg. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0dbc55a35738d0e3718f99a428253140f282ef9a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Oct 24 10:00:46 2016 +1000 Remove pacsort Moved to the pacman-contrib project Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile.am | 1 - configure.ac | 14 +- doc/pacman.8.txt | 6 +- etc/makepkg.conf.in | 6 +- lib/libalpm/be_local.c | 42 +- lib/libalpm/dload.c | 56 +-- lib/libalpm/dload.h | 1 + lib/libalpm/signing.c | 4 + lib/libalpm/sync.c | 4 +- scripts/Makefile.am | 6 +- scripts/libmakepkg/.gitignore | 3 + scripts/libmakepkg/lint_package.sh.in | 4 +- .../libmakepkg/lint_package/build_references.sh.in | 1 + .../util.sh.in => lint_package/file_names.sh.in} | 27 +- .../libmakepkg/lint_package/missing_backup.sh.in | 1 + scripts/makepkg.sh.in | 110 ++-- scripts/po/POTFILES.in | 1 + src/pacman/database.c | 14 +- src/pacman/pacman.c | 5 + src/util/.gitignore | 2 - src/util/Makefile.am | 5 +- src/util/pacsort.c | 552 --------------------- test/util/Makefile.am | 1 - test/util/pacsorttest.sh | 129 ----- 24 files changed, 164 insertions(+), 831 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild/util.sh.in => lint_package/file_names.sh.in} (57%) delete mode 100644 src/util/pacsort.c delete mode 100755 test/util/pacsorttest.sh hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-97-g5fbb361
by allan＠archlinux.org 05 Dec '16

05 Dec '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 5fbb361261d6a697f891dc4bfc4e504c4ca363bf (commit) from a79c0038ae84c38fe063bd7426a839f3c01c10e8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5fbb361261d6a697f891dc4bfc4e504c4ca363bf Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 5 15:12:03 2016 +1000 Revert "[RFC] Provide source files for useful debug packages" This reverts commit a79c0038ae84c38fe063bd7426a839f3c01c10e8. I merged the wrong branch into master... ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/tidy/strip.sh.in | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-96-ga79c003
by allan＠archlinux.org 04 Dec '16

04 Dec '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via a79c0038ae84c38fe063bd7426a839f3c01c10e8 (commit) from fa06951d90fee028ece95fc7caab39fc7d35d55f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a79c0038ae84c38fe063bd7426a839f3c01c10e8 Author: Allan McRae <allan(a)archlinux.org> Date: Thu Sep 1 16:37:50 2016 +1000 [RFC] Provide source files for useful debug packages Debug packages are fairly useless currently because the soucre files needed for stepping through code etc are not packaged with them. This patch adds the needed source files to the debug package and adjusts the debug info to look at the /usr/src/debug/ directory for them rather than the build location. This requires using the "debugedit" program which is provided as part of the RPM sources. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: scripts/libmakepkg/tidy/strip.sh.in | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] makepkg: key verification error
by Xyne 04 Dec '16

04 Dec '16

Hi, There is a seemingly unending trickle of user comments on the AUR seeking advice about key verification errors when building packages. The error message in question is <pkgname> ... FAILED (unknown public key ...) ==> ERROR: One or more PGP signatures could not be verified! Would you consider changing this message to make it clear to the user that they key is not in the *user's* keyring? Maybe something like (key ... not found in user's keyring: you may need to import it). The current message seems to leave a lot of users thinking that the key and signature are shady and untrusted. Regards, Xyne p.s. I still hope that you will re-introduce the --pkg option or an alternative to selectively install split packages with "-i". (Building them all makes sense. Giving no option but to install them all, not so much.) I can provide a package for this as I keep a working patched version of makepkg for this purpose (and provide it in a package for others).

2 1

[pacman-dev] Download options
by Allan McRae 03 Dec '16

03 Dec '16

There was many thread and patches regarding this, so I am starting another! So far there are two (maybe three) things people want options for to do with the downloader. I see most of these options being set in pacman.conf and rarely specified on the command line. Argue with me if I am wrong here... Based on that assumption, here are my preferred option names (for both pacman.conf and the command line): 1) Disable low speed timeout DisableDownloadTimeout --disable-download-timeout I see no need to separate out speed and time timeouts. 2) Set maximum download speed MaxDownloadSpeed --max-download-speed I would also accept replacing speed with limit. 3) (in a glorious future) Set maximum concurrent downloads MaxConcurrentDownloads --max-concurrent-downloads Any argument about these option names will need to be very clearly justified. I don't own a bike so have no need for a bikeshed. Allan

4 7

[pacman-dev] [PATCH] be_local: remove unused error return
by Andrew Gregory 03 Dec '16

03 Dec '16

LAZY_LOAD has completely ignored the errret value since commit 307a6de17a3bca9f8666b33aa3fb9a8dd88c300b in 2011. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/be_local.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 19c89a3..ad8b245 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -49,7 +49,7 @@ size_t ALPM_LOCAL_DB_VERSION = 9; static int local_db_read(alpm_pkg_t *info, int inforeq); -#define LAZY_LOAD(info, errret) \ +#define LAZY_LOAD(info) \ do { \ if(!(pkg->infolevel & info)) { \ local_db_read(pkg, info); \ @@ -65,121 +65,121 @@ static int local_db_read(alpm_pkg_t *info, int inforeq); static const char *_cache_get_base(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->base; } static const char *_cache_get_desc(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->desc; } static const char *_cache_get_url(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->url; } static alpm_time_t _cache_get_builddate(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, 0); + LAZY_LOAD(INFRQ_DESC); return pkg->builddate; } static alpm_time_t _cache_get_installdate(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, 0); + LAZY_LOAD(INFRQ_DESC); return pkg->installdate; } static const char *_cache_get_packager(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->packager; } static const char *_cache_get_arch(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->arch; } static off_t _cache_get_isize(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, -1); + LAZY_LOAD(INFRQ_DESC); return pkg->isize; } static alpm_pkgreason_t _cache_get_reason(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, -1); + LAZY_LOAD(INFRQ_DESC); return pkg->reason; } static int _cache_get_validation(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, -1); + LAZY_LOAD(INFRQ_DESC); return pkg->validation; } static alpm_list_t *_cache_get_licenses(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->licenses; } static alpm_list_t *_cache_get_groups(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->groups; } static int _cache_has_scriptlet(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_SCRIPTLET, NULL); + LAZY_LOAD(INFRQ_SCRIPTLET); return pkg->scriptlet; } static alpm_list_t *_cache_get_depends(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->depends; } static alpm_list_t *_cache_get_optdepends(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->optdepends; } static alpm_list_t *_cache_get_conflicts(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->conflicts; } static alpm_list_t *_cache_get_provides(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->provides; } static alpm_list_t *_cache_get_replaces(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_DESC, NULL); + LAZY_LOAD(INFRQ_DESC); return pkg->replaces; } static alpm_filelist_t *_cache_get_files(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_FILES, NULL); + LAZY_LOAD(INFRQ_FILES); return &(pkg->files); } static alpm_list_t *_cache_get_backup(alpm_pkg_t *pkg) { - LAZY_LOAD(INFRQ_FILES, NULL); + LAZY_LOAD(INFRQ_FILES); return pkg->backup; } -- 2.10.2

1 0

[pacman-dev] [PATCH 1/1] add generated scripts to gitignore
by Christian Hesse 02 Dec '16

02 Dec '16

From: Christian Hesse <mail(a)eworm.de> These files are generated at build time. Ignore in git. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- scripts/libmakepkg/.gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/libmakepkg/.gitignore b/scripts/libmakepkg/.gitignore index 941d39a..ceb7bfc 100644 --- a/scripts/libmakepkg/.gitignore +++ b/scripts/libmakepkg/.gitignore @@ -10,5 +10,8 @@ srcinfo.sh tidy.sh tidy/*.sh util.sh +util/message.sh +util/option.sh +util/parseopts.sh util/pkgbuild.sh util/source.sh -- 2.10.2

2 1

[pacman-dev] [PATCH 1/4] makepkg: fix find_lib{depends, provides} results
by Andrew Gregory 02 Dec '16

02 Dec '16

Neither function was checking for the existence of actual results before calling printf, resulting in them returning a list with a single empty value if there were no depends/provides. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 02398cf..714b376 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -494,7 +494,7 @@ find_libdepends() { done if (( sodepends == 0 )); then - printf '%s\n' "${depends[@]}" + (( ${#depends[@]} )) && printf '%s\n' "${depends[@]}" return; fi @@ -543,7 +543,7 @@ find_libdepends() { esac done - printf '%s\n' "${libdepends[@]}" + (( ${#libdepends[@]} )) && printf '%s\n' "${libdepends[@]}" } @@ -594,7 +594,7 @@ find_libprovides() { fi done - printf '%s\n' "${libprovides[@]}" + (( ${#libprovides[@]} )) && printf '%s\n' "${libprovides[@]}" } write_pkginfo() { -- 2.10.2

2 5

[pacman-dev] [PATCH v2] Make DUFLAGS be overrideable during configure
by Alastair Hughes 02 Dec '16

02 Dec '16

Not all du implementations on linux accept --apparent-size, so let the user configure the arguments passed to du if required. This fixes FS#47943. Signed-off-by: Alastair Hughes <hobbitalastair(a)gmail.com> --- configure.ac | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index dd4ac04..40062f2 100644 --- a/configure.ac +++ b/configure.ac @@ -327,12 +327,12 @@ AC_CHECK_MEMBERS([struct statfs.f_flags],,,[[#include <sys/param.h> GCC_VISIBILITY_CC # Host-dependant definitions +DEFAULT_DUFLAGS=" -sk --apparent-size" INODECMD="stat -c '%i %n'" OWNERCMD="stat -c '%u:%g'" MODECMD="stat -c '%a'" SIZECMD="stat -c %s" SEDINPLACE="sed --follow-symlinks -i" -DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" STRIP_STATIC="--strip-debug" @@ -343,7 +343,7 @@ case "${host_os}" in MODECMD="stat -f '%Lp'" SIZECMD="stat -f %z" SEDINPLACE="sed -i \"\"" - DUFLAGS="-sk" + DEFAULT_DUFLAGS=" -sk" ;; darwin*) host_os_darwin=yes @@ -352,13 +352,12 @@ case "${host_os}" in MODECMD="/usr/bin/stat -f '%Lp'" SIZECMD="/usr/bin/stat -f %z" SEDINPLACE="/usr/bin/sed -i ''" - DUFLAGS="-sk" + DEFAULT_DUFLAGS=" -sk" STRIP_BINARIES="" STRIP_SHARED="-S" STRIP_STATIC="-S" ;; esac - AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") AC_PATH_PROGS([DUPATH], [du], [du], [/usr/bin$PATH_SEPARATOR/bin] ) AC_SUBST(INODECMD) @@ -366,11 +365,16 @@ AC_SUBST(OWNERCMD) AC_SUBST(MODECMD) AC_SUBST(SIZECMD) AC_SUBST(SEDINPLACE) -AC_SUBST(DUFLAGS) AC_SUBST(STRIP_BINARIES) AC_SUBST(STRIP_SHARED) AC_SUBST(STRIP_STATIC) +# Flags for du +if test "${DUFLAGS+set}" != "set"; then + DUFLAGS="${DEFAULT_DUFLAGS}" +fi +AC_ARG_VAR(DUFLAGS, [flags for du, overriding the default]) + # Variables plugged into makepkg.conf CARCH="${host%%-*}" CHOST="${host}" -- 2.9.3

2 5