Skip to contentSkip to conversation

package/libfcgi: bump to version 2.4.2

PATCH New Louis Rannou 2 participants 2 messages Nov 26, 2019 – Dec 24, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): Re: [Buildroot] [PATCH] package/libfcgi: bump to version 2.4.2

#1 lore raw

PATCH 1/1 package/libfcgi: bump to version 2.4.2

FCGI is abandonned (https://repo.or.cz/fcgi2.git). Replace it by a maintained fork (https://github.com/FastCGI-Archives/fcgi2).

Patchs status:
0001-eof.patch -> fixed by commit 122e55cc354dd4a78849aed8d36c61ed9edeaeb2
0002-link-against-libfcgi-la.patch -> included in commit 2a575066bcbdadfc161d46ef816a45f6edf9d529 0004-make-autoreconfable.patch -> fixed in commits 854643b36e87cf1262da2eb82b3f10b56185131b and ad30485fa12be4415d57422702ee4f64a09b7bea 0006-fix-CVE-2012-6687.patch -> applied in commit 5c15a7bb5260bc83715090c9fd386d704c139671

---

$ ./utils/test-pkg -p libfcgi
                             br-arm-full [1/6]: OK
                  br-arm-cortex-a9-glibc [2/6]: OK
                   br-arm-cortex-m4-full [3/6]: SKIPPED
                          br-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: OK
                            sourcery-arm [6/6]: OK
---
 package/libfcgi/0001-eof.patch                |  24 ----
 ...ath.patch => 0001-link-against-math.patch} |   8 +-
 ...ples.patch => 0002-disable-examples.patch} |   0
 .../0002-link-against-libfcgi-la.patch        |  20 ----
 .../libfcgi/0004-make-autoreconfable.patch    |  67 -----------
 package/libfcgi/0006-fix-CVE-2012-6687.patch  | 104 ------------------
 package/libfcgi/libfcgi.hash                  |   2 +-
 package/libfcgi/libfcgi.mk                    |   5 +-
 8 files changed, 8 insertions(+), 222 deletions(-)
 delete mode 100644 package/libfcgi/0001-eof.patch
 rename package/libfcgi/{0003-link-against-math.patch => 0001-link-against-math.patch} (74%)
 rename package/libfcgi/{0005-disable-examples.patch => 0002-disable-examples.patch} (100%)
 delete mode 100644 package/libfcgi/0002-link-against-libfcgi-la.patch
 delete mode 100644 package/libfcgi/0004-make-autoreconfable.patch
 delete mode 100644 package/libfcgi/0006-fix-CVE-2012-6687.patch
package/libfcgi/0001-eof.patch deleted +0 -24
deleted file mode 100644
index e7314265a2..0000000000
@@ -1,24 +0,0 @@
-[PATCH] fix build with C++ support and gcc >= 4.4
-
-EOF is defined in stdio, so ensure it is included.
-
-Based on similar patch by Markus Rothe:
-http://comments.gmane.org/gmane.comp.web.fastcgi.devel/3205
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- libfcgi/fcgio.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: fcgi-2.4.0/libfcgi/fcgio.cpp
-===================================================================
---- fcgi-2.4.0.orig/libfcgi/fcgio.cpp
-+++ fcgi-2.4.0/libfcgi/fcgio.cpp
-@@ -22,6 +22,7 @@
- #define DLLAPI  __declspec(dllexport)
- #endif
- 
-+#include <cstdio>
- #include <limits.h>
- #include "fcgio.h"
- 
package/libfcgi/0001-link-against-math.patch renamed from package/libfcgi/0003-link-against-math.patch +5 -3
similarity index 74%
rename from package/libfcgi/0003-link-against-math.patch
rename to package/libfcgi/0001-link-against-math.patch
index c60c6d50ce..efba67123e 100644
@@ -1,16 +1,18 @@
 Link libfcgi against the math library.
 
 Signed-off-by: Thomas Claveirole <[email protected]>
+[Louis: rebase on top of 2.4.2]
+Signed-off-by: Louis Rannou <[email protected]>
 
 Index: b/libfcgi/Makefile.am
 ===================================================================
 --- a/libfcgi/Makefile.am
 +++ b/libfcgi/Makefile.am
-@@ -18,6 +18,7 @@
+@@ -18,4 +18,5 @@
                       os_ at [email protected]
  libfcgi_la_CC      = @PTHREAD_CC@
  libfcgi_la_CFLAGS  = @PTHREAD_CFLAGS@
 +libfcgi_la_LIBADD  = -lm
- 
+ libfcgi_la_LDFLAGS = @EXTRA_LIBS@ -no-undefined
+
  libfcgi___la_SOURCES = $(INCLUDE_FILES)       \
-                        $(INCLUDEDIR)/fcgio.h  \
package/libfcgi/0002-disable-examples.patch renamed from package/libfcgi/0005-disable-examples.patch +0 -0
similarity index 100%
rename from package/libfcgi/0005-disable-examples.patch
rename to package/libfcgi/0002-disable-examples.patch
package/libfcgi/0002-link-against-libfcgi-la.patch deleted +0 -20
deleted file mode 100644
index 8a5973ac5b..0000000000
@@ -1,20 +0,0 @@
-Properly link libfcgi++ against libfcgi
-
-We cannot directly use -lfcgi to link libfcgi++ against libfcgi,
-because libfcgi is not installed at this time. Instead, we should rely
-on libtool doing the right thing, by specifying libfcgi.la in
-libfcgi++ LIBADD variable.
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-
-Index: b/libfcgi/Makefile.am
-===================================================================
---- a/libfcgi/Makefile.am
-+++ b/libfcgi/Makefile.am
-@@ -23,5 +23,6 @@
-                        $(INCLUDEDIR)/fcgio.h  \
-                        fcgio.cpp
- libfcgi___la_CFLAGS  = @PTHREAD_CFLAGS@
--libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@
-+libfcgi___la_LIBADD  = libfcgi.la
-+libfcgi___la_LDFLAGS = -rpath @libdir@
package/libfcgi/0004-make-autoreconfable.patch deleted +0 -67

67 lines not on this page · raw message

package/libfcgi/0006-fix-CVE-2012-6687.patch deleted +0 -104

104 lines not on this page · raw message

package/libfcgi/libfcgi.hash +1 -1
index 98aa2ecf8f..110461235f 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9	fcgi-2.4.0.tar.gz
+sha256	1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc	libfcgi-2.4.2.tar.gz
 sha256	f0a8fe4513a43e8eebb24cdcf9d2e7efc52e4d8259178c6d76d3d84418397d81	LICENSE.TERMS
package/libfcgi/libfcgi.mk +2 -3
index 78da772916..c158df2395 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-LIBFCGI_VERSION = 2.4.0
-LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz
-LIBFCGI_SITE = http://www.fastcgi.com/dist
+LIBFCGI_VERSION = 2.4.2
+LIBFCGI_SITE = $(call github,FastCGI-Archives,fcgi2,$(LIBFCGI_VERSION))
 LIBFCGI_LICENSE = OML
 LIBFCGI_LICENSE_FILES = LICENSE.TERMS
 LIBFCGI_INSTALL_STAGING = YES
Signature · 1 line
2.24.0
#2 lore raw

PATCH 1/1 package/libfcgi: bump to version 2.4.2

Quoted 11 lines · On Tue, 26 Nov 2019 22:42:01 +0100 Louis Rannou <[email protected]> wrote:

FCGI is abandonned (https://repo.or.cz/fcgi2.git). Replace it by a maintained fork (https://github.com/FastCGI-Archives/fcgi2).

Patchs status:
0001-eof.patch -> fixed by commit 122e55cc354dd4a78849aed8d36c61ed9edeaeb2
0002-link-against-libfcgi-la.patch -> included in commit 2a575066bcbdadfc161d46ef816a45f6edf9d529 0004-make-autoreconfable.patch -> fixed in commits 854643b36e87cf1262da2eb82b3f10b56185131b and ad30485fa12be4415d57422702ee4f64a09b7bea 0006-fix-CVE-2012-6687.patch -> applied in commit 5c15a7bb5260bc83715090c9fd386d704c139671

---

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com