From 89ce253543fc8598f902d6b9efb1a1c42f15eeaf Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sun, 6 Dec 2015 15:46:58 +0100 Subject: [PATCH] new upstream release - 2.5.0 --- ...k-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch | 8 ++++---- 0002-use-futimens-if-available-instead-of-utime.patch | 6 +++--- nano-2.4.3.tar.gz.asc | 7 ------- nano-2.5.0.tar.gz.asc | 7 +++++++ nano.spec | 7 +++++-- sources | 2 +- 6 files changed, 20 insertions(+), 17 deletions(-) delete mode 100644 nano-2.4.3.tar.gz.asc create mode 100644 nano-2.5.0.tar.gz.asc 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 3914a09..26b63e8 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 -@@ -324,6 +324,24 @@ int do_lockfile(const char *filename) +@@ -321,6 +321,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) -@@ -402,11 +420,7 @@ void open_buffer(const char *filename, bool undoable) +@@ -399,11 +417,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 } -@@ -1778,10 +1792,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -1758,10 +1772,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 -@@ -2176,8 +2188,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -2151,8 +2163,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 0a995c5..01d86db 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 -@@ -1701,6 +1701,29 @@ int copy_file(FILE *inn, FILE *out) +@@ -1681,6 +1681,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 -@@ -1942,18 +1965,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -1922,18 +1945,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, -@@ -1965,6 +1979,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type +@@ -1945,6 +1959,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type goto cleanup_and_exit; } diff --git a/nano-2.4.3.tar.gz.asc b/nano-2.4.3.tar.gz.asc deleted file mode 100644 index e3cb546..0000000 --- a/nano-2.4.3.tar.gz.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iEYEABECAAYFAlZMEWcACgkQvLNW35EAn6f52QCg5WU8jiYtoRcHXSiXp0DPzfDO -lagAnAwWS8X8qgIRVkbX9YVQYsW7+BOz -=ricq ------END PGP SIGNATURE----- diff --git a/nano-2.5.0.tar.gz.asc b/nano-2.5.0.tar.gz.asc new file mode 100644 index 0000000..676b7c4 --- /dev/null +++ b/nano-2.5.0.tar.gz.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iEYEABECAAYFAlZjyBEACgkQvLNW35EAn6c2pwCg44t3cjySFYTBxqUQWn5cG/+i +nuIAoLrOVrhe06exKsGb8S9RpvqvfUPV +=jqjB +-----END PGP SIGNATURE----- diff --git a/nano.spec b/nano.spec index ac2d310..18be128 100644 --- a/nano.spec +++ b/nano.spec @@ -1,11 +1,11 @@ Summary: A small text editor Name: nano -Version: 2.4.3 +Version: 2.5.0 Release: 1%{?dist} License: GPLv3+ Group: Applications/Editors URL: http://www.nano-editor.org -Source: http://www.nano-editor.org/dist/v2.4/%{name}-%{version}.tar.gz +Source: http://www.nano-editor.org/dist/v2.5/%{name}-%{version}.tar.gz Source2: nanorc Patch0: nano-2.3.3-warnings.patch @@ -96,6 +96,9 @@ exit 0 %{_datadir}/nano %changelog +* Sun Dec 06 2015 Kamil Dudka - 2.5.0-1 +- new upstream release + * Wed Nov 18 2015 Kamil Dudka - 2.4.3-1 - new upstream release diff --git a/sources b/sources index ef0327b..057b1d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0acc0ca68eee68ef38f899532a4873c6 nano-2.4.3.tar.gz +751ed96457017572bab15be18cb873ba nano-2.5.0.tar.gz