package/tinyhttpd: remove package
tinyhttpd is affected by CVE-2002-1819 and is not maintained anymore (no release since 2001) so remove it Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine
Thomas Petazzoni
parent
3ab421080c
commit
fa25e78307
@ -146,6 +146,14 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2020.11"
|
||||
|
||||
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_XSERVER_XORG_SERVER_AIGLX
|
||||
bool "X.org Enable AIGLX Extension"
|
||||
select BR2_LEGACY
|
||||
|
||||
@ -2232,7 +2232,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"
|
||||
|
||||
@ -1,80 +0,0 @@
|
||||
diff -ur tinyhttpd-0.1.0/httpd.c tinyhttpd-0.1.0-patched/httpd.c
|
||||
--- tinyhttpd-0.1.0/httpd.c 2001-04-21 19:13:13.000000000 -0500
|
||||
+++ tinyhttpd-0.1.0-patched/httpd.c 2007-07-02 09:19:27.000000000 -0500
|
||||
@@ -4,14 +4,6 @@
|
||||
* CSE 4344 (Network concepts), Prof. Zeigler
|
||||
* University of Texas at Arlington
|
||||
*/
|
||||
-/* This program compiles for Sparc Solaris 2.6.
|
||||
- * To compile for Linux:
|
||||
- * 1) Comment out the #include <pthread.h> line.
|
||||
- * 2) Comment out the line that defines the variable newthread.
|
||||
- * 3) Comment out the two lines that run pthread_create().
|
||||
- * 4) Uncomment the line that runs accept_request().
|
||||
- * 5) Remove -lsocket from the Makefile.
|
||||
- */
|
||||
#include <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
@@ -22,7 +14,6 @@
|
||||
#include <strings.h>
|
||||
#include <string.h>
|
||||
#include <sys/stat.h>
|
||||
-#include <pthread.h>
|
||||
#include <sys/wait.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -30,7 +21,6 @@
|
||||
|
||||
#define SERVER_STRING "Server: jdbhttpd/0.1.0\r\n"
|
||||
|
||||
-void accept_request(int);
|
||||
void bad_request(int);
|
||||
void cat(int, FILE *);
|
||||
void cannot_execute(int);
|
||||
@@ -102,7 +92,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- sprintf(path, "htdocs%s", url);
|
||||
+ sprintf(path, "/var/www%s", url);
|
||||
if (path[strlen(path) - 1] == '/')
|
||||
strcat(path, "index.html");
|
||||
if (stat(path, &st) == -1) {
|
||||
@@ -475,11 +465,10 @@
|
||||
int main(void)
|
||||
{
|
||||
int server_sock = -1;
|
||||
- u_short port = 0;
|
||||
+ u_short port = 80;
|
||||
int client_sock = -1;
|
||||
struct sockaddr_in client_name;
|
||||
int client_name_len = sizeof(client_name);
|
||||
- pthread_t newthread;
|
||||
|
||||
server_sock = startup(&port);
|
||||
printf("httpd running on port %d\n", port);
|
||||
@@ -491,9 +480,7 @@
|
||||
&client_name_len);
|
||||
if (client_sock == -1)
|
||||
error_die("accept");
|
||||
- /* accept_request(client_sock); */
|
||||
- if (pthread_create(&newthread , NULL, accept_request, client_sock) != 0)
|
||||
- perror("pthread_create");
|
||||
+ accept_request(client_sock);
|
||||
}
|
||||
|
||||
close(server_sock);
|
||||
diff -ur tinyhttpd-0.1.0/Makefile tinyhttpd-0.1.0-patched/Makefile
|
||||
--- tinyhttpd-0.1.0/Makefile 2001-04-21 17:03:39.000000000 -0500
|
||||
+++ tinyhttpd-0.1.0-patched/Makefile 2007-07-02 10:29:41.000000000 -0500
|
||||
@@ -1,7 +1,7 @@
|
||||
all: httpd
|
||||
|
||||
httpd: httpd.c
|
||||
- gcc -W -Wall -lsocket -lpthread -o httpd httpd.c
|
||||
+ $(CC) $(CFLAGS) $(LDFLAGS) -W -Wall -o httpd httpd.c
|
||||
|
||||
clean:
|
||||
- rm httpd
|
||||
+ rm -f httpd
|
||||
@ -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/
|
||||
@ -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
|
||||
@ -1,3 +0,0 @@
|
||||
# Locally computed:
|
||||
sha256 56609b82869c80ba71b2a2af166a0bcaffe21e7412f4594e04b9a5abf733435a tinyhttpd-0.1.0.tar.gz
|
||||
sha256 4289e6d4f7ba72672dbd45ab78a8e02babf3d6e0577eeac5b2ef6926da6f4a87 README
|
||||
@ -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))
|
||||
@ -1,10 +0,0 @@
|
||||
[Unit]
|
||||
Description=Tiny HTTP daemon
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/tinyhttpd
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Loading…
Reference in New Issue
Block a user