- Arch-projects - lists.archlinux.org

[arch-projects] [namcap] Bugfix for shebangdepends checking with symlink script path
by Eric Langlois 12 Jun '20

12 Jun '20

Hello, I have a patch that fixes this issue with namcap: https://bugs.archlinux.org/task/66430 To summarize, namcap script dependency checking fails whenever part of the script binary path is a symbolic link because no package provides that exact path. For example, resolving the python path as /usr/sbin/python when running as root. This patch canonicalizes the path first. - Eric Langlois

1 0

[arch-projects] [dbscripts] Licensing of the dbscripts repository under the GPL-2.0-or-later
by Eli Schwartz 08 Jun '20

08 Jun '20

Hi all, I'm one of the current maintainers of the Arch Linux dbscripts [1]. Unfortunately, it did not used to have a license, and to fix that, I have agreed with Pierre Schmitz, Aaron Griffin, Judd Vinet, and Dan McGee (who between us cover 581/715 of the commits in the repository) to license it under the terms of the GPL-2.0-or-later [2]. If you're getting this email (which is cross-posted to the arch-projects mailing list) then you've contributed changes in the past as well, which I would appreciate a positive affirmation that you consent to your contribution(s) being distributed under this license as well. (If there is a different license you'd prefer, then I will have to see what we can do, but I'm hoping that won't be necessary...) Here's the (deduplicated) list of `git shortlog` committers: Abhishek Dasgupta <abhidg(a)gmail.com> Allan McRae <allan(a)archlinux.org> Andrea Scarpino <andrea(a)archlinux.org> Daniel J Griffiths <ghost1227(a)archlinux.us> Dave Reisner <dreisner(a)archlinux.org> Eric Bélanger <eric(a)archlinux.org> Florian Pritz <bluewind(a)xinu.at> François Charette <francois(a)archlinux.org> Henning Garus <henning.garus(a)gmail.com> Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Jan de Groot <jan(a)archlinux.org> Jelle van der Waa <jelle(a)vdwaa.nl> Johannes Löthberg <johannes(a)kyriasis.com> Levente Polyak <anthraxx(a)archlinux.org> Luke Shumaker <lukeshu(a)parabola.nu> Rémy Oudompheng <remy(a)archlinux.org> Scott Horowitz <stonecrest(a)gmail.com> Simo Leone <simo(a)archlinux.org> Thomas Bächler <thomas(a)archlinux.org> Travis Willard <travis(a)archlinux.org> Xavier Chantry <shiningxc(a)gmail.com> -- Eli Schwartz Bug Wrangler and Trusted User [1] https://git.archlinux.org/dbscripts.git/about/ https://github.com/archlinux/dbscripts [2] https://spdx.org/licenses/GPL-2.0-or-later.html

3 2

[arch-projects] [devtools] [PATCH] makerepropkg: allow specifying the package in pacman -S format
by Eli Schwartz 08 Jun '20

08 Jun '20

We now accept: 1) # nothing in which case we'll use the PKGBUILD to retrieve... 2) name, or repo/name in which case we'll use pacman to cache the package and retrieve... 3) a filename Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makerepropkg.1.asciidoc | 11 +++++++- makerepropkg.in | 54 +++++++++++++++++++++++++++---------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/doc/makerepropkg.1.asciidoc b/doc/makerepropkg.1.asciidoc index 0d7ddcb..e9f4c24 100644 --- a/doc/makerepropkg.1.asciidoc +++ b/doc/makerepropkg.1.asciidoc @@ -7,7 +7,7 @@ makerepropkg - Rebuild a package to see if it is reproducible Synopsis -------- -makerepropkg [OPTIONS] <package_file>... +makerepropkg [OPTIONS] [<package_file|pkgname>...] Description ----------- @@ -24,6 +24,15 @@ When given multiple packages, additional package files are assumed to be split packages and will be treated as additional artifacts to compare during the verification step. +A valid target(s) for pacman -S can be specified instead, and makerepropkg will +download it to the cache if needed. This is mostly useful to specify which +repository to retrieve from. If no positional arguments are specified, the +targets will be sourced from the PKGBUILD. + +In either case, the package name will be converted to a filename from the +cache, and makerepropkg will proceed as though this filename was initially +specified. + This implements a verifier for pacman/libalpm packages in accordance with the link:https://reproducible-builds.org/[Reproducible Builds] project. diff --git a/makerepropkg.in b/makerepropkg.in index c609ff6..051fe40 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -124,20 +124,46 @@ shift $((OPTIND - 1)) check_root -if [[ -n $1 ]]; then - pkgfile="$1" - splitpkgs=("$@") - for f in "${splitpkgs[@]}"; do - if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then - error "file is not a valid pacman package: '%s'" "${f}" - exit 1 - fi - done -else - error "no package file specified. Try '${BASH_SOURCE[0]##*/} -h' for more information. " - exit 1 +[[ -f PKGBUILD ]] || { error "No PKGBUILD in current directory."; exit 1; } + +# without arguments, get list of packages from PKGBUILD +if [[ -z $1 ]]; then + mapfile -t pkgnames < <(source PKGBUILD; pacman -Sddp --print-format '%r/%n' "${pkgname[@]}") + wait $! || { + error "No package file specified and failed to retrieve package names from './PKGBUILD'." + plain "Try '${BASH_SOURCE[0]##*/} -h' for more information." >&2 + exit 1 + } + msg "Reproducing all pkgnames listed in ./PKGBUILD" + set -- "${pkgnames[@]}" fi +# check each package to see if it's a file, and if not, try to download it +# using pacman -Sw, and get the filename from there +splitpkgs=() +for p in "$@"; do + if [[ -f ${p} ]]; then + splitpkgs+=("${p}") + else + pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null) || { error "package name '%s' not in repos" "${p}"; exit 1; } + pkgfile=${pkgfile_remote#file://} + if [[ ! -f ${pkgfile} ]]; then + msg "Downloading package '%s' into pacman's cache" "${pkgfile}" + sudo pacman -Swdd --noconfirm --logfile /dev/null "${p}" || exit 1 + pkgfile_remote=$(pacman -Sddp "${p}" 2>/dev/null) + pkgfile="${pkgfile_remote#file://}" + fi + splitpkgs+=("${pkgfile}") + fi +done + +for f in "${splitpkgs[@]}"; do + if ! bsdtar -tqf "${f}" .BUILDINFO >/dev/null 2>&1; then + error "file is not a valid pacman package: '%s'" "${f}" + exit 1 + fi +done + if (( ${#cache_dirs[@]} == 0 )); then mapfile -t cache_dirs < <(pacman-conf CacheDir) fi @@ -148,11 +174,11 @@ load_makepkg_config HOME=${ORIG_HOME} [[ -d ${SRCDEST} ]] || SRCDEST=${PWD} -parse_buildinfo < <(bsdtar -xOqf "${pkgfile}" .BUILDINFO) +parse_buildinfo < <(bsdtar -xOqf "${splitpkgs[0]}" .BUILDINFO) export SOURCE_DATE_EPOCH="${buildinfo[builddate]}" PACKAGER="${buildinfo[packager]}" BUILDDIR="${buildinfo[builddir]}" -PKGEXT=${pkgfile#${pkgfile%.pkg.tar*}} +PKGEXT=${splitpkgs[0]#${splitpkgs[0]%.pkg.tar*}} # nuke and restore reproducible testenv for copy in "${buildroot}"/*/; do -- 2.27.0

1 0

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch master updated. 20191022-2-geb1a090
by eschwartz＠archlinux.org 05 Jun '20

05 Jun '20

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 "Official repo DB scripts". The branch, master has been updated via eb1a090c5bfb9a1620abc21f8b81da510f965c4d (commit) from e7d06173a46eebad332805856e352531fc7b379b (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 eb1a090c5bfb9a1620abc21f8b81da510f965c4d Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 4 23:15:37 2020 -0400 rewrite issplitpkg check to be compatible with pacman 5.1 We tried to optimize out checking packages which aren't even split packages, by skipping the ones with no pkgbase. But pacman 5.1 always writes the pkgbase in order to simplify parsing of the .PKGINFO, so this was no longer reliable. Instead, check how many pkgnames are in the corresponding PKGBUILD. This is the master source of truth anyway. ----------------------------------------------------------------------- Summary of changes: db-functions | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch master updated. 20191022-1-ge7d0617
by eschwartz＠archlinux.org 05 Jun '20

05 Jun '20

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 "Official repo DB scripts". The branch, master has been updated via e7d06173a46eebad332805856e352531fc7b379b (commit) from ffae053006b2ecd53b028e26252b5b58e1f85d43 (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 e7d06173a46eebad332805856e352531fc7b379b Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu Jun 4 23:08:39 2020 -0400 add licensing information based on discussion with primary contributors Further contributions will need to be consistent with this, and now we need to hunt down the remaining contributors and clarify the license status. Fun! Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: LICENSE.md | 361 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ LICENSE_STATUS.md | 48 ++++++++ README.md | 20 +++ 3 files changed, 429 insertions(+) create mode 100644 LICENSE.md create mode 100644 LICENSE_STATUS.md hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [devtools] [PATCH] makerepropkg: do fast cache lookups
by Eli Schwartz 24 May '20

24 May '20

Teach get_pkgfile to call itself in local-only mode and find a cached file no matter what its extension is. Avoids repetitively trying to curl random files, fail with 404 errors, and proceed to discover a cache hit under a different file extension. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- makerepropkg.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/makerepropkg.in b/makerepropkg.in index 62ba5f3..2a8745c 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -57,9 +57,15 @@ parse_buildinfo() { get_pkgfile() { local cdir=${cache_dirs[0]} local pkgfilebase=${1} + local mode=${2} local pkgname=${pkgfilebase%-*-*-*} local pkgfile ext + # try without downloading + if [[ ${mode} != localonly ]] && get_pkgfile "${pkgfilebase}" localonly; then + return 0 + fi + for ext in .zst .xz ''; do pkgfile=${pkgfilebase}.pkg.tar${ext} @@ -72,6 +78,9 @@ get_pkgfile() { for f in "${pkgfile}" "${pkgfile}.sig"; do if [[ ! -f "${cdir}/${f}" ]]; then + if [[ ${mode} = localonly ]]; then + continue 2 + fi msg2 "retrieving '%s'..." "${f}" >&2 curl -Llf -# -o "${cdir}/${f}" "${archiveurl}/${pkgname:0:1}/${pkgname}/${f}" || continue 2 fi -- 2.26.2

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd annotated tag 1.23 created. 1.23
by Jouke Witteveen 27 Apr '20

27 Apr '20

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 "Network control utility based on systemd". The annotated tag, 1.23 has been created at 4238b55398927b5b2ceca025c2954bbc965db2df (tag) tagging e81093118ab70510cb8a929311b4a86efabfa35a (commit) replaces 1.22 tagged by Jouke Witteveen on Mon Apr 27 15:50:56 2020 +0200 - Log ----------------------------------------------------------------- Release 1.23 -----BEGIN PGP SIGNATURE----- iQFKBAABCAA0FiEEbql9KtO+F66lkufaVrYfv4JJLBUFAl6m40UWHGoud2l0dGV2 ZWVuQGdtYWlsLmNvbQAKCRBWth+/gkksFciKCACf5rBOGysEi8/VqbMOqE9qYVuK 58B/TMOPHEMAb+kixsnHonoQGUWXho+4T/67vlgasOFDdUPxipV9Wz/Vw7c4heGz 3+tbVjasqlonFEAEccV9rwr6fECvB+PPRFiopzJcgIRn123EXb4mKFSbDpOWCBFR KesYPUqNlx7nOTLSIUd7eZZ1BkygsRUIkAHfMhgY8ujr4Es13Zdt3Ku+z5LKvRJu fBxAa9j2tu5zBePqnhKFr9Mi6obVKWWDIsltQByPqHlavjdUvg+wF3G4KWwmAEPg VC2PpPE8/PS4V2lLDirF8AAO6VetkP4iXEjJiyqhbWfNuT3xlZnW7q2qQ4Jd =oVDd -----END PGP SIGNATURE----- Jouke Witteveen (2): Bring dhcpcd support up to date (FS#66349) 1.23 release updates ----------------------------------------------------------------------- hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.22-2-ge810931
by Jouke Witteveen 27 Apr '20

27 Apr '20

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 "Network control utility based on systemd". The branch, master has been updated via e81093118ab70510cb8a929311b4a86efabfa35a (commit) from 115411c31360bab9a5ffa60b8c0ca78836fc6474 (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 e81093118ab70510cb8a929311b4a86efabfa35a Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Mon Apr 27 15:50:36 2020 +0200 1.23 release updates ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.22-1-g115411c
by Jouke Witteveen 24 Apr '20

24 Apr '20

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 "Network control utility based on systemd". The branch, master has been updated via 115411c31360bab9a5ffa60b8c0ca78836fc6474 (commit) from 3bebcd7c2b8e18e737e3df9b18945f28f7662ea7 (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 115411c31360bab9a5ffa60b8c0ca78836fc6474 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Apr 24 11:45:55 2020 +0200 Bring dhcpcd support up to date (FS#66349) With dhcpcd 9, the rundir has moved. We follow this change and no longer support older versions of dhcpcd. While here, also support information only use on IPv6, which has been possible with dhcpcd for quite a while already. Reported by: Antonio Rojas <arojas(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: src/lib/dhcp/dhcpcd | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [namcap] [PATCH] silently skip over packages of type ${pkgbase}-debug
by Eli Schwartz 19 Apr '20

19 Apr '20

These produce many false positives, for example ELF warnings for split debug info. Under no circumstances do we want to claim there are any errors here, since makepkg autogenerates the package and we presume it's always right. Issues will always occur in the main package(s) only. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Namcap/package.py | 2 +- namcap.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Namcap/package.py b/Namcap/package.py index 2da5b1d..86129fe 100644 --- a/Namcap/package.py +++ b/Namcap/package.py @@ -209,7 +209,7 @@ def load_from_pkgbuild(path): return ret def load_from_alpm(pmpkg): - variables = ['name', 'version', 'conflicts', 'url', + variables = ['base', 'name', 'version', 'conflicts', 'url', 'depends', 'desc', 'files', 'groups', 'has_scriptlet', 'size', 'licenses', 'optdepends', 'packager', 'provides', 'replaces'] diff --git a/namcap.py b/namcap.py index a7f532a..dcf06f7 100755 --- a/namcap.py +++ b/namcap.py @@ -86,6 +86,10 @@ def process_realpackage(package, modules): return 1 pkginfo = Namcap.package.load_from_tarball(package) + + if pkginfo['name'] == pkginfo['base'] + '-debug': + # there are no errors -- this is a debug package autogenerated by makepkg + return 0 # Loop through each one, load them apply if possible for i in modules: rule = get_modules()[i]() -- 2.26.0

1 0