Hello community,
here is the log from the commit of package minicom for openSUSE:Factory
checked in at Wed Feb 2 02:06:26 CET 2011.
--------
--- minicom/minicom.changes 2011-01-11 16:54:21.000000000 +0100
+++ /mounts/work_src_done/STABLE/minicom/minicom.changes 2011-01-31 12:55:51.000000000 +0100
@@ -1,0 +2,14 @@
+Mon Jan 31 10:03:17 UTC 2011 - vcizek@novell.com
+
+- update to 2.5
+ * src/script.c: Make word handling more dynamic, and thus allowing
+ words > 89 chars. Reported via Debian BTS #610511.
+ * src/rwconf.c: Fix config file parsing bug, Thanks Jan Görig,
+ https://bugzilla.redhat.com/show_bug.cgi?id=669406
+ * src/updown.c: Check for error conditions on fd of running script.
+ for minicom bug-tracker #312517, by Chris Simmonds
+ * src/updown.c: Removed static buffers that limit multi-file
+ zmodem functionality. (Redhat #98654)
+- removed two unneeded patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bug199924.diff
bug204522.diff
minicom-2.4.tar.bz2
New:
----
minicom-2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ minicom.spec ++++++
--- /var/tmp/diff_new_pack.furEin/_old 2011-02-02 02:04:12.000000000 +0100
+++ /var/tmp/diff_new_pack.furEin/_new 2011-02-02 02:04:12.000000000 +0100
@@ -25,18 +25,16 @@
License: GPLv2+
Group: Hardware/Modem
Requires: rzsz
-Version: 2.4
-Release: 2
+Version: 2.5
+Release: 1
Summary: A Terminal Program
Source: %{name}-%{version}.tar.bz2
Patch0: minicom-2.2-defaults.diff
Patch1: minicom-2.3-ncurses.patch
-Patch2: bug204522.diff
-Patch3: bug199924.diff
-Patch4: 03norzsz.diff
-Patch5: minicom-2.4-lockdev.diff
-Patch6: minicom-2.3-no-build-date.patch
-Patch7: minicom-2.4-norootsetup.diff
+Patch2: 03norzsz.diff
+Patch3: minicom-2.4-lockdev.diff
+Patch4: minicom-2.3-no-build-date.patch
+Patch5: minicom-2.4-norootsetup.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -60,10 +58,8 @@
%patch1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
+%patch4
%patch5 -p1
-%patch6
-%patch7 -p1
%build
autoreconf --force --install
++++++ minicom-2.3-ncurses.patch ++++++
--- /var/tmp/diff_new_pack.furEin/_old 2011-02-02 02:04:12.000000000 +0100
+++ /var/tmp/diff_new_pack.furEin/_new 2011-02-02 02:04:12.000000000 +0100
@@ -5,8 +5,8 @@
@@ -146,6 +146,7 @@ dnl Do not use unles
if test "x$termlib" = xncurses; then
dnl Use AC_CHECK_HEADERS so the HAVE_*_H symbol gets defined.
- AC_CHECK_HEADERS(ncurses/termcap.h)
+ AC_CHECK_HEADERS(ncurses/termcap.h, [found_termcap_h=1])
+ CFLAGS="$CFLAGS -I/usr/include/ncurses"
fi
-
- AC_CHECK_LIB(socket, socket)
+ if test "x$found_termcap_h" != "x1"; then
+ AC_CHECK_HEADERS(termcap.h)
++++++ minicom-2.3-no-build-date.patch ++++++
--- /var/tmp/diff_new_pack.furEin/_old 2011-02-02 02:04:12.000000000 +0100
+++ /var/tmp/diff_new_pack.furEin/_new 2011-02-02 02:04:12.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- src/minicom.c.orig
+++ src/minicom.c
-@@ -1076,9 +1076,6 @@ int main(int argc, char **argv)
+@@ -1085,9 +1085,6 @@ int main(int argc, char **argv)
switch(c) {
case 'v':
printf(_("%s version %s"), PACKAGE, VERSION);
@@ -12,13 +12,13 @@
printf("\n");
printf(_("Copyright (C) Miquel van Smoorenburg.\n\n"));
printf("This program is free software; you can redistribute it and/or\n"
-@@ -1360,9 +1357,6 @@ int main(int argc, char **argv)
+@@ -1369,9 +1366,6 @@ int main(int argc, char **argv)
mc_wprintf(us, "\n%s %s\r\n", _("Welcome to minicom"), VERSION);
mc_wprintf(us, "\n%s: %s\r\n", _("OPTIONS"), option_string);
-#if defined (__DATE__) && defined (__TIME__)
- mc_wprintf(us, "%s %s, %s.\r\n",_("Compiled on"), __DATE__,__TIME__);
-#endif
- mc_wprintf(us, "Port %s\r\n", P_PORT);
+ mc_wprintf(us, "%s %s\r\n", _("Port"), P_PORT);
if (using_iconv())
- mc_wprintf(us, _("Using character set conversion\r\n"));
+ mc_wprintf(us, "%s\r\n", _("Using character set conversion"));
++++++ minicom-2.4-lockdev.diff ++++++
--- /var/tmp/diff_new_pack.furEin/_old 2011-02-02 02:04:12.000000000 +0100
+++ /var/tmp/diff_new_pack.furEin/_new 2011-02-02 02:04:12.000000000 +0100
@@ -1,8 +1,8 @@
-Index: minicom-2.4/src/main.c
+Index: minicom-2.5/src/main.c
===================================================================
---- minicom-2.4.orig/src/main.c
-+++ minicom-2.4/src/main.c
-@@ -161,6 +161,20 @@ int open_term(int doinit, int show_win_o
+--- minicom-2.5.orig/src/main.c
++++ minicom-2.5/src/main.c
+@@ -164,6 +164,20 @@ int open_term(int doinit, int show_win_o
int s_errno;
#endif
@@ -23,7 +23,7 @@
/* First see if the lock file directory is present. */
if (P_LOCK[0] && stat(P_LOCK, &stt) == 0) {
-@@ -208,10 +222,12 @@ int open_term(int doinit, int show_win_o
+@@ -211,10 +225,12 @@ int open_term(int doinit, int show_win_o
return -1;
}
}
@@ -36,7 +36,7 @@
/* Run a special program to disable callin if needed. */
if (doinit > 0 && P_CALLOUT[0]) {
if (fastsystem(P_CALLOUT, NULL, NULL, NULL) < 0) {
-@@ -229,11 +245,7 @@ int open_term(int doinit, int show_win_o
+@@ -232,11 +248,7 @@ int open_term(int doinit, int show_win_o
signal(SIGALRM, get_alrm);
alarm(4);
#ifdef USE_SOCKET
@@ -49,11 +49,11 @@
portfd_sock_addr.sun_family = AF_UNIX;
strncpy(portfd_sock_addr.sun_path,
dial_tty + strlen(SOCKET_PREFIX),
-Index: minicom-2.4/src/minicom.c
+Index: minicom-2.5/src/minicom.c
===================================================================
---- minicom-2.4.orig/src/minicom.c
-+++ minicom-2.4/src/minicom.c
-@@ -1555,7 +1555,7 @@ dirty_goto:
+--- minicom-2.5.orig/src/minicom.c
++++ minicom-2.5/src/minicom.c
+@@ -1570,7 +1570,7 @@ dirty_goto:
mc_wclose(stdwin, 1);
keyboard(KUNINSTALL, 0);
if (lockfile[0])
@@ -62,10 +62,10 @@
close(portfd);
if (quit != NORESET && P_CALLIN[0])
-Index: minicom-2.4/src/minicom.h
+Index: minicom-2.5/src/minicom.h
===================================================================
---- minicom-2.4.orig/src/minicom.h
-+++ minicom-2.4/src/minicom.h
+--- minicom-2.5.orig/src/minicom.h
++++ minicom-2.5/src/minicom.h
@@ -35,6 +35,12 @@
#include
@@ -88,11 +88,11 @@
EXTERN char homedir[256]; /* Home directory of user */
EXTERN char logfname[PARS_VAL_LEN]; /* Name of the logfile */
EXTERN char username[16]; /* Who is using minicom? */
-Index: minicom-2.4/src/updown.c
+Index: minicom-2.5/src/updown.c
===================================================================
---- minicom-2.4.orig/src/updown.c
-+++ minicom-2.4/src/updown.c
-@@ -393,18 +393,28 @@ void updown(int what, int nr)
+--- minicom-2.5.orig/src/updown.c
++++ minicom-2.5/src/updown.c
+@@ -457,17 +457,28 @@ void updown(int what, int nr)
void lockfile_remove(void)
{
@@ -110,7 +110,7 @@
+ int n;
+#if !HAVE_LOCKDEV
+ int fd;
- char buf[81];
++ char buf[81];
+#endif
+
+ if (portfd_is_socket)
@@ -123,7 +123,7 @@
n = umask(022);
/* Create lockfile compatible with UUCP-1.2 */
if ((fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, 0666)) < 0) {
-@@ -415,6 +425,9 @@ void lockfile_create(void)
+@@ -484,6 +495,9 @@ void lockfile_create(void)
close(fd);
}
umask(n);
@@ -133,10 +133,10 @@
}
/*
-Index: minicom-2.4/configure.in
+Index: minicom-2.5/configure.in
===================================================================
---- minicom-2.4.orig/configure.in
-+++ minicom-2.4/configure.in
+--- minicom-2.5.orig/configure.in
++++ minicom-2.5/configure.in
@@ -38,6 +38,11 @@ if test "x$enable_socket" = xyes; then
AC_DEFINE(USE_SOCKET, [1], [Socket support is enabled])
fi
@@ -149,11 +149,11 @@
AC_ARG_ENABLE([lock-dir],
AS_HELP_STRING([--enable-lock-dir=DIR],
[Set com line lock directory (def: try common locations)]),
-Index: minicom-2.4/src/Makefile.am
+Index: minicom-2.5/src/Makefile.am
===================================================================
---- minicom-2.4.orig/src/Makefile.am
-+++ minicom-2.4/src/Makefile.am
-@@ -31,7 +31,7 @@ confdir = @MINICOM_CONFDIR@
+--- minicom-2.5.orig/src/Makefile.am
++++ minicom-2.5/src/Makefile.am
+@@ -29,7 +29,7 @@ confdir = @MINICOM_CONFDIR@
AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/lib -DCONFDIR=\"$(confdir)\" \
-DLOCALEDIR=\"$(datadir)/locale\"
++++++ minicom-2.4.tar.bz2 -> minicom-2.5.tar.bz2 ++++++
++++ 41307 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org