diff --git a/ax25-tools-0.0.8-Unix98-ptmx.patch b/ax25-tools-0.0.8-Unix98-ptmx.patch new file mode 100644 index 0000000..bcde5dc --- /dev/null +++ b/ax25-tools-0.0.8-Unix98-ptmx.patch @@ -0,0 +1,42 @@ +--- kiss/mkiss.c.orig 2008-12-05 22:01:49.000000000 +0100 ++++ kiss/mkiss.c 2008-12-05 22:09:36.000000000 +0100 +@@ -96,6 +96,7 @@ + { + char *name; /* Interface name (/dev/???) */ + int fd; /* File descriptor */ ++ int is_pty; + int escaped; /* FESC received? */ + u16 crc; /* Incoming frame crc */ + unsigned char obuf[SIZE]; /* TX buffer */ +@@ -475,6 +476,8 @@ + perror("mkiss: open"); + return 1; + } ++ grantpt(tty->fd); ++ tty->is_pty = !unlockpt(tty->fd); + + tty->name = argv[optind]; + tty_raw(tty->fd, hwflag); +@@ -502,6 +505,8 @@ + perror("mkiss: open"); + return 1; + } ++ grantpt(pty[i]->fd); ++ pty[i]->is_pty = !unlockpt(pty[i]->fd); + pty[i]->name = argv[optind + i + 1]; + tty_raw(pty[i]->fd, FALSE); + pty[i]->optr = pty[i]->obuf; +@@ -511,9 +516,11 @@ + /* + * Now all the ports are open, lock them. + */ +- tty_lock(argv[optind]); ++ if (!tty->is_pty) ++ tty_lock(argv[optind]); + for (i = 0; i < numptys; i++) +- tty_lock(argv[optind + i + 1]); ++ if (!pty[i]->is_pty) ++ tty_lock(argv[optind + i + 1]); + + signal(SIGHUP, SIG_IGN); + signal(SIGUSR1, sigusr1_handler); diff --git a/ax25-tools.spec b/ax25-tools.spec index 03bb2f4..2f10c89 100644 --- a/ax25-tools.spec +++ b/ax25-tools.spec @@ -1,6 +1,6 @@ Name: ax25-tools Version: 0.0.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools used to configure an ax.25 enabled computer Group: Applications/Communications @@ -9,6 +9,8 @@ URL: http://ax25.sourceforge.net/ Source0: http://downloads.sourceforge.net/ax25/%{name}-%{version}.tar.gz #Patch by Daniel Schepler to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel Patch0: %{name}-%{version}-soundmodem.h.patch +#Patch by Thomas Sailer to work around issue with BSD style pseudo-terminal not being supported anymore. Adds support for Unix98 pseudo-terminals. +Patch1: %{name}-%{version}-Unix98-ptmx.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -24,6 +26,7 @@ as Net/ROM and ROSE configuration. %prep %setup -q %patch0 -p1 +%patch1 -p0 %build %configure @@ -50,7 +53,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man?/* %changelog +* Thu Dec 11 2008 Sindre Pedersen Bjørdal 0.0.8-3 +- Fix pseudo-terminal issue, #475045 + * Sat Feb 16 2008 Robert 'Bob' Jensen 0.0.8-2 - Submit for review + * Thu Dec 06 2007 Sindre Pedersen Bjørdal 0.0.8-1 - Initial Build