commit a3264b9072fa61ac1a834445d6b2d80860f58435
parent 4daae4a9009b1340e4887d42974a0b0a50ae6c43
Author: Duncan Overbruck <mail@duncano.de>
Date: Thu, 12 Nov 2020 16:11:40 +0100
use config.h and link objects instead of libopenbsd.a
Diffstat:
21 files changed, 106 insertions(+), 51 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ version.h
*.swo
config.mk
+config.h
diff --git a/bsd.prog.mk b/bsd.prog.mk
@@ -6,16 +6,10 @@ CFLAGS += -I${CURDIR}/libopenbsd ${COPTS} -MD -MP -Wno-unused-result
include config.mk
-CFLAGS += -DDOAS_CONF="\"${SYSCONFDIR}/doas.conf\""
-
-OPENBSD := $(addprefix libopenbsd/,${OPENBSD})
OBJS := ${SRCS:.y=.c}
OBJS := ${OBJS:.c=.o}
-libopenbsd.a: ${OPENBSD}
- ${AR} -r $@ $?
-
-${PROG}: ${OBJS} libopenbsd.a
+${PROG}: ${OBJS}
${CC} ${CFLAGS} $^ -o $@ ${LDFLAGS}
install: ${PROG} ${PAM_DOAS} ${MAN}
@@ -38,14 +32,11 @@ uninstall:
rm -f ${DESTDIR}${MANDIR}/man5/doas.conf.5
clean:
- rm -f libopenbsd.a
- rm -f ${OPENBSD}
- rm -f ${OPENBSD:.o=.d}
rm -f ${OBJS}
rm -f ${OBJS:.o=.d}
rm -f ${PROG}
rm -f parse.c
--include ${OBJS:.o=.d} ${OPENBSD:.o=.d}
+-include ${OBJS:.o=.d}
.PHONY: default clean install uninstall
diff --git a/configure b/configure
@@ -72,7 +72,14 @@ for x; do
done
CONFIG_MK=config.mk
-rm -f "$CONFIG_MK"
+CONFIG_H=config.h
+rm -f "$CONFIG_MK" "$CONFIG_H"
+
+cat <<! >$CONFIG_H
+#ifndef CONFIG_H
+#define CONFIG_H
+
+!
cat <<EOF >>$CONFIG_MK
PREFIX ?= ${PREFIX:="/usr"}
@@ -111,10 +118,12 @@ OS_CFLAGS="-D__${OS}__"
case "$OS" in
linux)
- OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE -DUID_MAX=${UID_MAX} -DGID_MAX=${GID_MAX}"
+ printf 'Setting UID_MAX\t\t\t\t%d.\n' "$UID_MAX" >&2
+ printf '#define UID_MAX %s\n' "$UID_MAX" >>$CONFIG_H
+ printf 'Setting GID_MAX\t\t\t\t%d.\n' "$GID_MAX" >&2
+ printf '#define GID_MAX %s\n' "$GID_MAX" >>$CONFIG_H
+ OS_CFLAGS="$OS_CFLAGS -D_DEFAULT_SOURCE -D_GNU_SOURCE"
printf 'CURDIR := .\n' >>$CONFIG_MK
- [ -z "$WITHOUT_PAM" ] && \
- printf 'PAM_DOAS = pam.d__doas__linux\n' >>$CONFIG_MK
;;
esac
@@ -139,12 +148,13 @@ check_func() {
$XCC "_$func.c" -o "_$func" 2>/dev/null
ret=$?
rm -f "_$func.c" "_$func"
+ upperfunc="$(printf '%s\n' "$func" | tr '[[:lower:]]' '[[:upper:]]')"
if [ $ret -eq 0 ]; then
printf 'yes.\n' >&2
- upperfunc="$(printf '%s\n' "$func" | tr '[[:lower:]]' '[[:upper:]]')"
- printf 'CFLAGS += -DHAVE_%s\n' "$upperfunc" >>$CONFIG_MK
+ printf '#define HAVE_%s\n' "$upperfunc" >>$CONFIG_H
return 0
else
+ printf '/* #define HAVE_%s */\n' "$upperfunc" >>$CONFIG_H
printf 'no.\n' >&2
return 1
fi
@@ -162,8 +172,11 @@ int main(void) {
[ -z "$WITHOUT_PAM" ] && check_func "pam_appl_h" "$src" && {
printf 'SRCS += pam.c\n' >>$CONFIG_MK
printf 'LDFLAGS += -lpam\n' >>$CONFIG_MK
- printf 'CPPFLAGS += -DUSE_PAM\n' >>$CONFIG_MK
+ printf '#define USE_PAM\n' >>$CONFIG_H
printf 'pam\n'
+
+ pam_file="pam.d__doas__${OS}"
+ [ -e "$pam_file" ] && printf 'PAM_DOAS = %s\n' "$pam_file" >>$CONFIG_MK
return 0
}
@@ -178,7 +191,7 @@ int main(void) {
[ -z "$WITHOUT_SHADOW" ] && check_func "shadow_h" "$src" && {
printf 'SRCS += shadow.c\n' >>$CONFIG_MK
printf 'LDFLAGS += -lcrypt\n' >>$CONFIG_MK
- printf 'CPPFLAGS += -DUSE_SHADOW\n' >>$CONFIG_MK
+ printf '#define USE_SHADOW\n' >>$CONFIG_H
printf 'shadow\n'
return 0
}
@@ -188,7 +201,7 @@ int main(void) {
persistmethod() {
[ -z "$WITHOUT_TIMESTAMP" ] && {
- printf 'CPPFLAGS += -DUSE_TIMESTAMP\n' >>$CONFIG_MK
+ printf '#define USE_TIMESTAMP\n' >>$CONFIG_H
printf 'SRCS += timestamp.c\n' >>$CONFIG_MK
printf 'timestamp\n'
return 0
@@ -206,7 +219,7 @@ int main(void) {
return 0;
}'
check_func "explicit_bzero" "$src" || {
- printf 'OPENBSD += explicit_bzero.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/explicit_bzero.c\n' >>$CONFIG_MK
}
#
@@ -221,7 +234,7 @@ int main(void) {
return 0;
}'
check_func "strlcat" "$src" || {
- printf 'OPENBSD += strlcat.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/strlcat.c\n' >>$CONFIG_MK
}
#
@@ -236,7 +249,7 @@ int main(void) {
return 0;
}'
check_func "strlcpy" "$src" || {
- printf 'OPENBSD += strlcpy.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/strlcpy.c\n' >>$CONFIG_MK
}
#
@@ -249,7 +262,7 @@ int main(void) {
return 0;
}'
check_func "errc" "$src" || {
- printf 'OPENBSD += errc.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/errc.c\n' >>$CONFIG_MK
}
#
@@ -262,7 +275,7 @@ int main(void) {
return 0;
}'
check_func "verrc" "$src" || {
- printf 'OPENBSD += verrc.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/verrc.c\n' >>$CONFIG_MK
}
#
@@ -275,7 +288,7 @@ int main(void) {
return 0;
}'
check_func "setprogname" "$src" || {
- printf 'OPENBSD += progname.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/progname.c\n' >>$CONFIG_MK
}
#
@@ -289,7 +302,7 @@ int main(void) {
return 0;
}'
check_func "readpassphrase" "$src" || {
- printf 'OPENBSD += readpassphrase.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/readpassphrase.c\n' >>$CONFIG_MK
}
#
@@ -303,7 +316,7 @@ int main(void) {
return 0;
}'
check_func "strtonum" "$src" || {
- printf 'OPENBSD += strtonum.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/strtonum.c\n' >>$CONFIG_MK
}
#
@@ -316,7 +329,7 @@ int main(void) {
return 0;
}'
check_func "reallocarray" "$src" || {
- printf 'OPENBSD += reallocarray.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/reallocarray.c\n' >>$CONFIG_MK
}
#
@@ -341,7 +354,7 @@ int main(void) {
return 0;
}'
check_func "setresuid" "$src" || {
- printf 'OPENBSD += bsd-setres_id.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/bsd-setres_id.c\n' >>$CONFIG_MK
}
#
@@ -354,7 +367,7 @@ int main(void) {
return 0;
}'
check_func "closefrom" "$src" || {
- printf 'OPENBSD += closefrom.o\n' >>$CONFIG_MK
+ printf 'SRCS += libopenbsd/closefrom.c\n' >>$CONFIG_MK
}
#
@@ -369,17 +382,6 @@ int main(void) {
check_func "sysconf" "$src"
#
-# Check for /proc/$PID.
-#
-printf 'Checking for %-14s\t\t' "/proc/\$PID ..." >&2
-if test -d /proc/$$; then
- printf 'yes.\n' >&2
- printf 'CFLAGS += -DHAVE_%s\n' "PROC_PID" >>$CONFIG_MK
-else
- printf 'no.\n' >&2
-fi
-
-#
# Check for dirfd().
#
src='
@@ -490,5 +492,7 @@ if [ $? -eq 0 ]; then
else
printf 'Using persist method\t\t\tnone.\n' >&2
fi
-printf 'Setting UID_MAX\t\t\t\t%d.\n' "$UID_MAX" >&2
-printf 'Setting GID_MAX\t\t\t\t%d.\n' "$GID_MAX" >&2
+
+printf '#define DOAS_CONF "%s/doas.conf"\n' "${SYSCONFDIR}" >>$CONFIG_H
+
+printf '\n#endif /* CONFIG_H */\n' >>$CONFIG_H
diff --git a/doas.c b/doas.c
@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
diff --git a/env.c b/env.c
@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <sys/types.h>
#include "sys-tree.h"
diff --git a/libopenbsd/bsd-setres_id.c b/libopenbsd/bsd-setres_id.c
@@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#include "includes.h"
+#include "config.h"
#include <sys/types.h>
diff --git a/libopenbsd/closefrom.c b/libopenbsd/closefrom.c
@@ -22,6 +22,8 @@
* PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
*/
+#include "config.h"
+
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
diff --git a/libopenbsd/errc.c b/libopenbsd/errc.c
@@ -28,11 +28,13 @@
* SUCH DAMAGE.
*/
-#include "includes.h"
+#include "config.h"
#include <err.h>
#include <stdarg.h>
+#include "openbsd.h"
+
void __dead
errc(int eval, int code, const char *fmt, ...)
{
diff --git a/libopenbsd/explicit_bzero.c b/libopenbsd/explicit_bzero.c
@@ -4,6 +4,8 @@
* Written by Matthew Dempsky.
*/
+#include "config.h"
+
#include <string.h>
#define __UNUSED __attribute__ ((unused))
diff --git a/libopenbsd/openbsd.h b/libopenbsd/openbsd.h
@@ -14,9 +14,6 @@
/* API definitions lifted from OpenBSD src/include */
-/* pwd.h */
-#define _PW_NAME_LEN 63
-
/* stdlib.h */
#ifndef HAVE_REALLOCARRAY
void * reallocarray(void *optr, size_t nmemb, size_t size);
diff --git a/libopenbsd/progname.c b/libopenbsd/progname.c
@@ -30,6 +30,8 @@
* <https://sourceware.org/ml/libc-alpha/2006-03/msg00125.html>.
*/
+#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <stdlib.h>
diff --git a/libopenbsd/readpassphrase.c b/libopenbsd/readpassphrase.c
@@ -23,7 +23,7 @@
/* OPENBSD ORIGINAL: lib/libc/gen/readpassphrase.c */
-#include "includes.h"
+#include "config.h"
#ifndef HAVE_READPASSPHRASE
diff --git a/libopenbsd/reallocarray.c b/libopenbsd/reallocarray.c
@@ -15,6 +15,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <sys/types.h>
#include <errno.h>
#include <stdint.h>
diff --git a/libopenbsd/strlcat.c b/libopenbsd/strlcat.c
@@ -16,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <sys/types.h>
#include <string.h>
diff --git a/libopenbsd/strlcpy.c b/libopenbsd/strlcpy.c
@@ -16,6 +16,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <sys/types.h>
#include <string.h>
diff --git a/libopenbsd/strtonum.c b/libopenbsd/strtonum.c
@@ -17,6 +17,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
diff --git a/libopenbsd/verrc.c b/libopenbsd/verrc.c
@@ -28,7 +28,7 @@
* SUCH DAMAGE.
*/
-#include "includes.h"
+#include "config.h"
#include <err.h>
#include <stdio.h>
@@ -36,6 +36,8 @@
#include <string.h>
#include <stdarg.h>
+#include "openbsd.h"
+
void __dead
verrc(int eval, int code, const char *fmt, va_list ap)
{
diff --git a/pam.c b/pam.c
@@ -14,6 +14,8 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "config.h"
+
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/parse.y b/parse.y
@@ -16,6 +16,8 @@
*/
%{
+#include "config.h"
+
#include <sys/types.h>
#include <ctype.h>
#include <err.h>
diff --git a/shadow.c b/shadow.c
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2020 Duncan Overbruck <mail@duncano.de>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "config.h"
+
#if HAVE_CRYPT_H
# include <crypt.h>
#endif
diff --git a/timestamp.c b/timestamp.c
@@ -1,4 +1,22 @@
/*
+ * Copyright (c) 2020 Duncan Overbruck <mail@duncano.de>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "config.h"
+
+/*
* 1) Timestamp files and directories
*
* Timestamp files MUST NOT be accessible to users other than root,
