| 1 |
volkmar 09/04/28 15:54:37 |
| 2 |
|
| 3 |
Added: kphone-4.1.0-Makefiles.patch |
| 4 |
kphone-4.2-CVE-2006-2442.diff |
| 5 |
kphone-4.1.1-gcc34.patch kphone-4.2-gcc4.diff |
| 6 |
Log: |
| 7 |
moving from net-misc to net-voip, bug 194364 |
| 8 |
(Portage version: 2.1.6.7/cvs/Linux ppc, RepoMan options: --force) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-voip/kphone/files/kphone-4.1.0-Makefiles.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.1.0-Makefiles.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.1.0-Makefiles.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: kphone-4.1.0-Makefiles.patch |
| 17 |
=================================================================== |
| 18 |
--- po/Makefile.in.orig 2004-12-12 14:30:00.690467152 +0000 |
| 19 |
+++ po/Makefile.in 2004-12-12 14:31:02.614053336 +0000 |
| 20 |
@@ -4,11 +4,11 @@ |
| 21 |
PO_DIR=$(SHAREDIR)/translations/ |
| 22 |
|
| 23 |
install: |
| 24 |
- install --mode=0755 --directory $(PO_DIR) |
| 25 |
+ install --mode=0755 --directory $(DESTDIR)/$(PO_DIR) |
| 26 |
for T in *.qm; do \ |
| 27 |
- install --mode=0644 $$T $(PO_DIR); \ |
| 28 |
+ install --mode=0644 $$T $(DESTDIR)/$(PO_DIR); \ |
| 29 |
done |
| 30 |
|
| 31 |
uninstall: |
| 32 |
- rm -r $(PO_DIR) |
| 33 |
+ rm -r $(DESTDIR)/$(PO_DIR) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.1 net-voip/kphone/files/kphone-4.2-CVE-2006-2442.diff |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.2-CVE-2006-2442.diff?rev=1.1&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.2-CVE-2006-2442.diff?rev=1.1&content-type=text/plain |
| 42 |
|
| 43 |
Index: kphone-4.2-CVE-2006-2442.diff |
| 44 |
=================================================================== |
| 45 |
--- kphone.cpp.orig 2005-06-21 13:14:49.000000000 +0200 |
| 46 |
+++ kphone/kphone/kphone.cpp 2006-02-04 22:49:19.000000000 +0100 |
| 47 |
@@ -1,5 +1,8 @@ |
| 48 |
#include <stdio.h> |
| 49 |
#include <stdlib.h> |
| 50 |
+#include <sys/types.h> |
| 51 |
+#include <sys/stat.h> |
| 52 |
+ |
| 53 |
#include <qtimer.h> |
| 54 |
#include <qsettings.h> |
| 55 |
#include <qmenubar.h> |
| 56 |
@@ -32,6 +35,8 @@ |
| 57 |
userPrefix = "_" + prefix + "_"; |
| 58 |
} |
| 59 |
QSettings settings; |
| 60 |
+ |
| 61 |
+ umask(077); |
| 62 |
Sip::setLocalAddress( settings.readEntry( |
| 63 |
"/kphone/dissipate_addr", Sip::getLocalAddress() ) ); |
| 64 |
QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" ); |
| 65 |
|
| 66 |
|
| 67 |
|
| 68 |
1.1 net-voip/kphone/files/kphone-4.1.1-gcc34.patch |
| 69 |
|
| 70 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.1.1-gcc34.patch?rev=1.1&view=markup |
| 71 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.1.1-gcc34.patch?rev=1.1&content-type=text/plain |
| 72 |
|
| 73 |
Index: kphone-4.1.1-gcc34.patch |
| 74 |
=================================================================== |
| 75 |
diff -Nur kphone.orig/kphone/dspoutalsa.cpp kphone/kphone/dspoutalsa.cpp |
| 76 |
--- kphone.orig/kphone/dspoutalsa.cpp 2005-04-22 14:09:34.000000000 +0200 |
| 77 |
+++ kphone/kphone/dspoutalsa.cpp 2005-05-27 11:57:48.000000000 +0200 |
| 78 |
@@ -189,7 +189,8 @@ |
| 79 |
#ifdef ALSADEBUG |
| 80 |
fprintf(stderr, "write %d instead of %d frames !\n", rc, (int)count/2); |
| 81 |
#endif |
| 82 |
- (int8_t*) buf += rc*4; |
| 83 |
+ int8_t *buff = (int8_t*) buf; |
| 84 |
+ buff += rc*4; |
| 85 |
count -= rc*2; |
| 86 |
continue; |
| 87 |
} |
| 88 |
|
| 89 |
|
| 90 |
|
| 91 |
1.1 net-voip/kphone/files/kphone-4.2-gcc4.diff |
| 92 |
|
| 93 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.2-gcc4.diff?rev=1.1&view=markup |
| 94 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.2-gcc4.diff?rev=1.1&content-type=text/plain |
| 95 |
|
| 96 |
Index: kphone-4.2-gcc4.diff |
| 97 |
=================================================================== |
| 98 |
diff -Naur kphone.old/kphone/kcallwidget.h kphone/kphone/kcallwidget.h |
| 99 |
--- kphone.old/kphone/kcallwidget.h 2006-03-31 20:00:14.000000000 -0500 |
| 100 |
+++ kphone/kphone/kcallwidget.h 2006-03-31 20:00:54.000000000 -0500 |
| 101 |
@@ -67,7 +67,7 @@ |
| 102 |
void clickHangup( void ); |
| 103 |
void setHide( void ); |
| 104 |
bool isHided( void ) const { return hided; } |
| 105 |
- void KCallWidget::setDTMFSender( QString &s ); |
| 106 |
+ void setDTMFSender( QString &s ); |
| 107 |
|
| 108 |
public slots: |
| 109 |
void pleaseDial( const SipUri &dialuri ); |
| 110 |
diff -Naur kphone.old/kphone/kphoneview.h kphone/kphone/kphoneview.h |
| 111 |
--- kphone.old/kphone/kphoneview.h 2006-03-31 20:00:14.000000000 -0500 |
| 112 |
+++ kphone/kphone/kphoneview.h 2006-03-31 20:00:43.000000000 -0500 |
| 113 |
@@ -54,7 +54,7 @@ |
| 114 |
QString getStunSrv( void ); |
| 115 |
void kphoneQuit( void ); |
| 116 |
bool getState( void ); |
| 117 |
- KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype ); |
| 118 |
+ KCallWidget *DoCall( QString num, SipCall::CallType ctype ); |
| 119 |
|
| 120 |
signals: |
| 121 |
void stateChanged( void ); |
Archives