- Pacman-dev - lists.archlinux.org

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

24 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 d2d00e454353d5a420ce3406e9cd011e299d091d (commit) via c07593c64ce616c768061348865ead2a13248b0f (commit) via a1c50a08c9307cd21947269bd8382add1acf2515 (commit) via 325e20dea15882a4cdfe1cdbddd09ffb30c0c364 (commit) via 23850c7c9995e00d52d09e60eaa95b6285b3146d (commit) from c8448bb466d3c532d5867a4452492b1948400c77 (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 d2d00e454353d5a420ce3406e9cd011e299d091d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 23 10:57:29 2014 -0500 makepkg: properly correlate checksums for multiple sources Previously, we used a single boolean value to determine correlation of sources to checksums. Since the introduction of arch-specific sources, this is no longer sufficient, as we must ensure that we have checksums for (potentially) multiple source arrays. This change inlines the logic of have_sources to build an associative array of source array names, unsetting them as we discover their checksums. The error condition then becomes a non-empty correlation array. Fixes: https://bugs.archlinux.org/task/43192 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c07593c64ce616c768061348865ead2a13248b0f Author: Evangelos Foutras <evangelos(a)foutrelis.com> Date: Mon Dec 22 19:19:38 2014 +0200 Use correct mode bits for the log file (0000 -> 0644) Following commit 086bbc5 (Use O_CLOEXEC as much as possible when opening files), the log file would be created by pacman with blank permissions. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit a1c50a08c9307cd21947269bd8382add1acf2515 Author: Peter Wu <peter(a)lekensteyn.nl> Date: Sat Dec 20 11:58:09 2014 +0100 pacman-db-upgrade: set umask 022 This prevents the database from becoming inaccessible for non-root users when the script was executed with a umask of 027. Signed-off-by: Peter Wu <peter(a)lekensteyn.nl> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 325e20dea15882a4cdfe1cdbddd09ffb30c0c364 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 16:18:10 2014 +1000 makepkg: download sources for all architectures when making source package We validated all sources when making a source package, whether or not they are included in the tarball. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 23850c7c9995e00d52d09e60eaa95b6285b3146d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 15:01:57 2014 +1000 pacman-db-upgrade: be more verbose 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> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/log.c | 2 +- scripts/makepkg.sh.in | 34 ++++++++++++++-------------------- scripts/pacman-db-upgrade.sh.in | 7 +++++-- 3 files changed, 20 insertions(+), 23 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH 1/5] create_tempfile: fix memory leak on error
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/dload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/dload.c b/lib/libalpm/dload.c index e3409f9..c5186be 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -379,7 +379,7 @@ static FILE *create_tempfile(struct dload_payload *payload, const char *localpat payload->tempfile_name = randpath; free(payload->remote_name); STRDUP(payload->remote_name, strrchr(randpath, '/') + 1, - RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); + fclose(fp); RET_ERR(payload->handle, ALPM_ERR_MEMORY, NULL)); return fp; } -- 2.2.1

1 4

[pacman-dev] [PATCH] makepkg: properly correlate checksums for multiple sources
by Dave Reisner 23 Dec '14

23 Dec '14

Previously, we used a single boolean value to determine correlation of sources to checksums. Since the introduction of arch-specific sources, this is no longer sufficient, as we must ensure that we have checksums for (potentially) multiple source arrays. This change inlines the logic of have_sources to build an associative array of source array names, unsetting them as we discover their checksums. The error condition then becomes a non-empty correlation array. Fixes: https://bugs.archlinux.org/task/43192 --- So, I wrote this patch this way because it presents an opportunity to actually call out in the "integrity checks missing" error, which arrays are missing checksum arrays. However, this of course necessitiates a string change. Is this something we want for maint, or should I submit a separate patch for master? scripts/makepkg.sh.in | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index ae8cf57..d53c39f 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1317,47 +1317,41 @@ verify_integrity_sums() { fi } -have_sources() { - local a - - (( ${#source[*]} )) && return 0 +check_checksums() { + local integ a + declare -A correlation + (( SKIPCHECKSUMS )) && return 0 + # Initialize a map which we'll use to verify that every source array has at + # least some kind of checksum array associated with it. + (( ${#source[*]} )) && correlation['source']=1 case $1 in all) for a in "${arch[@]}"; do - array_build _ source_"$a" && return 0 + array_build _ source_"$a" && correlation["source_$a"]=1 done ;; *) - array_build _ source_"$CARCH" && return 0 + array_build _ source_"$CARCH" && correlation["source_$CARCH"]=1 ;; esac - return 1 -} - -check_checksums() { - (( SKIPCHECKSUMS )) && return 0 - have_sources "$1" || return 0 - - local correlation=0 - local integ a for integ in "${known_hash_algos[@]}"; do - verify_integrity_sums "$integ" && correlation=1 + verify_integrity_sums "$integ" && unset "correlation[source]" case $1 in all) for a in "${arch[@]}"; do - verify_integrity_sums "$integ" "$a" && correlation=1 + verify_integrity_sums "$integ" "$a" && unset "correlation[source_$a]" done ;; *) - verify_integrity_sums "$integ" "$CARCH" && correlation=1 + verify_integrity_sums "$integ" "$CARCH" && unset "correlation[source_$CARCH]" ;; esac done - if (( ! correlation )); then + if (( ${#correlation[*]} )); then error "$(gettext "Integrity checks are missing.")" exit 1 # TODO: error code fi -- 2.2.1

2 1

[pacman-dev] [PATCH] pacman-db-upgrade: set umask 022
by Peter Wu 23 Dec '14

23 Dec '14

This prevents the database from becoming inaccessible for non-root users when the script was executed with a umask of 027. Signed-off-by: Peter Wu <peter(a)lekensteyn.nl> --- Hi, It would probably be a good idea to set umask 022 for /var/cache/pacman/archives/ as well, but that is not as severe as this issue. If there are people who actually use 'umask 027' to make their packages unreadable, what about a global Umask setting in pacman.conf (defaulting to 022?). Kind regards, Peter --- scripts/pacman-db-upgrade.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index 7bb277b..e2bb290 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -19,6 +19,9 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # +# Avoid creating world-unreadable files +umask 022 + # gettext initialization export TEXTDOMAIN='pacman-scripts' export TEXTDOMAINDIR='@localedir@' -- 2.2.1

2 4

[pacman-dev] [PATCH] makepkg: download sources for all architectures when making source package
by Allan McRae 23 Dec '14

23 Dec '14

We validated all sources when making a source package, whether or not they are included in the tarball. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- makepkg --source was broken when source_i686 and source_x86_64 were present. This may count as the first real breakage! scripts/makepkg.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 60276f6..ae8cf57 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -3607,7 +3607,7 @@ if (( SOURCEONLY )); then download_sources allarch elif ( (( ! SKIPCHECKSUMS )) || \ ( (( ! SKIPPGPCHECK )) && source_has_signatures ) ); then - download_sources novcs + download_sources allarch novcs fi check_source_integrity all cd_safe "$startdir" -- 2.2.1

2 1

[pacman-dev] [PATCH] Use correct mode bits for the log file (0000 -> 0644)
by Evangelos Foutras 23 Dec '14

23 Dec '14

Following commit 086bbc5 (Use O_CLOEXEC as much as possible when opening files), the log file would be created by pacman with blank permissions. --- lib/libalpm/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/log.c b/lib/libalpm/log.c index d232bcc..9af5e84 100644 --- a/lib/libalpm/log.c +++ b/lib/libalpm/log.c @@ -52,7 +52,7 @@ int SYMEXPORT alpm_logaction(alpm_handle_t *handle, const char *prefix, int fd; do { fd = open(handle->logfile, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, - 0000); + 0644); } while(fd == -1 && errno == EINTR); if(fd >= 0) { handle->logstream = fdopen(fd, "a"); -- 2.2.1

2 1

[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