remove pledge seccomp shim

[opendoas.git] / configure

diff --git a/configure b/configure
index 66589b9ec575d8fdafca62973c91768229ae74b2..d8543218f2e7f2101de3c6fcf5b4326d7f62a57c 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@ die() {
 
 usage() {
        cat <<EOF
-usage: configure [options] [settings]
+usage: configure [options]
 
   --prefix=PREFIX        installation prefix [/usr]
   --exec-prefix=EPREFIX  installation prefix for executable files [PREFIX]
@@ -22,7 +22,6 @@ usage: configure [options] [settings]
   --target=target-alias  the machine that CC will produce code for
 
   --enable-debug         enable debugging
-  --enable-seccomp       enable seccomp
   --enable-static        prepare for static build
 
   --help, -h             display this help and exit
@@ -45,7 +44,6 @@ for x; do
        --host) HOST=$var;;
        --target) TARGET=$var;;
        --enable-debug) DEBUG=yes;;
-       --enable-seccomp) BUILD_SECCOMP=yes;;
        --enable-static) BUILD_STATIC=yes;;
        --help|-h) usage;;
        *) die "Error: unknown option $opt";;
@@ -55,8 +53,10 @@ done
 CONFIG_MK=config.mk
 rm -f "$CONFIG_MK"
 
+# : ${VERSION:="$(git describe --dirty --tags --long --always)"}
+: ${VERSION:="0.2"}
+
 cat <<EOF >>$CONFIG_MK
-DESTDIR  ?=    /
 PREFIX   ?=    ${PREFIX:="/usr"}
 EPREFIX  ?=    ${EPREFIX:="${PREFIX}"}
 BINDIR   ?=    ${BINDIR:="${PREFIX}/bin"}
@@ -64,6 +64,7 @@ SHAREDIR ?=   ${SHAREDIR:="${PREFIX}/share"}
 MANDIR   ?=    ${MANDIR:="${SHAREDIR}/man"}
 SYSCONFDIR?=   ${SYSCONFDIR:="/etc"}
 PAMDIR   ?=    ${PAMDIR:="${SYSCONFDIR}/pam.d"}
+CFLAGS   +=    -DVERSION="\"${VERSION}\""
 EOF
 
 if [ -z "$BUILD" ]; then
@@ -89,9 +90,11 @@ if [ -z "$OS" ]; then
        KERNEL=${REST%%-*}
 fi
 
+OS_CFLAGS="-D__${OS}__"
+
 case "$OS" in
        linux)
-               OS_CFLAGS="-D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000"
+               OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000"
                printf 'CURDIR   :=     .\n' >>$CONFIG_MK
                printf 'PAM_DOAS  =     pam.d__doas__linux\n' >>$CONFIG_MK
                ;;
@@ -136,7 +139,7 @@ int main(void) {
        return 0;
 }'
 check_func "explicit_bzero" "$src" || {
-       printf 'OPENBSD  +=     explicit_bzero.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     explicit_bzero.o\n' >>$CONFIG_MK
 }
 
 
@@ -152,7 +155,7 @@ int main(void) {
        return 0;
 }'
 check_func "strlcat" "$src" || {
-       printf 'OPENBSD  +=     strlcat.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     strlcat.o\n' >>$CONFIG_MK
 }
 
 #
@@ -167,7 +170,7 @@ int main(void) {
        return 0;
 }'
 check_func "strlcpy" "$src" || {
-       printf 'OPENBSD  +=     strlcpy.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     strlcpy.o\n' >>$CONFIG_MK
 }
 
 #
@@ -180,7 +183,7 @@ int main(void) {
        return 0;
 }'
 check_func "errc" "$src" || {
-       printf 'OPENBSD  +=     errc.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     errc.o\n' >>$CONFIG_MK
 }
 
 #
@@ -193,7 +196,7 @@ int main(void) {
        return 0;
 }'
 check_func "verrc" "$src" || {
-       printf 'OPENBSD  +=     verrc.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     verrc.o\n' >>$CONFIG_MK
 }
 
 #
@@ -206,7 +209,7 @@ int main(void) {
        return 0;
 }'
 check_func "setprogname" "$src" || {
-       printf 'OPENBSD  +=     progname.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     progname.o\n' >>$CONFIG_MK
 }
 
 #
@@ -220,7 +223,7 @@ int main(void) {
        return 0;
 }'
 check_func "readpassphrase" "$src" || {
-       printf 'OPENBSD  +=     readpassphrase.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     readpassphrase.o\n' >>$CONFIG_MK
 }
 
 #
@@ -234,7 +237,7 @@ int main(void) {
        return 0;
 }'
 check_func "strtonum" "$src" || {
-       printf 'OPENBSD  +=     strtonum.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     strtonum.o\n' >>$CONFIG_MK
 }
 
 #
@@ -247,7 +250,7 @@ int main(void) {
        return 0;
 }'
 check_func "reallocarray" "$src" || {
-       printf 'OPENBSD  +=     reallocarray.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     reallocarray.o\n' >>$CONFIG_MK
 }
 
 #
@@ -272,20 +275,9 @@ int main(void) {
 [ -z "$have_bsd_auth_h" ] && \
        check_func "pam_appl_h" "$src" && {
                printf 'SRCS     +=     doas_pam.c\n' >>$CONFIG_MK
+               printf 'LDFLAGS  +=     -lpam\n' >>$CONFIG_MK
        }
 
-#
-# Check for login_cap.h.
-#
-src='
-#include <login_cap.h>
-int main(void) {
-       return 0;
-}'
-check_func "login_cap_h" "$src" || {
-       printf 'OPENBSD  +=     setusercontext.c\n' >>$CONFIG_MK
-}
-
 #
 # Check for execvpe().
 #
@@ -297,7 +289,7 @@ int main(void) {
        return 0;
 }'
 check_func "execvpe" "$src" || {
-       printf 'OPENBSD  +=     execvpe.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     execvpe.o\n' >>$CONFIG_MK
 }
 
 #
@@ -310,7 +302,7 @@ int main(void) {
        return 0;
 }'
 check_func "setresuid" "$src" || {
-       printf 'OPENBSD  +=     setresuid.c\n' >>$CONFIG_MK
+       printf 'OPENBSD  +=     setresuid.o\n' >>$CONFIG_MK
 }
 
 #
@@ -322,27 +314,6 @@ int main(void) {
        pledge("", NULL);
        return 0;
 }'
-check_func "pledge" "$src" && {
-       have_pledge=1
+check_func "pledge" "$src" || {
+       printf 'OPENBSD  +=     pledge-noop.o\n' >>$CONFIG_MK
 }
-
-#
-# Check for seccomp.h
-#
-src='
-#include <linux/seccomp.h>
-#include <sys/prctl.h>
-#include <unistd.h>
-int main(void) {
-       prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER, NULL);
-       return 0;
-}'
-[ -z "$have_pledge" -a -n "$BUILD_SECCOMP" ] && \
-       check_func "seccomp_h" "$src" && \
-       {
-               have_pledge=1
-               printf 'OPENBSD  +=     pledge-seccomp.c\n' >>$CONFIG_MK
-       }
-
-[ -z "$have_pledge" ] && \
-       printf 'OPENBSD  +=     pledge-noop.c\n' >>$CONFIG_MK