- up to 4.2

diff --git a/squid-crash-on-ENOSPC.patch b/squid-crash-on-ENOSPC.patch
index a560648b15dea8a57144201a9a01ee01c738f3e1..453a0d6293c717b58957327da97005f8e5b1818c 100644 (file)
--- a/squid-crash-on-ENOSPC.patch
+++ b/squid-crash-on-ENOSPC.patch
@@ -1,14 +1,14 @@
---- squid-3.2.3/src/log/ModStdio.cc~   2012-10-20 14:39:49.000000000 +0200
-+++ squid-3.2.3/src/log/ModStdio.cc    2012-10-26 12:23:52.502399442 +0200
-@@ -60,7 +60,11 @@
+--- squid-4.2//src/log/ModStdio.cc~    2018-08-05 16:13:41.000000000 +0200
++++ squid-4.2//src/log/ModStdio.cc     2018-09-20 20:19:38.877856849 +0200
+@@ -46,7 +46,11 @@ logfileWriteWrapper(Logfile * lf, const

      if (!lf->flags.fatal)
          return;
  
      if (!lf->flags.fatal)
          return;
  

--    fatalf("logfileWrite: %s: %s\n", lf->path, xstrerror());
+-    fatalf("logfileWrite: %s: %s\n", lf->path, xstrerr(xerrno));

 +#if HAVE_SYSLOG
 +#if HAVE_SYSLOG

-+    syslog(LOG_ALERT, "logfileWrite: %s: %s", lf->path, xstrerror());
++    syslog(LOG_ALERT, "logfileWrite: %s: %s", lf->path, xstrerr(xerrno));

 +#else
 +#else

-+    debugs(50, 1, "logfileWrite: " << lf->path << ": " << xstrerror());
++    debugs(50, 1, "logfileWrite: " << lf->path << ": " << xstrerr(xerrno));

 +#endif
  }
  
 +#endif
  }
  

diff --git a/squid-fhs.patch b/squid-fhs.patch
deleted file mode 100644 (file)
index 923946a..0000000
--- a/squid-fhs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur squid-3.1.14-orig/src/Makefile.am squid-3.1.14/src/Makefile.am
---- squid-3.1.14-orig/src/Makefile.am  2011-07-04 06:38:34.000000000 +0200
-+++ squid-3.1.14/src/Makefile.am       2011-07-12 13:15:33.936929633 +0200
-@@ -867,7 +867,7 @@
- DEFAULT_CACHE_LOG     = $(DEFAULT_LOG_PREFIX)/cache.log
- DEFAULT_ACCESS_LOG    = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG     = $(DEFAULT_LOG_PREFIX)/store.log
--DEFAULT_NETDB_FILE    = $(DEFAULT_LOG_PREFIX)/netdb.state
-+DEFAULT_NETDB_FILE    = $(DEFAULT_SWAP_PREFIX)/netdb.state
- DEFAULT_SSL_DB_DIR    = $(localstatedir)/lib/ssl_db
- DEFAULT_PINGER                = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
- DEFAULT_UNLINKD               = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`

diff --git a/squid.spec b/squid.spec
index e702e7059ea69a593d925d1669ede0f72ad09003..4786a4bf9c42dd15c00e01b027f1a1c76acf5101 100644 (file)
--- a/squid.spec
+++ b/squid.spec
@@ -16,13 +16,13 @@ Summary(ru.UTF-8):  Squid - кэш объектов Internet
 Summary(uk.UTF-8):     Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):  SQUID 高速缓冲代理服务器
 Name:          squid
 Summary(uk.UTF-8):     Squid - кеш об'єктів Internet
 Summary(zh_CN.UTF-8):  SQUID 高速缓冲代理服务器
 Name:          squid

-Version:       3.5.27
-Release:       2
+Version:       4.2
+Release:       1

 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons
 Epoch:         7
 License:       GPL v2
 Group:         Networking/Daemons

-Source0:       http://www.squid-cache.org/Versions/v3/3.5/%{name}-%{version}.tar.xz
-# Source0-md5: 39ef8199675d48a314b540f92c00c545
+Source0:       http://www.squid-cache.org/Versions/v4/%{name}-%{version}.tar.xz
+# Source0-md5: 2cf3f5f183d04322d798f98ea5ead43f

 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       http://squid-docs.sourceforge.net/latest/zip-files/book-full-html.zip


@@ -35,7 +35,7 @@ Source8:      %{name}.tmpfiles
 Source9:       %{name}-cachemgr-httpd.conf
 Source10:      %{name}.service
 Source11:      %{name}-check_cache
 Source9:       %{name}-cachemgr-httpd.conf
 Source10:      %{name}.service
 Source11:      %{name}-check_cache

-Patch0:                %{name}-fhs.patch
+

 Patch1:                %{name}-location.patch
 Patch2:                %{name}-crash-on-ENOSPC.patch
 Patch4:                %{name}-2.5.STABLE4-apache-like-combined-log.patch
 Patch1:                %{name}-location.patch
 Patch2:                %{name}-crash-on-ENOSPC.patch
 Patch4:                %{name}-2.5.STABLE4-apache-like-combined-log.patch


@@ -626,7 +626,7 @@ Ten pakiet zawiera skrypty perlowe i dodatkowe programy dla Squida.
 
 %prep
 %setup -q -a3
 
 %prep
 %setup -q -a3

-%patch0 -p1
+

 %patch1 -p1
 %patch2 -p1
 %{?with_combined_log:%patch4 -p1}
 %patch1 -p1
 %patch2 -p1
 %{?with_combined_log:%patch4 -p1}


@@ -836,10 +836,14 @@ fi
 %attr(755,root,root) %{_libexecdir}/ntlm_fake_auth
 %attr(755,root,root) %{_libexecdir}/basic_fake_auth
 %attr(755,root,root) %{_libexecdir}/ext_delayer_acl
 %attr(755,root,root) %{_libexecdir}/ntlm_fake_auth
 %attr(755,root,root) %{_libexecdir}/basic_fake_auth
 %attr(755,root,root) %{_libexecdir}/ext_delayer_acl

+%attr(755,root,root) %{_libexecdir}/helper-mux

 %attr(755,root,root) %{_libexecdir}/url_fake_rewrite
 %attr(755,root,root) %{_libexecdir}/url_fake_rewrite.sh
 %attr(755,root,root) %{_libexecdir}/log_file_daemon
 %attr(755,root,root) %{_libexecdir}/url_fake_rewrite
 %attr(755,root,root) %{_libexecdir}/url_fake_rewrite.sh
 %attr(755,root,root) %{_libexecdir}/log_file_daemon

+%attr(755,root,root) %{_libexecdir}/security_fake_certverify
+%attr(755,root,root) %{_libexecdir}/security_file_certgen

 %attr(755,root,root) %{_libexecdir}/squid-check_cache
 %attr(755,root,root) %{_libexecdir}/squid-check_cache

+%attr(755,root,root) %{_libexecdir}/url_lfs_rewrite

 %attr(755,root,root) %{_sbindir}/squid
 
 %attr(754,root,root) /etc/rc.d/init.d/squid
 %attr(755,root,root) %{_sbindir}/squid
 
 %attr(754,root,root) /etc/rc.d/init.d/squid


@@ -956,9 +960,14 @@ fi
 %ghost /var/cache/squid/swap.state
 %ghost /var/cache/squid/swap.state.clean
 %ghost /var/cache/squid/swap.state.last-clean
 %ghost /var/cache/squid/swap.state
 %ghost /var/cache/squid/swap.state.clean
 %ghost /var/cache/squid/swap.state.last-clean

+%{_mandir}/man1/purge.1*

 %{_mandir}/man1/squidclient.1*
 %{_mandir}/man8/ext_delayer_acl.8*
 %{_mandir}/man8/squid.8*
 %{_mandir}/man1/squidclient.1*
 %{_mandir}/man8/ext_delayer_acl.8*
 %{_mandir}/man8/squid.8*

+%{_mandir}/man8/helper-mux.8*
+%{_mandir}/man8/security_fake_certverify.8*
+%{_mandir}/man8/security_file_certgen.8*
+%{_mandir}/man8/url_lfs_rewrite.8*

 
 %files cachemgr
 %defattr(644,root,root,755)
 
 %files cachemgr
 %defattr(644,root,root,755)


@@ -985,14 +994,13 @@ fi
 
 %files smb_auth
 %defattr(644,root,root,755)
 
 %files smb_auth
 %defattr(644,root,root,755)

-%doc helpers/basic_auth/SMB/ChangeLog
-%attr(755,root,root) %{_libexecdir}/basic_smb_lm_auth
+%doc src/auth/basic/SMB/ChangeLog

 %attr(755,root,root) %{_libexecdir}/basic_smb_auth*
 
 %files msnt_auth
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/basic_smb_auth*
 
 %files msnt_auth
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libexecdir}/basic_msnt_multi_domain_auth
-%{_mandir}/man8/basic_msnt_multi_domain_auth.8*
+#%attr(755,root,root) %{_libexecdir}/basic_msnt_multi_domain_auth
+#%{_mandir}/man8/basic_msnt_multi_domain_auth.8*

 
 %files nis_auth
 %defattr(644,root,root,755)
 
 %files nis_auth
 %defattr(644,root,root,755)


@@ -1005,7 +1013,7 @@ fi
 
 %files sasl_auth
 %defattr(644,root,root,755)
 
 %files sasl_auth
 %defattr(644,root,root,755)

-%doc helpers/basic_auth/SASL/basic_sasl_auth.{conf,pam}
+%doc src/auth/basic/SASL/basic_sasl_auth.{conf,pam}

 %attr(755,root,root) %{_libexecdir}/basic_sasl_auth
 %{_mandir}/man8/basic_sasl_auth.8*
 
 %attr(755,root,root) %{_libexecdir}/basic_sasl_auth
 %{_mandir}/man8/basic_sasl_auth.8*
 


@@ -1021,18 +1029,18 @@ fi
 
 %files kerberos_auth
 %defattr(644,root,root,755)
 
 %files kerberos_auth
 %defattr(644,root,root,755)

-%doc helpers/negotiate_auth/kerberos/README
+%doc src/auth/negotiate/kerberos/README

 %attr(755,root,root) %{_libexecdir}/negotiate_kerberos_auth
 %attr(755,root,root) %{_libexecdir}/negotiate_kerberos_auth_test
 %{_mandir}/man8/negotiate_kerberos_auth.8*
 
 %files ntlm_auth
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/negotiate_kerberos_auth
 %attr(755,root,root) %{_libexecdir}/negotiate_kerberos_auth_test
 %{_mandir}/man8/negotiate_kerberos_auth.8*
 
 %files ntlm_auth
 %defattr(644,root,root,755)

-%attr(755,root,root) %{_libexecdir}/ntlm_smb_lm_auth
+#%attr(755,root,root) %{_libexecdir}/ntlm_smb_lm_auth

 
 %files radius_auth
 %defattr(644,root,root,755)
 
 %files radius_auth
 %defattr(644,root,root,755)

-%doc helpers/basic_auth/RADIUS/README
+%doc src/auth/basic/RADIUS/README

 %attr(755,root,root) %{_libexecdir}/basic_radius_auth
 %{_mandir}/man8/basic_radius_auth.8*
 
 %attr(755,root,root) %{_libexecdir}/basic_radius_auth
 %{_mandir}/man8/basic_radius_auth.8*
 


@@ -1060,7 +1068,7 @@ fi
 
 %files ip_acl
 %defattr(644,root,root,755)
 
 %files ip_acl
 %defattr(644,root,root,755)

-%doc helpers/external_acl/file_userip/example*
+%doc src/acl/external/file_userip/example*

 %attr(755,root,root) %{_libexecdir}/ext_file_userip_acl
 %{_mandir}/man8/ext_file_userip_acl.*
 
 %attr(755,root,root) %{_libexecdir}/ext_file_userip_acl
 %{_mandir}/man8/ext_file_userip_acl.*
 


@@ -1122,12 +1130,10 @@ fi
 %attr(755,root,root) %{_libexecdir}/cachetrace.pl
 %attr(755,root,root) %{_libexecdir}/calc-must-ids.pl
 %attr(755,root,root) %{_libexecdir}/cert_tool
 %attr(755,root,root) %{_libexecdir}/cachetrace.pl
 %attr(755,root,root) %{_libexecdir}/calc-must-ids.pl
 %attr(755,root,root) %{_libexecdir}/cert_tool

-%attr(755,root,root) %{_libexecdir}/cert_valid.pl

 %attr(755,root,root) %{_libexecdir}/check_cache.pl
 %attr(755,root,root) %{_libexecdir}/fileno-to-pathname.pl
 %attr(755,root,root) %{_libexecdir}/find-alive.pl
 %attr(755,root,root) %{_libexecdir}/flag_truncs.pl
 %attr(755,root,root) %{_libexecdir}/check_cache.pl
 %attr(755,root,root) %{_libexecdir}/fileno-to-pathname.pl
 %attr(755,root,root) %{_libexecdir}/find-alive.pl
 %attr(755,root,root) %{_libexecdir}/flag_truncs.pl

-%attr(755,root,root) %{_libexecdir}/helper-mux.pl

 %attr(755,root,root) %{_libexecdir}/icpserver.pl
 %attr(755,root,root) %{_libexecdir}/icp-test.pl
 %attr(755,root,root) %{_libexecdir}/tcp-banger.pl
 %attr(755,root,root) %{_libexecdir}/icpserver.pl
 %attr(755,root,root) %{_libexecdir}/icp-test.pl
 %attr(755,root,root) %{_libexecdir}/tcp-banger.pl