Attachment 196355 Details for Bug 230753 – Patch file generated with "svn diff"

[patch] Patch file generated with "svn diff"

minicom-2.7.1_1.diff (text/plain), 7.92 KB, created by Samy Mahmoudi on 2018-08-19 18:10:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samy Mahmoudi

Created: 2018-08-19 18:10:34 UTC

Size: 7.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(rÃ©vision 477040)
>+++ Makefile	(copie de travail)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	minicom
> PORTVERSION=	2.7.1
>+PORTREVISION=	1
> CATEGORIES=	comms
> MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/4215/ \
> 		http://alioth.debian.org/frs/download.php/file/4215/ \
>Index: files/patch-doc_minirc.dfl
>===================================================================
>--- files/patch-doc_minirc.dfl	(nonexistent)
>+++ files/patch-doc_minirc.dfl	(copie de travail)
>@@ -0,0 +1,10 @@
>+--- doc/minirc.dfl.orig	2009-12-12 15:47:47 UTC
>++++ doc/minirc.dfl
>+@@ -1,2 +1,7 @@
>+ # $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
>+ # Machine-generated file - use "minicom -s" to change parameters.
>++pr port             /dev/cuau0
>++pu baudrate         9600
>++pu bits             8
>++pu parity           N
>++pu minit            
>
>Property changes on: files/patch-doc_minirc.dfl
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-minirc.dfl
>===================================================================
>--- files/patch-minirc.dfl	(rÃ©vision 477040)
>+++ files/patch-minirc.dfl	(nonexistent)
>@@ -1,10 +0,0 @@
>---- doc/minirc.dfl.orig	2009-12-12 16:47:47.000000000 +0100
>-+++ doc/minirc.dfl	2011-12-28 16:07:59.000000000 +0100
>-@@ -1,2 +1,7 @@
>- # $Id: minirc.dfl,v 1.1.1.1 2003-03-30 18:55:39 al-guest Exp $
>- # Machine-generated file - use "minicom -s" to change parameters.
>-+pr port             /dev/cuau0
>-+pu baudrate         9600
>-+pu bits             8
>-+pu parity           N
>-+pu minit            
>
>Property changes on: files/patch-minirc.dfl
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src-minicom.h
>===================================================================
>--- files/patch-src-minicom.h	(rÃ©vision 477040)
>+++ files/patch-src-minicom.h	(copie de travail)
>@@ -1,5 +1,5 @@
>---- src/minicom.h.orig	2011-09-30 09:57:22.000000000 +0200
>-+++ src/minicom.h	2011-12-28 16:12:54.000000000 +0100
>+--- src/minicom.h.orig	2013-12-08 10:26:03 UTC
>++++ src/minicom.h
> @@ -35,6 +35,7 @@
>  
>  #include <time.h>
>Index: files/patch-src-script.c
>===================================================================
>--- files/patch-src-script.c	(rÃ©vision 477040)
>+++ files/patch-src-script.c	(copie de travail)
>@@ -1,5 +1,5 @@
>---- src/script.c.orig	2013-10-29 12:07:42.000000000 +0100
>-+++ src/script.c	2014-01-02 20:30:55.000000000 +0100
>+--- src/script.c.orig	2013-10-29 11:07:42 UTC
>++++ src/script.c
> @@ -32,6 +32,7 @@
>  #include <config.h>
>  #endif
>Index: files/patch-src-updown.c
>===================================================================
>--- files/patch-src-updown.c	(rÃ©vision 477040)
>+++ files/patch-src-updown.c	(copie de travail)
>@@ -1,5 +1,5 @@
>---- src/updown.c.orig	2013-12-08 11:25:06.000000000 +0100
>-+++ src/updown.c	2014-01-02 20:30:33.000000000 +0100
>+--- src/updown.c.orig	2013-12-08 10:25:06 UTC
>++++ src/updown.c
> @@ -298,7 +298,7 @@ void updown(int what, int nr)
>      do_log("%s", cmdline);   /* jl 22.06.97 */
>  
>Index: files/patch-src-window.c
>===================================================================
>--- files/patch-src-window.c	(rÃ©vision 477040)
>+++ files/patch-src-window.c	(copie de travail)
>@@ -1,6 +1,6 @@
>---- src/window.c.orig	2010-12-12 14:56:25.000000000 +0100
>-+++ src/window.c	2011-12-28 16:07:59.000000000 +0100
>-@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *D
>+--- src/window.c.orig	2010-12-12 13:56:25 UTC
>++++ src/window.c
>+@@ -66,6 +66,7 @@ static const char *CE, *Al, *Dl, *AL, *DL;
>  static const char *CS, *SF, *SR, *VB, *BL;
>  static const char *VE, *VI, *KS, *KE;
>  static const char *CD, *CL, *IC, *DC;
>Index: files/patch-src_sysdep1.c
>===================================================================
>--- files/patch-src_sysdep1.c	(nonexistent)
>+++ files/patch-src_sysdep1.c	(copie de travail)
>@@ -0,0 +1,55 @@
>+--- src/sysdep1.c.orig	2009-12-12 15:47:47 UTC
>++++ src/sysdep1.c
>+@@ -65,13 +65,13 @@ static void m_setrts(int fd)
>+   if (portfd_is_socket)
>+     return;
>+ #endif
>+-#if defined(TIOCM_RTS) && defined(TIOCMODG)
>++#if defined(TIOCM_RTS) && defined(TIOCMGET)
>+   {
>+     int mcs=0;
>+ 
>+-    ioctl(fd, TIOCMODG, &mcs);
>++    ioctl(fd, TIOCMGET, &mcs);
>+     mcs |= TIOCM_RTS;
>+-    ioctl(fd, TIOCMODS, &mcs);
>++    ioctl(fd, TIOCMSET, &mcs);
>+   }
>+ #endif
>+ }
>+@@ -180,11 +180,11 @@ int m_getdcd(int fd)
>+     return portfd_is_connected;
>+   }
>+ #endif
>+-#ifdef TIOCMODG
>++#ifdef TIOCMODGET
>+   {
>+     int mcs = 0;
>+ 
>+-    if (ioctl(fd, TIOCMODG, &mcs) < 0)
>++    if (ioctl(fd, TIOCMODGET, &mcs) < 0)
>+       return -1;
>+     return mcs & TIOCM_CAR ? 1 : 0;
>+   }
>+@@ -227,8 +227,8 @@ void m_savestate(int fd)
>+   ioctl(fd, TIOCLGET, &lsw);
>+ #  endif
>+ #endif
>+-#ifdef TIOCMODG
>+-  ioctl(fd, TIOCMODG, &m_word);
>++#ifdef TIOCMGET
>++  ioctl(fd, TIOCMGET, &m_word);
>+ #endif
>+ }
>+ 
>+@@ -252,8 +252,8 @@ void m_restorestate(int fd)
>+   ioctl(fd, TIOCLSET, &lsw);
>+ #  endif
>+ #endif
>+-#ifdef TIOCMODS
>+-  ioctl(fd, TIOCMODS, &m_word);
>++#ifdef TIOCMSET
>++  ioctl(fd, TIOCMSET, &m_word);
>+ #endif
>+ }
>+ 
>
>Property changes on: files/patch-src_sysdep1.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-sysdep1.c
>===================================================================
>--- files/patch-sysdep1.c	(rÃ©vision 477040)
>+++ files/patch-sysdep1.c	(nonexistent)
>@@ -1,55 +0,0 @@
>---- src/sysdep1.c.orig	2009-12-12 16:47:47.000000000 +0100
>-+++ src/sysdep1.c	2011-12-28 16:07:59.000000000 +0100
>-@@ -65,13 +65,13 @@ static void m_setrts(int fd)
>-   if (portfd_is_socket)
>-     return;
>- #endif
>--#if defined(TIOCM_RTS) && defined(TIOCMODG)
>-+#if defined(TIOCM_RTS) && defined(TIOCMGET)
>-   {
>-     int mcs=0;
>- 
>--    ioctl(fd, TIOCMODG, &mcs);
>-+    ioctl(fd, TIOCMGET, &mcs);
>-     mcs |= TIOCM_RTS;
>--    ioctl(fd, TIOCMODS, &mcs);
>-+    ioctl(fd, TIOCMSET, &mcs);
>-   }
>- #endif
>- }
>-@@ -180,11 +180,11 @@ int m_getdcd(int fd)
>-     return portfd_is_connected;
>-   }
>- #endif
>--#ifdef TIOCMODG
>-+#ifdef TIOCMODGET
>-   {
>-     int mcs = 0;
>- 
>--    if (ioctl(fd, TIOCMODG, &mcs) < 0)
>-+    if (ioctl(fd, TIOCMODGET, &mcs) < 0)
>-       return -1;
>-     return mcs & TIOCM_CAR ? 1 : 0;
>-   }
>-@@ -227,8 +227,8 @@ void m_savestate(int fd)
>-   ioctl(fd, TIOCLGET, &lsw);
>- #  endif
>- #endif
>--#ifdef TIOCMODG
>--  ioctl(fd, TIOCMODG, &m_word);
>-+#ifdef TIOCMGET
>-+  ioctl(fd, TIOCMGET, &m_word);
>- #endif
>- }
>- 
>-@@ -252,8 +252,8 @@ void m_restorestate(int fd)
>-   ioctl(fd, TIOCLSET, &lsw);
>- #  endif
>- #endif
>--#ifdef TIOCMODS
>--  ioctl(fd, TIOCMODS, &m_word);
>-+#ifdef TIOCMSET
>-+  ioctl(fd, TIOCMSET, &m_word);
>- #endif
>- }
>- 
>
>Property changes on: files/patch-sysdep1.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(rÃ©vision 477040)
>+++ pkg-plist	(copie de travail)
>@@ -1,10 +1,4 @@
>-@owner uucp
>-@group dialer
>-@mode 4511
>-bin/minicom
>-@owner
>-@group
>-@mode
>+@(uucp,dialer,555) bin/minicom
> bin/xminicom
> bin/runscript
> bin/ascii-xfr

Actions: View | Diff

Attachments on bug 230753: 196355 | 202452 | 202453