- Pacman-dev - lists.archlinux.org

[pacman-dev] Very slow, misbehaving Pacman that keeps changing its PID
by Allan McRae 21 Nov '16

21 Nov '16

Post on the Arch BBS: https://bbs.archlinux.org/viewtopic.php?id=219800 I have not looked at this in detail yet. I think that the ever changing PID is actually a gpg call from gpgme. A

1 0

[pacman-dev] [PATCH 0/6] Assorted makepkg cleanups
by Dave Reisner 16 Nov '16

16 Nov '16

Here's a bunch of patches I've had sitting on a branch for a while, plus a new one at the end which I thought would be a good idea after I found an instance of "{$pkgver}" in a PKGBUILD. These (and the other dload/curl patch) can be pulled from git://github.com/falconindy/pacman. Dave Reisner (6): makepkg.conf: add -g to default curl options makepkg: remove vestiges of global errexit makepkg: make run_function_safe more robust makepkg: fix quoting in calls to check_deps makepkg: fix quoting in calls to dependency checking makepkg: unset potentially architecture-specific vars etc/makepkg.conf.in | 6 +++--- scripts/makepkg.sh.in | 37 ++++++++++++++++++++++--------------- 2 files changed, 25 insertions(+), 18 deletions(-) -- 2.10.2

2 7

[pacman-dev] [PATCH] dload: use curl's keepalive mechanism
by Dave Reisner 16 Nov '16

16 Nov '16

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. --- lib/libalpm/dload.c | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9d80358..ccd70d9 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -246,47 +246,6 @@ static size_t dload_parseheader_cb(void *ptr, size_t size, size_t nmemb, void *u return realsize; } -static int dload_sockopt_cb(void *userdata, curl_socket_t curlfd, - curlsocktype purpose) -{ - alpm_handle_t *handle = userdata; - int optval = 1; - - /* this whole method is to prevent FTP control connections from going sour - * during a long data transfer; crappy firewalls love to drop otherwise idle - * connections if there is no traffic. */ - if(purpose != CURLSOCKTYPE_IPCXN) { - return 0; - } - - /* don't abort operation if any setsockopt fails, just log to debug */ - if(setsockopt(curlfd, SOL_SOCKET, SO_KEEPALIVE, (void *)&optval, - sizeof(optval)) < 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "Failed to set SO_KEEPALIVE on fd %d\n", curlfd); - } - else { -#ifdef TCP_KEEPIDLE - optval = 60; - if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPIDLE, (void *)&optval, - sizeof(optval)) < 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "Failed to set TCP_KEEPIDLE on fd %d\n", curlfd); - } -#endif -#ifdef TCP_KEEPINTVL - optval = 60; - if(setsockopt(curlfd, IPPROTO_TCP, TCP_KEEPINTVL, (void *)&optval, - sizeof(optval)) < 0) { - _alpm_log(handle, ALPM_LOG_DEBUG, - "Failed to set TCP_KEEPINTVL on fd %d\n", curlfd); - } -#endif - } - - return 0; -} - static void curl_set_handle_opts(struct dload_payload *payload, CURL *curl, char *error_buffer) { @@ -310,8 +269,9 @@ static void curl_set_handle_opts(struct dload_payload *payload, 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); - curl_easy_setopt(curl, CURLOPT_SOCKOPTFUNCTION, dload_sockopt_cb); - curl_easy_setopt(curl, CURLOPT_SOCKOPTDATA, (void *)handle); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPIDLE, 60L); + curl_easy_setopt(curl, CURLOPT_TCP_KEEPINTVL, 60L); curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY); _alpm_log(handle, ALPM_LOG_DEBUG, "url: %s\n", payload->fileurl); -- 2.10.2

2 1

[pacman-dev] [PATCH v7 1/2] 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 2d2491d..bea79da 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -812,6 +812,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 9d80358..c3bb200 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_XFERINFOFUNCTION, dload_progress_cb); curl_easy_setopt(curl, CURLOPT_XFERINFODATA, (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 28e8148..6479798 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 652f17d..0c66469 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 d8d64fb..520f4d0 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; } @@ -603,6 +606,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"), @@ -733,6 +754,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 945de7c..17e5f27 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -133,6 +133,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 fd7438b..bd85d8a 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 0a6ce97..fa84ecc 100644 --- a/src/pacman/util.h +++ b/src/pacman/util.h @@ -76,6 +76,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.10.2

1 1

[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] [PATCH 1/1] always accept untranslated answers 'Y' and 'N'
by Christian Hesse 11 Nov '16

11 Nov '16

From: Christian Hesse <mail(a)eworm.de> 'YES' translates to 'JA' in German, thus answer 'J' is expected for positive answer. This changes the behaviour to always accept 'Y' and 'N', in addition to the translated values. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- src/pacman/util.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index fd7438b..e878cb3 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -1587,9 +1587,13 @@ static int question(short preset, const char *format, va_list args) fprintf(stream, "%s\n", response); } - if(mbscasecmp(response, _("Y")) == 0 || mbscasecmp(response, _("YES")) == 0) { + if(mbscasecmp(response, "Y") == 0 /* always accept untranslated */ + || mbscasecmp(response, _("Y")) == 0 + || mbscasecmp(response, _("YES")) == 0) { return 1; - } else if(mbscasecmp(response, _("N")) == 0 || mbscasecmp(response, _("NO")) == 0) { + } else if(mbscasecmp(response, "N") == 0 /* always accept untranslated */ + || mbscasecmp(response, _("N")) == 0 + || mbscasecmp(response, _("NO")) == 0) { return 0; } } -- 2.10.2

4 5

[pacman-dev] [RFC] Add Server-specific options, currently only PinnedPubKey
by Travis Burtrum 02 Nov '16

02 Nov '16

Hi all, Here is a rough go at a patch for server-specific options. It works, but what still needs done is: 1. Changing alpm_db_remove_server, does it still take a char* url? or the entire alpm_server_t struct that alpm_db_add_server does? 2. Deciding what to do with alpm_cb_fetch's signature, should a new struct be added to make adding new server options easier? Should alpm_server_t be sent in instead? (this gets messy in some places). 3. Documentation updates. The end result looks like: Server = https://example.org/ PinnedPubKey=sha256//eEHQC9au2QRAP1FnvcYEsmvXT7511EXQ2gw8ppBfseM= Is this a sound approach? Any other comments appreciated. Thanks, Travis >From ebf448cd4da77bdea833dc75e60de5c992f21eaf Mon Sep 17 00:00:00 2001 From: Travis Burtrum <travis.archlinux(a)burtrum.org> Date: Tue, 1 Nov 2016 23:02:43 -0400 Subject: [PATCH] [RFC] Add Server-specific options, currently only PinnedPubKey supported --- lib/libalpm/Makefile.am | 1 + lib/libalpm/alpm.c | 1 + lib/libalpm/alpm.h | 18 ++++++++-- lib/libalpm/be_sync.c | 7 +++- lib/libalpm/db.c | 16 ++++++--- lib/libalpm/dload.c | 8 ++++- lib/libalpm/dload.h | 1 + lib/libalpm/hook.c | 10 +++--- lib/libalpm/server.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/server.h | 36 +++++++++++++++++++ lib/libalpm/sync.c | 4 ++- src/pacman/conf.c | 68 ++++++++++++++++++++++++++++-------- 12 files changed, 234 insertions(+), 27 deletions(-) create mode 100644 lib/libalpm/server.c create mode 100644 lib/libalpm/server.h diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index f4f20e6..197459c 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -48,6 +48,7 @@ libalpm_la_SOURCES = \ libarchive-compat.h \ log.h log.c \ package.h package.c \ + server.h server.c \ pkghash.h pkghash.c \ rawstr.c \ remove.h remove.c \ diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 5225e4f..82df39f 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -29,6 +29,7 @@ #include "alpm.h" #include "alpm_list.h" #include "handle.h" +#include "server.h" #include "log.h" #include "util.h" diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d2491d..53b48e5 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -48,6 +48,7 @@ typedef struct __alpm_handle_t alpm_handle_t; typedef struct __alpm_db_t alpm_db_t; typedef struct __alpm_pkg_t alpm_pkg_t; typedef struct __alpm_trans_t alpm_trans_t; +typedef struct __alpm_server_t alpm_server_t; /** @addtogroup alpm_api_errors Error Codes * @{ @@ -750,11 +751,12 @@ typedef void (*alpm_cb_totaldl)(off_t total); * @param url the URL of the file to be downloaded * @param localpath the directory to which the file should be downloaded * @param force whether to force an update, even if the file is the same + * @param pinnedpubkey a pinned public key string * @return 0 on success, 1 if the file exists and is identical, -1 on * error. */ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, - int force); + int force, const char *pinnedpubkey); /** Fetch a remote pkg. * @param handle the context handle @@ -998,7 +1000,7 @@ int alpm_db_get_valid(alpm_db_t *db); */ alpm_list_t *alpm_db_get_servers(const alpm_db_t *db); int alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers); -int alpm_db_add_server(alpm_db_t *db, const char *url); +int alpm_db_add_server(alpm_db_t *db, alpm_server_t *url); int alpm_db_remove_server(alpm_db_t *db, const char *url); /** @} */ @@ -1061,6 +1063,18 @@ int alpm_db_get_usage(alpm_db_t *db, int *usage); /** @} */ +alpm_server_t *alpm_server_new(void); +int alpm_server_free(alpm_server_t *server); + +const char *alpm_server_get_url(const alpm_server_t *server); +const char *alpm_server_get_pinnedpubkey(const alpm_server_t *server); +int alpm_server_set_url(alpm_server_t *server, const char *url); +int alpm_server_set_pinnedpubkey(alpm_server_t *server, const char *pinnedpubkey); + +char **alpm_wordsplit(char *str); +int alpm_wordsplit_free(char **ws); + + /** @addtogroup alpm_api_packages Package Functions * Functions to manipulate libalpm packages * @{ diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 7774975..79a35d2 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -219,7 +219,8 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) dbext = db->handle->dbext; for(i = db->servers; i; i = i->next) { - const char *server = i->data, *final_db_url = NULL; + alpm_server_t *server_t = i->data; + const char *server = alpm_server_get_url(server_t), *final_db_url = NULL; struct dload_payload payload; size_t len; int sig_ret = 0; @@ -242,6 +243,8 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.handle = handle; payload.force = force; payload.unlink_on_fail = 1; + + payload.pinnedpubkey = alpm_server_get_pinnedpubkey(server_t); ret = _alpm_download(&payload, syncpath, NULL, &final_db_url); _alpm_dload_payload_reset(&payload); @@ -297,6 +300,8 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) /* set hard upper limit of 16KiB */ payload.max_size = 16 * 1024; + payload.pinnedpubkey = alpm_server_get_pinnedpubkey(server_t); + sig_ret = _alpm_download(&payload, syncpath, NULL, NULL); /* errors_ok suppresses error messages, but not the return code */ sig_ret = payload.errors_ok ? 0 : sig_ret; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 5d78ee5..7c8dd4b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -150,7 +150,8 @@ alpm_list_t SYMEXPORT *alpm_db_get_servers(const alpm_db_t *db) int SYMEXPORT alpm_db_set_servers(alpm_db_t *db, alpm_list_t *servers) { ASSERT(db != NULL, return -1); - FREELIST(db->servers); + alpm_list_free_inner(db->servers, (alpm_list_fn_free) alpm_server_free); + alpm_list_free(db->servers); db->servers = servers; return 0; } @@ -173,9 +174,10 @@ static char *sanitize_url(const char *url) * @param url url of the server * @return 0 on success, -1 on error (pm_errno is set accordingly) */ -int SYMEXPORT alpm_db_add_server(alpm_db_t *db, const char *url) +int SYMEXPORT alpm_db_add_server(alpm_db_t *db, alpm_server_t *server) { char *newurl; + const char *url = alpm_server_get_url(server); /* Sanity checks */ ASSERT(db != NULL, return -1); @@ -186,7 +188,12 @@ int SYMEXPORT alpm_db_add_server(alpm_db_t *db, const char *url) if(!newurl) { return -1; } - db->servers = alpm_list_add(db->servers, newurl); + + alpm_server_t *copy = alpm_server_new(); + alpm_server_set_url(copy, newurl); + alpm_server_set_pinnedpubkey(copy, alpm_server_get_pinnedpubkey(server)); + + db->servers = alpm_list_add(db->servers, copy); _alpm_log(db->handle, ALPM_LOG_DEBUG, "adding new server URL to database '%s': %s\n", db->treename, newurl); @@ -348,7 +355,8 @@ void _alpm_db_free(alpm_db_t *db) /* cleanup pkgcache */ _alpm_db_free_pkgcache(db); /* cleanup server list */ - FREELIST(db->servers); + alpm_list_free_inner(db->servers, (alpm_list_fn_free) alpm_server_free); + alpm_list_free(db->servers); FREE(db->_path); FREE(db->treename); FREE(db); diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9d80358..6d5b371 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -327,6 +327,12 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); } + if(payload->pinnedpubkey != NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "using curl pinnedpubkey: %s\n", payload->pinnedpubkey); + curl_easy_setopt(curl, CURLOPT_PINNEDPUBLICKEY, payload->pinnedpubkey); + } + if(!payload->allow_resume && !payload->force && payload->destfile_name && stat(payload->destfile_name, &st) == 0) { /* start from scratch, but only download if our local is out of date. */ @@ -646,7 +652,7 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif } else { - int ret = handle->fetchcb(payload->fileurl, localpath, payload->force); + int ret = handle->fetchcb(payload->fileurl, localpath, payload->force, payload->pinnedpubkey); if(ret == -1 && !payload->errors_ok) { RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 427c486..9b8453a 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -41,6 +41,7 @@ struct dload_payload { int errors_ok; int unlink_on_fail; int trust_remote_name; + const char *pinnedpubkey; #ifdef HAVE_LIBCURL CURLcode curlerr; /* last error produced by curl */ #endif diff --git a/lib/libalpm/hook.c b/lib/libalpm/hook.c index ccde225..9e84d78 100644 --- a/lib/libalpm/hook.c +++ b/lib/libalpm/hook.c @@ -71,7 +71,7 @@ static void _alpm_trigger_free(struct _alpm_trigger_t *trigger) } } -static void _alpm_wordsplit_free(char **ws) +int SYMEXPORT alpm_wordsplit_free(char **ws) { if(ws) { char **c; @@ -79,7 +79,9 @@ static void _alpm_wordsplit_free(char **ws) free(*c); } free(ws); + return 0; } + return -1; } static void _alpm_hook_free(struct _alpm_hook_t *hook) @@ -87,7 +89,7 @@ static void _alpm_hook_free(struct _alpm_hook_t *hook) if(hook) { free(hook->name); free(hook->desc); - _alpm_wordsplit_free(hook->cmd); + alpm_wordsplit_free(hook->cmd); alpm_list_free_inner(hook->triggers, (alpm_list_fn_free) _alpm_trigger_free); alpm_list_free(hook->triggers); alpm_list_free(hook->matches); @@ -158,7 +160,7 @@ static int _alpm_hook_validate(alpm_handle_t *handle, return ret; } -static char **_alpm_wordsplit(char *str) +char SYMEXPORT **alpm_wordsplit(char *str) { char *c = str, *end; char **out = NULL, **outsave; @@ -330,7 +332,7 @@ static int _alpm_hook_parse_cb(const char *file, int line, } else if(strcmp(key, "NeedsTargets") == 0) { hook->needs_targets = 1; } else if(strcmp(key, "Exec") == 0) { - if((hook->cmd = _alpm_wordsplit(value)) == NULL) { + if((hook->cmd = alpm_wordsplit(value)) == NULL) { if(errno == EINVAL) { error(_("hook %s line %d: invalid value %s\n"), file, line, value); } else { diff --git a/lib/libalpm/server.c b/lib/libalpm/server.c new file mode 100644 index 0000000..29aa365 --- /dev/null +++ b/lib/libalpm/server.c @@ -0,0 +1,91 @@ +/* + * server.c + * + * Copyright (c) 2006-2016 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> + * Copyright (c) 2005, 2006 by Christian Hamar <krics(a)linuxforum.hu> + * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.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/>. + */ + +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> + +/* libalpm */ +#include "server.h" +#include "alpm_list.h" +#include "log.h" +#include "util.h" +#include "db.h" +#include "delta.h" +#include "handle.h" +#include "deps.h" + +/** \addtogroup alpm_packages Server Functions + * @brief Functions to manipulate libalpm servers + * @{ + */ + +alpm_server_t SYMEXPORT *alpm_server_new(void) +{ + alpm_server_t *server; + + CALLOC(server, 1, sizeof(alpm_server_t), return NULL); + + return server; +} + +/** Free a package. */ +int SYMEXPORT alpm_server_free(alpm_server_t *server) +{ + ASSERT(server != NULL, return -1); + FREE(server->url); + FREE(server->pinnedpubkey); + return 0; +} + +const char SYMEXPORT *alpm_server_get_url(const alpm_server_t *server) +{ + ASSERT(server != NULL, return NULL); + return server->url; +} + +const char SYMEXPORT *alpm_server_get_pinnedpubkey(const alpm_server_t *server) +{ + ASSERT(server != NULL, return NULL); + return server->pinnedpubkey; +} + +int SYMEXPORT alpm_server_set_url(alpm_server_t *server, const char *url) +{ + ASSERT(server != NULL, return -1); + ASSERT(url != NULL, return 0); + FREE(server->url); + server->url = strdup(url); + return 0; +} + +int SYMEXPORT alpm_server_set_pinnedpubkey(alpm_server_t *server, const char *pinnedpubkey) +{ + ASSERT(server != NULL, return -1); + ASSERT(pinnedpubkey != NULL, return 0); + FREE(server->pinnedpubkey); + server->pinnedpubkey = strdup(pinnedpubkey); + return 0; +} + +/* vim: set noet: */ diff --git a/lib/libalpm/server.h b/lib/libalpm/server.h new file mode 100644 index 0000000..b88f9ee --- /dev/null +++ b/lib/libalpm/server.h @@ -0,0 +1,36 @@ +/* + * server.h + * + * Copyright (c) 2006-2016 Pacman Development Team <pacman-dev(a)archlinux.org> + * Copyright (c) 2002-2006 by Judd Vinet <jvinet(a)zeroflux.org> + * Copyright (c) 2005 by Aurelien Foret <orelien(a)chez.com> + * Copyright (c) 2006 by David Kimpe <dnaku(a)frugalware.org> + * Copyright (c) 2005, 2006 by Christian Hamar <krics(a)linuxforum.hu> + * Copyright (c) 2005, 2006 by Miklos Vajna <vmiklos(a)frugalware.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/>. + */ +#ifndef ALPM_SERVER_H +#define ALPM_SERVER_H + +#include "alpm.h" + +struct __alpm_server_t { + char *url; + char *pinnedpubkey; +}; + +#endif /* ALPM_SERVER_H */ + +/* vim: set noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 837639d..c54f951 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -933,7 +933,9 @@ static int download_single_file(alpm_handle_t *handle, struct dload_payload *pay EVENT(handle, &event); for(server = payload->servers; server; server = server->next) { - const char *server_url = server->data; + const alpm_server_t *server_t = server->data; + payload->pinnedpubkey = alpm_server_get_pinnedpubkey(server_t); + const char *server_url = alpm_server_get_url(server_t); size_t len; /* print server + filename into a buffer */ diff --git a/src/pacman/conf.c b/src/pacman/conf.c index d8d64fb..4905310 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -164,7 +164,8 @@ void config_repo_free(config_repo_t *repo) return; } free(repo->name); - FREELIST(repo->servers); + alpm_list_free_inner(repo->servers, (alpm_list_fn_free) alpm_server_free); + alpm_list_free(repo->servers); free(repo); } @@ -204,7 +205,7 @@ static char *get_tempfile(const char *path, const char *filename) /** External fetch callback */ static int download_with_xfercommand(const char *url, const char *localpath, - int force) + int force, const char *pinnedpubkey) { int ret = 0, retval; int usepart = 0; @@ -232,6 +233,16 @@ static int download_with_xfercommand(const char *url, const char *localpath, } tempcmd = strdup(config->xfercommand); + /* replace all occurrences of %p with pinnedpubkey */ + if(strstr(tempcmd, "%p")) { + if(pinnedpubkey == NULL) { + parsedcmd = strreplace(tempcmd, "%p", ""); + } else { + parsedcmd = strreplace(tempcmd, "%p", pinnedpubkey); + } + free(tempcmd); + tempcmd = parsedcmd; + } /* replace all occurrences of %o with fn.part */ if(strstr(tempcmd, "%o")) { usepart = 1; @@ -613,16 +624,17 @@ static int _parse_options(const char *key, char *value, return 0; } -static int _add_mirror(alpm_db_t *db, char *value) +static int _add_mirror(alpm_db_t *db, alpm_server_t *server) { + const char *value = alpm_server_get_url(server); const char *dbname = alpm_db_get_name(db); /* let's attempt a replacement for the current repo */ char *temp = strreplace(value, "$repo", dbname); /* let's attempt a replacement for the arch */ const char *arch = config->arch; - char *server; + char *url; if(arch) { - server = strreplace(temp, "$arch", arch); + url = strreplace(temp, "$arch", arch); free(temp); } else { if(strstr(temp, "$arch")) { @@ -632,18 +644,19 @@ static int _add_mirror(alpm_db_t *db, char *value) value, "$arch", "Architecture"); return 1; } - server = temp; + url = temp; } + alpm_server_set_url(server, url); if(alpm_db_add_server(db, server) != 0) { /* pm_errno is set by alpm_db_setserver */ pm_printf(ALPM_LOG_ERROR, _("could not add server URL to database '%s': %s (%s)\n"), - dbname, server, alpm_strerror(alpm_errno(config->handle))); - free(server); + dbname, url, alpm_strerror(alpm_errno(config->handle))); + free(url); return 1; } - free(server); + free(url); return 0; } @@ -669,11 +682,11 @@ static int register_repo(config_repo_t *repo) alpm_db_set_usage(db, repo->usage == 0 ? ALPM_DB_USAGE_ALL : repo->usage); for(i = repo->servers; i; i = alpm_list_next(i)) { - char *value = i->data; - if(_add_mirror(db, value) != 0) { + alpm_server_t *server = i->data; + if(_add_mirror(db, server) != 0) { pm_printf(ALPM_LOG_ERROR, _("could not add mirror '%s' to database '%s' (%s)\n"), - value, repo->name, alpm_strerror(alpm_errno(config->handle))); + alpm_server_get_url(server), repo->name, alpm_strerror(alpm_errno(config->handle))); return 1; } } @@ -883,6 +896,7 @@ static int _parse_repo(const char *key, char *value, const char *file, { int ret = 0; config_repo_t *repo = section->repo; + char *server_key, *server_value; if(strcmp(key, "Server") == 0) { if(!value) { @@ -890,7 +904,34 @@ static int _parse_repo(const char *key, char *value, const char *file, file, line, key); ret = 1; } else { - repo->servers = alpm_list_add(repo->servers, strdup(value)); + alpm_server_t *server = alpm_server_new(); + char **cmd = alpm_wordsplit(value); + alpm_server_set_url(server, cmd[0]); + char **c; + for(c = cmd + 1; *c; c++) { + server_key = *c; + server_value = *c; + strsep(&server_value, "="); + strtrim(server_key); + strtrim(server_value); + + if(strcmp(server_key, "PinnedPubKey") == 0) { + if(!server_value) { + pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), + file, line, server_key); + } else { + alpm_server_set_pinnedpubkey(server, server_value); + pm_printf(ALPM_LOG_DEBUG, "server config: server: %s, pinnedpubkey: %s\n", cmd[0], server_value); + } + } else { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: directive '%s' in section '%s', server '%s', key '%s' not recognized.\n"), + file, line, key, repo->name, cmd[0], server_key); + } + + } + alpm_wordsplit_free(cmd); + repo->servers = alpm_list_add(repo->servers, server); } } else if(strcmp(key, "SigLevel") == 0) { if(!value) { @@ -920,7 +961,6 @@ static int _parse_repo(const char *key, char *value, const char *file, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), file, line, key, repo->name); } - return ret; } -- 2.10.2

1 0

[pacman-dev] [PATCH] Add per-repo PinnedPubKey option
by Travis Burtrum 02 Nov '16

02 Nov '16

>From abb057844eec0e5707c31b643d0f2187b4cf0eb6 Mon Sep 17 00:00:00 2001 From: Travis Burtrum <travis.archlinux(a)burtrum.org> Date: Mon, 31 Oct 2016 02:12:31 -0400 Subject: [PATCH] Add per-repo PinnedPubKey option This sets curl's CURLOPT_PINNEDPUBLICKEY option in the built-in downloader, or replaces %p in XferCommand. This pins public keys to ensure your TLS connection is not man-in-the-middled without relying on CAs etc. Probably most useful currently for very small groups or single servers. It would obviously be best as a per-mirror option, but such a thing currently does not exist. Signed-off-by: Travis Burtrum <travis.archlinux(a)burtrum.org> --- doc/pacman.conf.5.txt | 12 +++++++++++- lib/libalpm/alpm.h | 10 +++++++++- lib/libalpm/be_sync.c | 4 ++++ lib/libalpm/db.c | 12 ++++++++++++ lib/libalpm/db.h | 1 + lib/libalpm/dload.c | 8 +++++++- lib/libalpm/dload.h | 1 + lib/libalpm/sync.c | 7 ++++--- src/pacman/conf.c | 26 ++++++++++++++++++++++++-- src/pacman/conf.h | 1 + 10 files changed, 74 insertions(+), 8 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index c665870..b1859c7 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -126,7 +126,8 @@ Options All instances of `%u` will be replaced with the download URL. If present, instances of `%o` will be replaced with the local filename, plus a ``.part'' extension, which allows programs like wget to do file resumes - properly. + properly. If present, instances of `%p` will be replaced with the value of + the repo specific PinnedPubKey directive, or `` if that is not set. + This option is useful for users who experience problems with built-in HTTP/FTP support, or need the more advanced proxy support that comes with @@ -276,6 +277,15 @@ even be used for different architectures. Note that an enabled repository can be operated on explicitly, regardless of the Usage level set. +*PinnedPubKey =* pinnedpubkey:: + The string can be the file name of your pinned public key. The file format expected + is "PEM" or "DER". The string can also be any number of base64 encoded sha256 + hashes preceded by "sha256//" and separated by ";" ++ +When negotiating a TLS or SSL connection, the server sends a certificate indicating +its identity. A public key is extracted from this certificate and if it does not +exactly match the public key provided to this option, pacman will abort the +connection before sending or receiving any data. Package and Database Signature Checking[[SC]] --------------------------------------------- diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d2491d..e942559 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -750,11 +750,12 @@ typedef void (*alpm_cb_totaldl)(off_t total); * @param url the URL of the file to be downloaded * @param localpath the directory to which the file should be downloaded * @param force whether to force an update, even if the file is the same + * @param pinnedpubkey a pinned public key string * @return 0 on success, 1 if the file exists and is identical, -1 on * error. */ typedef int (*alpm_cb_fetch)(const char *url, const char *localpath, - int force); + int force, const char *pinnedpubkey); /** Fetch a remote pkg. * @param handle the context handle @@ -1037,6 +1038,13 @@ alpm_list_t *alpm_db_get_groupcache(alpm_db_t *db); */ alpm_list_t *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles); +/** Sets the pinned public key of a database. + * @param db pointer to the package database to set the status for + * @param pinnedpubkey a pinned public key string + * @return 0 on success, or -1 on error + */ +int alpm_db_set_pinnedpubkey(alpm_db_t *db, char *pinnedpubkey); + typedef enum _alpm_db_usage_ { ALPM_DB_USAGE_SYNC = 1, ALPM_DB_USAGE_SEARCH = (1 << 1), diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 7774975..be2cd64 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -242,6 +242,8 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) payload.handle = handle; payload.force = force; payload.unlink_on_fail = 1; + + payload.pinnedpubkey = db->pinnedpubkey; ret = _alpm_download(&payload, syncpath, NULL, &final_db_url); _alpm_dload_payload_reset(&payload); @@ -297,6 +299,8 @@ int SYMEXPORT alpm_db_update(int force, alpm_db_t *db) /* set hard upper limit of 16KiB */ payload.max_size = 16 * 1024; + payload.pinnedpubkey = db->pinnedpubkey; + sig_ret = _alpm_download(&payload, syncpath, NULL, NULL); /* errors_ok suppresses error messages, but not the return code */ sig_ret = payload.errors_ok ? 0 : sig_ret; diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 5d78ee5..0dab1e7 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -306,6 +306,15 @@ alpm_list_t SYMEXPORT *alpm_db_search(alpm_db_t *db, const alpm_list_t *needles) return _alpm_db_search(db, needles); } +/** Sets the pinned public key for a repo */ +int SYMEXPORT alpm_db_set_pinnedpubkey(alpm_db_t *db, char *pinnedpubkey) +{ + ASSERT(db != NULL, return -1); + ASSERT(pinnedpubkey != NULL, return 0); + db->pinnedpubkey = strdup(pinnedpubkey); + return 0; +} + /** Sets the usage bitmask for a repo */ int SYMEXPORT alpm_db_set_usage(alpm_db_t *db, int usage) { @@ -351,6 +360,9 @@ void _alpm_db_free(alpm_db_t *db) FREELIST(db->servers); FREE(db->_path); FREE(db->treename); + if(db->pinnedpubkey != NULL) { + FREE(db->pinnedpubkey); + } FREE(db); return; diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h index 8e50196..4ce98c8 100644 --- a/lib/libalpm/db.h +++ b/lib/libalpm/db.h @@ -67,6 +67,7 @@ struct __alpm_db_t { char *treename; /* do not access directly, use _alpm_db_path(db) for lazy access */ char *_path; + char *pinnedpubkey; alpm_pkghash_t *pkgcache; alpm_list_t *grpcache; alpm_list_t *servers; diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 9d80358..6d5b371 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -327,6 +327,12 @@ static void curl_set_handle_opts(struct dload_payload *payload, curl_easy_setopt(curl, CURLOPT_USERAGENT, useragent); } + if(payload->pinnedpubkey != NULL) { + _alpm_log(handle, ALPM_LOG_DEBUG, + "using curl pinnedpubkey: %s\n", payload->pinnedpubkey); + curl_easy_setopt(curl, CURLOPT_PINNEDPUBLICKEY, payload->pinnedpubkey); + } + if(!payload->allow_resume && !payload->force && payload->destfile_name && stat(payload->destfile_name, &st) == 0) { /* start from scratch, but only download if our local is out of date. */ @@ -646,7 +652,7 @@ int _alpm_download(struct dload_payload *payload, const char *localpath, RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); #endif } else { - int ret = handle->fetchcb(payload->fileurl, localpath, payload->force); + int ret = handle->fetchcb(payload->fileurl, localpath, payload->force, payload->pinnedpubkey); if(ret == -1 && !payload->errors_ok) { RET_ERR(handle, ALPM_ERR_EXTERNAL_DOWNLOAD, -1); } diff --git a/lib/libalpm/dload.h b/lib/libalpm/dload.h index 427c486..b938fdc 100644 --- a/lib/libalpm/dload.h +++ b/lib/libalpm/dload.h @@ -41,6 +41,7 @@ struct dload_payload { int errors_ok; int unlink_on_fail; int trust_remote_name; + char *pinnedpubkey; #ifdef HAVE_LIBCURL CURLcode curlerr; /* last error produced by curl */ #endif diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 837639d..05e1ffe 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -862,7 +862,7 @@ static int validate_deltas(alpm_handle_t *handle, alpm_list_t *deltas) } static struct dload_payload *build_payload(alpm_handle_t *handle, - const char *filename, size_t size, alpm_list_t *servers) + const char *filename, size_t size, alpm_list_t *servers, char *pinnedpubkey) { struct dload_payload *payload; @@ -870,6 +870,7 @@ static struct dload_payload *build_payload(alpm_handle_t *handle, STRDUP(payload->remote_name, filename, FREE(payload); RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); payload->max_size = size; payload->servers = servers; + payload->pinnedpubkey = pinnedpubkey; return payload; } @@ -898,7 +899,7 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t alpm_delta_t *delta = dlts->data; if(delta->download_size != 0) { struct dload_payload *payload = build_payload( - handle, delta->delta, delta->delta_size, repo->servers); + handle, delta->delta, delta->delta_size, repo->servers, repo->pinnedpubkey); ASSERT(payload, return -1); *files = alpm_list_add(*files, payload); } @@ -909,7 +910,7 @@ static int find_dl_candidates(alpm_db_t *repo, alpm_list_t **files, alpm_list_t } else if(spkg->download_size != 0) { struct dload_payload *payload; ASSERT(spkg->filename != NULL, RET_ERR(handle, ALPM_ERR_PKG_INVALID_NAME, -1)); - payload = build_payload(handle, spkg->filename, spkg->size, repo->servers); + payload = build_payload(handle, spkg->filename, spkg->size, repo->servers, repo->pinnedpubkey); ASSERT(payload, return -1); *files = alpm_list_add(*files, payload); } diff --git a/src/pacman/conf.c b/src/pacman/conf.c index d8d64fb..8dd23e5 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -163,6 +163,9 @@ void config_repo_free(config_repo_t *repo) if(repo == NULL) { return; } + if(repo->pinnedpubkey != NULL) { + free(repo->pinnedpubkey); + } free(repo->name); FREELIST(repo->servers); free(repo); @@ -204,7 +207,7 @@ static char *get_tempfile(const char *path, const char *filename) /** External fetch callback */ static int download_with_xfercommand(const char *url, const char *localpath, - int force) + int force, const char *pinnedpubkey) { int ret = 0, retval; int usepart = 0; @@ -232,6 +235,16 @@ static int download_with_xfercommand(const char *url, const char *localpath, } tempcmd = strdup(config->xfercommand); + /* replace all occurrences of %p with pinnedpubkey */ + if(strstr(tempcmd, "%p")) { + if(pinnedpubkey == NULL) { + parsedcmd = strreplace(tempcmd, "%p", ""); + } else { + parsedcmd = strreplace(tempcmd, "%p", pinnedpubkey); + } + free(tempcmd); + tempcmd = parsedcmd; + } /* replace all occurrences of %o with fn.part */ if(strstr(tempcmd, "%o")) { usepart = 1; @@ -668,6 +681,8 @@ static int register_repo(config_repo_t *repo) repo->name); alpm_db_set_usage(db, repo->usage == 0 ? ALPM_DB_USAGE_ALL : repo->usage); + alpm_db_set_pinnedpubkey(db, repo->pinnedpubkey); + for(i = repo->servers; i; i = alpm_list_next(i)) { char *value = i->data; if(_add_mirror(db, value) != 0) { @@ -915,12 +930,19 @@ static int _parse_repo(const char *key, char *value, const char *file, } FREELIST(values); } + } else if(strcmp(key, "PinnedPubKey") == 0) { + if(!value) { + pm_printf(ALPM_LOG_ERROR, _("config file %s, line %d: directive '%s' needs a value\n"), + file, line, key); + } else { + repo->pinnedpubkey = strdup(value); + pm_printf(ALPM_LOG_DEBUG, "repo config: pinnedpubkey: %s\n", value); + } } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), file, line, key, repo->name); } - return ret; } diff --git a/src/pacman/conf.h b/src/pacman/conf.h index 945de7c..7c021bf 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -40,6 +40,7 @@ typedef struct __config_repo_t { int usage; int siglevel; int siglevel_mask; + char *pinnedpubkey; } config_repo_t; typedef struct __config_t { -- 2.10.2

6 11

[pacman-dev] repose and contributing generic PKGINFO/database parsers
by Simon Gomizelj 02 Nov '16

02 Nov '16

Hey, so following up with discussions that happened yesterday on #archlinux. So, for context, I have a project for building Arch Linux repositories in an automated way: https://github.com/vodik/repose Some of you guys are aware of the project, but for those that aren't, its an alternative for the repo-add and repo-remove utilities. It attempts to intelligently build an optimal repository from a pool of packages and automatically handles incremental rebuilds in an automated way. For the most part, its faster than repo-add and fits better with makepkg and PKGDEST. As part of the project I've had to write my own utilities for processing tarballs and parsers and for the pacman database desc/depends/files entries and .PKGINFO file. I wanted to use reuse the official libalpm utilities, but I found them too tightly coupled into how libalpm expects to be used and the layout of the package structure. I initially copied out the internal parsers and modified them, but they've since been replaced with ragel-generated standalone parsers. They have their own test coverage and do run quite a bit faster. I'm curious if there's any interest in accepting some of this work and on what kind of terms? As patches to libalpm for my decouple parsers? Is ragel okay? Or if maybe its something that's best as a standalone library?

2 1