diff options
author | tron <tron> | 2005-11-29 10:15:18 +0000 |
---|---|---|
committer | tron <tron> | 2005-11-29 10:15:18 +0000 |
commit | bbb2b0a994bf704f81fb355a67656b655b714a2e (patch) | |
tree | bd8956ae4bb27f73116a45b261eb3cac785bd01f /net/kphone/patches | |
parent | 87faee391d90d10c94132a7ca56e2a28d964eded (diff) | |
download | pkgsrc-bbb2b0a994bf704f81fb355a67656b655b714a2e.tar.gz |
Update "kphone" package to version 4.2. Change since version 4.1.0:
- ILBC 20ms implementation added
- Some new translations
- Alsa support updated
- Some qt3 fixes
- Saved password support added
- DTMF support updated
- Command line call support added
- SRTP support added (see INSTALL file)
- Some new translations
- Alsa support updated
Update contributed by Stephen Borrill in PR pkg/32159.
Diffstat (limited to 'net/kphone/patches')
-rw-r--r-- | net/kphone/patches/patch-ac | 22 | ||||
-rw-r--r-- | net/kphone/patches/patch-ad | 14 | ||||
-rw-r--r-- | net/kphone/patches/patch-af | 16 | ||||
-rw-r--r-- | net/kphone/patches/patch-ag | 10 |
4 files changed, 27 insertions, 35 deletions
diff --git a/net/kphone/patches/patch-ac b/net/kphone/patches/patch-ac index ff7abf0b2b6..018bc72e966 100644 --- a/net/kphone/patches/patch-ac +++ b/net/kphone/patches/patch-ac @@ -1,7 +1,5 @@ -$NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ - ---- dissipate2/siputil.cpp.orig 2004-03-04 11:22:57.000000000 +0000 -+++ dissipate2/siputil.cpp 2004-07-21 12:11:34.000000000 +0100 +--- dissipate2/siputil.cpp.orig 2005-06-21 12:14:49.000000000 +0100 ++++ dissipate2/siputil.cpp 2005-11-24 16:47:03.000000000 +0000 @@ -5,6 +5,9 @@ #include <sys/time.h> #include <sys/errno.h> @@ -12,15 +10,15 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ #include <net/if_arp.h> #include <net/route.h> #include <net/if.h> -@@ -12,6 +15,7 @@ - #include <arpa/inet.h> +@@ -13,6 +16,7 @@ + #include <qobject.h> #include <qmessagebox.h> #include <netdb.h> +#include <errno.h> #include <fcntl.h> #include <stdio.h> #include <unistd.h> -@@ -25,6 +29,8 @@ +@@ -26,6 +30,8 @@ /* max number of network interfaces*/ #define MAX_IF 5 @@ -29,7 +27,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ /* Path to the route entry in proc filesystem */ #define PROCROUTE "/proc/net/route" -@@ -40,6 +46,8 @@ +@@ -41,6 +47,8 @@ #define SIOCGIFCOUNT 0x8935 #endif @@ -38,7 +36,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ char iface[16]; -@@ -61,6 +69,7 @@ +@@ -62,6 +70,7 @@ */ char *getdefaultdev() { @@ -46,7 +44,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ FILE *fp = fopen( PROCROUTE, "r"); char buff[4096], gate_addr[128], net_addr[128]; char mask_addr[128]; -@@ -84,19 +93,49 @@ +@@ -85,19 +94,49 @@ return iface; } fclose(fp); @@ -99,7 +97,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ netconf.ifc_len = 32 * MAX_IF; netconf.ifc_buf = buffer; sock=socket( PF_INET, SOCK_DGRAM, 0 ); -@@ -104,9 +143,11 @@ +@@ -105,9 +144,11 @@ if ( err < 0 ) printf( "Error in ioctl: %i.\n", errno ); close( sock ); if_count = netconf.ifc_len / 32; @@ -111,7 +109,7 @@ $NetBSD: patch-ac,v 1.1 2004/07/21 21:49:02 scw Exp $ if ( if_count == 1 ) { strncpy( if_name[j], netconf.ifc_req[0].ifr_name, 20 ); strncpy( if_addr[j], inet_ntoa(((struct sockaddr_in*)(&netconf.ifc_req[0].ifr_addr))->sin_addr), 20 ); -@@ -120,6 +161,8 @@ +@@ -122,6 +163,8 @@ } } } diff --git a/net/kphone/patches/patch-ad b/net/kphone/patches/patch-ad index 3a3db7cc7f4..1a319ab88da 100644 --- a/net/kphone/patches/patch-ad +++ b/net/kphone/patches/patch-ad @@ -1,7 +1,5 @@ -$NetBSD: patch-ad,v 1.1 2004/07/21 21:49:02 scw Exp $ - ---- dissipate2/udpmessagesocket.cpp.orig 2004-03-04 11:22:57.000000000 +0000 -+++ dissipate2/udpmessagesocket.cpp 2004-07-21 12:34:43.000000000 +0100 +--- dissipate2/udpmessagesocket.cpp.orig 2005-04-18 14:04:40.000000000 +0100 ++++ dissipate2/udpmessagesocket.cpp 2005-11-24 16:49:55.000000000 +0000 @@ -1,5 +1,7 @@ #include <sys/types.h> #include <sys/socket.h> @@ -10,12 +8,12 @@ $NetBSD: patch-ad,v 1.1 2004/07/21 21:49:02 scw Exp $ #include <netinet/ip.h> #include <errno.h> #include <string.h> -@@ -52,7 +54,7 @@ - socklen_t optlen; - tos=IPTOS_PREC_CRITIC_ECP; +@@ -57,7 +59,7 @@ + tos=IPTOS_LOWDELAY; + #endif optlen=1; - if(setsockopt(socketfd,SOL_IP,IP_TOS,&tos,optlen) != 0){ + if(setsockopt(socketfd,IPPROTO_IP,IP_TOS,&tos,optlen) != 0){ perror("UDPMessageSocket::SetTOS"); + return -1 ; } - return 0; diff --git a/net/kphone/patches/patch-af b/net/kphone/patches/patch-af index eadb8c190d2..b8d4d3135b4 100644 --- a/net/kphone/patches/patch-af +++ b/net/kphone/patches/patch-af @@ -1,9 +1,7 @@ -$NetBSD: patch-af,v 1.6 2005/05/26 21:01:07 tron Exp $ - ---- configure.orig 2004-12-07 13:16:23.000000000 +0100 -+++ configure 2005-05-26 22:38:17.000000000 +0200 -@@ -1262,8 +1262,8 @@ - fi +--- configure.orig 2005-06-22 09:37:20.000000000 +0100 ++++ configure 2005-11-24 16:55:26.000000000 +0000 +@@ -1295,8 +1295,8 @@ + echo "$ac_t""no" 1>&6 fi -CFLAGS="-I$ac_cv_qt_inc -Wall" @@ -13,16 +11,16 @@ $NetBSD: patch-af,v 1.6 2005/05/26 21:01:07 tron Exp $ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -@@ -1538,7 +1538,7 @@ +@@ -1571,7 +1571,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lssl $LIBS" +LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <<EOF - #line 1544 "configure" + #line 1577 "configure" #include "confdefs.h" -@@ -2116,7 +2116,6 @@ +@@ -2149,7 +2149,6 @@ CFLAGS="$CFLAGS -g -DDEBUG" echo "$ac_t""yes" 1>&6 else diff --git a/net/kphone/patches/patch-ag b/net/kphone/patches/patch-ag index b505b0cc2ea..019e6bec278 100644 --- a/net/kphone/patches/patch-ag +++ b/net/kphone/patches/patch-ag @@ -1,7 +1,5 @@ -$NetBSD: patch-ag,v 1.4 2005/04/14 17:53:40 schwarz Exp $ - ---- kphone/Makefile.in.orig Thu Apr 7 21:10:26 2005 -+++ kphone/Makefile.in Thu Apr 7 21:11:15 2005 +--- kphone/Makefile.in.orig 2005-06-22 09:37:20.000000000 +0100 ++++ kphone/Makefile.in 2005-11-24 16:59:45.000000000 +0000 @@ -6,7 +6,7 @@ SHARE_DIR=@datadir@/apps/kphone BIN_DIR=@bindir@ @@ -9,5 +7,5 @@ $NetBSD: patch-ag,v 1.4 2005/04/14 17:53:40 schwarz Exp $ -MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"${prefix}/share/kphone/translations//\" +MOREDEFS=-DSHARE_DIR=\"$(SHARE_DIR)\" -DPO_DIR=\"${prefix}/share/kphone/translations//\" -DDEVOSSAUDIO=\"$(DEVOSSAUDIO)\" - CFLAGS=@CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS) - CXXFLAGS=$(CFLAGS) + ifeq (@ENABLE_SRTP@,yes) + CFLAGS=-I/usr/local/include/srtp -I- @CFLAGS@ -I. -I../gsm -I../ilbc -I../dissipate2 @DEFS@ $(MOREDEFS) |