summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Smith <ollieparanoid@bitmessage.ch>2018-01-30 22:29:54 +0100
committerJakub Jirutka <jakub@jirutka.cz>2018-03-16 00:40:07 +0100
commit6981f3a6ae1cab387dd4273e3483a07d932d827f (patch)
treeff96c48d699079a0dccd27958def36d6ac809c0d
parent54dbf5f383a7a4248517fb7ddcb3bbf7d22f0d8b (diff)
downloadabuild-6981f3a6ae1cab387dd4273e3483a07d932d827f.tar.gz
abuild-6981f3a6ae1cab387dd4273e3483a07d932d827f.tar.bz2
abuild-6981f3a6ae1cab387dd4273e3483a07d932d827f.tar.xz
abuild-6981f3a6ae1cab387dd4273e3483a07d932d827f.zip
abuild: Change -f (force) to not ignore checksums/init scripts
The force flag used to skip the following functions, without any documentation in the help (-h) output: * verify (checksum verification) * initdcheck (check if the init scripts are openrc scripts) * check_arch (check if the target architecture is in "arch=") * check_libc (check if the target libc is masked in the options) This was counter-intuitive and could even be dangerous (when one relies on the checksum verification to prevent man-in-the-middle attacks, but always uses the -f flag). With this commit, it only skips check_arch and check_libc besides the package up to date check and the help output mentions this.
-rw-r--r--abuild.in8
1 files changed, 3 insertions, 5 deletions
diff --git a/abuild.in b/abuild.in
index 692e5c0..f6b6f90 100644
--- a/abuild.in
+++ b/abuild.in
@@ -421,10 +421,8 @@ initdcheck() {
# unpack the sources
default_unpack() {
local u
- if [ -z "$force" ]; then
- verify || return 1
- initdcheck || return 1
- fi
+ verify || return 1
+ initdcheck || return 1
mkdir -p "$srcdir"
for u in $source; do
local s
@@ -2424,7 +2422,7 @@ usage() {
-c Enable colored output
-d Disable dependency checking
-D Set APKINDEX description (default: \$repo \$(git describe))
- -f Force specified cmd, even if they are already done
+ -f Force specified cmd (skip checks: apk up to date, arch, libc)
-F Force run as root
-h Show this help
-i Install PKG after successful build