diff options
| author | wiz <wiz> | 2011-04-01 13:12:24 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-04-01 13:12:24 +0000 |
| commit | c5e85255263d50571fe67b22fc6e1d039628f0ef (patch) | |
| tree | bde456b8943eeae0158be06e02d426cf58411d5c /editors | |
| parent | 508aceb3864700792df762bc4fa0421aac8e3574 (diff) | |
| download | pkgsrc-c5e85255263d50571fe67b22fc6e1d039628f0ef.tar.gz | |
Fix for crash with a segv if called as jmacs with more then
one file as an argument on the command line from upstream.
From upstream via Jasper Wallace in PR 44808.
Bump PKGREVISION.
Set LICENSE (GNU GPL v1!)
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/joe/Makefile | 5 | ||||
| -rw-r--r-- | editors/joe/distinfo | 3 | ||||
| -rw-r--r-- | editors/joe/patches/patch-main.c | 18 |
3 files changed, 23 insertions, 3 deletions
diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 3e670c398ce..19aa4046d25 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.34 2011/03/29 21:38:26 roy Exp $ +# $NetBSD: Makefile,v 1.35 2011/04/01 13:12:24 wiz Exp $ DISTNAME= joe-3.7 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=joe-editor/} MAINTAINER= adam@NetBSD.org HOMEPAGE= http://joe-editor.sourceforge.net/ COMMENT= Joe's own editor +LICENSE= gnu-gpl-v1 PKG_DESTDIR_SUPPORT= user-destdir diff --git a/editors/joe/distinfo b/editors/joe/distinfo index c3faca4c679..8814d2790ab 100644 --- a/editors/joe/distinfo +++ b/editors/joe/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.16 2011/03/29 21:38:26 roy Exp $ +$NetBSD: distinfo,v 1.17 2011/04/01 13:12:24 wiz Exp $ SHA1 (joe-3.7.tar.gz) = 54398578886d4a3d325aece52c308a939d31101d RMD160 (joe-3.7.tar.gz) = 7e2c72a750c6aac4732cf4369bceee5333460f15 @@ -6,3 +6,4 @@ Size (joe-3.7.tar.gz) = 696036 bytes SHA1 (patch-aa) = 18bf5044cf546c0080df5387719715735389f8cc SHA1 (patch-ab) = bd416192e0273b596db6ecc280ad743efd9ed421 SHA1 (patch-ac) = 8062acd877404f4a5f6a8cd7f93f49b7b06965d2 +SHA1 (patch-main.c) = d5b8fee6e814ccbc3df048dcd2d31be5cb5f4225 diff --git a/editors/joe/patches/patch-main.c b/editors/joe/patches/patch-main.c new file mode 100644 index 00000000000..9646f53d6e8 --- /dev/null +++ b/editors/joe/patches/patch-main.c @@ -0,0 +1,18 @@ +$NetBSD: patch-main.c,v 1.1 2011/04/01 13:12:24 wiz Exp $ + +Fix for crash with a segv if called as jmacs with more then +one file as an argument on the command line from upstream. + +http://joe-editor.cvs.sourceforge.net/viewvc/joe-editor/joe-current/main/main.c?r1=1.5&r2=1.6 + +--- main.c.orig 2008-10-27 03:01:11.000000000 +0000 ++++ main.c +@@ -431,7 +431,7 @@ int main(int argc, char **real_argv, cha + b->orphan = 1; + b->oldcur = pdup(b->bof, USTR "main"); + pline(b->oldcur, get_file_pos(b->name)); +- p_goto_bol(bw->cursor); ++ p_goto_bol(b->oldcur); + line = b->oldcur->line - (maint->h - 1) / 2; + if (line < 0) + line = 0; |