summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-extended/cups/cups.inc1
-rw-r--r--meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch35
-rw-r--r--meta/recipes-extended/cups/cups/cups-no-gcrypt.patch49
-rw-r--r--meta/recipes-extended/cups/cups_1.7.5.bb6
-rw-r--r--meta/recipes-extended/cups/cups_2.0.0.bb6
5 files changed, 23 insertions, 74 deletions
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index 945f69a2c4..6720c3d596 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -7,7 +7,6 @@ SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \
7 file://use_echo_only_in_init.patch \ 7 file://use_echo_only_in_init.patch \
8 file://0001-don-t-try-to-run-generated-binaries.patch \ 8 file://0001-don-t-try-to-run-generated-binaries.patch \
9 file://cups_serverbin.patch \ 9 file://cups_serverbin.patch \
10 file://cups-no-gcrypt.patch \
11 file://cups.socket \ 10 file://cups.socket \
12 file://cups.path \ 11 file://cups.path \
13 file://cups.service \ 12 file://cups.service \
diff --git a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
index e6544b5607..5379eb6aa2 100644
--- a/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
+++ b/meta/recipes-extended/cups/cups/0001-don-t-try-to-run-generated-binaries.patch
@@ -10,13 +10,13 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10 ppdc/Makefile | 30 +++++++++++++++--------------- 10 ppdc/Makefile | 30 +++++++++++++++---------------
11 1 files changed, 15 insertions(+), 15 deletions(-) 11 1 files changed, 15 insertions(+), 15 deletions(-)
12 12
13diff --git a/ppdc/Makefile b/ppdc/Makefile 13Index: cups-2.0.0/ppdc/Makefile
14index 0288d47..fc87f1b 100644 14===================================================================
15--- a/ppdc/Makefile 15--- cups-2.0.0.orig/ppdc/Makefile
16+++ b/ppdc/Makefile 16+++ cups-2.0.0/ppdc/Makefile
17@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ 17@@ -242,8 +242,8 @@ genstrings: genstrings.o libcupsppdc.a
18 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ 18 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
19 libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ 19 libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \
20 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) 20 $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
21- echo Generating localization strings... 21- echo Generating localization strings...
22- ./genstrings >sample.c 22- ./genstrings >sample.c
@@ -25,9 +25,9 @@ index 0288d47..fc87f1b 100644
25 25
26 26
27 # 27 #
28@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po 28@@ -260,9 +260,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cu
29 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ 29 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
30 ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 30 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
31 $(COMMONLIBS) $(LIBZ) 31 $(COMMONLIBS) $(LIBZ)
32- echo Testing PPD compiler... 32- echo Testing PPD compiler...
33- ./ppdc-static -l en,fr -I ../data foo.drv 33- ./ppdc-static -l en,fr -I ../data foo.drv
@@ -38,24 +38,26 @@ index 0288d47..fc87f1b 100644
38 38
39 39
40 # 40 #
41@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a 41@@ -288,17 +288,17 @@ ppdi-static: ppdc-static ppdi.o libcups
42 ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ 42 $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdi-static ppdi.o libcupsppdc.a \
43 ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
43 $(COMMONLIBS) $(LIBZ) 44 $(COMMONLIBS) $(LIBZ)
44 echo Testing PPD importer... 45- echo Testing PPD importer...
45- $(RM) -r ppd ppd2 sample-import.drv 46- $(RM) -r ppd ppd2 sample-import.drv
46- ./ppdc-static -I ../data sample.drv 47- ./ppdc-static -l en -I ../data sample.drv
47- ./ppdi-static -I ../data -o sample-import.drv ppd/* 48- ./ppdi-static -I ../data -o sample-import.drv ppd/*
48- ./ppdc-static -I ../data -d ppd2 sample-import.drv 49- ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
49- if diff -r ppd ppd2 >/dev/null; then \ 50- if diff -r ppd ppd2 >/dev/null; then \
50- echo PPD import OK; \ 51- echo PPD import OK; \
51- else \ 52- else \
52- echo PPD import FAILED; \ 53- echo PPD import FAILED; \
53- exit 1; \ 54- exit 1; \
54- fi 55- fi
56+# echo Testing PPD importer...
55+# $(RM) -r ppd ppd2 sample-import.drv 57+# $(RM) -r ppd ppd2 sample-import.drv
56+# ./ppdc-static -I ../data sample.drv 58+# ./ppdc-static -l en -I ../data sample.drv
57+# ./ppdi-static -I ../data -o sample-import.drv ppd/* 59+# ./ppdi-static -I ../data -o sample-import.drv ppd/*
58+# ./ppdc-static -I ../data -d ppd2 sample-import.drv 60+# ./ppdc-static -l en -I ../data -d ppd2 sample-import.drv
59+# if diff -r ppd ppd2 >/dev/null; then \ 61+# if diff -r ppd ppd2 >/dev/null; then \
60+# echo PPD import OK; \ 62+# echo PPD import OK; \
61+# else \ 63+# else \
@@ -65,6 +67,3 @@ index 0288d47..fc87f1b 100644
65 67
66 68
67 # 69 #
68--
691.6.6.1
70
diff --git a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch b/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
deleted file mode 100644
index 8bbcf39497..0000000000
--- a/meta/recipes-extended/cups/cups/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1Description: Don't build-depend on libgcrypt, as nothing is used from it
2Author: Didier Raboud <odyx@debian.org>
3Bug-Debian: https://bugs.debian.org/638416
4Bug: http://www.cups.org/str.php?L????
5
6[CUPS Ticket #4399] -- http://www.cups.org/str.php?L4399
7
8Backported from http://www.cups.org/strfiles.php/3308/cups-no-gcrypt.patch
9
10Upstream-Status: Backport
11
12Signed-off-by: Armin Kuster <akuster@mvista.com>
13
14Last-Update: 2014-04-07
15--- a/config-scripts/cups-ssl.m4
16+++ b/config-scripts/cups-ssl.m4
17@@ -66,7 +66,6 @@
18 dnl Then look for GNU TLS...
19 if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
20 AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
21- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
22 if $PKGCONFIG --exists gnutls; then
23 have_ssl=1
24 SSLLIBS=`$PKGCONFIG --libs gnutls`
25@@ -84,14 +83,6 @@
26 if test $have_ssl = 1; then
27 CUPS_SERVERCERT="ssl/server.crt"
28 CUPS_SERVERKEY="ssl/server.key"
29-
30- if $PKGCONFIG --exists gcrypt; then
31- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
32- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
33- elif test "x$LIBGCRYPTCONFIG" != x; then
34- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
35- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
36- fi
37 fi
38 fi
39
40--- a/cups/http-private.h
41+++ b/cups/http-private.h
42@@ -80,7 +80,6 @@
43 # elif defined HAVE_GNUTLS
44 # include <gnutls/gnutls.h>
45 # include <gnutls/x509.h>
46-# include <gcrypt.h>
47 # elif defined(HAVE_CDSASSL)
48 # include <CoreFoundation/CoreFoundation.h>
49 # include <Security/Security.h>
diff --git a/meta/recipes-extended/cups/cups_1.7.5.bb b/meta/recipes-extended/cups/cups_1.7.5.bb
deleted file mode 100644
index 5538cecfd5..0000000000
--- a/meta/recipes-extended/cups/cups_1.7.5.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
4
5SRC_URI[md5sum] = "5d893edc2957005f78e2b2423fdace2e"
6SRC_URI[sha256sum] = "18cb4c6847dbaaaa05c8b35af787f19dd5c7686970b46548e72c711c6f26bd02"
diff --git a/meta/recipes-extended/cups/cups_2.0.0.bb b/meta/recipes-extended/cups/cups_2.0.0.bb
new file mode 100644
index 0000000000..384cd0bf88
--- /dev/null
+++ b/meta/recipes-extended/cups/cups_2.0.0.bb
@@ -0,0 +1,6 @@
1require cups.inc
2
3LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=6c5a350596fba02754bd96eb6df3afd0"
4
5SRC_URI[md5sum] = "2cdd81fea23e9e29555c24bdfd0d7c89"
6SRC_URI[sha256sum] = "83fdbbcb4ac4d82949bbde6d5dce7a4b6a62557da8f3d46c5e34b951110f5be2"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-09 22:29:01 +0000