[oe-commits] org.oe.dev explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'

[Laibsch commit]

explicit merge of '3690cf9a949f76acaa2b247794d6ee00339acd46'
              and 'f2497299e919cb94e12fc8690a709479451e5510'

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 94a69c171834b89089886081d5bd9f0e42d880f0
ViewMTN: http://monotone.openembedded.org/revision/info/94a69c171834b89089886081d5bd9f0e42d880f0
Files:
1
packages/keyring/keyring-0.6.8
packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch
packages/dropbear/dropbear-early_1.0.bb
packages/dropbear/dropbear.inc
packages/dropbear/dropbear_0.49.bb
packages/dropbear/dropbear_0.50.bb
Diffs:

#
# mt diff -r3690cf9a949f76acaa2b247794d6ee00339acd46 -r94a69c171834b89089886081d5bd9f0e42d880f0
#
#
# no changes
#


#
# mt diff -rf2497299e919cb94e12fc8690a709479451e5510 -r94a69c171834b89089886081d5bd9f0e42d880f0
#
#
#
# add_dir "packages/keyring/keyring-0.6.8"
# 
# add_file "packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch"
#  content [20aad83748060bdeaff7f817d93e61f7f3d10d42]
# 
# patch "packages/dropbear/dropbear-early_1.0.bb"
#  from [5b7702b9d74427e400988330fbd7c6fcff176371]
#    to [f1e7db2a9ec4fc0155567720a008f3158be5d187]
# 
# patch "packages/dropbear/dropbear.inc"
#  from [4ec56e07501d1a5accce2d4e6240ee349005dd46]
#    to [6d50c1193e4d2fa9a7c6f85db6149b36aee06851]
# 
# patch "packages/dropbear/dropbear_0.49.bb"
#  from [ca38761fd3af49819c41b42791592ee01c0d97cc]
#    to [78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77]
# 
# patch "packages/dropbear/dropbear_0.50.bb"
#  from [1f1e5b54696006b7f8484bd48dff9fa684992830]
#    to [61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200]
#
============================================================
--- packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch	20aad83748060bdeaff7f817d93e61f7f3d10d42
+++ packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch	20aad83748060bdeaff7f817d93e61f7f3d10d42
@@ -0,0 +1,93 @@
+diff -Naru Keyring.orig/accountlist.cpp Keyring/accountlist.cpp
+--- Keyring.orig/accountlist.cpp	2002-09-29 17:24:09.000000000 +0200
++++ Keyring/accountlist.cpp	2007-06-05 15:46:59.000000000 +0200
+@@ -314,7 +314,7 @@
+  */
+ void AccountList::resetTimer(){
+ 	mSeconds=mTimerStart;	
+-	mStartTime = time(NULL);
++	mStartTime = (time_t*)time(NULL);
+ 	wLCD->display(mSeconds);	
+ }
+ 
+@@ -390,20 +390,20 @@
+ 	//if so and it has expired, lock keyring.
+ 	if(mTimerViewingAC && mTimerEnabled){
+ 			//Timer has expired
+-			if((time(NULL)-mStartTime) > mTimerStart){
++			if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ 					lock();
+ 			} else {
+ 					//Timer needs to be updated
+ 					time_t diff=time(NULL)-viewtime;
+ 					mSeconds=mSeconds-diff;
+-					mStartTime = time(NULL)-(mTimerStart-mSeconds);
++					mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 					mUpdateTimer->start(500,false);
+ 					wLCD->display(mSeconds);	
+ 			}
+ 	} else {
+ 			if(mTimerEnabled){
+ 					mUpdateTimer->start(500,false);
+-					mStartTime = time(NULL)-(mTimerStart-mSeconds);
++					mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 			}
+ 	}
+ 
+@@ -432,7 +432,7 @@
+ 		if(mTimerEnabled)
+ 			mUpdateTimer->start(500,false);
+ 		mSeconds=mTimerStart;
+-		mStartTime = time(NULL);
++		mStartTime = (time_t*)time(NULL);
+ 		updateCountDown();
+ 	
+ 		//Let's be a bastard and bitch if the
+@@ -463,11 +463,11 @@
+ void AccountList::updateCountDown(){
+ 	wLCD->display(mSeconds);	
+ 	if(mSeconds==0 || 
+-			(((time(NULL)-mStartTime) > mTimerStart) && mTimerPowerOff)){
++			(((time(NULL)-(time_t)mStartTime) > mTimerStart) && mTimerPowerOff)){
+ 		lock();
+ 		return;
+ 	}
+-	mSeconds=mTimerStart-(time(NULL)-mStartTime);
++	mSeconds=mTimerStart-(time(NULL)-(time_t)mStartTime);
+ }
+ 
+ void AccountList::selectionChanged(QListViewItem *item){
+@@ -548,20 +548,20 @@
+ 		//if so and it has expired, lock keyring.
+ 		if(mTimerViewingAC && mTimerEnabled){
+ 			//Timer has expired
+-			if((time(NULL)-mStartTime) > mTimerStart){
++			if((time(NULL)-(time_t)mStartTime) > mTimerStart){
+ 				lock();
+ 			} else {
+ 				//Timer needs to be updated
+-				time_t diff=time(NULL)-viewtime;
++				time_t diff = time(NULL)-(time_t)viewtime;
+ 				mSeconds=mSeconds-diff;
+-				mStartTime = time(NULL)-(mTimerStart-mSeconds);
++				mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 				mUpdateTimer->start(500,false);
+ 				wLCD->display(mSeconds);	
+ 			}
+ 		} else {
+ 			if(mTimerEnabled){
+ 				mUpdateTimer->start(500,false);
+-				mStartTime = time(NULL)-(mTimerStart-mSeconds);
++				mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 			}
+ 		}
+ 		delete qd;	
+@@ -627,7 +627,7 @@
+ 		
+ 	if(mTimerEnabled){
+ 			mUpdateTimer->start(500,false);
+-			mStartTime = time(NULL)-(mTimerStart-mSeconds);
++			mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
+ 	}
+ 
+ 	showAccountList();
============================================================
--- packages/dropbear/dropbear-early_1.0.bb	5b7702b9d74427e400988330fbd7c6fcff176371
+++ packages/dropbear/dropbear-early_1.0.bb	f1e7db2a9ec4fc0155567720a008f3158be5d187
@@ -1,7 +1,7 @@ SECTION = "devel"
 DESCRIPTION = "Allow to start dropbear soon after boot, depending on kernel command line option."
 SECTION = "devel"
-PR = "r2"
 RDEPENDS = "dropbear"
+PR = "r3"
 
 SRC_URI = "file://dropbear-early"
 
============================================================
--- packages/dropbear/dropbear.inc	4ec56e07501d1a5accce2d4e6240ee349005dd46
+++ packages/dropbear/dropbear.inc	6d50c1193e4d2fa9a7c6f85db6149b36aee06851
@@ -10,7 +10,6 @@ SRC_URI = "http://matt.ucc.asn.au/dropbe
 	   file://urandom-xauth-changes-to-options.h.patch;patch=1 \
 	   file://configure.patch;patch=1 \
 	   file://fix-2kb-keys.patch;patch=1 \
-	   file://scp-argument-fix.patch;patch=1 \
 	   file://allow-nopw.patch \
 	   file://init"
 
============================================================
--- packages/dropbear/dropbear_0.49.bb	ca38761fd3af49819c41b42791592ee01c0d97cc
+++ packages/dropbear/dropbear_0.49.bb	78fcce6b1a8d01f370d8c3b57fe9feea4faa3d77
@@ -1,3 +1,5 @@
-PR = "r1"
+require dropbear.inc
 
+PR = "r2"
+
+SRC_URI += "file://scp-argument-fix.patch;patch=1"
-require dropbear.inc
============================================================
--- packages/dropbear/dropbear_0.50.bb	1f1e5b54696006b7f8484bd48dff9fa684992830
+++ packages/dropbear/dropbear_0.50.bb	61b1e18c0d8254b164c4d1ed3bf6b6b20d9fc200
@@ -1,6 +1,6 @@
-PR = "r0"
+require dropbear.inc
 
-require dropbear.inc
+PR = "r1"
 
 # testing
 DEFAULT_PREFERENCE = "-1"