|
@@ -1,6 +1,6 @@
|
|
%define base_name squid
|
|
%define base_name squid
|
|
%define pkg_epoch 7
|
|
%define pkg_epoch 7
|
|
-%define pkg_version 3.1.23
|
|
+%define pkg_version 3.4.6
|
|
%define pkg_release 1%{?_dist_release}
|
|
%define pkg_release 1%{?_dist_release}
|
|
%define uid 23
|
|
%define uid 23
|
|
%define gid 23
|
|
%define gid 23
|
|
@@ -11,7 +11,7 @@ Name: %{base_name}
|
|
Epoch: %{pkg_epoch}
|
|
Epoch: %{pkg_epoch}
|
|
Version: %{pkg_version}
|
|
Version: %{pkg_version}
|
|
Release: %{pkg_release}
|
|
Release: %{pkg_release}
|
|
-Source0: %{base_name}-%{version}.tar.bz2
|
|
+Source0: %{base_name}-%{version}.tar.xz
|
|
Source1: %{base_name}.init
|
|
Source1: %{base_name}.init
|
|
Source2: %{base_name}.logrotate
|
|
Source2: %{base_name}.logrotate
|
|
Source3: %{base_name}.sysconfig
|
|
Source3: %{base_name}.sysconfig
|
|
@@ -71,22 +71,22 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
|
|
--datadir=%{_datadir}/%{base_name} \
|
|
--datadir=%{_datadir}/%{base_name} \
|
|
--disable-dependency-tracking \
|
|
--disable-dependency-tracking \
|
|
--enable-arp-acl \
|
|
--enable-arp-acl \
|
|
- --enable-auth="basic,digest,ntlm,negotiate" \
|
|
+ --enable-auth \
|
|
- --enable-basic-auth-helpers="LDAP,MSNT,NCSA,PAM,SMB,YP,getpwnam,multi-domain-NTLM,SASL" \
|
|
+ --enable-auth-basic="DB,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,SASL,SMB,getpwnam" \
|
|
- --enable-negotiate-auth-helpers="squid_kerb_auth" \
|
|
+ --enable-auth-digest="file,LDAP,eDirectory" \
|
|
|
|
+ --enable-auth-negotiate="kerberos" \
|
|
|
|
+ --enable-auth-ntlm="smb_lm,fake" \
|
|
|
|
+ --enable-external-acl-helpers="LDAP_group,time_quota,session,unix_group,wbinfo_group" \
|
|
--enable-cache-digests \
|
|
--enable-cache-digests \
|
|
--enable-cachemgr-hostname=localhost \
|
|
--enable-cachemgr-hostname=localhost \
|
|
--enable-delay-pools \
|
|
--enable-delay-pools \
|
|
- --enable-digest-auth-helpers="password" \
|
|
|
|
--enable-epoll \
|
|
--enable-epoll \
|
|
- --enable-external-acl-helpers="ip_user,ldap_group,unix_group,wbinfo_group" \
|
|
|
|
--enable-icap-client \
|
|
--enable-icap-client \
|
|
--enable-ident-lookups \
|
|
--enable-ident-lookups \
|
|
%ifnarch ppc64 ia64 x86_64 s390x
|
|
%ifnarch ppc64 ia64 x86_64 s390x
|
|
--with-large-files \
|
|
--with-large-files \
|
|
%endif
|
|
%endif
|
|
--enable-linux-netfilter \
|
|
--enable-linux-netfilter \
|
|
- --enable-ntlm-auth-helpers="smb_lm,fakeauth" \
|
|
|
|
--enable-referer-log \
|
|
--enable-referer-log \
|
|
--enable-removal-policies="heap,lru" \
|
|
--enable-removal-policies="heap,lru" \
|
|
--enable-snmp \
|
|
--enable-snmp \
|
|
@@ -203,34 +203,23 @@ fi
|
|
|
|
|
|
# Program Files
|
|
# Program Files
|
|
%attr(0755,root,root) %{_sbindir}/%{base_name}
|
|
%attr(0755,root,root) %{_sbindir}/%{base_name}
|
|
-%attr(0755,root,root) %{_bindir}/squidclient
|
|
+%attr(0755,root,root) %{_bindir}/*
|
|
|
|
|
|
%attr(0755,root,root) %{_initdir}/%{base_name}
|
|
%attr(0755,root,root) %{_initdir}/%{base_name}
|
|
|
|
|
|
%attr(0755,root,root) %{_libdir}/%{base_name}/cachemgr.cgi
|
|
%attr(0755,root,root) %{_libdir}/%{base_name}/cachemgr.cgi
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_pw_auth
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/basic_*
|
|
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/cert_*
|
|
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_*
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/diskd
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/diskd
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/fakeauth_auth
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ext_*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/getpwname_auth
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/helper*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ip_user_check
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/log_*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/msnt_auth
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ncsa_auth
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ntlm_*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_kerb_auth
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/storeid_*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_kerb_auth_test
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ntlm_smb_lm_auth
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/pam_auth
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/sasl_auth
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/smb_auth
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/smb_auth.pl
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/smb_auth.sh
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_kerb_auth
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_kerb_auth_test
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_ldap_auth
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_ldap_group
|
|
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/squid_unix_group
|
|
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/wbinfo_group.pl
|
|
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
|
|
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/yp_auth
|
|
|
|
|
|
|
|
# Config Files
|
|
# Config Files
|
|
%attr(0640,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
|
|
%attr(0640,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
|
|
@@ -263,6 +252,9 @@ fi
|
|
%{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
|
|
%{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Mon Jul 7 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.6-1
|
|
|
|
+- new upstream release.
|
|
|
|
+
|
|
* Sat Jan 12 2013 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.23-1
|
|
* Sat Jan 12 2013 Masahiro INOUE <miyabi.-.inoue@nifty.com> 3.1.23-1
|
|
- new upstream release
|
|
- new upstream release
|
|
|
|
|