cups and others:v.bump

2017-12-15 07:39:59 +03:00
parent 72b184604a
commit ff0944daa5
19 changed files with 222 additions and 399 deletions
@@ -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...
@@ -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
- 
@@ -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 
@@ -30,19 +30,6 @@ index 3e0884a..b354420 100644
 	elif test "x$(XINETD)" != x; then \
 		echo Installing xinetd configuration file for cups-lpd...; \
 		$(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
 index 0a27c76..7a04248 100644
 --- 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=cups.socket cups.path
 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
- 
@@ -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@
+ 
+ #