bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] clearsilver: fix Config.in handling and refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@19843 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
rhk 2010-02-24 17:02:13 +00:00
parent 49cee26715
commit 8b30049274
7 changed files with 101 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/clearsilver/Config.in
View File

@ -1,11 +1,12 @@
config CLEARSILVER_ENABLE_COMPRESSION
bool "HTML compression support" if PACKAGE_clearsilver
default y if CONFIG_PACKAGE_zlib
bool "HTML compression support"
default y if PACKAGE_zlib
select PACKAGE_zlib
config CLEARSILVER_ENABLE_REMOTE_DEBUGGER
bool "Remote X CGI debugging" if PACKAGE_clearsilver
default n
bool "Remote X CGI debugging"
default n
config CLEARSILVER_ENABLE_GETTEXT
bool "Gettext message translation" if PACKAGE_clearsilver
default n
bool "Gettext message translation"
default n

61
libs/clearsilver/Makefile
View File

@ -9,12 +9,18 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=clearsilver
PKG_VERSION:=0.10.5
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.clearsilver.net/downloads/
PKG_MD5SUM:=b8c0c7fbe0ef5e06e0c935f134304d44
PKG_CONFIG_DEPENDS:= \
CONFIG_CLEARSILVER_ENABLE_COMPRESSION \
CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER \
CONFIG_CLEARSILVER_ENABLE_GETTEXT
PKG_FIXUP:=libtool
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
@ -24,16 +30,25 @@ define Package/clearsilver
CATEGORY:=Libraries
TITLE:=ClearSilver template system
URL:=http://www.clearsilver.net/
MENU:=1
MAINTAINER:=Raphaël HUCK <rhk@cksum.org>
DEPENDS:=+CLEARSILVER_ENABLE_COMPRESSION:zlib
endef
define Package/clearsilver/config
menu "Configuration"
depends on PACKAGE_clearsilver
source "$(SOURCE)/Config.in"
endmenu
endef
define Package/clearsilver/description
Clearsilver is a fast, powerful, and language-neutral HTML template system. In both static content sites and dynamic HTML applications, it provides a separation between presentation code and application logic which makes working with your project easier.
Clearsilver is a fast, powerful, and language-neutral HTML template system. In
both static content sites and dynamic HTML applications, it provides a separation
between presentation code and application logic which makes working with your
project easier.
endef
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
CONFIGURE_ARGS+= \
--disable-wdb \
--disable-apache \
--disable-python \
@ -43,31 +58,33 @@ CONFIGURE_ARGS += \
--disable-csharp \
--prefix=/usr
ifneq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_COMPRESSION),y)
CONFIGURE_ARGS+= \
--disable-compression
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_COMPRESSION),y)
CONFIGURE_ARGS+= \
--enable-compression
else
CONFIGURE_ARGS+= \
--enable-compression
CONFIGURE_ARGS+= \
--disable-compression
endif
ifneq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER),y)
CONFIGURE_ARGS+= \
--disable-remote-debugger
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_REMOTE_DEBUGGER),y)
CONFIGURE_ARGS+= \
--enable-remote-debugger
else
CONFIGURE_ARGS+= \
--enable-remote-debugger
CONFIGURE_ARGS+= \
--disable-remote-debugger
endif
ifneq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_GETTEXT),y)
CONFIGURE_ARGS+= \
--disable-gettext
ifeq ($(SDK)$(CONFIG_CLEARSILVER_ENABLE_GETTEXT),y)
CONFIGURE_ARGS+= \
--enable-gettext
else
CONFIGURE_ARGS+= \
--enable-gettext
CONFIGURE_ARGS+= \
--disable-gettext
endif
MAKE_FLAGS += \
TARGET_CFLAGS+=$(FPIC)
MAKE_FLAGS+= \
$(TARGET_CONFIGURE_OPTS) \
AR="$(AR) cr" \
LD="$(TARGET_CC) -o"

6
libs/clearsilver/patches/001-gcc-vs-dollar-cc.patch
View File

@ -1,6 +1,6 @@
--- clearsilver-0.10.5/rules.mk.in 2006-12-19 05:39:58.000000000 +0100
+++ clearsilver-0.10.5/rules.mk.in.new 2007-07-18 10:53:52.000000000 +0200
@@ -158,7 +158,7 @@
--- a/rules.mk.in
+++ b/rules.mk.in
@@ -158,7 +158,7 @@ Makefile.depends: $(NEOTONIC_ROOT)/rules
@touch Makefile.depends
@if test "x" != "x$(SOURCE_FILES)"; then \
for II in "$(SOURCE_FILES)"; do \

7
libs/clearsilver/patches/003-disable-tests.patch
View File

@ -1,7 +1,6 @@
diff -ur clearsilver-0.10.5/cs/Makefile clearsilver-0.10.5_new/cs/Makefile
--- clearsilver-0.10.5/cs/Makefile 2007-07-18 11:11:30.000000000 +0200
+++ clearsilver-0.10.5_new/cs/Makefile 2007-07-18 11:21:21.000000000 +0200
@@ -24,7 +24,7 @@
--- a/cs/Makefile
+++ b/cs/Makefile
@@ -24,7 +24,7 @@ CSDUMP_OBJ = $(CSDUMP_SRC:%.c=%.o)
LIBS += -lneo_cs -lneo_utl # -lefence

106
libs/clearsilver/patches/100-remove_warnings.patch
View File

@ -1,7 +1,6 @@
diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
--- clearsilver-0.10.5.orig/cgi/cgi.c 2007-07-12 04:38:03.000000000 +0200
+++ clearsilver-0.10.5/cgi/cgi.c 2008-01-28 12:04:50.000000000 +0100
@@ -698,7 +700,7 @@ NEOERR *cgi_parse (CGI *cgi)
--- a/cgi/cgi.c
+++ b/cgi/cgi.c
@@ -698,7 +698,7 @@ NEOERR *cgi_parse (CGI *cgi)
x = 0;
while (x < len)
{
@ -10,7 +9,7 @@ diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
cgiwrap_read (buf, sizeof(buf), &r);
else
cgiwrap_read (buf, len - x, &r);
@@ -1363,6 +1365,8 @@ void cgi_neo_error (CGI *cgi, NEOERR *er
@@ -1363,6 +1363,8 @@ void cgi_neo_error (CGI *cgi, NEOERR *er
{
STRING str;
@ -19,7 +18,7 @@ diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
string_init(&str);
cgiwrap_writef("Status: 500\n");
cgiwrap_writef("Content-Type: text/html\n\n");
@@ -1377,6 +1381,8 @@ void cgi_error (CGI *cgi, const char *fm
@@ -1377,6 +1379,8 @@ void cgi_error (CGI *cgi, const char *fm
{
va_list ap;
@ -28,7 +27,7 @@ diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
cgiwrap_writef("Status: 500\n");
cgiwrap_writef("Content-Type: text/html\n\n");
cgiwrap_writef("<html><body>\nAn error occured:<pre>");
@@ -1536,6 +1542,8 @@ NEOERR *cgi_cookie_set (CGI *cgi, const
@@ -1536,6 +1540,8 @@ NEOERR *cgi_cookie_set (CGI *cgi, const
STRING str;
char my_time[256];
@ -37,7 +36,7 @@ diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
if (path == NULL) path = "/";
string_init(&str);
@@ -1584,6 +1592,8 @@ NEOERR *cgi_cookie_set (CGI *cgi, const
@@ -1584,6 +1590,8 @@ NEOERR *cgi_cookie_set (CGI *cgi, const
NEOERR *cgi_cookie_clear (CGI *cgi, const char *name, const char *domain,
const char *path)
{
@ -46,9 +45,8 @@ diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
if (path == NULL) path = "/";
if (domain)
{
diff -pruN clearsilver-0.10.5.orig/cgi/cgiwrap.c clearsilver-0.10.5/cgi/cgiwrap.c
--- clearsilver-0.10.5.orig/cgi/cgiwrap.c 2006-12-19 05:36:20.000000000 +0100
+++ clearsilver-0.10.5/cgi/cgiwrap.c 2008-01-28 12:02:32.000000000 +0100
--- a/cgi/cgiwrap.c
+++ b/cgi/cgiwrap.c
@@ -14,6 +14,9 @@
#if HAVE_FEATURES_H
#include <features.h>
@ -59,9 +57,8 @@ diff -pruN clearsilver-0.10.5.orig/cgi/cgiwrap.c clearsilver-0.10.5/cgi/cgiwrap.
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff -pruN clearsilver-0.10.5.orig/cgi/date.c clearsilver-0.10.5/cgi/date.c
--- clearsilver-0.10.5.orig/cgi/date.c 2006-11-03 17:56:22.000000000 +0100
+++ clearsilver-0.10.5/cgi/date.c 2008-01-28 12:01:53.000000000 +0100
--- a/cgi/date.c
+++ b/cgi/date.c
@@ -94,7 +94,7 @@ NEOERR *export_date_tm (HDF *data, const
if (err) return nerr_pass(err);
err = hdf_set_int_value (obj, "wday", ttm->tm_wday);
@ -86,9 +83,8 @@ diff -pruN clearsilver-0.10.5.orig/cgi/date.c clearsilver-0.10.5/cgi/date.c
return nerr_pass (export_date_tm (data, prefix, &ttm));
}
diff -pruN clearsilver-0.10.5.orig/cgi/date.h clearsilver-0.10.5/cgi/date.h
--- clearsilver-0.10.5.orig/cgi/date.h 2005-07-01 03:21:30.000000000 +0200
+++ clearsilver-0.10.5/cgi/date.h 2008-01-28 11:36:10.000000000 +0100
--- a/cgi/date.h
+++ b/cgi/date.h
@@ -17,7 +17,7 @@
__BEGIN_DECLS
@ -98,9 +94,8 @@ diff -pruN clearsilver-0.10.5.orig/cgi/date.h clearsilver-0.10.5/cgi/date.h
time_t tt);
__END_DECLS
diff -pruN clearsilver-0.10.5.orig/cgi/html.c clearsilver-0.10.5/cgi/html.c
--- clearsilver-0.10.5.orig/cgi/html.c 2006-10-20 01:26:35.000000000 +0200
+++ clearsilver-0.10.5/cgi/html.c 2008-01-28 11:36:10.000000000 +0100
--- a/cgi/html.c
+++ b/cgi/html.c
@@ -774,7 +774,7 @@ NEOERR *html_strip_alloc(const char *src
}
else
@ -110,9 +105,8 @@ diff -pruN clearsilver-0.10.5.orig/cgi/html.c clearsilver-0.10.5/cgi/html.c
amp[ampl++] = tolower(src[x]);
else
{
diff -pruN clearsilver-0.10.5.orig/cgi/rfc2388.c clearsilver-0.10.5/cgi/rfc2388.c
--- clearsilver-0.10.5.orig/cgi/rfc2388.c 2006-08-29 10:44:50.000000000 +0200
+++ clearsilver-0.10.5/cgi/rfc2388.c 2008-01-28 12:01:13.000000000 +0100
--- a/cgi/rfc2388.c
+++ b/cgi/rfc2388.c
@@ -155,14 +155,14 @@ static NEOERR * _read_line (CGI *cgi, ch
ofs = cgi->readlen - cgi->nl;
memmove(cgi->buf, cgi->buf + cgi->nl, ofs);
@ -136,9 +130,8 @@ diff -pruN clearsilver-0.10.5.orig/cgi/rfc2388.c clearsilver-0.10.5/cgi/rfc2388.
to_read = cgi->buflen - ofs;
if (cgi->data_expected && (to_read > cgi->data_expected - cgi->data_read))
{
diff -pruN clearsilver-0.10.5.orig/cs/csparse.c clearsilver-0.10.5/cs/csparse.c
--- clearsilver-0.10.5.orig/cs/csparse.c 2007-07-12 04:37:34.000000000 +0200
+++ clearsilver-0.10.5/cs/csparse.c 2008-01-28 12:18:32.000000000 +0100
--- a/cs/csparse.c
+++ b/cs/csparse.c
@@ -59,7 +59,7 @@ typedef enum
ST_DEF = 1<<6,
ST_LOOP = 1<<7,
@ -350,9 +343,8 @@ diff -pruN clearsilver-0.10.5.orig/cs/csparse.c clearsilver-0.10.5/cs/csparse.c
my_parse->locals = parent->locals;
my_parse->parent = parent;
diff -pruN clearsilver-0.10.5.orig/util/dict.c clearsilver-0.10.5/util/dict.c
--- clearsilver-0.10.5.orig/util/dict.c 2005-07-01 02:48:26.000000000 +0200
+++ clearsilver-0.10.5/util/dict.c 2008-01-28 12:16:35.000000000 +0100
--- a/util/dict.c
+++ b/util/dict.c
@@ -87,6 +87,8 @@ static NEOERR *dictNewItem(dictCtx dict,
{
dictItemPtr my_item;
@ -362,9 +354,8 @@ diff -pruN clearsilver-0.10.5.orig/util/dict.c clearsilver-0.10.5/util/dict.c
if (item != NULL)
*item = NULL;
diff -pruN clearsilver-0.10.5.orig/util/neo_date.h clearsilver-0.10.5/util/neo_date.h
--- clearsilver-0.10.5.orig/util/neo_date.h 2005-06-30 20:58:48.000000000 +0200
+++ clearsilver-0.10.5/util/neo_date.h 2008-01-28 11:36:14.000000000 +0100
--- a/util/neo_date.h
+++ b/util/neo_date.h
@@ -17,10 +17,10 @@
__BEGIN_DECLS
@ -378,9 +369,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_date.h clearsilver-0.10.5/util/neo_d
/* To be portable... in seconds */
long neo_tz_offset(struct tm *ttm);
diff -pruN clearsilver-0.10.5.orig/util/neo_files.c clearsilver-0.10.5/util/neo_files.c
--- clearsilver-0.10.5.orig/util/neo_files.c 2007-07-12 04:14:23.000000000 +0200
+++ clearsilver-0.10.5/util/neo_files.c 2008-01-28 11:53:39.000000000 +0100
--- a/util/neo_files.c
+++ b/util/neo_files.c
@@ -35,7 +35,7 @@ NEOERR *ne_mkdirs (const char *path, mod
strncpy (mypath, path, sizeof(mypath));
@ -390,9 +380,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_files.c clearsilver-0.10.5/util/neo_
{
mypath[x] = '/';
mypath[x+1] = '\0';
diff -pruN clearsilver-0.10.5.orig/util/neo_hash.c clearsilver-0.10.5/util/neo_hash.c
--- clearsilver-0.10.5.orig/util/neo_hash.c 2006-10-19 01:57:24.000000000 +0200
+++ clearsilver-0.10.5/util/neo_hash.c 2008-01-28 11:53:09.000000000 +0100
--- a/util/neo_hash.c
+++ b/util/neo_hash.c
@@ -57,7 +57,7 @@ void ne_hash_destroy (NE_HASH **hash)
my_hash = *hash;
@ -442,9 +431,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_hash.c clearsilver-0.10.5/util/neo_h
{
if (prev)
{
diff -pruN clearsilver-0.10.5.orig/util/neo_hdf.c clearsilver-0.10.5/util/neo_hdf.c
--- clearsilver-0.10.5.orig/util/neo_hdf.c 2007-07-12 03:52:37.000000000 +0200
+++ clearsilver-0.10.5/util/neo_hdf.c 2008-01-28 12:24:48.000000000 +0100
--- a/util/neo_hdf.c
+++ b/util/neo_hdf.c
@@ -54,7 +54,7 @@ static UINT32 hash_hdf_hash(const void *
}
@ -564,7 +552,7 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_hdf.c clearsilver-0.10.5/util/neo_hd
{
buf[x++] = *st;
if (*st++ == '\n') break;
@@ -1398,17 +1400,17 @@ static NEOERR *_copy_line_advance(const
@@ -1398,17 +1400,17 @@ static NEOERR *_copy_line_advance(const
char *_strndup(const char *s, int len) {
int x;
@ -589,10 +577,9 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_hdf.c clearsilver-0.10.5/util/neo_hd
}
/* attributes are of the form [key1, key2, key3=value, key4="repr"] */
diff -pruN clearsilver-0.10.5.orig/util/neo_misc.c clearsilver-0.10.5/util/neo_misc.c
--- clearsilver-0.10.5.orig/util/neo_misc.c 2005-12-06 05:20:13.000000000 +0100
+++ clearsilver-0.10.5/util/neo_misc.c 2008-01-28 11:48:48.000000000 +0100
@@ -34,7 +34,7 @@ void ne_vwarn (const char *fmt, va_list
--- a/util/neo_misc.c
+++ b/util/neo_misc.c
@@ -34,7 +34,7 @@ void ne_vwarn (const char *fmt, va_list
localtime_r(&now, &my_tm);
@ -601,9 +588,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_misc.c clearsilver-0.10.5/util/neo_m
vsnprintf (buf, sizeof(buf), fmt, ap);
len = strlen(buf);
diff -pruN clearsilver-0.10.5.orig/util/neo_misc.h clearsilver-0.10.5/util/neo_misc.h
--- clearsilver-0.10.5.orig/util/neo_misc.h 2007-07-12 04:36:32.000000000 +0200
+++ clearsilver-0.10.5/util/neo_misc.h 2008-01-28 11:36:14.000000000 +0100
--- a/util/neo_misc.h
+++ b/util/neo_misc.h
@@ -106,6 +106,10 @@ typedef char BOOL;
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
#endif
@ -615,9 +601,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_misc.h clearsilver-0.10.5/util/neo_m
#ifndef TRUE
#define TRUE 1
#endif
diff -pruN clearsilver-0.10.5.orig/util/neo_net.c clearsilver-0.10.5/util/neo_net.c
--- clearsilver-0.10.5.orig/util/neo_net.c 2005-12-06 05:17:08.000000000 +0100
+++ clearsilver-0.10.5/util/neo_net.c 2008-01-28 11:46:42.000000000 +0100
--- a/util/neo_net.c
+++ b/util/neo_net.c
@@ -489,7 +489,7 @@ static NEOERR *_ne_net_read_int(NSOCK *s
char buf[32];
char *ep = NULL;
@ -627,9 +612,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_net.c clearsilver-0.10.5/util/neo_ne
{
while (sock->il - sock->ib > 0)
{
diff -pruN clearsilver-0.10.5.orig/util/neo_server.c clearsilver-0.10.5/util/neo_server.c
--- clearsilver-0.10.5.orig/util/neo_server.c 2005-06-30 20:52:00.000000000 +0200
+++ clearsilver-0.10.5/util/neo_server.c 2008-01-28 11:45:38.000000000 +0100
--- a/util/neo_server.c
+++ b/util/neo_server.c
@@ -104,6 +104,8 @@ static int ShutdownPending = 0;
static void sig_term(int sig)
@ -639,9 +623,8 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_server.c clearsilver-0.10.5/util/neo
ShutdownPending = 1;
ne_net_shutdown();
}
diff -pruN clearsilver-0.10.5.orig/util/neo_str.c clearsilver-0.10.5/util/neo_str.c
--- clearsilver-0.10.5.orig/util/neo_str.c 2007-07-12 03:24:00.000000000 +0200
+++ clearsilver-0.10.5/util/neo_str.c 2008-01-28 12:21:31.000000000 +0100
--- a/util/neo_str.c
+++ b/util/neo_str.c
@@ -592,11 +592,11 @@ char *repr_string_alloc (const char *s)
return rs;
}
@ -685,10 +668,9 @@ diff -pruN clearsilver-0.10.5.orig/util/neo_str.c clearsilver-0.10.5/util/neo_st
string_init(&out_s);
err = string_append (&out_s, "#");
if (err) return nerr_pass (err);
diff -pruN clearsilver-0.10.5.orig/util/skiplist.c clearsilver-0.10.5/util/skiplist.c
--- clearsilver-0.10.5.orig/util/skiplist.c 2005-06-30 20:52:10.000000000 +0200
+++ clearsilver-0.10.5/util/skiplist.c 2008-01-28 12:22:54.000000000 +0100
@@ -409,7 +409,7 @@ NEOERR *skipNewList(skipList *skip, int
--- a/util/skiplist.c
+++ b/util/skiplist.c
@@ -409,7 +409,7 @@ NEOERR *skipNewList(skipList *skip, int
if (err != STATUS_OK) break;
for(i = 0; /* init header and tail */

7
libs/clearsilver/patches/101-fix_content_type_ff3.patch
View File

@ -1,7 +1,6 @@
diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
--- clearsilver-0.10.5.orig/cgi/cgi.c 2008-05-29 17:59:56.000000000 +0200
+++ clearsilver-0.10.5/cgi/cgi.c 2008-05-29 18:02:51.000000000 +0200
@@ -642,7 +642,7 @@ NEOERR *cgi_parse (CGI *cgi)
--- a/cgi/cgi.c
+++ b/cgi/cgi.c
@@ -640,7 +640,7 @@ NEOERR *cgi_parse (CGI *cgi)
if (!strcmp(method, "POST"))
{

5
libs/clearsilver/patches/102-add_x_requested_http_headers.patch
View File

@ -1,6 +1,5 @@
diff -pruN clearsilver-0.10.5.orig/cgi/cgi.c clearsilver-0.10.5/cgi/cgi.c
--- clearsilver-0.10.5.orig/cgi/cgi.c 2007-07-12 04:38:03.000000000 +0200
+++ clearsilver-0.10.5/cgi/cgi.c 2008-01-28 12:04:50.000000000 +0100
--- a/cgi/cgi.c
+++ b/cgi/cgi.c
@@ -201,6 +201,8 @@ struct _http_vars
{"HTTP_IF_MODIFIED_SINCE", "IfModifiedSince"},
{"HTTP_REFERER", "Referer"},