Update samples

This commit is contained in:
Till Wegmueller 2021-04-25 18:39:35 -03:00
parent b516ee1498
commit 4fd068ac5f
5 changed files with 119 additions and 40 deletions

View file

@ -22,10 +22,13 @@
#
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
#
BUILD_BITS= 64_and_32
PREFERRED_BITS= 64
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME= cups
COMPONENT_VERSION= 2.3.3
COMPONENT_REVISION= 1
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://www.cups.org/
COMPONENT_ARCHIVE= $(COMPONENT_SRC)-source.tar.gz
@ -35,8 +38,6 @@ COMPONENT_BUGDB= utility/cups
include $(WS_MAKE_RULES)/common.mk
BUILD_BITS= 64
# don't use LD_Z_IGNORE: causes linker problems
LD_Z_IGNORE=
@ -60,18 +61,16 @@ CONFIGURE_OPTIONS += --with-cups-user=lp
CONFIGURE_OPTIONS += --with-cups-group=lp
CONFIGURE_OPTIONS += --disable-systemd
CONFIGURE_OPTIONS += --disable-static
CONFIGURE_OPTIONS += --disable-gnutls
CONFIGURE_OPTIONS += --enable-openssl
CONFIGURE_OPTIONS += --enable-dbus
CONFIGURE_OPTIONS += --enable-threads
CONFIGURE_OPTIONS += --with-archflags="$(CC_BITS)"
$(BUILD_DIR)/%/.installed: ENV += DSTROOT="$(PROTO_DIR)"
#$(BUILD_DIR)/%/.installed: ENV += DSTROOT="$(PROTO_DIR)"
COMPONENT_PRE_CONFIGURE_ACTION = \
$(CLONEY) $(SOURCE_DIR) $(@D) ; \
find $(@D) -name '*.in' | sed -e 's/.in$$//' | xargs $(RM) ; \
( cd $(SOURCE_DIR) ; autoconf -f )
#COMPONENT_PRE_CONFIGURE_ACTION = \
# $(CLONEY) $(SOURCE_DIR) $(@D) ; \
# find $(@D) -name '*.in' | sed -e 's/.in$$//' | xargs $(RM) ; \
# ( cd $(SOURCE_DIR) ; autoconf -f )
# Build dependencies
REQUIRED_PACKAGES += image/library/libpng16
@ -80,16 +79,17 @@ REQUIRED_PACKAGES += service/network/dns/mdns
REQUIRED_PACKAGES += service/network/slp
# Auto-generated dependencies
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += library/print/cups-libs
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/gnutls-3
REQUIRED_PACKAGES += library/libusb-1
#REQUIRED_PACKAGES += library/print/cups-libs
REQUIRED_PACKAGES += library/zlib
REQUIRED_PACKAGES += runtime/perl-522
REQUIRED_PACKAGES += runtime/perl-524
REQUIRED_PACKAGES += service/security/kerberos-5
REQUIRED_PACKAGES += shell/ksh93
REQUIRED_PACKAGES += system/library
REQUIRED_PACKAGES += $(GXX_RUNTIME_PKG)
REQUIRED_PACKAGES += $(GCC_RUNTIME_PKG)
REQUIRED_PACKAGES += system/library/libdbus
REQUIRED_PACKAGES += system/library/math
REQUIRED_PACKAGES += system/library/security/gss

View file

@ -36,3 +36,7 @@ file path=usr/lib/libcups.so.2
file path=usr/lib/libcupsimage.so.2
link path=usr/lib/libcups.so target=libcups.so.2
link path=usr/lib/libcupsimage.so target=libcupsimage.so.2
file path=usr/lib/amd64/libcups.so.2
file path=usr/lib/amd64/libcupsimage.so.2
link path=usr/lib/amd64/libcups.so target=libcups.so.2
link path=usr/lib/amd64/libcupsimage.so target=libcupsimage.so.2

View file

@ -74,9 +74,11 @@ dir group=lp owner=lp path=var/spool/lp mode=0775
# edited file-objects
file group=lp mode=0640 path=etc/cups/cupsd.conf preserve=true
file group=lp mode=0640 path=etc/cups/cups-files.conf preserve=true
file path=lib/svc/manifest/application/cups.xml mode=0444 restart_fmri=svc:/system/manifest-import:default
file path=lib/svc/manifest/application/cups.xml mode=0444 \
restart_fmri=svc:/system/manifest-import:default
file Solaris/service-selector.xml path=lib/svc/manifest/application/print/service-selector.xml mode=0444 restart_fmri=svc:/system/manifest-import:default
file Solaris/service-selector.xml path=lib/svc/manifest/application/print/service-selector.xml mode=0444 \
restart_fmri=svc:/system/manifest-import:default
file Solaris/print-service-selector path=lib/svc/method/print-service-selector
@ -84,7 +86,8 @@ file Solaris/print-service-selector path=lib/svc/method/print-service-selector
file Solaris/svc-cupsd path=lib/svc/method/svc-cupsd
# SMF help
file Solaris/ManageCUPS.html mode=0444 path=usr/lib/help/auths/locale/C/ManageCUPS.html
file Solaris/ManageCUPS.html mode=0444 \
path=usr/lib/help/auths/locale/C/ManageCUPS.html
file usr/bin/cancel path=usr/lib/cups/bin/cancel mode=0555
file usr/bin/lp path=usr/lib/cups/bin/lp mode=0555
@ -96,7 +99,7 @@ file usr/sbin/cupsaccept path=usr/lib/cups/bin/cupsaccept mode=0555
file usr/sbin/lpc path=usr/lib/cups/bin/lpc mode=0555
file usr/sbin/lpmove path=usr/lib/cups/bin/lpmove mode=0555
file usr/sbin/lpadmin path=usr/lib/cups/bin/lpadmin mode=0555
file path=usr/sbin/lpinfo
file usr/sbin/lpinfo path=usr/sbin/lpinfo
link path=usr/lib/cups/bin/accept target=cupsaccept
link path=usr/lib/cups/bin/cupsdisable target=cupsaccept
@ -107,9 +110,12 @@ link path=usr/lib/cups/bin/cupsreject target=cupsaccept
link path=usr/lib/cups/bin/reject target=cupsaccept
# install the desktop menu related bits
file Solaris/desktop-print-management mode=0555 path=usr/lib/cups/bin/desktop-print-management
file Solaris/desktop-print-management-applet mode=0555 path=usr/lib/cups/bin/desktop-print-management-applet
file Solaris/smb mode=0555 path=usr/lib/cups/backend/smb
file Solaris/desktop-print-management mode=0555 \
path=usr/lib/cups/bin/desktop-print-management
file Solaris/desktop-print-management-applet mode=0555 \
path=usr/lib/cups/bin/desktop-print-management-applet
file Solaris/smb mode=0555 \
path=usr/lib/cups/backend/smb
# install the service to set up CUPS as the default print service
file Solaris/auth_attr path=etc/security/auth_attr.d/cups
@ -118,12 +124,30 @@ file Solaris/tsol_banner.ps path=usr/lib/cups/filter/tsol_banner.ps
file Solaris/tsol_separator.ps path=usr/lib/cups/filter/tsol_separator.ps
file Solaris/tsol_trailer.ps path=usr/lib/cups/filter/tsol_trailer.ps
# Resolving file conflicts with illumos lp
# As witht the commands in /usr/bin cups commands are designed to replace lp
# But as lp is still delivered by illumos-gate we need to rename all the commands
# and their man pages and prefix them with cups so that both softwares can be installed simultaneously
# There is two ways where we can go from here.
# 1. Remove lp if it is not needed anymore and properly suceeded by cups
# 2. Modify manifest in illumos-gate to provide mediators so users can properly choose
file usr/share/man/man1/lp.1 path=usr/share/man/man1/cupslp.1
file usr/share/man/man1/lpoptions.1 path=usr/share/man/man1/cupslpoptions.1
file usr/share/man/man1/lpq.1 path=usr/share/man/man1/cupslpq.1
file usr/share/man/man1/lpr.1 path=usr/share/man/man1/cupslpr.1
file usr/share/man/man1/lprm.1 path=usr/share/man/man1/cupslprm.1
file usr/share/man/man1/lpstat.1 path=usr/share/man/man1/cupslpstat.1
file usr/share/man/man1/cancel.1 path=usr/share/man/man1/cupscancel.1
# file-objects from sample-manifest
file path=etc/cups/cups-files.conf.default
file path=etc/cups/cupsd.conf.default
file path=etc/cups/snmp.conf
file path=etc/cups/snmp.conf.default
file path=etc/dbus-1/system.d/cups.conf
file path=etc/pam.d/cups
file path=usr/sbin/cupsctl
file path=usr/sbin/cupsd
file path=usr/bin/cups-config
file path=usr/bin/cupstestppd
file path=usr/bin/ippeveprinter
@ -150,7 +174,11 @@ file path=usr/include/cups/sidechannel.h
file path=usr/include/cups/transcode.h
file path=usr/include/cups/versioning.h
file path=usr/lib/cups/backend/dnssd
link path=usr/lib/cups/backend/http target=ipp
link \
path=usr/lib/cups/backend/http \
target=ipp
link path=usr/lib/cups/backend/https target=ipp
link path=usr/lib/cups/backend/ipps target=ipp
file path=usr/lib/cups/backend/ipp
file path=usr/lib/cups/backend/lpd
file path=usr/lib/cups/backend/snmp
@ -179,8 +207,9 @@ file path=usr/lib/cups/monitor/tbcp
file path=usr/lib/cups/notifier/dbus
file path=usr/lib/cups/notifier/mailto
file path=usr/lib/cups/notifier/rss
file path=usr/sbin/cupsctl
file path=usr/sbin/cupsd
file path=usr/share/applications/cups.desktop
file path=usr/share/cups/drv/sample.drv
file path=usr/share/cups/examples/color.drv
@ -839,19 +868,12 @@ file path=usr/share/locale/ja/cups_ja.po
file path=usr/share/locale/pt_BR/cups_pt_BR.po
file path=usr/share/locale/ru/cups_ru.po
file path=usr/share/locale/zh_CN/cups_zh_CN.po
file path=usr/share/man/man1/cancel.1
file path=usr/share/man/man1/cups-config.1
file path=usr/share/man/man1/cups.1
file path=usr/share/man/man1/cupstestppd.1
file path=usr/share/man/man1/ippeveprinter.1
file path=usr/share/man/man1/ippfind.1
file path=usr/share/man/man1/ipptool.1
file path=usr/share/man/man1/lp.1
file path=usr/share/man/man1/lpoptions.1
file path=usr/share/man/man1/lpq.1
file path=usr/share/man/man1/lpr.1
file path=usr/share/man/man1/lprm.1
file path=usr/share/man/man1/lpstat.1
file path=usr/share/man/man1/ppdc.1
file path=usr/share/man/man1/ppdhtml.1
file path=usr/share/man/man1/ppdi.1
@ -873,21 +895,33 @@ file path=usr/share/man/man5/subscriptions.conf.5
file path=usr/share/man/man7/backend.7
file path=usr/share/man/man7/filter.7
file path=usr/share/man/man7/ippevepcl.7
link path=usr/share/man/man7/ippeveps.7 target=ippevepcl.7
link \
path=usr/share/man/man7/ippeveps.7 \
target=ippevepcl.7
file path=usr/share/man/man7/notifier.7
link path=usr/share/man/man8/cups-deviced.8 target=cupsd-helper.8
link path=usr/share/man/man8/cups-driverd.8 target=cupsd-helper.8
link path=usr/share/man/man8/cups-exec.8 target=cupsd-helper.8
link \
path=usr/share/man/man8/cups-deviced.8 \
target=cupsd-helper.8
link \
path=usr/share/man/man8/cups-driverd.8 \
target=cupsd-helper.8
link \
path=usr/share/man/man8/cups-exec.8 \
target=cupsd-helper.8
file path=usr/share/man/man8/cups-lpd.8
file path=usr/share/man/man8/cups-snmp.8
file path=usr/share/man/man8/cupsaccept.8
file path=usr/share/man/man8/cupsctl.8
file path=usr/share/man/man8/cupsd-helper.8
file path=usr/share/man/man8/cupsd.8
link path=usr/share/man/man8/cupsdisable.8 target=cupsenable.8
link \
path=usr/share/man/man8/cupsdisable.8 \
target=cupsenable.8
file path=usr/share/man/man8/cupsenable.8
file path=usr/share/man/man8/cupsfilter.8
link path=usr/share/man/man8/cupsreject.8 target=cupsaccept.8
link \
path=usr/share/man/man8/cupsreject.8 \
target=cupsaccept.8
file path=usr/share/man/man8/lpadmin.8
file path=usr/share/man/man8/lpc.8
file path=usr/share/man/man8/lpinfo.8

View file

@ -23,13 +23,35 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=etc/cups/cups-files.conf
file path=etc/cups/cups-files.conf.N
file path=etc/cups/cups-files.conf.default
file path=etc/cups/cupsd.conf
file path=etc/cups/cupsd.conf.N
file path=etc/cups/cupsd.conf.default
file path=etc/cups/snmp.conf
file path=etc/cups/snmp.conf.N
file path=etc/cups/snmp.conf.default
file path=etc/dbus-1/system.d/cups.conf
file path=etc/pam.d/cups
file path=etc/pam.d/cups.N
file path=lib/svc/manifest/application/cups.xml
file path=usr/bin/$(MACH32)/cancel
file path=usr/bin/$(MACH32)/cups-config
file path=usr/bin/$(MACH32)/cupstestppd
file path=usr/bin/$(MACH32)/ippeveprinter
file path=usr/bin/$(MACH32)/ippfind
file path=usr/bin/$(MACH32)/ipptool
file path=usr/bin/$(MACH32)/lp
file path=usr/bin/$(MACH32)/lpoptions
file path=usr/bin/$(MACH32)/lpq
file path=usr/bin/$(MACH32)/lpr
file path=usr/bin/$(MACH32)/lprm
file path=usr/bin/$(MACH32)/lpstat
file path=usr/bin/$(MACH32)/ppdc
file path=usr/bin/$(MACH32)/ppdhtml
file path=usr/bin/$(MACH32)/ppdi
file path=usr/bin/$(MACH32)/ppdmerge
file path=usr/bin/$(MACH32)/ppdpo
file path=usr/bin/cancel
file path=usr/bin/cups-config
file path=usr/bin/cupstestppd
@ -62,9 +84,15 @@ file path=usr/include/cups/raster.h
file path=usr/include/cups/sidechannel.h
file path=usr/include/cups/transcode.h
file path=usr/include/cups/versioning.h
link path=usr/lib/$(MACH64)/libcups.so target=libcups.so.2
file path=usr/lib/$(MACH64)/libcups.so.2
link path=usr/lib/$(MACH64)/libcupsimage.so target=libcupsimage.so.2
file path=usr/lib/$(MACH64)/libcupsimage.so.2
file path=usr/lib/cups/backend/dnssd
link path=usr/lib/cups/backend/http target=ipp
link path=usr/lib/cups/backend/https target=ipp
file path=usr/lib/cups/backend/ipp
link path=usr/lib/cups/backend/ipps target=ipp
file path=usr/lib/cups/backend/lpd
file path=usr/lib/cups/backend/snmp
file path=usr/lib/cups/backend/socket
@ -96,6 +124,17 @@ link path=usr/lib/libcups.so target=libcups.so.2
file path=usr/lib/libcups.so.2
link path=usr/lib/libcupsimage.so target=libcupsimage.so.2
file path=usr/lib/libcupsimage.so.2
file path=usr/sbin/$(MACH32)/cupsaccept
file path=usr/sbin/$(MACH32)/cupsctl
file path=usr/sbin/$(MACH32)/cupsd
link path=usr/sbin/$(MACH32)/cupsdisable target=cupsaccept
link path=usr/sbin/$(MACH32)/cupsenable target=cupsaccept
file path=usr/sbin/$(MACH32)/cupsfilter
link path=usr/sbin/$(MACH32)/cupsreject target=cupsaccept
file path=usr/sbin/$(MACH32)/lpadmin
file path=usr/sbin/$(MACH32)/lpc
file path=usr/sbin/$(MACH32)/lpinfo
file path=usr/sbin/$(MACH32)/lpmove
file path=usr/sbin/cupsaccept
file path=usr/sbin/cupsctl
file path=usr/sbin/cupsd
@ -187,7 +226,9 @@ file path=usr/share/cups/ipptool/testfile.ps
file path=usr/share/cups/ipptool/testfile.txt
file path=usr/share/cups/ipptool/validate-job.test
file path=usr/share/cups/mime/mime.convs
file path=usr/share/cups/mime/mime.convs.O
file path=usr/share/cups/mime/mime.types
file path=usr/share/cups/mime/mime.types.O
file path=usr/share/cups/ppdc/epson.h
file path=usr/share/cups/ppdc/font.defs
file path=usr/share/cups/ppdc/hp.h

View file

@ -3,14 +3,14 @@
"SUNWcs",
"image/library/libpng16",
"image/library/libtiff",
"library/print/cups-libs",
"library/security/openssl",
"library/gnutls-3",
"library/libusb-1",
"library/zlib",
"runtime/perl-522",
"runtime/perl-524",
"service/network/dns/mdns",
"service/network/slp",
"service/security/kerberos-5",
"shell/ksh93",
"system/library",
"system/library/g++-7-runtime",
"system/library/gcc-7-runtime",