diff options
| author | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-02-24 21:31:04 +0000 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2020-02-24 22:05:29 +0000 |
| commit | 5160c2a99a59b33ccb06d540b43e40ba0a16f27b (patch) | |
| tree | d10662a4b2478afea0ae19fde4278226bf7fac80 | |
| parent | a4301166888c0e2c8a72be8e5d3ec1747a6ab6bf (diff) | |
| download | aports-5160c2a99a59b33ccb06d540b43e40ba0a16f27b.tar.bz2 aports-5160c2a99a59b33ccb06d540b43e40ba0a16f27b.tar.xz | |
main/squid: make sure statedir exists
For IPC, squid creates a socket file in /var/run/squid, but this
directory does not exist. Because /run (/var/run) lives in tmpfs, you
cannot rely on it being created by the package.
Use `checkpath` in the initd file to make sure this path exists.
Fixes #11249
| -rw-r--r-- | main/squid/APKBUILD | 2 | ||||
| -rw-r--r-- | main/squid/squid.initd | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index 5f7ed6f396..55536f05de 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD @@ -111,6 +111,6 @@ squid_kerb_auth() { mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ } sha512sums="033891f84789fe23a23fabcfb6f51a5b044c16892600f94380b5f0bcbceaef67b95c7047154d940511146248ca9846a949f00a609c6ed27f9af8829325eb08e0 squid-4.10.tar.xz -15d95f7d787be8c2e6619ef1661fd8aae8d2c1ede706748764644c7dc3d7c34515ef6e8b7543295fddc4e767bbd74a7cf8c42e77cf60b3d574ff11b3f6e336c9 squid.initd +8320820c02c824ed96065e0b66cabdd80b11c23e911880a42f5bd7e3f6e7a5c1c6def910a1843cca810c62a7dc8ccdb9ae82c0cf52bf08259c3b50058232132d squid.initd 7292661de344e8a87d855c83afce49511685d2680effab3afab110e45144c0117935f3bf73ab893c9e6d43f7fb5ba013635e24f6da6daf0eeb895ef2e9b5baa9 squid.confd 89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5 squid.logrotate" diff --git a/main/squid/squid.initd b/main/squid/squid.initd index f9955bae7f..8a91000106 100644 --- a/main/squid/squid.initd +++ b/main/squid/squid.initd @@ -71,6 +71,7 @@ checkconfig() { start() { checkconfig || return 1 + checkpath -d /var/run/squid -m 0755 -o squid:squid ebegin "Starting ${SVCNAME}" KRB5_KTNAME="${SQUID_KEYTAB}" /usr/sbin/squid ${SQUID_OPTS} -f /etc/squid/${SVCNAME}.conf eend $? && sleep 1 |