Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cups and others:v.bump

Browse Source
This commit is contained in:
ayhanyalcinsoy
2017-12-15 07:39:59 +03:00
parent 72b184604a
commit ff0944daa5
19 changed files with 222 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/printer/cups-filters/pspec.xml
+9 -2
View File
@@ -19,7 +19,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>OpenPrinting CUPS filters and backends</Summary> <Summary>OpenPrinting CUPS filters and backends</Summary>
<Description>Contains backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc. In addition it contains additional filters developed independently of Apple, especially filters for the PDF-centric printing workflow introduced by OpenPrinting.</Description> <Description>Contains backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc. In addition it contains additional filters developed independently of Apple, especially filters for the PDF-centric printing workflow introduced by OpenPrinting.</Description>
<Archive sha1sum="c2962a2f37f447deed3d86e34a4f27328e466e1d" type="tarxz">http://www.openprinting.org/download/cups-filters/cups-filters-1.14.1.tar.xz</Archive> <Archive type="tarxz" sha1sum="352a16072f9f01057e1ea2a2ba119dc518082e1e">https://www.openprinting.org/download/cups-filters/cups-filters-1.17.9.tar.xz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cups-devel</Dependency> <Dependency>cups-devel</Dependency>
<Dependency>glib2-devel</Dependency> <Dependency>glib2-devel</Dependency>
@@ -93,6 +93,13 @@
</Package> </Package>
<History> <History>
<Update release="5">
<Date>2017-12-13</Date>
<Version>1.17.9</Version>
<Comment>version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="4"> <Update release="4">
<Date>2017-07-13</Date> <Date>2017-07-13</Date>
<Version>1.14.1</Version> <Version>1.14.1</Version>
@@ -122,4 +129,4 @@
<Email>alihan@pisilinux.org</Email> <Email>alihan@pisilinux.org</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
hardware/printer/cups/actions.py
+2 -1
View File
@@ -43,6 +43,7 @@ def setup():
--enable-avahi \ --enable-avahi \
--disable-gnutls \ --disable-gnutls \
--disable-launchd \ --disable-launchd \
--disable-libusb \
--without-rcdir \ --without-rcdir \
--libdir=/usr/lib \ --libdir=/usr/lib \
--without-perl \ --without-perl \
@@ -95,4 +96,4 @@ def install():
# Serial backend needs to run as root # Serial backend needs to run as root
#shelltools.chmod("%s/usr/lib/cups/backend/serial" % get.installDIR(), 0700) #shelltools.chmod("%s/usr/lib/cups/backend/serial" % get.installDIR(), 0700)
pisitools.dodoc("CHANGES.txt", "CREDITS.txt", "LICENSE.txt", "README.txt") pisitools.dodoc("LICENSE.txt")
hardware/printer/cups/files/archlinux/cups-1.6.0-fix-install-perms.patch
-25
View File
@@ -1,25 +0,0 @@
Index: Makedefs.in
===================================================================
--- Makedefs.in (Revision 10520)
+++ Makedefs.in (Arbeitskopie)
@@ -40,14 +40,14 @@
# Installation programs...
#
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT = $(INSTALL) -c -m 555
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_MAN = $(INSTALL) -c -m 644
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
#
# Default user, group, and system groups for the scheduler...
hardware/printer/cups/files/archlinux/cups-1.6.2-statedir.patch
-12
View File
@@ -1,12 +0,0 @@
diff -ruN cups-1.6.2.orig/config-scripts/cups-directories.m4 cups-1.6.2/config-scripts/cups-directories.m4
--- cups-1.6.2.orig/config-scripts/cups-directories.m4 2012-10-01 03:55:23.000000000 +0200
+++ cups-1.6.2/config-scripts/cups-directories.m4 2013-04-02 00:11:41.000000000 +0200
@@ -420,7 +420,7 @@
;;
*)
# All others
- CUPS_STATEDIR="$localstatedir/run/cups"
+ CUPS_STATEDIR="/run/cups"
;;
esac])
AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
hardware/printer/cups/files/archlinux/cups-no-gcrypt.patch
-11
View File
@@ -1,11 +0,0 @@
diff -up cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry cups-2.0rc1/config-scripts/cups-ssl.m4
--- cups-2.0rc1/config-scripts/cups-ssl.m4.no-gcry 2014-09-12 15:41:23.324760213 +0200
+++ cups-2.0rc1/config-scripts/cups-ssl.m4 2014-09-12 15:43:13.124203363 +0200
@@ -60,7 +60,6 @@ if test x$enable_ssl != xno; then
dnl Then look for GNU TLS...
if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
AC_PATH_TOOL(LIBGNUTLSCONFIG,libgnutls-config)
- AC_PATH_TOOL(LIBGCRYPTCONFIG,libgcrypt-config)
if $PKGCONFIG --exists gnutls; then
have_ssl=1
SSLLIBS=`$PKGCONFIG --libs gnutls`
hardware/printer/cups/files/fedora/cups-avahi-address.patch
-95
View File
@@ -1,95 +0,0 @@
diff -up cups-1.6.2/cups/http-support.c.avahi-address cups-1.6.2/cups/http-support.c
--- cups-1.6.2/cups/http-support.c.avahi-address 2013-03-11 18:44:36.000000000 +0000
+++ cups-1.6.2/cups/http-support.c 2013-06-28 13:42:15.834715511 +0100
@@ -2121,7 +2121,7 @@ http_resolve_cb(
const char *type, /* I - Registration type */
const char *domain, /* I - Domain (unused) */
const char *hostTarget, /* I - Hostname */
- const AvahiAddress *address, /* I - Address (unused) */
+ const AvahiAddress *address, /* I - Address */
uint16_t port, /* I - Port number */
AvahiStringList *txt, /* I - TXT record */
AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */
@@ -2248,41 +2248,59 @@ http_resolve_cb(
* getting the IP address of the .local name and then do reverse-lookups...
*/
- http_addrlist_t *addrlist, /* List of addresses */
- *addr; /* Current address */
+ http_addr_t addr;
+ size_t addrlen;
+ int error;
DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
+ switch (address->proto)
{
- for (addr = addrlist; addr; addr = addr->next)
+ case AVAHI_PROTO_INET:
+ addr.ipv4.sin_family = AF_INET;
+ addrlen = sizeof (addr.ipv4.sin_addr);
+ memcpy (&addr.ipv4.sin_addr, &address->data, addrlen);
+ break;
+ case AVAHI_PROTO_INET6:
+ addr.ipv6.sin6_family = AF_INET6;
+ addrlen = sizeof (addr.ipv6.sin6_addr);
+ memcpy (&addr.ipv6.sin6_addr, &address->data, addrlen);
+ break;
+ default:
+ DEBUG_printf(("8http_resolve_cb: unknown address family %d",
+ address->proto));
+ addrlen = 0;
+ }
+
+ if (addrlen > 0) {
+ error = getnameinfo(&addr.addr, httpAddrLength (&addr),
+ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
+
+ if (!error)
{
- int error = getnameinfo(&(addr->addr.addr),
- httpAddrLength(&(addr->addr)),
- fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
+ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
- if (!error)
+ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
+ _cups_strcasecmp(hostptr, ".local"))
{
- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
-
- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
- _cups_strcasecmp(hostptr, ".local"))
- {
- hostTarget = fqdn;
- break;
- }
+ hostTarget = fqdn;
}
+ } else {
+ avahi_address_snprint (fqdn, sizeof (fqdn), address);
+ hostTarget = fqdn;
#ifdef DEBUG
- else
- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
- error));
+ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
+ fqdn, error));
#endif /* DEBUG */
}
-
- httpAddrFreeList(addrlist);
}
+ } else {
+ /*
+ * Use the IP address that responded...
+ */
+
+ avahi_address_snprint (fqdn, sizeof (fqdn), address);
+ hostTarget = fqdn;
}
/*
hardware/printer/cups/files/pld-linux/cups-avahi-no-threaded.patch → hardware/printer/cups/files/fedora/cups-avahi-no-threaded.patch
+73 -69
View File
@@ -1,6 +1,6 @@
diff -up cups-2.0rc1/scheduler/avahi.c.avahi-no-threaded cups-2.0rc1/scheduler/avahi.c diff -up cups-2.2.5/scheduler/avahi.c.avahi-no-threaded cups-2.2.5/scheduler/avahi.c
--- cups-2.0rc1/scheduler/avahi.c.avahi-no-threaded 2014-09-12 15:45:28.772280006 +0200 --- cups-2.2.5/scheduler/avahi.c.avahi-no-threaded 2017-10-17 19:03:00.760881016 +0200
+++ cups-2.0rc1/scheduler/avahi.c 2014-09-12 15:45:28.772280006 +0200 +++ cups-2.2.5/scheduler/avahi.c 2017-10-17 19:03:00.760881016 +0200
@@ -0,0 +1,441 @@ @@ -0,0 +1,441 @@
+/* +/*
+ * "$Id$" + * "$Id$"
@@ -443,9 +443,9 @@ diff -up cups-2.0rc1/scheduler/avahi.c.avahi-no-threaded cups-2.0rc1/scheduler/a
+/* +/*
+ * End of "$Id$". + * End of "$Id$".
+ */ + */
diff -up cups-2.0rc1/scheduler/avahi.h.avahi-no-threaded cups-2.0rc1/scheduler/avahi.h diff -up cups-2.2.5/scheduler/avahi.h.avahi-no-threaded cups-2.2.5/scheduler/avahi.h
--- cups-2.0rc1/scheduler/avahi.h.avahi-no-threaded 2014-09-12 15:45:28.772280006 +0200 --- cups-2.2.5/scheduler/avahi.h.avahi-no-threaded 2017-10-17 19:03:00.760881016 +0200
+++ cups-2.0rc1/scheduler/avahi.h 2014-09-12 15:45:28.772280006 +0200 +++ cups-2.2.5/scheduler/avahi.h 2017-10-17 19:03:00.760881016 +0200
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+/* +/*
+ * "$Id$" + * "$Id$"
@@ -516,10 +516,10 @@ diff -up cups-2.0rc1/scheduler/avahi.h.avahi-no-threaded cups-2.0rc1/scheduler/a
+/* +/*
+ * End of "$Id$". + * End of "$Id$".
+ */ + */
diff -up cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded cups-2.0rc1/scheduler/cupsd.h diff -up cups-2.2.5/scheduler/cupsd.h.avahi-no-threaded cups-2.2.5/scheduler/cupsd.h
--- cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded 2014-03-21 17:42:53.000000000 +0100 --- cups-2.2.5/scheduler/cupsd.h.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200
+++ cups-2.0rc1/scheduler/cupsd.h 2014-09-12 15:47:02.886945551 +0200 +++ cups-2.2.5/scheduler/cupsd.h 2017-10-17 19:03:00.760881016 +0200
@@ -119,6 +119,7 @@ extern const char *cups_hstrerror(int); @@ -118,6 +118,7 @@ extern const char *cups_hstrerror(int);
#include "colorman.h" #include "colorman.h"
#include "conf.h" #include "conf.h"
#include "banners.h" #include "banners.h"
@@ -527,7 +527,7 @@ diff -up cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded cups-2.0rc1/scheduler/c
#include "dirsvc.h" #include "dirsvc.h"
#include "network.h" #include "network.h"
#include "subscriptions.h" #include "subscriptions.h"
@@ -139,6 +140,15 @@ extern const char *cups_hstrerror(int); @@ -138,6 +139,15 @@ extern const char *cups_hstrerror(int);
typedef void (*cupsd_selfunc_t)(void *data); typedef void (*cupsd_selfunc_t)(void *data);
@@ -543,21 +543,21 @@ diff -up cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded cups-2.0rc1/scheduler/c
/* /*
* Globals... * Globals...
@@ -163,6 +173,10 @@ VAR int OnDemand VALUE(0); @@ -162,6 +172,9 @@ VAR int OnDemand VALUE(0);
/* Launched on demand */ /* Launched on demand */
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ #endif /* HAVE_ONDEMAND */
+#ifdef HAVE_AVAHI +#ifdef HAVE_AVAHI
+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */ +VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
+#endif /* HAVE_AVAHI */ +#endif /* HAVE_AVAHI */
+
/* /*
* Prototypes... * Prototypes...
@@ -226,6 +240,17 @@ extern void cupsdStopSelect(void); @@ -224,3 +237,15 @@ extern void cupsdStopSelect(void);
/* server.c */
extern void cupsdStartServer(void); extern void cupsdStartServer(void);
extern void cupsdStopServer(void); extern void cupsdStopServer(void);
+
+#ifdef HAVE_AVAHI +#ifdef HAVE_AVAHI
+extern void cupsdInitTimeouts(void); +extern void cupsdInitTimeouts(void);
+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv, +extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
@@ -569,13 +569,11 @@ diff -up cups-2.0rc1/scheduler/cupsd.h.avahi-no-threaded cups-2.0rc1/scheduler/c
+ const struct timeval *tv); + const struct timeval *tv);
+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout); +extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
+#endif /* HAVE_AVAHI */ +#endif /* HAVE_AVAHI */
\ No newline at end of file
/* diff -up cups-2.2.5/scheduler/dirsvc.c.avahi-no-threaded cups-2.2.5/scheduler/dirsvc.c
* End of "$Id: cupsd.h 11717 2014-03-21 16:42:53Z msweet $". --- cups-2.2.5/scheduler/dirsvc.c.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200
diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/dirsvc.c +++ cups-2.2.5/scheduler/dirsvc.c 2017-10-17 19:05:35.938592292 +0200
--- cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded 2014-05-09 22:57:11.000000000 +0200 @@ -193,7 +193,7 @@ cupsdStartBrowsing(void)
+++ cups-2.0rc1/scheduler/dirsvc.c 2014-09-12 15:45:28.773279992 +0200
@@ -195,7 +195,7 @@ cupsdStartBrowsing(void)
cupsdUpdateDNSSDName(); cupsdUpdateDNSSDName();
# else /* HAVE_AVAHI */ # else /* HAVE_AVAHI */
@@ -584,7 +582,7 @@ diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/
{ {
cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread."); cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to create DNS-SD thread.");
@@ -206,7 +206,7 @@ cupsdStartBrowsing(void) @@ -204,7 +204,7 @@ cupsdStartBrowsing(void)
{ {
int error; /* Error code, if any */ int error; /* Error code, if any */
@@ -593,7 +591,7 @@ diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/
if (DNSSDClient == NULL) if (DNSSDClient == NULL)
{ {
@@ -217,11 +217,9 @@ cupsdStartBrowsing(void) @@ -215,11 +215,9 @@ cupsdStartBrowsing(void)
if (FatalErrors & CUPSD_FATAL_BROWSE) if (FatalErrors & CUPSD_FATAL_BROWSE)
cupsdEndProcess(getpid(), 0); cupsdEndProcess(getpid(), 0);
@@ -606,7 +604,7 @@ diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/
} }
# endif /* HAVE_DNSSD */ # endif /* HAVE_DNSSD */
} }
@@ -608,7 +606,7 @@ dnssdClientCallback( @@ -635,7 +633,7 @@ dnssdClientCallback(
* Renew Avahi client... * Renew Avahi client...
*/ */
@@ -615,21 +613,21 @@ diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/
if (!DNSSDClient) if (!DNSSDClient)
{ {
@@ -672,13 +670,7 @@ dnssdDeregisterInstance( @@ -701,13 +699,7 @@ dnssdDeregisterInstance(
DNSServiceRefDeallocate(*srv);
# else /* HAVE_AVAHI */ # else /* HAVE_AVAHI */
- if (!from_callback) if (*srv)
- avahi_threaded_poll_lock(DNSSDMaster); {
- if (!from_callback)
- avahi_threaded_poll_lock(DNSSDMaster);
- -
avahi_entry_group_free(*srv); avahi_entry_group_free(*srv);
- -
- if (!from_callback) - if (!from_callback)
- avahi_threaded_poll_unlock(DNSSDMaster); - avahi_threaded_poll_unlock(DNSSDMaster);
}
# endif /* HAVE_DNSSD */ # endif /* HAVE_DNSSD */
*srv = NULL; @@ -1029,16 +1021,10 @@ dnssdRegisterInstance(
@@ -999,16 +991,10 @@ dnssdRegisterInstance(
(void)commit; (void)commit;
# else /* HAVE_AVAHI */ # else /* HAVE_AVAHI */
@@ -646,7 +644,7 @@ diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/
cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s", cupsdLogMessage(CUPSD_LOG_WARN, "DNS-SD registration of \"%s\" failed: %s",
name, dnssdErrorString(avahi_client_errno(DNSSDClient))); name, dnssdErrorString(avahi_client_errno(DNSSDClient)));
return (0); return (0);
@@ -1123,9 +1109,6 @@ dnssdRegisterInstance( @@ -1153,9 +1139,6 @@ dnssdRegisterInstance(
cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.", cupsdLogMessage(CUPSD_LOG_DEBUG, "DNS-SD commit of \"%s\" failed.",
name); name);
} }
@@ -656,24 +654,29 @@ diff -up cups-2.0rc1/scheduler/dirsvc.c.avahi-no-threaded cups-2.0rc1/scheduler/
# endif /* HAVE_DNSSD */ # endif /* HAVE_DNSSD */
if (error) if (error)
@@ -1296,12 +1279,10 @@ dnssdStop(void) @@ -1326,9 +1309,6 @@ dnssdStop(void)
DNSSDMaster = NULL; DNSSDMaster = NULL;
# else /* HAVE_AVAHI */ # else /* HAVE_AVAHI */
- avahi_threaded_poll_stop(DNSSDMaster); - if (DNSSDMaster)
- avahi_threaded_poll_stop(DNSSDMaster);
- -
avahi_client_free(DNSSDClient); if (DNSSDClient)
DNSSDClient = NULL; {
avahi_client_free(DNSSDClient);
@@ -1337,7 +1317,7 @@ dnssdStop(void)
- avahi_threaded_poll_free(DNSSDMaster); if (DNSSDMaster)
+ avahi_cups_poll_free(DNSSDMaster); {
DNSSDMaster = NULL; - avahi_threaded_poll_free(DNSSDMaster);
+ avahi_cups_poll_free(DNSSDMaster);
DNSSDMaster = NULL;
}
# endif /* HAVE_DNSSD */ # endif /* HAVE_DNSSD */
diff -up cups-2.2.5/scheduler/dirsvc.h.avahi-no-threaded cups-2.2.5/scheduler/dirsvc.h
diff -up cups-2.0rc1/scheduler/dirsvc.h.avahi-no-threaded cups-2.0rc1/scheduler/dirsvc.h --- cups-2.2.5/scheduler/dirsvc.h.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200
--- cups-2.0rc1/scheduler/dirsvc.h.avahi-no-threaded 2013-05-29 13:51:34.000000000 +0200 +++ cups-2.2.5/scheduler/dirsvc.h 2017-10-17 19:03:00.761881007 +0200
+++ cups-2.0rc1/scheduler/dirsvc.h 2014-09-12 15:45:28.773279992 +0200 @@ -49,7 +49,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
@@ -51,7 +51,7 @@ VAR cups_array_t *DNSSDPrinters VALUE(NU
VAR DNSServiceRef DNSSDMaster VALUE(NULL); VAR DNSServiceRef DNSSDMaster VALUE(NULL);
/* Master DNS-SD service reference */ /* Master DNS-SD service reference */
# else /* HAVE_AVAHI */ # else /* HAVE_AVAHI */
@@ -682,21 +685,22 @@ diff -up cups-2.0rc1/scheduler/dirsvc.h.avahi-no-threaded cups-2.0rc1/scheduler/
/* Master polling interface for Avahi */ /* Master polling interface for Avahi */
VAR AvahiClient *DNSSDClient VALUE(NULL); VAR AvahiClient *DNSSDClient VALUE(NULL);
/* Client information */ /* Client information */
diff -up cups-2.0rc1/scheduler/main.c.avahi-no-threaded cups-2.0rc1/scheduler/main.c diff -up cups-2.2.5/scheduler/main.c.avahi-no-threaded cups-2.2.5/scheduler/main.c
--- cups-2.0rc1/scheduler/main.c.avahi-no-threaded 2014-09-12 15:45:28.736280516 +0200 --- cups-2.2.5/scheduler/main.c.avahi-no-threaded 2017-10-17 19:03:00.753881074 +0200
+++ cups-2.0rc1/scheduler/main.c 2014-09-12 15:47:43.433370643 +0200 +++ cups-2.2.5/scheduler/main.c 2017-10-17 19:03:00.761881007 +0200
@@ -127,6 +127,10 @@ main(int argc, /* I - Number of comm @@ -131,7 +131,10 @@ main(int argc, /* I - Number of comm
int service_idle_exit; int service_idle_exit;
/* Idle exit on select timeout? */ /* Idle exit on select timeout? */
#endif /* HAVE_LAUNCHD || HAVE_SYSTEMD */ #endif /* HAVE_ONDEMAND */
-
+#ifdef HAVE_AVAHI +#ifdef HAVE_AVAHI
+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */ + cupsd_timeout_t *tmo; /* Next scheduled timed callback */
+ long tmo_delay; /* Time before it must be called */ + long tmo_delay; /* Time before it must be called */
+#endif /* HAVE_AVAHI */ +#endif /* HAVE_AVAHI */
#ifdef HAVE_GETEUID #ifdef HAVE_GETEUID
@@ -569,6 +573,14 @@ main(int argc, /* I - Number of comm /*
@@ -610,6 +613,14 @@ main(int argc, /* I - Number of comm
httpInitialize(); httpInitialize();
@@ -711,7 +715,7 @@ diff -up cups-2.0rc1/scheduler/main.c.avahi-no-threaded cups-2.0rc1/scheduler/ma
cupsdStartServer(); cupsdStartServer();
/* /*
@@ -871,6 +883,16 @@ main(int argc, /* I - Number of comm @@ -928,6 +939,16 @@ main(int argc, /* I - Number of comm
} }
#endif /* __APPLE__ */ #endif /* __APPLE__ */
@@ -728,9 +732,9 @@ diff -up cups-2.0rc1/scheduler/main.c.avahi-no-threaded cups-2.0rc1/scheduler/ma
#ifndef __APPLE__ #ifndef __APPLE__
/* /*
* Update the network interfaces once a minute... * Update the network interfaces once a minute...
@@ -1562,6 +1584,10 @@ select_timeout(int fds) /* I - Number @@ -1632,6 +1653,10 @@ select_timeout(int fds) /* I - Number
cupsd_job_t *job; /* Job information */ cupsd_job_t *job; /* Job information */
cupsd_subscription_t *sub; /* Subscription information */ cupsd_printer_t *printer; /* Printer information */
const char *why; /* Debugging aid */ const char *why; /* Debugging aid */
+#ifdef HAVE_AVAHI +#ifdef HAVE_AVAHI
+ cupsd_timeout_t *tmo; /* Timed callback */ + cupsd_timeout_t *tmo; /* Timed callback */
@@ -739,7 +743,7 @@ diff -up cups-2.0rc1/scheduler/main.c.avahi-no-threaded cups-2.0rc1/scheduler/ma
cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld", cupsdLogMessage(CUPSD_LOG_DEBUG2, "select_timeout: JobHistoryUpdate=%ld",
@@ -1607,6 +1633,19 @@ select_timeout(int fds) /* I - Number @@ -1677,6 +1702,19 @@ select_timeout(int fds) /* I - Number
} }
#endif /* __APPLE__ */ #endif /* __APPLE__ */
@@ -759,10 +763,10 @@ diff -up cups-2.0rc1/scheduler/main.c.avahi-no-threaded cups-2.0rc1/scheduler/ma
/* /*
* Check whether we are accepting new connections... * Check whether we are accepting new connections...
*/ */
diff -up cups-2.0rc1/scheduler/Makefile.avahi-no-threaded cups-2.0rc1/scheduler/Makefile diff -up cups-2.2.5/scheduler/Makefile.avahi-no-threaded cups-2.2.5/scheduler/Makefile
--- cups-2.0rc1/scheduler/Makefile.avahi-no-threaded 2014-08-29 13:27:18.000000000 +0200 --- cups-2.2.5/scheduler/Makefile.avahi-no-threaded 2017-10-13 20:22:26.000000000 +0200
+++ cups-2.0rc1/scheduler/Makefile 2014-09-12 15:48:35.367634265 +0200 +++ cups-2.2.5/scheduler/Makefile 2017-10-17 19:03:00.762880999 +0200
@@ -17,6 +17,7 @@ include ../Makedefs @@ -15,6 +15,7 @@ include ../Makedefs
CUPSDOBJS = \ CUPSDOBJS = \
auth.o \ auth.o \
@@ -770,7 +774,7 @@ diff -up cups-2.0rc1/scheduler/Makefile.avahi-no-threaded cups-2.0rc1/scheduler/
banners.o \ banners.o \
cert.o \ cert.o \
classes.o \ classes.o \
@@ -40,7 +41,8 @@ CUPSDOBJS = \ @@ -38,7 +39,8 @@ CUPSDOBJS = \
server.o \ server.o \
statbuf.o \ statbuf.o \
subscriptions.o \ subscriptions.o \
@@ -780,9 +784,9 @@ diff -up cups-2.0rc1/scheduler/Makefile.avahi-no-threaded cups-2.0rc1/scheduler/
LIBOBJS = \ LIBOBJS = \
filter.o \ filter.o \
mime.o \ mime.o \
diff -up cups-2.0rc1/scheduler/timeout.c.avahi-no-threaded cups-2.0rc1/scheduler/timeout.c diff -up cups-2.2.5/scheduler/timeout.c.avahi-no-threaded cups-2.2.5/scheduler/timeout.c
--- cups-2.0rc1/scheduler/timeout.c.avahi-no-threaded 2014-09-12 15:45:28.775279963 +0200 --- cups-2.2.5/scheduler/timeout.c.avahi-no-threaded 2017-10-17 19:03:00.762880999 +0200
+++ cups-2.0rc1/scheduler/timeout.c 2014-09-12 15:45:28.775279963 +0200 +++ cups-2.2.5/scheduler/timeout.c 2017-10-17 19:03:00.762880999 +0200
@@ -0,0 +1,235 @@ @@ -0,0 +1,235 @@
+/* +/*
+ * "$Id$" + * "$Id$"
@@ -1018,4 +1022,4 @@ diff -up cups-2.0rc1/scheduler/timeout.c.avahi-no-threaded cups-2.0rc1/scheduler
+ +
+/* +/*
+ * End of "$Id$". + * End of "$Id$".
+ */ + */
hardware/printer/cups/files/fedora/cups-enum-all.patch
-17
View File
@@ -1,17 +0,0 @@
diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100
+++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100
@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
break;
case AVAHI_BROWSER_REMOVE:
- case AVAHI_BROWSER_ALL_FOR_NOW:
case AVAHI_BROWSER_CACHE_EXHAUSTED:
break;
+
+ case AVAHI_BROWSER_ALL_FOR_NOW:
+ avahi_simple_poll_quit(data->simple_poll);
+ break;
}
}
hardware/printer/cups/files/gentoo/cups-1.6.0-fix-install-perms.patch
-25
View File
@@ -1,25 +0,0 @@
Index: Makedefs.in
===================================================================
--- Makedefs.in (Revision 10520)
+++ Makedefs.in (Arbeitskopie)
@@ -40,14 +40,14 @@
# Installation programs...
#
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT = $(INSTALL) -c -m 555
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 @INSTALL_STRIP@
+INSTALL_MAN = $(INSTALL) -c -m 644
+INSTALL_SCRIPT = $(INSTALL) -c -m 755
#
# Default user, group, and system groups for the scheduler...
hardware/printer/cups/files/gentoo/cups-2.0.1-fix-compilation.patch
-25
View File
@@ -1,25 +0,0 @@
From 7bb9184b40bea3c4b9f46362642e5d40053a3ae1 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 19 Nov 2014 18:44:33 +0100
Subject: [PATCH] fix compilation
---
test/ippserver.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/ippserver.c b/test/ippserver.c
index c785e5f..1c64668 100644
--- a/test/ippserver.c
+++ b/test/ippserver.c
@@ -421,7 +421,7 @@ static int valid_job_attributes(_ipp_client_t *client);
# ifdef HAVE_DNSSD
static DNSServiceRef DNSSDMaster = NULL;
-# else /* HAVE_AVAHI */
+# elif defined(HAVE_AVAHI)
static AvahiThreadedPoll *DNSSDMaster = NULL;
static AvahiClient *DNSSDClient = NULL;
# endif /* HAVE_DNSSD */
--
2.0.4
hardware/printer/cups/files/gentoo/cups-2.0.1-fix-linkage-to-gnutls.patch
-24
View File
@@ -1,24 +0,0 @@
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -1044,7 +1044,9 @@
options = 0;
}
+#ifdef HAVE_SSL
_httpTLSSetOptions(options);
+#endif /* HAVE_SSL */
}
}
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -2975,7 +2975,9 @@
}
}
+#ifdef HAVE_SSL
_httpTLSSetOptions(options);
+#endif /* HAVE_SSL */
}
else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")
#ifdef HAVE_SSL
hardware/printer/cups/files/gentoo/cups-2.0.1-rename-systemd-service-files.patch → hardware/printer/cups/files/gentoo/cups-2.0.2-rename-systemd-service-files.patch
-28
View File
@@ -30,19 +30,6 @@ index 3e0884a..b354420 100644
elif test "x$(XINETD)" != x; then \ elif test "x$(XINETD)" != x; then \
echo Installing xinetd configuration file for cups-lpd...; \ echo Installing xinetd configuration file for cups-lpd...; \
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(XINETD); \
diff --git a/scheduler/org.cups.cupsd.path.in b/scheduler/org.cups.cupsd.path.in
index 1bccc6f..90c8576 100644
--- a/scheduler/org.cups.cupsd.path.in
+++ b/scheduler/org.cups.cupsd.path.in
@@ -2,7 +2,7 @@
Description=CUPS Scheduler
[Path]
-PathExists=@CUPS_CACHEDIR@/org.cups.cupsd
+PathExists=@CUPS_CACHEDIR@/d*
[Install]
WantedBy=multi-user.target
diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in diff --git a/scheduler/org.cups.cupsd.service.in b/scheduler/org.cups.cupsd.service.in
index 0a27c76..7a04248 100644 index 0a27c76..7a04248 100644
--- a/scheduler/org.cups.cupsd.service.in --- a/scheduler/org.cups.cupsd.service.in
@@ -54,20 +41,5 @@ index 0a27c76..7a04248 100644
-Also=org.cups.cupsd.socket org.cups.cupsd.path -Also=org.cups.cupsd.socket org.cups.cupsd.path
+Also=cups.socket cups.path +Also=cups.socket cups.path
WantedBy=printer.target WantedBy=printer.target
diff --git a/scheduler/org.cups.cupsd.socket.in b/scheduler/org.cups.cupsd.socket.in
--- a/scheduler/org.cups.cupsd.socket.in
+++ a/scheduler/org.cups.cupsd.socket.in
@@ -3,6 +3,10 @@
[Socket]
ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
+ListenStream=[::1]:631
+ListenStream=127.0.0.1:631
+BindIPv6Only=ipv6-only
+ReusePort=true
[Install]
WantedBy=sockets.target
-- --
2.0.4 2.0.4
hardware/printer/cups/files/gentoo/cups-2.2.6-fix-install-perms.patch
+18
View File
@@ -0,0 +1,18 @@
--- cups-2.2.6/Makedefs.in
+++ cups-2.2.6/Makedefs.in
@@ -49,12 +49,12 @@
#
INSTALL_BIN = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
-INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d
INSTALL_LIB = @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444
+INSTALL_MAN = $(INSTALL) -c -m 644
INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
#
hardware/printer/cups/files/pisilinux/desktop.patch
+49
View File
@@ -0,0 +1,49 @@
diff -Nuar cups_old-2.2.6/desktop/cups.desktop.in cups-2.2.6/desktop/cups.desktop.in
--- cups_old-2.2.6/desktop/cups.desktop.in 2017-11-01 17:57:53.000000000 +0300
+++ cups-2.2.6/desktop/cups.desktop.in 2011-02-24 14:03:21.000000000 +0200
@@ -7,18 +7,6 @@
Type=Application
Name=Manage Printing
Comment=CUPS Web Interface
-Name[af]=bestuur Printing
-Comment[af]=CUPS Web Interface
-Name[ar]=إدارة الطباعة
-Comment[ar]=الكؤوس واجهة الويب
-Name[az]=Çap idarə
-Comment[az]=CUPS Web Interface
-Name[bn-IN]=মুদ্রণ পরিচালনা
-Comment[bn-IN]=CUPS ওয়েব ইন্টারফেস
-Name[ca]=Gestor d'impressió
-Comment[ca]=Interfície web de CUPS
-Name[cs]=Správa tisku CUPS
-Comment[cs]=Webové rozhraní CUPS
Name[de]=Druckerverwaltung
Comment[de]=CUPS Webinterface
Name[en_US]=Manage Printing
@@ -39,24 +27,14 @@
Comment[it]=Interfaccia web di CUPS
Name[ja]=印刷の管理
Comment[ja]=CUPS Web インタフェース
-Name[ko]=인쇄 관리
-Comment[ko]=CUPS 웹 인터페이스
Name[pl]=Zarządzanie drukowaniem
Comment[pl]=Interfejs WWW CUPS
-Name[pt_BR]=Gerenciador de impressão
-Comment[pt_BR]=Interface web do CUPS
-Name[pt-PT]=Gerenciador de impressão
-Comment[pt-PT]=Interface sítio do CUPS
Name[ru]=Настройка печати
Comment[ru]=Настройка CUPS
Name[sv]=Hantera skrivare
Comment[sv]=CUPS webb-gränssnitt
-Name[sq]=Menaxho Printime
-Comment[sq]=CUPS Web Interface
-Name[th]=จัดการการพิมพ์
-Comment[th]=CUPS เว็บอินเตอร์เฟส
-Name[uz]=chop boshqarish
-Comment[uz]=CUPS veb interfeysi
+Name[tr]=Yazıcıları Yönet
+Comment[tr]=CUPS Web Arayüzü
Name[zh]=打印机管理
Comment[zh]=CUPS网页界面
Name[zh_TW]=印表管理
hardware/printer/cups/files/pisilinux/lib64.patch
+32 -29
View File
@@ -1,6 +1,35 @@
--- cups-config.in~ 2014-01-18 13:56:12.423297761 +0100 diff -Nuar cups_old-2.2.6/config-scripts/cups-directories.m4 cups-2.2.6/config-scripts/cups-directories.m4
+++ cups-config.in 2014-01-18 13:56:59.459964275 +0100 --- cups_old-2.2.6/config-scripts/cups-directories.m4 2017-12-14 06:56:50.708946000 +0300
@@ -50,7 +50,7 @@ else +++ cups-2.2.6/config-scripts/cups-directories.m4 2017-12-14 09:23:45.490213940 +0300
@@ -101,8 +101,8 @@
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
esac
diff -Nuar cups_old-2.2.6/configure cups-2.2.6/configure
--- cups_old-2.2.6/configure 2017-12-14 06:56:51.766946000 +0300
+++ cups-2.2.6/configure 2017-12-14 09:26:43.667224765 +0300
@@ -6187,8 +6187,8 @@
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$host_os_name" in
linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
esac
diff -Nuar cups_old-2.2.6/cups-config.in cups-2.2.6/cups-config.in
--- cups_old-2.2.6/cups-config.in 2017-11-01 17:57:53.000000000 +0300
+++ cups-2.2.6/cups-config.in 2017-12-14 09:22:37.641209818 +0300
@@ -48,7 +48,7 @@
CFLAGS="$CFLAGS -I$includedir" CFLAGS="$CFLAGS -I$includedir"
fi fi
@@ -9,29 +38,3 @@
LDFLAGS="$LDFLAGS -L$libdir" LDFLAGS="$LDFLAGS -L$libdir"
fi fi
fi fi
--- config-scripts/cups-directories.m4~ 2014-01-18 13:56:23.529964393 +0100
+++ config-scripts/cups-directories.m4 2014-01-18 13:57:40.706630807 +0100
@@ -103,8 +103,8 @@ dnl Fix "libdir" variable...
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$uname" in
Linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
HP-UX*)
--- configure~ 2014-01-18 13:56:32.346631030 +0100
+++ configure 2014-01-18 13:57:12.076630898 +0100
@@ -5893,8 +5893,8 @@ fi
if test "$libdir" = "\${exec_prefix}/lib"; then
case "$uname" in
Linux*)
- if test -d /usr/lib64 -a ! -d /usr/lib64/fakeroot; then
- libdir="$exec_prefix/lib64"
+ if test -d /usr/lib -a ! -d /usr/lib/fakeroot; then
+ libdir="$exec_prefix/lib"
fi
;;
HP-UX*)
hardware/printer/cups/files/pisilinux/statedir.patch
+7 -17
View File
@@ -1,22 +1,12 @@
--- config-scripts/cups-network.m4~ 2014-01-18 14:05:51.353295869 +0100 diff -Nuar cups_old-2.2.6/config-scripts/cups-network.m4 cups-2.2.6/config-scripts/cups-network.m4
+++ config-scripts/cups-network.m4 2014-01-18 14:07:25.179962227 +0100 --- cups_old-2.2.6/config-scripts/cups-network.m4 2017-11-01 17:57:53.000000000 +0300
@@ -45,7 +45,7 @@ if test x$enable_domainsocket != xno -a +++ cups-2.2.6/config-scripts/cups-network.m4 2017-12-14 09:40:48.442276087 +0300
case "$uname" in @@ -48,7 +48,7 @@
Darwin*) case "$host_os_name" in
# Darwin and MaxOS X do their own thing... darwin*)
# Darwin and macOS do their own thing...
- CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd" - CUPS_DEFAULT_DOMAINSOCKET="$localstatedir/run/cupsd"
+ CUPS_DEFAULT_DOMAINSOCKET="/run/cupsd" + CUPS_DEFAULT_DOMAINSOCKET="/run/cupsd"
;; ;;
*) *)
# All others use FHS standard... # All others use FHS standard...
--- config-scripts/cups-directories.m4~ 2014-01-18 14:05:59.609962507 +0100
+++ config-scripts/cups-directories.m4 2014-01-18 14:07:13.516628933 +0100
@@ -420,7 +420,7 @@ AC_ARG_WITH(rundir, [ --with-rundir
;;
*)
# All others
- CUPS_STATEDIR="$localstatedir/run/cups"
+ CUPS_STATEDIR="/run/cups"
;;
esac])
AC_DEFINE_UNQUOTED(CUPS_STATEDIR, "$CUPS_STATEDIR")
hardware/printer/cups/pspec.xml
+15 -16
View File
@@ -12,8 +12,8 @@
<IsA>service</IsA> <IsA>service</IsA>
<Summary>Common Unix Printing System</Summary> <Summary>Common Unix Printing System</Summary>
<Description>cups provides a portable printing layer for *nix-based operating systems.</Description> <Description>cups provides a portable printing layer for *nix-based operating systems.</Description>
<Archive sha1sum="149e9ded0744b7545630c62b6a347e747928e0f7" type="targz">https://github.com/apple/cups/releases/download/v2.2.3/cups-2.2.3-source.tar.gz</Archive> <Archive sha1sum="b5e3389fb9450bfed377c95c0230c029c053acc4" type="targz">https://github.com/apple/cups/releases/download/v2.2.6/cups-2.2.6-source.tar.gz</Archive>
<Archive sha1sum="062beea95c6f8dda0a5e7eed51604e22806ffad3" type="tar" target="cups-2.2.3">http://source.pisilinux.org/1.0/cups-tr.tar</Archive> --> <!-- <Archive sha1sum="062beea95c6f8dda0a5e7eed51604e22806ffad3" type="tar" target="cups-2.2.3">http://source.pisilinux.org/1.0/cups-tr.tar</Archive> --> -->
<BuildDependencies> <BuildDependencies>
<Dependency>acl-devel</Dependency> <Dependency>acl-devel</Dependency>
<Dependency>pam-devel</Dependency> <Dependency>pam-devel</Dependency>
@@ -35,35 +35,27 @@
<!-- ARCH Linux patches --> <!-- ARCH Linux patches -->
<Patch level="1">archlinux/cups-no-export-ssllibs.patch</Patch> <Patch level="1">archlinux/cups-no-export-ssllibs.patch</Patch>
<Patch level="1">archlinux/cups-no-gzip-man.patch</Patch> <Patch level="1">archlinux/cups-no-gzip-man.patch</Patch>
<Patch level="1">archlinux/cups-1.6.2-statedir.patch</Patch>
<Patch level="1">archlinux/cups-no-gcrypt.patch</Patch>
<Patch level="0">archlinux/cups-1.6.0-fix-install-perms.patch</Patch>
<!-- Debian patches -->
<!-- Fedora patches --> <!-- Fedora patches -->
<Patch level="1">fedora/cups-enum-all.patch</Patch>
<Patch level="1">fedora/cups-final-content-type.patch</Patch> <Patch level="1">fedora/cups-final-content-type.patch</Patch>
<Patch level="1">fedora/cups-res_init.patch</Patch> <Patch level="1">fedora/cups-res_init.patch</Patch>
<Patch level="1">fedora/cups-hp-deviceid-oid.patch</Patch> <Patch level="1">fedora/cups-hp-deviceid-oid.patch</Patch>
<Patch level="1">fedora/cups-logrotate.patch</Patch> <Patch level="1">fedora/cups-logrotate.patch</Patch>
<Patch level="1">fedora/cups-avahi-no-threaded.patch</Patch>
<!-- Gentoo patches --> <!-- Gentoo patches -->
<!-- <Patch>gentoo/cups-1.6.0-fix-install-perms.patch</Patch> --> <Patch>gentoo/cups-2.2.6-fix-install-perms.patch</Patch>
<Patch >gentoo/cups-2.0.1-rename-systemd-service-files.patch</Patch> <Patch >gentoo/cups-2.0.2-rename-systemd-service-files.patch</Patch>
<!--<Patch>gentoo/cups-2.0.1-fix-linkage-to-gnutls.patch</Patch>
<Patch>gentoo/cups-2.0.1-fix-compilation.patch</Patch>-->
<!-- Pisi Linux patches --> <!-- Pisi Linux patches -->
<Patch>pisilinux/lib64.patch</Patch>
<Patch level="1">pisilinux/nostrip.patch</Patch> <Patch level="1">pisilinux/nostrip.patch</Patch>
<Patch level="1">pisilinux/cups-run.patch</Patch> <Patch level="1">pisilinux/cups-run.patch</Patch>
<Patch level="1">pisilinux/lib64.patch</Patch>
<Patch level="1">pisilinux/statedir.patch</Patch>
<Patch level="1">pisilinux/desktop.patch</Patch>
<!-- Pld-linux patches --> <!-- Pld-linux patches -->
<Patch>pld-linux/cups-avahi-address.patch</Patch> <Patch>pld-linux/cups-avahi-address.patch</Patch>
<!-- <Patch>pld-linux/cups-avahi-no-threaded.patch</Patch> -->
</Patches> </Patches>
</Source> </Source>
@@ -150,6 +142,13 @@
</Package> </Package>
<History> <History>
<Update release="6">
<Date>2017-12-13</Date>
<Version>2.2.6</Version>
<Comment>Version bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyacinsoy@pisilinux.org</Email>
</Update>
<Update release="5"> <Update release="5">
<Date>2017-07-16</Date> <Date>2017-07-16</Date>
<Version>2.2.3</Version> <Version>2.2.3</Version>
hardware/printer/foomatic-db-nonfree/pspec.xml
+9 -2
View File
@@ -12,7 +12,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>Foomatic printer database nonfree</Summary> <Summary>Foomatic printer database nonfree</Summary>
<Description>Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses.</Description> <Description>Foomatic - database extension consisting of manufacturer-supplied PPD files released under non-free licenses.</Description>
<Archive sha1sum="0fca589d77feff1b9f779933758d5f29f490ac32" type="targz">http://www.openprinting.org/download/foomatic/foomatic-db-nonfree-20170409.tar.gz</Archive> <Archive sha1sum="dc60930a405d000ec034c21d9c0e6d31d8ec4b56" type="targz">http://www.openprinting.org/download/foomatic/foomatic-db-nonfree-20171214.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>cups-devel</Dependency> <Dependency>cups-devel</Dependency>
<Dependency>foomatic-db</Dependency> <Dependency>foomatic-db</Dependency>
@@ -31,6 +31,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2017-12-14</Date>
<Version>20171214</Version>
<Comment>Version Bump</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2017-04-09</Date> <Date>2017-04-09</Date>
<Version>20170409</Version> <Version>20170409</Version>
@@ -53,4 +60,4 @@
<Email>alihan@pisilinux.org</Email> <Email>alihan@pisilinux.org</Email>
</Update> </Update>
</History> </History>
</PISI> </PISI>
hardware/printer/foomatic-db/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>data</IsA> <IsA>data</IsA>
<Summary>Database of printers and printer drivers</Summary> <Summary>Database of printers and printer drivers</Summary>
<Description>foomatic-db contains the knowledge database for printers which are used by foomatic-db-engine to generate PPD files.</Description> <Description>foomatic-db contains the knowledge database for printers which are used by foomatic-db-engine to generate PPD files.</Description>
<Archive sha1sum="acfcbfa1e0434d060ca7c11e9f00718dac00c666" type="tarxz">http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20170228.tar.xz</Archive> <Archive sha1sum="a006a9d75cf0bfdf3f802dc711f26b16bd19c46d" type="tarxz">http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20171214.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile permission="0755" target="cleanup-conflicts">cleanup-script</AdditionalFile> <AdditionalFile permission="0755" target="cleanup-conflicts">cleanup-script</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
@@ -32,6 +32,13 @@
</Package> </Package>
<History> <History>
<Update release="4">
<Date>2017-12-14</Date>
<Version>4.0.20171214</Version>
<Comment>version bump.</Comment>
<Name>Ayhan Yalçınsoy</Name>
<Email>ayhanyalcinsoy@pisilinux.org</Email>
</Update>
<Update release="3"> <Update release="3">
<Date>2017-02-28</Date> <Date>2017-02-28</Date>
<Version>4.0.20170228</Version> <Version>4.0.20170228</Version>