From patchwork Wed Feb 12 09:34:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2782 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 "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 48HZHr2l3Xz3xYL for ; Wed, 12 Feb 2020 09:35:20 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 48HZHq2T3Hz11v; Wed, 12 Feb 2020 09:35:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 48HZHq04ylz2ywy; Wed, 12 Feb 2020 09:35:19 +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 "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 48HZHj3brpz2yvn for ; Wed, 12 Feb 2020 09:35:13 +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) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 48HZHj2j7qzQ1; Wed, 12 Feb 2020 09:35:13 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RdQSVmfLqTBJ0a8rrCPRi9afKBz++SSIaYrHuYIPE1o=; b=S0YfZGN8Jb8AgjWbxg34NH0aDOFbWp6O9v7qAih1+a9ORJg6004BuwQz+yNJXLz+GrFXHc bUaAtCes0k5mCDAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1581500113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RdQSVmfLqTBJ0a8rrCPRi9afKBz++SSIaYrHuYIPE1o=; b=gJjdxyPQaf2K1Pl9wuLpg7G5FgTrEX7YHrNVo/mV+IGvENVn9DP/3aoQ3UX1exxbUaOCBz +o33EyS5NEyYtzeDNL7PB5t0pvBsELsmOcQWnidLJp40qW0Bi/4Jsaeg2EYnIi5zz2XIgv lxYUPOJ+8YpQZE/qSrf0WUzCDMtUQJ+rxggZXIavcmvF/o17qUNC4c56o+Wp77YUSweoBM sKOSQLuq2vVHL0ORPIcvLEc4ZcdkqeA2NKMsKLN11CTpSEuT5KEuW6n6rhR9WpSo8J8kdE yqt1+uZjtnOV9F2MWnd/WcQegy3KBbfcEiP8e93F4zHFOSe+riEchuInDUW+TQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 06/14] Drop ez-ipupdate Date: Wed, 12 Feb 2020 09:34:45 +0000 Message-Id: <20200212093453.5732-7-michael.tremer@ipfire.org> In-Reply-To: <20200212093453.5732-1-michael.tremer@ipfire.org> References: <20200212093453.5732-1-michael.tremer@ipfire.org> MIME-Version: 1.0 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: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" We do not use this at all any more, because it has been replaced by ddns. Signed-off-by: Michael Tremer --- config/rootfiles/common/ez-ipupdate | 1 - lfs/ez-ipupdate | 79 ------------------- make.sh | 1 - ...ez-ipupdate-3.0.11b8-zoneedit-server.patch | 13 --- src/patches/ez-ipupdate.formstring.patch | 11 --- 5 files changed, 105 deletions(-) delete mode 100644 config/rootfiles/common/ez-ipupdate delete mode 100644 lfs/ez-ipupdate delete mode 100644 src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch delete mode 100644 src/patches/ez-ipupdate.formstring.patch diff --git a/config/rootfiles/common/ez-ipupdate b/config/rootfiles/common/ez-ipupdate deleted file mode 100644 index 58125d790..000000000 --- a/config/rootfiles/common/ez-ipupdate +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ez-ipupdate diff --git a/lfs/ez-ipupdate b/lfs/ez-ipupdate deleted file mode 100644 index bd2523607..000000000 --- a/lfs/ez-ipupdate +++ /dev/null @@ -1,79 +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 = 3.0.11b8 - -THISAPP = ez-ipupdate-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 000211add4c4845ffa4211841bff4fb0 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# 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 -Np0 < $(DIR_SRC)/src/patches/ez-ipupdate.formstring.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index ca02c40f4..1a2dd3de7 100755 --- a/make.sh +++ b/make.sh @@ -1267,7 +1267,6 @@ buildipfire() { lfsmake2 fuse lfsmake2 ntfs-3g lfsmake2 ethtool - lfsmake2 ez-ipupdate lfsmake2 fcron lfsmake2 perl-GD lfsmake2 GD-Graph diff --git a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch b/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch deleted file mode 100644 index 0fbc07a50..000000000 --- a/src/patches/ez-ipupdate-3.0.11b8-zoneedit-server.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ez-ipupdate.c b/ez-ipupdate.c -index 9aea495..a6d2528 100644 ---- a/ez-ipupdate.c -+++ b/ez-ipupdate.c -@@ -95,7 +95,7 @@ - #define HN_DEFAULT_PORT "80" - #define HN_REQUEST "/vanity/update" - --#define ZONEEDIT_DEFAULT_SERVER "www.zoneedit.com" -+#define ZONEEDIT_DEFAULT_SERVER "dynamic.zoneedit.com" - #define ZONEEDIT_DEFAULT_PORT "80" - #define ZONEEDIT_REQUEST "/auth/dynamic.html" - diff --git a/src/patches/ez-ipupdate.formstring.patch b/src/patches/ez-ipupdate.formstring.patch deleted file mode 100644 index 83187d197..000000000 --- a/src/patches/ez-ipupdate.formstring.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ez-ipupdate.c.old 2002-03-12 00:31:47.000000000 +0100 -+++ ez-ipupdate.c 2004-11-10 15:28:23.000000000 +0100 -@@ -798,7 +798,7 @@ void show_message(char *fmt, ...) - sprintf(buf, "message incomplete because your OS sucks: %s\n", fmt); - #endif - -- syslog(LOG_NOTICE, buf); -+ syslog(LOG_NOTICE, "%s", buf); - } - else - {