diff options
| -rw-r--r-- | package/picocom/Makefile | 8 | ||||
| -rw-r--r-- | package/picocom/patches/patch-Makefile | 16 | ||||
| -rw-r--r-- | package/picocom/patches/patch-term_c | 106 |
3 files changed, 119 insertions, 11 deletions
diff --git a/package/picocom/Makefile b/package/picocom/Makefile index d602f724f..db15a0646 100644 --- a/package/picocom/Makefile +++ b/package/picocom/Makefile @@ -4,13 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= picocom -PKG_VERSION:= 1.4 +PKG_VERSION:= 1.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 08fcc5f6bb9e7676a2569386d5ea9f70 +PKG_MD5SUM:= 8eaba1d31407e8408674d6e57af447ef PKG_DESCR:= minimal dumb-terminal emulation program PKG_SECTION:= serial -PKG_URL:= http://efault.net/npat/hacks/picocom/ -PKG_SITES:= http://efault.net/npat/hacks/picocom/dist/ +PKG_URL:= http://code.google.com/p/picocom +PKG_SITES:= http://picocom.googlecode.com/files/ include ${TOPDIR}/mk/package.mk diff --git a/package/picocom/patches/patch-Makefile b/package/picocom/patches/patch-Makefile index 621e7c211..6c08b9d12 100644 --- a/package/picocom/patches/patch-Makefile +++ b/package/picocom/patches/patch-Makefile @@ -1,13 +1,15 @@ ---- picocom-1.4.orig/Makefile 2004-08-13 13:18:38.000000000 +0200 -+++ picocom-1.4/Makefile 2011-01-21 21:02:02.096749132 +0100 -@@ -2,11 +2,12 @@ - VERSION=1.4 +--- picocom-1.7.orig/Makefile 2012-02-21 06:42:24.000000000 +0100 ++++ picocom-1.7/Makefile 2013-12-26 09:43:38.000000000 +0100 +@@ -4,13 +4,14 @@ VERSION=1.7 + UUCP_LOCK_DIR=/var/lock # CC = gcc --CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\" --CFLAGS = -Wall -g +-CPPFLAGS=-DVERSION_STR=\"$(VERSION)\" \ +CPPFLAGS ?= -+CPPFLAGS += -DVERSION_STR=\"$(VERSION)\" -DUUCP_LOCK_DIR=\"/var/lock\" ++CPPFLAGS+=-DVERSION_STR=\"$(VERSION)\" \ + -DUUCP_LOCK_DIR=\"$(UUCP_LOCK_DIR)\" \ + -DHIGH_BAUD +-CFLAGS = -Wall -g +CFLAGS ?= -Wall -g # LD = gcc diff --git a/package/picocom/patches/patch-term_c b/package/picocom/patches/patch-term_c new file mode 100644 index 000000000..6ed95ab65 --- /dev/null +++ b/package/picocom/patches/patch-term_c @@ -0,0 +1,106 @@ +--- picocom-1.7.orig/term.c 2010-05-29 00:41:19.000000000 +0200 ++++ picocom-1.7/term.c 2013-12-26 09:45:20.000000000 +0100 +@@ -33,11 +33,7 @@ + #include <string.h> + #include <errno.h> + #include <unistd.h> +-#ifdef __linux__ +-#include <termio.h> +-#else + #include <termios.h> +-#endif /* of __linux__ */ + + #include "term.h" + +@@ -945,27 +941,6 @@ term_pulse_dtr (int fd) + break; + } + +-#ifdef __linux__ +- { +- int opins = TIOCM_DTR; +- +- r = ioctl(fd, TIOCMBIC, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRDOWN; +- rval = -1; +- break; +- } +- +- sleep(1); +- +- r = ioctl(fd, TIOCMBIS, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRUP; +- rval = -1; +- break; +- } +- } +-#else + { + struct termios tio, tioold; + +@@ -997,8 +972,6 @@ term_pulse_dtr (int fd) + break; + } + } +-#endif /* of __linux__ */ +- + } while (0); + + return rval; +@@ -1020,19 +993,6 @@ term_raise_dtr(int fd) + rval = -1; + break; + } +- +-#ifdef __linux__ +- { +- int opins = TIOCM_DTR; +- +- r = ioctl(fd, TIOCMBIS, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRUP; +- rval = -1; +- break; +- } +- } +-#else + r = tcsetattr(fd, TCSANOW, &term.currtermios[i]); + if ( r < 0 ) { + /* FIXME: perhaps try to update currtermios */ +@@ -1040,7 +1000,6 @@ term_raise_dtr(int fd) + rval = -1; + break; + } +-#endif /* of __linux__ */ + } while (0); + + return rval; +@@ -1064,18 +1023,6 @@ term_lower_dtr(int fd) + break; + } + +-#ifdef __linux__ +- { +- int opins = TIOCM_DTR; +- +- r = ioctl(fd, TIOCMBIC, &opins); +- if ( r < 0 ) { +- term_errno = TERM_EDTRDOWN; +- rval = -1; +- break; +- } +- } +-#else + { + struct termios tio; + +@@ -1097,7 +1044,6 @@ term_lower_dtr(int fd) + break; + } + } +-#endif /* of __linux__ */ + } while (0); + + return rval; |