- CRUX-ARM - lists.crux-arm.nu

[crossrootfs][PATCH] ncurses: add --disable-rpath, --disable-rpath-hack
by John Vogel 15 May '16

15 May '16

0e001d4977d829b608afe6399d648fdd58e3ab2d Fix toolchain rpath from showing up in built binaries by adding --disable-rpath and --disable-rpath-hack configure switches. --- ncurses/Pkgfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ncurses/Pkgfile b/ncurses/Pkgfile index 09970ea..3b366a3 100644 --- a/ncurses/Pkgfile +++ b/ncurses/Pkgfile @@ -20,7 +20,9 @@ build() { --with-{normal,shared} \ --without-{debug,ada,tests} \ --enable-pc-files \ - --enable-widec + --enable-widec \ + --disable-rpath \ + --disable-rpath-hack make make DESTDIR=$PKG install -- 2.7.4

2 1

[crossrootfs][PATCH] openssh: use http instead of ftp for source
by John Vogel 15 May '16

15 May '16

2bebb7f265a01c43e8fb398f64f578e729be2092 The openbsd site refuses ftp connections, so change source link to use http proto instead. Update the md5sums, the cksum for the sshd file was stale but new one matches crux core, so seems ok. --- openssh/.md5sum | 2 +- openssh/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openssh/.md5sum b/openssh/.md5sum index e25730d..02a2db5 100644 --- a/openssh/.md5sum +++ b/openssh/.md5sum @@ -1,2 +1,2 @@ 8709736bc8a8c253bc4eeb4829888ca5 openssh-7.1p1.tar.gz -ce4ef44c7d80f6451170e6fe5c07d3f4 sshd +7789cba75dc6c448814ca2e51f0dbf30 sshd diff --git a/openssh/Pkgfile b/openssh/Pkgfile index 201ae8f..7d21ab9 100644 --- a/openssh/Pkgfile +++ b/openssh/Pkgfile @@ -7,7 +7,7 @@ name=openssh version=7.1p1 release=1 -source=(ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd) +source=(http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$name-$version.tar.gz sshd) build() { cd $name-$version -- 2.7.4

2 1

[crossrootfs][PATCH] gettext: fix linking in host libraries
by John Vogel 15 May '16

15 May '16

2c3a745b65afd2bf58e45da2a5dec07a8a6fac05 gettext: fix linking in host libraries --- gettext/Pkgfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gettext/Pkgfile b/gettext/Pkgfile index ca5de0e..fe32e75 100644 --- a/gettext/Pkgfile +++ b/gettext/Pkgfile @@ -29,6 +29,18 @@ EOF --with-included-{glib,libcroco,libxml} \ --with-sysroot=$CLFS \ --cache-file=config.cache + + # get rid of host lib search dirs from Makefiles + for mk in $(find -name Makefile) ; do + sed -i 's|-L/usr/lib||' $mk + done + + # use same type fix as done for gcc port, to prevent libtool + # from linking in host libraries + for lt_file in $(find -name 'libtool') ; do + sed -i 's/func_append add_dir \" /add_dir=\"/' $lt_file + done + make make -j1 DESTDIR=$PKG install rm -r $PKG/usr/share/{info,doc} -- 2.7.4

2 1

[crossrootfs][PATCH] libcap: prevent host pam from breaking build
by John Vogel 15 May '16

15 May '16

1be4e9cfb494a2017cbedbe039f09bbeaf72d0df libcap: prevent host pam from breaking build --- libcap/Pkgfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcap/Pkgfile b/libcap/Pkgfile index d30e2aa..8a1037f 100644 --- a/libcap/Pkgfile +++ b/libcap/Pkgfile @@ -14,8 +14,8 @@ build () { sed -i "/^CFLAGS/s/-O2/$CFLAGS/" Make.Rules - make CC="$CC" BUILD_CC="gcc" BUILD_CFLAGS="-O2 -pipe" - make RAISE_SETFCAP=no DESTDIR=$PKG man_prefix=/usr/share install + make CC="$CC" BUILD_CC="gcc" BUILD_CFLAGS="-O2 -pipe" PAM_CAP=no + make RAISE_SETFCAP=no PAM_CAP=no DESTDIR=$PKG man_prefix=/usr/share install install -d $PKG/usr/lib mv $PKG/lib/libcap.a $PKG/usr/lib -- 2.7.4

2 1

[crossrootfs][PATCH] bindutils: prevent host pam from breaking build
by John Vogel 15 May '16

15 May '16

fb8e47f41f23189e0c8c1063c2014a95e689a8b9 bindutils: prevent host pam from breaking build --- bindutils/Pkgfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bindutils/Pkgfile b/bindutils/Pkgfile index cff61cb..64e0985 100644 --- a/bindutils/Pkgfile +++ b/bindutils/Pkgfile @@ -20,7 +20,8 @@ build() { --enable-epoll=no \ --with-randomdev=/dev/random \ --with-gost=yes \ - --without-openssl + --without-openssl \ + --without-gssapi sed 's|${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include|gcc ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include|g' -i lib/dns/Makefile.in -i lib/dns/Makefile sed 's|${CC} ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS}|gcc ${ALL_CFLAGS} ${LDFLAGS} -o $@ ${srcdir}/gen.c ${LIBS)|g' -i lib/export/dns/Makefile.in -i lib/export/dns/Makefile -- 2.7.4

2 2

[crossrootfs][PATCH] gcc: fix libtool relink of cross arch libraries
by John Vogel 15 May '16

15 May '16

a403a54cc6f51937d5f208662fc002c278cdcf68 gcc: fix libtool relink of cross arch libraries --- gcc/Pkgfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/Pkgfile b/gcc/Pkgfile index a5bf931..241f048 100644 --- a/gcc/Pkgfile +++ b/gcc/Pkgfile @@ -46,7 +46,15 @@ build() { # prevent GCC from looking in the wrong directories for headers and libraries sed "/^HOST_$GMP\|PPL\|CLOOG$$LIBS\|INC$/s:-[IL]/$lib\|include$::" -i Makefile - make + make + + # prevent libtool from adding host lib paths for relink at install + # based on patch submitted by Vincent Cadet for libtool bug #21455 + # see https://lists.gnu.org/archive/html/bug-libtool/2015-09/msg00012.html + for lt_file in $(find $SRC/build/$CTARGET -name libtool) ; do + sed -i 's/$add_dir=\"$\$add_dir $-L\$inst_prefix_dir\$libdir\"$/\1\2/' $lt_file + done + make -j1 DESTDIR=$PKG install mkdir $PKG/lib -- 2.7.4

2 1

[crossrootfs][PATCH] file: fix build when host file version != port
by John Vogel 15 May '16

15 May '16

a2a8b508a8e776f2da4b0198b4d5818da75b4fc3 Mon Sep 17 00:00:00 2001 --- file/Pkgfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/file/Pkgfile b/file/Pkgfile index cd502a5..816bbad 100644 --- a/file/Pkgfile +++ b/file/Pkgfile @@ -12,6 +12,21 @@ source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz) build() { cd $name-$version + OLD_PATH=$PATH + export PATH=/usr/bin:/bin + + CC=gcc CXX=g++ \ + CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" \ + LDFLAGS="" \ + AR=ar LD=ld AS=as RANLIB=ranlib STRIP=strip \ + ./configure --prefix=$SRC/host_file + make + make install + + export PATH=$SRC/host_file/bin:$OLD_PATH + + printf 'PATH=%s\n' "$PATH" + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ -- 2.7.4

2 2

[crossrootfs][PATCH] readline: use uncompressed patch, update md5sums
by John Vogel 15 May '16

15 May '16

8d4de6c004f6640b3e5793e05e116e4635b67349 Mon Sep 17 00:00:00 2001 Use uncompressed patch, update md5sums, and remove old patch. --- readline/.md5sum | 2 +- readline/readline-6.3.6-wcwidth.patch | 97 --------- readline/readline-6.3.8.patch | 400 ++++++++++++++++++++++++++++++++++ 3 files changed, 401 insertions(+), 98 deletions(-) delete mode 100644 readline/readline-6.3.6-wcwidth.patch create mode 100644 readline/readline-6.3.8.patch diff --git a/readline/.md5sum b/readline/.md5sum index ae22d1e..2376bc6 100644 --- a/readline/.md5sum +++ b/readline/.md5sum @@ -1,4 +1,4 @@ 553cf04fdeec54dca12062864c3ffba3 inputrc b1efd651024094fa2f0f3a34d2d0f0b7 readline-6.3.8-wcwidth.patch -bfba9ca30c7252588ea50bcc61f1006c readline-6.3.8.patch.gz +8d4584841e20bbad2c27e41a4ecceac9 readline-6.3.8.patch 33c8fb279e981274f485fd91da77e94a readline-6.3.tar.gz diff --git a/readline/readline-6.3.6-wcwidth.patch b/readline/readline-6.3.6-wcwidth.patch deleted file mode 100644 index 6570b33..0000000 --- a/readline/readline-6.3.6-wcwidth.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -ur original/readline-6.3/configure build/readline-6.3/configure ---- original/readline-6.3/configure 2013-03-13 23:14:53.000000000 +0900 -+++ build/readline-6.3/configure 2014-04-28 22:52:45.510169436 +0900 -@@ -6316,49 +6316,49 @@ - - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 --$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } --if ${bash_cv_wcwidth_broken+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error $? "cannot run test program while cross compiling --See \`config.log' for more details" "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --#include <unistd.h> --#include <stdlib.h> --#include <stdio.h> -- --#include <locale.h> --#include <wchar.h> -- --main(c, v) --int c; --char **v; --{ -- int w; -- -- setlocale(LC_ALL, "en_US.UTF-8"); -- w = wcwidth (0x0301); -- exit (w == 0); /* exit 0 if wcwidth broken */ --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- bash_cv_wcwidth_broken=yes --else -- bash_cv_wcwdith_broken=no --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- --fi -+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcwidth broken with unicode combining characters" >&5 -+#$as_echo_n "checking for wcwidth broken with unicode combining characters... " >&6; } -+#if ${bash_cv_wcwidth_broken+:} false; then : -+# $as_echo_n "(cached) " >&6 -+#else -+# if test "$cross_compiling" = yes; then : -+# { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+#as_fn_error $? "cannot run test program while cross compiling -+#See \`config.log' for more details" "$LINENO" 5; } -+#else -+# cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+#/* end confdefs.h. */ -+# -+##include <unistd.h> -+##include <stdlib.h> -+##include <stdio.h> -+# -+##include <locale.h> -+##include <wchar.h> -+# -+#main(c, v) -+#int c; -+#char **v; -+#{ -+# int w; -+# -+# setlocale(LC_ALL, "en_US.UTF-8"); -+# w = wcwidth (0x0301); -+# exit (w == 0); /* exit 0 if wcwidth broken */ -+#} -+# -+#_ACEOF -+#if ac_fn_c_try_run "$LINENO"; then : -+# bash_cv_wcwidth_broken=yes -+#else -+# bash_cv_wcwdith_broken=no -+#fi -+#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+# conftest.$ac_objext conftest.beam conftest.$ac_ext -+#fi -+bash_cv_wcwdith_broken=no -+#fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bash_cv_wcwidth_broken" >&5 - $as_echo "$bash_cv_wcwidth_broken" >&6; } - if test "$bash_cv_wcwidth_broken" = yes; then - diff --git a/readline/readline-6.3.8.patch b/readline/readline-6.3.8.patch new file mode 100644 index 0000000..b33edd2 --- /dev/null +++ b/readline/readline-6.3.8.patch @@ -0,0 +1,400 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-001 + +Bug-Reported-by: Daan van Rossum <daan(a)flash.uchicago.edu> +Bug-Reference-ID: <20140307072523.GA14250(a)flash.uchicago.edu> +Bug-Reference-URL: + +Bug-Description: + +The `.' command in vi mode cannot undo multi-key commands beginning with +`c', `d', and `y' (command plus motion specifier). + +Patch (apply with `patch -p0'): + +*** readline.c 2013-10-28 14:58:06.000000000 -0400 +--- readline.c 2014-03-07 15:20:33.000000000 -0500 +*************** +*** 965,969 **** + if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && + key != ANYOTHERKEY && +! rl_key_sequence_length == 1 && /* XXX */ + _rl_vi_textmod_command (key)) + _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); +--- 965,969 ---- + if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && + key != ANYOTHERKEY && +! _rl_dispatching_keymap == vi_movement_keymap && + _rl_vi_textmod_command (key)) + _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 5 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 1 + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-002 + +Bug-Reported-by: Anatol Pomozov <anatol.pomozov(a)gmail.com> +Bug-Reference-ID: <CAOMFOmXy3mT2So5GQ5F-smCVArQuAeBwZ2QKzgCtMeXJoDeYOQ(a)mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00010.html + +Bug-Description: + +When in callback mode, some readline commands can cause readline to seg +fault by passing invalid contexts to callback functions. + +Patch (apply with `patch -p0'): + +*** readline.c 2013-10-28 14:58:06.000000000 -0400 +--- readline.c 2014-03-10 14:15:02.000000000 -0400 +*************** +*** 745,749 **** + + RL_CHECK_SIGNALS (); +! if (r == 0) /* success! */ + { + _rl_keyseq_chain_dispose (); +--- 745,750 ---- + + RL_CHECK_SIGNALS (); +! /* We only treat values < 0 specially to simulate recursion. */ +! if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ + { + _rl_keyseq_chain_dispose (); +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 1 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 2 + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-003 + +Bug-Reported-by: +Bug-Reference-ID: +Bug-Reference-URL: + +Bug-Description: + +There are debugging functions in the readline release that are theoretically +exploitable as security problems. They are not public functions, but have +global linkage. + +Patch (apply with `patch -p0'): + +*** util.c 2013-09-02 13:36:12.000000000 -0400 +--- util.c 2014-03-20 10:25:53.000000000 -0400 +*************** +*** 477,480 **** +--- 479,483 ---- + } + ++ #if defined (DEBUG) + #if defined (USE_VARARGS) + static FILE *_rl_tracefp; +*************** +*** 539,542 **** +--- 542,546 ---- + } + #endif ++ #endif /* DEBUG */ + + +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 2 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 3 + + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-004 + +Bug-Reported-by: Egmont Koblinger <egmont(a)gmail.com> +Bug-Reference-ID: <CAGWcZk+bU5Jo1M+tutGvL-250UBE9DXjpeJVofYJSFcqFEVfMg(a)mail.gmail.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-03/msg00153.html + +Bug-Description: + +The signal handling changes to bash and readline (to avoid running any code +in a signal handler context) cause the cursor to be placed on the wrong +line of a multi-line command after a ^C interrupts editing. + +Patch (apply with `patch -p0'): + +*** display.c 2013-12-27 13:10:56.000000000 -0500 +--- display.c 2014-03-27 11:52:45.000000000 -0400 +*************** +*** 2678,2682 **** + if (_rl_echoing_p) + { +! _rl_move_vert (_rl_vis_botlin); + _rl_vis_botlin = 0; + fflush (rl_outstream); +--- 2678,2683 ---- + if (_rl_echoing_p) + { +! if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */ +! _rl_move_vert (_rl_vis_botlin); + _rl_vis_botlin = 0; + fflush (rl_outstream); +*** /patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 3 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 4 + + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-005 + +Bug-Reported-by: Juergen Daubert <jue(a)jue.li> +Bug-Reference-ID: <20140303180430.GA7346(a)jue.netz> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2014-03/msg00002.html + +Bug-Description: + +There are still applications using the deprecated Function/VFunction/etc. +typedefs in rltypedefs.h. This patch restores the typedefs, but attempts +to mark them as deprecated using gcc/clang attributes. Thanks to Max Horn +for the suggestion. + +Patch (apply with `patch -p0'): + +*** rltypedefs.h 2011-03-26 14:53:31.000000000 -0400 +--- rltypedefs.h 2014-04-10 11:30:45.000000000 -0400 +*************** +*** 27,30 **** +--- 27,49 ---- + #endif + ++ /* Old-style, attempt to mark as deprecated in some way people will notice. */ ++ ++ #if !defined (_FUNCTION_DEF) ++ # define _FUNCTION_DEF ++ ++ #if defined(__GNUC__) || defined(__clang__) ++ typedef int Function () __attribute__ ((deprecated)); ++ typedef void VFunction () __attribute__ ((deprecated)); ++ typedef char *CPFunction () __attribute__ ((deprecated)); ++ typedef char **CPPFunction () __attribute__ ((deprecated)); ++ #else ++ typedef int Function (); ++ typedef void VFunction (); ++ typedef char *CPFunction (); ++ typedef char **CPPFunction (); ++ #endif ++ ++ #endif /* _FUNCTION_DEF */ ++ + /* New style. */ + +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 4 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 5 + + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-006 + +Bug-Reported-by: <Trond.Endrestol(a)ximalas.info> +Bug-Reference-ID: <alpine.BSF.2.03.1404192114310.1973(a)enterprise.ximalas.info> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00069.html + +Bug-Description: + +Using reverse-i-search when horizontal scrolling is enabled does not redisplay +the entire line containing the successful search results. + +Patch (apply with `patch -p0'): + +*** display.c 2014-04-08 18:19:36.000000000 -0400 +--- display.c 2014-04-20 18:32:52.000000000 -0400 +*************** +*** 1638,1642 **** + the spot of first difference is before the end of the invisible chars, + lendiff needs to be adjusted. */ +! if (current_line == 0 && !_rl_horizontal_scroll_mode && + current_invis_chars != visible_wrap_offset) + { +--- 1638,1642 ---- + the spot of first difference is before the end of the invisible chars, + lendiff needs to be adjusted. */ +! if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */ + current_invis_chars != visible_wrap_offset) + { +*************** +*** 1826,1831 **** + _rl_last_c_pos += bytes_to_insert; + + if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) +! goto clear_rest_of_line; + } + } +--- 1826,1836 ---- + _rl_last_c_pos += bytes_to_insert; + ++ /* XXX - we only want to do this if we are at the end of the line ++ so we move there with _rl_move_cursor_relative */ + if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new))) +! { +! _rl_move_cursor_relative (ne-new, new); +! goto clear_rest_of_line; +! } + } + } +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 5 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 6 + + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-007 + +Bug-Reported-by: John Lenton +Bug-Reference-ID: +Bug-Reference-URL: https://bugs.launchpad.net/ubuntu/+source/bash/+bug/1317476 + +Bug-Description: + +Readline should allow SIGALRM and SIGVTALRM (if available) to `interrupt' +rl_getc and cause the handler to run when not in a signal handling context. + +Patch (apply with `patch -p0'): + +*** input.c 2014-01-10 15:07:08.000000000 -0500 +--- input.c 2014-05-30 16:20:56.000000000 -0400 +*************** +*** 535,540 **** +--- 538,551 ---- + else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM) + return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF); ++ /* keyboard-generated signals of interest */ + else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT) + RL_CHECK_SIGNALS (); ++ /* non-keyboard-generated signals of interest */ ++ else if (_rl_caught_signal == SIGALRM ++ #if defined (SIGVTALRM) ++ || _rl_caught_signal == SIGVTALRM ++ #endif ++ ) ++ RL_CHECK_SIGNALS (); + + if (rl_signal_event_hook) +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 6 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 7 + + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.3 +Patch-ID: readline63-008 + +Bug-Reported-by: Jared Yanovich <slovichon(a)gmail.com> +Bug-Reference-ID: <20140625225019.GJ17044(a)nightderanger.psc.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-06/msg00070.html + +Bug-Description: + +When the readline `revert-all-at-newline' option is set, pressing newline +when the current line is one retrieved from history results in a double free +and a segmentation fault. + +Patch (apply with `patch -p0'): + +*** misc.c 2012-09-01 18:03:11.000000000 -0400 +--- misc.c 2014-06-30 13:41:19.000000000 -0400 +*************** +*** 462,465 **** +--- 462,466 ---- + /* Set up rl_line_buffer and other variables from history entry */ + rl_replace_from_history (entry, 0); /* entry->line is now current */ ++ entry->data = 0; /* entry->data is now current undo list */ + /* Undo all changes to this history entry */ + while (rl_undo_list) +*************** +*** 469,473 **** + FREE (entry->line); + entry->line = savestring (rl_line_buffer); +- entry->data = 0; + } + entry = previous_history (); +--- 470,473 ---- +*** patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 7 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 8 + -- 2.7.4

2 1

[pkgutils-cross][PATCH] Makefile: build shared so that fakeroot will work.
by John Vogel 15 May '16

15 May '16

I have tested this for my builds of the crossrootfs and have had no issues. A few minor tweaks in devtools/buildAllPackages.sh: patch forthcoming. .gitignore: add pkginfo. pkgmk-cross.conf: not all shells define MACHTYPE, so use gcc -dumpmachine to get the host triple. --- .gitignore | 1 + Makefile | 4 ++-- pkgmk-cross.conf | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e2c7965..615a564 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.8 *.5 pkgadd +pkginfo pkgmk rejmerge diff --git a/Makefile b/Makefile index bd733fb..d7b5072 100644 --- a/Makefile +++ b/Makefile @@ -32,9 +32,9 @@ CXXFLAGS += -DNDEBUG CXXFLAGS += -O2 -Wall -pedantic -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" \ -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -LIBARCHIVELIBS := $(shell pkg-config --libs --static libarchive) +LIBARCHIVELIBS := $(shell pkg-config --libs libarchive) -LDFLAGS += -static $(LIBARCHIVELIBS) +LDFLAGS += $(LIBARCHIVELIBS) OBJECTS = main.o pkgutil.o pkgadd.o pkgrm.o pkginfo.o diff --git a/pkgmk-cross.conf b/pkgmk-cross.conf index 00f8361..482b9b2 100644 --- a/pkgmk-cross.conf +++ b/pkgmk-cross.conf @@ -2,7 +2,7 @@ # pkgmk.conf: pkgmk(8) configuration # -export CHOST="$(echo $MACHTYPE)" +export CHOST="$(gcc -dumpmachine)" # hardfp (mainline) export CTARGET="arm-crux-linux-gnueabihf" -- 2.7.4

2 1

[crossrootfs][PATCH] file: fix build when host version != port
by John Vogel 13 May '16

13 May '16

419056684c4b93689a0f68ebd265bfc239908e55 Build host file so that cross build can use that copy for generating the 'magic' database. --- file/Pkgfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/file/Pkgfile b/file/Pkgfile index cd502a5..11dde42 100644 --- a/file/Pkgfile +++ b/file/Pkgfile @@ -12,6 +12,19 @@ source=(ftp://ftp.astron.com/pub/file/$name-$version.tar.gz) build() { cd $name-$version + OLD_PATH=$PATH + export PATH=/usr/bin:/bin + + CC=gcc CXX=g++ \ + CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" \ + LDFLAGS="" \ + AR=ar LD=ld AS=as RANLIB=ranlib STRIP=strip \ + ./configure --prefix=$SRC/host_file + make + make install + + export PATH=$SRC/host_file/bin:$OLD_PATH + ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ -- 2.7.4

1 0