Attachment 60665 Details for Bug 91033 – sredird-2.2.2.diff

[patch] sredird-2.2.2.diff

sredird-2.2.2.diff (text/plain), 4.77 KB, created by Frank J. Laszlo on 2005-12-28 20:50:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank J. Laszlo

Created: 2005-12-28 20:50:04 UTC

Size: 4.77 KB

patch

obsolete

>diff -NrU3 sredird.orig/Makefile sredird/Makefile
>--- sredird.orig/Makefile	Wed Dec 28 15:32:34 2005
>+++ sredird/Makefile	Wed Dec 28 15:33:06 2005
>@@ -6,12 +6,12 @@
> #
> 
> PORTNAME=	sredird
>-PORTVERSION=	2.2.1
>+PORTVERSION=	2.2.2
> CATEGORIES=	comms
> MASTER_SITES=	${MASTER_SITE_SUNSITE}
> MASTER_SITE_SUBDIR=	system/serial
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	laszlof@vonostingroup.com
> COMMENT=	RFC 2217 compliant serial port redirector
> 
> PLIST_FILES=	libexec/sredird
>diff -NrU3 sredird.orig/distinfo sredird/distinfo
>--- sredird.orig/distinfo	Wed Dec 28 15:32:34 2005
>+++ sredird/distinfo	Wed Dec 28 15:33:13 2005
>@@ -1,3 +1,3 @@
>-MD5 (sredird-2.2.1.tar.gz) = a6b8f03ddb9657f533bd218110c3e635
>-SHA256 (sredird-2.2.1.tar.gz) = 6b9b5afdcd2a5f4740371268055d95d0a24523f7665c747f16cff811cbb5844d
>-SIZE (sredird-2.2.1.tar.gz) = 25766
>+MD5 (sredird-2.2.2.tar.gz) = e541e4b1cb9fa8fc8ff0e76bb1127cda
>+SHA256 (sredird-2.2.2.tar.gz) = 640c47dcd84b3b90640165a38eb336a675fdab06c14c09cae2f4a604cae560d3
>+SIZE (sredird-2.2.2.tar.gz) = 25495
>diff -NrU3 sredird.orig/files/patch-aa sredird/files/patch-aa
>--- sredird.orig/files/patch-aa	Wed Dec 28 15:32:34 2005
>+++ sredird/files/patch-aa	Wed Dec 28 15:40:01 2005
>@@ -1,54 +1,52 @@
>---- sredird.c.orig	Mon Sep 20 15:26:54 1999
>-+++ sredird.c	Tue Dec 21 11:02:48 1999
>-@@ -43,7 +43,12 @@
>+--- sredird.c.orig	Wed Dec 28 15:35:00 2005
>++++ sredird.c	Wed Dec 28 15:39:43 2005
>+@@ -110,7 +110,12 @@
>  #include <fcntl.h>
>  #include <syslog.h>
>  #include <termios.h>
>--#include <termio.h>
>-+#ifndef __FreeBSD__ /* FreeBSD */
>-+#include <termio.h> /* Doesn't exist on FreeBSD */
>++#ifndef __FreeBSD__
>+ #include <termio.h>
> +#else
>-+#include <netdb.h> /* Necessary for getprotobyname(3) function */
>-+#include <netinet/in_systm.h> /* Reqired for netinet/ip.h */
>-+#endif /* FreeBSD */
>++#include <netdb.h>
>++#include <netinet/in_systm.h>
>++#endif
>  #include <sys/socket.h>
>  #include <netinet/in.h>
>  #include <netinet/ip.h>
>-@@ -129,6 +134,14 @@
>+@@ -196,6 +201,13 @@
>  /* Default modem state polling in milliseconds (100 msec should be enough) */
>  #define ModemStatePolling 100
>  
>-+/* FreeBSD specific definitions */
>-+#ifdef __FreeBSD__ /* FreeBSD */
>++#ifdef __FreeBSD__
> +struct tms mytms;
>-+#define times(NULL) times(&mytms) /* Coz times(NULL) coredumps on FreeBSD */
>-+#define SOL_TCP getprotobyname("TCP")->p_proto /* SOL_TCP and SOL_IP undefined */
>-+#define SOL_IP getprotobyname("IP")->p_proto   /* on FreeBSD                   */
>-+#endif /* FreeBSD */
>++#define times(NULL) times(&mytms)
>++#define SOL_TCP getprotobyname("TCP")->p_proto
>++#define SOL_IP getprotobyname("IP")->p_proto
>++#endif
> +
>  /* Standard boolean definition */
>  typedef enum { False, True } Boolean;
>  
>-@@ -571,8 +584,10 @@
>-           return(115200UL);
>-         case B230400:
>-           return(230400UL);
>-+#ifndef __FreeBSD__ /* Sadly, but FreeBSD doesn't support rates > 230K */
>-         case B460800:
>-           return(460800UL);
>+@@ -714,8 +726,10 @@
>+ 					return(115200UL);
>+ 				case B230400:
>+ 					return(230400UL);
>++#ifndef __FreeBSD__
>+ 				case B460800:
>+ 					return(460800UL);
> +#endif
>-         default:
>-           return(0UL);
>-       }
>-@@ -954,9 +969,11 @@
>-         case 230400UL:
>-           Speed = B230400;
>-         break;
>+ 				default:
>+ 					return(0UL);
>+ 			}
>+@@ -1094,9 +1108,11 @@
>+ 				case 230400UL:
>+ 					Speed = B230400;
>+ 				break;
> +#ifndef __FreeBSD__
>-         case 460800UL:
>-           Speed = B460800;
>-         break;
>+ 				case 460800UL:
>+ 					Speed = B460800;
>+ 				break;
> +#endif
>-         default:
>-           LogMsg(LOG_WARNING,"Unknwon baud rate requested. Setting to 38400");
>-           Speed = B38400;
>+ 				default:
>+ 					LogMsg(LOG_WARNING,"Unknwon baud rate requested, setting to 9600.");
>+ 					Speed = B9600;
>diff -NrU3 sredird.orig/files/patch-ab sredird/files/patch-ab
>--- sredird.orig/files/patch-ab	Wed Dec 28 15:32:34 2005
>+++ sredird/files/patch-ab	Wed Dec 28 15:43:06 2005
>@@ -1,8 +1,5 @@
>-
>-$FreeBSD: ports/comms/sredird/files/patch-ab,v 1.2 2003/02/17 13:28:53 sobomax Exp $
>-
>---- README.orig	Thu Nov 14 11:29:17 2002
>-+++ README	Mon Feb 17 15:25:24 2003
>+--- README.orig	Wed Dec 28 15:40:48 2005
>++++ README	Wed Dec 28 15:42:52 2005
> @@ -101,21 +101,19 @@
>  
>  5 - Installation
>@@ -13,7 +10,7 @@
>  configuration file (usually /etc/inetd.conf) should look like this:
>  
> -sredir          stream  tcp     nowait  root    /usr/sbin/tcpd /usr/sbin/sredird -i 5 /dev/modem /var/lock/LCK..modem
>-+sredir		stream	tcp	nowait	root	/usr/local/libexec/sredird	sredird -i 5 /dev/cuaa0 /var/spool/lock/LCK..cuaa0
>++sredir         stream  tcp     nowait  root    /usr/local/libexec/sredird      sredird -i 5 /dev/cuaa0 /var/spool/lock/LCK..cuaa0
>  
>  Of course, "sredir" should be defined in the services file (usually
> -/etc/services, usual values start at port 7000) and "/dev/modem" should

Actions: View | Diff

Attachments on bug 91033: 60665