- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCH] Extend BUILDENV: Allow for supplemental scripts that enable build-time optimizations.
by Que Quotion 22 May '18

22 May '18

Signed-off-by: Que Quotion <quequotion(a)bugmenot.com> --- scripts/Makefile.am | 2 ++ scripts/libmakepkg/buildenv_ext.sh.in | 43 +++++++++++++++++++++++++++ scripts/makepkg.sh.in | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 scripts/libmakepkg/buildenv_ext.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 448057dc..094bca48 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -48,6 +48,7 @@ LIBMAKEPKGDIRS = \ lint_pkgbuild \ source \ tidy \ + buildenv_ext \ util LIBMAKEPKG_IN = \ @@ -93,6 +94,7 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/staticlibs.sh \ libmakepkg/tidy/strip.sh \ libmakepkg/tidy/zipman.sh \ + libmakepkg/buildenv_ext.sh \ libmakepkg/util.sh \ libmakepkg/util/message.sh \ libmakepkg/util/option.sh \ diff --git a/scripts/libmakepkg/buildenv_ext.sh.in b/scripts/libmakepkg/buildenv_ext.sh.in new file mode 100644 index 00000000..72d5948a --- /dev/null +++ b/scripts/libmakepkg/buildenv_ext.sh.in @@ -0,0 +1,43 @@ +#!/bin/bash +# +# buildenv_ext.sh - addional functions for altering the build environment +# before compiliation +# +# Copyright (c) 2015-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_BUILDENV_EXT_SH" ]] && return +LIBMAKEPKG_BUILDENV_EXT_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +declare -a extra_buildopts + +for lib in "$LIBRARY/buildenv_ext/"*.sh; do + source "$lib" +done + +readonly -a extra_buildopts + + +buildenv_ext() { + + # options that alter compilation parameters + for func in ${extra_buildopts[@]}; do + $func + done + +} diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 02398cf8..8f4110f8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -395,6 +395,9 @@ prepare_buildenv() { fi export DISTCC_HOSTS fi + + # Check for BUILDENV extensions, use any that are requested (check buildenv and PKGBUILD opts) + buildenv_ext } run_function_safe() { -- 2.17.0

2 1

[pacman-dev] Any final changes?
by Allan McRae 22 May '18

22 May '18

I am about to call the final freeze. Anything final to add that I missed? A

3 7

[pacman-dev] [PATCH 0/2] Add Architecture information to .BUILDINFO
by Robin Broda 16 May '18

16 May '18

For reproducible builds, Foxboron and I are working on scripts to reproduce a given package file. Generating archive links to download the same exact packages that were present on the build machine is a crucial part of this. The package names have architecture information appended to them, eg. archlinux-keyring-20180302-1-any instead of archlinux-keyring-20180302-1 so to be able to reliably regenerate the package filename, architecture information is required. The proposed patches add - An additional field, 'arch', to the .BUILDINFO file - The '-$arch' suffix used in package filenames to the packages in the 'installed' array of the .BUILDINFO Robin Broda (2): Add 'arch' field to .BUILDINFO Append '-$arch' to 'installed' array in .BUILDINFO doc/BUILDINFO.5.txt | 5 ++++- scripts/makepkg.sh.in | 13 +++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) -- 2.16.2

7 15

[pacman-dev] Full freeze for 5.1
by Allan McRae 15 May '18

15 May '18

Hi all, We are now in complete freeze. Regression bug fixes only are allowed. I have uploaded the final string change for translation - deadline for translations is the 24th of May. Final release will be made the following weekend. Thanks, Allan

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-274-g65243877
by Allan McRae 15 May '18

15 May '18

1 0

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-273-g1e7a1911
by Allan McRae 14 May '18

14 May '18

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 1e7a19113628f30450903526c36db3cde0def543 (commit) via 076b6184de2b20e9b26225d93f6f3a7030504109 (commit) via 860e4c4943ad062bd0eff99f28e7d64804b3c08e (commit) via 9aec7c3c7225ec9a2ae1124eca612a709f7abddf (commit) from 03272ad57142a1c7dacf1d9933d52650d3936225 (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 1e7a19113628f30450903526c36db3cde0def543 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu May 3 00:10:22 2018 -0400 Add http://EditorConfig.org configuration Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 076b6184de2b20e9b26225d93f6f3a7030504109 Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu May 3 00:10:21 2018 -0400 Ensure better text editor automatic filetype detection Since we no longer use vim-specific modelines, use the .asciidoc file extension which is, well, reserved for asciidoc formatted files. This should presumably work everywhere without needing editor-specific workarounds and configuration. Also add a shebang to makepkg.conf to indicate it contains bash content. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 860e4c4943ad062bd0eff99f28e7d64804b3c08e Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Thu May 3 00:10:20 2018 -0400 Remove all modelines from the project Many of these are pointless (e.g. there is no need to explicitly turn on spellchecking and language dictionaries for the manpages by default). The only useful modelines are the ones enforcing the project coding standards for indentation style (and "maybe" filetype/syntax, but everything except the asciidoc manpages and makepkg.conf is already autodetected), and indent style can be applied more easily with .editorconfig Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 9aec7c3c7225ec9a2ae1124eca612a709f7abddf Author: Eli Schwartz <eschwartz(a)archlinux.org> Date: Wed May 2 21:32:58 2018 -0400 makepkg.conf: add default protocol handler for file:// urls. This is a common URI scheme (in general if not in makepg) and we should provide a handler for it. We already allow its use for locally sourced git repositories, so it makes sense to not leave files out. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: .editorconfig | 20 +++++++ HACKING | 13 +--- Makefile.am | 2 - NEWS | 2 - configure.ac | 2 - doc/{BUILDINFO.5.txt => BUILDINFO.5.asciidoc} | 2 +- doc/Makefile.am | 70 +++++++++++----------- doc/{PKGBUILD.5.txt => PKGBUILD.5.asciidoc} | 5 +- doc/{alpm-hooks.5.txt => alpm-hooks.5.asciidoc} | 5 +- doc/{footer.txt => footer.asciidoc} | 3 - doc/{index.txt => index.asciidoc} | 4 -- doc/{libalpm.3.txt => libalpm.3.asciidoc} | 5 +- ...-template.1.txt => makepkg-template.1.asciidoc} | 5 +- doc/{makepkg.8.txt => makepkg.8.asciidoc} | 5 +- ...{makepkg.conf.5.txt => makepkg.conf.5.asciidoc} | 5 +- doc/{pacman-key.8.txt => pacman-key.8.asciidoc} | 5 +- doc/{pacman.8.txt => pacman.8.asciidoc} | 5 +- doc/{pacman.conf.5.txt => pacman.conf.5.asciidoc} | 5 +- doc/{pkgdelta.8.txt => pkgdelta.8.asciidoc} | 5 +- doc/{repo-add.8.txt => repo-add.8.asciidoc} | 5 +- ...ing-patches.txt => submitting-patches.asciidoc} | 4 -- ...nslation-help.txt => translation-help.asciidoc} | 4 -- doc/{vercmp.8.txt => vercmp.8.asciidoc} | 5 +- etc/Makefile.am | 2 - etc/makepkg.conf.in | 6 +- lib/libalpm/Makefile.am | 2 - lib/libalpm/add.c | 2 - lib/libalpm/add.h | 2 - lib/libalpm/alpm.c | 2 - lib/libalpm/alpm.h | 2 - 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 | 2 - lib/libalpm/be_package.c | 2 - lib/libalpm/be_sync.c | 2 - lib/libalpm/conflict.c | 2 - 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 | 1 - lib/libalpm/deps.h | 2 - lib/libalpm/diskspace.c | 2 - lib/libalpm/diskspace.h | 2 - lib/libalpm/dload.c | 2 - lib/libalpm/dload.h | 2 - lib/libalpm/error.c | 2 - lib/libalpm/filelist.c | 2 - lib/libalpm/filelist.h | 2 - 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 | 2 - lib/libalpm/package.h | 2 - lib/libalpm/pkghash.c | 2 - lib/libalpm/rawstr.c | 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 | 1 - lib/libalpm/trans.h | 2 - lib/libalpm/util.c | 2 - lib/libalpm/util.h | 2 - lib/libalpm/version.c | 2 - scripts/Makefile.am | 3 - scripts/makepkg-template.pl.in | 2 - scripts/makepkg.sh.in | 2 - scripts/pacman-db-upgrade.sh.in | 2 - scripts/pacman-key.sh.in | 2 - scripts/pkgdelta.sh.in | 2 - scripts/repo-add.sh.in | 1 - src/common/Makefile.am | 2 - src/common/ini.c | 2 - src/common/ini.h | 2 - src/common/util-common.c | 2 - src/common/util-common.h | 2 - src/pacman/Makefile.am | 3 - 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 | 2 - 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/Makefile.am | 2 - src/util/cleanupdelta.c | 2 - test/pacman/Makefile.am | 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/tests/Makefile.am | 2 - test/pacman/util.py | 2 - test/scripts/Makefile.am | 2 - test/scripts/human_to_size_test.sh | 2 - test/scripts/parseopts_test.sh | 2 - test/tap.sh | 2 - test/util/Makefile.am | 2 - test/util/vercmptest.sh | 2 - 130 files changed, 72 insertions(+), 331 deletions(-) create mode 100644 .editorconfig rename doc/{BUILDINFO.5.txt => BUILDINFO.5.asciidoc} (98%) rename doc/{PKGBUILD.5.txt => PKGBUILD.5.asciidoc} (99%) rename doc/{alpm-hooks.5.txt => alpm-hooks.5.asciidoc} (97%) rename doc/{footer.txt => footer.asciidoc} (91%) rename doc/{index.txt => index.asciidoc} (99%) rename doc/{libalpm.3.txt => libalpm.3.asciidoc} (89%) rename doc/{makepkg-template.1.txt => makepkg-template.1.asciidoc} (97%) rename doc/{makepkg.8.txt => makepkg.8.asciidoc} (99%) rename doc/{makepkg.conf.5.txt => makepkg.conf.5.asciidoc} (99%) rename doc/{pacman-key.8.txt => pacman-key.8.asciidoc} (97%) rename doc/{pacman.8.txt => pacman.8.asciidoc} (99%) rename doc/{pacman.conf.5.txt => pacman.conf.5.asciidoc} (99%) rename doc/{pkgdelta.8.txt => pkgdelta.8.asciidoc} (93%) rename doc/{repo-add.8.txt => repo-add.8.asciidoc} (97%) rename doc/{submitting-patches.txt => submitting-patches.asciidoc} (98%) rename doc/{translation-help.txt => translation-help.asciidoc} (98%) rename doc/{vercmp.8.txt => vercmp.8.asciidoc} (93%) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] makepkg: respect --ignorearch when verifying source or printing packagelist
by Eli Schwartz 13 May '18

13 May '18

--verifysource is often used to validate the PKGBUILD before uploading to the AUR, but currently there is no way to trivially check all sources. By default we don't check sources we won't use, because it forces downloading those sources, but in certain cases the user might need to check them regardless... --packagelist is usually used to derive the built package names for the user's machine, but in some cases, e.g. repo building, we might want to get the packagelist for all supported arches. This is primarily motivated by the desire to use this in the dbscripts testsuite (which tests for i686 and x86_64). While dbscripts could use `for a in ${ARCHES[@]}; do CARCH=$a makepkg --packagelist` it seemed easier to add this directly in makepkg once I was already changing --verifysource. This partially reverts d8591dd3418d55c5736022ef003891fc03b953e0 but ensures the use is controllable. Signed-off-by: Eli Schwartz <eschwartz(a)archlinux.org> --- doc/makepkg.8.txt | 13 ++++++++----- scripts/libmakepkg/util/pkgbuild.sh.in | 14 ++++++++++---- scripts/makepkg.sh.in | 11 ++++++++--- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index a065b795..42abceae 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -37,9 +37,10 @@ your logs and output are not localized. Options ------- *-A, \--ignorearch*:: - Ignore a missing or incomplete arch field in the build script. This is - for rebuilding packages from source when the PKGBUILD may be slightly - outdated and not updated with an `arch=('yourarch')` field. + Ignore a missing or incomplete arch field in the build script, when + building packages. This is for rebuilding packages from source when + the PKGBUILD may be slightly outdated and not updated with an `arch=('yourarch')` + field. Act on all available arches, when performing other actions. *-c, \--clean*:: Clean up leftover work files and directories after a successful build. @@ -66,7 +67,8 @@ Options if required and perform the integrity checks. No extraction or build is performed. Dependencies specified in the PKGBUILD will not be handled unless `--syncdeps` is used. Useful for performing subsequent offline - builds. + builds. When `--ignorearch` is used, verify all split arch sources instead + of just the sources for the current arch. *-f, \--force*:: makepkg will not build a package if a built package already exists in @@ -201,7 +203,8 @@ Options *\--packagelist*:: List the package filenames that would be produced without building. Listed - package filenames include PKGDEST and PKGEXT. + package filenames include PKGDEST and PKGEXT. When `--ignorearch` is used, + list filenames for all supported arches. *\--printsrcinfo*:: Generate and print the SRCINFO file to stdout. diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 2db46f1f..e23208c3 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -182,11 +182,17 @@ print_all_package_names() { local version=$(get_full_version) local architecture pkg opts a for pkg in ${pkgname[@]}; do - architecture=$(get_pkg_arch $pkg) - printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$architecture" "$PKGEXT" - if check_option "debug" "y" && check_option "strip" "y"; then - printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$architecture" "$PKGEXT" + if (( IGNOREARCH )); then + get_pkgbuild_attribute "$pkg" 'arch' 1 architecture + else + architecture=$(get_pkg_arch $pkg) fi + for a in "${architecture[@]}"; do + printf "%s/%s-%s-%s%s\n" "$PKGDEST" "$pkg" "$version" "$a" "$PKGEXT" + if check_option "debug" "y" && check_option "strip" "y"; then + printf "%s/%s-%s-%s-%s%s\n" "$PKGDEST" "$pkg" "@DEBUGSUFFIX@" "$version" "$a" "$PKGEXT" + fi + done done } diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index bc2d0061..584c10a8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1262,7 +1262,7 @@ while true; do --nosign) SIGNPKG='n' ;; -o|--nobuild) NOBUILD=1 ;; -p) shift; BUILDFILE=$1 ;; - --packagelist) PACKAGELIST=1 IGNOREARCH=1;; + --packagelist) PACKAGELIST=1 ;; --printsrcinfo) PRINTSRCINFO=1 IGNOREARCH=1;; -r|--rmdeps) RMDEPS=1 ;; -R|--repackage) REPKG=1 ;; @@ -1631,8 +1631,13 @@ if (( !REPKG )); then if (( NOEXTRACT && ! VERIFYSOURCE )); then warning "$(gettext "Using existing %s tree")" "\$srcdir/" else - download_sources - check_source_integrity + if (( VERIFYSOURCE && IGNOREARCH )); then + download_sources allarch + check_source_integrity all + else + download_sources + check_source_integrity + fi (( VERIFYSOURCE )) && exit $E_OK if (( CLEANBUILD )); then -- 2.17.0

2 3

[pacman-dev] [PATCH 0/2] makepkg: Allow placing local sources in subdirectories
by Vladimir Panteleev 13 May '18

13 May '18

Currently, makepkg doesn't support (actually, mishandles) sources in a subdirectory of the package directory. Though there aren't many uses for such a feature, it is useful for an otherwise source-less package of Arch- or site-specific scripts, to be installed on one or a few systems, for which it doesn't make sense to have a separate source repository. In this case, it would be nice to either move the source files in a subdirectory, or allow pulling them from somewhere else on the filesystem. Whether or not this is considered a valid usecase, the current behavior is broken (makepkg computes broken paths and attempts to operate on files that aren't there), so this probably ought to be fixed regardless. I couldn't find a test suite for makepkg (only pacman and makepkg-template), so, here is the test case: mkdir dir touch a dir/b /tmp/c cat > PKGBUILD <<'EOF' pkgname=dir-test pkgver=1 pkgrel=1 arch=('any') source=(a dir/b /tmp/c) md5sums=(SKIP SKIP SKIP) package() { cp "$srcdir"/* "$pkgdir/" ; } EOF One thing to note is that this doesn't protect against filename collisions: specifying dir1/file and dir2/file as sources will just make makepkg clobber the first file. Still, that's not new: source=(http://xxx/a http://yyy/a) are going to have the same problem. Vladimir Panteleev (2): libmakepkg: Fix handling of file paths in get_filepath libmakepkg: Use the correct path in extract_sources scripts/libmakepkg/source.sh.in | 2 +- scripts/libmakepkg/util/source.sh.in | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) -- 2.17.0

3 10

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v5.0.1-269-g03272ad5
by Allan McRae 12 May '18

12 May '18

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 03272ad57142a1c7dacf1d9933d52650d3936225 (commit) via 40937b381abd013cf3473af4ea04bf52fecf0854 (commit) from af6125fbcc51b2074321003c3cbd74aeb65d9b7b (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 03272ad57142a1c7dacf1d9933d52650d3936225 Author: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Date: Fri Apr 20 19:46:16 2018 +0200 libmakepkg: Support file 5.33's application/x-pie-executable file 5.33 introduces a new MIME type "application/x-pie-executable", which is used for relocatable binaries. makepkg ignored these binaries and did not attempt to strip them. Handle the new MIME type like the old "application/x-sharedlib". Stripping the binaries with --strip-unneeded to keep relocation information should be the correct thing to do. file 5.33 also misidentifies actual libraries as PIE executables, so we didn't strip any shared libraries, either. We now work around this bug. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 40937b381abd013cf3473af4ea04bf52fecf0854 Author: Andrew Gregory <andrew.gregory.8(a)gmail.com> Date: Sat Feb 25 12:21:17 2017 -0500 util/pkgbuild: fix broken indentation Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: doc/makepkg.conf.5.txt | 4 ++-- scripts/libmakepkg/tidy/strip.sh.in | 2 ++ scripts/libmakepkg/util/pkgbuild.sh.in | 16 ++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] libmakepkg: Support file 5.33's application/x-pie-executable
by Jan Alexander Steffens (heftig) 12 May '18

12 May '18

file 5.33 introduces a new MIME type "application/x-pie-executable", which is used for relocatable binaries. makepkg ignored these binaries and did not attempt to strip them. Handle the new MIME type like the old "application/x-sharedlib". Stripping the binaries with --strip-unneeded to keep relocation information should be the correct thing to do. file 5.33 also misidentifies actual libraries as PIE executables, so we didn't strip any shared libraries, either. We now work around this bug. Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens(a)gmail.com> --- scripts/libmakepkg/tidy/strip.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/libmakepkg/tidy/strip.sh.in b/scripts/libmakepkg/tidy/strip.sh.in index e20114c0..36d1b89e 100644 --- a/scripts/libmakepkg/tidy/strip.sh.in +++ b/scripts/libmakepkg/tidy/strip.sh.in @@ -125,6 +125,8 @@ tidy_strip() { esac;; *application/x-executable*) # Binaries strip_flags="$STRIP_BINARIES";; + *application/x-pie-executable*) # Relocatable binaries + strip_flags="$STRIP_SHARED";; *) continue ;; esac -- 2.17.0

5 7