From da8cda2080d8a2d275cd98985106029f2bd502dc Mon Sep 17 00:00:00 2001 From: PktSurf Date: Thu, 3 Apr 2025 20:36:25 +0530 Subject: [PATCH] Switched from netbsd-curses to ncurses in base. Upgraded base/readline from 6.3 to 8.2.13 Added scdoc 1.11.3, a documentation dependency for base/kmod to base --- base/ncurses/smbuild | 68 ++++++++++ base/netbsd-curses/smbuild | 42 ------ base/readline/fix-ncurses-underlinking.patch | 11 ++ base/readline/fix-rl_do_undo-crash.patch | 127 +++++++++++++++++++ base/readline/smbuild | 29 ++--- base/scdoc/smbuild | 32 +++++ 6 files changed, 249 insertions(+), 60 deletions(-) create mode 100644 base/ncurses/smbuild delete mode 100644 base/netbsd-curses/smbuild create mode 100644 base/readline/fix-ncurses-underlinking.patch create mode 100644 base/readline/fix-rl_do_undo-crash.patch create mode 100644 base/scdoc/smbuild diff --git a/base/ncurses/smbuild b/base/ncurses/smbuild new file mode 100644 index 0000000..225977d --- /dev/null +++ b/base/ncurses/smbuild @@ -0,0 +1,68 @@ +# Maintainer: PktSurf +app=ncurses +version=6.5 +build=1sml +homepage="https://slackware.uk/slackware/slackware-current/source/l/ncurses" +download="https://slackware.uk/slackware/slackware-current/source/l/ncurses/ncurses-6.5.tar.lz" +desc="The accursed ncurses library" +requires="gcc-libs" +preservestaticlibs=1 + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions +} + +build() { + ./configure \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-widec \ + --disable-termcap \ + --disable-root-access \ + --disable-rpath-hack \ + --with-cxx-binding \ + --with-cxx-shared \ + --with-shared \ + --enable-symlinks \ + --enable-pc-files \ + --without-ada \ + --with-pkg-config-libdir=/usr/lib/pkgconfig \ + --program-suffix="" \ + --program-prefix="" + + make + make install DESTDIR="$pkg" + + ( + cd $pkg + + # force link against *w.so + local lib + for lib in ncurses ncurses++ form panel menu; do + ln -s ${lib}w.pc usr/lib/pkgconfig/$lib.pc + ln -s lib${lib}w.a usr/lib/lib$lib.a + ln -s lib${lib}w.so usr/lib/lib$lib.so + done + + # link curses, tic, tinfo -> ncurses + for lib in curses tic tinfo; do + ln -s libncurses.a usr/lib/lib${lib}.a + ln -s libncurses.so usr/lib/lib${lib}.so + ln -s ncurses.pc usr/lib/pkgconfig/${lib}.pc + done + ln -s libncursesw.so usr/lib/libcursesw.so + ) + + cp COPYING $pkgdocs/ + + mkfinalpkg +} + +sha512sums=" +dde1ac89b8e4649329b767c02fb795793f757fc93f28a62dac8b761dc93fe79482439b0ff956e0de462a8b52357080074e601bd11eaeafd7b0222e211e1fed58 ncurses-6.5.tar.lz +" diff --git a/base/netbsd-curses/smbuild b/base/netbsd-curses/smbuild deleted file mode 100644 index 9f28c1d..0000000 --- a/base/netbsd-curses/smbuild +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: PktSurf -app=netbsd-curses -version=0.3.1 -build=1sml -homepage="http://ftp.barfooze.de/pub/sabotage/tarballs/" -download="https://ftp.barfooze.de/pub/sabotage/tarballs/netbsd-curses-$version.tar.xz" -desc="drop-in replacement for the bloated ncurses library with wide character support" -requires="gcc-libs" -preservestaticlibs=1 - -prepbuilddir() { - mkandenterbuilddir - rm -rf $app-$version - - tar xf $srcdir/$app-$version.tar.?z* - cd $app-$version - fixbuilddirpermissions -} - -build() { - cat << EOF > config.mak -CC=gcc -HOSTCC=gcc -AR=ar -RANLIB=ranlib -CFLAGS=$CFLAGS -PREFIX=/usr -BINDIR=/usr/bin -DESTDIR=$pkg -EOF - - make - make install - - cp COPYING $pkgdocs/ - - mkfinalpkg -} - -sha512sums=" -d8f650d241bd9db213194213900983c694194c00fcc406c1091b0be15248f6b6453983027cd87e1ff34eb05c6fd8f63797035d545df8b2642ec9b87a2a6a279e netbsd-curses-0.3.1.tar.lz -" diff --git a/base/readline/fix-ncurses-underlinking.patch b/base/readline/fix-ncurses-underlinking.patch new file mode 100644 index 0000000..0c9b313 --- /dev/null +++ b/base/readline/fix-ncurses-underlinking.patch @@ -0,0 +1,11 @@ +--- a/shlib/Makefile.in.orig ++++ b/shlib/Makefile.in +@@ -86,7 +86,7 @@ + SHOBJ_LIBS = @SHOBJ_LIBS@ + + SHLIB_XLDFLAGS = @LDFLAGS@ @SHLIB_XLDFLAGS@ +-SHLIB_LIBS = @SHLIB_LIBS@ ++SHLIB_LIBS = @SHLIB_LIBS@ -lncursesw + + SHLIB_DOT = @SHLIB_DOT@ + SHLIB_LIBPREF = @SHLIB_LIBPREF@ diff --git a/base/readline/fix-rl_do_undo-crash.patch b/base/readline/fix-rl_do_undo-crash.patch new file mode 100644 index 0000000..251288c --- /dev/null +++ b/base/readline/fix-rl_do_undo-crash.patch @@ -0,0 +1,127 @@ +Patch-Source: https://sources.debian.org/data/main/r/readline/8.2-3/debian/patches/fix-rl_do_undo-crash.diff + +https://git.savannah.gnu.org/cgit/bash.git/patch/?id=277c21d2b2c6730f6cbda428180b08bacdcecc80 + +From 277c21d2b2c6730f6cbda428180b08bacdcecc80 Mon Sep 17 00:00:00 2001 +From: Chet Ramey +Date: Mon, 6 Mar 2023 10:50:45 -0500 +Subject: readline fix for rl_undo_list pointer aliasing; arith command sets + word_top + +--- a/histlib.h ++++ b/histlib.h +@@ -1,6 +1,6 @@ + /* histlib.h -- internal definitions for the history library. */ + +-/* Copyright (C) 1989-2009,2021-2022 Free Software Foundation, Inc. ++/* Copyright (C) 1989-2009,2021-2023 Free Software Foundation, Inc. + + This file contains the GNU History Library (History), a set of + routines for managing the text of previously typed lines. +@@ -84,6 +84,7 @@ extern int _hs_history_patsearch (const + + /* history.c */ + extern void _hs_replace_history_data (int, histdata_t *, histdata_t *); ++extern int _hs_search_history_data (histdata_t *); + extern int _hs_at_end_of_history (void); + + /* histfile.c */ +--- a/history.c ++++ b/history.c +@@ -1,6 +1,6 @@ + /* history.c -- standalone history library */ + +-/* Copyright (C) 1989-2021 Free Software Foundation, Inc. ++/* Copyright (C) 1989-2023 Free Software Foundation, Inc. + + This file contains the GNU History Library (History), a set of + routines for managing the text of previously typed lines. +@@ -460,7 +460,7 @@ _hs_replace_history_data (int which, his + } + + last = -1; +- for (i = 0; i < history_length; i++) ++ for (i = history_length - 1; i >= 0; i--) + { + entry = the_history[i]; + if (entry == 0) +@@ -477,7 +477,27 @@ _hs_replace_history_data (int which, his + entry = the_history[last]; + entry->data = new; /* XXX - we don't check entry->old */ + } +-} ++} ++ ++int ++_hs_search_history_data (histdata_t *needle) ++{ ++ register int i; ++ HIST_ENTRY *entry; ++ ++ if (history_length == 0 || the_history == 0) ++ return -1; ++ ++ for (i = history_length - 1; i >= 0; i--) ++ { ++ entry = the_history[i]; ++ if (entry == 0) ++ continue; ++ if (entry->data == needle) ++ return i; ++ } ++ return -1; ++} + + /* Remove history element WHICH from the history. The removed + element is returned to you so you can free the line, data, +--- a/misc.c ++++ b/misc.c +@@ -339,6 +339,9 @@ rl_maybe_replace_line (void) + xfree (temp->line); + FREE (temp->timestamp); + xfree (temp); ++ /* XXX - what about _rl_saved_line_for_history? if the saved undo list ++ is rl_undo_list, and we just put that into a history entry, should ++ we set the saved undo list to NULL? */ + } + return 0; + } +@@ -386,14 +389,16 @@ _rl_free_saved_history_line (void) + + if (_rl_saved_line_for_history) + { +- if (rl_undo_list && rl_undo_list == (UNDO_LIST *)_rl_saved_line_for_history->data) +- rl_undo_list = 0; +- /* Have to free this separately because _rl_free_history entry can't: +- it doesn't know whether or not this has application data. Only the +- callers that know this is _rl_saved_line_for_history can know that +- it's an undo list. */ +- if (_rl_saved_line_for_history->data) +- _rl_free_undo_list ((UNDO_LIST *)_rl_saved_line_for_history->data); ++ UNDO_LIST *sentinel; ++ ++ sentinel = (UNDO_LIST *)_rl_saved_line_for_history->data; ++ ++ /* We should only free `data' if it's not the current rl_undo_list and ++ it's not the `data' member in a history entry somewhere. We have to ++ free it separately because only the callers know it's an undo list. */ ++ if (sentinel && sentinel != rl_undo_list && _hs_search_history_data ((histdata_t *)sentinel) < 0) ++ _rl_free_undo_list (sentinel); ++ + _rl_free_history_entry (_rl_saved_line_for_history); + _rl_saved_line_for_history = (HIST_ENTRY *)NULL; + } +--- a/search.c ++++ b/search.c +@@ -88,8 +88,10 @@ make_history_line_current (HIST_ENTRY *e + + xlist = _rl_saved_line_for_history ? (UNDO_LIST *)_rl_saved_line_for_history->data : 0; + /* At this point, rl_undo_list points to a private search string list. */ +- if (rl_undo_list && rl_undo_list != (UNDO_LIST *)entry->data && rl_undo_list != xlist) ++ if (rl_undo_list && rl_undo_list != (UNDO_LIST *)entry->data && rl_undo_list != xlist && ++ _hs_search_history_data ((histdata_t *)rl_undo_list) < 0) + rl_free_undo_list (); ++ rl_undo_list = 0; /* XXX */ + + /* Now we create a new undo list with a single insert for this text. + WE DON'T CHANGE THE ORIGINAL HISTORY ENTRY UNDO LIST */ diff --git a/base/readline/smbuild b/base/readline/smbuild index 7205fd2..2a382fd 100644 --- a/base/readline/smbuild +++ b/base/readline/smbuild @@ -1,11 +1,11 @@ # Maintainer: PktSurf app=readline -version=6.3 +version=8.2.13 build=1sml homepage="https://tiswww.case.edu/php/chet/readline/rltop.html" download="ftp://ftp.cwru.edu/pub/bash/readline-$version.tar.gz" desc="Line input library with editing features" -requires="netbsd-curses" +requires="ncurses" prepbuilddir() { mkandenterbuilddir @@ -15,32 +15,25 @@ prepbuilddir() { cd $app-$version fixbuilddirpermissions - for file in $srcdir/readline*-???.patch ; do - cat $file | patch -p0 --verbose - done + # Thanks alpine linux + applypatch $srcdir/fix-rl_do_undo-crash.patch + applypatch $srcdir/fix-ncurses-underlinking.patch + } build() { ./configure \ --prefix=/usr \ - --with-curses \ - --enable-multibyte \ - --disable-static + --disable-static \ + --enable-shared - make shared + make make install DESTDIR=$pkg mkfinalpkg } sha512sums=" -39d003396e2dc5127f1d970dd0b50fa95388f2e31f9c08a513138637156b673d1e82b53fddce9ad9ee23cfe206ea8ea4b6adc900a0eb3af4a2f761e74e3856de readline-6.3.tar.lz -e70f89ca52a4eae7e1cddd70de6a7162252231ee029c89bb3fcb0f6c8c8b46c666be910c8b2eee72e96983ec2f1a23663694dc222f67228d82e8e4684f1504a2 readline63-001.patch -4e23bd67433577e6e361d10a6c32768ea9e13b10e77493e565b870f56069b673fbcb0b860225f79fa9931845fc91d35c9a82c1385c23f8b757ebfd59f27851f4 readline63-002.patch -6bfb84a5b980091b995e2b96bdf5680f97fe670e6cac1b8606d2d75a1ef922ff5bd4e73f029f7af98a115006b7ab7828146f2cd6986287543d8a29987c91dc12 readline63-003.patch -6b683e9fe28831885135391b5a23bc580cacf0ffe720951a80f545574eda4eb064fe189801d44329b2eb2d3577db5a90f9e5ad9ed131e7e8a8ae349511632721 readline63-004.patch -b0332d7f999376788155341319d138a899a2278c338a6faaac89ecf3ed1e2248a07413dd810a76996bf25f211de787182b55f34ab3d7d31eb7519d7a48ebed32 readline63-005.patch -e9fbfa38d7b03ab2aff2e9e48918b85b4b67a729862ee47d1cc8e0aeb90c3224394a79f68829951e1377cae65742aa5385eae865f75e9c0b2e2abde42889431c readline63-006.patch -abee331894846b360203a521d9a66fa02c03214120d5cafbd1cb4d680bd7bbef14321ae845dd67f7b5e8c87322801fd96fc9a5fd0ae026b41d98dc24a8949854 readline63-007.patch -8e30bbca3aa5cea8c2ee511abe0ec8f131608d74fe5ab24d68bcf452267f0f97446ed6e7cd482360876ce6c027280e4f4450cae05eb18f56046240f4c224841c readline63-008.patch +94c671de03cd63a8075f4f7ebcdaad3e407eea0ad0e0aa896f32c7740b076505b047b799c618b9a315822df2b390d72c77cc7f4c24ce4ef81260d75eccf53eca readline-8.2.13.tar.lz +ce1a668581b85d03ffd73aedb0ab6b9bcd7c96a0d17d5fe1282c0a9af0b5782267570e1265f5b6def1cd90554a7c255cc1db8f88d3d58d3d20add13ea322e1f1 fix-rl_do_undo-crash.patch " diff --git a/base/scdoc/smbuild b/base/scdoc/smbuild new file mode 100644 index 0000000..0d5fd3c --- /dev/null +++ b/base/scdoc/smbuild @@ -0,0 +1,32 @@ +# Maintainer: PktSurf +# Generated by mksm SMLinux build file generator version 0.102 +app=scdoc +version=1.11.3 +build=1sml +homepage="https://git.sr.ht/~sircmpwn/scdoc" +download="https://mirrors.slackware.com/slackware/slackware64-current/source/ap/$app/$app-$version.tar.lz" +desc="Man page generator" +requires="musl" + +prepbuilddir() { + mkandenterbuilddir + rm -rf $app-$version + + tar xf $srcdir/$app-$version.tar.?z* + cd $app-$version + fixbuilddirpermissions +} + +build() { + make + make install PREFIX=/usr DESTDIR=$pkg + + cp COPYING $pkgdocs/ + + mkfinalpkg +} + + +sha512sums=" +fca75a10fe6405b02296d28d52d74999e8f23bcc0ba49e0207c552669e8f54afd26cbc1d8a1d707fa34e947e645ffaa231a2e9ea63f337bc9946c1118f6a5753 scdoc-1.11.3.tar.lz +"