diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2018-11-05 21:07:22 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-11-09 14:28:56 +0000 |
| commit | e4073f729e33e37bf78da302b4097afa5f6ff246 (patch) | |
| tree | 077d7c339d1ed35560b9b3d8fc25f33c0288437a | |
| parent | 81f05ada5a529c7ea67d4e89d713a048255e751e (diff) | |
| download | aports-e4073f729e33e37bf78da302b4097afa5f6ff246.tar.bz2 aports-e4073f729e33e37bf78da302b4097afa5f6ff246.tar.xz | |
main/squid: Update to latest 4.4
| -rw-r--r-- | main/squid/APKBUILD | 15 | ||||
| -rw-r--r-- | main/squid/libressl.patch | 11 |
2 files changed, 7 insertions, 19 deletions
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index 9d654a1978..74cf507ba7 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=squid -pkgver=4.2 -pkgrel=1 +pkgver=4.4 +pkgrel=0 pkgdesc="A full-featured Web proxy cache server." url="http://www.squid-cache.org" install="squid.pre-install squid.pre-upgrade" @@ -11,7 +11,8 @@ pkggroups="squid" arch="all" license="GPL-2.0" depends="logrotate" -makedepends="openssl-dev perl-dev autoconf automake heimdal-dev libtool +# stay with libressl for now as heimdal-dev conflicts with openssl-dev +makedepends="libressl-dev perl-dev autoconf automake heimdal-dev libtool libcap-dev linux-headers" subpackages="$pkgname-doc" linguas="af ar az bg ca cs da de el es et fa fi fr he hu hy id it ja ka ko lt @@ -22,12 +23,11 @@ source="http://www.squid-cache.org/Versions/v4/squid-${pkgver}.tar.xz $pkgname.initd $pkgname.confd $pkgname.logrotate - libressl.patch " pkgusers="squid" pkggroups="squid" builddir="$srcdir"/$pkgname-$pkgver -options="!check" # does not work with available cppunit +options="!check" # does not work. Error message is about "applet not found", some issue with the installed busybox # secfixes: # 3.5.27-r2: @@ -101,8 +101,7 @@ squid_kerb_auth() { install -d "$subpkgdir"/usr/lib/squid mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ } -sha512sums="bd22e0ed646e14f3bf776b84fa8e78066a889216a5afa1f0a854070aeca67ffa88b25712d4ab3b147ab59343d3dc12a0e5d78c592d509134e05f8e301e0a95a9 squid-4.2.tar.xz +sha512sums="8ed45abc65febf2955db11bafd49e940914a58230a8945afab9ea4926c4bafd538474a0836665b4131e23a23d6389d512a40bbe53368b8206ba4765fd71fb21f squid-4.4.tar.xz 15d95f7d787be8c2e6619ef1661fd8aae8d2c1ede706748764644c7dc3d7c34515ef6e8b7543295fddc4e767bbd74a7cf8c42e77cf60b3d574ff11b3f6e336c9 squid.initd 7292661de344e8a87d855c83afce49511685d2680effab3afab110e45144c0117935f3bf73ab893c9e6d43f7fb5ba013635e24f6da6daf0eeb895ef2e9b5baa9 squid.confd -89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5 squid.logrotate -55e35ebd892a0238e7cef47df1e7dae1adf470fd0543541ef50b266808cb6584b04b81fbf3e14c96b264315404e80e77d1f4364ddf27a6369c553077aff885e5 libressl.patch" +89a703fa4f21b6c7c26e64a46fd52407e20f00c34146ade0bea0c4b63d050117c0f8e218f2256a1fbf6abb84f4ec9b0472c9a4092ff6e78f07c4f5a25d0892a5 squid.logrotate" diff --git a/main/squid/libressl.patch b/main/squid/libressl.patch deleted file mode 100644 index d640109f62..0000000000 --- a/main/squid/libressl.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/ssl/bio.cc -+++ b/src/ssl/bio.cc -@@ -76,7 +76,7 @@ - BIO_meth_set_create(SquidMethods, squid_bio_create); - BIO_meth_set_destroy(SquidMethods, squid_bio_destroy); - } -- const BIO_METHOD *useMethod = SquidMethods; -+ BIO_METHOD *useMethod = SquidMethods; - #else - BIO_METHOD *useMethod = &SquidMethods; - #endif |