March 2014 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH 1/4] makepkg: sign source packages with --sign
by Allan McRae 29 Mar '14

29 Mar '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index d8cdc88..d9a14e2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2060,10 +2060,16 @@ create_srcpackage() { exit 1 # TODO: error code fi + create_signature "$pkg_file" + if [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then rm -f "${pkg_file/$SRCPKGDEST/$startdir}" ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" ret=$? + if [[ -f $pkg_file.sig ]]; then + rm -f "${pkg_file/$PKGDEST/$startdir}.sig" + ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" + fi fi if (( ret )); then -- 1.9.1

2 5

[pacman-dev] [PATCH v3 0/4] pacman/upgrade
by Sören Brinkmann 27 Mar '14

27 Mar '14

So, Andrew urged me to dive a little deeper into this and here's the result. On top of the original fix for the potential NULL-pointer dereference there are three more patches now. Those address the memory management and error paths in the upgrade code. Sören Sören Brinkmann (4): pacman/upgrade: Check malloc() return value pacman/upgrade: Refactor memory management pacman/upgrade: Fix memory leaks pacman/upgrade: Bail early on errors src/pacman/upgrade.c | 52 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 20 deletions(-) -- 1.9.0

3 11

[pacman-dev] [PATCH v4] Add configuration options for libcurl's "low speed" timeout
by Andrew Hills 27 Mar '14

27 Mar '14

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. Signed-off-by: Andrew Hills <ahills(a)ednos.net> --- This version of the patch does not allow setting LowSpeedLimit, nor LowSpeedTime, to a negative value. doc/pacman.conf.5.txt | 13 +++++++++++++ etc/pacman.conf.in | 2 ++ lib/libalpm/alpm.h | 10 ++++++++++ lib/libalpm/dload.c | 4 ++-- lib/libalpm/handle.c | 34 ++++++++++++++++++++++++++++++++++ lib/libalpm/handle.h | 4 ++++ src/pacman/conf.c | 24 ++++++++++++++++++++++++ src/pacman/conf.h | 4 ++++ 8 files changed, 93 insertions(+), 2 deletions(-) diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index f19311c..bfc0191 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -199,6 +199,19 @@ 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 ------------------- Each repository section defines a section name and at least one location where diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index b891de1..0bc5908 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -20,6 +20,8 @@ HoldPkg = pacman glibc #CleanMethod = KeepInstalled #UseDelta = 0.7 Architecture = auto +#LowSpeedLimit = 1 +#LowSpeedTime = 10 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index b0adb95..d23ae23 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -595,6 +595,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_lowspeedlimit(alpm_handle_t *handle); +/** Sets the libcurl low speed limit in bytes per second. */ +int alpm_option_set_lowspeedlimit(alpm_handle_t *handle, long lowspeedlimit); + +/** Returns the libcurl low speed time in seconds. */ +long alpm_option_get_lowspeedtime(alpm_handle_t *handle); +/** Sets the libcurl low speed time in seconds. */ +int alpm_option_set_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 53867f5..31edbf4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -294,8 +294,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->lowspeedlimit); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, handle->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 0842d51..7eb0f8f 100644 --- a/lib/libalpm/handle.c +++ b/lib/libalpm/handle.c @@ -198,6 +198,18 @@ const char SYMEXPORT *alpm_option_get_lockfile(alpm_handle_t *handle) return handle->lockfile; } +long SYMEXPORT alpm_option_get_lowspeedlimit(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->lowspeedlimit; +} + +long SYMEXPORT alpm_option_get_lowspeedtime(alpm_handle_t *handle) +{ + CHECK_HANDLE(handle, return -1); + return handle->lowspeedtime; +} + const char SYMEXPORT *alpm_option_get_gpgdir(alpm_handle_t *handle) { CHECK_HANDLE(handle, return NULL); @@ -294,6 +306,28 @@ int SYMEXPORT alpm_option_set_progresscb(alpm_handle_t *handle, alpm_cb_progress return 0; } +int SYMEXPORT alpm_option_set_lowspeedlimit(alpm_handle_t *handle, long lowspeedlimit) +{ + CHECK_HANDLE(handle, return -1); + if(lowspeedlimit < 0) + { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->lowspeedlimit = lowspeedlimit; + return 0; +} + +int SYMEXPORT alpm_option_set_lowspeedtime(alpm_handle_t *handle, long lowspeedtime) +{ + CHECK_HANDLE(handle, return -1); + if(lowspeedtime < 0) + { + RET_ERR(handle, ALPM_ERR_WRONG_ARGS, -1); + } + handle->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 27241ea..25a51ff 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -104,6 +104,10 @@ struct __alpm_handle_t { /* for delta parsing efficiency */ int delta_regex_compiled; regex_t delta_regex; + + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; }; alpm_handle_t *_alpm_handle_new(void); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f75f3a7..0506329 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -120,6 +120,9 @@ config_t *config_new(void) newconfig->colstr.err = ""; newconfig->colstr.nocolor = ""; + newconfig->lowspeedlimit = 1L; + newconfig->lowspeedtime = 10L; + return newconfig; } @@ -596,6 +599,24 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "LowSpeedLimit") == 0) { + config->lowspeedlimit = strtol(value, NULL, 0); + if((config->lowspeedlimit == LONG_MAX || config->lowspeedlimit == LONG_MIN) && errno == ERANGE) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: LowSpeedLimit overflow, using default.\n"), + file, linenum); + config->lowspeedlimit = 1L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedlimit: %ld\n", config->lowspeedlimit); + } else if(strcmp(key, "LowSpeedTime") == 0) { + config->lowspeedtime = strtol(value, NULL, 0); + if((config->lowspeedtime == LONG_MAX || config->lowspeedtime == LONG_MIN) && errno == ERANGE) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: LowSpeedTime overflow, using default.\n"), + file, linenum); + 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"), @@ -690,6 +711,9 @@ static int setup_libalpm(void) alpm_option_set_questioncb(handle, cb_question); alpm_option_set_progresscb(handle, cb_progress); + alpm_option_set_lowspeedlimit(handle, config->lowspeedlimit); + alpm_option_set_lowspeedtime(handle, config->lowspeedtime); + config->logfile = config->logfile ? config->logfile : strdup(LOGFILE); ret = alpm_option_set_logfile(handle, config->logfile); if(ret != 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index e8cac50..3f2cdb3 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -113,6 +113,10 @@ typedef struct __config_t { /* Color strings for output */ colstr_t colstr; + + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; } config_t; /* Operations */ -- 1.9.0

2 1

[pacman-dev] [PATCH] Add configuration options for libcurl's "low speed" timeout
by Andrew Hills 26 Mar '14

26 Mar '14

Hi all, (Resending; looks like it didn't make it through the first time.) Behind an obnoxious "transparent" corporate virus-scanning firewall, I find pacman frequently failing to download packages, yielding an "Operation too slow" error. Setting the transfer command to a more forgiving program like wget is suboptimal, as it's often unclear what failed and why: most mirrors are missing the signatures for the package databases, for example, littering the terminal with irrelevant errors. This patch adds the "LowSpeedLimit" and "LowSpeedTime" configuration parameters to pacman.conf rather than hard-coding the defaults in libalpm. It adds two fields to the configuration structure and the ALPM handle structure to get the data all the way into curl_set_handle_opts(). Unfortunately, I had to include ALPM's handle.h in pacman's conf.h, else setting the handle's new fields fails (the type is incomplete at that point). I couldn't see a better way to do it. Comments requested. Thanks, Andrew From 85b5392be37fa6b8cc4392f6b308a8141255ab8f Mon Sep 17 00:00:00 2001 From: Andrew Hills <ahills(a)ednos.net> Date: Wed, 19 Mar 2014 14:03:30 -0400 Subject: [PATCH] Add LowSpeedLimit and LowSpeedTime configuration options to correspond to libcurl's CURLOPT_LOW_SPEED_LIMIT and CURLOPT_LOW_SPEED_TIME options. Signed-off-by: Andrew Hills <ahills(a)ednos.net> --- lib/libalpm/dload.c | 4 ++-- lib/libalpm/handle.h | 4 ++++ src/pacman/conf.c | 24 ++++++++++++++++++++++++ src/pacman/conf.h | 5 +++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index 53867f5..31edbf4 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -294,8 +294,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->lowspeedlimit); + curl_easy_setopt(curl, CURLOPT_LOW_SPEED_TIME, handle->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.h b/lib/libalpm/handle.h index 27241ea..25a51ff 100644 --- a/lib/libalpm/handle.h +++ b/lib/libalpm/handle.h @@ -104,6 +104,10 @@ struct __alpm_handle_t { /* for delta parsing efficiency */ int delta_regex_compiled; regex_t delta_regex; + + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; }; alpm_handle_t *_alpm_handle_new(void); diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f75f3a7..3e5041f 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -120,6 +120,9 @@ config_t *config_new(void) newconfig->colstr.err = ""; newconfig->colstr.nocolor = ""; + newconfig->lowspeedlimit = 1L; + newconfig->lowspeedtime = 10L; + return newconfig; } @@ -596,6 +599,24 @@ static int _parse_options(const char *key, char *value, return 1; } FREELIST(values); + } else if(strcmp(key, "LowSpeedLimit") == 0) { + config->lowspeedlimit = strtol(value, NULL, 0); + if((config->lowspeedlimit == LONG_MAX || config->lowspeedlimit == LONG_MIN) && errno == ERANGE) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: LowSpeedLimit overflow, using default.\n"), + file, linenum); + config->lowspeedlimit = 1L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedlimit: %lu\n", config->lowspeedlimit); + } else if(strcmp(key, "LowSpeedTime") == 0) { + config->lowspeedtime = strtol(value, NULL, 0); + if((config->lowspeedtime == LONG_MAX || config->lowspeedtime == LONG_MIN) && errno == ERANGE) { + pm_printf(ALPM_LOG_WARNING, + _("config file %s, line %d: LowSpeedTime overflow, using default.\n"), + file, linenum); + config->lowspeedtime = 10L; + } + pm_printf(ALPM_LOG_DEBUG, "config: lowspeedtime: %lu\n", config->lowspeedtime); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), @@ -690,6 +711,9 @@ static int setup_libalpm(void) alpm_option_set_questioncb(handle, cb_question); alpm_option_set_progresscb(handle, cb_progress); + handle->lowspeedlimit = config->lowspeedlimit; + handle->lowspeedtime = config->lowspeedtime; + config->logfile = config->logfile ? config->logfile : strdup(LOGFILE); ret = alpm_option_set_logfile(handle, config->logfile); if(ret != 0) { diff --git a/src/pacman/conf.h b/src/pacman/conf.h index e8cac50..6ab8b52 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -21,6 +21,7 @@ #define _PM_CONF_H #include <alpm.h> +#include <handle.h> typedef struct __colstr_t { const char *colon; @@ -113,6 +114,10 @@ typedef struct __config_t { /* Color strings for output */ colstr_t colstr; + + /* Curl timeouts */ + long lowspeedlimit; + long lowspeedtime; } config_t; /* Operations */ -- 1.8.5.5

4 10

[pacman-dev] [PATCH] sync_prepare: remove useless check for replacers
by Andrew Gregory 24 Mar '14

24 Mar '14

Since 017184fa, alpm_sync_sysupgrade will not add both a replacement and a literal upgrade to the transaction. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/sync.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index a025b68..44a0ba8 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -416,8 +416,6 @@ int _alpm_sync_prepare(alpm_handle_t *handle, alpm_list_t **data) alpm_pkg_t *spkg = i->data; for(j = spkg->removes; j; j = j->next) { remove = alpm_list_add(remove, j->data); - /* do not re-install a (replaced) package even if an update is available */ - trans->add = alpm_list_remove(trans->add, j->data, _alpm_pkg_cmp, NULL); } } -- 1.9.0

1 0

[pacman-dev] [PATCH] conf.c: remove extra indentation
by Andrew Gregory 24 Mar '14

24 Mar '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/conf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index f75f3a7..0e483f7 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -93,10 +93,9 @@ config_t *config_new(void) { config_t *newconfig = calloc(1, sizeof(config_t)); if(!newconfig) { - pm_printf(ALPM_LOG_ERROR, - _("malloc failure: could not allocate %zd bytes\n"), - sizeof(config_t)); - return NULL; + pm_printf(ALPM_LOG_ERROR, + _("malloc failure: could not allocate %zd bytes\n"), sizeof(config_t)); + return NULL; } /* defaults which may get overridden later */ newconfig->op = PM_OP_MAIN; -- 1.9.0

1 0

[pacman-dev] [PATCH] check config_new return value
by Andrew Gregory 24 Mar '14

24 Mar '14

Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/pacman.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 9791ced..ef86d39 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -1045,7 +1045,10 @@ int main(int argc, char *argv[]) setuseragent(); /* init config data */ - config = config_new(); + if(!(config = config_new())) { + /* config_new prints the appropriate error message */ + cleanup(1); + } /* disable progressbar if the output is redirected */ if(!isatty(fileno(stdout))) { -- 1.9.0

1 0

[pacman-dev] [PATCH] pkgdelta: use highest compression ratio when creating deltas with xdelta3
by Matthias Krüger 21 Mar '14

21 Mar '14

Looking how pkgdelta works, I found this line xdelta3 -q -f -s "$oldfile" "$newfile" "$deltafile" || ret=$? which seemed to be responsible for the actual delta generation, however man xdelta3 revealed that there were different compression levels (0-9) (not sure which one is default). To make it short, we could have had smaller deltas since pkgdelta was introduced! Examples: -9 16660K blender-12:2.69.c7ac0e-1_to_13:2.69.13290d-1-x86_64.delta default 17832K blender-12:2.69.c7ac0e-1_to_13:2.69.13290d-1-x86_64.delta -9 504K xbmc-12.3-10_to_12.3-11-x86_64.delta default 572K xbmc-12.3-10_to_12.3-11-x86_64.delta The attached patch adds the "-9" option to the line above. Side note: it might be even more advantageous to use bsdiff instead of xdelta3 comparing the /usr/bin/blender binaries of the above versions (12:2.69.c7ac0e-1 and 13:2.69.13290d-1) : xdelta3 10.4M xdelta3 -9 9.9M bsdiff 4.7M ,however bsdiff is only for direct diff creation, bsdiff foo1.pkg.tar.xz foo2.pkg.tar.xz will create a diff between the archives and not their contents, so that'd require further coding which I am unable to do (maybe someone else volunteers :) ). Kind regards, Matthias

4 11

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.1.2-328-g912ea36
by allan＠archlinux.org 13 Mar '14

13 Mar '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 912ea363dec9038e9226a619364e16709720cac3 (commit) via d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 (commit) via 61ba5c961e4a3536c4bbf41edb348987a9993fdb (commit) via ce3fbcb18d176d45df0c0f54299022e55509595f (commit) via 204158682910556b3e5e53906dcfaf063ab0e195 (commit) via 87b0818246984295399c0b612abf9514695ae473 (commit) via ffdc2c5396903ec0dd2b7ab4623f7f7674827885 (commit) via f3a280bc67c0f2e7b57f3772599f989b0df4d945 (commit) via 2e9602716c4586ccb1b54eda4718f4dd53399f99 (commit) via 2330a6458976f20e6039ddbb5a0e00ea939b392a (commit) via 1afddd74a978631ff4f15d450b96d66e7af1e768 (commit) from e6ff63076390141f2606babda627e5e053462456 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 912ea363dec9038e9226a619364e16709720cac3 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Wed Mar 5 10:45:21 2014 +0100 makepkg: Reorder some entries in usage() and getopts Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8ee8d0c99c3820951e2e49dbdb71a5390bd1dc4 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 8 20:46:21 2014 +1000 makepkg: enforce fakeroot usage Packaging outside of fakeroot can result in incorrect permissions for package files. It has been years since fakeroot issues during packaging were common, so it is safe to enforce fakeroot usage. If using fakeroot is impossible for some reason, a two line wrapper script will suffice to fool makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 61ba5c961e4a3536c4bbf41edb348987a9993fdb Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 8 20:31:46 2014 +1000 makepkg: Remove --asroot option The days of fakeroot being error ridden are long gone, so there is no valid reason to run makepkg as root. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ce3fbcb18d176d45df0c0f54299022e55509595f Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Mon Mar 3 20:29:54 2014 +0100 makepkg: Add a --noarchive option to inhibit archive creation 1. Packagers who want to test the package() function, i.e. to check the content of the pkg/ folder. 2. Developers who want to check how the packaged version of a program looks, in other words how the pkg/ folder looks. 3. For users of systems with no port tree, makepkg can ease package creation. However the resulting archive of the whole makepkg process is often useless. For all situations, makepkg will usually be called several times. But no archive (the final package) is needed in any cases. The archive creation ends up being a waste of time and resource, especially for big applications and slow machines. Since this option aborts the process prematurely, it behaves like the -o,--nobuild option, i.e. any other option acting on later stages in the process will be automatically discarded. For --noarchive, it means that in $ makepkg --noarchive --install the '--install' option does not do anything. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 204158682910556b3e5e53906dcfaf063ab0e195 Author: Pierre Neidhardt <ambrevar(a)gmail.com> Date: Wed Mar 5 10:45:22 2014 +0100 makepkg: Comment on install_package() return code Previously, install_package() return code was either used as exit code or ignored. This was rather confusing. The return code is now always ignored and a comment on install_package() has been added. Signed-off-by: Pierre Neidhardt <ambrevar(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87b0818246984295399c0b612abf9514695ae473 Author: Matthias Krüger <matthias.krueger(a)famsik.de> Date: Thu Mar 6 01:25:59 2014 +0100 note that TotalDownload and XferCommand are incompatible. Another small patch that I made long ago (but was too lazy to submit back then). When using XferCommand, TotalDownload option is not take into account. Regards, Matthias >From bff946cd9969b6bc6243875e0759f0ee02e487de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger(a)famsik.de> Date: Thu, 9 May 2013 13:21:04 +0200 Subject: [PATCH] doc: pacman.conf: note that TotalDownload and XferCommand options are incompatible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Matthias Krüger <matthias.krueger(a)famsik.de> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ffdc2c5396903ec0dd2b7ab4623f7f7674827885 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Mar 8 16:58:30 2014 +1000 Use MALLOC throughtout libalpm Use MALLOC instead of malloc for safety in libalpm. Some changes are pure refactoring, but for others this provides a success check for memory allocation. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f3a280bc67c0f2e7b57f3772599f989b0df4d945 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 3 18:29:10 2014 -0500 remove check for unused ALPM_ERR_PKG_IGNORED alpm_add_pkg does not ignore packages. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2e9602716c4586ccb1b54eda4718f4dd53399f99 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 3 18:29:09 2014 -0500 simplify check for leading "local/" Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2330a6458976f20e6039ddbb5a0e00ea939b392a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Mon Mar 3 18:29:08 2014 -0500 sync_prepare: ignore explicitly removed conflicts Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1afddd74a978631ff4f15d450b96d66e7af1e768 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Mar 3 20:14:45 2014 +1000 Fix install order in scripts Makefile We need to use install-exec-hook instead of install-data-hook to make sure the hook is run after the installation of the scripts into $BINDIR. ----------------------------------------------------------------------- Summary of changes: doc/makepkg.8.txt | 10 ++--- doc/makepkg.conf.5.txt | 5 +-- doc/pacman.conf.5.txt | 1 + etc/makepkg.conf.in | 5 +-- lib/libalpm/be_local.c | 6 +-- lib/libalpm/be_package.c | 8 ++-- lib/libalpm/pkghash.c | 5 +-- lib/libalpm/sync.c | 6 ++- scripts/Makefile.am | 2 +- scripts/makepkg.sh.in | 113 +++++++++++++++++------------------------------ src/pacman/remove.c | 9 ++-- src/pacman/sync.c | 5 +-- 12 files changed, 65 insertions(+), 110 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH v2] pacman/upgrade: Check malloc() return value
by Sören Brinkmann 12 Mar '14

12 Mar '14

Check the return value of malloc() before dereferencing the returned pointer. Signed-off-by: Sören Brinkmann <soeren.brinkmann(a)gmail.com> --- v2: - add print statement to log the error --- src/pacman/upgrade.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pacman/upgrade.c b/src/pacman/upgrade.c index 5416f6180b39..11da4dcb5e53 100644 --- a/src/pacman/upgrade.c +++ b/src/pacman/upgrade.c @@ -51,6 +51,10 @@ int pacman_upgrade(alpm_list_t *targets) */ for(i = targets; i; i = alpm_list_next(i)) { int *r = malloc(sizeof(int)); + if(r == NULL) { + pm_printf(ALPM_LOG_ERROR, _("memory exhausted\n")); + return 1; + } if(strstr(i->data, "://")) { char *str = alpm_fetch_pkgurl(config->handle, i->data); -- 1.9.0

2 4