diff options
Diffstat (limited to 'www-servers')
7 files changed, 10 insertions, 138 deletions
diff --git a/www-servers/cherokee/ChangeLog b/www-servers/cherokee/ChangeLog index 2e9d49d2691b..b0d7a274143e 100644 --- a/www-servers/cherokee/ChangeLog +++ b/www-servers/cherokee/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for www-servers/cherokee # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.48 2009/04/01 12:50:05 bass Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/ChangeLog,v 1.49 2009/04/01 12:52:31 bass Exp $ + + 01 Apr 2009; J. Alberto Suárez López <bass@gentoo.org> + -files/cherokee-0.5.6-epoll-crosscompile.patch, + -files/cherokee-0.5.6-gnutls-pkgconfig.patch, + -files/cherokee-0.5.6-replace-with-sed.patch, + -files/cherokee-0.5.6-sendfile-crosscompile.patch, + -files/cherokee-initd-0.6, + -files/cherokee-0.7.2-signed_unsigned_char.patch: + Cleaning old files. *cherokee-0.99.8 (01 Apr 2009) diff --git a/www-servers/cherokee/files/cherokee-0.5.6-epoll-crosscompile.patch b/www-servers/cherokee/files/cherokee-0.5.6-epoll-crosscompile.patch deleted file mode 100644 index 9a34a5dcd2b9..000000000000 --- a/www-servers/cherokee/files/cherokee-0.5.6-epoll-crosscompile.patch +++ /dev/null @@ -1,43 +0,0 @@ -Index: cherokee-0.5.6/configure.in -=================================================================== ---- cherokee-0.5.6.orig/configure.in -+++ cherokee-0.5.6/configure.in -@@ -274,13 +274,20 @@ fi - dnl - dnl Epoll - dnl --AC_CHECK_HEADER(sys/epoll.h, have_epoll_include=yes, have_epoll_include=no) - --have_epoll=no --if test "x$have_epoll_include" = "xyes"; then -- AC_MSG_CHECKING(for epoll system call) -+AC_ARG_ENABLE([epoll], AC_HELP_STRING([--disable-epoll], [Disable epoll system call usage, default: check])) - -- AC_TRY_RUN([ -+have_epoll=no -+if test "x$enable_epoll" != "xno"; then -+ AC_CHECK_HEADER(sys/epoll.h, have_epoll_include=yes, have_epoll_include=no) -+ if test "x$have_epoll_include" = "xyes"; then -+ AC_MSG_CHECKING(for epoll system call) -+ -+ if test "$host" != "$build"; then -+ AC_MSG_RESULT([crosscompile, assuming yes]) -+ have_epoll=yes -+ else -+ AC_TRY_RUN([ - #include <stdint.h> - #include <sys/param.h> - #include <sys/types.h> -@@ -297,8 +304,10 @@ 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) -+ AC_MSG_RESULT($have_epoll) -+ fi -+ fi - fi - - dnl diff --git a/www-servers/cherokee/files/cherokee-0.5.6-gnutls-pkgconfig.patch b/www-servers/cherokee/files/cherokee-0.5.6-gnutls-pkgconfig.patch deleted file mode 100644 index 258779762214..000000000000 --- a/www-servers/cherokee/files/cherokee-0.5.6-gnutls-pkgconfig.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: cherokee-0.5.6/configure.in -=================================================================== ---- cherokee-0.5.6.orig/configure.in -+++ cherokee-0.5.6/configure.in -@@ -861,11 +861,9 @@ then - dnl - dnl GNUTLS - dnl -- AM_PATH_LIBGNUTLS(1.0.4, [have_gnutls=yes], [have_gnutls=no]) -+ PKG_CHECK_MODULES([TLS], [gnutls >= 1.0.4], [have_gnutls=yes], [have_gnutls=no]) - if test "$have_gnutls" = "yes" - then -- TLS_LIBS="$LIBGNUTLS_LIBS" -- TLS_CFLAGS="$LIBGNUTLS_CFLAGS" - AC_SUBST(TLS_LIBS) - AC_SUBST(TLS_CFLAGS) - diff --git a/www-servers/cherokee/files/cherokee-0.5.6-replace-with-sed.patch b/www-servers/cherokee/files/cherokee-0.5.6-replace-with-sed.patch deleted file mode 100644 index e880320c1e25..000000000000 --- a/www-servers/cherokee/files/cherokee-0.5.6-replace-with-sed.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: cherokee-0.5.6/Makefile.am -=================================================================== ---- cherokee-0.5.6.orig/Makefile.am -+++ cherokee-0.5.6/Makefile.am -@@ -19,15 +19,11 @@ cherokee_logrotate.1 - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = cherokee.pc - --# Replacement utility --noinst_PROGRAMS = cherokee_replace --cherokee_replace_SOURCES = cherokee_replace.c -- - # Configuration files - cherokeeconfdir = $(sysconfdir)/cherokee - - .sample.pre.sample: -- $(top_builddir)/cherokee_replace $< $@ "%sysconfdir%" "${sysconfdir}" "%datadir%" "${datadir}" "%prefix%" "${prefix}" "%wwwroot%" "${WWW_ROOT}" -+ sed -e "s|%sysconfdir%|${sysconfdir}|g; s|%datadir%|${datadir}|g; s|%prefix%|${prefix}|g; s|%wwwroot%|${WWW_ROOT}|g" $< > $@ - - CONFS_PRE = \ - mods-ssl.sample.pre \ diff --git a/www-servers/cherokee/files/cherokee-0.5.6-sendfile-crosscompile.patch b/www-servers/cherokee/files/cherokee-0.5.6-sendfile-crosscompile.patch deleted file mode 100644 index dedeab0ea791..000000000000 --- a/www-servers/cherokee/files/cherokee-0.5.6-sendfile-crosscompile.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: cherokee-0.5.6/configure.in -=================================================================== ---- cherokee-0.5.6.orig/configure.in -+++ cherokee-0.5.6/configure.in -@@ -634,6 +634,7 @@ ETR_SOCKET_NSL - SENDFILE_CHECK - - # Is sendfile broken? -+if test "$host" = "$build"; then - AC_MSG_CHECKING(if sendfile works) - AC_TRY_RUN([#include <errno.h> - int main() { -@@ -644,6 +645,7 @@ AC_TRY_RUN([#include <errno.h> - AC_MSG_RESULT(yes), - [ AC_MSG_RESULT(no) - AC_DEFINE([HAVE_SENDFILE_BROKEN], [1], [broken sendfile]) ]) -+fi - - # readdir_r() - LIBWWW_READDIR_R_TYPE diff --git a/www-servers/cherokee/files/cherokee-0.7.2-signed_unsigned_char.patch b/www-servers/cherokee/files/cherokee-0.7.2-signed_unsigned_char.patch deleted file mode 100644 index 9eafc4090c77..000000000000 --- a/www-servers/cherokee/files/cherokee-0.7.2-signed_unsigned_char.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur cherokee-0.7.2.orig/cherokee/buffer.c cherokee-0.7.2/cherokee/buffer.c ---- cherokee-0.7.2.orig/cherokee/buffer.c 2008-06-20 09:55:45.000000000 +0200 -+++ cherokee-0.7.2/cherokee/buffer.c 2008-06-20 09:57:41.000000000 +0200 -@@ -1250,7 +1250,7 @@ - * "A-Za-z0-9+/". - */ - -- static const char -+ static const signed char - b64_decode_tab[256] = { - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 00-0F */ - -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 10-1F */ diff --git a/www-servers/cherokee/files/cherokee-initd-0.6 b/www-servers/cherokee/files/cherokee-initd-0.6 deleted file mode 100644 index fec415393ba7..000000000000 --- a/www-servers/cherokee/files/cherokee-initd-0.6 +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/cherokee/files/cherokee-initd-0.6,v 1.2 2008/03/25 10:39:35 bass Exp $ - -PIDFILE=/var/run/cherokee-guardian.pid - -depend() { - need net -} - -start() { - ebegin "Starting Cherokee Web Server" - start-stop-daemon --start -b --pidfile ${PIDFILE} \ - --exec /usr/sbin/cherokee-guardian - eend $? -} - -stop() { - ebegin "Stopping Cherokee Web Server" - start-stop-daemon --stop --pidfile ${PIDFILE} \ - --exec /usr/sbin/cherokee-guardian - eend $? -} |