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

[pacman-dev] [PATCH 1/2] libalpm: Parse and write PKGBASEs
by Johannes Löthberg 22 Dec '14

22 Dec '14

This commit adds support to libalpm to parse the pkgbase present in packages .PKGINFO files, writing the PKGBASE to the %BASE% section of the local DBs desc files and for parsing it again when loading the local DB Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- lib/libalpm/be_local.c | 6 ++++++ lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 ++ lib/libalpm/package.h | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 9376396..54d3099 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -701,6 +701,8 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq) _alpm_log(db->handle, ALPM_LOG_ERROR, _("%s database is inconsistent: version " "mismatch on package %s\n"), db->treename, info->name); } + } else if(strcmp(line, "%BASE%") == 0) { + READ_AND_STORE(info->base); } else if(strcmp(line, "%DESC%") == 0) { READ_AND_STORE(info->desc); } else if(strcmp(line, "%GROUPS%") == 0) { @@ -904,6 +906,10 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq free(path); fprintf(fp, "%%NAME%%\n%s\n\n" "%%VERSION%%\n%s\n\n", info->name, info->version); + if(info->base) { + fprintf(fp, "%%BASE%%\n" + "%s\n\n", info->base); + } if(info->desc) { fprintf(fp, "%%DESC%%\n" "%s\n\n", info->desc); diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index 5617f4f..2d42465 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -193,7 +193,7 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * STRDUP(newpkg->name, ptr, return -1); newpkg->name_hash = _alpm_hash_sdbm(newpkg->name); } else if(strcmp(key, "pkgbase") == 0) { - /* not used atm */ + STRDUP(newpkg->base, ptr, return -1); } else if(strcmp(key, "pkgver") == 0) { STRDUP(newpkg->version, ptr, return -1); } else if(strcmp(key, "basever") == 0) { diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c index 5245948..6e89ad9 100644 --- a/lib/libalpm/be_sync.c +++ b/lib/libalpm/be_sync.c @@ -614,6 +614,8 @@ static int sync_db_read(alpm_db_t *db, struct archive *archive, if(_alpm_validate_filename(db, pkg->name, pkg->filename) < 0) { return -1; } + } else if(strcmp(line, "%BASE%") == 0) { + READ_AND_STORE(pkg->base); } else if(strcmp(line, "%DESC%") == 0) { READ_AND_STORE(pkg->desc); } else if(strcmp(line, "%GROUPS%") == 0) { diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 357c20e..98c1e6d 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -85,6 +85,7 @@ extern struct pkg_operations default_pkg_ops; struct __alpm_pkg_t { unsigned long name_hash; char *filename; + char *base; char *name; char *version; char *desc; -- 2.2.0

2 8

[pacman-dev] Updating NEWS and README when needed
by Allan McRae 22 Dec '14

22 Dec '14

Hi all, All patches touching the API now need to add an entry in README. Any significant changes also need a NEWS entry. Thanks, Allan

1 0

[pacman-dev] [PATCH] pacman-db-upgrade: be more verbose
by Allan McRae 22 Dec '14

22 Dec '14

People have mentioned that the silent upgrade to DB version 9 when no adjustments are needed for directory symlinks is confusion. Always print the upgrading message. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- scripts/pacman-db-upgrade.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 7bb277b..7b360c3 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -167,6 +167,8 @@ if [[ -z "$db_version" ]]; then fi # pacman 4.1 to 4.2 upgrade - remove directory symlink support + msg "$(gettext "Pre-4.2 database format detected - upgrading...")" + dirlist=() unset GREP_OPTIONS @@ -180,8 +182,6 @@ if [[ -z "$db_version" ]]; then done) if [[ ${#dirlist[@]} != 0 ]]; then - msg "$(gettext "Pre-4.2 database format detected - upgrading...")" - pacroot="$(resolve_dir "$pacroot")" for dir in "${dirlist[@]}"; do -- 2.2.1

1 0

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.2.0-5-gc8448bb
by allan＠archlinux.org 22 Dec '14

22 Dec '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, maint has been updated via c8448bb466d3c532d5867a4452492b1948400c77 (commit) via ec679e09b2d7b0a2bc84b2edb7dfa628b5295916 (commit) via a7c1b7a914f050036720b643715233f769f00e25 (commit) from 91a56a707253a04123f61530f4e1127e463481e9 (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 c8448bb466d3c532d5867a4452492b1948400c77 Author: Florian Pritz <bluewind(a)xinu.at> Date: Sun Dec 21 16:04:59 2014 +0100 makepkg-template: Remove unused printf format string 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit ec679e09b2d7b0a2bc84b2edb7dfa628b5295916 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 10:34:53 2014 +1000 Check architecture specific fields for VCS support Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a7c1b7a914f050036720b643715233f769f00e25 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 09:48:24 2014 +1000 add VCSCLIENTS to etc/makepkg.conf Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: etc/makepkg.conf.in | 7 +++++++ scripts/makepkg-template.pl.in | 2 +- scripts/makepkg.sh.in | 16 +++++++++++++--- 3 files changed, 21 insertions(+), 4 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[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