squid 3.4.14: Bugfix for #4323 (Netfilter broken cross-includes with Linux 4.2)

  For details see: http://bugs.squid-cache.org/show_bug.cgi?id=4323

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/rootfiles/common/squid     |  2 ++
 lfs/squid                         |  3 ++-
 src/patches/squid-3.4-13231.patch | 48 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/patches/squid-3.4-13231.patch
  

The *kerberos_auth* files are missing after clean build so cdrom will 
fail now...

Arne

> diff --git a/config/rootfiles/common/squid 
> b/config/rootfiles/common/squid
> index c8227e3..83cfe3f 100644
> --- a/config/rootfiles/common/squid
> +++ b/config/rootfiles/common/squid
> @@ -2145,6 +2145,8 @@ usr/lib/squid/icons/silk/script_palette.png
>  usr/lib/squid/log_db_daemon
>  usr/lib/squid/log_file_daemon
>  usr/lib/squid/mib.txt
> +usr/lib/squid/negotiate_kerberos_auth
> +usr/lib/squid/negotiate_kerberos_auth_test
>  usr/lib/squid/negotiate_wrapper_auth
>  usr/lib/squid/ntlm_fake_auth
>  usr/lib/squid/ntlm_smb_lm_auth
  

Hi,

On 06.04.2016 13:19, Arne Fitzenreiter wrote:
> The *kerberos_auth* files are missing after clean build so cdrom will 
> fail now...

I'll take care of this!

Somehow weird, though. During the last builds prior to this commit,
'cdrom' failed because these files were build, so I added them. Now its
the other way around!?
I started a clean build and test - Devel is running.

Best,
Matthias

> 
> Arne
> 
>> diff --git a/config/rootfiles/common/squid 
>> b/config/rootfiles/common/squid
>> index c8227e3..83cfe3f 100644
>> --- a/config/rootfiles/common/squid
>> +++ b/config/rootfiles/common/squid
>> @@ -2145,6 +2145,8 @@ usr/lib/squid/icons/silk/script_palette.png
>>  usr/lib/squid/log_db_daemon
>>  usr/lib/squid/log_file_daemon
>>  usr/lib/squid/mib.txt
>> +usr/lib/squid/negotiate_kerberos_auth
>> +usr/lib/squid/negotiate_kerberos_auth_test
>>  usr/lib/squid/negotiate_wrapper_auth
>>  usr/lib/squid/ntlm_fake_auth
>>  usr/lib/squid/ntlm_smb_lm_auth
> 
>
  

Hi,

sorry, I patched this already. Didn't see your email before I did this.

This is basically happens when krb is built and squid is built after that.
Usually it is built first and krb afterwards. If you rebuild squid after a full
compile, krb will be around and compiled into squid which we don't want.

I couldn't find a switch to explicitly switch this off (like --disable-
kerberos). If you find something similar, feel free to send a patch.

-Michael

On Wed, 2016-04-06 at 18:51 +0200, Matthias Fischer wrote:
> Hi,
> 
> On 06.04.2016 13:19, Arne Fitzenreiter wrote:
> > 
> > The *kerberos_auth* files are missing after clean build so cdrom will 
> > fail now...
> I'll take care of this!
> 
> Somehow weird, though. During the last builds prior to this commit,
> 'cdrom' failed because these files were build, so I added them. Now its
> the other way around!?
> I started a clean build and test - Devel is running.
> 
> Best,
> Matthias
> 
> > 
> > 
> > Arne
> > 
> > > 
> > > diff --git a/config/rootfiles/common/squid 
> > > b/config/rootfiles/common/squid
> > > index c8227e3..83cfe3f 100644
> > > --- a/config/rootfiles/common/squid
> > > +++ b/config/rootfiles/common/squid
> > > @@ -2145,6 +2145,8 @@ usr/lib/squid/icons/silk/script_palette.png
> > >  usr/lib/squid/log_db_daemon
> > >  usr/lib/squid/log_file_daemon
> > >  usr/lib/squid/mib.txt
> > > +usr/lib/squid/negotiate_kerberos_auth
> > > +usr/lib/squid/negotiate_kerberos_auth_test
> > >  usr/lib/squid/negotiate_wrapper_auth
> > >  usr/lib/squid/ntlm_fake_auth
> > >  usr/lib/squid/ntlm_smb_lm_auth
> >
  

Hi,

On 06.04.2016 23:00, Michael Tremer wrote:
> sorry, I patched this already. Didn't see your email before I did this.

No problem. Everything's fine. ;-)

> This is basically happens when krb is built and squid is built after that.
> Usually it is built first and krb afterwards. If you rebuild squid after a full
> compile, krb will be around and compiled into squid which we don't want.

Yep. I think, this must be the reason.

> I couldn't find a switch to explicitly switch this off (like --disable-
> kerberos). If you find something similar, feel free to send a patch.

If I find one, you'll know. ;-))

Best,
Matthias