- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-37-g25b492a
by allan＠archlinux.org 27 Dec '14

27 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, master has been updated via 25b492aab691579c8edfc9f57831d055a3f82d74 (commit) via 5221440b6bd0520762026a24abdde50d60552f99 (commit) via 286dc83451fe816b80a00806a7f15566ffcc23a7 (commit) from 1f1e53c208cfa0e284511470acb679fe10c4d80c (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 25b492aab691579c8edfc9f57831d055a3f82d74 Merge: 1f1e53c 5221440 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 27 17:07:04 2014 +1000 Merge branch 'maint' ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

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

27 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 5221440b6bd0520762026a24abdde50d60552f99 (commit) via 286dc83451fe816b80a00806a7f15566ffcc23a7 (commit) from d2d00e454353d5a420ce3406e9cd011e299d091d (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 5221440b6bd0520762026a24abdde50d60552f99 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 12:36:43 2014 +1000 fix duplication of package sha256sum Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 286dc83451fe816b80a00806a7f15566ffcc23a7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Dec 24 11:57:21 2014 -0500 makepkg: fix typo in dep array name We fixed this up to check architecture specific sources in ec679e09b2, but fudged the array name in the in_array call. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: lib/libalpm/package.c | 2 +- scripts/makepkg.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: fix typo in dep array name
by Dave Reisner 24 Dec '14

24 Dec '14

We fixed this up to check architecture specific sources in ec679e09b2, but fudged the array name in the in_array call. --- 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 d53c39f..ab4a784 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2925,7 +2925,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" ${alldeps[@]}; then + if ! in_array "$client" ${all_deps[@]}; then error "$(gettext "Cannot find the %s package needed to handle %s sources.")" \ "$client" "${proto%%+*}" ret=1 -- 2.2.1

1 0

[pacman-dev] [PATCH] Remove logically dead code in _alpm_local_db_write
by Allan McRae 24 Dec '14

24 Dec '14

We can only get to cleanup: through fp being NULL due to fopen failing or normal execution when fclose is called. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/be_local.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c index 0771aaf..2454cdc 100644 --- a/lib/libalpm/be_local.c +++ b/lib/libalpm/be_local.c @@ -1036,11 +1036,6 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq cleanup: umask(oldmask); - - if(fp) { - fclose(fp); - } - return retval; } -- 2.2.1

1 0

[pacman-dev] [PATCH] _alpm_run_chroot: only close working directory if it was opened
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index 43d0d7b..22408d7 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -542,7 +542,9 @@ int _alpm_run_chroot(alpm_handle_t *handle, const char *cmd, char *const argv[]) while(dup2(pipefd[1], 2) == -1 && errno == EINTR); close(pipefd[0]); close(pipefd[1]); - close(cwdfd); + if(cwdfd >= 0) { + close(cwdfd); + } /* use fprintf instead of _alpm_log to send output through the parent */ if(chroot(handle->root) != 0) { -- 2.2.1

1 0

[pacman-dev] [PATCH] fix duplication of package sha256sum
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- I can only think we have not seen an error due to this because signatures overrule all checksums. lib/libalpm/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index ce6b0a2..b186a4c 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -584,7 +584,7 @@ int _alpm_pkg_dup(alpm_pkg_t *pkg, alpm_pkg_t **new_ptr) newpkg->installdate = pkg->installdate; STRDUP(newpkg->packager, pkg->packager, goto cleanup); STRDUP(newpkg->md5sum, pkg->md5sum, goto cleanup); - STRDUP(newpkg->sha256sum, pkg->md5sum, goto cleanup); + STRDUP(newpkg->sha256sum, pkg->sha256sum, goto cleanup); STRDUP(newpkg->arch, pkg->arch, goto cleanup); newpkg->size = pkg->size; newpkg->isize = pkg->isize; -- 2.2.1

1 0

[pacman-dev] [PATCH] _alpm_db_add_pkgincache: free potential memory leak
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/db.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c index 0ca12d7..a122ccc 100644 --- a/lib/libalpm/db.c +++ b/lib/libalpm/db.c @@ -572,6 +572,8 @@ int _alpm_db_add_pkgincache(alpm_db_t *db, alpm_pkg_t *pkg) } if(_alpm_pkg_dup(pkg, &newpkg)) { + /* we return memory on "non-fatal" error in _alpm_pkg_dup */ + _alpm_pkg_free(copy); return -1; } -- 2.2.1

1 1

[pacman-dev] [PATCH 1/4] pacsort: fix memory leak
by Allan McRae 24 Dec '14

24 Dec '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/util/pacsort.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/pacsort.c b/src/util/pacsort.c index 665f218..c59ba13 100644 --- a/src/util/pacsort.c +++ b/src/util/pacsort.c @@ -227,6 +227,7 @@ static struct input_t *input_new(const char *path, int pathlen) in->data = strndup(path, pathlen); if(in->data == NULL) { + free(in); return NULL; } -- 2.2.1

1 3

[pacman-dev] [PATCH 1/2] makepkg: call out the source array(s) missing checksums
by Dave Reisner 24 Dec '14

24 Dec '14

--- 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 d53c39f..52928e4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1352,7 +1352,7 @@ check_checksums() { done if (( ${#correlation[*]} )); then - error "$(gettext "Integrity checks are missing.")" + error "$(gettext "Integrity checks are missing for: %s")" "${!correlation[*]}" exit 1 # TODO: error code fi } -- 2.2.1

1 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v4.2.0-34-g1f1e53c
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, master has been updated via 1f1e53c208cfa0e284511470acb679fe10c4d80c (commit) via 9f527d2de453b542293e24d85ee894fa6452259a (commit) via fda599df3773955aa2f95a842649902e41f4e0bc (commit) via 21faf1682e380cc95aa766eed6c3c7b62d2b1843 (commit) via 2114ef18742142a7eb1df367558967a754be8059 (commit) via 9cf1b2c00432420499c0f1031d15ebccd23b2ae9 (commit) via 88eedef6c653d6308fcd93dd49ea9abecd7e5f62 (commit) via 52d2ff648d2d6672b7a6458b76f639388f32d3df (commit) via 123ecb8e07a6489ceb2fc2e89f4ef62370aaf5bf (commit) via c6dd581ec561af04e4e0edb07bcf74e4db17485a (commit) via 27506aba8fe1e67bff7df47922d0e5fbba17b19f (commit) via 46459da39b4a38397f9781435573b7acd5b9004c (commit) via 895780bd9aa53c0767a9067a166c60b5b0569c6d (commit) via 87e55a4ee7a92ab7510fd268717d21dbba6f5cf6 (commit) via cd5e4b89f4564edb1926e18dd857a9d3842c17e4 (commit) via e89223420796739a1c52e64fcbffc011085d0e52 (commit) via f4796c905ca70f87461feb8e1fca3dc4afbe1217 (commit) via eac09e1d9fd445eb004d1419717c6e458f1fd019 (commit) via c0d9d260704ac59691b9c3cec5aa154be868948c (commit) via 32ebd7ad5d0c96951065ef251f1766637ae5dd66 (commit) via bf06efaa7831d9c18d6687f197303a688d843ca9 (commit) via eb7cc246c628acbd20e4f8a739682212c41ccf1a (commit) via c9ca3634317d11623ed017c214dc1000dc846a23 (commit) via 863cfb5808c618d3cda54aa3dd73e721855049d4 (commit) via d2d00e454353d5a420ce3406e9cd011e299d091d (commit) via c07593c64ce616c768061348865ead2a13248b0f (commit) via a1c50a08c9307cd21947269bd8382add1acf2515 (commit) via 325e20dea15882a4cdfe1cdbddd09ffb30c0c364 (commit) via 23850c7c9995e00d52d09e60eaa95b6285b3146d (commit) via c8448bb466d3c532d5867a4452492b1948400c77 (commit) via ec679e09b2d7b0a2bc84b2edb7dfa628b5295916 (commit) via a7c1b7a914f050036720b643715233f769f00e25 (commit) via 91a56a707253a04123f61530f4e1127e463481e9 (commit) via d107aced3751f6136e119603d9d33fdc49848aa8 (commit) from 565c931e2c684d4460ff65cbec9b097ee1d8f94d (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 1f1e53c208cfa0e284511470acb679fe10c4d80c Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Dec 22 15:11:39 2014 +0100 libalpm: Add accessors for the base field This commit adds the necessary accessor functions to get the PKGBASE of a package, forcing the desc file to be parsed. Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9f527d2de453b542293e24d85ee894fa6452259a Author: Johannes Löthberg <johannes(a)kyriasis.com> Date: Mon Dec 22 15:11:38 2014 +0100 libalpm: Parse and write PKGBASEs 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> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit fda599df3773955aa2f95a842649902e41f4e0bc Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Dec 23 16:53:10 2014 -0500 add vim modeline to test files Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 21faf1682e380cc95aa766eed6c3c7b62d2b1843 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 10:56:37 2014 +1000 mount_point_list: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2114ef18742142a7eb1df367558967a754be8059 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 10:54:28 2014 +1000 conflict_new: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9cf1b2c00432420499c0f1031d15ebccd23b2ae9 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 10:52:15 2014 +1000 _alpm_runscriptlet: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 88eedef6c653d6308fcd93dd49ea9abecd7e5f62 Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 10:48:57 2014 +1000 add_fileconflict: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 52d2ff648d2d6672b7a6458b76f639388f32d3df Author: Allan McRae <allan(a)archlinux.org> Date: Wed Dec 24 10:37:28 2014 +1000 create_tempfile: fix memory leak on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 123ecb8e07a6489ceb2fc2e89f4ef62370aaf5bf Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 18:46:03 2014 +1000 _alpm_split_backup: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c6dd581ec561af04e4e0edb07bcf74e4db17485a Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 17:42:41 2014 +1000 alpm_dep_from_string: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 27506aba8fe1e67bff7df47922d0e5fbba17b19f Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 17:39:47 2014 +1000 _alpm_conflict_dup: fix memory leak on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 46459da39b4a38397f9781435573b7acd5b9004c Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 00:42:27 2014 +1000 local_db_read: fix memory leak on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 895780bd9aa53c0767a9067a166c60b5b0569c6d Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 00:39:10 2014 +1000 _alpm_db_new: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 87e55a4ee7a92ab7510fd268717d21dbba6f5cf6 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 00:33:41 2014 +1000 _alpm_db_get_pkgcache_hash: check for error when loading pkgcache Signed-off-by: Allan McRae <allan(a)archlinux.org> commit cd5e4b89f4564edb1926e18dd857a9d3842c17e4 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 00:11:59 2014 +1000 _alpm_delta_parse: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit e89223420796739a1c52e64fcbffc011085d0e52 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 00:08:24 2014 +1000 _alpm_dep_dup: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit f4796c905ca70f87461feb8e1fca3dc4afbe1217 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 22 00:05:16 2014 +1000 pacman/util.c: fix potential memory leak in indentprint commit eac09e1d9fd445eb004d1419717c6e458f1fd019 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 21 23:55:53 2014 +1000 Fix memory leak in ALPM_EVENT_OPTDEP_REMOVAL callback Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c0d9d260704ac59691b9c3cec5aa154be868948c Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 21 23:51:08 2014 +1000 build_payload: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 32ebd7ad5d0c96951065ef251f1766637ae5dd66 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 21 23:48:48 2014 +1000 depmiss_new: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit bf06efaa7831d9c18d6687f197303a688d843ca9 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Dec 21 23:45:24 2014 +1000 _alpm_delta_dup: free memory on error Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eb7cc246c628acbd20e4f8a739682212c41ccf1a Author: Evangelos Foutras <evangelos(a)foutrelis.com> Date: Fri Dec 19 20:03:23 2014 +0200 checkupdates: include package versions in output Especially useful now that pacman -Qu will also show the new version. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit c9ca3634317d11623ed017c214dc1000dc846a23 Author: Evangelos Foutras <evangelos(a)foutrelis.com> Date: Fri Dec 19 20:03:22 2014 +0200 checkupdates: show error when fakeroot is missing Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 863cfb5808c618d3cda54aa3dd73e721855049d4 Author: Allan McRae <allan(a)archlinux.org> Date: Sat Dec 20 20:47:22 2014 +1000 Improve db upgrade error message This message is clearer without (another) error prefix. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/checkupdates.sh.in | 10 +++++++- contrib/paclist.sh.in | 2 +- etc/makepkg.conf.in | 7 +++++ lib/libalpm/alpm.h | 6 +++++ lib/libalpm/backup.c | 7 +++-- lib/libalpm/be_local.c | 14 ++++++++++ lib/libalpm/be_package.c | 2 +- lib/libalpm/be_sync.c | 2 ++ lib/libalpm/conflict.c | 17 ++++++++++--- lib/libalpm/db.c | 7 +++-- lib/libalpm/delta.c | 24 ++++++++++++------ lib/libalpm/deps.c | 28 ++++++++++++++------ lib/libalpm/diskspace.c | 6 ++--- lib/libalpm/dload.c | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/package.c | 11 ++++++++ lib/libalpm/package.h | 2 ++ lib/libalpm/sync.c | 2 +- lib/libalpm/trans.c | 2 +- scripts/makepkg-template.pl.in | 2 +- scripts/makepkg.sh.in | 52 ++++++++++++++++++++------------------ scripts/pacman-db-upgrade.sh.in | 7 +++-- src/pacman/callback.c | 4 ++- src/pacman/conf.c | 2 +- src/pacman/util.c | 1 + test/scripts/human_to_size_test.sh | 2 ++ test/scripts/parseopts_test.sh | 2 ++ test/util/pacsorttest.sh | 2 ++ test/util/vercmptest.sh | 2 ++ 29 files changed, 164 insertions(+), 65 deletions(-) hooks/post-receive -- The official pacman repository

1 0