me/guix
Archived
1
0
Fork 0
Code Activity

gnu: privoxy: Fix daemon with default configuration.

Browse source 
* gnu/packages/tor.scm (privoxy)[arguments]: Add --localstatedir=/var to
configure flags.  Patch default configuration to disable logging and thus
allowing non-root users to use it.

Signed-off-by: Pierre Neidhardt <mail@ambrevar.xyz>
This commit is contained in:
Brice Waegeneire 2020-06-18 09:37:06 +02:00 • committed by Pierre Neidhardt
parent f817a0c095
commit e418c3d076
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/tor.scm
View file

@ -8,6 +8,7 @@
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -141,8 +142,28 @@ rejects UDP traffic from the application you're using.")
;; $out/etc/privoxy. ;; $out/etc/privoxy.
#:configure-flags (list (string-append "--sysconfdir=" #:configure-flags (list (string-append "--sysconfdir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/etc/privoxy")) "/etc/privoxy")
#:tests? #f)) "--localstatedir=/var")
#:tests? #f ; no test suite
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'patch-default-logging
(lambda _
(with-fluids ((%default-port-encoding "ISO-8859-1"))
;; Do not create /var/run nor /var/log/privoxy/logfile.
(substitute* "GNUmakefile.in"
(("(logfile \\|\\| exit )1" _ match)
(string-append match "0"))
(("(\\$\\(DESTDIR\\)\\$\\(SHARE_DEST\\)) \\\\" _ match)
match)
((".*\\$\\(LOG_DEST\\) \\$\\(DESTDIR\\)\\$\\(PID_DEST\\).*")
""))
;; Disable logging in the default configuration to allow for
;; non-root users using it as is.
(substitute* "config"
(("^logdir") "#logdir")
(("^logfile") "#logfile")))
#t)))))
(inputs (inputs
`(("w3m" ,w3m) `(("w3m" ,w3m)
("pcre" ,pcre) ("pcre" ,pcre)