From b0d25057a4d92bc8361e48d58e1fcca2bd6c05fb Mon Sep 17 00:00:00 2001 From: Randall 'Randy' Berry Date: Apr 08 2009 01:43:32 +0000 Subject: Upstream upgrade to 0.0.9 --- diff --git a/.cvsignore b/.cvsignore index d0970e4..e472b4e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ax25-tools-0.0.8.tar.gz +ax25-tools.tar.gz diff --git a/ax25-tools-0.0.8-Unix98-ptmx.patch b/ax25-tools-0.0.8-Unix98-ptmx.patch deleted file mode 100644 index bcde5dc..0000000 --- a/ax25-tools-0.0.8-Unix98-ptmx.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- 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-0.0.8-soundmodem.h.patch b/ax25-tools-0.0.8-soundmodem.h.patch deleted file mode 100644 index e675491..0000000 --- a/ax25-tools-0.0.8-soundmodem.h.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -urN ax25-tools-0.0.8.old/hdlcutil/hdrvcomm.h ax25-tools-0.0.8/hdlcutil/hdrvcomm.h ---- ax25-tools-0.0.8.old/hdlcutil/hdrvcomm.h 2001-04-09 19:10:48.000000000 -0700 -+++ ax25-tools-0.0.8/hdlcutil/hdrvcomm.h 2004-01-23 23:51:18.000000000 -0800 -@@ -42,7 +42,7 @@ - - #ifdef HDRVC_KERNEL - #include --#include -+#include "soundmodem.h" - #include - #endif /* HDRVC_KERNEL */ - -diff -urN ax25-tools-0.0.8.old/hdlcutil/soundmodem.h ax25-tools-0.0.8/hdlcutil/soundmodem.h ---- ax25-tools-0.0.8.old/hdlcutil/soundmodem.h 1969-12-31 16:00:00.000000000 -0800 -+++ ax25-tools-0.0.8/hdlcutil/soundmodem.h 2004-01-23 23:49:25.000000000 -0800 -@@ -0,0 +1,90 @@ -+/* -+ * The Linux soundcard driver for 1200 baud and 9600 baud packet radio -+ * (C) 1996-1998 by Thomas Sailer, HB9JNX/AE4WA -+ */ -+ -+#ifndef _SOUNDMODEM_H -+#define _SOUNDMODEM_H -+ -+/* -------------------------------------------------------------------- */ -+/* -+ * structs for the IOCTL commands -+ */ -+ -+struct sm_debug_data { -+ unsigned int int_rate; -+ unsigned int mod_cycles; -+ unsigned int demod_cycles; -+ unsigned int dma_residue; -+}; -+ -+struct sm_diag_data { -+ unsigned int mode; -+ unsigned int flags; -+ unsigned int samplesperbit; -+ unsigned int datalen; -+ short *data; -+}; -+ -+struct sm_mixer_data { -+ unsigned int mixer_type; -+ unsigned int sample_rate; -+ unsigned int bit_rate; -+ unsigned int reg; -+ unsigned int data; -+}; -+ -+struct sm_config { -+ int hardware; -+ int mode; -+}; -+ -+struct sm_ioctl { -+ int cmd; -+ union { -+ struct sm_config cfg; -+ struct sm_diag_data diag; -+ struct sm_mixer_data mix; -+ struct sm_debug_data dbg; -+ } data; -+}; -+ -+/* -------------------------------------------------------------------- */ -+ -+/* -+ * diagnose modes -+ */ -+#define SM_DIAGMODE_OFF 0 -+#define SM_DIAGMODE_INPUT 1 -+#define SM_DIAGMODE_DEMOD 2 -+#define SM_DIAGMODE_CONSTELLATION 3 -+ -+/* -+ * diagnose flags -+ */ -+#define SM_DIAGFLAG_DCDGATE (1<<0) -+#define SM_DIAGFLAG_VALID (1<<1) -+ -+/* -+ * mixer types -+ */ -+#define SM_MIXER_INVALID 0 -+#define SM_MIXER_AD1848 0x10 -+#define SM_MIXER_CRYSTAL 0x11 -+#define SM_MIXER_CT1335 0x20 -+#define SM_MIXER_CT1345 0x21 -+#define SM_MIXER_CT1745 0x22 -+ -+/* -+ * ioctl values -+ */ -+#define SMCTL_DIAGNOSE 0x82 -+#define SMCTL_GETMIXER 0x83 -+#define SMCTL_SETMIXER 0x84 -+#define SMCTL_GETDEBUG 0x85 -+ -+/* -------------------------------------------------------------------- */ -+ -+#endif /* _SOUNDMODEM_H */ -+ -+/* --------------------------------------------------------------------- */ diff --git a/ax25-tools.spec b/ax25-tools.spec index a5f22b5..9936a53 100644 --- a/ax25-tools.spec +++ b/ax25-tools.spec @@ -1,22 +1,26 @@ Name: ax25-tools -Version: 0.0.8 -Release: 4%{?dist} +Version: 0.0.9 +Release: 1%{?dist} Summary: Tools used to configure an ax.25 enabled computer Group: Applications/Communications License: GPLv2+ -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 +URL: http://www.linux-ax25.org/wiki/LinuxAX25 +Source0: http://www.linux-ax25.org/cvsweb/%{name}/%{name}.tar.gz + +# Patch to include soundmodem.h, which was obsoleted and removed from the 2.6 kernel +# Patch0: +# 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) +BuildRequires: automake BuildRequires: libax25-devel BuildRequires: ncurses-devel -BuildRequires: libXt-devel, fltk-devel +BuildRequires: libXt-devel +BuildRequires: fltk-devel %description ax25-tools is a collection of tools that are used to configure an ax.25 enabled @@ -24,11 +28,12 @@ computer. They will configure interfaces and assign callsigns to ports as well as Net/ROM and ROSE configuration. %prep -%setup -q -%patch0 -p1 -%patch1 -p0 +%setup -qn %{name} +#%patch0 -p1 +#%patch1 -p1 %build +autoreconf %configure make %{?_smp_mflags} @@ -53,8 +58,10 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man?/* %changelog -* Mon Feb 23 2009 Fedora Release Engineering - 0.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Thu Mar 12 2009 Randall J. Berry 0.0.9-1 +- Upstream update to 0.0.9, #488049 +- Upstream URL has changed +- Remove patches applied to newer source * Thu Dec 11 2008 Sindre Pedersen Bjørdal 0.0.8-3 - Fix pseudo-terminal issue, #475045 diff --git a/import.log b/import.log new file mode 100644 index 0000000..3401f1f --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +ax25-tools-0_0_9-1_fc9:HEAD:ax25-tools-0.0.9-1.fc9.src.rpm:1239154929 diff --git a/sources b/sources index b543373..3c88d35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -70172b979b38a9434f21d2e8152f0d5e ax25-tools-0.0.8.tar.gz +08f1d4990c628346cc01fad6de19a46c ax25-tools.tar.gz