[1/2] libedit: A command line editor library

Message ID 20190209074115.28071-1-ummeegge@ipfire.org
State Accepted
Commit 17b3255b7f16a0b62a00d8c244b131047091f7ad
Headers
Series [1/2] libedit: A command line editor library |

Commit Message

ummeegge Feb. 9, 2019, 6:41 p.m. UTC
  Dependency for knot (kdig).

Signed-off-by: Erik Kapfer <ummeegge@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
  

Comments

Michael Tremer Feb. 14, 2019, 4:33 a.m. UTC | #1
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@ipfire.org> wrote:
> 
> Dependency for knot (kdig).
> 
> Signed-off-by: Erik Kapfer <ummeegge@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@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
>
  

Patch

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@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() {