public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2015-10-22 12:45 Julian Ospald
  0 siblings, 0 replies; 8+ messages in thread
From: Julian Ospald @ 2015-10-22 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     231001d252cd81974b8745d07a4440d4f59bced7
Author:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 22 12:14:25 2015 +0000
Commit:     Julian Ospald <hasufell <AT> gentoo <DOT> org>
CommitDate: Thu Oct 22 12:45:33 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=231001d2

net-dns/dnscrypt-proxy: add missing quotes to dnscrypt-proxy.initd

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 3ef60f9..8e231e4 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -21,8 +21,8 @@ start() {
 	if [ ! -d "${rundir}" ]; then
 		mkdir "${rundir}"
 		if [ -n "${runas_user}" ]; then
-			touch  ${DNSCRYPT_LOGFILE}
-			chown ${runas_user}:${runas_group} ${DNSCRYPT_LOGFILE}
+			touch "${DNSCRYPT_LOGFILE}"
+			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
 			chown -R ${runas_user}:${runas_group} "${rundir}"
 		fi
 	fi
@@ -31,8 +31,8 @@ start() {
 	start-stop-daemon --start --quiet \
 		--exec /usr/sbin/dnscrypt-proxy \
 		-- \
-		--pidfile=${pidfile} \
-		--logfile=${DNSCRYPT_LOGFILE} \
+		--pidfile="${pidfile}" \
+		--logfile="${DNSCRYPT_LOGFILE}" \
 		--daemonize --user=${runas_user} \
 		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
 		--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2018-05-16  8:10 Michał Górny
  0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2018-05-16  8:10 UTC (permalink / raw
  To: gentoo-commits

commit:     538d9b025dd42583c2e6d9c622022cedf20801ec
Author:     Georgy Yakovlev <ya <AT> sysdump <DOT> net>
AuthorDate: Fri May 11 17:43:51 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed May 16 08:10:35 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=538d9b02

net-dns/dnscrypt-proxy: QA minor openrc nits

Closes: https://github.com/gentoo/gentoo/pull/8414
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd | 2 +-
 net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
index fb40827a77e..492b2fc2294 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.confd
@@ -1,3 +1,3 @@
-#DNSCRYPT_PROXY_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+#DNSCRYPT_PROXY_OPTS="-config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
 #DNSCRYPT_PROXY_USER="dnscrypt-proxy"
 #DNSCRYPT_PROXY_GROUP="dnscrypt-proxy"

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
index 74c2dad63f7..4a46acdc4bb 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.initd
@@ -14,6 +14,6 @@ depend() {
 }
 
 start_pre() {
-        checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
-        checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
+        checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+        checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2018-07-10  5:27 Georgy Yakovlev
  0 siblings, 0 replies; 8+ messages in thread
From: Georgy Yakovlev @ 2018-07-10  5:27 UTC (permalink / raw
  To: gentoo-commits

commit:     ff422337a888f3b2e2bd9a648e18b400abc44733
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 05:24:40 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 05:24:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff422337

net-dns/dnscrypt-proxy: adjust systemd service

Disable socket file by default, as
described in pkg_postinst message.
Users who want to use socket activation will have to
set listen_addresses to an empty set (i.e. [] )
and enable dnscrypt-proxy.socket explicitly.

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
index ed02955621b..a0c7a1408c8 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
@@ -7,12 +7,11 @@ Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
 ## If you enable this, the `listen_addresses` list in the main configuration file can be empty.
 ## Or, at least, the addresses it contains should not overlap with the systemd socket addresses.
 
-# Requires=dnscrypt-proxy.socket
-
-After=network.target
-Wants=network.target
+#Requires=dnscrypt-proxy.socket
 Before=nss-lookup.target
-Wants=nss-lookup.target
+After=network.target
+Wants=network.target nss-lookup.target
+
 
 [Service]
 ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
@@ -35,5 +34,5 @@ CapabilityBoundingSet=CAP_NET_BIND_SERVICE
 AmbientCapabilities=CAP_NET_BIND_SERVICE
 
 [Install]
-Also=dnscrypt-proxy.socket
+#Also=dnscrypt-proxy.socket
 WantedBy=multi-user.target


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2018-07-10  5:27 Georgy Yakovlev
  0 siblings, 0 replies; 8+ messages in thread
From: Georgy Yakovlev @ 2018-07-10  5:27 UTC (permalink / raw
  To: gentoo-commits

commit:     23b51318bca3c2c85bc77701809b05fd68eb466f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 10 05:26:07 2018 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 05:26:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23b51318

net-dns/dnscrypt-proxy: use tabs in init.d file

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index 4a46acdc4bb..d81a36fc8f8 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -9,11 +9,11 @@ pidfile="/run/${RC_SVCNAME}.pid"
 start_stop_daemon_args="--background --make-pidfile"
 
 depend() {
-	use net logger
+	use logger net
 	provide dns
 }
 
 start_pre() {
-        checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
-        checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
+	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
 }


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2019-12-04 21:01 Georgy Yakovlev
  0 siblings, 0 replies; 8+ messages in thread
From: Georgy Yakovlev @ 2019-12-04 21:01 UTC (permalink / raw
  To: gentoo-commits

commit:     fddb0093047f7894988be85053367612d550db48
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 20:57:29 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 21:01:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fddb0093

net-dns/dnscrypt-proxy: fix missing initfile

accidentally mv file on bump instead of copying.

Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
new file mode 100644
index 00000000000..e0fc08ad6a0
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/dnscrypt-proxy"
+command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
+command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
+pidfile="/run/${RC_SVCNAME}.pid"
+start_stop_daemon_args="--background --make-pidfile"
+
+depend() {
+	use logger net
+	provide dns
+}
+
+start_pre() {
+	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${RC_SVCNAME}"
+	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${RC_SVCNAME}"
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2020-05-01  7:05 Georgy Yakovlev
  0 siblings, 0 replies; 8+ messages in thread
From: Georgy Yakovlev @ 2020-05-01  7:05 UTC (permalink / raw
  To: gentoo-commits

commit:     56c0f3e1344c21d6a1ea98fc61ed4cec374cdb27
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Apr 30 16:22:44 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri May  1 07:04:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56c0f3e1

net-dns/dnscrypt-proxy: remove unused patch

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15577
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../files/config-full-paths-r10.patch              | 72 ----------------------
 1 file changed, 72 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
deleted file mode 100644
index aba278c221a..00000000000
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r10.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- dnscrypt-proxy-2.0.9/dnscrypt-proxy/example-dnscrypt-proxy.toml  2018-04-11 05:05:16.000000000 -0700
-+++ dnscrypt-proxy-2.0.9/dnscrypt-proxy/dnscrypt-proxy.toml 2018-04-11 22:29:21.810501858 -0700
-@@ -96,7 +96,7 @@
- 
- ## log file for the application
- 
--# log_file = 'dnscrypt-proxy.log'
-+# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
- 
- 
- ## Use the system logger (syslog on Unix, Event Log on Windows)
-@@ -254,7 +254,7 @@
- 
-   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
- 
--  # file = 'query.log'
-+  # file = '/var/log/dnscrypt-proxy/query.log'
- 
- 
-   ## Query log format (currently supported: tsv and ltsv)
-@@ -280,7 +280,7 @@
- 
-   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
- 
--  # file = 'nx.log'
-+  # file = '/var/log/dnscrypt-proxy/nx.log'
- 
- 
-   ## Query log format (currently supported: tsv and ltsv)
-@@ -315,7 +315,7 @@
- 
-   ## Optional path to a file logging blocked queries
- 
--  # log_file = 'blocked.log'
-+  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -343,7 +343,7 @@
- 
-   ## Optional path to a file logging blocked queries
- 
--  # log_file = 'ip-blocked.log'
-+  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -371,7 +371,7 @@
- 
-   ## Optional path to a file logging whitelisted queries
- 
--  # log_file = 'whitelisted.log'
-+  # log_file = '/var/log/dnscrypt-proxy/whitelisted.log'
- 
- 
-   ## Optional log format: tsv or ltsv (default: tsv)
-@@ -441,7 +441,7 @@
- 
-   [sources.'public-resolvers']
-   urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md']
--  cache_file = 'public-resolvers.md'
-+  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
-   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
-   refresh_delay = 72
-   prefix = ''
-@@ -451,7 +451,7 @@
- 
-   #  [sources.'parental-control']
-   #  urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md']
--  #  cache_file = 'parental-control.md'
-+  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
-   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2021-01-03 23:13 Sam James
  0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-01-03 23:13 UTC (permalink / raw
  To: gentoo-commits

commit:     20a1da9271be1b1303a3b74f0581345ea33a654e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 23:12:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 23:12:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a1da92

net-dns/dnscrypt-proxy: cleanup patch cruft

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
index 86ca893440d..a871990deb9 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy-2.0.45-config-full-paths.patch
@@ -1,5 +1,3 @@
-diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
-index 12d9bde..0c7f3e1 100644
 --- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
 +++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
 @@ -157,7 +157,7 @@ keepalive = 30


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/
@ 2021-12-03 14:42 Brian Evans
  0 siblings, 0 replies; 8+ messages in thread
From: Brian Evans @ 2021-12-03 14:42 UTC (permalink / raw
  To: gentoo-commits

commit:     34d0fd905f2581f33320abad2840da8e1ff65288
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  3 14:41:13 2021 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Dec  3 14:41:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34d0fd90

net-dns/dnscrypt-proxy: Update OpenRC script

Non-maintainer commit: This is effectively the same options reorganized
for future consideration.

Closes: https://bugs.gentoo.org/828076
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
index ce1d1175d707..c1cb90040a20 100644
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command="/usr/bin/dnscrypt-proxy"
@@ -7,7 +7,7 @@ command_args="${DNSCRYPT_PROXY_OPTS:--config /etc/dnscrypt-proxy/dnscrypt-proxy.
 command_user="${DNSCRYPT_PROXY_USER:-dnscrypt-proxy}:${DNSCRYPT_PROXY_GROUP:-dnscrypt-proxy}"
 pidfile="/run/${RC_SVCNAME}.pid"
 retry="SIGTERM/5/SIGTERM/5/SIGKILL/5"
-start_stop_daemon_args="--background --make-pidfile"
+command_background="yes"
 
 depend() {
 	use logger net


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2021-12-03 14:42 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-03 14:42 [gentoo-commits] repo/gentoo:master commit in: net-dns/dnscrypt-proxy/files/ Brian Evans
  -- strict thread matches above, loose matches on Subject: below --
2021-01-03 23:13 Sam James
2020-05-01  7:05 Georgy Yakovlev
2019-12-04 21:01 Georgy Yakovlev
2018-07-10  5:27 Georgy Yakovlev
2018-07-10  5:27 Georgy Yakovlev
2018-05-16  8:10 Michał Górny
2015-10-22 12:45 Julian Ospald

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox