| Message ID | 1509898955-17124-2-git-send-email-nerv@dawncrow.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] libkrb5: New package | expand |
Hi André, On Sun, Nov 05, 2017 at 05:22:35PM +0100, André Hentschel wrote: > Signed-off-by: André Hentschel <nerv@dawncrow.de> > --- > package/squid/squid.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/package/squid/squid.mk b/package/squid/squid.mk > index d334d14..3b3649a 100644 > --- a/package/squid/squid.mk > +++ b/package/squid/squid.mk > @@ -29,7 +29,6 @@ SQUID_CONF_OPTS = \ > --enable-removal-policies="lru,heap" \ > --with-filedescriptors=1024 \ > --disable-ident-lookups \ > - --without-mit-krb5 \ > --enable-auth-basic="fake getpwnam" \ > --enable-auth-digest="file" \ > --enable-auth-negotiate="wrapper" \ > @@ -50,6 +49,13 @@ else > SQUID_CONF_ENV += squid_cv_gnu_atomics=no > endif > > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > +SQUID_CONF_OPTS += --without-krb5 without? Are you sure this is correct? If so, it needs an explanation comment. > +SQUID_DEPENDENCIES += libkrb5 > +else > +SQUID_CONF_OPTS += --without-mit-krb5 > +endif > + > ifeq ($(BR2_PACKAGE_OPENSSL),y) > SQUID_CONF_OPTS += --with-openssl > SQUID_DEPENDENCIES += openssl baruch
Hello, On Sun, 5 Nov 2017 18:42:35 +0200, Baruch Siach wrote: > On Sun, Nov 05, 2017 at 05:22:35PM +0100, André Hentschel wrote: > > Signed-off-by: André Hentschel <nerv@dawncrow.de> > > --- > > package/squid/squid.mk | 8 +++++++- > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > diff --git a/package/squid/squid.mk b/package/squid/squid.mk > > index d334d14..3b3649a 100644 > > --- a/package/squid/squid.mk > > +++ b/package/squid/squid.mk > > @@ -29,7 +29,6 @@ SQUID_CONF_OPTS = \ > > --enable-removal-policies="lru,heap" \ > > --with-filedescriptors=1024 \ > > --disable-ident-lookups \ > > - --without-mit-krb5 \ > > --enable-auth-basic="fake getpwnam" \ > > --enable-auth-digest="file" \ > > --enable-auth-negotiate="wrapper" \ > > @@ -50,6 +49,13 @@ else > > SQUID_CONF_ENV += squid_cv_gnu_atomics=no > > endif > > > > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > > +SQUID_CONF_OPTS += --without-krb5 > > without? Are you sure this is correct? If so, it needs an explanation comment. > > > +SQUID_DEPENDENCIES += libkrb5 > > +else > > +SQUID_CONF_OPTS += --without-mit-krb5 > > +endif Since a respin is needed, I want to suggest a better commit title too: squid: add optional dependency on libkrb5 Thanks! Thomas
Hi Thomas, On Mon, Nov 06, 2017 at 03:46:44PM +0100, Thomas Petazzoni wrote: > On Sun, 5 Nov 2017 18:42:35 +0200, Baruch Siach wrote: > > On Sun, Nov 05, 2017 at 05:22:35PM +0100, André Hentschel wrote: > > > Signed-off-by: André Hentschel <nerv@dawncrow.de> > > > --- > > > package/squid/squid.mk | 8 +++++++- > > > 1 file changed, 7 insertions(+), 1 deletion(-) > > > > > > diff --git a/package/squid/squid.mk b/package/squid/squid.mk > > > index d334d14..3b3649a 100644 > > > --- a/package/squid/squid.mk > > > +++ b/package/squid/squid.mk > > > @@ -29,7 +29,6 @@ SQUID_CONF_OPTS = \ > > > --enable-removal-policies="lru,heap" \ > > > --with-filedescriptors=1024 \ > > > --disable-ident-lookups \ > > > - --without-mit-krb5 \ > > > --enable-auth-basic="fake getpwnam" \ > > > --enable-auth-digest="file" \ > > > --enable-auth-negotiate="wrapper" \ > > > @@ -50,6 +49,13 @@ else > > > SQUID_CONF_ENV += squid_cv_gnu_atomics=no > > > endif > > > > > > +ifeq ($(BR2_PACKAGE_LIBKRB5),y) > > > +SQUID_CONF_OPTS += --without-krb5 > > > > without? Are you sure this is correct? If so, it needs an explanation comment. > > > > > +SQUID_DEPENDENCIES += libkrb5 > > > +else > > > +SQUID_CONF_OPTS += --without-mit-krb5 > > > +endif > > Since a respin is needed, I want to suggest a better commit title too: > > squid: add optional dependency on libkrb5 v2 of this patch is at http://patchwork.ozlabs.org/patch/834393/. baruch
diff --git a/package/squid/squid.mk b/package/squid/squid.mk index d334d14..3b3649a 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -29,7 +29,6 @@ SQUID_CONF_OPTS = \ --enable-removal-policies="lru,heap" \ --with-filedescriptors=1024 \ --disable-ident-lookups \ - --without-mit-krb5 \ --enable-auth-basic="fake getpwnam" \ --enable-auth-digest="file" \ --enable-auth-negotiate="wrapper" \ @@ -50,6 +49,13 @@ else SQUID_CONF_ENV += squid_cv_gnu_atomics=no endif +ifeq ($(BR2_PACKAGE_LIBKRB5),y) +SQUID_CONF_OPTS += --without-krb5 +SQUID_DEPENDENCIES += libkrb5 +else +SQUID_CONF_OPTS += --without-mit-krb5 +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) SQUID_CONF_OPTS += --with-openssl SQUID_DEPENDENCIES += openssl
Signed-off-by: André Hentschel <nerv@dawncrow.de> --- package/squid/squid.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)