diff --git a/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch b/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch index 2bb8f66..3914a09 100644 --- a/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch +++ b/0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch @@ -11,7 +11,7 @@ diff --git a/src/files.c b/src/files.c index f6efbf1..99cc1b8 100644 --- a/src/files.c +++ b/src/files.c -@@ -313,6 +313,24 @@ int do_lockfile(const char *filename) +@@ -324,6 +324,24 @@ int do_lockfile(const char *filename) } #endif /* !NANO_TINY */ @@ -36,7 +36,7 @@ index f6efbf1..99cc1b8 100644 /* If it's not "", filename is a file to open. We make a new buffer, if * necessary, and then open and read the file, if applicable. */ void open_buffer(const char *filename, bool undoable) -@@ -376,11 +394,7 @@ void open_buffer(const char *filename, bool undoable) +@@ -402,11 +420,7 @@ void open_buffer(const char *filename, bool undoable) if (rc > 0) { read_file(f, rc, filename, undoable, new_buffer); #ifndef NANO_TINY @@ -49,7 +49,7 @@ index f6efbf1..99cc1b8 100644 #endif } -@@ -1749,10 +1763,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -1778,10 +1792,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type * specified it interactively), stat and save the value now, * or else we will chase null pointers when we do modtime checks, * preserve file times, and so on, during backup. */ @@ -62,7 +62,7 @@ index f6efbf1..99cc1b8 100644 /* We backup only if the backup toggle is set, the file isn't * temporary, and the file already exists. Furthermore, if we -@@ -2145,8 +2157,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -2176,8 +2188,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type if (openfile->current_stat == NULL) openfile->current_stat = (struct stat *)nmalloc(sizeof(struct stat)); diff --git a/0002-use-futimens-if-available-instead-of-utime.patch b/0002-use-futimens-if-available-instead-of-utime.patch index 214c405..0a995c5 100644 --- a/0002-use-futimens-if-available-instead-of-utime.patch +++ b/0002-use-futimens-if-available-instead-of-utime.patch @@ -54,7 +54,7 @@ diff --git a/src/files.c b/src/files.c index 99cc1b8..9a1bdcc 100644 --- a/src/files.c +++ b/src/files.c -@@ -1672,6 +1672,29 @@ int copy_file(FILE *inn, FILE *out) +@@ -1701,6 +1701,29 @@ int copy_file(FILE *inn, FILE *out) return retval; } @@ -84,7 +84,7 @@ index 99cc1b8..9a1bdcc 100644 /* Write a file out to disk. If f_open isn't NULL, we assume that it is * a stream associated with the file, and we don't try to open it * ourselves. If tmp is TRUE, we set the umask to disallow anyone else -@@ -1913,18 +1936,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -1942,18 +1965,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type fprintf(stderr, "Backing up %s to %s\n", realname, backupname); #endif @@ -106,7 +106,7 @@ index 99cc1b8..9a1bdcc 100644 if (prompt_failed_backupwrite(backupname)) goto skip_backup; statusbar(_("Error writing backup file %s: %s"), backupname, -@@ -1936,6 +1950,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -1965,6 +1979,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type goto cleanup_and_exit; } diff --git a/nano-2.4.2.tar.gz.asc b/nano-2.4.2.tar.gz.asc deleted file mode 100644 index 27161c1..0000000 --- a/nano-2.4.2.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlWY4tEACgkQvLNW35EAn6fCwwCgnoLwgu9AGefaB/T+MsTF52bj -z10AnjzaN4/wehr2NS8cg9dqoTtY283l -=23cU ------END PGP SIGNATURE----- diff --git a/nano-2.4.3.tar.gz.asc b/nano-2.4.3.tar.gz.asc new file mode 100644 index 0000000..e3cb546 --- /dev/null +++ b/nano-2.4.3.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlZMEWcACgkQvLNW35EAn6f52QCg5WU8jiYtoRcHXSiXp0DPzfDO +lagAnAwWS8X8qgIRVkbX9YVQYsW7+BOz +=ricq +-----END PGP SIGNATURE----- diff --git a/nano.spec b/nano.spec index 062477d..ac2d310 100644 --- a/nano.spec +++ b/nano.spec @@ -1,7 +1,7 @@ Summary: A small text editor Name: nano -Version: 2.4.2 -Release: 2%{?dist} +Version: 2.4.3 +Release: 1%{?dist} License: GPLv3+ Group: Applications/Editors URL: http://www.nano-editor.org @@ -96,6 +96,9 @@ exit 0 %{_datadir}/nano %changelog +* Wed Nov 18 2015 Kamil Dudka - 2.4.3-1 +- new upstream release + * Mon Oct 12 2015 Kamil Dudka - 2.4.2-2 - enable syntax highlighting by default (#1270712) - remove installed HTML documentation (to prevent a build failure in rawhide) diff --git a/sources b/sources index e7f0962..ef0327b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce6968992fec4283c17984b53554168b nano-2.4.2.tar.gz +0acc0ca68eee68ef38f899532a4873c6 nano-2.4.3.tar.gz