diff options
Diffstat (limited to 'doas.patch')
| -rw-r--r-- | doas.patch | 145 |
1 files changed, 0 insertions, 145 deletions
diff --git a/doas.patch b/doas.patch deleted file mode 100644 index 70e5c3ad20ad..000000000000 --- a/doas.patch +++ /dev/null @@ -1,145 +0,0 @@ -diff -ura doas-6.2p2-old/doas.1 doas-6.2p2-new/doas.1 ---- doas-6.2p2-old/doas.1 2019-10-13 02:07:28.000000000 +1100 -+++ doas-6.2p2-new/doas.1 2019-11-07 13:03:09.849984860 +1100 -@@ -91,7 +91,7 @@ - .Bl -bullet -compact - .It - The config file --.Pa /usr/local/etc/doas.conf -+.Pa /etc/doas.conf - could not be parsed. - .It - The user attempted to run a command which is not permitted. -diff -ura doas-6.2p2-old/doas.conf.5 doas-6.2p2-new/doas.conf.5 ---- doas-6.2p2-old/doas.conf.5 2019-10-13 02:07:28.000000000 +1100 -+++ doas-6.2p2-new/doas.conf.5 2019-11-07 13:03:09.849984860 +1100 -@@ -20,7 +20,7 @@ - .Nm doas.conf - .Nd doas configuration file - .Sh SYNOPSIS --.Nm /usr/local/etc/doas.conf -+.Nm doas.conf - .Sh DESCRIPTION - The - .Xr doas 1 -@@ -125,6 +125,11 @@ - If quotes or backslashes are used in a word, - it is not considered a keyword. - .El -+.Sh FILES -+.Bl -tag -width "/etc/doas.conf" -+.It Pa /etc/doas.conf -+doas configuration file. -+.El - .Sh EXAMPLES - The following example permits users in group wsrc to build ports; - wheel to execute commands as any user while keeping the environment -diff -ura doas-6.2p2-old/Makefile doas-6.2p2-new/Makefile ---- doas-6.2p2-old/Makefile 2019-10-13 02:07:28.000000000 +1100 -+++ doas-6.2p2-new/Makefile 2019-11-07 13:05:35.273137128 +1100 -@@ -1,68 +1,38 @@ --CC?=clang --YACC?=yacc --BIN=doas --PREFIX?=/usr/local --MANDIR?=$(DESTDIR)$(PREFIX)/man --SYSCONFDIR?=$(DESTDIR)$(PREFIX)/etc --OBJECTS=doas.o env.o compat/execvpe.o compat/reallocarray.o y.tab.o --OPT?=-O2 --# Can set GLOBAL_PATH here to set PATH for target user. --# TARGETPATH=-DGLOBAL_PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:\" --CFLAGS+=-Wall $(OPT) -DUSE_PAM -DDOAS_CONF=\"${SYSCONFDIR}/doas.conf\" $(TARGETPATH) --CPPFLAGS+=-include compat/compat.h --LDFLAGS+=-lpam --UNAME_S := $(shell uname -s) --ifeq ($(UNAME_S),Linux) -- LDFLAGS+=-lpam_misc -- CPPFLAGS+=-Icompat -- CFLAGS+=-D_GNU_SOURCE -- COMPAT+=closefrom.o errc.o getprogname.o setprogname.o strlcat.o strlcpy.o strtonum.o verrc.o -- OBJECTS+=$(COMPAT:%.o=compat/%.o) --endif --ifeq ($(UNAME_S),FreeBSD) -- CFLAGS+=-DHAVE_LOGIN_CAP_H -- LDFLAGS+=-lutil --endif --ifeq ($(UNAME_S),SunOS) -- SAFE_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin -- GLOBAL_PATH?=/bin:/sbin:/usr/bin:/usr/sbin:$(PREFIX)/bin:$(PREFIX)/sbin -- CPPFLAGS+=-Icompat -- CFLAGS+=-DSOLARIS_PAM -DSAFE_PATH=\"$(SAFE_PATH)\" -DGLOBAL_PATH=\"$(GLOBAL_PATH)\" -- COMPAT=errc.o pm_pam_conv.o setresuid.o verrc.o -- OBJECTS+=$(COMPAT:%.o=compat/%.o) --endif --ifeq ($(UNAME_S),Darwin) -- CPPFLAGS+=-Icompat -- COMPAT+=bsd-closefrom.o -- OBJECTS+=$(COMPAT:%.o=compat/%.o) -- # On MacOS the default man page path is /usr/local/share/man -- MANDIR=$(DESTDIR)$(PREFIX)/share/man --endif -- --all: $(OBJECTS) -- $(CC) -o $(BIN) $(OBJECTS) $(LDFLAGS) -- --env.o: doas.h env.c -- --execvpe.o: doas.h execvpe.c -- --doas.o: doas.h doas.c parse.y -- --reallocarray.o: doas.h reallocarray.c -- --y.tab.o: parse.y -- $(YACC) parse.y -- $(CC) $(CPPFLAGS) $(CFLAGS) -c y.tab.c -- --install: $(BIN) -- mkdir -p $(DESTDIR)$(PREFIX)/bin -- cp $(BIN) $(DESTDIR)$(PREFIX)/bin/ -- chmod 4755 $(DESTDIR)$(PREFIX)/bin/$(BIN) -- mkdir -p $(MANDIR)/man1 -- cp doas.1 $(MANDIR)/man1/ -- mkdir -p $(MANDIR)/man5 -- cp doas.conf.5 $(MANDIR)/man5/ -- -+PREFIX := /usr -+BINDIR := $(PREFIX)/bin -+MANDIR := $(PREFIX)/share/man -+ -+CPPFLAGS += -include compat/compat.h -Icompat -+CFLAGS += -DUSE_PAM -DDOAS_CONF=\"/etc/doas.conf\" -D_GNU_SOURCE -+LDFLAGS := -lpam -lpam_misc $(LDFLAGS) -+ -+OBJS = \ -+ compat/closefrom.o \ -+ compat/errc.o \ -+ compat/execvpe.o \ -+ compat/getprogname.o \ -+ compat/reallocarray.o \ -+ compat/setprogname.o \ -+ compat/strlcat.o \ -+ compat/strlcpy.o \ -+ compat/strtonum.o \ -+ compat/verrc.o \ -+ doas.o \ -+ env.o \ -+ parse.o -+ -+doas: $(OBJS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJS) -+ -+compat/execvpe.o: doas.h -+compat/reallocarray.o: doas.h -+doas.o: doas.h -+env.o: doas.h -+ -+install: doas -+ install -Dm4755 doas $(DESTDIR)$(BINDIR)/doas -+ install -Dm0644 doas.1 $(DESTDIR)$(MANDIR)/man1/doas.1 -+ install -Dm0644 doas.conf.5 $(DESTDIR)$(MANDIR)/man5/doas.conf.5 -+ - clean: -- rm -f $(BIN) $(OBJECTS) y.tab.c -- -+ rm -f $(OBJS) doas |