From patchwork Wed Jun 2 18:36:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4387 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FwHmn5bCFz3wgv for ; Wed, 2 Jun 2021 18:36:41 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FwHmm18D9z12R; Wed, 2 Jun 2021 18:36:40 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FwHml6W2gz2yVC; Wed, 2 Jun 2021 18:36:39 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FwHmk167cz2xKp for ; Wed, 2 Jun 2021 18:36:38 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FwHmh5q0Kz99 for ; Wed, 2 Jun 2021 18:36:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1622658997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UrWuIjATJcA9nnmliUQSxGDJeGnRbEKUJPNeXP5aJU=; b=Pa8T7zxhIBcA+1c2BLvYATKavaZfAiD1TJhlfBm/59myzZCO8R1VDiafx2X3VdBm7tNFJz atAAZJpv8F3/o48GpNcpeN05A6EypBmA2bcqG0/dxXifXBl5luH6d7KezqKAq1n5tVR27O 9dBatv9MPgIH+f3SazsrA120b4mss7vRzDv8vMaOV1MTUd51aGHCoscS6FYwws8cs6fL3o M74Dd/NU8CS3TZnndA1wZWR3Bt2V5ZFC6K6ekU2T8D6e0dcUiU37oJadq2WByGwWr1Bt5M wM69uucfFUQaq42ySDpKnEvfMjEX+78TtlqP++sysiMV6CZ/nljtImqlrMdZ/Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1622658997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UrWuIjATJcA9nnmliUQSxGDJeGnRbEKUJPNeXP5aJU=; b=qKpzNk8okmWovb1iehXMf/1TdhHQgdJOJsw39ReWFLItBSMIE2x8QW0Q8f5jHFN6PkkQe+ 2bbXPZ9nIaIDtjAQ== To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH 1/2] Drop unmaintained add-on lcd4linux Message-ID: <170fca42-1f7f-4991-54cf-3bff342727a3@ipfire.org> Date: Wed, 2 Jun 2021 20:36:31 +0200 MIME-Version: 1.0 Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package has not received any updates or attention within the last three years. It's sole known upstream URL (https://ssl.bulix.org/projects/lcd4linux/) returns a HTTP error 404 nowadays, and the author was unable to locate any upstream source that appears to be still maintained today. Given the status quo, bugs in lcd4linux cannot be reported properly, security issues won't be addressed (by anybody else then ourselves), and technical questions cannot be clarified aside a reverse engineering approach. We should not allow such an add-on to be installed on a firewall system. Signed-off-by: Peter Müller Reviewed-by: Adolf Belka --- config/backup/includes/lcd4linux | 1 - config/rootfiles/packages/lcd4linux | 3 - lfs/lcd4linux | 92 ----------------------------- make.sh | 1 - src/initscripts/packages/lcd4linux | 46 --------------- 5 files changed, 143 deletions(-) delete mode 100644 config/backup/includes/lcd4linux delete mode 100644 config/rootfiles/packages/lcd4linux delete mode 100644 lfs/lcd4linux delete mode 100644 src/initscripts/packages/lcd4linux diff --git a/config/backup/includes/lcd4linux b/config/backup/includes/lcd4linux deleted file mode 100644 index 40fa69c51..000000000 --- a/config/backup/includes/lcd4linux +++ /dev/null @@ -1 +0,0 @@ -/etc/lcd4linux.conf diff --git a/config/rootfiles/packages/lcd4linux b/config/rootfiles/packages/lcd4linux deleted file mode 100644 index 226daf418..000000000 --- a/config/rootfiles/packages/lcd4linux +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/lcd4linux -var/ipfire/backup/addons/includes/lcd4linux -etc/rc.d/init.d/lcd4linux diff --git a/lfs/lcd4linux b/lfs/lcd4linux deleted file mode 100644 index 9121e6fa0..000000000 --- a/lfs/lcd4linux +++ /dev/null @@ -1,92 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.11.0-svn1200-dpf - -THISAPP = lcd4linux-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/lcd4linux -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = lcd4linux -PAK_VER = 7 - -DEPS = dpfhack libmpdclient - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 5b76a26879849dbd52a5bcfda4107ea4 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - $(UPDATE_AUTOMAKE) - cd $(DIR_APP) && autoreconf -v -i - cd $(DIR_APP) && autoupdate -v configure.in - cd $(DIR_APP) && ./configure --with-plugins=all,!qnaplog,!dbus --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - - #install initscripts - $(call INSTALL_INITSCRIPT,lcd4linux) - - install -v -m 644 $(DIR_SRC)/config/backup/includes/lcd4linux /var/ipfire/backup/addons/includes/lcd4linux - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index b5dbfae5d..9f9fd7b0e 100755 --- a/make.sh +++ b/make.sh @@ -1547,7 +1547,6 @@ buildipfire() { lfsmake2 aws-cli lfsmake2 transmission lfsmake2 dpfhack - lfsmake2 lcd4linux lfsmake2 mtr lfsmake2 minidlna lfsmake2 acpid diff --git a/src/initscripts/packages/lcd4linux b/src/initscripts/packages/lcd4linux deleted file mode 100644 index 34f8c8b46..000000000 --- a/src/initscripts/packages/lcd4linux +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/lcd4linux - - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting lcd4linux..." - if [ ! -f /etc/lcd4linux.conf ]; then - boot_mesg "No configuration file found, not starting." - exit 1 - fi - - loadproc /usr/bin/lcd4linux - ;; - - stop) - boot_mesg "Stopping lcd4linux..." - killproc /usr/bin/lcd4linux - ;; - - reload) - boot_mesg "Reloading lcd4linux..." - reloadproc /usr/bin/lcd4linux - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - statusproc /usr/bin/lcd4linux - ;; - - *) - echo "Usage: $0 {start|stop|reload|restart|status}" - exit 1 - ;; -esac - - -# End $rc_base/init.d/lcd4linux From patchwork Wed Jun 2 18:37:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 4388 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4FwHnF4S8Gz3wgv for ; Wed, 2 Jun 2021 18:37:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4FwHnF27Z3z12R; Wed, 2 Jun 2021 18:37:05 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4FwHnF10TLz2xff; Wed, 2 Jun 2021 18:37:05 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4FwHnD2Kpcz2xJj for ; Wed, 2 Jun 2021 18:37:04 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4FwHnC2GGCz99 for ; Wed, 2 Jun 2021 18:37:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1622659024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3v29XvnBb6WnmRYxKEt1Xhpki2Jrw9MhBlcOKBKs3w0=; b=DsyeA+LoFUn2une//8KFBPBljblywxgck7m/KLBd7wC3vdHXO4I4RosajLSPPN4UrPpxQO l7TEWkjxsiHD9oCA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1622659024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3v29XvnBb6WnmRYxKEt1Xhpki2Jrw9MhBlcOKBKs3w0=; b=C56DBdDo7Tv4zRAMUoco2TyLLfINTqqEP892Z7d1sEi2y1JGdh7UDJLnSuYePrg8sStvPc X91H8PoeoEotCXAJXkCqyiEWN9bRQG9xI9MuPuaT9skiDiqNW4JHj5e0qCFaHV8bNtDYHB qE9gXIXbJzqOLt9kTmOWnfPxyx949tkkDxfLBTDC1xr5qZaoXWaqtmS1yT2vmLoCM/L0Mw xr8NWKA0gZNfDkxaULSUln9g29hhD8JwSQIpqi3vnjAGY6Tyx/23rPEoiUFVCzQL4yJscF cDQikgSi4G5lwUAOUSIYyeO7gEUGxuLkvhNS/j+lj2olTxpJUttZgOJHs36VcA== Subject: [PATCH 2/2] Drop unmaintained add-on dpfhack To: development@lists.ipfire.org References: <170fca42-1f7f-4991-54cf-3bff342727a3@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= Message-ID: Date: Wed, 2 Jun 2021 20:37:02 +0200 MIME-Version: 1.0 In-Reply-To: <170fca42-1f7f-4991-54cf-3bff342727a3@ipfire.org> Content-Language: en-US X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This package seems to be unmaintained for at least five years. It's (former?) upstream traces back to https://section5.ch/index.php/2011/01/13/dpf-hacking/, but download links to both dpfhack and a patched version of lcd4linux point to http://localhost/. http://tech.section5.ch/files/dpfhack-0.1alpha.tgz still serves something apparently related to dpfhack, but it is unclear whether that is a previous version than the "0.12devel" we know about, or a successor. https://tech.section5.ch/files/dpfhack-0.1alpha.tgz, just to have it noticed, comes with a X.509 certificate not issued for this FQDN. dpfhack is solely needed as a dependancy for lcd4linux, which appears to be unmaintained as well, hence being dropped in a dedicated patch. Given the status quo, bugs in dpfhack cannot be reported properly, security issues won't be addressed (by anybody else then ourselves), and technical questions cannot be clarified aside a reverse engineering approach. We should not allow such an add-on to be installed on a firewall system. Signed-off-by: Peter Müller Reviewed-by: Adolf Belka --- config/rootfiles/packages/dpfhack | 3 -- lfs/dpfhack | 84 ------------------------------- make.sh | 1 - src/patches/dpfhack.patch | 12 ----- 4 files changed, 100 deletions(-) delete mode 100644 config/rootfiles/packages/dpfhack delete mode 100644 lfs/dpfhack delete mode 100644 src/patches/dpfhack.patch diff --git a/config/rootfiles/packages/dpfhack b/config/rootfiles/packages/dpfhack deleted file mode 100644 index b79791c90..000000000 --- a/config/rootfiles/packages/dpfhack +++ /dev/null @@ -1,3 +0,0 @@ -#usr/include/dpf.h -#usr/include/usbuser.h -usr/lib/libdpf.so diff --git a/lfs/dpfhack b/lfs/dpfhack deleted file mode 100644 index 4d1c158c6..000000000 --- a/lfs/dpfhack +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.12devel -APP = dpf -THISAPP = dpfhack-$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(APP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = dpfhack -PAK_VER = 1 - -DEPS = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 00473bb01d8da7c5967ecb19ca251ac2 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - $(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(PROG).patch - cd $(DIR_APP) && make - cd $(DIR_APP) && cp Debug/libdpf.so /usr/lib && cp dpflib/dpf.h include/usbuser.h /usr/include - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 9f9fd7b0e..fc03ebcd5 100755 --- a/make.sh +++ b/make.sh @@ -1546,7 +1546,6 @@ buildipfire() { lfsmake2 python3-msgpack lfsmake2 aws-cli lfsmake2 transmission - lfsmake2 dpfhack lfsmake2 mtr lfsmake2 minidlna lfsmake2 acpid diff --git a/src/patches/dpfhack.patch b/src/patches/dpfhack.patch deleted file mode 100644 index 2a473175a..000000000 --- a/src/patches/dpfhack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur dpf_alt/python/Makefile dpf/python/Makefile ---- dpf_alt/python/Makefile 2011-04-18 17:14:12.000000000 +0200 -+++ dpf/python/Makefile 2011-08-14 13:22:46.129748815 +0200 -@@ -32,7 +32,7 @@ - endif - - ifeq (Linux, $(PLATFORM)) -- PYTHON=$(shell pyversions -d) -+ PYTHON=python2.7 - include $(DEVLIB)/unixdll.mk - DLLDEPS = $(CLIENTLIB) -l$(PYTHON) - PYTHONINCLUDES = -I/usr/include/$(PYTHON)