rpms/nano/F-13 nano-2.2.3-warnings.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 nano.spec, 1.38, 1.39 sources, 1.14, 1.15

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/nano/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30978

Modified Files:
	.cvsignore nano.spec sources 
Added Files:
	nano-2.2.3-warnings.patch 
Log Message:
- new upstream release
- CVE-2010-1160, CVE-2010-1161 (#582739)

nano-2.2.3-warnings.patch:
 po/Makefile.in.in |    1 +
 src/nano.c        |    2 +-
 src/winio.c       |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE nano-2.2.3-warnings.patch ---
 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
+++ b/po/Makefile.in.in
@@ -20,6 +20,7 @@ VPATH = @srcdir@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
diff --git a/src/nano.c b/src/nano.c
index 59e2a9d..1d1d40c 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1901,7 +1901,7 @@ precalc_cleanup:
  * TRUE. */
 void do_output(char *output, size_t output_len, bool allow_cntrls)
 {
-    size_t current_len, orig_lenpt, i = 0;
+    size_t current_len, orig_lenpt = 0, i = 0;
     char *char_buf = charalloc(mb_cur_max());
     int char_buf_len;
 
diff --git a/src/winio.c b/src/winio.c
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)
                     old_current->lineno, openfile->edittop->lineno);
 #endif
 	filestruct *old_edittop = openfile->edittop;
-	ssize_t nlines;
 
 #ifndef NANO_TINY
 	/* If the mark is on, update all the lines between old_current


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nano/F-13/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- .cvsignore	29 Jan 2010 01:09:45 -0000	1.14
+++ .cvsignore	15 Apr 2010 18:12:20 -0000	1.15
@@ -1 +1 @@
-nano-2.2.2.tar.gz
+nano-2.2.4.tar.gz


Index: nano.spec
===================================================================
RCS file: /cvs/extras/rpms/nano/F-13/nano.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- nano.spec	29 Jan 2010 01:09:45 -0000	1.38
+++ nano.spec	15 Apr 2010 18:12:21 -0000	1.39
@@ -1,12 +1,13 @@
 Summary:         A small text editor
 Name:            nano
-Version:         2.2.2
+Version:         2.2.4
 Release:         1%{?dist}
 License:         GPLv3+
 Group:           Applications/Editors
 URL:             http://www.nano-editor.org
 Source:          http://www.nano-editor.org/dist/v2.2/%{name}-%{version}.tar.gz
 Source2:         nanorc
+Patch0:          nano-2.2.3-warnings.patch
 BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:   autoconf
 BuildRequires:   gettext-devel
@@ -21,6 +22,7 @@ GNU nano is a small and friendly text ed
 
 %prep
 %setup -q
+%patch0 -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
@@ -79,6 +81,10 @@ rm -rf %{buildroot}
 %{_datadir}/nano
 
 %changelog
+* Thu Apr 15 2010 Kamil Dudka <kdudka at redhat.com> - 2.2.4-1
+- new upstream release
+- CVE-2010-1160, CVE-2010-1161 (#582739)
+
 * Fri Jan 29 2010 Kamil Dudka <kdudka at redhat.com> - 2.2.2-1
 - new upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nano/F-13/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- sources	29 Jan 2010 01:09:45 -0000	1.14
+++ sources	15 Apr 2010 18:12:21 -0000	1.15
@@ -1 +1 @@
-7e3fa2c9877664f377372ef378b9f230  nano-2.2.2.tar.gz
+6304308afb1f7ef4a5e93eb99206632a  nano-2.2.4.tar.gz