summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbar0metr2018-08-16 09:42:11 +0500
committerbar0metr2018-08-16 09:42:11 +0500
commit83d8c5ac99730fc1751d53300d7f2b8bd5f7ab3b (patch)
tree5604b4a24bbef374f56694694b63b0d7ccea222c
parent3c91cebb3a7c3a32ac3098c71779e05311bdd144 (diff)
downloadaur-83d8c5ac99730fc1751d53300d7f2b8bd5f7ab3b.tar.gz
Add Squid5 in conflicts...
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6ca23f6d8a43..b1b6009ec77b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -17,6 +17,7 @@ pkgbase = squid4
depends = libnsl
conflicts = squid
conflicts = squid4
+ conflicts = squid5
options = emptydirs
backup = etc/squid/squid.conf
backup = etc/squid/cachemgr.conf
diff --git a/PKGBUILD b/PKGBUILD
index 881300817ede..83f1f05fcd57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ arch=('x86_64')
url='http://www.squid-cache.org'
depends=('openssl' 'libecap' 'pam' 'perl' 'libltdl' 'libcap' 'nettle' 'gnutls' 'libnsl')
makedepends=('krb5')
-conflicts=('squid' 'squid4')
+conflicts=('squid' 'squid4' 'squid5')
license=('GPL')
options=('emptydirs')
backup=('etc/squid/squid.conf'