Skip to contentSkip to conversation

Update the libhttpparser package

PATCH New Renaud AUBIN 2 participants 3 messages Dec 1, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Update the libhttpparser package

The http-parser repository has been transfered from joyent to nodejs. Bump version to 2.6.0.

---
 ...1-Use-f-option-when-calling-ln-at-install-time.patch | 17 +++++++++--------
 package/libhttpparser/Config.in                         |  2 +-
 package/libhttpparser/libhttpparser.mk                  |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)
package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +9 -8
index 29fe04d..df16656 100644
@@ -1,4 +1,4 @@
-From d9dfeca8736318eaad5cd4554cbae059469decde Mon Sep 17 00:00:00 2001
+From 384917321c45e492b0ca7aaa94d4b15324aef95d Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Fri, 28 Aug 2015 19:02:11 +0200
 Subject: [PATCH] Use -f option when calling ln at install time
@@ -6,29 +6,30 @@ Subject: [PATCH] Use -f option when calling ln at install time
 This allows "make install; make install" to work properly.
 
 Signed-off-by: Thomas Petazzoni <[email protected]>
+Signed-off-by: Renaud AUBIN <[email protected]>
 ---
  Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 373709c..6206b09 100644
+index 33c8ba0..b36d95a 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -113,12 +113,12 @@ tags: http_parser.c http_parser.h test.c
+@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c
  install: library
  	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
  	$(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
-+	ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
+-	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
++	ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
  
  install-strip: library
  	$(INSTALL) -D  http_parser.h $(INCLUDEDIR)/http_parser.h
  	$(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME)
--	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
-+	ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.so
+-	ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
++	ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT)
  
  uninstall:
  	rm $(INCLUDEDIR)/http_parser.h
 -- 
-2.5.0
+2.6.2
 
package/libhttpparser/Config.in +1 -1
index 31b8b9b..4356304 100644
@@ -11,7 +11,7 @@ config BR2_PACKAGE_LIBHTTPPARSER
 	  40 bytes of data per message stream (in a web server
 	  that is per connection).
 
-	  https://github.com/joyent/http-parser
+	  https://github.com/nodejs/http-parser
 
 comment "libhttpparser needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
package/libhttpparser/libhttpparser.mk +2 -2
index d6ec236..015efc0 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBHTTPPARSER_VERSION = v2.5.0
-LIBHTTPPARSER_SITE = $(call github,joyent,http-parser,$(LIBHTTPPARSER_VERSION))
+LIBHTTPPARSER_VERSION = v2.6.0
+LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION))
 LIBHTTPPARSER_INSTALL_STAGING = YES
 LIBHTTPPARSER_LICENSE = MIT
 LIBHTTPPARSER_LICENSE_FILES = LICENSE-MIT
Signature · 1 line
2.6.2
#1 lore raw

PATCH 1/1 Update the libhttpparser package

Renaud,

Quoted 4 lines · Renaud AUBIN

The http-parser repository has been transfered from joyent to nodejs. Bump version to 2.6.0.

The commit title for packages should always look like:

<package>: <description>

So in the case of this commit, it should be:

libhttpparser: bump to version 2.6.0

Also, when you send a new version of a patch, it should be titled [PATCHv2] and include a changelog of what has changed since the previous iteration of the patch. See the Buildroot manual for details about this, and "git help format-patch" for details on how to do it.

package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch Subject: [PATCH] Use -f option when calling ln at install time · line 6

Quoted 12 lines
package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +1 -1
index 29fe04d..df16656 100644
@@ -1,4 +1,4 @@
-From d9dfeca8736318eaad5cd4554cbae059469decde Mon Sep 17 00:00:00 2001
+From 384917321c45e492b0ca7aaa94d4b15324aef95d Mon Sep 17 00:00:00 2001
 From: Thomas Petazzoni <[email protected]>
 Date: Fri, 28 Aug 2015 19:02:11 +0200
 Subject: [PATCH] Use -f option when calling ln at install time
@@ -6,29 +6,30 @@ Subject: [PATCH] Use -f option when calling ln at install time
 This allows "make install; make install" to work properly.

Since you're using libhttpparser, could you submit this patch to the upstream project, so that we can hopefully get rid of it in the future ?

Finally, if you have some time, could you submit a patch to add a hash file to this package, since it's fetched from github ?

I've fixed the commit title, and applied to the next branch (soon to be merged into master).

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 Update the libhttpparser package

Thomas,

Le 2015-12-01 17:50, Thomas Petazzoni a ?crit?:

Quoted 12 lines

Renaud,

Quoted 4 lines · Renaud AUBIN

The http-parser repository has been transfered from joyent to nodejs. Bump version to 2.6.0.

The commit title for packages should always look like:

<package>: <description>

Quoted 9 lines

So in the case of this commit, it should be:

libhttpparser: bump to version 2.6.0

Also, when you send a new version of a patch, it should be titled [PATCHv2] and include a changelog of what has changed since the previous iteration of the patch. See the Buildroot manual for details about this, and "git help format-patch" for details on how to do it.

OK, no excuse on that since the manual is complete on that. Sorry (^^)

Quoted 15 lines
Quoted 15 lines
(quoted diff) +0 -0

a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch index 29fe04d..df16656 100644
---
a/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch
+++
b/package/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch

(quoted diff) +0 -1
@@ -1,4 +1,4 @@
-From d9dfeca8736318eaad5cd4554cbae059469decde Mon Sep 17 00:00:00 

2001
+From 384917321c45e492b0ca7aaa94d4b15324aef95d Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <[email protected]>
Date: Fri, 28 Aug 2015 19:02:11 +0200

Quoted 9 lines
Quoted 4 lines

Subject: [PATCH] Use -f option when calling ln at install time

(quoted diff) +0 -0
@@ -6,29 +6,30 @@ Subject: [PATCH] Use -f option when calling ln at 

install time
This allows "make install; make install" to work properly.

Since you're using libhttpparser, could you submit this patch to the upstream project, so that we can hopefully get rid of it in the future ?

Existing upstream PR on this:
https://github.com/nodejs/http-parser/pull/243
https://github.com/nodejs/http-parser/pull/272

+ an issue / proposal on CMake usage instead of the existing plain old Makefile (but with no PR, I wouldn't count on this one). So... Wait and see...

Quoted 6 lines

Finally, if you have some time, could you submit a patch to add a hash file to this package, since it's fetched from github ?

I've fixed the commit title, and applied to the next branch (soon to be merged into master).

No problem, I'll monitor master.

Quoted 3 lines

Thanks,

Thomas

Thanks for your thoroughful explanation (obv. + the great work on buildroot!)

Renaud