cups: fix default cupsd.conf add gssapi build option (#5649)
The cupsd.conf currently provided by the cups package contains a Kerberos section. Since cupsd is built without gssapi support, the daemon fails to verify it's configuration and refuses to start. This commit adds a build option to make it possible to build the package with gssapi support and also provides a patch pulled in from Alpine Linux for the cupsd.conf to be able to start the daemon without building it with gssapi support.
This commit is contained in:
parent
86aec15b8f
commit
ec2acdc051
2 changed files with 32 additions and 4 deletions
26
srcpkgs/cups/patches/default-config-no-gssapi.patch
Normal file
26
srcpkgs/cups/patches/default-config-no-gssapi.patch
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
--- a/conf/cupsd.conf.in
|
||||||
|
+++ b/conf/cupsd.conf.in
|
||||||
|
@@ -145,12 +145,12 @@
|
||||||
|
|
||||||
|
# Job-related operations must be done by the owner or an administrator...
|
||||||
|
<Limit Create-Job Print-Job Print-URI Validate-Job>
|
||||||
|
- AuthType Negotiate
|
||||||
|
+ AuthType Default
|
||||||
|
Order deny,allow
|
||||||
|
</Limit>
|
||||||
|
|
||||||
|
<Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job Cancel-My-Jobs Close-Job CUPS-Move-Job CUPS-Get-Document>
|
||||||
|
- AuthType Negotiate
|
||||||
|
+ AuthType Default
|
||||||
|
Require user @OWNER @SYSTEM
|
||||||
|
Order deny,allow
|
||||||
|
</Limit>
|
||||||
|
@@ -171,7 +171,7 @@
|
||||||
|
|
||||||
|
# Only the owner or an administrator can cancel or authenticate a job...
|
||||||
|
<Limit Cancel-Job CUPS-Authenticate-Job>
|
||||||
|
- AuthType Negotiate
|
||||||
|
+ AuthType Default
|
||||||
|
Require user @OWNER @CUPS_DEFAULT_PRINTOPERATOR_AUTH@
|
||||||
|
Order deny,allow
|
||||||
|
</Limit>
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'cups'
|
# Template file for 'cups'
|
||||||
pkgname=cups
|
pkgname=cups
|
||||||
version=2.2.2
|
version=2.2.2
|
||||||
revision=1
|
revision=2
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
short_desc="Common Unix Printing System"
|
short_desc="Common Unix Printing System"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
|
@ -13,7 +13,7 @@ checksum=f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6
|
||||||
hostmakedepends="automake pkg-config poppler-utils gnutls-devel avahi-libs-devel"
|
hostmakedepends="automake pkg-config poppler-utils gnutls-devel avahi-libs-devel"
|
||||||
makedepends="acl-devel libjpeg-turbo-devel libpng-devel tiff-devel
|
makedepends="acl-devel libjpeg-turbo-devel libpng-devel tiff-devel
|
||||||
gnutls-devel pam-devel poppler-devel libusb-devel avahi-libs-devel
|
gnutls-devel pam-devel poppler-devel libusb-devel avahi-libs-devel
|
||||||
libpaper-devel"
|
libpaper-devel $(vopt_if gssapi mit-krb5-devel)"
|
||||||
depends="xdg-utils"
|
depends="xdg-utils"
|
||||||
conf_files="/etc/pam.d/cups /etc/cups/*.conf"
|
conf_files="/etc/pam.d/cups /etc/cups/*.conf"
|
||||||
make_dirs="
|
make_dirs="
|
||||||
|
@ -23,6 +23,8 @@ make_dirs="
|
||||||
/var/spool/cups 0755 cups lp
|
/var/spool/cups 0755 cups lp
|
||||||
/etc/cups/ssl 0700 cups lp"
|
/etc/cups/ssl 0700 cups lp"
|
||||||
|
|
||||||
|
build_options="gssapi"
|
||||||
|
|
||||||
# Package build options
|
# Package build options
|
||||||
system_accounts="cups"
|
system_accounts="cups"
|
||||||
cups_pgroup="lp"
|
cups_pgroup="lp"
|
||||||
|
@ -44,12 +46,12 @@ do_configure() {
|
||||||
./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
|
./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \
|
||||||
--enable-acl --enable-dbus --enable-raw-printing \
|
--enable-acl --enable-dbus --enable-raw-printing \
|
||||||
--enable-threads --with-logdir=/var/log/cups \
|
--enable-threads --with-logdir=/var/log/cups \
|
||||||
--with-docdir=/usr/share/cups/doc --disable-gssapi \
|
--with-docdir=/usr/share/cups/doc \
|
||||||
--with-cups-user=cups --with-cups-group=lp --enable-relro \
|
--with-cups-user=cups --with-cups-group=lp --enable-relro \
|
||||||
--enable-libpaper --enable-avahi --enable-pam --enable-ssl \
|
--enable-libpaper --enable-avahi --enable-pam --enable-ssl \
|
||||||
--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
|
--with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \
|
||||||
--with-optim="${CFLAGS}" --without-systemd \
|
--with-optim="${CFLAGS}" --without-systemd \
|
||||||
--without-perl --without-php --without-python
|
--without-perl --without-php --without-python $(vopt_enable gssapi)
|
||||||
}
|
}
|
||||||
do_build() {
|
do_build() {
|
||||||
# Do not run genstrings binary in cross builds.
|
# Do not run genstrings binary in cross builds.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue