* [PATCH 1/9] apr: add 1.4.2
@ 2011-03-13 18:58 Eric Bénard
2011-03-13 18:58 ` [PATCH 2/9] apr-util: add 1.3.10 Eric Bénard
` (8 more replies)
0 siblings, 9 replies; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/apr/apr_1.4.2.bb | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
create mode 100644 recipes/apr/apr_1.4.2.bb
diff --git a/recipes/apr/apr_1.4.2.bb b/recipes/apr/apr_1.4.2.bb
new file mode 100644
index 0000000..0595731
--- /dev/null
+++ b/recipes/apr/apr_1.4.2.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "Apache Portable Runtime (APR) library"
+SECTION = "libs"
+LICENSE = "Apache License, Version 2.0"
+
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
+ file://configure_fixes.patch \
+ file://configfix.patch"
+
+inherit autotools lib_package binconfig
+
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
+do_configure_prepend() {
+ echo "top_builddir=@apr_builddir@" >> ${S}/Makefile.in
+}
+
+FILES_${PN}-dev += "${datadir}/build-1/* ${libdir}/apr.exp"
+
+do_install_append() {
+ install -d ${D}${datadir}/apr
+ cp ${S}/build/apr_rules.mk ${D}${datadir}/apr/
+ sed -i s,apr_builddir=.*,apr_builddir=,g ${D}${datadir}/apr/apr_rules.mk
+ sed -i s,apr_builders=.*,apr_builders=,g ${D}${datadir}/apr/apr_rules.mk
+ sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${D}${datadir}/apr/apr_rules.mk
+ sed -i s,\$\(apr_builders\),${D}${datadir}/apr/,g ${D}${datadir}/apr/apr_rules.mk
+ cp ${S}/build/mkdir.sh ${D}${datadir}/apr/
+ cp ${S}/build/make_exports.awk ${D}${datadir}/apr/
+ cp ${S}/build/make_var_export.awk ${D}${datadir}/apr/
+ cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
+}
+
+SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
+SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 2/9] apr-util: add 1.3.10
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:24 ` Khem Raj
2011-03-13 18:58 ` [PATCH 3/9] apr: remove old versions Eric Bénard
` (7 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/apr/apr-util_1.3.10.bb | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
create mode 100644 recipes/apr/apr-util_1.3.10.bb
diff --git a/recipes/apr/apr-util_1.3.10.bb b/recipes/apr/apr-util_1.3.10.bb
new file mode 100644
index 0000000..ee32ddd
--- /dev/null
+++ b/recipes/apr/apr-util_1.3.10.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "Apache Portable Runtime (APR) companion library"
+SECTION = "libs"
+DEPENDS = "apr expat gdbm"
+LICENSE = "Apache License, Version 2.0"
+
+PR = "r0"
+
+SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
+ file://configfix.patch \
+ file://configure_fixes.patch"
+
+EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
+ --with-dbm=gdbm \
+ --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
+ --without-sqlite2 \
+ --without-sqlite3 \
+ --without-pgsql \
+ --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
+
+SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19"
+SRC_URI[sha256sum] = "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
+
+inherit autotools lib_package binconfig
+
+OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
+
+do_configure_prepend() {
+ cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
+ echo "AC_PROG_LIBTOOL" >> ${S}/configure.in
+}
+
+do_configure_append() {
+ sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk
+ sed -i /^LIBTOOL/d ${S}/build/rules.mk
+ echo LIBTOOL="${HOST_SYS}-libtool --tag=CC" >> ${S}/build/rules.mk
+}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 3/9] apr: remove old versions
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
2011-03-13 18:58 ` [PATCH 2/9] apr-util: add 1.3.10 Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:25 ` Khem Raj
2011-03-13 18:58 ` [PATCH 4/9] apache2: add 2.2.17 Eric Bénard
` (6 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
recent apr was not building, others are not pinned anywhere.
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/apr/apr-1.3.5/cleanup.patch | 42 --------------------------------
recipes/apr/apr-util_0.9.12.bb | 22 ----------------
recipes/apr/apr-util_1.3.4.bb | 38 ----------------------------
recipes/apr/apr_0.9.12.bb | 16 ------------
recipes/apr/apr_1.3.12.bb | 36 ---------------------------
recipes/apr/apr_1.3.3.bb | 35 --------------------------
recipes/apr/apr_1.3.5.bb | 35 --------------------------
recipes/apr/files/gen_uri_delims.patch | 7 -----
recipes/apr/files/uri_delims.h | 16 ------------
9 files changed, 0 insertions(+), 247 deletions(-)
delete mode 100644 recipes/apr/apr-1.3.5/cleanup.patch
delete mode 100644 recipes/apr/apr-util_0.9.12.bb
delete mode 100644 recipes/apr/apr-util_1.3.4.bb
delete mode 100644 recipes/apr/apr_0.9.12.bb
delete mode 100644 recipes/apr/apr_1.3.12.bb
delete mode 100644 recipes/apr/apr_1.3.3.bb
delete mode 100644 recipes/apr/apr_1.3.5.bb
delete mode 100644 recipes/apr/files/gen_uri_delims.patch
delete mode 100644 recipes/apr/files/uri_delims.h
diff --git a/recipes/apr/apr-1.3.5/cleanup.patch b/recipes/apr/apr-1.3.5/cleanup.patch
deleted file mode 100644
index 53623a2..0000000
--- a/recipes/apr/apr-1.3.5/cleanup.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: apr-1.3.5/build/buildcheck.sh
-===================================================================
---- apr-1.3.5.orig/build/buildcheck.sh 2009-02-23 20:37:18.000000000 -0700
-+++ apr-1.3.5/build/buildcheck.sh 2010-09-09 11:09:08.000000000 -0700
-@@ -31,36 +31,4 @@
- else
- echo "buildconf: autoconf version $ac_version (ok)"
- fi
--
--# Sample libtool --version outputs:
--# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
--# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
--# output is multiline from 1.5 onwards
--
--# Require libtool 1.4 or newer
--libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
--lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
--if test -z "$lt_pversion"; then
--echo "buildconf: libtool not found."
--echo " You need libtool version 1.4 or newer installed"
--echo " to build APR from SVN."
--exit 1
--fi
--lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
--IFS=.; set $lt_version; IFS=' '
--lt_status="good"
--if test "$1" = "1"; then
-- if test "$2" -lt "4"; then
-- lt_status="bad"
-- fi
--fi
--if test $lt_status = "good"; then
-- echo "buildconf: libtool version $lt_pversion (ok)"
-- exit 0
--fi
--
--echo "buildconf: libtool version $lt_pversion found."
--echo " You need libtool version 1.4 or newer installed"
--echo " to build APR from SVN."
--
--exit 1
-+exit 0
diff --git a/recipes/apr/apr-util_0.9.12.bb b/recipes/apr/apr-util_0.9.12.bb
deleted file mode 100644
index 89c9a93..0000000
--- a/recipes/apr/apr-util_0.9.12.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) companion library"
-SECTION = "libs"
-DEPENDS = "apr expat gdbm"
-LICENSE = "Apache"
-HOMEPAGE = "http://apr.apache.org"
-PR = "r1"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
- file://gen_uri_delims.patch \
- file://uri_delims.h"
-
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
-
-inherit autotools lib_package binconfig
-
-do_configure() {
- cp ${S}/../uri_delims.h ${S}/uri/.
- oe_runconf
-}
-
-SRC_URI[md5sum] = "8e9cc71a1303b67b3278fbeab9799f2e"
-SRC_URI[sha256sum] = "5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3"
diff --git a/recipes/apr/apr-util_1.3.4.bb b/recipes/apr/apr-util_1.3.4.bb
deleted file mode 100644
index a2c8211..0000000
--- a/recipes/apr/apr-util_1.3.4.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) companion library"
-SECTION = "libs"
-DEPENDS = "apr expat gdbm"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r7"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
- file://configfix.patch \
- file://configure_fixes.patch"
-
-EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
- --with-dbm=gdbm \
- --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
- --without-sqlite2 \
- --without-sqlite3 \
- --without-pgsql \
- --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
-
-
-inherit autotools lib_package binconfig
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-do_configure_prepend() {
- cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
- echo "AC_PROG_LIBTOOL" >> ${S}/configure.in
-}
-
-do_configure_append() {
- sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk
- sed -i /^LIBTOOL/d ${S}/build/rules.mk
- echo LIBTOOL="${HOST_SYS}-libtool --tag=CC" >> ${S}/build/rules.mk
-}
-
-
-SRC_URI[md5sum] = "a10e2ca150ff07f484c724c36142211f"
-SRC_URI[sha256sum] = "3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e"
diff --git a/recipes/apr/apr_0.9.12.bb b/recipes/apr/apr_0.9.12.bb
deleted file mode 100644
index 8748757..0000000
--- a/recipes/apr/apr_0.9.12.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-LICENSE = "Apache"
-HOMEPAGE = "http://apr.apache.org"
-PR = "r1"
-
-SRC_URI = "${APACHE_MIRROR}/apr/apr-${PV}.tar.bz2"
-
-inherit autotools lib_package binconfig
-
-do_configure() {
- oe_runconf
-}
-
-SRC_URI[md5sum] = "63fef787c263bd8025c6ab6a6cecdd01"
-SRC_URI[sha256sum] = "cd1da2119dd812127ab6e6e8cbb954d9b74fe01ec744364ba79c9845865ffdaa"
diff --git a/recipes/apr/apr_1.3.12.bb b/recipes/apr/apr_1.3.12.bb
deleted file mode 100644
index 38ed343..0000000
--- a/recipes/apr/apr_1.3.12.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-LICENSE = "Apache License, Version 2.0"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
- file://configure_fixes.patch \
-# file://cleanup.patch \
- file://configfix.patch"
-
-SRC_URI[md5sum] = "6f19af60a161480cc16bb6adb9820040"
-SRC_URI[sha256sum] = "cdc5eff894239344cb35e06f10e8d39a5b46d4250750c6c4ac4058ffbfb6ae80"
-
-inherit autotools lib_package binconfig
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-do_configure_prepend() {
- cd ${S}
- echo "top_builddir=@apr_builddir@" >> build/apr_rules.mk.in
- cp build/libtool.m4 .
- ./buildconf
-}
-
-FILES_${PN}-dev += "${datadir}/build-1/* ${libdir}/apr.exp"
-
-do_install_append() {
- install -d ${D}${datadir}/apr
- cp ${S}/build/apr_rules.mk ${D}${datadir}/apr/
- sed -i s,apr_builddir=.*,apr_builddir=,g ${D}${datadir}/apr/apr_rules.mk
- sed -i s,apr_builders=.*,apr_builders=,g ${D}${datadir}/apr/apr_rules.mk
- sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${D}${datadir}/apr/apr_rules.mk
- sed -i s,\$\(apr_builders\),${D}${datadir}/apr/,g ${D}${datadir}/apr/apr_rules.mk
- cp ${S}/build/mkdir.sh ${D}${datadir}/apr/
- cp ${S}/build/make_exports.awk ${D}${datadir}/apr/
- cp ${S}/build/make_var_export.awk ${D}${datadir}/apr/
-}
diff --git a/recipes/apr/apr_1.3.3.bb b/recipes/apr/apr_1.3.3.bb
deleted file mode 100644
index 22e399d..0000000
--- a/recipes/apr/apr_1.3.3.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r4"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
- file://configure_fixes.patch \
- file://cleanup.patch \
- file://configfix.patch"
-
-inherit autotools lib_package binconfig
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-do_configure_prepend() {
- cd ${S}
- ./buildconf
-}
-
-do_stage() {
- autotools_stage_all
- install -d ${STAGING_DATADIR}/apr
- cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
- sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
- sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
- sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
- sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
- cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
- cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
- cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
-}
-
-SRC_URI[md5sum] = "2090c21dee4f0eb1512604127dcd158f"
-SRC_URI[sha256sum] = "d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37"
diff --git a/recipes/apr/apr_1.3.5.bb b/recipes/apr/apr_1.3.5.bb
deleted file mode 100644
index 4f4c288..0000000
--- a/recipes/apr/apr_1.3.5.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Apache Portable Runtime (APR) library"
-SECTION = "libs"
-LICENSE = "Apache License, Version 2.0"
-
-PR = "r5"
-
-SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2;name=apr135tarbz2 \
- file://configure_fixes.patch \
- file://cleanup.patch \
- file://configfix.patch"
-
-inherit autotools lib_package binconfig
-
-OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
-
-do_configure_prepend() {
- cd ${S}
- ./buildconf
-}
-
-do_stage() {
- autotools_stage_all
- install -d ${STAGING_DATADIR}/apr
- cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
- sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
- sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
- sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
- sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
- cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
- cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
- cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
-}
-
-SRC_URI[apr135tarbz2.md5sum] = "9ac9a00eaa190937fdbbde7b4f03ac1e"
-SRC_URI[apr135tarbz2.sha256sum] = "a33d360b70a9c7971651b3810513d7a85ca84d13ddfc1cb96d6cb0af76aab574"
diff --git a/recipes/apr/files/gen_uri_delims.patch b/recipes/apr/files/gen_uri_delims.patch
deleted file mode 100644
index 57bc15a..0000000
--- a/recipes/apr/files/gen_uri_delims.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- apr-util-0.9.7/uri/Makefile.in.old 2006-03-11 23:01:09.000000000 +0100
-+++ apr-util-0.9.7/uri/Makefile.in 2006-03-11 23:01:28.000000000 +0100
-@@ -15,4 +15,3 @@
- apr_uri.lo: uri_delims.h apr_uri.c
-
- uri_delims.h: gen_uri_delims
-- ./gen_uri_delims > uri_delims.h
diff --git a/recipes/apr/files/uri_delims.h b/recipes/apr/files/uri_delims.h
deleted file mode 100644
index 0c855bf..0000000
--- a/recipes/apr/files/uri_delims.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* this file is automatically generated by gen_uri_delims, do not edit */
-static const unsigned char uri_delims[256] = {
- T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,
- 0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,
- 0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-};
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 4/9] apache2: add 2.2.17
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
2011-03-13 18:58 ` [PATCH 2/9] apr-util: add 1.3.10 Eric Bénard
2011-03-13 18:58 ` [PATCH 3/9] apr: remove old versions Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:26 ` Khem Raj
2011-03-13 18:58 ` [PATCH 5/9] apache2: remove 2.2.14 Eric Bénard
` (5 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/apache2/apache2-2.2.17/apr-sockets-patch | 10 ++
recipes/apache2/apache2-2.2.17/apr-sockets.patch | 10 ++
recipes/apache2/apache2-2.2.17/apr.h.in.patch | 13 ++
recipes/apache2/apache2-2.2.17/configure-patch | 71 ++++++++++++
recipes/apache2/apache2-2.2.17/configure.in.patch | 27 +++++
.../apache2/apache2-2.2.17/dftables-makefile-patch | 10 ++
.../apache2/apache2-2.2.17/server-makefile-patch | 11 ++
recipes/apache2/apache2-native_2.2.17.bb | 44 +++++++
recipes/apache2/apache2_2.2.17.bb | 119 ++++++++++++++++++++
9 files changed, 315 insertions(+), 0 deletions(-)
create mode 100644 recipes/apache2/apache2-2.2.17/apr-sockets-patch
create mode 100644 recipes/apache2/apache2-2.2.17/apr-sockets.patch
create mode 100644 recipes/apache2/apache2-2.2.17/apr.h.in.patch
create mode 100644 recipes/apache2/apache2-2.2.17/configure-patch
create mode 100644 recipes/apache2/apache2-2.2.17/configure.in.patch
create mode 100644 recipes/apache2/apache2-2.2.17/dftables-makefile-patch
create mode 100644 recipes/apache2/apache2-2.2.17/server-makefile-patch
create mode 100644 recipes/apache2/apache2-native_2.2.17.bb
create mode 100644 recipes/apache2/apache2_2.2.17.bb
diff --git a/recipes/apache2/apache2-2.2.17/apr-sockets-patch b/recipes/apache2/apache2-2.2.17/apr-sockets-patch
new file mode 100644
index 0000000..5e97482
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/apr-sockets-patch
@@ -0,0 +1,10 @@
+--- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig
++++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c
+@@ -231,6 +231,7 @@
+ #if APR_O_NONBLOCK_INHERITED
+ if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
+ apr_set_option(*new, APR_SO_NONBLOCK, 1);
++ apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0);
+ }
+ #endif /* APR_O_NONBLOCK_INHERITED */
+
diff --git a/recipes/apache2/apache2-2.2.17/apr-sockets.patch b/recipes/apache2/apache2-2.2.17/apr-sockets.patch
new file mode 100644
index 0000000..5e97482
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/apr-sockets.patch
@@ -0,0 +1,10 @@
+--- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig
++++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c
+@@ -231,6 +231,7 @@
+ #if APR_O_NONBLOCK_INHERITED
+ if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
+ apr_set_option(*new, APR_SO_NONBLOCK, 1);
++ apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0);
+ }
+ #endif /* APR_O_NONBLOCK_INHERITED */
+
diff --git a/recipes/apache2/apache2-2.2.17/apr.h.in.patch b/recipes/apache2/apache2-2.2.17/apr.h.in.patch
new file mode 100644
index 0000000..97554c9
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/apr.h.in.patch
@@ -0,0 +1,13 @@
+Index: httpd-2.2.14/srclib/apr/include/apr.h.in
+===================================================================
+--- httpd-2.2.14.orig/srclib/apr/include/apr.h.in
++++ httpd-2.2.14/srclib/apr/include/apr.h.in
+@@ -224,7 +224,7 @@ extern "C" {
+ #define APR_HAVE_STRUCT_RLIMIT @struct_rlimit@
+ #define APR_HAVE_UNION_SEMUN @have_union_semun@
+ #define APR_HAVE_SCTP @have_sctp@
+-#define APR_HAVE_IOVEC @have_iovec@
++#define APR_HAVE_IOVEC 1
+
+ /* APR Feature Macros */
+ #define APR_HAS_SHARED_MEMORY @sharedmem@
diff --git a/recipes/apache2/apache2-2.2.17/configure-patch b/recipes/apache2/apache2-2.2.17/configure-patch
new file mode 100644
index 0000000..405b1c1
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/configure-patch
@@ -0,0 +1,71 @@
+diff --git a/configure b/configure
+index 7cc39f3..447a65a 100755
+--- a/configure
++++ b/configure
+@@ -3545,26 +3545,6 @@ $as_echo "$as_me: error: the --with-apr parameter is incorrect. It must specify
+
+ else
+
+- if test -n "1" && test "1" = "1"; then
+- for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
+- do
+- if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
+- apr_config="$apr_temp_apr_config_file"
+-
+- apr_found="yes"
+- break
+- else
+- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
+- apr_config="$lookdir/bin/$apr_temp_apr_config_file"
+-
+- apr_found="yes"
+- break 2
+- fi
+- done
+- fi
+- done
+- fi
+ if test "$apr_found" = "no" && test -d ""$srcdir/srclib/apr""; then
+ apr_temp_abs_srcdir="`cd "$srcdir/srclib/apr" && pwd`"
+ apr_found="reconfig"
+@@ -3905,26 +3885,6 @@ $as_echo "$as_me: error: the --with-apr-util parameter is incorrect. It must spe
+
+ else
+
+- if test -n "1" && test "1" = "1"; then
+- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
+- do
+- if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
+- apu_config="$apu_temp_apu_config_file"
+-
+- apu_found="yes"
+- break
+- else
+- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
+- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
+- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
+-
+- apu_found="yes"
+- break 2
+- fi
+- done
+- fi
+- done
+- fi
+ if test "$apu_found" = "no" && test -d ""$srcdir/srclib/apr-util""; then
+ apu_temp_abs_srcdir="`cd \""$srcdir/srclib/apr-util"\" && pwd`"
+ apu_found="reconfig"
+@@ -7800,7 +7760,11 @@ if test "${ap_cv_void_ptr_lt_long+set}" = set; then
+ $as_echo_n "(cached) " >&6
+ else
+ if test "$cross_compiling" = yes; then
+- ap_cv_void_ptr_lt_long=yes
++ if test "$ac_cv_sizeof_long_p" = "$ac_cv_sizeof_void_p"; then
++ ap_void_ptr_lt_long=no
++ else
++ ap_void_ptr_lt_long=yes
++ fi
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
diff --git a/recipes/apache2/apache2-2.2.17/configure.in.patch b/recipes/apache2/apache2-2.2.17/configure.in.patch
new file mode 100644
index 0000000..2ca098d
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/configure.in.patch
@@ -0,0 +1,27 @@
+Index: httpd-2.2.14/srclib/apr/configure.in
+===================================================================
+--- httpd-2.2.14.orig/srclib/apr/configure.in
++++ httpd-2.2.14/srclib/apr/configure.in
+@@ -923,7 +923,7 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
+ create_area])
+
+ APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
+-AC_CHECK_FILE(/dev/zero)
++APR_CHECK_FILE(/dev/zero)
+
+ # Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
+ if test "$ac_cv_func_mmap" = "yes" &&
+Index: httpd-2.2.14/configure.in
+===================================================================
+--- httpd-2.2.14.orig/configure.in
++++ httpd-2.2.14/configure.in
+@@ -61,6 +61,9 @@ APR_MKDIR_P_CHECK($top_srcdir/build/mkdi
+
+ dnl ## Run configure for packages Apache uses
+
++dnl first configure subdirs
++AC_CONFIG_SUBDIRS(srclib/apr srclib/apr-util srclib/prce)
++
+ dnl shared library support for these packages doesn't currently
+ dnl work on some platforms
+
diff --git a/recipes/apache2/apache2-2.2.17/dftables-makefile-patch b/recipes/apache2/apache2-2.2.17/dftables-makefile-patch
new file mode 100644
index 0000000..ac966db
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/dftables-makefile-patch
@@ -0,0 +1,10 @@
+--- http-2.2.3/srclib/pcre/Makefile.in-orig
++++ http-2.2.3/srclib/pcre/Makefile.in 2005-12-20 13:12:03.000000000 -0500
+@@ -15,6 +15,6 @@
+ $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS)
+
+ $(srcdir)/chartables.c: dftables
+- ./dftables $@
++ dftables $@
+
+ pcre.lo: $(srcdir)/chartables.c
diff --git a/recipes/apache2/apache2-2.2.17/server-makefile-patch b/recipes/apache2/apache2-2.2.17/server-makefile-patch
new file mode 100644
index 0000000..f1349cb
--- /dev/null
+++ b/recipes/apache2/apache2-2.2.17/server-makefile-patch
@@ -0,0 +1,11 @@
+--- http-2.0.54/server/Makefile.in-old 2005-12-20 13:26:56.000000000 -0500
++++ http-2.0.54/server/Makefile.in 2005-12-20 13:27:22.000000000 -0500
+@@ -27,7 +27,7 @@
+ $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
+
+ test_char.h: gen_test_char
+- ./gen_test_char > test_char.h
++ gen_test_char > test_char.h
+
+ util.lo: test_char.h
+
diff --git a/recipes/apache2/apache2-native_2.2.17.bb b/recipes/apache2/apache2-native_2.2.17.bb
new file mode 100644
index 0000000..66b326d
--- /dev/null
+++ b/recipes/apache2/apache2-native_2.2.17.bb
@@ -0,0 +1,44 @@
+SECTION = "net"
+DEPENDS = "expat pcre"
+
+inherit native
+
+PR = "r0"
+SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
+
+S = "${WORKDIR}/httpd-${PV}"
+
+do_configure () {
+ ./configure --with-included-apr --prefix=${prefix}
+}
+
+do_install () {
+ install -d ${D}${bindir} ${D}${libdir}
+ cp server/gen_test_char ${D}${bindir}
+ cp srclib/apr/apr-1-config ${D}${bindir}
+ cp srclib/apr-util/apu-1-config ${D}${bindir}
+ cp support/apxs ${D}${bindir}
+ chmod 755 ${D}${bindir}/apxs
+ install -d ${D}/usr/build
+ cp build/*.mk ${D}/usr/build
+ cp build/instdso.sh ${D}/usr/build
+ cp .libs/httpd ${D}${bindir}
+
+ (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
+ (cd ${D}${libdir}; tar -xf - )
+ (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
+ (cd ${D}${libdir}; tar -xf - )
+
+ install -d ${D}${includedir}/apache2
+ cp include/* ${D}${includedir}/apache2
+ cp os/unix/os.h ${D}${includedir}/apache2
+ cp os/unix/unixd.h ${D}${includedir}/apache2
+
+ cp support/envvars-std ${D}${bindir}/envvars
+ chmod 755 ${D}${bindir}/envvars
+}
+
+NATIVE_INSTALL_WORKS = "1"
+
+SRC_URI[md5sum] = "16eadc59ea6b38af33874d300973202e"
+SRC_URI[sha256sum] = "868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04"
diff --git a/recipes/apache2/apache2_2.2.17.bb b/recipes/apache2/apache2_2.2.17.bb
new file mode 100644
index 0000000..13012a7
--- /dev/null
+++ b/recipes/apache2/apache2_2.2.17.bb
@@ -0,0 +1,119 @@
+SECTION = "net"
+DESCRIPTION = "The apache v2 web server"
+DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
+RDEPENDS_${PN} += "openssl"
+
+PR = "r0"
+
+SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
+ file://apr-sockets-patch;apply=yes \
+ file://configure-patch;apply=yes \
+ file://server-makefile-patch;apply=yes \
+ file://configure.in.patch \
+ file://apr.h.in.patch \
+ file://init"
+
+#
+# over-ride needed since apache unpacks into httpd
+#
+S = "${WORKDIR}/httpd-${PV}"
+
+#
+# implications - autotools defines suitable do_configure, do_install, etc.
+# update-rc.d adds hooks for rc-update.
+#
+#
+inherit autotools update-rc.d
+
+#
+# implications - used by update-rc.d scripts
+#
+INITSCRIPT_NAME = "apache2"
+INITSCRIPT_PARAMS = "defaults 91 20"
+LEAD_SONAME = "libapr-1.so.0"
+
+CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \
+ ${sysconfdir}/${PN}/magic \
+ ${sysconfdir}/${PN}/mime.types \
+ ${sysconfdir}/init.d/${PN} "
+
+PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
+
+# we override here rather than append so that .so links are
+# included in the runtime package rather than here (-dev)
+# and to get build, icons, error into the -dev package
+FILES_${PN}-dev = "${datadir}/${PN}/build \
+ ${datadir}/${PN}/icons \
+ ${datadir}/${PN}/error \
+ ${bindir}/apr-config ${bindir}/apu-config \
+ ${libdir}/apr*.exp \
+ ${includedir}/${PN} \
+ ${libdir}/*.la \
+ ${libdir}/*.a"
+
+# manual to manual
+FILES_${PN}-doc += " ${datadir}/${PN}/manual"
+
+#
+# override this too - here is the default, less datadir
+#
+FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \
+ ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
+ ${libdir}/${PN}"
+
+# we want htdocs and cgi-bin to go with the binary
+FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin"
+
+#make sure the lone .so links also get wrapped in the base package
+FILES_${PN} += " ${libdir}/lib*.so ${libdir}/pkgconfig/*"
+
+CFLAGS_append = " -DPATH_MAX=4096"
+CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
+EXTRA_OECONF = "--enable-ssl \
+ --with-ssl=${STAGING_LIBDIR}/.. \
+ --with-expat=${STAGING_LIBDIR}/.. \
+ --with-pcre=${STAGING_LIBDIR}/.. \
+ --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
+ --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
+ --enable-info \
+ --enable-rewrite \
+ --with-dbm=sdbm \
+ --with-berkeley-db=no \
+ --localstatedir=/var/${PN} \
+ --with-gdbm=no \
+ --with-ndbm=no \
+ --includedir=${includedir}/${PN} \
+ --datadir=${datadir}/${PN} \
+ --sysconfdir=${sysconfdir}/${PN} \
+ ap_cv_void_ptr_lt_long=no \
+ "
+
+#
+# here we over-ride the autotools provided do_configure.
+#
+
+do_configure_prepend() {
+ sed -e 's,libtool libtool15,${HOST_SYS}-libtool libtool115,' -i ${S}/srclib/apr/build/buildcheck.sh
+}
+
+do_compile_prepend() {
+ ln -sf ${S}/srclib/apr/${HOST_SYS}-libtool ${S}/srclib/apr/libtool
+}
+
+do_install_append() {
+ install -d ${D}/${sysconfdir}/init.d
+ cat ${WORKDIR}/init | \
+ sed -e 's,/usr/sbin/,${sbindir}/,g' \
+ -e 's,/usr/bin/,${bindir}/,g' \
+ -e 's,/usr/lib,${libdir}/,g' \
+ -e 's,/etc/,${sysconfdir}/,g' \
+ -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${PN}
+ chmod 755 ${D}/${sysconfdir}/init.d/${PN}
+# remove the goofy original files...
+ rm -rf ${D}/${sysconfdir}/${PN}/original
+# Expat should be found in the staging area via DEPENDS...
+ rm -f ${D}/${libdir}/libexpat.*
+}
+
+SRC_URI[md5sum] = "16eadc59ea6b38af33874d300973202e"
+SRC_URI[sha256sum] = "868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 5/9] apache2: remove 2.2.14
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
` (2 preceding siblings ...)
2011-03-13 18:58 ` [PATCH 4/9] apache2: add 2.2.17 Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:27 ` Khem Raj
2011-03-13 18:58 ` [PATCH 6/9] libc-client: add 2007e Eric Bénard
` (4 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
which doesn't build and is replaced by 2.2.17
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/apache2/apache2-2.2.14/apr-sockets-patch | 10 --
recipes/apache2/apache2-2.2.14/apr.h.in.patch | 13 --
recipes/apache2/apache2-2.2.14/configure-patch | 71 -----------
recipes/apache2/apache2-2.2.14/configure.in.patch | 27 -----
.../apache2/apache2-2.2.14/dftables-makefile-patch | 10 --
.../apache2/apache2-2.2.14/server-makefile-patch | 11 --
recipes/apache2/apache2-native_2.2.14.bb | 44 -------
recipes/apache2/apache2_2.2.14.bb | 122 --------------------
8 files changed, 0 insertions(+), 308 deletions(-)
delete mode 100644 recipes/apache2/apache2-2.2.14/apr-sockets-patch
delete mode 100644 recipes/apache2/apache2-2.2.14/apr.h.in.patch
delete mode 100644 recipes/apache2/apache2-2.2.14/configure-patch
delete mode 100644 recipes/apache2/apache2-2.2.14/configure.in.patch
delete mode 100644 recipes/apache2/apache2-2.2.14/dftables-makefile-patch
delete mode 100644 recipes/apache2/apache2-2.2.14/server-makefile-patch
delete mode 100644 recipes/apache2/apache2-native_2.2.14.bb
delete mode 100644 recipes/apache2/apache2_2.2.14.bb
diff --git a/recipes/apache2/apache2-2.2.14/apr-sockets-patch b/recipes/apache2/apache2-2.2.14/apr-sockets-patch
deleted file mode 100644
index 5e97482..0000000
--- a/recipes/apache2/apache2-2.2.14/apr-sockets-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig
-+++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c
-@@ -231,6 +231,7 @@
- #if APR_O_NONBLOCK_INHERITED
- if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
- apr_set_option(*new, APR_SO_NONBLOCK, 1);
-+ apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0);
- }
- #endif /* APR_O_NONBLOCK_INHERITED */
-
diff --git a/recipes/apache2/apache2-2.2.14/apr.h.in.patch b/recipes/apache2/apache2-2.2.14/apr.h.in.patch
deleted file mode 100644
index 97554c9..0000000
--- a/recipes/apache2/apache2-2.2.14/apr.h.in.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: httpd-2.2.14/srclib/apr/include/apr.h.in
-===================================================================
---- httpd-2.2.14.orig/srclib/apr/include/apr.h.in
-+++ httpd-2.2.14/srclib/apr/include/apr.h.in
-@@ -224,7 +224,7 @@ extern "C" {
- #define APR_HAVE_STRUCT_RLIMIT @struct_rlimit@
- #define APR_HAVE_UNION_SEMUN @have_union_semun@
- #define APR_HAVE_SCTP @have_sctp@
--#define APR_HAVE_IOVEC @have_iovec@
-+#define APR_HAVE_IOVEC 1
-
- /* APR Feature Macros */
- #define APR_HAS_SHARED_MEMORY @sharedmem@
diff --git a/recipes/apache2/apache2-2.2.14/configure-patch b/recipes/apache2/apache2-2.2.14/configure-patch
deleted file mode 100644
index 50f7420..0000000
--- a/recipes/apache2/apache2-2.2.14/configure-patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Index: httpd-2.2.14/configure
-===================================================================
---- httpd-2.2.14.orig/configure
-+++ httpd-2.2.14/configure
-@@ -3795,26 +3795,6 @@ if test "${with_apr+set}" = set; then :
-
- else
-
-- if test -n "1" && test "1" = "1"; then
-- for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
-- do
-- if $apr_temp_apr_config_file --help > /dev/null 2>&1 ; then
-- apr_config="$apr_temp_apr_config_file"
--
-- apr_found="yes"
-- break
-- else
-- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
-- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
-- apr_config="$lookdir/bin/$apr_temp_apr_config_file"
--
-- apr_found="yes"
-- break 2
-- fi
-- done
-- fi
-- done
-- fi
- if test "$apr_found" = "no" && test -d ""$srcdir/srclib/apr""; then
- apr_temp_abs_srcdir="`cd "$srcdir/srclib/apr" && pwd`"
- apr_found="reconfig"
-@@ -4147,26 +4127,6 @@ if test "${with_apr_util+set}" = set; th
-
- else
-
-- if test -n "1" && test "1" = "1"; then
-- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
-- do
-- if $apu_temp_apu_config_file --help > /dev/null 2>&1 ; then
-- apu_config="$apu_temp_apu_config_file"
--
-- apu_found="yes"
-- break
-- else
-- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
-- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
-- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
--
-- apu_found="yes"
-- break 2
-- fi
-- done
-- fi
-- done
-- fi
- if test "$apu_found" = "no" && test -d ""$srcdir/srclib/apr-util""; then
- apu_temp_abs_srcdir="`cd "$srcdir/srclib/apr-util" && pwd`"
- apu_found="reconfig"
-@@ -7045,7 +7005,11 @@ if test "${ap_cv_void_ptr_lt_long+set}"
- $as_echo_n "(cached) " >&6
- else
- if test "$cross_compiling" = yes; then :
-- ap_cv_void_ptr_lt_long=yes
-+ if test "$ac_cv_sizeof_long_p" = "$ac_cv_sizeof_void_p"; then
-+ ap_void_ptr_lt_long=no
-+ else
-+ ap_void_ptr_lt_long=yes
-+ fi
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
diff --git a/recipes/apache2/apache2-2.2.14/configure.in.patch b/recipes/apache2/apache2-2.2.14/configure.in.patch
deleted file mode 100644
index 2ca098d..0000000
--- a/recipes/apache2/apache2-2.2.14/configure.in.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: httpd-2.2.14/srclib/apr/configure.in
-===================================================================
---- httpd-2.2.14.orig/srclib/apr/configure.in
-+++ httpd-2.2.14/srclib/apr/configure.in
-@@ -923,7 +923,7 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
- create_area])
-
- APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
--AC_CHECK_FILE(/dev/zero)
-+APR_CHECK_FILE(/dev/zero)
-
- # Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
- if test "$ac_cv_func_mmap" = "yes" &&
-Index: httpd-2.2.14/configure.in
-===================================================================
---- httpd-2.2.14.orig/configure.in
-+++ httpd-2.2.14/configure.in
-@@ -61,6 +61,9 @@ APR_MKDIR_P_CHECK($top_srcdir/build/mkdi
-
- dnl ## Run configure for packages Apache uses
-
-+dnl first configure subdirs
-+AC_CONFIG_SUBDIRS(srclib/apr srclib/apr-util srclib/prce)
-+
- dnl shared library support for these packages doesn't currently
- dnl work on some platforms
-
diff --git a/recipes/apache2/apache2-2.2.14/dftables-makefile-patch b/recipes/apache2/apache2-2.2.14/dftables-makefile-patch
deleted file mode 100644
index ac966db..0000000
--- a/recipes/apache2/apache2-2.2.14/dftables-makefile-patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- http-2.2.3/srclib/pcre/Makefile.in-orig
-+++ http-2.2.3/srclib/pcre/Makefile.in 2005-12-20 13:12:03.000000000 -0500
-@@ -15,6 +15,6 @@
- $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS)
-
- $(srcdir)/chartables.c: dftables
-- ./dftables $@
-+ dftables $@
-
- pcre.lo: $(srcdir)/chartables.c
diff --git a/recipes/apache2/apache2-2.2.14/server-makefile-patch b/recipes/apache2/apache2-2.2.14/server-makefile-patch
deleted file mode 100644
index f1349cb..0000000
--- a/recipes/apache2/apache2-2.2.14/server-makefile-patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- http-2.0.54/server/Makefile.in-old 2005-12-20 13:26:56.000000000 -0500
-+++ http-2.0.54/server/Makefile.in 2005-12-20 13:27:22.000000000 -0500
-@@ -27,7 +27,7 @@
- $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
-
- test_char.h: gen_test_char
-- ./gen_test_char > test_char.h
-+ gen_test_char > test_char.h
-
- util.lo: test_char.h
-
diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb
deleted file mode 100644
index 8b1bf7e..0000000
--- a/recipes/apache2/apache2-native_2.2.14.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SECTION = "net"
-DEPENDS = "expat pcre"
-
-inherit native
-
-PR = "r2"
-SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
-
-S = "${WORKDIR}/httpd-${PV}"
-
-do_configure () {
- ./configure --with-included-apr --prefix=${prefix}
-}
-
-do_install () {
- install -d ${D}${bindir} ${D}${libdir}
- cp server/gen_test_char ${D}${bindir}
- cp srclib/apr/apr-1-config ${D}${bindir}
- cp srclib/apr-util/apu-1-config ${D}${bindir}
- cp support/apxs ${D}${bindir}
- chmod 755 ${D}${bindir}/apxs
- install -d ${D}/usr/build
- cp build/*.mk ${D}/usr/build
- cp build/instdso.sh ${D}/usr/build
- cp .libs/httpd ${D}${bindir}
-
- (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
- (cd ${D}${libdir}; tar -xf - )
- (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
- (cd ${D}${libdir}; tar -xf - )
-
- install -d ${D}${includedir}/apache2
- cp include/* ${D}${includedir}/apache2
- cp os/unix/os.h ${D}${includedir}/apache2
- cp os/unix/unixd.h ${D}${includedir}/apache2
-
- cp support/envvars-std ${D}${bindir}/envvars
- chmod 755 ${D}${bindir}/envvars
-}
-
-SRC_URI[md5sum] = "a5226203aaf97e5b941c41a71c112704"
-SRC_URI[sha256sum] = "b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6"
-
-NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb
deleted file mode 100644
index 8a6b38d..0000000
--- a/recipes/apache2/apache2_2.2.14.bb
+++ /dev/null
@@ -1,122 +0,0 @@
-SECTION = "net"
-DESCRIPTION = "The apache v2 web server"
-DEPENDS = "libtool-native apache2-native openssl expat pcre"
-RDEPENDS_${PN} += "openssl"
-
-PR = "r2"
-
-SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
- file://apr-sockets-patch;apply=yes \
- file://configure-patch;apply=yes \
- file://server-makefile-patch;apply=yes \
- file://configure.in.patch \
- file://apr.h.in.patch \
- file://init"
-
-#
-# over-ride needed since apache unpacks into httpd
-#
-S = "${WORKDIR}/httpd-${PV}"
-
-#
-# implications - autotools defines suitable do_configure, do_install, etc.
-# update-rc.d adds hooks for rc-update.
-#
-#
-inherit autotools update-rc.d
-
-#
-# implications - used by update-rc.d scripts
-#
-INITSCRIPT_NAME = "apache2"
-INITSCRIPT_PARAMS = "defaults 91 20"
-LEAD_SONAME = "libapr-1.so.0"
-
-CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \
- ${sysconfdir}/${PN}/magic \
- ${sysconfdir}/${PN}/mime.types \
- ${sysconfdir}/init.d/${PN} "
-
-#
-PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
-
-# we override here rather than append so that .so links are
-# included in the runtime package rather than here (-dev)
-# and to get build, icons, error into the -dev package
-FILES_${PN}-dev = "${datadir}/${PN}/build \
- ${datadir}/${PN}/icons \
- ${datadir}/${PN}/error \
- ${bindir}/apr-config ${bindir}/apu-config \
- ${libdir}/apr*.exp \
- ${includedir}/${PN} \
- ${libdir}/*.la \
- ${libdir}/*.a"
-
-# manual to manual
-FILES_${PN}-doc += " ${datadir}/${PN}/manual"
-
-#
-# override this too - here is the default, less datadir
-#
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \
- ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
- ${libdir}/${PN}"
-
-# we want htdocs and cgi-bin to go with the binary
-FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin"
-
-#make sure the lone .so links also get wrapped in the base package
-FILES_${PN} += " ${libdir}/lib*.so ${libdir}/pkgconfig/*"
-
-CFLAGS_append = " -DPATH_MAX=4096"
-CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
-EXTRA_OECONF = "--enable-ssl \
- --with-ssl=${STAGING_LIBDIR}/.. \
- --with-expat=${STAGING_LIBDIR}/.. \
- --with-pcre=${STAGING_LIBDIR}/.. \
- --enable-info \
- --enable-rewrite \
- --with-dbm=sdbm \
- --with-berkeley-db=no \
- --localstatedir=/var/${PN} \
- --with-gdbm=no \
- --with-ndbm=no \
- --includedir=${includedir}/${PN} \
- --datadir=${datadir}/${PN} \
- --sysconfdir=${sysconfdir}/${PN} \
- "
-
-#
-# here we over-ride the autotools provided do_configure.
-#
-
-do_configure_prepend() {
- sed -e 's,libtool libtool15,${HOST_SYS}-libtool libtool115,' -i ${S}/srclib/apr/build/buildcheck.sh
-}
-
-do_configure() {
- ( cd srclib/apr; sh ./buildconf )
- oe_runconf
-}
-
-do_compile_prepend() {
- ln -sf ${S}/srclib/apr/${HOST_SYS}-libtool ${S}/srclib/apr/libtool
-}
-
-do_install_append() {
- install -d ${D}/${sysconfdir}/init.d
- cat ${WORKDIR}/init | \
- sed -e 's,/usr/sbin/,${sbindir}/,g' \
- -e 's,/usr/bin/,${bindir}/,g' \
- -e 's,/usr/lib,${libdir}/,g' \
- -e 's,/etc/,${sysconfdir}/,g' \
- -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/${PN}
- chmod 755 ${D}/${sysconfdir}/init.d/${PN}
-# remove the goofy original files...
- rm -rf ${D}/${sysconfdir}/${PN}/original
-# Expat should be found in the staging area via DEPENDS...
- rm -f ${D}/${libdir}/libexpat.*
-}
-
-SRC_URI[md5sum] = "a5226203aaf97e5b941c41a71c112704"
-SRC_URI[sha256sum] = "b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 6/9] libc-client: add 2007e
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
` (3 preceding siblings ...)
2011-03-13 18:58 ` [PATCH 5/9] apache2: remove 2.2.14 Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:29 ` Khem Raj
2011-03-13 18:58 ` [PATCH 7/9] libc-client: remove 2007b Eric Bénard
` (3 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/libc-client/libc-client_2007e.bb | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
create mode 100644 recipes/libc-client/libc-client_2007e.bb
diff --git a/recipes/libc-client/libc-client_2007e.bb b/recipes/libc-client/libc-client_2007e.bb
new file mode 100644
index 0000000..743910c
--- /dev/null
+++ b/recipes/libc-client/libc-client_2007e.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "UW c-client library for mail protocols"
+SECTION = "devel"
+PRIORITY = "optional"
+LICENSE = "University of Washingtons Free-Fork License"
+DEPENDS = "libpam openssl libpam"
+
+SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.gz \
+ file://quote_cctype.patch"
+
+S = "${WORKDIR}/imap-${PV}"
+
+EXTRA_OEMAKE = "CC='${CC}'"
+
+HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
+
+do_compile() {
+ echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS
+ oe_runmake lnp
+}
+
+do_install() {
+ install -d ${D}${includedir}/c-client
+ install ${HEADERS} ${D}${includedir}/c-client
+ install -d ${D}${libdir}
+ install c-client/c-client.a ${D}${libdir}/libc-client.a
+}
+
+SRC_URI[md5sum] = "7903800dc2604000016de070e0c55840"
+SRC_URI[sha256sum] = "4b1137b87249782496ec3eeacaf83bbf09312a7d2ae3aead262179041b55565f"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 7/9] libc-client: remove 2007b
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
` (4 preceding siblings ...)
2011-03-13 18:58 ` [PATCH 6/9] libc-client: add 2007e Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:29 ` Khem Raj
2011-03-13 18:58 ` [PATCH 8/9] php: add 5.3.5 Eric Bénard
` (2 subsequent siblings)
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/libc-client/libc-client_2007b.bb | 30 ------------------------------
1 files changed, 0 insertions(+), 30 deletions(-)
delete mode 100644 recipes/libc-client/libc-client_2007b.bb
diff --git a/recipes/libc-client/libc-client_2007b.bb b/recipes/libc-client/libc-client_2007b.bb
deleted file mode 100644
index dbcda08..0000000
--- a/recipes/libc-client/libc-client_2007b.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "UW c-client library for mail protocols"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "University of Washingtons Free-Fork License"
-DEPENDS = "libpam openssl libpam"
-
-SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.Z \
- file://quote_cctype.patch"
-
-S = "${WORKDIR}/imap-${PV}"
-
-EXTRA_OEMAKE = "CC='${CC}'"
-
-HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
-
-do_compile() {
- echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}" > ${S}/SPECIALS
- oe_runmake lnp
-}
-
-do_install() {
- install -d ${D}${includedir}/c-client
- install ${HEADERS} ${D}${includedir}/c-client
- install -d ${D}${libdir}
- install c-client/c-client.a ${D}${libdir}/libc-client.a
-}
-
-
-SRC_URI[md5sum] = "4d59ce6303cf8ef93ff51341b1ce2df7"
-SRC_URI[sha256sum] = "b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 8/9] php: add 5.3.5
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
` (5 preceding siblings ...)
2011-03-13 18:58 ` [PATCH 7/9] libc-client: remove 2007b Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:30 ` Khem Raj
2011-03-13 18:58 ` [PATCH 9/9] php: remove php-native 5.3.2 Eric Bénard
2011-03-13 20:23 ` [PATCH 1/9] apr: add 1.4.2 Khem Raj
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
which is the latest version
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/php/php-5.3.5/acinclude-xml2-config.patch | 18 ++++
recipes/php/php-5.3.5/iconv.patch | 27 +++++
recipes/php/php-5.3.5/imap-fix-autofoo.patch | 41 ++++++++
recipes/php/php-5.3.5/pear-makefile.patch | 13 +++
recipes/php/php-5.3.5/phar-makefile.patch | 26 +++++
recipes/php/php-5.3.5/php-m4-divert.patch | 83 ++++++++++++++++
recipes/php/php-5.3.5/php_exec_native.patch | 11 ++
recipes/php/php-native_5.3.5.bb | 11 ++
recipes/php/php_5.3.5.bb | 108 +++++++++++++++++++++
9 files changed, 338 insertions(+), 0 deletions(-)
create mode 100644 recipes/php/php-5.3.5/acinclude-xml2-config.patch
create mode 100644 recipes/php/php-5.3.5/iconv.patch
create mode 100644 recipes/php/php-5.3.5/imap-fix-autofoo.patch
create mode 100644 recipes/php/php-5.3.5/pear-makefile.patch
create mode 100644 recipes/php/php-5.3.5/phar-makefile.patch
create mode 100644 recipes/php/php-5.3.5/php-m4-divert.patch
create mode 100644 recipes/php/php-5.3.5/php_exec_native.patch
create mode 100644 recipes/php/php-native_5.3.5.bb
create mode 100644 recipes/php/php_5.3.5.bb
diff --git a/recipes/php/php-5.3.5/acinclude-xml2-config.patch b/recipes/php/php-5.3.5/acinclude-xml2-config.patch
new file mode 100644
index 0000000..bf519d2
--- /dev/null
+++ b/recipes/php/php-5.3.5/acinclude-xml2-config.patch
@@ -0,0 +1,18 @@
+--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
+@@ -2359,12 +2359,9 @@
+ AC_DEFUN([PHP_SETUP_LIBXML], [
+ AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
+ [
+- for i in $PHP_LIBXML_DIR /usr/local /usr; do
+- if test -x "$i/bin/xml2-config"; then
+- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
+- break
+- fi
+- done
++
++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
++
+ ])
+
+ if test -x "$ac_cv_php_xml2_config_path"; then
diff --git a/recipes/php/php-5.3.5/iconv.patch b/recipes/php/php-5.3.5/iconv.patch
new file mode 100644
index 0000000..66b39cc
--- /dev/null
+++ b/recipes/php/php-5.3.5/iconv.patch
@@ -0,0 +1,27 @@
+Index: php-5.2.13/acinclude.m4
+===================================================================
+--- php-5.2.13.orig/acinclude.m4
++++ php-5.2.13/acinclude.m4
+@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
+ dnl
+ dnl Check libc first if no path is provided in --with-iconv
+ dnl
+- if test "$PHP_ICONV" = "yes"; then
++ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
++ if test "$PHP_ICONV" != "no"; then
+ AC_CHECK_FUNC(iconv, [
+ found_iconv=yes
+ ],[
+Index: php-5.2.13/ext/iconv/config.m4
+===================================================================
+--- php-5.2.13.orig/ext/iconv/config.m4
++++ php-5.2.13/ext/iconv/config.m4
+@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
+
+ if test "$iconv_avail" != "no"; then
+ if test -z "$ICONV_DIR"; then
+- for i in /usr/local /usr; do
++ for i in $PHP_ICONV /usr/local /usr; do
+ if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+ PHP_ICONV_PREFIX="$i"
+ break
diff --git a/recipes/php/php-5.3.5/imap-fix-autofoo.patch b/recipes/php/php-5.3.5/imap-fix-autofoo.patch
new file mode 100644
index 0000000..3695b7b
--- /dev/null
+++ b/recipes/php/php-5.3.5/imap-fix-autofoo.patch
@@ -0,0 +1,41 @@
+Index: php-5.2.11/ext/imap/config.m4
+===================================================================
+--- php-5.2.11.orig/ext/imap/config.m4 2009-12-10 12:27:52.800974533 -0700
++++ php-5.2.11/ext/imap/config.m4 2009-12-10 12:28:33.720976583 -0700
+@@ -103,7 +103,7 @@
+ PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
+ AC_DEFINE(HAVE_IMAP,1,[ ])
+
+- for i in $PHP_IMAP /usr/local /usr; do
++ for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do
+ IMAP_INC_CHK()
+ el[]IMAP_INC_CHK(/include/c-client)
+ el[]IMAP_INC_CHK(/include/imap)
+@@ -192,13 +192,7 @@
+ AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
+ fi
+
+- if test -r "$IMAP_DIR/c-client/c-client.a"; then
+- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a" >/dev/null 2>&1
+- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
+- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a" >/dev/null 2>&1
+- fi
+-
+- for lib in c-client4 c-client imap; do
++ for lib in /usr/lib c-client4 c-client imap; do
+ IMAP_LIB=$lib
+ IMAP_LIB_CHK($PHP_LIBDIR)
+ IMAP_LIB_CHK(c-client)
+Index: php-5.2.11/acinclude.m4
+===================================================================
+--- php-5.2.11.orig/acinclude.m4 2009-12-10 12:37:13.134722881 -0700
++++ php-5.2.11/acinclude.m4 2009-12-10 12:37:39.342007053 -0700
+@@ -2338,7 +2338,7 @@
+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ fi
+
+- for i in $PHP_OPENSSL_DIR; do
++ for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do
+ if test -r $i/include/openssl/evp.h; then
+ OPENSSL_INCDIR=$i/include
+ fi
diff --git a/recipes/php/php-5.3.5/pear-makefile.patch b/recipes/php/php-5.3.5/pear-makefile.patch
new file mode 100644
index 0000000..1928b98
--- /dev/null
+++ b/recipes/php/php-5.3.5/pear-makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/pear/Makefile.frag b/pear/Makefile.frag
+index 1f6f70e..b19a77c 100644
+--- a/pear/Makefile.frag
++++ b/pear/Makefile.frag
+@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix}
+ PEAR_SUFFIX = -ds a$(program_suffix)
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
diff --git a/recipes/php/php-5.3.5/phar-makefile.patch b/recipes/php/php-5.3.5/phar-makefile.patch
new file mode 100644
index 0000000..6fde251
--- /dev/null
+++ b/recipes/php/php-5.3.5/phar-makefile.patch
@@ -0,0 +1,26 @@
+diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
+index fc93d1d..9a8cd65 100755
+--- a/ext/phar/Makefile.frag
++++ b/ext/phar/Makefile.frag
+@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
+
+ PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
+ PHP_PHARCMD_EXECUTABLE = ` \
+- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
+- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
+- if test "x$(PHP_MODULES)" != "x"; then \
+- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
+- for i in bz2 zlib phar; do \
+- if test -f "$(top_builddir)/modules/$$i.la"; then \
+- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
+- fi; \
+- done; \
+- fi; \
+- else \
+- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
+- fi;`
++ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
++
+ PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
+
+ $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
diff --git a/recipes/php/php-5.3.5/php-m4-divert.patch b/recipes/php/php-5.3.5/php-m4-divert.patch
new file mode 100644
index 0000000..dfc7b64
--- /dev/null
+++ b/recipes/php/php-5.3.5/php-m4-divert.patch
@@ -0,0 +1,83 @@
+Patch taken from
+
+http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1
+
+diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in
+--- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200
++++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200
+@@ -1,7 +1,7 @@
+ ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*-
+ dnl ## Process this file with autoconf to produce a configure script.
+
+-divert(1)
++divert(1001)
+
+ dnl ## Diversion 1 is the autoconf + automake setup phase. We also
+ dnl ## set the PHP version, deal with platform-specific compile
+@@ -263,7 +263,7 @@
+ sinclude(TSRM/tsrm.m4)
+
+
+-divert(2)
++divert(1002)
+
+ dnl ## Diversion 2 is where we set PHP-specific options and come up
+ dnl ## with reasonable default values for them. We check for pthreads here
+@@ -302,7 +302,7 @@
+ PTHREADS_FLAGS
+ fi
+
+-divert(3)
++divert(1003)
+
+ dnl ## In diversion 3 we check for compile-time options to the PHP
+ dnl ## core and how to deal with different system dependencies.
+@@ -661,7 +661,7 @@
+ PHP_CRYPT_R_STYLE
+ fi
+
+-divert(4)
++divert(1004)
+
+ dnl ## In diversion 4 we check user-configurable general settings.
+
+@@ -902,7 +902,7 @@
+ AC_MSG_RESULT([using system default])
+ fi
+
+-divert(5)
++divert(1005)
+
+ dnl ## In diversion 5 we check which extensions should be compiled.
+ dnl ## All of these are normally in the extension directories.
+diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4
+--- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200
++++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200
+@@ -1,6 +1,6 @@
+ dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
+
+-divert(3)dnl
++divert(1003)dnl
+
+ dnl
+ dnl Check if flush should be called explicitly after buffered io
+@@ -205,7 +205,7 @@
+ AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
+ AC_FUNC_FNMATCH
+
+-divert(5)dnl
++divert(1005)dnl
+
+ dnl
+ dnl Check for regex library type
+diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4
+--- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200
++++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200
+@@ -1,6 +1,6 @@
+ dnl This file becomes configure.in for self-contained extensions.
+
+-divert(1)
++divert(1001)
+
+ AC_PREREQ(2.13)
+ AC_INIT(config.m4)
diff --git a/recipes/php/php-5.3.5/php_exec_native.patch b/recipes/php/php-5.3.5/php_exec_native.patch
new file mode 100644
index 0000000..a563c9a
--- /dev/null
+++ b/recipes/php/php-5.3.5/php_exec_native.patch
@@ -0,0 +1,11 @@
+--- php/configure.in.orig 2011-03-12 02:13:19.000000000 +0100
++++ php/configure.in 2011-03-12 02:14:05.000000000 +0100
+@@ -1216,7 +1216,7 @@
+ PHP_INSTALL_CLI_TARGET="install-cli"
+ PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli)
+ PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
+- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
++ PHP_EXECUTABLE="${PHP_NATIVE_DIR}/php"
+ else
+ PHP_INSTALLED_SAPIS="$PHP_SAPI"
+ fi
diff --git a/recipes/php/php-native_5.3.5.bb b/recipes/php/php-native_5.3.5.bb
new file mode 100644
index 0000000..3d4f2be
--- /dev/null
+++ b/recipes/php/php-native_5.3.5.bb
@@ -0,0 +1,11 @@
+require php-native.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://downloads.php.net/johannes/php-${PV}.tar.gz;name=src \
+ file://acinclude-xml2-config.patch \
+ file://php-m4-divert.patch \
+ "
+
+SRC_URI[src.md5sum] = "fb727a3ac72bf0ce37e1a20468a7bb81"
+SRC_URI[src.sha256sum] = "95474df979efbf2b1a298998fe9954200f59048681817a97eb18415346fb6ca4"
diff --git a/recipes/php/php_5.3.5.bb b/recipes/php/php_5.3.5.bb
new file mode 100644
index 0000000..23be66c
--- /dev/null
+++ b/recipes/php/php_5.3.5.bb
@@ -0,0 +1,108 @@
+require php.inc
+
+DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
+ libc-client openssl"
+
+PR = "${INC_PR}.0"
+
+SRC_URI = "http://downloads.php.net/johannes/php-${PV}.tar.gz;name=src \
+ file://acinclude-xml2-config.patch \
+ file://php-m4-divert.patch \
+ file://iconv.patch \
+ file://imap-fix-autofoo.patch \
+ file://pear-makefile.patch \
+ file://phar-makefile.patch \
+ file://php_exec_native.patch \
+ "
+
+SRC_URI[src.md5sum] = "fb727a3ac72bf0ce37e1a20468a7bb81"
+SRC_URI[src.sha256sum] = "95474df979efbf2b1a298998fe9954200f59048681817a97eb18415346fb6ca4"
+
+export THREADS="pthread"
+export LIBS=" -lpthread "
+
+EXTRA_OECONF = " --enable-mbstring \
+ --enable-discard-path \
+ --enable-sockets \
+ --enable-shared \
+ --enable-pcntl \
+ --enable-wddx \
+ --disable-embedded-mysqli \
+ --disable-rpath \
+ --enable-magic-quotes \
+ --enable-fastcgi \
+ --with-imap=${STAGING_DIR_HOST} \
+ --with-imap-ssl=${STAGING_DIR_HOST} \
+ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
+ --with-iconv=${STAGING_LIBDIR}/.. \
+ --with-libxml-dir=${STAGING_BINDIR_CROSS} \
+ --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
+ --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
+ --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
+ --without-pdo-sqlite \
+ "
+
+export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
+export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
+export PHP_PEAR_PHP_BIN = "${bindir}/php"
+
+#LDFLAGS += "-lstdc++"
+
+do_configure_append() {
+ find ${S} -type f -readable -writable | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
+ # use same fix as libiconv
+ sed -i -e s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ \
+ -e s/^runpath_var/#runpath_var/ ${S}/*-libtool
+}
+
+# fixme
+do_install_append() {
+ mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir}
+ rm -rf ${D}/${STAGING_DIR_NATIVE}
+ rm -rf ${D}/.registry
+ rm -rf ${D}/.channels
+ rm -rf ${D}/.[a-z]*
+ sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
+}
+
+PACKAGES = "${PN}-dbg \
+ ${PN}-cli \
+ ${PN}-cgi \
+ ${PN}-pear \
+ ${PN}-dev \
+ ${PN}-doc \
+ ${PN} \
+"
+
+
+FILES_${PN}-dbg =+ "${bindir}/.debug"
+
+FILES_${PN}-doc += "${libdir}/php/doc"
+
+FILES_${PN}-cli = "${bindir}/php"
+FILES_${PN}-cgi = "${bindir}/php-cgi"
+
+FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl \
+ ${libdir}/php/PEAR \
+ ${libdir}/php/PEAR.php \
+ ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \
+ ${libdir}/php/.channels ${libdir}/php/.channels/.alias \
+ ${libdir}/php/.channels\__uri.reg \
+ ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \
+ ${libdir}/php/.registry \
+ ${libdir}/php/Archive/Tar.php \
+ ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \
+ ${sysconfdir}/pear.conf"
+
+
+FILES_${PN}-dev = "${includedir}/php ${libdir}/build \
+ ${bindir}/phpize ${bindir}/php-config \
+ ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \
+ ${libdir}/php/test "
+
+FILES_${PN} = "${libdir}/php"
+FILES_${PN} += "${bindir}"
+
+RDEPENDS_${PN}-pear = ${PN}
+RDEPENDS_${PN}-cli = ${PN}
+RDEPENDS_${PN}-dev = ${PN}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH 9/9] php: remove php-native 5.3.2
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
` (6 preceding siblings ...)
2011-03-13 18:58 ` [PATCH 8/9] php: add 5.3.5 Eric Bénard
@ 2011-03-13 18:58 ` Eric Bénard
2011-03-13 20:30 ` Khem Raj
2011-03-13 20:23 ` [PATCH 1/9] apr: add 1.4.2 Khem Raj
8 siblings, 1 reply; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 18:58 UTC (permalink / raw)
To: openembedded-devel
now that we have 5.3.5
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
recipes/php/php-5.3.2/CVE-2010-0397.patch | 57 --------------
recipes/php/php-5.3.2/acinclude-xml2-config.patch | 18 -----
recipes/php/php-5.3.2/pear-makefile.patch | 11 ---
recipes/php/php-5.3.2/php-m4-divert.patch | 83 ---------------------
recipes/php/php-native_5.3.2.bb | 12 ---
5 files changed, 0 insertions(+), 181 deletions(-)
delete mode 100644 recipes/php/php-5.3.2/CVE-2010-0397.patch
delete mode 100644 recipes/php/php-5.3.2/acinclude-xml2-config.patch
delete mode 100644 recipes/php/php-5.3.2/pear-makefile.patch
delete mode 100644 recipes/php/php-5.3.2/php-m4-divert.patch
delete mode 100644 recipes/php/php-native_5.3.2.bb
diff --git a/recipes/php/php-5.3.2/CVE-2010-0397.patch b/recipes/php/php-5.3.2/CVE-2010-0397.patch
deleted file mode 100644
index 0d9c23d..0000000
--- a/recipes/php/php-5.3.2/CVE-2010-0397.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Description: Fix a null pointer dereference when processing invalid
- XML-RPC requests.
-Origin: vendor
-Forwarded: http://bugs.php.net/51288
-Last-Update: 2010-03-12
-
-Index: php/ext/xmlrpc/tests/bug51288.phpt
-===================================================================
---- /dev/null
-+++ php/ext/xmlrpc/tests/bug51288.phpt
-@@ -0,0 +1,14 @@
-+--TEST--
-+Bug #51288 (CVE-2010-0397, NULL pointer deref when no <methodName> in request)
-+--FILE--
-+<?php
-+$method = NULL;
-+$req = '<?xml version="1.0"?><methodCall></methodCall>';
-+var_dump(xmlrpc_decode_request($req, $method));
-+var_dump($method);
-+echo "Done\n";
-+?>
-+--EXPECT--
-+NULL
-+NULL
-+Done
-Index: php/ext/xmlrpc/xmlrpc-epi-php.c
-===================================================================
---- php.orig/ext/xmlrpc/xmlrpc-epi-php.c
-+++ php/ext/xmlrpc/xmlrpc-epi-php.c
-@@ -778,6 +778,7 @@
- zval* retval = NULL;
- XMLRPC_REQUEST response;
- STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {{0}};
-+ const char *method_name;
- opts.xml_elem_opts.encoding = encoding_in ? utf8_get_encoding_id_from_string(encoding_in) : ENCODING_DEFAULT;
-
- /* generate XMLRPC_REQUEST from raw xml */
-@@ -788,10 +789,15 @@
-
- if (XMLRPC_RequestGetRequestType(response) == xmlrpc_request_call) {
- if (method_name_out) {
-- zval_dtor(method_name_out);
-- Z_TYPE_P(method_name_out) = IS_STRING;
-- Z_STRVAL_P(method_name_out) = estrdup(XMLRPC_RequestGetMethodName(response));
-- Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out));
-+ method_name = XMLRPC_RequestGetMethodName(response);
-+ if (method_name) {
-+ zval_dtor(method_name_out);
-+ Z_TYPE_P(method_name_out) = IS_STRING;
-+ Z_STRVAL_P(method_name_out) = estrdup(method_name);
-+ Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out));
-+ } else {
-+ retval = NULL;
-+ }
- }
- }
-
diff --git a/recipes/php/php-5.3.2/acinclude-xml2-config.patch b/recipes/php/php-5.3.2/acinclude-xml2-config.patch
deleted file mode 100644
index bf519d2..0000000
--- a/recipes/php/php-5.3.2/acinclude-xml2-config.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
-+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
-@@ -2359,12 +2359,9 @@
- AC_DEFUN([PHP_SETUP_LIBXML], [
- AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
- [
-- for i in $PHP_LIBXML_DIR /usr/local /usr; do
-- if test -x "$i/bin/xml2-config"; then
-- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
-- break
-- fi
-- done
-+
-+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
-+
- ])
-
- if test -x "$ac_cv_php_xml2_config_path"; then
diff --git a/recipes/php/php-5.3.2/pear-makefile.patch b/recipes/php/php-5.3.2/pear-makefile.patch
deleted file mode 100644
index 26de98a..0000000
--- a/recipes/php/php-5.3.2/pear-makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200
-+++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200
-@@ -6,7 +6,7 @@
- PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
-
- install-pear-installer: $(SAPI_CLI_PATH)
-- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
-+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
-
- install-pear:
- @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
diff --git a/recipes/php/php-5.3.2/php-m4-divert.patch b/recipes/php/php-5.3.2/php-m4-divert.patch
deleted file mode 100644
index dfc7b64..0000000
--- a/recipes/php/php-5.3.2/php-m4-divert.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Patch taken from
-
-http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1
-
-diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in
---- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200
-+++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200
-@@ -1,7 +1,7 @@
- ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*-
- dnl ## Process this file with autoconf to produce a configure script.
-
--divert(1)
-+divert(1001)
-
- dnl ## Diversion 1 is the autoconf + automake setup phase. We also
- dnl ## set the PHP version, deal with platform-specific compile
-@@ -263,7 +263,7 @@
- sinclude(TSRM/tsrm.m4)
-
-
--divert(2)
-+divert(1002)
-
- dnl ## Diversion 2 is where we set PHP-specific options and come up
- dnl ## with reasonable default values for them. We check for pthreads here
-@@ -302,7 +302,7 @@
- PTHREADS_FLAGS
- fi
-
--divert(3)
-+divert(1003)
-
- dnl ## In diversion 3 we check for compile-time options to the PHP
- dnl ## core and how to deal with different system dependencies.
-@@ -661,7 +661,7 @@
- PHP_CRYPT_R_STYLE
- fi
-
--divert(4)
-+divert(1004)
-
- dnl ## In diversion 4 we check user-configurable general settings.
-
-@@ -902,7 +902,7 @@
- AC_MSG_RESULT([using system default])
- fi
-
--divert(5)
-+divert(1005)
-
- dnl ## In diversion 5 we check which extensions should be compiled.
- dnl ## All of these are normally in the extension directories.
-diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4
---- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200
-+++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200
-@@ -1,6 +1,6 @@
- dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
-
--divert(3)dnl
-+divert(1003)dnl
-
- dnl
- dnl Check if flush should be called explicitly after buffered io
-@@ -205,7 +205,7 @@
- AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
- AC_FUNC_FNMATCH
-
--divert(5)dnl
-+divert(1005)dnl
-
- dnl
- dnl Check for regex library type
-diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4
---- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200
-+++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200
-@@ -1,6 +1,6 @@
- dnl This file becomes configure.in for self-contained extensions.
-
--divert(1)
-+divert(1001)
-
- AC_PREREQ(2.13)
- AC_INIT(config.m4)
diff --git a/recipes/php/php-native_5.3.2.bb b/recipes/php/php-native_5.3.2.bb
deleted file mode 100644
index 3a2299c..0000000
--- a/recipes/php/php-native_5.3.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require php-native.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2;name=src \
- file://acinclude-xml2-config.patch \
- file://php-m4-divert.patch \
- file://CVE-2010-0397.patch"
-
-SRC_URI[src.md5sum] = "46f500816125202c48a458d0133254a4"
-SRC_URI[src.sha256sum] = "9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda"
-
--
1.7.0.4
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH 1/9] apr: add 1.4.2
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
` (7 preceding siblings ...)
2011-03-13 18:58 ` [PATCH 9/9] php: remove php-native 5.3.2 Eric Bénard
@ 2011-03-13 20:23 ` Khem Raj
8 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:23 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/apr/apr_1.4.2.bb | 33 +++++++++++++++++++++++++++++++++
> 1 files changed, 33 insertions(+), 0 deletions(-)
> create mode 100644 recipes/apr/apr_1.4.2.bb
>
> diff --git a/recipes/apr/apr_1.4.2.bb b/recipes/apr/apr_1.4.2.bb
> new file mode 100644
> index 0000000..0595731
> --- /dev/null
> +++ b/recipes/apr/apr_1.4.2.bb
> @@ -0,0 +1,33 @@
> +DESCRIPTION = "Apache Portable Runtime (APR) library"
> +SECTION = "libs"
> +LICENSE = "Apache License, Version 2.0"
> +
> +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
> + file://configure_fixes.patch \
> + file://configfix.patch"
> +
> +inherit autotools lib_package binconfig
> +
> +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
> +
> +do_configure_prepend() {
> + echo "top_builddir=@apr_builddir@">> ${S}/Makefile.in
> +}
> +
> +FILES_${PN}-dev += "${datadir}/build-1/* ${libdir}/apr.exp"
> +
> +do_install_append() {
> + install -d ${D}${datadir}/apr
> + cp ${S}/build/apr_rules.mk ${D}${datadir}/apr/
> + sed -i s,apr_builddir=.*,apr_builddir=,g ${D}${datadir}/apr/apr_rules.mk
> + sed -i s,apr_builders=.*,apr_builders=,g ${D}${datadir}/apr/apr_rules.mk
> + sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${D}${datadir}/apr/apr_rules.mk
> + sed -i s,\$\(apr_builders\),${D}${datadir}/apr/,g ${D}${datadir}/apr/apr_rules.mk
> + cp ${S}/build/mkdir.sh ${D}${datadir}/apr/
> + cp ${S}/build/make_exports.awk ${D}${datadir}/apr/
> + cp ${S}/build/make_var_export.awk ${D}${datadir}/apr/
> + cp ${S}/${HOST_SYS}-libtool ${D}${datadir}/build-1/libtool
> +}
> +
> +SRC_URI[md5sum] = "4b00e8f70c067893d075577962656b35"
> +SRC_URI[sha256sum] = "2017ca700694d09d2b0b21dd7c4d195e43a48735aac88526160c6195ee8f5391"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 2/9] apr-util: add 1.3.10
2011-03-13 18:58 ` [PATCH 2/9] apr-util: add 1.3.10 Eric Bénard
@ 2011-03-13 20:24 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:24 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/apr/apr-util_1.3.10.bb | 36 ++++++++++++++++++++++++++++++++++++
> 1 files changed, 36 insertions(+), 0 deletions(-)
> create mode 100644 recipes/apr/apr-util_1.3.10.bb
>
> diff --git a/recipes/apr/apr-util_1.3.10.bb b/recipes/apr/apr-util_1.3.10.bb
> new file mode 100644
> index 0000000..ee32ddd
> --- /dev/null
> +++ b/recipes/apr/apr-util_1.3.10.bb
> @@ -0,0 +1,36 @@
> +DESCRIPTION = "Apache Portable Runtime (APR) companion library"
> +SECTION = "libs"
> +DEPENDS = "apr expat gdbm"
> +LICENSE = "Apache License, Version 2.0"
> +
> +PR = "r0"
> +
> +SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
> + file://configfix.patch \
> + file://configure_fixes.patch"
> +
> +EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
> + --with-dbm=gdbm \
> + --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
> + --without-sqlite2 \
> + --without-sqlite3 \
> + --without-pgsql \
> + --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
> +
> +SRC_URI[md5sum] = "82acd25cf3df8c72eba44eaee8b80c19"
> +SRC_URI[sha256sum] = "7c37ac40b2351bfc23000fb6b7b54a67e0872255df315c82eb60c821bcef4b23"
> +
> +inherit autotools lib_package binconfig
> +
> +OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
> +
> +do_configure_prepend() {
> + cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
> + echo "AC_PROG_LIBTOOL">> ${S}/configure.in
> +}
> +
> +do_configure_append() {
> + sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk
> + sed -i /^LIBTOOL/d ${S}/build/rules.mk
> + echo LIBTOOL="${HOST_SYS}-libtool --tag=CC">> ${S}/build/rules.mk
> +}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 3/9] apr: remove old versions
2011-03-13 18:58 ` [PATCH 3/9] apr: remove old versions Eric Bénard
@ 2011-03-13 20:25 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:25 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> recent apr was not building, others are not pinned anywhere.
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/apr/apr-1.3.5/cleanup.patch | 42 --------------------------------
> recipes/apr/apr-util_0.9.12.bb | 22 ----------------
> recipes/apr/apr-util_1.3.4.bb | 38 ----------------------------
> recipes/apr/apr_0.9.12.bb | 16 ------------
> recipes/apr/apr_1.3.12.bb | 36 ---------------------------
> recipes/apr/apr_1.3.3.bb | 35 --------------------------
> recipes/apr/apr_1.3.5.bb | 35 --------------------------
> recipes/apr/files/gen_uri_delims.patch | 7 -----
> recipes/apr/files/uri_delims.h | 16 ------------
> 9 files changed, 0 insertions(+), 247 deletions(-)
> delete mode 100644 recipes/apr/apr-1.3.5/cleanup.patch
> delete mode 100644 recipes/apr/apr-util_0.9.12.bb
> delete mode 100644 recipes/apr/apr-util_1.3.4.bb
> delete mode 100644 recipes/apr/apr_0.9.12.bb
> delete mode 100644 recipes/apr/apr_1.3.12.bb
> delete mode 100644 recipes/apr/apr_1.3.3.bb
> delete mode 100644 recipes/apr/apr_1.3.5.bb
> delete mode 100644 recipes/apr/files/gen_uri_delims.patch
> delete mode 100644 recipes/apr/files/uri_delims.h
>
> diff --git a/recipes/apr/apr-1.3.5/cleanup.patch b/recipes/apr/apr-1.3.5/cleanup.patch
> deleted file mode 100644
> index 53623a2..0000000
> --- a/recipes/apr/apr-1.3.5/cleanup.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -Index: apr-1.3.5/build/buildcheck.sh
> -===================================================================
> ---- apr-1.3.5.orig/build/buildcheck.sh 2009-02-23 20:37:18.000000000 -0700
> -+++ apr-1.3.5/build/buildcheck.sh 2010-09-09 11:09:08.000000000 -0700
> -@@ -31,36 +31,4 @@
> - else
> - echo "buildconf: autoconf version $ac_version (ok)"
> - fi
> --
> --# Sample libtool --version outputs:
> --# ltmain.sh (GNU libtool) 1.3.3 (1.385.2.181 1999/07/02 15:49:11)
> --# ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
> --# output is multiline from 1.5 onwards
> --
> --# Require libtool 1.4 or newer
> --libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
> --lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
> --if test -z "$lt_pversion"; then
> --echo "buildconf: libtool not found."
> --echo " You need libtool version 1.4 or newer installed"
> --echo " to build APR from SVN."
> --exit 1
> --fi
> --lt_version=`echo $lt_pversion|sed -e 's/\([a-z]*\)$/.\1/'`
> --IFS=.; set $lt_version; IFS=' '
> --lt_status="good"
> --if test "$1" = "1"; then
> -- if test "$2" -lt "4"; then
> -- lt_status="bad"
> -- fi
> --fi
> --if test $lt_status = "good"; then
> -- echo "buildconf: libtool version $lt_pversion (ok)"
> -- exit 0
> --fi
> --
> --echo "buildconf: libtool version $lt_pversion found."
> --echo " You need libtool version 1.4 or newer installed"
> --echo " to build APR from SVN."
> --
> --exit 1
> -+exit 0
> diff --git a/recipes/apr/apr-util_0.9.12.bb b/recipes/apr/apr-util_0.9.12.bb
> deleted file mode 100644
> index 89c9a93..0000000
> --- a/recipes/apr/apr-util_0.9.12.bb
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -DESCRIPTION = "Apache Portable Runtime (APR) companion library"
> -SECTION = "libs"
> -DEPENDS = "apr expat gdbm"
> -LICENSE = "Apache"
> -HOMEPAGE = "http://apr.apache.org"
> -PR = "r1"
> -
> -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
> - file://gen_uri_delims.patch \
> - file://uri_delims.h"
> -
> -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS} --with-dbm=gdbm --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
> -
> -inherit autotools lib_package binconfig
> -
> -do_configure() {
> - cp ${S}/../uri_delims.h ${S}/uri/.
> - oe_runconf
> -}
> -
> -SRC_URI[md5sum] = "8e9cc71a1303b67b3278fbeab9799f2e"
> -SRC_URI[sha256sum] = "5768fcc4d38fa6f811b0a89e2ef450d0f52688ff9263e548819adb096fbfc9c3"
> diff --git a/recipes/apr/apr-util_1.3.4.bb b/recipes/apr/apr-util_1.3.4.bb
> deleted file mode 100644
> index a2c8211..0000000
> --- a/recipes/apr/apr-util_1.3.4.bb
> +++ /dev/null
> @@ -1,38 +0,0 @@
> -DESCRIPTION = "Apache Portable Runtime (APR) companion library"
> -SECTION = "libs"
> -DEPENDS = "apr expat gdbm"
> -LICENSE = "Apache License, Version 2.0"
> -
> -PR = "r7"
> -
> -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.gz \
> - file://configfix.patch \
> - file://configure_fixes.patch"
> -
> -EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
> - --with-dbm=gdbm \
> - --with-gdbm=${STAGING_DIR_HOST}${layout_prefix} \
> - --without-sqlite2 \
> - --without-sqlite3 \
> - --without-pgsql \
> - --with-expat=${STAGING_DIR_HOST}${layout_prefix}"
> -
> -
> -inherit autotools lib_package binconfig
> -
> -OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
> -
> -do_configure_prepend() {
> - cp ${STAGING_DATADIR}/apr/apr_rules.mk ${S}/build/rules.mk
> - echo "AC_PROG_LIBTOOL">> ${S}/configure.in
> -}
> -
> -do_configure_append() {
> - sed -i -e s:apr_builders=/usr/share/build-1:apr_builders=${STAGING_DATADIR}/build-1:g ${S}/build/rules.mk
> - sed -i /^LIBTOOL/d ${S}/build/rules.mk
> - echo LIBTOOL="${HOST_SYS}-libtool --tag=CC">> ${S}/build/rules.mk
> -}
> -
> -
> -SRC_URI[md5sum] = "a10e2ca150ff07f484c724c36142211f"
> -SRC_URI[sha256sum] = "3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e"
> diff --git a/recipes/apr/apr_0.9.12.bb b/recipes/apr/apr_0.9.12.bb
> deleted file mode 100644
> index 8748757..0000000
> --- a/recipes/apr/apr_0.9.12.bb
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -DESCRIPTION = "Apache Portable Runtime (APR) library"
> -SECTION = "libs"
> -LICENSE = "Apache"
> -HOMEPAGE = "http://apr.apache.org"
> -PR = "r1"
> -
> -SRC_URI = "${APACHE_MIRROR}/apr/apr-${PV}.tar.bz2"
> -
> -inherit autotools lib_package binconfig
> -
> -do_configure() {
> - oe_runconf
> -}
> -
> -SRC_URI[md5sum] = "63fef787c263bd8025c6ab6a6cecdd01"
> -SRC_URI[sha256sum] = "cd1da2119dd812127ab6e6e8cbb954d9b74fe01ec744364ba79c9845865ffdaa"
> diff --git a/recipes/apr/apr_1.3.12.bb b/recipes/apr/apr_1.3.12.bb
> deleted file mode 100644
> index 38ed343..0000000
> --- a/recipes/apr/apr_1.3.12.bb
> +++ /dev/null
> @@ -1,36 +0,0 @@
> -DESCRIPTION = "Apache Portable Runtime (APR) library"
> -SECTION = "libs"
> -LICENSE = "Apache License, Version 2.0"
> -
> -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
> - file://configure_fixes.patch \
> -# file://cleanup.patch \
> - file://configfix.patch"
> -
> -SRC_URI[md5sum] = "6f19af60a161480cc16bb6adb9820040"
> -SRC_URI[sha256sum] = "cdc5eff894239344cb35e06f10e8d39a5b46d4250750c6c4ac4058ffbfb6ae80"
> -
> -inherit autotools lib_package binconfig
> -
> -OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
> -
> -do_configure_prepend() {
> - cd ${S}
> - echo "top_builddir=@apr_builddir@">> build/apr_rules.mk.in
> - cp build/libtool.m4 .
> - ./buildconf
> -}
> -
> -FILES_${PN}-dev += "${datadir}/build-1/* ${libdir}/apr.exp"
> -
> -do_install_append() {
> - install -d ${D}${datadir}/apr
> - cp ${S}/build/apr_rules.mk ${D}${datadir}/apr/
> - sed -i s,apr_builddir=.*,apr_builddir=,g ${D}${datadir}/apr/apr_rules.mk
> - sed -i s,apr_builders=.*,apr_builders=,g ${D}${datadir}/apr/apr_rules.mk
> - sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${D}${datadir}/apr/apr_rules.mk
> - sed -i s,\$\(apr_builders\),${D}${datadir}/apr/,g ${D}${datadir}/apr/apr_rules.mk
> - cp ${S}/build/mkdir.sh ${D}${datadir}/apr/
> - cp ${S}/build/make_exports.awk ${D}${datadir}/apr/
> - cp ${S}/build/make_var_export.awk ${D}${datadir}/apr/
> -}
> diff --git a/recipes/apr/apr_1.3.3.bb b/recipes/apr/apr_1.3.3.bb
> deleted file mode 100644
> index 22e399d..0000000
> --- a/recipes/apr/apr_1.3.3.bb
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -DESCRIPTION = "Apache Portable Runtime (APR) library"
> -SECTION = "libs"
> -LICENSE = "Apache License, Version 2.0"
> -
> -PR = "r4"
> -
> -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2 \
> - file://configure_fixes.patch \
> - file://cleanup.patch \
> - file://configfix.patch"
> -
> -inherit autotools lib_package binconfig
> -
> -OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
> -
> -do_configure_prepend() {
> - cd ${S}
> - ./buildconf
> -}
> -
> -do_stage() {
> - autotools_stage_all
> - install -d ${STAGING_DATADIR}/apr
> - cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
> - sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
> - cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
> - cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
> -}
> -
> -SRC_URI[md5sum] = "2090c21dee4f0eb1512604127dcd158f"
> -SRC_URI[sha256sum] = "d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37"
> diff --git a/recipes/apr/apr_1.3.5.bb b/recipes/apr/apr_1.3.5.bb
> deleted file mode 100644
> index 4f4c288..0000000
> --- a/recipes/apr/apr_1.3.5.bb
> +++ /dev/null
> @@ -1,35 +0,0 @@
> -DESCRIPTION = "Apache Portable Runtime (APR) library"
> -SECTION = "libs"
> -LICENSE = "Apache License, Version 2.0"
> -
> -PR = "r5"
> -
> -SRC_URI = "${APACHE_MIRROR}/apr/${P}.tar.bz2;name=apr135tarbz2 \
> - file://configure_fixes.patch \
> - file://cleanup.patch \
> - file://configfix.patch"
> -
> -inherit autotools lib_package binconfig
> -
> -OE_BINCONFIG_EXTRA_MANGLE = " -e 's:location=source:location=installed:'"
> -
> -do_configure_prepend() {
> - cd ${S}
> - ./buildconf
> -}
> -
> -do_stage() {
> - autotools_stage_all
> - install -d ${STAGING_DATADIR}/apr
> - cp ${S}/build/apr_rules.mk ${STAGING_DATADIR}/apr/
> - sed -i s,apr_builddir=.*,apr_builddir=,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - sed -i s,apr_builders=.*,apr_builders=,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - sed -i s,LIBTOOL=.*,LIBTOOL=\$\(SHELL\)\ ${HOST_SYS}-libtool,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - sed -i s,\$\(apr_builders\),${STAGING_DATADIR}/apr/,g ${STAGING_DATADIR}/apr/apr_rules.mk
> - cp ${S}/build/mkdir.sh ${STAGING_DATADIR}/apr/
> - cp ${S}/build/make_exports.awk ${STAGING_DATADIR}/apr/
> - cp ${S}/build/make_var_export.awk ${STAGING_DATADIR}/apr/
> -}
> -
> -SRC_URI[apr135tarbz2.md5sum] = "9ac9a00eaa190937fdbbde7b4f03ac1e"
> -SRC_URI[apr135tarbz2.sha256sum] = "a33d360b70a9c7971651b3810513d7a85ca84d13ddfc1cb96d6cb0af76aab574"
> diff --git a/recipes/apr/files/gen_uri_delims.patch b/recipes/apr/files/gen_uri_delims.patch
> deleted file mode 100644
> index 57bc15a..0000000
> --- a/recipes/apr/files/gen_uri_delims.patch
> +++ /dev/null
> @@ -1,7 +0,0 @@
> ---- apr-util-0.9.7/uri/Makefile.in.old 2006-03-11 23:01:09.000000000 +0100
> -+++ apr-util-0.9.7/uri/Makefile.in 2006-03-11 23:01:28.000000000 +0100
> -@@ -15,4 +15,3 @@
> - apr_uri.lo: uri_delims.h apr_uri.c
> -
> - uri_delims.h: gen_uri_delims
> -- ./gen_uri_delims> uri_delims.h
> diff --git a/recipes/apr/files/uri_delims.h b/recipes/apr/files/uri_delims.h
> deleted file mode 100644
> index 0c855bf..0000000
> --- a/recipes/apr/files/uri_delims.h
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -/* this file is automatically generated by gen_uri_delims, do not edit */
> -static const unsigned char uri_delims[256] = {
> - T_NUL,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,T_HASH,0,0,0,0,
> - 0,0,0,0,0,0,0,T_SLASH,0,0,0,0,0,0,0,0,0,0,T_COLON,0,
> - 0,0,0,T_QUESTION,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
> - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
> -};
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 4/9] apache2: add 2.2.17
2011-03-13 18:58 ` [PATCH 4/9] apache2: add 2.2.17 Eric Bénard
@ 2011-03-13 20:26 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:26 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/apache2/apache2-2.2.17/apr-sockets-patch | 10 ++
> recipes/apache2/apache2-2.2.17/apr-sockets.patch | 10 ++
> recipes/apache2/apache2-2.2.17/apr.h.in.patch | 13 ++
> recipes/apache2/apache2-2.2.17/configure-patch | 71 ++++++++++++
> recipes/apache2/apache2-2.2.17/configure.in.patch | 27 +++++
> .../apache2/apache2-2.2.17/dftables-makefile-patch | 10 ++
> .../apache2/apache2-2.2.17/server-makefile-patch | 11 ++
> recipes/apache2/apache2-native_2.2.17.bb | 44 +++++++
> recipes/apache2/apache2_2.2.17.bb | 119 ++++++++++++++++++++
> 9 files changed, 315 insertions(+), 0 deletions(-)
> create mode 100644 recipes/apache2/apache2-2.2.17/apr-sockets-patch
> create mode 100644 recipes/apache2/apache2-2.2.17/apr-sockets.patch
> create mode 100644 recipes/apache2/apache2-2.2.17/apr.h.in.patch
> create mode 100644 recipes/apache2/apache2-2.2.17/configure-patch
> create mode 100644 recipes/apache2/apache2-2.2.17/configure.in.patch
> create mode 100644 recipes/apache2/apache2-2.2.17/dftables-makefile-patch
> create mode 100644 recipes/apache2/apache2-2.2.17/server-makefile-patch
> create mode 100644 recipes/apache2/apache2-native_2.2.17.bb
> create mode 100644 recipes/apache2/apache2_2.2.17.bb
>
> diff --git a/recipes/apache2/apache2-2.2.17/apr-sockets-patch b/recipes/apache2/apache2-2.2.17/apr-sockets-patch
> new file mode 100644
> index 0000000..5e97482
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/apr-sockets-patch
> @@ -0,0 +1,10 @@
> +--- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig
> ++++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c
> +@@ -231,6 +231,7 @@
> + #if APR_O_NONBLOCK_INHERITED
> + if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
> + apr_set_option(*new, APR_SO_NONBLOCK, 1);
> ++ apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0);
> + }
> + #endif /* APR_O_NONBLOCK_INHERITED */
> +
> diff --git a/recipes/apache2/apache2-2.2.17/apr-sockets.patch b/recipes/apache2/apache2-2.2.17/apr-sockets.patch
> new file mode 100644
> index 0000000..5e97482
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/apr-sockets.patch
> @@ -0,0 +1,10 @@
> +--- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig
> ++++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c
> +@@ -231,6 +231,7 @@
> + #if APR_O_NONBLOCK_INHERITED
> + if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
> + apr_set_option(*new, APR_SO_NONBLOCK, 1);
> ++ apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0);
> + }
> + #endif /* APR_O_NONBLOCK_INHERITED */
> +
> diff --git a/recipes/apache2/apache2-2.2.17/apr.h.in.patch b/recipes/apache2/apache2-2.2.17/apr.h.in.patch
> new file mode 100644
> index 0000000..97554c9
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/apr.h.in.patch
> @@ -0,0 +1,13 @@
> +Index: httpd-2.2.14/srclib/apr/include/apr.h.in
> +===================================================================
> +--- httpd-2.2.14.orig/srclib/apr/include/apr.h.in
> ++++ httpd-2.2.14/srclib/apr/include/apr.h.in
> +@@ -224,7 +224,7 @@ extern "C" {
> + #define APR_HAVE_STRUCT_RLIMIT @struct_rlimit@
> + #define APR_HAVE_UNION_SEMUN @have_union_semun@
> + #define APR_HAVE_SCTP @have_sctp@
> +-#define APR_HAVE_IOVEC @have_iovec@
> ++#define APR_HAVE_IOVEC 1
> +
> + /* APR Feature Macros */
> + #define APR_HAS_SHARED_MEMORY @sharedmem@
> diff --git a/recipes/apache2/apache2-2.2.17/configure-patch b/recipes/apache2/apache2-2.2.17/configure-patch
> new file mode 100644
> index 0000000..405b1c1
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/configure-patch
> @@ -0,0 +1,71 @@
> +diff --git a/configure b/configure
> +index 7cc39f3..447a65a 100755
> +--- a/configure
> ++++ b/configure
> +@@ -3545,26 +3545,6 @@ $as_echo "$as_me: error: the --with-apr parameter is incorrect. It must specify
> +
> + else
> +
> +- if test -n "1"&& test "1" = "1"; then
> +- for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
> +- do
> +- if $apr_temp_apr_config_file --help> /dev/null 2>&1 ; then
> +- apr_config="$apr_temp_apr_config_file"
> +-
> +- apr_found="yes"
> +- break
> +- else
> +- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
> +- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
> +- apr_config="$lookdir/bin/$apr_temp_apr_config_file"
> +-
> +- apr_found="yes"
> +- break 2
> +- fi
> +- done
> +- fi
> +- done
> +- fi
> + if test "$apr_found" = "no"&& test -d ""$srcdir/srclib/apr""; then
> + apr_temp_abs_srcdir="`cd "$srcdir/srclib/apr"&& pwd`"
> + apr_found="reconfig"
> +@@ -3905,26 +3885,6 @@ $as_echo "$as_me: error: the --with-apr-util parameter is incorrect. It must spe
> +
> + else
> +
> +- if test -n "1"&& test "1" = "1"; then
> +- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
> +- do
> +- if $apu_temp_apu_config_file --help> /dev/null 2>&1 ; then
> +- apu_config="$apu_temp_apu_config_file"
> +-
> +- apu_found="yes"
> +- break
> +- else
> +- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
> +- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
> +- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
> +-
> +- apu_found="yes"
> +- break 2
> +- fi
> +- done
> +- fi
> +- done
> +- fi
> + if test "$apu_found" = "no"&& test -d ""$srcdir/srclib/apr-util""; then
> + apu_temp_abs_srcdir="`cd \""$srcdir/srclib/apr-util"\"&& pwd`"
> + apu_found="reconfig"
> +@@ -7800,7 +7760,11 @@ if test "${ap_cv_void_ptr_lt_long+set}" = set; then
> + $as_echo_n "(cached) ">&6
> + else
> + if test "$cross_compiling" = yes; then
> +- ap_cv_void_ptr_lt_long=yes
> ++ if test "$ac_cv_sizeof_long_p" = "$ac_cv_sizeof_void_p"; then
> ++ ap_void_ptr_lt_long=no
> ++ else
> ++ ap_void_ptr_lt_long=yes
> ++ fi
> + else
> + cat>conftest.$ac_ext<<_ACEOF
> + /* confdefs.h. */
> diff --git a/recipes/apache2/apache2-2.2.17/configure.in.patch b/recipes/apache2/apache2-2.2.17/configure.in.patch
> new file mode 100644
> index 0000000..2ca098d
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/configure.in.patch
> @@ -0,0 +1,27 @@
> +Index: httpd-2.2.14/srclib/apr/configure.in
> +===================================================================
> +--- httpd-2.2.14.orig/srclib/apr/configure.in
> ++++ httpd-2.2.14/srclib/apr/configure.in
> +@@ -923,7 +923,7 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
> + create_area])
> +
> + APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
> +-AC_CHECK_FILE(/dev/zero)
> ++APR_CHECK_FILE(/dev/zero)
> +
> + # Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
> + if test "$ac_cv_func_mmap" = "yes"&&
> +Index: httpd-2.2.14/configure.in
> +===================================================================
> +--- httpd-2.2.14.orig/configure.in
> ++++ httpd-2.2.14/configure.in
> +@@ -61,6 +61,9 @@ APR_MKDIR_P_CHECK($top_srcdir/build/mkdi
> +
> + dnl ## Run configure for packages Apache uses
> +
> ++dnl first configure subdirs
> ++AC_CONFIG_SUBDIRS(srclib/apr srclib/apr-util srclib/prce)
> ++
> + dnl shared library support for these packages doesn't currently
> + dnl work on some platforms
> +
> diff --git a/recipes/apache2/apache2-2.2.17/dftables-makefile-patch b/recipes/apache2/apache2-2.2.17/dftables-makefile-patch
> new file mode 100644
> index 0000000..ac966db
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/dftables-makefile-patch
> @@ -0,0 +1,10 @@
> +--- http-2.2.3/srclib/pcre/Makefile.in-orig
> ++++ http-2.2.3/srclib/pcre/Makefile.in 2005-12-20 13:12:03.000000000 -0500
> +@@ -15,6 +15,6 @@
> + $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS)
> +
> + $(srcdir)/chartables.c: dftables
> +- ./dftables $@
> ++ dftables $@
> +
> + pcre.lo: $(srcdir)/chartables.c
> diff --git a/recipes/apache2/apache2-2.2.17/server-makefile-patch b/recipes/apache2/apache2-2.2.17/server-makefile-patch
> new file mode 100644
> index 0000000..f1349cb
> --- /dev/null
> +++ b/recipes/apache2/apache2-2.2.17/server-makefile-patch
> @@ -0,0 +1,11 @@
> +--- http-2.0.54/server/Makefile.in-old 2005-12-20 13:26:56.000000000 -0500
> ++++ http-2.0.54/server/Makefile.in 2005-12-20 13:27:22.000000000 -0500
> +@@ -27,7 +27,7 @@
> + $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
> +
> + test_char.h: gen_test_char
> +- ./gen_test_char> test_char.h
> ++ gen_test_char> test_char.h
> +
> + util.lo: test_char.h
> +
> diff --git a/recipes/apache2/apache2-native_2.2.17.bb b/recipes/apache2/apache2-native_2.2.17.bb
> new file mode 100644
> index 0000000..66b326d
> --- /dev/null
> +++ b/recipes/apache2/apache2-native_2.2.17.bb
> @@ -0,0 +1,44 @@
> +SECTION = "net"
> +DEPENDS = "expat pcre"
> +
> +inherit native
> +
> +PR = "r0"
> +SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
> +
> +S = "${WORKDIR}/httpd-${PV}"
> +
> +do_configure () {
> + ./configure --with-included-apr --prefix=${prefix}
> +}
> +
> +do_install () {
> + install -d ${D}${bindir} ${D}${libdir}
> + cp server/gen_test_char ${D}${bindir}
> + cp srclib/apr/apr-1-config ${D}${bindir}
> + cp srclib/apr-util/apu-1-config ${D}${bindir}
> + cp support/apxs ${D}${bindir}
> + chmod 755 ${D}${bindir}/apxs
> + install -d ${D}/usr/build
> + cp build/*.mk ${D}/usr/build
> + cp build/instdso.sh ${D}/usr/build
> + cp .libs/httpd ${D}${bindir}
> +
> + (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
> + (cd ${D}${libdir}; tar -xf - )
> + (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
> + (cd ${D}${libdir}; tar -xf - )
> +
> + install -d ${D}${includedir}/apache2
> + cp include/* ${D}${includedir}/apache2
> + cp os/unix/os.h ${D}${includedir}/apache2
> + cp os/unix/unixd.h ${D}${includedir}/apache2
> +
> + cp support/envvars-std ${D}${bindir}/envvars
> + chmod 755 ${D}${bindir}/envvars
> +}
> +
> +NATIVE_INSTALL_WORKS = "1"
> +
> +SRC_URI[md5sum] = "16eadc59ea6b38af33874d300973202e"
> +SRC_URI[sha256sum] = "868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04"
> diff --git a/recipes/apache2/apache2_2.2.17.bb b/recipes/apache2/apache2_2.2.17.bb
> new file mode 100644
> index 0000000..13012a7
> --- /dev/null
> +++ b/recipes/apache2/apache2_2.2.17.bb
> @@ -0,0 +1,119 @@
> +SECTION = "net"
> +DESCRIPTION = "The apache v2 web server"
> +DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util"
> +RDEPENDS_${PN} += "openssl"
> +
> +PR = "r0"
> +
> +SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
> + file://apr-sockets-patch;apply=yes \
> + file://configure-patch;apply=yes \
> + file://server-makefile-patch;apply=yes \
> + file://configure.in.patch \
> + file://apr.h.in.patch \
> + file://init"
> +
> +#
> +# over-ride needed since apache unpacks into httpd
> +#
> +S = "${WORKDIR}/httpd-${PV}"
> +
> +#
> +# implications - autotools defines suitable do_configure, do_install, etc.
> +# update-rc.d adds hooks for rc-update.
> +#
> +#
> +inherit autotools update-rc.d
> +
> +#
> +# implications - used by update-rc.d scripts
> +#
> +INITSCRIPT_NAME = "apache2"
> +INITSCRIPT_PARAMS = "defaults 91 20"
> +LEAD_SONAME = "libapr-1.so.0"
> +
> +CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \
> + ${sysconfdir}/${PN}/magic \
> + ${sysconfdir}/${PN}/mime.types \
> + ${sysconfdir}/init.d/${PN} "
> +
> +PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
> +
> +# we override here rather than append so that .so links are
> +# included in the runtime package rather than here (-dev)
> +# and to get build, icons, error into the -dev package
> +FILES_${PN}-dev = "${datadir}/${PN}/build \
> + ${datadir}/${PN}/icons \
> + ${datadir}/${PN}/error \
> + ${bindir}/apr-config ${bindir}/apu-config \
> + ${libdir}/apr*.exp \
> + ${includedir}/${PN} \
> + ${libdir}/*.la \
> + ${libdir}/*.a"
> +
> +# manual to manual
> +FILES_${PN}-doc += " ${datadir}/${PN}/manual"
> +
> +#
> +# override this too - here is the default, less datadir
> +#
> +FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \
> + ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
> + ${libdir}/${PN}"
> +
> +# we want htdocs and cgi-bin to go with the binary
> +FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin"
> +
> +#make sure the lone .so links also get wrapped in the base package
> +FILES_${PN} += " ${libdir}/lib*.so ${libdir}/pkgconfig/*"
> +
> +CFLAGS_append = " -DPATH_MAX=4096"
> +CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
> +EXTRA_OECONF = "--enable-ssl \
> + --with-ssl=${STAGING_LIBDIR}/.. \
> + --with-expat=${STAGING_LIBDIR}/.. \
> + --with-pcre=${STAGING_LIBDIR}/.. \
> + --with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
> + --with-apr-util=${STAGING_BINDIR_CROSS}/apu-1-config \
> + --enable-info \
> + --enable-rewrite \
> + --with-dbm=sdbm \
> + --with-berkeley-db=no \
> + --localstatedir=/var/${PN} \
> + --with-gdbm=no \
> + --with-ndbm=no \
> + --includedir=${includedir}/${PN} \
> + --datadir=${datadir}/${PN} \
> + --sysconfdir=${sysconfdir}/${PN} \
> + ap_cv_void_ptr_lt_long=no \
> + "
> +
> +#
> +# here we over-ride the autotools provided do_configure.
> +#
> +
> +do_configure_prepend() {
> + sed -e 's,libtool libtool15,${HOST_SYS}-libtool libtool115,' -i ${S}/srclib/apr/build/buildcheck.sh
> +}
> +
> +do_compile_prepend() {
> + ln -sf ${S}/srclib/apr/${HOST_SYS}-libtool ${S}/srclib/apr/libtool
> +}
> +
> +do_install_append() {
> + install -d ${D}/${sysconfdir}/init.d
> + cat ${WORKDIR}/init | \
> + sed -e 's,/usr/sbin/,${sbindir}/,g' \
> + -e 's,/usr/bin/,${bindir}/,g' \
> + -e 's,/usr/lib,${libdir}/,g' \
> + -e 's,/etc/,${sysconfdir}/,g' \
> + -e 's,/usr/,${prefix}/,g'> ${D}/${sysconfdir}/init.d/${PN}
> + chmod 755 ${D}/${sysconfdir}/init.d/${PN}
> +# remove the goofy original files...
> + rm -rf ${D}/${sysconfdir}/${PN}/original
> +# Expat should be found in the staging area via DEPENDS...
> + rm -f ${D}/${libdir}/libexpat.*
> +}
> +
> +SRC_URI[md5sum] = "16eadc59ea6b38af33874d300973202e"
> +SRC_URI[sha256sum] = "868af11e3ed8fa9aade15241ea4f51971b3ef71104292ca2625ef2065e61fb04"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 5/9] apache2: remove 2.2.14
2011-03-13 18:58 ` [PATCH 5/9] apache2: remove 2.2.14 Eric Bénard
@ 2011-03-13 20:27 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:27 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> which doesn't build and is replaced by 2.2.17
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/apache2/apache2-2.2.14/apr-sockets-patch | 10 --
> recipes/apache2/apache2-2.2.14/apr.h.in.patch | 13 --
> recipes/apache2/apache2-2.2.14/configure-patch | 71 -----------
> recipes/apache2/apache2-2.2.14/configure.in.patch | 27 -----
> .../apache2/apache2-2.2.14/dftables-makefile-patch | 10 --
> .../apache2/apache2-2.2.14/server-makefile-patch | 11 --
> recipes/apache2/apache2-native_2.2.14.bb | 44 -------
> recipes/apache2/apache2_2.2.14.bb | 122 --------------------
> 8 files changed, 0 insertions(+), 308 deletions(-)
> delete mode 100644 recipes/apache2/apache2-2.2.14/apr-sockets-patch
> delete mode 100644 recipes/apache2/apache2-2.2.14/apr.h.in.patch
> delete mode 100644 recipes/apache2/apache2-2.2.14/configure-patch
> delete mode 100644 recipes/apache2/apache2-2.2.14/configure.in.patch
> delete mode 100644 recipes/apache2/apache2-2.2.14/dftables-makefile-patch
> delete mode 100644 recipes/apache2/apache2-2.2.14/server-makefile-patch
> delete mode 100644 recipes/apache2/apache2-native_2.2.14.bb
> delete mode 100644 recipes/apache2/apache2_2.2.14.bb
>
> diff --git a/recipes/apache2/apache2-2.2.14/apr-sockets-patch b/recipes/apache2/apache2-2.2.14/apr-sockets-patch
> deleted file mode 100644
> index 5e97482..0000000
> --- a/recipes/apache2/apache2-2.2.14/apr-sockets-patch
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- httpd-2.2.3/srclib/apr/network_io/unix/sockets.c.orig
> -+++ httpd-2.2.3/srclib/apr/network_io/unix/sockets.c
> -@@ -231,6 +231,7 @@
> - #if APR_O_NONBLOCK_INHERITED
> - if (apr_is_option_set(sock, APR_SO_NONBLOCK) == 1) {
> - apr_set_option(*new, APR_SO_NONBLOCK, 1);
> -+ apr_socket_opt_set(*new, APR_SO_NONBLOCK, 0);
> - }
> - #endif /* APR_O_NONBLOCK_INHERITED */
> -
> diff --git a/recipes/apache2/apache2-2.2.14/apr.h.in.patch b/recipes/apache2/apache2-2.2.14/apr.h.in.patch
> deleted file mode 100644
> index 97554c9..0000000
> --- a/recipes/apache2/apache2-2.2.14/apr.h.in.patch
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -Index: httpd-2.2.14/srclib/apr/include/apr.h.in
> -===================================================================
> ---- httpd-2.2.14.orig/srclib/apr/include/apr.h.in
> -+++ httpd-2.2.14/srclib/apr/include/apr.h.in
> -@@ -224,7 +224,7 @@ extern "C" {
> - #define APR_HAVE_STRUCT_RLIMIT @struct_rlimit@
> - #define APR_HAVE_UNION_SEMUN @have_union_semun@
> - #define APR_HAVE_SCTP @have_sctp@
> --#define APR_HAVE_IOVEC @have_iovec@
> -+#define APR_HAVE_IOVEC 1
> -
> - /* APR Feature Macros */
> - #define APR_HAS_SHARED_MEMORY @sharedmem@
> diff --git a/recipes/apache2/apache2-2.2.14/configure-patch b/recipes/apache2/apache2-2.2.14/configure-patch
> deleted file mode 100644
> index 50f7420..0000000
> --- a/recipes/apache2/apache2-2.2.14/configure-patch
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -Index: httpd-2.2.14/configure
> -===================================================================
> ---- httpd-2.2.14.orig/configure
> -+++ httpd-2.2.14/configure
> -@@ -3795,26 +3795,6 @@ if test "${with_apr+set}" = set; then :
> -
> - else
> -
> -- if test -n "1"&& test "1" = "1"; then
> -- for apr_temp_apr_config_file in $apr_temp_acceptable_apr_config
> -- do
> -- if $apr_temp_apr_config_file --help> /dev/null 2>&1 ; then
> -- apr_config="$apr_temp_apr_config_file"
> --
> -- apr_found="yes"
> -- break
> -- else
> -- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
> -- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then
> -- apr_config="$lookdir/bin/$apr_temp_apr_config_file"
> --
> -- apr_found="yes"
> -- break 2
> -- fi
> -- done
> -- fi
> -- done
> -- fi
> - if test "$apr_found" = "no"&& test -d ""$srcdir/srclib/apr""; then
> - apr_temp_abs_srcdir="`cd "$srcdir/srclib/apr"&& pwd`"
> - apr_found="reconfig"
> -@@ -4147,26 +4127,6 @@ if test "${with_apr_util+set}" = set; th
> -
> - else
> -
> -- if test -n "1"&& test "1" = "1"; then
> -- for apu_temp_apu_config_file in $apu_temp_acceptable_apu_config
> -- do
> -- if $apu_temp_apu_config_file --help> /dev/null 2>&1 ; then
> -- apu_config="$apu_temp_apu_config_file"
> --
> -- apu_found="yes"
> -- break
> -- else
> -- for lookdir in /usr /usr/local /usr/local/apr /opt/apr; do
> -- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then
> -- apu_config="$lookdir/bin/$apu_temp_apu_config_file"
> --
> -- apu_found="yes"
> -- break 2
> -- fi
> -- done
> -- fi
> -- done
> -- fi
> - if test "$apu_found" = "no"&& test -d ""$srcdir/srclib/apr-util""; then
> - apu_temp_abs_srcdir="`cd "$srcdir/srclib/apr-util"&& pwd`"
> - apu_found="reconfig"
> -@@ -7045,7 +7005,11 @@ if test "${ap_cv_void_ptr_lt_long+set}"
> - $as_echo_n "(cached) ">&6
> - else
> - if test "$cross_compiling" = yes; then :
> -- ap_cv_void_ptr_lt_long=yes
> -+ if test "$ac_cv_sizeof_long_p" = "$ac_cv_sizeof_void_p"; then
> -+ ap_void_ptr_lt_long=no
> -+ else
> -+ ap_void_ptr_lt_long=yes
> -+ fi
> - else
> - cat confdefs.h -<<_ACEOF>conftest.$ac_ext
> - /* end confdefs.h. */
> diff --git a/recipes/apache2/apache2-2.2.14/configure.in.patch b/recipes/apache2/apache2-2.2.14/configure.in.patch
> deleted file mode 100644
> index 2ca098d..0000000
> --- a/recipes/apache2/apache2-2.2.14/configure.in.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -Index: httpd-2.2.14/srclib/apr/configure.in
> -===================================================================
> ---- httpd-2.2.14.orig/srclib/apr/configure.in
> -+++ httpd-2.2.14/srclib/apr/configure.in
> -@@ -923,7 +923,7 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm
> - create_area])
> -
> - APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
> --AC_CHECK_FILE(/dev/zero)
> -+APR_CHECK_FILE(/dev/zero)
> -
> - # Not all systems can mmap /dev/zero (such as HP-UX). Check for that.
> - if test "$ac_cv_func_mmap" = "yes"&&
> -Index: httpd-2.2.14/configure.in
> -===================================================================
> ---- httpd-2.2.14.orig/configure.in
> -+++ httpd-2.2.14/configure.in
> -@@ -61,6 +61,9 @@ APR_MKDIR_P_CHECK($top_srcdir/build/mkdi
> -
> - dnl ## Run configure for packages Apache uses
> -
> -+dnl first configure subdirs
> -+AC_CONFIG_SUBDIRS(srclib/apr srclib/apr-util srclib/prce)
> -+
> - dnl shared library support for these packages doesn't currently
> - dnl work on some platforms
> -
> diff --git a/recipes/apache2/apache2-2.2.14/dftables-makefile-patch b/recipes/apache2/apache2-2.2.14/dftables-makefile-patch
> deleted file mode 100644
> index ac966db..0000000
> --- a/recipes/apache2/apache2-2.2.14/dftables-makefile-patch
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- http-2.2.3/srclib/pcre/Makefile.in-orig
> -+++ http-2.2.3/srclib/pcre/Makefile.in 2005-12-20 13:12:03.000000000 -0500
> -@@ -15,6 +15,6 @@
> - $(LINK) $(EXTRA_LDFLAGS) dftables.lo $(EXTRA_LIBS)
> -
> - $(srcdir)/chartables.c: dftables
> -- ./dftables $@
> -+ dftables $@
> -
> - pcre.lo: $(srcdir)/chartables.c
> diff --git a/recipes/apache2/apache2-2.2.14/server-makefile-patch b/recipes/apache2/apache2-2.2.14/server-makefile-patch
> deleted file mode 100644
> index f1349cb..0000000
> --- a/recipes/apache2/apache2-2.2.14/server-makefile-patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- http-2.0.54/server/Makefile.in-old 2005-12-20 13:26:56.000000000 -0500
> -+++ http-2.0.54/server/Makefile.in 2005-12-20 13:27:22.000000000 -0500
> -@@ -27,7 +27,7 @@
> - $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS)
> -
> - test_char.h: gen_test_char
> -- ./gen_test_char> test_char.h
> -+ gen_test_char> test_char.h
> -
> - util.lo: test_char.h
> -
> diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb
> deleted file mode 100644
> index 8b1bf7e..0000000
> --- a/recipes/apache2/apache2-native_2.2.14.bb
> +++ /dev/null
> @@ -1,44 +0,0 @@
> -SECTION = "net"
> -DEPENDS = "expat pcre"
> -
> -inherit native
> -
> -PR = "r2"
> -SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
> -
> -S = "${WORKDIR}/httpd-${PV}"
> -
> -do_configure () {
> - ./configure --with-included-apr --prefix=${prefix}
> -}
> -
> -do_install () {
> - install -d ${D}${bindir} ${D}${libdir}
> - cp server/gen_test_char ${D}${bindir}
> - cp srclib/apr/apr-1-config ${D}${bindir}
> - cp srclib/apr-util/apu-1-config ${D}${bindir}
> - cp support/apxs ${D}${bindir}
> - chmod 755 ${D}${bindir}/apxs
> - install -d ${D}/usr/build
> - cp build/*.mk ${D}/usr/build
> - cp build/instdso.sh ${D}/usr/build
> - cp .libs/httpd ${D}${bindir}
> -
> - (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
> - (cd ${D}${libdir}; tar -xf - )
> - (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
> - (cd ${D}${libdir}; tar -xf - )
> -
> - install -d ${D}${includedir}/apache2
> - cp include/* ${D}${includedir}/apache2
> - cp os/unix/os.h ${D}${includedir}/apache2
> - cp os/unix/unixd.h ${D}${includedir}/apache2
> -
> - cp support/envvars-std ${D}${bindir}/envvars
> - chmod 755 ${D}${bindir}/envvars
> -}
> -
> -SRC_URI[md5sum] = "a5226203aaf97e5b941c41a71c112704"
> -SRC_URI[sha256sum] = "b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6"
> -
> -NATIVE_INSTALL_WORKS = "1"
> diff --git a/recipes/apache2/apache2_2.2.14.bb b/recipes/apache2/apache2_2.2.14.bb
> deleted file mode 100644
> index 8a6b38d..0000000
> --- a/recipes/apache2/apache2_2.2.14.bb
> +++ /dev/null
> @@ -1,122 +0,0 @@
> -SECTION = "net"
> -DESCRIPTION = "The apache v2 web server"
> -DEPENDS = "libtool-native apache2-native openssl expat pcre"
> -RDEPENDS_${PN} += "openssl"
> -
> -PR = "r2"
> -
> -SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-${PV}.tar.bz2 \
> - file://apr-sockets-patch;apply=yes \
> - file://configure-patch;apply=yes \
> - file://server-makefile-patch;apply=yes \
> - file://configure.in.patch \
> - file://apr.h.in.patch \
> - file://init"
> -
> -#
> -# over-ride needed since apache unpacks into httpd
> -#
> -S = "${WORKDIR}/httpd-${PV}"
> -
> -#
> -# implications - autotools defines suitable do_configure, do_install, etc.
> -# update-rc.d adds hooks for rc-update.
> -#
> -#
> -inherit autotools update-rc.d
> -
> -#
> -# implications - used by update-rc.d scripts
> -#
> -INITSCRIPT_NAME = "apache2"
> -INITSCRIPT_PARAMS = "defaults 91 20"
> -LEAD_SONAME = "libapr-1.so.0"
> -
> -CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \
> - ${sysconfdir}/${PN}/magic \
> - ${sysconfdir}/${PN}/mime.types \
> - ${sysconfdir}/init.d/${PN} "
> -
> -#
> -PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}"
> -
> -# we override here rather than append so that .so links are
> -# included in the runtime package rather than here (-dev)
> -# and to get build, icons, error into the -dev package
> -FILES_${PN}-dev = "${datadir}/${PN}/build \
> - ${datadir}/${PN}/icons \
> - ${datadir}/${PN}/error \
> - ${bindir}/apr-config ${bindir}/apu-config \
> - ${libdir}/apr*.exp \
> - ${includedir}/${PN} \
> - ${libdir}/*.la \
> - ${libdir}/*.a"
> -
> -# manual to manual
> -FILES_${PN}-doc += " ${datadir}/${PN}/manual"
> -
> -#
> -# override this too - here is the default, less datadir
> -#
> -FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \
> - ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \
> - ${libdir}/${PN}"
> -
> -# we want htdocs and cgi-bin to go with the binary
> -FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin"
> -
> -#make sure the lone .so links also get wrapped in the base package
> -FILES_${PN} += " ${libdir}/lib*.so ${libdir}/pkgconfig/*"
> -
> -CFLAGS_append = " -DPATH_MAX=4096"
> -CFLAGS_prepend = "-I${STAGING_INCDIR}/openssl "
> -EXTRA_OECONF = "--enable-ssl \
> - --with-ssl=${STAGING_LIBDIR}/.. \
> - --with-expat=${STAGING_LIBDIR}/.. \
> - --with-pcre=${STAGING_LIBDIR}/.. \
> - --enable-info \
> - --enable-rewrite \
> - --with-dbm=sdbm \
> - --with-berkeley-db=no \
> - --localstatedir=/var/${PN} \
> - --with-gdbm=no \
> - --with-ndbm=no \
> - --includedir=${includedir}/${PN} \
> - --datadir=${datadir}/${PN} \
> - --sysconfdir=${sysconfdir}/${PN} \
> - "
> -
> -#
> -# here we over-ride the autotools provided do_configure.
> -#
> -
> -do_configure_prepend() {
> - sed -e 's,libtool libtool15,${HOST_SYS}-libtool libtool115,' -i ${S}/srclib/apr/build/buildcheck.sh
> -}
> -
> -do_configure() {
> - ( cd srclib/apr; sh ./buildconf )
> - oe_runconf
> -}
> -
> -do_compile_prepend() {
> - ln -sf ${S}/srclib/apr/${HOST_SYS}-libtool ${S}/srclib/apr/libtool
> -}
> -
> -do_install_append() {
> - install -d ${D}/${sysconfdir}/init.d
> - cat ${WORKDIR}/init | \
> - sed -e 's,/usr/sbin/,${sbindir}/,g' \
> - -e 's,/usr/bin/,${bindir}/,g' \
> - -e 's,/usr/lib,${libdir}/,g' \
> - -e 's,/etc/,${sysconfdir}/,g' \
> - -e 's,/usr/,${prefix}/,g'> ${D}/${sysconfdir}/init.d/${PN}
> - chmod 755 ${D}/${sysconfdir}/init.d/${PN}
> -# remove the goofy original files...
> - rm -rf ${D}/${sysconfdir}/${PN}/original
> -# Expat should be found in the staging area via DEPENDS...
> - rm -f ${D}/${libdir}/libexpat.*
> -}
> -
> -SRC_URI[md5sum] = "a5226203aaf97e5b941c41a71c112704"
> -SRC_URI[sha256sum] = "b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 6/9] libc-client: add 2007e
2011-03-13 18:58 ` [PATCH 6/9] libc-client: add 2007e Eric Bénard
@ 2011-03-13 20:29 ` Khem Raj
2011-03-13 21:14 ` Eric Bénard
0 siblings, 1 reply; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:29 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> Signed-off-by: Eric Bénard<eric@eukrea.com>
there is some tab and space intermix I think but
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/libc-client/libc-client_2007e.bb | 29 +++++++++++++++++++++++++++++
> 1 files changed, 29 insertions(+), 0 deletions(-)
> create mode 100644 recipes/libc-client/libc-client_2007e.bb
>
> diff --git a/recipes/libc-client/libc-client_2007e.bb b/recipes/libc-client/libc-client_2007e.bb
> new file mode 100644
> index 0000000..743910c
> --- /dev/null
> +++ b/recipes/libc-client/libc-client_2007e.bb
> @@ -0,0 +1,29 @@
> +DESCRIPTION = "UW c-client library for mail protocols"
> +SECTION = "devel"
> +PRIORITY = "optional"
> +LICENSE = "University of Washingtons Free-Fork License"
> +DEPENDS = "libpam openssl libpam"
> +
> +SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.gz \
> + file://quote_cctype.patch"
> +
> +S = "${WORKDIR}/imap-${PV}"
> +
> +EXTRA_OEMAKE = "CC='${CC}'"
> +
> +HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
> +
> +do_compile() {
> + echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}"> ${S}/SPECIALS
> + oe_runmake lnp
> +}
> +
> +do_install() {
> + install -d ${D}${includedir}/c-client
> + install ${HEADERS} ${D}${includedir}/c-client
> + install -d ${D}${libdir}
> + install c-client/c-client.a ${D}${libdir}/libc-client.a
> +}
> +
> +SRC_URI[md5sum] = "7903800dc2604000016de070e0c55840"
> +SRC_URI[sha256sum] = "4b1137b87249782496ec3eeacaf83bbf09312a7d2ae3aead262179041b55565f"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 7/9] libc-client: remove 2007b
2011-03-13 18:58 ` [PATCH 7/9] libc-client: remove 2007b Eric Bénard
@ 2011-03-13 20:29 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:29 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/libc-client/libc-client_2007b.bb | 30 ------------------------------
> 1 files changed, 0 insertions(+), 30 deletions(-)
> delete mode 100644 recipes/libc-client/libc-client_2007b.bb
>
> diff --git a/recipes/libc-client/libc-client_2007b.bb b/recipes/libc-client/libc-client_2007b.bb
> deleted file mode 100644
> index dbcda08..0000000
> --- a/recipes/libc-client/libc-client_2007b.bb
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -DESCRIPTION = "UW c-client library for mail protocols"
> -SECTION = "devel"
> -PRIORITY = "optional"
> -LICENSE = "University of Washingtons Free-Fork License"
> -DEPENDS = "libpam openssl libpam"
> -
> -SRC_URI = "ftp://ftp.cac.washington.edu/imap/imap-${PV}.tar.Z \
> - file://quote_cctype.patch"
> -
> -S = "${WORKDIR}/imap-${PV}"
> -
> -EXTRA_OEMAKE = "CC='${CC}'"
> -
> -HEADERS = "src/c-client/*.h src/osdep/unix/*.h c-client/auths.c c-client/linkage.c c-client/linkage.h c-client/osdep.h"
> -
> -do_compile() {
> - echo "SSLINCLUDE=${STAGING_INCDIR} SSLLIB=${STAGING_LIBDIR}"> ${S}/SPECIALS
> - oe_runmake lnp
> -}
> -
> -do_install() {
> - install -d ${D}${includedir}/c-client
> - install ${HEADERS} ${D}${includedir}/c-client
> - install -d ${D}${libdir}
> - install c-client/c-client.a ${D}${libdir}/libc-client.a
> -}
> -
> -
> -SRC_URI[md5sum] = "4d59ce6303cf8ef93ff51341b1ce2df7"
> -SRC_URI[sha256sum] = "b3170bef59f416be1f710be58333f9b0c2c8b0fe137062accd4f5f13a3785cd0"
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 8/9] php: add 5.3.5
2011-03-13 18:58 ` [PATCH 8/9] php: add 5.3.5 Eric Bénard
@ 2011-03-13 20:30 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:30 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> which is the latest version
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/php/php-5.3.5/acinclude-xml2-config.patch | 18 ++++
> recipes/php/php-5.3.5/iconv.patch | 27 +++++
> recipes/php/php-5.3.5/imap-fix-autofoo.patch | 41 ++++++++
> recipes/php/php-5.3.5/pear-makefile.patch | 13 +++
> recipes/php/php-5.3.5/phar-makefile.patch | 26 +++++
> recipes/php/php-5.3.5/php-m4-divert.patch | 83 ++++++++++++++++
> recipes/php/php-5.3.5/php_exec_native.patch | 11 ++
> recipes/php/php-native_5.3.5.bb | 11 ++
> recipes/php/php_5.3.5.bb | 108 +++++++++++++++++++++
> 9 files changed, 338 insertions(+), 0 deletions(-)
> create mode 100644 recipes/php/php-5.3.5/acinclude-xml2-config.patch
> create mode 100644 recipes/php/php-5.3.5/iconv.patch
> create mode 100644 recipes/php/php-5.3.5/imap-fix-autofoo.patch
> create mode 100644 recipes/php/php-5.3.5/pear-makefile.patch
> create mode 100644 recipes/php/php-5.3.5/phar-makefile.patch
> create mode 100644 recipes/php/php-5.3.5/php-m4-divert.patch
> create mode 100644 recipes/php/php-5.3.5/php_exec_native.patch
> create mode 100644 recipes/php/php-native_5.3.5.bb
> create mode 100644 recipes/php/php_5.3.5.bb
>
> diff --git a/recipes/php/php-5.3.5/acinclude-xml2-config.patch b/recipes/php/php-5.3.5/acinclude-xml2-config.patch
> new file mode 100644
> index 0000000..bf519d2
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/acinclude-xml2-config.patch
> @@ -0,0 +1,18 @@
> +--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
> ++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
> +@@ -2359,12 +2359,9 @@
> + AC_DEFUN([PHP_SETUP_LIBXML], [
> + AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
> + [
> +- for i in $PHP_LIBXML_DIR /usr/local /usr; do
> +- if test -x "$i/bin/xml2-config"; then
> +- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
> +- break
> +- fi
> +- done
> ++
> ++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
> ++
> + ])
> +
> + if test -x "$ac_cv_php_xml2_config_path"; then
> diff --git a/recipes/php/php-5.3.5/iconv.patch b/recipes/php/php-5.3.5/iconv.patch
> new file mode 100644
> index 0000000..66b39cc
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/iconv.patch
> @@ -0,0 +1,27 @@
> +Index: php-5.2.13/acinclude.m4
> +===================================================================
> +--- php-5.2.13.orig/acinclude.m4
> ++++ php-5.2.13/acinclude.m4
> +@@ -2430,7 +2430,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [
> + dnl
> + dnl Check libc first if no path is provided in --with-iconv
> + dnl
> +- if test "$PHP_ICONV" = "yes"; then
> ++ dnl must check against no, not against yes as PHP_ICONV can also include a path, which implies yes
> ++ if test "$PHP_ICONV" != "no"; then
> + AC_CHECK_FUNC(iconv, [
> + found_iconv=yes
> + ],[
> +Index: php-5.2.13/ext/iconv/config.m4
> +===================================================================
> +--- php-5.2.13.orig/ext/iconv/config.m4
> ++++ php-5.2.13/ext/iconv/config.m4
> +@@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then
> +
> + if test "$iconv_avail" != "no"; then
> + if test -z "$ICONV_DIR"; then
> +- for i in /usr/local /usr; do
> ++ for i in $PHP_ICONV /usr/local /usr; do
> + if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
> + PHP_ICONV_PREFIX="$i"
> + break
> diff --git a/recipes/php/php-5.3.5/imap-fix-autofoo.patch b/recipes/php/php-5.3.5/imap-fix-autofoo.patch
> new file mode 100644
> index 0000000..3695b7b
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/imap-fix-autofoo.patch
> @@ -0,0 +1,41 @@
> +Index: php-5.2.11/ext/imap/config.m4
> +===================================================================
> +--- php-5.2.11.orig/ext/imap/config.m4 2009-12-10 12:27:52.800974533 -0700
> ++++ php-5.2.11/ext/imap/config.m4 2009-12-10 12:28:33.720976583 -0700
> +@@ -103,7 +103,7 @@
> + PHP_NEW_EXTENSION(imap, php_imap.c, $ext_shared)
> + AC_DEFINE(HAVE_IMAP,1,[ ])
> +
> +- for i in $PHP_IMAP /usr/local /usr; do
> ++ for i in $PHP_IMAP $PHP_IMAP/usr /usr/local /usr; do
> + IMAP_INC_CHK()
> + el[]IMAP_INC_CHK(/include/c-client)
> + el[]IMAP_INC_CHK(/include/imap)
> +@@ -192,13 +192,7 @@
> + AC_MSG_ERROR(Cannot find rfc822.h. Please check your c-client installation.)
> + fi
> +
> +- if test -r "$IMAP_DIR/c-client/c-client.a"; then
> +- ln -s "$IMAP_DIR/c-client/c-client.a" "$IMAP_DIR/c-client/libc-client.a">/dev/null 2>&1
> +- elif test -r "$IMAP_DIR/$PHP_LIBDIR/c-client.a"; then
> +- ln -s "$IMAP_DIR/$PHP_LIBDIR/c-client.a" "$IMAP_DIR/$PHP_LIBDIR/libc-client.a">/dev/null 2>&1
> +- fi
> +-
> +- for lib in c-client4 c-client imap; do
> ++ for lib in /usr/lib c-client4 c-client imap; do
> + IMAP_LIB=$lib
> + IMAP_LIB_CHK($PHP_LIBDIR)
> + IMAP_LIB_CHK(c-client)
> +Index: php-5.2.11/acinclude.m4
> +===================================================================
> +--- php-5.2.11.orig/acinclude.m4 2009-12-10 12:37:13.134722881 -0700
> ++++ php-5.2.11/acinclude.m4 2009-12-10 12:37:39.342007053 -0700
> +@@ -2338,7 +2338,7 @@
> + PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
> + fi
> +
> +- for i in $PHP_OPENSSL_DIR; do
> ++ for i in $PHP_OPENSSL_DIR $PHP_OPENSSL_DIR/usr; do
> + if test -r $i/include/openssl/evp.h; then
> + OPENSSL_INCDIR=$i/include
> + fi
> diff --git a/recipes/php/php-5.3.5/pear-makefile.patch b/recipes/php/php-5.3.5/pear-makefile.patch
> new file mode 100644
> index 0000000..1928b98
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/pear-makefile.patch
> @@ -0,0 +1,13 @@
> +diff --git a/pear/Makefile.frag b/pear/Makefile.frag
> +index 1f6f70e..b19a77c 100644
> +--- a/pear/Makefile.frag
> ++++ b/pear/Makefile.frag
> +@@ -11,7 +11,7 @@ PEAR_PREFIX = -dp a${program_prefix}
> + PEAR_SUFFIX = -ds a$(program_suffix)
> +
> + install-pear-installer: $(SAPI_CLI_PATH)
> +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) pear/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
> ++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)" ${PEAR_PREFIX} ${PEAR_SUFFIX}
> +
> + install-pear:
> + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
> diff --git a/recipes/php/php-5.3.5/phar-makefile.patch b/recipes/php/php-5.3.5/phar-makefile.patch
> new file mode 100644
> index 0000000..6fde251
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/phar-makefile.patch
> @@ -0,0 +1,26 @@
> +diff --git a/ext/phar/Makefile.frag b/ext/phar/Makefile.frag
> +index fc93d1d..9a8cd65 100755
> +--- a/ext/phar/Makefile.frag
> ++++ b/ext/phar/Makefile.frag
> +@@ -6,19 +6,8 @@ pharcmd: $(builddir)/phar.php $(builddir)/phar.phar
> +
> + PHP_PHARCMD_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d phar.readonly=0 -d 'safe_mode=0'
> + PHP_PHARCMD_EXECUTABLE = ` \
> +- if test -x "$(top_builddir)/$(SAPI_CLI_PATH)"; then \
> +- $(top_srcdir)/build/shtool echo -n -- "$(top_builddir)/$(SAPI_CLI_PATH) -n"; \
> +- if test "x$(PHP_MODULES)" != "x"; then \
> +- $(top_srcdir)/build/shtool echo -n -- " -d extension_dir=$(top_builddir)/modules"; \
> +- for i in bz2 zlib phar; do \
> +- if test -f "$(top_builddir)/modules/$$i.la"; then \
> +- . $(top_builddir)/modules/$$i.la; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
> +- fi; \
> +- done; \
> +- fi; \
> +- else \
> +- $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; \
> +- fi;`
> ++ $(top_srcdir)/build/shtool echo -n -- "$(PHP_EXECUTABLE)"; `
> ++
> + PHP_PHARCMD_BANG = `$(top_srcdir)/build/shtool echo -n -- "$(INSTALL_ROOT)$(bindir)/$(program_prefix)php$(program_suffix)$(EXEEXT)";`
> +
> + $(builddir)/phar/phar.inc: $(srcdir)/phar/phar.inc
> diff --git a/recipes/php/php-5.3.5/php-m4-divert.patch b/recipes/php/php-5.3.5/php-m4-divert.patch
> new file mode 100644
> index 0000000..dfc7b64
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/php-m4-divert.patch
> @@ -0,0 +1,83 @@
> +Patch taken from
> +
> +http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1
> +
> +diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in
> +--- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200
> ++++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200
> +@@ -1,7 +1,7 @@
> + ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*-
> + dnl ## Process this file with autoconf to produce a configure script.
> +
> +-divert(1)
> ++divert(1001)
> +
> + dnl ## Diversion 1 is the autoconf + automake setup phase. We also
> + dnl ## set the PHP version, deal with platform-specific compile
> +@@ -263,7 +263,7 @@
> + sinclude(TSRM/tsrm.m4)
> +
> +
> +-divert(2)
> ++divert(1002)
> +
> + dnl ## Diversion 2 is where we set PHP-specific options and come up
> + dnl ## with reasonable default values for them. We check for pthreads here
> +@@ -302,7 +302,7 @@
> + PTHREADS_FLAGS
> + fi
> +
> +-divert(3)
> ++divert(1003)
> +
> + dnl ## In diversion 3 we check for compile-time options to the PHP
> + dnl ## core and how to deal with different system dependencies.
> +@@ -661,7 +661,7 @@
> + PHP_CRYPT_R_STYLE
> + fi
> +
> +-divert(4)
> ++divert(1004)
> +
> + dnl ## In diversion 4 we check user-configurable general settings.
> +
> +@@ -902,7 +902,7 @@
> + AC_MSG_RESULT([using system default])
> + fi
> +
> +-divert(5)
> ++divert(1005)
> +
> + dnl ## In diversion 5 we check which extensions should be compiled.
> + dnl ## All of these are normally in the extension directories.
> +diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4
> +--- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200
> ++++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200
> +@@ -1,6 +1,6 @@
> + dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
> +
> +-divert(3)dnl
> ++divert(1003)dnl
> +
> + dnl
> + dnl Check if flush should be called explicitly after buffered io
> +@@ -205,7 +205,7 @@
> + AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
> + AC_FUNC_FNMATCH
> +
> +-divert(5)dnl
> ++divert(1005)dnl
> +
> + dnl
> + dnl Check for regex library type
> +diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4
> +--- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200
> ++++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200
> +@@ -1,6 +1,6 @@
> + dnl This file becomes configure.in for self-contained extensions.
> +
> +-divert(1)
> ++divert(1001)
> +
> + AC_PREREQ(2.13)
> + AC_INIT(config.m4)
> diff --git a/recipes/php/php-5.3.5/php_exec_native.patch b/recipes/php/php-5.3.5/php_exec_native.patch
> new file mode 100644
> index 0000000..a563c9a
> --- /dev/null
> +++ b/recipes/php/php-5.3.5/php_exec_native.patch
> @@ -0,0 +1,11 @@
> +--- php/configure.in.orig 2011-03-12 02:13:19.000000000 +0100
> ++++ php/configure.in 2011-03-12 02:14:05.000000000 +0100
> +@@ -1216,7 +1216,7 @@
> + PHP_INSTALL_CLI_TARGET="install-cli"
> + PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c,, cli)
> + PHP_INSTALLED_SAPIS="cli $PHP_SAPI"
> +- PHP_EXECUTABLE="\$(top_builddir)/\$(SAPI_CLI_PATH)"
> ++ PHP_EXECUTABLE="${PHP_NATIVE_DIR}/php"
> + else
> + PHP_INSTALLED_SAPIS="$PHP_SAPI"
> + fi
> diff --git a/recipes/php/php-native_5.3.5.bb b/recipes/php/php-native_5.3.5.bb
> new file mode 100644
> index 0000000..3d4f2be
> --- /dev/null
> +++ b/recipes/php/php-native_5.3.5.bb
> @@ -0,0 +1,11 @@
> +require php-native.inc
> +
> +PR = "${INC_PR}.0"
> +
> +SRC_URI = "http://downloads.php.net/johannes/php-${PV}.tar.gz;name=src \
> + file://acinclude-xml2-config.patch \
> + file://php-m4-divert.patch \
> + "
> +
> +SRC_URI[src.md5sum] = "fb727a3ac72bf0ce37e1a20468a7bb81"
> +SRC_URI[src.sha256sum] = "95474df979efbf2b1a298998fe9954200f59048681817a97eb18415346fb6ca4"
> diff --git a/recipes/php/php_5.3.5.bb b/recipes/php/php_5.3.5.bb
> new file mode 100644
> index 0000000..23be66c
> --- /dev/null
> +++ b/recipes/php/php_5.3.5.bb
> @@ -0,0 +1,108 @@
> +require php.inc
> +
> +DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \
> + libc-client openssl"
> +
> +PR = "${INC_PR}.0"
> +
> +SRC_URI = "http://downloads.php.net/johannes/php-${PV}.tar.gz;name=src \
> + file://acinclude-xml2-config.patch \
> + file://php-m4-divert.patch \
> + file://iconv.patch \
> + file://imap-fix-autofoo.patch \
> + file://pear-makefile.patch \
> + file://phar-makefile.patch \
> + file://php_exec_native.patch \
> + "
> +
> +SRC_URI[src.md5sum] = "fb727a3ac72bf0ce37e1a20468a7bb81"
> +SRC_URI[src.sha256sum] = "95474df979efbf2b1a298998fe9954200f59048681817a97eb18415346fb6ca4"
> +
> +export THREADS="pthread"
> +export LIBS=" -lpthread "
> +
> +EXTRA_OECONF = " --enable-mbstring \
> + --enable-discard-path \
> + --enable-sockets \
> + --enable-shared \
> + --enable-pcntl \
> + --enable-wddx \
> + --disable-embedded-mysqli \
> + --disable-rpath \
> + --enable-magic-quotes \
> + --enable-fastcgi \
> + --with-imap=${STAGING_DIR_HOST} \
> + --with-imap-ssl=${STAGING_DIR_HOST} \
> + --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \
> + --with-iconv=${STAGING_LIBDIR}/.. \
> + --with-libxml-dir=${STAGING_BINDIR_CROSS} \
> + --with-mysql="${STAGING_DIR_TARGET}${layout_exec_prefix}" \
> + --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \
> + --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \
> + --without-pdo-sqlite \
> + "
> +
> +export LD_LIBRARY_PATH = "${STAGING_LIBDIR}"
> +export PHP_NATIVE_DIR = "${STAGING_BINDIR_NATIVE}"
> +export PHP_PEAR_PHP_BIN = "${bindir}/php"
> +
> +#LDFLAGS += "-lstdc++"
> +
> +do_configure_append() {
> + find ${S} -type f -readable -writable | xargs sed -i 's:I/usr/include:I${STAGING_INCDIR}:g'
> + # use same fix as libiconv
> + sed -i -e s/^hardcode_libdir_flag_spec/#hardcode_libdir_flag_spec/ \
> + -e s/^runpath_var/#runpath_var/ ${S}/*-libtool
> +}
> +
> +# fixme
> +do_install_append() {
> + mv ${D}/${STAGING_DIR_NATIVE}/${sysconfdir} ${D}/${sysconfdir}
> + rm -rf ${D}/${STAGING_DIR_NATIVE}
> + rm -rf ${D}/.registry
> + rm -rf ${D}/.channels
> + rm -rf ${D}/.[a-z]*
> + sed -i 's:${STAGING_DIR_NATIVE}::g' ${D}/${sysconfdir}/pear.conf
> +}
> +
> +PACKAGES = "${PN}-dbg \
> + ${PN}-cli \
> + ${PN}-cgi \
> + ${PN}-pear \
> + ${PN}-dev \
> + ${PN}-doc \
> + ${PN} \
> +"
> +
> +
> +FILES_${PN}-dbg =+ "${bindir}/.debug"
> +
> +FILES_${PN}-doc += "${libdir}/php/doc"
> +
> +FILES_${PN}-cli = "${bindir}/php"
> +FILES_${PN}-cgi = "${bindir}/php-cgi"
> +
> +FILES_${PN}-pear = "${bindir}/pear* ${bindir}/pecl \
> + ${libdir}/php/PEAR \
> + ${libdir}/php/PEAR.php \
> + ${libdir}/php/System.php ${libdir}php/peclcmd.php ${libdir}/php/pearcmd.php \
> + ${libdir}/php/.channels ${libdir}/php/.channels/.alias \
> + ${libdir}/php/.channels\__uri.reg \
> + ${libdir}/php/.channels\pear.php.net.reg ${libdir}/php/.channels/pecl.php.net.reg \
> + ${libdir}/php/.registry \
> + ${libdir}/php/Archive/Tar.php \
> + ${libdir}/php/Console/Getopt.php ${libdir}/php/OS/Guess.php \
> + ${sysconfdir}/pear.conf"
> +
> +
> +FILES_${PN}-dev = "${includedir}/php ${libdir}/build \
> + ${bindir}/phpize ${bindir}/php-config \
> + ${libdir}/php/.depdb ${libdir}/php/.depdblock ${libdir}/php/.filemap ${libdir}/php/.lock \
> + ${libdir}/php/test "
> +
> +FILES_${PN} = "${libdir}/php"
> +FILES_${PN} += "${bindir}"
> +
> +RDEPENDS_${PN}-pear = ${PN}
> +RDEPENDS_${PN}-cli = ${PN}
> +RDEPENDS_${PN}-dev = ${PN}
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 9/9] php: remove php-native 5.3.2
2011-03-13 18:58 ` [PATCH 9/9] php: remove php-native 5.3.2 Eric Bénard
@ 2011-03-13 20:30 ` Khem Raj
0 siblings, 0 replies; 19+ messages in thread
From: Khem Raj @ 2011-03-13 20:30 UTC (permalink / raw)
To: openembedded-devel
On 3/13/2011 11:58 AM, Eric Bénard wrote:
> now that we have 5.3.5
>
> Signed-off-by: Eric Bénard<eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
> ---
> recipes/php/php-5.3.2/CVE-2010-0397.patch | 57 --------------
> recipes/php/php-5.3.2/acinclude-xml2-config.patch | 18 -----
> recipes/php/php-5.3.2/pear-makefile.patch | 11 ---
> recipes/php/php-5.3.2/php-m4-divert.patch | 83 ---------------------
> recipes/php/php-native_5.3.2.bb | 12 ---
> 5 files changed, 0 insertions(+), 181 deletions(-)
> delete mode 100644 recipes/php/php-5.3.2/CVE-2010-0397.patch
> delete mode 100644 recipes/php/php-5.3.2/acinclude-xml2-config.patch
> delete mode 100644 recipes/php/php-5.3.2/pear-makefile.patch
> delete mode 100644 recipes/php/php-5.3.2/php-m4-divert.patch
> delete mode 100644 recipes/php/php-native_5.3.2.bb
>
> diff --git a/recipes/php/php-5.3.2/CVE-2010-0397.patch b/recipes/php/php-5.3.2/CVE-2010-0397.patch
> deleted file mode 100644
> index 0d9c23d..0000000
> --- a/recipes/php/php-5.3.2/CVE-2010-0397.patch
> +++ /dev/null
> @@ -1,57 +0,0 @@
> -Description: Fix a null pointer dereference when processing invalid
> - XML-RPC requests.
> -Origin: vendor
> -Forwarded: http://bugs.php.net/51288
> -Last-Update: 2010-03-12
> -
> -Index: php/ext/xmlrpc/tests/bug51288.phpt
> -===================================================================
> ---- /dev/null
> -+++ php/ext/xmlrpc/tests/bug51288.phpt
> -@@ -0,0 +1,14 @@
> -+--TEST--
> -+Bug #51288 (CVE-2010-0397, NULL pointer deref when no<methodName> in request)
> -+--FILE--
> -+<?php
> -+$method = NULL;
> -+$req = '<?xml version="1.0"?><methodCall></methodCall>';
> -+var_dump(xmlrpc_decode_request($req, $method));
> -+var_dump($method);
> -+echo "Done\n";
> -+?>
> -+--EXPECT--
> -+NULL
> -+NULL
> -+Done
> -Index: php/ext/xmlrpc/xmlrpc-epi-php.c
> -===================================================================
> ---- php.orig/ext/xmlrpc/xmlrpc-epi-php.c
> -+++ php/ext/xmlrpc/xmlrpc-epi-php.c
> -@@ -778,6 +778,7 @@
> - zval* retval = NULL;
> - XMLRPC_REQUEST response;
> - STRUCT_XMLRPC_REQUEST_INPUT_OPTIONS opts = {{0}};
> -+ const char *method_name;
> - opts.xml_elem_opts.encoding = encoding_in ? utf8_get_encoding_id_from_string(encoding_in) : ENCODING_DEFAULT;
> -
> - /* generate XMLRPC_REQUEST from raw xml */
> -@@ -788,10 +789,15 @@
> -
> - if (XMLRPC_RequestGetRequestType(response) == xmlrpc_request_call) {
> - if (method_name_out) {
> -- zval_dtor(method_name_out);
> -- Z_TYPE_P(method_name_out) = IS_STRING;
> -- Z_STRVAL_P(method_name_out) = estrdup(XMLRPC_RequestGetMethodName(response));
> -- Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out));
> -+ method_name = XMLRPC_RequestGetMethodName(response);
> -+ if (method_name) {
> -+ zval_dtor(method_name_out);
> -+ Z_TYPE_P(method_name_out) = IS_STRING;
> -+ Z_STRVAL_P(method_name_out) = estrdup(method_name);
> -+ Z_STRLEN_P(method_name_out) = strlen(Z_STRVAL_P(method_name_out));
> -+ } else {
> -+ retval = NULL;
> -+ }
> - }
> - }
> -
> diff --git a/recipes/php/php-5.3.2/acinclude-xml2-config.patch b/recipes/php/php-5.3.2/acinclude-xml2-config.patch
> deleted file mode 100644
> index bf519d2..0000000
> --- a/recipes/php/php-5.3.2/acinclude-xml2-config.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> ---- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
> -+++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
> -@@ -2359,12 +2359,9 @@
> - AC_DEFUN([PHP_SETUP_LIBXML], [
> - AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
> - [
> -- for i in $PHP_LIBXML_DIR /usr/local /usr; do
> -- if test -x "$i/bin/xml2-config"; then
> -- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
> -- break
> -- fi
> -- done
> -+
> -+ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
> -+
> - ])
> -
> - if test -x "$ac_cv_php_xml2_config_path"; then
> diff --git a/recipes/php/php-5.3.2/pear-makefile.patch b/recipes/php/php-5.3.2/pear-makefile.patch
> deleted file mode 100644
> index 26de98a..0000000
> --- a/recipes/php/php-5.3.2/pear-makefile.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200
> -+++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200
> -@@ -6,7 +6,7 @@
> - PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
> -
> - install-pear-installer: $(SAPI_CLI_PATH)
> -- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
> -+ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
> -
> - install-pear:
> - @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
> diff --git a/recipes/php/php-5.3.2/php-m4-divert.patch b/recipes/php/php-5.3.2/php-m4-divert.patch
> deleted file mode 100644
> index dfc7b64..0000000
> --- a/recipes/php/php-5.3.2/php-m4-divert.patch
> +++ /dev/null
> @@ -1,83 +0,0 @@
> -Patch taken from
> -
> -http://cvs.pld-linux.org/cgi-bin/cvsweb/packages/php/php-m4-divert.patch?rev=1.1
> -
> -diff -ur php-5.2.10.org/configure.in php-5.2.10/configure.in
> ---- php-5.2.10.org/configure.in 2009-06-17 14:22:41.000000000 +0200
> -+++ php-5.2.10/configure.in 2009-08-18 12:16:25.317640253 +0200
> -@@ -1,7 +1,7 @@
> - ## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*-
> - dnl ## Process this file with autoconf to produce a configure script.
> -
> --divert(1)
> -+divert(1001)
> -
> - dnl ## Diversion 1 is the autoconf + automake setup phase. We also
> - dnl ## set the PHP version, deal with platform-specific compile
> -@@ -263,7 +263,7 @@
> - sinclude(TSRM/tsrm.m4)
> -
> -
> --divert(2)
> -+divert(1002)
> -
> - dnl ## Diversion 2 is where we set PHP-specific options and come up
> - dnl ## with reasonable default values for them. We check for pthreads here
> -@@ -302,7 +302,7 @@
> - PTHREADS_FLAGS
> - fi
> -
> --divert(3)
> -+divert(1003)
> -
> - dnl ## In diversion 3 we check for compile-time options to the PHP
> - dnl ## core and how to deal with different system dependencies.
> -@@ -661,7 +661,7 @@
> - PHP_CRYPT_R_STYLE
> - fi
> -
> --divert(4)
> -+divert(1004)
> -
> - dnl ## In diversion 4 we check user-configurable general settings.
> -
> -@@ -902,7 +902,7 @@
> - AC_MSG_RESULT([using system default])
> - fi
> -
> --divert(5)
> -+divert(1005)
> -
> - dnl ## In diversion 5 we check which extensions should be compiled.
> - dnl ## All of these are normally in the extension directories.
> -diff -ur php-5.2.10.org/ext/standard/config.m4 php-5.2.10/ext/standard/config.m4
> ---- php-5.2.10.org/ext/standard/config.m4 2007-07-11 13:56:03.000000000 +0200
> -+++ php-5.2.10/ext/standard/config.m4 2009-08-18 12:16:25.317640253 +0200
> -@@ -1,6 +1,6 @@
> - dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
> -
> --divert(3)dnl
> -+divert(1003)dnl
> -
> - dnl
> - dnl Check if flush should be called explicitly after buffered io
> -@@ -205,7 +205,7 @@
> - AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
> - AC_FUNC_FNMATCH
> -
> --divert(5)dnl
> -+divert(1005)dnl
> -
> - dnl
> - dnl Check for regex library type
> -diff -ur php-5.2.10.org/scripts/phpize.m4 php-5.2.10/scripts/phpize.m4
> ---- php-5.2.10.org/scripts/phpize.m4 2009-06-02 21:54:22.000000000 +0200
> -+++ php-5.2.10/scripts/phpize.m4 2009-08-18 12:16:25.317640253 +0200
> -@@ -1,6 +1,6 @@
> - dnl This file becomes configure.in for self-contained extensions.
> -
> --divert(1)
> -+divert(1001)
> -
> - AC_PREREQ(2.13)
> - AC_INIT(config.m4)
> diff --git a/recipes/php/php-native_5.3.2.bb b/recipes/php/php-native_5.3.2.bb
> deleted file mode 100644
> index 3a2299c..0000000
> --- a/recipes/php/php-native_5.3.2.bb
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -require php-native.inc
> -
> -PR = "${INC_PR}.1"
> -
> -SRC_URI = "http://museum.php.net/php5/php-${PV}.tar.bz2;name=src \
> - file://acinclude-xml2-config.patch \
> - file://php-m4-divert.patch \
> - file://CVE-2010-0397.patch"
> -
> -SRC_URI[src.md5sum] = "46f500816125202c48a458d0133254a4"
> -SRC_URI[src.sha256sum] = "9a380a574adcb3a9abe3226e7c3a9bae619e8a1b90842ec2a7edf0ad92afdeda"
> -
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH 6/9] libc-client: add 2007e
2011-03-13 20:29 ` Khem Raj
@ 2011-03-13 21:14 ` Eric Bénard
0 siblings, 0 replies; 19+ messages in thread
From: Eric Bénard @ 2011-03-13 21:14 UTC (permalink / raw)
To: openembedded-devel
Hi Khem,
On 13/03/2011 21:29, Khem Raj wrote:
> On 3/13/2011 11:58 AM, Eric Bénard wrote:
>> Signed-off-by: Eric Bénard<eric@eukrea.com>
>
> there is some tab and space intermix I think but
>
> Acked-by: Khem Raj <raj.khem@gmail.com>
should now be fixed & thanks for the review !
Eric
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2011-03-13 21:16 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-13 18:58 [PATCH 1/9] apr: add 1.4.2 Eric Bénard
2011-03-13 18:58 ` [PATCH 2/9] apr-util: add 1.3.10 Eric Bénard
2011-03-13 20:24 ` Khem Raj
2011-03-13 18:58 ` [PATCH 3/9] apr: remove old versions Eric Bénard
2011-03-13 20:25 ` Khem Raj
2011-03-13 18:58 ` [PATCH 4/9] apache2: add 2.2.17 Eric Bénard
2011-03-13 20:26 ` Khem Raj
2011-03-13 18:58 ` [PATCH 5/9] apache2: remove 2.2.14 Eric Bénard
2011-03-13 20:27 ` Khem Raj
2011-03-13 18:58 ` [PATCH 6/9] libc-client: add 2007e Eric Bénard
2011-03-13 20:29 ` Khem Raj
2011-03-13 21:14 ` Eric Bénard
2011-03-13 18:58 ` [PATCH 7/9] libc-client: remove 2007b Eric Bénard
2011-03-13 20:29 ` Khem Raj
2011-03-13 18:58 ` [PATCH 8/9] php: add 5.3.5 Eric Bénard
2011-03-13 20:30 ` Khem Raj
2011-03-13 18:58 ` [PATCH 9/9] php: remove php-native 5.3.2 Eric Bénard
2011-03-13 20:30 ` Khem Raj
2011-03-13 20:23 ` [PATCH 1/9] apr: add 1.4.2 Khem Raj
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox