[Midnightbsd-cvs] mports [21410] trunk/print/cups/files: cups 2.1.3 patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 22 17:13:39 EDT 2016
Revision: 21410
http://svnweb.midnightbsd.org/mports/?rev=21410
Author: laffer1
Date: 2016-05-22 17:13:39 -0400 (Sun, 22 May 2016)
Log Message:
-----------
cups 2.1.3 patchset
Added Paths:
-----------
trunk/print/cups/files/cups
trunk/print/cups/files/cups.conf.sample
trunk/print/cups/files/cupsd.in
trunk/print/cups/files/patch-backend_usb-libusb.c
trunk/print/cups/files/patch-conf_mime.convs.in
trunk/print/cups/files/patch-configure
trunk/print/cups/files/patch-scheduler_auth.c
trunk/print/cups/files/patch-scheduler_cups-driverd.cxx
Added: trunk/print/cups/files/cups
===================================================================
--- trunk/print/cups/files/cups (rev 0)
+++ trunk/print/cups/files/cups 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,4 @@
+# $FreeBSD: head/print/cups/files/cups 410825 2016-03-11 11:53:42Z tijl $
+
+auth include system
+account include system
Property changes on: trunk/print/cups/files/cups
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/cups.conf.sample
===================================================================
--- trunk/print/cups/files/cups.conf.sample (rev 0)
+++ trunk/print/cups/files/cups.conf.sample 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,13 @@
+# $FreeBSD: head/print/cups/files/cups.conf.sample 411055 2016-03-14 11:40:58Z tijl $
+#
+# Allow members of group cups to access generic USB printer devices
+
+notify 100 {
+ match "system" "USB";
+ match "subsystem" "INTERFACE";
+ match "type" "ATTACH";
+ match "intclass" "0x07";
+ match "intsubclass" "0x01";
+ match "intprotocol" "(0x01|0x02|0x03)";
+ action "chgrp cups /dev/$cdev; chmod g+rw /dev/$cdev";
+};
Property changes on: trunk/print/cups/files/cups.conf.sample
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/cupsd.in
===================================================================
--- trunk/print/cups/files/cupsd.in (rev 0)
+++ trunk/print/cups/files/cupsd.in 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# $FreeBSD: head/print/cups/files/cupsd.in 410825 2016-03-11 11:53:42Z tijl $
+#
+# PROVIDE: cupsd
+# REQUIRE: DAEMON %%DBUS_DAEMON%% %%AVAHI_DAEMON%%
+# KEYWORD: shutdown
+#
+# Add the following to /etc/rc.conf[.local] to enable this service
+#
+# cupsd_enable="YES"
+#
+
+. /etc/rc.subr
+
+name="cupsd"
+rcvar="cupsd_enable"
+
+start_precmd="${name}_prestart"
+
+command="%%PREFIX%%/sbin/cupsd"
+extra_commands="reload"
+
+cupsd_prestart()
+{
+ if [ -n "$TZ" ]; then
+ export TZ
+ fi
+}
+
+load_rc_config ${name}
+
+: ${cupsd_enable=NO}
+
+run_rc_command "$1"
Property changes on: trunk/print/cups/files/cupsd.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/patch-backend_usb-libusb.c
===================================================================
--- trunk/print/cups/files/patch-backend_usb-libusb.c (rev 0)
+++ trunk/print/cups/files/patch-backend_usb-libusb.c 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,11 @@
+--- backend/usb-libusb.c.orig 2015-09-15 21:20:02 UTC
++++ backend/usb-libusb.c
+@@ -1441,7 +1441,7 @@ open_device(usb_printer_t *printer, /* I
+ * works without the module attached.
+ */
+
+- errcode = libusb_kernel_driver_active(printer->handle, printer->iface);
++ errcode = 0;
+ if (errcode == 0)
+ printer->usblp_attached = 0;
+ else if (errcode == 1)
Property changes on: trunk/print/cups/files/patch-backend_usb-libusb.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/patch-conf_mime.convs.in
===================================================================
--- trunk/print/cups/files/patch-conf_mime.convs.in (rev 0)
+++ trunk/print/cups/files/patch-conf_mime.convs.in 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,15 @@
+Lower PostScript-to-PostScript cost such that PostScript files are sent to
+PostScript printers directly without intermediate conversion to PDF, see
+http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_as_standard_print_job_format
+
+--- conf/mime.convs.in.orig 2013-06-07 01:00:33 UTC
++++ conf/mime.convs.in
+@@ -38,7 +38,7 @@
+ # PostScript filters
+ #
+
+-application/postscript application/vnd.cups-postscript 66 pstops
++application/postscript application/vnd.cups-postscript 65 pstops
+
+ ########################################################################
+ #
Property changes on: trunk/print/cups/files/patch-conf_mime.convs.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/patch-configure
===================================================================
--- trunk/print/cups/files/patch-configure (rev 0)
+++ trunk/print/cups/files/patch-configure 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,39 @@
+--- configure.orig 2016-02-05 17:22:09 UTC
++++ configure
+@@ -5390,6 +5390,13 @@ $as_echo "yes" >&6; }
+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`"
+ LIBUSB="`$PKGCONFIG --libs libusb-1.0`"
+ USBQUIRKS="\$(DATADIR)/usb"
++ elif test -f /usr/lib/libusb.so; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ $as_echo "#define HAVE_LIBUSB 1" >>confdefs.h
++
++ LIBUSB="-lusb"
++ USBQUIRKS="\$(DATADIR)/usb"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -5656,7 +5663,6 @@ if test "${with_dbusdir+set}" = set; the
+ fi
+
+
+-DBUSDIR=""
+ DBUS_NOTIFIER=""
+ DBUS_NOTIFIERLIBS=""
+
+@@ -8684,13 +8690,7 @@ fi
+ PAMLIBS="-lpam"
+ fi
+
+- # Find the PAM configuration directory, if any...
+- for dir in /private/etc/pam.d /etc/pam.d; do
+- if test -d $dir; then
+- PAMDIR=$dir
+- break;
+- fi
+- done
++ PAMDIR=/usr/local/etc/pam.d
+ fi
+
+ LIBS="$SAVELIBS"
Property changes on: trunk/print/cups/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/patch-scheduler_auth.c
===================================================================
--- trunk/print/cups/files/patch-scheduler_auth.c (rev 0)
+++ trunk/print/cups/files/patch-scheduler_auth.c 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,20 @@
+--- scheduler/auth.c.orig 2015-10-26 19:46:02 UTC
++++ scheduler/auth.c
+@@ -456,7 +456,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I
+
+ peersize = sizeof(peercred);
+
+-# ifdef __APPLE__
++# if defined(__APPLE__) || defined(__FreeBSD__)
+ if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize))
+ # else
+ if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred, &peersize))
+@@ -854,7 +854,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I
+
+ peersize = sizeof(peercred);
+
+-# ifdef __APPLE__
++# if defined(__APPLE__) || defined(__FreeBSD__)
+ if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize))
+ # else
+ if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred,
Property changes on: trunk/print/cups/files/patch-scheduler_auth.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/print/cups/files/patch-scheduler_cups-driverd.cxx
===================================================================
--- trunk/print/cups/files/patch-scheduler_cups-driverd.cxx (rev 0)
+++ trunk/print/cups/files/patch-scheduler_cups-driverd.cxx 2016-05-22 21:13:39 UTC (rev 21410)
@@ -0,0 +1,20 @@
+--- scheduler/cups-driverd.cxx.orig 2015-06-12 01:21:05 UTC
++++ scheduler/cups-driverd.cxx
+@@ -913,7 +913,7 @@ get_file(const char *name, /* I - Name
+ }
+ else
+
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__FreeBSD__) || defined(__DragonFly__)
+ if (!strncmp(name, "lsb/usr/", 8))
+ {
+ /*
+@@ -1093,7 +1093,7 @@ list_ppds(int request_id, /* I -
+ load_ppds("/System/Library/Printers/PPDs/Contents/Resources/en.lproj",
+ "System/Library/Printers/PPDs/Contents/Resources/en.lproj", 0);
+
+-#elif defined(__linux)
++#elif defined(__linux) || defined(__FreeBSD__) || defined(__DragonFly__)
+ /*
+ * Load PPDs from LSB-defined locations...
+ */
Property changes on: trunk/print/cups/files/patch-scheduler_cups-driverd.cxx
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list