1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
|
diff -Nru wvstreams-4.0.1.orig/config.guess wvstreams-4.0.1/config.guess
--- wvstreams-4.0.1.orig/config.guess 2004-11-18 16:15:05.000000000 +0200
+++ wvstreams-4.0.1/config.guess 2005-02-17 21:47:14.995711640 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2004-08-13'
+timestamp='2004-11-12'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -319,6 +319,9 @@
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit 0 ;;
*:OS400:*:*)
echo powerpc-ibm-os400
exit 0 ;;
@@ -342,7 +345,7 @@
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
esac ;;
@@ -824,6 +827,12 @@
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit 0 ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit 0 ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -1241,7 +1250,10 @@
A*) echo alpha-dec-vms && exit 0 ;;
I*) echo ia64-dec-vms && exit 0 ;;
V*) echo vax-dec-vms && exit 0 ;;
- esac
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff -Nru wvstreams-4.0.1.orig/config.sub wvstreams-4.0.1/config.sub
--- wvstreams-4.0.1.orig/config.sub 2004-11-18 16:15:05.000000000 +0200
+++ wvstreams-4.0.1/config.sub 2005-02-17 21:47:14.996711488 +0200
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2004-06-24'
+timestamp='2004-11-30'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -267,7 +267,7 @@
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -343,8 +343,8 @@
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -457,6 +457,9 @@
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
;;
@@ -486,6 +489,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -1026,6 +1033,10 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
xps | xps100)
basic_machine=xps100-honeywell
;;
@@ -1294,6 +1305,9 @@
-kaos*)
os=-kaos
;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
-none)
;;
*)
diff -Nru wvstreams-4.0.1.orig/debian/changelog wvstreams-4.0.1/debian/changelog
--- wvstreams-4.0.1.orig/debian/changelog 2004-11-18 16:15:05.000000000 +0200
+++ wvstreams-4.0.1/debian/changelog 2005-02-17 21:47:14.997711336 +0200
@@ -1,3 +1,29 @@
+wvstreams (4.0.1-1.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * High-urgency upload for sarge-targetted RC bugfix
+ * Fix WvModem::setup_modem to not expect TIOCSSERIAL to work if we're not
+ root. (Closes: #292618)
+
+ -- Steve Langasek <vorlon@debian.org> Sat, 5 Feb 2005 02:45:25 -0800
+
+wvstreams (4.0.1-1.2) unstable; urgency=high
+
+ * NMU with maintainer's permission
+ * Use high urgency as the version in testing has unfixed
+ RC bugs (#281772)
+ * libwvstreams.dev has to depend on libxplc0.3.10-dev
+ (Closes: #289237)
+
+ -- Frank Lichtenheld <djpig@debian.org> Sun, 9 Jan 2005 14:40:02 +0100
+
+wvstreams (4.0.1-1.1) unstable; urgency=low
+
+ * NMU at request of maintainer
+ * add doxygen to build-depends (Cloeses: #286593)
+
+ -- Blars Blarson <blarson@blars.org> Mon, 27 Dec 2004 18:51:32 -0800
+
wvstreams (4.0.1-1) unstable; urgency=low
* New upstream version. (Closes: Bug#276571)
diff -Nru wvstreams-4.0.1.orig/debian/control wvstreams-4.0.1/debian/control
--- wvstreams-4.0.1.orig/debian/control 2004-11-18 16:15:05.000000000 +0200
+++ wvstreams-4.0.1/debian/control 2005-02-17 21:47:14.997711336 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Simon Law <sfllaw@debian.org>
Uploaders: James Morrison <phython@debian.org>, Patrick Patterson <ppatters@debian.org>
-Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev
+Build-Depends: debhelper (>> 4.0.0), fftw-dev, libdb4.2-dev, libfam-dev, libpam0g-dev, libqt3-mt-dev, libslp-dev, libspeex-dev, libssl-dev, libvorbis-dev, libxplc0.3.10-dev, zlib1g-dev, doxygen
Build-Depends-Indep: doxygen
Standards-Version: 3.6.1
@@ -99,7 +99,7 @@
Package: libwvstreams-dev
Architecture: any
Section: libdevel
-Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, ${misc:Depends}
+Depends: libwvstreams4.0-base, libwvstreams4.0-extras, libuniconf4.0, libwvstreams4.0-fft, libwvstreams4.0-qt, libwvstreams4.0-speex, libwvstreams4.0-vorbis, libxplc0.3.10-dev, ${misc:Depends}
Provides: libwvstreams4.0-dev
Description: Development libraries and header files for libwvstreams4.0
Contains the header files and static libraries for use in rapid
diff -Nru wvstreams-4.0.1.orig/streams/wvmodem.cc wvstreams-4.0.1/streams/wvmodem.cc
--- wvstreams-4.0.1.orig/streams/wvmodem.cc 2004-11-18 16:15:05.000000000 +0200
+++ wvstreams-4.0.1/streams/wvmodem.cc 2005-02-17 21:47:34.112805400 +0200
@@ -190,25 +190,24 @@
drain();
#if HAVE_LINUX_SERIAL_H
- struct serial_struct old_sinfo, sinfo;
- sinfo.reserved_char[0] = 0;
- if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)
- {
- seterr("Cannot get information for serial port.");
- return;
- }
- sinfo = old_sinfo;
- // Why there are two closing wait timeouts, is beyond me
- // but there are... apparently the second one is deprecated
- // but why take a chance...
- sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
- sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
-
- if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
- {
- seterr("Cannot set information for serial port.");
- return;
- }
+ if (getuid() == 0)
+ {
+ struct serial_struct sinfo;
+ if (ioctl(getrfd(), TIOCGSERIAL, &sinfo) >= 0) //Ignore errors because some modems (at least slmodem) do not support this
+ {
+ // Why there are two closing wait timeouts, is beyond me
+ // but there are... apparently the second one is deprecated
+ // but why take a chance...
+ sinfo.closing_wait = ASYNC_CLOSING_WAIT_NONE;
+ sinfo.closing_wait2 = ASYNC_CLOSING_WAIT_NONE;
+
+ if (ioctl(getrfd(), TIOCSSERIAL, &sinfo) < 0)
+ {
+ seterr("Cannot set information for serial port.");
+ return;
+ }
+ }
+ }
#endif
// set up the terminal characteristics.
|
GitWeb