rpms/nano
5
0
Fork 0
Code Issues Pull Requests Releases Activity

new upstream release - 2.4.2

Browse Source
This commit is contained in:
Kamil Dudka 2015-07-07 09:33:52 +02:00
parent 5567ed9fd2
commit fb354ce4fb
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch
View File

@ -11,7 +11,7 @@ diff --git a/src/files.c b/src/files.c
index f6efbf1..99cc1b8 100644 index f6efbf1..99cc1b8 100644
--- a/src/files.c --- a/src/files.c
+++ b/src/files.c +++ b/src/files.c
@@ -316,6 +316,24 @@ int do_lockfile(const char *filename) @@ -313,6 +313,24 @@ int do_lockfile(const char *filename)
} }
#endif /* !NANO_TINY */ #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 /* 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. */ * necessary, and then open and read the file, if applicable. */
void open_buffer(const char *filename, bool undoable) void open_buffer(const char *filename, bool undoable)
@@ -380,11 +398,7 @@ void open_buffer(const char *filename, bool undoable) @@ -376,11 +394,7 @@ void open_buffer(const char *filename, bool undoable)
if (rc > 0) { if (rc > 0) {
read_file(f, rc, filename, undoable, new_buffer); read_file(f, rc, filename, undoable, new_buffer);
#ifndef NANO_TINY #ifndef NANO_TINY
@ -49,7 +49,7 @@ index f6efbf1..99cc1b8 100644
#endif #endif
} }
@@ -1768,10 +1782,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type @@ -1749,10 +1763,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
* specified it interactively), stat and save the value now, * specified it interactively), stat and save the value now,
* or else we will chase null pointers when we do modtime checks, * or else we will chase null pointers when we do modtime checks,
* preserve file times, and so on, during backup. */ * 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 /* We backup only if the backup toggle is set, the file isn't
* temporary, and the file already exists. Furthermore, if we * temporary, and the file already exists. Furthermore, if we
@@ -2164,8 +2176,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type @@ -2145,8 +2157,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
if (openfile->current_stat == NULL) if (openfile->current_stat == NULL)
openfile->current_stat = openfile->current_stat =
(struct stat *)nmalloc(sizeof(struct stat)); (struct stat *)nmalloc(sizeof(struct stat));

6
0002-use-futimens-if-available-instead-of-utime.patch
View File

@ -54,7 +54,7 @@ diff --git a/src/files.c b/src/files.c
index 99cc1b8..9a1bdcc 100644 index 99cc1b8..9a1bdcc 100644
--- a/src/files.c --- a/src/files.c
+++ b/src/files.c +++ b/src/files.c
@@ -1691,6 +1691,29 @@ int copy_file(FILE *inn, FILE *out) @@ -1672,6 +1672,29 @@ int copy_file(FILE *inn, FILE *out)
return retval; 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 /* 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 * 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 * ourselves. If tmp is TRUE, we set the umask to disallow anyone else
@@ -1932,18 +1955,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type @@ -1913,18 +1936,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
fprintf(stderr, "Backing up %s to %s\n", realname, backupname); fprintf(stderr, "Backing up %s to %s\n", realname, backupname);
#endif #endif
@ -106,7 +106,7 @@ index 99cc1b8..9a1bdcc 100644
if (prompt_failed_backupwrite(backupname)) if (prompt_failed_backupwrite(backupname))
goto skip_backup; goto skip_backup;
statusbar(_("Error writing backup file %s: %s"), backupname, statusbar(_("Error writing backup file %s: %s"), backupname,
@@ -1955,6 +1969,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type @@ -1936,6 +1950,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
goto cleanup_and_exit; goto cleanup_and_exit;
} }

7
nano-2.4.1.tar.gz.asc
View File

@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlUtVzEACgkQvLNW35EAn6dSsQCdENF3GrHNudfN8XoKSBjWTVlD
FUwAoLk8jBO5QdLZwyvqLh3YRQIMRESY
=KgtI
-----END PGP SIGNATURE-----

7
nano-2.4.2.tar.gz.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEABECAAYFAlWY4tEACgkQvLNW35EAn6fCwwCgnoLwgu9AGefaB/T+MsTF52bj
z10AnjzaN4/wehr2NS8cg9dqoTtY283l
=23cU
-----END PGP SIGNATURE-----

7
nano.spec
View File

@ -1,7 +1,7 @@
Summary: A small text editor Summary: A small text editor
Name: nano Name: nano
Version: 2.4.1 Version: 2.4.2
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/Editors Group: Applications/Editors
URL: http://www.nano-editor.org URL: http://www.nano-editor.org
@ -89,6 +89,9 @@ exit 0
%{_datadir}/nano %{_datadir}/nano
%changelog %changelog
* Tue Jul 07 2015 Kamil Dudka <kdudka@redhat.com> - 2.4.2-1
- new upstream release
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-2 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
1c612b478f976abf8ef926480c7a3684 nano-2.4.1.tar.gz ce6968992fec4283c17984b53554168b nano-2.4.2.tar.gz