* [PATCH 1/2] libedit: A command line editor library
@ 2019-02-09 7:41 Erik Kapfer
2019-02-09 7:41 ` [PATCH 2/2] knot: Reduced version of knot with kdig only Erik Kapfer
2019-02-13 17:33 ` [PATCH 1/2] libedit: A command line editor library Michael Tremer
0 siblings, 2 replies; 3+ messages in thread
From: Erik Kapfer @ 2019-02-09 7:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5999 bytes --]
Dependency for knot (kdig).
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# #
+# 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 <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# 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() {
--
2.12.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] knot: Reduced version of knot with kdig only
2019-02-09 7:41 [PATCH 1/2] libedit: A command line editor library Erik Kapfer
@ 2019-02-09 7:41 ` Erik Kapfer
2019-02-13 17:33 ` [PATCH 1/2] libedit: A command line editor library Michael Tremer
1 sibling, 0 replies; 3+ messages in thread
From: Erik Kapfer @ 2019-02-09 7:41 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 7406 bytes --]
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
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 <info(a)ipfire.org> #
+# #
+# 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 <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# 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() {
--
2.12.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] libedit: A command line editor library
2019-02-09 7:41 [PATCH 1/2] libedit: A command line editor library Erik Kapfer
2019-02-09 7:41 ` [PATCH 2/2] knot: Reduced version of knot with kdig only Erik Kapfer
@ 2019-02-13 17:33 ` Michael Tremer
1 sibling, 0 replies; 3+ messages in thread
From: Michael Tremer @ 2019-02-13 17:33 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 6575 bytes --]
Very good work, Erik!
Perfectly split patch, tidy and neat.
I merged it and it built locally. This will be shipped with Core Update 128.
Best,
-Michael
> On 9 Feb 2019, at 07:41, Erik Kapfer <ummeegge(a)ipfire.org> wrote:
>
> Dependency for knot (kdig).
>
> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> ---
> 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 <info(a)ipfire.org> #
> +# #
> +# 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 <http://www.gnu.org/licenses/>. #
> +# #
> +###############################################################################
> +
> +###############################################################################
> +# 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() {
> --
> 2.12.2
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-13 17:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-09 7:41 [PATCH 1/2] libedit: A command line editor library Erik Kapfer
2019-02-09 7:41 ` [PATCH 2/2] knot: Reduced version of knot with kdig only Erik Kapfer
2019-02-13 17:33 ` [PATCH 1/2] libedit: A command line editor library Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox