From patchwork Sat Feb 9 18:41:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2077 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 6E24088B606 for ; Sat, 9 Feb 2019 07:41:29 +0000 (GMT) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 43xPBJ2PtXz5HDM8; Sat, 9 Feb 2019 07:41:28 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1549698088; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references:list-id: list-unsubscribe:list-subscribe:list-post; bh=w4kbvWfraDK7B1m3jIjA3bYtFyxDlaZIfSdZy0vR52g=; b=B226EZqSLQEis/L+505npsCBUt/2vQpv4FCkt2IMS7rnOfkymUVCnpCTCp1TFeWae5Zthe 5kl6Hxqz5Gg+rN6J13Wf7EjHk2Ogn5MTY9MEghiBj515eqaijO5StJb0BM7i55SwA0oN0J zE+/h2HEoo2reB4kepzA8sx7ozZLiLWY57fcv/ThDEY4rHqnc8vWt+YeSY4EilbWDYnb3f 92HQqYQL5tqwlpg7XFlN/pIKIgtQ2sqjO8bSB5lzTwQP508jOB/1QJVFuTfa2lXuirUNo0 8rhIEoust9Pq+lelkbotXeGo0cGmtiXzBTLNEJlKdD+hQBI/g145VFPKdg/OGQ== Received: from ipfire-server.local (i59F52EF9.versanet.de [89.245.46.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 43xPBF6Vc6z5HDLs; Sat, 9 Feb 2019 07:41:25 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1549698086; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=w4kbvWfraDK7B1m3jIjA3bYtFyxDlaZIfSdZy0vR52g=; b=ftl1BPAmpMu2xK8i1z50/aYEYivqd8/NAhfCR8kKg8ENsSpjoUM6fYf95ZtO2NQCpFGsEk jFaUJBvGxT6A43NY5AELxFFf+Mw5XIakHsBgp6AMdAD9JPKCdGyYIfAfJ03ezJlbGqSNDq G9YVlmoSB83MdK5UzdOWKkB56oQQSD+bGtvaXE80j5p5uncRjz5JEyIV1zQBNnjfcHfCrH 4r1E0384j3nfZcxaFP654Aq1dPIVEY//C7crfzZKJHPR/zxRYVJnppgjIKDqqj/Y21CwyJ Ox+QVEwSE2JgkqvaiaIrJ+QWICTrMtIxlnxGqm26dz+I9ThwK/ZkJ7CoohwN8A== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH 1/2] libedit: A command line editor library Date: Sat, 9 Feb 2019 08:41:14 +0100 Message-Id: <20190209074115.28071-1-ummeegge@ipfire.org> X-Mailer: git-send-email 2.12.2 Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=ummeegge@ipfire.org X-Spamd-Result: default: False [-5.01 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-2.91)[-0.970,0]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8881, ipnet:89.245.32.0/20, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-5.01 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 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" Dependency for knot (kdig). Signed-off-by: Erik Kapfer --- config/rootfiles/common/libedit | 50 ++++++++++++++++++++++++ lfs/libedit | 85 +++++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 136 insertions(+) create mode 100644 config/rootfiles/common/libedit create mode 100644 lfs/libedit diff --git a/config/rootfiles/common/libedit b/config/rootfiles/common/libedit new file mode 100644 index 000000000..65b3b86a9 --- /dev/null +++ b/config/rootfiles/common/libedit @@ -0,0 +1,50 @@ +#usr/include/editline +#usr/include/editline/readline.h +#usr/include/histedit.h +#usr/lib/libedit.la +#usr/lib/libedit.so +usr/lib/libedit.so.0 +usr/lib/libedit.so.0.0.59 +#usr/lib/pkgconfig/libedit.pc +#usr/share/man/man3/editline.3 +#usr/share/man/man3/el_deletestr.3 +#usr/share/man/man3/el_end.3 +#usr/share/man/man3/el_get.3 +#usr/share/man/man3/el_getc.3 +#usr/share/man/man3/el_gets.3 +#usr/share/man/man3/el_init.3 +#usr/share/man/man3/el_init_fd.3 +#usr/share/man/man3/el_insertstr.3 +#usr/share/man/man3/el_line.3 +#usr/share/man/man3/el_parse.3 +#usr/share/man/man3/el_push.3 +#usr/share/man/man3/el_reset.3 +#usr/share/man/man3/el_resize.3 +#usr/share/man/man3/el_set.3 +#usr/share/man/man3/el_source.3 +#usr/share/man/man3/el_wdeletestr.3 +#usr/share/man/man3/el_wget.3 +#usr/share/man/man3/el_wgetc.3 +#usr/share/man/man3/el_wgets.3 +#usr/share/man/man3/el_winsertstr.3 +#usr/share/man/man3/el_wline.3 +#usr/share/man/man3/el_wparse.3 +#usr/share/man/man3/el_wpush.3 +#usr/share/man/man3/el_wset.3 +#usr/share/man/man3/history_end.3 +#usr/share/man/man3/history_init.3 +#usr/share/man/man3/history_w.3 +#usr/share/man/man3/history_wend.3 +#usr/share/man/man3/history_winit.3 +#usr/share/man/man3/tok_end.3 +#usr/share/man/man3/tok_init.3 +#usr/share/man/man3/tok_line.3 +#usr/share/man/man3/tok_reset.3 +#usr/share/man/man3/tok_str.3 +#usr/share/man/man3/tok_wend.3 +#usr/share/man/man3/tok_winit.3 +#usr/share/man/man3/tok_wline.3 +#usr/share/man/man3/tok_wreset.3 +#usr/share/man/man3/tok_wstr.3 +#usr/share/man/man5/editrc.5 +#usr/share/man/man7/editline.7 diff --git a/lfs/libedit b/lfs/libedit new file mode 100644 index 000000000..f3a831b14 --- /dev/null +++ b/lfs/libedit @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 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 = 20181209-3.1 + +THISAPP = libedit-$(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 = 22e945a0476e388e6f78bfc8d6e1192c + +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) && ./configure \ + --prefix=/usr \ + --enable-static=no + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index f96b74b10..05164be79 100755 --- a/make.sh +++ b/make.sh @@ -1588,6 +1588,7 @@ buildipfire() { lfsmake2 dehydrated lfsmake2 shairport-sync lfsmake2 borgbackup + lfsmake2 libedit } buildinstaller() { From patchwork Sat Feb 9 18:41:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2078 Return-Path: Received: from mail01.ipfire.org (unknown [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id ABDDE88B606 for ; Sat, 9 Feb 2019 07:41:33 +0000 (GMT) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 43xPBP00Hwz5C6vH; Sat, 9 Feb 2019 07:41:32 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1549698093; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:list-id:list-unsubscribe:list-subscribe:list-post; bh=AthvhkP4JpvEGO/G/DGpZQH1WGQjymewaMksscPDuWM=; b=mPqLle05ngMZjvDpPfTm0lm73jg9SP6898RNexRkco7Wnu+NMFSbYGXP8FOLM8xS/iYSxV UOLZStSUdA+IXtJF7LRJUdNTKaFfwmFYVOgDdVSLPqrQsNw4kEWrm4kgL+iH/bKdxHtUEl 0V5AC4ElWCrLsory5x36f1BweypluNCuF+lQPNWQq916PyLidfdmAH7ta2iyBRScG1txYH RzTtirjwOmJ6ibbIu7XUr2hhn5rZuDwiaQcJ4eAooZoAMZaDUVXJFFGwf4Vr3UWn5lP4Vf BuO7z9Bdef9/yWwt3dG8UYQJSHBppjySlYc2w6qzJHm2FjrILsGVe6LfH3UudQ== Received: from ipfire-server.local (i59F52EF9.versanet.de [89.245.46.249]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 43xPBJ6s5Gz5HDMD; Sat, 9 Feb 2019 07:41:28 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1549698089; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=AthvhkP4JpvEGO/G/DGpZQH1WGQjymewaMksscPDuWM=; b=gnAUprH3JcdBQ+x84EujKs58pk2/MAgNn2c7is2dePHHplXuXW0xLnzj7exPZE4xnjOcsZ rR5qTTUzrL0HzzWsgZj0ZBjEe7lVjkaFbTcSEzzUVsAH4oIKF47xg5qwyp8ZqIshMlrHUl zausuUukD/gaMEXh7vgAd8Kdpqtw1aG7msug0HgJCVY179hUWzazazJVp2rgpAmvdNv5ca fEhm33jC5Zdxd3PIgClYT7Dy46ipcU6dpvEdLOkYNw8c/JdEAykBVtFlAcecArdAJTWACN KDHICSGG35j00CNJK+AE8Bw/uetw3H6xMUDWXbJ3L/Kg2Gq99gXBWDRMEt7Kuw== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH 2/2] knot: Reduced version of knot with kdig only Date: Sat, 9 Feb 2019 08:41:15 +0100 Message-Id: <20190209074115.28071-2-ummeegge@ipfire.org> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20190209074115.28071-1-ummeegge@ipfire.org> References: <20190209074115.28071-1-ummeegge@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=ummeegge@ipfire.org X-Spamd-Result: default: False [-9.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLY(-4.00)[]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM(-3.00)[-1.000,0]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8881, ipnet:89.245.32.0/20, country:DE]; RCVD_TLS_ALL(0.00)[]; BAYES_HAM(-3.00)[100.00%] X-Spam-Status: No, score=-9.10 X-Rspamd-Server: mail01.i.ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 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" Signed-off-by: Erik Kapfer --- config/rootfiles/common/knot | 93 ++++++++++++++++++++++++++++++++++++++++++++ lfs/knot | 89 ++++++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 183 insertions(+) create mode 100644 config/rootfiles/common/knot create mode 100644 lfs/knot diff --git a/config/rootfiles/common/knot b/config/rootfiles/common/knot new file mode 100644 index 000000000..68d1e702e --- /dev/null +++ b/config/rootfiles/common/knot @@ -0,0 +1,93 @@ +usr/bin/kdig +#usr/bin/khost +#usr/bin/knsec3hash +#usr/bin/knsupdate +#usr/include/knot +#usr/include/knot/module.h +#usr/include/libdnssec +#usr/include/libdnssec/binary.h +#usr/include/libdnssec/crypto.h +#usr/include/libdnssec/dnssec.h +#usr/include/libdnssec/error.h +#usr/include/libdnssec/key.h +#usr/include/libdnssec/keyid.h +#usr/include/libdnssec/keystore.h +#usr/include/libdnssec/keytag.h +#usr/include/libdnssec/list.h +#usr/include/libdnssec/nsec.h +#usr/include/libdnssec/random.h +#usr/include/libdnssec/sign.h +#usr/include/libdnssec/tsig.h +#usr/include/libdnssec/version.h +#usr/include/libknot +#usr/include/libknot/attribute.h +#usr/include/libknot/codes.h +#usr/include/libknot/consts.h +#usr/include/libknot/control +#usr/include/libknot/control/control.h +#usr/include/libknot/cookies.h +#usr/include/libknot/db +#usr/include/libknot/db/db.h +#usr/include/libknot/db/db_lmdb.h +#usr/include/libknot/db/db_trie.h +#usr/include/libknot/descriptor.h +#usr/include/libknot/dname.h +#usr/include/libknot/endian.h +#usr/include/libknot/errcode.h +#usr/include/libknot/error.h +#usr/include/libknot/libknot.h +#usr/include/libknot/lookup.h +#usr/include/libknot/mm_ctx.h +#usr/include/libknot/packet +#usr/include/libknot/packet/compr.h +#usr/include/libknot/packet/pkt.h +#usr/include/libknot/packet/rrset-wire.h +#usr/include/libknot/packet/wire.h +#usr/include/libknot/rdata.h +#usr/include/libknot/rdataset.h +#usr/include/libknot/rrset-dump.h +#usr/include/libknot/rrset.h +#usr/include/libknot/rrtype +#usr/include/libknot/rrtype/dnskey.h +#usr/include/libknot/rrtype/ds.h +#usr/include/libknot/rrtype/naptr.h +#usr/include/libknot/rrtype/nsec.h +#usr/include/libknot/rrtype/nsec3.h +#usr/include/libknot/rrtype/nsec3param.h +#usr/include/libknot/rrtype/opt.h +#usr/include/libknot/rrtype/rdname.h +#usr/include/libknot/rrtype/rrsig.h +#usr/include/libknot/rrtype/soa.h +#usr/include/libknot/rrtype/tsig.h +#usr/include/libknot/tsig-op.h +#usr/include/libknot/tsig.h +#usr/include/libknot/version.h +#usr/include/libknot/wire.h +#usr/include/libknot/yparser +#usr/include/libknot/yparser/yparser.h +#usr/include/libknot/yparser/ypformat.h +#usr/include/libknot/yparser/ypschema.h +#usr/include/libknot/yparser/yptrafo.h +#usr/include/libzscanner +#usr/include/libzscanner/error.h +#usr/include/libzscanner/scanner.h +#usr/include/libzscanner/version.h +#usr/lib/libdnssec.la +#usr/lib/libdnssec.so +usr/lib/libdnssec.so.6 +usr/lib/libdnssec.so.6.0.0 +#usr/lib/libknot.la +#usr/lib/libknot.so +usr/lib/libknot.so.8 +usr/lib/libknot.so.8.0.0 +#usr/lib/libzscanner.la +#usr/lib/libzscanner.so +usr/lib/libzscanner.so.2 +usr/lib/libzscanner.so.2.0.0 +#usr/lib/pkgconfig/libdnssec.pc +#usr/lib/pkgconfig/libknot.pc +#usr/lib/pkgconfig/libzscanner.pc +#usr/share/man/man1/kdig.1 +#usr/share/man/man1/khost.1 +#usr/share/man/man1/knsec3hash.1 +#usr/share/man/man1/knsupdate.1 diff --git a/lfs/knot b/lfs/knot new file mode 100644 index 000000000..729db9147 --- /dev/null +++ b/lfs/knot @@ -0,0 +1,89 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2019 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 = 2.7.6 + +THISAPP = knot-$(VER) +DL_FILE = $(THISAPP).tar.xz +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 = 6afbbaff4e9d93de8d6311958d86b323 + +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 Jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-static=no \ + --disable-daemon \ + --disable-modules \ + --enable-maxminddb=no \ + --disable-documentation + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) + diff --git a/make.sh b/make.sh index 05164be79..3c08997fb 100755 --- a/make.sh +++ b/make.sh @@ -1589,6 +1589,7 @@ buildipfire() { lfsmake2 shairport-sync lfsmake2 borgbackup lfsmake2 libedit + lfsmake2 knot } buildinstaller() {