summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-07-22 18:20:46 +0000
committerintrigeri <intrigeri@boum.org>2016-07-22 18:23:06 +0000
commitc2a2f546555dcefc67253beba4228bda44c1ff72 (patch)
tree685156d6b5e039d5aba81ab79c251855f290d6aa
parentbe35933d4d5d27d044ce8aad53f1bb4b31eec01c (diff)
parentc4b04388c2ec2696d7a1929d423c4c5b71f747ea (diff)
Merge remote-tracking branch 'origin/bugfix/10494-fix-htpdate-pools' into stable
Fix-committed: #11577
-rw-r--r--config/chroot_local-includes/etc/default/htpdate.pools4
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/htpdate1
2 files changed, 3 insertions, 2 deletions
diff --git a/config/chroot_local-includes/etc/default/htpdate.pools b/config/chroot_local-includes/etc/default/htpdate.pools
index 68b79b4..e91d876 100644
--- a/config/chroot_local-includes/etc/default/htpdate.pools
+++ b/config/chroot_local-includes/etc/default/htpdate.pools
@@ -1,3 +1,3 @@
-HTP_POOL_PAL="boum.org,chavez.indymedia.org,db.debian.org,epic.org,mail.riseup.net,sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
+HTP_POOL_PAL="boum.org,espiv.net,db.debian.org,epic.org,mail.riseup.net,www.sarava.org,squat.net,tachanka.org,www.1984.is,www.eff.org,www.immerda.ch,www.privacyinternational.org,www.torproject.org"
HTP_POOL_NEUTRAL="cve.mitre.org,en.wikipedia.org,lkml.org,thepiratebay.org,www.apache.org,www.centos.org,www.democracynow.org,www.duckduckgo.com,www.gnu.org,www.kernel.org,www.mozilla.org,www.stackexchange.com,www.startpage.com,www.xkcd.com"
-HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rsa.com,www.sony.com"
+HTP_POOL_FOE="encrypted.google.com,github.com,login.live.com,login.yahoo.com,secure.flickr.com,tumblr.com,twitter.com,www.adobe.com,www.gandi.net,www.myspace.com,www.paypal.com,www.rackspace.com,www.sony.com"
diff --git a/config/chroot_local-includes/usr/local/sbin/htpdate b/config/chroot_local-includes/usr/local/sbin/htpdate
index 41f2b2f..454ba8b 100755
--- a/config/chroot_local-includes/usr/local/sbin/htpdate
+++ b/config/chroot_local-includes/usr/local/sbin/htpdate
@@ -223,6 +223,7 @@ sub getUrlDateDiff {
my @curl_options = (
'--user-agent', $useragent, '--silent',
'--proto', '=https', '--tlsv1',
+ '--max-time', '30',
'--head', '--output', catfile($tmpdir, 'headers'),
);
push @curl_options, ('--socks5-hostname', $proxy) if defined $proxy;