Update to version 4.2

- resolves #1315126

.gitignore

@@ -1 +1,2 @@
 /joe-4.1.tar.gz
+/joe-4.2.tar.gz

joe-3.7-joerc.patch

@@ -18,7 +18,7 @@ diff -up joe-3.7/rc/joerc.in.joerc joe-3.7/rc/joerc.in
 +prevw		^[ [ 3 D	alt left in gnome-terminal
  query		^K ?		Macro query insert
  record		^K [		Record a macro
- retype		^R		Refresh screen
+  retype		^R		Refresh screen
 @@ -763,8 +767,8 @@ if,"char==65",then,"it's an A",else,"it'
  :def ispellword psh,nextword,markk,prevword,markb,filt,"cat >ispell.tmp;ispell ispell.tmp </dev/tty >/dev/tty;tr -d <ispell.tmp '\\012';/bin/rm ispell.tmp",rtn,retype,nextword
  

joe-3.8-indent-ow.patch

@@ -50,8 +50,8 @@ index 8e1caa8..e552896 100644
  				}
 @@ -523,6 +526,7 @@ int uformat(W *w, int k)
  	BW *bw;
- 	WIND_BW(bw, w);
  	int flag;
+ 	WIND_BW(bw, w);
 +	off_t indents_size = 0;
  
  	p = pdup(bw->cursor, "uformat");

joe-4.1-use-after-free.patch

@@ -1,12 +0,0 @@
-diff -r 11552fe918c3 -r e26894707ac5 joe/main.c
---- a/joe/main.c	Thu Sep 17 12:51:50 2015 -0400
-+++ b/joe/main.c	Fri Oct 02 17:22:09 2015 -0400
-@@ -211,7 +211,7 @@
- 		}
- 
- 		/* Restore modes */
--		if (maint->curwin->watom->what & TYPETW) {
-+		if (!leave && maint->curwin->watom->what & TYPETW) {
- 			bw = (BW *)maint->curwin->object;
- 
- 			if (auto_off) {

joe.spec

@@ -1,7 +1,7 @@
 Summary: An easy to use, modeless text editor
 Name: joe
-Version: 4.1
-Release: 3%{?dist}
+Version: 4.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Editors
 URL: http://sourceforge.net/projects/joe-editor/
@@ -15,7 +15,6 @@ Patch2: joe-3.8-time.patch
 Patch4: joe-3.8-indent-ow.patch
 Patch5: joe-3.8-aarch64.patch
 Patch6: joe-3.8-format-security.patch
-Patch7: joe-4.1-use-after-free.patch
 
 BuildRequires: ncurses-devel libselinux-devel
 
@@ -32,7 +31,6 @@ environment.
 %patch4 -p1 -b .of
 %patch5 -p1 -b .aarch64
 %patch6 -p1 -b .format-security
-%patch7 -p1 -b .use-after-free
 iconv -f koi8-r -t utf-8 ./man/ru/joe.1.in >./man/ru/joe.1.in.aux
 touch -r ./man/ru/joe.1.in ./man/ru/joe.1.in.aux
 mv ./man/ru/joe.1.in.aux ./man/ru/joe.1.in
@@ -69,6 +67,10 @@ popd
 %{_datadir}/%{name}
 
 %changelog
+* Tue Mar 08 2016 Nikola Forró <nforro@redhat.com> - 4.2-1
+- Update to version 4.2
+  resolves #1315126
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

sources

@@ -1 +1 @@
-b8c9ab4295e3208ddbbaa9c1141564f9  joe-4.1.tar.gz
+0a70057cc4493320f9838822451857ef  joe-4.2.tar.gz