summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/cherokee/cherokee-0.5.5/.mtn2git_empty0
-rw-r--r--packages/cherokee/cherokee-0.5.5/Makefile.am.patch26
-rw-r--r--packages/cherokee/cherokee-0.5.5/configure.in.patch52
-rw-r--r--packages/cherokee/cherokee-nossl_0.5.3.bb5
-rw-r--r--packages/cherokee/cherokee.inc42
-rw-r--r--packages/cherokee/cherokee_0.5.3.bb49
-rw-r--r--packages/cherokee/cherokee_0.5.5.bb6
-rw-r--r--packages/cherokee/site/.mtn2git_empty0
-rw-r--r--packages/cherokee/site/common2
9 files changed, 139 insertions, 43 deletions
diff --git a/packages/cherokee/cherokee-0.5.5/.mtn2git_empty b/packages/cherokee/cherokee-0.5.5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.5/.mtn2git_empty
diff --git a/packages/cherokee/cherokee-0.5.5/Makefile.am.patch b/packages/cherokee/cherokee-0.5.5/Makefile.am.patch
new file mode 100644
index 0000000000..168200c476
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.5/Makefile.am.patch
@@ -0,0 +1,26 @@
+Index: cherokee-0.5.5/cget/Makefile.am
+===================================================================
+--- cherokee-0.5.5.orig/cget/Makefile.am
++++ cherokee-0.5.5/cget/Makefile.am
+@@ -12,6 +12,8 @@ $(LARGEFILE_CFLAGS)
+
+ cget_LDADD = \
+ ../cherokee/libcherokee-client.la \
++../cherokee/libcherokee-base.la \
++../cherokee/libcherokee-server.la \
+ $(TLS_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(PTHREAD_CFLAGS)
+Index: cherokee-0.5.5/cherokee/Makefile.am
+===================================================================
+--- cherokee-0.5.5.orig/cherokee/Makefile.am
++++ cherokee-0.5.5/cherokee/Makefile.am
+@@ -923,7 +923,7 @@ cherokee_logrotate_LDADD = libcherokee-b
+ noinst_PROGRAMS = cherokee_admin
+
+ 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
+
+ ##cherokee_table_test_SOURCES = cherokee_table_test.c
+ ##cherokee_table_test_LDADD = libcherokee.la
diff --git a/packages/cherokee/cherokee-0.5.5/configure.in.patch b/packages/cherokee/cherokee-0.5.5/configure.in.patch
new file mode 100644
index 0000000000..7017243222
--- /dev/null
+++ b/packages/cherokee/cherokee-0.5.5/configure.in.patch
@@ -0,0 +1,52 @@
+Add cache support for some values which require running on the
+target. These need to be set in the site files:
+
+ cherokee_cv_have_epoll
+ cherokee_cv_func_sendfile_works
+
+Both should be set to yes for any reasonably recent linux.
+
+Index: cherokee-0.5.5/configure.in
+===================================================================
+--- cherokee-0.5.5.orig/configure.in
++++ cherokee-0.5.5/configure.in
+@@ -280,6 +280,7 @@ have_epoll=no
+ if test "x$have_epoll_include" = "xyes"; then
+ AC_MSG_CHECKING(for epoll system call)
+
++ AC_CACHE_CHECK([for epoll],cherokee_cv_have_epoll,[
+ AC_TRY_RUN([
+ #include <stdint.h>
+ #include <sys/param.h>
+@@ -297,8 +298,7 @@ if test "x$have_epoll_include" = "xyes";
+ epfd = epoll_create(256);
+ exit (epfd == -1 ? 1 : 0);
+ }
+- ], have_epoll=yes)
+- AC_MSG_RESULT($have_epoll)
++ ], have_epoll=yes)])
+ fi
+
+ dnl
+@@ -625,16 +625,16 @@ ETR_SOCKET_NSL
+ SENDFILE_CHECK
+
+ # Is sendfile broken?
+-AC_MSG_CHECKING(if sendfile works)
++AC_CACHE_CHECK([if sendfile works],cherokee_cv_func_sendfile_works,[
+ AC_TRY_RUN([#include <errno.h>
+ int main() {
+ int o = 0;
+ if (-1 == sendfile(0, 0, &o, 0) && errno == ENOSYS) return -1;
+ return 0;
+- } ],
+- AC_MSG_RESULT(yes),
+- [ AC_MSG_RESULT(no)
+- AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile]) ])
++ } ], cherokee_cv_func_sendfile_works=yes,cherokee_cv_func_sendfile_works=no,cherokee_cv_func_sendfile_works=false)])
++if test "$cherokee_cv_func_sendfile_works" = false; then
++ AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile])
++fi
+
+ # readdir_r()
+ LIBWWW_READDIR_R_TYPE
diff --git a/packages/cherokee/cherokee-nossl_0.5.3.bb b/packages/cherokee/cherokee-nossl_0.5.3.bb
index 5487afcfde..409366004a 100644
--- a/packages/cherokee/cherokee-nossl_0.5.3.bb
+++ b/packages/cherokee/cherokee-nossl_0.5.3.bb
@@ -7,3 +7,8 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/cherokee-${PV}', '${FILE_D
S = "${WORKDIR}/cherokee-${PV}"
EXTRA_OECONF = "--disable-tls --disable-static --disable-nls"
+
+# Fix up files - the ${PN} in the defaults expand to cherokee-nossl
+# but we are actually installing into cherokee.
+FILES_${PN} += "${datadir}/cherokee ${libdir}/cherokee/*"
+FILES_${PN}-dbg += "${libdir}/cherokee/.debug"
diff --git a/packages/cherokee/cherokee.inc b/packages/cherokee/cherokee.inc
new file mode 100644
index 0000000000..4adc283173
--- /dev/null
+++ b/packages/cherokee/cherokee.inc
@@ -0,0 +1,42 @@
+DESCRIPTION = "Cherokee Web Server fast and secure"
+DESCRIPTION_cget = "Small downloader based in the Cherokee client library"
+HOMEPAGE = "http://www.cherokee-project.com/"
+SECTION = "network"
+LICENSE = "GPL"
+DEPENDS = "libpcre gnutls"
+
+SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \
+ file://cherokee.init "
+
+inherit autotools pkgconfig binconfig update-rc.d
+
+EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
+
+do_install_prepend () {
+ # It only needs this app during the install, so compile it natively
+ $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
+}
+do_install_append () {
+ install -m 0755 -d ${D}${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
+}
+
+PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base"
+
+FILES_cget = "${bindir}/cget"
+FILES_libcherokee-server = "${libdir}/libcherokee-server*"
+FILES_libcherokee-client = "${libdir}/libcherokee-client*"
+FILES_libcherokee-base = "${libdir}/libcherokee-base*"
+
+CONFFILES_${PN} = "${sysconfdir}/cherokee/mime.types \
+ ${sysconfdir}/cherokee/mods-available/admin \
+ ${sysconfdir}/cherokee/mods-available/ssl \
+ ${sysconfdir}/cherokee/advanced.conf \
+ ${sysconfdir}/cherokee/cherokee.conf \
+ ${sysconfdir}/cherokee/mime.compression.types \
+ ${sysconfdir}/cherokee/sites-available/example.com \
+ ${sysconfdir}/cherokee/sites-available/default \
+ ${sysconfdir}/cherokee/icons.conf"
+
+INITSCRIPT_NAME = "cherokee"
+INITSCRIPT_PARAMS = "defaults 91 91"
diff --git a/packages/cherokee/cherokee_0.5.3.bb b/packages/cherokee/cherokee_0.5.3.bb
index 511ebc4904..45746ccded 100644
--- a/packages/cherokee/cherokee_0.5.3.bb
+++ b/packages/cherokee/cherokee_0.5.3.bb
@@ -1,51 +1,14 @@
-DESCRIPTION = "Cherokee Web Server fast and secure"
-DESCRIPTION_cget = "Small downloader based in the Cherokee client library"
-HOMEPAGE = "http://www.cherokee-project.com/"
-SECTION = "network"
-LICENSE = "GPL"
-DEPENDS = "libpcre gnutls"
-PR = "r4"
+PR = "r5"
-SRC_URI = "http://www.cherokee-project.com/download/0.5/${PV}/cherokee-${PV}.tar.gz \
- file://configure.patch;patch=1 \
- file://Makefile.in.patch;patch=1 \
- file://Makefile.cget.patch;patch=1 \
- file://util.patch;patch=1 \
- file://cherokee.init"
+SRC_URI_append = "file://configure.patch;patch=1 \
+ file://Makefile.in.patch;patch=1 \
+ file://Makefile.cget.patch;patch=1 \
+ file://util.patch;patch=1"
-inherit autotools pkgconfig binconfig update-rc.d
-
-EXTRA_OECONF = "--enable-tls=gnutls --disable-static --disable-nls"
+require cherokee.inc
do_configure() {
gnu-configize
oe_runconf
sed -i 's:-L\$:-L${STAGING_LIBDIR} -L\$:' ${S}/*libtool
}
-do_install_prepend () {
- $BUILD_CC -DHAVE_SYS_STAT_H -o cherokee_replace cherokee_replace.c
-}
-do_install_append () {
- install -m 0755 -d ${D}${sysconfdir}/init.d
- install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
-}
-
-PACKAGES =+ "cget libcherokee-server libcherokee-client libcherokee-base"
-
-FILES_cget = "${bindir}/cget"
-FILES_libcherokee-server = "${libdir}/libcherokee-server*"
-FILES_libcherokee-client = "${libdir}/libcherokee-client*"
-FILES_libcherokee-base = "${libdir}/libcherokee-base*"
-
-CONFFILES_${PN} = "${sysconfdir}/cherokee/mime.types \
- ${sysconfdir}/cherokee/mods-available/admin \
- ${sysconfdir}/cherokee/mods-available/ssl \
- ${sysconfdir}/cherokee/advanced.conf \
- ${sysconfdir}/cherokee/cherokee.conf \
- ${sysconfdir}/cherokee/mime.compression.types \
- ${sysconfdir}/cherokee/sites-available/example.com \
- ${sysconfdir}/cherokee/sites-available/default \
- ${sysconfdir}/cherokee/icons.conf"
-
-INITSCRIPT_NAME = "cherokee"
-INITSCRIPT_PARAMS = "defaults 91 91"
diff --git a/packages/cherokee/cherokee_0.5.5.bb b/packages/cherokee/cherokee_0.5.5.bb
new file mode 100644
index 0000000000..02d94db117
--- /dev/null
+++ b/packages/cherokee/cherokee_0.5.5.bb
@@ -0,0 +1,6 @@
+PR = "r1"
+
+SRC_URI_append = "file://configure.in.patch;patch=1 \
+ file://Makefile.am.patch;patch=1"
+
+require cherokee.inc
diff --git a/packages/cherokee/site/.mtn2git_empty b/packages/cherokee/site/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cherokee/site/.mtn2git_empty
diff --git a/packages/cherokee/site/common b/packages/cherokee/site/common
new file mode 100644
index 0000000000..f7ad462caa
--- /dev/null
+++ b/packages/cherokee/site/common
@@ -0,0 +1,2 @@
+cherokee_cv_have_epoll=yes
+cherokee_cv_func_sendfile_works=yes
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 05:15:01 +0000