kdudka pushed to nano (master). "new upstream release - 2.4.1"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Apr 14 18:38:28 UTC 2015
>From bafaa5d44ead6d1835e78632cf26b8dd43eee342 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka at redhat.com>
Date: Tue, 14 Apr 2015 20:29:08 +0200
Subject: new upstream release - 2.4.1
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 f8ac282..44d388c 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
@@ -49,7 +49,7 @@ index f6efbf1..99cc1b8 100644
#endif
}
-@@ -1770,10 +1784,8 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -1768,10 +1782,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
-@@ -2166,8 +2178,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -2164,8 +2176,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 2df3407..1246dc9 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
-@@ -1693,6 +1693,29 @@ int copy_file(FILE *inn, FILE *out)
+@@ -1691,6 +1691,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
-@@ -1934,18 +1957,9 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -1932,18 +1955,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,
-@@ -1957,6 +1971,16 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
+@@ -1955,6 +1969,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
deleted file mode 100644
index 4ba236f..0000000
--- a/nano-2.4.0.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iEYEABECAAYFAlUPkQAACgkQvLNW35EAn6fEVgCgu5ZhQL4zx55CzexuaWPaNWds
-rooAnReJx8Ife51lj3XzPosYw/gV0ypB
-=5+mu
------END PGP SIGNATURE-----
diff --git a/nano-2.4.1.tar.gz.asc b/nano-2.4.1.tar.gz.asc
new file mode 100644
index 0000000..c81164e
--- /dev/null
+++ b/nano-2.4.1.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlUtVzEACgkQvLNW35EAn6dSsQCdENF3GrHNudfN8XoKSBjWTVlD
+FUwAoLk8jBO5QdLZwyvqLh3YRQIMRESY
+=KgtI
+-----END PGP SIGNATURE-----
diff --git a/nano.spec b/nano.spec
index 130ec1b..aacfc15 100644
--- a/nano.spec
+++ b/nano.spec
@@ -1,6 +1,6 @@
Summary: A small text editor
Name: nano
-Version: 2.4.0
+Version: 2.4.1
Release: 1%{?dist}
License: GPLv3+
Group: Applications/Editors
@@ -89,6 +89,9 @@ exit 0
%{_datadir}/nano
%changelog
+* Tue Apr 14 2015 Kamil Dudka <kdudka at redhat.com> - 2.4.1-1
+- new upstream release
+
* Mon Mar 23 2015 Kamil Dudka <kdudka at redhat.com> - 2.4.0-1
- new upstream release
diff --git a/sources b/sources
index d6c2f1c..b563a6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5c9c6424ee2303663ae4b99ecd4b493 nano-2.4.0.tar.gz
+1c612b478f976abf8ef926480c7a3684 nano-2.4.1.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/nano.git/commit/?h=master&id=bafaa5d44ead6d1835e78632cf26b8dd43eee342
More information about the scm-commits
mailing list