Compare commits
No commits in common. "c8s" and "c9s" have entirely different histories.
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
|||||||
|
1
|
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
/nano-2.*.*.tar.gz
|
/nano-2.*.*.tar.gz
|
||||||
/nano-2.*.*/
|
/nano-[3-5].*.tar.xz
|
||||||
|
2
ci.fmf
Normal file
2
ci.fmf
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
# Docs: https://docs.fedoraproject.org/en-US/ci/tmt/#_multiple_plans
|
||||||
|
resultsdb-testcase: separate
|
6
gating.yaml
Normal file
6
gating.yaml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-*
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/all-internal.functional}
|
@ -1,110 +0,0 @@
|
|||||||
From 5e7a3c2e7e118c7f12d5dfda9f9140f638976aa2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benno Schulenberg <bensberg@telfort.nl>
|
|
||||||
Date: Sun, 28 Apr 2024 10:51:52 +0200
|
|
||||||
Subject: files: run `chmod` and `chown` on the descriptor, not on the filename
|
|
||||||
|
|
||||||
This closes a window of opportunity where the emergency file could be
|
|
||||||
replaced by a malicious symlink.
|
|
||||||
|
|
||||||
The issue was reported by `MartinJM` and `InvisibleMeerkat`.
|
|
||||||
|
|
||||||
Problem existed since version 2.2.0, commit 123110c5, when chmodding
|
|
||||||
and chowning of the emergency .save file was added.
|
|
||||||
|
|
||||||
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
|
||||||
Upstream-commit: 5e7a3c2e7e118c7f12d5dfda9f9140f638976aa2
|
|
||||||
|
|
||||||
---
|
|
||||||
src/files.c | 18 +++++++++++++++---
|
|
||||||
src/nano.c | 12 +-----------
|
|
||||||
src/nano.h | 2 +-
|
|
||||||
3 files changed, 17 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/files.c b/src/files.c
|
|
||||||
index 8cdf195..e822068 100644
|
|
||||||
--- a/src/files.c
|
|
||||||
+++ b/src/files.c
|
|
||||||
@@ -1551,7 +1551,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
|
|
||||||
* set retval and then goto cleanup_and_exit. */
|
|
||||||
size_t lineswritten = 0;
|
|
||||||
const filestruct *fileptr = openfile->fileage;
|
|
||||||
- int fd;
|
|
||||||
+ int fd = 0;
|
|
||||||
/* The file descriptor we use. */
|
|
||||||
mode_t original_umask = 0;
|
|
||||||
/* Our umask, from when nano started. */
|
|
||||||
@@ -1920,14 +1920,26 @@ bool write_file(const char *name, FILE *f_open, bool tmp,
|
|
||||||
goto cleanup_and_exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (copy_file(f_source, f, TRUE) != 0) {
|
|
||||||
+ if (copy_file(f_source, f, FALSE) != 0) {
|
|
||||||
statusline(ALERT, _("Error writing %s: %s"), realname,
|
|
||||||
strerror(errno));
|
|
||||||
goto cleanup_and_exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
unlink(tempname);
|
|
||||||
- } else if (fclose(f) != 0) {
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+#ifndef NANO_TINY
|
|
||||||
+ /* Change permissions and owner of an emergency save file to the values
|
|
||||||
+ * of the original file, but ignore any failure as we are in a hurry. */
|
|
||||||
+ if (method == EMERGENCY && fd && openfile->current_stat) {
|
|
||||||
+ IGNORE_CALL_RESULT(fchmod(fd, openfile->current_stat->st_mode));
|
|
||||||
+ IGNORE_CALL_RESULT(fchown(fd, openfile->current_stat->st_uid,
|
|
||||||
+ openfile->current_stat->st_gid));
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ if (fclose(f) != 0) {
|
|
||||||
statusline(ALERT, _("Error writing %s: %s"), realname,
|
|
||||||
strerror(errno));
|
|
||||||
goto cleanup_and_exit;
|
|
||||||
diff --git a/src/nano.c b/src/nano.c
|
|
||||||
index 79b5450..9b9c468 100644
|
|
||||||
--- a/src/nano.c
|
|
||||||
+++ b/src/nano.c
|
|
||||||
@@ -644,7 +644,7 @@ void emergency_save(const char *die_filename, struct stat *die_stat)
|
|
||||||
targetname = get_next_filename(die_filename, ".save");
|
|
||||||
|
|
||||||
if (*targetname != '\0')
|
|
||||||
- failed = !write_file(targetname, NULL, TRUE, OVERWRITE, FALSE);
|
|
||||||
+ failed = !write_file(targetname, NULL, TRUE, EMERGENCY, FALSE);
|
|
||||||
|
|
||||||
if (!failed)
|
|
||||||
fprintf(stderr, _("\nBuffer written to %s\n"), targetname);
|
|
||||||
@@ -655,16 +655,6 @@ void emergency_save(const char *die_filename, struct stat *die_stat)
|
|
||||||
fprintf(stderr, _("\nBuffer not written: %s\n"),
|
|
||||||
_("Too many backup files?"));
|
|
||||||
|
|
||||||
-#ifndef NANO_TINY
|
|
||||||
- /* Try to chmod/chown the saved file to the values of the original file,
|
|
||||||
- * but ignore any failure as we are in a hurry to get out. */
|
|
||||||
- if (die_stat) {
|
|
||||||
- IGNORE_CALL_RESULT(chmod(targetname, die_stat->st_mode));
|
|
||||||
- IGNORE_CALL_RESULT(chown(targetname, die_stat->st_uid,
|
|
||||||
- die_stat->st_gid));
|
|
||||||
- }
|
|
||||||
-#endif
|
|
||||||
-
|
|
||||||
free(targetname);
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/src/nano.h b/src/nano.h
|
|
||||||
index 4fd186a..5e22fb7 100644
|
|
||||||
--- a/src/nano.h
|
|
||||||
+++ b/src/nano.h
|
|
||||||
@@ -157,7 +157,7 @@ typedef enum {
|
|
||||||
} message_type;
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
- OVERWRITE, APPEND, PREPEND
|
|
||||||
+ OVERWRITE, APPEND, PREPEND, EMERGENCY
|
|
||||||
} kind_of_writing_type;
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
--
|
|
||||||
2.45.2
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEv9AJBh5TUFKtDfIVDSjU0qCs6IQFAlsSVMkACgkQDSjU0qCs
|
|
||||||
6IR99BAAnWR+QygOw1tCFHtCM83K3Z+Ufgjy/WuiJYRZVB3FUVM8L2sq+KY8DMHN
|
|
||||||
/8jW5ztibvZI7hTfEMCeaPOS+y4vkScSCW/qb6qK81rDswsDESvGulA1nHLayS++
|
|
||||||
0b34A2PmgMpPsFf2qPac7TQ13xjUxCnV/Qt03yfRnKPoo3YoJRnxKw4vH2DJWIGz
|
|
||||||
/77IwUlGUufEaZZ0U5JzOKr35o1pPA+sP/wje976v28Qxv9e9WDEsc2ks3dNsKWu
|
|
||||||
aS0orQYHmHcxUy1vrxPwYrBt38CFzTOoBMPewe9d/mHMgDooX5HBhZ4fC4Ov0LIy
|
|
||||||
TRiXZeyx2ArVwsmgcPo8J2Ly5BDAIQnLEJdfSIU2qCckGmMrzQaGuuYRLqNGG8Up
|
|
||||||
/mYc/Xkfg8iYv/GN2UfwWPsWI1S3yaHhwgVjWXj5+Ma5agtZTvdLgIdRf0d/s2oh
|
|
||||||
oLNFv4DEhPE3jrliYNMqso5MP2E5Q5V6h7ubLRFyZr8fQmvMtU8gCqAsB8f/pTo1
|
|
||||||
51wpM8S8I8U/PUFEoDH1Yjfno6XWnqeL0YmlLXMHVE065j/fNb5qn0xo6T+bCgrb
|
|
||||||
uyCzR33QvfEJMya8GkPW/KK+Q1Vk0BBg/d9loA0OcApkrHDOqDfZenHIE2t1vZ/V
|
|
||||||
Wdaq+VdodYHaY6YzTPrAYwkQwzV6EY/aJfgNyeAb8v/JgpQGpVA=
|
|
||||||
=JHeW
|
|
||||||
-----END PGP SIGNATURE-----
|
|
102
nano-5.6.1-emergency-file-replace-vuln.patch
Normal file
102
nano-5.6.1-emergency-file-replace-vuln.patch
Normal file
@ -0,0 +1,102 @@
|
|||||||
|
From 5e7a3c2e7e118c7f12d5dfda9f9140f638976aa2 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Benno Schulenberg <bensberg@telfort.nl>
|
||||||
|
Date: Sun, 28 Apr 2024 10:51:52 +0200
|
||||||
|
Subject: files: run `chmod` and `chown` on the descriptor, not on the filename
|
||||||
|
|
||||||
|
This closes a window of opportunity where the emergency file could be
|
||||||
|
replaced by a malicious symlink.
|
||||||
|
|
||||||
|
The issue was reported by `MartinJM` and `InvisibleMeerkat`.
|
||||||
|
|
||||||
|
Problem existed since version 2.2.0, commit 123110c5, when chmodding
|
||||||
|
and chowning of the emergency .save file was added.
|
||||||
|
|
||||||
|
Cherry-picked-by: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Upstream-commit: 5e7a3c2e7e118c7f12d5dfda9f9140f638976aa2
|
||||||
|
|
||||||
|
diff --git a/src/definitions.h b/src/definitions.h
|
||||||
|
index af3a793..55d8235 100644
|
||||||
|
--- a/src/definitions.h
|
||||||
|
+++ b/src/definitions.h
|
||||||
|
@@ -254,7 +254,7 @@ typedef enum {
|
||||||
|
} message_type;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
- OVERWRITE, APPEND, PREPEND
|
||||||
|
+ OVERWRITE, APPEND, PREPEND, EMERGENCY
|
||||||
|
} kind_of_writing_type;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
diff --git a/src/files.c b/src/files.c
|
||||||
|
index 57c2001..584b579 100644
|
||||||
|
--- a/src/files.c
|
||||||
|
+++ b/src/files.c
|
||||||
|
@@ -1751,6 +1751,8 @@ bool write_file(const char *name, FILE *thefile, bool normal,
|
||||||
|
#endif
|
||||||
|
char *realname = real_dir_from_tilde(name);
|
||||||
|
/* The filename after tilde expansion. */
|
||||||
|
+ int fd = 0;
|
||||||
|
+ /* The descriptor that is assigned when opening the file. */
|
||||||
|
char *tempname = NULL;
|
||||||
|
/* The name of the temporary file we use when prepending. */
|
||||||
|
linestruct *line = openfile->filetop;
|
||||||
|
@@ -1830,7 +1830,6 @@ bool write_file(const char *name, FILE *thefile, bool normal,
|
||||||
|
* For an emergency file, access is restricted to just the owner. */
|
||||||
|
if (thefile == NULL) {
|
||||||
|
mode_t permissions = (tmp ? S_IRUSR|S_IWUSR : RW_FOR_ALL);
|
||||||
|
- int fd;
|
||||||
|
|
||||||
|
#ifndef NANO_TINY
|
||||||
|
block_sigwinch(TRUE);
|
||||||
|
@@ -1953,6 +1953,16 @@ bool write_file(const char *name, FILE *thefile, bool normal,
|
||||||
|
goto cleanup_and_exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifndef NANO_TINY
|
||||||
|
+ /* Change permissions and owner of an emergency save file to the values
|
||||||
|
+ * of the original file, but ignore any failure as we are in a hurry. */
|
||||||
|
+ if (method == EMERGENCY && fd && openfile->statinfo) {
|
||||||
|
+ IGNORE_CALL_RESULT(fchmod(fd, openfile->statinfo->st_mode));
|
||||||
|
+ IGNORE_CALL_RESULT(fchown(fd, openfile->statinfo->st_uid,
|
||||||
|
+ openfile->statinfo->st_gid));
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
if (fclose(thefile) != 0) {
|
||||||
|
statusline(ALERT, _("Error writing %s: %s"), realname, strerror(errno));
|
||||||
|
goto cleanup_and_exit;
|
||||||
|
|
||||||
|
diff --git a/src/nano.c b/src/nano.c
|
||||||
|
index 90b4a0b..973054f 100644
|
||||||
|
--- a/src/nano.c
|
||||||
|
+++ b/src/nano.c
|
||||||
|
@@ -321,25 +321,15 @@ void emergency_save(const char *filename)
|
||||||
|
targetname = get_next_filename(plainname, ".save");
|
||||||
|
|
||||||
|
if (*targetname != '\0')
|
||||||
|
- failed = !write_file(targetname, NULL, TRUE, OVERWRITE, FALSE);
|
||||||
|
+ failed = !write_file(targetname, NULL, TRUE, EMERGENCY, FALSE);
|
||||||
|
|
||||||
|
if (!failed)
|
||||||
|
fprintf(stderr, _("\nBuffer written to %s\n"), targetname);
|
||||||
|
else if (*targetname != '\0')
|
||||||
|
fprintf(stderr, _("\nBuffer not written to %s: %s\n"),
|
||||||
|
targetname, strerror(errno));
|
||||||
|
else
|
||||||
|
fprintf(stderr, _("\nToo many .save files"));
|
||||||
|
-
|
||||||
|
-#ifndef NANO_TINY
|
||||||
|
- /* Try to chmod/chown the saved file to the values of the original file,
|
||||||
|
- * but ignore any failure as we are in a hurry to get out. */
|
||||||
|
- if (openfile->statinfo) {
|
||||||
|
- IGNORE_CALL_RESULT(chmod(targetname, openfile->statinfo->st_mode));
|
||||||
|
- IGNORE_CALL_RESULT(chown(targetname, openfile->statinfo->st_uid,
|
||||||
|
- openfile->statinfo->st_gid));
|
||||||
|
- }
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
free(targetname);
|
||||||
|
}
|
||||||
|
--
|
||||||
|
cgit v1.1
|
||||||
|
|
35
nano-5.6.1-fix-leak-after-linter-failure.patch
Normal file
35
nano-5.6.1-fix-leak-after-linter-failure.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 7fd38e88c12133859f48ca3191fe341795401982 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Lukáš Zaoral <lzaoral@redhat.com>
|
||||||
|
Date: Tue, 10 Dec 2024 10:01:07 +0100
|
||||||
|
Subject: memory: avoid a leak when linter aborts after producing parsable
|
||||||
|
output
|
||||||
|
|
||||||
|
Any collected messages should be freed also after an
|
||||||
|
abnormal exit of the linter.
|
||||||
|
|
||||||
|
Buglet existed since version 2.4.1, commit f225991b.
|
||||||
|
---
|
||||||
|
src/text.c | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/text.c b/src/text.c
|
||||||
|
index e924e818..5ac9d4ca 100644
|
||||||
|
--- a/src/text.c
|
||||||
|
+++ b/src/text.c
|
||||||
|
@@ -2755,6 +2755,13 @@ void do_linter(void)
|
||||||
|
|
||||||
|
if (!WIFEXITED(lint_status) || WEXITSTATUS(lint_status) > 2) {
|
||||||
|
statusline(ALERT, _("Error invoking '%s'"), openfile->syntax->linter);
|
||||||
|
+ for (curlint = lints; curlint != NULL;) {
|
||||||
|
+ tmplint = curlint;
|
||||||
|
+ curlint = curlint->next;
|
||||||
|
+ free(tmplint->msg);
|
||||||
|
+ free(tmplint->filename);
|
||||||
|
+ free(tmplint);
|
||||||
|
+ }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
cgit v1.2.3-70-g09d2
|
||||||
|
|
16
nano-5.6.1.tar.xz.asc
Normal file
16
nano-5.6.1.tar.xz.asc
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEv9AJBh5TUFKtDfIVDSjU0qCs6IQFAmA/UvIACgkQDSjU0qCs
|
||||||
|
6ITgEA//QF5uO+jui0G1UjPuilIAHbupuKL89kJSDyzaUCr5icFk0d/WEgjcbTX1
|
||||||
|
Ch1TpJeXILRUD78Wme9yS5/FX1UCB+n7LXQu28DdK5ux/ygwXRT3ILt4u8VPXu0w
|
||||||
|
+Ce5oKxWXeN8qLSkOuv179YjZAiFzkJkBKXpvsyHI0aMoLkzAKKRbAogYknpefaO
|
||||||
|
CMDMIP4JTIm6PwIaDFPiUrT1VVclBSDPf2wGaPHvPLEI1in43fqJ6GHKWx8l4AFI
|
||||||
|
iVlC89T+sieqrbR5TkjyovT5L4Wog2Jp4BWVLv37bUHGWIUuOR4SxkSC+XALCrGC
|
||||||
|
Pa+MEBzv1w9CN18wc+fGLOkr74XPEeb24T0r+sw3DEas8/XKDKLscGBXxZySynqU
|
||||||
|
C/6Vj1toXzxS1HHgA9iTrd0v/Fwm/M87fH+XyZBk24aSjVIYrTu3W6rBGUatBkJ1
|
||||||
|
a7jvXMe9gM7vITZEEPUGo3LTYldBiEO/NwfGZvgZbegbq1JgM7q0doIab469uvFN
|
||||||
|
fdcB0i9hSZuBPy10LZ7ONtQ+vkqFZUkiw7KZoQqIPX4Rc0USdt8ctqN0UrYtpos8
|
||||||
|
eXQJywXHAVCMHJXrigpBUKgsgIIHhewnWszzKw8dxEEmzIxHYWn7yfhg4HTrx3Tp
|
||||||
|
ZnF2ZBHBff72RiZPShKcHmwO2K+ih/8gmC7CgBFQ4CzUOHbf5Ac=
|
||||||
|
=Q3mg
|
||||||
|
-----END PGP SIGNATURE-----
|
5
nano-default-editor.csh
Normal file
5
nano-default-editor.csh
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Ensure GNU nano is set as EDITOR if it isn't already set
|
||||||
|
|
||||||
|
if ( ! ($?EDITOR) ) then
|
||||||
|
setenv EDITOR "/usr/bin/nano"
|
||||||
|
endif
|
8
nano-default-editor.fish
Normal file
8
nano-default-editor.fish
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
# Ensure GNU nano is set as EDITOR if it isn't already set
|
||||||
|
# This is set as a universal variable so that any other definition
|
||||||
|
# by the user would win
|
||||||
|
# Cf. https://fishshell.com/docs/current/index.html#variables-scope
|
||||||
|
|
||||||
|
if ! set -q EDITOR;
|
||||||
|
set -x EDITOR /usr/bin/nano
|
||||||
|
end
|
5
nano-default-editor.sh
Normal file
5
nano-default-editor.sh
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# Ensure GNU nano is set as EDITOR if it isn't already set
|
||||||
|
|
||||||
|
if [ -z "$EDITOR" ]; then
|
||||||
|
export EDITOR="/usr/bin/nano"
|
||||||
|
fi
|
216
nano.spec
216
nano.spec
@ -1,30 +1,57 @@
|
|||||||
|
# build nano-default-editor by default only on fedora
|
||||||
|
%if 0%{?fedora}
|
||||||
|
%bcond_without default_editor
|
||||||
|
%else
|
||||||
|
%bcond_with default_editor
|
||||||
|
%endif
|
||||||
|
|
||||||
Summary: A small text editor
|
Summary: A small text editor
|
||||||
Name: nano
|
Name: nano
|
||||||
Version: 2.9.8
|
Version: 5.6.1
|
||||||
Release: 3%{?dist}
|
Release: 7%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://www.nano-editor.org
|
URL: https://www.nano-editor.org
|
||||||
Source: https://www.nano-editor.org/dist/v2.9/%{name}-%{version}.tar.gz
|
Source: https://www.nano-editor.org/dist/latest/%{name}-%{version}.tar.xz
|
||||||
Source2: nanorc
|
Source2: nanorc
|
||||||
|
|
||||||
|
# Shell snippets for default-editor setup
|
||||||
|
Source11: nano-default-editor.sh
|
||||||
|
Source12: nano-default-editor.csh
|
||||||
|
Source13: nano-default-editor.fish
|
||||||
|
|
||||||
# fix emergency file replacement vulnerability (CVE-2024-5742)
|
# fix emergency file replacement vulnerability (CVE-2024-5742)
|
||||||
Patch0: nano-2.9.8-emergency-file-replace-vuln.patch
|
Patch0: nano-5.6.1-emergency-file-replace-vuln.patch
|
||||||
|
# avoid a leak when linter aborts after producing parsable output (RHEL-51175)
|
||||||
|
Patch1: nano-5.6.1-fix-leak-after-linter-failure.patch
|
||||||
|
|
||||||
BuildRequires: file-devel
|
BuildRequires: file-devel
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
BuildRequires: groff
|
BuildRequires: groff
|
||||||
|
BuildRequires: make
|
||||||
BuildRequires: ncurses-devel
|
BuildRequires: ncurses-devel
|
||||||
BuildRequires: sed
|
BuildRequires: sed
|
||||||
BuildRequires: texinfo
|
BuildRequires: texinfo
|
||||||
Conflicts: filesystem < 3
|
Conflicts: filesystem < 3
|
||||||
Requires(post): /sbin/install-info
|
|
||||||
Requires(preun): /sbin/install-info
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
GNU nano is a small and friendly text editor.
|
GNU nano is a small and friendly text editor.
|
||||||
|
|
||||||
|
%if %{with default_editor}
|
||||||
|
%package default-editor
|
||||||
|
Summary: Sets GNU nano as the default editor
|
||||||
|
Requires: nano = %{version}-%{release}
|
||||||
|
# Ensure that only one package with this capability is installed
|
||||||
|
Provides: system-default-editor
|
||||||
|
Conflicts: system-default-editor
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
|
%description default-editor
|
||||||
|
This package ensures the EDITOR shell variable
|
||||||
|
is set in common shells to GNU nano.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -S git
|
%autosetup -S git
|
||||||
|
|
||||||
@ -33,14 +60,12 @@ mkdir build
|
|||||||
cd build
|
cd build
|
||||||
%global _configure ../configure
|
%global _configure ../configure
|
||||||
%configure
|
%configure
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
# generate default /etc/nanorc
|
# generate default /etc/nanorc
|
||||||
# - disable line wrapping by default
|
|
||||||
# - set hunspell as the default spell-checker
|
# - set hunspell as the default spell-checker
|
||||||
# - enable syntax highlighting by default (#1270712)
|
# - enable syntax highlighting by default (#1270712)
|
||||||
sed -e 's/# set nowrap/set nowrap/' \
|
sed -e 's/^#.*set speller.*$/set speller "hunspell"/' \
|
||||||
-e 's/^#.*set speller.*$/set speller "hunspell"/' \
|
|
||||||
-e 's|^# \(include "/usr/share/nano/\*.nanorc"\)|\1|' \
|
-e 's|^# \(include "/usr/share/nano/\*.nanorc"\)|\1|' \
|
||||||
%{SOURCE2} doc/sample.nanorc > ./nanorc
|
%{SOURCE2} doc/sample.nanorc > ./nanorc
|
||||||
|
|
||||||
@ -56,21 +81,18 @@ rm -f %{buildroot}%{_docdir}/nano/{nano,nano.1,nanorc.5,rnano.1}.html
|
|||||||
mkdir -p %{buildroot}%{_sysconfdir}
|
mkdir -p %{buildroot}%{_sysconfdir}
|
||||||
install -m 0644 ./nanorc %{buildroot}%{_sysconfdir}/nanorc
|
install -m 0644 ./nanorc %{buildroot}%{_sysconfdir}/nanorc
|
||||||
|
|
||||||
|
# enable all extra syntax highlighting files by default
|
||||||
|
mv %{buildroot}%{_datadir}/nano/extra/* %{buildroot}%{_datadir}/nano
|
||||||
|
rm -rf %{buildroot}%{_datadir}/nano/extra
|
||||||
|
|
||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%post
|
%if %{with default_editor}
|
||||||
if [ -f %{_infodir}/%{name}.info.gz ]; then
|
# install nano-default-editor snippets
|
||||||
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir
|
install -Dpm 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/profile.d/%{basename:%{S:11}}
|
||||||
fi
|
install -Dpm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/profile.d/%{basename:%{S:12}}
|
||||||
exit 0
|
install -Dpm 0644 %{SOURCE13} %{buildroot}%{_datadir}/fish/vendor_conf.d/%{basename:%{S:13}}
|
||||||
|
%endif
|
||||||
%preun
|
|
||||||
if [ $1 -eq 0 ]; then
|
|
||||||
if [ -f %{_infodir}/%{name}.info.gz ]; then
|
|
||||||
/sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%files -f build/%{name}.lang
|
%files -f build/%{name}.lang
|
||||||
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
|
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
|
||||||
@ -82,13 +104,149 @@ exit 0
|
|||||||
%{_infodir}/nano.info*
|
%{_infodir}/nano.info*
|
||||||
%{_datadir}/nano
|
%{_datadir}/nano
|
||||||
|
|
||||||
%changelog
|
%if %{with default_editor}
|
||||||
* Thu Jul 11 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.8-3
|
%files default-editor
|
||||||
- fix incomplete backport of the fix for the emergency file replacement
|
%dir %{_sysconfdir}/profile.d
|
||||||
vulnerability (RHEL-35236)
|
%config(noreplace) %{_sysconfdir}/profile.d/nano-default-editor.*
|
||||||
|
%dir %{_datadir}/fish/vendor_conf.d
|
||||||
|
%{_datadir}/fish/vendor_conf.d/nano-default-editor.fish
|
||||||
|
%endif
|
||||||
|
|
||||||
* Thu Jul 04 2024 Lukáš Zaoral <lzaoral@redhat.com> - 2.9.8-2
|
|
||||||
- fix emergency file replacement vulnerability (RHEL-35236)
|
%changelog
|
||||||
|
* Wed Dec 11 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.6.1-7
|
||||||
|
- avoid a leak when linter aborts after producing parsable output (RHEL-51175)
|
||||||
|
|
||||||
|
* Mon Jul 01 2024 Lukáš Zaoral <lzaoral@redhat.com> - 5.6.1-6
|
||||||
|
- fix emergency file replacement vulnerability (RHEL-35237)
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 5.6.1-5
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Thu Jun 10 2021 Florian Weimer <fweimer@redhat.com> - 5.6.1-4
|
||||||
|
- Rebuild with updated binutils (#1960667)
|
||||||
|
|
||||||
|
* Wed May 05 2021 Kamil Dudka <kdudka@redhat.com> - 5.6.1-3
|
||||||
|
- build nano-default-editor by default only on fedora
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.6.1-2
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Wed Mar 03 2021 Kamil Dudka <kdudka@redhat.com> - 5.6.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Wed Feb 24 2021 Kamil Dudka <kdudka@redhat.com> - 5.6-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.5-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 14 2021 Kamil Dudka <kdudka@redhat.com> - 5.5-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Wed Dec 02 2020 Kamil Dudka <kdudka@redhat.com> - 5.4-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Thu Oct 15 2020 Zdenek Dohnal <zdohnal@redhat.com> - 5.3-4
|
||||||
|
- fix nano-default-editor.fish - don't give EDITOR an universal scope
|
||||||
|
|
||||||
|
* Mon Oct 12 2020 Neal Gompa <ngompa13@gmail.com> - 5.3-3
|
||||||
|
- Ensure default-editor subpackage is easily swappable
|
||||||
|
|
||||||
|
* Thu Oct 08 2020 Neal Gompa <ngompa13@gmail.com> - 5.3-2
|
||||||
|
- Enable all extra definitions for syntax highlighting (#1886561)
|
||||||
|
|
||||||
|
* Wed Oct 07 2020 Kamil Dudka <kdudka@redhat.com> - 5.3-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Mon Aug 24 2020 Kamil Dudka <kdudka@redhat.com> - 5.2-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Sat Aug 15 2020 Kamil Dudka <kdudka@redhat.com> - 5.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Thu Jul 30 2020 Kamil Dudka <kdudka@redhat.com> - 5.0-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.9.3-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 23 2020 Tom Stellard <tstellar@redhat.com> - 4.9.3-3
|
||||||
|
- Use make macros
|
||||||
|
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
|
||||||
|
|
||||||
|
* Thu Jul 16 2020 Neal Gompa <ngompa13@gmail.com> - 4.9.3-2
|
||||||
|
- Add default-editor subpackage (#1854444)
|
||||||
|
|
||||||
|
* Mon May 25 2020 Kamil Dudka <kdudka@redhat.com> - 4.9.3-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue Apr 07 2020 Kamil Dudka <kdudka@redhat.com> - 4.9.2-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue Mar 31 2020 Kamil Dudka <kdudka@redhat.com> - 4.9.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue Mar 24 2020 Kamil Dudka <kdudka@redhat.com> - 4.9-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Fri Feb 07 2020 Kamil Dudka <kdudka@redhat.com> - 4.8-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.7-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Dec 23 2019 Kamil Dudka <kdudka@redhat.com> - 4.7-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Fri Nov 29 2019 Kamil Dudka <kdudka@redhat.com> - 4.6-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Fri Oct 04 2019 Kamil Dudka <kdudka@redhat.com> - 4.5-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Mon Aug 26 2019 Kamil Dudka <kdudka@redhat.com> - 4.4-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jun 18 2019 Kamil Dudka <kdudka@redhat.com> - 4.3-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue May 28 2019 Kamil Dudka <kdudka@redhat.com> - 4.2-2
|
||||||
|
- fix possible crash while opening help
|
||||||
|
|
||||||
|
* Wed Apr 24 2019 Kamil Dudka <kdudka@redhat.com> - 4.2-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Mon Apr 15 2019 Kamil Dudka <kdudka@redhat.com> - 4.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Tue Apr 02 2019 Kamil Dudka <kdudka@redhat.com> - 4.0-2
|
||||||
|
- make sure that variables on stack are initialized
|
||||||
|
|
||||||
|
* Mon Mar 25 2019 Kamil Dudka <kdudka@redhat.com> - 4.0-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 12 2018 Kamil Dudka <kdudka@redhat.com> - 3.2-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Wed Sep 19 2018 Kamil Dudka <kdudka@redhat.com> - 3.1-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Fri Sep 14 2018 Kamil Dudka <kdudka@redhat.com> - 3.0-2
|
||||||
|
- when Ctrl+Shift+Delete has no key code, do not fall back to KEY_BACKSPACE
|
||||||
|
|
||||||
|
* Mon Sep 10 2018 Kamil Dudka <kdudka@redhat.com> - 3.0-1
|
||||||
|
- new upstream release
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.8-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Jun 04 2018 Kamil Dudka <kdudka@redhat.com> - 2.9.8-1
|
* Mon Jun 04 2018 Kamil Dudka <kdudka@redhat.com> - 2.9.8-1
|
||||||
- new upstream release
|
- new upstream release
|
||||||
|
9
plans.fmf
Normal file
9
plans.fmf
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
/all-internal:
|
||||||
|
discover:
|
||||||
|
how: fmf
|
||||||
|
url: https://pkgs.devel.redhat.com/git/tests/nano
|
||||||
|
execute:
|
||||||
|
how: tmt
|
||||||
|
adjust:
|
||||||
|
enabled: false
|
||||||
|
when: distro == centos-stream or distro == fedora
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (nano-2.9.8.tar.gz) = dcc7b074b585135e34339648fc725f54964488813d49fac50cf88c11d7cfcb8514907dbc2631ce7664ab0241717e8c42833e3c037070c80c8e7bee68fc280a2d
|
SHA512 (nano-5.6.1.tar.xz) = d33eed1a141a3325d5afb9157d5a3448d54a2e33fdee934d161553b7e705734d0244b6f3c826e5b0afb9db827ada915f2cebe756ca00bef8d605288922c520fc
|
||||||
|
Loading…
Reference in New Issue
Block a user