- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository annotated tag, v5.0.2, created. v5.0.2
by andrew＠archlinux.org 05 Jun '17

05 Jun '17

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 annotated tag, v5.0.2 has been created at 95fd1a379aa279da7f2260ae6c269f3c333c5238 (tag) tagging 0c633c27eaeab2a9d30efb01199579896ccf63c9 (commit) replaces v5.0.1 tagged by Andrew Gregory on Sat Jun 3 22:21:35 2017 -0400 - Log ----------------------------------------------------------------- v5.0.2 -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEuBUbEXA3eBCVUUynu9/8kjBrESEFAlkzbq8ACgkQu9/8kjBr ESGkNgf/YEnAWmX0UK9ZIdObD3iaQJxQJOW15UaHvd58P6RPM7M/HKkJUl2usroy 2EDX5qEmaKuzkJ6tRdLjquxaBJZZij9H5vr5lcQAJn6H/lm253A3g4TGIl8TxW1o xvFOmI1n8pcDi0YDS1TyupJEzKp6W2y2sTrXI6dxtryFZGL5HvenZzGqyOzmuU0J 0lskI+GMKbC4FmEFChCYICgFtPXkQqosR0xcCkdZuGQIX50Gjk5SLFolB1NXiglL RRxxleNGQrFiE1xEaexUmRT0SLO9RNZl5DckSmFiNRPwo5TObcCheEDo3EHu0LE/ OuhkvzFk+ES7IdWnMqGwPEpxxx0L3g== =w4ld -----END PGP SIGNATURE----- Alad Wenter (1): libmakepkg: generate all scripts Alastair Hughes (3): makepkg: ignore the architecture for --printsrcinfo Remove AC_FUNC_MALLOC check. Add missing newline in paclog-pkglist help output Allan McRae (17): Update NEWS for pacman-5.0.1 libmakepkg: fix is_array function libmakepkg: ensure emptydir find command acts on individual directories Do not add root prefix twice when checking database files PKGBUILD.5: document that the pkgver() function runs after prepare() Consider provides when labelling optdepends status as pending install Consider provides when warning about optdepnd removal Use versions specified in optdepends repo-add: do not alter the database if only verifying signature Prevent wrapping of enum items Avoid logical OR duplication warning from gcc-6 Fix typo in pacman-db-upgrade usage message Fix memory leak in remove_notify_needed_optdepends Move bash/zsh completion out of contrib Ensure makepkg-wrapper is built after makepkg Prepare translations for 5.0.2 release Pull translation changes for 5.0.2 Andrew Gregory (8): use multi-byte character matching for user input recursedeps: include cyclic dependencies hook.c: replace readdir_r with readdir hook.c: replace fstatat with stat unlink_file: strip trailing slashes extract db files with dbonly update NEWS for v5.0.2 Release v5.0.2 Armin K (1): libalpm: Use archive_read_extract2 Ashley Whetter (1): pacsort help clearly states that files contain inputs to be sorted Christian Hesse (4): libalpm.3: add link to alpm-hooks(5) in see also pacman.8: add link to alpm-hooks(5) in see also libalpm/signing: support EDDSA from gpgme 1.7.0 add generated scripts to gitignore Dave Reisner (1): makepkg.conf: add -g to default curl options Eli Schwartz (1): bash-completion: fix leaking "files" array into shell environment Eric Engestrom (1): fix spelling mistakes Fabio Castell (1): repo-add: fix error in directories with a space in their name Giulio Fidente (1): Merge Giolio Fidente into "Pacman Development Team" contribution Ivy Foster (2): lib/libalpm/be_sync.c: Close memory leaks when mallocing while out of memory Do not #define _RESERVED_IDENTIFIERS Jack O'Connor (1): libmakepkg: look for architecture-specific hashes in get_integlist Leonid Isaev (1): Use a more generic regexp when parsing output of gpg(1) in signature verification. Levente Polyak (1): fix --printsrcinfo unify arch and non-arch specific variables Lukas Fleischer (1): pacman.8: fix typo in the documentation of --asexplicit Martin Kühne (1): Use f_bavail for diskspace calculations Olivier Brunel (1): configure.ac: Fix handling --with-libcurl Rikard Falkeborn (3): Fix gcc strict-overflow error Return boolean from db_populate Change type of count in be_sync Tobias Stoeckmann (4): Always use proper error code in alpm_initialize. Release resources on error paths. Reject files larger than 16384 bytes in read_sigfile. Handle all POSIX compliant systems in mbscasecmp. ----------------------------------------------------------------------- hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, release/5.0.x, updated. v5.0.2
by andrew＠archlinux.org 05 Jun '17

05 Jun '17

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, release/5.0.x has been updated via 0c633c27eaeab2a9d30efb01199579896ccf63c9 (commit) via fdf53393bc996a514bbfc9fcd6ea19a8bb2f02ed (commit) from 34d8beaef87bab7bb01dd5825b8ffa0a8fda010c (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 0c633c27eaeab2a9d30efb01199579896ccf63c9 Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sat Jun 3 22:17:02 2017 -0400 Release v5.0.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> commit fdf53393bc996a514bbfc9fcd6ea19a8bb2f02ed Author: Andrew Gregory <andrew(a)archlinux.org> Date: Sat Jun 3 22:15:22 2017 -0400 update NEWS for v5.0.2 Signed-off-by: Andrew Gregory <andrew(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 18 ++++++++++++++++++ configure.ac | 4 ++-- doc/index.txt | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [GIT] The official pacman repository branch, release/5.0.x, updated. v5.0.1-53-g34d8beae
by allan＠archlinux.org 31 May '17

31 May '17

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, release/5.0.x has been updated via 34d8beaef87bab7bb01dd5825b8ffa0a8fda010c (commit) via d39271ab56a1ac33001d26823e7b563655668eed (commit) from 831cc8d9cd51921370e20befa4672f232ea2fbdf (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 34d8beaef87bab7bb01dd5825b8ffa0a8fda010c Author: Allan McRae <allan(a)archlinux.org> Date: Wed May 31 23:47:00 2017 +1000 Pull translation changes for 5.0.2 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d39271ab56a1ac33001d26823e7b563655668eed Author: Allan McRae <allan(a)archlinux.org> Date: Mon May 22 11:03:33 2017 +1000 Prepare translations for 5.0.2 release Pull translation updates from transifex and regenerate po files. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/po/ar.po | 121 +++---- lib/libalpm/po/ast.po | 135 ++++---- lib/libalpm/po/bg.po | 152 ++++---- lib/libalpm/po/br.po | 117 ++++--- lib/libalpm/po/ca.po | 149 ++++---- lib/libalpm/po/cs.po | 118 ++++--- lib/libalpm/po/da.po | 117 ++++--- lib/libalpm/po/de.po | 120 ++++--- lib/libalpm/po/el.po | 119 ++++--- lib/libalpm/po/en_GB.po | 117 ++++--- lib/libalpm/po/eo.po | 117 ++++--- lib/libalpm/po/es.po | 143 ++++---- lib/libalpm/po/es_419.po | 123 +++---- lib/libalpm/po/eu.po | 135 ++++---- lib/libalpm/po/{eu.po => eu_ES.po} | 142 ++++---- lib/libalpm/po/fi.po | 117 ++++--- lib/libalpm/po/fr.po | 159 ++++----- lib/libalpm/po/gl.po | 117 ++++--- lib/libalpm/po/hr.po | 232 +++++++------ lib/libalpm/po/hu.po | 144 ++++---- lib/libalpm/po/id.po | 117 ++++--- lib/libalpm/po/is.po | 117 ++++--- lib/libalpm/po/it.po | 117 ++++--- lib/libalpm/po/ja.po | 119 ++++--- lib/libalpm/po/ka.po | 117 ++++--- lib/libalpm/po/kk.po | 117 ++++--- lib/libalpm/po/ko.po | 120 ++++--- lib/libalpm/po/libalpm.pot | 113 +++--- lib/libalpm/po/lt.po | 119 ++++--- lib/libalpm/po/nb.po | 136 ++++---- lib/libalpm/po/nl.po | 117 ++++--- lib/libalpm/po/pl.po | 127 +++---- lib/libalpm/po/pt.po | 119 ++++--- lib/libalpm/po/pt_BR.po | 117 ++++--- lib/libalpm/po/ro.po | 117 ++++--- lib/libalpm/po/ru.po | 120 ++++--- lib/libalpm/po/sk.po | 120 ++++--- lib/libalpm/po/sl.po | 115 ++++--- lib/libalpm/po/sr.po | 117 ++++--- lib/libalpm/po/sr(a)latin.po | 117 ++++--- lib/libalpm/po/sv.po | 115 ++++--- lib/libalpm/po/tr.po | 120 ++++--- lib/libalpm/po/uk.po | 117 ++++--- lib/libalpm/po/ur.po | 133 +++---- lib/libalpm/po/uz.po | 136 ++++---- lib/libalpm/po/vi.po | 133 +++---- lib/libalpm/po/zh_CN.po | 117 ++++--- lib/libalpm/po/zh_TW.po | 214 ++++++------ scripts/po/ar.po | 328 +++++++++--------- scripts/po/ast.po | 332 +++++++++--------- scripts/po/az_AZ.po | 328 +++++++++--------- scripts/po/bg.po | 687 +++++++++++++++++++------------------ scripts/po/br.po | 332 +++++++++--------- scripts/po/ca.po | 505 ++++++++++++++------------- scripts/po/cs.po | 333 +++++++++--------- scripts/po/da.po | 341 +++++++++--------- scripts/po/de.po | 344 ++++++++++--------- scripts/po/el.po | 334 +++++++++--------- scripts/po/en_GB.po | 332 +++++++++--------- scripts/po/eo.po | 332 +++++++++--------- scripts/po/es.po | 617 ++++++++++++++++----------------- scripts/po/es_419.po | 403 ++++++++++++---------- scripts/po/eu.po | 334 +++++++++--------- scripts/po/{eu.po => eu_ES.po} | 341 +++++++++--------- scripts/po/fi.po | 421 ++++++++++++----------- scripts/po/fr.po | 394 +++++++++++---------- scripts/po/gl.po | 334 +++++++++--------- scripts/po/hr.po | 508 ++++++++++++++------------- scripts/po/hu.po | 398 +++++++++++---------- scripts/po/id.po | 337 +++++++++--------- scripts/po/is.po | 330 +++++++++--------- scripts/po/it.po | 332 +++++++++--------- scripts/po/ja.po | 333 +++++++++--------- scripts/po/ka.po | 328 +++++++++--------- scripts/po/kk.po | 328 +++++++++--------- scripts/po/ko.po | 352 +++++++++---------- scripts/po/lt.po | 335 +++++++++--------- scripts/po/nb.po | 358 +++++++++---------- scripts/po/nl.po | 333 +++++++++--------- scripts/po/pacman-scripts.pot | 326 +++++++++--------- scripts/po/pl.po | 444 ++++++++++++------------ scripts/po/pt.po | 363 ++++++++++---------- scripts/po/pt_BR.po | 347 +++++++++---------- scripts/po/ro.po | 331 +++++++++--------- scripts/po/ru.po | 360 ++++++++++--------- scripts/po/sk.po | 354 ++++++++++--------- scripts/po/sl.po | 328 +++++++++--------- scripts/po/sr.po | 332 +++++++++--------- scripts/po/sr(a)latin.po | 332 +++++++++--------- scripts/po/sv.po | 330 +++++++++--------- scripts/po/tr.po | 349 +++++++++---------- scripts/po/uk.po | 335 +++++++++--------- scripts/po/uz.po | 333 +++++++++--------- scripts/po/zh_CN.po | 334 +++++++++--------- scripts/po/zh_TW.po | 511 ++++++++++++++------------- src/pacman/po/ar.po | 127 +++---- src/pacman/po/ast.po | 207 +++++------ src/pacman/po/az_AZ.po | 178 +++++----- src/pacman/po/bg.po | 298 ++++++++-------- src/pacman/po/br.po | 129 +++---- src/pacman/po/ca.po | 241 ++++++------- src/pacman/po/cs.po | 130 +++---- src/pacman/po/da.po | 138 ++++---- src/pacman/po/de.po | 142 ++++---- src/pacman/po/el.po | 131 +++---- src/pacman/po/en_GB.po | 129 +++---- src/pacman/po/eo.po | 134 ++++---- src/pacman/po/es.po | 214 ++++++------ src/pacman/po/es_419.po | 201 ++++++----- src/pacman/po/eu.po | 207 +++++------ src/pacman/po/{eu.po => eu_ES.po} | 214 ++++++------ src/pacman/po/fa.po | 127 +++---- src/pacman/po/fi.po | 129 +++---- src/pacman/po/fr.po | 164 ++++----- src/pacman/po/gl.po | 133 +++---- src/pacman/po/hr.po | 319 +++++++++-------- src/pacman/po/hu.po | 235 +++++++------ src/pacman/po/id.po | 129 +++---- src/pacman/po/is.po | 129 +++---- src/pacman/po/it.po | 162 +++++---- src/pacman/po/ja.po | 133 +++---- src/pacman/po/ka.po | 129 +++---- src/pacman/po/kk.po | 127 +++---- src/pacman/po/ko.po | 136 ++++---- src/pacman/po/lt.po | 132 +++---- src/pacman/po/nb.po | 210 ++++++------ src/pacman/po/nl.po | 129 +++---- src/pacman/po/pacman.pot | 125 +++---- src/pacman/po/pl.po | 149 ++++---- src/pacman/po/pt.po | 136 ++++---- src/pacman/po/pt_BR.po | 136 ++++---- src/pacman/po/ro.po | 129 +++---- src/pacman/po/ru.po | 136 ++++---- src/pacman/po/sk.po | 132 +++---- src/pacman/po/sl.po | 127 +++---- src/pacman/po/sr.po | 129 +++---- src/pacman/po/sr(a)latin.po | 129 +++---- src/pacman/po/sv.po | 127 +++---- src/pacman/po/th.po | 127 +++---- src/pacman/po/tr.po | 138 ++++---- src/pacman/po/uk.po | 141 ++++---- src/pacman/po/ur.po | 205 +++++------ src/pacman/po/uz.po | 208 +++++------ src/pacman/po/vi.po | 127 +++---- src/pacman/po/zh_CN.po | 129 +++---- src/pacman/po/zh_TW.po | 340 +++++++++--------- 146 files changed, 16237 insertions(+), 15486 deletions(-) copy lib/libalpm/po/{eu.po => eu_ES.po} (89%) copy scripts/po/{eu.po => eu_ES.po} (92%) copy src/pacman/po/{eu.po => eu_ES.po} (94%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] %PGPSIG% vs .sig
by Brandon Milton 29 May '17

29 May '17

Hello all, This is my first post to the mailing list, so please feel free to correct me if I'm in the wrong place. While exploring the pacman mirror layout (ie what is hosted by mirrors), I noticed that for each package, there are two copies of the same signature: one in %PGPSIG% in the desc file of the database and one in the {package}-{version}.pkg.tar.gz.sig file I understand that for the AUR, the .sig file is necessary given that there is no official database. However, is there any reasoning behind having two copies of the signature for official repositories? To me, this simply seems like extra cruft that mirrors have to carry around. Thanks /brandon

5 7

[pacman-dev] [Feature Suggestion] Option to install packages one-by-one when upgrading
by Lakshay Garg 28 May '17

28 May '17

Hello all This is my first email to the pacman mailing-list and I am writing to suggest and discuss a possible feature for future versions of pacman. [Problem] Whenever a full system upgrade is run with pacman -Syyu, pacman downloads all the packages which need to be installed and then upgrades all at once. This approach sometimes leads to problems on computers with unreliable internet connections as in my case. It often happens that while downloading one of then several packages to be upgraded, one of the download will get corrupted and in the end when it tries to install, none of the packages would get upgraded due to a single corrupted package. In such a case, I run pacman -Scc followed by pacman -Syyu to try and upgrade again leading to lots of wasted data and time. [Suggested Solution] What I suggest is that a new commandline flag be created in pacman which changes the default behaviour. When the flag is enabled, pacman downloads upgrade files for a single package (or a few interdependent packages) and upgrade it and then move on to upgrade other packages. Thus installing packages one-by-one. [Request] Please let me know if this is a possibility or is there another way my problem can be solved without modifying pacman. I am willing to contribute the patch myself if you can guide me on how to proceed. Would like to know if anyone is interested. -- Lakshay Garg Senior Undergraduate, EE IIT Kanpur

3 4

Re: [pacman-dev] [PATCH] Removed root necessity for DOWNLOADONLY
by Harley W 28 May '17

28 May '17

On May 28, 2017 00:40:25 Allan McRae <allan(a)archlinux.org> wrote: > On 25/05/17 12:16, Harley W wrote: >> This is in response to bug #33369 on Flyspray - "pacman asks for root password >> for -w option (download only)". > > What do you do with the downloaded packages that does not itself require > root access? > > I think this bug should just be closed. > > A Yeah, I agree. I mostly wanted to see if there's a better solution out there than what I was proposing. I guess I didn't think much about why someone would want to download a package that didn't require root access. Even if there was a reason, it's probably not common enough to really benefit from being able to run the pacman command without root privileges. Given the change in behavior associated with my patch I'd say it's really not worth it. Thanks for your feedback, I'll concur that the bug should be closed. -Harley Sent with AquaMail for Android http://www.aqua-mail.com

1 0

[pacman-dev] [PATCH] Removed root necessity for DOWNLOADONLY
by Harley W 25 May '17

25 May '17

Signed-off-by: DestructiveReasoning <harleyw(a)hotmail.com> --- This is in response to bug #33369 on Flyspray - "pacman asks for root password for -w option (download only)". I was looking into this tonight and ultimately encountered an issue that the lock file is (by default) stored under /usr, making it not writable for the average user. I am very new to C and concurrency (and pacman-dev ;) so I do not fully understand why the lockfile is necessary for a download-only operation, but assuming it is necessary, the only option I can think of to resolve the reported bug involves changing the permissions on the lockfile. I've included the very simple patch below that, in conjunction with changing the permissions on the lockfile, seem to fix the problem described in the bug. The only notable change of functionality that I've seen is that executing "$ pacman -Sw <package>" without modifying the cache directory will, since it cannot write to the default, write to /tmp rather than asking for a root password. However, now it is possible to execute "$ pacman -Sw <package> --cachedir=$HOME", for example, without being prompted for the root password. Please let me know what you think about this or if I've missed a much prettier alternative (which is likely). Cordially, Harley Wiltzer src/pacman/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index ae8a74d3..f7f397fa 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -115,7 +115,7 @@ int needs_root(void) case PM_OP_SYNC: return (config->op_s_clean || config->op_s_sync || (!config->group && !config->op_s_info && !config->op_q_list && - !config->op_s_search && !config->print)); + !config->op_s_search && !config->print && !config->op_s_downloadonly)); case PM_OP_FILES: return config->op_s_sync; default: -- 2.13.0

1 0

[pacman-dev] [PATCH] Add option MaxDlSpeed to limit download speed
by Olivier Brunel 20 May '17

20 May '17

Signed-off-by: Olivier Brunel <jjk(a)jjacky.com> --- doc/pacman.8.txt | 5 +++++ doc/pacman.conf.5.txt | 6 ++++++ lib/libalpm/alpm.h | 3 +++ lib/libalpm/dload.c | 1 + lib/libalpm/handle.c | 26 ++++++++++++++++++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 11 +++++++++++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 11 +++++++++++ src/pacman/util.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ src/pacman/util.h | 2 ++ 11 files changed, 114 insertions(+), 1 deletion(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 231e0bc..1890cd9 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -266,6 +266,11 @@ Upgrade Options (apply to '-S' and '-U')[[UO]] *\--needed*:: Do not reinstall the targets that are already up-to-date. +*\--maxdlspeed* <speed>:: + Sets the maximum download speed to the specified speed in bytes/s, unless a + suffix is appended. Suffix 'k' or 'K' will count as KiB/s, 'm' or 'M' as + MiB/s, and 'g' or 'G' as GiB/s. + Query Options (apply to '-Q')[[QO]] ----------------------------------- diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index c665870..49ce63b 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -201,6 +201,12 @@ Options bar is still based solely on the current file download. This option won't work if XferCommand is used. +*MaxDlSpeed*:: + Sets the maximum download speed to the specified speed in bytes/s, unless a + suffix is appended. Suffix 'k' or 'K' will count as KiB/s, 'm' or 'M' as + MiB/s, and 'g' or 'G' as GiB/s. + This option won't work if XferCommand is used. + *CheckSpace*:: Performs an approximate check for adequate available disk space before installing packages. diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 168d71b..7e4e9da 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -925,6 +925,9 @@ int alpm_option_set_local_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t l alpm_siglevel_t alpm_option_get_remote_file_siglevel(alpm_handle_t *handle); int alpm_option_set_remote_file_siglevel(alpm_handle_t *handle, alpm_siglevel_t level); +off_t alpm_option_get_maxdlspeed(alpm_handle_t *handle); +int alpm_option_set_maxdlspeed(alpm_handle_t *handle, off_t speed); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 31ae82c..8c6d6af 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -295,6 +295,7 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); curl_easy_setopt(curl, CURLOPT_PROGRESSFUNCTION, dload_progress_cb); curl_easy_setopt(curl, CURLOPT_PROGRESSDATA, (void *)payload); + curl_easy_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, handle->maxdlspeed); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, 1L); curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index e9439a0..9cab5da 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -844,4 +844,30 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha } } +off_t SYMEXPORT alpm_option_get_maxdlspeed(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + return (off_t) handle->maxdlspeed; +#else + return 0; +#endif +} + +int SYMEXPORT alpm_option_set_maxdlspeed(alpm_handle_t *handle, off_t speed) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + if(speed >= 0) { + handle->maxdlspeed = (curl_off_t) speed; + return 0; + } else +#else + if(speed == 0) + return 0; + else +#endif + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); +} + /* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a1d0f9a..f55b6ed 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -60,6 +60,7 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ + curl_off_t maxdlspeed; /* maximum download speed (B/s) */ #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 25de7af..39cc15c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -544,6 +544,16 @@ static int _parse_options(const char *key, char *value, } config->deltaratio = ratio; pm_printf(ALPM_LOG_DEBUG, "config: usedelta = %f\n", ratio); + } else if(strcmp(key, "MaxDlSpeed") == 0) { + off_t speed = parsesize(value); + if(speed < 0) { + pm_printf(ALPM_LOG_ERROR, + _("config file %s, line %d: invalid value for '%s' : '%s'\n"), + file, linenum, "MaxDlSpeed", value); + return 1; + } + config->maxdlspeed = speed; + pm_printf(ALPM_LOG_DEBUG, "config: maxdlspeed = %jd\n", (intmax_t) speed); } else if(strcmp(key, "DBPath") == 0) { /* don't overwrite a path specified on the command line */ if(!config->dbpath) { @@ -810,6 +820,7 @@ static int setup_libalpm(void) alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); alpm_option_set_deltaratio(handle, config->deltaratio); + alpm_option_set_maxdlspeed(handle, config->maxdlspeed); alpm_option_set_ignorepkgs(handle, config->ignorepkg); alpm_option_set_ignoregroups(handle, config->ignoregrp); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2aba8bf..77353a2 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -56,6 +56,7 @@ typedef struct __config_t { unsigned short usesyslog; unsigned short color; double deltaratio; + off_t maxdlspeed; char *arch; char *print_format; /* unfortunately, we have to keep track of paths both here and in the library @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_MAXDLSPEED }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..91f8500 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -194,6 +194,8 @@ static void usage(int op, const char * const myname) addlist(_(" --ignore <pkg> ignore a package upgrade (can be used more than once)\n")); addlist(_(" --ignoregroup <grp>\n" " ignore a group upgrade (can be used more than once)\n")); + addlist(_(" --maxdlspeed <speed>\n" + " set the maximum download speed\n")); /* pass through */ case PM_OP_REMOVE: addlist(_(" -d, --nodeps skip dependency version checks (-dd to skip all checks)\n")); @@ -713,6 +715,14 @@ static int parsearg_upgrade(int opt) case OP_IGNOREGROUP: parsearg_util_addlist(&(config->ignoregrp)); break; + case OP_MAXDLSPEED: + { + off_t speed = parsesize(optarg); + if(speed < 0) + return 1; + config->maxdlspeed = speed; + break; + } default: return 1; } return 0; @@ -929,6 +939,7 @@ static int parseargs(int argc, char *argv[]) {"ignoregroup", required_argument, 0, OP_IGNOREGROUP}, {"needed", no_argument, 0, OP_NEEDED}, {"asexplicit", no_argument, 0, OP_ASEXPLICIT}, + {"maxdlspeed", required_argument, 0, OP_MAXDLSPEED}, {"arch", required_argument, 0, OP_ARCH}, {"print-format", required_argument, 0, OP_PRINTFORMAT}, {"gpgdir", required_argument, 0, OP_GPGDIR}, diff --git a/src/pacman/util.c b/src/pacman/util.c index 81780f7..35b4f23 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1763,4 +1763,49 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list return ret; } +off_t parsesize(const char *str) +{ + long size; + char *endptr; + + size = strtol(str, &endptr, 10); + if((size == LONG_MIN || size == LONG_MAX) && errno == ERANGE) { + return -1; + } + if(*endptr != '\0') { + if(endptr[1] != '\0') { + return -1; + } + switch(*endptr) { + case 'g': + case 'G': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + /* fallthrough */ + case 'm': + case 'M': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + /* fallthrough */ + case 'k': + case 'K': + if(size > LONG_MAX / 1024) { + return -1; + } + size *= 1024; + break; + default: + return -1; + } + } + if(size < 0) { + return -1; + } + return (off_t) size; +} + /* vim: set noet: */ diff --git a/src/pacman/util.h b/src/pacman/util.h index f5e37c8..7d0a897 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -82,6 +82,8 @@ int pm_vfprintf(FILE *stream, alpm_loglevel_t level, const char *format, va_list int pm_sprintf(char **string, alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,3,4))); int pm_vasprintf(char **string, alpm_loglevel_t level, const char *format, va_list args) __attribute__((format(printf,3,0))); +off_t parsesize(const char *str); + #endif /* _PM_UTIL_H */ /* vim: set noet: */ -- 2.9.3

3 2

[pacman-dev] [PATCH 1/5] makepkg: remove build date from .PKGINFO header
by Levente Polyak 17 May '17

17 May '17

From: Allan McRae <allan(a)archlinux.org> This information is duplicated (in less friendly format) in the "builddate" entry and removing it improves reproducible packaging. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> --- scripts/makepkg.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 0218e13b..86abb177 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -635,7 +635,6 @@ write_pkginfo() { msg2 "$(gettext "Generating %s file...")" ".PKGINFO" printf "# Generated by makepkg %s\n" "$makepkg_version" printf "# using %s\n" "$(fakeroot -v)" - printf "# %s\n" "$(LC_ALL=C date -u)" write_kv_pair "pkgname" "$pkgname" if (( SPLITPKG )) || [[ "$pkgbase" != "$pkgname" ]]; then -- 2.12.2

4 8

[pacman-dev] [PATCH 5/5] remove unused byte from user agent buffer
by Andrew Gregory 10 May '17

10 May '17

snprintf prints at most n bytes including the terminating '\0'. The extra reserved byte was never being used. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 11b7e6f0..8c7f715e 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -269,7 +269,7 @@ static void localize(void) */ static void setuseragent(void) { - char agent[101]; + char agent[100]; struct utsname un; int len; -- 2.12.2

1 0