pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/46190: pkgsrc-2011Q4 - misc/rlwrap - Segfaults on amd64 - odd gdb results
The following reply was made to PR pkg/46190; it has been noted by GNATS.
From: Matthew Mondor <mm_lists%pulsar-zone.net@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: heinz%NetBSD.org@localhost
Subject: Re: pkg/46190: pkgsrc-2011Q4 - misc/rlwrap - Segfaults on amd64 -
odd gdb results
Date: Wed, 2 May 2012 23:03:30 -0400
--MP_/Ve4gyygiY.okwQxWipu+ueX
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
On Tue, 1 May 2012 11:30:10 +0000 (UTC)
Matthew Mondor <mm_lists%pulsar-zone.net@localhost> wrote:
> These make rlwrap work for me on NetBSD/amd64. I'm not sure that the
> patch that adds the __NetBSD__ check is optimal, but it seems that
> configure.in changes would be required to properly detect termcap
> presence otherwise...
This is an attempt at upgrading to rlwrap-0.37 (applied against
pkgsrc-current). There remains one patch necessary for the
openpty(3)-in-libutil issue, but the other such issue was already fixed
upstream. I also sent mail to the author for the libutil fix (patch-aa
and patch-ab, so that hopefully rlwrap 0.38 will include these fixes).
I'm not too sure what to do about the optional test perl filters, and
added a patch to disable these for now...
Thanks,
--
Matt
--MP_/Ve4gyygiY.okwQxWipu+ueX
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=rlwrap-037-diff
Index: Makefile
===================================================================
RCS file: /data/rsync/netbsd-cvs/pkgsrc/misc/rlwrap/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile 20 May 2009 00:58:24 -0000 1.4
+++ Makefile 3 May 2012 02:21:20 -0000
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2009/05/20 00:58:24 wiz Exp $
#
-DISTNAME= rlwrap-0.30
+DISTNAME= rlwrap-0.37
PKGREVISION= 1
CATEGORIES= misc
MASTER_SITES= http://utopia.knoware.nl/~hlub/uck/rlwrap/
Index: PLIST
===================================================================
RCS file: /data/rsync/netbsd-cvs/pkgsrc/misc/rlwrap/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- PLIST 14 Jun 2009 18:07:29 -0000 1.2
+++ PLIST 3 May 2012 02:40:13 -0000
@@ -1,6 +1,5 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:07:29 joerg Exp $
bin/rlwrap
man/man1/rlwrap.1
-share/rlwrap/coqtop
-share/rlwrap/ftp
-share/rlwrap/testclient
+share/rlwrap/completions/coqtop
+share/rlwrap/completions/testclient
Index: distinfo
===================================================================
RCS file: /data/rsync/netbsd-cvs/pkgsrc/misc/rlwrap/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 9 Jan 2008 13:40:38 -0000 1.2
+++ distinfo 3 May 2012 02:44:54 -0000
@@ -1,5 +1,8 @@
$NetBSD: distinfo,v 1.2 2008/01/09 13:40:38 heinz Exp $
-SHA1 (rlwrap-0.30.tar.gz) = 26f3a6348710fee5e87f5274ddc29af8eaaf65d2
-RMD160 (rlwrap-0.30.tar.gz) = 23f19b9e98f61183fe719ee7a62db9d8ee2cf602
-Size (rlwrap-0.30.tar.gz) = 184037 bytes
+SHA1 (rlwrap-0.37.tar.gz) = c8fc5e7798a7c618a22583c56fa38d344700cc2f
+RMD160 (rlwrap-0.37.tar.gz) = 4e229e8fed579002605919760b313651aa427870
+Size (rlwrap-0.37.tar.gz) = 251438 bytes
+SHA1 (patch-aa) = d4590dcb9b73b2ee778896eb8f6f36f8ef26a641
+SHA1 (patch-ab) = d2f512d48bd71c695e9b4f3ca2328a8cf057438b
+SHA1 (patch-ac) = 2839d8dbd5daf2833c1817a83c13cef854c3435f
--MP_/Ve4gyygiY.okwQxWipu+ueX
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch-aa
If openpty(3) is in libutil, include util.h to avoid broken code on amd64
--- src/ptytty.c.orig 2007-09-16 06:49:21.000000000 -0400
+++ src/ptytty.c 2012-05-01 07:15:34.000000000 -0400
@@ -38,6 +38,9 @@
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
+#ifdef HAVE_LIBUTIL
+# include <util.h>
+#endif
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
--MP_/Ve4gyygiY.okwQxWipu+ueX
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch-ab
Broke with -Wimplicit-function-declaration -Wimplicit -Werror
--- src/string_utils.c.orig 2012-05-02 22:12:11.000000000 -0400
+++ src/string_utils.c 2012-05-02 22:13:04.000000000 -0400
@@ -617,8 +617,9 @@ colourless_strlen(const char *str, char
int visible = TRUE;
int column = 0;
int length = strlen(str);
- char *p, *q, *copy_without_ignore_markers;
-
+ const char *p;
+ char *q, *copy_without_ignore_markers;
+
assert(termwidth >= 0);
q = copy_without_ignore_markers = mymalloc(length + 1);
--MP_/Ve4gyygiY.okwQxWipu+ueX
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=patch-ac
According to README: filters are to test rlwrap, not to be practical
--- Makefile.in.orig 2010-04-30 09:45:35.000000000 -0400
+++ Makefile.in 2012-05-02 22:38:47.000000000 -0400
@@ -228,17 +228,11 @@
top_srcdir = @top_srcdir@
EXTRA_DIST = BUGS COPYING TODO INSTALL README PLEA src/rlwrap.h
src/redblack.h src/malloc_debug.h\
src/completion.rb doc/rlwrap.man.in test/testclient test/testit\
- completions/testclient completions/coqtop\
- filters/README filters/RlwrapFilter.pm filters/RlwrapFilter.3pm
filters/count_in_prompt filters/pipeto\
- filters/logger filters/null filters/unbackspace filters/pipeline
filters/ftp_filter filters/history_format\
- filters/simple_macro filters/template filters/scrub_prompt
filters/paint_prompt filters/censor_passwords filters/listing
+ completions/testclient completions/coqtop
TESTS = test/testit
-SUBDIRS = doc src filters
-nobase_pkgdata_DATA = completions/testclient completions/coqtop\
- filters/README filters/RlwrapFilter.pm
filters/RlwrapFilter.3pm filters/count_in_prompt filters/pipeto\
- filters/logger filters/null filters/unbackspace
filters/pipeline filters/ftp_filter filters/history_format\
- filters/simple_macro filters/template
filters/scrub_prompt filters/paint_prompt filters/censor_passwords
filters/listing
+SUBDIRS = doc src
+nobase_pkgdata_DATA = completions/testclient completions/coqtop
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -851,7 +845,7 @@
rm -f *~
install-data-hook:
- chmod a+x $(DESTDIR)$(pkgdatadir)/filters/*
+# chmod a+x $(DESTDIR)$(pkgdatadir)/filters/*
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--MP_/Ve4gyygiY.okwQxWipu+ueX--
Home |
Main Index |
Thread Index |
Old Index