Hello community,
here is the log from the commit of package minicom for openSUSE:Factory
checked in at Fri Sep 3 17:40:20 CEST 2010.
--------
--- minicom/minicom.changes 2010-08-29 19:53:08.000000000 +0200
+++ minicom/minicom.changes 2010-09-03 16:18:30.000000000 +0200
@@ -1,0 +2,14 @@
+Tue Aug 31 15:46:53 CEST 2010 - anicka@suse.cz
+
+- update to 2.4
+ * Add options -b, -D and -R.
+ * Remove environment variable for the remote
+ charset and make it available via option -R.
+ * remove all code that deals with running as suid-root. Also
+ remove minicom.users as it's not needed anymore. Handle
+ permissions within the file-system.
+ * Consolidate lockfile handling into separate functions and use them,
+ also do lockfile handling before and after launching kermit.
+ * Add -b %b (Baudrate) to kermit command call.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
minicom-2.3-conflicting-types.patch
minicom-2.3.tar.bz2
xminicom-title.diff
New:
----
minicom-2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ minicom.spec ++++++
--- /var/tmp/diff_new_pack.Ovz1zv/_old 2010-09-03 17:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Ovz1zv/_new 2010-09-03 17:38:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package minicom (Version 2.3)
+# spec file for package minicom (Version 2.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,20 +25,17 @@
License: GPLv2+
Group: Hardware/Modem
Requires: rzsz
-Version: 2.3
-Release: 41
+Version: 2.4
+Release: 1
Summary: A Terminal Program
Source: %{name}-%{version}.tar.bz2
Patch0: minicom-2.2-defaults.diff
-Patch1: xminicom-title.diff
-Patch2: minicom-2.3-conflicting-types.patch
-Patch3: minicom-2.3-ncurses.patch
-#Patch4: 01manual.diff
-Patch5: bug199924.diff
-Patch6: 03norzsz.diff
-Patch7: bug204522.diff
-Patch8: minicom-2.3-lockdev.diff
-Patch9: minicom-2.3-no-build-date.patch
+Patch1: minicom-2.3-ncurses.patch
+Patch2: bug204522.diff
+Patch3: bug199924.diff
+Patch4: 03norzsz.diff
+Patch5: minicom-2.3-lockdev.diff
+Patch6: minicom-2.3-no-build-date.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -60,14 +57,11 @@
%setup -q
%patch0
%patch1
-%patch2
-%patch3
-#patch4 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9
+%patch6
%build
autoreconf --force --install
++++++ bug199924.diff ++++++
--- /var/tmp/diff_new_pack.Ovz1zv/_old 2010-09-03 17:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Ovz1zv/_new 2010-09-03 17:38:37.000000000 +0200
@@ -1,6 +1,8 @@
---- minicom-2.2.orig/src/util.c 2005-11-09 00:34:25.000000000 +0100
-+++ minicom-2.2/src/util.c 2006-10-19 17:38:18.000000000 +0200
-@@ -120,7 +120,7 @@
+Index: minicom-2.4/src/util.c
+===================================================================
+--- minicom-2.4.orig/src/util.c
++++ minicom-2.4/src/util.c
+@@ -115,7 +115,7 @@ int fastexec(char *cmd)
/* Delete escape-characters ment for the shell */
p = cmd;
@@ -9,9 +11,11 @@
memmove(p, p + 1, strlen(p+1));
/* Split line into words */
---- minicom-2.2.orig/src/file.c 2005-08-14 22:39:30.000000000 +0200
-+++ minicom-2.2/src/file.c 2006-10-19 17:43:10.000000000 +0200
-@@ -535,6 +535,8 @@
+Index: minicom-2.4/src/file.c
+===================================================================
+--- minicom-2.4.orig/src/file.c
++++ minicom-2.4/src/file.c
+@@ -534,6 +534,8 @@ static char *concat_list(GETSDIR_ENTRY *
{
GETSDIR_ENTRY *my_d;
int indxr, len;
@@ -20,7 +24,7 @@
my_d = d;
for (indxr = nrents, len = 0; indxr; --indxr, ++my_d)
-@@ -554,8 +556,18 @@
+@@ -553,8 +555,18 @@ static char *concat_list(GETSDIR_ENTRY *
for (indxr = nrents; indxr; --indxr, ++my_d)
if (my_d->cflags & FL_TAG) {
/* this could be *much* more efficient */
++++++ bug204522.diff ++++++
--- /var/tmp/diff_new_pack.Ovz1zv/_old 2010-09-03 17:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Ovz1zv/_new 2010-09-03 17:38:37.000000000 +0200
@@ -1,19 +1,23 @@
---- minicom-2.2.orig/src/config.c 2006-04-02 11:52:30.000000000 +0200
-+++ minicom-2.2/src/config.c 2006-10-19 17:50:24.000000000 +0200
-@@ -58,13 +58,10 @@
- sleep(2);
- return;
- }
+Index: minicom-2.4/src/config.c
+===================================================================
+--- minicom-2.4.orig/src/config.c
++++ minicom-2.4/src/config.c
+@@ -51,14 +51,11 @@ void read_parms(void)
+ char *p;
+
+ /* Read global parameters */
+- if ((fp = fopen(parfile, "r")) == NULL) {
- fprintf(stderr,
- _("minicom: there is no global configuration file %s\n"), parfile);
- fputs(_("Ask your sysadmin to create one (with minicom -s).\n"), stderr);
- exit(1);
-+ } else {
-+ readpars(fp, CONFIG_GLOBAL);
-+ fclose(fp);
++ if ((fp = fopen(parfile, "r")) != NULL) {
++ readpars(fp, CONFIG_GLOBAL);
++ fclose(fp);
}
- readpars(fp, CONFIG_GLOBAL);
- fclose(fp);
++
/* Read personal parameters */
- if ((fp = sfopen(pparfile, "r")) != NULL) {
+ if ((fp = fopen(pparfile, "r")) != NULL) {
readpars(fp, CONFIG_PERSONAL);
++++++ minicom-2.2-defaults.diff ++++++
--- /var/tmp/diff_new_pack.Ovz1zv/_old 2010-09-03 17:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Ovz1zv/_new 2010-09-03 17:38:37.000000000 +0200
@@ -1,6 +1,8 @@
---- src/rwconf.c
+Index: src/rwconf.c
+===================================================================
+--- src/rwconf.c.orig
+++ src/rwconf.c
-@@ -78,8 +78,8 @@
+@@ -79,8 +79,8 @@ struct pars mpars[] = {
#if defined(__linux__) || defined(__GNU__)
{ "/usr/bin/sz -vv -b", 0, "pprog1" },
{ "/usr/bin/sb -vv", 0, "pprog2" },
@@ -10,8 +12,8 @@
+ { "/usr/bin/rz -vv -b", 0, "pprog4" },
{ "/usr/bin/rb -vv", 0, "pprog5" },
{ "/usr/bin/rx -vv", 0, "pprog6" },
- { "/usr/bin/kermit -i -l %l -s", 0, "pprog7" },
-@@ -144,7 +144,7 @@
+ { "/usr/bin/kermit -i -l %l -b %b -s", 0, "pprog7" },
+@@ -145,7 +145,7 @@ struct pars mpars[] = {
{ "BS", 0, "backspace" },
{ N_("enabled"), 0, "statusline" },
{ N_("Yes"), 0, "hasdcd" },
++++++ minicom-2.3-lockdev.diff ++++++
--- /var/tmp/diff_new_pack.Ovz1zv/_old 2010-09-03 17:38:37.000000000 +0200
+++ /var/tmp/diff_new_pack.Ovz1zv/_new 2010-09-03 17:38:37.000000000 +0200
@@ -1,43 +1,19 @@
-Index: minicom-2.3/src/main.c
+Index: minicom-2.4/src/main.c
===================================================================
---- minicom-2.3.orig/src/main.c
-+++ minicom-2.3/src/main.c
-@@ -87,7 +87,7 @@ void leave(const char *s)
- }
- set_privs();
- if (lockfile[0])
-- unlink(lockfile);
-+ ttyunlock(lockfile);
- if (P_CALLIN[0])
- fastsystem(P_CALLIN, NULL, NULL, NULL);
- if (real_uid)
-@@ -161,10 +161,13 @@ void term_socket_close(void)
- int open_term(int doinit, int show_win_on_error)
- {
- struct stat stt;
-+#if !HAVE_LOCKDEV
- char buf[128];
-- int fd, n = 0;
-+ int fd;
- int pid;
- int mask;
-+#endif
-+ int n = 0;
- #ifdef HAVE_ERRNO_H
+--- minicom-2.4.orig/src/main.c
++++ minicom-2.4/src/main.c
+@@ -161,6 +161,8 @@ int open_term(int doinit, int show_win_o
int s_errno;
#endif
-@@ -172,6 +175,8 @@ int open_term(int doinit, int show_win_o
- /* Upgrade our status. */
- set_privs();
+#if !HAVE_LOCKDEV
+
/* First see if the lock file directory is present. */
if (P_LOCK[0] && stat(P_LOCK, &stt) == 0) {
-@@ -243,6 +248,30 @@ int open_term(int doinit, int show_win_o
- close(fd);
- }
+@@ -212,6 +214,29 @@ int open_term(int doinit, int show_win_o
+ if (doinit > 0)
+ lockfile_create();
+#else
+ lockfile[0] = 0;
@@ -57,7 +33,6 @@
+ }
+ if (rc) {
+ if (stdwin) mc_wclose(stdwin, 1);
-+ drop_privs();
+ return(-1);
+ }
+ }
@@ -66,47 +41,23 @@
/* Run a special program to disable callin if needed. */
if (doinit > 0 && P_CALLOUT[0]) {
if (fastsystem(P_CALLOUT, NULL, NULL, NULL) < 0) {
-@@ -250,7 +279,7 @@ int open_term(int doinit, int show_win_o
- mc_wclose(stdwin, 1);
- fprintf(stderr, _("Could not setup for dial out.\n"));
- if (lockfile[0])
-- unlink(lockfile);
-+ ttyunlock(lockfile);
- drop_privs();
- return -1;
- }
-@@ -310,12 +339,12 @@ int open_term(int doinit, int show_win_o
- fprintf(stderr, _("minicom: cannot open %s. Sorry.\n"), dial_tty);
- #endif
- if (lockfile[0])
-- unlink(lockfile);
-+ ttyunlock(lockfile);
- drop_privs();
- return -1;
- }
- if (lockfile[0])
-- unlink(lockfile);
-+ ttyunlock(lockfile);
- if (show_win_on_error)
- werror(_("Cannot open %s!"), dial_tty);
- drop_privs();
-Index: minicom-2.3/src/minicom.c
-===================================================================
---- minicom-2.3.orig/src/minicom.c
-+++ minicom-2.3/src/minicom.c
-@@ -1545,7 +1545,7 @@ dirty_goto:
- set_privs();
+Index: minicom-2.4/src/minicom.c
+===================================================================
+--- minicom-2.4.orig/src/minicom.c
++++ minicom-2.4/src/minicom.c
+@@ -1555,7 +1555,7 @@ dirty_goto:
+ mc_wclose(stdwin, 1);
keyboard(KUNINSTALL, 0);
if (lockfile[0])
- unlink(lockfile);
+ ttyunlock(lockfile);
close(portfd);
- /* Please - if your system doesn't have uid_t and/or gid_t, define 'em
- * conditionally in "port.h".
-Index: minicom-2.3/src/minicom.h
+
+ if (quit != NORESET && P_CALLIN[0])
+Index: minicom-2.4/src/minicom.h
===================================================================
---- minicom-2.3.orig/src/minicom.h
-+++ minicom-2.3/src/minicom.h
+--- minicom-2.4.orig/src/minicom.h
++++ minicom-2.4/src/minicom.h
@@ -35,6 +35,12 @@
#include