Date: Tue, 8 Mar 2005 12:27:43 -0500 From: Diane Bruce <db@db.net> To: Volker Stolz <vs@FreeBSD.org> Cc: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/78574: [MAINTAINER] comms/echolinux: [SUMMARIZE CHANGES] Message-ID: <20050308172743.GB72737@night.dbn> In-Reply-To: <200503081423.j28ENDKu005935@freefall.freebsd.org> References: <200503081423.j28ENDKu005935@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Mar 08, 2005 at 02:23:13PM +0000, Volker Stolz wrote:
> Synopsis: [MAINTAINER] comms/echolinux: [SUMMARIZE CHANGES]
>
> State-Changed-From-To: open->feedback
> State-Changed-By: vs
> State-Changed-When: Tue Mar 8 14:22:32 GMT 2005
> State-Changed-Why:
> ===> Applying FreeBSD patches for echolinux-0.16a_2
> 2 out of 5 hunks failed--saving rejects to echolinux/control.c.rej
> => Patch patch-echolinux_control.c failed to apply cleanly.
> => Patch(es) patch-echogui_servercode.c patch-echogui_testgui.c patch-echogui_testgui_cb.c patch-echogui_testgui_main.c applied cleanly.
> *** Error code 1
Odd. This is the first time I have seen porttools screw up.
Here is a manually generated diff. I applied it to a test ports directory here
and the resulting ports directory compiles fine as well.
--- /usr/ports/comms/echolinux/Makefile Mon Nov 15 18:17:54 2004
+++ Makefile Sun Mar 6 00:52:34 2005
@@ -7,7 +7,7 @@
PORTNAME= echolinux
PORTVERSION= 0.16a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= cqinet
--- /usr/ports/comms/echolinux/files/patch-echolinux_control.c Sun Jul 4 19:28:32 2004
+++ files/patch-echolinux_control.c Mon Mar 7 15:53:15 2005
@@ -1,5 +1,14 @@
--- echolinux/control.c.orig Mon Feb 2 22:29:46 2004
-+++ echolinux/control.c Fri Jul 2 00:58:38 2004
++++ echolinux/control.c Mon Mar 7 15:52:46 2005
+@@ -13,7 +13,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+-#include <linux/soundcard.h>
++#include <sys/soundcard.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
@@ -24,7 +24,8 @@
#include <arpa/inet.h>
#include <netdb.h>
@@ -10,3 +19,76 @@
#include <signal.h>
#include <string.h>
#include <sys/time.h>
+@@ -354,7 +355,7 @@
+ timeout.tv_sec = 10;
+ timeout.tv_usec = 0;
+ }
+-
++
+ if((i == 0) && (audioPid > 0)){ // timeout & connected
+ connectTimeout++;
+ if(connectTimeout == CONNECT_TRY){
+@@ -388,28 +389,32 @@
+ disconnect(FALSE);
+ }
+ if(isRTCPSdespacket(inBuffer, length)){
+- if((audioPid > 0) &&
+- (inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr)){
+- sdesItems.nitems = 1;
+- sdesItems.item[0].r_item = RTCP_SDES_NAME;
+- sdesItems.item[0].r_text = NULL;
+- remoteName[0] = 0;
+- parseSDES(inBuffer, &sdesItems);
+- if(sdesItems.item[0].r_text != NULL){
+- copySDESitem(sdesItems.item[0].r_text, &remoteName[2]);
+- }
+- remoteName[0] = CONNECT;
+- remoteName[1] = ' ';
+- puts(remoteName);
+- if(atemptingConnect){
+- atemptingConnect = 0;
+- fputs("P connect.wav\n", audioOutFd);
+- fputs("I\n", audioOutFd);
+- }
+- connectTimeout = 0; // reset the counter
+- }
+- else {
+- if(audioPid<=0){
++ if (audioPid > 0) {
++ sendto(outControlSocket,
++ *sdesPacket,
++ sdesLength,
++ 0,
++ (struct sockaddr *)&destAddr,
++ sizeof destAddr);
++ if(inAddr.sin_addr.s_addr == destAddr.sin_addr.s_addr){
++ sdesItems.nitems = 1;
++ sdesItems.item[0].r_item = RTCP_SDES_NAME;
++ sdesItems.item[0].r_text = NULL;
++ remoteName[0] = 0;
++ parseSDES(inBuffer, &sdesItems);
++ if(sdesItems.item[0].r_text != NULL){
++ copySDESitem(sdesItems.item[0].r_text, &remoteName[2]);
++ }
++ remoteName[0] = CONNECT;
++ remoteName[1] = ' ';
++ puts(remoteName);
++ if(atemptingConnect){
++ atemptingConnect = 0;
++ fputs("P connect.wav\n", audioOutFd);
++ fputs("I\n", audioOutFd);
++ }
++ connectTimeout = 0; // reset the counter
++ } else { /* audioPid <= 0 */
+ sdesItems.nitems = 1;
+ sdesItems.item[0].r_item = RTCP_SDES_NAME;
+ sdesItems.item[0].r_text = NULL;
+@@ -424,8 +429,6 @@
+ makeConnection(inet_ntoa(inAddr.sin_addr));
+ fputs("P connect.wav\n", audioOutFd);
+ fputs("I\n", audioOutFd);
+- }
+- else {
+ }
+ }
+ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050308172743.GB72737>