pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/security/adguardhome



Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Feb 23 13:22:15 UTC 2026

Modified Files:
        pkgsrc/security/adguardhome: Makefile distinfo
        pkgsrc/security/adguardhome/files: adguardhome.sh
Added Files:
        pkgsrc/security/adguardhome/patches:
            patch-internal_ossvc_config__netbsd.go

Log Message:
adguardhome: fix for NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/security/adguardhome/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/security/adguardhome/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/adguardhome/files/adguardhome.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/adguardhome/patches/patch-internal_ossvc_config__netbsd.go

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/adguardhome/Makefile
diff -u pkgsrc/security/adguardhome/Makefile:1.7 pkgsrc/security/adguardhome/Makefile:1.8
--- pkgsrc/security/adguardhome/Makefile:1.7    Mon Feb 23 08:38:47 2026
+++ pkgsrc/security/adguardhome/Makefile        Mon Feb 23 13:22:14 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2026/02/23 08:38:47 adam Exp $
+# $NetBSD: Makefile,v 1.8 2026/02/23 13:22:14 adam Exp $
 
 DISTNAME=      adguardhome-0.107.72
 CATEGORIES=    security
@@ -36,6 +36,12 @@ INSTALLATION_DIRS+=  libdata/adguardhome
 PKG_SYSCONFSUBDIR=     adguardhome
 RCD_SCRIPTS+=          adguardhome
 
+SUBST_CLASSES+=                rcconf
+SUBST_STAGE.rcconf=    pre-configure
+SUBST_MESSAGE.rcconf=  Subsituting pkgsrc variables.
+SUBST_FILES.rcconf=    internal/ossvc/config_netbsd.go
+SUBST_VARS.rcconf=     PKG_SYSCONFDIR PREFIX RCD_SCRIPTS_SHELL VARBASE
+
 # Hack: see https://github.com/AdguardTeam/AdGuardHome/pull/8142
 post-patch:
        ${LN} ${WRKSRC}/internal/aghnet/net_freebsd.go ${WRKSRC}/internal/aghnet/net_netbsd.go

Index: pkgsrc/security/adguardhome/distinfo
diff -u pkgsrc/security/adguardhome/distinfo:1.4 pkgsrc/security/adguardhome/distinfo:1.5
--- pkgsrc/security/adguardhome/distinfo:1.4    Mon Feb 23 08:38:47 2026
+++ pkgsrc/security/adguardhome/distinfo        Mon Feb 23 13:22:14 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2026/02/23 08:38:47 adam Exp $
+$NetBSD: distinfo,v 1.5 2026/02/23 13:22:14 adam Exp $
 
 BLAKE2s (adguardhome-0.107.72.tar.gz) = 7c7fe10c521c23947c8f04a9041450d6a30779bfefda770046adbffee393f3a4
 SHA512 (adguardhome-0.107.72.tar.gz) = c15a6b91ea4edfa85068c6386fecd6d35c7f13500ba3727dd7f1afe86d909d761d9cd0d147131cdd652948ff84af5078a4e2d7f3fd095e7fcbc7eaac9155484f
@@ -762,3 +762,4 @@ SHA1 (patch-internal_dhcpd_v4__unix.go) 
 SHA1 (patch-internal_dhcpd_v4__unix__internal__test.go) = 76ce987d8edc5314c1076427d8fe4000092011b5
 SHA1 (patch-internal_dhcpd_v6__unix.go) = c28cc0ee11b5084cd3a4600aab183487f35497fb
 SHA1 (patch-internal_dhcpd_v6__unix__internal__test.go) = 5322a928bc14ffbbd4335ed716c22f1c23069227
+SHA1 (patch-internal_ossvc_config__netbsd.go) = d587f2b7a3cb1331874acce840225e9f5b99c2b5

Index: pkgsrc/security/adguardhome/files/adguardhome.sh
diff -u pkgsrc/security/adguardhome/files/adguardhome.sh:1.1 pkgsrc/security/adguardhome/files/adguardhome.sh:1.2
--- pkgsrc/security/adguardhome/files/adguardhome.sh:1.1        Mon Dec  1 08:54:33 2025
+++ pkgsrc/security/adguardhome/files/adguardhome.sh    Mon Feb 23 13:22:15 2026
@@ -4,13 +4,13 @@
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
 
- . /etc/rc.subr
+. /etc/rc.subr
 
- name="AdGuardHome"
- rcvar="adguardhome"
- command="@PREFIX@/bin/${name}"
- command_args="--no-check-update -c @PKG_SYSCONFDIR@/AdGuardHome.yaml -w @PREFIX@/libdata/adguardhome --pidfile @VARBASE@/run/${name}.pid -l syslog &"
- pidfile="/var/run/${name}.pid"
+name="AdGuardHome"
+rcvar="adguardhome"
+command="@PREFIX@/bin/${name}"
+command_args="--no-check-update -c @PKG_SYSCONFDIR@/AdGuardHome.yaml -w @PREFIX@/libdata/adguardhome --pidfile @VARBASE@/run/${name}.pid -l syslog &"
+pidfile="/var/run/${name}.pid"
 
- load_rc_config $name
- run_rc_command "$1"
+load_rc_config $name
+run_rc_command "$1"

Added files:

Index: pkgsrc/security/adguardhome/patches/patch-internal_ossvc_config__netbsd.go
diff -u /dev/null pkgsrc/security/adguardhome/patches/patch-internal_ossvc_config__netbsd.go:1.1
--- /dev/null   Mon Feb 23 13:22:15 2026
+++ pkgsrc/security/adguardhome/patches/patch-internal_ossvc_config__netbsd.go  Mon Feb 23 13:22:15 2026
@@ -0,0 +1,38 @@
+$NetBSD: patch-internal_ossvc_config__netbsd.go,v 1.1 2026/02/23 13:22:15 adam Exp $
+
+Compile in contents of files/adguardhome.sh.
+
+--- /dev/null  2026-02-23 12:20:15.725096000 +0000
++++ internal/ossvc/config_netbsd.go
+@@ -0,0 +1,31 @@
++//go:build netbsd
++
++package ossvc
++
++import (
++      "github.com/kardianos/service"
++)
++
++// configureServiceOptions defines additional settings of the service
++// configuration on FreeBSD.  conf must not be nil.
++func configureOSOptions(conf *service.Config) {
++      conf.Option["SysvScript"] = netBSDScript
++}
++
++//lint:ignore U1000 TODO(e.burkov): Use.
++const netBSDScript = `#!@RCD_SCRIPTS_SHELL@
++# PROVIDE: adguardhome
++# REQUIRE: DAEMON
++# BEFORE:  LOGIN
++
++. /etc/rc.subr
++
++name="AdGuardHome"
++rcvar="adguardhome"
++command="@PREFIX@/bin/${name}"
++command_args="--no-check-update -c @PKG_SYSCONFDIR@/AdGuardHome.yaml -w @PREFIX@/libdata/adguardhome --pidfile @VARBASE@/run/${name}.pid -l syslog &"
++pidfile="/var/run/${name}.pid"
++
++load_rc_config $name
++run_rc_command "$1"
++`



Home | Main Index | Thread Index | Old Index