All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v3] libcgi: bump to version 1.1
@ 2017-08-10  7:45 Joe Lin
  2017-08-10  8:20 ` Arnout Vandecappelle
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Joe Lin @ 2017-08-10  7:45 UTC (permalink / raw)
  To: buildroot

Cleanup the libcgi package,
by using https://github.com/rafaelsteil/libcgi as an upstream.
Remove old patch and use cmake to build new version.

Signed-off-by: Joe Lin <xlcwu.taiwan@gmail.com>
---
Changes v2 -> v3:
    - Resubmit patch using real name

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))
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] libcgi: bump to version 1.1
  2017-08-10  7:45 [Buildroot] [PATCH v3] libcgi: bump to version 1.1 Joe Lin
@ 2017-08-10  8:20 ` Arnout Vandecappelle
  2017-08-10 11:48   ` xlcwu
  2017-08-11 14:06 ` Arnout Vandecappelle
  2017-09-03  6:56 ` Alexander Dahl
  2 siblings, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-08-10  8:20 UTC (permalink / raw)
  To: buildroot

 Hi Joe,

On 10-08-17 09:45, Joe Lin wrote:
> Cleanup the libcgi package,
> by using https://github.com/rafaelsteil/libcgi as an upstream.
> Remove old patch and use cmake to build new version.
> 
> Signed-off-by: Joe Lin <xlcwu.taiwan@gmail.com>
[snip]
> -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

 Mario (added in Cc) submitted a similar patch and it didn't have this
_IN_SOURCE_BUILD line. Is it really needed?

 Regards,
 Arnout

> +
> +$(eval $(cmake-package))
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] libcgi: bump to version 1.1
  2017-08-10  8:20 ` Arnout Vandecappelle
@ 2017-08-10 11:48   ` xlcwu
  2017-08-11  5:47     ` xlcwu
  0 siblings, 1 reply; 6+ messages in thread
From: xlcwu @ 2017-08-10 11:48 UTC (permalink / raw)
  To: buildroot

Hi Arnout

I build the libcgi by follow steps in
https://github.com/rafaelsteil/libcgi/blob/master/README.md


On Thu, Aug 10, 2017 at 4:20 PM Arnout Vandecappelle <arnout@mind.be> wrote:

>  Hi Joe,
>
> On 10-08-17 09:45, Joe Lin wrote:
> > Cleanup the libcgi package,
> > by using https://github.com/rafaelsteil/libcgi as an upstream.
> > Remove old patch and use cmake to build new version.
> >
> > Signed-off-by: Joe Lin <xlcwu.taiwan@gmail.com>
> [snip]
> > -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
>
>  Mario (added in Cc) submitted a similar patch and it didn't have this
> _IN_SOURCE_BUILD line. Is it really needed?
>
I am not sure and I will trigger a build to check it.

>
>  Regards,
>  Arnout
>
> > +
> > +$(eval $(cmake-package))
> >
>
> --
> Arnout Vandecappelle                          arnout at mind be
> Senior Embedded Software Architect            +32-16-286500
> Essensium/Mind                                http://www.mind.be
> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170810/2153b631/attachment.html>

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] libcgi: bump to version 1.1
  2017-08-10 11:48   ` xlcwu
@ 2017-08-11  5:47     ` xlcwu
  0 siblings, 0 replies; 6+ messages in thread
From: xlcwu @ 2017-08-11  5:47 UTC (permalink / raw)
  To: buildroot

Hi Arnout,

On Thu, Aug 10, 2017 at 7:48 PM, xlcwu <xlcwu.taiwan@gmail.com> wrote:
> Hi Arnout
>
> I build the libcgi by follow steps in
> https://github.com/rafaelsteil/libcgi/blob/master/README.md
>
>
> On Thu, Aug 10, 2017 at 4:20 PM Arnout Vandecappelle <arnout@mind.be> wrote:
>>
>>  Hi Joe,
>>
>> On 10-08-17 09:45, Joe Lin wrote:
>> > Cleanup the libcgi package,
>> > by using https://github.com/rafaelsteil/libcgi as an upstream.
>> > Remove old patch and use cmake to build new version.
>> >
>> > Signed-off-by: Joe Lin <xlcwu.taiwan@gmail.com>
>> [snip]
>> > -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
>>
>>  Mario (added in Cc) submitted a similar patch and it didn't have this
>> _IN_SOURCE_BUILD line. Is it really needed?
>
> I am not sure and I will trigger a build to check it.
I build libcgi with/without _IN_SOURCE_BUILD = NO then use "diff -y"
"cmp -l" to compare two binary and make no difference. We can remove
it.

>>
>>
>>  Regards,
>>  Arnout
>>
>> > +
>> > +$(eval $(cmake-package))
>> >
>>
>> --
>> Arnout Vandecappelle                          arnout at mind be
>> Senior Embedded Software Architect            +32-16-286500
>> Essensium/Mind                                http://www.mind.be
>> G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
>> LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
>> GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] libcgi: bump to version 1.1
  2017-08-10  7:45 [Buildroot] [PATCH v3] libcgi: bump to version 1.1 Joe Lin
  2017-08-10  8:20 ` Arnout Vandecappelle
@ 2017-08-11 14:06 ` Arnout Vandecappelle
  2017-09-03  6:56 ` Alexander Dahl
  2 siblings, 0 replies; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-08-11 14:06 UTC (permalink / raw)
  To: buildroot



On 10-08-17 09:45, Joe Lin wrote:
> Cleanup the libcgi package,
> by using https://github.com/rafaelsteil/libcgi as an upstream.
> Remove old patch and use cmake to build new version.
> 
> Signed-off-by: Joe Lin <xlcwu.taiwan@gmail.com>

 I've applied to next, after also merging in the changes by Mario (and adding
his Signed-off-by):
- Remove LIBCGI_SUPPORTS_IN_SOURCE_BUILD = NO
- Use github URL in Config.in
- Use upstream sha256 hash

 I've also added the URL of the upstream hash.

 Regards,
 Arnout
-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v3] libcgi: bump to version 1.1
  2017-08-10  7:45 [Buildroot] [PATCH v3] libcgi: bump to version 1.1 Joe Lin
  2017-08-10  8:20 ` Arnout Vandecappelle
  2017-08-11 14:06 ` Arnout Vandecappelle
@ 2017-09-03  6:56 ` Alexander Dahl
  2 siblings, 0 replies; 6+ messages in thread
From: Alexander Dahl @ 2017-09-03  6:56 UTC (permalink / raw)
  To: buildroot

Hei hei,

On Thu, Aug 10, 2017 at 07:45:27AM +0000, Joe Lin wrote:
> Cleanup the libcgi package,
> by using https://github.com/rafaelsteil/libcgi as an upstream.
> Remove old patch and use cmake to build new version.

I can confirm this is the correct upstream project and I am more or
less the maintainer now (as you can see in the commit log). So you may
Cc me on patches on this package, I'm also willing to accept upstream
patches (after my vacation next week). However I don't use libcgi with
buildroot by myself.

Greets
Alex

-- 
?With the first link, the chain is forged. The first speech censured, 
the first thought forbidden, the first freedom denied, chains us all 
irrevocably.? (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: C28E E6B9 0263 95CF 8FAF  08FA 34AD CD00 7221 5CC6 ***
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170903/9d61cdf2/attachment.asc>

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-09-03  6:56 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-10  7:45 [Buildroot] [PATCH v3] libcgi: bump to version 1.1 Joe Lin
2017-08-10  8:20 ` Arnout Vandecappelle
2017-08-10 11:48   ` xlcwu
2017-08-11  5:47     ` xlcwu
2017-08-11 14:06 ` Arnout Vandecappelle
2017-09-03  6:56 ` Alexander Dahl

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.