Skip to contentSkip to conversation

package/tinyhttpd: remove package

PATCH New Fabrice Fontaine 2 participants 2 messages May 17, 2020 – Sep 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/tinyhttpd: remove package

tinyhttpd is affected by CVE-2002-1819 and is not maintained anymore (no release since 2001) so remove it

---
 Config.in.legacy                        |  8 +++
 package/Config.in                       |  1 -
 package/tinyhttpd/0001-misc-fixes.patch | 80 -------------------------
 package/tinyhttpd/Config.in             |  9 ---
 package/tinyhttpd/S85tinyhttpd          | 32 ----------
 package/tinyhttpd/tinyhttpd.hash        |  3 -
 package/tinyhttpd/tinyhttpd.mk          | 32 ----------
 package/tinyhttpd/tinyhttpd.service     | 10 ----
 8 files changed, 8 insertions(+), 167 deletions(-)
 delete mode 100644 package/tinyhttpd/0001-misc-fixes.patch
 delete mode 100644 package/tinyhttpd/Config.in
 delete mode 100644 package/tinyhttpd/S85tinyhttpd
 delete mode 100644 package/tinyhttpd/tinyhttpd.hash
 delete mode 100644 package/tinyhttpd/tinyhttpd.mk
 delete mode 100644 package/tinyhttpd/tinyhttpd.service
Config.in.legacy +8 -0
index 5605ba1fad..898b92a0eb 100644
@@ -146,6 +146,14 @@ endif
 
 comment "Legacy options removed in 2020.05"
 
+config BR2_PACKAGE_TINYHTTPD
+	bool "tinyhttpd package removed"
+	select BR2_LEGACY
+	help
+	  The tinyhttpd package was removed as it is affected by
+	  CVE-2002-1819 and is not maintained anymore (no release since
+	  2001).
+
 config BR2_PACKAGE_EZXML
 	bool "ezxml package removed"
 	select BR2_LEGACY
package/Config.in +0 -1
index b8cdd3f7c3..1b9ecd3fcc 100644
@@ -2204,7 +2204,6 @@ endif
 	source "package/tftpd/Config.in"
 	source "package/thttpd/Config.in"
 	source "package/tinc/Config.in"
-	source "package/tinyhttpd/Config.in"
 	source "package/tinyproxy/Config.in"
 	source "package/tinyssh/Config.in"
 	source "package/tor/Config.in"
package/tinyhttpd/0001-misc-fixes.patch deleted +0 -80

80 lines not on this page · raw message

package/tinyhttpd/Config.in deleted +0 -9
deleted file mode 100644
index f648bcd369..0000000000
@@ -1,9 +0,0 @@
-config BR2_PACKAGE_TINYHTTPD
-	bool "tinyhttpd"
-	depends on BR2_USE_MMU # fork()
-	help
-	  A relatively simple webserver written as a school
-	  project. It is exceedingly simple, threaded and handles
-	  basic CGI scripts.
-
-	  http://sourceforge.net/projects/tinyhttpd/
package/tinyhttpd/S85tinyhttpd deleted +0 -32
deleted file mode 100644
index f3f1de69bf..0000000000
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-NAME=tinyhttpd
-
-mkdir -p /var/www
-
-case "$1" in
-  start)
-	printf "Starting $NAME: "
-	$NAME > /dev/null &
-	echo "done"
-	;;
-  stop)
-	printf "Stopping $NAME: "
-	killall -9 $NAME
-	echo "done"
-	;;
-  restart)
-	printf "Restarting $NAME: "
-	killall -9 $NAME
-	sleep 1
-	$NAME > /dev/null &
-	echo "done"
-	;;
-  *)
-	echo "Usage: /etc/init.d/S85tinyhttpd {start|stop|restart}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
package/tinyhttpd/tinyhttpd.hash deleted +0 -3
deleted file mode 100644
index fc8ff4ee2c..0000000000
@@ -1,3 +0,0 @@
-# Locally computed:
-sha256  56609b82869c80ba71b2a2af166a0bcaffe21e7412f4594e04b9a5abf733435a  tinyhttpd-0.1.0.tar.gz
-sha256  4289e6d4f7ba72672dbd45ab78a8e02babf3d6e0577eeac5b2ef6926da6f4a87  README
package/tinyhttpd/tinyhttpd.mk deleted +0 -32
deleted file mode 100644
index 6b3ba5f305..0000000000
@@ -1,32 +0,0 @@
-################################################################################
-#
-# tinyhttpd
-#
-################################################################################
-
-TINYHTTPD_VERSION = 0.1.0
-TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION)
-TINYHTTPD_LICENSE = GPL
-TINYHTTPD_LICENSE_FILES = README
-
-define TINYHTTPD_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)"
-endef
-
-define TINYHTTPD_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd
-	mkdir -p $(TARGET_DIR)/var/www
-endef
-
-define TINYHTTPD_INSTALL_INIT_SYSV
-	$(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \
-		$(TARGET_DIR)/etc/init.d/S85tinyhttpd
-endef
-
-define TINYHTTPD_INSTALL_INIT_SYSTEMD
-	$(INSTALL) -D -m 644 package/tinyhttpd/tinyhttpd.service \
-		$(TARGET_DIR)/usr/lib/systemd/system/tinyhttpd.service
-endef
-
-$(eval $(generic-package))
package/tinyhttpd/tinyhttpd.service deleted +0 -10
deleted file mode 100644
index 0ae5bac943..0000000000
@@ -1,10 +0,0 @@
-[Unit]
-Description=Tiny HTTP daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/tinyhttpd
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/tinyhttpd: remove package

Quoted 4 lines · On Sun, 17 May 2020 10:38:32 +0200 Fabrice Fontaine…

tinyhttpd is affected by CVE-2002-1819 and is not maintained anymore (no release since 2001) so remove it

Quoted 16 lines
---
 Config.in.legacy                        |  8 +++
 package/Config.in                       |  1 -
 package/tinyhttpd/0001-misc-fixes.patch | 80 -------------------------
 package/tinyhttpd/Config.in             |  9 ---
 package/tinyhttpd/S85tinyhttpd          | 32 ----------
 package/tinyhttpd/tinyhttpd.hash        |  3 -
 package/tinyhttpd/tinyhttpd.mk          | 32 ----------
 package/tinyhttpd/tinyhttpd.service     | 10 ----
 8 files changed, 8 insertions(+), 167 deletions(-)
 delete mode 100644 package/tinyhttpd/0001-misc-fixes.patch
 delete mode 100644 package/tinyhttpd/Config.in
 delete mode 100644 package/tinyhttpd/S85tinyhttpd
 delete mode 100644 package/tinyhttpd/tinyhttpd.hash
 delete mode 100644 package/tinyhttpd/tinyhttpd.mk
 delete mode 100644 package/tinyhttpd/tinyhttpd.service

Applied to master, thanks.

Thomas

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