diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | 00-Makefile.patch | 54 | ||||
| -rw-r--r-- | PKGBUILD | 16 |
3 files changed, 9 insertions, 72 deletions
@@ -1,7 +1,7 @@ pkgbase = doas pkgdesc = A port of OpenBSD's doas(1), an alternative to sudo(1) - pkgver = 6.3p2 - pkgrel = 4 + pkgver = 6.3p6 + pkgrel = 1 url = https://github.com/slicer69/doas install = doas.install changelog = doas.changelog @@ -16,14 +16,11 @@ pkgbase = doas conflicts = opendoas-git backup = etc/doas.conf backup = etc/pam.d/doas - source = doas-6.3p2.tar.gz::https://github.com/slicer69/doas/archive/6.3p2.tar.gz - source = 00-Makefile.patch + source = doas-6.3p6.tar.gz::https://github.com/slicer69/doas/archive/6.3p6.tar.gz source = doas-pam source = doas.conf - sha256sums = 037813a404bfe35289f2c6cb22a8c4de6f636b2a491e546a90d2ae2afa54aa64 - sha256sums = 627a97d223365100f378de31786ab3abe337752012830d32adc994a02e46144f + sha256sums = aa6f5d686942d9148506634e7b84af561af2564b689a287434023b1f272c064a sha256sums = b064704fb3448c3511904c3963b0e167ecf6274aea48afb9c42d452447dfd042 sha256sums = 1f28802fad6ae0eaa5b94bb8d945ada923631ddfb7ae63e934962dbe41774976 pkgname = doas - diff --git a/00-Makefile.patch b/00-Makefile.patch deleted file mode 100644 index 211e138b5e15..000000000000 --- a/00-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) @@ -1,13 +1,13 @@ # Maintainer: scrouthtv <scrouthtv 0x40 gmail 0x2e com> # Contributor: Stephen Gregoratto <dev at sgregoratto dot me> pkgname=doas -pkgver=6.3p2 -pkgrel=4 +pkgver=6.3p6 +pkgrel=1 pkgdesc="A port of OpenBSD's doas(1), an alternative to sudo(1)" license=('BSD') url="https://github.com/slicer69/doas" arch=('i686' 'x86_64' 'armv6h' 'armv7h') -depends=() +depends=() # bash & pam are dependencies of base makedepends=('bison') optdepends=('vi: default editor for vidoas') backup=('etc/doas.conf' @@ -16,18 +16,12 @@ install="doas.install" changelog="doas.changelog" conflicts=('opendoas' 'opendoas-git') source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" - '00-Makefile.patch' 'doas-pam' 'doas.conf') -sha256sums=('037813a404bfe35289f2c6cb22a8c4de6f636b2a491e546a90d2ae2afa54aa64' - '627a97d223365100f378de31786ab3abe337752012830d32adc994a02e46144f' +sha256sums=('aa6f5d686942d9148506634e7b84af561af2564b689a287434023b1f272c064a' 'b064704fb3448c3511904c3963b0e167ecf6274aea48afb9c42d452447dfd042' '1f28802fad6ae0eaa5b94bb8d945ada923631ddfb7ae63e934962dbe41774976') -prepare() { - patch "$pkgname-$pkgver/Makefile" "${srcdir}/00-Makefile.patch" -} - build() { cd "$pkgname-$pkgver" make @@ -37,7 +31,7 @@ package() { install -Dm644 "doas-pam" "$pkgdir/etc/pam.d/doas" install -Dm644 "doas.conf" "$pkgdir/etc/doas.conf" cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make PREFIX="/usr" DESTDIR="$pkgdir" MANDIR="$pkgdir/usr/share/man" install install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } |