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

moved into main repo for pisi 2.0

Browse Source
This commit is contained in:
ayhanyalcinsoy
2015-06-19 13:37:40 +03:00
parent 9050f3df88
commit 217df81789
37 changed files with 2418 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/printer/cups/files/gentoo/cups-1.6.0-fix-install-perms.patch
+25
View File
@@ -0,0 +1,25 @@
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
@@ -0,0 +1,25 @@
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
@@ -0,0 +1,24 @@
--- 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
+73
View File
@@ -0,0 +1,73 @@
From 33e0d4c8e450fe69b195422c0880aaa96ca9478d Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@kyomu.43-1.org>
Date: Wed, 19 Nov 2014 18:00:06 +0100
Subject: [PATCH] change systemd service files to gentoo naming scheme
---
scheduler/Makefile | 10 +++++-----
scheduler/org.cups.cupsd.path.in | 2 +-
scheduler/org.cups.cupsd.service.in | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/scheduler/Makefile b/scheduler/Makefile
index 3e0884a..b354420 100644
--- a/scheduler/Makefile
+++ b/scheduler/Makefile
@@ -203,11 +203,11 @@ install-data:
if test "x$(SYSTEMD_DIR)" != x; then \
echo Installing systemd configuration files...; \
$(INSTALL_DIR) $(BUILDROOT)$(SYSTEMD_DIR); \
- $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR); \
- $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR); \
- $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
- $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/org.cups.cups-lpd@.service; \
- $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR); \
+ $(INSTALL_DATA) org.cups.cupsd.path $(BUILDROOT)$(SYSTEMD_DIR)/cups.path; \
+ $(INSTALL_DATA) org.cups.cupsd.service $(BUILDROOT)$(SYSTEMD_DIR)/cups.service; \
+ $(INSTALL_DATA) org.cups.cupsd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups.socket; \
+ $(INSTALL_DATA) org.cups.cups-lpdAT.service $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd@.service; \
+ $(INSTALL_DATA) org.cups.cups-lpd.socket $(BUILDROOT)$(SYSTEMD_DIR)/cups-lpd.socket; \
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
+++ b/scheduler/org.cups.cupsd.service.in
@@ -7,5 +7,5 @@ ExecStart=@sbindir@/cupsd -l
Type=simple
[Install]
-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