July 2018 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH 1/1] arch-nspawn: get all mirrors from host
by Christian Hesse 22 Mar '19

22 Mar '19

From: Christian Hesse <mail(a)eworm.de> Now that pacconf gives us all mirrors we can use them, instead of just the first one. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- arch-nspawn.in | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b9c846e..661bbbd 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,17 +60,19 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) # shellcheck disable=2016 -[[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') # {{{ functions build_mount_args() { declare -g mount_args=() - if [[ -n $host_mirror_path ]]; then - mount_args+=("--bind-ro=$host_mirror_path") - fi + for host_mirror in "${host_mirrors[@]}"; do + if [[ $host_mirror == *file://* ]]; then + host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') + mount_args+=("--bind-ro=$host_mirror_path") + fi + done mount_args+=("--bind=${cache_dirs[0]}") @@ -81,7 +83,10 @@ build_mount_args() { copy_hostconf () { cp -a /etc/pacman.d/gnupg "$working_dir/etc/pacman.d" - echo "Server = $host_mirror" >"$working_dir/etc/pacman.d/mirrorlist" + + for host_mirror in "${host_mirrors[@]}"; do + echo "Server = $host_mirror" + done >"$working_dir/etc/pacman.d/mirrorlist" [[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf" [[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"

1 1

[arch-projects] [mkinitcpio] [PATCH] --rsyncable option
by Charles Duffy 15 Dec '18

15 Dec '18

At present, mkinitcpio outputs are not particularly stable: Generating two consecutive initramfs images from the same inputs can generate archives which are quite entirely unlike each other from the perspective of binary diff tools (rsync, casync, rdiff-backup, xdelta, etc). Making some adjustments to compression and archival can greatly reduce the size of this delta. A ticket with a proposed patch (adding a --rsyncable option to mkinitcpio) has been opened at https://bugs.archlinux.org/task/56128 -- however, as the advice there has been to consult this mailing list, it may no longer be open as of this writing. :) The change consists of the following: - Sort the list of files (in the C locale) before passing it to cpio. - When --rsyncable is passed, set all datestamps to the UNIX epoch before generating the cpio archive. - When --rsyncable is passed, pass the --reproducible option to cpio (this creates a dependency on GNU cpio 2.12, prevents device numbers from being included in the archive, and renumbers inode numbers to be consistent when file ordering is unchanged). - When --rsyncable is passed, pass the --rsyncable and --no-name options to gzip (the former tells it to reset the compression table on occasion, sacrificing compression ratio to prevent the effect from changes from cascading throughout too much of the stream; the latter prevents name and timestamp data from being stored in the gzip header itself). A version of the patch squashing together the two commits already present on the ticket is attached.

1 1

[arch-projects] [netctl][PATCH] Use drop-in directories instead of .include statements
by Jouke Witteveen 28 Jul '18

28 Jul '18

The .include directive in systemd unit files has effectively been deprecated since systemd v210. Its functionality is subsumed by drop-in directories. --- src/netctl.in | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/netctl.in b/src/netctl.in index b5da594..6aeed7e 100644 --- a/src/netctl.in +++ b/src/netctl.in @@ -90,43 +90,43 @@ switch_to() { } unit_enable() { - local unit="@systemdsystemconfdir@/netctl@$(systemd-escape "$1").service" - if [[ -e $unit ]]; then - report_error "A unit file for profile '$1' already exists" + local unit=$(systemd-escape --template=netctl@.service "$1") target + load_profile "$1" + + target="@systemdsystemconfdir@/multi-user.target.wants/$unit" + if [[ -e $target ]]; then + report_error "The profile '$1' is already enabled" return 1 fi - load_profile "$1" - do_readable touch "$unit" - echo ".include @systemdsystemunitdir@/netctl@.service" > "$unit" - echo -e "\n[Unit]" >> "$unit" - [[ $Description ]] && echo "Description=$Description" >> "$unit" + do_readable mkdir -p "$(dirname "$target")" + ln -vs "@systemdsystemunitdir@/netctl@.service" "$target" + + target="@systemdsystemconfdir@/$unit.d/profile.conf" + do_readable mkdir -p "$(dirname "$target")" + do_readable touch "$target" + echo "[Unit]" > "$target" + if [[ $Description ]]; then + echo "Description=$Description" >> "$target" + fi declare -p BindsToInterfaces &> /dev/null || BindsToInterfaces=$Interface if (( ${#BindsToInterfaces[@]} )); then : ${InterfaceRoot=sys/subsystem/net/devices/} printf "BindsTo=$(systemd-escape "$InterfaceRoot")%s.device\n" \ - $(systemd-escape "${BindsToInterfaces[@]}") >> "$unit" + $(systemd-escape "${BindsToInterfaces[@]}") >> "$target" printf "After=$(systemd-escape "$InterfaceRoot")%s.device\n" \ - $(systemd-escape "${BindsToInterfaces[@]}") >> "$unit" + $(systemd-escape "${BindsToInterfaces[@]}") >> "$target" fi if (( ${#After[@]} )); then printf 'After=netctl(a)%s.service\n' \ - $(systemd-escape "${After[@]}") >> "$unit" + $(systemd-escape "${After[@]}") >> "$target" fi - mkdir -p "@systemdsystemconfdir@/multi-user.target.wants" - echo "ln -s '$unit' '${unit/system\//system/multi-user.target.wants/}'" - ln -s "$unit" "${unit/system\//system/multi-user.target.wants/}" + report_notice "generated '$target'" } unit_disable() { - local unit="@systemdsystemconfdir@/netctl@$(systemd-escape "$1").service" - if sd_call "is-enabled --quiet" "$1" &> /dev/null; then - sd_call disable "$1" - fi - if [[ ! -f $unit ]]; then - report_error "No regular unit file found for profile '$1'" - return 1 - fi - do_debug rm "$unit" + local unit=$(systemd-escape --template=netctl@.service "$1") + rm -vfd "@systemdsystemconfdir@"{/multi-user.target.wants,}"/$unit" \ + "@systemdsystemconfdir@/$unit.d"{/profile.conf,} } wait_online() { -- 2.18.0

1 0

[arch-projects] [devtools] [PATCH] Expand check_root keepenv variables
by Morten Linderud 24 Jul '18

24 Jul '18

From: Morten Linderud <morten(a)linderud.pw> makechrootpkg checks the environment for multiple variables before overwriting them with makepkg.conf configurations. Expand check_root with the variables makechrootpkg check for so we are capable of overwriting them when needed. Signed-off-by: Morten Linderud <foxboron(a)archlinux.org> --- archbuild.in | 2 +- lib/archroot.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archbuild.in b/archbuild.in index 1e5b582..6f22b12 100644 --- a/archbuild.in +++ b/archbuild.in @@ -39,7 +39,7 @@ while getopts 'hcr:' arg; do esac done -check_root SOURCE_DATE_EPOCH +check_root SOURCE_DATE_EPOCH SRCDEST SRCPKGDEST PKGDEST LOGDEST MAKEFLAGS PACKAGER # Pass all arguments after -- right to makepkg makechrootpkg_args+=("${@:$OPTIND}") diff --git a/lib/archroot.sh b/lib/archroot.sh index f279603..82276e2 100644 --- a/lib/archroot.sh +++ b/lib/archroot.sh @@ -10,7 +10,7 @@ CHROOT_VERSION='v4' ## orig_argv=("$0" "$@") check_root() { - local keepenv=$1 + local keepenv=$(tr " " "," <<< $@) (( EUID == 0 )) && return if type -P sudo >/dev/null; then -- 2.18.0

2 1

[arch-projects] [devtools] [PATCH 1/1] arch-nspawn: ignore localhost for repository mirror
by Christian Hesse 23 Jul '18

23 Jul '18

From: Christian Hesse <mail(a)eworm.de> My system has a mirror configuration where only the host can access a local caching service on localhost. So ignore localhost urls. Signed-off-by: Christian Hesse <mail(a)eworm.de> --- arch-nspawn.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index b9c846e..020ed71 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -60,7 +60,7 @@ fi pacconf_cmd=$(command -v pacman-conf || command -v pacconf) # shellcheck disable=2016 -host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirror=$($pacconf_cmd --repo extra Server 2> /dev/null | grep -E -v '(127.0.0.1|localhost)' | head -1 | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') # shellcheck disable=2016 [[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')

2 5

Re: [arch-projects] [devtools] [PATCH] makechrootpkg: Skip PGP checks inside the chroot
by Alexander Shpilkin 13 Jul '18

13 Jul '18

On Fri, 2018-07-13 at 06:55 +0200, Alexander Shpilkin wrote: > As with the integrity checks, these have already been done in > download_sources(), and the GPG keyring is unavailable inside the > chroot anyway. Err... Nevermind, apparently --skipinteg disables PGP as well, and I messed up my debugging today. Sorry for the noise. --Alex

1 0

[arch-projects] [devtools] [PATCH] makechrootpkg: Skip PGP checks inside the chroot
by Alexander Shpilkin 13 Jul '18

13 Jul '18

As with the integrity checks, these have already been done in download_sources(), and the GPG keyring is unavailable inside the chroot anyway. --- makechrootpkg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index d81be84..a26815e 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -304,7 +304,7 @@ move_products() { # }}} main() { - default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg) + default_makepkg_args=(--syncdeps --noconfirm --log --holdver --skipinteg --skippgpcheck) makepkg_args=("${default_makepkg_args[@]}") keepbuilddir=false update_first=false --- 2.18.0

1 0

[arch-projects] [dbscripts] [PATCH v2] Don't parse .db files ourselves; use expac instead
by Luke Shumaker 10 Jul '18

10 Jul '18

From: Luke Shumaker <lukeshu(a)parabola.nu> In a patchset that I recently submitted, Eli was concerned that I was parsing .db files with bsdtar+awk, when the format of .db files isn't "public"; the only guarantees made about it are that libalpm can parse it. https://lists.archlinux.org/pipermail/arch-projects/2018-June/004932.html I wasn't too concerned, because `ftpdir-cleanup` and `sourceballs` already parse the .db files in the same way. Nonetheless, I think Eli is right: we shouldn't be parsing these files ourselves. So, add an `arch_expac` function that uses `expac` to parse the .db files. `expac` is particularly palatable as a new dependency, as it seems likely that it will be included in future releases of pacman. `expac` (like the underlying libalpm) doesn't offer an easy way to say "parse this DB file for me"; instead, we must construct a pacman.conf that has a repo pointing to that file with a `Server=file://...` line. --- v2: - use expac, not pyalpm cron-jobs/ftpdir-cleanup | 2 +- cron-jobs/sourceballs | 21 ++++++++------------- db-functions | 24 ++++++++++++++++++++++++ test/Dockerfile | 2 +- 4 files changed, 34 insertions(+), 15 deletions(-) diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 9df5f99..e64b7e4 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -44,7 +44,7 @@ for repo in "${PKGREPOS[@]}"; do fi done | sort > "${WORKDIR}/repo-${repo}-${arch}" # get a list of package files defined in the repo db - bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" | awk '/^%FILENAME%/{getline;print}' | sort > "${WORKDIR}/db-${repo}-${arch}" + arch_expac "$repo" "$arch" '%f' | sort > "${WORKDIR}/db-${repo}-${arch}" missing_pkgs=($(comm -13 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}")) if (( ${#missing_pkgs[@]} >= 1 )); then diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index 6be28ab..e24102b 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -19,24 +19,19 @@ renice +10 -p $$ > /dev/null # Create a readable file for each repo with the following format # <pkgbase|pkgname> <pkgver>-<pkgrel> <arch> <license>[ <license>] for repo in "${PKGREPOS[@]}"; do + # The %n+awk+cut bit is because we can't trust %e, as makepkg + # <5.1 didn't set pkgbase in .PKGINFO for non-split packages + # when when pkgbase==pkgname; so until all packages have been + # rebuilt with makepkg 5.1, we need to look at both pkgbase + # (%e) and pkgname (%n) to reliably get pkgbase. for arch in "${ARCHES[@]}"; do # Repo does not exist; skip it if [[ ! -f ${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT} ]]; then continue fi - bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \ - | awk '/^%NAME%/ { getline b }; - /^%BASE%/ { getline b }; - /^%VERSION%/ { getline v }; - /^%LICENSE%/,/^$/ { - if ( !/^%LICENSE%/ ) { l=l" "$0 } - }; - /^%ARCH%/ { - getline a; - printf "%s %s %s %s\n", b, v, a, l; - l=""; - }' - done | sort -u > "${WORKDIR}/db-${repo}" + arch_expac "$repo" "$arch" '%n %e %v %a %L' + done | awk -F' ' '$2 == "(null)" { $2 = $1 } { print }' | cut -d' ' -f2- | + sort -u > "${WORKDIR}/db-${repo}" done for repo in "${PKGREPOS[@]}"; do diff --git a/db-functions b/db-functions index 0491c22..cb55f87 100644 --- a/db-functions +++ b/db-functions @@ -436,6 +436,30 @@ set_repo_permission() { fi } +# usage: arch_expac repo arch expac_args... +arch_expac() { + local repo=$1 + local arch=$2 + local args=("${@:3}") + local dir="${WORKDIR}/expac-${repo}-${arch}" + + if ! [[ -d $dir ]]; then + mkdir -p -- "${dir}/root" + cat >"${dir}/pacman.conf" <<-EOT + [options] + RootDir = ${dir}/root + DBPath = ${dir}/root + Architecture = ${arch} + + [$repo] + Server = file://${FTP_BASE}/\$repo/os/\$arch + EOT + fi + + fakeroot pacman --config="${dir}/pacman.conf" -Sy >/dev/null + expac --config="${dir}/pacman.conf" --sync "${args[@]}" +} + arch_repo_modify() { local action=$1 local repo=$2 diff --git a/test/Dockerfile b/test/Dockerfile index 83c8449..cb40570 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,5 +1,5 @@ FROM archlinux/base -RUN pacman -Syu --noconfirm --needed sudo fakeroot awk subversion make kcov bash-bats gettext grep +RUN pacman -Syu --noconfirm --needed sudo fakeroot awk subversion make kcov bash-bats gettext grep expac RUN pacman-key --init RUN echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel RUN useradd -N -g users -G wheel -d /build -m tester -- 2.17.1

1 0

[arch-projects] [dbscripts] [PATCH] Don't parse .db files ourselves; use pyalpm instead
by Luke Shumaker 10 Jul '18

10 Jul '18

From: Luke Shumaker <lukeshu(a)parabola.nu> In a patchset that I recently submitted, Eli was concerned that I was parsing .db files with bsdtar+awk, when the format of .db files isn't "public"; the only guarantees made about it are that libalpm can parse it. https://lists.archlinux.org/pipermail/arch-projects/2018-June/004932.html I wasn't too concerned, because `ftpdir-cleanup` and `sourceballs` already parse the .db files in the same way. Nonetheless, I think Eli is right: we shouldn't be parsing these files ourselves. So, add a `dbquery` function that uses pyalpm to parse the .db files: - It takes as arguments Python 3 expressions; 1. one that that returns a bool deciding whether we want to print information on a package, and 2. another that returns the string to print for a package. Currently, all callers use "True" for the decider expression, as ftpdir-cleanup and sourceballs operate on *every* package. However, I'm including a way to filter packages because, I'm coming at this from the context that I want to parse .db files in other places too. - libalpm doesn't offer an easy way to say "parse this DB file for me"; instead, we must construct a configuration that has a syncdb pointing to that file, which we then have it sync in to a temporary directory. As a final note, when re-writing the bit of sourceballs to use dbquery instead of AWK, I realized that it does not correctly handle licenses that have a space in them (as of 2018-07-07 there are 67 packages in the Arch repos that have license containing a space). I did not fix this bug; I merely translated it from AWK to Python, as the program would also need to be adjusted elsewhere. --- cron-jobs/ftpdir-cleanup | 2 +- cron-jobs/sourceballs | 14 ++------------ db-functions | 25 +++++++++++++++++++++++++ test/Dockerfile | 2 +- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 9df5f99..77e49c8 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -44,7 +44,7 @@ for repo in "${PKGREPOS[@]}"; do fi done | sort > "${WORKDIR}/repo-${repo}-${arch}" # get a list of package files defined in the repo db - bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" | awk '/^%FILENAME%/{getline;print}' | sort > "${WORKDIR}/db-${repo}-${arch}" + dbquery "$repo" "$arch" True pkg.filename | sort > "${WORKDIR}/db-${repo}-${arch}" missing_pkgs=($(comm -13 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}")) if (( ${#missing_pkgs[@]} >= 1 )); then diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index 6be28ab..784b48b 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -24,18 +24,8 @@ for repo in "${PKGREPOS[@]}"; do if [[ ! -f ${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT} ]]; then continue fi - bsdtar -xOf "${FTP_BASE}/${repo}/os/${arch}/${repo}${DBEXT}" \ - | awk '/^%NAME%/ { getline b }; - /^%BASE%/ { getline b }; - /^%VERSION%/ { getline v }; - /^%LICENSE%/,/^$/ { - if ( !/^%LICENSE%/ ) { l=l" "$0 } - }; - /^%ARCH%/ { - getline a; - printf "%s %s %s %s\n", b, v, a, l; - l=""; - }' + dbquery "$repo" "$arch" True \ + 'f"{pkg.base or pkg.name} {pkg.version} {pkg.arch} {'\'' '\''.join(pkg.licenses)}"' done | sort -u > "${WORKDIR}/db-${repo}" done diff --git a/db-functions b/db-functions index 0491c22..f1d821a 100644 --- a/db-functions +++ b/db-functions @@ -294,6 +294,31 @@ getpkgfiles() { echo "${files[@]}" } +# usage: dbquery repo arch filter_expr output_expr +dbquery() { + local repo=$1 + local arch=$2 + local filter=$3 + local output=$4 + local dbfile="${FTP_BASE}/${repo}/os/${arch}/${repo}.db" + + python3 - "$dbfile" "$filter" "$output" <<-'EOT' + import os.path + import sys + import tempfile + import pyalpm + db_dir, db_file = os.path.split(os.path.abspath(sys.argv[1])) + with tempfile.TemporaryDirectory() as tmpdirname: + handle = pyalpm.Handle(tmpdirname, tmpdirname) + db = handle.register_syncdb(db_file[:-3], 0) + db.servers = ["file://{}".format(db_dir)] + db.update(False) + for pkg in db.search(".*"): + if eval(sys.argv[2], {}, {"pkg": pkg}): + print(eval(sys.argv[3], {}, {"pkg": pkg})) + EOT +} + check_pkgfile() { local pkgfile=$1 diff --git a/test/Dockerfile b/test/Dockerfile index 83c8449..0d01a75 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,5 +1,5 @@ FROM archlinux/base -RUN pacman -Syu --noconfirm --needed sudo fakeroot awk subversion make kcov bash-bats gettext grep +RUN pacman -Syu --noconfirm --needed sudo fakeroot awk subversion make kcov bash-bats gettext grep pyalpm RUN pacman-key --init RUN echo '%wheel ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/wheel RUN useradd -N -g users -G wheel -d /build -m tester -- 2.17.1

2 4

[arch-projects] [namcap] [PATCH] Fix testsuite to not hardcode the libalpm version.
by Eli Schwartz 06 Jul '18

06 Jul '18

Namcap already depends on pyelftools, which contains an elegant way to retrieve the soname information directly from libalpm.so (demonstrated in readelf.py). Using hardcoded strings means the testsuite periodically breaks (every time the external pacman project bumps their soname), for no good reason and at least a few bad ones. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- Namcap/tests/package/test_sodepends.py | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/Namcap/tests/package/test_sodepends.py b/Namcap/tests/package/test_sodepends.py index 3a3d7b6..f94b3e9 100644 --- a/Namcap/tests/package/test_sodepends.py +++ b/Namcap/tests/package/test_sodepends.py @@ -2,7 +2,7 @@ # # namcap tests - sodepends # Copyright (C) 2011 Rémy Oudompheng <remy(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 @@ -17,11 +17,23 @@ # 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.sodepends +from elftools.elf.dynamic import DynamicSection +from elftools.elf.elffile import ELFFile + +def get_soname(filename): + with open(filename, 'rb') as f: + alpm = ELFFile(f) + for section in alpm.iter_sections(): + if not isinstance(section, DynamicSection): + continue + for tag in section.iter_tags(): + if tag.entry.d_tag == 'DT_SONAME': + return tag.soname class SoDependsTest(MakepkgTest): pkgbuild = """ @@ -47,6 +59,7 @@ package() { def test_sodepends(self): "Package with missing pacman dependency" pkgfile = "__namcap_test_sodepends-1.0-1-%(arch)s.pkg.tar" % { "arch": self.arch } + alpm_filename = os.path.join('usr/lib', get_soname('/usr/lib/libalpm.so')) with open(os.path.join(self.tmpdir, "PKGBUILD"), "w") as f: f.write(self.pkgbuild) self.run_makepkg() @@ -56,15 +69,15 @@ package() { ) self.assertEqual(pkg.detected_deps['pacman'], [ ('libraries-needed %s %s', - (str(['usr/lib/libalpm.so.10']), str(["usr/bin/main"])) + (str([alpm_filename]), str(["usr/bin/main"])) )] ) e, w, i = Namcap.depends.analyze_depends(pkg) self.assertEqual(e, [ ('dependency-detected-not-included %s (%s)', - ('pacman', "libraries ['usr/lib/libalpm.so.10'] needed in files ['usr/bin/main']")) + ('pacman', "libraries ['%s'] needed in files ['usr/bin/main']" % alpm_filename)) + ]) self.assertEqual(w, []) # vim: set ts=4 sw=4 noet: - -- 2.18.0

1 0