forked from SynoCommunity/spksrc
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add java-11-openjdk (SynoCommunity#4784)
* Initial java-1.8.0-openjdk package * Added LICENSE files * Disabled parallel build for cups due to race conditions * Removed Java AOT. Not available on all arches * Removed debug symbols and cups to reduce package size * Changed zlib,libjpeg,giflib,libpng and lcms to use system and not bundled * Removed RedHat patches and added Debian patches * Added fix for PARALLEL_MAKE Co-authored-by: hgy59 <hpgy59@gmail.com>
- Loading branch information
1 parent
d094ad3
commit 0913abd
Showing
136 changed files
with
6,681 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
PKG_NAME = cups | ||
PKG_VERS = 2.3.3 | ||
PKG_EXT = tar.gz | ||
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS)-source.$(PKG_EXT) | ||
PKG_DIST_SITE = https://github.com/apple/$(PKG_NAME)/releases/download/v$(PKG_VERS) | ||
PKG_DIR = $(PKG_NAME)-$(PKG_VERS) | ||
|
||
HOMEPAGE = https://www.cups.org/ | ||
COMMENT = CUPS printing system | ||
LICENSE = GPLv2 | ||
|
||
PRE_CONFIGURE_TARGET = cups_pre_configure | ||
GNU_CONFIGURE = 1 | ||
CONFIGURE_ARGS = --with-cupsd-file-perm=0755 | ||
CONFIGURE_ARGS += --with-log-file-perm=0600 | ||
CONFIGURE_ARGS += --enable-relro | ||
CONFIGURE_ARGS += --enable-threads | ||
CONFIGURE_ARGS += --enable-webif | ||
CONFIGURE_ARGS += --with-xinetd=no | ||
CONFIGURE_ARGS += --with-access-log-level=actions | ||
CONFIGURE_ARGS += --enable-page-logging | ||
CONFIGURE_ARGS += --with-components=core | ||
CONFIGURE_ARGS += --libdir=$(INSTALL_PREFIX)/lib | ||
|
||
include ../../mk/spksrc.archs.mk | ||
ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH)) | ||
ADDITIONAL_LDFLAGS += -lrt | ||
endif | ||
ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH)) | ||
ADDITIONAL_CFLAGS = -DIP_FREEBIND=15 | ||
endif | ||
|
||
PATCHES_LEVEL = 1 | ||
|
||
include ../../mk/spksrc.cross-cc.mk | ||
|
||
.PHONY: cups_pre_configure | ||
cups_pre_configure: | ||
$(RUN) aclocal -I config-scripts | ||
$(RUN) autoconf -f -I config-scripts |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
rsc:bin/cups-config | ||
bin:bin/ippeveprinter | ||
bin:bin/ipptool | ||
rsc:include/cups/adminutil.h | ||
rsc:include/cups/array.h | ||
rsc:include/cups/backend.h | ||
rsc:include/cups/cups.h | ||
rsc:include/cups/dir.h | ||
rsc:include/cups/file.h | ||
rsc:include/cups/http.h | ||
rsc:include/cups/ipp.h | ||
rsc:include/cups/language.h | ||
rsc:include/cups/ppd.h | ||
rsc:include/cups/pwg.h | ||
rsc:include/cups/raster.h | ||
rsc:include/cups/sidechannel.h | ||
rsc:include/cups/transcode.h | ||
rsc:include/cups/versioning.h | ||
lib:lib/cups/command/ippevepcl | ||
lib:lib/cups/command/ippeveps | ||
lnk:lib/libcupsimage.so | ||
lib:lib/libcupsimage.so.2 | ||
lnk:lib/libcups.so | ||
lib:lib/libcups.so.2 | ||
rsc:share/locale/ca/cups_ca.po | ||
rsc:share/locale/cs/cups_cs.po | ||
rsc:share/locale/de/cups_de.po | ||
rsc:share/locale/en/cups_en.po | ||
rsc:share/locale/es/cups_es.po | ||
rsc:share/locale/fr/cups_fr.po | ||
rsc:share/locale/it/cups_it.po | ||
rsc:share/locale/ja/cups_ja.po | ||
rsc:share/locale/pt_BR/cups_pt_BR.po | ||
rsc:share/locale/ru/cups_ru.po | ||
rsc:share/locale/zh_CN/cups_zh_CN.po |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
cups-2.3.3-source.tar.gz SHA1 7a01c9fba5d784eb61eda03fd40e513fd2a1b5b8 | ||
cups-2.3.3-source.tar.gz SHA256 261fd948bce8647b6d5cb2a1784f0c24cc52b5c4e827b71d726020bcc502f3ee | ||
cups-2.3.3-source.tar.gz MD5 412434ceefbdf3ec71bc9188a035f589 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
diff -up cups-1.5b1/conf/cups.password-auth.system-auth cups-1.5b1/conf/cups.password-auth | ||
--- cups-1.5b1/conf/cups.password-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 | ||
+++ cups-1.5b1/conf/cups.password-auth 2011-05-23 17:27:27.000000000 +0200 | ||
@@ -0,0 +1,4 @@ | ||
+#%PAM-1.0 | ||
+# Use password-auth common PAM configuration for the daemon | ||
+auth include password-auth | ||
+account include password-auth | ||
diff -up cups-1.5b1/conf/cups.system-auth.system-auth cups-1.5b1/conf/cups.system-auth | ||
--- cups-1.5b1/conf/cups.system-auth.system-auth 2011-05-23 17:27:27.000000000 +0200 | ||
+++ cups-1.5b1/conf/cups.system-auth 2011-05-23 17:27:27.000000000 +0200 | ||
@@ -0,0 +1,3 @@ | ||
+#%PAM-1.0 | ||
+auth include system-auth | ||
+account include system-auth | ||
diff -up cups-1.5b1/conf/Makefile.system-auth cups-1.5b1/conf/Makefile | ||
--- cups-1.5b1/conf/Makefile.system-auth 2011-05-12 07:21:56.000000000 +0200 | ||
+++ cups-1.5b1/conf/Makefile 2011-05-23 17:27:27.000000000 +0200 | ||
@@ -90,10 +90,16 @@ install-data: | ||
done | ||
-if test x$(PAMDIR) != x; then \ | ||
$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ | ||
- if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ | ||
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ | ||
+ if test -f /etc/pam.d/password-auth; then \ | ||
+ $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \ | ||
+ elif test -f /etc/pam.d/system-auth; then \ | ||
+ $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \ | ||
else \ | ||
- $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ | ||
+ if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ | ||
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ | ||
+ else \ | ||
+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ | ||
+ fi ; \ | ||
fi ; \ | ||
fi | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
diff -up cups-1.5b1/scheduler/banners.c.banners cups-1.5b1/scheduler/banners.c | ||
--- cups-1.5b1/scheduler/banners.c.banners 2011-05-20 05:49:49.000000000 +0200 | ||
+++ cups-1.5b1/scheduler/banners.c 2011-05-23 17:35:30.000000000 +0200 | ||
@@ -110,6 +110,8 @@ cupsdLoadBanners(const char *d) /* I - | ||
if ((ext = strrchr(dent->filename, '.')) != NULL) | ||
if (!strcmp(ext, ".bck") || | ||
!strcmp(ext, ".bak") || | ||
+ !strcmp(ext, ".rpmnew") || | ||
+ !strcmp(ext, ".rpmsave") || | ||
!strcmp(ext, ".sav")) | ||
continue; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
diff -up cups-2.2b2/config-scripts/cups-ssl.m4.no-export-ssllibs cups-2.2b2/config-scripts/cups-ssl.m4 | ||
--- cups-2.2b2/config-scripts/cups-ssl.m4.no-export-ssllibs 2016-06-27 15:06:22.299980753 +0200 | ||
+++ cups-2.2b2/config-scripts/cups-ssl.m4 2016-06-27 15:08:00.953154042 +0200 | ||
@@ -102,5 +102,5 @@ AC_SUBST(IPPALIASES) | ||
AC_SUBST(SSLFLAGS) | ||
AC_SUBST(SSLLIBS) | ||
|
||
-EXPORT_SSLLIBS="$SSLLIBS" | ||
+EXPORT_SSLLIBS="" | ||
AC_SUBST(EXPORT_SSLLIBS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
diff -up cups-1.5b1/backend/usb-unix.c.direct-usb cups-1.5b1/backend/usb-unix.c | ||
--- cups-1.5b1/backend/usb-unix.c.direct-usb 2011-05-20 05:49:49.000000000 +0200 | ||
+++ cups-1.5b1/backend/usb-unix.c 2011-05-23 17:52:14.000000000 +0200 | ||
@@ -102,6 +102,9 @@ print_device(const char *uri, /* I - De | ||
_cups_strncasecmp(hostname, "Minolta", 7); | ||
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ | ||
|
||
+ if (use_bc && !strncmp(uri, "usb:/dev/", 9)) | ||
+ use_bc = 0; | ||
+ | ||
if ((device_fd = open_device(uri, &use_bc)) == -1) | ||
{ | ||
if (getenv("CLASS") != NULL) | ||
@@ -331,12 +334,7 @@ open_device(const char *uri, /* I - Dev | ||
if (!strncmp(uri, "usb:/dev/", 9)) | ||
#ifdef __linux | ||
{ | ||
- /* | ||
- * Do not allow direct devices anymore... | ||
- */ | ||
- | ||
- errno = ENODEV; | ||
- return (-1); | ||
+ return (open(uri + 4, O_RDWR | O_EXCL)); | ||
} | ||
else if (!strncmp(uri, "usb://", 6)) | ||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
diff -up cups-1.7b1/scheduler/ipp.c.driverd-timeout cups-1.7b1/scheduler/ipp.c | ||
--- cups-1.7b1/scheduler/ipp.c.driverd-timeout 2013-04-19 12:24:43.003841810 +0200 | ||
+++ cups-1.7b1/scheduler/ipp.c 2013-04-19 12:24:43.204839107 +0200 | ||
@@ -4556,7 +4556,7 @@ copy_model(cupsd_client_t *con, /* I - | ||
close(temppipe[1]); | ||
|
||
/* | ||
- * Wait up to 30 seconds for the PPD file to be copied... | ||
+ * Wait up to 70 seconds for the PPD file to be copied... | ||
*/ | ||
|
||
total = 0; | ||
@@ -4576,7 +4576,7 @@ copy_model(cupsd_client_t *con, /* I - | ||
FD_SET(temppipe[0], &input); | ||
FD_SET(CGIPipes[0], &input); | ||
|
||
- timeout.tv_sec = 30; | ||
+ timeout.tv_sec = 70; | ||
timeout.tv_usec = 0; | ||
|
||
if ((i = select(maxfd, &input, NULL, NULL, &timeout)) < 0) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
diff -up cups-1.5b1/backend/usb-unix.c.usb-paperout cups-1.5b1/backend/usb-unix.c | ||
--- cups-1.5b1/backend/usb-unix.c.usb-paperout 2011-05-24 15:51:39.000000000 +0200 | ||
+++ cups-1.5b1/backend/usb-unix.c 2011-05-24 15:51:39.000000000 +0200 | ||
@@ -30,6 +30,11 @@ | ||
|
||
#include <sys/select.h> | ||
|
||
+#ifdef __linux | ||
+#include <sys/ioctl.h> | ||
+#include <linux/lp.h> | ||
+#endif /* __linux */ | ||
+ | ||
|
||
/* | ||
* Local functions... | ||
@@ -334,7 +339,19 @@ open_device(const char *uri, /* I - Dev | ||
if (!strncmp(uri, "usb:/dev/", 9)) | ||
#ifdef __linux | ||
{ | ||
- return (open(uri + 4, O_RDWR | O_EXCL)); | ||
+ fd = open(uri + 4, O_RDWR | O_EXCL); | ||
+ | ||
+ if (fd != -1) | ||
+ { | ||
+ /* | ||
+ * Tell the driver to return from write() with errno==ENOSPACE | ||
+ * on paper-out. | ||
+ */ | ||
+ unsigned int t = 1; | ||
+ ioctl (fd, LPABORT, &t); | ||
+ } | ||
+ | ||
+ return fd; | ||
} | ||
else if (!strncmp(uri, "usb://", 6)) | ||
{ | ||
@@ -400,7 +417,14 @@ open_device(const char *uri, /* I - Dev | ||
if (!strcmp(uri, device_uri)) | ||
{ | ||
/* | ||
- * Yes, return this file descriptor... | ||
+ * Yes, tell the driver to return from write() with | ||
+ * errno==ENOSPACE on paper-out. | ||
+ */ | ||
+ unsigned int t = 1; | ||
+ ioctl (fd, LPABORT, &t); | ||
+ | ||
+ /* | ||
+ * Return this file descriptor... | ||
*/ | ||
|
||
fprintf(stderr, "DEBUG: Printer using device file \"%s\"...\n", |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
diff -up cups-1.5b1/backend/usb-unix.c.uri-compat cups-1.5b1/backend/usb-unix.c | ||
--- cups-1.5b1/backend/usb-unix.c.uri-compat 2011-05-24 15:59:05.000000000 +0200 | ||
+++ cups-1.5b1/backend/usb-unix.c 2011-05-24 16:02:03.000000000 +0200 | ||
@@ -63,11 +63,34 @@ print_device(const char *uri, /* I - De | ||
int device_fd; /* USB device */ | ||
ssize_t tbytes; /* Total number of bytes written */ | ||
struct termios opts; /* Parallel port options */ | ||
+ char *fixed_uri = strdup (uri); | ||
+ char *p; | ||
|
||
|
||
(void)argc; | ||
(void)argv; | ||
|
||
+ p = strchr (fixed_uri, ':'); | ||
+ if (p++ != NULL) | ||
+ { | ||
+ char *e; | ||
+ p += strspn (p, "/"); | ||
+ e = strchr (p, '/'); | ||
+ if (e > p) | ||
+ { | ||
+ size_t mfrlen = e - p; | ||
+ e++; | ||
+ if (!strncasecmp (e, p, mfrlen)) | ||
+ { | ||
+ char *x = e + mfrlen; | ||
+ if (!strncmp (x, "%20", 3)) | ||
+ /* Take mfr name out of mdl name for compatibility with | ||
+ * Fedora 11 before bug #507244 was fixed. */ | ||
+ strcpy (e, x + 3); puts(fixed_uri); | ||
+ } | ||
+ } | ||
+ } | ||
+ | ||
/* | ||
* Open the USB port device... | ||
*/ | ||
@@ -107,10 +130,10 @@ print_device(const char *uri, /* I - De | ||
_cups_strncasecmp(hostname, "Minolta", 7); | ||
#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */ | ||
|
||
- if (use_bc && !strncmp(uri, "usb:/dev/", 9)) | ||
+ if (use_bc && !strncmp(fixed_uri, "usb:/dev/", 9)) | ||
use_bc = 0; | ||
|
||
- if ((device_fd = open_device(uri, &use_bc)) == -1) | ||
+ if ((device_fd = open_device(fixed_uri, &use_bc)) == -1) | ||
{ | ||
if (getenv("CLASS") != NULL) | ||
{ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff -up cups-2.0.2/cups/http-addr.c.freebind cups-2.0.2/cups/http-addr.c | ||
--- cups-2.0.2/cups/http-addr.c.freebind 2015-02-10 14:46:33.000000000 +0100 | ||
+++ cups-2.0.2/cups/http-addr.c 2015-02-10 14:50:35.074759141 +0100 | ||
@@ -186,6 +186,10 @@ httpAddrListen(http_addr_t *addr, /* I - | ||
val = 1; | ||
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, CUPS_SOCAST &val, sizeof(val)); | ||
|
||
+#ifdef __linux | ||
+ setsockopt(fd, IPPROTO_IP, IP_FREEBIND, CUPS_SOCAST &val, sizeof(val)); | ||
+#endif /* __linux */ | ||
+ | ||
#ifdef IPV6_V6ONLY | ||
if (addr->addr.sa_family == AF_INET6) | ||
setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, CUPS_SOCAST &val, sizeof(val)); | ||
diff -up cups-2.0.2/scheduler/listen.c.freebind cups-2.0.2/scheduler/listen.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff -up cups-1.7.0/backend/ipp.c.ipp-multifile cups-1.7.0/backend/ipp.c | ||
--- cups-1.7.0/backend/ipp.c.ipp-multifile 2013-10-24 15:52:00.745814354 +0100 | ||
+++ cups-1.7.0/backend/ipp.c 2013-10-24 15:53:46.463266724 +0100 | ||
@@ -1758,7 +1758,10 @@ main(int argc, /* I - Number of comm | ||
ippAddBoolean(request, IPP_TAG_OPERATION, "last-document", | ||
(i + 1) >= num_files); | ||
|
||
- if (document_format) | ||
+ if (num_files > 1) | ||
+ ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, | ||
+ "document-format", NULL, "application/octet-stream"); | ||
+ else if (document_format) | ||
ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, | ||
"document-format", NULL, document_format); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
diff -up cups-1.7rc1/cgi-bin/admin.c.web-devices-timeout cups-1.7rc1/cgi-bin/admin.c | ||
--- cups-1.7rc1/cgi-bin/admin.c.web-devices-timeout 2013-05-29 12:51:34.000000000 +0100 | ||
+++ cups-1.7rc1/cgi-bin/admin.c 2013-08-16 16:01:17.308264287 +0100 | ||
@@ -1019,13 +1019,13 @@ do_am_printer(http_t *http, /* I - HTTP | ||
} | ||
|
||
/* | ||
- * Scan for devices for up to 30 seconds... | ||
+ * Scan for devices for up to 10 seconds... | ||
*/ | ||
|
||
fputs("DEBUG: Getting list of devices...\n", stderr); | ||
|
||
current_device = 0; | ||
- if (cupsGetDevices(http, 5, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE, | ||
+ if (cupsGetDevices(http, 10, CUPS_INCLUDE_ALL, CUPS_EXCLUDE_NONE, | ||
(cups_device_cb_t)choose_device_cb, | ||
(void *)title) == IPP_OK) | ||
{ |
Oops, something went wrong.