[package] update cgilib to 0.7 (#5367)

SVN-Revision: 16502

diff --git a/libs/cgilib/Makefile b/libs/cgilib/Makefile
index 3c773be63056d74f5bdc73838898507e76a4a05d..93c175c9d706fb2d8b69dd8ef6e75591a8fd2166 100644 (file)
--- a/libs/cgilib/Makefile
+++ b/libs/cgilib/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cgilib
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cgilib

-PKG_VERSION:=0.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.7
+PKG_RELEASE:=1

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download

-PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0
+PKG_MD5SUM:=2c7053f58dfb06f7a80a112797ed7e86

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -24,28 +24,26 @@ define Package/cgilib
   URL:=http://www.infodrom.org/projects/cgilib/
 endef
 
   URL:=http://www.infodrom.org/projects/cgilib/
 endef
 

-define Build/Configure
-endef
-

 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                 OFLAGS="$(TARGET_CFLAGS)" \
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                 OFLAGS="$(TARGET_CFLAGS)" \

-                all
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+                install

 endef
 
 define Build/InstallDev
        mkdir -p $(1)/usr/include
 endef
 
 define Build/InstallDev
        mkdir -p $(1)/usr/include

-       $(CP) $(PKG_BUILD_DIR)/cgi.h $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/cgi.h $(1)/usr/include/

        mkdir -p $(1)/usr/lib
        mkdir -p $(1)/usr/lib

-       $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcgi.{a,so*} $(1)/usr/lib/

 endef
 
 define Package/cgilib/install
        $(INSTALL_DIR) $(1)/usr/lib
 endef
 
 define Package/cgilib/install
        $(INSTALL_DIR) $(1)/usr/lib

-       $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcgi.so.* $(1)/usr/lib/

 endef
 
 $(eval $(call BuildPackage,cgilib))
 endef
 
 $(eval $(call BuildPackage,cgilib))

diff --git a/libs/cgilib/patches/100-shared_lib.patch b/libs/cgilib/patches/100-shared_lib.patch
deleted file mode 100644 (file)
index 5603340..0000000
--- a/libs/cgilib/patches/100-shared_lib.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN cgilib-0.5-orig/Makefile cgilib-0.5-1/Makefile
---- cgilib-0.5-orig/Makefile   1999-08-20 23:14:07.000000000 +0200
-+++ cgilib-0.5-1/Makefile      2005-08-10 20:28:17.000000000 +0200
-@@ -14,14 +14,26 @@
- #   along with this program; if not, write to the Free Software
- #   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
- 
--CFLAGS = -I. -Wall -O2 -g
-+OFLAGS = -O2 -g
-+CFLAGS = -I. -Wall $(OFLAGS)
- LDFLAGS = -L.
- LIBS = -lcgi
- 
-+SOVER_MAJ := 0
-+SOVER_MIN := 0
-+SOVER_REV := 0
-+SONAME := libcgi.so.$(SOVER_MAJ)
-+SOREAL := libcgi.so.$(SOVER_MAJ).$(SOVER_MIN).$(SOVER_REV)
-+
- OBJS = cgi.o cookies.o
- 
- libcgi.a: $(OBJS)
--      ar rc $@ $^
-+      $(AR) rc $@ $^
-+
-+libcgi.so: $(OBJS)
-+      $(CC) -shared -o $(SOREAL) $(LDFLAGS) -Wl,-soname,$(SONAME) $^
-+      ln -sf $(SOREAL) $(SONAME)
-+      ln -sf $(SONAME) libcgi.so
- 
- cgitest: cgitest.o libcgi.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-@@ -29,7 +41,7 @@
- jumpto: jumpto.o libcgi.a
-       $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
--all: libcgi.a cgitest jumpto
-+all: libcgi.a libcgi.so cgitest jumpto
- 
- install: cgitest
-       install -m 755 cgitest /usr/lib/cgi-bin

diff --git a/libs/cgilib/patches/200-cgitest_bugfix.patch b/libs/cgilib/patches/200-cgitest_bugfix.patch
index 62a68e7391c0c6fc2a87121fec546a1c53e5e383..745aa0e7edaa3043cba593f7cfcc673afad51a83 100644 (file)
--- a/libs/cgilib/patches/200-cgitest_bugfix.patch
+++ b/libs/cgilib/patches/200-cgitest_bugfix.patch
@@ -1,10 +1,10 @@
---- cgilib-0.5/cgitest.c.orig  1999-08-17 15:21:20.000000000 +0200
-+++ cgilib-0.5/cgitest.c       2005-08-10 20:49:01.000000000 +0200
-@@ -113,7 +113,7 @@
+--- a/cgitest.c
++++ b/cgitest.c
+@@ -216,7 +216,7 @@ int main (int argc, char **argv, char **
+           cgiSetHeader ("Set-Cookie", "Version=1; Library=cgilib; Path=/");

              cgiHeader();
              cgiHeader();

-           printf ("<html>\n<head><title>cgilib</title></title>\n\n<body bgcolor=\"#ffffff\">\n");
-           printf ("<h1><a href=\"%s\">cgilib</a></h1>\n", URL);
--          printf ("<h3>Cookie "Library" set</h3>\n");
+           printf (HTML_CSS HTML_HEAD);
+-          printf ("<h3>Cookie Library set</h3>\n");

 +          printf ("<h3>Cookie \"Library\" set</h3>\n");
            printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest\">Test</a><p>\n");
            printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest/redirect\">Redirect</a><p>\n");
 +          printf ("<h3>Cookie \"Library\" set</h3>\n");
            printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest\">Test</a><p>\n");
            printf ("<p><br><p><br><a href=\"/cgi-bin/cgitest/redirect\">Redirect</a><p>\n");

diff --git a/libs/cgilib/patches/300-cpp_bugfix.patch b/libs/cgilib/patches/300-cpp_bugfix.patch
index 48ff7de0419342b03ef244d134f848b8302b9c3c..c06f81612391896614608f9d76ec372c0de78f5a 100644 (file)
--- a/libs/cgilib/patches/300-cpp_bugfix.patch
+++ b/libs/cgilib/patches/300-cpp_bugfix.patch
@@ -1,9 +1,8 @@
-diff -Nur cgilib-0.5.orig/cgi.h cgilib-0.5/cgi.h
---- cgilib-0.5.orig/cgi.h      2008-01-03 18:02:08.000000000 +0100
-+++ cgilib-0.5/cgi.h   2008-01-03 18:02:31.000000000 +0100
-@@ -20,6 +20,10 @@
- #ifndef _CGI_H_
- #define _CGI_H_
+--- a/cgi.h
++++ b/cgi.h
+@@ -24,6 +24,10 @@
+ extern "C" {
+ #endif

  
 +#ifdef __cplusplus
 +extern "C" {
  
 +#ifdef __cplusplus
 +extern "C" {


@@ -12,9 +11,9 @@ diff -Nur cgilib-0.5.orig/cgi.h cgilib-0.5/cgi.h
  typedef struct var_s {
        char    *name,
                *value;
  typedef struct var_s {
        char    *name,
                *value;

-@@ -112,4 +116,8 @@
-  */
- void cgiFree (s_cgi *parms);
+@@ -146,4 +150,8 @@ char *cgiEscape (char *string);
+ extern }
+ #endif

  
 +#ifdef __cplusplus
 +} /* end of extern "C" */
  
 +#ifdef __cplusplus
 +} /* end of extern "C" */