diff options
author | Eric Bénard <eric@eukrea.com> | 2010-09-21 10:43:32 +0200 |
---|---|---|
committer | Eric Bénard <eric@eukrea.com> | 2010-09-24 15:15:34 +0200 |
commit | b947b798b514d00b961947fa77c791d651945eed (patch) | |
tree | 866ee28358f96266ac5be330e63b5adc8edc4e47 /recipes/cups | |
parent | dd955396c4521a882e037eae75bede4c647fd4b7 (diff) | |
download | openembedded-b947b798b514d00b961947fa77c791d651945eed.tar.gz |
cups: add version 1.4.4
* libusb support is enabled in this recipe
* DEFAULT_PREFERENCE = "-1" as previous recipe didn't enable this
Signed-off-by: Eric Bénard <eric@eukrea.com>
Diffstat (limited to 'recipes/cups')
-rw-r--r-- | recipes/cups/cups-1.4.4/configure.patch | 117 | ||||
-rw-r--r-- | recipes/cups/cups-1.4.4/skip_tools.patch | 51 | ||||
-rw-r--r-- | recipes/cups/cups-1.4.4/use_echo_only_in_init.patch | 11 | ||||
-rw-r--r-- | recipes/cups/cups_1.4.4.bb | 17 |
4 files changed, 196 insertions, 0 deletions
diff --git a/recipes/cups/cups-1.4.4/configure.patch b/recipes/cups/cups-1.4.4/configure.patch new file mode 100644 index 0000000000..877e8d3232 --- /dev/null +++ b/recipes/cups/cups-1.4.4/configure.patch @@ -0,0 +1,117 @@ +--- cups-1.4.3/configure.orig 2010-04-08 11:14:19.092296014 +0200 ++++ cups-1.4.3/configure 2010-04-08 11:19:02.661417938 +0200 +@@ -10940,114 +10940,6 @@ + OPTIM="-fPIC $OPTIM" + fi + +- # The -fstack-protector option is available with some versions of +- # GCC and adds "stack canaries" which detect when the return address +- # has been overwritten, preventing many types of exploit attacks. +- { echo "$as_me:$LINENO: checking if GCC supports -fstack-protector" >&5 +-echo $ECHO_N "checking if GCC supports -fstack-protector... $ECHO_C" >&6; } +- OLDCFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -fstack-protector" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_link") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest$ac_exeext && +- $as_test_x conftest$ac_exeext; then +- OPTIM="$OPTIM -fstack-protector" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- conftest$ac_exeext conftest.$ac_ext +- CFLAGS="$OLDCFLAGS" +- +- # The -pie option is available with some versions of GCC and adds +- # randomization of addresses, which avoids another class of exploits +- # that depend on a fixed address for common functions. +- { echo "$as_me:$LINENO: checking if GCC supports -pie" >&5 +-echo $ECHO_N "checking if GCC supports -pie... $ECHO_C" >&6; } +- OLDCFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -pie -fPIE" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- PIEFLAGS="-pie -fPIE" +- { echo "$as_me:$LINENO: result: yes" >&5 +-echo "${ECHO_T}yes" >&6; } +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- { echo "$as_me:$LINENO: result: no" >&5 +-echo "${ECHO_T}no" >&6; } +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$OLDCFLAGS" +- + if test "x$with_optim" = x; then + # Add useful warning options for tracking down problems... + OPTIM="-Wall -Wno-format-y2k $OPTIM" diff --git a/recipes/cups/cups-1.4.4/skip_tools.patch b/recipes/cups/cups-1.4.4/skip_tools.patch new file mode 100644 index 0000000000..272110146b --- /dev/null +++ b/recipes/cups/cups-1.4.4/skip_tools.patch @@ -0,0 +1,51 @@ +--- cups-1.4.3/ppdc/Makefile.orig 2010-04-07 12:38:56.650327699 +0200 ++++ cups-1.4.3/ppdc/Makefile 2010-04-07 12:40:05.842418876 +0200 +@@ -243,8 +243,8 @@ + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ + libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \ + $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) +- echo Generating localization strings... +- ./genstrings >sample.c ++# echo Generating localization strings... ++# ./genstrings >sample.c + + + # +@@ -261,9 +261,9 @@ + $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \ + ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \ + $(COMMONLIBS) $(LIBZ) +- echo Testing PPD compiler... +- ./ppdc-static -l en,fr -I ../data foo.drv +- ./ppdc-static -l en,fr -z -I ../data foo.drv ++# echo Testing PPD compiler... ++# ./ppdc-static -l en,fr -I ../data foo.drv ++# ./ppdc-static -l en,fr -z -I ../data foo.drv + + + # +@@ -291,15 +291,15 @@ + $(COMMONLIBS) $(LIBZ) + echo Testing PPD importer... + $(RM) -r ppd ppd2 sample-import.drv +- ./ppdc-static -I ../data sample.drv +- ./ppdi-static -I ../data -o sample-import.drv ppd/* +- ./ppdc-static -I ../data -d ppd2 sample-import.drv +- if diff -qr ppd ppd2; then \ +- echo PPD import OK; \ +- else \ +- echo PPD import FAILED; \ +- exit 1; \ +- fi ++# ./ppdc-static -I ../data sample.drv ++# ./ppdi-static -I ../data -o sample-import.drv ppd/* ++# ./ppdc-static -I ../data -d ppd2 sample-import.drv ++# if diff -qr ppd ppd2; then \ ++# echo PPD import OK; \ ++# else \ ++# echo PPD import FAILED; \ ++# exit 1; \ ++# fi + + + # diff --git a/recipes/cups/cups-1.4.4/use_echo_only_in_init.patch b/recipes/cups/cups-1.4.4/use_echo_only_in_init.patch new file mode 100644 index 0000000000..21ff0e535b --- /dev/null +++ b/recipes/cups/cups-1.4.4/use_echo_only_in_init.patch @@ -0,0 +1,11 @@ +--- a/init/cups.sh.in.orig 2008-10-04 16:50:46.000000000 -0300 ++++ b/init/cups.sh.in 2008-10-04 16:51:39.000000000 -0300 +@@ -68,7 +68,7 @@ + ECHO_ERROR=: + ;; + +- Linux*) ++ DISABLELinux*) + IS_ON=/bin/true + if test -f /etc/init.d/functions; then + . /etc/init.d/functions diff --git a/recipes/cups/cups_1.4.4.bb b/recipes/cups/cups_1.4.4.bb new file mode 100644 index 0000000000..7813dbfe61 --- /dev/null +++ b/recipes/cups/cups_1.4.4.bb @@ -0,0 +1,17 @@ +require cups14.inc + +SRC_URI += " \ + file://use_echo_only_in_init.patch \ + file://skip_tools.patch \ + file://configure.patch \ + " + +SRC_URI[archive.md5sum] = "8776403ad60fea9e85eab9c04d88560d" +SRC_URI[archive.sha256sum] = "d25ffa35add3abeeec0eba60be2cffc89425b649c64ef3a73dfc724683a59aa3" + +PR = "r1" + +DEFAULT_PREFERENCE = "-1" +DEPENDS += " libusb " +EXTRA_OECONF += " --disable-gssapi --disable-largefile --enable-debug --disable-relro --enable-libusb" +CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" |