- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Check architecture specific fields for VCS support
by Allan McRae 22 Dec '14

22 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/makepkg.sh.in | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 23e70cd..f5373bf 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2897,6 +2897,7 @@ get_vcsclient() { check_vcs_software() { local ret=0 + local alldeps l if (( SOURCEONLY == 1 )); then # we will not download VCS sources @@ -2908,6 +2909,20 @@ check_vcs_software() { return $ret fi + + if array_build l 'depends'; then + alldeps+=("${l[@]}") + fi + if array_build l 'makedepends'; then + alldeps+=("${l[@]}") + fi + if array_build l "depends_$CARCH"; then + alldeps+=("${l[@]}") + fi + if array_build l "makedepends_$CARCH"; then + alldeps+=("${l[@]}") + fi + for netfile in ${source[@]}; do local proto=$(get_protocol "$netfile") @@ -2921,7 +2936,7 @@ check_vcs_software() { uninstalled="$(set +E; check_deps $client)" || exit 1 # if not installed, check presence in depends or makedepends if [[ -n "$uninstalled" ]] && (( ! NODEPS || ( VERIFYSOURCE && !DEP_BIN ) )); then - if ! in_array "$client" ${depends[@]} ${makedepends[@]}; then + if ! in_array "$client" ${alldeps[@]}; then error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" ret=1 -- 2.2.0

2 1

[pacman-dev] [PATCH] add VCSCLIENTS to etc/makepkg.conf
by Allan McRae 22 Dec '14

22 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- etc/makepkg.conf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 712ca60..9ed7ef9 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -19,6 +19,13 @@ DLAGENTS=('ftp::/usr/bin/curl -qfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o # /usr/bin/lftpget -c # /usr/bin/wget +#-- The the package required by makepkg to download VCS sources +# Format: 'protocol::package' +VCSCLIENTS=('bzr::bzr' + 'git::git' + 'hg::mercurial' + 'svn::subversion') + ######################################################################### # ARCHITECTURE, COMPILE FLAGS ######################################################################### -- 2.2.0

1 0

[pacman-dev] [PATCH] makepkg-template: Remove unused printf format string
by Florian Pritz 21 Dec '14

21 Dec '14

I'm pretty sure this is some kind of left over stuff that was supposed to print the filename, linenumber and line content. This is already done so just remove it. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg-template.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 6e6d944..d9da167 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -70,7 +70,7 @@ sub parse_template_line { foreach my $element (@elements) { my ($key, $val) = ($element =~ /^([a-z0-9]+)=(.*)$/); unless ($key and $val) { - die gettext("invalid key/value pair\n%s:%s: %s"), + die gettext("invalid key/value pair\n"), "$filename:$linenumber: $line"; } $values{$key} = $val; -- 2.2.1

1 0

[pacman-dev] [PATCH] local_db_read: fix memory leak on error
by Allan McRae 21 Dec '14

21 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 9376396..d0e8944 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -801,6 +801,7 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) alpm_backup_t *backup; CALLOC(backup, 1, sizeof(alpm_backup_t), goto error); if(_alpm_split_backup(line, &backup)) { + FREE(backup); goto error; } info->backup = alpm_list_add(info->backup, backup); -- 2.2.0

1 0

[pacman-dev] [PATCH] _alpm_db_new: free memory on error
by Allan McRae 21 Dec '14

21 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/db.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 11e3a3b..0ca12d7 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -331,7 +331,7 @@ alpm_db_t *_alpm_db_new(const char *treename, int is_local) alpm_db_t *db; CALLOC(db, 1, sizeof(alpm_db_t), return NULL); - STRDUP(db->treename, treename, return NULL); + STRDUP(db->treename, treename, FREE(db); return NULL); if(is_local) { db->status |= DB_STATUS_LOCAL; } else { -- 2.2.0

1 0

[pacman-dev] [PATCH] _alpm_db_get_pkgcache_hash: check for error when loading pkgcache
by Allan McRae 21 Dec '14

21 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/db.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 466c96f..11e3a3b 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -542,7 +542,10 @@ alpm_pkghash_t *_alpm_db_get_pkgcache_hash(alpm_db_t *db) } if(!(db->status & DB_STATUS_PKGCACHE)) { - load_pkgcache(db); + if(load_pkgcache(db)) { + /* handle->error set in local/sync-db-populate */ + return NULL; + } } return db->pkgcache; -- 2.2.0

1 0

[pacman-dev] [PATCH] _alpm_delta_parse: free memory on error
by Allan McRae 21 Dec '14

21 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/delta.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/libalpm/delta.c b/lib/libalpm/delta.c index 23ca31d..db6bb8e 100644 --- a/lib/libalpm/delta.c +++ b/lib/libalpm/delta.c @@ -306,10 +306,10 @@ alpm_delta_t *_alpm_delta_parse(alpm_handle_t *handle, const char *line) /* start at index 1 -- match 0 is the entire match */ len = pmatch[1].rm_eo - pmatch[1].rm_so; - STRNDUP(delta->delta, &line[pmatch[1].rm_so], len, return NULL); + STRNDUP(delta->delta, &line[pmatch[1].rm_so], len, goto error); len = pmatch[2].rm_eo - pmatch[2].rm_so; - STRNDUP(delta->delta_md5, &line[pmatch[2].rm_so], len, return NULL); + STRNDUP(delta->delta_md5, &line[pmatch[2].rm_so], len, goto error); len = pmatch[3].rm_eo - pmatch[3].rm_so; if(len < sizeof(filesize)) { @@ -319,12 +319,16 @@ alpm_delta_t *_alpm_delta_parse(alpm_handle_t *handle, const char *line) } len = pmatch[4].rm_eo - pmatch[4].rm_so; - STRNDUP(delta->from, &line[pmatch[4].rm_so], len, return NULL); + STRNDUP(delta->from, &line[pmatch[4].rm_so], len, goto error); len = pmatch[5].rm_eo - pmatch[5].rm_so; - STRNDUP(delta->to, &line[pmatch[5].rm_so], len, return NULL); + STRNDUP(delta->to, &line[pmatch[5].rm_so], len, goto error); return delta; + +error: + _alpm_delta_free(delta); + return NULL; } #undef NUM_MATCHES -- 2.2.0

1 0

[pacman-dev] [PATCH] _alpm_dep_dup: free memory on error
by Allan McRae 21 Dec '14

21 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/deps.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index ca36270..b12c629 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -527,13 +527,17 @@ alpm_depend_t *_alpm_dep_dup(const alpm_depend_t *dep) alpm_depend_t *newdep; CALLOC(newdep, 1, sizeof(alpm_depend_t), return NULL); - STRDUP(newdep->name, dep->name, return NULL); - STRDUP(newdep->version, dep->version, return NULL); - STRDUP(newdep->desc, dep->desc, return NULL); + STRDUP(newdep->name, dep->name, goto error); + STRDUP(newdep->version, dep->version, goto error); + STRDUP(newdep->desc, dep->desc, goto error); newdep->name_hash = dep->name_hash; newdep->mod = dep->mod; return newdep; + +error: + alpm_dep_free(newdep); + return NULL; } /* These parameters are messy. We check if this package, given a list of -- 2.2.0

1 0

[pacman-dev] [PATCH] pacman/util.c: fix potential memory leak in indentprint
by Allan McRae 21 Dec '14

21 Dec '14

--- src/pacman/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pacman/util.c b/src/pacman/util.c index 36f4414..f63ac1b 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -284,6 +284,7 @@ void indentprint(const char *str, unsigned short indent, unsigned short cols) cidx = indent; if(!p || !len) { + free(wcstr); return; } -- 2.2.0

1 0

[pacman-dev] [PATCH] Fix memory leak in ALPM_EVENT_OPTDEP_REMOVAL callback
by Allan McRae 21 Dec '14

21 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/callback.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pacman/callback.c b/src/pacman/callback.c index 4993382..d566d73 100644 --- a/src/pacman/callback.c +++ b/src/pacman/callback.c @@ -269,9 +269,11 @@ void cb_event(alpm_event_t *event) case ALPM_EVENT_OPTDEP_REMOVAL: { alpm_event_optdep_removal_t *e = &event->optdep_removal; + char *dep_string = alpm_dep_compute_string(e->optdep); colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(e->pkg), - alpm_dep_compute_string(e->optdep)); + dep_string); + free(dep_string); } break; case ALPM_EVENT_DATABASE_MISSING: -- 2.2.0

1 0