Pacman-dev September 2016

pacman-dev@lists.archlinux.org

21 participants
29 discussions

[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 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

[pacman-dev] [PATCH v6 1/1] Add configuration options for libcurl's "low speed" timeout
by Christian Hesse 14 Nov '16

14 Nov '16

From: Christian Hesse <mail(a)eworm.de> Add LowSpeedLimit and LowSpeedTime configuration options to correspond to libcurl's CURLOPT_LOW_SPEED_LIMIT and CURLOPT_LOW_SPEED_TIME options. This allows, e.g., transfers behind corporate virus-scanning firewalls to survive the delays. Increasing the timeout may not be desirable in all situations; similarly, disabling the check prevents detection of disappearing networks. Adds a utility function, parse_positive_long(), which yields a positive (but not unsigned) long integer from a null-terminated string using strtol(). A string containing anything but a base-10 number will cause the function to return -1. Original-Patch-by: Andrew Hills <ahills(a)ednos.net> Signed-off-by: Christian Hesse <mail(a)eworm.de> --- doc/pacman.conf.5.txt | 12 ++++++++++++ etc/pacman.conf.in | 4 ++++ lib/libalpm/alpm.h | 10 ++++++++++ lib/libalpm/dload.c | 4 ++-- lib/libalpm/handle.c | 32 ++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 9 +++++++++ src/pacman/conf.c | 24 ++++++++++++++++++++++++ src/pacman/conf.h | 4 ++++ src/pacman/util.c | 19 +++++++++++++++++++ src/pacman/util.h | 1 + 10 files changed, 117 insertions(+), 2 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index c665870..2346331 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -209,6 +209,18 @@ Options Displays name, version and size of target packages formatted as a table for upgrade, sync and remove operations. +*LowSpeedLimit* = speed:: + Sets the speed in bytes per second that a download should be below during + `LowSpeedTime` seconds to abort the transfer for being too slow. Setting + 'speed' to 0 will disable the speed check. Defaults to 1 byte per second. + Note that this option will not affect external programs specified by + `XferCommand`. + +*LowSpeedTime* = time:: + Sets the time in seconds that a download should be below the `LowSpeedLimit` + transfer speed to abort the transfer for being too slow. Setting 'time' to + 0 will disable the speed check. Defaults to 10 seconds. Note that this + option will not affect external programs specified by `XferCommand`. Repository Sections ------------------- diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 53071e5..ddc7397 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -29,6 +29,10 @@ Architecture = auto #NoUpgrade = #NoExtract = +# Downloader options +#LowSpeedLimit = 1 +#LowSpeedTime = 10 + # Misc options #UseSyslog #Color diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 168d71b..c338119 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -811,6 +811,16 @@ const char *alpm_option_get_dbpath(alpm_handle_t *handle); /** Get the name of the database lock file. Read-only. */ const char *alpm_option_get_lockfile(alpm_handle_t *handle); +/** Returns the libcurl low speed limit in bytes per second. */ +long alpm_option_get_download_lowspeedlimit(alpm_handle_t *handle); +/** Sets the libcurl low speed limit in bytes per second. */ +int alpm_option_set_download_lowspeedlimit(alpm_handle_t *handle, long lowspeedlimit); + +/** Returns the libcurl low speed time in seconds. */ +long alpm_option_get_download_lowspeedtime(alpm_handle_t *handle); +/** Sets the libcurl low speed time in seconds. */ +int alpm_option_set_download_lowspeedtime(alpm_handle_t *handle, long lowspeedtime); + /** @name Accessors to the list of package cache directories. * @{ */ diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index f4e6a27..7490dd6 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -305,8 +305,8 @@ 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_LOW_SPEED_LIMIT, 1L); - curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, handle->download.lowspeedlimit); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, handle->download.lowspeedtime); curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, dload_parseheader_cb); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index e9439a0..8cfe0a1 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -247,6 +247,18 @@ const char SYMEXPORT *alpm_option_get_lockfile(alpm_handle_t *handle) return handle->lockfile; } +long SYMEXPORT alpm_option_get_download_lowspeedlimit(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->download.lowspeedlimit; +} + +long SYMEXPORT alpm_option_get_download_lowspeedtime(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->download.lowspeedtime; +} + const char SYMEXPORT *alpm_option_get_gpgdir(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -362,6 +374,26 @@ int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress return 0; } +int SYMEXPORT alpm_option_set_download_lowspeedlimit(alpm_handle_t *handle, long lowspeedlimit) +{ + CHECK_HANDLE(handle, return -1); + if(lowspeedlimit < 0) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->download.lowspeedlimit = lowspeedlimit; + return 0; +} + +int SYMEXPORT alpm_option_set_download_lowspeedtime(alpm_handle_t *handle, long lowspeedtime) +{ + CHECK_HANDLE(handle, return -1); + if(lowspeedtime < 0) { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->download.lowspeedtime = lowspeedtime; + return 0; +} + static char *canonicalize_path(const char *path) { char *new_path; diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a1d0f9a..73fa584 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -50,6 +50,14 @@ do { \ } \ } while(0) +#ifdef HAVE_LIBCURL +struct download { + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; +}; +#endif + struct __alpm_handle_t { /* internal usage */ alpm_db_t *db_local; /* local db pointer */ @@ -60,6 +68,7 @@ struct __alpm_handle_t { #ifdef HAVE_LIBCURL /* libcurl handle */ CURL *curl; /* reusable curl_easy handle */ + struct download download; #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 25de7af..21db633 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -122,6 +122,9 @@ config_t *config_new(void) newconfig->colstr.err = ""; newconfig->colstr.nocolor = ""; + newconfig->lowspeedlimit = 1L; + newconfig->lowspeedtime = 10L; + return newconfig; } @@ -604,6 +607,24 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "LowSpeedLimit") == 0) { + config->lowspeedlimit = parse_positive_long(value); + if(config->lowspeedlimit < 0) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: invalid %s, using default.\n"), + file, linenum, "LowSpeedLimit"); + config->lowspeedlimit = 1L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedlimit: %ld\n", config->lowspeedlimit); + } else if(strcmp(key, "LowSpeedTime") == 0) { + config->lowspeedtime = parse_positive_long(value); + if(config->lowspeedtime < 0) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: invalid %s, using default.\n"), + file, linenum, "LowSpeedTime"); + config->lowspeedtime = 10L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedtime: %ld\n", config->lowspeedtime); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -734,6 +755,9 @@ static int setup_libalpm(void) alpm_option_set_questioncb(handle, cb_question); alpm_option_set_progresscb(handle, cb_progress); + alpm_option_set_download_lowspeedlimit(handle, config->lowspeedlimit); + alpm_option_set_download_lowspeedtime(handle, config->lowspeedtime); + if(config->op == PM_OP_FILES) { alpm_option_set_dbext(handle, ".files"); } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2aba8bf..c61ed2a 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -131,6 +131,10 @@ typedef struct __config_t { /* Color strings for output */ colstr_t colstr; + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; + alpm_list_t *repos; } config_t; diff --git a/src/pacman/util.c b/src/pacman/util.c index b979083..b1875bd 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1620,6 +1620,25 @@ int noyes(const char *format, ...) return ret; } +/* Attempts to extract a positive long from a string; failure yields -1. */ +long parse_positive_long(const char *str) +{ + char *end; + long num; + + errno = 0; + num = strtol(str, &end, 10); + + if(end == str || /* Not a decimal number */ + *end != 0 || /* Extra characters */ + (num == LONG_MAX && errno == ERANGE) || /* Out of range */ + num < 0) { /* Out of range (negative) */ + return -1; + } + + return num; +} + int colon_printf(const char *fmt, ...) { int ret; diff --git a/src/pacman/util.h b/src/pacman/util.h index f5e37c8..d3eb77f 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -75,6 +75,7 @@ int multiselect_question(char *array, int count); int colon_printf(const char *format, ...) __attribute__((format(printf, 1, 2))); int yesno(const char *format, ...) __attribute__((format(printf, 1, 2))); int noyes(const char *format, ...) __attribute__((format(printf, 1, 2))); +long parse_positive_long(const char *str); int pm_printf(alpm_loglevel_t level, const char *format, ...) __attribute__((format(printf,2,3))); int pm_asprintf(char **string, const char *format, ...) __attribute__((format(printf,2,3))); -- 2.9.3

5 12

[pacman-dev] [PATCH 1/1] Introduce a 'stupid-proxy' option
by Christian Hesse 11 Nov '16

11 Nov '16

From: Christian Hesse <mail(a)eworm.de> Add command line option ('--stupid-proxy') and config file option ('StupidProxy') to disable defaults for low speed limit and timeout on downloads. Use this if you have issues downloading files with proxy and/or security gateway. Signed-off-by: Christian Hesse <mail(a)eworm.de> Tested-by: Martin <martin(a)herndl.org> --- doc/pacman.8.txt | 4 ++++ doc/pacman.conf.5.txt | 4 ++++ lib/libalpm/alpm.h | 2 ++ lib/libalpm/dload.c | 6 ++++-- lib/libalpm/handle.c | 10 ++++++++++ lib/libalpm/handle.h | 1 + src/pacman/conf.c | 4 ++++ src/pacman/conf.h | 4 +++- src/pacman/pacman.c | 5 +++++ 9 files changed, 37 insertions(+), 3 deletions(-) diff --git a/doc/pacman.8.txt b/doc/pacman.8.txt index 231e0bc..a99db45 100644 --- a/doc/pacman.8.txt +++ b/doc/pacman.8.txt @@ -193,6 +193,10 @@ Options *\--confirm*:: Cancels the effects of a previous '\--noconfirm'. +*\--stupid-proxy*:: + Disable defaults for low speed limit and timeout on downloads. Use this + if you have issues downloading files with proxy and/or security gateway. + Transaction Options (apply to '-S', '-R' and '-U') -------------------------------------------------- diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index c665870..3d2ce31 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -209,6 +209,10 @@ Options Displays name, version and size of target packages formatted as a table for upgrade, sync and remove operations. +*StupidProxy*:: + Disable defaults for low speed limit and timeout on downloads. Use this + if you have issues downloading files with proxy and/or security gateway. + Repository Sections ------------------- diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 168d71b..5b3954f 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -925,6 +925,8 @@ 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); +int alpm_option_set_stupidproxy(alpm_handle_t *handle, unsigned short stupidproxy); + /** @} */ /** @addtogroup alpm_api_databases Database Functions diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 31ae82c..ae5397d 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -295,8 +295,10 @@ 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_LOW_SPEED_LIMIT, 1L); - curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, 10L); + if(!handle->stupidproxy) { + 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); curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)payload); curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); diff --git a/lib/libalpm/handle.c b/lib/libalpm/handle.c index e9439a0..6ef5c86 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -844,4 +844,14 @@ alpm_siglevel_t SYMEXPORT alpm_option_get_remote_file_siglevel(alpm_handle_t *ha } } +int SYMEXPORT alpm_option_set_stupidproxy(alpm_handle_t *handle, + unsigned short stupidproxy) +{ + CHECK_HANDLE(handle, return -1); +#ifdef HAVE_LIBCURL + handle->stupidproxy = stupidproxy; +#endif + return 0; +} + /* vim: set noet: */ diff --git a/lib/libalpm/handle.h b/lib/libalpm/handle.h index a1d0f9a..d4d949b 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 */ + unsigned short stupidproxy; #endif #ifdef HAVE_LIBGPGME diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 25de7af..0608cf0 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -499,6 +499,8 @@ static int _parse_options(const char *key, char *value, config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; enable_colors(config->color); } + } else if(strcmp(key, "StupidProxy") == 0) { + config->stupidproxy = 1; } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -816,6 +818,8 @@ static int setup_libalpm(void) alpm_option_set_noupgrades(handle, config->noupgrade); alpm_option_set_noextracts(handle, config->noextract); + alpm_option_set_stupidproxy(handle, config->stupidproxy); + for(i = config->assumeinstalled; i; i = i->next) { char *entry = i->data; alpm_depend_t *dep = alpm_dep_from_string(entry); diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 2aba8bf..043fb1c 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -55,6 +55,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned short stupidproxy; double deltaratio; char *arch; char *print_format; @@ -201,7 +202,8 @@ enum { OP_VERBOSE, OP_DOWNLOADONLY, OP_REFRESH, - OP_ASSUMEINSTALLED + OP_ASSUMEINSTALLED, + OP_STUPIDPROXY }; /* clean method */ diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..0b078a2 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -221,6 +221,7 @@ static void usage(int op, const char * const myname) addlist(_(" --logfile <path> set an alternate log file\n")); addlist(_(" --noconfirm do not ask for any confirmation\n")); addlist(_(" --confirm always ask for confirmation\n")); + addlist(_(" --stupid-proxy use relaxed timeouts for download\n")); } list = alpm_list_msort(list, alpm_list_count(list), options_cmp); for(i = list; i; i = alpm_list_next(i)) { @@ -443,6 +444,9 @@ static int parsearg_global(int opt) free(config->rootdir); config->rootdir = strdup(optarg); break; + case OP_STUPIDPROXY: + config->stupidproxy = 1; + break; case OP_VERBOSE: case 'v': (config->verbose)++; @@ -934,6 +938,7 @@ static int parseargs(int argc, char *argv[]) {"gpgdir", required_argument, 0, OP_GPGDIR}, {"dbonly", no_argument, 0, OP_DBONLY}, {"color", required_argument, 0, OP_COLOR}, + {"stupid-proxy", no_argument, 0, OP_STUPIDPROXY}, {0, 0, 0, 0} }; -- 2.9.2

3 5

[pacman-dev] [RFC, PATCHES]: Very preliminary work towards clean build with clang -Weverything
by ivy.foster＠gmail.com 01 Oct '16

01 Oct '16

First of all, don't worry; I'm under no illusion that the pie-in-the-sky Subject line is anything that will happen in the near future, nor even necessarily a goal for the project (given just how finicky -Weverything is). Basically, I'm wondering whether sporadic patches addressing the sorts of things "clang -Weverything" gripes about would be considered welcome contributions, or nitpicking. By "sporadic patches", I mean that any of this sort from me would come when I felt like working on a coding project but didn't have anything particularly in mind. As a sample, I've made two patches addressing some of its earliest warnings. The first changes several headers to (say) #define IDENTIFIERS rather than _IDENTIFIERS. The second adds ALPM_ERR_OK = 0 to the _alpm_err_t enum. Some functions which return an _alpm_err_t return value were returning 0 on success, but there was no 0 value enumerated--not actively harmful, but still an oddity. If this sort of thing isn't of interest, I definitely get it. I just figured that an RFC with patches attached would provide something more concrete to discuss than one without. Cheers, Ivy

5 9

[pacman-dev] [PATCH 00/11] Streamline syntax of contrib scripts
by Gordian Edenhofer 01 Oct '16

01 Oct '16

Reorganize scripts in contrib to fit the syntax and style of makepkg. Unify multiple different approaches to e.g. write a usage function, handle options and differences in naming schemas for options. Gordian Edenhofer (11): checkupdates: streamline usage function paccache: streamline usage function pacdiff: streamline usage function pacdiff: proper option handling pacdiff: streamline option syntax with makepkg paclist: streamline usage function paclog-pkglist: streamline usage function pacscripts: streamline usage function updpkgsums: streamline usage function rankmirrors: streamline usage function rankmirrors: proper option handling contrib/checkupdates.sh.in | 9 +-- contrib/paccache.sh.in | 61 ++++++++++---------- contrib/pacdiff.sh.in | 76 +++++++++++++++---------- contrib/paclist.sh.in | 10 ++-- contrib/paclog-pkglist.sh.in | 12 ++-- contrib/pacscripts.sh.in | 18 +++--- contrib/rankmirrors.sh.in | 132 +++++++++++++++++++++---------------------- contrib/updpkgsums.sh.in | 21 ++++--- 8 files changed, 179 insertions(+), 160 deletions(-) -- 2.10.0

5 53

[pacman-dev] [PATCH] Give a "success!" message on database check
by Patrick Eigensatz 01 Oct '16

01 Oct '16

'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> --- src/pacman/database.c | 4 ++++ src/pacman/pacman.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/pacman/database.c b/src/pacman/database.c index 0197903..5143031 100644 --- a/src/pacman/database.c +++ b/src/pacman/database.c @@ -286,6 +286,10 @@ int pacman_database(alpm_list_t *targets) } else { ret = check_db_sync(); } + + if(ret == 0 && !config->quiet) { + printf(_("success!\n")); + } } if(config->flags & (ALPM_TRANS_FLAG_ALLDEPS | ALPM_TRANS_FLAG_ALLEXPLICIT)) { diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index be52d1b..b477df7 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -466,6 +466,10 @@ static int parsearg_database(int opt) case 'k': (config->op_q_check)++; break; + case OP_QUIET: + case 'q': + config->quiet = 1; + break; default: return 1; } -- 2.10.0

5 7

[pacman-dev] [PATCH] fix --printsrcinfo unify arch and non-arch specific variables
by Levente Polyak 01 Oct '16

01 Oct '16

This fixes the issue with --printsrcinfo that all arch specific variants of a variable get merged into their non arch specific variant. The .SRCINFO file ends up having $depends containing $depends_x86_64 and omitting the latter. --- scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 7b2ce51..82c9367 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1476,7 +1476,7 @@ pkgbase=${pkgbase:-${pkgname[0]}} # check the PKGBUILD for some basic requirements lint_pkgbuild || exit 1 -if (( !SOURCEONLY )); then +if (( !SOURCEONLY && !PRINTSRCINFO )); then merge_arch_attrs fi -- 2.10.0

2 1

Re: [pacman-dev] [PATCH 01/11] checkupdates: streamline usage function
by Dave Reisner 29 Sep '16

29 Sep '16

On Sep 29, 2016 06:23, "Gordian Edenhofer" <gordian.edenhofer(a)gmail.com> wrote: Signed-off-by: Gordian Edenhofer <gordian.edenhofer(a)gmail.com> --- contrib/checkupdates.sh.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index ff62891..8c04370 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -25,13 +25,14 @@ m4_include(../scripts/library/output_format.sh) m4_include(../scripts/library/term_colors.sh) if (( $# > 0 )); then - echo "${myname} (pacman) v${myver}" + printf "%s (pacman) %s\n" "$myname" "$myver" echo - echo "Safely print a list of pending updates" + printf -- "$(gettext "Safely print a list of pending updates")\n" echo - echo "Usage: ${myname}" + printf -- "$(gettext "Usage: %s")\n" "$0" + echo + printf -- "$(gettext "Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.")\n" This is broken -- double quotes do not nest like this, and they're effectively dropped. I also question the value of adding gettext support to untranslated scripts and including flag/envvar names as part of the translatable strings -- that won't end well as some translator *will* get it wrong. echo - echo 'Note: Export the "CHECKUPDATES_DB" variable to change the path of the temporary database.' exit 0 fi -- 2.10.0

3 2

[pacman-dev] Fwd: [arch-general] Removing infinality
by Martin Kühne 28 Sep '16

28 Sep '16

...actually, would a mechanism like beneath implemented natively in pacman be worth a feature request? cheers! mar77i ---------- Forwarded message ---------- From: Martin Kühne <mysatyre(a)gmail.com> Date: Tue, Sep 27, 2016 at 2:46 PM Subject: Re: [arch-general] Removing infinality To: General Discussion about Arch Linux <arch-general(a)archlinux.org> Just a thought. If you find the excerpt in the pacman logs where you did the transaction got you into this mess, you might be able to reverse just that without risking too much for the current install and save you a complete reinstall. Ignoring dependencies is then not so bad, because you then just install the packages again that were uninstalled to get you into this. cheers! mar77i

2 3

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Pacman-dev September 2016