mysql: upgrade to 5.1.66
PATCH 1/7 mysql: upgrade to 5.1.66
--- .../recipes-support/mysql/mysql5-native_5.1.40.bb | 24 --- .../recipes-support/mysql/mysql5-native_5.1.66.bb | 24 +++ .../mysql/mysql5/configure-ps-cache-check.patch | 27 --- .../mysql/mysql5/configure.in.patch | 54 ------ .../mysql/mysql5/fix-abi-check-gcc45.patch | 77 -------- .../mysql/mysql5/mysql-5.1.66-ac_cache_check.patch | 145 +++++++++++++++ .../mysql/mysql5/mysql-5.1.66-skip_abi_check.patch | 31 ++++ meta-oe/recipes-support/mysql/mysql5/plug.in.patch | 40 ---- meta-oe/recipes-support/mysql/mysql5_5.1.40.bb | 6 - meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 192 -------------------- meta-oe/recipes-support/mysql/mysql5_5.1.66.bb | 6 + meta-oe/recipes-support/mysql/mysql5_5.1.66.inc | 202 +++++++++++++++++++++ 12 files changed, 408 insertions(+), 420 deletions(-) delete mode 100644 meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb create mode 100644 meta-oe/recipes-support/mysql/mysql5-native_5.1.66.bb delete mode 100644 meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch delete mode 100644 meta-oe/recipes-support/mysql/mysql5/configure.in.patch delete mode 100644 meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch create mode 100644 meta-oe/recipes-support/mysql/mysql5/mysql-5.1.66-ac_cache_check.patch create mode 100644 meta-oe/recipes-support/mysql/mysql5/mysql-5.1.66-skip_abi_check.patch delete mode 100644 meta-oe/recipes-support/mysql/mysql5/plug.in.patch delete mode 100644 meta-oe/recipes-support/mysql/mysql5_5.1.40.bb delete mode 100644 meta-oe/recipes-support/mysql/mysql5_5.1.40.inc create mode 100644 meta-oe/recipes-support/mysql/mysql5_5.1.66.bb create mode 100644 meta-oe/recipes-support/mysql/mysql5_5.1.66.inc
meta-oe/recipes-support/mysql/mysql5-native_5.1.40.bb deleted +0 -24
@@ -1,24 +0,0 @@ -require mysql5_${PV}.inc -inherit native -PR ="r3" - -SRC_URI = "http://downloads.mysql.com/archives/mysql-5.1/mysql-${PV}.tar.gz \ - file://fix-abi-check-gcc45.patch" - -RDEPENDS_${PN} = "" -PACKAGES = "" -DEPENDS = "ncurses-native" -EXTRA_OEMAKE = "" -EXTRA_OECONF = " --with-embedded-server " - -do_install() { - oe_runmake 'DESTDIR=${D}' install - mv -f ${D}${libdir}/mysql/* ${D}${libdir} - rmdir ${D}${libdir}/mysql - - install -d ${D}${bindir} - install -m 0755 sql/gen_lex_hash ${D}${bindir}/ -} - -SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" -SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"
meta-oe/recipes-support/mysql/mysql5-native_5.1.66.bb new file +24 -0
@@ -0,0 +1,24 @@ +require mysql5_${PV}.inc +inherit native +PR ="r0" + +SRC_URI = "http://cdn.mysql.com/Downloads/MySQL-5.1/mysql-${PV}.tar.gz \ + " + +RDEPENDS_${PN} = "" +PACKAGES = "" +DEPENDS = "ncurses-native" +EXTRA_OEMAKE = "" +EXTRA_OECONF = " --with-embedded-server " + +do_install() { + oe_runmake 'DESTDIR=${D}' install + mv -f ${D}${libdir}/mysql/* ${D}${libdir} + rmdir ${D}${libdir}/mysql + + install -d ${D}${bindir} + install -m 0755 sql/gen_lex_hash ${D}${bindir}/ +} + +SRC_URI[md5sum] = "a43ffa58e3611e5a557feb745596aca3" +SRC_URI[sha256sum] = "eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907"
meta-oe/recipes-support/mysql/mysql5/configure-ps-cache-check.patch deleted +0 -27
@@ -1,27 +0,0 @@ -Index: mysql-4.1.22/configure.in -=================================================================== ---- mysql-4.1.22.orig/configure.in 2009-01-28 16:33:28.000000000 +0000 -+++ mysql-4.1.22/configure.in 2009-01-28 16:43:26.000000000 +0000 -@@ -471,8 +471,8 @@ - - # Lock for PS - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS p $$ 2> /dev/null | grep $0 > /dev/null - then -@@ -511,8 +511,9 @@ - AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill)
meta-oe/recipes-support/mysql/mysql5/configure.in.patch deleted +0 -54
54 lines not on this page · raw message
meta-oe/recipes-support/mysql/mysql5/fix-abi-check-gcc45.patch deleted +0 -77
77 lines not on this page · raw message
meta-oe/recipes-support/mysql/mysql5/mysql-5.1.66-ac_cache_check.patch new file +145 -0
145 lines not on this page · raw message
meta-oe/recipes-support/mysql/mysql5/mysql-5.1.66-skip_abi_check.patch new file +31 -0
@@ -0,0 +1,31 @@ +patch from http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/ + +diff -Naur mysql-5.1.66-old/Makefile.am mysql-5.1.66-new/Makefile.am +--- mysql-5.1.66-old/Makefile.am 2012-10-03 14:49:21.000000000 -0700 ++++ mysql-5.1.66-new/Makefile.am 2012-10-03 14:50:29.000000000 -0700 +@@ -310,24 +310,7 @@ + $(MAKE) abi_headers="$^" do_abi_check + + do_abi_check: +- set -ex; \ +- for file in $(abi_headers); do \ +- @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \ +- -I$(top_srcdir)/include \ +- -I$(top_srcdir)/include/mysql \ +- -I$(top_srcdir)/sql \ +- -I$(top_builddir)/include \ +- -I$(top_builddir)/include/mysql \ +- -I$(top_builddir)/sql \ +- $$file 2>/dev/null | \ +- @SED@ -e '/^# /d' \ +- -e '/^[ ]*$$/d' \ +- -e '/^#pragma GCC set_debug_pwd/d' \ +- -e '/^#ident/d' > \ +- $(top_builddir)/abi_check.out; \ +- @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \ +- @RM@ $(top_builddir)/abi_check.out; \ +- done ++ echo "Skipping do_abi_check" + + # Don't update the files from bitkeeper + %::SCCS/s.%
meta-oe/recipes-support/mysql/mysql5/plug.in.patch deleted +0 -40
@@ -1,40 +0,0 @@ -Index: mysql-5.1.40/storage/innodb_plugin/plug.in -=================================================================== ---- mysql-5.1.40.orig/storage/innodb_plugin/plug.in -+++ mysql-5.1.40/storage/innodb_plugin/plug.in -@@ -63,35 +63,6 @@ MYSQL_PLUGIN_ACTIONS(innodb_plugin, [ - ;; - esac - AC_SUBST(INNODB_DYNAMIC_CFLAGS) -- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) -- AC_TRY_RUN( -- [ -- #include <pthread.h> -- #include <string.h> -- -- int main(int argc, char** argv) { -- pthread_t x1; -- pthread_t x2; -- pthread_t x3; -- -- memset(&x1, 0x0, sizeof(x1)); -- memset(&x2, 0x0, sizeof(x2)); -- memset(&x3, 0x0, sizeof(x3)); -- -- __sync_bool_compare_and_swap(&x1, x2, x3); -- -- return(0); -- } -- ], -- [ -- AC_DEFINE([HAVE_ATOMIC_PTHREAD_T], [1], -- [pthread_t can be used by GCC atomic builtins]) -- AC_MSG_RESULT(yes) -- ], -- [ -- AC_MSG_RESULT(no) -- ] -- ) - - # Try using solaris atomics on SunOS if GCC atomics are not available - AC_CHECK_DECLS(
meta-oe/recipes-support/mysql/mysql5_5.1.40.bb deleted +0 -6
@@ -1,6 +0,0 @@ -require ${PN}_${PV}.inc - -DEPENDS += "mysql5-native" - -SRC_URI[md5sum] = "32e7373c16271606007374396e6742ad" -SRC_URI[sha256sum] = "2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432"
meta-oe/recipes-support/mysql/mysql5_5.1.40.inc deleted +0 -192
192 lines not on this page · raw message
meta-oe/recipes-support/mysql/mysql5_5.1.66.bb new file +6 -0
@@ -0,0 +1,6 @@ +require ${PN}_${PV}.inc + +DEPENDS += "mysql5-native" + +SRC_URI[md5sum] = "a43ffa58e3611e5a557feb745596aca3" +SRC_URI[sha256sum] = "eb85e3fa152949670f5b6f4379bd1d700a5f4726660ce18ff0ca628190cba907"
meta-oe/recipes-support/mysql/mysql5_5.1.66.inc new file +202 -0
202 lines not on this page · raw message
Signature · 1 line
1.7.11.7
PATCH 2/7 apache2: upgrade to 2.4.3
--- .../apache2-2.4.2/apache-configure_perlbin.patch | 37 --- .../apache2-2.4.2/apache-ssl-ltmain-rpath.patch | 76 ----- .../apache2/apache2-2.4.2/fix-libtool-name.patch | 55 ---- .../apache2-2.4.2/httpd-2.4.1-corelimit.patch | 37 --- .../apache2/apache2-2.4.2/httpd-2.4.1-export.patch | 22 -- .../apache2-2.4.2/httpd-2.4.1-selinux.patch | 63 ---- .../apache2-2.4.2/httpd-2.4.2-r1326980+.patch | 74 ----- .../apache2-2.4.2/httpd-2.4.2-r1327036+.patch | 87 ----- .../apache2-2.4.2/httpd-2.4.2-r1332643.patch | 260 --------------- .../apache2-2.4.2/httpd-2.4.2-r1337344+.patch | 350 --------------------- .../apache2-2.4.2/httpd-2.4.2-restart.patch | 35 --- .../replace-lynx-to-curl-in-apachectl-script.patch | 52 --- .../apache2/apache2-2.4.2/server-makefile.patch | 11 - .../apache2-2.4.3/apache-configure_perlbin.patch | 37 +++ .../apache2-2.4.3/apache-ssl-ltmain-rpath.patch | 76 +++++ .../apache2/apache2-2.4.3/fix-libtool-name.patch | 55 ++++ .../apache2-2.4.3/httpd-2.4.1-corelimit.patch | 37 +++ .../apache2/apache2-2.4.3/httpd-2.4.1-export.patch | 22 ++ .../apache2-2.4.3/httpd-2.4.1-selinux.patch | 63 ++++ .../apache2-2.4.3/httpd-2.4.2-r1332643.patch | 260 +++++++++++++++ .../replace-lynx-to-curl-in-apachectl-script.patch | 52 +++ .../apache2/apache2-2.4.3/server-makefile.patch | 11 + .../recipes-httpd/apache2/apache2-native_2.4.2.bb | 43 --- .../recipes-httpd/apache2/apache2-native_2.4.3.bb | 43 +++ .../recipes-httpd/apache2/apache2_2.4.2.bb | 144 --------- .../recipes-httpd/apache2/apache2_2.4.3.bb | 140 +++++++++ 26 files changed, 796 insertions(+), 1346 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-ssl-ltmain-rpath.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/fix-libtool-name.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-corelimit.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-selinux.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1332643.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/replace-lynx-to-curl-in-apachectl-script.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.2/server-makefile.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2-native_2.4.2.bb create mode 100644 meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb create mode 100644 meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-configure_perlbin.patch deleted +0 -37
@@ -1,37 +0,0 @@ -# Author: echo <[email protected]> -# Date: April 28 2009 -# Summary:Fix perl install directory to /usr/bin -# -# Upstream-Status: Inappropriate [configuration] - ---- a/configure -+++ b/configure -@@ -22365,13 +22365,7 @@ - #define APACHE_MPM_DIR "$MPM_DIR" - _ACEOF - -- --perlbin=`$ac_aux_dir/PrintPath perl` --if test "x$perlbin" = "x"; then -- perlbin="/replace/with/path/to/perl/interpreter" --fi -- -- -+perlbin='/usr/bin/perl' - - BSD_MAKEFILE=no - ap_make_include=include ---- a/configure.in -+++ b/configure.in -@@ -638,10 +638,7 @@ - AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", - [Location of the source for the current MPM]) - --perlbin=`$ac_aux_dir/PrintPath perl` --if test "x$perlbin" = "x"; then -- perlbin="/replace/with/path/to/perl/interpreter" --fi -+perlbin='/usr/bin/perl' - AC_SUBST(perlbin) - - dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/apache-ssl-ltmain-rpath.patch deleted +0 -76
76 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/fix-libtool-name.patch deleted +0 -55
55 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-corelimit.patch deleted +0 -37
@@ -1,37 +0,0 @@ - -Bump up the core size limit if CoreDumpDirectory is -configured. - -Upstream-Status: Pending - -Note: upstreaming was discussed but there are competing desires; - there are portability oddities here too. - ---- httpd-2.4.1/server/core.c.corelimit -+++ httpd-2.4.1/server/core.c -@@ -4433,6 +4433,25 @@ static int core_post_config(apr_pool_t * - } - apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, - apr_pool_cleanup_null); -+ -+#ifdef RLIMIT_CORE -+ if (ap_coredumpdir_configured) { -+ struct rlimit lim; -+ -+ if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) { -+ lim.rlim_cur = lim.rlim_max; -+ if (setrlimit(RLIMIT_CORE, &lim) == 0) { -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, -+ "core dump file size limit raised to %lu bytes", -+ lim.rlim_cur); -+ } else { -+ ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL, -+ "core dump file size is zero, setrlimit failed"); -+ } -+ } -+ } -+#endif -+ - return OK; - } -
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-export.patch deleted +0 -22
@@ -1,22 +0,0 @@ - -There is no need to "suck in" the apr/apr-util symbols when using -a shared libapr{,util}, it just bloats the symbol table; so don't. - -Upstream-HEAD: needed -Upstream-2.0: omit -Upstream-Status: Pending - -Note: EXPORT_DIRS change is conditional on using shared apr - ---- httpd-2.4.1/server/Makefile.in.export -+++ httpd-2.4.1/server/Makefile.in -@@ -57,9 +57,6 @@ export_files: - ( for dir in $(EXPORT_DIRS); do \ - ls $$dir/*.h ; \ - done; \ -- for dir in $(EXPORT_DIRS_APR); do \ -- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ -- done; \ - ) | sort -u > $@ - - exports.c: export_files
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.1-selinux.patch deleted +0 -63
63 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1326980+.patch deleted +0 -74
74 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1327036+.patch deleted +0 -87
87 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1332643.patch deleted +0 -260
260 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-r1337344+.patch deleted +0 -350
350 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/httpd-2.4.2-restart.patch deleted +0 -35
@@ -1,35 +0,0 @@ - -* server/main.c (main): Bail out *before* signalling the server - if the config is bad. (as per the claim in the docs!) - -https://bugzilla.redhat.com/show_bug.cgi?id=814645 -http://svn.apache.org/viewvc?view=revision&revision=1328345 - -Upstream-Status: Backport - ---- httpd-2.4.2/server/main.c.restart -+++ httpd-2.4.2/server/main.c -@@ -671,6 +671,11 @@ int main(int argc, const char * const ar - } - } - -+ /* If our config failed, deal with that here. */ -+ if (rv != OK) { -+ destroy_and_exit_process(process, 1); -+ } -+ - signal_server = APR_RETRIEVE_OPTIONAL_FN(ap_signal_server); - if (signal_server) { - int exit_status; -@@ -680,11 +685,6 @@ int main(int argc, const char * const ar - } - } - -- /* If our config failed, deal with that here. */ -- if (rv != OK) { -- destroy_and_exit_process(process, 1); -- } -- - apr_pool_clear(plog); - - if ( ap_run_open_logs(pconf, plog, ptemp, ap_server_conf) != OK) {
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/replace-lynx-to-curl-in-apachectl-script.patch deleted +0 -52
52 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.2/server-makefile.patch deleted +0 -11
@@ -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 -
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-configure_perlbin.patch new file +37 -0
@@ -0,0 +1,37 @@ +# Author: echo <[email protected]> +# Date: April 28 2009 +# Summary:Fix perl install directory to /usr/bin +# +# Upstream-Status: Inappropriate [configuration] + +--- a/configure ++++ b/configure +@@ -22365,13 +22365,7 @@ + #define APACHE_MPM_DIR "$MPM_DIR" + _ACEOF + +- +-perlbin=`$ac_aux_dir/PrintPath perl` +-if test "x$perlbin" = "x"; then +- perlbin="/replace/with/path/to/perl/interpreter" +-fi +- +- ++perlbin='/usr/bin/perl' + + BSD_MAKEFILE=no + ap_make_include=include +--- a/configure.in ++++ b/configure.in +@@ -638,10 +638,7 @@ + AC_DEFINE_UNQUOTED(APACHE_MPM_DIR, "$MPM_DIR", + [Location of the source for the current MPM]) + +-perlbin=`$ac_aux_dir/PrintPath perl` +-if test "x$perlbin" = "x"; then +- perlbin="/replace/with/path/to/perl/interpreter" +-fi ++perlbin='/usr/bin/perl' + AC_SUBST(perlbin) + + dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/apache-ssl-ltmain-rpath.patch new file +76 -0
76 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/fix-libtool-name.patch new file +55 -0
55 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-corelimit.patch new file +37 -0
@@ -0,0 +1,37 @@ + +Bump up the core size limit if CoreDumpDirectory is +configured. + +Upstream-Status: Pending + +Note: upstreaming was discussed but there are competing desires; + there are portability oddities here too. + +--- httpd-2.4.1/server/core.c.corelimit ++++ httpd-2.4.1/server/core.c +@@ -4433,6 +4433,25 @@ static int core_post_config(apr_pool_t * + } + apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, + apr_pool_cleanup_null); ++ ++#ifdef RLIMIT_CORE ++ if (ap_coredumpdir_configured) { ++ struct rlimit lim; ++ ++ if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) { ++ lim.rlim_cur = lim.rlim_max; ++ if (setrlimit(RLIMIT_CORE, &lim) == 0) { ++ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, ++ "core dump file size limit raised to %lu bytes", ++ lim.rlim_cur); ++ } else { ++ ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL, ++ "core dump file size is zero, setrlimit failed"); ++ } ++ } ++ } ++#endif ++ + return OK; + } +
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-export.patch new file +22 -0
@@ -0,0 +1,22 @@ + +There is no need to "suck in" the apr/apr-util symbols when using +a shared libapr{,util}, it just bloats the symbol table; so don't. + +Upstream-HEAD: needed +Upstream-2.0: omit +Upstream-Status: Pending + +Note: EXPORT_DIRS change is conditional on using shared apr + +--- httpd-2.4.1/server/Makefile.in.export ++++ httpd-2.4.1/server/Makefile.in +@@ -57,9 +57,6 @@ export_files: + ( for dir in $(EXPORT_DIRS); do \ + ls $$dir/*.h ; \ + done; \ +- for dir in $(EXPORT_DIRS_APR); do \ +- ls $$dir/ap[ru].h $$dir/ap[ru]_*.h 2>/dev/null; \ +- done; \ + ) | sort -u > $@ + + exports.c: export_files
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.1-selinux.patch new file +63 -0
63 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/httpd-2.4.2-r1332643.patch new file +260 -0
260 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/replace-lynx-to-curl-in-apachectl-script.patch new file +52 -0
52 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-2.4.3/server-makefile.patch new file +11 -0
@@ -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 +
meta-webserver/recipes-httpd/apache2/apache2-native_2.4.2.bb deleted +0 -43
43 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2-native_2.4.3.bb new file +43 -0
43 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2_2.4.2.bb deleted +0 -144
144 lines not on this page · raw message
meta-webserver/recipes-httpd/apache2/apache2_2.4.3.bb new file +140 -0
140 lines not on this page · raw message
Signature · 1 line
1.7.11.7
PATCH 7/7 hiawatha: add CONFFILES and a php example
In reply to Eric Bénard- add CONFFILES so that configuration files don't get overwritten during upgrade
- add an example on how to launch php-cgi using php-fcgi
--- meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb +13 -1
@@ -4,6 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2 libxslt" +PR = "r1" + SECTION = "net" SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
@@ -36,10 +38,20 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ -DWORK_DIR=/var/lib/hiawatha " do_install_append() { - # Copy over init script and sed in the correct sbin path sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init mkdir -p ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + # configure php-fcgi to have a working configuration + # by default if php is installed + echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf } + +CONFFILES_${PN} = " \ + ${sysconfdir}/hiawatha/cgi-wrapper.conf \ + ${sysconfdir}/hiawatha/hiawatha.conf \ + ${sysconfdir}/hiawatha/index.xslt \ + ${sysconfdir}/hiawatha/mimetype.conf \ + ${sysconfdir}/hiawatha/php-fcgi.conf \ + "
Signature · 1 line
1.7.11.7
PATCH 3/7 modphp: upgrade to 5.3.19
In reply to Eric Bénard--- meta-webserver/recipes-php/modphp/modphp_5.3.14.bb | 5 ----- meta-webserver/recipes-php/modphp/modphp_5.3.19.bb | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 meta-webserver/recipes-php/modphp/modphp_5.3.14.bb create mode 100644 meta-webserver/recipes-php/modphp/modphp_5.3.19.bb
meta-webserver/recipes-php/modphp/modphp_5.3.14.bb deleted +0 -5
@@ -1,5 +0,0 @@ -include modphp5.inc -PR = "r3" - -SRC_URI[md5sum] = "7caac4f71e2f21426c11ac153e538392" -SRC_URI[sha256sum] = "c8075b6e83c5db0d26cc8426a7456856421089a76c963813b1fcac3ced041cb3"
meta-webserver/recipes-php/modphp/modphp_5.3.19.bb new file +5 -0
@@ -0,0 +1,5 @@ +include modphp5.inc +PR = "r0" + +SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" +SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"
Signature · 1 line
1.7.11.7
PATCH 4/7 modphp: enable bz2, zip and mbstring
In reply to Eric Bénard- bz2 and zip remove warnings in phpmyadmin
- mbstring is usefull for multibyte strings
--- meta-webserver/recipes-php/modphp/modphp5.inc | 5 ++++- meta-webserver/recipes-php/modphp/modphp_5.3.19.bb | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-)
meta-webserver/recipes-php/modphp/modphp5.inc +4 -1
@@ -1,7 +1,7 @@ SECTION = "console/network" DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the apache php module." LICENSE = "PHP-3.0" -DEPENDS = "apache2-native apache2 zlib" +DEPENDS = "apache2-native apache2 zlib bzip2" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2 \ file://configure.patch \
@@ -36,6 +36,9 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_CROSS}/apxs \ --disable-rpath \ --libdir=${libdir}/php5 \ --with-zlib --with-zlib-dir=${STAGING_DIR_TARGET}${exec_prefix} \ + --with-bz2=${STAGING_DIR_TARGET}${exec_prefix} \ + --enable-zip \ + --enable-mbstring \ --with-config-file-path=${sysconfdir}/php/apache2-php5" PACKAGECONFIG ??= ""
meta-webserver/recipes-php/modphp/modphp_5.3.19.bb +1 -1
@@ -1,5 +1,5 @@ include modphp5.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"
Signature · 1 line
1.7.11.7
PATCH 5/7 php: upgrade to 5.3.19
In reply to Eric Bénard--- meta-oe/recipes-devtools/php/php.inc | 4 ++-- meta-oe/recipes-devtools/php/php/iconv.patch | 26 +++++++++++++------------- meta-oe/recipes-devtools/php/php_5.3.19.bb | 19 +++++++++++++++++++ meta-oe/recipes-devtools/php/php_5.3.6.bb | 19 ------------------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php_5.3.19.bb delete mode 100644 meta-oe/recipes-devtools/php/php_5.3.6.bb
meta-oe/recipes-devtools/php/php.inc +2 -2
@@ -1,13 +1,13 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." HOMEPAGE = "http://www.php.net" SECTION = "console/network" -LICENSE = "PHP" +LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r0" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"
meta-oe/recipes-devtools/php/php/iconv.patch +13 -13
@@ -1,21 +1,21 @@ -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 +diff --git a/acinclude.m4 b/acinclude.m4 +index 4c28b80..d6491a1 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ 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 + dnl Reset LIBS temporarily as it may have already been included + dnl -liconv in. + LIBS_save="$LIBS" +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index d673b0a..1fbef13 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 @@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then if test "$iconv_avail" != "no"; then
meta-oe/recipes-devtools/php/php_5.3.19.bb new file +19 -0
@@ -0,0 +1,19 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" + +PR = "${INC_PR}.0" + +SRC_URI += "file://acinclude-xml2-config.patch \ + file://php-m4-divert.patch \ + file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" + +SRC_URI_append_pn-php += "file://iconv.patch \ + file://imap-fix-autofoo.patch \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://php_exec_native.patch \ + " + +SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" +SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"
meta-oe/recipes-devtools/php/php_5.3.6.bb deleted +0 -19
@@ -1,19 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" - -PR = "${INC_PR}.0" - -SRC_URI += "file://acinclude-xml2-config.patch \ - file://php-m4-divert.patch \ - file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" - -SRC_URI_append_pn-php += "file://iconv.patch \ - file://imap-fix-autofoo.patch \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://php_exec_native.patch \ - " - -SRC_URI[md5sum] = "2286f5a82a6e8397955a0025c1c2ad98" -SRC_URI[sha256sum] = "30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198"
Signature · 1 line
1.7.11.7
PATCH 6/7 php: enable gettext and sqlite
In reply to Eric Bénard--- meta-oe/recipes-devtools/php/php.inc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
meta-oe/recipes-devtools/php/php.inc +6 -4
@@ -4,16 +4,16 @@ SECTION = "console/network" LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ - libc-client openssl" + libc-client openssl sqlite3" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r0" +INC_PR = "r1" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2" S = "${WORKDIR}/php-${PV}" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig pythonnative gettext SSTATE_SCAN_FILES += "build-defs.h"
@@ -22,6 +22,7 @@ COMMON_EXTRA_OECONF = "--enable-sockets --enable-pcntl --enable-shared" EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --enable-magic-quotes --enable-fastcgi \ --with-imap=${STAGING_DIR_HOST} \ + --with-gettext=${STAGING_LIBDIR}/.. \ --with-imap-ssl=${STAGING_DIR_HOST} \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR}/.. \ --with-iconv=${STAGING_LIBDIR}/.. \
@@ -29,8 +30,9 @@ EXTRA_OECONF = "--enable-mbstring --enable-discard-path --enable-wddx \ --disable-embedded-mysqli \ --with-mysql="${STAGING_DIR_TARGET}${prefix}" \ --with-mysqli="${STAGING_BINDIR_CROSS}/mysql_config" \ + --with-sqlite3=${STAGING_LIBDIR}/.. --enable-sqlite-utf8 \ --with-pdo-mysql="${STAGING_BINDIR_CROSS}/mysql_config" \ - --without-pdo-sqlite ${COMMON_EXTRA_OECONF} \ + --with-pdo-sqlite=${STAGING_LIBDIR}/.. ${COMMON_EXTRA_OECONF} \ " EXTRA_OECONF_virtclass-native = "--with-cgi --without-libpng --without-libjpeg \ --with-zlib --with-zlib-dir=${STAGING_LIBDIR_NATIVE}/.. \
Signature · 1 line
1.7.11.7
Re: [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example
In reply to Eric BénardQuoted 34 lines · Eric Bénard
- add CONFFILES so that configuration files don't get overwritten during upgrade
- add an example on how to launch php-cgi using php-fcgiSigned-off-by Eric Bénard <[email protected]>--- meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb +4
-1@@ -4,6 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "libxml2 libxslt" +PR = "r1" + SECTION = "net" SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \@@ -36,10 +38,20 @@ EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ -DWORK_DIR=/var/lib/hiawatha " do_install_append() { - # Copy over init script and sed in the correct sbin path sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init mkdir -p ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + # configure php-fcgi to have a working configuration + # by default if php is installed
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ · line 57
Quoted 10 lines
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb +9
-0+ echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf } + +CONFFILES_${PN} = " \ + ${sysconfdir}/hiawatha/cgi-wrapper.conf \ + ${sysconfdir}/hiawatha/hiawatha.conf \ + ${sysconfdir}/hiawatha/index.xslt \ + ${sysconfdir}/hiawatha/mimetype.conf \ + ${sysconfdir}/hiawatha/php-fcgi.conf \ + "
Looks good to me, thanks for the improvements Eric!
Regards,
Signature · 5 lines
Jack Mitchell ([email protected]) Embedded Systems Engineer http://www.embed.me.uk --
Re: [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example
Hi Jack,
Quoted 8 lines · Jack Mitchell
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ · line 49
Quoted 4 lines · Eric Bénard
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb +3
-0+ # configure php-fcgi to have a working configuration + # by default if php is installed + echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf }Looks good to me, thanks for the improvements Eric!
I still have to find a good way to provide a default ${sysconfdir}/php/hiawatha-php5/php.ini and launch php-fcgi in the init script if php is enabled.
Do you think we could provide the file php.ini in the hiawatha recipe (as hiawatha's doc recommends setting some options :
http://www.hiawatha-webserver.org/howto/php_configuration ) ?
Eric
Re: [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example
Quoted 12 lines · Eric Bénard
Hi Jack,
Quoted 7 lines · Jack Mitchell
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ · line 49
Quoted 4 lines · Eric Bénard
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb +3
-0+ # configure php-fcgi to have a working configuration + # by default if php is installed + echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf }Looks good to me, thanks for the improvements Eric!
Quoted 8 lines
I still have to find a good way to provide a default ${sysconfdir}/php/hiawatha-php5/php.ini and launch php-fcgi in the init script if php is enabled.
Do you think we could provide the file php.ini in the hiawatha recipe (as hiawatha's doc recommends setting some options :
http://www.hiawatha-webserver.org/howto/php_configuration ) ?Eric
The only way I could think of doing it would be to have some sort of test to see if PHP is installed and then possibly sed the php.ini file to set the correct values.
On the other hand, a note in the BB file may be enough and OE users shouldn't really need their hands holding to this level.
As for the init file, I use PHP and Hiawatha as normal CGI rather than using a fastCGI daemon, therefore I don't think it would be appropriate to automatically start the fcgi daemon. We could possibly ship a seperate fastCGI init file, although not automatically enable it?
Regards,
Signature · 5 lines
Jack Mitchell ([email protected]) Embedded Systems Engineer http://www.embed.me.uk --
Re: [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example
Quoted 26 lines · Jack Mitchell
Quoted 12 lines · Eric Bénard
Hi Jack,
Quoted 7 lines · Jack Mitchell
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ · line 49
Quoted 4 lines · Eric Bénard
meta-webserver/recipes-httpd/hiawatha/hiawatha_8.6.bb +3
-0+ # configure php-fcgi to have a working configuration + # by default if php is installed + echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf }Looks good to me, thanks for the improvements Eric!
Quoted 8 lines
I still have to find a good way to provide a default ${sysconfdir}/php/hiawatha-php5/php.ini and launch php-fcgi in the init script if php is enabled.
Do you think we could provide the file php.ini in the hiawatha recipe (as hiawatha's doc recommends setting some options :
http://www.hiawatha-webserver.org/howto/php_configuration ) ?Eric
The only way I could think of doing it would be to have some sort of test to see if PHP is installed and then possibly sed the php.ini file to set the correct values.
Quoted 7 lines
On the other hand, a note in the BB file may be enough and OE users shouldn't really need their hands holding to this level.
As for the init file, I use PHP and Hiawatha as normal CGI rather than using a fastCGI daemon, therefore I don't think it would be appropriate to automatically start the fcgi daemon. We could possibly ship a seperate fastCGI init file, although not automatically enable it?
yes the idea is to provide default confi/init files which work so that users can enable them with .bbappend in their overlay.
Eric
Re: [meta-webserver][PATCH 5/7] php: upgrade to 5.3.19
In reply to Eric BénardQuoted 9 lines · Eric Bénard
Signed-off-by Eric Bénard <[email protected]>--- meta-oe/recipes-devtools/php/php.inc | 4 ++-- meta-oe/recipes-devtools/php/php/iconv.patch | 26 +++++++++++++------------- meta-oe/recipes-devtools/php/php_5.3.19.bb | 19 +++++++++++++++++++ meta-oe/recipes-devtools/php/php_5.3.6.bb | 19 ------------------- 4 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 meta-oe/recipes-devtools/php/php_5.3.19.bb delete mode 100644 meta-oe/recipes-devtools/php/php_5.3.6.bb
Fixes the build issue with new libxml2 I've reported few days ago, so:
Quoted 118 lines
meta-oe/recipes-devtools/php/php.inc +2
-2@@ -1,13 +1,13 @@ DESCRIPTION = "A server-side, HTML-embedded scripting language. This package provides the CGI." HOMEPAGE = "http://www.php.net" SECTION = "console/network" -LICENSE = "PHP" +LICENSE = "PHP-3.0" BBCLASSEXTEND = "native" DEPENDS = "zlib libxml2 virtual/libiconv php-native lemon-native mysql5 \ libc-client openssl" DEPENDS_virtclass-native = "zlib-native libxml2-native" -INC_PR = "r2" +INC_PR = "r0" SRC_URI = "http://www.php.net/distributions/php-${PV}.tar.bz2"meta-oe/recipes-devtools/php/php/iconv.patch +13
-13@@ -1,21 +1,21 @@ -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 +diff --git a/acinclude.m4 b/acinclude.m4 +index 4c28b80..d6491a1 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -2439,7 +2439,8 @@ AC_DEFUN([PHP_SETUP_ICONV], [ 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 + dnl Reset LIBS temporarily as it may have already been included + dnl -liconv in. + LIBS_save="$LIBS" +diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 +index d673b0a..1fbef13 100644 +--- a/ext/iconv/config.m4 ++++ b/ext/iconv/config.m4 @@ -15,7 +15,7 @@ if test "$PHP_ICONV" != "no"; then if test "$iconv_avail" != "no"; thenmeta-oe/recipes-devtools/php/php_5.3.19.bb new file +19
-0@@ -0,0 +1,19 @@ +require php.inc + +LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" + +PR = "${INC_PR}.0" + +SRC_URI += "file://acinclude-xml2-config.patch \ + file://php-m4-divert.patch \ + file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" + +SRC_URI_append_pn-php += "file://iconv.patch \ + file://imap-fix-autofoo.patch \ + file://pear-makefile.patch \ + file://phar-makefile.patch \ + file://php_exec_native.patch \ + " + +SRC_URI[md5sum] = "e1d2a3ec7849d4b3032bd1abf1916aa4" +SRC_URI[sha256sum] = "814ce55b950158c4ddadbcd0b2d7d8cb4b570de4a29b9db021020594e2469fd6"meta-oe/recipes-devtools/php/php_5.3.6.bb deleted +0
-19@@ -1,19 +0,0 @@ -require php.inc - -LIC_FILES_CHKSUM = "file://LICENSE;md5=cb564efdf78cce8ea6e4b5a4f7c05d97" - -PR = "${INC_PR}.0" - -SRC_URI += "file://acinclude-xml2-config.patch \ - file://php-m4-divert.patch \ - file://0001-php-don-t-use-broken-wrapper-for-mkdir.patch" - -SRC_URI_append_pn-php += "file://iconv.patch \ - file://imap-fix-autofoo.patch \ - file://pear-makefile.patch \ - file://phar-makefile.patch \ - file://php_exec_native.patch \ - " - -SRC_URI[md5sum] = "2286f5a82a6e8397955a0025c1c2ad98" -SRC_URI[sha256sum] = "30ae880f22e3ee93eccc9b80e3c58b0d6364d139bb4366dcc27f2fab658d3198"Signature · 7 lines
1.7.11.7 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]
Re: [meta-webserver][PATCH 7/7] hiawatha: add CONFFILES and a php example
In reply to Eric BénardQuoted 6 lines · On Sunday 25 November 2012 18:25:10 Eric Bénard wrote:
- add CONFFILES so that configuration files don't get overwritten during upgrade
- add an example on how to launch php-cgi using php-fcgiSigned-off-by Eric Bénard <[email protected]>---
I've tested building and running phpMyAdmin with these changes and it all works perfectly, thanks.
I've merged this, 2/7, 3/7 and 4/7. The rest are against meta-oe (although I acknowledge php ought to be moved to meta-webserver and eventually merged to a common .inc with modphp).
Cheers,
Paul
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
W dniu 25.11.2012 18:25, Eric Bénard pisze:
Quoted 4 lines
Signed-off-by Eric Bénard <[email protected]>--- .../recipes-support/mysql/mysql5-native_5.1.40.bb | 24 --- .../recipes-support/mysql/mysql5-native_5.1.66.bb | 24 +++
5.1.66 crashes on AArch64. Will debug it soon but do not hold because of it (I can keep local copy of 5.1.40 until fix).