diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2010-04-19 11:57:03 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-04-29 13:12:41 +0000 |
commit | 4181640a2f00c7d40bb70b4924e958029092623f (patch) | |
tree | 7ea3f3266f0f2bd0c78d16f7ff00557c0608a7cc | |
parent | 7d832cde78f942596fe7950a772998da1bcb56c4 (diff) | |
download | alpine_aports-4181640a2f00c7d40bb70b4924e958029092623f.tar.bz2 alpine_aports-4181640a2f00c7d40bb70b4924e958029092623f.tar.xz alpine_aports-4181640a2f00c7d40bb70b4924e958029092623f.zip |
main/squid: support for squid_kerb_auth
fixes #343
(cherry picked from commit 236a35ddd6048ddff7f05c47777840973141369d)
-rw-r--r-- | main/squid/APKBUILD | 14 | ||||
-rw-r--r-- | main/squid/squid-2-heimdal.patch | 18 |
2 files changed, 30 insertions, 2 deletions
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD index fa13a0ab52..e0f6582fee 100644 --- a/main/squid/APKBUILD +++ b/main/squid/APKBUILD | |||
@@ -3,7 +3,7 @@ | |||
3 | pkgname=squid | 3 | pkgname=squid |
4 | pkgver=2.7.7 | 4 | pkgver=2.7.7 |
5 | _ver=2.7.STABLE7 | 5 | _ver=2.7.STABLE7 |
6 | pkgrel=2 | 6 | pkgrel=3 |
7 | pkgdesc="A full-featured Web proxy cache server." | 7 | pkgdesc="A full-featured Web proxy cache server." |
8 | url="http://www.squid-cache.org" | 8 | url="http://www.squid-cache.org" |
9 | install="squid.pre-install squid.pre-upgrade squid.post-install" | 9 | install="squid.pre-install squid.pre-upgrade squid.post-install" |
@@ -11,8 +11,9 @@ pkgusers="squid" | |||
11 | pkggroups="squid" | 11 | pkggroups="squid" |
12 | license="GPL-2" | 12 | license="GPL-2" |
13 | depends="$pkgname-errors-english logrotate" | 13 | depends="$pkgname-errors-english logrotate" |
14 | makedepends="openssl-dev perl-dev autoconf automake" | 14 | makedepends="openssl-dev perl-dev autoconf automake heimdal-dev" |
15 | subpackages="$pkgname-doc | 15 | subpackages="$pkgname-doc |
16 | squid_kerb_auth | ||
16 | $pkgname-errors-armenian:errors_armenian | 17 | $pkgname-errors-armenian:errors_armenian |
17 | $pkgname-errors-azerbaijani:errors_azerbaijani | 18 | $pkgname-errors-azerbaijani:errors_azerbaijani |
18 | $pkgname-errors-bulgarian:errors_bulgarian | 19 | $pkgname-errors-bulgarian:errors_bulgarian |
@@ -52,6 +53,7 @@ source="http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${_ver}.tar.bz2 | |||
52 | squid.initd | 53 | squid.initd |
53 | squid.confd | 54 | squid.confd |
54 | squid-2.7-gentoo.patch | 55 | squid-2.7-gentoo.patch |
56 | squid-2-heimdal.patch | ||
55 | squid-2.7-ims-content-type.patch | 57 | squid-2.7-ims-content-type.patch |
56 | $pkgname.logrotate | 58 | $pkgname.logrotate |
57 | " | 59 | " |
@@ -63,6 +65,7 @@ build() { | |||
63 | 65 | ||
64 | patch -p1 -i "$srcdir"/squid-2.7-gentoo.patch || return 1 | 66 | patch -p1 -i "$srcdir"/squid-2.7-gentoo.patch || return 1 |
65 | patch -p1 -i "$srcdir"/squid-2.7-ims-content-type.patch || return 1 | 67 | patch -p1 -i "$srcdir"/squid-2.7-ims-content-type.patch || return 1 |
68 | patch -p1 -i "$srcdir"/squid-2-heimdal.patch || return 1 | ||
66 | 69 | ||
67 | touch NEWS AUTHORS | 70 | touch NEWS AUTHORS |
68 | aclocal && autoconf && automake -a || return 1 | 71 | aclocal && autoconf && automake -a || return 1 |
@@ -77,6 +80,7 @@ build() { | |||
77 | --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \ | 80 | --enable-basic-auth-helpers="getpwnam,NCSA,SMB,MSNT,multi-domain-NTLM,squid_radius_auth" \ |
78 | --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ | 81 | --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \ |
79 | --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \ | 82 | --enable-ntlm-auth-helpers="SMB,fakeauth,no_check" \ |
83 | --enable-negotiate-auth-helpers="squid_kerb_auth" \ | ||
80 | --enable-delay-pools --enable-arp-acl --enable-ssl \ | 84 | --enable-delay-pools --enable-arp-acl --enable-ssl \ |
81 | --enable-linux-netfilter --enable-ident-lookups \ | 85 | --enable-linux-netfilter --enable-ident-lookups \ |
82 | --enable-useragent-log --enable-cache-digests --enable-referer-log \ | 86 | --enable-useragent-log --enable-cache-digests --enable-referer-log \ |
@@ -100,6 +104,11 @@ build() { | |||
100 | chmod +x "$pkgdir"/usr/lib/squid/* | 104 | chmod +x "$pkgdir"/usr/lib/squid/* |
101 | } | 105 | } |
102 | 106 | ||
107 | squid_kerb_auth() { | ||
108 | pkgdesc="Squid kerberos authetication helper" | ||
109 | install -d "$subpkgdir"/usr/lib/squid | ||
110 | mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/ | ||
111 | } | ||
103 | 112 | ||
104 | _mv_error() { | 113 | _mv_error() { |
105 | local d=usr/share/squid/errors | 114 | local d=usr/share/squid/errors |
@@ -285,5 +294,6 @@ md5sums="c18b0371fca813d5e7c7e0baf87baa22 squid-2.7.STABLE7.tar.bz2 | |||
285 | 57fed05adc40acab6a5480ec7a014154 squid.initd | 294 | 57fed05adc40acab6a5480ec7a014154 squid.initd |
286 | 44b052db7910f386ef88ddcf69c9ba4e squid.confd | 295 | 44b052db7910f386ef88ddcf69c9ba4e squid.confd |
287 | 3827f71d940b47eb385a1a1d92a51d66 squid-2.7-gentoo.patch | 296 | 3827f71d940b47eb385a1a1d92a51d66 squid-2.7-gentoo.patch |
297 | 614b97126ad9eecf728095f2de63d33d squid-2-heimdal.patch | ||
288 | 549377b5a6b673bf19ea6c34003d122c squid-2.7-ims-content-type.patch | 298 | 549377b5a6b673bf19ea6c34003d122c squid-2.7-ims-content-type.patch |
289 | 58823e0b86bc2dc71d270208b7b284b4 squid.logrotate" | 299 | 58823e0b86bc2dc71d270208b7b284b4 squid.logrotate" |
diff --git a/main/squid/squid-2-heimdal.patch b/main/squid/squid-2-heimdal.patch new file mode 100644 index 0000000000..67500ae6a8 --- /dev/null +++ b/main/squid/squid-2-heimdal.patch | |||
@@ -0,0 +1,18 @@ | |||
1 | diff -Nru squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am | ||
2 | --- squid-2.7.STABLE6.orig/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2007-05-14 23:36:29.000000000 +0000 | ||
3 | +++ squid-2.7.STABLE6/helpers/negotiate_auth/squid_kerb_auth/Makefile.am 2009-02-16 23:26:28.000000000 +0000 | ||
4 | @@ -18,10 +18,10 @@ | ||
5 | #-L$(top_builddir)/lib -lmiscutil $(XTRA_LIBS) | ||
6 | |||
7 | # HEIMDAL | ||
8 | -#KERBINC = -DHEIMDAL -I/usr/include/heimdal | ||
9 | -#KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken | ||
10 | +KERBINC = -DHEIMDAL -I/usr/include/heimdal | ||
11 | +KERBLIBS = -lgssapi -lkrb5 -lcom_err -lasn1 -lroken | ||
12 | |||
13 | # MIT | ||
14 | -KERBINC = | ||
15 | -KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err | ||
16 | +#KERBINC = | ||
17 | +#KERBLIBS = -lgssapi_krb5 -lkrb5 -lcom_err | ||
18 | |||