[crux-commits] ports/contrib (refs/remotes/origin/3.6): doas: fixed config location

crux at crux.nu crux at crux.nu
Sat Apr 10 19:05:57 UTC 2021


commit 7c3b50ada0ff04c70c9235cec709ecde7d5dc4cd
Author: Tim Biermann <tbier at posteo.de>
Date:   Sun Jan 31 11:05:24 2021 +0000

    doas: fixed config location

diff --git a/doas/.signature b/doas/.signature
index 3cbf47521..06ae115f3 100644
--- a/doas/.signature
+++ b/doas/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3x9w9+09F4KPdub6s49QOsSNna1R4NEWa1gCZ9Q4QVNBKg6QJnWLO4vupuR5xVeDk2Tu1SdsYIjl58xUF/ElswQ=
-SHA256 (Pkgfile) = 17a0d9b0db8748620a0e49bb5de6d0dec63e2a25ddec58c64fe82f8f558e14aa
+RWSagIOpLGJF37A9XKFY4VfqzW4O+5aEQjHJ4Mn1zK9qtFW6iIx6C/LqMe+HjlVeZzqcsQC2gD5NhdBVm7hvk1uT5XROw6l7+A4=
+SHA256 (Pkgfile) = 3775e1eacf97669de2bdc70352fe482e74752f35f12e0ffaadcd09f71cbd241e
 SHA256 (.footprint) = 2e5f69e214da00311dacf013cf86e9b8ae6f8b2eeea56cb1c0eb4da674808829
 SHA256 (doas-6.3p4.tar.gz) = e6dff62c7e38f8002ac0936f636432c52cf767f01ba703bf8723456b3c43e6de
 SHA256 (doas-pam) = 8cec7d05c6c04c293ed6639de88abf5bcc99ccf261aab19212d197c53ca62c92
diff --git a/doas/Makefile.patch b/doas/Makefile.patch
deleted file mode 100644
index 211e138b5..000000000
--- a/doas/Makefile.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- src/doas-6.3p2/Makefile	2020-08-07 23:42:52.000000000 +0200
-+++ Makefile	2020-08-18 17:14:50.982152763 +0200
-@@ -2,10 +2,10 @@
- CC?=clang
- YACC?=yacc
- BIN=doas
--PREFIX?=/usr/local
-+PREFIX=/usr
- MANDIR?=$(DESTDIR)$(PREFIX)/man
--SYSCONFDIR?=$(DESTDIR)$(PREFIX)/etc
--OBJECTS=doas.o env.o compat/execvpe.o compat/reallocarray.o y.tab.o 
-+SYSCONFDIR?=$(DESTDIR)/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:\"
-@@ -13,32 +13,11 @@
- 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
-+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)
- 
- all: $(OBJECTS) doas.1.final doas.conf.5.final
- 	$(CC) -o $(BIN) $(OBJECTS) $(LDFLAGS)
diff --git a/doas/Pkgfile b/doas/Pkgfile
index b6fed8f6b..328c001ba 100644
--- a/doas/Pkgfile
+++ b/doas/Pkgfile
@@ -5,15 +5,19 @@
 
 name=doas
 version=6.3p4
-release=1
+release=2
 source=(https://github.com/slicer69/doas/archive/$version/$name-$version.tar.gz
   #shamelessly grabbed from archs aur
   doas-pam doas.conf)
 
 build() {
   cd $name-$version
-  make
-  make PREFIX=/usr DESTDIR=$PKG install
+  make PREFIX=/usr \
+    SYSCONFDIR=/etc
+  make PREFIX=/usr \
+    SYSCONFDIR=/etc \
+    DESTDIR=$PKG \
+    install
   install -Dm644 $SRC/doas.conf $PKG/etc/doas.conf
   install -Dm644 $SRC/doas-pam $PKG/etc/pam.d/doas
 }


More information about the crux-commits mailing list