[ninja] fixed "Process /usr/bin/ninja-1.5.8.1 was killed by signal 11" (#718920)
Adrian Reber
adrian at fedoraproject.org
Wed Mar 28 07:56:14 UTC 2012
commit ed9189b096f2ea91649469b68b8270d6e01a0825
Author: Adrian Reber <adrian at lisas.de>
Date: Wed Mar 28 09:56:07 2012 +0200
fixed "Process /usr/bin/ninja-1.5.8.1 was killed by signal 11" (#718920)
- removed buildroot and clean section
ninja.signal-11-718920.patch | 43 ++++++++++++++++++++++++++++++++++++++++++
ninja.spec | 12 ++++++----
2 files changed, 50 insertions(+), 5 deletions(-)
---
diff --git a/ninja.signal-11-718920.patch b/ninja.signal-11-718920.patch
new file mode 100644
index 0000000..9698cd1
--- /dev/null
+++ b/ninja.signal-11-718920.patch
@@ -0,0 +1,43 @@
+--- a/source/irc.c.old 2012-03-28 09:46:57.558502133 +0200
++++ b/source/irc.c 2012-03-28 09:46:10.512440313 +0200
+@@ -257,7 +257,7 @@
+ extern FILE *awayfile;
+
+ if (!reason)
+- reason = DEFAULT_SIGNOFF_REASON;
++ malloc_strcpy(&reason, UP(DEFAULT_SIGNOFF_REASON));
+
+ /* if we're away, close the away log */
+ if (awayfile)
+@@ -305,7 +305,7 @@
+ /* build From[User,Host,UserHost] */
+ dma_strcpy(&FromUser, server_list[i].username ? server_list[i].username : username);
+ dma_strcpy(&FromHost, server_list[i].hostname ? server_list[i].hostname : hostname);
+- snprintf(tbuf, sizeof(tbuf)-1, "%s@%s", FromUser, FromHost);
++ snprintf((char *)tbuf, sizeof(tbuf)-1, "%s@%s", FromUser, FromHost);
+ tbuf[sizeof(tbuf)-1] = '\0';
+ dma_strcpy(&FromUserHost, tbuf);
+ from = server_list[i].nickname;
+@@ -340,7 +340,7 @@
+ {
+
+ if (!reason)
+- reason = DEFAULT_SIGNOFF_REASON;
++ malloc_strcpy(&reason, UP(DEFAULT_SIGNOFF_REASON));
+
+ #ifdef SHOW_OWN_SIGNOFF
+ /* this is a little hack to show yourself signing off */
+@@ -600,11 +600,11 @@
+ *realname = '\0';
+ ac = 1;
+ malloc_strcpy(&args_str, argv[0]);
+- malloc_strcat(&args_str, " ");
++ malloc_strcat(&args_str, UP(" "));
+ while ((arg = argv[ac++]) != (u_char *) NULL)
+ {
+ malloc_strcat(&args_str, argv[ac-1]);
+- malloc_strcat(&args_str, " ");
++ malloc_strcat(&args_str, UP(" "));
+ if ((*arg == '-') != '\0')
+ {
+ ++arg;
diff --git a/ninja.spec b/ninja.spec
index 3f30548..a5d6b08 100644
--- a/ninja.spec
+++ b/ninja.spec
@@ -1,6 +1,6 @@
Name: ninja
Version: 1.5.8.1
-Release: 12
+Release: 13
License: GPLv2+
Summary: Text based Internet Relay Chat (IRC) client
Group: Applications/Internet
@@ -8,7 +8,7 @@ URL: http://qoop.org/ftp/ninja/
Source0: http://qoop.org/ftp/ninja/sources/%{name}-%{version}.tar.gz
Patch0: %{name}-%{version}-doc.patch
Patch1: %{name}-%{version}-build.patch
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch2: ninja.signal-11-718920.patch
BuildRequires: ncurses-devel
%description
@@ -27,6 +27,7 @@ irc channels. Especially if you want to have power features.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%configure
@@ -42,9 +43,6 @@ mkdir -p %{buildroot}%{_mandir}/man1/
mv %{buildroot}%{_mandir}/ninja.* %{buildroot}%{_mandir}/man1/
rm %{buildroot}/%{_datadir}/%{name}/help/.date
-%clean
-rm -rf %{buildroot}
-
%files
%defattr(-,root,root, 755)
%{_bindir}/%{name}
@@ -61,6 +59,10 @@ rm -rf %{buildroot}
%doc README ChangeLog BUGS+TODO COPYING
%changelog
+* Wed Mar 28 2012 Adrian Reber <adrian at lisas.de> - 1.5.8.1-13
+- fixed "Process /usr/bin/ninja-1.5.8.1 was killed by signal 11" (#718920)
+- removed buildroot and clean section
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.8.1-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list