diff -pruN 2.7.STABLE7-1/debian/changelog 2.7.STABLE7-1ubuntu1/debian/changelog --- 2.7.STABLE7-1/debian/changelog 2009-11-06 22:24:29.000000000 +0000 +++ 2.7.STABLE7-1ubuntu1/debian/changelog 2009-11-06 22:24:30.000000000 +0000 @@ -1,3 +1,16 @@ +squid (2.7.STABLE7-1ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil /etc/ssl + + debian/control: + + Add ssl-cert to Depends to bring in snakeoil certificates. + + debian/logrotate: use sarg-reports rather than sarg-maint. + (LP: #268816) + + -- Chuck Short Fri, 06 Nov 2009 02:04:39 +0000 + squid (2.7.STABLE7-1) unstable; urgency=low * New upstream release @@ -19,6 +32,27 @@ squid (2.7.STABLE7-1) unstable; urgency= -- Luigi Gangitano Sun, 20 Sep 2009 01:25:52 +0200 +squid (2.7.STABLE6-2ubuntu2) karmic; urgency=low + + * debian/{control,rules}: add and enable hardened build for PIE + (Debian bug 542723). + + -- Kees Cook Thu, 20 Aug 2009 17:25:42 -0700 + +squid (2.7.STABLE6-2ubuntu1) karmic; urgency=low + + [ Bhavani Shankar ] + * Merge from debian unstable, remaining changes: (LP: #396472) + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add refrence to snakepil /etc/ssl + - debian/control: + + Add ssl-cert to Depends to bring in snakeoil certificates. + - debian/logrotate: use sarg-reports rather than sarg-maint. + (LP: #268816) + + -- Mathias Gug Fri, 14 Aug 2009 18:14:47 -0400 + squid (2.7.STABLE6-2) unstable; urgency=low * debian/{control,rules,postinst.squid-common,NEWS.Debian} @@ -36,6 +70,19 @@ squid (2.7.STABLE6-2) unstable; urgency= -- Luigi Gangitano Tue, 7 Jul 2009 01:48:46 +0100 +squid (2.7.STABLE6-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add refrence to snakepil /etc/ssl + - debian/control: + + Add ssl-cert to Depends to bring in snakeoil certificates. + - debian/logrotate: use sarg-reports rather than sarg-maint. + (LP: #268816) + + -- Andrew Mitchell Tue, 12 May 2009 15:49:17 +1200 + squid (2.7.STABLE6-1) unstable; urgency=low * New upstream release (Closes: #498998) @@ -58,6 +105,21 @@ squid (2.7.STABLE6-1) unstable; urgency= -- Luigi Gangitano Sun, 01 Mar 2009 19:29:09 +0100 +squid (2.7.STABLE3-4.1ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: LP: #326547 + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add refrence to snakepil /etc/ssl + - debian/control: + + Add ssl-cert to Depends to bring in snakeoil certificates. + - debian/logrotate: use sarg-reports rather than sarg-maint. + (LP: #268816) + - Only pass -j$(NUMJOBS) to "$(MAKE) all" and not in MAKEFLAGS as + debian/rules isn't -j safe; see Debian #512512. + + -- Bhavani Shankar Sat, 07 Feb 2009 18:08:10 +0530 + squid (2.7.STABLE3-4.1) unstable; urgency=high * Non-maintainer upload by the security team @@ -91,6 +153,29 @@ squid (2.7.STABLE3-3) unstable; urgency= -- Luigi Gangitano Wed, 21 Jan 2009 01:35:06 +0100 +squid (2.7.STABLE3-2ubuntu2) jaunty; urgency=low + + * Only pass -j$(NUMJOBS) to "$(MAKE) all" and not in MAKEFLAGS as + debian/rules isn't -j safe; see Debian #512512. + + -- Loic Minier Tue, 27 Jan 2009 15:59:20 +0100 + +squid (2.7.STABLE3-2ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add refrence to snakepil /etc/ssl + - debian/control: + + Add ssl-cert to Depends to bring in snakeoil certificates. + + Modify maintainer value to match Debian-Maintainer-Field spec. + - debian/logrotate: use sarg-reports rather than sarg-maint. + (LP: #268816) + - Dropped status action already merged upstream. + - Dropped reload action already merged upstream. + + -- Chuck Short Fri, 09 Jan 2009 16:53:41 +0000 + squid (2.7.STABLE3-2) unstable; urgency=low * debian/squid.rc @@ -121,6 +206,31 @@ squid (2.7.STABLE3-2) unstable; urgency= -- Luigi Gangitano Fri, 9 Jan 2009 05:29:31 +0200 +squid (2.7.STABLE3-1ubuntu2) intrepid; urgency=low + + * debian/logrotate: use sarg-reports rather than sarg-maint. + (LP: #268816) + + -- Chuck Short Mon, 22 Sep 2008 15:31:01 -0400 + +squid (2.7.STABLE3-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil /etc/ssl + - debian/control: + + Add ssl-cert to Depends to bring in snakeoil certificates. + + Modify maintainer value to match Debian-Maintainer-Field spec. + - debian/squid.rc + - Use squid -k to reload the squid configration. (LP: #204474) + + [Dustin Kirkland] + * debian/control: Depend on lsb-base >= 3.2-14, providing status_of_proc(). + * debian/squid.rc: Add the 'status' action (LP: #251299). + + -- Chuck Short Mon, 07 Jul 2008 01:10:49 +0100 + squid (2.7.STABLE3-1) unstable; urgency=low * New upstream release (Closes:#489405) @@ -137,6 +247,20 @@ squid (2.7.STABLE3-1) unstable; urgency= -- Luigi Gangitano Sun, 06 Jul 2008 10:52:31 +0200 +squid (2.7.STABLE2-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil /etc/ssl + - debian/control + + Add ssl-cert to Depends to bring in snakeoil certificates. + + Modify maintainer value to match Debian-Maintainer-Field spec. + - debian/squid.rc + - Use squid -k to reload the squid confiration. (LP: #204474) + + -- Chuck Short Wed, 18 Jun 2008 12:09:23 -0500 + squid (2.7.STABLE2-2) unstable; urgency=low * debian/NEWS.Debian @@ -174,6 +298,20 @@ squid (2.7.STABLE1-1) unstable; urgency= -- Luigi Gangitano Thu, 29 May 2008 16:56:26 +0200 +squid (2.6.20-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil in /etc/ssl + - debian/control + + Add ssl-cert to Depends to bring in snakeoil certificates. + * Moifiy maintainer value to match Debian-Maintainer-Field Spec. + * debian/squid.rc + - Used squid -k to reload the squid configuration. (LP: #204474) + + -- Chuck Short Mon, 26 May 2008 13:20:14 -0500 + squid (2.6.20-1) unstable; urgency=low * New upstream release @@ -184,6 +322,20 @@ squid (2.6.20-1) unstable; urgency=low -- Luigi Gangitano Sat, 03 May 2008 17:49:31 +0200 +squid (2.6.19-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoit in /etc/ssl + - debian/control: + + Add ssl-cert to Depends: to bring in snakeoil certificates. + * Modify maintainer value to match Debian-Maintainer-Field Spec. + * debian/squid.rc + - Use squid -k to reconfigure to reload the squid configuration. (LP: #204474) + + -- Chuck Short Fri, 02 May 2008 14:10:43 -0500 + squid (2.6.19-1) unstable; urgency=low * New upstream release @@ -203,6 +355,32 @@ squid (2.6.19-1) unstable; urgency=low -- Luigi Gangitano Sun, 30 Mar 2008 23:27:22 +0200 +squid (2.6.18-1ubuntu3) hardy; urgency=low + + * debian/squid.rc + - Use squid -k reconfigure to reload the squid configuration. + (LP: #204474). + + -- Chuck Short Wed, 09 Apr 2008 14:48:49 -0400 + +squid (2.6.18-1ubuntu2) hardy; urgency=low + + * No-change rebuild against libldap-2.4-2. + + -- Steve Langasek Wed, 23 Jan 2008 11:35:38 +0000 + +squid (2.6.18-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP:# 182624), Ubuntu remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil certificates in /etc/ssl + - debian/control: + + Add ssl-cert to Depends: to bring in snakeoil certificates. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Fri, 11 Jan 2008 21:47:16 +0000 + squid (2.6.18-1) unstable; urgency=low * New upstream release @@ -217,6 +395,20 @@ squid (2.6.18-1) unstable; urgency=low -- Luigi Gangitano Fri, 11 Jan 2008 14:02:02 +0100 +squid (2.6.17-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil certificates in /etc/ssl + - debian/control: + + DebianMaintainerField + + Add ssl-cert to Depends: to bring in snakeoil certificates. + * Dropped: + - 98_manpage.dpatch: Included in Debian. + + -- Mathias Gug Thu, 03 Jan 2008 11:50:49 -0500 + squid (2.6.17-1) unstable; urgency=low * New upstream release @@ -242,6 +434,20 @@ squid (2.6.17-1) unstable; urgency=low -- Luigi Gangitano Sun, 02 Dec 2007 20:02:55 +0100 +squid (2.6.16-1ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil certificates in /etc/ssl + - debian/control: + + DebianMaintainerField + + Add ssl-cert to Depends: to bring in snakeoil certificates. + - 98_manpage.dpatch: + + Update reference to squid.conf.default in the man page. + + -- Mathias Gug Mon, 19 Nov 2007 04:48:28 -0500 + squid (2.6.16-1) unstable; urgency=low * New upstream release @@ -340,6 +546,26 @@ squid (2.6.14-2) unstable; urgency=low -- Luigi Gangitano Sun, 22 Jul 2007 19:03:10 +0200 +squid (2.6.14-1ubuntu2) gutsy; urgency=low + + * Trigger rebuild for hppa + + -- LaMont Jones Thu, 04 Oct 2007 12:24:29 -0600 + +squid (2.6.14-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil certificates in /etc/ssl + - debian/control: + + DebianMaintainerField + + Add ssl-cert to Depends: to bring in snakeoil certificates. + - 98_manpage.dpatch: + + Update reference to squid.conf.default in the man page. + + -- Mathias Gug Wed, 15 Aug 2007 18:24:37 -0400 + squid (2.6.14-1) unstable; urgency=low * New upstream release @@ -349,6 +575,25 @@ squid (2.6.14-1) unstable; urgency=low -- Luigi Gangitano Sun, 22 Jul 2007 15:35:48 +0200 +squid (2.6.13-2ubuntu2) gutsy; urgency=low + + * 98_manpage.dpatch: + - Update reference to squid.conf.default in the man page. (LP: #105253) + + -- Soren Hansen Wed, 11 Jul 2007 17:50:45 +0200 + +squid (2.6.13-2ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil certificates in /etc/ssl + - debian/control: + + DebianMaintainerField + + Add ssl-cert to Depends: to bring in snakeoil certificates. + + -- Soren Hansen Tue, 10 Jul 2007 14:21:51 +0200 + squid (2.6.13-2) unstable; urgency=low - debian/rules @@ -437,6 +682,18 @@ squid (2.6.13-2) unstable; urgency=low -- Luigi Gangitano Sat, 29 Jun 2007 16:31:55 +0200 +squid (2.6.13-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - 99-ubuntu-ssl-cert-snakeoil: + + src/cf.data.pre: + * Add reference to snakeoil certificates in /etc/ssl + - debian/control: + + DebianMaintainerField + + Add ssl-cert to Depends: to bring in snakeoil certificates. + + -- Soren Hansen Tue, 12 Jun 2007 08:29:07 +0200 + squid (2.6.13-1) unstable; urgency=low * New upstream release @@ -474,6 +731,13 @@ squid (2.6.13-1) unstable; urgency=low -- Luigi Gangitano Sat, 12 May 2007 17:21:05 +0200 +squid (2.6.12-3ubuntu1) gutsy; urgency=low + + * Merged from debian unstable, remaining changes: + - Use snakeoil SSL cert. + + -- Brian Murray Tue, 1 May 2007 14:35:19 -0700 + squid (2.6.12-3) unstable; urgency=low * debian/rules @@ -557,6 +821,23 @@ squid (2.6.5-5) unstable; urgency=low -- Luigi Gangitano Sat, 10 Mar 2007 20:01:12 +0100 +squid (2.6.5-4ubuntu2) feisty; urgency=low + + * SECURITY UPDATE: remote denial of service via TRACE method. + * debian/patches/57-external-trace-crash.dpatch: upstream fix. + * References + http://www.squid-cache.org/Versions/v2/2.6/changesets/11349.patch + CVE-2007-1560 + + -- Kees Cook Thu, 22 Mar 2007 16:22:28 -0700 + +squid (2.6.5-4ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - Use snakeoil SSL cert. + + -- Kees Cook Mon, 22 Jan 2007 10:58:02 -0800 + squid (2.6.5-4) unstable; urgency=high * Urgency high due to security issues @@ -583,6 +864,13 @@ squid (2.6.5-3) unstable; urgency=low -- Luigi Gangitano Wed, 27 Dec 2006 15:33:21 +0100 +squid (2.6.5-2ubuntu1) feisty; urgency=low + + * Merge from debian unstable. + * keep snakeoil cert patch + + -- Oliver Grawert Mon, 20 Nov 2006 02:54:43 +0000 + squid (2.6.5-2) unstable; urgency=low * debian/rules @@ -684,7 +972,6 @@ squid (2.6.2-1) unstable; urgency=low -- Luigi Gangitano Wed, 2 Aug 2006 03:02:07 +0200 - squid (2.6.1-4) unstable; urgency=low * debian/control @@ -697,6 +984,13 @@ squid (2.6.1-4) unstable; urgency=low -- Luigi Gangitano Thu, 27 Jul 2006 01:45:00 +0200 +squid (2.6.1-3ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + * debian/rules + - Removed debian/po/*.po~ + + -- Anibal Monsalve Salazar Thu, 13 Jul 2006 09:21:43 +1000 squid (2.6.1-3) unstable; urgency=low @@ -714,7 +1008,6 @@ squid (2.6.1-3) unstable; urgency=low -- Luigi Gangitano Wed, 12 Jul 2006 15:11:08 +0200 - squid (2.6.1-2) unstable; urgency=low * debian/control @@ -722,6 +1015,18 @@ squid (2.6.1-2) unstable; urgency=low -- Luigi Gangitano Sun, 9 Jul 2006 13:22:55 +0200 +squid (2.6.1-1ubuntu2) edgy; urgency=low + + * Add libdb4.4-dev build dependency to fix FTBFS. + + -- Martin Pitt Tue, 11 Jul 2006 13:38:01 +0200 + +squid (2.6.1-1ubuntu1) edgy; urgency=low + + * Merge from Debian unstable. + + -- Martin Pitt Mon, 10 Jul 2006 08:35:58 +0200 + squid (2.6.1-1) unstable; urgency=low * New upstream version @@ -750,6 +1055,13 @@ squid (2.5.14-2) unstable; urgency=low -- Luigi Gangitano Wed, 14 Jun 2006 14:44:40 +0200 +squid (2.5.14-1ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + * Only Ubuntu change left: Use snakeoil SSL certificate. + + -- Martin Pitt Thu, 6 Jul 2006 10:41:53 +0200 + squid (2.5.14-1) unstable; urgency=low * New upstream release @@ -781,6 +1093,21 @@ squid (2.5.13-1) unstable; urgency=low -- Luigi Gangitano Sun, 19 Mar 2006 01:19:36 +0100 +squid (2.5.12-4ubuntu2) dapper; urgency=low + + * Add 99-ubuntu-wbinfo_group.dpatch, to make wbinfo_group.pl work properly + with Samba >= 3.0.21, which is in dapper (Closes: launchpad.net/29228) + + -- Adam Conrad Wed, 22 Feb 2006 21:21:56 +1100 + +squid (2.5.12-4ubuntu1) dapper; urgency=low + + * Switch default config to suggest default ssl-cert-snakeoil certificates. + * Add Depends on ssl-cert. + * Add patch ssl-cert-snakeoil. + + -- Fabio M. Di Nitto Sat, 04 Feb 2006 11:12:20 +0100 + squid (2.5.12-4) unstable; urgency=low * The "Required is not essential" release @@ -1986,7 +2313,7 @@ squid (2.2.5-2) unstable; urgency=low * Use unlink() instead of safeunlink to remove pidfile (closes: #40501) -- Miquel van Smoorenburg Sat, 20 Nov 1999 15:20:20 +0100 - + squid (2.2.5-1) unstable; urgency=low * New upstream release @@ -2272,3 +2599,4 @@ squid (1.0.beta16) stable; urgency=low * added debian package information -- Craig Sanders Fri, 14 Jun 1996 18:55:45 +0200 + diff -pruN 2.7.STABLE7-1/debian/control 2.7.STABLE7-1ubuntu1/debian/control --- 2.7.STABLE7-1/debian/control 2009-11-06 22:24:29.000000000 +0000 +++ 2.7.STABLE7-1ubuntu1/debian/control 2009-11-06 22:24:30.000000000 +0000 @@ -1,7 +1,8 @@ Source: squid Section: web Priority: optional -Maintainer: Luigi Gangitano +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Luigi Gangitano Homepage: http://www.squid-cache.org/ Standards-Version: 3.8.3 Build-Depends: libldap2-dev, libpam0g-dev, sharutils, dpatch (>= 2.0.9), po-debconf, libdb-dev, libgssglue-dev, libkrb5-dev, hardening-wrapper @@ -11,7 +12,7 @@ Architecture: any Section: web Priority: optional Pre-Depends: debconf (>= 1.2.9) | debconf-2.0 -Depends: ${shlibs:Depends}, netbase, adduser, logrotate (>= 3.5.4-1), squid-common (>= ${source:Version}), lsb-base (>= 3.2-14) +Depends: ${shlibs:Depends}, netbase, adduser, logrotate (>= 3.5.4-1), squid-common (>= ${source:Version}), lsb-base (>= 3.2-14), ssl-cert (>= 1.0-11ubuntu1) Conflicts: squid-novm, sarg (<< 1.1.1-2) Replaces: squid-novm Suggests: squidclient, squid-cgi, logcheck-database, resolvconf (>= 0.40), smbclient, winbind diff -pruN 2.7.STABLE7-1/debian/logrotate 2.7.STABLE7-1ubuntu1/debian/logrotate --- 2.7.STABLE7-1/debian/logrotate 2009-11-06 22:24:29.000000000 +0000 +++ 2.7.STABLE7-1ubuntu1/debian/logrotate 2009-11-06 22:24:30.000000000 +0000 @@ -9,6 +9,9 @@ missingok nocreate sharedscripts + prerotate + test ! -x /usr/sbin/sarg-reports || /usr/sbin/sarg-reports + endscript postrotate test ! -e /var/run/squid.pid || /usr/sbin/squid -k rotate endscript diff -pruN 2.7.STABLE7-1/debian/patches/00list 2.7.STABLE7-1ubuntu1/debian/patches/00list --- 2.7.STABLE7-1/debian/patches/00list 2009-11-06 22:24:29.000000000 +0000 +++ 2.7.STABLE7-1ubuntu1/debian/patches/00list 2009-11-06 22:24:30.000000000 +0000 @@ -4,3 +4,4 @@ 04-smb-auth 06-unlinkd 07-manpage +99-ubuntu-ssl-cert-snakeoil diff -pruN 2.7.STABLE7-1/debian/patches/99-ubuntu-ssl-cert-snakeoil.dpatch 2.7.STABLE7-1ubuntu1/debian/patches/99-ubuntu-ssl-cert-snakeoil.dpatch --- 2.7.STABLE7-1/debian/patches/99-ubuntu-ssl-cert-snakeoil.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ 2.7.STABLE7-1ubuntu1/debian/patches/99-ubuntu-ssl-cert-snakeoil.dpatch 2009-11-06 22:24:30.000000000 +0000 @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## ssl-cert-snakoil.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad squid-2.6.1~/src/cf.data.pre squid-2.6.1/src/cf.data.pre +--- squid-2.6.1~/src/cf.data.pre 2006-07-10 08:37:11.000000000 +0200 ++++ squid-2.6.1/src/cf.data.pre 2006-07-10 08:39:34.000000000 +0200 +@@ -606,6 +606,19 @@ + specified then 'sslcert' is assumed to reference a + combined file containing both the certificate and the key. + ++ Notes: ++ ++ On Debian/Ubuntu system a default snakeoil certificate is ++ available in /etc/ssl and users can set: ++ ++ cert=/etc/ssl/certs/ssl-cert-snakeoil.pem ++ ++ and ++ ++ key=/etc/ssl/private/ssl-cert-snakeoil.key ++ ++ for testing. ++ + use sslversion=1|2|3|4 to specify the SSL version to use + when connecting to this peer + 1 = automatic (default) diff -pruN 2.7.STABLE7-1/debian/po/nl.po 2.7.STABLE7-1ubuntu1/debian/po/nl.po --- 2.7.STABLE7-1/debian/po/nl.po 2009-11-06 22:24:29.000000000 +0000 +++ 2.7.STABLE7-1ubuntu1/debian/po/nl.po 2009-11-06 22:24:30.000000000 +0000 @@ -25,15 +25,13 @@ msgstr "squid.conf automatisch opwaarder #. Description #: ../templates:2001 msgid "Incompatible settings have been found in the existing squid.conf file." -msgstr "" -"Incompatibele instellingen gevonden in bestaand squid.conf bestand" +msgstr "Incompatibele instellingen gevonden in bestaand squid.conf bestand" #. Type: boolean #. Description #: ../templates:2001 msgid "They will prevent Squid from starting or working correctly." -msgstr "" -"Squid zal hierdoor niet correct starten of werken." +msgstr "Squid zal hierdoor niet correct starten of werken." #. Type: boolean #. Description @@ -49,8 +47,7 @@ msgstr "" #. Description #: ../templates:3001 msgid "Fix permissions of 'cache_dir'?" -msgstr "" -"Permissies van 'cache_dir' repareren?" +msgstr "Permissies van 'cache_dir' repareren?" #. Type: boolean #. Description @@ -60,16 +57,15 @@ msgid "" "Squid's configuration file are incompatible with the owner/group of the " "cache directories." msgstr "" -"De waarden voor 'cache_effective_user' en/of 'cache_effective_group' " -"in het configuratiebestand zijn incompatibel met de gebruiker/groep van " -"de cache-mappen." +"De waarden voor 'cache_effective_user' en/of 'cache_effective_group' in het " +"configuratiebestand zijn incompatibel met de gebruiker/groep van de cache-" +"mappen." #. Type: boolean #. Description #: ../templates:3001 msgid "Please choose whether this should be fixed automatically." -msgstr "" -"Wilt u de permissies van de cache-map automatisch laten repareren?" +msgstr "Wilt u de permissies van de cache-map automatisch laten repareren?" #. Type: boolean #. Description