From b3140343fb3f60f802edcb7f636dd1e1d6b6ef77 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 18 May 2008 02:41:18 +0000 Subject: keyring: fix compilation. Closes 2418. * Commit by Laibsch --- packages/keyring/keyring_0.6.8.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb index 5696a6618b..5739255826 100644 --- a/packages/keyring/keyring_0.6.8.bb +++ b/packages/keyring/keyring_0.6.8.bb @@ -5,7 +5,8 @@ LICENSE = "GPL" DEPENDS = "gdbm" PR = "r2" -SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz" +SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \ + file://keyring-0.6.8-datatype.patch;patch=1" S = "${WORKDIR}/Keyring" inherit palmtop -- cgit v1.2.3 From 6f1f21f64e38ad68226c7b83d8e6072c81ced58e Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 18 May 2008 15:41:28 +0000 Subject: keyring: fix compilation. Closes 2418. * Commit by Laibsch --- packages/keyring/keyring-0.6.8/.mtn2git_empty | 0 .../keyring-0.6.8/keyring-0.6.8-datatype.patch | 93 ++++++++++++++++++++++ packages/keyring/keyring_0.6.8.bb | 3 +- 3 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 packages/keyring/keyring-0.6.8/.mtn2git_empty create mode 100644 packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch diff --git a/packages/keyring/keyring-0.6.8/.mtn2git_empty b/packages/keyring/keyring-0.6.8/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch b/packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch new file mode 100644 index 0000000000..9f0a236b39 --- /dev/null +++ b/packages/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch @@ -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(); diff --git a/packages/keyring/keyring_0.6.8.bb b/packages/keyring/keyring_0.6.8.bb index 5696a6618b..5739255826 100644 --- a/packages/keyring/keyring_0.6.8.bb +++ b/packages/keyring/keyring_0.6.8.bb @@ -5,7 +5,8 @@ LICENSE = "GPL" DEPENDS = "gdbm" PR = "r2" -SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz" +SRC_URI = "http://www.scrypt.net/~celer/kweb/Keyring-0.6.8.tgz \ + file://keyring-0.6.8-datatype.patch;patch=1" S = "${WORKDIR}/Keyring" inherit palmtop -- cgit v1.2.3 From c15fef9716526f7433ba94ae2b43a400850e0445 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 18 May 2008 15:48:15 +0000 Subject: dropbear: apply scp-argument-fix.patch to version 0.49 only. reorder some fields according to Style Guide. bump PR. * commit and cosmetic changes by Laibsch --- packages/dropbear/dropbear-early_1.0.bb | 2 +- packages/dropbear/dropbear.inc | 1 - packages/dropbear/dropbear_0.49.bb | 6 ++++-- packages/dropbear/dropbear_0.50.bb | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/dropbear/dropbear-early_1.0.bb b/packages/dropbear/dropbear-early_1.0.bb index df2c2dc26f..c947cf0e74 100644 --- a/packages/dropbear/dropbear-early_1.0.bb +++ b/packages/dropbear/dropbear-early_1.0.bb @@ -1,7 +1,7 @@ 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" diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc index 00e5eec2ce..ebe0c1ea9c 100644 --- a/packages/dropbear/dropbear.inc +++ b/packages/dropbear/dropbear.inc @@ -10,7 +10,6 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ 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" diff --git a/packages/dropbear/dropbear_0.49.bb b/packages/dropbear/dropbear_0.49.bb index 0ed386ca0c..bf2f2add60 100644 --- a/packages/dropbear/dropbear_0.49.bb +++ b/packages/dropbear/dropbear_0.49.bb @@ -1,3 +1,5 @@ -PR = "r1" - require dropbear.inc + +PR = "r2" + +SRC_URI += "file://scp-argument-fix.patch;patch=1" diff --git a/packages/dropbear/dropbear_0.50.bb b/packages/dropbear/dropbear_0.50.bb index 21d46ef59c..bd8f31cff6 100644 --- a/packages/dropbear/dropbear_0.50.bb +++ b/packages/dropbear/dropbear_0.50.bb @@ -1,6 +1,6 @@ -PR = "r0" - require dropbear.inc +PR = "r1" + # testing DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3