diff options
author | leot <leot@pkgsrc.org> | 2017-10-23 12:34:54 +0000 |
---|---|---|
committer | leot <leot@pkgsrc.org> | 2017-10-23 12:34:54 +0000 |
commit | c54c96b55ca7a5a4351a71c65cafb4f258007feb (patch) | |
tree | 40f2c8f1a596f7f4f4c31e4cf97b35e7d82e479f /print/cups | |
parent | a1dfbc1148c952cb31db74257864667ad48e3f09 (diff) | |
download | pkgsrc-c54c96b55ca7a5a4351a71c65cafb4f258007feb.tar.gz |
cups: Update print/cups to 2.2.5
pkgsrc changes:
- Delete patches/patch-config-scripts_cups-sharedlibs.m4,
patches/patch-configure.ac and adjust patches/patch-ae to reflect libtool
upstream update.
- Add patches/patch-config-scripts_cups-libtool.m4 to avoid to use `=='
not-so-portable test(1) operator.
Changes:
2.2.5
-----
- The scheduler's `-t` option did not force all errors to the standard error
file, making debugging of configuration problems hard (Issue #5041)
- Fixed a typo in the CUPS Programming Manual (Issue #5042)
- Fixed RPM packaging issue (Issue #5043, Issue #5044)
- The `cupsGetDests` function incorrectly returned an empty list of printers if
there was no default printer (Issue #5046)
- The `cupsGetDests` function waited too long for network printers (Issue #5049)
- Libtool support was completely broken with current libtool versions that use
an incompatible command-line syntax (Issue #5050)
- Fixed a build issue with `--enable-mallinfo` (Issue #5051)
- The ippserver test program contained a deadlock issue (Issue #5054)
- The `cupsLocalizeDest*` functions did not provide base localizations for
all registered IPP attributes and values (Issue #5056)
- The --enable-libtool configure option requires a path to the libtool program,
but doesn't document or check for it (Issue #5062)
- Fixed the `SSLOptions DenyCBC` option when using GNU TLS (Issue #5065)
- Fixed the `ServerTokens None` option (Issue #5065)
- Fixed the default `ServerAlias` value from `ServerName` (Issue #5072)
- Fixed the adminurl field in the TXT record for fully-qualified `ServerName`
values (Issue #5074)
- The scheduler now creates a PID file when not running on demand with a modern
service launcher (Issue #5080)
- The web interface did not support newer language identifiers used by Microsoft
web browsers (Issue #5803)
- Updated the cups-files.conf and cupsd.conf file documentation for missing
directives (Issue #5084)
- Fixed an Avahi-related crash bug in the scheduler (Issue #5085, Issue #5086)
- Fixed the interactions between the "print-quality" and "cupsPrintQuality"
options (Issue #5090)
- The IPP Everywhere PPD generator now sorts the supported resolutions before
choosing them for draft, normal, and best quality modes (Issue #5091)
- Fixed the localization unit test on Linux (Issue #5097)
- The CUPS library did not reuse domain sockets (Issue #5098)
- Fixed the "make check" target for some environments (Issue #5099)
- The scheduler woke up once per second to remove old temporary queues
(Issue #5100)
- Added USB quirk rule for Kyocera printer (Issue #5102, Issue #5103)
- Re-documented the limits of `file:///...` device URIs and moved the FileDevice
directive in `cups-files.conf` to the list of deprecated configuration
directives (Issue #5117)
- Added USB quirk rule for HP LaserJet 1160 printer (Issue #5121)
- Fixed the script interpreter detection in the configure script (Issue #5122)
- The network backends now retry on more error conditions (Issue #5123)
- Added a French translation of the web interface (Issue #5134)
- `cupsGetDests2` was not using the supplied HTTP connection (Issue #5135)
- `httpAddrConnect` leaked sockets in certain circumstances, causing some
printers to hang (rdar://31965686)
- Fixed an issue with Chinese localizations on macOS (rdar://32419311)
- The IPP backend now always sends the "finishings" attribute for printers that
support it because otherwise the client cannot override printer defaults
(rdar://33169732)
- The `cupsGetNamedDest` function did not use the local default printer
(rdar://33228500)
- The IPP backend incorrectly sent the "job-pages-per-set" attribute to PDF
printers (rdar://33250434)
- Fixed the `cups.strings` file that is used on macOS (rdar://33287650)
- CUPS now sends the `Date` HTTP header in IPP requests (rdar://33302034)
- The `ippCopyAttribute` function did not copy out-of-band values correctly
(rdar://33688003)
- Fixed the localization fallback code on macOS (rdar://33583699)
- The scheduler did not run with a high enough priority, causing problems on
busy systems (rdar://33789342)
- Added support for Japanese Kaku 1 envelope size (rdar://34774110)
- The `ipptool` program's `-P` option did not work correctly.
- The `ipptool` program did not compare URI scheme or hostname components
correctly for the WITH-ALL-HOSTNAMES, WITH-ALL-SCHEMES, WITH-HOSTNAME, or
WITH-SCHEME predicates.
Diffstat (limited to 'print/cups')
-rw-r--r-- | print/cups/Makefile | 4 | ||||
-rw-r--r-- | print/cups/PLIST | 72 | ||||
-rw-r--r-- | print/cups/distinfo | 19 | ||||
-rw-r--r-- | print/cups/patches/patch-ae | 51 | ||||
-rw-r--r-- | print/cups/patches/patch-config-scripts_cups-libtool.m4 | 15 | ||||
-rw-r--r-- | print/cups/patches/patch-config-scripts_cups-sharedlibs.m4 | 89 | ||||
-rw-r--r-- | print/cups/patches/patch-configure.ac | 14 | ||||
-rw-r--r-- | print/cups/patches/patch-ppdc_Makefile | 8 | ||||
-rw-r--r-- | print/cups/patches/patch-scheduler-main.c | 26 |
9 files changed, 121 insertions, 177 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index a60ba6db52d..8c5b7ecc02e 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.250 2017/09/03 11:30:54 leot Exp $ +# $NetBSD: Makefile,v 1.251 2017/10/23 12:34:54 leot Exp $ -DISTNAME= cups-2.2.4-source +DISTNAME= cups-2.2.5-source PKGNAME= ${DISTNAME:S/-source//} CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} diff --git a/print/cups/PLIST b/print/cups/PLIST index ff1c8accd9c..881142ff67b 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.59 2017/09/03 11:30:54 leot Exp $ +@comment $NetBSD: PLIST,v 1.60 2017/10/23 12:34:54 leot Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -351,6 +351,76 @@ share/cups/templates/es/subscription-canceled.tmpl share/cups/templates/es/test-page.tmpl share/cups/templates/es/trailer.tmpl share/cups/templates/es/users.tmpl +share/cups/templates/fr/add-class.tmpl +share/cups/templates/fr/add-printer.tmpl +share/cups/templates/fr/add-rss-subscription.tmpl +share/cups/templates/fr/admin.tmpl +share/cups/templates/fr/choose-device.tmpl +share/cups/templates/fr/choose-make.tmpl +share/cups/templates/fr/choose-model.tmpl +share/cups/templates/fr/choose-serial.tmpl +share/cups/templates/fr/choose-uri.tmpl +share/cups/templates/fr/class-added.tmpl +share/cups/templates/fr/class-confirm.tmpl +share/cups/templates/fr/class-deleted.tmpl +share/cups/templates/fr/class-jobs-header.tmpl +share/cups/templates/fr/class-modified.tmpl +share/cups/templates/fr/class.tmpl +share/cups/templates/fr/classes-header.tmpl +share/cups/templates/fr/classes.tmpl +share/cups/templates/fr/command.tmpl +share/cups/templates/fr/edit-config.tmpl +share/cups/templates/fr/error-op.tmpl +share/cups/templates/fr/error.tmpl +share/cups/templates/fr/header.tmpl +share/cups/templates/fr/help-header.tmpl +share/cups/templates/fr/help-printable.tmpl +share/cups/templates/fr/help-trailer.tmpl +share/cups/templates/fr/job-cancel.tmpl +share/cups/templates/fr/job-hold.tmpl +share/cups/templates/fr/job-move.tmpl +share/cups/templates/fr/job-moved.tmpl +share/cups/templates/fr/job-release.tmpl +share/cups/templates/fr/job-restart.tmpl +share/cups/templates/fr/jobs-header.tmpl +share/cups/templates/fr/jobs.tmpl +share/cups/templates/fr/list-available-printers.tmpl +share/cups/templates/fr/modify-class.tmpl +share/cups/templates/fr/modify-printer.tmpl +share/cups/templates/fr/norestart.tmpl +share/cups/templates/fr/option-boolean.tmpl +share/cups/templates/fr/option-conflict.tmpl +share/cups/templates/fr/option-header.tmpl +share/cups/templates/fr/option-pickmany.tmpl +share/cups/templates/fr/option-pickone.tmpl +share/cups/templates/fr/option-trailer.tmpl +share/cups/templates/fr/pager.tmpl +share/cups/templates/fr/printer-accept.tmpl +share/cups/templates/fr/printer-added.tmpl +share/cups/templates/fr/printer-cancel-jobs.tmpl +share/cups/templates/fr/printer-configured.tmpl +share/cups/templates/fr/printer-confirm.tmpl +share/cups/templates/fr/printer-default.tmpl +share/cups/templates/fr/printer-deleted.tmpl +share/cups/templates/fr/printer-jobs-header.tmpl +share/cups/templates/fr/printer-modified.tmpl +share/cups/templates/fr/printer-reject.tmpl +share/cups/templates/fr/printer-start.tmpl +share/cups/templates/fr/printer-stop.tmpl +share/cups/templates/fr/printer.tmpl +share/cups/templates/fr/printers-header.tmpl +share/cups/templates/fr/printers.tmpl +share/cups/templates/fr/restart.tmpl +share/cups/templates/fr/samba-export.tmpl +share/cups/templates/fr/samba-exported.tmpl +share/cups/templates/fr/search.tmpl +share/cups/templates/fr/set-printer-options-header.tmpl +share/cups/templates/fr/set-printer-options-trailer.tmpl +share/cups/templates/fr/subscription-added.tmpl +share/cups/templates/fr/subscription-canceled.tmpl +share/cups/templates/fr/test-page.tmpl +share/cups/templates/fr/trailer.tmpl +share/cups/templates/fr/users.tmpl share/cups/templates/header.tmpl share/cups/templates/help-header.tmpl share/cups/templates/help-printable.tmpl diff --git a/print/cups/distinfo b/print/cups/distinfo index 818d4c0cbe2..5ded007558c 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.124 2017/09/03 11:30:54 leot Exp $ +$NetBSD: distinfo,v 1.125 2017/10/23 12:34:54 leot Exp $ -SHA1 (cups-2.2.4-source.tar.gz) = 964a6c54e0542f11a4b22bba19bd66ded0c53785 -RMD160 (cups-2.2.4-source.tar.gz) = e97524690a808fd061a2ea758d9ab3099a6c9da5 -SHA512 (cups-2.2.4-source.tar.gz) = 132e1896c5b8466e0c38decbb1210b420f1fa811a761150abdf07112bab290d51883f58a9a441fdc51e7094d94036288d564d6f39e9ee65e9c298e00088469d3 -Size (cups-2.2.4-source.tar.gz) = 9984475 bytes -SHA1 (patch-ae) = 119a1f2d3db75ac0e77515194fe53616b5c26aa5 +SHA1 (cups-2.2.5-source.tar.gz) = b6b1967e0329768708f89b42adb4c6810a77a195 +RMD160 (cups-2.2.5-source.tar.gz) = fc69142955bfdf30668598ca2c8dcb553ea8eaee +SHA512 (cups-2.2.5-source.tar.gz) = 5c824e74e2679de360ff1f95aa74013ca2d6a88d11d18041e7a5b51746c2a21bbc10da785791ea4e40d316167560982466789767018bd02676cf810ad0c3a5c9 +Size (cups-2.2.5-source.tar.gz) = 10314038 bytes +SHA1 (patch-ae) = f34ec899f4816bdcf96ff315e001e3ac5a960200 SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56 SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6 SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f @@ -13,16 +13,15 @@ SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0 SHA1 (patch-config-scripts_cups-compiler.m4) = 6a717af7983f15606fbc703bb4e853b5084ec919 SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354 +SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412 SHA1 (patch-config-scripts_cups-manpages.m4) = 5cc943738df29f11fc366557938b82c1e9162344 -SHA1 (patch-config-scripts_cups-sharedlibs.m4) = 70dafb798a2839beb81c4cb93ed4f1926ee78164 -SHA1 (patch-configure.ac) = 0e48669372badc477db7d6f26c8180062f4e78de SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511 SHA1 (patch-doc-help-man-cups-files.conf.html) = fcd3d06c00b0a85b6c0790235ccb68685252ea68 SHA1 (patch-man-cups-files.conf.man.in) = 1563a7be3327a975ce8753a3287947f1594975a3 -SHA1 (patch-ppdc_Makefile) = 575ab7d75bebf086cde52956679164c9f01fd37e +SHA1 (patch-ppdc_Makefile) = cdeb0ef9a68f9dd85453ef3076a0120ad9983698 SHA1 (patch-scheduler-conf.c) = 179964f8d251be3c21f4cfc7b67f3196beda29dc SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee -SHA1 (patch-scheduler-main.c) = 599053cb4384f739f27d1ec49fdfe11ca6e450d4 +SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab SHA1 (patch-scheduler_auth.c) = ca675a6e903d4b41cd69a0cab27180653e11f501 SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf SHA1 (patch-test_ippfind.c) = 6db56b9b1b9a26d5c40336af4dc6cde98abd9c19 diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae index 7f50ed0fadb..c48759d9b41 100644 --- a/print/cups/patches/patch-ae +++ b/print/cups/patches/patch-ae @@ -1,43 +1,20 @@ -$NetBSD: patch-ae,v 1.34 2017/09/03 11:30:54 leot Exp $ +$NetBSD: patch-ae,v 1.35 2017/10/23 12:34:54 leot Exp $ -For proper libtool usage split CC into CC_COMPILE and CC with libtool -mode options compile/link respectively. +- Do not pass `-z' option to install(1) +- Honor optimization flags. -Same for CXX. - ---- Makedefs.in.orig 2017-06-30 15:44:38.000000000 +0000 +--- Makedefs.in.orig 2017-10-13 18:22:26.000000000 +0000 +++ Makedefs.in -@@ -17,9 +17,11 @@ - - AR = @AR@ - AWK = @AWK@ --CC = @LIBTOOL@ @CC@ -+CC_COMPILE = @LIBTOOL@ --mode=compile @CC@ -+CC = @LIBTOOL@ --mode=link @CC@ - CHMOD = @CHMOD@ --CXX = @LIBTOOL@ @CXX@ -+CXX_COMPILE = @LIBTOOL@ --mode=compile @CXX@ -+CXX = @LIBTOOL@ --mode=link @CXX@ - DSO = @DSO@ - DSOXX = @DSOXX@ - GZIP = @GZIP@ -@@ -38,12 +40,12 @@ SHELL = /bin/sh - # Installation programs... +@@ -49,7 +49,7 @@ SHELL = /bin/sh # --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ + INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ -INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ -+INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ +INSTALL_COMPDATA = $(INSTALL) -c -m 444 INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ INSTALL_DATA = $(INSTALL) -c -m 444 INSTALL_DIR = $(INSTALL) -d --INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ -+INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ - INSTALL_MAN = $(INSTALL) -c -m 444 - INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ - -@@ -141,7 +143,7 @@ CXXLIBS = @CXXLIBS@ +@@ -151,7 +151,7 @@ CXXLIBS = @CXXLIBS@ DBUS_NOTIFIER = @DBUS_NOTIFIER@ DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@ DNSSD_BACKEND = @DNSSD_BACKEND@ @@ -46,17 +23,3 @@ Same for CXX. DSOLIBS = @DSOLIBS@ $(COMMONLIBS) DNSSDLIBS = @DNSSDLIBS@ IPPFIND_BIN = @IPPFIND_BIN@ -@@ -252,11 +254,11 @@ USBQUIRKS = @USBQUIRKS@ - - .c.o: - echo Compiling $<... -- $(CC) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< -+ $(CC_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CFLAGS) -c -o $@ $< - - .cxx.o: - echo Compiling $<... -- $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $< -+ $(CXX_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c -o $@ $< - - .man.1 .man.1m .man.3 .man.5 .man.7 .man.8: - echo Linking $<... diff --git a/print/cups/patches/patch-config-scripts_cups-libtool.m4 b/print/cups/patches/patch-config-scripts_cups-libtool.m4 new file mode 100644 index 00000000000..a5fbcd10e74 --- /dev/null +++ b/print/cups/patches/patch-config-scripts_cups-libtool.m4 @@ -0,0 +1,15 @@ +$NetBSD: patch-config-scripts_cups-libtool.m4,v 1.1 2017/10/23 12:34:54 leot Exp $ + +Fix non-portable `==' test(1) operator. + +--- config-scripts/cups-libtool.m4.orig 2017-10-13 18:22:26.000000000 +0000 ++++ config-scripts/cups-libtool.m4 +@@ -14,7 +14,7 @@ dnl + AC_ARG_ENABLE(libtool_unsupported, [ --enable-libtool-unsupported=/path/to/libtool + build with libtool (UNSUPPORTED!)], + [if test x$enable_libtool_unsupported != xno; then +- if test x$enable_libtool_unsupported == xyes; then ++ if test x$enable_libtool_unsupported = xyes; then + AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.]) + fi + LIBTOOL="$enable_libtool_unsupported" diff --git a/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4 b/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4 deleted file mode 100644 index d1005514ab7..00000000000 --- a/print/cups/patches/patch-config-scripts_cups-sharedlibs.m4 +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-config-scripts_cups-sharedlibs.m4,v 1.3 2017/09/03 11:30:54 leot Exp $ - -libtoolize. - ---- config-scripts/cups-sharedlibs.m4.orig 2017-06-30 15:44:38.000000000 +0000 -+++ config-scripts/cups-sharedlibs.m4 -@@ -20,6 +20,24 @@ cupsbase="cups" - LIBCUPSBASE="lib$cupsbase" - LIBCUPSSTATIC="lib$cupsbase.a" - -+AC_ARG_ENABLE(libtool, [ --enable-libtool[=LIBTOOL_PATH] -+ turn on building with libtool (UNSUPPORTED!), default=no]) -+ -+if test x$enable_libtool != xno; then -+ echo "WARNING: libtool is not supported or endorsed by Easy Software Products." -+ echo " WE DO NOT PROVIDE TECHNICAL SUPPORT FOR LIBTOOL PROBLEMS." -+ echo " (even if you have a support contract)" -+ enable_shared=no -+ if test x$enable_libtool = xyes; then -+ LIBTOOL=libtool -+ else -+ LIBTOOL=$enable_libtool -+ fi -+else -+ LIBTOOL= -+fi -+AC_SUBST(LIBTOOL) -+ - if test x$enable_shared != xno; then - case "$host_os_name" in - sunos*) -@@ -65,6 +83,15 @@ if test x$enable_shared != xno; then - DSOFLAGS="$DSOFLAGS -Wl,-soname,\`basename \$@\` -shared \$(OPTIM)" - ;; - esac -+elif test x$enable_libtool != xno; then -+ LIBCUPS="libcups.la" -+ LIBCUPSCGI="libcupscgi.la" -+ LIBCUPSDRIVER="libcupsdriver.la" -+ LIBCUPSIMAGE="libcupsimage.la" -+ LIBCUPSMIME="libcupsmime.la" -+ LIBCUPSPPDC="libcupsppdc.la" -+ DSO="\$(CC)" -+ DSOXX="\$(CXX)" - else - PICFLAG=0 - LIBCUPS="lib$cupsbase.a" -@@ -88,8 +115,13 @@ AC_SUBST(LIBCUPSPPDC) - AC_SUBST(LIBCUPSSTATIC) - - if test x$enable_shared = xno; then -- LINKCUPS="../cups/lib$cupsbase.a" -- LINKCUPSIMAGE="../filter/libcupsimage.a" -+ if test x$enable_libtool = xno; then -+ LINKCUPS="../cups/lib$cupsbase.a" -+ LINKCUPSIMAGE="../filter/libcupsimage.a" -+ else -+ LINKCUPS="../cups/\$(LIBCUPS)" -+ LINKCUPSIMAGE="../filter/\$(LIBCUPSIMAGE)" -+ fi - - EXTLINKCUPS="-lcups" - EXTLINKCUPSIMAGE="-lcupsimage" -@@ -117,10 +149,11 @@ if test "$DSO" != ":"; then - DSOLIBS="\$(LIBZ)" - IMGLIBS="" - -- # Tell the run-time linkers where to find a DSO. Some platforms -- # need this option, even when the library is installed in a -- # standard location... -- case $host_os_name in -+ if test x$enable_libtool = xno; then -+ # Tell the run-time linkers where to find a DSO. Some platforms -+ # need this option, even when the library is installed in a -+ # standard location... -+ case $host_os_name in - sunos*) - # Solaris... - if test $exec_prefix != /usr; then -@@ -145,7 +178,8 @@ if test "$DSO" != ":"; then - EXPORT_LDFLAGS="-Wl,-rpath,$libdir" - fi - ;; -- esac -+ esac -+ fi - else - DSOLIBS="" - IMGLIBS="\$(LIBZ)" diff --git a/print/cups/patches/patch-configure.ac b/print/cups/patches/patch-configure.ac deleted file mode 100644 index b10de562adb..00000000000 --- a/print/cups/patches/patch-configure.ac +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-configure.ac,v 1.2 2015/12/02 21:14:16 leot Exp $ - -libtoolize. - ---- configure.ac.orig 2015-12-02 15:09:04.000000000 +0000 -+++ configure.ac -@@ -25,7 +25,6 @@ sinclude(config-scripts/cups-directories - sinclude(config-scripts/cups-manpages.m4) - - sinclude(config-scripts/cups-sharedlibs.m4) --sinclude(config-scripts/cups-libtool.m4) - sinclude(config-scripts/cups-compiler.m4) - - sinclude(config-scripts/cups-network.m4) diff --git a/print/cups/patches/patch-ppdc_Makefile b/print/cups/patches/patch-ppdc_Makefile index 5f33f76e933..fa5b9630884 100644 --- a/print/cups/patches/patch-ppdc_Makefile +++ b/print/cups/patches/patch-ppdc_Makefile @@ -1,11 +1,11 @@ -$NetBSD: patch-ppdc_Makefile,v 1.3 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-ppdc_Makefile,v 1.4 2017/10/23 12:34:54 leot Exp $ ---- ppdc/Makefile.orig 2015-05-06 20:21:51.000000000 +0000 +--- ppdc/Makefile.orig 2017-10-13 18:22:26.000000000 +0000 +++ ppdc/Makefile -@@ -366,7 +366,7 @@ libcupsppdc.1.dylib: $(LIBOBJS) ../cups/ +@@ -352,7 +352,7 @@ libcupsppdc.1.dylib: $(LIBOBJS) ../cups/ libcupsppdc.la: $(LIBOBJS) ../cups/$(LIBCUPS) echo Linking $@... - $(CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ + $(LD_CC) $(ARCHFLAGS) $(DSOFLAGS) -o $@ $(LIBOBJS:.o=.lo) -rpath $(LIBDIR) \ - -version-info 1:0 $(LINKCUPS) + -version-info 1:0 $(COMMONLIBS) diff --git a/print/cups/patches/patch-scheduler-main.c b/print/cups/patches/patch-scheduler-main.c index 4731702b36f..08e1315ef67 100644 --- a/print/cups/patches/patch-scheduler-main.c +++ b/print/cups/patches/patch-scheduler-main.c @@ -1,18 +1,18 @@ -$NetBSD: patch-scheduler-main.c,v 1.2 2017/09/03 11:30:54 leot Exp $ +$NetBSD: patch-scheduler-main.c,v 1.3 2017/10/23 12:34:54 leot Exp $ Add a PidFile configuration directive to write a PID file. ---- scheduler/main.c.orig 2017-06-30 15:44:38.000000000 +0000 +--- scheduler/main.c.orig 2017-10-13 18:22:26.000000000 +0000 +++ scheduler/main.c -@@ -72,6 +72,7 @@ static void service_checkin(void); - static void service_checkout(void); - #endif /* HAVE_ONDEMAND */ - static void usage(int status) __attribute__((noreturn)); -+static int create_pidfile(const char *path); - +@@ -61,6 +61,7 @@ + * Local functions... + */ - /* -@@ -677,6 +678,13 @@ main(int argc, /* I - Number of comm ++static int create_pidfile(const char *path); + static void parent_handler(int sig); + static void process_children(void); + static void sigchld_handler(int sig); +@@ -676,6 +677,13 @@ main(int argc, /* I - Number of comm #endif /* __APPLE__ */ /* @@ -26,7 +26,7 @@ Add a PidFile configuration directive to write a PID file. * Send server-started event... */ -@@ -1139,6 +1147,7 @@ main(int argc, /* I - Number of comm +@@ -1143,6 +1151,7 @@ main(int argc, /* I - Number of comm "Scheduler shutting down due to program error."); } @@ -34,7 +34,7 @@ Add a PidFile configuration directive to write a PID file. /* * Close all network clients... */ -@@ -1167,6 +1176,12 @@ main(int argc, /* I - Number of comm +@@ -1168,6 +1177,12 @@ main(int argc, /* I - Number of comm */ cupsdDeleteTemporaryPrinters(1); @@ -47,7 +47,7 @@ Add a PidFile configuration directive to write a PID file. #ifdef __APPLE__ /* -@@ -2068,6 +2083,36 @@ service_checkout(void) +@@ -2088,6 +2103,36 @@ service_checkout(int shutdown) /* |