squid-3.5.5-1

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

s/squid/squid-vl.spec

@@ -1,6 +1,6 @@
 %define         base_name       squid
 %define         pkg_epoch       7
-%define         pkg_version     3.4.6
+%define         pkg_version     3.5.5
 %define         pkg_release     1%{?_dist_release}
 %define         uid             23
 %define         gid             23
@@ -20,12 +20,16 @@ License:        GPLv2+
 Group:          Applications/Services
 URL:            http://www.squid-cache.org
 
+Patch201: squid-3.1.0.9-config.patch
+Patch202: squid-3.1.0.9-location.patch
+Patch203: squid-3.0.STABLE1-perlpath.patch
+
 Requires:       bash >= 2.0
 Requires(pre):  shadow-utils
 Requires(post): %{_syssbindir}/chkconfig
 Requires(preun): %{_syssbindir}/chkconfig
 BuildRequires:  openldap-devel pam-devel openssl-devel krb5-devel
-BuildRequires:  cyrus-sasl-devel libcap-devel
+BuildRequires:  cyrus-sasl-devel libcap-devel libdb-devel
 BuildRoot:      %{_tmppath}/%{base_name}-%{version}-root
 
 Conflicts:      squid30
@@ -63,16 +67,26 @@ Squid は、メインのサーバプログラム squid と、 Domain Name System
 %prep
 %setup -q
 
+%patch201 -p1 -b .config
+%patch202 -p1 -b .location
+%patch203 -p1 -b .perlpath
+
 %build
-export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;
+CXXFLAGS="$RPM_OPT_FLAGS -fPIC"
+CFLAGS="$RPM_OPT_FLAGS -fPIC"
+LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
+
 %configure \
    --libexecdir=%{_libdir}/%{base_name} \
-   --sysconfdir=%{_sysconfdir}/%{base_name} \
    --datadir=%{_datadir}/%{base_name} \
+   --sysconfdir=%{_sysconfdir}/%{base_name} \
+   --with-logdir=%{_localstatedir}/log/%{base_name} \
    --disable-dependency-tracking \
+   --enable-eui \
+   --enable-follow-x-forwarded-for \
    --enable-arp-acl \
    --enable-auth \
-   --enable-auth-basic="DB,LDAP,MSNT,MSNT-multi-domain,NCSA,NIS,PAM,POP3,SASL,SMB,getpwnam" \
+   --enable-auth-basic="DB,LDAP,MSNT-multi-domain,NCSA,NIS,PAM,POP3,SASL,SMB,getpwnam" \
    --enable-auth-digest="file,LDAP,eDirectory" \
    --enable-auth-negotiate="kerberos" \
    --enable-auth-ntlm="smb_lm,fake" \
@@ -91,17 +105,20 @@ export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned
    --enable-removal-policies="heap,lru" \
    --enable-snmp \
    --enable-ssl \
-   --enable-storeio="aufs,diskd,ufs" \
+   --enable-ssl-crtd \
+   --enable-storeio="aufs,diskd,ufs,rock" \
+   --enable-diskio \
    --enable-useragent-log \
    --enable-wccpv2 \
    --with-aio \
    --with-default-user="%{base_name}" \
-   --with-logdir=%{_localstatedir}/log/%{base_name} \
    --with-filedescriptors=16384 \
    --with-dl \
-   --with-pthreads
+   --with-openssl \
+   --with-pthreads \
+   --disable-arch-native \
+   --with-pic
 
-export CXXFLAGS="-fPIE" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS="-pie" ;
 %{__make} \
     %{?_smp_mflags} \
     DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{base_name}"
@@ -151,6 +168,13 @@ rm -f ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp
 %clean
 [ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
 
+%pretrans
+for l in zh-cn zh-tw; do
+  if [ -d /usr/share/squid/errors/$l -a ! -L /usr/share/squid/errors/$l ]; then
+    rm -rf /usr/share/squid/errors/$l
+  fi
+done
+
 %pre
 if ! getent group %{base_name} >/dev/null 2>&1; then
   /usr/sbin/groupadd -g %{gid} %{base_name}
@@ -217,6 +241,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}/storeid_*
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/unlinkd
 %attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
@@ -225,7 +250,6 @@ fi
 %attr(0640,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/%{base_name}.conf
 %attr(0644,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/cachemgr.conf
 %config(noreplace) %{_sysconfdir}/%{base_name}/mime.conf
-%config(noreplace) %{_sysconfdir}/%{base_name}/msntauth.conf
 %config(noreplace) %{_sysconfdir}/%{base_name}/errorpage.css
 
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{base_name}.conf
@@ -238,7 +262,6 @@ fi
 %config %{_sysconfdir}/%{base_name}/%{base_name}.conf.default
 %config %{_sysconfdir}/%{base_name}/cachemgr.conf.default
 %config %{_sysconfdir}/%{base_name}/mime.conf.default
-%config %{_sysconfdir}/%{base_name}/msntauth.conf.default
 %config %{_sysconfdir}/%{base_name}/errorpage.css.default
 
 # Data Files
@@ -252,6 +275,9 @@ fi
 %{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
 
 %changelog
+* Thu Jun 18 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.5.5-1
+- new upstream release.
+
 * Mon Jul  7 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.6-1
 - new upstream release.