NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/thttpd: security bump to version 2.29

Browse Source 
- Switch site to "real" upstream instead of debian as debian does not
  have latest version
- Drop patch (not needed anymore as getline was renamed in my_getline)
- Add hash for license file
- Fix CVE-2013-0348 and CVE-2017-17663

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 48e6230e5f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2019-03-30 16:46:31 +01:00 committed by Peter Korsgaard
parent 1e91555584
commit b39d75838b
3 changed files with 5 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/thttpd/0001-getline.patch
View File

@ -1,26 +0,0 @@
Fix glibc/eglibc getline() conflicting functions.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c
--- thttpd-2.25b.orig/extras/htpasswd.c 2001-12-18 21:08:08.000000000 -0300
+++ thttpd-2.25b/extras/htpasswd.c 2011-11-25 11:42:47.198582812 -0300
@@ -49,7 +49,7 @@
while((line[y++] = line[x++]));
}
-static int getline(char *s, int n, FILE *f) {
+static int get_line(char *s, int n, FILE *f) {
register int i=0;
while(1) {
@@ -189,7 +189,7 @@
strcpy(user,argv[2]);
found = 0;
- while(!(getline(line,MAX_STRING_LEN,f))) {
+ while(!(get_line(line,MAX_STRING_LEN,f))) {
if(found || (line[0] == '#') || (!line[0])) {
putline(tfp,line);
continue;

6
package/thttpd/thttpd.hash
View File

@ -1,3 +1,3 @@
# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd/thttpd_2.25b-11.dsc # Locally calculated
sha256 07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360 thttpd_2.25b.orig.tar.gz sha256 99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397 thttpd-2.29.tar.gz
sha256 4d213c18daf121d21412cc54864fbca250e1773a91df6573373e1d2273a2cec9 thttpd_2.25b-11.diff.gz sha256 be059e6b8219d5bb5480fa6a2864bbb34892f56951d03d08b356bc1fa8c81a01 thttpd.c

16
package/thttpd/thttpd.mk
View File

@ -4,23 +4,11 @@
# #
################################################################################ ################################################################################
THTTPD_VERSION = 2.25b THTTPD_VERSION = 2.29
THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz THTTPD_SITE = https://acme.com/software/thttpd
THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz
THTTPD_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd
THTTPD_LICENSE = BSD-2-Clause THTTPD_LICENSE = BSD-2-Clause
THTTPD_LICENSE_FILES = thttpd.c THTTPD_LICENSE_FILES = thttpd.c
ifneq ($(THTTPD_PATCH),)
define THTTPD_DEBIAN_PATCHES
if [ -d $(@D)/debian/patches ]; then \
$(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \
fi
endef
endif
THTTPD_POST_PATCH_HOOKS = THTTPD_DEBIAN_PATCHES
THTTPD_MAKE = $(MAKE1) THTTPD_MAKE = $(MAKE1)
define THTTPD_INSTALL_TARGET_CMDS define THTTPD_INSTALL_TARGET_CMDS