opendoas

A portable version of the OpenBSD `doas` command
git clone https://pi.duncano.de/git/opendoas.git
Log | Files | Refs | README | LICENSE

commit eb33da16ec8b0203cd48cd06f85bb4e9cf19d250
parent e18b632f557e28278a1bc8e384572378ce91e000
Author: Duncaen <mail@duncano.de>
Date:   Sun,  8 May 2016 21:32:55 +0200

More configure and make cleanup

Diffstat:
Makefile | 1-
bsd.prog.mk | 19+++++++++----------
configure | 34++++++++++++++++++----------------
3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile @@ -11,6 +11,5 @@ BINMODE=4511 CFLAGS+= -I${CURDIR} COPTS+= -Wall -Wextra -Werror -pedantic -std=c11 -LDFLAGS+= -lpam include bsd.prog.mk diff --git a/bsd.prog.mk b/bsd.prog.mk @@ -2,21 +2,21 @@ default: ${PROG} +CFLAGS += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP + include config.mk -OPENBSD:=$(addprefix libopenbsd/,${OPENBSD:.c=.o}) +OPENBSD := $(addprefix libopenbsd/,${OPENBSD}) +OBJS := ${SRCS:.y=.c} +OBJS := ${OBJS:.c=.o} + libopenbsd.a: ${OPENBSD} ${AR} -r $@ $? -CFLAGS:=${CFLAGS} -I${CURDIR}/libopenbsd ${COPTS} -MD -MP - -OBJS:=${SRCS:.y=.c} -OBJS:=${OBJS:.c=.o} - ${PROG}: ${OBJS} libopenbsd.a ${CC} ${CFLAGS} ${LDFLAGS} $^ -o $@ -install: ${PROG} ${PAM_DOAS} +install: ${PROG} ${PAM_DOAS} ${MAN} mkdir -p -m 0755 ${DESTDIR}${BINDIR} mkdir -p -m 0755 ${DESTDIR}${PAMDIR} mkdir -p -m 0755 ${DESTDIR}${MANDIR}/man1 @@ -38,7 +38,6 @@ clean: rm -f ${OBJS:.o=.d} rm -f ${PROG} --include ${objs:.o=.d} ${OPENBSD:.o=.d} +-include ${OBJS:.o=.d} ${OPENBSD:.o=.d} -.PHONY: default clean install man -.INTERMEDIATE: .${PROG}.chmod +.PHONY: default clean install diff --git a/configure b/configure @@ -58,7 +58,6 @@ rm -f "$CONFIG_MK" : ${VERSION:="$(git describe --dirty --tags --long --always)"} cat <<EOF >>$CONFIG_MK -DESTDIR ?= PREFIX ?= ${PREFIX:="/usr"} EPREFIX ?= ${EPREFIX:="${PREFIX}"} BINDIR ?= ${BINDIR:="${PREFIX}/bin"} @@ -92,9 +91,11 @@ if [ -z "$OS" ]; then KERNEL=${REST%%-*} fi +OS_FLAGS="-D__${OS}__" + case "$OS" in linux) - OS_CFLAGS="-D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=60000 -DGID_MAX=60000" + 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 ;; @@ -139,7 +140,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 } @@ -155,7 +156,7 @@ int main(void) { return 0; }' check_func "strlcat" "$src" || { - printf 'OPENBSD += strlcat.c\n' >>$CONFIG_MK + printf 'OPENBSD += strlcat.o\n' >>$CONFIG_MK } # @@ -170,7 +171,7 @@ int main(void) { return 0; }' check_func "strlcpy" "$src" || { - printf 'OPENBSD += strlcpy.c\n' >>$CONFIG_MK + printf 'OPENBSD += strlcpy.o\n' >>$CONFIG_MK } # @@ -183,7 +184,7 @@ int main(void) { return 0; }' check_func "errc" "$src" || { - printf 'OPENBSD += errc.c\n' >>$CONFIG_MK + printf 'OPENBSD += errc.o\n' >>$CONFIG_MK } # @@ -196,7 +197,7 @@ int main(void) { return 0; }' check_func "verrc" "$src" || { - printf 'OPENBSD += verrc.c\n' >>$CONFIG_MK + printf 'OPENBSD += verrc.o\n' >>$CONFIG_MK } # @@ -209,7 +210,7 @@ int main(void) { return 0; }' check_func "setprogname" "$src" || { - printf 'OPENBSD += progname.c\n' >>$CONFIG_MK + printf 'OPENBSD += progname.o\n' >>$CONFIG_MK } # @@ -223,7 +224,7 @@ int main(void) { return 0; }' check_func "readpassphrase" "$src" || { - printf 'OPENBSD += readpassphrase.c\n' >>$CONFIG_MK + printf 'OPENBSD += readpassphrase.o\n' >>$CONFIG_MK } # @@ -237,7 +238,7 @@ int main(void) { return 0; }' check_func "strtonum" "$src" || { - printf 'OPENBSD += strtonum.c\n' >>$CONFIG_MK + printf 'OPENBSD += strtonum.o\n' >>$CONFIG_MK } # @@ -250,7 +251,7 @@ int main(void) { return 0; }' check_func "reallocarray" "$src" || { - printf 'OPENBSD += reallocarray.c\n' >>$CONFIG_MK + printf 'OPENBSD += reallocarray.o\n' >>$CONFIG_MK } # @@ -275,6 +276,7 @@ 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 } # @@ -286,7 +288,7 @@ int main(void) { return 0; }' check_func "login_cap_h" "$src" || { - printf 'OPENBSD += setusercontext.c\n' >>$CONFIG_MK + printf 'OPENBSD += setusercontext.o\n' >>$CONFIG_MK } # @@ -300,7 +302,7 @@ int main(void) { return 0; }' check_func "execvpe" "$src" || { - printf 'OPENBSD += execvpe.c\n' >>$CONFIG_MK + printf 'OPENBSD += execvpe.o\n' >>$CONFIG_MK } # @@ -313,7 +315,7 @@ int main(void) { return 0; }' check_func "setresuid" "$src" || { - printf 'OPENBSD += setresuid.c\n' >>$CONFIG_MK + printf 'OPENBSD += setresuid.o\n' >>$CONFIG_MK } # @@ -344,8 +346,8 @@ int main(void) { check_func "seccomp_h" "$src" && \ { have_pledge=1 - printf 'OPENBSD += pledge-seccomp.c\n' >>$CONFIG_MK + printf 'OPENBSD += pledge-seccomp.o\n' >>$CONFIG_MK } [ -z "$have_pledge" ] && \ - printf 'OPENBSD += pledge-noop.c\n' >>$CONFIG_MK + printf 'OPENBSD += pledge-noop.o\n' >>$CONFIG_MK