From 72f91a7d6c48442627bd60f9a91479dafe3f6ad7 Mon Sep 17 00:00:00 2001 From: RunningDroid Date: Tue, 11 Oct 2022 17:13:49 -0400 Subject: [PATCH] New package: nextdns-1.39.4 --- srcpkgs/nextdns/files/nextdns/run | 4 +++ .../Don't touch files managed by xbps.patch | 26 +++++++++++++++++++ srcpkgs/nextdns/template | 18 +++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 srcpkgs/nextdns/files/nextdns/run create mode 100644 srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch create mode 100644 srcpkgs/nextdns/template diff --git a/srcpkgs/nextdns/files/nextdns/run b/srcpkgs/nextdns/files/nextdns/run new file mode 100644 index 000000000000..d77ac6f24d27 --- /dev/null +++ b/srcpkgs/nextdns/files/nextdns/run @@ -0,0 +1,4 @@ +#!/bin/sh +exec 2>&1 +[ -r conf ] && . ./conf +exec /usr/bin/nextdns run ${OPTS:--config-file /etc/nextdns.conf} diff --git a/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch b/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch new file mode 100644 index 000000000000..cb4556525126 --- /dev/null +++ b/srcpkgs/nextdns/patches/Don't touch files managed by xbps.patch @@ -0,0 +1,26 @@ +diff --recursive --unified nextdns-1.39.4-clean/host/service/runit/service.go nextdns-1.39.4/host/service/runit/service.go +--- nextdns-1.39.4-clean/host/service/runit/service.go 2023-04-14 00:46:58.232616533 -0400 ++++ nextdns-1.39.4/host/service/runit/service.go 2023-04-14 01:12:43.931927878 -0400 +@@ -31,20 +31,14 @@ + } + + func (s Service) Install() error { +- if err := internal.CreateWithTemplate(s.Path, tmpl, 0755, s.Config); err != nil { +- return err +- } +- if err := os.Symlink(strings.TrimSuffix(s.Path, "/run"), "/etc/runit/runsvdir/current/"+s.Config.Name); err != nil { ++ if err := os.Symlink(strings.TrimSuffix(s.Path, "/run"), "/var/service/"+s.Config.Name); err != nil { + return err + } + return nil + } + + func (s Service) Uninstall() error { +- if err := os.RemoveAll("/etc/runit/runsvdir/current/" + s.Config.Name); err != nil { +- return err +- } +- if err := os.RemoveAll(strings.TrimSuffix(s.Path, "/run")); err != nil { ++ if err := os.RemoveAll("/var/service/" + s.Config.Name); err != nil { + return err + } + return nil diff --git a/srcpkgs/nextdns/template b/srcpkgs/nextdns/template new file mode 100644 index 000000000000..576e9c169401 --- /dev/null +++ b/srcpkgs/nextdns/template @@ -0,0 +1,18 @@ +# Template file for 'nextdns' +pkgname=nextdns +version=1.39.4 +revision=1 +build_style=go +go_import_path="github.com/nextdns/nextdns" +go_ldflags="-X main.version=${version}" +short_desc="NextDNS CLI client (DoH Proxy)" +maintainer="RunningDroid " +license="MIT" +homepage="https://nextdns.io/" +distfiles="https://github.com/nextdns/nextdns/archive/refs/tags/v${version}.tar.gz" +checksum=e24db909fbd732e064be465b74f4004a6f4fc0f422ef7c10e86ff707a016ccac + +post_install() { + vsv nextdns + vlicense LICENSE +}