dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-conky-1.4.5.tar.bz2

.gitignore

@@ -0,0 +1 @@
+conky-1.6.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: conky
-# $Id$
-NAME := conky
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

conky-1.6.0-rdtsc.patch

@@ -0,0 +1,17 @@
+diff -up conky-1.6.0/src/linux.c.rdtsc conky-1.6.0/src/linux.c
+--- conky-1.6.0/src/linux.c.rdtsc	2008-07-15 03:02:37.000000000 +0200
++++ conky-1.6.0/src/linux.c	2008-07-22 13:56:04.000000000 +0200
+@@ -1061,9 +1061,11 @@ void get_adt746x_cpu(char *p_client_buff
+ unsigned long long int rdtsc(void)
+ {
+ 	unsigned long long int x;
++	unsigned int a, d;
+ 
+-	__asm__ volatile(".byte 0x0f, 0x31":"=A" (x));
+-	return x;
++	__asm__ volatile(".byte 0x0f, 0x31":"=a" (a),"=d" (d));
++	x = d;
++	return x << 32 | a;
+ }
+ #endif
+ 

conky-1.6.1-ifaddrs.patch

@@ -0,0 +1,24 @@
+diff -up conky-1.6.1/src/linux.c.ifaddrs conky-1.6.1/src/linux.c
+--- conky-1.6.1/src/linux.c.ifaddrs	2008-08-20 12:50:15.000000000 +0200
++++ conky-1.6.1/src/linux.c	2008-08-20 12:50:31.000000000 +0200
+@@ -353,7 +353,7 @@ void update_net_stats(void)
+ 	for (i2 = 0; i2 < 16; i2++) {
+ 		struct net_stat *ns;
+ 		char *s, *p;
+-		char temp_addr[17];
++		char temp_addr[18];
+ 		long long r, t, last_recv, last_trans;
+ 
+ 		if (fgets(buf, 255, net_dev_fp) == NULL) {
+@@ -380,9 +380,9 @@ void update_net_stats(void)
+ 		memset(&(ns->addr.sa_data), 0, 14);
+ 
+ 		if(NULL == ns->addrs)
+-			ns->addrs = (char*) malloc(17 * 16);
++			ns->addrs = (char*) malloc(17 * 16 + 1);
+ 		if(NULL != ns->addrs)
+-			memset(ns->addrs, 0, 17 * 16); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
++			memset(ns->addrs, 0, 17 * 16 + 1); /* Up to 17 chars per ip, max 16 interfaces. Nasty memory usage... */
+ 
+ 		last_recv = ns->recv;
+ 		last_trans = ns->trans;

conky-news.diff

@@ -1,37 +0,0 @@
---- /home/errr/src/conky-1.4.5/NEWS	2006-11-21 14:08:08.000000000 -0600
-+++ NEWS	2006-12-14 00:29:27.000000000 -0600
-@@ -1,3 +1,34 @@
-+Summary of changes for Conky release 1.4.5:
-+-------------------------------------------
-+Added config items: 
-+- max_specials 
-+- max_port_monitor_connections 
-+ 
-+Removed config items: 
-+- min_port_monitors 
-+- min_port_monitor_connections 
-+ 
-+Added variables: 
-+- entropy_avail 
-+- entropy_poolsize 
-+- entropy_bar 
-+ 
-+Added length specifier to audacious_title. 
-+ 
-+Split battery var into: 
-+- battery and battery_time 
-+ 
-+Fixed broken texeci variable. 
-+Fixed build error with --disable-x11. 
-+Fixed build error with --disable-xdamage. 
-+Fixed acpi battery issues. 
-+Fixed mem var overflows when >= 4GB. 
-+Close pop3/imap sockets properly. 
-+Improved internal thread handling. 
-+Converted tcp_portmon internal hash to GLib  
-+for GPL compatibility.
-+
-+
- Summary of changes for Conky release 1.4.4:
- -------------------------------------------
- * fix build error for freebsd.

conky-timed_c.diff

@@ -1,34 +0,0 @@
---- /home/errr/src/conky-1.4.5/src/timed_thread.c	2006-12-02 17:07:47.000000000 -0600
-+++ src/timed_thread.c	2006-12-14 00:29:24.000000000 -0600
-@@ -1,10 +1,26 @@
--/* $Id: timed_thread.c 803 2006-12-02 23:07:21Z pkovacs $ */
-+/* $Id: timed_thread.c 817 2006-12-13 16:54:59Z pkovacs $ */
- 
--/* timed_thread.c
-- * Author: Philip Kovacs
-+/* 
-+ * timed_thread.c: Abstraction layer for timed threads
-  *
-- * Abstraction layer for timed threads
-- * */
-+ * Copyright (C) 2006  Philip Kovacs pkovacs@users.sourceforge.net
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-+ * USA.
-+ *
-+ */
- 
- #include <pthread.h>
- #include <assert.h>

conky-timed_h.diff

@@ -1,34 +0,0 @@
---- /home/errr/src/conky-1.4.5/src/timed_thread.h	2006-11-21 14:08:07.000000000 -0600
-+++ src/timed_thread.h	2006-12-14 00:29:24.000000000 -0600
-@@ -1,10 +1,26 @@
--/* $Id: timed_thread.h 772 2006-11-15 01:20:49Z pkovacs $ */
-+/* $Id: timed_thread.h 817 2006-12-13 16:54:59Z pkovacs $ */
- 
--/* timed_thread.h
-- * Author: Philip Kovacs 
-+/* 
-+ * timed_thread.h: Abstraction layer for timed threads
-  *
-- * Abstraction layer for timed threads
-- * */
-+ * Copyright (C) 2006  Philip Kovacs pkovacs@users.sourceforge.net
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-+ * USA.
-+ *
-+ */
- 
- #ifndef _TIMED_THREAD_H_
- #define _TIMED_THREAD_H_

conky.spec

@@ -1,23 +1,34 @@
+%bcond_without audacious
+%bcond_without mpd
+%bcond_with nvidia
+%bcond_without rss
+%bcond_without smapi
+%bcond_without wlan
+
 Name:           conky 
-Version:        1.4.5
-Release:        4%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 Summary:        A system monitor for X 
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv3+
 URL:            http://conky.sf.net/
-Source0:        http://easynews.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0:         conky-news.diff
-Patch1:         conky-timed_c.diff
-Patch2:         conky-timed_h.diff
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         conky-1.6.0-rdtsc.patch
+Patch1:         conky-1.6.1-ifaddrs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXft-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXext-devel
+%if %{with audacious}
 BuildRequires:  audacious-devel
-
+BuildRequires:  dbus-glib-devel
+%endif
+%{?with_nvidia:BuildRequires: libXNVCtrl-devel}
+%{?with_rss:BuildRequires: curl-devel}
+%{?with_wlan:BuildRequires: wireless-tools-devel}
 
 %description
 A system monitor for X originally based on the torsmo code. but more kickass. 
@@ -25,24 +36,22 @@ It just keeps on given'er. Yeah.
 
 %prep
 %setup -q
-%patch0
-%patch1
-%patch2
+%patch0 -p1 -b .rdtsc
+%patch1 -p1 -b .ifaddrs
+
+for i in AUTHORS ChangeLog; do
+    iconv -f iso8859-1 -t utf8 -o ${i}{_,} && touch -r ${i}{,_} && mv -f ${i}{_,}
+done
 
 %build
-%configure  --enable-audacious \
-            --enable-hddtemp \
-            --enable-own-window \
-            --enable-proc-uptime \
-            --enable-portmon \
-            --enable-double-buffer \
-            --enable-xft \
-            --enable-xdamage \
-            --enable-x11 \
-            --disable-bmpx \
-            --disable-xmms2 \
-            --disable-mpd \
-            --with-x
+%configure \
+%{?with_audacious: --enable-audacious=yes} \
+%{!?with_mpd:      --disable-mpd} \
+%{?with_nvidia:    --enable-nvidia} \
+%{?with_rss:       --enable-rss} \
+%{?with_smapi:     --enable-smapi} \
+%{?with_wlan:      --enable-wlan} \
+    ;
 
 make %{?_smp_mflags}
 
@@ -57,12 +66,40 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html  doc/conkyrc.sample
+%doc AUTHORS ChangeLog COPYING TODO README NEWS extras/* doc/docs.html doc/conky.conf
+%dir %{_sysconfdir}/conky
+%config %{_sysconfdir}/conky/conky.conf
 %{_bindir}/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Tue Aug 26 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.6.1-1
+- Update to 1.6.1
+- Fix buffer overflow when reading interface addresses
+
+* Tue Jul 22 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.6.0-1
+- Update to 1.6.0
+- Fix freq_dyn on x86_64
+
+* Tue Apr 01 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.1-1
+- Update to 1.5.1
+
+* Sun Mar 23 2008 Miroslav Lichvar <mlichvar@redhat.com> - 1.5.0-1
+- Update to 1.5.0
+- Convert doc files to UTF-8
+
+* Thu Dec 27 2007 Patrice Dumas <pertusus@free.fr> - 1.4.9-1.1
+- Enable support for Audacious 1.4.0
+
+* Tue Nov 27 2007 Miroslav Lichvar <mlichvar@redhat.com> - 1.4.9-1
+- Update to 1.4.9
+
+* Sun Oct 21 2007 Miroslav Lichvar <mlichvar@redhat.com> - 1.4.8-1
+- Update to 1.4.8
+- Enable mpd, rss and wireless support
+- Update license tag
+
 * Wed Apr 18 2007 Michael Rice <errr[AT]errr-online.com> - 1.4.5-4
 - Rebuild to match audacious lib in fc6 bug: 236989
 

sources

@@ -1 +1 @@
-4625c052852f2919a5e7ce2eb7c31189  conky-1.4.5.tar.bz2
+b2839f21cec18e5eaa338c7440a1ba28  conky-1.6.1.tar.bz2