debian/0000755000000000000000000000000012260313120007154 5ustar debian/changelog0000644000000000000000000000724212260313120011033 0ustar lrzsz (0.12.21-7) unstable; urgency=low * Fixed file permissions. -- Martin A. Godisch Mon, 30 Dec 2013 16:50:38 +0100 lrzsz (0.12.21-6) unstable; urgency=low * Changed source format to v3.0 (quilt). * Updated build script. * Fixed copyright file. * Added watch file. * Updated standards version. -- Martin A. Godisch Sat, 28 Dec 2013 17:32:43 +0100 lrzsz (0.12.21-5) unstable; urgency=low * New maintainer upload, closes: #556238. Thanks to Josip Rodin for his work. * Removed build-dependency on debhelper. * Added build-dependency on autotools-dev. * Cut Debian diff.gz into pieces. * Updated FSF address in copyright file. * Updated German po file, added build-dependency on gettext. Closes: #313992, thanks to Jens Seidel and Tobias Toedter. * Fixed missing includes (compiler warnings). * Fixed typo in sz manpage. * Fixed linking to libnsl. * Removed changelog emacs settings. * Updated standards version. -- Martin A. Godisch Sun, 22 Nov 2009 09:35:13 +0100 lrzsz (0.12.21-4.1) unstable; urgency=low * Non-maintainer upload. * Rebuilt with current debhelper, finishing the /usr/doc transition. Closes: #322762 * Rebuilt with a current toolchain, now it's prelinkable. Closes: #288084 * Appled man page typo fix patch from A Costa. Closes: #311459 -- Joey Hess Tue, 10 Jan 2006 01:35:00 -0500 lrzsz (0.12.21-4) unstable; urgency=low * Updated for Standards-Version: 3.5.2. * Added touch stamp-h.in before make invocation in order to stop autoheader from running. -- Josip Rodin Sun, 25 Mar 2001 19:48:18 +0200 lrzsz (0.12.21-3) unstable; urgency=low * Newish upstream version, (990823 in CVS). * Updated for Policy 3.x. * Misc. fixes for debian/*. -- Josip Rodin Sun, 19 Sep 1999 17:55:38 +0200 lrzsz (0.12.21-2) unstable; urgency=low * Removed definition of strstr, advised by upstream maintainer, to get it to compile on glibc2.1, as John Goerzen and Bart Warmerdam noticed (fixes: #39429 #39812). -- Josip Rodin Sun, 20 Jun 1999 21:38:07 +0200 lrzsz (0.12.21-1) unstable; urgency=low * New upstream version (990604 in CVS). * Cleaned up the diff by removing unneeded .deps/ files and not changing aclocal et al. -- Josip Rodin Sun, 6 Jun 1999 21:01:50 +0200 lrzsz (0.12.20-2) unstable; urgency=low * Don't install ansi2knr.1 manpage, closing bug #33121 -- Josip Rodin Sun, 7 Feb 1999 01:32:31 +0100 lrzsz (0.12.20-1) unstable; urgency=low * New maintainer. * Althought version number doesn't indicate that, this version is today's CVS snapshot from ftp://tirka.ohse.de/uwe/cvs-trees * This release fixes following bugs: #8373 #11208 #16170 #16744 #17210. * Package is lintian clean. -- Josip Rodin Sun, 7 Feb 1999 01:32:31 +0100 lrzsz (0.12.17) unstable; urgency=low * sorry, see ../ChangeLog. automagically generated debian/changelog -- Uwe Ohse Mon, 02 Jun 1997 10:06:05 +0200 lrzsz (0.12.16) unstable; urgency=low * sorry, see ../ChangeLog. changelog is here just to make dpkg happy. * initial release -- Uwe Ohse Sun, 2 Jun 1997 21:00:00 +0200 lrzsz (0.12b-1.1) unstable; urgency=low * Non-maintainer release. * Libc6 compile. -- Martin Mitchell Sat, 18 Oct 1997 01:58:54 +1000 lrzsz (0.12b-1) unstable; urgency=low * Converted to new source packaging format. * New upstream version. -- Michael Alan Dorman Tue, 17 Sep 1996 13:39:23 -0400 debian/control0000644000000000000000000000127112257571727010611 0ustar Source: lrzsz Section: comm Priority: optional Maintainer: Martin A. Godisch Standards-Version: 3.9.5 Build-Depends: autotools-dev, gettext Homepage: https://ohse.de/uwe/software/lrzsz.html Package: lrzsz Architecture: any Depends: ${shlibs:Depends} Suggests: minicom Description: Tools for zmodem/xmodem/ymodem file transfer Lrzsz is a cosmetically modified zmodem/ymodem/xmodem package built from the public-domain version of Chuck Forsberg's rzsz package. . These programs use error correcting protocols ({z,x,y}modem) to send (sz, sx, sb) and receive (rz, rx, rb) files over a dial-in serial port from a variety of programs running under various operating systems. debian/copyright0000644000000000000000000000255312257575762011150 0ustar This is the lrzsz Debian GNU/Linux package. It was first maintained by Michael Alan Dorman , with help of Martin Mitchell and current upstream maintainer, Uwe Ohse . Current maintainer is Josip Rodin Original source was downloaded from: ftp://tirka.ohse.de/uwe/ Copyright (C) until 1988 Chuck Forsberg (Omen Technology INC) Copyright (C) 1994 Matt Porter, Michael D. Black Copyright (C) 1996, 1997 Uwe Ohse Please note that credit should be given to Chuck Forsberg (rzsz) and Stephen Satchell/Satchell Evaluations (crc routines) for this package. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 dated June, 1991. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2. debian/rules0000755000000000000000000000522012260311707010244 0ustar #!/usr/bin/make -f testdir = test -f src/lrz.c && test -f debian/rules testroot = test x`whoami` = xroot # FOR AUTOCONF 2.13 ONLY ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) confflags += $(DEB_HOST_GNU_TYPE) else $(error Cannot cross-compile this package out-of-the-box) endif CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS) CFLAGS = $(shell dpkg-buildflags --get CFLAGS) LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) export CPPFLAGS export CFLAGS export LDFLAGS build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: $(testdir) cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . ./configure $(CONFFLAGS) --prefix=/usr --mandir='$${prefix}/share/man' --program-transform-name=s/l// touch stamp-h.in # to stop autoheader from running touch -d yesterday aclocal.m4 # to stop automake from running $(MAKE) touch $@ clean: $(testdir) $(testroot) cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . touch stamp-h.in # to stop autoheader from running touch -d yesterday aclocal.m4 # to stop automake from running [ ! -f Makefile ] || $(MAKE) distclean rm -rf debian/tmp rm -f build-stamp config.guess config.sub po/lrzsz.pot po/*.gmo debian/files debian/rejected debian/substvars binary: binary-arch binary-indep binary-arch: build $(testdir) $(testroot) rm -rf debian/tmp $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" "" strip -R .comment -R .note debian/tmp/usr/bin/* endif install -d -m 0755 debian/tmp/usr/share/doc/lrzsz install -p -m 0644 NEWS README README.cvs README.isdn4linux TODO debian/copyright debian/tmp/usr/share/doc/lrzsz install -p -m 0644 -D ChangeLog debian/tmp/usr/share/doc/lrzsz/changelog install -p -m 0644 -D debian/changelog debian/tmp/usr/share/doc/lrzsz/changelog.Debian find debian/tmp/usr/share/man -type f -print0 | xargs -0 gzip -9 find debian/tmp/usr/share/doc -type f ! -name copyright ! -name '*.html' \ \( -name 'changelog*' -o -size +8 \) -print0 | xargs -0 gzip -9 ln -s rz.1.gz debian/tmp/usr/share/man/man1/rb.1.gz ln -s rz.1.gz debian/tmp/usr/share/man/man1/rx.1.gz ln -s sz.1.gz debian/tmp/usr/share/man/man1/sb.1.gz ln -s sz.1.gz debian/tmp/usr/share/man/man1/sx.1.gz install -d -m 0755 debian/tmp/DEBIAN install -p -m 0644 debian/control debian/tmp/DEBIAN cd debian/tmp && find usr -type f -print0 | xargs -0 md5sum > DEBIAN/md5sums chown -R root:root debian/tmp chmod -R go=u-w debian/tmp dpkg-shlibdeps debian/tmp/usr/bin/* dpkg-gencontrol -isp -plrzsz dpkg --build debian/tmp .. binary-indep: .PHONY: clean build build-arch build-indep binary binary-arch binary-indep debian/patches/0000755000000000000000000000000012257574554010635 5ustar debian/patches/mantypos.diff0000644000000000000000000000330111302174704013315 0ustar --- lrzsz-0.12.21.orig/man/lsz.1 +++ lrzsz-0.12.21/man/lsz.1 @@ -247,7 +247,7 @@ Escape all control characters; normally XON, XOFF, DLE, CR-@-CR, and Ctrl-X are escaped. .TP -.B"-E, --rename" +.B "-E, --rename" Force the sender to rename the new file if a file with the same name already exists. .TP @@ -265,7 +265,7 @@ .TP .B "-i COMMAND, --immediate-command COMMAND" Send COMMAND to the receiver for execution, return immediately -upon the receiving program's successful recption of the command. +upon the receiving program's successful reception of the command. .TP .B "-k, --1k" (XMODEM/YMODEM) Send files using 1024 byte blocks @@ -509,7 +509,7 @@ .RB ( \-a ) to end of line conventions appropriate to the receiving environment. With ZMODEM AutoDownload enabled, Professional-YAM and ZCOMM -will automatically recieve +will automatically receive the files after performing a security check. .br @@ -592,8 +592,8 @@ the source file. .SH "VMS VERSION" The VMS version does not support wild cards. -Because of VMS DCL, upper case option letters muse be represented -by \\ proceding the letter. +Because of VMS DCL, upper case option letters must be represented +by \\ preceding the letter. The current VMS version does not support XMODEM, XMODEM-1k, or YMODEM. @@ -682,7 +682,7 @@ The test mode leaves a zero length file on the receiving system. A few high speed modems have a firmware bug that drops characters when the -direction of high speed transmissson is reversed. +direction of high speed transmission is reversed. The environment variable ZNULLS may be used to specify the number of nulls to send before a ZDATA frame. Values of 101 for a 4.77 mHz PC and 124 for an AT are typical. debian/patches/strstr.diff0000644000000000000000000000067211302175157013017 0ustar --- lrzsz-0.12.21.orig/src/lrz.c +++ lrzsz-0.12.21/src/lrz.c @@ -44,7 +44,6 @@ #ifndef STRICT_PROTOTYPES extern time_t time(); extern char *strerror(); -extern char *strstr(); #endif #ifndef HAVE_ERRNO_DECLARATION --- lrzsz-0.12.21.orig/src/lsz.c +++ lrzsz-0.12.21/src/lsz.c @@ -53,7 +53,6 @@ #ifndef STRICT_PROTOTYPES extern time_t time(); extern char *strerror(); -extern char *strstr(); #endif #ifndef HAVE_ERRNO_DECLARATION debian/patches/include.diff0000644000000000000000000000064111302221745013070 0ustar --- lrzsz-0.12.21.orig/lib/long-options.c +++ lrzsz-0.12.21/lib/long-options.c @@ -22,6 +22,7 @@ #endif #include +#include #include #include "long-options.h" --- lrzsz-0.12.21.orig/src/lsyslog.c +++ lrzsz-0.12.21/src/lsyslog.c @@ -22,6 +22,7 @@ #ifdef ENABLE_SYSLOG #include "zglobal.h" #include +#include #include #include #endif debian/patches/cat-id-tbl.diff0000644000000000000000000001026311302217603013364 0ustar --- lrzsz-0.12.21.orig/po/cat-id-tbl.c +++ lrzsz-0.12.21/po/cat-id-tbl.c @@ -141,22 +141,23 @@ {"\ \n\ countem: Total %d %ld\n", 84}, - {"Bad escape sequence %x", 85}, - {"Sender Canceled", 86}, - {"TIMEOUT", 87}, - {"Bad data subpacket", 88}, - {"Data subpacket too long", 89}, - {"Garbage count exceeded", 90}, - {"Got %s", 91}, - {"Retry %d: ", 92}, - {"don't have settimeofday, will not set time\n", 93}, - {"not running as root (this is good!), can not set time\n", 94}, - {"bytes_per_error", 95}, - {"bytes-per-error should be >100", 96}, - {"O_SYNC not supported by the kernel", 97}, - {"garbage on commandline", 98}, - {"Usage: %s [options] [filename.if.xmodem]\n", 99}, - {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 100}, + {"Bad CRC", 85}, + {"Bad escape sequence %x", 86}, + {"Sender Canceled", 87}, + {"TIMEOUT", 88}, + {"Bad data subpacket", 89}, + {"Data subpacket too long", 90}, + {"Garbage count exceeded", 91}, + {"Got %s", 92}, + {"Retry %d: ", 93}, + {"don't have settimeofday, will not set time\n", 94}, + {"not running as root (this is good!), can not set time\n", 95}, + {"bytes_per_error", 96}, + {"bytes-per-error should be >100", 97}, + {"O_SYNC not supported by the kernel", 98}, + {"garbage on commandline", 99}, + {"Usage: %s [options] [filename.if.xmodem]\n", 100}, + {"Receive files with ZMODEM/YMODEM/XMODEM protocol\n", 101}, {"\ -+, --append append to existing files\n\ -a, --ascii ASCII transfer (change CR/LF to LF)\n\ @@ -193,41 +194,41 @@ --ymodem use YMODEM protocol\n\ -Z, --zmodem use ZMODEM protocol\n\ \n\ -short options use the same arguments as the long ones\n", 101}, - {"%s waiting to receive.", 102}, - {"\rBytes received: %7ld/%7ld BPS:%-6ld \r\n", 103}, - {"%s: ready to receive %s", 104}, - {"\rBytes received: %7ld BPS:%-6ld \r\n", 105}, +short options use the same arguments as the long ones\n", 102}, + {"%s waiting to receive.", 103}, + {"\rBytes received: %7ld/%7ld BPS:%-6ld \r\n", 104}, + {"%s: ready to receive %s", 105}, + {"\rBytes received: %7ld BPS:%-6ld \r\n", 106}, {"\ \r\n\ -%s: %s removed.\r\n", 106}, - {"Pathname fetch returned EOT", 107}, - {"Received dup Sector", 108}, - {"Sync Error", 109}, - {"CRC", 110}, - {"Checksum", 111}, - {"Sector number garbled", 112}, - {"Sender Cancelled", 113}, - {"Got 0%o sector header", 114}, - {"file name ends with a /, skipped: %s\n", 115}, - {"zmanag=%d, Lzmanag=%d\n", 116}, - {"zconv=%d\n", 117}, - {"file exists, skipped: %s\n", 118}, - {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 119}, - {"TIMESYNC: cannot set time: %s\n", 120}, - {"Topipe", 121}, - {"Receiving: %s\n", 122}, - {"Blocks received: %d", 123}, - {"%s: %s exists\n", 124}, - {"%s:\tSecurity Violation", 125}, - {"remote command execution requested", 126}, - {"not executed", 127}, - {"got ZRINIT", 128}, - {"Skipped", 129}, - {"rzfile: bps rate %ld below min %ld", 130}, - {"rzfile: reached stop time", 131}, - {"\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d ", 132}, - {"file close error", 133}, +%s: %s removed.\r\n", 107}, + {"Pathname fetch returned EOT", 108}, + {"Received dup Sector", 109}, + {"Sync Error", 110}, + {"CRC", 111}, + {"Checksum", 112}, + {"Sector number garbled", 113}, + {"Sender Cancelled", 114}, + {"Got 0%o sector header", 115}, + {"file name ends with a /, skipped: %s\n", 116}, + {"zmanag=%d, Lzmanag=%d\n", 117}, + {"zconv=%d\n", 118}, + {"file exists, skipped: %s\n", 119}, + {"TIMESYNC: here %ld, remote %ld, diff %ld seconds\n", 120}, + {"TIMESYNC: cannot set time: %s\n", 121}, + {"Topipe", 122}, + {"Receiving: %s\n", 123}, + {"Blocks received: %d", 124}, + {"%s: %s exists\n", 125}, + {"%s:\tSecurity Violation", 126}, + {"remote command execution requested", 127}, + {"not executed", 128}, + {"got ZRINIT", 129}, + {"Skipped", 130}, + {"rzfile: bps rate %ld below min %ld", 131}, + {"rzfile: reached stop time", 132}, + {"\rBytes received: %7ld/%7ld BPS:%-6ld ETA %02d:%02d ", 133}, + {"file close error", 134}, }; -int _msg_tbl_length = 133; +int _msg_tbl_length = 134; debian/patches/build.diff0000644000000000000000000022306511302223136012547 0ustar --- lrzsz-0.12.21.orig/Makefile.in +++ lrzsz-0.12.21/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -106,13 +105,13 @@ DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ INSTALL Makefile.am Makefile.in NEWS Specfile.in THANKS TODO acconfig.h \ -acinclude.m4 aclocal.m4 config.guess config.h.in configure configure.in \ -install-sh missing mkinstalldirs systype.in +acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \ +configure.in install-sh missing mkinstalldirs systype.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -298,7 +297,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -340,7 +339,7 @@ all-am: Makefile $(SCRIPTS) config.h all-redirect: all-recursive-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: --- lrzsz-0.12.21.orig/aclocal.m4 +++ lrzsz-0.12.21/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -117,8 +117,6 @@ AC_DEFUN(AM_INIT_AUTOMAKE, [AC_REQUIRE([AC_PROG_INSTALL]) -dnl We require 2.13 because we rely on SHELL being computed by configure. -AC_PREREQ([2.13]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] --- lrzsz-0.12.21.orig/configure +++ lrzsz-0.12.21/configure @@ -703,7 +703,6 @@ fi - PACKAGE=lrzsz VERSION=0.12.21rc @@ -723,7 +722,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:727: checking for working aclocal" >&5 +echo "configure:726: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -736,7 +735,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:740: checking for working autoconf" >&5 +echo "configure:739: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -749,7 +748,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:753: checking for working automake" >&5 +echo "configure:752: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -762,7 +761,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:766: checking for working autoheader" >&5 +echo "configure:765: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -775,7 +774,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:779: checking for working makeinfo" >&5 +echo "configure:778: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -926,7 +925,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:930: checking for $ac_word" >&5 +echo "configure:929: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -956,7 +955,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:960: checking for $ac_word" >&5 +echo "configure:959: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1007,7 +1006,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1011: checking for $ac_word" >&5 +echo "configure:1010: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1039,7 +1038,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1042: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1050,12 +1049,12 @@ cat > conftest.$ac_ext << EOF -#line 1054 "configure" +#line 1053 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1081,12 +1080,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1085: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1084: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1090: checking whether we are using GNU C" >&5 +echo "configure:1089: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1095,7 +1094,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1114,7 +1113,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1118: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1117: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1146,7 +1145,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1150: checking how to run the C preprocessor" >&5 +echo "configure:1149: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1161,13 +1160,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1178,13 +1177,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1195,13 +1194,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1205: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1235,13 +1234,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1239: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1238: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1259,7 +1258,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1283,7 +1282,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1287: checking for $ac_word" >&5 +echo "configure:1286: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1311,7 +1310,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1315: checking for POSIXized ISC" >&5 +echo "configure:1314: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1332,9 +1331,9 @@ fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1336: checking for AIX" >&5 +echo "configure:1335: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1361: checking for minix/config.h" >&5 +echo "configure:1360: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1408,7 +1407,7 @@ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1412: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1411: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'am_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1424,7 +1423,7 @@ do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -1461,7 +1460,7 @@ ; return 0; } EOF -if { (eval echo configure:1465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -1487,7 +1486,7 @@ echo $ac_n "checking for function prototypes""... $ac_c" 1>&6 -echo "configure:1491: checking for function prototypes" >&5 +echo "configure:1490: checking for function prototypes" >&5 if test "$am_cv_prog_cc_stdc" != no; then echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF @@ -1500,12 +1499,12 @@ U=_ ANSI2KNR=./ansi2knr # Ensure some checks needed by ansi2knr itself. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1504: checking for ANSI C header files" >&5 +echo "configure:1503: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1513,7 +1512,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1516: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1530,7 +1529,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1548,7 +1547,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1569,7 +1568,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1580,7 +1579,7 @@ exit (0); } EOF -if { (eval echo configure:1584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1607,17 +1606,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1611: checking for $ac_hdr" >&5 +echo "configure:1610: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1646,12 +1645,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1650: checking for working const" >&5 +echo "configure:1649: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1721,21 +1720,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1725: checking for inline" >&5 +echo "configure:1724: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1786,7 +1785,7 @@ esac echo $ac_n "checking for syslog in -lsocket""... $ac_c" 1>&6 -echo "configure:1790: checking for syslog in -lsocket" >&5 +echo "configure:1789: checking for syslog in -lsocket" >&5 ac_lib_var=`echo socket'_'syslog | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1794,7 +1793,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1832,108 +1831,14 @@ echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for syslog in -lbe""... $ac_c" 1>&6 -echo "configure:1837: checking for syslog in -lbe" >&5 -ac_lib_var=`echo be'_'syslog | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lbe $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo be | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - -echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:1884: checking for gethostbyname in -lnsl" >&5 -ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo nsl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&6 -fi - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1932: checking for ANSI C header files" >&5 +echo "configure:1931: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1941,7 +1846,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1958,7 +1863,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1976,7 +1881,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1997,7 +1902,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2008,7 +1913,7 @@ exit (0); } EOF -if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2035,17 +1940,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2039: checking for $ac_hdr" >&5 +echo "configure:2038: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2049: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2076,17 +1981,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2080: checking for $ac_hdr" >&5 +echo "configure:2079: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2089: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2116,17 +2021,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2120: checking for $ac_hdr" >&5 +echo "configure:2119: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2156,17 +2061,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2160: checking for $ac_hdr" >&5 +echo "configure:2159: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2196,17 +2101,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2200: checking for $ac_hdr" >&5 +echo "configure:2199: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2234,12 +2139,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2238: checking for size_t" >&5 +echo "configure:2237: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2267,12 +2172,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:2271: checking for mode_t" >&5 +echo "configure:2270: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2300,12 +2205,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2304: checking for off_t" >&5 +echo "configure:2303: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2334,12 +2239,12 @@ echo $ac_n "checking for speed_t""... $ac_c" 1>&6 -echo "configure:2338: checking for speed_t" >&5 +echo "configure:2337: checking for speed_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_speed_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -2389,12 +2294,12 @@ fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:2393: checking for st_rdev in struct stat" >&5 +echo "configure:2392: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2402,7 +2307,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:2406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -2423,12 +2328,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2427: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2426: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2437,7 +2342,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2459,12 +2364,12 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:2463: checking for socklen_t" >&5 +echo "configure:2462: checking for socklen_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_socklen_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_socklen_t=yes else @@ -2505,12 +2410,12 @@ fi echo $ac_n "checking whether sys/time.h and sys/select.h may both be included""... $ac_c" 1>&6 -echo "configure:2509: checking whether sys/time.h and sys/select.h may both be included" >&5 +echo "configure:2508: checking whether sys/time.h and sys/select.h may both be included" >&5 if eval "test \"`echo '$''{'lrzsz_cv_header_sys_select'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2519,7 +2424,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* lrzsz_cv_header_sys_select=yes else @@ -2540,12 +2445,12 @@ fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:2544: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:2543: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2553,7 +2458,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -2575,19 +2480,19 @@ echo $ac_n "checking for errno declaration""... $ac_c" 1>&6 -echo "configure:2579: checking for errno declaration" >&5 +echo "configure:2578: checking for errno declaration" >&5 if eval "test \"`echo '$''{'lrzsz_cv_decl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int i = errno; errno = 1; ; return 0; } EOF -if { (eval echo configure:2591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* lrzsz_cv_decl_errno=yes else @@ -2610,7 +2515,7 @@ if test $cross_compiling = no ; then echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:2614: checking whether setvbuf arguments are reversed" >&5 +echo "configure:2613: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2618,7 +2523,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -2632,7 +2537,7 @@ exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -2657,12 +2562,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2661: checking return type of signal handlers" >&5 +echo "configure:2660: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2679,7 +2584,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2701,17 +2606,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2705: checking for $ac_hdr" >&5 +echo "configure:2704: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2740,12 +2645,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2744: checking for $ac_func" >&5 +echo "configure:2743: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2793,7 +2698,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2797: checking for working mmap" >&5 +echo "configure:2796: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2801,7 +2706,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2966,19 +2871,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2970: checking for working alloca.h" >&5 +echo "configure:2969: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2999,12 +2904,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3003: checking for alloca" >&5 +echo "configure:3002: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3064,12 +2969,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3068: checking whether alloca needs Cray hooks" >&5 +echo "configure:3067: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:3098: checking for $ac_func" >&5 +echo "configure:3097: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3149,7 +3054,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3153: checking stack direction for C alloca" >&5 +echo "configure:3152: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3157,7 +3062,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3198,7 +3103,7 @@ fi cat > conftest.$ac_ext < EOF @@ -3216,12 +3121,12 @@ for ac_func in gettimeofday settimeofday do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3220: checking for $ac_func" >&5 +echo "configure:3219: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3271,12 +3176,12 @@ for ac_func in strchr memcpy select vprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3275: checking for $ac_func" >&5 +echo "configure:3274: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3326,12 +3231,12 @@ for ac_func in times rdchk utime syslog siginterrupt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3330: checking for $ac_func" >&5 +echo "configure:3329: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3381,12 +3286,12 @@ for ac_func in mkdir mktime strerror strstr strdup strtoul strtol strpbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3385: checking for $ac_func" >&5 +echo "configure:3384: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3438,12 +3343,12 @@ for ac_func in stpcpy strftime vasprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3442: checking for $ac_func" >&5 +echo "configure:3441: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3494,12 +3399,12 @@ echo $ac_n "checking for getopt_long""... $ac_c" 1>&6 -echo "configure:3498: checking for getopt_long" >&5 +echo "configure:3497: checking for getopt_long" >&5 if eval "test \"`echo '$''{'ac_cv_func_getopt_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getopt_long=yes" else @@ -3552,12 +3457,12 @@ echo $ac_n "checking for ftime""... $ac_c" 1>&6 -echo "configure:3556: checking for ftime" >&5 +echo "configure:3555: checking for ftime" >&5 if eval "test \"`echo '$''{'ac_cv_func_ftime'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_ftime=yes" else @@ -3595,7 +3500,7 @@ if eval "test \"`echo '$ac_cv_func_'ftime`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking that ftime works correctly""... $ac_c" 1>&6 -echo "configure:3599: checking that ftime works correctly" >&5 +echo "configure:3598: checking that ftime works correctly" >&5 if eval "test \"`echo '$''{'lrzsz_cv_sys_ftime_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3603,7 +3508,7 @@ lrzsz_cv_sys_ftime_ok=runtime else cat > conftest.$ac_ext < @@ -3632,7 +3537,7 @@ } EOF -if { (eval echo configure:3636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then lrzsz_cv_sys_ftime_ok=yes else @@ -3666,20 +3571,20 @@ echo $ac_n "checking for timezone variable""... $ac_c" 1>&6 -echo "configure:3670: checking for timezone variable" >&5 +echo "configure:3669: checking for timezone variable" >&5 if eval "test \"`echo '$''{'libquark_cv_var_timezone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return(int)(timezone/2); ; return 0; } EOF -if { (eval echo configure:3683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* libquark_cv_var_timezone=yes else @@ -3705,13 +3610,13 @@ : else echo $ac_n "checking for $lookup_facility""... $ac_c" 1>&6 -echo "configure:3709: checking for $lookup_facility" >&5 +echo "configure:3708: checking for $lookup_facility" >&5 if eval "test \"`echo '$''{'lrzsz_cv_lookup_facility'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:3767: checking for $ac_hdr" >&5 +echo "configure:3766: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3803,12 +3708,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3807: checking for $ac_func" >&5 +echo "configure:3806: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3860,12 +3765,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3864: checking for $ac_func" >&5 +echo "configure:3863: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3922,19 +3827,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3926: checking for LC_MESSAGES" >&5 +echo "configure:3925: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3955,7 +3860,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3959: checking whether NLS is requested" >&5 +echo "configure:3958: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3975,7 +3880,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3979: checking whether included gettext is requested" >&5 +echo "configure:3978: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3994,17 +3899,17 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3998: checking for libintl.h" >&5 +echo "configure:3997: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4021,19 +3926,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:4025: checking for gettext in libc" >&5 +echo "configure:4024: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -4049,7 +3954,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:4053: checking for bindtextdomain in -lintl" >&5 +echo "configure:4052: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4057,7 +3962,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4084,12 +3989,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:4088: checking for gettext in libintl" >&5 +echo "configure:4087: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:4093: checking for gettext in -lintl" >&5 +echo "configure:4092: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4097,7 +4002,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4147,7 +4052,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4151: checking for $ac_word" >&5 +echo "configure:4150: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4181,12 +4086,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4185: checking for $ac_func" >&5 +echo "configure:4184: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4236,7 +4141,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4240: checking for $ac_word" >&5 +echo "configure:4239: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4272,7 +4177,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4276: checking for $ac_word" >&5 +echo "configure:4275: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4304,7 +4209,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -4335,7 +4240,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:4339: checking whether catgets can be used" >&5 +echo "configure:4338: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -4348,7 +4253,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:4352: checking for main in -li" >&5 +echo "configure:4351: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4356,14 +4261,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4391,12 +4296,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:4395: checking for catgets" >&5 +echo "configure:4394: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -4441,7 +4346,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4445: checking for $ac_word" >&5 +echo "configure:4444: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4477,7 +4382,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4481: checking for $ac_word" >&5 +echo "configure:4480: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4514,7 +4419,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4518: checking for $ac_word" >&5 +echo "configure:4517: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4549,7 +4454,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4553: checking for $ac_word" >&5 +echo "configure:4552: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4607,7 +4512,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4611: checking for $ac_word" >&5 +echo "configure:4610: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4641,7 +4546,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4645: checking for $ac_word" >&5 +echo "configure:4644: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4677,7 +4582,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4681: checking for $ac_word" >&5 +echo "configure:4680: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4770,7 +4675,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4774: checking for catalogs to be installed" >&5 +echo "configure:4773: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4798,17 +4703,17 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4802: checking for linux/version.h" >&5 +echo "configure:4801: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* --- lrzsz-0.12.21.orig/lib/Makefile.in +++ lrzsz-0.12.21/lib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -127,7 +126,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DEP_FILES = .deps/alloca.P .deps/error.P .deps/getopt.P .deps/getopt1.P \ .deps/long-options.P .deps/mkdir.P .deps/mktime.P .deps/stpcpy.P \ @@ -282,7 +281,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -343,7 +342,7 @@ all-am: Makefile $(ANSI2KNR) $(LIBRARIES) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: --- lrzsz-0.12.21.orig/man/Makefile.in +++ lrzsz-0.12.21/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -106,7 +105,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best all: all-redirect .SUFFIXES: @@ -173,7 +172,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -202,7 +201,7 @@ all-am: Makefile $(MANS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 --- lrzsz-0.12.21.orig/src/Makefile.in +++ lrzsz-0.12.21/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -45,10 +45,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -132,7 +131,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = gtar +TAR = tar GZIP_ENV = --best DEP_FILES = .deps/canit.P .deps/crctab.P .deps/lrz.P .deps/lsyslog.P \ .deps/lsz.P .deps/protname.P .deps/rbsb.P .deps/tcp.P .deps/timing.P \ @@ -167,8 +166,8 @@ $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(bin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done @@ -292,7 +291,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -353,7 +352,7 @@ all-am: Makefile $(ANSI2KNR) $(PROGRAMS) $(HEADERS) all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) --- lrzsz-0.12.21.orig/testsuite/Makefile.in +++ lrzsz-0.12.21/testsuite/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -103,7 +102,7 @@ DIST_COMMON = Makefile.am Makefile.in -TAR = gtar +TAR = tar GZIP_ENV = --best EXPECT = expect RUNTEST = runtest @@ -133,7 +132,7 @@ @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pr $$/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -192,7 +191,7 @@ all-am: Makefile all-redirect: all-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: debian/patches/206648_dszlog.diff.unchecked0000644000000000000000000001712211302257643015540 0ustar diff -ur lrzsz-0.12.21/src/lrz.c newlrzsz/src/lrz.c --- lrzsz-0.12.21/src/lrz.c 2003-08-21 16:22:01.000000000 -0500 +++ newlrzsz/src/lrz.c 2003-08-21 17:05:53.000000000 -0500 @@ -68,6 +68,7 @@ unsigned Baudrate = 2400; FILE *fout; +char *dszlogpath; int Lastrx; @@ -192,6 +193,9 @@ zmputs(Attn); canit(STDOUT_FILENO); io_mode(0,0); + if (dszlogpath) { + dszlog(dszlogpath, 'L', 0, 0, 0, errors, 0, 0); + } error(128+n,0,_("caught signal %d; exiting"), n); } @@ -265,6 +269,13 @@ if ((cp=getenv("ZMODEM_RESTRICTED"))!=NULL) Restricted=2; + dszlogpath = getenv("DSZLOG"); + if (access(dszlogpath, F_OK) == 0) { + if (unlink(dszlogpath) != 0) { + perror("unlink dszlog"); + } + } + /* make temporary and unfinished files */ umask(0077); @@ -559,6 +570,7 @@ signal(SIGINT, bibi); signal(SIGTERM, bibi); signal(SIGPIPE, bibi); + signal(SIGHUP, bibi); if (wcreceive(npats, patts)==ERROR) { exitcode=0200; canit(STDOUT_FILENO); @@ -685,9 +697,9 @@ #endif if (c) goto fubar; - } else { + } else { /* Not Xmodem, not Zmodem, so Ymodem */ for (;;) { - if (Verbose > 1 + if (Verbose > 1 || dszlogpath #ifdef ENABLE_SYSLOG || enable_syslog #endif @@ -712,7 +724,7 @@ if (wcrx(&zi)==ERROR) goto fubar; - if (Verbose > 1 + if (Verbose > 1 || dszlogpath #ifdef ENABLE_SYSLOG || enable_syslog #endif @@ -734,16 +746,19 @@ lsyslog(LOG_INFO,"%s/%s: %ld Bytes, %ld BPS", shortname,protname(),zi.bytes_received, bps); #endif + if (dszlogpath) dszlog(dszlogpath, 'R', + zi.bytes_received, zi.fname, + bps, errors, 0, 0); } } } - } else { + } else { /* Xmodem */ char dummy[128]; dummy[0]='\0'; /* pre-ANSI HPUX cc demands this */ dummy[1]='\0'; /* procheader uses name + 1 + strlen(name) */ zi.bytes_total = DEFBYTL; - if (Verbose > 1 + if (Verbose > 1 || dszlogpath #ifdef ENABLE_SYSLOG || enable_syslog #endif @@ -782,7 +797,7 @@ if (wcrx(&zi)==ERROR) { goto fubar; } - if (Verbose > 1 + if (Verbose > 1 || dszlogpath #ifdef ENABLE_SYSLOG || enable_syslog #endif @@ -803,6 +818,10 @@ lsyslog(LOG_INFO,"%s/%s: %ld Bytes, %ld BPS", shortname,protname(),zi.bytes_received, bps); #endif + if (dszlogpath) dszlog(dszlogpath, 'R', + zi.bytes_received, zi.fname, + bps, errors, 0, 0); + } } return OK; @@ -812,6 +831,13 @@ lsyslog(LOG_ERR,"%s/%s: got error", shortname ? shortname : "no.name", protname()); #endif + if (dszlogpath) { + double d = timing(0,NULL); + dszlog(dszlogpath, 'E', zi.bytes_received, zi.fname, + (zi.bytes_received-zi.bytes_skipped)/((d) ? d : 0.5), + errors, 0, 0); + } + canit(STDOUT_FILENO); if (Topipe && fout) { pclose(fout); return ERROR; @@ -1783,10 +1809,18 @@ rzfiles(struct zm_fileinfo *zi) { register int c; + long bps; for (;;) { timing(1,NULL); c = rzfile(zi); + { + double d; + d=timing(0,NULL); + if (d==0) + d=0.5; /* can happen if timing uses time() */ + bps=(zi->bytes_received-zi->bytes_skipped)/d; + } switch (c) { case ZEOF: if (Verbose > 1 @@ -1794,12 +1828,6 @@ || enable_syslog #endif ) { - double d; - long bps; - d=timing(0,NULL); - if (d==0) - d=0.5; /* can happen if timing uses time() */ - bps=(zi->bytes_received-zi->bytes_skipped)/d; if (Verbose > 1) { vstringf( _("\rBytes received: %7ld/%7ld BPS:%-6ld \r\n"), @@ -1807,6 +1835,8 @@ } DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: %ld Bytes, %ld BPS",shortname, protname(), (long) zi->bytes_total,bps)); + if (dszlogpath) dszlog(dszlogpath, 'z', zi->bytes_received, + zi->fname, bps, errors, 0, 0); } /* FALL THROUGH */ case ZSKIP: @@ -1815,6 +1845,8 @@ if (Verbose) vstringf(_("Skipped")); DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: skipped",shortname,protname())); + if (dszlogpath) dszlog(dszlogpath, 'E', zi->bytes_received, + zi->fname, bps, errors, 0, 0); } switch (tryz()) { case ZCOMPL: @@ -1829,6 +1861,8 @@ return c; case ERROR: DO_SYSLOG_FNAME((LOG_INFO, "%s/%s: error",shortname,protname())); + if (dszlogpath) dszlog(dszlogpath, 'E', zi->bytes_received, + zi->fname, bps, errors, 0, 0); return ERROR; } } diff -ur lrzsz-0.12.21/src/lsyslog.c newlrzsz/src/lsyslog.c --- lrzsz-0.12.21/src/lsyslog.c 1998-12-29 11:27:55.000000000 -0600 +++ newlrzsz/src/lsyslog.c 2003-08-21 16:47:53.000000000 -0500 @@ -26,6 +26,8 @@ #include #endif +#include + #if __STDC__ # include # define VA_START(args, lastarg) va_start(args, lastarg) @@ -79,3 +81,23 @@ #endif } +void dszlog(char *logname, char status, unsigned long num_bytes, char *fname, + int cps, int retry_events, int flow_events, int blocksize) { + + FILE *mylog; + if ((mylog = fopen(logname, "a"))) { + fprintf(mylog, "%c %6ld %5ld bps %4ld cps %3d errors %5u %4d %s %ld\r\n", + status, + num_bytes, + cps*8, /* XXX where to get DTE from? */ + cps, + retry_events, + flow_events, /* XXX where is flow_control? */ + blocksize, + fname, + -1 /* serial number */ + ); + fclose(mylog); + } +} + diff -ur lrzsz-0.12.21/src/lsz.c newlrzsz/src/lsz.c --- lrzsz-0.12.21/src/lsz.c 2003-08-21 16:22:01.000000000 -0500 +++ newlrzsz/src/lsz.c 2003-08-21 17:02:18.000000000 -0500 @@ -59,6 +59,8 @@ extern int errno; #endif +char *dszlogpath; + unsigned Baudrate=2400; /* Default, should be set by first mode() call */ unsigned Txwindow; /* Control the size of the transmitted window */ unsigned Txwspac; /* Spacing between zcrcq requests */ @@ -223,6 +225,9 @@ canit(STDOUT_FILENO); fflush (stdout); io_mode (io_mode_fd,0); + if (dszlogpath) { + dszlog(dszlogpath, 'L', 0, 0, 0, errors, 0, 0); + } if (n == 99) error (0, 0, _ ("io_mode(,2) in rbsb.c not implemented\n")); else @@ -332,6 +337,14 @@ } if ((cp=getenv("ZMODEM_RESTRICTED"))!=NULL) Restricted=1; + + dszlogpath = getenv("DSZLOG"); + if (access(dszlogpath, F_OK) == 0) { + if (unlink(dszlogpath) != 0) { + perror("unlink dszlog"); + } + } + from_cu(); chkinvok(argv[0]); @@ -1113,6 +1126,12 @@ if (enable_syslog) lsyslog(LOG_INFO, _("%s/%s: error occured"),protname(),shortname); #endif + if (dszlogpath) { + double d = timing(0,NULL); + dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname, + zi.bytes_sent/((d) ? d : 0.5), + errors, 0, blklen); + } return ERROR; case ZSKIP: error(0,0, _("skipped: %s"),name); @@ -1120,6 +1139,13 @@ if (enable_syslog) lsyslog(LOG_INFO, _("%s/%s: skipped"),protname(),shortname); #endif + if (dszlogpath) { + double d = timing(0,NULL); + /* XXX is Zmodem skip really deserving a 'E' ? */ + dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname, + zi.bytes_sent/((d) ? d : 0.5), + errors, 0, blklen); + } return OK; } if (!zmodem_requested && wctx(&zi)==ERROR) @@ -1128,12 +1154,18 @@ if (enable_syslog) lsyslog(LOG_INFO, _("%s/%s: error occured"),protname(),shortname); #endif + if (dszlogpath) { + double d = timing(0,NULL); + dszlog(dszlogpath, 'E', zi.bytes_sent, zi.fname, + zi.bytes_sent/((d) ? d : 0.5), + errors, 0, blklen); + } return ERROR; } if (Unlinkafter) unlink(oname); - if (Verbose > 1 + if (Verbose > 1 || dszlogpath #ifdef ENABLE_SYSLOG || enable_syslog #endif @@ -1152,6 +1184,11 @@ lsyslog(LOG_INFO, "%s/%s: %ld Bytes, %ld BPS",shortname, protname(), (long) zi.bytes_sent,bps); #endif + if (dszlogpath) { + char whichprot = (protocol==ZM_ZMODEM)? 'Z' : 'S'; + dszlog(dszlogpath, whichprot, zi.bytes_sent, + zi.fname, bps, errors, 0, blklen); + } } return 0; } debian/patches/313992_de_po.diff0000644000000000000000000005602212257574446013414 0ustar --- lrzsz-0.12.21/po/de.po.orig 1999-08-22 21:59:09.000000000 +0200 +++ lrzsz-0.12.21/po/de.po 2013-12-28 17:14:02.742048293 +0100 @@ -1,17 +1,18 @@ -# german translation of lrzsz output -# Copyright (C) 1997 Uwe Ohse -# Uwe Ohse , 1997. +# German translation of lrzsz +# Copyright (C) Uwe Ohse , 1997. +# Copyright (C) Tobias Toedter , 2005, 2006. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lrzsz 0.12.21\n" "POT-Creation-Date: 1999-08-22 21:00+0200\n" -"PO-Revision-Date: 1997-06-01 19:00+0200\n" -"Last-Translator: FULL NAME \n" -"Language-Team: none. try \n" +"PO-Revision-Date: 2006-01-12 10:23+0100\n" +"Last-Translator: Tobias Toedter \n" +"Language-Team: German \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: src/lsz.c:228 msgid "io_mode(,2) in rbsb.c not implemented\n" @@ -28,21 +29,21 @@ #: src/lsz.c:422 msgid "packetlength" -msgstr "Paketlänge" +msgstr "Paketlänge" #: src/lsz.c:427 #, c-format msgid "packetlength out of range 24..%ld" -msgstr "Argument der Option L außerhalb des Bereichs 24..%ld" +msgstr "Argument der Option L außerhalb des Bereichs 24..%ld" #: src/lsz.c:436 msgid "framelength" -msgstr "Framelänge" +msgstr "Framelänge" #: src/lsz.c:441 #, c-format msgid "framelength out of range 32..%ld" -msgstr "Argument der Option l außerhalb des Bereichs 32..%ld" +msgstr "Argument der Option l außerhalb des Bereichs 32..%ld" #: src/lrz.c:318 src/lsz.c:450 msgid "min_bps" @@ -50,27 +51,27 @@ #: src/lsz.c:452 msgid "min_bps must be >= 0" -msgstr "minimale BPS-Rate muß >= 0 sein" +msgstr "minimale BPS-Rate muss >= 0 sein" #: src/lrz.c:324 src/lsz.c:458 msgid "min_bps_time" -msgstr "" +msgstr "Zeitfenster für minimale BPS-Rate" #: src/lrz.c:326 src/lsz.c:460 msgid "min_bps_time must be > 1" -msgstr "Zeitfenster für minimale BPS-Rate muß > 1 Sekunde sein" +msgstr "Zeitfenster für minimale BPS-Rate muss > 1 Sekunde sein" #: src/lrz.c:342 src/lsz.c:484 msgid "hour to large (0..23)" -msgstr "Stunde zu gross (0..23)" +msgstr "Stunde zu groß (0..23)" #: src/lrz.c:344 src/lsz.c:486 msgid "unparsable stop time\n" -msgstr "unparsbare Endzeit\n" +msgstr "Endzeit nicht auszuwerten\n" #: src/lrz.c:348 src/lsz.c:490 msgid "minute to large (0..59)" -msgstr "Minute zu groß (0..59)" +msgstr "Minute zu groß (0..59)" #: src/lrz.c:358 src/lrz.c:365 src/lsz.c:500 src/lsz.c:507 msgid "stop time to small" @@ -78,7 +79,7 @@ #: src/lrz.c:363 src/lsz.c:505 msgid "stop-at" -msgstr "" +msgstr "Stopp um" #: src/lrz.c:394 src/lsz.c:516 msgid "timeout" @@ -86,15 +87,15 @@ #: src/lrz.c:396 src/lsz.c:518 msgid "timeout out of range 10..1000" -msgstr "Argument der Option t außerhalb des Bereichs 10..1000" +msgstr "Argument der Option t außerhalb des Bereichs 10..1000" #: src/lrz.c:412 src/lsz.c:526 msgid "security violation: can't do that under restricted shell\n" -msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n" +msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten\n" #: src/lrz.c:402 src/lsz.c:533 msgid "window size" -msgstr "Fenstergröße" +msgstr "Fenstergröße" #: src/lrz.c:427 src/lrz.c:434 src/lsz.c:556 src/lsz.c:563 msgid "cannot turnoff syslog" @@ -102,7 +103,7 @@ #: src/lrz.c:449 src/lsz.c:571 msgid "startup delay" -msgstr "Startverzögerung" +msgstr "Startverzögerung" #: src/lrz.c:465 src/lrz.c:483 src/lrz.c:760 src/lrz.c:1122 src/lrz.c:1244 #: src/lrz.c:1292 src/lrz.c:1309 src/lrz.c:1324 src/lrz.c:1423 src/lsz.c:580 @@ -117,11 +118,11 @@ #: src/lsz.c:612 src/lsz.c:627 msgid "need at least one file to send" -msgstr "es muß mindestens ein Name einer zu sendenden Datei angegeben werden" +msgstr "es muss mindestens ein Name einer zu sendenden Datei angegeben werden" #: src/lsz.c:629 msgid "Can't send command in restricted mode\n" -msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n" +msgstr "Im eingeschränkten Modus ist das Senden von Kommandos verboten\n" #: src/lrz.c:527 src/lsz.c:656 msgid "hostname too long\n" @@ -129,7 +130,7 @@ #: src/lrz.c:542 src/lsz.c:671 msgid "illegal server address\n" -msgstr "Illegale Serveraddresse\n" +msgstr "Illegale Serveradresse\n" #: src/lsz.c:710 msgid "can read only one file from stdin" @@ -137,21 +138,21 @@ #: src/lrz.c:574 src/lsz.c:803 msgid "Transfer incomplete\n" -msgstr "Übertragung nicht abgeschlossen\n" +msgstr "Ãœbertragung nicht abgeschlossen\n" #: src/lrz.c:576 src/lsz.c:805 msgid "Transfer complete\n" -msgstr "Übertragung abgeschlossen\n" +msgstr "Ãœbertragung abgeschlossen\n" #: src/lsz.c:838 #, c-format msgid "send_pseudo %s: cannot open tmpfile %s: %s" -msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s" +msgstr "send_pseudo %s: kann temporäre Datei %s nicht öffnen: %s" #: src/lsz.c:851 #, c-format msgid "send_pseudo %s: cannot lstat tmpfile %s: %s" -msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s" +msgstr "send_pseudo %s: kann lstat nicht auf temporäre Datei %s anwenden: %s" #: src/lsz.c:859 #, c-format @@ -161,7 +162,7 @@ #: src/lsz.c:870 #, c-format msgid "send_pseudo %s: cannot write to tmpfile %s: %s" -msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s" +msgstr "send_pseudo %s: kann nicht in temporäre Datei %s schreiben: %s" #: src/lsz.c:879 #, c-format @@ -188,17 +189,17 @@ #: src/lsz.c:953 msgid "Can't open any requested files." -msgstr "Kann keine der angeforderten Dateien öffnen" +msgstr "Kann keine der angeforderten Dateien öffnen" #: src/lsz.c:1009 #, c-format msgid "security violation: not allowed to upload from %s" -msgstr "Sicherheitsverstoß: Ausführung unter eingeschränkter Shell verboten" +msgstr "Sicherheitsverstoß: Hochladen von %s nicht erlaubt" #: src/lrz.c:1384 src/lsz.c:1027 #, c-format msgid "cannot open %s" -msgstr "kann %s nicht öffnen" +msgstr "kann %s nicht öffnen" #: src/lsz.c:1082 #, c-format @@ -213,12 +214,12 @@ #: src/lsz.c:1119 #, c-format msgid "skipped: %s" -msgstr "übersprungen: %s" +msgstr "übersprungen: %s" #: src/lsz.c:1122 #, c-format msgid "%s/%s: skipped" -msgstr "%s/%s: übersprungen" +msgstr "%s/%s: übersprungen" #: src/lsz.c:1149 #, c-format @@ -228,7 +229,7 @@ #: src/lsz.c:1178 #, c-format msgid "Sending %s, %ld blocks: " -msgstr "Sende %s, %ld Blöcke:" +msgstr "Sende %s, %ld Blöcke:" #: src/lsz.c:1181 msgid "Give your local XMODEM receive command now." @@ -245,11 +246,11 @@ #: src/lsz.c:1314 msgid "Receiver Cancelled" -msgstr "Empfänger brach ab" +msgstr "Empfänger brach ab" #: src/lsz.c:1340 msgid "No ACK on EOT" -msgstr "Keine Bestätigung für Übertragungsende erhalten" +msgstr "Keine Bestätigung für Ãœbertragungsende erhalten" #: src/lsz.c:1361 #, c-format @@ -267,24 +268,24 @@ #: src/lsz.c:1399 msgid "Timeout on sector ACK" -msgstr "Timeout bei Sektorbestätigung" +msgstr "Timeout bei Sektorbestätigung" #: src/lsz.c:1404 msgid "NAK on sector" -msgstr "Sektor nicht bestätigt" +msgstr "Sektor nicht bestätigt" #: src/lsz.c:1410 msgid "Got burst for sector ACK" -msgstr "" +msgstr "Erhielt Bruch als Sektorbestätigung" #: src/lsz.c:1412 #, c-format msgid "Got %02x for sector ACK" -msgstr "Erhielt %02x als Sektorbestätigung" +msgstr "Erhielt %02x als Sektorbestätigung" #: src/lsz.c:1424 msgid "Retry Count Exceeded" -msgstr "Maximale Wiederholungsanzahl überschritten" +msgstr "Maximale Wiederholungsanzahl überschritten" #: src/lrz.c:596 src/lsz.c:1502 #, c-format @@ -304,11 +305,11 @@ #: src/lsz.c:1512 #, c-format msgid " or: %s [options] -{c|i} COMMAND\n" -msgstr " oder: %s [Optionen] -{c|i} KOMMANDO\n" +msgstr " oder: %s [-2Ceqv] -{c|i} KOMMANDO\n" #: src/lsz.c:1513 msgid "Send file(s) with ZMODEM/YMODEM/XMODEM protocol\n" -msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n" +msgstr "Dateien mit ZMODEM/YMODEM/XMODEM übertragen\n" # src/lrz.c:475 src/lsz.c:1330 xx #: src/lrz.c:607 src/lsz.c:1515 @@ -317,9 +318,9 @@ " (Y) = option applies to YMODEM only\n" " (Z) = option applies to ZMODEM only\n" msgstr "" -" (X) = Option gilt nur für XMODEM\n" -" (Y) = Option gilt nur für YMODEM\n" -" (Z) = Option gilt nur für ZMODEM\n" +" (X) = Option gilt nur für XMODEM\n" +" (Y) = Option gilt nur für YMODEM\n" +" (Z) = Option gilt nur für ZMODEM\n" #: src/lsz.c:1521 msgid "" @@ -347,32 +348,32 @@ " -m, --min-bps N stop transmission if BPS below N\n" " -M, --min-bps-time N for at least N seconds (default: 120)\n" msgstr "" -" -+, --append an existierende Dateien anhängen (Z)\n" +" -+, --append an existierende Dateien anhängen (Z)\n" " -2, --twostop zwei Stopbits verwenden\n" -" -4, --try-4k bis zu 4K Blockgröße verwenden\n" -" --start-4k mit 4K Blockgröße starten (versucht nicht 8)\n" -" -8, --try-8k bis zu 8K Blockgröße verwenden\n" -" --start-8k mit 8K Blockgröße starten\n" +" -4, --try-4k bis zu 4K Blockgröße verwenden\n" +" --start-4k mit 4K Blockgröße starten (versucht nicht 8)\n" +" -8, --try-8k bis zu 8K Blockgröße verwenden\n" +" --start-8k mit 8K Blockgröße starten\n" " -a, --ascii ASCII: NL nach CR/LF wandeln\n" -" -b, --binary Binärübertragung erzwingen\n" +" -b, --binary Binärübertragung erzwingen\n" " -B, --bufsize N N Bytes puffern (auto: ganze Datei puffern)\n" -" -c, --command COMMAND Kommando KOMMANDO auf Gegenseite ausführen " +" -c, --command COMMAND Kommando KOMMANDO auf Gegenseite ausführen " "(Z)\n" -" -C, --command-tries N N mal Kommandoausführung versuchen (Z)\n" +" -C, --command-tries N N mal Kommandoausführung versuchen (Z)\n" " -d, --dot-to-slash C '.' in Dateinamen nach '/' wandeln (Y/Z)\n" " --delay-startup N Bei Programmstart N Sek. schlafen (Debugging)\n" " -e, --escape alle Steuerzeichen escapen (Z)\n" -" -E, --rename Empfänger soll Datei umbenennen falls\n" +" -E, --rename Empfänger soll Datei umbenennen falls\n" " Zieldatei schon existiert\n" " -f, --full-path Dateien mit vollen Pfaden senden (Y/Z)\n" -" -i, --immediate-command CMD wie `c', aber sofort zurückkehren (Z)\n" +" -i, --immediate-command CMD wie `c', aber sofort zurückkehren (Z)\n" " -h, --help diesen Hilfetext ausgeben\n" " -k, --1k 1024 Bytes Pakete senden (Y)\n" -" -L, --packetlen N Unterpaketlänge auf N Bytes beschränken (Z)\n" -" -l, --framelen N Rahmenlänge auf N Bytes beschränken (l>=L) " +" -L, --packetlen N Unterpaketlänge auf N Bytes beschränken (Z)\n" +" -l, --framelen N Rahmenlänge auf N Bytes beschränken (l>=L) " "(Z)\n" -" -m, --min-bps N Übertragung abbrechen bei weniger als N BPS\n" -" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" +" -m, --min-bps N Ãœbertragung abbrechen bei weniger als N BPS\n" +" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" #: src/lsz.c:1546 msgid "" @@ -400,28 +401,28 @@ "short options use the same arguments as the long ones\n" msgstr "" " -n, --newer Datei senden wenn sie neuer ist (Z)\n" -" -N, --newer-or-longer Datei senden wenn neuer oder länger (Z)\n" +" -N, --newer-or-longer Datei senden wenn neuer oder länger (Z)\n" " -o, --16-bit-crc 16Bit CRC statt 32Bit CRC verwenden (Z)\n" " -O, --disable-timeouts Timeoutbehandlung abschalten\n" -" -p, --protect existierende Dateien nicht verändern\n" -" -r, --resume unterbrochene Übertragungen fortsetzen (Z)\n" -" -R, --restricted eingeschränkter, sichererer Modus\n" +" -p, --protect existierende Dateien nicht verändern\n" +" -r, --resume unterbrochene Ãœbertragungen fortsetzen (Z)\n" +" -R, --restricted eingeschränkter, sichererer Modus\n" " -q, --quiet leise, keine Ausgaben machen\n" -" -s, --stop-at {HH:MM|+N} Übertragung um HH:MM oder in N Sek. abbrechen\n" -" --tcp-server Socket öffnen und auf Verbindung warten\n" -" --tcp-client ADDR:PORT Socket öffnen und verbindung mit ...\n" -" -u, --unlink Datei nach Übertragung löschen\n" -" -U, --unrestrict eingeschränkten Modus aufheben (falls " +" -s, --stop-at {HH:MM|+N} Ãœbertragung um HH:MM oder in N Sek. abbrechen\n" +" --tcp-server Socket öffnen, Verbindung abwarten (Z)\n" +" --tcp-client ADDR:PORT Socket öffnen, verbinden mit ... (Z)\n" +" -u, --unlink Datei nach Ãœbertragung löschen\n" +" -U, --unrestrict eingeschränkten Modus aufheben (falls " "erlaubt)\n" " -v, --verbose mehr ausgeben\n" -" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" +" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" " -X --xmodem XMODEM-Protokoll benutzen\n" -" -y, --overwrite existierende Dateien überschreiben\n" -" -Y, --overwrite-or-skip wie `y', aber nicht existierende überspringen\n" +" -y, --overwrite existierende Dateien überschreiben\n" +" -Y, --overwrite-or-skip wie `y', aber nicht existierende überspringen\n" " --ymodem YMODEM-Protokoll benutzen\n" " -Z, --zmodem ZMODEM-Protokoll benutzen\n" "\n" -"Kurze Optionen benötigen dieselben Argumente wie Lange.\n" +"Kurze Optionen benötigen dieselben Argumente wie die langen.\n" #: src/lsz.c:1768 msgid "got ZRQINIT" @@ -434,7 +435,7 @@ #: src/lsz.c:1991 #, c-format msgid "blklen now %d\n" -msgstr "Blockgröße nun %d\n" +msgstr "Blockgröße nun %d\n" #: src/lsz.c:2053 #, c-format @@ -453,7 +454,7 @@ #: src/lsz.c:2223 #, c-format msgid "calc_blklen: reduced to %d due to error\n" -msgstr "calc_blklen: Blockgrösse auf %d reduziert wegen Fehler\n" +msgstr "calc_blklen: Blockgröße auf %d reduziert wegen Fehler\n" #: src/lsz.c:2256 #, c-format @@ -468,12 +469,12 @@ #: src/lsz.c:2267 #, c-format msgid "calc_blklen: calc total_bytes=%ld, bpe=%ld, ec=%ld\n" -msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%le, ec=%ld\n" +msgstr "calc_blklen: kalkuliere gesamt_bytes=%ld, bpe=%ld, ec=%ld\n" #: src/lsz.c:2278 #, c-format msgid "calc_blklen: blklen %d, ok %ld, failed %ld -> %lu\n" -msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n" +msgstr "calc_blklen: Blocklänge %d, ok %ld, fehlgeschlagen %ld -> %lu\n" #: src/lsz.c:2290 #, c-format @@ -512,7 +513,7 @@ #: src/zm.c:712 msgid "Garbage count exceeded" -msgstr "Maximale Wiederholungsanzahl überschritten" +msgstr "Maximale Wiederholungsanzahl überschritten" #: src/zm.c:773 #, c-format @@ -526,11 +527,11 @@ #: src/lrz.c:382 msgid "don't have settimeofday, will not set time\n" -msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n" +msgstr "Zeitsynchronisation nicht ausführbar, settimeofday() fehlt\n" #: src/lrz.c:386 msgid "not running as root (this is good!), can not set time\n" -msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n" +msgstr "Zeitsynchronisation mangels Superuserrechten nicht ausführbar\n" #: src/lrz.c:441 msgid "bytes_per_error" @@ -542,16 +543,16 @@ #: src/lrz.c:455 msgid "O_SYNC not supported by the kernel" -msgstr "O_SYNC vom Kernel nicht unterstützt" +msgstr "O_SYNC vom Kernel nicht unterstützt" #: src/lrz.c:497 src/lrz.c:499 msgid "garbage on commandline" -msgstr "Müll auf der Kommandozeile" +msgstr "Müll auf der Kommandozeile" #: src/lrz.c:604 #, c-format msgid "Usage: %s [options] [filename.if.xmodem]\n" -msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n" +msgstr "Benutzung: %s [Optionen] [Dateiname.für.xmodem]\n" #: src/lrz.c:605 msgid "Receive files with ZMODEM/YMODEM/XMODEM protocol\n" @@ -596,44 +597,44 @@ "\n" "short options use the same arguments as the long ones\n" msgstr "" -" -+, --append an existierende Dateien anhängen\n" -" -a, --ascii ASCII-Übertragung (CR/LF nach LF wandeln)\n" -" -b, --binary Binärübertragung (keine Umwandlungen)\n" +" -+, --append an existierende Dateien anhängen\n" +" -a, --ascii ASCII-Ãœbertragung (CR/LF nach LF wandeln)\n" +" -b, --binary Binärübertragung (keine Umwandlungen)\n" " -B, --bufsize N N Bytes puffern (auto: ganze Datei puffern)\n" -" -c, --with-crc 16bit CRC statt Prüfsumme verwenden (X)\n" -" -C, --allow-remote-commands Ausführung von Kommandos erlauben (Z)\n" +" -c, --with-crc 16bit CRC statt Prüfsumme verwenden (X)\n" +" -C, --allow-remote-commands Ausführung von Kommandos erlauben (Z)\n" " -D, --null empfangene Daten nach /dev/null schreiben\n" " --delay-startup N Bei Programmstart N Sek. schlafen (Debugging)\n" " -e, --escape Alle Steuerzeichen escapen (Z)\n" -" -E, --rename Empfänger soll Datei umbenennen falls\n" +" -E, --rename Empfänger soll Datei umbenennen, falls\n" " Zieldatei schon existiert\n" " --errors N Einen CRC-Fehler alle N Bytes erzeugen\n" " -h, --help Diesen Hilfstext ausgeben\n" -" -m, --min-bps N Übertragung abbrechen bei weniger als N BPS\n" -" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" +" -m, --min-bps N Ãœbertragung abbrechen bei weniger als N BPS\n" +" -M, --min-bps-time N für mindestens N Sekunden (Default: 120)\n" " -O, --disable-timeouts Timeoutbehandlung abschalten\n" " --o-sync Ausgabedatei(en) im synchron schreiben\n" -" -p, --protect existierende Dateien nicht verändern\n" +" -p, --protect existierende Dateien nicht verändern\n" " -q, --quiet leise, keine Ausgaben machen\n" -" -r, --resume unterbrochene Übertragungen fortsetzen (Z)\n" -" -R, --restricted eingeschränkter, sichererer Modus\n" -" -s, --stop-at {HH:MM|+N} Übertragung um HH:MM oder in N Sek. abbrechen\n" +" -r, --resume unterbrochene Ãœbertragungen fortsetzen (Z)\n" +" -R, --restricted eingeschränkter, sichererer Modus\n" +" -s, --stop-at {HH:MM|+N} Ãœbertragung um HH:MM oder in N Sek. abbrechen\n" " -S, --timesync Zeit anfordern (doppelt: lokale Zeit setzen)\n" -" --syslog[=off] syslog an- oder ausschalten, wenn möglich\n" -" -t, --timeout N Timeout auf N Zehntelsekungen setzen\n" -" --tcp-server Socket öffnen und auf Verbindung warten\n" -" --tcp-client ADDR:PORT Socket öffnen und verbindung mit ...\n" +" --syslog[=off] syslog an- oder ausschalten, wenn möglich\n" +" -t, --timeout N Timeout auf N Zehntelsekunden setzen\n" +" --tcp-server Socket öffnen, Verbindung abwarten (Z)\n" +" --tcp-client ADDR:PORT Socket öffnen, verbinden mit ... (Z)\n" " -u, --keep-uppercase GROSS geschrieben Dateinamen beibehalten\n" -" -U, --unrestrict eingeschränkten Modus aufheben (falls " +" -U, --unrestrict eingeschränkten Modus aufheben (falls " "erlaubt)\n" " -v, --verbose mehr ausgeben\n" -" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" +" -w, --windowsize N Fenstergröße auf N Bytes setzen (Z)\n" " -X --xmodem XMODEM-Protokoll benutzen\n" -" -y, --overwrite existierende Dateien überschreiben\n" +" -y, --overwrite existierende Dateien überschreiben\n" " --ymodem YMODEM-Protokoll benutzen\n" " -Z, --zmodem ZMODEM-Protokoll benutzen\n" "\n" -"Kurze Optionen benötigen dieselben Argumente wie Lange.\n" +"Kurze Optionen benötigen dieselben Argumente wie die langen.\n" #: src/lrz.c:676 #, c-format @@ -662,11 +663,11 @@ "%s: %s removed.\r\n" msgstr "" "\r\n" -"%s: %s gelöscht\r\n" +"%s: %s gelöscht\r\n" #: src/lrz.c:856 msgid "Pathname fetch returned EOT" -msgstr "Ende der Übertragung beim Warten auf Dateinamen" +msgstr "Ende der Ãœbertragung beim Warten auf Dateinamen" #: src/lrz.c:903 msgid "Received dup Sector" @@ -682,7 +683,7 @@ #: src/lrz.c:976 msgid "Checksum" -msgstr "Prüfsummenfehler" +msgstr "Prüfsummenfehler" #: src/lrz.c:979 msgid "Sector number garbled" @@ -695,27 +696,27 @@ #: src/lrz.c:1005 #, c-format msgid "Got 0%o sector header" -msgstr "Erhielt %02x als Sektorbestätigung" +msgstr "Erhielt %02x als Sektorbestätigung" #: src/lrz.c:1113 #, c-format msgid "file name ends with a /, skipped: %s\n" -msgstr "Dateiname endet mit /, übersprungen: %s\n" +msgstr "Dateiname endet mit /, übersprungen: %s\n" #: src/lrz.c:1127 #, c-format msgid "zmanag=%d, Lzmanag=%d\n" -msgstr "" +msgstr "zmanag=%d, Lzmanag=%d\n" #: src/lrz.c:1128 #, c-format msgid "zconv=%d\n" -msgstr "" +msgstr "zconv=%d\n" #: src/lrz.c:1192 src/lrz.c:1226 #, c-format msgid "file exists, skipped: %s\n" -msgstr "Datei existiert, übersprungen: %s\n" +msgstr "Datei existiert, übersprungen: %s\n" #: src/lrz.c:1267 #, c-format @@ -739,7 +740,7 @@ #: src/lrz.c:1545 #, c-format msgid "Blocks received: %d" -msgstr "Blöcke empfangen: %d" +msgstr "Blöcke empfangen: %d" #: src/lrz.c:1599 #, c-format @@ -749,15 +750,15 @@ #: src/lrz.c:1612 src/lrz.c:1620 #, c-format msgid "%s:\tSecurity Violation" -msgstr "%s:\tSicherheitsverstoß" +msgstr "%s:\tSicherheitsverstoß" #: src/lrz.c:1730 msgid "remote command execution requested" -msgstr "Gegenseite versucht Kommandoausführung" +msgstr "Gegenseite versucht Kommandoausführung" #: src/lrz.c:1737 msgid "not executed" -msgstr "nicht ausgeführt" +msgstr "nicht ausgeführt" #: src/lrz.c:1768 msgid "got ZRINIT" @@ -765,7 +766,7 @@ #: src/lrz.c:1817 msgid "Skipped" -msgstr "Übersprungen" +msgstr "Ãœbersprungen" #. too bad #: src/lrz.c:2049 @@ -785,7 +786,7 @@ #: src/lrz.c:2215 msgid "file close error" -msgstr "Fehler beim Schließen der Datei" +msgstr "Fehler beim Schließen der Datei" #~ msgid "tcp protocol init failed\n" #~ msgstr "TCP Protokoll Initialisierung fehlgeschlagen\n" @@ -796,17 +797,3 @@ #~ msgid "fgets for tcp protocol synchronization failed: " #~ msgstr "fgets() bei tcp Protokoll Synchronisation fehlgeschlagen: " -#~ msgid "Transfer complete." -#~ msgstr "Übertragung abgeschlossen" - -#~ msgid "at" -#~ msgstr "um" - -#~ msgid "TIMESYNC: failed\n" -#~ msgstr "Zeitsynchronisation: fehlgeschlagen\n" - -#~ msgid "TIMESYNC: ok\n" -#~ msgstr "Zeitsynchronisation: ok\n" - -#~ msgid "Falldown to %ld blklen" -#~ msgstr "Blockgröße auf %ld gesenkt" debian/patches/206499_ymodemg.diff.unchecked0000644000000000000000000000436411302260630015675 0ustar --- org/lrz.c 1998-12-29 23:49:24.000000000 -0800 +++ lrz.c 2003-08-21 15:15:15.000000000 -0700 @@ -73,6 +73,7 @@ int Lastrx; int Crcflg; +int Optiong; int Firstsec; int errors; int Restricted=1; /* restricted; no /.. or ../ in filenames */ @@ -211,6 +212,7 @@ {"allow-remote-commands", no_argument, NULL, 'C'}, {"escape", no_argument, NULL, 'e'}, {"rename", no_argument, NULL, 'E'}, + {"go", no_argument, NULL, 'g'}, {"help", no_argument, NULL, 'h'}, {"crc-check", no_argument, NULL, 'H'}, {"junk-path", no_argument, NULL, 'j'}, @@ -288,7 +290,7 @@ parse_long_options (argc, argv, show_version, usage1); while ((c = getopt_long (argc, argv, - "a+bB:cCDeEhm:M:OprRqs:St:uUvw:XZy", + "a+bB:cCDeEghm:M:OprRqs:St:uUvw:XZy", long_options, (int *) 0)) != EOF) { unsigned long int tmp; @@ -313,6 +315,7 @@ case 'D': Nflag = TRUE; break; case 'E': Lzmanag = ZF1_ZMCHNG; break; case 'e': Zctlesc = 1; break; + case 'g': Optiong = 1; break; case 'h': usage(0,NULL); break; case 'H': Lzmanag= ZF1_ZMCRC; break; case 'j': junk_path=TRUE; break; @@ -617,6 +620,7 @@ " -e, --escape Escape control characters (Z)\n" " -E, --rename rename any files already existing\n" " --errors N generate CRC error every N bytes (debugging)\n" +" -g, --go use X/YMODEM-g protocol (with CRC)\n" " -h, --help Help, print this usage message\n" " -m, --min-bps N stop transmission if BPS below N\n" " -M, --min-bps-time N for at least N seconds (default: 120)\n" @@ -843,7 +847,7 @@ et_tu: Firstsec=TRUE; zi->eof_seen=FALSE; - sendline(Crcflg?WANTCRC:NAK); + sendline(Optiong?WANTG:(Crcflg?WANTCRC:NAK)); flushmo(); purgeline(0); /* Do read next time ... */ while ((c = wcgetsec(&Blklen, rpn, 100)) != 0) { @@ -875,7 +879,7 @@ Firstsec=TRUE;sectnum=0; zi->eof_seen=FALSE; - sendchar=Crcflg?WANTCRC:NAK; + sendchar=(Optiong?WANTG:(Crcflg?WANTCRC:NAK)); for (;;) { sendline(sendchar); /* send it now, we're ready! */ @@ -1007,7 +1011,7 @@ ; } if (Firstsec) { - sendline(Crcflg?WANTCRC:NAK); + sendline(Optiong?WANTG:(Crcflg?WANTCRC:NAK)); flushmo(); purgeline(0); /* Do read next time ... */ } else { debian/patches/series0000644000000000000000000000012412257572431012037 0ustar 313992_de_po.diff build.diff cat-id-tbl.diff include.diff mantypos.diff strstr.diff debian/source/0000755000000000000000000000000012257571615010501 5ustar debian/source/format0000644000000000000000000000001412257571615011707 0ustar 3.0 (quilt) debian/watch0000644000000000000000000000015712257576117010237 0ustar version=3 https://ohse.de/uwe/software/lrzsz.html .*/lrzsz-(\d\S*)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))