From 2aa254d61a70b34861b9317234429943e3acdeb9 Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Wed, 14 Jul 2021 09:05:27 +0200 Subject: [PATCH 1/4] issued critical curses patch --- curses-lib/build | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 43 insertions(+), 5 deletions(-) diff --git a/curses-lib/build b/curses-lib/build index 12005b8..5610e00 100755 --- a/curses-lib/build +++ b/curses-lib/build @@ -5,12 +5,50 @@ sed -i s/mawk// configure mkdir build pushd build ../configure -make -C include +make -C in`clude make -C progs tic popd -./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec +./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec --with-pkg-config-libdir=/usr/lib/ncurses/6_2/lib/pkgconfig make -make install DESTDIR="$1" -cp libncursesw.so /lib/libncursesw.so -ln -s /lib/libncursesw.so /lib/libncurses.so +make DESTDIR="$1" install +ln -s $1/usr/lib/ncurses/6_2/bin/captoinfo $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/clear $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/infocmp $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/infotocap $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/ncurses6-config $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/reset $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/tabs $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/tic $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/toe $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/tput $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/bin/tset $1/usr/bin/ +ln -s $1/usr/lib/ncurses/6_2/include/ncurses $1/usr/include +ln -s $1/usr/lib/ncurses/6_2/lib/libform.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libform_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libform.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libform.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libform.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libmenu_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses++.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses++_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libpanel_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/terminfo $1/usr/lib/ +ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/form.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/menu.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/ncurses++.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/ncurses.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/panel.pc $1/usr/lib/pkgconfig/ echo "INPUT(-lncursesw)" > $1/usr/lib/libncurses.so -- 2.30.2 From d23d04fc85a558634534a8b8be0ba0a63efeda6f Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Wed, 14 Jul 2021 09:06:05 +0200 Subject: [PATCH 2/4] flex changed up --- flex/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flex/build b/flex/build index dac4763..5813a9b 100755 --- a/flex/build +++ b/flex/build @@ -6,4 +6,4 @@ HELP2MAN=/tools/bin/true ./configure --prefix=/usr --docdir=/usr/share/doc/flex- make make check make install DESTDIR="$1" -ln -sv flex /usr/bin/lex +ln -sv flex $1/usr/bin/lex -- 2.30.2 From 58550f7cb42412af990b5fde8e07e6e42d60c27b Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Wed, 14 Jul 2021 16:37:01 +0200 Subject: [PATCH 3/4] fix curses lib --- curses-lib/build | 89 ++++++++++++++++++++++-------------------------- flex/build | 4 --- 2 files changed, 41 insertions(+), 52 deletions(-) diff --git a/curses-lib/build b/curses-lib/build index 13947be..29f8d18 100755 --- a/curses-lib/build +++ b/curses-lib/build @@ -9,54 +9,47 @@ pushd build make -C in`clude make -C progs tic popd -./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec --with-pkg-config-libdir=/usr/lib/ncurses/6_2/lib/pkgconfig +./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec --with-pkg-config-libdir=/usr/lib/ncurses//lib/pkgconfig make -<<<<<<< HEAD make DESTDIR="$1" install -ln -s $1/usr/lib/ncurses/6_2/bin/captoinfo $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/clear $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/infocmp $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/infotocap $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/ncurses6-config $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/reset $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/tabs $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/tic $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/toe $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/tput $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/bin/tset $1/usr/bin/ -ln -s $1/usr/lib/ncurses/6_2/include/ncurses $1/usr/include -ln -s $1/usr/lib/ncurses/6_2/lib/libform.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libform_g.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libform.so $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libform.so.6 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libform.so.6.1 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libmenu_g.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.so $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.so.6 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libmenu.so.6.1 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses++.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses++_g.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses_g.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.so $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.so.6 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libncurses.so.6.1 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libpanel_g.a $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.so $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.so.6 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/libpanel.so.6.1 $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/terminfo $1/usr/lib/ -ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/form.pc $1/usr/lib/pkgconfig/ -ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/menu.pc $1/usr/lib/pkgconfig/ -ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/ncurses++.pc $1/usr/lib/pkgconfig/ -ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/ncurses.pc $1/usr/lib/pkgconfig/ -ln -s $1/usr/lib/ncurses/6_2/lib/pkgconfig/panel.pc $1/usr/lib/pkgconfig/ -======= -make install DESTDIR="$1" - -cp libncursesw.so /lib/libncursesw.so -ln -s /lib/libncursesw.so /lib/libncurses.so ->>>>>>> e1d9880bd99d6d808dc9beccdf707f6d87bedae6 +ln -s $1/usr/lib/ncurses/bin/captoinfo $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/clear $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/infocmp $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/infotocap $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/ncurses6-config $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/reset $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/tabs $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/tic $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/toe $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/tput $1/usr/bin/ +ln -s $1/usr/lib/ncurses/bin/tset $1/usr/bin/ +ln -s $1/usr/lib/ncurses/include/ncurses $1/usr/include +ln -s $1/usr/lib/ncurses/lib/libform.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libform_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libform.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libform.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libform.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libmenu.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libmenu_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libmenu.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libmenu.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libmenu.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses++.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses++_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libncurses.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libpanel.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libpanel_g.a $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libpanel.so $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libpanel.so.6 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/libpanel.so.6.1 $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/terminfo $1/usr/lib/ +ln -s $1/usr/lib/ncurses/lib/pkgconfig/form.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/lib/pkgconfig/menu.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/lib/pkgconfig/ncurses++.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/lib/pkgconfig/ncurses.pc $1/usr/lib/pkgconfig/ +ln -s $1/usr/lib/ncurses/lib/pkgconfig/panel.pc $1/usr/lib/pkgconfig/ echo "INPUT(-lncursesw)" > $1/usr/lib/libncurses.so diff --git a/flex/build b/flex/build index 67f2fd7..d499d01 100755 --- a/flex/build +++ b/flex/build @@ -8,9 +8,5 @@ HELP2MAN=/tools/bin/true ./configure --prefix=/usr --docdir=/usr/share/doc/flex- make make check make install DESTDIR="$1" -<<<<<<< HEAD ln -sv flex $1/usr/bin/lex -======= -ln -sv flex /usr/bin/lex ->>>>>>> e1d9880bd99d6d808dc9beccdf707f6d87bedae6 -- 2.30.2 From 063467485c80d4342b6cb2a893eee5755cfc57dc Mon Sep 17 00:00:00 2001 From: Ohio2 Date: Wed, 14 Jul 2021 15:45:03 +0100 Subject: [PATCH 4/4] Zaktualizuj 'curses-lib/build' --- curses-lib/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/curses-lib/build b/curses-lib/build index 29f8d18..aeec30f 100755 --- a/curses-lib/build +++ b/curses-lib/build @@ -6,7 +6,7 @@ sed -i s/mawk// configure mkdir build pushd build ../configure -make -C in`clude +make -C include make -C progs tic popd ./configure --prefix=/usr --build=$(./config.guess) --mandir=/usr/share/man --with-manpage-format=normal --with-shared --without-debug --without-ada --without-normal --enable-widec --with-pkg-config-libdir=/usr/lib/ncurses//lib/pkgconfig -- 2.30.2