squid-4.4-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11933 ec354946-7b23-47d6-9f5a-488ba84defc7

s/squid/squid-vl.spec

@@ -1,10 +1,12 @@
 %define         base_name       squid
 %define         pkg_epoch       7
-%define         pkg_version     3.5.27
+%define         pkg_version     4.4
-%define         pkg_release     2%{?_dist_release}
+%define         pkg_release     1%{?_dist_release}
 %define         uid             23
 %define         gid             23
 
+%define _unpackaged_files_terminate_build 1
+
 Summary:        The Squid proxy caching server
 Summary(ja):    Squid ウェブプロキシキャッシュ
 Name:           %{base_name}
@@ -20,9 +22,9 @@ License:        GPLv2+
 Group:          Applications/Services
 URL:            http://www.squid-cache.org
 
-Patch201: squid-3.1.0.9-config.patch
+Patch1:         0001-config.patch
-Patch202: squid-3.1.0.9-location.patch
+Patch2:         0002-location.patch
-Patch203: squid-3.5.27-perlpath.patch
+Patch3:         0003-perlpath.patch
 
 Requires:       bash >= 2.0
 Requires(pre):  shadow-utils
@@ -65,11 +67,7 @@ Squid は、メインのサーバプログラム squid と、 Domain Name System
 (ftpget) と、いくつかの管理用またはクライアントツールから成ります。
 
 %prep
-%setup -q
+%autosetup -p1
-
-%patch201 -p1 -b .config
-%patch202 -p1 -b .location
-%patch203 -p1 -b .perlpath
 
 %build
 CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
@@ -86,10 +84,10 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
    --enable-follow-x-forwarded-for \
    --enable-arp-acl \
    --enable-auth \
-   --enable-auth-basic="DB,LDAP,MSNT-multi-domain,NCSA,NIS,PAM,POP3,SASL,SMB,getpwnam" \
+   --enable-auth-basic="DB,LDAP,NCSA,NIS,PAM,POP3,SASL,SMB,getpwnam" \
    --enable-auth-digest="file,LDAP,eDirectory" \
    --enable-auth-negotiate="kerberos" \
-   --enable-auth-ntlm="smb_lm,fake" \
+   --enable-auth-ntlm="SMB_LM,fake" \
    --enable-external-acl-helpers="LDAP_group,time_quota,session,unix_group,wbinfo_group" \
    --enable-cache-digests \
    --enable-cachemgr-hostname=localhost \
@@ -159,7 +157,7 @@ install -m 644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/pam.d/%{base_name}
 install -m 644 ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp ${RPM_BUILD_ROOT}%{_sysconfdir}/httpd/conf.d/%{base_name}.conf
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{base_name}
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{base_name}
-chmod 644 contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
+chmod 644 contrib/url-normalizer.pl contrib/user-agents.pl
 iconv -f ISO88591 -t UTF8 ChangeLog -o ChangeLog.tmp
 mv -f ChangeLog.tmp ChangeLog
 
@@ -234,7 +232,6 @@ fi
 
 %attr(0755,root,root) %{_libdir}/%{base_name}/cachemgr.cgi
 %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}/ext_*
@@ -242,7 +239,7 @@ fi
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/log_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/negotiate_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ntlm_*
-%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/ssl_crtd
+%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/security_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/storeid_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
@@ -269,13 +266,17 @@ fi
 %{_datadir}/%{base_name}/*
 
 # Document Files
-%doc README ChangeLog QUICKSTART
+%doc COPYING README ChangeLog QUICKSTART
-%doc contrib/url-normalizer.pl contrib/rredir.* contrib/user-agents.pl
+%doc contrib/url-normalizer.pl contrib/user-agents.pl
 %{_mandir}/man8/*
 %{_mandir}/man1/*
 %{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
 
 %changelog
+* Tue Nov 20 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.4-1
+- new upstream release.
+- update patches.
+
 * Tue Jan 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.27-2
 - enabled a build option: --enable-internal-dns.