upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup with prefix and exec_prefix expanded.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4172 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2017-05-17 15:04:05 +00:00
parent 0d271cbb09
commit 0b10c8da28
3 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
configure vendored
View file

@ -757,6 +757,10 @@ UNBOUND_CHROOT_DIR
UNBOUND_RUN_DIR UNBOUND_RUN_DIR
ub_conf_dir ub_conf_dir
ub_conf_file ub_conf_file
UNBOUND_LOCALSTATE_DIR
UNBOUND_SYSCONF_DIR
UNBOUND_SBIN_DIR
UNBOUND_BIN_DIR
EGREP EGREP
GREP GREP
CPP CPP
@ -4111,6 +4115,11 @@ case "$prefix" in
prefix="/usr/local" prefix="/usr/local"
;; ;;
esac esac
case "$exec_prefix" in
NONE)
exec_prefix="/usr/local"
;;
esac
# are we on MinGW? # are we on MinGW?
if uname -s 2>&1 | grep MINGW32 >/dev/null; then on_mingw="yes" if uname -s 2>&1 | grep MINGW32 >/dev/null; then on_mingw="yes"
@ -4122,6 +4131,14 @@ fi
# #
# Determine configuration file # Determine configuration file
# the eval is to evaluate shell expansion twice # the eval is to evaluate shell expansion twice
UNBOUND_BIN_DIR=`eval echo "${bindir}"`
UNBOUND_SBIN_DIR=`eval echo "${sbindir}"`
UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"`
UNBOUND_LOCALSTATE_DIR=`eval echo "${localstatedir}"`
if test $on_mingw = "no"; then if test $on_mingw = "no"; then
ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"` ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"`
else else

13
configure.ac
View file

@ -109,6 +109,11 @@ case "$prefix" in
prefix="/usr/local" prefix="/usr/local"
;; ;;
esac esac
case "$exec_prefix" in
NONE)
exec_prefix="/usr/local"
;;
esac
# are we on MinGW? # are we on MinGW?
if uname -s 2>&1 | grep MINGW32 >/dev/null; then on_mingw="yes" if uname -s 2>&1 | grep MINGW32 >/dev/null; then on_mingw="yes"
@ -120,6 +125,14 @@ fi
# #
# Determine configuration file # Determine configuration file
# the eval is to evaluate shell expansion twice # the eval is to evaluate shell expansion twice
UNBOUND_BIN_DIR=`eval echo "${bindir}"`
AC_SUBST(UNBOUND_BIN_DIR)
UNBOUND_SBIN_DIR=`eval echo "${sbindir}"`
AC_SUBST(UNBOUND_SBIN_DIR)
UNBOUND_SYSCONF_DIR=`eval echo "${sysconfdir}"`
AC_SUBST(UNBOUND_SYSCONF_DIR)
UNBOUND_LOCALSTATE_DIR=`eval echo "${localstatedir}"`
AC_SUBST(UNBOUND_LOCALSTATE_DIR)
if test $on_mingw = "no"; then if test $on_mingw = "no"; then
ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"` ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"`
else else

6
contrib/unbound.service.in
View file

@ -6,8 +6,8 @@ Documentation=man:unbound(8)
WantedBy=multi-user.target WantedBy=multi-user.target
[Service] [Service]
ExecReload=@bindir@/kill -HUP $MAINPID ExecReload=@UNBOUND_BIN_DIR@/kill -HUP $MAINPID
ExecStart=@sbindir@/unbound ExecStart=@UNBOUND_SBIN_DIR@/unbound
NotifyAccess=main NotifyAccess=main
Type=notify Type=notify
CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT CapabilityBoundingSet=CAP_IPC_LOCK CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT
@ -20,7 +20,7 @@ ProtectControlGroups=true
ProtectKernelModules=true ProtectKernelModules=true
ProtectKernelTunables=true ProtectKernelTunables=true
ProtectSystem=strict ProtectSystem=strict
ReadWritePaths=@sysconfdir@ @localstatedir@ /run ReadWritePaths=@UNBOUND_SYSCONF_DIR@ @UNBOUND_LOCALSTATE_DIR@ /run @UNBOUND_RUN_DIR@
RestrictAddressFamilies=AF_INET AF_UNIX RestrictAddressFamilies=AF_INET AF_UNIX
RestrictRealtime=true RestrictRealtime=true
SystemCallArchitectures=native SystemCallArchitectures=native