Index: squid-4.7/configure =================================================================== --- squid-4.7/configure +++ squid-4.7/configure 2019-05-15 10:09:51.860836010 +0200 @@ -1988,7 +1988,7 @@ --with-logdir=PATH Default location for squid logs. default: PREFIX/var/logs --with-pidfile=PATH Default location for squid pid file. Default: - PREFIX/var/run/squid.pid + PREFIX/run/squid.pid --with-swapdir=PATH Default location for squid cache directories. Default: PREFIX/var/cache/squid --with-aufs-threads=N_THREADS Index: squid-4.7/configure.ac =================================================================== --- squid-4.7/configure.ac +++ squid-4.7/configure.ac 2019-05-15 10:10:29.280920504 +0200 @@ -276,7 +276,7 @@ DEFAULT_PID_FILE="$localstatedir/run/@SERVICE_NAME@.pid" AC_ARG_WITH(pidfile, AS_HELP_STRING([--with-pidfile=PATH], - [Default location for squid pid file. Default: PREFIX/var/run/squid.pid]), [ + [Default location for squid pid file. Default: PREFIX/run/squid.pid]), [ case $withval in yes|no) AC_MSG_ERROR( --with-pidfile requires a file PATH. --with-pidfile=PATH ) Index: squid-4.7/configure.ac.egrep =================================================================== --- squid-4.7/configure.ac.egrep +++ squid-4.7/configure.ac.egrep 2019-05-15 10:10:36.576936978 +0200 @@ -274,7 +274,7 @@ DEFAULT_PID_FILE="$localstatedir/run/@SERVICE_NAME@.pid" AC_ARG_WITH(pidfile, AS_HELP_STRING([--with-pidfile=PATH], - [Default location for squid pid file. Default: PREFIX/var/run/squid.pid]), [ + [Default location for squid pid file. Default: PREFIX/run/squid.pid]), [ case $withval in yes|no) AC_MSG_ERROR( --with-pidfile requires a file PATH. --with-pidfile=PATH ) Index: squid-4.7/squid.init =================================================================== --- squid-4.7/squid.init +++ squid-4.7/squid.init 2019-05-15 10:10:19.428898258 +0200 @@ -9,7 +9,7 @@ # requesting site than to the source. Web browsers can then use the \ # local Squid cache as a proxy HTTP server, reducing access time as \ # well as bandwidth consumption. -# pidfile: /var/run/squid.pid +# pidfile: /run/squid.pid # config: /etc/squid/squid.conf ### BEGIN INIT INFO @@ -86,7 +86,7 @@ if [ $RETVAL -eq 0 ]; then timeout=0; while : ; do - [ ! -f /var/run/squid.pid ] || break + [ ! -f /run/squid.pid ] || break if [ $timeout -ge $SQUID_PIDFILE_TIMEOUT ]; then RETVAL=1 break @@ -112,7 +112,7 @@ rm -f /var/lock/subsys/$SQUID timeout=0 while : ; do - [ -f /var/run/squid.pid ] || break + [ -f /run/squid.pid ] || break if [ $timeout -ge $SQUID_SHUTDOWN_TIMEOUT ]; then echo return 1 Index: squid-4.7/tools/systemd/squid.service =================================================================== --- squid-4.7/tools/systemd/squid.service +++ squid-4.7/tools/systemd/squid.service 2019-05-15 10:08:34.320660928 +0200 @@ -12,7 +12,7 @@ [Service] Type=forking -PIDFile=/var/run/squid.pid +PIDFile=/run/squid.pid ExecStartPre=/usr/sbin/squid --foreground -z ExecStart=/usr/sbin/squid -sYC ExecReload=/bin/kill -HUP $MAINPID Index: squid-4.7/tools/apparmor/usr.sbin.squid =================================================================== --- squid-4.7/tools/apparmor/usr.sbin.squid +++ squid-4.7/tools/apparmor/usr.sbin.squid 2019-05-15 10:09:09.128739523 +0200 @@ -32,7 +32,7 @@ # squid configuration /etc/squid/** r, - /{,var/}run/squid.pid rwk, + /run/squid.pid rwk, /var/spool/squid/ r, /var/spool/squid/** rwk, /usr/lib/squid/* rmix,