diff options
| author | wiz <wiz> | 2017-02-17 23:45:48 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2017-02-17 23:45:48 +0000 |
| commit | cbf137ce1409aa857c74ba1fa65e61c2f0351892 (patch) | |
| tree | 7d21395b17d413f8efa7812751f4a0cee8833512 /print/cups | |
| parent | e30780fc37a2219ec56ccd9f387cc0664b4b82f8 (diff) | |
| download | pkgsrc-cbf137ce1409aa857c74ba1fa65e61c2f0351892.tar.gz | |
Handle non-kerberos automatically. Based on suggestions by pgoyette
and tested by him.
Add upstream bug report URL.
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/MESSAGE.nokerberos | 7 | ||||
| -rw-r--r-- | print/cups/options.mk | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/print/cups/MESSAGE.nokerberos b/print/cups/MESSAGE.nokerberos deleted file mode 100644 index e106e7085c7..00000000000 --- a/print/cups/MESSAGE.nokerberos +++ /dev/null @@ -1,7 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.nokerberos,v 1.1 2017/02/16 13:09:19 wiz Exp $ - -When running a non-kerberized cupsd, you need to remove the kerberos -section from the config file. Otherwise cupsd will not start. - -=========================================================================== diff --git a/print/cups/options.mk b/print/cups/options.mk index 01829ba9ce4..ec89e188545 100644 --- a/print/cups/options.mk +++ b/print/cups/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.20 2017/02/16 13:09:19 wiz Exp $ +# $NetBSD: options.mk,v 1.21 2017/02/17 23:45:48 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers @@ -59,7 +59,12 @@ CONFIGURE_ARGS+= --disable-dnssd CONFIGURE_ARGS+= --enable-gssapi .else CONFIGURE_ARGS+= --disable-gssapi -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.nokerberos +# https://github.com/apple/cups/issues/4947 +SUBST_CLASSES+= nokerb +SUBST_STAGE.nokerb= post-build +SUBST_SED.nokerb+= -e '\%<Policy kerberos>%,\%</Policy>%s/^/\#/' +SUBST_FILES.nokerb+= conf/cupsd.conf +SUBST_MESSAGE.nokerb= Commenting out kerberos section in config. .endif .if !empty(PKG_OPTIONS:Mlibusb) |