- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] [namcap] Fix makedepends.py for PKGBUILD without source array
by Michael Straube 20 Jan '20

20 Jan '20

Namcap errors when a PKGBUILD has no source array. Test if the PKGBUILD has a source array in the VCSMakedepends rule to avoid such errors. Fixes FS#65042 Signed-off-by: Michael Straube <michael.straube(a)posteo.de> --- Namcap/rules/makedepends.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Namcap/rules/makedepends.py b/Namcap/rules/makedepends.py index 53676c2..380a089 100644 --- a/Namcap/rules/makedepends.py +++ b/Namcap/rules/makedepends.py @@ -56,6 +56,9 @@ class VCSMakedepends(PkgbuildRule): missing = [] protocols = set() + if 'source' not in pkginfo: + return + for s in pkginfo["source"]: p = s.split("::", 1)[-1] p = p.split("://", 1)[0] -- 2.25.0

1 0

[arch-projects] [namcap] [PATCH] Add: rule to detect Python dependencies
by Felix Yan 07 Jan '20

07 Jan '20

--- Namcap/rules/__init__.py | 1 + Namcap/rules/pydepends.py | 122 +++++++++++++++++++++++++ Namcap/tests/package/test_pydepends.py | 68 ++++++++++++++ 3 files changed, 191 insertions(+) create mode 100644 Namcap/rules/pydepends.py create mode 100644 Namcap/tests/package/test_pydepends.py diff --git a/Namcap/rules/__init__.py b/Namcap/rules/__init__.py index 525dbc6..01d1b96 100644 --- a/Namcap/rules/__init__.py +++ b/Namcap/rules/__init__.py @@ -43,6 +43,7 @@ from . import ( perllocal, permissions, py_mtime, + pydepends, rpath, scrollkeeper, shebangdepends, diff --git a/Namcap/rules/pydepends.py b/Namcap/rules/pydepends.py new file mode 100644 index 0000000..efc6735 --- /dev/null +++ b/Namcap/rules/pydepends.py @@ -0,0 +1,122 @@ +# -*- coding: utf-8 -*- +# +# namcap rules - pydepends +# Copyright (C) 2020 Felix Yan <felixonmars(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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +from collections import defaultdict +import ast +import sys +import sysconfig +import Namcap.package +from Namcap.ruleclass import * + + +def finddepends(liblist): + """ + Find packages owning a list of libraries + + Returns: + dependlist -- a dictionary { package => set(libraries) } + orphans -- the list of libraries without owners + """ + dependlist = defaultdict(set) + + pymatches = {} + + knownlibs = set(liblist) + foundlibs = set() + + workarounds = { + "python": sys.builtin_module_names + } + + for pkg in Namcap.package.get_installed_packages(): + for j, fsize, fmode in pkg.files: + if not j.startswith("usr/lib/python3"): + continue + + for k in knownlibs: + if j.endswith("site-packages/" + k + "/") or j.endswith("site-packages/" + k + ".py") or \ + j.endswith("site-packages/" + k + ".so") or \ + j.endswith("site-packages/" + k + sysconfig.get_config_var('EXT_SUFFIX')) or \ + j.endswith("lib-dynload/" + k + sysconfig.get_config_var('EXT_SUFFIX')) or \ + j.count("/") == 3 and j.endswith("/" + k + ".py") or \ + j.count("/") == 4 and j.endswith("/" + k + "/") or \ + pkg.name in workarounds and k in workarounds[pkg.name]: + dependlist[pkg.name].add(k) + foundlibs.add(k) + + orphans = list(knownlibs - foundlibs) + return dependlist, orphans + + +def get_imports(file): + root = ast.parse(file.read()) + + for node in ast.walk(root): + if isinstance(node, ast.Import): + for module in node.names: + yield module.name.split('.')[0] + elif isinstance(node, ast.ImportFrom): + if node.module and node.level == 0: + yield node.module.split('.')[0] + + +class PythonDependencyRule(TarballRule): + name = "pydepends" + description = "Checks python dependencies" + def analyze(self, pkginfo, tar): + liblist = defaultdict(set) + own_liblist = set() + + for entry in tar: + if not entry.isfile() or not entry.name.endswith('.py'): + continue + own_liblist.add(entry.name[:-3]) + f = tar.extractfile(entry) + for module in get_imports(f): + liblist[module].add(entry.name) + f.close() + + for lib in own_liblist: + liblist.pop(lib, None) + + dependlist, orphans = finddepends(liblist) + + # Handle "no package associated" errors + self.warnings.extend([("library-no-package-associated %s", i) + for i in orphans]) + + # Print link-level deps + for pkg, libraries in dependlist.items(): + if isinstance(libraries, set): + files = list(libraries) + needing = set().union(*[liblist[lib] for lib in libraries]) + reasons = pkginfo.detected_deps.setdefault(pkg, []) + reasons.append(( + "libraries-needed %s %s", + (str(files), str(list(needing))) + )) + self.infos.append(("link-level-dependence %s in %s", (pkg, str(files)))) + + # Check for packages in testing + for i in dependlist.keys(): + p = Namcap.package.load_testing_package(i) + q = Namcap.package.load_from_db(i) + if p is not None and q is not None and p["version"] == q["version"] : + self.warnings.append(("dependency-is-testing-release %s", i)) diff --git a/Namcap/tests/package/test_pydepends.py b/Namcap/tests/package/test_pydepends.py new file mode 100644 index 0000000..bb0dfbb --- /dev/null +++ b/Namcap/tests/package/test_pydepends.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +# +# namcap tests - pydepends +# Copyright (C) 2020 Felix Yan <felixonmars(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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# USA +# + +import os +from Namcap.tests.makepkg import MakepkgTest +import Namcap.rules.pydepends + + +class PyDependsTest(MakepkgTest): + pkgbuild = """ +pkgname=__namcap_test_pydepends +pkgver=1.0 +pkgrel=1 +pkgdesc="A package" +arch=('any') +url="http://www.example.com/" +license=('GPL') +depends=('python-six') +source=() +build() { + cd "${srcdir}" + echo "import six, pyalpm" > main.py +} +package() { + install -D -m 755 "$srcdir/main.py" "$pkgdir/usr/bin/main.py" +} +""" + def test_pydepends(self): + "Package with missing pacman dependency" + pkgfile = "__namcap_test_pydepends-1.0-1-any.pkg.tar" + with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: + f.write(self.pkgbuild) + self.run_makepkg() + pkg, r = self.run_rule_on_tarball( + os.path.join(self.tmpdir, pkgfile), + Namcap.rules.pydepends.PythonDependencyRule + ) + self.assertEqual(pkg.detected_deps['pyalpm'], [ + ('libraries-needed %s %s', + (str(["pyalpm"]), str(["usr/bin/main.py"]))) + ] + ) + e, w, i = Namcap.depends.analyze_depends(pkg) + self.assertEqual(e, [ + ('dependency-detected-not-included %s (%s)', + ('pyalpm', "libraries ['pyalpm'] needed in files ['usr/bin/main.py']")) + ]) + self.assertEqual(w, []) + +# vim: set ts=4 sw=4 noet: -- 2.24.1

1 0

[arch-projects] [devtools] [PATCH 1/2] checkpkg: fix support for http:// url comparisons
by Eli Schwartz 02 Jan '20

02 Jan '20

Broken in commit c14338c0fe71a74f5e56b4f3af7c548fe0928e15. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- checkpkg.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/checkpkg.in b/checkpkg.in index 374c004..d7c0948 100644 --- a/checkpkg.in +++ b/checkpkg.in @@ -95,8 +95,10 @@ for _pkgname in "${pkgname[@]}"; do if (( $# )); then case $1 in + *://*) + pkgurl=$1 ;; /*|*/*) - pkgurl=file://$(readlink -m "$1") ;; + pkgurl=$(readlink -m "$1") ;; *.pkg.tar*) pkgurl=$1 ;; '') -- 2.24.1

1 1

[arch-projects] [devtools] [PATCH 0/3] makerepropkg improvements
by Eli Schwartz 02 Jan '20

02 Jan '20

Available at https://github.com/eli-schwartz/devtools/commits/makerepropkg-diffoscope Eli Schwartz (3): makerepropkg: fix wonky indent makerepropkg: add support to check unreproducible packages using diffoscope makerepropkg: support checking multiple split packages doc/makerepropkg.1.asciidoc | 11 ++++++-- makerepropkg.in | 56 +++++++++++++++++++++++-------------- 2 files changed, 44 insertions(+), 23 deletions(-) -- 2.24.1

2 13

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20191227-1-g4c08847
by Levente Polyak 27 Dec '19

27 Dec '19

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 devtools repository". The branch, master has been updated via 4c08847bfa7776abb884fef289a25c1cef9883fb (commit) from 74d7a70915d7143938f560e6f7051e0147855d3f (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 4c08847bfa7776abb884fef289a25c1cef9883fb Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Fri Dec 27 11:59:48 2019 -0500 makerepropkg: correctly reproduce a pkgfile with any compression type We don't want the default PKGEXT in the current version of devtools, we want the PKGEXT we *know* the input file used. Signed-off-by: Levente Polyak <anthraxx(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: makerepropkg.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [PATCH] makerepropkg: correctly reproduce a pkgfile with any compression type
by Eli Schwartz 27 Dec '19

27 Dec '19

We don't want the default PKGEXT in the current version of devtools, we want the PKGEXT we *know* the input file used. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- makerepropkg.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/makerepropkg.in b/makerepropkg.in index 51c2dd2..0721f65 100755 --- a/makerepropkg.in +++ b/makerepropkg.in @@ -144,6 +144,9 @@ export SOURCE_DATE_EPOCH="${buildinfo[builddate]}" PACKAGER="${buildinfo[packager]}" BUILDDIR="${buildinfo[builddir]}" +trimprefix=${pkgfile%.pkg.tar*} +PKGEXT=${pkgfile#$trimprefix} + # nuke and restore reproducible testenv for copy in "${buildroot}"/*/; do [[ -d ${copy} ]] || continue @@ -166,7 +169,7 @@ makechrootpkg -r "${buildroot}" -l "${chroot}" -- --packagelist || exit 1 # set detected makepkg.conf options { - for var in PACKAGER BUILDDIR; do + for var in PACKAGER BUILDDIR PKGEXT; do printf '%s=%s\n' "${var}" "${!var@Q}" done printf 'OPTIONS=(%s)\n' "${buildopts[*]@Q}" -- 2.24.1

1 1

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20191227 created. 20191227
by Levente Polyak 27 Dec '19

27 Dec '19

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 devtools repository". The annotated tag, 20191227 has been created at 2304c51f99fd4b06a43de97ccb61b03532d8265b (tag) tagging 74d7a70915d7143938f560e6f7051e0147855d3f (commit) replaces 20191212 tagged by Levente Polyak on Fri Dec 27 16:06:30 2019 +0100 - Log ----------------------------------------------------------------- Version 20191227 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE4kC1fixGMLp2ji8m/BtUfI2BcsgFAl4GHfYACgkQ/BtUfI2B csjulg//aRqDfwA5/FihptiY3aPH9GlOeWai/ikV1djfMjdie0kkjsWviHACr1bK TggToyVKO1xq2oMO3oauO+/5dLMdE/TTsMHhrFkt6aFXD2Xm2LNKN2BsolAktmAU vFF6F2mZJzKrRVglA5q/QjfDaWGMgKMu03no2Ei3yTjjCZwLucxl2xfb9PuCldYo HD06ZEI5TsM/gkXRgobVTXvIdHFtXUgrcFKwlJ3RnfKfoPHxNbfKHJII+ZupTgbE k9B1xVoErIItrDS8ZGaU6tqysYlOkfrtYlvdyu23eBIrkPJ1yrkYQsYXcWp8yA54 iZsD2SbUwW9xzEUjHfq3+VqGsn8MIpz9sDbwR06GZ849S2JKLTuikjDYzQY62m7j 498F+VCazWizn7koQaYcKGdAwB+HCrd5FR7Hgmf3yDTfzWC+lpiQMq1/P0lz7azT DXxM0SH8/ei7ptsIOrSzri+R5+UH/ryKLBIQyN9xfB/FkDmZ3oPCumu82KRI3Q38 MwCmcWFsUOImSIWVcnh/akyqC86NoLsIR67f5r8Tu6A++LvbYQ4ifiS5QizKE4b3 4vtuGGdqxoTobWPsNsnjZbJNxcE+idlD64UZhu3MoiRqjkAB+5MWgBwdB95TD0Qm j3q4lKBVBt3mmsYOl4FaPdEvJx3LkT9Mi1yhrmGA2NCYFgS8kuY= =k9jN -----END PGP SIGNATURE----- Levente Polyak (1): Version 20191227 Robin Broda (2): makepkg.conf: change default compression method to zstd makerepopkg: fix zstd extension (.zstd -> .zst) ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20191212-3-g74d7a70
by Levente Polyak 27 Dec '19

27 Dec '19

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 devtools repository". The branch, master has been updated via 74d7a70915d7143938f560e6f7051e0147855d3f (commit) via 5eacb475cd1a92dc4fdaf25f86984da74a23f5ab (commit) via bcda211dd86b3bf54a9bc40d2e19f1aad4bbfbb8 (commit) from d4546c59ce2731a96d336f9953108816ff4b954b (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 74d7a70915d7143938f560e6f7051e0147855d3f Author: Levente Polyak <anthraxx(a)archlinux.org> Date: Fri Dec 27 16:06:30 2019 +0100 Version 20191227 commit 5eacb475cd1a92dc4fdaf25f86984da74a23f5ab Author: Robin Broda <robin(a)broda.me> Date: Sat Dec 14 19:25:00 2019 +0100 makerepopkg: fix zstd extension (.zstd -> .zst) commit bcda211dd86b3bf54a9bc40d2e19f1aad4bbfbb8 Author: Robin Broda <robin(a)broda.me> Date: Sat Dec 14 19:25:46 2019 +0100 makepkg.conf: change default compression method to zstd ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- makepkg-x86_64.conf | 4 ++-- makerepropkg.in | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.20-2-gc019679
by Jouke Witteveen 25 Dec '19

25 Dec '19

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 c0196798dde620566146867e59d52d3120e9b4f1 (commit) via 89cba954bef7c370ea38f9c0ca087f816620d62b (commit) from 7cb0a5ab146f3c26bc05706bda7e3e662af5408a (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 c0196798dde620566146867e59d52d3120e9b4f1 Author: Christian Hesse <mail(a)eworm.de> Date: Wed Nov 13 12:15:35 2019 +0000 base group removal commit 89cba954bef7c370ea38f9c0ca087f816620d62b Author: Antonio Rojas <arojas(a)archlinux.org> Date: Wed Jun 26 16:22:35 2019 +0200 PKGBUILD: use https for the url ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20191212 created. 20191212
by Levente Polyak 12 Dec '19

12 Dec '19

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 devtools repository". The annotated tag, 20191212 has been created at 7a55fc0fb9bfbd1341de76405b26de70cc54ec64 (tag) tagging d4546c59ce2731a96d336f9953108816ff4b954b (commit) replaces 20191130 tagged by Levente Polyak on Thu Dec 12 01:01:45 2019 +0100 - Log ----------------------------------------------------------------- Version 20191212 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEE4kC1fixGMLp2ji8m/BtUfI2BcsgFAl3xg2kACgkQ/BtUfI2B cshpsg/+Ll13/q+GHDx7w7HvM+zDajv26XqeVR2snu2mZkwRhCa8sV603HixXTwY D5DHDOQidylIpaYLmcVyc15Ed37y7IK58yiGt4uhViVHwh2pevIN+XhhKvbcez9L IhjsPb/ZLg9a/gFKsvsHVaWWD98WYUCSTyORVuJgpbYT7nHUb0pAz1+wRZBEXnlQ ogR/nXzVOaSa/eSO0YBzTgn4AYJP75ylijFzlXKrRRPxC5QRGU3nyajsoAt2UlS+ kteMiGJpH3qzi7NLyf+hBhjYQrxPUZrMcjoLXdRrtPCB/wX8VMdaOdtDLbFdLBwC 5ZBCqkNw6X5A9XkKOh4HxScsBWcBMQaFcilensvV5mVyy/iz0jadu5VpUhxp9Y9r lM1UZsvC1IP6jmmtkMyoWTemZTX4KYQe6Nh5WxV1QXYvirFBNf/zkH9pUf8eidDq 3aS8zQF8NSnZ2HQspK2edQf6Zaurb2jHa3MvOhR4TazkIVIVuGiidOgtW3fKIPZO eA4QUrt9HnVXIK96XZV8Ybde185xceok9KQgGA+UIkKWjOrGtD5XFVIbTGSez4ip M02Kbdmw7l7K2TMiLLqnnq1qb98j/z/lPGdc9yD7VZ/dDJVitvOKajVaudNwyEIp PfxU8rpArfYHyCVIhTxX7yWmecMyNBW5nxLIuL0oC09RB2u/c3A= =ge4p -----END PGP SIGNATURE----- Eli Schwartz (1): offload-build: return failure if no package files were found Levente Polyak (4): makechrootpkg: double quote array expansions for checkpkg locations makechrootpkg: sync databases for checkpkg off-site lib: support arbitrary compressed package files Version 20191212 ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0