diff -Nru qtsmbstatus-2.2.0/changelog qtsmbstatus-2.2.1/changelog --- qtsmbstatus-2.2.0/changelog 2011-06-28 17:58:34.000000000 +0000 +++ qtsmbstatus-2.2.1/changelog 2012-02-19 17:45:47.000000000 +0000 @@ -1,5 +1,9 @@ Changelog for QtSmbstatus: +2012-02-19 - Version 2.2.1: + - fix: authentification required with smbclient + - Updated some translations + 2011-06-26 - Version 2.2.0: - Check server certificate (known host). A protection against Man-In-The-Middle Attacks - Updated some translations diff -Nru qtsmbstatus-2.2.0/client/mainwindows.cpp qtsmbstatus-2.2.1/client/mainwindows.cpp --- qtsmbstatus-2.2.0/client/mainwindows.cpp 2011-06-28 17:58:33.000000000 +0000 +++ qtsmbstatus-2.2.1/client/mainwindows.cpp 2012-02-19 17:45:44.000000000 +0000 @@ -253,7 +253,7 @@ "Ukrainian translation Motsyo Gennadi, Андрей Стрепетов" "Swedish translation Zirro" "Brazilian Portuguese translation Muriel de Souza Godoi, Rafael Porto Rodrigues" - "Dutch translation Elco, Robert Wubs" + "Dutch translation Jogai, Elco, Robert Wubs" "RPM packages for FC3 CG (cyberkoa)" "Second reading Eric Bresson" "
")+ Binary files /tmp/bz9lHJSh1v/qtsmbstatus-2.2.0/client/tr/qtsmbstatus_nl.qm and /tmp/JX34blTHFz/qtsmbstatus-2.2.1/client/tr/qtsmbstatus_nl.qm differ diff -Nru qtsmbstatus-2.2.0/client/tr/qtsmbstatus_nl.ts qtsmbstatus-2.2.1/client/tr/qtsmbstatus_nl.ts --- qtsmbstatus-2.2.0/client/tr/qtsmbstatus_nl.ts 2011-06-28 17:58:33.000000000 +0000 +++ qtsmbstatus-2.2.1/client/tr/qtsmbstatus_nl.ts 2012-02-19 17:45:44.000000000 +0000 @@ -14,14 +14,14 @@ Project-Id-Version: qtsmbstatus Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS> POT-Creation-Date: 2008-11-12 21:25+0200 -PO-Revision-Date: 2009-09-24 14:10+0000 -Last-Translator: Elco <Unknown> +PO-Revision-Date: 2011-10-25 18:23+0000 +Last-Translator: Jogai <wouter@microshit.nl> Language-Team: Dutch <nl@li.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -X-Launchpad-Export-Date: 2009-12-26 10:24+0000 -X-Generator: Launchpad (build Unknown) +X-Launchpad-Export-Date: 2012-02-19 17:04+0000 +X-Generator: Launchpad (build 14814) @@ -446,36 +446,36 @@ Verbinding maken bezig op %1 - Connected to host - Verbonden met host + The server certificate doesn't contain valid data or expired ! + Het server certificaat bevat geen geldige data of is verlopen! - Connection closed - Verbinding verbroken + The authenticity of host '%1' can't be established. + De echtheid van host '%1' kan niet worden bevestigd. - Disconnect - Verbinding verbreken + SHA1 Fingerprint: %1. + SHA1 Vingerafdruk: %1. - Invalid login or password ! - Ongeldig gebruikersnaam of wachtwoord ! + Are you sure you want to continue connecting ? + Weet u zeker dat u verbinding wilt maken? - The server certificate doesn't contain valid data or expired ! - + Connected to host + Verbonden met host - The authenticity of host '%1' can't be established. - + Connection closed + Verbinding verbroken - Are you sure you want to continue connecting ? - + Disconnect + Verbinding verbreken - SHA1 Fingerprint: %1. - + Invalid login or password ! + Ongeldig gebruikersnaam of wachtwoord ! diff -Nru qtsmbstatus-2.2.0/common/common.cpp qtsmbstatus-2.2.1/common/common.cpp --- qtsmbstatus-2.2.0/common/common.cpp 2011-06-28 17:58:33.000000000 +0000 +++ qtsmbstatus-2.2.1/common/common.cpp 2012-02-19 17:45:44.000000000 +0000 @@ -44,9 +44,9 @@ // variables environnements -QString version_qtsmbstatus="2.2.0"; -uint int_qtsmbstatus_version=220; -QString date_qtsmbstatus="2011-06-26"; +QString version_qtsmbstatus="2.2.1"; +uint int_qtsmbstatus_version=221; +QString date_qtsmbstatus="2012-02-19"; QString auteur_qtsmbstatus="Daniel Rocher"; QString mail_qtsmbstatus="daniel.rocher@adella.org"; QString web_qtsmbstatus="http://qtsmbstatus.free.fr"; diff -Nru qtsmbstatus-2.2.0/debian/changelog qtsmbstatus-2.2.1/debian/changelog --- qtsmbstatus-2.2.0/debian/changelog 2011-07-01 09:46:36.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/changelog 2012-02-19 19:13:24.000000000 +0000 @@ -1,42 +1,20 @@ -qtsmbstatus (2.2.0-1) unstable; urgency=low +qtsmbstatus (2.2.1-0~ppa1~oneiric) oneiric; urgency=low - * New upstream release: - - Check server certificate (known host). A protection against - Man-In-The-Middle Attacks. - - Update translations. - * Remove 0001-translations.patch. - * debian/rules: - - Enable parallel building. - - Remove unneeded override_*. - - Link with --as-needed. - * debian/control: - - Remove shlibs:Depends from qtsmbstatus-language's Depends field. - - Remove Conflicts field, stable has qtsmbstatus >> 2.0.99 - - Bump Standards. + * New upstream release - -- Alessio Treglia Fri, 01 Jul 2011 11:45:15 +0200 + -- Daniel Rocher Sun, 19 Feb 2012 18:36:20 +0100 + +qtsmbstatus (2.2.0-0~ppa1~natty) natty; urgency=low -qtsmbstatus (2.1.3-2) unstable; urgency=low + * New upstream release - * debian/patches/0001-translations.patch: - - Update translations. - * debian/patches/0001-disable_check_for_upstream_updates.patch: - - Don't check for upstream updates. - * Bump Standards. - * Add gbp's config file. - * Update my e-mail address. - * Drop DM-Upload-Allowed: yes. - - -- Alessio Treglia Mon, 14 Feb 2011 18:36:19 +0100 - -qtsmbstatus (2.1.3-1) unstable; urgency=low - - * New upstream release. - * Move packaging to Git. - * Switch to debian 3.0 (quilt) format. - * Update debian/copyright. + -- Daniel Rocher Tue, 28 Jun 2011 20:43:16 +0200 + +qtsmbstatus (2.1.3-0~ppa1~lucid) lucid; urgency=low + + * New upstream release - -- Alessio Treglia Sat, 24 Apr 2010 19:47:31 +0200 + -- Daniel Rocher Thu, 22 Apr 2010 17:48:24 +0200 qtsmbstatus (2.1.2-3) unstable; urgency=low diff -Nru qtsmbstatus-2.2.0/debian/control qtsmbstatus-2.2.1/debian/control --- qtsmbstatus-2.2.0/debian/control 2011-07-01 09:44:18.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/control 2012-02-19 19:13:24.000000000 +0000 @@ -1,18 +1,19 @@ Source: qtsmbstatus Section: net Priority: optional -Maintainer: Alessio Treglia +Maintainer: Alessio Treglia Build-Depends: debhelper (>= 7.0.50~), libqt4-dev, libpam0g-dev -Standards-Version: 3.9.2 +Standards-Version: 3.8.4 +DM-Upload-Allowed: yes Homepage: http://qtsmbstatus.free.fr/ -Vcs-Git: git://git.debian.org/collab-maint/qtsmbstatus.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/qtsmbstatus.git Package: qtsmbstatus-language Architecture: all -Depends: ${misc:Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends} +Conflicts: qtsmbstatus-client (<= 2.0.99) Description: QtSmbstatus languages package QtSmbstatus is a smbstatus graphical interface (GUI). It is meant to provide the possibility of administering remote machines. diff -Nru qtsmbstatus-2.2.0/debian/copyright qtsmbstatus-2.2.1/debian/copyright --- qtsmbstatus-2.2.0/debian/copyright 2011-07-01 09:31:09.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/copyright 2012-02-19 19:13:24.000000000 +0000 @@ -1,18 +1,23 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 Name: QtSmbstatus Maintainer: Daniel Rocher Source: http://qtsmbstatus.free.fr/index.php?page=downloads -Copyright: 2004-2008, Daniel Rocher -License: GPL-2+ +File: * +Copyright: 2004, Daniel Rocher +License: GPL-2 -File: ./debian/* +File: client/mainwindows.* +Copyright: 2008, Daniel Rocher +License: GPL-2 + +File: debian/* Copyright: - 2009-2010, Alessio Treglia + 2009, Alessio Treglia 2007, Daniel Rocher -License: GPL-2+ +License: GPL-2 -License: GPL-2+ +License: GPL-2 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 2 of the License, or @@ -26,5 +31,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + X-Comment: On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-2' file. diff -Nru qtsmbstatus-2.2.0/debian/gbp.conf qtsmbstatus-2.2.1/debian/gbp.conf --- qtsmbstatus-2.2.0/debian/gbp.conf 2011-07-01 09:31:09.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[DEFAULT] -pristine-tar = True -sign-tags = True diff -Nru qtsmbstatus-2.2.0/debian/patches/0001-disable_check_for_upstream_updates.patch qtsmbstatus-2.2.1/debian/patches/0001-disable_check_for_upstream_updates.patch --- qtsmbstatus-2.2.0/debian/patches/0001-disable_check_for_upstream_updates.patch 2011-07-01 09:31:09.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/patches/0001-disable_check_for_upstream_updates.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -Description: Disable checking for upstream updates. -Author: Alessio Treglia -Forwarded: no ---- - client/mainwindows.cpp | 1 - - 1 file changed, 1 deletion(-) - ---- qtsmbstatus.orig/client/mainwindows.cpp -+++ qtsmbstatus/client/mainwindows.cpp -@@ -77,7 +77,6 @@ MainWindows::MainWindows(QWidget *parent - { - debugQt("MainWindows::MainWindows()"); - setupUi(this); -- if (check_new_release) checkForUpdateOfQtSmbstatus(); - - msgError=new QErrorMessage(this); // an error message display dialog - diff -Nru qtsmbstatus-2.2.0/debian/patches/series qtsmbstatus-2.2.1/debian/patches/series --- qtsmbstatus-2.2.0/debian/patches/series 2011-07-01 09:34:26.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-disable_check_for_upstream_updates.patch diff -Nru qtsmbstatus-2.2.0/debian/rules qtsmbstatus-2.2.1/debian/rules --- qtsmbstatus-2.2.0/debian/rules 2011-07-01 09:43:24.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/rules 2012-02-19 19:13:24.000000000 +0000 @@ -1,9 +1,12 @@ #!/usr/bin/make -f -LDFLAGS+=-Wl,--as-needed - %: - dh $@ --parallel + dh $@ + +override_dh_auto_configure: + qmake-qt4 + +override_dh_auto_install: override_dh_installinit: dh_installinit --name=qtsmbstatusd diff -Nru qtsmbstatus-2.2.0/debian/source/format qtsmbstatus-2.2.1/debian/source/format --- qtsmbstatus-2.2.0/debian/source/format 2012-02-19 19:13:24.000000000 +0000 +++ qtsmbstatus-2.2.1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru qtsmbstatus-2.2.0/packages/deb/changelog qtsmbstatus-2.2.1/packages/deb/changelog --- qtsmbstatus-2.2.0/packages/deb/changelog 2011-06-28 17:58:34.000000000 +0000 +++ qtsmbstatus-2.2.1/packages/deb/changelog 2012-02-19 17:45:47.000000000 +0000 @@ -1,3 +1,15 @@ +qtsmbstatus (2.2.1-0) unstable; urgency=low + + * New upstream release + + -- Daniel Rocher Sun, 19 Feb 2012 18:36:20 +0100 + +qtsmbstatus (2.2.0-0) unstable; urgency=low + + * New upstream release + + -- Daniel Rocher Tue, 28 Jun 2011 20:43:16 +0200 + qtsmbstatus (2.1.3-0) unstable; urgency=low * New upstream release diff -Nru qtsmbstatus-2.2.0/packages/rpm/fedora/qtsmbstatus-2.2.0-init.patch qtsmbstatus-2.2.1/packages/rpm/fedora/qtsmbstatus-2.2.0-init.patch --- qtsmbstatus-2.2.0/packages/rpm/fedora/qtsmbstatus-2.2.0-init.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtsmbstatus-2.2.1/packages/rpm/fedora/qtsmbstatus-2.2.0-init.patch 2012-02-19 17:45:47.000000000 +0000 @@ -0,0 +1,171 @@ +diff -up qtsmbstatus-2.2.0/server/etc/qtsmbstatusd.init qtsmbstatus-2.2.0/server/etc/qtsmbstatusd +--- qtsmbstatus-2.2.0/server/etc/qtsmbstatusd.init 2011-06-28 19:58:33.000000000 +0200 ++++ qtsmbstatus-2.2.0/server/etc/qtsmbstatusd 2011-06-28 20:55:16.000000000 +0200 +@@ -1,8 +1,11 @@ + #!/bin/sh +-# script for qtsmbstatusd + # ++# qtsmbstatusd ++# ++# chkconfig: 2345 99 20 ++# description: qtsmbstatusd server (QtSmbstatus is a graphical user \ ++# interface for smbstatus) + +-# For LSB + ### BEGIN INIT INFO + # Provides: qtsmbstatusd + # Required-Start: $samba +@@ -13,69 +16,99 @@ + # Description: QtSmbstatus is a graphical user interface for smbstatus + ### END INIT INFO + +-# For Mandrake/Mandriva/Fedora: +-# chkconfig: 2345 99 20 +-# description: qtsmbstatusd server (QtSmbstatus is a graphical user interface for smbstatus) ++# Source function library. ++. /etc/rc.d/init.d/functions ++ ++exec="/usr/bin/qtsmbstatusd" ++prog="qtsmbstatusd" ++config="/etc/qtsmbstatusd/qtsmbstatusd.conf" + +-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:$PATH +-NAME=qtsmbstatusd ++[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +-# see if qtsmbstatusd is running +-pid=`ps ax | awk '{print $1,$5}' | grep $NAME | awk '{print $1}' | awk '{print $1}'` ++lockfile=/var/lock/subsys/$prog + + # get locale + default_locale=en_US.UTF-8 +-if [ -f /etc/default/locale ]; then +- # Debian systems +- system_locale=`grep -re "LANG=" /etc/default/locale | awk 'BEGIN { FS = "[\"]" } { print $2 }'` +-elif [ -f /etc/sysconfig/language ]; then +- # SuSE systems +- system_locale=`grep -re "LANG=" /etc/sysconfig/language | awk 'BEGIN { FS = "[\"]" } { print $2 }'` +-elif [ -f /etc/sysconfig/i18n ]; then ++if [ -f /etc/sysconfig/i18n ]; then + # RedHat/mandriva systems + system_locale=`grep -re "LANG=" /etc/sysconfig/i18n | awk 'BEGIN { FS = "[\"]" } { print $2 }'` +-elif [ -f /etc/profile ]; then +- #default +- system_locale=`grep -re "LANG=" /etc/profile | awk 'BEGIN { FS = "[\"]" } { print $2 }'` + fi + + if [ -z $system_locale ]; then system_locale=$default_locale; fi + +-# Start or stop the qtsmbstatusd server +-case $1 in +- start | restart | reload | force-reload) +- export LANG=$system_locale +- if test "$pid" != ""; then +- kill $pid +- if qtsmbstatusd -d; then +- echo "qtsmbstatusd server restarted." +- fi +- else +- if qtsmbstatusd -d; then +- echo "qtsmbstatusd server started." +- fi +- fi +- ;; +- stop) +- if test "$pid" != ""; then +- kill -3 $pid +- fi +- echo "qtsmbstatusd server stopped" +- ;; +- +- status) +- if test "$pid" != ""; then +- echo "qtsmbstatusd : server is running." +- else +- echo "qtsmbstatusd : server is not running." +- fi +- ;; +- +- *) +- echo "Usage: qtsmbstatusd {start|stop|reload|restart|status|force-reload}" +- exit 1 +- ;; +-esac +- +-exit 0 + ++start() { ++ [ -x $exec ] || exit 5 ++ [ -f $config ] || exit 6 ++ export LANG=$system_locale ++ echo -n $"Starting $prog: " ++ $exec -d ++ retval=$? ++ echo ++ [ $retval -eq 0 ] && touch $lockfile ++ return $retval ++} ++ ++stop() { ++ echo -n $"Stopping $prog: " ++ killproc $prog ++ retval=$? ++ echo ++ [ $retval -eq 0 ] && rm -f $lockfile ++ return $retval ++} ++ ++restart() { ++ stop ++ start ++} ++ ++reload() { ++ restart ++} ++ ++force_reload() { ++ restart ++} ++ ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} ++ ++rh_status_q() { ++ rh_status >/dev/null 2>&1 ++} ++ ++ ++case "$1" in ++ start) ++ rh_status_q && exit 0 ++ $1 ++ ;; ++ stop) ++ rh_status_q || exit 0 ++ $1 ++ ;; ++ restart) ++ $1 ++ ;; ++ reload) ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload ++ ;; ++ status) ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; ++ *) ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 ++esac ++exit $? diff -Nru qtsmbstatus-2.2.0/packages/rpm/fedora/qtsmbstatus-2.2.1-init.patch qtsmbstatus-2.2.1/packages/rpm/fedora/qtsmbstatus-2.2.1-init.patch --- qtsmbstatus-2.2.0/packages/rpm/fedora/qtsmbstatus-2.2.1-init.patch 1970-01-01 00:00:00.000000000 +0000 +++ qtsmbstatus-2.2.1/packages/rpm/fedora/qtsmbstatus-2.2.1-init.patch 2012-02-19 17:45:47.000000000 +0000 @@ -0,0 +1,171 @@ +diff -up qtsmbstatus-2.2.1/server/etc/qtsmbstatusd.init qtsmbstatus-2.2.1/server/etc/qtsmbstatusd +--- qtsmbstatus-2.2.1/server/etc/qtsmbstatusd.init 2012-02-19 19:58:33.000000000 +0200 ++++ qtsmbstatus-2.2.1/server/etc/qtsmbstatusd 2012-02-19 20:55:16.000000000 +0200 +@@ -1,8 +1,11 @@ + #!/bin/sh +-# script for qtsmbstatusd + # ++# qtsmbstatusd ++# ++# chkconfig: 2345 99 20 ++# description: qtsmbstatusd server (QtSmbstatus is a graphical user \ ++# interface for smbstatus) + +-# For LSB + ### BEGIN INIT INFO + # Provides: qtsmbstatusd + # Required-Start: $samba +@@ -13,69 +16,99 @@ + # Description: QtSmbstatus is a graphical user interface for smbstatus + ### END INIT INFO + +-# For Mandrake/Mandriva/Fedora: +-# chkconfig: 2345 99 20 +-# description: qtsmbstatusd server (QtSmbstatus is a graphical user interface for smbstatus) ++# Source function library. ++. /etc/rc.d/init.d/functions ++ ++exec="/usr/bin/qtsmbstatusd" ++prog="qtsmbstatusd" ++config="/etc/qtsmbstatusd/qtsmbstatusd.conf" + +-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:$PATH +-NAME=qtsmbstatusd ++[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +-# see if qtsmbstatusd is running +-pid=`ps ax | awk '{print $1,$5}' | grep $NAME | awk '{print $1}' | awk '{print $1}'` ++lockfile=/var/lock/subsys/$prog + + # get locale + default_locale=en_US.UTF-8 +-if [ -f /etc/default/locale ]; then +- # Debian systems +- system_locale=`grep -re "LANG=" /etc/default/locale | awk 'BEGIN { FS = "[\"]" } { print $2 }'` +-elif [ -f /etc/sysconfig/language ]; then +- # SuSE systems +- system_locale=`grep -re "LANG=" /etc/sysconfig/language | awk 'BEGIN { FS = "[\"]" } { print $2 }'` +-elif [ -f /etc/sysconfig/i18n ]; then ++if [ -f /etc/sysconfig/i18n ]; then + # RedHat/mandriva systems + system_locale=`grep -re "LANG=" /etc/sysconfig/i18n | awk 'BEGIN { FS = "[\"]" } { print $2 }'` +-elif [ -f /etc/profile ]; then +- #default +- system_locale=`grep -re "LANG=" /etc/profile | awk 'BEGIN { FS = "[\"]" } { print $2 }'` + fi + + if [ -z $system_locale ]; then system_locale=$default_locale; fi + +-# Start or stop the qtsmbstatusd server +-case $1 in +- start | restart | reload | force-reload) +- export LANG=$system_locale +- if test "$pid" != ""; then +- kill $pid +- if qtsmbstatusd -d; then +- echo "qtsmbstatusd server restarted." +- fi +- else +- if qtsmbstatusd -d; then +- echo "qtsmbstatusd server started." +- fi +- fi +- ;; +- stop) +- if test "$pid" != ""; then +- kill -3 $pid +- fi +- echo "qtsmbstatusd server stopped" +- ;; +- +- status) +- if test "$pid" != ""; then +- echo "qtsmbstatusd : server is running." +- else +- echo "qtsmbstatusd : server is not running." +- fi +- ;; +- +- *) +- echo "Usage: qtsmbstatusd {start|stop|reload|restart|status|force-reload}" +- exit 1 +- ;; +-esac +- +-exit 0 + ++start() { ++ [ -x $exec ] || exit 5 ++ [ -f $config ] || exit 6 ++ export LANG=$system_locale ++ echo -n $"Starting $prog: " ++ $exec -d ++ retval=$? ++ echo ++ [ $retval -eq 0 ] && touch $lockfile ++ return $retval ++} ++ ++stop() { ++ echo -n $"Stopping $prog: " ++ killproc $prog ++ retval=$? ++ echo ++ [ $retval -eq 0 ] && rm -f $lockfile ++ return $retval ++} ++ ++restart() { ++ stop ++ start ++} ++ ++reload() { ++ restart ++} ++ ++force_reload() { ++ restart ++} ++ ++rh_status() { ++ # run checks to determine if the service is running or use generic status ++ status $prog ++} ++ ++rh_status_q() { ++ rh_status >/dev/null 2>&1 ++} ++ ++ ++case "$1" in ++ start) ++ rh_status_q && exit 0 ++ $1 ++ ;; ++ stop) ++ rh_status_q || exit 0 ++ $1 ++ ;; ++ restart) ++ $1 ++ ;; ++ reload) ++ rh_status_q || exit 7 ++ $1 ++ ;; ++ force-reload) ++ force_reload ++ ;; ++ status) ++ rh_status ++ ;; ++ condrestart|try-restart) ++ rh_status_q || exit 0 ++ restart ++ ;; ++ *) ++ echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" ++ exit 2 ++esac ++exit $? diff -Nru qtsmbstatus-2.2.0/packages/rpm/fedora/qtsmbstatus.spec qtsmbstatus-2.2.1/packages/rpm/fedora/qtsmbstatus.spec --- qtsmbstatus-2.2.0/packages/rpm/fedora/qtsmbstatus.spec 2011-06-28 17:58:34.000000000 +0000 +++ qtsmbstatus-2.2.1/packages/rpm/fedora/qtsmbstatus.spec 2012-02-19 17:45:47.000000000 +0000 @@ -9,7 +9,7 @@ Summary: A GUI for smbstatus with Qt Name: qtsmbstatus Group: Applications/System -Version: 2.1.3 +Version: 2.2.0 Release: 1%{?dist} License: GPLv2 Vendor: ADELLA @@ -183,6 +183,10 @@ %{_mandir}/man7/qtsmbstatusd.7.gz %changelog + +* Tue Jun 28 2011 Daniel Rocher 2.2.0-1 +- New upstream version + * Thu Apr 22 2010 Daniel Rocher 2.1.3-1 - New upstream version diff -Nru qtsmbstatus-2.2.0/packages/windows/nsi/qtsmbstatus.nsi qtsmbstatus-2.2.1/packages/windows/nsi/qtsmbstatus.nsi --- qtsmbstatus-2.2.0/packages/windows/nsi/qtsmbstatus.nsi 2011-06-28 17:58:34.000000000 +0000 +++ qtsmbstatus-2.2.1/packages/windows/nsi/qtsmbstatus.nsi 2012-02-19 17:45:47.000000000 +0000 @@ -10,7 +10,7 @@ ;-------------------------------- Name "QtSmbstatus" -OutFile "qtsmbstatus-client.2.1.3-1.exe" +OutFile "qtsmbstatus-client.2.2.1-1.exe" InstallDir "$PROGRAMFILES\qtsmbstatus" InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\qtsmbstatus""UninstallString" diff -Nru qtsmbstatus-2.2.0/server/sendmessage_manager.cpp qtsmbstatus-2.2.1/server/sendmessage_manager.cpp --- qtsmbstatus-2.2.0/server/sendmessage_manager.cpp 2011-06-28 17:58:33.000000000 +0000 +++ qtsmbstatus-2.2.1/server/sendmessage_manager.cpp 2012-02-19 17:45:44.000000000 +0000 @@ -42,7 +42,7 @@ my_message=message.simplified(); my_message.replace( "\"", " ").replace( "\\", " "); - my_message="echo " + my_message + " | smbclient -M " + to_machine; + my_message="echo " + my_message + " | smbclient -M " + to_machine + " -N"; connect( &proc, SIGNAL(finished ( int, QProcess::ExitStatus)),this, SLOT(end_process()) ); connect( &proc, SIGNAL(readyReadStandardOutput ()),this, SLOT(readFromStdout()) );