debian/0000775000000000000000000000000012145232231007163 5ustar debian/rules0000775000000000000000000000221412145232165010250 0ustar #!/usr/bin/make -f # -*- makefile -*- export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif configure: configure-stamp configure-stamp: dh_testdir touch configure-stamp build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: configure-stamp dh_testdir $(MAKE) touch $@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp $(MAKE) clean dh_clean install: build dh_testdir dh_testroot dh_clean -k dh_installdirs usr/lib/xchat/plugins dh_install xsys-2.2.0.so usr/lib/xchat/plugins # Build architecture-independent files here. binary-indep: build install # Blank here :) # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installchangelogs ChangeLog dh_installdocs README dh_link dh_strip dh_fixperms dh_compress dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install configure debian/changelog0000664000000000000000000000716512145232141011046 0ustar xchat-xsys (2.2.0-3ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - debian/control: Add lsb-release to Depends. - debian/patches/fix_whitespace: Change remove_leading_whitespace in match.c so that it removes all leading whitespaces (tabs included). - debian/patches/fix_wrong_distro: Change xs_parse_distro in parse.c to use lsb_release instead of its own version. - debian/patches/fix_xsys2.conf: Fix xchat crashing when xchat-xsys configuration file is not present. -- Logan Rosen Thu, 16 May 2013 15:24:46 -0400 xchat-xsys (2.2.0-3) unstable; urgency=low * The 'hey-long-time-no-see' dupload. * Include local patch to include /ether by default (Closes: #687446). * Build using hardening flags, build-dep on dpkg-dev because of that and add local patch to fix chainbuilder LDFLAGS glitch. * Switch to 3.0 quilt source format. * Switch to machine-readable copyright. * Enhance porting targets on debian/rules. * Bump up Standards-Version to 3.9.3 (no relevant changes required). * Switch to my @d.o account. -- Ulises Vitulli Mon, 05 Nov 2012 19:59:16 -0300 xchat-xsys (2.2.0-2ubuntu4) lucid; urgency=low * Fix bug in the fix_whitespace patch (LP: #512113) -- Jean-Louis Dupond Mon, 25 Jan 2010 00:45:26 +0100 xchat-xsys (2.2.0-2ubuntu3) karmic; urgency=low * No-change rebuild for libaudclient1 -> libaudclient2 transition. -- Steve Kowalik Sun, 09 Aug 2009 22:46:35 +1000 xchat-xsys (2.2.0-2ubuntu2) intrepid; urgency=low * debian/patches/fix_xsys2.conf: fix xchat crashing when xchat-xsys configuration file is not present (LP: #58513) -- Cesare Tirabassi Wed, 14 May 2008 22:16:10 +0200 xchat-xsys (2.2.0-2ubuntu1) intrepid; urgency=low * Merge from Debian unstable. Remaining Ubuntu changes: - Add quilt support in debian/control and debian/rules. - debian/patches/fix_wrong_distro (LP: #221171): change xs_parse_distro in parse.c to use lsb_release instead of its own version. - debian/patches/fix_whitespace: change remove_leading_whitespace in match.c so that it removes all leading whitespaces (tabs included). - Modify Maintainer value to match the DebianMaintainerField specification. * debian/control: Add lsb-release as a Depends -- Cesare Tirabassi Fri, 09 May 2008 22:25:47 +0200 xchat-xsys (2.2.0-2) unstable; urgency=low * libpci-dev replaced pciutils-dev (Closes: #478399). -- Ulises Vitulli Tue, 29 Apr 2008 14:03:01 -0300 xchat-xsys (2.2.0-1ubuntu1) intrepid; urgency=low * Add quilt support in debian/control and debian/rules. * debian/patches/fix_wrong_distro (LP: #221171): change xs_parse_distro in parse.c to use lsb_release instead of its own version. * debian/patches/fix_whitespace: change remove_leading_whitespace in match.c so that it removes all leading whitespaces (tabs included). * Modify Maintainer value to match the DebianMaintainerField specification. -- Cesare Tirabassi Tue, 29 Apr 2008 20:28:54 +0200 xchat-xsys (2.2.0-1) unstable; urgency=high * New upstrem release (Closes: #352350, #372306). * New maintainer: http://lists.debian.org/debian-devel/2008/03/msg00377.html. * Fixing dynamic dependence on old libpci.so.2. -- Ulises Vitulli Tue, 11 Mar 2008 14:13:05 -0200 xchat-xsys (2.0.9-1) unstable; urgency=low * Initial release. (Closes: #339619) -- Ricardo Markiewicz Tue, 23 Aug 2005 11:09:59 -0300 debian/compat0000664000000000000000000000000212145231141010360 0ustar 5 debian/copyright0000664000000000000000000000362412145231163011126 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: X-Sys Upstream-Contact: Tony Vroon Source: http://dev.gentoo.org/~chainsaw/xsys/ Files: * Copyright: 2003-2005 Michael Shoup 2005-2008 Tony Vroon License: GPL-2.0 Files: debian/* Copyright: 2006-2012 Ulises Vitulli License: GPL-3.0+ License: GPL-2.0 This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. . This package 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 General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". License: GPL-3.0+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. . This package 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 General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . . On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". debian/source/0000775000000000000000000000000012145232231010463 5ustar debian/source/format0000664000000000000000000000001412145231163011674 0ustar 3.0 (quilt) debian/source/include-binaries0000664000000000000000000000006312145231163013625 0ustar hwmon.o match.o parse.o pci.o xsys-2.2.0.so xsys.o debian/control0000664000000000000000000000204612145231237010575 0ustar Source: xchat-xsys Section: misc Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Ulises Vitulli Build-Depends: debhelper (>= 5), libpci-dev, audacious-dev, dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.3 Homepage: http://dev.gentoo.org/~chainsaw/xsys/ Package: xchat-xsys Architecture: any Depends: xchat (>= 2.4.0), lsb-release, ${shlibs:Depends}, ${misc:Depends} Recommends: audacious Description: x-chat plugin that can display your current system statistics X-Sys is a plugin for X-Chat that allows you to display your current system statistics in a channel, private conversation or just in an echo to yourself for testing purposes. . The plugin can display the following information: * Number of CPU's and their specifications. * Operating system information. * Video card type. * Sound card type. * Memory and swap usage. * Disk usage. * Ethernet card type. * Network traffic, both current and total. * Currently supporting audacious. debian/patches/0000775000000000000000000000000012145232231010612 5ustar debian/patches/fix_whitespace0000664000000000000000000000073612145231141013544 0ustar --- xchat-xsys-2.2.0.orig/match.c 2007-11-12 21:00:39.000000000 +0100 +++ xchat-xsys-2.2.0/match.c 2010-01-25 00:26:06.837498322 +0100 @@ -68,12 +68,14 @@ void remove_leading_whitespace(char *buffer) { - char *pos; - while((pos = memchr(buffer, 0x20, 1))) - { - pos += 1; - strcpy(buffer, pos); - } + char *pos = malloc(bsize); + + strcpy(pos, buffer); + + while (*pos && isspace(*pos)) + pos++; + + strcpy(buffer, pos); } char *decruft_filename(char *buffer) debian/patches/fix_wrong_distro0000664000000000000000000000414612145231141014127 0ustar Index: xchat-xsys-2.2.0/parse.c =================================================================== --- xchat-xsys-2.2.0.orig/parse.c 2008-04-29 20:37:15.000000000 +0200 +++ xchat-xsys-2.2.0/parse.c 2008-04-29 20:38:19.000000000 +0200 @@ -374,8 +374,8 @@ { FILE *fp = NULL; char buffer[bsize], *pos = NULL; - - if((fp = fopen("/etc/lsb_release", "r")) != NULL) + + if((fp = popen("/usr/bin/lsb_release -icr", "r")) != NULL) { char id[bsize], codename[bsize], release[bsize]; strcpy(id, "?"); @@ -383,42 +383,16 @@ strcpy(release, "?"); while(fgets(buffer, bsize, fp) != NULL) { - find_match_char(buffer, "DISTRIB_ID", id); - find_match_char(buffer, "DISTRIB_CODENAME", codename); - find_match_char(buffer, "DISTRIB_RELEASE", release); + find_match_char(buffer, "Distributor ID", id); + find_match_char(buffer, "Codename", codename); + find_match_char(buffer, "Release", release); } snprintf(buffer, bsize, "%s \"%s\" %s", id, codename, release); + pclose(fp); } - else if((fp = fopen("/etc/make.conf", "r")) != NULL) - { - char keywords[bsize]; - while(fgets(buffer, bsize, fp) != NULL) - find_match_char(buffer, "ACCEPT_KEYWORDS", keywords); - if (strstr(keywords, "\"") == NULL) - snprintf(buffer, bsize, "Gentoo Linux (stable)"); - else - snprintf(buffer, bsize, "Gentoo Linux %s", keywords); - } - else if((fp = fopen("/etc/redhat-release", "r")) != NULL) - fgets(buffer, bsize, fp); - else if((fp = fopen("/etc/slackware-version", "r")) != NULL) - fgets(buffer, bsize, fp); - else if((fp = fopen("/etc/mandrake-release", "r")) != NULL) - fgets(buffer, bsize, fp); - else if((fp = fopen("/etc/debian_version", "r")) != NULL) - { - char release[bsize]; - fgets(release, bsize, fp); - snprintf(buffer, bsize, "Debian %s", release); - } - else if((fp = fopen("/etc/SuSE-release", "r")) != NULL) - fgets(buffer, bsize, fp); - else if((fp = fopen("/etc/turbolinux-release", "r")) != NULL) - fgets(buffer, bsize, fp); else snprintf(buffer, bsize, "Unknown Distro"); - if(fp != NULL) fclose(fp); - + pos=strchr(buffer, '\n'); if(pos != NULL) *pos = '\0'; strcpy(name, buffer); debian/patches/fix-makefile-ldflags.patch0000664000000000000000000000216612145231163015616 0ustar Description: Fix upstream Makefile handle of LDFLAGS Author: Ulises Vitulli Index: xchat-xsys-2.2.0/Makefile =================================================================== --- xchat-xsys-2.2.0.orig/Makefile 2012-11-05 21:36:00.000000000 -0300 +++ xchat-xsys-2.2.0/Makefile 2012-11-05 21:36:54.000000000 -0300 @@ -13,14 +13,14 @@ 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) -LDFLAGS = $(CFLAGS) -shared +LDFLAGS += -shared LIBRARY = xsys-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).so OBJECTS = xsys.o parse.o pci.o match.o hwmon.o ALL : $(LIBRARY) $(LIBRARY) : $(OBJECTS) - $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci $(shell pkg-config dbus-1 --libs) $(shell pkg-config glib-2.0 --libs) -laudclient + $(CC) $(CFLAGS) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci $(shell pkg-config dbus-1 --libs) $(shell pkg-config glib-2.0 --libs) -laudclient xsys.o : xsys.c parse.o : parse.c debian/patches/series0000664000000000000000000000014412145231503012027 0ustar fix-makefile-ldflags.patch include-slash-ether.patch fix_wrong_distro fix_whitespace fix_xsys2.conf debian/patches/fix_xsys2.conf0000664000000000000000000000101612145231141013414 0ustar Index: xchat-xsys-2.2.0/xsys.c =================================================================== --- xchat-xsys-2.2.0.orig/xsys.c 2008-05-14 22:14:00.000000000 +0200 +++ xchat-xsys-2.2.0/xsys.c 2008-05-14 22:15:15.000000000 +0200 @@ -153,8 +153,11 @@ snprintf(buffer, bsize, "%s/xsys2.conf", xchat_get_info(ph, "xchatdirfs")); fp = fopen(buffer, "r"); if(fp == NULL) + { save_config(); - + fp = fopen(buffer, "r"); + } + while(fgets(buffer, bsize, fp) != NULL) { find_match_char(buffer, "format", format); debian/patches/include-slash-ether.patch0000664000000000000000000000146112145231163015500 0ustar Description: Include /ether by default Author: Abel McClendon Bug-Debian: http://bugs.debian.org/687446 Index: xchat-xsys-2.2.0/xsys.c =================================================================== --- xchat-xsys-2.2.0.orig/xsys.c 2012-11-05 21:50:01.000000000 -0300 +++ xchat-xsys-2.2.0/xsys.c 2012-11-05 21:50:34.000000000 -0300 @@ -313,6 +313,14 @@ format_output("video", buffer, format); strcat(sysinfo, "\017 "); strncat(sysinfo, buffer, bsize-strlen(buffer)); + +//BEGIN ETHER PARSING + if(xs_parse_ether(buffer)) + strncpy(buffer, "None found", bsize); + format_output("ether", buffer, format); + strcat(sysinfo, "\017 "); + strncat(sysinfo, buffer, bsize-strlen(buffer)); + //BEGIN SOUND PARSING if(xs_parse_sound(buffer)) strncpy(buffer, "Not present", bsize);