minicom: Update to 2.3 (from OE)

Signed-off-by: Saul Wold <Saul.Wold@intel.com>

5 files changed, 30 insertions, 37 deletions

diff --git a/meta-lsb/packages/minicom/minicom-2.1/configure.patch b/meta-lsb/packages/minicom/minicom-2.1/configure.patch
deleted file mode 100644
index 4db47fb3d8..0000000000
--- a/meta-lsb/packages/minicom/minicom-2.1/configure.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: minicom-2.1/configure.in
-===================================================================
---- minicom-2.1.orig/configure.in       2003-04-29 21:08:25.000000000 +0000
-+++ minicom-2.1/configure.in    2005-07-04 19:03:32.000000000 +0000
-@@ -231,9 +231,9 @@
- AC_HEADER_STAT
- AC_HEADER_TIME
- 
--AM_SYS_POSIX_TERMIOS
-+AC_SYS_POSIX_TERMIOS
- AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
--if test $am_cv_sys_posix_termios = yes; then
-+if test $ac_cv_sys_posix_termios = yes; then
-   AC_DEFINE(POSIX_TERMIOS)
- fi
- 
-@@ -253,7 +253,7 @@
- 
- dnl Checks for library functions.
- AC_TYPE_SIGNAL
--AM_FUNC_ERROR_AT_LINE
-+AC_FUNC_ERROR_AT_LINE
- AC_FUNC_CLOSEDIR_VOID
- AM_WITH_DMALLOC
- AC_CHECK_FUNCS(getcwd getwd strerror strstr vsnprintf vprintf)
diff --git a/meta-lsb/packages/minicom/minicom-2.1/gcc4-scope.patch b/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch
index 5bd47bd354..5bd47bd354 100644
--- a/meta-lsb/packages/minicom/minicom-2.1/gcc4-scope.patch
+++ b/meta-lsb/packages/minicom/minicom-2.3/gcc4-scope.patch
diff --git a/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch b/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch
new file mode 100644
index 0000000000..c344203267
--- /dev/null
+++ b/meta-lsb/packages/minicom/minicom-2.3/rename-conflicting-functions.patch
@@ -0,0 +1,13 @@
+--- minicom-2.3/src/minicom.c-orig      2009-06-08 14:49:07.000000000 +0200
++++ minicom-2.3/src/minicom.c   2009-06-08 14:50:23.000000000 +0200
+@@ -63,6 +63,10 @@
+ }
+ #endif /*DEBUG*/
+ 
++#ifdef __USE_GNU
++#define getline minicom_getline
++#endif
++
+ /*
+  * Sub - menu's.
+  */
diff --git a/meta-lsb/packages/minicom/minicom_2.1.bb b/meta-lsb/packages/minicom/minicom_2.1.bb
deleted file mode 100644
index c4a1c3018a..0000000000
--- a/meta-lsb/packages/minicom/minicom_2.1.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-SECTION = "console/network"
-DEPENDS = "ncurses"
-LICENSE = "GPL"
-SRC_URI = "http://alioth.debian.org/download.php/123/minicom-${PV}.tar.gz \
-        file://configure.patch;patch=1 \
-        file://gcc4-scope.patch;patch=1"
-
-inherit autotools gettext
-
-do_install() {
-        for d in doc extras man intl lib src; do make -C $d DESTDIR=${D} install; done
-}
diff --git a/meta-lsb/packages/minicom/minicom_2.3.bb b/meta-lsb/packages/minicom/minicom_2.3.bb
new file mode 100644
index 0000000000..a114e30c99
--- /dev/null
+++ b/meta-lsb/packages/minicom/minicom_2.3.bb
@@ -0,0 +1,17 @@
+SECTION = "console/network"
+DEPENDS = "ncurses"
+LICENSE = "GPL"
+SRC_URI = "http://alioth.debian.org/frs/download.php/2332/minicom-${PV}.tar.gz \
+        file://rename-conflicting-functions.patch \
+        "
+
+#       file://gcc4-scope.patch;patch=1 \
+
+inherit autotools gettext
+
+do_install() {
+        for d in doc extras man lib src; do make -C $d DESTDIR=${D} install; done
+}
+
+SRC_URI[md5sum] = "0ebe7a91898384ca906787cc4e2c3f25"
+SRC_URI[sha256sum] = "2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb"