jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

cups: update to 1.7.1

Browse source
This commit is contained in:
Juan RP 2014-04-07 18:23:07 +02:00
parent 6604d5ff47
commit 3a5869651b
7 changed files with 113 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

110
srcpkgs/cups/patches/cups-systemd-socket.patch → srcpkgs/cups/patches/00-cups-systemd-socket.patch
View file

@ -1,7 +1,7 @@
diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
--- cups-1.6b1/config.h.in.systemd-socket 2012-05-17 00:57:03.000000000 +0200
+++ cups-1.6b1/config.h.in 2012-05-28 11:16:35.657250584 +0200
@@ -506,6 +506,13 @@
diff -up cups-1.7rc1/config.h.in.systemd-socket cups-1.7rc1/config.h.in
--- cups-1.7rc1/config.h.in.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/config.h.in 2013-07-12 11:16:53.257546263 +0200
@@ -451,6 +451,13 @@
/*
@ -15,9 +15,9 @@ diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
* Various scripting languages...
*/
diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4
--- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket 2012-05-28 11:16:35.658250577 +0200
+++ cups-1.6b1/config-scripts/cups-systemd.m4 2012-05-28 11:16:35.658250577 +0200
diff -up cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket cups-1.7rc1/config-scripts/cups-systemd.m4
--- cups-1.7rc1/config-scripts/cups-systemd.m4.systemd-socket 2013-07-12 11:16:53.257546263 +0200
+++ cups-1.7rc1/config-scripts/cups-systemd.m4 2013-07-12 11:16:53.257546263 +0200
@@ -0,0 +1,36 @@
+dnl
+dnl "$Id$"
@ -55,9 +55,9 @@ diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/con
+dnl
+dnl "$Id$"
+dnl
diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
--- cups-1.6b1/configure.in.systemd-socket 2012-04-23 19:26:57.000000000 +0200
+++ cups-1.6b1/configure.in 2012-05-28 11:16:35.658250577 +0200
diff -up cups-1.7rc1/configure.in.systemd-socket cups-1.7rc1/configure.in
--- cups-1.7rc1/configure.in.systemd-socket 2013-07-08 23:15:13.000000000 +0200
+++ cups-1.7rc1/configure.in 2013-07-12 11:16:53.257546263 +0200
@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
sinclude(config-scripts/cups-largefile.m4)
sinclude(config-scripts/cups-dnssd.m4)
@ -66,7 +66,7 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
sinclude(config-scripts/cups-defaults.m4)
sinclude(config-scripts/cups-scripting.m4)
@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
@@ -67,6 +68,9 @@ AC_OUTPUT(Makedefs
conf/snmp.conf
cups-config
data/testprint
@ -74,12 +74,12 @@ diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
+ data/cups.socket
+ data/cups.path
desktop/cups.desktop
doc/help/ref-cups-files-conf.html
doc/help/ref-cupsd-conf.html
doc/help/standard.html
diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
--- cups-1.6b1/cups/usersys.c.systemd-socket 2012-04-23 19:26:57.000000000 +0200
+++ cups-1.6b1/cups/usersys.c 2012-05-28 11:16:35.659250570 +0200
@@ -975,7 +975,7 @@ cups_read_client_conf(
diff -up cups-1.7rc1/cups/usersys.c.systemd-socket cups-1.7rc1/cups/usersys.c
--- cups-1.7rc1/cups/usersys.c.systemd-socket 2013-07-10 16:08:39.000000000 +0200
+++ cups-1.7rc1/cups/usersys.c 2013-07-12 11:16:53.258546249 +0200
@@ -1046,7 +1046,7 @@ cups_read_client_conf(
struct stat sockinfo; /* Domain socket information */
if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
@ -88,9 +88,9 @@ diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
cups_server = CUPS_DEFAULT_DOMAINSOCKET;
else
#endif /* CUPS_DEFAULT_DOMAINSOCKET */
diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in
--- cups-1.6b1/data/cups.path.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200
+++ cups-1.6b1/data/cups.path.in 2012-05-28 11:16:35.659250570 +0200
diff -up cups-1.7rc1/data/cups.path.in.systemd-socket cups-1.7rc1/data/cups.path.in
--- cups-1.7rc1/data/cups.path.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
+++ cups-1.7rc1/data/cups.path.in 2013-07-12 11:16:53.258546249 +0200
@@ -0,0 +1,8 @@
+[Unit]
+Description=CUPS Printer Service Spool
@ -100,9 +100,9 @@ diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.i
+
+[Install]
+WantedBy=multi-user.target
diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in
--- cups-1.6b1/data/cups.service.in.systemd-socket 2012-05-28 11:16:35.659250570 +0200
+++ cups-1.6b1/data/cups.service.in 2012-05-28 11:16:35.659250570 +0200
diff -up cups-1.7rc1/data/cups.service.in.systemd-socket cups-1.7rc1/data/cups.service.in
--- cups-1.7rc1/data/cups.service.in.systemd-socket 2013-07-12 11:16:53.258546249 +0200
+++ cups-1.7rc1/data/cups.service.in 2013-07-12 11:16:53.258546249 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Printing Service
@ -114,21 +114,23 @@ diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.ser
+[Install]
+Also=cups.socket cups.path
+WantedBy=printer.target
diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in
--- cups-1.6b1/data/cups.socket.in.systemd-socket 2012-05-28 11:16:35.660250563 +0200
+++ cups-1.6b1/data/cups.socket.in 2012-05-28 11:16:35.660250563 +0200
@@ -0,0 +1,8 @@
diff -up cups-1.7rc1/data/cups.socket.in.systemd-socket cups-1.7rc1/data/cups.socket.in
--- cups-1.7rc1/data/cups.socket.in.systemd-socket 2013-07-12 11:16:53.259546235 +0200
+++ cups-1.7rc1/data/cups.socket.in 2013-07-12 11:16:53.259546235 +0200
@@ -0,0 +1,10 @@
+[Unit]
+Description=CUPS Printing Service Sockets
+
+[Socket]
+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
+ListenStream=@DEFAULT_IPP_PORT@
+BindIPv6Only=ipv6-only
+
+[Install]
+WantedBy=sockets.target
diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
--- cups-1.6b1/data/Makefile.systemd-socket 2011-08-27 11:23:01.000000000 +0200
+++ cups-1.6b1/data/Makefile 2012-05-28 11:16:35.660250563 +0200
diff -up cups-1.7rc1/data/Makefile.systemd-socket cups-1.7rc1/data/Makefile
--- cups-1.7rc1/data/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/data/Makefile 2013-07-12 11:16:53.259546235 +0200
@@ -100,6 +100,12 @@ install-data:
$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
done
@ -152,10 +154,10 @@ diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
#
diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
--- cups-1.6b1/Makedefs.in.systemd-socket 2012-05-28 11:16:35.648250647 +0200
+++ cups-1.6b1/Makedefs.in 2012-05-28 11:16:35.660250563 +0200
@@ -134,11 +134,13 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
diff -up cups-1.7rc1/Makedefs.in.systemd-socket cups-1.7rc1/Makedefs.in
--- cups-1.7rc1/Makedefs.in.systemd-socket 2013-07-12 11:16:53.246546416 +0200
+++ cups-1.7rc1/Makedefs.in 2013-07-12 11:17:49.327768742 +0200
@@ -134,6 +134,7 @@ CXXFLAGS = @CPPFLAGS@ @CXXFLAGS@
CXXLIBS = @CXXLIBS@
DBUS_NOTIFIER = @DBUS_NOTIFIER@
DBUS_NOTIFIERLIBS = @DBUS_NOTIFIERLIBS@
@ -163,13 +165,15 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
DNSSD_BACKEND = @DNSSD_BACKEND@
DSOFLAGS = -L../cups @DSOFLAGS@
DSOLIBS = @DSOLIBS@ $(COMMONLIBS)
DNSSDLIBS = @DNSSDLIBS@
@@ -141,6 +142,7 @@ DNSSDLIBS = @DNSSDLIBS@
IPPFIND_BIN = @IPPFIND_BIN@
IPPFIND_MAN = @IPPFIND_MAN@
LAUNCHDLIBS = @LAUNCHDLIBS@
+SDLIBS = @SDLIBS@
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
@@ -229,6 +231,7 @@ PAMFILE = @PAMFILE@
@@ -231,6 +233,7 @@ PAMFILE = @PAMFILE@
DEFAULT_LAUNCHD_CONF = @DEFAULT_LAUNCHD_CONF@
DBUSDIR = @DBUSDIR@
@ -177,9 +181,9 @@ diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
#
diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h
--- cups-1.6b1/scheduler/client.h.systemd-socket 2012-03-22 21:30:20.000000000 +0100
+++ cups-1.6b1/scheduler/client.h 2012-05-28 11:16:35.661250556 +0200
diff -up cups-1.7rc1/scheduler/client.h.systemd-socket cups-1.7rc1/scheduler/client.h
--- cups-1.7rc1/scheduler/client.h.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/scheduler/client.h 2013-07-12 11:16:53.260546222 +0200
@@ -77,6 +77,9 @@ typedef struct
int fd; /* File descriptor for this server */
http_addr_t address; /* Bind address of socket */
@ -190,9 +194,9 @@ diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/clien
} cupsd_listener_t;
diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c
--- cups-1.6b1/scheduler/listen.c.systemd-socket 2011-04-16 01:38:13.000000000 +0200
+++ cups-1.6b1/scheduler/listen.c 2012-05-28 11:16:35.661250556 +0200
diff -up cups-1.7rc1/scheduler/listen.c.systemd-socket cups-1.7rc1/scheduler/listen.c
--- cups-1.7rc1/scheduler/listen.c.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/scheduler/listen.c 2013-07-12 11:16:53.260546222 +0200
@@ -401,7 +401,11 @@ cupsdStopListening(void)
lis;
lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
@ -206,9 +210,9 @@ diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/liste
{
#ifdef WIN32
closesocket(lis->fd);
diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
--- cups-1.6b1/scheduler/main.c.systemd-socket 2012-05-28 11:16:35.612250897 +0200
+++ cups-1.6b1/scheduler/main.c 2012-05-28 12:49:32.698375139 +0200
diff -up cups-1.7rc1/scheduler/main.c.systemd-socket cups-1.7rc1/scheduler/main.c
--- cups-1.7rc1/scheduler/main.c.systemd-socket 2013-07-12 11:16:53.212546887 +0200
+++ cups-1.7rc1/scheduler/main.c 2013-07-12 11:16:53.261546208 +0200
@@ -26,6 +26,8 @@
* launchd_checkin() - Check-in with launchd and collect the listening
* fds.
@ -229,7 +233,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
# include <malloc.h>
#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
@@ -78,6 +84,9 @@
@@ -83,6 +89,9 @@
static void launchd_checkin(void);
static void launchd_checkout(void);
#endif /* HAVE_LAUNCHD */
@ -239,7 +243,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
static void parent_handler(int sig);
static void process_children(void);
static void sigchld_handler(int sig);
@@ -528,6 +537,13 @@ main(int argc, /* I - Number of comm
@@ -574,6 +583,13 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@ -253,7 +257,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
/*
* Startup the server...
*/
@@ -738,6 +754,15 @@ main(int argc, /* I - Number of comm
@@ -762,6 +778,15 @@ main(int argc, /* I - Number of comm
}
#endif /* HAVE_LAUNCHD */
@ -269,7 +273,7 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
/*
* Startup the server...
*/
@@ -1516,6 +1541,102 @@ launchd_checkout(void)
@@ -1511,6 +1536,102 @@ launchd_checkout(void)
}
#endif /* HAVE_LAUNCHD */
@ -372,10 +376,10 @@ diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
/*
* 'parent_handler()' - Catch USR1/CHLD signals...
diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile
--- cups-1.6b1/scheduler/Makefile.systemd-socket 2012-05-21 19:40:22.000000000 +0200
+++ cups-1.6b1/scheduler/Makefile 2012-05-28 11:16:35.663250542 +0200
@@ -371,7 +371,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
diff -up cups-1.7rc1/scheduler/Makefile.systemd-socket cups-1.7rc1/scheduler/Makefile
--- cups-1.7rc1/scheduler/Makefile.systemd-socket 2013-05-29 13:51:34.000000000 +0200
+++ cups-1.7rc1/scheduler/Makefile 2013-07-12 11:16:53.261546208 +0200
@@ -381,7 +381,7 @@ cupsd: $(CUPSDOBJS) $(LIBCUPSMIME) ../cu
$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
@ -384,7 +388,7 @@ diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makef
cupsd-static: $(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
echo Linking $@...
@@ -379,7 +379,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
@@ -389,7 +389,7 @@ cupsd-static: $(CUPSDOBJS) libcupsmime.a
$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \

4
srcpkgs/cups/patches/cups-1.6.0-fix-install-perms.patch
View file

@ -1,7 +1,7 @@
Index: Makedefs.in
===================================================================
--- cups-1.6.0/Makedefs.in (Revision 10520)
+++ cups-1.6.0/Makedefs.in (Arbeitskopie)
--- a/Makedefs.in (Revision 10520)
+++ b/Makedefs.in (Arbeitskopie)
@@ -40,14 +40,14 @@
# Installation programs...
#

106
srcpkgs/cups/patches/cups-dbus-utf8.patch
View file

@ -1,106 +0,0 @@
diff -up cups-1.6.1/notifier/dbus.c.dbus-utf8 cups-1.6.1/notifier/dbus.c
--- cups-1.6.1/notifier/dbus.c.dbus-utf8 2012-01-20 19:00:32.000000000 +0000
+++ cups-1.6.1/notifier/dbus.c 2012-10-31 11:04:47.686973616 +0000
@@ -31,6 +31,9 @@
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
+#include <assert.h>
+#include <locale.h>
+#include <wchar.h>
#ifdef HAVE_DBUS
# include <dbus/dbus.h>
@@ -157,10 +160,82 @@ enum
* Local functions...
*/
-static int acquire_lock(int *fd, char *lockfile, size_t locksize);
+static int acquire_lock(int *fd, char *lockfile, size_t locksize);
+static const char *validate_utf8(const char *str);
/*
+ * 'validate_utf8()' - Convert to valid UTF-8
+ */
+
+static const char *
+validate_utf8 (const char *str)
+{
+ static char *buffer = NULL;
+ static size_t buflen = 0;
+ char *p;
+ size_t str_len;
+ unsigned int i;
+ mbstate_t instate, outstate;
+
+ if (str == NULL)
+ {
+ free (buffer);
+ return (NULL);
+ }
+
+ /* Is it already valid? */
+ if (mbstowcs (NULL, str, 0) != (size_t) -1)
+ return str;
+
+ /* Make sure our buffer is at least as large as the input string */
+ str_len = strlen (str);
+ if (str_len > buflen)
+ {
+ if (buffer == NULL)
+ /* Set encoding type to UTF-8 the first time we need to */
+ setlocale (LC_CTYPE, "en_US.UTF-8");
+
+ buflen = str_len + 1;
+ buffer = realloc (buffer, buflen);
+ }
+
+ memset (&instate, '\0', sizeof (mbstate_t));
+ memset (&outstate, '\0', sizeof (mbstate_t));
+ p = buffer;
+ i = 0;
+ while (i < str_len)
+ {
+ wchar_t wc;
+ size_t used, written;
+ mbstate_t orig_instate = instate;
+ used = mbrtowc (&wc, str + i, str_len - i, &instate);
+ switch (used)
+ {
+ case (size_t) -2:
+ case (size_t) -1:
+ wc = L'?'; /* so replacement is never longer than original char */
+ instate = orig_instate;
+ /* fallthru */
+ case 0:
+ used = 1;
+ }
+
+ written = wcrtomb (p, wc, &outstate);
+ if (written != -1)
+ {
+ p += written;
+ assert (p - buffer < buflen);
+ }
+
+ i += used;
+ }
+
+ *p = '\0';
+ return buffer;
+}
+
+/*
* 'main()' - Read events and send DBUS notifications.
*/
@@ -366,7 +441,7 @@ main(int argc, /* I - Number of comm
attr = ippFindAttribute(msg, "notify-text", IPP_TAG_TEXT);
if (attr)
{
- const char *val = ippGetString(attr, 0, NULL);
+ const char *val = validate_utf8 (ippGetString(attr, 0, NULL));
if (!dbus_message_iter_append_string(&iter, &val))
goto bail;
}

18
srcpkgs/cups/patches/cups-final-content-type.patch Normal file
View file

@ -0,0 +1,18 @@
diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c
--- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27 16:58:13.934775402 +0100
+++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100
@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I
if (!job->printer->remote)
{
- for (filter = (mime_filter_t *)cupsArrayLast(filters);
- filter && filter->dst;
- filter = (mime_filter_t *)cupsArrayPrev(filters))
- if (strcmp(filter->dst->super, "printer") ||
- strcmp(filter->dst->type, job->printer->name))
- break;
+ filter = (mime_filter_t *)cupsArrayLast(filters);
if (filter && filter->dst)
{

19
srcpkgs/cups/patches/cupsd-no-crash-on-avahi-threaded-poll-shutdown.patch
View file

@ -1,19 +0,0 @@
Description: Fixed crash which sometimes happens on shutdown of the CUPS
daemon, caused by a wrong shutdown sequence for shutting down the Avahi
threaded poll.
Author: Till Kamppeter <till.kamppeter@gmail.com>
Bug-Upstream: http://cups.org/str.php?L4180
Bug-Upstream: http://cups.org/str.php?L4213
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1034045
Last-Updated: 2012-10-16
--- a/scheduler/dirsvc.c
+++ b/scheduler/dirsvc.c
@@ -1333,6 +1333,7 @@
DNSSDMaster = NULL;
# else /* HAVE_AVAHI */
+ avahi_threaded_poll_stop(DNSSDMaster);
avahi_client_free(DNSSDClient);
DNSSDClient = NULL;

31
srcpkgs/cups/patches/get-ppd-file-for-statically-configured-ipp-shared-queues.patch Normal file
View file

@ -0,0 +1,31 @@
Description: Applications could not get the PPD file for
statically-configured IPP-shared print queues
Author: Till Kamppeter <till.kamppeter@gmail.com>
Bug-Upstream: http://cups.org/str.php?L4178
Last-Updated: 2012-09-19
--- a/cups/util.c
+++ b/cups/util.c
@@ -1731,6 +1731,22 @@
return (1);
}
+ else if (device_uri &&
+ (!strncmp(device_uri, "ipp:", 4) != NULL ||
+ !strncmp(device_uri, "ipps:", 5) != NULL))
+ {
+ /*
+ * Statically-configured IPP shared printer.
+ */
+
+ httpSeparateURI(HTTP_URI_CODING_ALL,
+ device_uri,
+ scheme, sizeof(scheme), username, sizeof(username),
+ host, hostsize, port, resource, resourcesize);
+ ippDelete(response);
+
+ return (1);
+ }
else if ((attr = ippFindAttribute(response, "member-uris",
IPP_TAG_URI)) != NULL)
{

4
srcpkgs/cups/template
View file

@ -1,6 +1,6 @@
# Template file for 'cups'
pkgname=cups
version=1.6.4
version=1.7.1
revision=1
patch_args="-Np1"
short_desc="Common Unix Printing System"
@ -8,7 +8,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.cups.org/"
license="GPL-2"
distfiles="http://www.cups.org/software/${version}/cups-${version}-source.tar.gz"
checksum=9452ab7720c0075627407ca13a2ecba4fc03f8bfae7d2cbb9e93f41785a8ad68
checksum=ce5aec8c5f7c9f6d3898334aedbc5e29cacb783ff9d04fa29d41f5d4a2d03b3d
hostmakedepends="automake pkg-config poppler-utils"
makedepends="acl-devel libjpeg-turbo-devel libpng-devel>=1.5.10 tiff-devel