Request 434 (accepted)

Overview

Request 434 (accepted)

Fixed building, also added a patch for errors when adding opt flags. PLEASE check patch, I think I have it right.

Created by malcolmlewis over 11 years ago
In state accepted
Package maintainer: detrei

Submit xsys

Submit package home:malcolmlewis...nches:Multimedia / xsys to package Multimedia / xsys

xsys.changes Added

xsys.spec Changed

@@ -1,21 +1,37 @@
-# norootforbuild
-
-Name:		xsys
-Version:	2.2.0
-Release:	3
-
-Summary:	X-Sys system information plugin for X-Chat
-URL:		http://dev.gentoo.org/~chainsaw/xsys
-License:	GPL
-Group:		Productivity/Networking/IRC
-
-Source0:	http://dev.gentoo.org/~chainsaw/xsys/download/%{name}-%{version}.tar.bz2
-
-BuildRoot:	%{_tmppath}/build-%{name}-%{version}
-
-BuildRequires:	audacious-devel dbus-1-devel glib2-devel pciutils-devel
-BuildRequires:	pkg-config xchat
-
+#
+# spec file for package xsys
+#
+# Copyright (c) 2009-2013 detlef@links2linux.de
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+Name:           xsys
+Version:        2.2.0
+Release:        3
+License:        GPL-2.0+
+Summary:        X-Sys system information plugin for X-Chat
+Url:            http://dev.gentoo.org/~chainsaw/xsys
+Group:          Productivity/Networking/IRC
+Source0:        http://dev.gentoo.org/~chainsaw/xsys/download/%{name}-%{version}.tar.bz2
+#PATCH-FIX-OPENSUSE xsys-fix-bufferoverflowstrncat-error.patch malcolmlewis@opensuse.org -- Fix Statement might be overflowing a buffer errors.
+Patch0:         xsys-fix-bufferoverflowstrncat-error.patch
+BuildRequires:  audacious-devel
+BuildRequires:  dbus-1-glib-devel
+BuildRequires:  glib2-devel
+BuildRequires:  pciutils-devel
+BuildRequires:  pkg-config
+BuildRequires:  xchat
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 X-Sys is a system information plugin for X-Chat, originally created by
@@ -36,28 +52,19 @@
     * Currently playing song in XMMS or Audacious
 
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q
+%patch0 -p1
 
 %build
-%__make  %{?jobs:-j%{jobs}}
-
+make
 
 %install
-%__install -d -m755 %{buildroot}/%{_libdir}/xchat/plugins
-%__install -m644 %{name}-%{version}.so %{buildroot}/%{_libdir}/xchat/plugins
-
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
+install -d -m755 %{buildroot}/%{_libdir}/xchat/plugins
+install -m644 %{name}-%{version}.so %{buildroot}/%{_libdir}/xchat/plugins
 
 %files
 %defattr(-, root, root)
-%doc ChangeLog INSTALL README
+%doc ChangeLog README
 %{_libdir}/xchat/plugins/%{name}-%{version}.so
 
-
 %changelog
-* Wed Aug 12 2009 Detlef Reichelt <detlef@links2linux.de> 2.2.0
-- initial build 2.2.0

xsys-fix-bufferoverflowstrncat-error.patch Added

@@ -0,0 +1,36 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2007-07-12 18:05:05.000000000 -0500
++++ b/Makefile	2013-04-12 13:22:03.595352978 -0500
+@@ -9,7 +9,7 @@
+ VER_MINOR = 2
+ VER_PATCH = 0
+ CC = gcc
+-CFLAGS += -O2 -Wall -fPIC
++CFLAGS += $(RPM_OPT_FLAGS) -fPIC
+ CFLAGS += $(shell pkg-config dbus-1 --cflags) $(shell pkg-config glib-2.0 --cflags)
+ CFLAGS += -DVER_MINOR=$(VER_MINOR) -DVER_MAJOR=$(VER_MAJOR) -DVER_PATCH=$(VER_PATCH) \
+           -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\" -DPCIIDS=\"$(PCIIDS)\" $(BUTTON)
+diff -Naur a/xsys.c b/xsys.c
+--- a/xsys.c	2007-07-13 15:38:51.000000000 -0500
++++ b/xsys.c	2013-04-12 12:18:53.459169546 -0500
+@@ -540,9 +540,9 @@
+ 	if(bytes_recv>1024)
+ 	{
+ 		bytes_recv /= 1024;
+-		snprintf(mag_r, 5, "KB/s");
++		snprintf(mag_r, sizeof(mag_r), "KB/s");
+ 	}
+-	else snprintf(mag_r, 5, "B/s");
++	else snprintf(mag_r, sizeof(mag_r), "B/s");
+ 	
+ 	if(bytes_sent>1024)
+ 	{
+@@ -719,7 +719,7 @@
+ 		flat_format_output("length", length, format);
+ 	else
+ 		format_output("length", length, format);
+-	strncat(title, length, bsize);
++	strncat(title, length, sizeof(title)-strlen(title)-1);
+ 	
+ 	if ((action != 0) && (long)userdata)
+ 		xchat_printf(ph, "You are %s", title);

Build Results
RPM Lint

Refresh

Comments for request 434 0

Request History

malcolmlewis created request over 11 years ago

Fixed building, also added a patch for errors when adding opt flags. PLEASE check patch, I think I have it right.

jsjhb accepted request over 11 years ago

At least is compiles OK, and the strncat fix is the proposed syntax, so looks OK to me ;-)