From e3e9cc14a52062e2c3e0f4e2c4c6dec8efc68be4 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Sat, 5 Nov 2016 18:08:17 -0400 Subject: makepkg: reject packages with newlines in paths libalpm's local database format does not support paths with newlines. Signed-off-by: Andrew Gregory Signed-off-by: Allan McRae --- scripts/Makefile.am | 1 + scripts/libmakepkg/lint_package/file_names.sh.in | 42 ++++++++++++++++++++++++ scripts/po/POTFILES.in | 1 + 3 files changed, 44 insertions(+) create mode 100644 scripts/libmakepkg/lint_package/file_names.sh.in diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 1ce460d1..41a9f5da 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/file_names.sh \ libmakepkg/lint_package/missing_backup.sh \ libmakepkg/lint_pkgbuild.sh \ libmakepkg/lint_pkgbuild/arch.sh \ diff --git a/scripts/libmakepkg/lint_package/file_names.sh.in b/scripts/libmakepkg/lint_package/file_names.sh.in new file mode 100644 index 00000000..56458a33 --- /dev/null +++ b/scripts/libmakepkg/lint_package/file_names.sh.in @@ -0,0 +1,42 @@ +#!/bin/bash +# +# file_names.sh - check package file names +# +# Copyright (c) 2016 Pacman Development Team +# +# 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 . +# + +[[ -n "$LIBMAKEPKG_LINT_PACKAGE_FILE_NAMES_SH" ]] && return +LIBMAKEPKG_LINT_PACKAGE_FILE_NAMES_SH=1 + +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + +source "$LIBRARY/util/message.sh" + +lint_package_functions+=('lint_file_names') + +lint_file_names() { + local ret=0 paths + + # alpm's local database format does not support newlines in paths + mapfile -t paths < <(find "$pkgdir" -name \*$'\n'\*) + if (( ${#paths} > 0 )); then + error "$(gettext 'Package contains paths with newlines')" + printf '%s\n' "${paths[@]}" >&2 + ret=1 + fi + + return $ret +} diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in index aa9e6764..4f47fc3b 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/file_names.sh.in scripts/libmakepkg/lint_package/missing_backup.sh.in scripts/libmakepkg/lint_pkgbuild.sh.in scripts/libmakepkg/lint_pkgbuild/arch.sh.in -- cgit v1.2.3-70-g09d2