[nano] new upstream release - 2.4.0
Kamil Dudka
kdudka at fedoraproject.org
Mon Mar 23 09:32:46 UTC 2015
commit 1b68f43fb4246214b104dc3435b4905a08b63bd5
Author: Kamil Dudka <kdudka at redhat.com>
Date: Mon Mar 23 10:27:22 2015 +0100
new upstream release - 2.4.0
...s-result-and-avoid-calling-stat-on-a-NULL.patch | 8 +-
...se-futimens-if-available-instead-of-utime.patch | 8 +-
nano-2.3.5.tar.gz.asc | 7 -
nano-2.3.6-lockfile.patch | 423 ---------------------
nano-2.4.0.tar.gz.asc | 7 +
nano.spec | 13 +-
sources | 2 +-
7 files changed, 22 insertions(+), 446 deletions(-)
---
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 511b081..f8ac282 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
-@@ -310,6 +310,24 @@ int do_lockfile(const char *filename)
+@@ -316,6 +316,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)
-@@ -355,11 +373,7 @@ void open_buffer(const char *filename, bool undoable)
+@@ -380,11 +398,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
}
-@@ -1753,10 +1767,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -1770,10 +1784,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
-@@ -2149,8 +2161,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -2166,8 +2178,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 7c0fe84..2df3407 100644
--- a/0002-use-futimens-if-available-instead-of-utime.patch
+++ b/0002-use-futimens-if-available-instead-of-utime.patch
@@ -28,7 +28,7 @@ diff --git a/configure b/configure
index 02733c7..1805e53 100755
--- a/configure
+++ b/configure
-@@ -7596,7 +7596,7 @@ fi
+@@ -7755,7 +7755,7 @@ fi
@@ -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
-@@ -1676,6 +1676,29 @@ int copy_file(FILE *inn, FILE *out)
+@@ -1693,6 +1693,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
-@@ -1917,18 +1940,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -1934,18 +1957,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,
-@@ -1940,6 +1954,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -1957,6 +1971,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
goto cleanup_and_exit;
}
diff --git a/nano-2.4.0.tar.gz.asc b/nano-2.4.0.tar.gz.asc
new file mode 100644
index 0000000..4ba236f
--- /dev/null
+++ b/nano-2.4.0.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlUPkQAACgkQvLNW35EAn6fEVgCgu5ZhQL4zx55CzexuaWPaNWds
+rooAnReJx8Ife51lj3XzPosYw/gV0ypB
+=5+mu
+-----END PGP SIGNATURE-----
diff --git a/nano.spec b/nano.spec
index c7f0a08..130ec1b 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,11 +1,11 @@
Summary: A small text editor
Name: nano
-Version: 2.3.6
-Release: 7%{?dist}
+Version: 2.4.0
+Release: 1%{?dist}
License: GPLv3+
Group: Applications/Editors
URL: http://www.nano-editor.org
-Source: http://www.nano-editor.org/dist/v2.3/%{name}-%{version}.tar.gz
+Source: http://www.nano-editor.org/dist/v2.4/%{name}-%{version}.tar.gz
Source2: nanorc
Patch0: nano-2.3.3-warnings.patch
@@ -15,9 +15,6 @@ Patch1: 0001-check-stat-s-result-and-avoid-calling-stat-on-a-NULL.patch
# http://lists.gnu.org/archive/html/nano-devel/2010-08/msg00005.html
Patch2: 0002-use-futimens-if-available-instead-of-utime.patch
-# fix the file locking feature of nano (#1183320)
-Patch3: nano-2.3.6-lockfile.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: file-devel
BuildRequires: gettext-devel
@@ -37,7 +34,6 @@ GNU nano is a small and friendly text editor.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
for f in doc/man/fr/{nano.1,nanorc.5,rnano.1} ; do
iconv -f iso-8859-1 -t utf-8 -o $f.tmp $f && mv $f.tmp $f
@@ -93,6 +89,9 @@ exit 0
%{_datadir}/nano
%changelog
+* Mon Mar 23 2015 Kamil Dudka <kdudka at redhat.com> - 2.4.0-1
+- new upstream release
+
* Sat Feb 21 2015 Till Maas <opensource at till.name> - 2.3.6-7
- Rebuilt for Fedora 23 Change
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
diff --git a/sources b/sources
index 58b989e..d6c2f1c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df3d201aecb3155a80633990cc467831 nano-2.3.6.tar.gz
+e5c9c6424ee2303663ae4b99ecd4b493 nano-2.4.0.tar.gz
More information about the scm-commits
mailing list