diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-30 15:37:30 +0100 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-01-30 16:50:35 +0100 |
commit | 7c3864e0182d817dcfac6f1baa3af232e03adab0 (patch) | |
tree | 0ee7b88ae7b27b2cf6f524258344220939af9710 | |
parent | a0fea6dda7c711d3c78931bf89d1279d98e425ef (diff) | |
download | meta-openembedded-7c3864e0182d817dcfac6f1baa3af232e03adab0.tar.gz |
cups 1.4.6: clean up recipe and patches
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
-rw-r--r-- | recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch (renamed from recipes-support/cups/cups-1.4.6/skip_tools.patch) | 33 | ||||
-rw-r--r-- | recipes-support/cups/cups-1.4.6/configure.patch | 117 | ||||
-rw-r--r-- | recipes-support/cups/cups.inc | 89 | ||||
-rw-r--r-- | recipes-support/cups/cups14.inc | 37 | ||||
-rw-r--r-- | recipes-support/cups/cups_1.4.6.bb | 3 |
5 files changed, 45 insertions, 234 deletions
diff --git a/recipes-support/cups/cups-1.4.6/skip_tools.patch b/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch index 272110146b..7b544ca0e3 100644 --- a/recipes-support/cups/cups-1.4.6/skip_tools.patch +++ b/recipes-support/cups/cups-1.4.6/0001-don-t-try-to-run-generated-binaries.patch | |||
@@ -1,6 +1,18 @@ | |||
1 | --- cups-1.4.3/ppdc/Makefile.orig 2010-04-07 12:38:56.650327699 +0200 | 1 | From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001 |
2 | +++ cups-1.4.3/ppdc/Makefile 2010-04-07 12:40:05.842418876 +0200 | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | @@ -243,8 +243,8 @@ | 3 | Date: Sun, 30 Jan 2011 16:37:27 +0100 |
4 | Subject: [PATCH] don't try to run generated binaries | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | ppdc/Makefile | 30 +++++++++++++++--------------- | ||
9 | 1 files changed, 15 insertions(+), 15 deletions(-) | ||
10 | |||
11 | diff --git a/ppdc/Makefile b/ppdc/Makefile | ||
12 | index 0288d47..fc87f1b 100644 | ||
13 | --- a/ppdc/Makefile | ||
14 | +++ b/ppdc/Makefile | ||
15 | @@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \ | ||
4 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ | 16 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ |
5 | libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ | 17 | libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ |
6 | $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) | 18 | $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) |
@@ -11,7 +23,7 @@ | |||
11 | 23 | ||
12 | 24 | ||
13 | # | 25 | # |
14 | @@ -261,9 +261,9 @@ | 26 | @@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po |
15 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ | 27 | $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ |
16 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | 28 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ |
17 | $(COMMONLIBS) $(LIBZ) | 29 | $(COMMONLIBS) $(LIBZ) |
@@ -24,23 +36,25 @@ | |||
24 | 36 | ||
25 | 37 | ||
26 | # | 38 | # |
27 | @@ -291,15 +291,15 @@ | 39 | @@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a |
40 | ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ | ||
28 | $(COMMONLIBS) $(LIBZ) | 41 | $(COMMONLIBS) $(LIBZ) |
29 | echo Testing PPD importer... | 42 | echo Testing PPD importer... |
30 | $(RM) -r ppd ppd2 sample-import.drv | 43 | - $(RM) -r ppd ppd2 sample-import.drv |
31 | - ./ppdc-static -I ../data sample.drv | 44 | - ./ppdc-static -I ../data sample.drv |
32 | - ./ppdi-static -I ../data -o sample-import.drv ppd/* | 45 | - ./ppdi-static -I ../data -o sample-import.drv ppd/* |
33 | - ./ppdc-static -I ../data -d ppd2 sample-import.drv | 46 | - ./ppdc-static -I ../data -d ppd2 sample-import.drv |
34 | - if diff -qr ppd ppd2; then \ | 47 | - if diff -r ppd ppd2 >/dev/null; then \ |
35 | - echo PPD import OK; \ | 48 | - echo PPD import OK; \ |
36 | - else \ | 49 | - else \ |
37 | - echo PPD import FAILED; \ | 50 | - echo PPD import FAILED; \ |
38 | - exit 1; \ | 51 | - exit 1; \ |
39 | - fi | 52 | - fi |
53 | +# $(RM) -r ppd ppd2 sample-import.drv | ||
40 | +# ./ppdc-static -I ../data sample.drv | 54 | +# ./ppdc-static -I ../data sample.drv |
41 | +# ./ppdi-static -I ../data -o sample-import.drv ppd/* | 55 | +# ./ppdi-static -I ../data -o sample-import.drv ppd/* |
42 | +# ./ppdc-static -I ../data -d ppd2 sample-import.drv | 56 | +# ./ppdc-static -I ../data -d ppd2 sample-import.drv |
43 | +# if diff -qr ppd ppd2; then \ | 57 | +# if diff -r ppd ppd2 >/dev/null; then \ |
44 | +# echo PPD import OK; \ | 58 | +# echo PPD import OK; \ |
45 | +# else \ | 59 | +# else \ |
46 | +# echo PPD import FAILED; \ | 60 | +# echo PPD import FAILED; \ |
@@ -49,3 +63,6 @@ | |||
49 | 63 | ||
50 | 64 | ||
51 | # | 65 | # |
66 | -- | ||
67 | 1.6.6.1 | ||
68 | |||
diff --git a/recipes-support/cups/cups-1.4.6/configure.patch b/recipes-support/cups/cups-1.4.6/configure.patch deleted file mode 100644 index 877e8d3232..0000000000 --- a/recipes-support/cups/cups-1.4.6/configure.patch +++ /dev/null | |||
@@ -1,117 +0,0 @@ | |||
1 | --- cups-1.4.3/configure.orig 2010-04-08 11:14:19.092296014 +0200 | ||
2 | +++ cups-1.4.3/configure 2010-04-08 11:19:02.661417938 +0200 | ||
3 | @@ -10940,114 +10940,6 @@ | ||
4 | OPTIM="-fPIC $OPTIM" | ||
5 | fi | ||
6 | |||
7 | - # The -fstack-protector option is available with some versions of | ||
8 | - # GCC and adds "stack canaries" which detect when the return address | ||
9 | - # has been overwritten, preventing many types of exploit attacks. | ||
10 | - { echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5 | ||
11 | -echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; } | ||
12 | - OLDCFLAGS="$CFLAGS" | ||
13 | - CFLAGS="$CFLAGS -fstack-protector" | ||
14 | - cat >conftest.$ac_ext <<_ACEOF | ||
15 | -/* confdefs.h. */ | ||
16 | -_ACEOF | ||
17 | -cat confdefs.h >>conftest.$ac_ext | ||
18 | -cat >>conftest.$ac_ext <<_ACEOF | ||
19 | -/* end confdefs.h. */ | ||
20 | - | ||
21 | -int | ||
22 | -main () | ||
23 | -{ | ||
24 | - | ||
25 | - ; | ||
26 | - return 0; | ||
27 | -} | ||
28 | -_ACEOF | ||
29 | -rm -f conftest.$ac_objext conftest$ac_exeext | ||
30 | -if { (ac_try="$ac_link" | ||
31 | -case "(($ac_try" in | ||
32 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
33 | - *) ac_try_echo=$ac_try;; | ||
34 | -esac | ||
35 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
36 | - (eval "$ac_link") 2>conftest.er1 | ||
37 | - ac_status=$? | ||
38 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
39 | - rm -f conftest.er1 | ||
40 | - cat conftest.err >&5 | ||
41 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
42 | - (exit $ac_status); } && { | ||
43 | - test -z "$ac_c_werror_flag" || | ||
44 | - test ! -s conftest.err | ||
45 | - } && test -s conftest$ac_exeext && | ||
46 | - $as_test_x conftest$ac_exeext; then | ||
47 | - OPTIM="$OPTIM -fstack-protector" | ||
48 | - { echo "$as_me:$LINENO: result: yes" >&5 | ||
49 | -echo "${ECHO_T}yes" >&6; } | ||
50 | -else | ||
51 | - echo "$as_me: failed program was:" >&5 | ||
52 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
53 | - | ||
54 | - { echo "$as_me:$LINENO: result: no" >&5 | ||
55 | -echo "${ECHO_T}no" >&6; } | ||
56 | -fi | ||
57 | - | ||
58 | -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ | ||
59 | - conftest$ac_exeext conftest.$ac_ext | ||
60 | - CFLAGS="$OLDCFLAGS" | ||
61 | - | ||
62 | - # The -pie option is available with some versions of GCC and adds | ||
63 | - # randomization of addresses, which avoids another class of exploits | ||
64 | - # that depend on a fixed address for common functions. | ||
65 | - { echo "$as_me:$LINENO: checking if GCC supports -pie" >&5 | ||
66 | -echo $ECHO_N "checking if GCC supports -pie... $ECHO_C" >&6; } | ||
67 | - OLDCFLAGS="$CFLAGS" | ||
68 | - CFLAGS="$CFLAGS -pie -fPIE" | ||
69 | - cat >conftest.$ac_ext <<_ACEOF | ||
70 | -/* confdefs.h. */ | ||
71 | -_ACEOF | ||
72 | -cat confdefs.h >>conftest.$ac_ext | ||
73 | -cat >>conftest.$ac_ext <<_ACEOF | ||
74 | -/* end confdefs.h. */ | ||
75 | - | ||
76 | -int | ||
77 | -main () | ||
78 | -{ | ||
79 | - | ||
80 | - ; | ||
81 | - return 0; | ||
82 | -} | ||
83 | -_ACEOF | ||
84 | -rm -f conftest.$ac_objext | ||
85 | -if { (ac_try="$ac_compile" | ||
86 | -case "(($ac_try" in | ||
87 | - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; | ||
88 | - *) ac_try_echo=$ac_try;; | ||
89 | -esac | ||
90 | -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 | ||
91 | - (eval "$ac_compile") 2>conftest.er1 | ||
92 | - ac_status=$? | ||
93 | - grep -v '^ *+' conftest.er1 >conftest.err | ||
94 | - rm -f conftest.er1 | ||
95 | - cat conftest.err >&5 | ||
96 | - echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
97 | - (exit $ac_status); } && { | ||
98 | - test -z "$ac_c_werror_flag" || | ||
99 | - test ! -s conftest.err | ||
100 | - } && test -s conftest.$ac_objext; then | ||
101 | - PIEFLAGS="-pie -fPIE" | ||
102 | - { echo "$as_me:$LINENO: result: yes" >&5 | ||
103 | -echo "${ECHO_T}yes" >&6; } | ||
104 | -else | ||
105 | - echo "$as_me: failed program was:" >&5 | ||
106 | -sed 's/^/| /' conftest.$ac_ext >&5 | ||
107 | - | ||
108 | - { echo "$as_me:$LINENO: result: no" >&5 | ||
109 | -echo "${ECHO_T}no" >&6; } | ||
110 | -fi | ||
111 | - | ||
112 | -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
113 | - CFLAGS="$OLDCFLAGS" | ||
114 | - | ||
115 | if test "x$with_optim" = x; then | ||
116 | # Add useful warning options for tracking down problems... | ||
117 | OPTIM="-Wall -Wno-format-y2k $OPTIM" | ||
diff --git a/recipes-support/cups/cups.inc b/recipes-support/cups/cups.inc deleted file mode 100644 index 8f97f12338..0000000000 --- a/recipes-support/cups/cups.inc +++ /dev/null | |||
@@ -1,89 +0,0 @@ | |||
1 | DESCRIPTION = "An Internet printing system for Unix." | ||
2 | SECTION = "console/utils" | ||
3 | LICENSE = "GPL LGPL" | ||
4 | DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib" | ||
5 | |||
6 | INC_PR = "r7" | ||
7 | |||
8 | SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \ | ||
9 | " | ||
10 | |||
11 | inherit autotools binconfig | ||
12 | |||
13 | EXTRA_OECONF = " \ | ||
14 | --enable-gnutls \ | ||
15 | --enable-dbus \ | ||
16 | --enable-browsing \ | ||
17 | --disable-openssl \ | ||
18 | --disable-tiff \ | ||
19 | --disable-ssl \ | ||
20 | --without-php \ | ||
21 | --without-perl \ | ||
22 | --without-python \ | ||
23 | --without-java \ | ||
24 | " | ||
25 | |||
26 | |||
27 | do_configure() { | ||
28 | export DSOFLAGS="${LDFLAGS}" | ||
29 | gnu-configize | ||
30 | libtoolize --force | ||
31 | oe_runconf | ||
32 | } | ||
33 | |||
34 | do_compile () { | ||
35 | sed -i s:STRIP:NOSTRIP: Makedefs | ||
36 | sed -i s:serial:: backend/Makefile | ||
37 | |||
38 | echo "all:" > man/Makefile | ||
39 | echo "install:" >> man/Makefile | ||
40 | |||
41 | oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ | ||
42 | "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ | ||
43 | "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ | ||
44 | "LIBZ=-lz -L${STAGING_LIBDIR}" \ | ||
45 | "-I." | ||
46 | } | ||
47 | |||
48 | do_install () { | ||
49 | oe_runmake "DSTROOT=${D}" install | ||
50 | |||
51 | # This directory gets installed with perms 511, which makes packaging fail | ||
52 | chmod 0711 "${D}/${localstatedir}/run/cups/certs" | ||
53 | } | ||
54 | |||
55 | python do_package_append() { | ||
56 | # Change permissions back the way they were, they probably had a reason... | ||
57 | pkgdest = bb.data.getVar('PKGDEST', d, 1) | ||
58 | os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest) | ||
59 | } | ||
60 | |||
61 | SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle" | ||
62 | |||
63 | cups_config_mangle() { | ||
64 | # Undo mangle of cups_datadir and cups_serverbin | ||
65 | sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \ | ||
66 | -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \ | ||
67 | -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config | ||
68 | } | ||
69 | |||
70 | PACKAGES =+ "${PN}-lib ${PN}-libimage" | ||
71 | |||
72 | FILES_${PN}-lib = "${libdir}/libcups.so.*" | ||
73 | |||
74 | FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | ||
75 | |||
76 | FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ | ||
77 | ${libdir}/cups/cgi-bin/.debug \ | ||
78 | ${libdir}/cups/filter/.debug \ | ||
79 | ${libdir}/cups/monitor/.debug \ | ||
80 | ${libdir}/cups/notifier/.debug \ | ||
81 | ${libdir}/cups/daemon/.debug \ | ||
82 | " | ||
83 | #package the html for the webgui inside the main packages (~1MB uncompressed) | ||
84 | |||
85 | FILES_${PN} += "${datadir}/doc/cups/images \ | ||
86 | ${datadir}/doc/cups/*html \ | ||
87 | ${datadir}/doc/cups/*.css \ | ||
88 | ${datadir}/icons/ \ | ||
89 | " | ||
diff --git a/recipes-support/cups/cups14.inc b/recipes-support/cups/cups14.inc index 4514724755..430d3ab5b5 100644 --- a/recipes-support/cups/cups14.inc +++ b/recipes-support/cups/cups14.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | DESCRIPTION = "An Internet printing system for Unix." | 1 | DESCRIPTION = "An Internet printing system for Unix." |
2 | SECTION = "console/utils" | 2 | SECTION = "console/utils" |
3 | LICENSE = "GPL LGPL" | 3 | LICENSE = "GPLv2 LGPLv2" |
4 | DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" | 4 | DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" |
5 | PROVIDES = "cups14" | 5 | PROVIDES = "cups14" |
6 | 6 | ||
@@ -11,15 +11,15 @@ LEAD_SONAME = "libcupsdriver.so" | |||
11 | inherit autotools binconfig | 11 | inherit autotools binconfig |
12 | 12 | ||
13 | EXTRA_OECONF = " \ | 13 | EXTRA_OECONF = " \ |
14 | --enable-gnutls \ | 14 | --enable-gnutls \ |
15 | --enable-dbus \ | 15 | --enable-dbus \ |
16 | --enable-browsing \ | 16 | --enable-browsing \ |
17 | --disable-openssl \ | 17 | --disable-openssl \ |
18 | --disable-tiff \ | 18 | --disable-tiff \ |
19 | --without-php \ | 19 | --without-php \ |
20 | --without-perl \ | 20 | --without-perl \ |
21 | --without-python \ | 21 | --without-python \ |
22 | --without-java \ | 22 | --without-java \ |
23 | " | 23 | " |
24 | 24 | ||
25 | 25 | ||
@@ -69,15 +69,16 @@ FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*" | |||
69 | 69 | ||
70 | FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ | 70 | FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \ |
71 | ${libdir}/cups/cgi-bin/.debug \ | 71 | ${libdir}/cups/cgi-bin/.debug \ |
72 | ${libdir}/cups/filter/.debug \ | 72 | ${libdir}/cups/filter/.debug \ |
73 | ${libdir}/cups/monitor/.debug \ | 73 | ${libdir}/cups/monitor/.debug \ |
74 | ${libdir}/cups/notifier/.debug \ | 74 | ${libdir}/cups/notifier/.debug \ |
75 | ${libdir}/cups/daemon/.debug \ | 75 | ${libdir}/cups/daemon/.debug \ |
76 | " | 76 | " |
77 | |||
77 | #package the html for the webgui inside the main packages (~1MB uncompressed) | 78 | #package the html for the webgui inside the main packages (~1MB uncompressed) |
78 | 79 | ||
79 | FILES_${PN} += "${datadir}/doc/cups/images \ | 80 | FILES_${PN} += "${datadir}/doc/cups/images \ |
80 | ${datadir}/doc/cups/*html \ | 81 | ${datadir}/doc/cups/*html \ |
81 | ${datadir}/doc/cups/*.css \ | 82 | ${datadir}/doc/cups/*.css \ |
82 | ${datadir}/icons/ \ | 83 | ${datadir}/icons/ \ |
83 | " | 84 | " |
diff --git a/recipes-support/cups/cups_1.4.6.bb b/recipes-support/cups/cups_1.4.6.bb index 850b80c5cc..783ecf6b3a 100644 --- a/recipes-support/cups/cups_1.4.6.bb +++ b/recipes-support/cups/cups_1.4.6.bb | |||
@@ -6,8 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=956e7600195e6139f12de8c2a5bbefa9" | |||
6 | 6 | ||
7 | SRC_URI += " \ | 7 | SRC_URI += " \ |
8 | file://use_echo_only_in_init.patch \ | 8 | file://use_echo_only_in_init.patch \ |
9 | file://skip_tools.patch \ | 9 | file://0001-don-t-try-to-run-generated-binaries.patch \ |
10 | file://configure.patch \ | ||
11 | " | 10 | " |
12 | 11 | ||
13 | SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1" | 12 | SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1" |