January 2017 - Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Add http://EditorConfig.org configuration
by Eli Schwartz 06 Jan '17

06 Jan '17

Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> --- .editorconfig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..af9b70d1 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +# EditorConfig configuration for pacman +# http://EditorConfig.org + +# Top-most EditorConfig file +root = true + +# Unix-style newlines without trailing whitespaces, but with a newline +# ending every file, utf-8 charset, set indent to tabs +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = tab +indent_size = tab -- 2.11.0

3 4

[pacman-dev] Pacman configuration parser library
by Xyne 04 Jan '17

04 Jan '17

Happy new year! It would be useful for third-party developers to have access to the Pacman configuration file parsing functions and datatypes in src/pacman/conf.h. Would you consider providing a shared library for this (or adding it to libalpm)? It would be more reliable than third-party custom parsers. Aside from providing the actual shared object file, the only change needed* would be to remove the lines from parseconfig (conf.c) that free config->repos so that users could access repo information directly via config->repos after invoking the function (config_free will free that memory later). Regards, Xyne * It would be nice as well to have the option of parsing a file without initializing alpm, but that isn't necessary and I expect that would require more intrusive changes due to the current use of a global variable.

5 7

[pacman-dev] [PATCH] alpm_fetch_pkgurl: fix memory leak
by Allan McRae 04 Jan '17

04 Jan '17

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 5c4e1f99..17e4f3a6 100644 --- a/lib/libalpm/dload.c +++ b/lib/libalpm/dload.c @@ -672,7 +672,7 @@ char SYMEXPORT *alpm_fetch_pkgurl(alpm_handle_t *handle, const char *url) size_t len; len = strlen(final_pkg_url) + 5; - MALLOC(payload.fileurl, len, RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); + MALLOC(payload.fileurl, len, free(final_file); RET_ERR(handle, ALPM_ERR_MEMORY, NULL)); snprintf(payload.fileurl, len, "%s.sig", final_pkg_url); sig_filepath = filecache_find_url(handle, payload.fileurl); -- 2.11.0

1 0

[pacman-dev] [PATCH] Fix memory leak in alpm_pkg_checkmd5sum
by Allan McRae 04 Jan '17

04 Jan '17

Also remove redundant additional return path. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- lib/libalpm/package.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index d0f902f0..e9ecc178 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -69,9 +69,9 @@ int SYMEXPORT alpm_pkg_checkmd5sum(alpm_pkg_t *pkg) retval = _alpm_test_checksum(fpath, pkg->md5sum, ALPM_PKG_VALIDATION_MD5SUM); - if(retval == 0) { - return 0; - } else if(retval == 1) { + FREE(fpath); + + if(retval == 1) { pkg->handle->pm_errno = ALPM_ERR_PKG_INVALID; retval = -1; } -- 2.11.0

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-139-g9ad7cda
by allan＠archlinux.org 04 Jan '17

04 Jan '17

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 9ad7cda9d8847b6e664f603d6f6c10a7c4fc45a8 (commit) via 8b0d59b83a60eb504567590346119fe4cd891cad (commit) via 37a89e2fac704babbe3badf0d9df0d41ec622f6f (commit) via eaa82b4d0775252856a4e54a6f2a9ea191cf0b8f (commit) via 42e7020281d3ae260e1e9693495f527b7f476625 (commit) via 0994893b0e6b627d45a63884ac01af7d0967eff2 (commit) via aa44824788582cd3278ff74a60dfb276cf1aebfc (commit) via 6444ccbaf0c2ff566217eb32e32397868088812f (commit) via 585bd89803a37380f51d625115b58db4012f4df3 (commit) via 01a6502169f3e51ea52d60877528c5979898bbb3 (commit) via 9c3bf2988f565be66c57c6eee242e6f61e4921e4 (commit) via b6753eeb7ead3fa7bfdb053babe877319a722115 (commit) via 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 (commit) via 67602c4cf7318ba558f07c906ae1223ec7065bf1 (commit) via d8367162e8f9c0ab2c8bc98f0033f1e3bfaf2a1f (commit) via d0a5766e24dd12d277bb9237e204f7c10f4981ac (commit) via 36eb35cacd9282fb063ed181b8754ef679ee302a (commit) via 2c4511bdbe3599713811e54edbbd60e51d66ce3e (commit) via 1a2d5bee3bc8841f81db7a4d6b2d41a2363b93d6 (commit) via 3a4623b10a7eab1aa9d3121c5d4b0f96428df407 (commit) via 5dfa3c8f6a0b1c170feac564b1fca51a33f78723 (commit) via 9a4d61622066d5d30c649f1c958b26526a4ceddf (commit) from c40ee73bc40d239702d288f922e50db1a82915d4 (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 9ad7cda9d8847b6e664f603d6f6c10a7c4fc45a8 Author: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Date: Mon Jan 2 13:51:11 2017 +0100 Suppress valgrind error in fakechroot This was spotted on Arch Linux, most likely it was introduced when fakechroot was updated to 2.19-1. Valgrind suggests to add the following suppression, which can be tweaked to fit an already existing one. { <insert_a_suppression_name_here> Memcheck:Leak match-leak-kinds: reachable fun:calloc obj:/usr/lib/libdl-2.24.so fun:dlsym obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so fun:bindtextdomain obj:/usr/lib/libgpg-error.so.0.20.0 fun:call_init.part.0 fun:_dl_init obj:/usr/lib/ld-2.24.so obj:* obj:* obj:* } Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8b0d59b83a60eb504567590346119fe4cd891cad Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 5 14:53:08 2016 +1000 Provide source files for useful debug packages Debug packages are fairly useless currently because the soucre files needed for stepping through code etc are not packaged with them. This patch adds the needed source files to the debug package and adjusts the debug info to look at the /usr/src/debug/ directory for them rather than the build location. This requires using the "debugedit" program which is provided as part of the RPM sources. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 37a89e2fac704babbe3badf0d9df0d41ec622f6f Author: Eli Schwartz <eschwartz93(a)gmail.com> Date: Tue Jan 3 15:10:19 2017 -0500 Document the new query parameter for VCS sources Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit eaa82b4d0775252856a4e54a6f2a9ea191cf0b8f Author: Eli Schwartz <eschwartz93(a)gmail.com> Date: Tue Jan 3 15:10:18 2017 -0500 makepkg: Verify git signatures A git repository is marked as signed if it contains the query "signed" as defined by https://tools.ietf.org/html/rfc3986 Adds two utility functions in util/source.sh.in to extract fragments and queries, and modifies source/git.sh.in to use them. Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 42e7020281d3ae260e1e9693495f527b7f476625 Author: Eli Schwartz <eschwartz93(a)gmail.com> Date: Tue Jan 3 15:10:17 2017 -0500 libmakepkg/integrity: Verify file signatures in a separate function This makes it easier to add signature verification for new protos. Signed-off-by: Eli Schwartz <eschwartz93(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 0994893b0e6b627d45a63884ac01af7d0967eff2 Author: Mark Weiman <mark.weiman(a)markzz.com> Date: Tue Jan 3 17:32:27 2017 -0500 Add alpm_pkg_get_makedepends and alpm_pkg_get_checkdepends makepkg adds makedepends and checkdepends to a package's .PKGINFO file. Add functions that allow use of these from libalpm. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit aa44824788582cd3278ff74a60dfb276cf1aebfc Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 9 11:14:07 2016 -0500 filelist_sort: check if filelist is presorted Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 6444ccbaf0c2ff566217eb32e32397868088812f Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 9 11:14:06 2016 -0500 add _alpm_filelist_sort Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 585bd89803a37380f51d625115b58db4012f4df3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 9 11:14:05 2016 -0500 repo-add: sort file list entries Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 01a6502169f3e51ea52d60877528c5979898bbb3 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 3 02:11:54 2017 -0500 makepkg: sort package contents By passing a NUL-separated filelist, this also fixes a bug where files that look like bsdtar options in the package root could break the package ("-C" was particularly troublesome because bsdtar interprets it as an option anywhere in the file list, even following "--"). Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9c3bf2988f565be66c57c6eee242e6f61e4921e4 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 17 10:02:18 2016 -0500 find_fileconflicts: rename tmpfiles -> newfiles The files belong to the new version of a package being installed, they are not temporary in any way. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit b6753eeb7ead3fa7bfdb053babe877319a722115 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Jan 3 02:06:22 2017 -0500 conflict: skip dir children when replacing a file When replacing a file with a directory, any files under that directory do not need to be checked for conflicts. This prevents possible false-positive conflicts where the file being replaced is a symlink. We were already skipping the directory children when the file was owned by the previous version of a package being upgraded. This extends that to other packages being removed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8a19c4a78251c5e34ecf508a65d943ca2dc833c7 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Dec 17 08:18:32 2016 -0500 ini: only recognize comments at beginning of line Allows the hash sign to be used in values in config files and hooks. Fixes #48702 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 67602c4cf7318ba558f07c906ae1223ec7065bf1 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 11 15:02:01 2016 -0500 dload: s/CURLOPT_WRITEHEADER/CURLOPT_HEADERDATA/ The former is really old, and should be avoided. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d8367162e8f9c0ab2c8bc98f0033f1e3bfaf2a1f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Dec 10 20:12:53 2016 -0500 pacman: ensure linkage against libarchive Fixes build on ubuntu/debian platforms. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d0a5766e24dd12d277bb9237e204f7c10f4981ac Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Dec 10 20:12:52 2016 -0500 configure.ac: Use POSIX compatible equality checks Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 36eb35cacd9282fb063ed181b8754ef679ee302a Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Fri Dec 9 11:14:03 2016 -0500 makepkg: warn about dotfiles in package root libalpm reserves paths starting with '.' for its own use and will not extract any other than those it recognizes. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 2c4511bdbe3599713811e54edbbd60e51d66ce3e Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Tue Dec 6 01:30:42 2016 -0500 extract db files with dbonly Some database files (install, mtree, and changelog) are extracted directly from the package, but DBONLY was skipping extraction altogether, causing those files to be missing after the transaction. Fixes #52052 Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1a2d5bee3bc8841f81db7a4d6b2d41a2363b93d6 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Jan 1 17:52:18 2017 +1000 Update copyright years Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 3a4623b10a7eab1aa9d3121c5d4b0f96428df407 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Dec 9 07:44:18 2016 +1000 Fix documentation of -Dq Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 5dfa3c8f6a0b1c170feac564b1fca51a33f78723 Author: Steef Hegeman <steefhegeman(a)hotmail.com> Date: Sun Oct 23 02:27:21 2016 +0200 makepkg: Disallow forward slashes in pkgver scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in now raises an error when pkgver contains forward slashes. pkgver containing a forward slash results in a package filename containing a forward slash, which isn't a valid filename. Signed-off-by: Steef Hegeman <steefhegeman(a)hotmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9a4d61622066d5d30c649f1c958b26526a4ceddf Author: Allan McRae <allan(a)archlinux.org> Date: Mon Dec 5 14:44:51 2016 +1000 Build a single debug package for all packages from a PKGBUILD We want to provide source files with debug symbol packages to allow easy stepping through the program. This becomes difficult with split packages due to the binaries in many of these sharing source files across packages. There are (at least) two solutions to this problem. #1: ensure common source files are located in the debug package for the package lowest in the dependency chain and add dependencies to the debug packages so all require source files are present, or #2: create one debug package for all split packages in a PKGBUILD. The second is a more robust approach despite potentially creating very large debug packages. This patch creates a single $pkgbase-debug package and adds provides such that installing $pkgname-debug will always work. Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: configure.ac | 4 +- doc/PKGBUILD.5.txt | 17 ++- doc/index.txt | 2 +- doc/pacman.8.txt | 3 +- lib/libalpm/add.c | 114 ++++++++++-------- lib/libalpm/add.h | 2 +- lib/libalpm/alpm.c | 2 +- lib/libalpm/alpm.h | 14 ++- lib/libalpm/alpm_list.c | 2 +- lib/libalpm/alpm_list.h | 2 +- lib/libalpm/backup.c | 2 +- lib/libalpm/backup.h | 2 +- lib/libalpm/be_local.c | 6 +- lib/libalpm/be_package.c | 11 +- lib/libalpm/be_sync.c | 5 +- lib/libalpm/conflict.c | 30 +++-- lib/libalpm/conflict.h | 2 +- lib/libalpm/db.c | 2 +- lib/libalpm/db.h | 2 +- lib/libalpm/delta.c | 2 +- lib/libalpm/delta.h | 2 +- lib/libalpm/deps.c | 2 +- lib/libalpm/deps.h | 2 +- lib/libalpm/diskspace.c | 2 +- lib/libalpm/diskspace.h | 2 +- lib/libalpm/dload.c | 4 +- lib/libalpm/dload.h | 2 +- lib/libalpm/error.c | 2 +- lib/libalpm/filelist.c | 17 ++- lib/libalpm/filelist.h | 4 +- lib/libalpm/graph.c | 2 +- lib/libalpm/graph.h | 2 +- lib/libalpm/group.c | 2 +- lib/libalpm/group.h | 2 +- lib/libalpm/handle.c | 2 +- lib/libalpm/handle.h | 2 +- lib/libalpm/hook.c | 2 +- lib/libalpm/hook.h | 2 +- lib/libalpm/libarchive-compat.h | 2 +- lib/libalpm/log.c | 2 +- lib/libalpm/log.h | 2 +- lib/libalpm/package.c | 20 +++- lib/libalpm/package.h | 6 +- lib/libalpm/pkghash.c | 2 +- lib/libalpm/pkghash.h | 2 +- lib/libalpm/remove.c | 2 +- lib/libalpm/remove.h | 2 +- lib/libalpm/signing.c | 2 +- lib/libalpm/signing.h | 2 +- lib/libalpm/sync.c | 2 +- lib/libalpm/sync.h | 2 +- lib/libalpm/trans.c | 2 +- lib/libalpm/trans.h | 2 +- lib/libalpm/util.c | 2 +- lib/libalpm/util.h | 2 +- lib/libalpm/version.c | 2 +- scripts/Makefile.am | 1 + scripts/libmakepkg/integrity.sh.in | 2 +- .../libmakepkg/integrity/generate_checksum.sh.in | 2 +- .../libmakepkg/integrity/generate_signature.sh.in | 2 +- scripts/libmakepkg/integrity/verify_checksum.sh.in | 2 +- .../libmakepkg/integrity/verify_signature.sh.in | 131 +++++++++++++++------ scripts/libmakepkg/lint_package.sh.in | 2 +- .../libmakepkg/lint_package/build_references.sh.in | 2 +- .../dotfiles.sh.in} | 28 ++--- scripts/libmakepkg/lint_package/file_names.sh.in | 2 +- .../libmakepkg/lint_package/missing_backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/arch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/backup.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/changelog.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/epoch.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/install.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/optdepends.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/options.sh.in | 2 +- .../lint_pkgbuild/package_function.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgbase.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkglist.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgname.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgrel.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/pkgver.sh.in | 6 +- scripts/libmakepkg/lint_pkgbuild/provides.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/source.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/util.sh.in | 2 +- scripts/libmakepkg/lint_pkgbuild/variable.sh.in | 2 +- scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/source/bzr.sh.in | 2 +- scripts/libmakepkg/source/file.sh.in | 2 +- scripts/libmakepkg/source/git.sh.in | 13 +- scripts/libmakepkg/source/hg.sh.in | 2 +- scripts/libmakepkg/source/local.sh.in | 2 +- scripts/libmakepkg/source/svn.sh.in | 2 +- scripts/libmakepkg/srcinfo.sh.in | 2 +- scripts/libmakepkg/tidy.sh.in | 2 +- scripts/libmakepkg/tidy/docs.sh.in | 2 +- scripts/libmakepkg/tidy/emptydirs.sh.in | 2 +- scripts/libmakepkg/tidy/libtool.sh.in | 2 +- scripts/libmakepkg/tidy/purge.sh.in | 2 +- scripts/libmakepkg/tidy/staticlibs.sh.in | 2 +- scripts/libmakepkg/tidy/strip.sh.in | 27 ++++- scripts/libmakepkg/tidy/zipman.sh.in | 2 +- scripts/libmakepkg/util.sh.in | 2 +- scripts/libmakepkg/util/message.sh.in | 2 +- scripts/libmakepkg/util/option.sh.in | 2 +- scripts/libmakepkg/util/parseopts.sh.in | 2 +- scripts/libmakepkg/util/pkgbuild.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 29 ++++- scripts/libmakepkg/util/util.sh.in | 2 +- scripts/makepkg-template.pl.in | 4 +- scripts/makepkg.sh.in | 46 ++++---- scripts/pacman-db-upgrade.sh.in | 4 +- scripts/pacman-key.sh.in | 4 +- scripts/po/POTFILES.in | 1 + scripts/repo-add.sh.in | 6 +- scripts/wrapper.sh.in | 2 +- src/common/ini.c | 11 +- src/common/ini.h | 2 +- src/common/util-common.c | 2 +- src/common/util-common.h | 2 +- src/pacman/Makefile.am | 5 +- src/pacman/callback.c | 2 +- src/pacman/callback.h | 2 +- src/pacman/check.c | 2 +- src/pacman/check.h | 2 +- src/pacman/conf.c | 2 +- src/pacman/conf.h | 2 +- src/pacman/database.c | 2 +- src/pacman/deptest.c | 2 +- src/pacman/files.c | 2 +- src/pacman/package.c | 2 +- src/pacman/package.h | 2 +- src/pacman/pacman.c | 4 +- src/pacman/pacman.h | 2 +- src/pacman/query.c | 2 +- src/pacman/remove.c | 2 +- src/pacman/sighandler.c | 2 +- src/pacman/sighandler.h | 2 +- src/pacman/sync.c | 2 +- src/pacman/upgrade.c | 2 +- src/pacman/util.c | 2 +- src/pacman/util.h | 2 +- src/util/cleanupdelta.c | 2 +- src/util/testpkg.c | 2 +- src/util/vercmp.c | 2 +- test/pacman/pactest.py | 2 +- test/pacman/pmdb.py | 2 +- test/pacman/pmenv.py | 2 +- test/pacman/pmfile.py | 2 +- test/pacman/pmpkg.py | 2 +- test/pacman/pmrule.py | 2 +- test/pacman/pmtest.py | 2 +- test/pacman/tap.py | 2 +- test/pacman/tests/TESTS | 2 + test/pacman/tests/dbonly-extracted-files.py | 16 +++ .../{sync701.py => symlink-replace-with-dir.py} | 15 +-- test/pacman/util.py | 2 +- test/util/vercmptest.sh | 2 +- valgrind.supp | 4 +- 158 files changed, 521 insertions(+), 339 deletions(-) copy scripts/libmakepkg/{lint_pkgbuild.sh.in => lint_package/dotfiles.sh.in} (64%) create mode 100644 test/pacman/tests/dbonly-extracted-files.py copy test/pacman/tests/{sync701.py => symlink-replace-with-dir.py} (58%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Suppress valgrind error in fakechroot
by Rikard Falkeborn 04 Jan '17

04 Jan '17

This was spotted on Arch Linux, most likely it was introduced when fakechroot was updated to 2.19-1. Valgrind suggests to add the following suppression, which can be tweaked to fit an already existing one. { <insert_a_suppression_name_here> Memcheck:Leak match-leak-kinds: reachable fun:calloc obj:/usr/lib/libdl-2.24.so fun:dlsym obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so fun:bindtextdomain obj:/usr/lib/libgpg-error.so.0.20.0 fun:call_init.part.0 fun:_dl_init obj:/usr/lib/ld-2.24.so obj:* obj:* obj:* } Signed-off-by: Rikard Falkeborn <rikard.falkeborn(a)gmail.com> --- valgrind.supp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/valgrind.supp b/valgrind.supp index 0691e808..69265dff 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -160,8 +160,10 @@ fakechroot-call-init Memcheck:Leak match-leak-kinds: reachable - fun:malloc + fun:?alloc + ... obj:/usr/lib/libfakeroot/fakechroot/libfakechroot.so + ... fun:call_init.part.0 fun:_dl_init obj:/usr/lib/ld-*.so -- 2.11.0

2 1

[pacman-dev] [PATCH] Add alpm_pkg_get_makedepends and alpm_pkg_get_checkdepends
by Mark Weiman 03 Jan '17

03 Jan '17

makepkg adds makedepends and checkdepends to a package's .PKGINFO file. Add functions that allow use of these from libalpm. Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- lib/libalpm/alpm.h | 12 ++++++++ lib/libalpm/be_package.c | 6 ++-- lib/libalpm/package.c | 80 +++++++++++++++++++++++++++++------------------- lib/libalpm/package.h | 4 +++ 4 files changed, 69 insertions(+), 33 deletions(-) diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h index 2d2491d..3ef2426 100644 --- a/lib/libalpm/alpm.h +++ b/lib/libalpm/alpm.h @@ -1261,6 +1261,18 @@ alpm_list_t *alpm_pkg_get_depends(alpm_pkg_t *pkg); */ alpm_list_t *alpm_pkg_get_optdepends(alpm_pkg_t *pkg); +/** Returns a list of package check dependencies + * @param pkg a pointer to package + * @return a reference to an internal list of alpm_depend_t structures. + */ +alpm_list_t *alpm_pkg_get_checkdepends(alpm_pkg_t *pkg); + +/** Returns a list of package make dependencies + * @param pkg a pointer to package + * @return a reference to an internal list of alpm_depend_t structures. + */ +alpm_list_t *alpm_pkg_get_makedepends(alpm_pkg_t *pkg); + /** Returns the list of packages conflicting with pkg. * @param pkg a pointer to package * @return a reference to an internal list of alpm_depend_t structures. diff --git a/lib/libalpm/be_package.c b/lib/libalpm/be_package.c index b7c54fa..93af969 100644 --- a/lib/libalpm/be_package.c +++ b/lib/libalpm/be_package.c @@ -223,9 +223,11 @@ static int parse_descfile(alpm_handle_t *handle, struct archive *a, alpm_pkg_t * alpm_depend_t *optdep = alpm_dep_from_string(ptr); newpkg->optdepends = alpm_list_add(newpkg->optdepends, optdep); } else if(strcmp(key, "makedepend") == 0) { - /* not used atm */ + alpm_depend_t *makedep = alpm_dep_from_string(ptr); + newpkg->makedepends = alpm_list_add(newpkg->makedepends, makedep); } else if(strcmp(key, "checkdepend") == 0) { - /* not used atm */ + alpm_depend_t *checkdep = alpm_dep_from_string(ptr); + newpkg->checkdepends = alpm_list_add(newpkg->checkdepends, checkdep); } else if(strcmp(key, "conflict") == 0) { alpm_depend_t *conflict = alpm_dep_from_string(ptr); newpkg->conflicts = alpm_list_add(newpkg->conflicts, conflict); diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 05becf0..6bc9936 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -99,6 +99,8 @@ static alpm_list_t *_pkg_get_licenses(alpm_pkg_t *pkg) { return pkg->licenses; static alpm_list_t *_pkg_get_groups(alpm_pkg_t *pkg) { return pkg->groups; } static alpm_list_t *_pkg_get_depends(alpm_pkg_t *pkg) { return pkg->depends; } static alpm_list_t *_pkg_get_optdepends(alpm_pkg_t *pkg) { return pkg->optdepends; } +static alpm_list_t *_pkg_get_checkdepends(alpm_pkg_t *pkg) { return pkg->checkdepends; } +static alpm_list_t *_pkg_get_makedepends(alpm_pkg_t *pkg) { return pkg->makedepends; } static alpm_list_t *_pkg_get_conflicts(alpm_pkg_t *pkg) { return pkg->conflicts; } static alpm_list_t *_pkg_get_provides(alpm_pkg_t *pkg) { return pkg->provides; } static alpm_list_t *_pkg_get_replaces(alpm_pkg_t *pkg) { return pkg->replaces; } @@ -145,37 +147,39 @@ static int _pkg_force_load(alpm_pkg_t UNUSED *pkg) { return 0; } * struct itself with no abstraction layer or any type of lazy loading. */ struct pkg_operations default_pkg_ops = { - .get_base = _pkg_get_base, - .get_desc = _pkg_get_desc, - .get_url = _pkg_get_url, - .get_builddate = _pkg_get_builddate, - .get_installdate = _pkg_get_installdate, - .get_packager = _pkg_get_packager, - .get_arch = _pkg_get_arch, - .get_isize = _pkg_get_isize, - .get_reason = _pkg_get_reason, - .get_validation = _pkg_get_validation, - .has_scriptlet = _pkg_has_scriptlet, - - .get_licenses = _pkg_get_licenses, - .get_groups = _pkg_get_groups, - .get_depends = _pkg_get_depends, - .get_optdepends = _pkg_get_optdepends, - .get_conflicts = _pkg_get_conflicts, - .get_provides = _pkg_get_provides, - .get_replaces = _pkg_get_replaces, - .get_files = _pkg_get_files, - .get_backup = _pkg_get_backup, - - .changelog_open = _pkg_changelog_open, - .changelog_read = _pkg_changelog_read, - .changelog_close = _pkg_changelog_close, - - .mtree_open = _pkg_mtree_open, - .mtree_next = _pkg_mtree_next, - .mtree_close = _pkg_mtree_close, - - .force_load = _pkg_force_load, + .get_base = _pkg_get_base, + .get_desc = _pkg_get_desc, + .get_url = _pkg_get_url, + .get_builddate = _pkg_get_builddate, + .get_installdate = _pkg_get_installdate, + .get_packager = _pkg_get_packager, + .get_arch = _pkg_get_arch, + .get_isize = _pkg_get_isize, + .get_reason = _pkg_get_reason, + .get_validation = _pkg_get_validation, + .has_scriptlet = _pkg_has_scriptlet, + + .get_licenses = _pkg_get_licenses, + .get_groups = _pkg_get_groups, + .get_depends = _pkg_get_depends, + .get_optdepends = _pkg_get_optdepends, + .get_checkdepends = _pkg_get_checkdepends, + .get_makedepends = _pkg_get_makedepends, + .get_conflicts = _pkg_get_conflicts, + .get_provides = _pkg_get_provides, + .get_replaces = _pkg_get_replaces, + .get_files = _pkg_get_files, + .get_backup = _pkg_get_backup, + + .changelog_open = _pkg_changelog_open, + .changelog_read = _pkg_changelog_read, + .changelog_close = _pkg_changelog_close, + + .mtree_open = _pkg_mtree_open, + .mtree_next = _pkg_mtree_next, + .mtree_close = _pkg_mtree_close, + + .force_load = _pkg_force_load, }; /* Public functions for getting package information. These functions @@ -335,6 +339,20 @@ alpm_list_t SYMEXPORT *alpm_pkg_get_optdepends(alpm_pkg_t *pkg) return pkg->ops->get_optdepends(pkg); } +alpm_list_t SYMEXPORT *alpm_pkg_get_checkdepends(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_checkdepends(pkg); +} + +alpm_list_t SYMEXPORT *alpm_pkg_get_makedepends(alpm_pkg_t *pkg) +{ + ASSERT(pkg != NULL, return NULL); + pkg->handle->pm_errno = ALPM_ERR_OK; + return pkg->ops->get_makedepends(pkg); +} + alpm_list_t SYMEXPORT *alpm_pkg_get_conflicts(alpm_pkg_t *pkg) { ASSERT(pkg != NULL, return NULL); diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h index 0822a8d..1f029bd 100644 --- a/lib/libalpm/package.h +++ b/lib/libalpm/package.h @@ -59,6 +59,8 @@ struct pkg_operations { alpm_list_t *(*get_groups) (alpm_pkg_t *); alpm_list_t *(*get_depends) (alpm_pkg_t *); alpm_list_t *(*get_optdepends) (alpm_pkg_t *); + alpm_list_t *(*get_checkdepends) (alpm_pkg_t *); + alpm_list_t *(*get_makedepends) (alpm_pkg_t *); alpm_list_t *(*get_conflicts) (alpm_pkg_t *); alpm_list_t *(*get_provides) (alpm_pkg_t *); alpm_list_t *(*get_replaces) (alpm_pkg_t *); @@ -112,6 +114,8 @@ struct __alpm_pkg_t { alpm_list_t *backup; alpm_list_t *depends; alpm_list_t *optdepends; + alpm_list_t *checkdepends; + alpm_list_t *makedepends; alpm_list_t *conflicts; alpm_list_t *provides; alpm_list_t *deltas; -- 2.10.2

2 3

[pacman-dev] makepkg: verify git sources
by Jelle van der Waa 03 Jan '17

03 Jan '17

Hi, I would like to work on verifying git signed tags. So far I've actually managed to hack it into makepkg, but by missing a lot of edge cases and well writing an ugly implementation. [1] Some of this work has been borrowed from the systemd PKGBUILD. [2] Example with vte3-ng: ==> Validating source files with md5sums... vte-ng ... Skipped ==> Verifying source file signatures with gpg... vte-ng ... Passed Of course the hacks I've put in there are never going to be accepted even if I bribe Allan with a case of bourbon. I can think of the following issues, edge-cases which need to be handled: * git url, but no #tag= or #commit= specified, should verify HEAD on the #branch or no tag, commit, branch case. * Not parsing or tested invalid signed tags, not sure how git verify-tag displays errors so that needs more work. * I would like to move the git verification into source/git.sh.in and then re-use the code which extracts #branch, #commit etc. It would also reduce the clutter in verify_signature.sh.in. Another idea is to move the verification into integrity/verify_git.sh.in. * Changing the directory is cumbersome. git offers git -C $path verify-tag $tag to resolve that. * Multiple sources, .tar.gz{,asc} and a git one. (Rare but should be handled) Or multiple git sources. So tl;dr, I would love to see a pointer where I should call my own verification function for git sources or any other edge-cases I've missed :) [1] https://github.com/jelly/pacman/commit/5172a74ed9de422429d18034841acf8025fd… [2] https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packa… -- Jelle van der Waa

4 18

[pacman-dev] [PATCH 1/5] makepkg: warn about dotfiles in package root
by Andrew Gregory 03 Jan '17

03 Jan '17

libalpm reserves paths starting with '.' for its own use and will not extract any other than those it recognizes. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_package/dotfiles.sh.in | 38 ++++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 3 files changed, 40 insertions(+) create mode 100644 scripts/libmakepkg/lint_package/dotfiles.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 41a9f5d..4bb08a2 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -58,6 +58,7 @@ LIBMAKEPKG_IN = \ libmakepkg/integrity/verify_signature.sh \ libmakepkg/lint_package.sh \ libmakepkg/lint_package/build_references.sh \ + libmakepkg/lint_package/dotfiles.sh \ libmakepkg/lint_package/file_names.sh \ libmakepkg/lint_package/missing_backup.sh \ libmakepkg/lint_pkgbuild.sh \ diff --git a/scripts/libmakepkg/lint_package/dotfiles.sh.in b/scripts/libmakepkg/lint_package/dotfiles.sh.in new file mode 100644 index 0000000..bf7f41d --- /dev/null +++ b/scripts/libmakepkg/lint_package/dotfiles.sh.in @@ -0,0 +1,38 @@ +#!/bin/bash +# +# dotfiles.sh - check for dotfiles in the package root +# +# Copyright (c) 2016 Pacman Development Team <pacman-dev(a)archlinux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH" ]] && return +LIBMAKEPKG_LINT_PACKAGE_DOTFILES_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_package_functions+=('check_dotfiles') + +check_dotfiles() { + local ret=0 + for f in "$pkgdir"/.*; do + [[ ${f##*/} == . || ${f##*/} == .. ]] && continue + error "$(gettext "Dotfile found in package root '%s'")" "$f" + ret=1 + done + return $ret +} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index 4f47fc3..7cc6a03 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -14,6 +14,7 @@ scripts/libmakepkg/integrity/verify_checksum.sh.in scripts/libmakepkg/integrity/verify_signature.sh.in scripts/libmakepkg/lint_package.sh.in scripts/libmakepkg/lint_package/build_references.sh.in +scripts/libmakepkg/lint_package/dotfiles.sh.in scripts/libmakepkg/lint_package/file_names.sh.in scripts/libmakepkg/lint_package/missing_backup.sh.in scripts/libmakepkg/lint_pkgbuild.sh.in -- 2.10.2

2 10

[pacman-dev] [PATCH] conflict: skip dir children when replacing a file
by Andrew Gregory 03 Jan '17

03 Jan '17

When replacing a file with a directory, any files under that directory do not need to be checked for conflicts. This prevents possible false-positive conflicts where the file being replaced is a symlink. We were already skipping the directory children when the file was owned by the previous version of a package being upgraded. This extends that to other packages being removed. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- lib/libalpm/conflict.c | 16 +++++++++++++++- test/pacman/tests/TESTS | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c index b9e30870..48bc88b6 100644 --- a/lib/libalpm/conflict.c +++ b/lib/libalpm/conflict.c @@ -503,6 +503,7 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, struct stat lsbuf; char path[PATH_MAX]; size_t pathlen; + int pfile_isdir; pathlen = snprintf(path, PATH_MAX, "%s%s", handle->root, filestr); relative_path = path + rootlen; @@ -514,7 +515,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "checking possible conflict: %s\n", path); - if(path[pathlen - 1] == '/') { + pfile_isdir = path[pathlen - 1] == '/'; + if(pfile_isdir) { if(S_ISDIR(lsbuf.st_mode)) { _alpm_log(handle, ALPM_LOG_DEBUG, "file is a directory, not a conflict\n"); continue; @@ -551,6 +553,18 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle, _alpm_log(handle, ALPM_LOG_DEBUG, "local file will be removed, not a conflict\n"); resolved_conflict = 1; + if(pfile_isdir) { + /* go ahead and skip any files inside filestr as they will + * necessarily be resolved by replacing the file with a dir + * NOTE: afterward, j will point to the last file inside filestr */ + size_t fslen = strlen(filestr); + for( ; j->next; j = j->next) { + const char *filestr2 = j->next->data; + if(strncmp(filestr, filestr2, fslen) != 0) { + break; + } + } + } } } diff --git a/test/pacman/tests/TESTS b/test/pacman/tests/TESTS index 2d877962..44007f63 100644 --- a/test/pacman/tests/TESTS +++ b/test/pacman/tests/TESTS @@ -149,6 +149,7 @@ TESTS += test/pacman/tests/smoke001.py TESTS += test/pacman/tests/smoke002.py TESTS += test/pacman/tests/smoke003.py TESTS += test/pacman/tests/smoke004.py +TESTS += test/pacman/tests/symlink-replace-with-dir.py TESTS += test/pacman/tests/symlink001.py TESTS += test/pacman/tests/symlink002.py TESTS += test/pacman/tests/symlink010.py -- 2.11.0

2 3