aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-support
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-01-30 15:37:30 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-01-30 16:50:35 +0100
commit7c3864e0182d817dcfac6f1baa3af232e03adab0 (patch)
tree0ee7b88ae7b27b2cf6f524258344220939af9710 /recipes-support
parenta0fea6dda7c711d3c78931bf89d1279d98e425ef (diff)
downloadmeta-openembedded-contrib-7c3864e0182d817dcfac6f1baa3af232e03adab0.tar.gz
meta-openembedded-contrib-7c3864e0182d817dcfac6f1baa3af232e03adab0.tar.bz2
meta-openembedded-contrib-7c3864e0182d817dcfac6f1baa3af232e03adab0.zip
cups 1.4.6: clean up recipe and patches
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-support')
-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.patch117
-rw-r--r--recipes-support/cups/cups.inc89
-rw-r--r--recipes-support/cups/cups14.inc37
-rw-r--r--recipes-support/cups/cups_1.4.6.bb3
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 @@
---- 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 @@
+From 90069586167b930befce7303aea57078f04b4ed8 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sun, 30 Jan 2011 16:37:27 +0100
+Subject: [PATCH] don't try to run generated binaries
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ ppdc/Makefile | 30 +++++++++++++++---------------
+ 1 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/ppdc/Makefile b/ppdc/Makefile
+index 0288d47..fc87f1b 100644
+--- a/ppdc/Makefile
++++ b/ppdc/Makefile
+@@ -243,8 +243,8 @@ genstrings: genstrings.o libcupsppdc.a ../cups/libcups.a \
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \
libcupsppdc.a ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) \
$(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
@@ -11,7 +23,7 @@
#
-@@ -261,9 +261,9 @@
+@@ -261,9 +261,9 @@ ppdc-static: ppdc.o libcupsppdc.a ../cups/libcups.a foo.drv foo-fr.po
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o ppdc-static ppdc.o libcupsppdc.a \
../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
$(COMMONLIBS) $(LIBZ)
@@ -24,23 +36,25 @@
#
-@@ -291,15 +291,15 @@
+@@ -290,16 +290,16 @@ ppdi-static: ppdc-static ppdi.o libcupsppdc.a ../cups/libcups.a
+ ../cups/libcups.a $(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) \
$(COMMONLIBS) $(LIBZ)
echo Testing PPD importer...
- $(RM) -r ppd ppd2 sample-import.drv
+- $(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 \
+- if diff -r ppd ppd2 >/dev/null; then \
- echo PPD import OK; \
- else \
- echo PPD import FAILED; \
- exit 1; \
- fi
++# $(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 \
++# if diff -r ppd ppd2 >/dev/null; then \
+# echo PPD import OK; \
+# else \
+# echo PPD import FAILED; \
@@ -49,3 +63,6 @@
#
+--
+1.6.6.1
+
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 @@
---- 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-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 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib"
-
-INC_PR = "r7"
-
-SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- "
-
-inherit autotools binconfig
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --disable-ssl \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- export DSOFLAGS="${LDFLAGS}"
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "install:" >> man/Makefile
-
- oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \
- "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \
- "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \
- "LIBZ=-lz -L${STAGING_LIBDIR}" \
- "-I."
-}
-
-do_install () {
- oe_runmake "DSTROOT=${D}" install
-
- # This directory gets installed with perms 511, which makes packaging fail
- chmod 0711 "${D}/${localstatedir}/run/cups/certs"
-}
-
-python do_package_append() {
- # Change permissions back the way they were, they probably had a reason...
- pkgdest = bb.data.getVar('PKGDEST', d, 1)
- os.system('chmod 0511 %s/cups/var/run/cups/certs' % pkgdest)
-}
-
-SYSROOT_PREPROCESS_FUNCS += "cups_config_mangle"
-
-cups_config_mangle() {
- # Undo mangle of cups_datadir and cups_serverbin
- sed -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:g' \
- -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:g' \
- -i ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/cups-config
-}
-
-PACKAGES =+ "${PN}-lib ${PN}-libimage"
-
-FILES_${PN}-lib = "${libdir}/libcups.so.*"
-
-FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
-
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
- ${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
-#package the html for the webgui inside the main packages (~1MB uncompressed)
-
-FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
- ${datadir}/icons/ \
- "
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 @@
DESCRIPTION = "An Internet printing system for Unix."
SECTION = "console/utils"
-LICENSE = "GPL LGPL"
+LICENSE = "GPLv2 LGPLv2"
DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib"
PROVIDES = "cups14"
@@ -11,15 +11,15 @@ LEAD_SONAME = "libcupsdriver.so"
inherit autotools binconfig
EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
+ --enable-gnutls \
+ --enable-dbus \
+ --enable-browsing \
+ --disable-openssl \
+ --disable-tiff \
+ --without-php \
+ --without-perl \
+ --without-python \
+ --without-java \
"
@@ -69,15 +69,16 @@ FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
${libdir}/cups/cgi-bin/.debug \
- ${libdir}/cups/filter/.debug \
- ${libdir}/cups/monitor/.debug \
- ${libdir}/cups/notifier/.debug \
- ${libdir}/cups/daemon/.debug \
- "
+ ${libdir}/cups/filter/.debug \
+ ${libdir}/cups/monitor/.debug \
+ ${libdir}/cups/notifier/.debug \
+ ${libdir}/cups/daemon/.debug \
+ "
+
#package the html for the webgui inside the main packages (~1MB uncompressed)
FILES_${PN} += "${datadir}/doc/cups/images \
- ${datadir}/doc/cups/*html \
- ${datadir}/doc/cups/*.css \
+ ${datadir}/doc/cups/*html \
+ ${datadir}/doc/cups/*.css \
${datadir}/icons/ \
- "
+ "
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"
SRC_URI += " \
file://use_echo_only_in_init.patch \
- file://skip_tools.patch \
- file://configure.patch \
+ file://0001-don-t-try-to-run-generated-binaries.patch \
"
SRC_URI[md5sum] = "de8fb5a29c36554925c0c6a6e2c0dae1"