volkmar 09/04/28 15:54:37
Added: kphone-4.1.0-Makefiles.patch
kphone-4.2-CVE-2006-2442.diff
kphone-4.1.1-gcc34.patch kphone-4.2-gcc4.diff
Log:
moving from net-misc to net-voip, bug 194364
(Portage version: 2.1.6.7/cvs/Linux ppc, RepoMan options: --force)
Revision Changes Path
1.1 net-voip/kphone/files/kphone-4.1.0-Makefiles.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.1.0-Makefiles.patch?rev=1.1&view=markup
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
Index: kphone-4.1.0-Makefiles.patch
===================================================================
--- po/Makefile.in.orig 2004-12-12 14:30:00.690467152 +0000
+++ po/Makefile.in 2004-12-12 14:31:02.614053336 +0000
@@ -4,11 +4,11 @@
PO_DIR=$(SHAREDIR)/translations/
install:
- install --mode=0755 --directory $(PO_DIR)
+ install --mode=0755 --directory $(DESTDIR)/$(PO_DIR)
for T in *.qm; do \
- install --mode=0644 $$T $(PO_DIR); \
+ install --mode=0644 $$T $(DESTDIR)/$(PO_DIR); \
done
uninstall:
- rm -r $(PO_DIR)
+ rm -r $(DESTDIR)/$(PO_DIR)
1.1 net-voip/kphone/files/kphone-4.2-CVE-2006-2442.diff
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
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
Index: kphone-4.2-CVE-2006-2442.diff
===================================================================
--- kphone.cpp.orig 2005-06-21 13:14:49.000000000 +0200
+++ kphone/kphone/kphone.cpp 2006-02-04 22:49:19.000000000 +0100
@@ -1,5 +1,8 @@
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
#include <qtimer.h>
#include <qsettings.h>
#include <qmenubar.h>
@@ -32,6 +35,8 @@
userPrefix = "_" + prefix + "_";
}
QSettings settings;
+
+ umask(077);
Sip::setLocalAddress( settings.readEntry(
"/kphone/dissipate_addr", Sip::getLocalAddress() ) );
QString socketStr = settings.readEntry( "/kphone/General/SocketMode", "UDP" );
1.1 net-voip/kphone/files/kphone-4.1.1-gcc34.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.1.1-gcc34.patch?rev=1.1&view=markup
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
Index: kphone-4.1.1-gcc34.patch
===================================================================
diff -Nur kphone.orig/kphone/dspoutalsa.cpp kphone/kphone/dspoutalsa.cpp
--- kphone.orig/kphone/dspoutalsa.cpp 2005-04-22 14:09:34.000000000 +0200
+++ kphone/kphone/dspoutalsa.cpp 2005-05-27 11:57:48.000000000 +0200
@@ -189,7 +189,8 @@
#ifdef ALSADEBUG
fprintf(stderr, "write %d instead of %d frames !\n", rc, (int)count/2);
#endif
- (int8_t*) buf += rc*4;
+ int8_t *buff = (int8_t*) buf;
+ buff += rc*4;
count -= rc*2;
continue;
}
1.1 net-voip/kphone/files/kphone-4.2-gcc4.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-voip/kphone/files/kphone-4.2-gcc4.diff?rev=1.1&view=markup
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
Index: kphone-4.2-gcc4.diff
===================================================================
diff -Naur kphone.old/kphone/kcallwidget.h kphone/kphone/kcallwidget.h
--- kphone.old/kphone/kcallwidget.h 2006-03-31 20:00:14.000000000 -0500
+++ kphone/kphone/kcallwidget.h 2006-03-31 20:00:54.000000000 -0500
@@ -67,7 +67,7 @@
void clickHangup( void );
void setHide( void );
bool isHided( void ) const { return hided; }
- void KCallWidget::setDTMFSender( QString &s );
+ void setDTMFSender( QString &s );
public slots:
void pleaseDial( const SipUri &dialuri );
diff -Naur kphone.old/kphone/kphoneview.h kphone/kphone/kphoneview.h
--- kphone.old/kphone/kphoneview.h 2006-03-31 20:00:14.000000000 -0500
+++ kphone/kphone/kphoneview.h 2006-03-31 20:00:43.000000000 -0500
@@ -54,7 +54,7 @@
QString getStunSrv( void );
void kphoneQuit( void );
bool getState( void );
- KCallWidget *KPhoneView::DoCall( QString num, SipCall::CallType ctype );
+ KCallWidget *DoCall( QString num, SipCall::CallType ctype );
signals:
void stateChanged( void );
|
