|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
%define base_name squid
|
|
%define base_name squid
|
|
%define pkg_epoch 7
|
|
%define pkg_epoch 7
|
|
-%define pkg_version 4.12
|
|
|
|
|
|
+%define pkg_version 4.13
|
|
%define pkg_release 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
%define pkg_release 1%{?_dist_release}%{?with_systemd:.systemd}
|
|
%define uid 23
|
|
%define uid 23
|
|
%define gid 23
|
|
%define gid 23
|
|
@@ -15,7 +15,7 @@ Name: %{base_name}
|
|
Epoch: %{pkg_epoch}
|
|
Epoch: %{pkg_epoch}
|
|
Version: %{pkg_version}
|
|
Version: %{pkg_version}
|
|
Release: %{pkg_release}
|
|
Release: %{pkg_release}
|
|
-Group: Applications/Services
|
|
|
|
|
|
+Group: servers
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
Distribution: Vine Linux
|
|
Distribution: Vine Linux
|
|
|
|
|
|
@@ -80,6 +80,7 @@ Squid は、メインのサーバプログラム squid と、 Domain Name System
|
|
%prep
|
|
%prep
|
|
%autosetup -p1
|
|
%autosetup -p1
|
|
|
|
|
|
|
|
+
|
|
%build
|
|
%build
|
|
TIRPC_CFLAGS=$(pkg-config --cflags libtirpc)
|
|
TIRPC_CFLAGS=$(pkg-config --cflags libtirpc)
|
|
TIRPC_LIBS=$(pkg-config --libs libtirpc)
|
|
TIRPC_LIBS=$(pkg-config --libs libtirpc)
|
|
@@ -140,6 +141,7 @@ LDFLAGS="$RPM_LD_FLAGS -pie -Wl,-z,relro -Wl,-z,now -Wl,--warn-shared-textrel"
|
|
%{?_smp_mflags} \
|
|
%{?_smp_mflags} \
|
|
DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{base_name}"
|
|
DEFAULT_SWAP_DIR="%{_localstatedir}/cache/%{base_name}"
|
|
|
|
|
|
|
|
+
|
|
%install
|
|
%install
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
@@ -187,9 +189,11 @@ mv -f ChangeLog.tmp ChangeLog
|
|
# remove unpackaged files from the buildroot
|
|
# remove unpackaged files from the buildroot
|
|
rm -f ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp
|
|
rm -f ${RPM_BUILD_ROOT}/%{base_name}.httpd.tmp
|
|
|
|
|
|
|
|
+
|
|
%clean
|
|
%clean
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && %{__rm} -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
|
|
+
|
|
%pretrans
|
|
%pretrans
|
|
for l in zh-cn zh-tw; do
|
|
for l in zh-cn zh-tw; do
|
|
if [ -d /usr/share/squid/errors/$l -a ! -L /usr/share/squid/errors/$l ]; then
|
|
if [ -d /usr/share/squid/errors/$l -a ! -L /usr/share/squid/errors/$l ]; then
|
|
@@ -225,7 +229,6 @@ if ! /sbin/chkconfig %{base_name}; then
|
|
fi
|
|
fi
|
|
%endif
|
|
%endif
|
|
|
|
|
|
-
|
|
|
|
%preun
|
|
%preun
|
|
%if %{with systemd}
|
|
%if %{with systemd}
|
|
%systemd_preun %{name}.service
|
|
%systemd_preun %{name}.service
|
|
@@ -250,29 +253,18 @@ fi
|
|
/usr/sbin/usermod -a -G wbpriv %{base_name} >/dev/null 2>&1 || \
|
|
/usr/sbin/usermod -a -G wbpriv %{base_name} >/dev/null 2>&1 || \
|
|
chgrp %{base_name} %{_localstatedir}/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
|
|
chgrp %{base_name} %{_localstatedir}/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
|
|
|
|
|
|
|
|
+
|
|
%files
|
|
%files
|
|
%defattr(-,root,root,-)
|
|
%defattr(-,root,root,-)
|
|
-
|
|
|
|
# Directory
|
|
# Directory
|
|
%dir %{_sysconfdir}/%{base_name}/
|
|
%dir %{_sysconfdir}/%{base_name}/
|
|
%dir %{_libdir}/%{base_name}
|
|
%dir %{_libdir}/%{base_name}
|
|
%dir %{_datadir}/%{base_name}
|
|
%dir %{_datadir}/%{base_name}
|
|
-
|
|
|
|
%attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/log/%{base_name}
|
|
%attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/log/%{base_name}
|
|
%attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/cache/%{base_name}
|
|
%attr(0750,%{base_name},%{base_name}) %dir %{_localstatedir}/cache/%{base_name}
|
|
-
|
|
|
|
# Program Files
|
|
# Program Files
|
|
%attr(0755,root,root) %{_sbindir}/%{base_name}
|
|
%attr(0755,root,root) %{_sbindir}/%{base_name}
|
|
%attr(0755,root,root) %{_bindir}/*
|
|
%attr(0755,root,root) %{_bindir}/*
|
|
-
|
|
|
|
-%if %{with systemd}
|
|
|
|
-%attr(0644,root,root) %{_unitdir}/%{base_name}.service
|
|
|
|
-%dir %{_libexecdir}/%{base_name}
|
|
|
|
-%attr(0755,root,root) %{_libexecdir}/%{base_name}/*
|
|
|
|
-%else
|
|
|
|
-%attr(0755,root,root) %{_initdir}/%{base_name}
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
%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}/basic_*
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/basic_*
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_*
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/digest_*
|
|
@@ -286,28 +278,29 @@ fi
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/storeid_*
|
|
%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}/unlinkd
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
|
|
%attr(4750,root,%{base_name}) %{_libdir}/%{base_name}/url_*
|
|
-
|
|
|
|
# Config Files
|
|
# Config Files
|
|
|
|
+%if %{with systemd}
|
|
|
|
+%attr(0644,root,root) %{_unitdir}/%{base_name}.service
|
|
|
|
+%dir %{_libexecdir}/%{base_name}
|
|
|
|
+%attr(0755,root,root) %{_libexecdir}/%{base_name}/*
|
|
|
|
+%else
|
|
|
|
+%attr(0755,root,root) %{_initdir}/%{base_name}
|
|
|
|
+%endif
|
|
%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
|
|
%attr(0644,root,%{base_name}) %config(noreplace) %{_sysconfdir}/%{base_name}/cachemgr.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}/mime.conf
|
|
%config(noreplace) %{_sysconfdir}/%{base_name}/errorpage.css
|
|
%config(noreplace) %{_sysconfdir}/%{base_name}/errorpage.css
|
|
-
|
|
|
|
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{base_name}.conf
|
|
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/httpd/conf.d/%{base_name}.conf
|
|
-
|
|
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/%{base_name}
|
|
%config(noreplace) %{_sysconfdir}/sysconfig/%{base_name}
|
|
%config(noreplace) %{_sysconfdir}/pam.d/%{base_name}
|
|
%config(noreplace) %{_sysconfdir}/pam.d/%{base_name}
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/%{base_name}
|
|
%config(noreplace) %{_sysconfdir}/logrotate.d/%{base_name}
|
|
-
|
|
|
|
# Sample Config Files
|
|
# Sample Config Files
|
|
%config %{_sysconfdir}/%{base_name}/%{base_name}.conf.default
|
|
%config %{_sysconfdir}/%{base_name}/%{base_name}.conf.default
|
|
%config %{_sysconfdir}/%{base_name}/cachemgr.conf.default
|
|
%config %{_sysconfdir}/%{base_name}/cachemgr.conf.default
|
|
%config %{_sysconfdir}/%{base_name}/mime.conf.default
|
|
%config %{_sysconfdir}/%{base_name}/mime.conf.default
|
|
%config %{_sysconfdir}/%{base_name}/errorpage.css.default
|
|
%config %{_sysconfdir}/%{base_name}/errorpage.css.default
|
|
-
|
|
|
|
# Data Files
|
|
# Data Files
|
|
%{_datadir}/%{base_name}/*
|
|
%{_datadir}/%{base_name}/*
|
|
-
|
|
|
|
# Document Files
|
|
# Document Files
|
|
%license COPYING
|
|
%license COPYING
|
|
%doc README ChangeLog QUICKSTART
|
|
%doc README ChangeLog QUICKSTART
|
|
@@ -318,6 +311,9 @@ fi
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Fri Sep 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13-1
|
|
|
|
+- new upstream release.
|
|
|
|
+
|
|
* Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12-1
|
|
* Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
|
|
|