From patchwork Wed May 3 04:21:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Lin X-Patchwork-Id: 757847 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wHlMy3rsWz9s3w for ; Wed, 3 May 2017 14:21:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mzmhH6iB"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id DCC9D884A9; Wed, 3 May 2017 04:21:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tVOk7CFCMNoF; Wed, 3 May 2017 04:21:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DD7538849C; Wed, 3 May 2017 04:21:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4DA031BFFA6 for ; Wed, 3 May 2017 04:21:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4986786A4A for ; Wed, 3 May 2017 04:21:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5Nja-yJYBaoZ for ; Wed, 3 May 2017 04:21:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f172.google.com (mail-pf0-f172.google.com [209.85.192.172]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 767CD86A48 for ; Wed, 3 May 2017 04:21:11 +0000 (UTC) Received: by mail-pf0-f172.google.com with SMTP id q66so6725624pfi.3 for ; Tue, 02 May 2017 21:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=3+8IVN6LPsslD+Iw9fBjE/YC6lfupDIJTqlM9Btpg/Q=; b=mzmhH6iB8KPWf0Od/qHPnVrkeeUwzmttJcPrUS60BqaFK/RQHTCxcdun0ezlOys6vX nrY75z3UnWOcg4GKIbfNz84GnKkaCKMMfDSM/aIHblIMzJzSfO1msY63nAU1UuiOeM5G TMGqUYr5Qrvri7hMPwYUlzzu+PLVNi0O0nLePjtvpxZygpnYTNqyYddshO7kXVQmJ+Go mKoLF4QGQoyAZ5u8Zr70skTdCJnRueULa+5Q/0aAzwac9ohBPSeDWz886EAAI/vtXyT5 d+WpCL+Eo5fmQ8JFuTap4px4koUm7n0FpGWjbqaM1VzgmwBJnTpc4UCvf0ULIu/JvofA nBnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3+8IVN6LPsslD+Iw9fBjE/YC6lfupDIJTqlM9Btpg/Q=; b=TPn+UcgkPoe6HJQYpOGjfbulVd3gB428UUK1XZAbLA9exLB/Gte5gOF6uycu053zR+ /g+WkLnXP0ogqWSHek1dhKZx9AkbkrRtIh0PiMlEHjfTBznclEpt3aNcGUCZHo9ENTue JkihCFvShfW67cgECOWTIVua0wvYfWuhGstk+5odduY2aueFncqXWfhI9lxWjZ1Av7uH so4TLfP+aIlIgCmq81JpU2rOrhmGVUwAiqVDVrjXNS43u6FRDIfuhzoUTW26LaN2oAxL +AmSxakBRSsHX42hZ4BfmyLDdsd1c8kDxpqinMUzucnX1Ryra8jQUM6Y+a0utYWtGFPI ObMw== X-Gm-Message-State: AN3rC/5BRD21FQDlxxNJ9B51V8rH/dm03y+Rd5pyI0rJUrIgQcr6u3Or +n3OgllQCpL1XKKw X-Received: by 10.98.65.216 with SMTP id g85mr2535120pfd.187.1493785270873; Tue, 02 May 2017 21:21:10 -0700 (PDT) Received: from localhost.localdomain (36-227-7-196.dynamic-ip.hinet.net. [36.227.7.196]) by smtp.gmail.com with ESMTPSA id i63sm2940227pgc.26.2017.05.02.21.21.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 May 2017 21:21:10 -0700 (PDT) From: xlcwu To: buildroot@buildroot.org Date: Wed, 3 May 2017 04:21:04 +0000 Message-Id: <1493785264-17179-1-git-send-email-xlcwu.taiwan@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH v2] libcgi: bump to version 1.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 1. Cleanup the libcgi package, by using https://github.com/rafaelsteil/libcgi as an upstream. 2. Remove old patch and use cmake to build new version. Signed-off-by: xlcwu Changes v1 -> v2: - Remove old patch - Cleanup libcgi.mk - Rewrite commit log and reformat it --- package/libcgi/0001-misc-fixes.patch | 122 ----------------------------------- package/libcgi/libcgi.hash | 2 +- package/libcgi/libcgi.mk | 12 ++-- 3 files changed, 7 insertions(+), 129 deletions(-) delete mode 100644 package/libcgi/0001-misc-fixes.patch diff --git a/package/libcgi/0001-misc-fixes.patch b/package/libcgi/0001-misc-fixes.patch deleted file mode 100644 index b576178..0000000 --- a/package/libcgi/0001-misc-fixes.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: b/src/cgi.c -=================================================================== ---- a/src/cgi.c -+++ b/src/cgi.c -@@ -336,7 +336,7 @@ - hextable['b'] = 11; - hextable['c'] = 12; - hextable['d'] = 13; -- hextable['e'] = 13; -+ hextable['e'] = 14; - hextable['f'] = 15; - hextable['A'] = 10; - hextable['B'] = 11; -Index: b/src/string.c -=================================================================== ---- a/src/string.c -+++ b/src/string.c -@@ -584,7 +584,7 @@ - - va_start(ptr, s); - -- va_copy(bkp, str); -+ va_copy(bkp, ptr); - len = strlen(s); - - while (*str) { -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -5,22 +5,32 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - --SHAREDOPT = -shared -+SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.0 - LIBDIR = $(prefix)/lib --INCDIR = $(prefix)/include -+INCDIR = $(prefix)/include/libcgi/ - MANDIR = $(prefix)/man/man3 - SHELL = /bin/sh - EXTRA_LIBS = - - INCS = -Isrc --FLAGS = -Wall -fpic -+FLAGS = -Wall -D_REENTRANT - - OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \ - src/string.o src/general.o src/list.o src/cookie.o -+SHOBJS=$(OBJS:.o=.sh.o) - --.c.o: $(CC) $(FLAGS) -c $< -+ALL_TARGETS = src/libcgi.a -+ifeq ($(STATIC),) -+ALL_TARGETS += src/libcgi.so -+endif - --all: $(OBJS) src/libcgi.so -+%.o: %.c -+ $(CC) $(FLAGS) -c $*.c -o $@ -+ -+%.sh.o: %.c -+ $(CC) $(FLAGS) -fPIC -c $*.c -o $@ -+ -+all: $(ALL_TARGETS) - - @echo "" - @echo "" -@@ -48,14 +58,17 @@ - src/libcgi.a: $(OBJS) - $(AR) rc src/libcgi.a $(OBJS) - --src/libcgi.so: src/libcgi.a -- $(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS) -+src/libcgi.so: $(SHOBJS) -+ $(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS) - - install: -- cp src/libcgi.a $(LIBDIR) -- cp src/libcgi.so $(LIBDIR) -- cp src/cgi.h $(INCDIR) -- cp src/session.h $(INCDIR) -+ cp src/libcgi.a $(DESTDIR)/$(LIBDIR) -+ifeq ($(STATIC),) -+ cp src/libcgi.so $(DESTDIR)/$(LIBDIR) -+endif -+ [ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p $(DESTDIR)/$(INCDIR) -+ cp src/cgi.h $(DESTDIR)/$(INCDIR) -+ cp src/session.h $(DESTDIR)/$(INCDIR) - - - src/error.o: src/error.c src/error.h -@@ -69,8 +82,9 @@ - src/list.o: src/list.c - - clean: -- find src/ -name *.*o -exec rm -f {} \; -+ find src/ -name *.o -exec rm -f {} \; - find src/ -name *.a -exec rm -f {} \; -+ find src/ -name *.so -exec rm -f {} \; - - uninstall: clean - rm -f $(LIBDIR)/libcgi.* -@@ -78,11 +92,11 @@ - rm -f $(INCDIR)/session.h - rm -f $(MANDIR)/libcgi* - --install_man: -- cp doc/man/man3/libcgi_base64.3 $(MANDIR) -- cp doc/man/man3/libcgi_cgi.3 $(MANDIR) -- cp doc/man/man3/libcgi_general.3 $(MANDIR) -- cp doc/man/man3/libcgi_string.3 $(MANDIR) -- cp doc/man/man3/libcgi_session.3 $(MANDIR) -- cp doc/man/man3/libcgi_cookie.3 $(MANDIR) -+#install_man: -+# cp doc/man/man3/libcgi_base64.3 $(MANDIR) -+# cp doc/man/man3/libcgi_cgi.3 $(MANDIR) -+# cp doc/man/man3/libcgi_general.3 $(MANDIR) -+# cp doc/man/man3/libcgi_string.3 $(MANDIR) -+# cp doc/man/man3/libcgi_session.3 $(MANDIR) -+# cp doc/man/man3/libcgi_cookie.3 $(MANDIR) - diff --git a/package/libcgi/libcgi.hash b/package/libcgi/libcgi.hash index 6bd7c0c..1ac1440 100644 --- a/package/libcgi/libcgi.hash +++ b/package/libcgi/libcgi.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 861df39cc0195d43419c4c3de8dff4f42478db66c9ba0b0c1e994c99400e130c libcgi-1.0.tar.gz +sha256 128445f2f828e84905d51bd53d11e2e08c489df3a07225ff9f198c1318092fe6 libcgi-1.1.tar.gz diff --git a/package/libcgi/libcgi.mk b/package/libcgi/libcgi.mk index de2a1e4..66bb165 100644 --- a/package/libcgi/libcgi.mk +++ b/package/libcgi/libcgi.mk @@ -4,12 +4,12 @@ # ################################################################################ -LIBCGI_VERSION = 1.0 -LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION) +LIBCGI_VERSION = 1.1 +LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION) + LIBCGI_INSTALL_STAGING = YES -# use cross CC/AR rather than host -LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \ - $(if $(BR2_STATIC_LIBS),STATIC=1) LIBCGI_LICENSE = LGPL-2.1+ -$(eval $(autotools-package)) +LIBCGI_SUPPORTS_IN_SOURCE_BUILD = NO + +$(eval $(cmake-package))