- Created lfs and rootfile - Added entry into make.sh

Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- config/rootfiles/common/libpipeline | 74 ++++++++++++++++++++++++++ lfs/libpipeline | 80 +++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 155 insertions(+) create mode 100644 config/rootfiles/common/libpipeline create mode 100644 lfs/libpipeline

diff --git a/config/rootfiles/common/libpipeline b/config/rootfiles/common/libpipeline new file mode 100644 index 000000000..703d33e65 --- /dev/null +++ b/config/rootfiles/common/libpipeline @@ -0,0 +1,74 @@ +#usr/include/pipeline.h +#usr/lib/libpipeline.la +#usr/lib/libpipeline.so +#usr/lib/libpipeline.so.1 +#usr/lib/libpipeline.so.1.5.6 +#usr/lib/pkgconfig/libpipeline.pc +#usr/share/man/man3/libpipeline.3 +#usr/share/man/man3/pipecmd_arg.3 +#usr/share/man/man3/pipecmd_argf.3 +#usr/share/man/man3/pipecmd_args.3 +#usr/share/man/man3/pipecmd_argstr.3 +#usr/share/man/man3/pipecmd_argv.3 +#usr/share/man/man3/pipecmd_chdir.3 +#usr/share/man/man3/pipecmd_clearenv.3 +#usr/share/man/man3/pipecmd_discard_err.3 +#usr/share/man/man3/pipecmd_dump.3 +#usr/share/man/man3/pipecmd_dup.3 +#usr/share/man/man3/pipecmd_exec.3 +#usr/share/man/man3/pipecmd_fchdir.3 +#usr/share/man/man3/pipecmd_free.3 +#usr/share/man/man3/pipecmd_get_nargs.3 +#usr/share/man/man3/pipecmd_new.3 +#usr/share/man/man3/pipecmd_new_args.3 +#usr/share/man/man3/pipecmd_new_argstr.3 +#usr/share/man/man3/pipecmd_new_argv.3 +#usr/share/man/man3/pipecmd_new_function.3 +#usr/share/man/man3/pipecmd_new_passthrough.3 +#usr/share/man/man3/pipecmd_new_sequence.3 +#usr/share/man/man3/pipecmd_new_sequencev.3 +#usr/share/man/man3/pipecmd_nice.3 +#usr/share/man/man3/pipecmd_pre_exec.3 +#usr/share/man/man3/pipecmd_sequence_command.3 +#usr/share/man/man3/pipecmd_setenv.3 +#usr/share/man/man3/pipecmd_tostring.3 +#usr/share/man/man3/pipecmd_unsetenv.3 +#usr/share/man/man3/pipeline_command.3 +#usr/share/man/man3/pipeline_command_args.3 +#usr/share/man/man3/pipeline_command_argstr.3 +#usr/share/man/man3/pipeline_command_argv.3 +#usr/share/man/man3/pipeline_commands.3 +#usr/share/man/man3/pipeline_commandv.3 +#usr/share/man/man3/pipeline_connect.3 +#usr/share/man/man3/pipeline_dump.3 +#usr/share/man/man3/pipeline_free.3 +#usr/share/man/man3/pipeline_get_command.3 +#usr/share/man/man3/pipeline_get_infile.3 +#usr/share/man/man3/pipeline_get_ncommands.3 +#usr/share/man/man3/pipeline_get_outfile.3 +#usr/share/man/man3/pipeline_get_pid.3 +#usr/share/man/man3/pipeline_ignore_signals.3 +#usr/share/man/man3/pipeline_install_post_fork.3 +#usr/share/man/man3/pipeline_join.3 +#usr/share/man/man3/pipeline_new.3 +#usr/share/man/man3/pipeline_new_command_args.3 +#usr/share/man/man3/pipeline_new_command_argv.3 +#usr/share/man/man3/pipeline_new_commands.3 +#usr/share/man/man3/pipeline_new_commandv.3 +#usr/share/man/man3/pipeline_peek.3 +#usr/share/man/man3/pipeline_peek_size.3 +#usr/share/man/man3/pipeline_peek_skip.3 +#usr/share/man/man3/pipeline_peekline.3 +#usr/share/man/man3/pipeline_pump.3 +#usr/share/man/man3/pipeline_read.3 +#usr/share/man/man3/pipeline_readline.3 +#usr/share/man/man3/pipeline_run.3 +#usr/share/man/man3/pipeline_set_command.3 +#usr/share/man/man3/pipeline_start.3 +#usr/share/man/man3/pipeline_tostring.3 +#usr/share/man/man3/pipeline_wait.3 +#usr/share/man/man3/pipeline_wait_all.3 +#usr/share/man/man3/pipeline_want_in.3 +#usr/share/man/man3/pipeline_want_infile.3 +#usr/share/man/man3/pipeline_want_out.3 +#usr/share/man/man3/pipeline_want_outfile.3 diff --git a/lfs/libpipeline b/lfs/libpipeline new file mode 100644 index 000000000..66b72d07d --- /dev/null +++ b/lfs/libpipeline @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2018 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 = 1.5.6 + +THISAPP = libpipeline-$(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)_BLAKE2 = 813009e37ddb9a63da57e11ce71040646449b10140f5dd42cca02d280a3adb2173207af857ebca24777fdc8d30e426c41ad51f356f285decfe007b5829d9730f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# 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) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5f9f16d05..f794dec0e 100755 --- a/make.sh +++ b/make.sh @@ -1127,6 +1127,7 @@ buildbase() { lfsmake2 pkg-config lfsmake2 procps lfsmake2 make + lfsmake2 libpipeline lfsmake2 man lfsmake2 net-tools lfsmake2 patch

Reviewed-by: Peter Müller peter.mueller@ipfire.org

• Update from version 2.4.3 (2005) to 2.10.2 (2022)
• Update of rootfile
• Addition of libpipeline as a build dependency - separate patch for that.
• Changelog is too long to include here (~14000 lines) Details back to 2013 can be found in the file ChangeLog in the source tarball Details from 2013 back to version 2.4.3 can be found in the file ChangeLog-2013 in the source tarball 90 bug fixes listed in ChangeLog 128 bug fixes listed in Changelog-2013 back to the version after 2.4.3

Signed-off-by: Adolf Belka adolf.belka@ipfire.org

config/rootfiles/common/man | 108 +++++++++++++++++++++--------------- lfs/man | 30 +++++----- 2 files changed, 78 insertions(+), 60 deletions(-)

diff --git a/config/rootfiles/common/man b/config/rootfiles/common/man index 39358d110..21d8115f1 100644 --- a/config/rootfiles/common/man +++ b/config/rootfiles/common/man @@ -3,56 +3,87 @@ #usr/bin/catman #usr/bin/lexgrog #usr/bin/man +#usr/bin/man-recode #usr/bin/mandb #usr/bin/manpath #usr/bin/whatis -#usr/bin/zsoelim #usr/lib/man-db +#usr/lib/man-db/libman-2.10.2.so +#usr/lib/man-db/libman.la +#usr/lib/man-db/libman.so +#usr/lib/man-db/libmandb-2.10.2.so +#usr/lib/man-db/libmandb.la +#usr/lib/man-db/libmandb.so +#usr/libexec/man-db +#usr/libexec/man-db/globbing +#usr/libexec/man-db/manconv +#usr/libexec/man-db/zsoelim #usr/sbin/accessdb +#usr/share/doc/man-db +#usr/share/doc/man-db/man-db-manual.ps +#usr/share/doc/man-db/man-db-manual.txt +#usr/share/locale/af/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/ast/LC_MESSAGES/man-db.mo +#usr/share/locale/be/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/bg/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/ca/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/ca/LC_MESSAGES/man-db.mo +#usr/share/locale/cs/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/cs/LC_MESSAGES/man-db.mo +#usr/share/locale/da/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/da/LC_MESSAGES/man-db.mo +#usr/share/locale/de/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/de/LC_MESSAGES/man-db.mo +#usr/share/locale/el/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/eo/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/eo/LC_MESSAGES/man-db.mo +#usr/share/locale/es/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/es/LC_MESSAGES/man-db.mo +#usr/share/locale/et/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/eu/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/fi/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/fi/LC_MESSAGES/man-db.mo +#usr/share/locale/fr/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/fr/LC_MESSAGES/man-db.mo +#usr/share/locale/ga/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/gl/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/hu/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/id/LC_MESSAGES/man-db.mo +#usr/share/locale/it/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/it/LC_MESSAGES/man-db.mo +#usr/share/locale/ja/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/ja/LC_MESSAGES/man-db.mo +#usr/share/locale/ko/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/ms/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/nb/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/nl/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/nl/LC_MESSAGES/man-db.mo +#usr/share/locale/pl/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/pl/LC_MESSAGES/man-db.mo +#usr/share/locale/pt/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/pt/LC_MESSAGES/man-db.mo +#usr/share/locale/pt_BR/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/pt_BR/LC_MESSAGES/man-db.mo -#usr/share/locale/ro -#usr/share/locale/ro/LC_MESSAGES +#usr/share/locale/ro/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/ro/LC_MESSAGES/man-db.mo -#usr/share/locale/ru -#usr/share/locale/ru/LC_MESSAGES +#usr/share/locale/ru/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/ru/LC_MESSAGES/man-db.mo +#usr/share/locale/rw/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/sk/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/sl/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/sr/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/sr/LC_MESSAGES/man-db.mo +#usr/share/locale/sv/LC_MESSAGES/man-db-gnulib.mo #usr/share/locale/sv/LC_MESSAGES/man-db.mo -#usr/share/man/de -#usr/share/man/de/man1 -#usr/share/man/de/man1/apropos.1 -#usr/share/man/de/man1/man.1 -#usr/share/man/de/man1/manpath.1 -#usr/share/man/de/man1/whatis.1 -#usr/share/man/de/man1/zsoelim.1 -#usr/share/man/de/man5 -#usr/share/man/de/man5/manpath.5 -#usr/share/man/de/man8 -#usr/share/man/de/man8/accessdb.8 -#usr/share/man/de/man8/catman.8 -#usr/share/man/de/man8/mandb.8 -#usr/share/man/es -#usr/share/man/es/man1 -#usr/share/man/es/man1/apropos.1 -#usr/share/man/es/man1/man.1 -#usr/share/man/es/man1/manpath.1 -#usr/share/man/es/man1/whatis.1 -#usr/share/man/es/man1/zsoelim.1 -#usr/share/man/es/man5 -#usr/share/man/es/man5/manpath.5 -#usr/share/man/es/man8 -#usr/share/man/es/man8/accessdb.8 -#usr/share/man/es/man8/catman.8 -#usr/share/man/es/man8/mandb.8 +#usr/share/locale/tr/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/tr/LC_MESSAGES/man-db.mo +#usr/share/locale/uk/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/vi/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/vi/LC_MESSAGES/man-db.mo +#usr/share/locale/zh_CN/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/zh_CN/LC_MESSAGES/man-db.mo +#usr/share/locale/zh_TW/LC_MESSAGES/man-db-gnulib.mo +#usr/share/locale/zh_TW/LC_MESSAGES/man-db.mo #usr/share/man/it #usr/share/man/it/man1 #usr/share/man/it/man1/apropos.1 @@ -66,22 +97,11 @@ #usr/share/man/it/man8/accessdb.8 #usr/share/man/it/man8/catman.8 #usr/share/man/it/man8/mandb.8 -#usr/share/man/ja -#usr/share/man/ja/man1 -#usr/share/man/ja/man1/apropos.1 -#usr/share/man/ja/man1/man.1 -#usr/share/man/ja/man1/manpath.1 -#usr/share/man/ja/man1/whatis.1 -#usr/share/man/ja/man1/zsoelim.1 -#usr/share/man/ja/man5 -#usr/share/man/ja/man5/manpath.5 -#usr/share/man/ja/man8 -#usr/share/man/ja/man8/accessdb.8 -#usr/share/man/ja/man8/catman.8 -#usr/share/man/ja/man8/mandb.8 #usr/share/man/man1/apropos.1 #usr/share/man/man1/lexgrog.1 +#usr/share/man/man1/man-recode.1 #usr/share/man/man1/man.1 +#usr/share/man/man1/manconv.1 #usr/share/man/man1/manpath.1 #usr/share/man/man1/whatis.1 #usr/share/man/man1/zsoelim.1 diff --git a/lfs/man b/lfs/man index 16a3eae89..c6038c255 100644 --- a/lfs/man +++ b/lfs/man @@ -24,10 +24,10 @@

include Config

-VER = 2.4.3 +VER = 2.10.2

THISAPP = man-db-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_BLAKE2 = 022f3c39296e47b5fca348e49cfde234af304dbb815ff8a2977c75b8fe1890f9922ecb12e1271be4eb161cea50f3153c396b37b240104e009dd163c5dc998131 +$(DL_FILE)_BLAKE2 = 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599

install : $(TARGET)

@@ -69,21 +69,19 @@ $(subst %,%_BLAKE2,$(objects)) :

$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD)

• @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)

• @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) $(UPDATE_AUTOMAKE)

• cd $(DIR_APP) && mv man/de{_DE.88591,}
• cd $(DIR_APP) && mv man/es{_ES.88591,}
• cd $(DIR_APP) && mv man/it{_IT.88591,}
• cd $(DIR_APP) && mv man/ja{_JP.eucJP,}
• cd $(DIR_APP) && sed -i "s/-I-//g" {lib,src}/Makefile*
• cd $(DIR_APP) && sed -i 's,*_*,??,' man/Makefile.in
• cd $(DIR_APP) && sed -i '/\t/usr/man/d' src/man_db.conf.in
• cd $(DIR_APP) && echo -e "#define WEB_BROWSER "exec /usr/bin/lynx"" >> include/manconfig.h.in
• cd $(DIR_APP) && echo -e "#define COL "/usr/bin/col"" >> include/manconfig.h.in
• cd $(DIR_APP) && echo -e "#define VGRIND "/usr/bin/vgrind"" >> include/manconfig.h.in
• cd $(DIR_APP) && echo -e "#define GRAP "/usr/bin/grap"" >> include/manconfig.h.in
• cd $(DIR_APP) && ./configure --prefix=/usr --enable-mb-groff --disable-setuid

• cd $(DIR_APP) && ./configure \

•                --prefix=/usr \
  

•                --sysconfdir=/etc \
  

•                --disable-setuid \
  

•                --enable-cache-owner=bin \
  

•                --with-browser=/usr/bin/lynx \
  

•                --with-vgrind=/usr/bin/vgrind \
  

•                --with-grap=/usr/bin/grap \
  

•                --with-systemdtmpfilesdir= \
  

•                --with-systemdsystemunitdir=
  

  cd $(DIR_APP) && make cd $(DIR_APP) && make install @rm -rf $(DIR_APP)