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/cherokee/files | |
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/cherokee/files')
-rw-r--r-- | packages/cherokee/files/Makefile.cget.patch | 23 | ||||
-rw-r--r-- | packages/cherokee/files/Makefile.in.patch | 33 | ||||
-rw-r--r-- | packages/cherokee/files/cherokee.init | 32 | ||||
-rw-r--r-- | packages/cherokee/files/configure.patch | 127 | ||||
-rw-r--r-- | packages/cherokee/files/util.patch | 19 |
5 files changed, 0 insertions, 234 deletions
diff --git a/packages/cherokee/files/Makefile.cget.patch b/packages/cherokee/files/Makefile.cget.patch deleted file mode 100644 index bb6b2141b3..0000000000 --- a/packages/cherokee/files/Makefile.cget.patch +++ /dev/null @@ -1,23 +0,0 @@ - -# -# Patch managed by http://www.xwaves.net -# - ---- cherokee-0.4.29/cget/Makefile.in~Makefile.cget -+++ cherokee-0.4.29/cget/Makefile.in -@@ -56,6 +56,7 @@ - cget_OBJECTS = $(am_cget_OBJECTS) - am__DEPENDENCIES_1 = - cget_DEPENDENCIES = ../cherokee/libcherokee-client.la \ -+ ../cherokee/libcherokee-base.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -286,6 +287,7 @@ - - cget_LDADD = \ - ../cherokee/libcherokee-client.la \ -+../cherokee/libcherokee-base.la \ - $(TLS_LIBS) \ - $(PTHREAD_LIBS) \ - $(PTHREAD_CFLAGS) diff --git a/packages/cherokee/files/Makefile.in.patch b/packages/cherokee/files/Makefile.in.patch deleted file mode 100644 index 9d278121b4..0000000000 --- a/packages/cherokee/files/Makefile.in.patch +++ /dev/null @@ -1,33 +0,0 @@ - -# -# Patch managed by http://www.xwaves.net -# - ---- cherokee-0.4.29/cherokee/Makefile.in~Makefile -+++ cherokee-0.4.29/cherokee/Makefile.in -@@ -403,11 +403,11 @@ - am_cherokee_admin_OBJECTS = cherokee_admin.$(OBJEXT) - cherokee_admin_OBJECTS = $(am_cherokee_admin_OBJECTS) - cherokee_admin_DEPENDENCIES = libcherokee-config.la \ -- libcherokee-base.la libcherokee-client.la -+ libcherokee-base.la libcherokee-client.la libcherokee-server.la - am_cherokee_logrotate_OBJECTS = cherokee_logrotate.$(OBJEXT) - cherokee_logrotate_OBJECTS = $(am_cherokee_logrotate_OBJECTS) - cherokee_logrotate_DEPENDENCIES = libcherokee-config.la \ -- libcherokee-base.la libcherokee-client.la -+ libcherokee-base.la libcherokee-client.la libcherokee-server.la - binSCRIPT_INSTALL = $(INSTALL_SCRIPT) - SCRIPTS = $(bin_SCRIPTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -@@ -1343,9 +1343,9 @@ - - cherokee_LDFLAGS = -export-dynamic - cherokee_logrotate_SOURCES = cherokee_logrotate.c --cherokee_logrotate_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la -+cherokee_logrotate_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la libcherokee-server.la - cherokee_admin_SOURCES = cherokee_admin.c --cherokee_admin_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la -+cherokee_admin_LDADD = libcherokee-config.la libcherokee-base.la libcherokee-client.la libcherokee-server.la - - #noinst_PROGRAMS = cherokee_modules cherokee_base64 cherokee_headers cherokee_fastcgi - diff --git a/packages/cherokee/files/cherokee.init b/packages/cherokee/files/cherokee.init deleted file mode 100644 index ea1263aff5..0000000000 --- a/packages/cherokee/files/cherokee.init +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -DAEMON=/usr/sbin/cherokee -CONFIG=/etc/cherokee/cherokee.conf -PIDFILE=/var/run/cherokee.pid -NAME="cherokee" -DESC="Cherokee http server" - -test -r /etc/default/cherokee && . /etc/default/cherokee -test -x "$DAEMON" || exit 0 -test ! -r "$CONFIG" && exit 0 - -case "$1" in - start) - echo "Starting $DESC: " - start-stop-daemon --oknodo -S -x $DAEMON -- -b -C $CONFIG - ;; - - stop) - echo "Stopping $DESC:" - start-stop-daemon -K -p $PIDFILE - ;; - - restart) - $0 stop >/dev/null 2>&1 - $0 start - ;; - - *) - echo "Usage: $0 {start|stop|restart}" - exit 0 - ;; -esac diff --git a/packages/cherokee/files/configure.patch b/packages/cherokee/files/configure.patch deleted file mode 100644 index 9c34d961ac..0000000000 --- a/packages/cherokee/files/configure.patch +++ /dev/null @@ -1,127 +0,0 @@ - -# -# Patch managed by http://www.xwaves.net -# - ---- cherokee-0.4.29/configure~configure -+++ cherokee-0.4.29/configure -@@ -28929,59 +28929,8 @@ - if test "x$have_epoll_include" = "xyes"; then - echo "$as_me:$LINENO: checking for epoll system call" >&5 - echo $ECHO_N "checking for epoll system call... $ECHO_C" >&6 -- -- if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- -- #include <stdint.h> -- #include <sys/param.h> -- #include <sys/types.h> -- #include <sys/syscall.h> -- #include <sys/epoll.h> -- #include <unistd.h> -- -- int epoll_create (int size) { -- return (syscall(__NR_epoll_create, size)); -- } -- -- int main (int argc, char **argv) { -- int epfd; -- epfd = epoll_create(256); -- exit (epfd == -1 ? 1 : 0); -- } -- --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- have_epoll=yes --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -+have_epoll=yes -+ - echo "$as_me:$LINENO: result: $have_epoll" >&5 - echo "${ECHO_T}$have_epoll" >&6 - fi -@@ -32593,55 +32542,9 @@ - # Is sendfile broken? - echo "$as_me:$LINENO: checking if sendfile works" >&5 - echo $ECHO_N "checking if sendfile works... $ECHO_C" >&6 --if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <errno.h> -- int main() { -- int o = 0; -- if (-1 == sendfile(0, 0, &o, 0) && errno == ENOSYS) return -1; -- return 0; -- } --_ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --( exit $ac_status ) -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- --cat >>confdefs.h <<\_ACEOF --#define HAVE_SENDFILE_BROKEN 1 --_ACEOF -- --fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext --fi -+echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 - - # readdir_r() - diff --git a/packages/cherokee/files/util.patch b/packages/cherokee/files/util.patch deleted file mode 100644 index 5319f18190..0000000000 --- a/packages/cherokee/files/util.patch +++ /dev/null @@ -1,19 +0,0 @@ - -# -# Patch managed by http://www.xwaves.net -# - ---- cherokee-0.4.29/cherokee/util.c~util -+++ cherokee-0.4.29/cherokee/util.c -@@ -348,9 +348,9 @@ - - - --#if defined(HAVE_PTHREAD) && !defined(HAVE_READDIR_R) -+/*#if defined(HAVE_PTHREAD) && !defined(HAVE_READDIR_R)*/ - static pthread_mutex_t readdir_mutex = PTHREAD_MUTEX_INITIALIZER; --#endif -+/*#endif*/ - - /* The readdir subroutine is reentrant when an application program - * uses different DirectoryPointer parameter values (returned from the |