summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2007-06-01 13:43:41 -0400
committerDan McGee <dan@archlinux.org>2007-06-01 13:43:41 -0400
commitfb10e0c797b649dc036bc0432dc77cffaabbc56d (patch)
tree46924f0fdadc7c65f992ac7a6e467f6d3d6c43c0
parent6f183cb9847082eab5aa4e27e25629aca31af05c (diff)
downloadpacman-fb10e0c797b649dc036bc0432dc77cffaabbc56d.tar.xz
Drop --usesudo option and add some checks related to ASROOT
Drop the --usesudo option and use it by default if running as a non-root user. Check the usage of the --asroot option and do not allow it to be used as a normal user. A few other small fixes, including a typo in $confdir. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/makepkg.810
-rw-r--r--scripts/makepkg.in60
2 files changed, 37 insertions, 33 deletions
diff --git a/doc/makepkg.8 b/doc/makepkg.8
index 2f7c359b..9135be21 100644
--- a/doc/makepkg.8
+++ b/doc/makepkg.8
@@ -101,11 +101,11 @@ Install missing dependencies using \fBpacman\fP. When missing build-time or
run-time dependencies are found, \fBpacman\fP will try to resolve them. If
successful, the missing packages will be downloaded and installed.
.TP
-.B \-S, --usesudo
-Use \fBsudo\fP to perform all operations that require \fBpacman\fP. This is
-useful for \fB--install\fP, \fB--rmdeps\fP, and \fB--syncdeps\fP. If you are
-building packages as a non-root user as recommended, this option should be used
-if using any option that calls \fBpacman\fP.
+.B \--asroot
+This option allows you to run \fBmakepkg\fP as root. You should not normally
+run \fBmakepkg\fP as root unless you know what you are doing. For any
+operations that require \fBpacman\fP, \fBsudo\fP is normally used; this switch
+will call \fBpacman\fP directly.
.TP
.B \--noconfirm
(Passed to \fBpacman\fP) Prevent \fBpacman\fP from waiting for user input
diff --git a/scripts/makepkg.in b/scripts/makepkg.in
index fbb9e193..5f14b52d 100644
--- a/scripts/makepkg.in
+++ b/scripts/makepkg.in
@@ -43,7 +43,6 @@ CLEANUP=0
CLEANCACHE=0
DEP_BIN=0
DEP_SRC=0
-SUDO=0
FORCE=0
INFAKEROOT=0
GENINTEG=0
@@ -241,10 +240,6 @@ handledeps() {
if [ "$DEP_SRC" = "0" -a "$DEP_BIN" = "0" ]; then
return $R_DEPS_MISSING
- elif [ "$SUDO" = 0 -a $EUID -gt 0 ]; then
- warning "$(gettext "Cannot auto-install missing dependencies as a normal user without sudo!")"
- plain "$(gettext "Run makepkg as root or with -S to resolve dependencies automatically.")"
- return $R_DEPS_MISSING
fi
if [ "$DEP_BIN" = "1" ]; then
@@ -252,7 +247,7 @@ handledeps() {
msg "$(gettext "Installing missing dependencies...")"
local ret=0
- if [ "$SUDO" = 1 ]; then
+ if [ "$ASROOT" = 0 ]; then
sudo pacman $PACMAN_OPTS -S $striplist || ret=$?
else
pacman $PACMAN_OPTS -S $striplist || ret=$?
@@ -335,7 +330,6 @@ resolvedeps() {
# fix flyspray bug #5923
removedeps() {
[ "$RMDEPS" = "0" ] && return
- [ "$SUDO" = "0" -a $EUID -gt 0 ] && return
# runtimedeps and buildtimedeps are set when resolving deps
local deplist="$runtimedeps $buildtimedeps"
@@ -349,7 +343,7 @@ removedeps() {
done
msg "Removing installed dependencies..."
- if [ "$SUDO" = "1" ]; then
+ if [ "$ASROOT" = "0" ]; then
sudo pacman $PACMAN_OPTS -Rs $striplist
else
pacman $PACMAN_OPTS -Rs $striplist
@@ -463,7 +457,7 @@ tidy_install() {
*application/x-sharedlib*) # Libraries
/usr/bin/strip --strip-debug "$file";;
*application/x-executable*) # Binaries
- /usr/bin/strip "$file";;
+ /usr/bin/strip "$file";;
esac
done
fi
@@ -654,12 +648,13 @@ create_srcpackage() {
}
installpackage() {
- if [ "$INSTALL" = "1" -a "$SUDO" = "1" ]; then
- msg "$(gettext "Installing package with pacman -U...")"
+ [ "$INSTALL" = "0" ] && return
+
+ msg "$(gettext "Installing package with pacman -U...")"
+ if [ "$ASROOT" = "0" ]; then
sudo pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
exit $?
- elif [ "$INSTALL" = "1" -a "$EUID" = "0" -a "$INFAKEROOT" != "1" ]; then
- msg "$(gettext "Installing package with pacman -U...")"
+ else
pacman $PACMAN_OPTS -U $PKGDEST/${pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
exit $?
fi
@@ -688,7 +683,7 @@ usage() {
# fix flyspray feature request #2978
echo "$(gettext " -R, --repackage Repackage contents of pkg/ without building")"
echo "$(gettext " -s, --syncdeps Install missing dependencies with pacman")"
- echo "$(gettext " -S, --usesudo When calling pacman, use sudo")"
+ echo "$(gettext " --asroot Allow makepkg to run as root user")"
echo "$(gettext " --source Do not build package; generate a source-only tarball")"
echo
echo "$(gettext "These options can be passed to pacman:")"
@@ -717,7 +712,7 @@ _SRCDEST=${SRCDEST}
# Source makepkg.conf; fail if it is not found
if [ -r "$confdir/makepkg.conf" ]; then
- source "$condir/makepkg.conf"
+ source "$confdir/makepkg.conf"
else
error "$(gettext "%s not found. cannot continue")" "$confdir/makepkg.conf"
exit 1 # $E_CONFIG_ERROR # TODO: error codes
@@ -755,7 +750,6 @@ while [ "$#" -ne "0" ]; do
--clean) CLEANUP=1 ;;
--cleancache) CLEANCACHE=1 ;;
--syncdeps) DEP_BIN=1 ;;
- --usesudo) SUDO=1 ;;
--builddeps) DEP_SRC=1 ;;
--nodeps) NODEPS=1 ;;
--noextract) NOEXTRACT=1 ;;
@@ -799,7 +793,6 @@ while [ "$#" -ne "0" ]; do
r) RMDEPS=1 ;;
R) REPKG=1 ;;
s) DEP_BIN=1 ;;
- S) SUDO=1 ;;
h)
usage
exit 0
@@ -826,12 +819,6 @@ while [ "$#" -ne "0" ]; do
shift
done
-# check for sudo
-if [ "$SUDO" = "1" -a ! "$(type -p sudo)" ]; then
- error "$(gettext "Cannot find the sudo binary! Is sudo installed?")"
- exit 1
-fi
-
if [ "$CLEANCACHE" = "1" ]; then
#fix flyspray feature request #5223
if [ -n "$SRCDEST" -a "$SRCDEST" != "$startdir" ]; then
@@ -868,25 +855,27 @@ if [ -z $BUILDSCRIPT ]; then
fi
if [ "$INFAKEROOT" = "0" ]; then
- if [ $EUID -eq 0 -a $ASROOT -eq 0 ]; then
+ if [ $EUID -eq 0 -a "$ASROOT" = "0" ]; then
# Warn those who like to live dangerously.
error "$(gettext "Running makepkg as root is a BAD idea and can cause")"
plain "$(gettext "permanent, catastrophic damage to your system. If you")"
plain "$(gettext "wish to run as root, please use the --asroot option.")"
- plain ""
+ exit 1 # $E_USER_ABORT
+ elif [ $EUID -gt 0 -a "$ASROOT" = "1" ]; then
+ # Warn those who try to use the --asroot option when they are not root
+ error "$(gettext "The --asroot option is meant for the root user only.")"
+ plain "$(gettext "Please rerun makepkg without the --asroot flag.")"
exit 1 # $E_USER_ABORT
elif [ "$(check_buildenv fakeroot)" = "y" ]; then
if [ ! $(type -p fakeroot) ]; then
error "$(gettext "fakeroot must be installed if using the 'fakeroot' option")"
plain "$(gettext "in the BUILDENV array in makepkg.conf.")"
- plain ""
exit 1
fi
else
warning "$(gettext "Running makepkg as an unprivileged user will result in non-root")"
plain "$(gettext "ownership of the packaged files. Try using the fakeroot environment by")"
plain "$(gettext "placing 'fakeroot' in the BUILDENV array in makepkg.conf.")"
- plain ""
sleep 1
fi
else
@@ -896,6 +885,17 @@ else
fi
fi
+# check for sudo if we will need it during makepkg execution
+if [ "$ASROOT" = "0" -a \( "$DEP_BIN" = "1" -o "$DEP_SRC" = "1" \
+ -o "$RMDEPS" = "1" -o "$INSTALL" = "1" \) ]; then
+ if [ ! "$(type -p sudo)" ]; then
+ error "$(gettext "Cannot find the sudo binary! Is sudo installed?")"
+ plain "$(gettext "Missing dependencies cannot be installed or removed as a normal user")"
+ plain "$(gettext "without sudo; install and configure sudo to auto-resolve dependencies.")"
+ exit 1
+ fi
+fi
+
unset pkgname pkgver pkgrel pkgdesc url license groups provides md5sums force
unset replaces depends conflicts backup source install build makedepends
unset options noextract
@@ -974,6 +974,10 @@ fi
date=$(date)
msg "$(gettext "Making package: %s")" "$pkgname $pkgver-$pkgrel ($date)"
+if [ $EUID -eq 0 ]; then
+ warning "$(gettext "Running makepkg as root...")"
+fi
+
# if we are creating a source-only package, go no further
if [ "$SOURCEONLY" = "1" ]; then
if [ -f "$PKGDEST/${pkgname}-${pkgver}-${pkgrel}${SRCEXT}" \
@@ -1199,7 +1203,7 @@ else
fi
done
- if [ "$EUID" = "0" ]; then
+ if [ $EUID -eq 0 ]; then
# chown all source files to root.root
chown -R root.root "$srcdir"
fi