diff options
author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
---|---|---|
committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/apache2 | |
parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/apache2')
-rw-r--r-- | packages/apache2/apache2-2.2.3/apr-sockets-patch | 10 | ||||
-rw-r--r-- | packages/apache2/apache2-2.2.3/configure-fix-cross-compile-ptr-check.patch | 17 | ||||
-rw-r--r-- | packages/apache2/apache2-2.2.3/configure-patch | 52 | ||||
-rw-r--r-- | packages/apache2/apache2-2.2.3/dftables-makefile-patch | 10 | ||||
-rw-r--r-- | packages/apache2/apache2-2.2.3/server-makefile-patch | 11 | ||||
-rw-r--r-- | packages/apache2/apache2-native_2.2.3.bb | 40 | ||||
-rw-r--r-- | packages/apache2/apache2_2.2.3.bb | 108 | ||||
-rwxr-xr-x | packages/apache2/files/init | 70 |
8 files changed, 0 insertions, 318 deletions
diff --git a/packages/apache2/apache2-2.2.3/apr-sockets-patch b/packages/apache2/apache2-2.2.3/apr-sockets-patch deleted file mode 100644 index 5e974820b3..0000000000 --- a/packages/apache2/apache2-2.2.3/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/packages/apache2/apache2-2.2.3/configure-fix-cross-compile-ptr-check.patch b/packages/apache2/apache2-2.2.3/configure-fix-cross-compile-ptr-check.patch deleted file mode 100644 index fab828ddc3..0000000000 --- a/packages/apache2/apache2-2.2.3/configure-fix-cross-compile-ptr-check.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./orig-configure 2007-02-20 11:05:12.000000000 +0200 -+++ ./configure 2007-02-20 11:14:11.000000000 +0200 -@@ -6667,7 +6667,13 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- ap_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/packages/apache2/apache2-2.2.3/configure-patch b/packages/apache2/apache2-2.2.3/configure-patch deleted file mode 100644 index d173681fd5..0000000000 --- a/packages/apache2/apache2-2.2.3/configure-patch +++ /dev/null @@ -1,52 +0,0 @@ ---- httpd-2.2.3/configure-orig 2006-08-11 11:00:11.000000000 -0700 -+++ httpd-2.2.3/configure 2006-08-11 10:59:44.000000000 -0700 -@@ -2643,24 +2643,6 @@ - - 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_found="yes" -- apr_config="$apr_temp_apr_config_file" -- break -- else -- for lookdir in /usr /usr/local /usr/local/apr /opt/apr /usr/local/apache2; do -- if $TEST_X "$lookdir/bin/$apr_temp_apr_config_file"; then -- apr_found="yes" -- apr_config="$lookdir/bin/$apr_temp_apr_config_file" -- 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" -@@ -2979,24 +2961,6 @@ - - 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_found="yes" -- apu_config="$apu_temp_apu_config_file" -- break -- else -- for lookdir in /usr /usr/local /usr/local/apr /opt/apr /usr/local/apache2 ; do -- if $TEST_X "$lookdir/bin/$apu_temp_apu_config_file"; then -- apu_found="yes" -- apu_config="$lookdir/bin/$apu_temp_apu_config_file" -- 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" diff --git a/packages/apache2/apache2-2.2.3/dftables-makefile-patch b/packages/apache2/apache2-2.2.3/dftables-makefile-patch deleted file mode 100644 index ac966db282..0000000000 --- a/packages/apache2/apache2-2.2.3/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/packages/apache2/apache2-2.2.3/server-makefile-patch b/packages/apache2/apache2-2.2.3/server-makefile-patch deleted file mode 100644 index f1349cb6a4..0000000000 --- a/packages/apache2/apache2-2.2.3/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/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb deleted file mode 100644 index 3ea987c718..0000000000 --- a/packages/apache2/apache2-native_2.2.3.bb +++ /dev/null @@ -1,40 +0,0 @@ -SECTION = "net" -DEPENDS = "expat pcre" - -inherit native - -PR ="r10" -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_stage () { - install -d ${STAGING_BINDIR_NATIVE} - cp srclib/pcre/dftables ${STAGING_BINDIR_NATIVE} - cp server/gen_test_char ${STAGING_BINDIR_NATIVE} - cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE} - cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE} - cp support/apxs ${STAGING_BINDIR_NATIVE} - chmod 755 ${STAGING_BINDIR_NATIVE}/apxs - mkdir -p ${STAGING_DIR_NATIVE}//usr/build - cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build - cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build - cp .libs/httpd ${STAGING_BINDIR_NATIVE} - - (cd srclib/apr/.libs; tar -cf - libapr-*.so* ) | - (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - ) - (cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) | - (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - ) - - mkdir -p ${STAGING_INCDIR_NATIVE}/apache2 - cp include/* ${STAGING_INCDIR_NATIVE}/apache2 - cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2 - cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2 - - cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars - chmod 755 ${STAGING_BINDIR_NATIVE}/envvars -} diff --git a/packages/apache2/apache2_2.2.3.bb b/packages/apache2/apache2_2.2.3.bb deleted file mode 100644 index ba995ea6d7..0000000000 --- a/packages/apache2/apache2_2.2.3.bb +++ /dev/null @@ -1,108 +0,0 @@ -SECTION = "net" -DESCRIPTION = "The apache v2 web server" -DEPENDS = "apache2-native openssl expat pcre" -RDEPENDS += "openssl" - -PR = "r6" - -SRC_URI = "http://apache.mirrors.tds.net/httpd/httpd-2.2.3.tar.bz2 \ - file://dftables-makefile-patch;patch=1 \ - file://apr-sockets-patch;patch=1 \ - file://configure-patch;patch=1 \ - file://server-makefile-patch;patch=1 \ - file://configure-fix-cross-compile-ptr-check.patch;patch=1 \ - 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}/.. \ - --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() { - oe_runconf -} - -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.* -} diff --git a/packages/apache2/files/init b/packages/apache2/files/init deleted file mode 100755 index eb57f6686c..0000000000 --- a/packages/apache2/files/init +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -ARGS="-D SSL -k start" -NAME=apache2 -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/httpd -SUEXEC=/usr/lib/apache/suexec -PIDFILE=/var/run/$NAME.pid -CONF=/etc/apache2/httpd.conf -APACHECTL=/usr/sbin/apachectl - -trap "" 1 -export LANG=C -export PATH - -test -f $DAEMON || exit 0 -test -f $APACHECTL || exit 0 - -# ensure we don't leak environment vars into apachectl -APACHECTL="env -i LANG=${LANG} PATH=${PATH} $APACHECTL" - -if egrep -q -i "^[[:space:]]*ServerType[[:space:]]+inet" $CONF -then - exit 0 -fi - -case "$1" in - start) - echo -n "Starting web server: $NAME" - start-stop-daemon --start --quiet --background --exec $DAEMON -- $ARGS - ;; - - stop) - echo -n "Stopping web server: $NAME" - start-stop-daemon --stop --signal 3 --quiet --exec $DAEMON - ;; - - reload) - echo -n "Reloading $NAME configuration" - start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON - ;; - - reload-modules) - echo -n "Reloading $NAME modules" - $0 stop - $0 start - ;; - - restart) - $0 reload-modules - exit $? - ;; - - force-reload) - $0 reload-modules - exit $? - ;; - - *) - echo "Usage: /etc/init.d/$NAME {start|stop|reload|reload-modules|force-reload|restart}" - exit 1 - ;; -esac - -if [ $? = 0 ]; then - echo . - exit 0 -else - echo failed - exit 1 -fi |