- new upstream release

- CVE-2010-1160, CVE-2010-1161 (#582739)

.cvsignore

@@ -1 +1 @@
-nano-2.2.3.tar.gz
+nano-2.2.4.tar.gz

nano-2.2.3-warnings.patch

@@ -1,3 +1,8 @@
+ po/Makefile.in.in |    1 +
+ src/nano.c        |    2 +-
+ src/winio.c       |    1 -
+ 3 files changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/po/Makefile.in.in b/po/Makefile.in.in
 index ada8bb4..f7b2a95 100644
 --- a/po/Makefile.in.in
@@ -11,10 +16,10 @@ index ada8bb4..f7b2a95 100644
  localedir = $(datadir)/locale
  gettextsrcdir = $(datadir)/gettext/po
 diff --git a/src/nano.c b/src/nano.c
-index 7008413..22b305d 100644
+index 59e2a9d..1d1d40c 100644
 --- a/src/nano.c
 +++ b/src/nano.c
-@@ -1894,7 +1894,7 @@ precalc_cleanup:
+@@ -1901,7 +1901,7 @@ precalc_cleanup:
   * TRUE. */
  void do_output(char *output, size_t output_len, bool allow_cntrls)
  {
@@ -24,7 +29,7 @@ index 7008413..22b305d 100644
      int char_buf_len;
  
 diff --git a/src/winio.c b/src/winio.c
-index 65fd0e4..b201e02 100644
+index 1aef2a9..9fde5a2 100644
 --- a/src/winio.c
 +++ b/src/winio.c
 @@ -3125,7 +3125,6 @@ void edit_redraw(filestruct *old_current, size_t pww_save)

nano-2.2.4.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkvGxK4ACgkQvLNW35EAn6eztgCeNXlGIESZDK3KM1pPXzvX5YLD
+LkMAnR3iTvLbcYaBd2kdO+4b1QK+DeQP
+=CXLR
+-----END PGP SIGNATURE-----

nano.spec

@@ -1,6 +1,6 @@
 Summary:         A small text editor
 Name:            nano
-Version:         2.2.3
+Version:         2.2.4
 Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Editors
@@ -81,6 +81,10 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Thu Apr 15 2010 Kamil Dudka <kdudka@redhat.com> - 2.2.4-1
+- new upstream release
+- CVE-2010-1160, CVE-2010-1161 (#582739)
+
 * Wed Mar 03 2010 Kamil Dudka <kdudka@redhat.com> - 2.2.3-1
 - new upstream release
 

sources

@@ -1 +1 @@
-91918a484f54f94fedaebe00dc393a50  nano-2.2.3.tar.gz
+6304308afb1f7ef4a5e93eb99206632a  nano-2.2.4.tar.gz