Mailinglist Archive: opensuse-commit (1093 mails)
| < Previous | Next > |
commit umtsmon
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 21 Feb 2008 02:03:12 +0100
- Message-id: <20080221010312.E812F678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package umtsmon
checked in at Thu Feb 21 02:03:12 CET 2008.
--------
--- umtsmon/umtsmon.changes 2008-02-12 11:54:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/umtsmon/umtsmon.changes 2008-02-20
19:27:33.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Feb 20 19:26:56 CET 2008 - seife@xxxxxxx
+
+- change the pppd-verbosity patch to accept "-v 5,0" which is more
+ likely of being accepted upstream
+
+-------------------------------------------------------------------
Old:
----
umtsmon-0.7.90-pppverbosity.diff
New:
----
umtsmon-0.7.91-pppverbosity.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ umtsmon.spec ++++++
--- /var/tmp/diff_new_pack.I13246/_old 2008-02-21 02:02:55.000000000 +0100
+++ /var/tmp/diff_new_pack.I13246/_new 2008-02-21 02:02:55.000000000 +0100
@@ -13,7 +13,7 @@
Name: umtsmon
BuildRequires: libusb-devel qt3-devel
Version: 0.7.91.20080212
-Release: 1
+Release: 4
Summary: Control/monitor your UMTS card
License: GPL v2 or later
Group: Hardware/Mobile
@@ -21,7 +21,7 @@
Url: http://sourceforge.net/projects/umtsmon/
AutoReqProv: on
Source0: %name-%version.tar.bz2
-Patch0: umtsmon-0.7.90-pppverbosity.diff
+Patch0: umtsmon-0.7.91-pppverbosity.diff
%description
A program to control your UMTS (and GPRS/EDGE) card: enter SIM PIN
@@ -58,6 +58,9 @@
rm -rf %{buildroot}
%changelog
+* Wed Feb 20 2008 seife@xxxxxxx
+- change the pppd-verbosity patch to accept "-v 5,0" which is more
+ likely of being accepted upstream
* Tue Feb 12 2008 seife@xxxxxxx
- update to 0.7.91 version - which is beta1 of the upcoming new
release
++++++ umtsmon-0.7.90-pppverbosity.diff -> umtsmon-0.7.91-pppverbosity.diff
++++++
--- umtsmon/umtsmon-0.7.90-pppverbosity.diff 2008-02-12 11:54:55.000000000
+0100
+++ /mounts/work_src_done/STABLE/umtsmon/umtsmon-0.7.91-pppverbosity.diff
2008-02-20 19:00:16.000000000 +0100
@@ -1,20 +1,11 @@
Index: main.cpp
===================================================================
RCS file: /cvsroot/umtsmon/umtsmon/main.cpp,v
-retrieving revision 1.44
-diff -u -p -r1.44 main.cpp
---- main.cpp 14 Dec 2007 20:28:01 -0000 1.44
-+++ main.cpp 15 Jan 2008 14:50:23 -0000
-@@ -60,6 +60,8 @@ static bool help( __attribute__ ((unused
- printf(" --force-autodetect force autodetection (don't use info from
config file)\n");
- printf(" --serial <at>[,ppp] will prevent autodetection of devices and
use serial port <at>[,<ppp>]\n");
- printf(" -s <at>[,<ppp>] will prevent autodetection of devices and
use serial port <at>[,<ppp>]\n");
-+ printf(" --ppp-verbose [level] set pppd verbosity, 0=normal (default),
2=all\n");
-+ printf(" -p [level] set pppd verbosity, 0=normal (default),
2=all\n");
- printf(" --verbose [level] set verbosity, 1=little (default),
%d=all\n", MAX_VERBOSITY);
- printf(" -v [level] set verbosity\n");
- printf("\n");
-@@ -105,6 +107,7 @@ static bool setserial(char* anArgument)
+retrieving revision 1.47
+diff -u -p -r1.47 main.cpp
+--- main.cpp 5 Feb 2008 15:20:20 -0000 1.47
++++ main.cpp 20 Feb 2008 17:59:37 -0000
+@@ -191,10 +191,11 @@ static bool setserial(char* anArgument)
// oops global variable declared here...
int theVerbosity = 1;
@@ -22,42 +13,44 @@
static bool setVerbosity(char* anArgument)
{
-@@ -123,11 +126,28 @@ static bool setVerbosity(char* anArgumen
- return true;
- }
-
-+static bool setPPPVerbosity(char* anArgument)
-+{
-+ DEBUG5("setPPPVerbosity: '%s'\n", anArgument);
+- DEBUG5("setVerbosity: '%s'\n", anArgument);
++ DEBUG1("setVerbosity: '%s'\n", anArgument);
+
+ // the argument should be a number. Let's parse.
+ int myNumber = atoi(anArgument);
+@@ -205,6 +206,25 @@ static bool setVerbosity(char* anArgumen
+ }
+ theVerbosity = myNumber;
+ DEBUG2("set verbosity level to %d\n", theVerbosity);
+
-+ int myNumber = atoi(anArgument);
-+ if (myNumber < 0 || myNumber > 2)
++ // check if we have a second argument after a comma (ppp-verbosity)
++ char* comma = strchr(anArgument, ',');
++ if (comma != NULL)
++ {
++ myNumber = atoi(comma + 1);
++ if (myNumber < 0 || myNumber > 2)
++ {
++ printf("ERROR: PPP verbosity argument should be between
0 and 2\n");
++ return false;
++ }
++ thePPPVerbosity = myNumber;
++ }
++ else
+ {
-+ printf("ERROR: PPP verbosity argument should be between 0 and
2\n");
-+ return false;
++ // verbosity > 2 => pppverbosity = 1; verbosity > 4 =>
pppverbosity = 2
++ thePPPVerbosity = (theVerbosity - 1) / 2;
+ }
-+ thePPPVerbosity = myNumber;
+ DEBUG2("set PPP verbosity level to %d\n", thePPPVerbosity);
-+
-+ return true;
-+}
-+
- static struct s_args theArgsTable[] =
- {
- { "--help", "-h", false, help, },
- { "--serial", "-s", true, setserial, },
- { "--verbosity", "-v", true, setVerbosity, },
-+ { "--ppp-verbosity", "-p", true, setPPPVerbosity, },
- { "--force-autodetect", "", false, setForceAutodetection, },
- // keep this one last
- { "\0", "\0", false, NULL, },
+
+ return true;
+ }
Index: umtsmon_global.h
===================================================================
RCS file: /cvsroot/umtsmon/umtsmon/umtsmon_global.h,v
-retrieving revision 1.22
-diff -u -p -r1.22 umtsmon_global.h
---- umtsmon_global.h 11 Oct 2007 17:05:48 -0000 1.22
-+++ umtsmon_global.h 15 Jan 2008 14:50:23 -0000
+retrieving revision 1.23
+diff -u -p -r1.23 umtsmon_global.h
+--- umtsmon_global.h 11 Feb 2008 21:33:38 -0000 1.23
++++ umtsmon_global.h 20 Feb 2008 17:59:37 -0000
@@ -33,6 +33,7 @@
*/
#include <stdio.h>
@@ -69,10 +62,10 @@
Index: src/model/PPPConnection.cpp
===================================================================
RCS file: /cvsroot/umtsmon/umtsmon/src/model/PPPConnection.cpp,v
-retrieving revision 1.10
-diff -u -p -r1.10 PPPConnection.cpp
---- src/model/PPPConnection.cpp 12 Jan 2008 20:08:48 -0000 1.10
-+++ src/model/PPPConnection.cpp 15 Jan 2008 14:50:23 -0000
+retrieving revision 1.12
+diff -u -p -r1.12 PPPConnection.cpp
+--- src/model/PPPConnection.cpp 4 Feb 2008 07:56:00 -0000 1.12
++++ src/model/PPPConnection.cpp 20 Feb 2008 17:59:37 -0000
@@ -166,7 +166,7 @@ PPPConnection::isPPPConnected(void)
theRunningPPPDPID=-1;
thePPPDStdOut = thePPPThreadPtr->getStdOut();
@@ -82,7 +75,7 @@
{
QStringList::Iterator it;
DEBUG4("*****output of PPP to
stdout\n");
-@@ -371,7 +371,7 @@ QStringList PPPConnection::assembleArgum
+@@ -372,7 +372,7 @@ QStringList PPPConnection::assembleArgum
// PPP related stuff
// we only ask PPP to detach if connection is successfully up
myPPPArguments.push_back("updetach");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |