December 2016 - Pacman-dev - lists.archlinux.org

[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] [RFC] adding a --sysroot option
by Andrew Gregory 16 Apr '17

16 Apr '17

pacman's --root option is regularly (mis)used to use pacman to manage a mounted guest system, typically one whose pacman installation is currently broken. We have a few configuration defaults in place to make this sort of work, but support is incomplete. Those defaults only actually take effect if the settings haven't been set in a configuration file, several options still default to the host system resources, and using the guest's pacman configuration requires updating all configured paths to the new mounted location. Adding a --sysroot/--chroot option would allow pacman to properly operate in a mounted guest system. At the moment, there are two ways we could accomplish this: prefix all paths with the sysroot or just call chroot(2). Obviously, the problem with chroot(2) is that it requires special privileges. Unfortunately, I think my symbolic user/group patch (https://patchwork.archlinux.org/patch/3694/) will require chroot to work properly as I can't find any other way to look up users/groups in a mounted guest. So, we may have to implement both approaches so that regular users can perform queries but privileged users can perform transactions with proper symbolic name support. apg

2 5

[pacman-dev] [PATCH] Add alpm_pkg_get_makedepends and alpm_pkg_get_checkdepends
by Mark Weiman 03 Jan '17

03 Jan '17

makepkg adds makedepends and checkdepends to a package's .PKGINFO file. Add functions that allow use of these from libalpm. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- lib/libalpm/alpm.h | 12 ++++++++ lib/libalpm/be_package.c | 6 ++-- lib/libalpm/package.c | 80 +++++++++++++++++++++++++++++------------------- lib/libalpm/package.h | 4 +++ 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d2491d..3ef2426 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1261,6 +1261,18 @@ alpm_list_t *alpm_pkg_get_depends(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_get_optdepends(alpm_pkg_t *pkg); +/** Returns a list of package check dependencies + * @param pkg a pointer to package + * @return a reference to an internal list of alpm_depend_t structures. + */ +alpm_list_t *alpm_pkg_get_checkdepends(alpm_pkg_t *pkg); + +/** Returns a list of package make dependencies + * @param pkg a pointer to package + * @return a reference to an internal list of alpm_depend_t structures. + */ +alpm_list_t *alpm_pkg_get_makedepends(alpm_pkg_t *pkg); + /** Returns the list of packages conflicting with pkg. * @param pkg a pointer to package * @return a reference to an internal list of alpm_depend_t structures. diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index b7c54fa..93af969 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -223,9 +223,11 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * alpm_depend_t *optdep = alpm_dep_from_string(ptr); newpkg->optdepends = alpm_list_add(newpkg->optdepends, optdep); } else if(strcmp(key, "makedepend") == 0) { - /* not used atm */ + alpm_depend_t *makedep = alpm_dep_from_string(ptr); + newpkg->makedepends = alpm_list_add(newpkg->makedepends, makedep); } else if(strcmp(key, "checkdepend") == 0) { - /* not used atm */ + alpm_depend_t *checkdep = alpm_dep_from_string(ptr); + newpkg->checkdepends = alpm_list_add(newpkg->checkdepends, checkdep); } else if(strcmp(key, "conflict") == 0) { alpm_depend_t *conflict = alpm_dep_from_string(ptr); newpkg->conflicts = alpm_list_add(newpkg->conflicts, conflict); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 05becf0..6bc9936 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -99,6 +99,8 @@ static alpm_list_t *_pkg_get_licenses(alpm_pkg_t *pkg) { return pkg->licenses; static alpm_list_t *_pkg_get_groups(alpm_pkg_t *pkg) { return pkg->groups; } static alpm_list_t *_pkg_get_depends(alpm_pkg_t *pkg) { return pkg->depends; } static alpm_list_t *_pkg_get_optdepends(alpm_pkg_t *pkg) { return pkg->optdepends; } +static alpm_list_t *_pkg_get_checkdepends(alpm_pkg_t *pkg) { return pkg->checkdepends; } +static alpm_list_t *_pkg_get_makedepends(alpm_pkg_t *pkg) { return pkg->makedepends; } static alpm_list_t *_pkg_get_conflicts(alpm_pkg_t *pkg) { return pkg->conflicts; } static alpm_list_t *_pkg_get_provides(alpm_pkg_t *pkg) { return pkg->provides; } static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg) { return pkg->replaces; } @@ -145,37 +147,39 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } * struct itself with no abstraction layer or any type of lazy loading. */ struct pkg_operations default_pkg_ops = { - .get_base = _pkg_get_base, - .get_desc = _pkg_get_desc, - .get_url = _pkg_get_url, - .get_builddate = _pkg_get_builddate, - .get_installdate = _pkg_get_installdate, - .get_packager = _pkg_get_packager, - .get_arch = _pkg_get_arch, - .get_isize = _pkg_get_isize, - .get_reason = _pkg_get_reason, - .get_validation = _pkg_get_validation, - .has_scriptlet = _pkg_has_scriptlet, - - .get_licenses = _pkg_get_licenses, - .get_groups = _pkg_get_groups, - .get_depends = _pkg_get_depends, - .get_optdepends = _pkg_get_optdepends, - .get_conflicts = _pkg_get_conflicts, - .get_provides = _pkg_get_provides, - .get_replaces = _pkg_get_replaces, - .get_files = _pkg_get_files, - .get_backup = _pkg_get_backup, - - .changelog_open = _pkg_changelog_open, - .changelog_read = _pkg_changelog_read, - .changelog_close = _pkg_changelog_close, - - .mtree_open = _pkg_mtree_open, - .mtree_next = _pkg_mtree_next, - .mtree_close = _pkg_mtree_close, - - .force_load = _pkg_force_load, + .get_base = _pkg_get_base, + .get_desc = _pkg_get_desc, + .get_url = _pkg_get_url, + .get_builddate = _pkg_get_builddate, + .get_installdate = _pkg_get_installdate, + .get_packager = _pkg_get_packager, + .get_arch = _pkg_get_arch, + .get_isize = _pkg_get_isize, + .get_reason = _pkg_get_reason, + .get_validation = _pkg_get_validation, + .has_scriptlet = _pkg_has_scriptlet, + + .get_licenses = _pkg_get_licenses, + .get_groups = _pkg_get_groups, + .get_depends = _pkg_get_depends, + .get_optdepends = _pkg_get_optdepends, + .get_checkdepends = _pkg_get_checkdepends, + .get_makedepends = _pkg_get_makedepends, + .get_conflicts = _pkg_get_conflicts, + .get_provides = _pkg_get_provides, + .get_replaces = _pkg_get_replaces, + .get_files = _pkg_get_files, + .get_backup = _pkg_get_backup, + + .changelog_open = _pkg_changelog_open, + .changelog_read = _pkg_changelog_read, + .changelog_close = _pkg_changelog_close, + + .mtree_open = _pkg_mtree_open, + .mtree_next = _pkg_mtree_next, + .mtree_close = _pkg_mtree_close, + + .force_load = _pkg_force_load, }; /* Public functions for getting package information. These functions @@ -335,6 +339,20 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_optdepends(alpm_pkg_t *pkg) return pkg->ops->get_optdepends(pkg); } +alpm_list_t SYMEXPORT *alpm_pkg_get_checkdepends(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_checkdepends(pkg); +} + +alpm_list_t SYMEXPORT *alpm_pkg_get_makedepends(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_makedepends(pkg); +} + alpm_list_t SYMEXPORT *alpm_pkg_get_conflicts(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 0822a8d..1f029bd 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -59,6 +59,8 @@ struct pkg_operations { alpm_list_t *(*get_groups) (alpm_pkg_t *); alpm_list_t *(*get_depends) (alpm_pkg_t *); alpm_list_t *(*get_optdepends) (alpm_pkg_t *); + alpm_list_t *(*get_checkdepends) (alpm_pkg_t *); + alpm_list_t *(*get_makedepends) (alpm_pkg_t *); alpm_list_t *(*get_conflicts) (alpm_pkg_t *); alpm_list_t *(*get_provides) (alpm_pkg_t *); alpm_list_t *(*get_replaces) (alpm_pkg_t *); @@ -112,6 +114,8 @@ struct __alpm_pkg_t { alpm_list_t *backup; alpm_list_t *depends; alpm_list_t *optdepends; + alpm_list_t *checkdepends; + alpm_list_t *makedepends; alpm_list_t *conflicts; alpm_list_t *provides; alpm_list_t *deltas; -- 2.10.2

2 3

[pacman-dev] makepkg: verify git sources
by Jelle van der Waa 03 Jan '17

03 Jan '17

Hi, I would like to work on verifying git signed tags. So far I've actually managed to hack it into makepkg, but by missing a lot of edge cases and well writing an ugly implementation. [1] Some of this work has been borrowed from the systemd PKGBUILD. [2] Example with vte3-ng: ==> Validating source files with md5sums... vte-ng ... Skipped ==> Verifying source file signatures with gpg... vte-ng ... Passed Of course the hacks I've put in there are never going to be accepted even if I bribe Allan with a case of bourbon. I can think of the following issues, edge-cases which need to be handled: * git url, but no #tag= or #commit= specified, should verify HEAD on the #branch or no tag, commit, branch case. * Not parsing or tested invalid signed tags, not sure how git verify-tag displays errors so that needs more work. * I would like to move the git verification into source/git.sh.in and then re-use the code which extracts #branch, #commit etc. It would also reduce the clutter in verify_signature.sh.in. Another idea is to move the verification into integrity/verify_git.sh.in. * Changing the directory is cumbersome. git offers git -C $path verify-tag $tag to resolve that. * Multiple sources, .tar.gz{,asc} and a git one. (Rare but should be handled) Or multiple git sources. So tl;dr, I would love to see a pointer where I should call my own verification function for git sources or any other edge-cases I've missed :) [1] https://github.com/jelly/pacman/commit/5172a74ed9de422429d18034841acf8025fd… [2] https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packa… -- Jelle van der Waa

4 18

[pacman-dev] [PATCH 1/5] makepkg: warn about dotfiles in package root
by Andrew Gregory 03 Jan '17

03 Jan '17

libalpm reserves paths starting with '.' for its own use and will not extract any other than those it recognizes. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_package/dotfiles.sh.in | 38 ++++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 3 files changed, 40 insertions(+) create mode 100644 scripts/libmakepkg/lint_package/dotfiles.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 41a9f5d..4bb08a2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -58,6 +58,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_package.sh \ libmakepkg/lint_package/build_references.sh \ + libmakepkg/lint_package/dotfiles.sh \ libmakepkg/lint_package/file_names.sh \ libmakepkg/lint_package/missing_backup.sh \ libmakepkg/lint_pkgbuild.sh \ diff --git a/scripts/libmakepkg/lint_package/dotfiles.sh.in b/scripts/libmakepkg/lint_package/dotfiles.sh.in new file mode 100644 index 0000000..bf7f41d --- /dev/null +++ b/scripts/libmakepkg/lint_package/dotfiles.sh.in @@ -0,0 +1,38 @@ +#!/bin/bash +# +# dotfiles.sh - check for dotfiles in the package root +# +# Copyright (c) 2016 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH" ]] && return +LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_package_functions+=('check_dotfiles') + +check_dotfiles() { + local ret=0 + for f in "$pkgdir"/.*; do + [[ ${f##*/} == . || ${f##*/} == .. ]] && continue + error "$(gettext "Dotfile found in package root '%s'")" "$f" + ret=1 + done + return $ret +} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 4f47fc3..7cc6a03 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -14,6 +14,7 @@ scripts/libmakepkg/integrity/verify_checksum.sh.in scripts/libmakepkg/integrity/verify_signature.sh.in scripts/libmakepkg/lint_package.sh.in scripts/libmakepkg/lint_package/build_references.sh.in +scripts/libmakepkg/lint_package/dotfiles.sh.in scripts/libmakepkg/lint_package/file_names.sh.in scripts/libmakepkg/lint_package/missing_backup.sh.in scripts/libmakepkg/lint_pkgbuild.sh.in -- 2.10.2

2 10

[pacman-dev] [PATCH] conflict: skip dir children when replacing a file
by Andrew Gregory 03 Jan '17

03 Jan '17

When replacing a file with a directory, any files under that directory do not need to be checked for conflicts. This prevents possible false-positive conflicts where the file being replaced is a symlink. We were already skipping the directory children when the file was owned by the previous version of a package being upgraded. This extends that to other packages being removed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 16 +++++++++++++++- test/pacman/tests/TESTS | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b9e30870..48bc88b6 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -503,6 +503,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, struct stat lsbuf; char path[PATH_MAX]; size_t pathlen; + int pfile_isdir; pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); relative_path = path + rootlen; @@ -514,7 +515,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path); - if(path[pathlen - 1] == '/') { + pfile_isdir = path[pathlen - 1] == '/'; + if(pfile_isdir) { if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n"); continue; @@ -551,6 +553,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "local file will be removed, not a conflict\n"); resolved_conflict = 1; + if(pfile_isdir) { + /* go ahead and skip any files inside filestr as they will + * necessarily be resolved by replacing the file with a dir + * NOTE: afterward, j will point to the last file inside filestr */ + size_t fslen = strlen(filestr); + for( ; j->next; j = j->next) { + const char *filestr2 = j->next->data; + if(strncmp(filestr, filestr2, fslen) != 0) { + break; + } + } + } } } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 2d877962..44007f63 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -149,6 +149,7 @@ TESTS += test/pacman/tests/smoke001.py TESTS += test/pacman/tests/smoke002.py TESTS += test/pacman/tests/smoke003.py TESTS += test/pacman/tests/smoke004.py +TESTS += test/pacman/tests/symlink-replace-with-dir.py TESTS += test/pacman/tests/symlink001.py TESTS += test/pacman/tests/symlink002.py TESTS += test/pacman/tests/symlink010.py -- 2.11.0

2 3

[pacman-dev] [PATCH] ini: only recognize comments at beginning of line
by Andrew Gregory 03 Jan '17

03 Jan '17

Allows the hash sign to be used in values in config files and hooks. Fixes #48702 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/common/ini.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/common/ini.c b/src/common/ini.c index 1ac24b5..fc834e2 100644 --- a/src/common/ini.c +++ b/src/common/ini.c @@ -61,19 +61,14 @@ int parse_ini(const char *file, ini_parser_fn cb, void *data) } while(safe_fgets(line, PATH_MAX, fp)) { - char *key, *value, *ptr; + char *key, *value; size_t line_len; linenum++; - /* ignore whole line and end of line comments */ - if((ptr = strchr(line, '#'))) { - *ptr = '\0'; - } - line_len = strtrim(line); - if(line_len == 0) { + if(line_len == 0 || line[0] == '#') { continue; } -- 2.10.2

2 1

[pacman-dev] [PATCH 1/2] configure.ac: Use POSIX compatible equality checks
by Dave Reisner 03 Jan '17

03 Jan '17

--- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 63f87d1..10e4415 100644 --- a/configure.ac +++ b/configure.ac @@ -222,13 +222,13 @@ PKG_CHECK_MODULES(LIBARCHIVE, [libarchive >= 2.8.0], , # Check for OpenSSL have_openssl=no have_nettle=no -if test "x$with_crypto" == "xnettle"; then +if test "x$with_crypto" = "xnettle"; then PKG_CHECK_MODULES(NETTLE, [nettle], [AC_DEFINE(HAVE_LIBNETTLE, 1, [Define whether to use nettle]) have_nettle=yes], have_nettle=no) if test "x$have_nettle" = xno -a "x$with_crypto" = xnettle; then AC_MSG_ERROR([*** nettle support requested but libraries not found]) fi -else if test "x$with_crypto" == "xopenssl"; then +else if test "x$with_crypto" = "xopenssl"; then PKG_CHECK_MODULES(LIBSSL, [libcrypto], [AC_DEFINE(HAVE_LIBSSL, 1, [Define if libcrypto is available]) have_openssl=yes], have_openssl=no) if test "x$have_openssl" = xno; then -- 2.10.2

2 3

[pacman-dev] Could makepkg verify .dsc file?
by Bruno Pagani 22 Dec '16

22 Dec '16

Hi there, This is probably some sort of feature request or maybe more general asking. I have a case where sha*sums are provided in a .dsc signed file (bs1770gain, for which *sane* upstream is Debian: https://packages.debian.org/source/sid/bs1770gain) Apparently, makepkg only supports verifying file with detached signature. Is there a specific reason for that (like this use case is really tiny — I have no actual idea about this) or is it just because it was never implemented? Thanks, Bruno

4 19

[pacman-dev] [PATCH] find_fileconflicts: rename tmpfiles -> newfiles
by Andrew Gregory 17 Dec '16

17 Dec '16

The files belong to the new version of a package being installed, they are not temporary in any way. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- This has confused me every single time I have looked at this function. lib/libalpm/conflict.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index 092b019a..b9e30870 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -419,7 +419,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, for(current = 0, i = upgrade; i; i = i->next, current++) { alpm_pkg_t *p1 = i->data; alpm_list_t *j; - alpm_list_t *tmpfiles = NULL; + alpm_list_t *newfiles = NULL; alpm_pkg_t *dbpkg; int percent = (current * 100) / numtargs; @@ -483,18 +483,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, * be freed. */ if(dbpkg) { /* older ver of package currently installed */ - tmpfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), + newfiles = _alpm_filelist_difference(alpm_pkg_get_files(p1), alpm_pkg_get_files(dbpkg)); } else { /* no version of package currently installed */ alpm_filelist_t *fl = alpm_pkg_get_files(p1); size_t filenum; for(filenum = 0; filenum < fl->count; filenum++) { - tmpfiles = alpm_list_add(tmpfiles, fl->files[filenum].name); + newfiles = alpm_list_add(newfiles, fl->files[filenum].name); } } - for(j = tmpfiles; j; j = j->next) { + for(j = newfiles; j; j = j->next) { const char *filestr = j->data; const char *relative_path; alpm_list_t *k; @@ -653,12 +653,12 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, alpm_list_free_inner(conflicts, (alpm_list_fn_free) alpm_conflict_free); alpm_list_free(conflicts); - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); return NULL; } } } - alpm_list_free(tmpfiles); + alpm_list_free(newfiles); } PROGRESS(handle, ALPM_PROGRESS_CONFLICTS_START, "", 100, numtargs, current); -- 2.11.0

1 0