summaryrefslogtreecommitdiff
path: root/print/cups/patches
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2010-05-21 10:05:20 +0000
committersbd <sbd@pkgsrc.org>2010-05-21 10:05:20 +0000
commit1985a4331d133cf2c0ef0c614aca702d261169ad (patch)
treebecc82ca09f4d264c08961d8bc275de21ba237ca /print/cups/patches
parent9f6ecf2d5269cb3cd52ac26fa400d82540890b6c (diff)
downloadpkgsrc-1985a4331d133cf2c0ef0c614aca702d261169ad.tar.gz
Update to cups 1.4.3
Adds the option acl, libusb and tcpwrappers. CHANGES IN CUPS V1.4.3 - SECURITY: The scheduler could try responding on a closed client connection, leading to a crash (STR #3200) - SECURITY: The lppasswd program allowed the localization files to be overridden when running in setuid mode (STR #3482) - Localization updates (STR #3352, STR #3409, STR #3422, STR #3452, STR #3473, STR #3502) - Documentation updates (STR #3451, STR #3504) - The IPP backend now sets the printer-state-message to "Ready to print." at the end of a successful job (STR #3460) - The PPD compiler did not correctly add the manufacturer to the output filename when using the "-m" option (STR #3469) - The IPP backend did not handle authentication properly for the Get- Printer-Attributes operation (STR 3458) - Getting SNMP values larger than 127 bytes did not work. - IPP conformance: Get-Jobs has a default value for requested-attributes (STR #3383) - cupsPrintFiles() did not report all errors (STR #3449) - cupsAddDest() could read freed memory (STR #3448) - The DBUS notifier did not build (STR #3447) - The scheduler would crash when an active printer was deleted. - The snmp backend did not work with some printers (STR #3413) - The web interface did not show the conflicting values when setting options (STR #3440) - Setting options in the web interface did not always work (STR #3439) - The scheduler did not use the Get-Job-Attributes policy for a printer (STR #3431) - The scheduler added two job-name attributes to each job object (STR #3428) - CSS files would not print (STR #3442) - The scheduler did not clean out completed jobs when PreserveJobHistory was turned off (STR #3425) - The web interface did not show completed jobs for a printer (STR #3436) - Authenticated printing did not always work when printing directly to a remote server (STR #3435) - The USB backend did not work on Solaris (STR #3423) - cupstestppd didn't catch problems with JobPatchFile definitions (STR #3421) - The socket backend could crash if a SNMP string had a negative length. - Fixed some termination issues with the USB backend on Mac OS X. - The side-channel APIs did not handle interrupts properly. - The network backends incorrectly cleared the media-empty-warning state. - The web interface did not allow users to successfully add serial printers (STR #3391) - cupsTempFd() did not work in some situations (STR #3382) - Some C API headers were missing C++ wrapper logic. - The PPD compiler did not localize single-language PPD options properly (STR #3386) - Modifying a printer from the web interface sometimes caused the wrong driver to be selected (STR #3418) - The scheduler did not handle out-of-memory conditions properly when loading a job (STR #3407) - When adding printers from the web interface, the dynamic updates of the device list made it hard to pick a device (STR #3406) - Fixed a typo in the web interface admin page template (STR 3403) - The web interface did not preserve the "printer is shared" state when modifying a printer (STR #3390) - The PPD compiler incorrectly inserted translations of empty strings (STR #3411) - The scheduler did not reset the SIGPIPE handler of child processes (STR #3399) - cupsGetNamedDest() incorrectly returned the default printer if the named printer did not exist (STR #3397) - Fixed a GNU TLS error handling bug (STR #3381) CHANGES IN CUPS V1.4.2 - SECURITY: The CUPS web interface was vulnerable to several XSS and HTTP header/body attacks via attribute injection (STR #3367, STR #3401) - Fixed localization errors (STR #3359, STR #3372, STR #3380, STR #3387) - The documentation for classes.conf and printers.conf did not provide the correct instructions for manual changes (STR #3351) - The scheduler did not always rebuild printer cache files when the driver was changed (STR #3356) - The documentation makefile failed to install localizations when using newer versions of Bash (STR #3360) - The configure script did not use the --with-xinetd value for the default LPD configuration path (STR #3347) - The configure script incorrectly required glib for DBUS support (STR #3346) - The cupstestppd program incorrectly reported filters with bad permisssions as missing (STR #3363) - The cups.desktop file used the wrong locale names (STR #3358) - cupsSideChannelRead() did not return an error for short reads. - The installed PAM configuration file did not use the correct options with the pam_unix2 module (STR #3313) - The scheduler did not preserve default options that contained special characters (STR #3340) - The scheduler did not remove old pre-filters when updating a printer driver (STR #3342) - The HP/GL-2 filter did not check for early end-of-file (STR #3319) - The USB backend did not compile on some platforms (STR #3332) - cupsSideChannelSNMPWalk() could go into an infinite loop with broken SNMP implementations. CHANGES IN CUPS V1.4.1 - Documention fixes (STR #3296) - SNMP supply levels and states were wrong for some printers. - The IPP backend did not update the auth-info-required value. - The libusb-based USB backend would hang at the end of the job (STR #3315, STR #3318) - DNS-SD registrations for raw queues had an empty "ty" key (STR #3299) - The JPEG and BMP MIME type rules were broken (STR #3284) - cupsGetNamedDest returned the default printer when the named destination did not exist (STR #3285) - The JobKillDelay was not triggered for canceled jobs (STR #3292) - The PPD compiler could get in an infinite loop (STR #3293) - The configure check for dns-sd.h was broken (STR #3297) - The "Query Printer for Default Options" page did not go away if the query job was held (STR #3302) - Boolean options did not show up as selected in the web interface (STR #3303) - The scheduler did not cache or report driver information files correctly, leading to a variety of issues (STR #3283, STR #3297, STR #3305) - cupsDoIORequest() did not abort on permanent errors (STR #3311) - Modifying a class in the web interface did not work (STR #3312) - BrowseLocalProtocols could be cleared when changing the sharing setting (STR #3287) - The scheduler could return an empty supported document format (STR #3308) - The PPD compiler generated invalid PPD files when the locale used something other than "." for the decimal point (STR #3300) - The IPP backend did not handle some non-comforming IPP printer implementations (STR #3262) - The scheduler leaked three file descriptors to each job filter (STR #3263) - The scheduler now uses a default CUPS-Get-Devices timeout of 15 seconds (STR #3307) CHANGES IN CUPS V1.4.0 - Localization updates (STR #3223, STR #3246, STR #3248, STR #3250) - Documentation updates (STR #3225, STR #3230, STR #3242, STR #3260) - The --with-pdftops configure option did not accept a full path to the filter (STR #3278) - The banner filter did not position the back side image correctly (STR #3277) - The dnssd backend could crash (STR #3272) - The 1284 device ID sometimes contained trailing garbage (STR #3266) - The USB backend returned different URIs for some printers than in CUPS 1.3 (STR #3259) - The scheduler did not do local job-hold-until processing for remote queues (STR #3258) - The scheduler did not try all possible SSL certificates on Mac OS X. - The scheduler did not always remove a file descriptor when using the kqueue interface (STR #3256) - The scheduler did not protect against bad job control files in all cases (STR #3253) - The scheduler did not encode "+" in model names (STR #3254) - The web interface didn't show the default options (STR #3244) - The IPP and LPD backends needed print data before they would do an SNMP query. - Fixed a GNU TLS compatibility issue (STR #3231) - Fixed a HTML error in the add and modify printer web interface templates (STR #3229) - The scheduler did not minimize the number of printer state events that were generated by filter STATE: messages, which could lead to poor performance. - The USB backend on Mac OS X did not cleanly cancel a job. - The network backends now set the connecting-to-device printer-state- reasons value when looking up the address and copying the print data for consistency. - The scheduler now supports the com.apple.print.recoverable-warning reason on all platforms. CHANGES IN CUPS V1.4rc1 - The PPD compiler documentation was missing information on localization (STR #3212) - The IPP backend now reconnects after every request when talking to printers that claim IPP support but only use HTTP/1.0. - The PPD compiler crashed when both "Resolution" and "Group foo Option Resolution" were specified in the .drv file. - The PPD compiler's #if/#elif/#else/#endif did not work for undefined variables (STR #3210) - Static libraries could not be installed by a non-root user on systems needing a ranlib program (STR #3209) - The scheduler incorrectly always tried to copy Kerberos credentials for print jobs. - Updated the Spanish localization (STR #3204) - The scheduler crashed when getting the default paper size from libpaper (STR #3205, STR #3206) - The PPD compiler now defines six variables: CUPS_VERSION, CUPS_VERSION_MAJOR, CUPS_VERSION_MINOR, CUPS_VERSION_PATCH, PLATFORM_NAME, and PLATFORM_ARCH (STR #3203) - Fixed a whitespace skipping bug in cupsRasterInterpretPPD. - The scheduler did not return HTTP 403 (Forbidden) for authenticated users that were not authorized to do IPP operations (STR #3193) - The scheduler did not report more than 8 Product strings from a PPD file. Some PPD files have as many as 24. - ppdOpen*() could crash if a keyword had no value string (something that cupstestppd looks for...) - cupsLangDefault() did not return the correct language on Mac OS X. - The Mac OS X USB backend did not handle aborted or stalled pipe conditions properly, which prevented drivers from ejecting partial pages when a job was canceled or held. CHANGES IN CUPS V1.4b3 - Documentation fixes (STR #3044, STR #3057, STR #3153, STR #3158, STR #3173) - Added complete localizations for German, Japanese, Polish, and Russian and partial localizations for Chinese, Danish, Finnish, French, Italian, Korean, Norwegian, Portuguese, and Swedish (STR #3096, STR #3098, STR #3109, STR #3111, STR #3141) - Updated the configure check for -fstack-protector (STR #3198) - The network backends now correctly convert SNMP supply descriptions to UTF-8 encoding as needed. - The scheduler could crash when deleting an attribute (STR #3197) - The cups-driverd program did not detect symlink loops (STR #3185) - The EPSON 24-pin series driver should now feed the correct amount (STR #2624) - The scheduler now automatically logs the last N debug messages for failed print jobs. - You can now modify a raw print queue (STR #3133) - Fixed a number of ppdi issues and added a unit test to validate that ppdc + ppdi can generate and import the same data (STR #3152) - Moving jobs in the web interface now shows an error if you only have one printer or class added (STR #3094) - Since classes have never truly supported the printer-error-policy stuff added in CUPS 1.2, update the code to reflect the current reality and support only the retry-current-job policy for now (STR #3171) - Revised the password callback support (STR #2953) - ppdEmit*() did not choose between PageSize and PageRegion properly. - Make some fairly substantial changes to the Kerberos support code so that CUPS can work in multi-realm environments and does not require delegatable credentials. Shared printing still requires delegation, however "delegation by policy" can be enabled in the KDC to make this all work. - "AccessLogLevel actions" did not hide client-error-not-found errors. - AP_FIRST_InputSlot did not work with number-up. - cupsBackChannelRead() and cupsBackChannelWrite() could fail due to a lack of kernel buffers. - The IPP and LPD backends did not respond to side-channel requests while copying print data to a temporary file. - cupsWriteRequestData() flushed the output buffer unnecessarily, causing reduced performance in some situations. - If a CGI process died before sending its MIME headers, the request would hang on the client. - The printer/class/job search feature on the web interface did not work (STR #3132) - The scheduler did not write the printers out for classes. - CUPS-Get-PPDs did not work properly when filtering by language, product, or psversion (STR #3136) - The scheduler now kills job filters when it takes more than 30 seconds (configurable) to cancel or hold the job. - The cupstestppd program did not validate the capitalization of filenames in the PPD file. - The cupstestppd program did not validate the PageSize and PageRegion values. - The cups-deviced helper program could miss reporting some backend devices (STR #3108) - The cupsSideChannelSNMP* functions did not work. - The scheduler could consume 100% CPU when jobs were canceled. - Clicking on "Select Another Make/Manufacturer" in the web interface incorrectly added the printer (STR #3095) - The scheduler no longer uses programs with insecure file permissions. - httpAssembleURI*() did not escape backslashes in hostnames. - The dnssd backend did not unquote "full names" before creating the device URI. - The scheduler now supports JobRetryInterval values less than 10 seconds. - Updated the Spanish localization (STR #3090) - The scheduler did not redo Bonjour/DNS-SD registrations when updating them failed. - The "authenticated" policy incorrectly required authentication for status operations. - ppdOpen*() incorrectly loaded PPDs with multiple JobPatchFile keywords. - The network backends no longer report the SNMP "offline" or maintenance status bits since they are inconsistently implemented and often unreliable. - The scheduler no longer logs child processes killed via SIGKILL as "crashed". - The printer link shown on the "job moved" template was bad (STR #3085) - Updated the HTML templates to use the final HTML 4 DOCTYPE (STR #3086) - The scheduler did not track the "paused" reason properly if a printer had other reasons associated with it. - cupsSendRequest() did not clear old local certificate auth data. - The PPD compiler did not search for localization files properly (STR #3084) - cupsGetNamedDest() did not use the fallback default like cupsGetDests*() (STR #3082) - The scheduler now provides a LogTimeFormat directive to enable microseconds in the date and time that are logged. - The scheduler now provides a MultipleOperationTimeout directive to control the timeout for multi-file print jobs. - The configure script incorrectly allowed Avahi to be used for DNS-SD printer discovery (STR #3065) - The web interface and scheduler did not support URIs up to 1024 bytes in length (STR #3072) - Fixed pdftops issues with page sizes (STR #3063) - Fixed pdftops issues with Ghostscript (STR #3062) - The scheduler incorrectly registered default profiles for PostScript printers with no specified colorspace. - The scheduler incorrectly created an empty org.cups.printers.plist file on Mac OS X. - cupsGetPPD3() did not look for local PPDs in the right directory. - SNMP lookups via side-channel did not work for NULL-VALUE and and OCTET-STRING OIDs containing nul characters. - The libusb-based USB backend did not work. - The scheduler did not set the printer-commands attribute correctly for some PPDs. - The ppdi utility did not work. - The web interface no longer uses multi-part output with old or broken web browsers (STR #3049) - CUPS now conforms to the draft IPP/2.0 and IPP/2.1 specification. - Added a new cupsGetConflicts() API to get a list of conflicting options. - The PPD compiler didn't localize options or choices that did not have associated translation text (STR #3045) - Updated the Spanish localization (STR #3043) - Fixed build problems (STR #3040, STR #3047) - cupsResolveConflicts() did not resolve using the default option choice in some cases due to the mirror UIConstraints that are present in most PPD files. - The scheduler did not honor MIME type priorities. - The commandtops filter incorrectly used the JCLBegin code to end its jobs. - The default BrowseLocalProtocols value was not set properly. - Since the commandtops filter does not actually support ReportLevels all on its own, don't list that printer command by default for PS printers. - The scheduler did not give filters a chance to log errors or update printer attributes when a job was canceled. - The scheduler did not clear the "connecting-to-device" reason keyword when a job finished. CHANGES IN CUPS V1.4b2 - Documentation updates (STR #2983, STR #2998, STR #3021) - The cupstestppd utility now validates the FileVersion and FormatVersion values in PPD files. - The default cupsd.conf file did not reflect the --with-local-protocols value set at compile-time (STR #3037) - The cupsGetPPD* APIs now create symlinks to local PPD files rather than copying them whenever possible. - Various performance optimizations in the string pool, dests, and options implementations. - The cupsGetDests* APIs now return the marker and printer-commands attributes. - Side-channel SNMP lookups would not work when cupsSNMPSupplies was set to False in the PPD file. - Localized the device descriptions for the SCSI, serial, and network backends (STR #3014) - Added a Spanish localization (STR #3015) - Added support for marker-low-levels and marker-high-levels attributes. - The scheduler could hang writing a long log line. - The cupsGetDevices() function now has an "include_schemes" parameter. - The lpinfo command now supports --include-schemes and --exclude-schemes options. - The CUPS-Get-PPDs operation now supports the include-schemes and exclude-schemes attributes. - The CUPS-Get-Devices operation now supports the include-schemes attribute. - The print filters now support a replacement for the fitplot option called "fit-to-page". - The LPD backend no longer tries to collect page accounting information since the LPD protocol does not allow us to prevent race conditions. - The scheduler did not save the last marker-change-time value. - Fixed a problem with printing to some IPP printers, including CUPS 1.1.x. - Fixed a redirection problem with the printer web page (STR #3012) - Fixed a PPD compiler problem with the loading of message catalogs (STR #2990) - Fixed a PPD compiler problem with the loading of .strings files (STR #2989) - The cupsfilter utility did not set the CONTENT_TYPE environment variable when running filters. - The scheduler now waits to allow system sleep until the jobs have all stopped. - The IPP, LPD, and socket backends used different "connecting" progress messages. CHANGES IN CUPS V1.4b1 - Documentation updates (STR #2567) - The PPD compiler now allows local message catalogs to override the standard CUPS translations (STR #2642) - The ppdmerge command did not merge custom option strings (STR #2863) - The scheduler now supports the Hold-New-Jobs and Release-Held-New-Jobs operations; these are exposed via the cupsdisable and cupsenable commands (STR #2332) - The lpstat command is now much faster when displaying the status of a single printer (STR #2843) - The scheduler now caches information from PPD files to provide significantly faster startup time with large numbers of PPDs (STR #1293) - CUPS-Get-Driver now provides much better driver matching based on the IEEE-1284 device ID and make/model strings (STR #2707) - Now support the cupsSNMPSupplies keyword to control whether the network backends query the SNMP Printer MIB for supply levels. - Now support and use a new banner file format for better text support and easier customization (STR #2490) - The scheduler now sets the PRINTER_INFO and PRINTER_LOCATION environment variables from the corresponding IPP attributes. - The ippRead*() and ippWrite*() functions no longer use a stack-based buffer (STR #2388) - The CUPS-Add-Modify-Printer operation now allows you to set the printer-state-reasons attribute. - The "set printer options" page now supports auto-configuration of printer options (STR #1440) - The web interface now provides an advanced server settings form. - The web interface's "modify printer" pages now make it easier to change just one setting (STR #1919) - The scheduler now supports a plist PrintcapFormat. - The scheduler now supports multiple addresses in Allow and Deny lines, just like Apache (STR #2947) - Added CUPS_JOBTYPE environment variable for job filters so they know whether they are printing a banner or document file (STR #2799) - Added support for printer filtering by the cupsfilter command (STR #2562) - Added a SSLOptions directive to allow Windows clients to talk to CUPS in FIPS mode (STR #2827) - Renamed the accept and reject commands to cupsaccept and cupsreject; the old names are still available (STR #2936) - The locale/translate utility needed an update to work with Google (STR #2882) - The lpstat command now supports a -H option to display the default server (STR #2833) - The scheduler now supports a FatalErrors directive to control which errors should cause the scheduler to exit (STR #2536) - The scheduler now uses the php-cgi program if it is available (STR #2923) - The scheduler now supports a DefaultPaperSize directive (STR #2848) - The scheduler now passes the job-originating-host-name value to filters in the options argument (STR #2558) - CUPS now supports job tickets in PDF files (STR #2903) - Added a DBUS notifier (STR #2529) - The LPD mini-daemon now passes the document name when queuing print jobs (STR #2482) - The IPP backend did not relay com.apple.print.recoverable-message values. - The scheduler now supports a job-media-progress attribute to track the progress of individual pages. - The sample HP driver now supports A5 (STR #2798) - The CUPS web interface menu item now uses the xdg-open command, when available (STR #2724) - The cups-lpd program now supports the -h option (STR #2794) - The scheduler now sets the PAM_TTY parameter and the PAM_ESTABLISH_CRED credential flag (STR #2745) - The scheduler now logs unsuccessful requests to the error_log file as errors (STR #2616) - Added support for a "retry-current-job" error policy that retries the current job immediately when the backend encounters an error (STR #2555) - The scheduler now returns a "forbidden" error when a user correctly authenticates but does not have permission to continue further (STR #2101) - The scheduler now loads both the server and CA certificates (if present) from the ServerCertificate file (STR #2146) - New RSS subscriptions now create their feed files immediately (STR #2853) - Added support for a device-location attribute which provides the physical location of a printer device. - Added a cupsBackendReport() API which handles quoting of the device data by a backend. - Added support for custom options in the web interface (STR #1729) - Added support for Mozilla LDAP, reconnection to LDAP servers, and improved LDAP performance (STR #1962) - Added Solaris SMF support (STR #1477) - Added optional support for using TCP wrappers to limit access to CUPS (STR #263) - Added ppdPageSizeLimits API. - Added support for new cupsMediaQualifier2, cupsMediaQualifier3, cupsMinSize, and cupsMaxSize attributes. - Added cupsResolveConflicts and ppdInstallableConflict APIs. - Added support for new cupsUIConstraints and cupsUIResolver attributes for better option conflict detection and resolution. - Increased the maximum size of 1284 device ID strings to 256 bytes (STR #2877) - Added an AccessLogLevel directive to cupsd.conf to control what is logged to the access_log file. - The default LogLevel is now "warn" instead of "info" to reduce the amount of logging that is done to disk by default. - The PPD compiler did not include OID query keywords in PPD files (STR #2871) - The cups-driverd helper program now directly supports driver information files. - The USB backend now uses libusb when available (STR #1575) - Added ppdLocalizeAttr function to get the localized version of an attribute. - MIME types now support a priority() attribute (STR #2719) - The standard MIME types are now installed in DataDir/mime (STR #2719) - The lpoptions command now describes custom options and the necessary parameters (STR #2660) - The ppdmerge program did not support Simplified Chinese or Traditional Chinese language version strings (STR #2851) - The PPD compiler now supports localizable attributes (STR #2738) - The ppdpo utility now includes cupsIPPReasons values in the message catalogs it generates (STR #2754) - The PPD compiler now supports conditional directives (STR #2636) - The ppdc utility now supports a "-t" option to test PPD files (STR #2739) - The ppdc utility now supports a "-m" option to use the ModelName value as the output filename. - The ppdc utility now supports a FileName directive to set an alternate output filename (STR #2740) - The side-channel API now supports SNMP queries for the standard network backends. - Added a PageLogFormat directive to the cupsd.conf file to control the format of lines in the page_log file. - Filters can now send PPD: messages to stderr to set PPD keywords like DefaultPageSize while a job is printing. - Added a mdns backend for discovery and printing to printers that advertise themselves via DNS-SD (Bonjour) - The ipp, lpd, and socket backends now support DNS-SD service name resolution. - The scheduler now uses a single shared file descriptor for all DNS-SD registrations (STR #2674) - The ipp, lpd, and socket backends now support SNMP-based page accounting and supply level monitoring (STR #1655) - Added support for cupsPJLDisplay attribute to control what PJL commands are used to display the job information. - Driver information files can now be installed in /Library/Printers/PPDs.drv on Mac OS X. - The CUPS image library now supports reading images larger than 2GB. - The scheduler now delays writing config and state files to reduce disk activity (STR #2684) - The CUPS-Get-Devices operation now supports the exclude-schemes and timeout attributes to control which backends are polled and for how long. - The cups-deviced helper application now runs backends in parallel to get the list of devices faster. - Added --enable-pap configure option. - The default cupsd.conf file now includes an "authenticated" policy which requires authentication for remote print jobs. - Added support for Czech and Hungarian in PPD files (STR #2735, STR #2736) - The PPD compiler tools now support Mac OS X .strings files for localization (STR #2737) - ppdOpen*() now default the colorspace member to PPD_CS_N when no DefaultColorSpace attribute is present in the PPD file. - The build system has been updated to support separate installation of data, program, header, and library files. - All support libraries are now built as shared libraries by default. - The scheduler now manages ICC color profiles on Mac OS X. - The network backends (ipp, lpd, socket) now support SNMP-based supply and page count monitoring (STR #1655) - The lppasswd program is no longer installed setuid to root to make the default installation more secure. - Added a new ppdLocalizeMarkerName() function to get the localized version of a marker-names value. - The scheduler now provides the printer-dns-sd-name attribute for printers shared via DNS-SD/Bonjour. - The pdftops filter now executes the Xpdf or poppler pdftops utility to convert PDF files (STR #1471) - Bonjour printer registrations now advertise as local or global based on the current access policies for the printer. - cupsGetDests*() and cupsSetDests*() now track the last used printer preference on Mac OS X. - Added a new streaming request API (STR #2261) - Added a new cupsGetNamedDest() function to the CUPS library for faster printing with lp and lpr (STR #2638) - The scheduler now sets the PAM RHOST value on systems that support it (STR #2637) - The scheduler now sandboxes child processes when possible. - The Cancel-Job operation now supports a purge-job attriibute to purge a specified job. - ppdEmit* and ppdCollect* now use the NonUIOrderDependency attributes for custom option selections. - The web interface now enables/disables the printer sharing (formerly publishing) controls based on the server-is-sharing-printers state (STR #2233) - The scheduler now tracks printer sharing via the server-is-sharing-printers attribute, and manages LPD and SMB sharing as well (STR #2233) - The web interface now allows you to go back to the make/ manufacturer page if there is no matching printer driver on the model page (STR #2436) - The printer list now shows the default media, banner, and duplex options as well as the color and duplex capabilities of printers (STR #1175) - The web interface look-n-feel has been updated (STR #2492) - The scheduler now supports a CUPS-Get-Document operation that returns the specified print job document (STR #118) - The cupsfilter utility now supports a "-J jobid" option to filter the document from the specified job. - The scheduler (cupsd) now supports a new option (-t) to do a syntax check of the cupsd.conf file (STR #2003) - Added new cupsGetPPD3() API to allow applications to cache PPDs safely (STR #1473) - Added generic PostScript and PCL printer driver PPDs.
Diffstat (limited to 'print/cups/patches')
-rw-r--r--print/cups/patches/patch-aa6
-rw-r--r--print/cups/patches/patch-ab38
-rw-r--r--print/cups/patches/patch-ac6
-rw-r--r--print/cups/patches/patch-ad27
-rw-r--r--print/cups/patches/patch-ae35
-rw-r--r--print/cups/patches/patch-af12
-rw-r--r--print/cups/patches/patch-ag4
-rw-r--r--print/cups/patches/patch-ah10
-rw-r--r--print/cups/patches/patch-an34
-rw-r--r--print/cups/patches/patch-ao16
-rw-r--r--print/cups/patches/patch-at30
11 files changed, 108 insertions, 110 deletions
diff --git a/print/cups/patches/patch-aa b/print/cups/patches/patch-aa
index 0e81442b338..574190327b0 100644
--- a/print/cups/patches/patch-aa
+++ b/print/cups/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.21 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-aa,v 1.22 2010/05/21 10:05:20 sbd Exp $
Treat DragonFly like other BSD descendants.
---- cups/http.h.orig 2007-03-15 18:57:14.000000000 +0000
+--- cups/http.h.orig 2009-06-22 20:40:28.000000000 +0000
+++ cups/http.h
-@@ -106,7 +106,7 @@ extern "C" {
+@@ -88,7 +88,7 @@ extern "C" {
#if defined(AF_INET6) && !defined(s6_addr32)
# if defined(__sun)
# define s6_addr32 _S6_un._S6_u32
diff --git a/print/cups/patches/patch-ab b/print/cups/patches/patch-ab
index 02112680a66..0602c471fb3 100644
--- a/print/cups/patches/patch-ab
+++ b/print/cups/patches/patch-ab
@@ -1,36 +1,36 @@
-$NetBSD: patch-ab,v 1.20 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-ab,v 1.21 2010/05/21 10:05:20 sbd Exp $
Split the install target in installcups & installconf.
(installcup is everything but the config files.)
---- Makefile.orig 2009-03-12 17:34:21.000000000 -0400
-+++ Makefile 2009-05-13 20:57:09.000000000 -0400
-@@ -22,7 +22,7 @@
- DIRS = cups backend berkeley cgi-bin filter locale man monitor \
- notifier scheduler systemv test \
+--- Makefile.orig 2010-01-18 22:10:29.000000000 +0000
++++ Makefile
+@@ -30,7 +30,7 @@ include Makedefs
+ DIRS = cups filter backend berkeley cgi-bin driver locale man monitor \
+ notifier ppdc scheduler systemv test \
$(PHPDIR) \
-- conf data doc $(FONTS) ppd templates
-+ data doc $(FONTS) ppd templates
+- conf data doc examples $(FONTS) templates
++ data doc examples $(FONTS) templates
#
-@@ -107,7 +107,9 @@
- # Install object and target files...
+@@ -162,7 +162,8 @@ ctags:
+ # Install everything...
#
--install: installhdrs
-+install: installcups installconf
-+
-+installcups: installhdrs
- for dir in $(DIRS); do\
- echo Installing in $$dir... ;\
- (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
-@@ -115,6 +117,10 @@
+-install: install-data install-headers install-libs install-exec
++install: install-data install-conf install-headers install-libs install-exec
++installcups: install-data install-headers install-libs install-exec
+
+
+ #
+@@ -177,6 +178,11 @@ install-data:
echo Installing cups-config script...
$(INSTALL_DIR) -m 755 $(BINDIR)
$(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config
+
-+installconf:
++install-conf:
++ (cd scheduler; $(MAKE) $(MFLAGS) install-dirs) || exit 1
+ echo Installing in conf...
+ (cd conf; $(MAKE) $(MFLAGS) install)
if test "x$(INITDIR)" != x; then \
diff --git a/print/cups/patches/patch-ac b/print/cups/patches/patch-ac
index 52105397f3c..b6f86d76b51 100644
--- a/print/cups/patches/patch-ac
+++ b/print/cups/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.14 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-ac,v 1.15 2010/05/21 10:05:20 sbd Exp $
libtoolize.
---- configure.in.orig 2006-12-07 09:10:16.000000000 +1300
+--- configure.in.orig 2008-11-14 19:32:22.000000000 +0000
+++ configure.in
-@@ -31,7 +31,6 @@ sinclude(config-scripts/cups-manpages.m4
+@@ -22,7 +22,6 @@ sinclude(config-scripts/cups-manpages.m4
sinclude(config-scripts/cups-3264.m4)
sinclude(config-scripts/cups-sharedlibs.m4)
diff --git a/print/cups/patches/patch-ad b/print/cups/patches/patch-ad
index 2848a31c89a..ff0b1280a6a 100644
--- a/print/cups/patches/patch-ad
+++ b/print/cups/patches/patch-ad
@@ -1,15 +1,15 @@
-$NetBSD: patch-ad,v 1.14 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-ad,v 1.15 2010/05/21 10:05:20 sbd Exp $
libtoolize.
---- config-scripts/cups-sharedlibs.m4.orig 2006-12-07 09:10:16.000000000 +1300
+--- config-scripts/cups-sharedlibs.m4.orig 2009-02-10 17:05:35.000000000 +0000
+++ config-scripts/cups-sharedlibs.m4
-@@ -27,6 +27,24 @@ DSOFLAGS="${DSOFLAGS:=}"
+@@ -18,6 +18,24 @@ DSOFLAGS="${DSOFLAGS:=}"
- AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries, default=yes])
+ AC_ARG_ENABLE(shared, [ --disable-shared do not create shared libraries])
+AC_ARG_ENABLE(libtool, [ --enable-libtool[=LIBTOOL_PATH]
-+ turn on building with libtool (UNSUPPORTED!), default=no])
++ 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."
@@ -28,20 +28,25 @@ libtoolize.
+
if test x$enable_shared != xno; then
case "$uname" in
- SunOS* | UNIX_S*)
-@@ -84,6 +102,10 @@ if test x$enable_shared != xno; then
+ SunOS*)
+@@ -126,6 +144,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="libcups.a"
-@@ -104,8 +126,13 @@ AC_SUBST(LIBCUPS)
- AC_SUBST(LIBCUPSIMAGE)
+@@ -156,8 +183,13 @@ AC_SUBST(LIBCUPSMIME)
+ AC_SUBST(LIBCUPSPPDC)
if test x$enable_shared = xno; then
- LINKCUPS="../cups/libcups.a"
@@ -56,7 +61,7 @@ libtoolize.
else
if test $uname = AIX; then
LINKCUPS="-lcups_s"
-@@ -130,10 +157,11 @@ if test "$DSO" != ":"; then
+@@ -182,10 +214,11 @@ if test "$DSO" != ":"; then
DSOLIBS="\$(LIBTIFF) \$(LIBPNG) \$(LIBJPEG) \$(LIBZ)"
IMGLIBS=""
@@ -72,7 +77,7 @@ libtoolize.
HP-UX*)
# HP-UX needs the path, even for /usr/lib...
case "$uarch" in
-@@ -181,7 +209,8 @@ if test "$DSO" != ":"; then
+@@ -233,7 +266,8 @@ if test "$DSO" != ":"; then
EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
fi
;;
diff --git a/print/cups/patches/patch-ae b/print/cups/patches/patch-ae
index b2c58211404..d4f28d54f52 100644
--- a/print/cups/patches/patch-ae
+++ b/print/cups/patches/patch-ae
@@ -1,40 +1,41 @@
-$NetBSD: patch-ae,v 1.25 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-ae,v 1.26 2010/05/21 10:05:20 sbd Exp $
For proper libtool usage split CC into CC_COMPILE and CC with libtool
mode options compile/link respectively.
Same for CXX.
---- Makedefs.in.orig 2009-09-07 18:00:35.000000000 +0200
+--- Makedefs.in.orig 2009-05-26 23:27:06.000000000 +0000
+++ Makedefs.in
-@@ -19,8 +19,10 @@
+@@ -19,9 +19,11 @@
AR = @AR@
AWK = @AWK@
-CC = @LIBTOOL@ @CC@
--CXX = @LIBTOOL@ @CXX@
+CC_COMPILE = @LIBTOOL@ --mode=compile @CC@
-+CXX_COMPILE = @LIBTOOL@ --mode=compile @CXX@
+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@
HTMLDOC = @HTMLDOC@
- INSTALL = @INSTALL@
-@@ -40,11 +42,11 @@ STRIP = @STRIP@
+@@ -41,11 +43,11 @@ SHELL = /bin/sh
# Installation programs...
#
--INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -m 755
- INSTALL_CONFIG = $(INSTALL) -m @CUPS_CONFIG_FILE_PERM@
- INSTALL_DATA = $(INSTALL) -m 644
+-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -c -m 555 @INSTALL_STRIP@
+ INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
+ INSTALL_DATA = $(INSTALL) -c -m 444
INSTALL_DIR = $(INSTALL) -d
--INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755
-+INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -m 755
- INSTALL_MAN = $(INSTALL) -m 644
- INSTALL_SCRIPT = $(INSTALL) -m 755
+-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
++INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -c -m 555 @INSTALL_STRIP@
+ INSTALL_MAN = $(INSTALL) -c -m 444
+ INSTALL_SCRIPT = $(INSTALL) -c -m 555
-@@ -246,19 +248,19 @@ DBUSDIR = @DBUSDIR@
+@@ -263,19 +265,19 @@ DBUSDIR = @DBUSDIR@
.c.o:
echo Compiling $<...
@@ -56,5 +57,5 @@ Same for CXX.
- $(CXX) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
+ $(CXX_COMPILE) $(ARCHFLAGS) $(OPTIM) $(ALL_CXXFLAGS) -c $<
- .man.1 .man.1m .man.5 .man.7 .man.8:
+ .man.1 .man.1m .man.3 .man.5 .man.7 .man.8:
echo Linking $<...
diff --git a/print/cups/patches/patch-af b/print/cups/patches/patch-af
index e92f59fffb7..805e04eab3e 100644
--- a/print/cups/patches/patch-af
+++ b/print/cups/patches/patch-af
@@ -1,13 +1,13 @@
-$NetBSD: patch-af,v 1.18 2009/09/08 19:02:11 joerg Exp $
+$NetBSD: patch-af,v 1.19 2010/05/21 10:05:20 sbd Exp $
---- backend/Makefile.orig 2009-09-07 18:28:31.000000000 +0200
+--- backend/Makefile.orig 2009-03-03 19:39:21.000000000 +0000
+++ backend/Makefile
-@@ -55,7 +55,7 @@ depend:
- install: all
+@@ -84,7 +84,7 @@ install-data:
+ install-exec:
$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
for file in $(RBACKENDS); do \
-- $(LIBTOOL) $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
-+ $(LIBTOOL) --mode=install $(INSTALL) -m 700 $$file $(SERVERBIN)/backend; \
+- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
++ $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
done
for file in $(UBACKENDS); do \
$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
diff --git a/print/cups/patches/patch-ag b/print/cups/patches/patch-ag
index 815ae84df0f..fb68bff2863 100644
--- a/print/cups/patches/patch-ag
+++ b/print/cups/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.21 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-ag,v 1.22 2010/05/21 10:05:20 sbd Exp $
cups installs stuff in /usr/pkg/lib64 on Linux. Don't do this.
---- config-scripts/cups-3264.m4.orig 2007-07-11 23:46:42.000000000 +0200
+--- config-scripts/cups-3264.m4.orig 2009-04-19 21:18:45.000000000 +0000
+++ config-scripts/cups-3264.m4
@@ -95,7 +95,7 @@ case "$uname" in
LIB32CUPS="32bit/libcups.so.2"
diff --git a/print/cups/patches/patch-ah b/print/cups/patches/patch-ah
index c7cb2b79473..14faa1a6947 100644
--- a/print/cups/patches/patch-ah
+++ b/print/cups/patches/patch-ah
@@ -1,16 +1,16 @@
-$NetBSD: patch-ah,v 1.16 2010/03/03 14:22:23 dmcmahill Exp $
+$NetBSD: patch-ah,v 1.17 2010/05/21 10:05:20 sbd Exp $
Some builds of gcc seem to support this for compiling but then fail during
linking with undefined reference to `__stack_chk_fail_local'
---- config-scripts/cups-compiler.m4.orig 2008-06-16 17:41:11.000000000 +0000
+--- config-scripts/cups-compiler.m4.orig 2009-05-17 00:13:47.000000000 +0000
+++ config-scripts/cups-compiler.m4
-@@ -109,7 +109,7 @@ if test -n "$GCC"; then
+@@ -140,7 +140,7 @@ if test -n "$GCC"; then
AC_MSG_CHECKING(if GCC supports -fstack-protector)
OLDCFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fstack-protector"
-- AC_TRY_COMPILE(,,
-+ AC_TRY_LINK(, [return 0;],
+- AC_TRY_LINK(,,
++ AC_TRY_LINK(, [return 0;],,
OPTIM="$OPTIM -fstack-protector"
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no))
diff --git a/print/cups/patches/patch-an b/print/cups/patches/patch-an
index 45a8b7b8296..0f14e1c4a78 100644
--- a/print/cups/patches/patch-an
+++ b/print/cups/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.10 2009/10/11 16:30:43 tnn Exp $
+$NetBSD: patch-an,v 1.11 2010/05/21 10:05:20 sbd Exp $
The '$' while loops expand the variables as long as possible so that no
references to other variables occur. This is necessary because fontpath
@@ -9,7 +9,7 @@ loop.
I'm also sure that this is not the Right Way to fix it, but at least it
works.
---- config-scripts/cups-directories.m4.orig 2008-10-23 17:40:14.000000000 +0200
+--- config-scripts/cups-directories.m4.orig 2009-04-12 23:04:51.000000000 +0000
+++ config-scripts/cups-directories.m4
@@ -106,7 +106,7 @@ if test "$libdir" = "\${exec_prefix}/lib
libdir="$exec_prefix/lib32"
@@ -20,7 +20,7 @@ works.
libdir="$exec_prefix/lib64"
fi
;;
-@@ -249,7 +249,15 @@ AC_SUBST(CUPS_CACHEDIR)
+@@ -297,7 +297,15 @@ AC_SUBST(CUPS_CACHEDIR)
# Data files
CUPS_DATADIR="$datadir/cups"
@@ -37,7 +37,7 @@ works.
AC_SUBST(CUPS_DATADIR)
# Icon directory
-@@ -258,7 +266,11 @@ AC_ARG_WITH(icondir, [ --with-icondir
+@@ -306,7 +314,11 @@ AC_ARG_WITH(icondir, [ --with-icondir
if test "x$icondir" = x -a -d /usr/share/icons; then
ICONDIR="/usr/share/icons"
else
@@ -50,7 +50,7 @@ works.
fi
AC_SUBST(ICONDIR)
-@@ -269,7 +281,11 @@ AC_ARG_WITH(menudir, [ --with-menudir
+@@ -317,7 +329,11 @@ AC_ARG_WITH(menudir, [ --with-menudir
if test "x$menudir" = x -a -d /usr/share/applications; then
MENUDIR="/usr/share/applications"
else
@@ -63,7 +63,7 @@ works.
fi
AC_SUBST(MENUDIR)
-@@ -284,7 +300,15 @@ else
+@@ -332,7 +348,15 @@ else
CUPS_DOCROOT="$docdir"
fi
@@ -80,7 +80,7 @@ works.
AC_SUBST(CUPS_DOCROOT)
# Fonts
-@@ -296,8 +320,16 @@ else
+@@ -344,8 +368,16 @@ else
CUPS_FONTPATH="$fontpath"
fi
@@ -96,9 +96,9 @@ works.
AC_DEFINE_UNQUOTED(CUPS_FONTPATH, "$CUPS_FONTPATH")
+AC_SUBST(CUPS_FONTPATH)
- # Locale data (initial assignment allows us not to require autoconf 2.60)
- localedir="${localedir:=}"
-@@ -320,6 +352,14 @@ else
+ # Locale data
+ if test "$localedir" = "\${datarootdir}/locale"; then
+@@ -367,6 +399,14 @@ else
CUPS_LOCALEDIR="$localedir"
fi
@@ -113,7 +113,7 @@ works.
AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
AC_SUBST(CUPS_LOCALEDIR)
-@@ -328,7 +368,6 @@ AC_ARG_WITH(logdir, [ --with-logdir
+@@ -375,7 +415,6 @@ AC_ARG_WITH(logdir, [ --with-logdir
if test x$logdir = x; then
CUPS_LOGDIR="$localstatedir/log/cups"
@@ -121,7 +121,7 @@ works.
else
CUPS_LOGDIR="$logdir"
fi
-@@ -337,10 +376,13 @@ AC_SUBST(CUPS_LOGDIR)
+@@ -384,10 +423,13 @@ AC_SUBST(CUPS_LOGDIR)
# Longer-term spool data
CUPS_REQUESTS="$localstatedir/spool/cups"
@@ -136,7 +136,7 @@ works.
case "$uname" in
*BSD* | Darwin*)
# *BSD and Darwin (MacOS X)
-@@ -353,6 +395,10 @@ case "$uname" in
+@@ -400,6 +442,10 @@ case "$uname" in
CUPS_SERVERBIN="$exec_prefix/lib/cups"
;;
esac
@@ -147,7 +147,7 @@ works.
AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
AC_SUBST(CUPS_SERVERBIN)
-@@ -360,12 +406,12 @@ AC_SUBST(INSTALL_SYSV)
+@@ -407,7 +453,7 @@ AC_SUBST(INSTALL_SYSV)
# Configuration files
CUPS_SERVERROOT="$sysconfdir/cups"
@@ -156,9 +156,3 @@ works.
AC_SUBST(CUPS_SERVERROOT)
# Transient run-time state
- CUPS_STATEDIR="$localstatedir/run/cups"
--AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$localstatedir/run/cups")
-+AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
- AC_SUBST(CUPS_STATEDIR)
-
- dnl
diff --git a/print/cups/patches/patch-ao b/print/cups/patches/patch-ao
index ac21eb30c6a..a9e72c490ac 100644
--- a/print/cups/patches/patch-ao
+++ b/print/cups/patches/patch-ao
@@ -1,10 +1,10 @@
-$NetBSD: patch-ao,v 1.10 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-ao,v 1.11 2010/05/21 10:05:21 sbd Exp $
Add '--with-manext' configure option.
---- config-scripts/cups-manpages.m4.orig 2009-01-12 14:17:21.000000000 -0500
-+++ config-scripts/cups-manpages.m4 2009-05-13 21:07:50.000000000 -0400
-@@ -13,6 +13,8 @@
+--- config-scripts/cups-manpages.m4.orig 2009-01-12 19:17:09.000000000 +0000
++++ config-scripts/cups-manpages.m4
+@@ -13,6 +13,8 @@ dnl which should have been included wi
dnl file is missing or damaged, see the license at "http://www.cups.org/".
dnl
@@ -13,7 +13,7 @@ Add '--with-manext' configure option.
dnl Fix "mandir" variable...
if test "$mandir" = "\${datarootdir}/man" -a "$prefix" = "/"; then
# New GNU "standards" break previous ones, so make sure we use
-@@ -50,8 +52,33 @@
+@@ -50,8 +52,33 @@ AC_SUBST(AMANDIR)
AC_SUBST(PMANDIR)
dnl Setup manpage extensions...
@@ -49,7 +49,7 @@ Add '--with-manext' configure option.
# SGI IRIX
MAN1EXT=1
MAN5EXT=5
-@@ -59,7 +86,7 @@
+@@ -59,7 +86,7 @@ case "$uname" in
MAN8EXT=1m
MAN8DIR=1
;;
@@ -58,7 +58,7 @@ Add '--with-manext' configure option.
# Solaris and HP-UX
MAN1EXT=1
MAN5EXT=5
-@@ -67,7 +94,7 @@
+@@ -67,7 +94,7 @@ case "$uname" in
MAN8EXT=1m
MAN8DIR=1m
;;
@@ -67,7 +67,7 @@ Add '--with-manext' configure option.
# Linux, GNU Hurd, and Mac OS X
MAN1EXT=1.gz
MAN5EXT=5.gz
-@@ -75,7 +102,7 @@
+@@ -75,7 +102,7 @@ case "$uname" in
MAN8EXT=8.gz
MAN8DIR=8
;;
diff --git a/print/cups/patches/patch-at b/print/cups/patches/patch-at
index 4bbb79a2e4c..2a6666f77d2 100644
--- a/print/cups/patches/patch-at
+++ b/print/cups/patches/patch-at
@@ -1,26 +1,24 @@
-$NetBSD: patch-at,v 1.8 2010/05/20 08:06:44 sbd Exp $
+$NetBSD: patch-at,v 1.9 2010/05/21 10:05:21 sbd Exp $
Don't create the empty driver dir, do that with OWN_DIRS
---- scheduler/Makefile.orig 2007-02-05 23:20:52.000000000 +1300
+--- scheduler/Makefile.orig 2009-05-26 23:27:06.000000000 +0000
+++ scheduler/Makefile
-@@ -106,7 +106,9 @@ depend:
- # Install the scheduler...
+@@ -127,7 +127,7 @@ depend:
+ # Install all targets...
#
--install: all
-+install: installbin
-+
-+installbin: all
- echo Creating $(SBINDIR)...
- $(INSTALL_DIR) -m 755 $(SBINDIR)
- echo Installing cupsd in $(SBINDIR)...
-@@ -120,6 +122,8 @@ install: all
- $(INSTALL_BIN) cups-driverd $(SERVERBIN)/daemon
- $(INSTALL_BIN) cups-lpd $(SERVERBIN)/daemon
- $(INSTALL_BIN) cups-polld $(SERVERBIN)/daemon
+-install: all install-data install-headers install-libs install-exec
++install: all install-headers install-libs install-exec install-dirs
+
+
+ #
+@@ -135,6 +135,8 @@ install: all install-data install-header
+ #
+
+ install-data:
+
-+installdir:
++install-dirs:
echo Creating $(SERVERBIN)/driver...
$(INSTALL_DIR) -m 755 $(SERVERBIN)/driver
echo Creating $(SERVERROOT)...