--- sendfile-2.1b.20080616.orig/debian/NMU-Disclaimer +++ sendfile-2.1b.20080616/debian/NMU-Disclaimer @@ -0,0 +1,45 @@ +Non Maintainer Upload of this Package +------------------------------------- + +If you plan to work on an NMU for this package, read the following +closely. It can save you and me some grief. + + 1. At first, contact the maintainer (i.e. send a mail to + joey@debian.org, do not cc or bounce a mail, send a plain mail, + not copied to any mailing list or the BTS) and ask about the + status of the bug you are considering to work on. + + 2. In this mail include all information relevant for this problem, + i.e. include a description of the bug and not only its bug + number. + + 3. If the maintainer is not able or willing to fix the problem or + does not respond within four days, continue with step 4. + + 4. Work on the bug and prepare a patch. Do not upload into the + Debian archive. + + 5. Send the entire patch, together with enough explanations, to the + maintainer for reviewing and ask him for permission of an NMU + using this patch. + + 6. IF AND ONLY IF the maintainer approves the patch (or doesn't + respond within four days), upload the NMU to the incoming + directory and send the patch to the BTS. If the NMU is not + approved, go back to 4. or add the NMU to your homepage, but do + not upload it to the Debian archive. + + 7. Properly sized and well-written patches sent to the BTS are always + appreciated, even if they are rejected later. They demonstrate a + potential solution which could probably improved into a real + solution. + + 8. NEVER change the way a package is maintained in an NMU, i.e. don't + remove dh_* stuff or switch to dh_* respectively. This rule + applies to all NMU's, not only to an NMU for this package. + +These rules always apply. They even apply if somebody declares NMUs +as ok and reduces regular NMU rules to a delay of zero days. Unless +I'm on vacation or on a show I am reachable via mail, so there is +hardly a reason not to contact me. + --- sendfile-2.1b.20080616.orig/debian/changelog +++ sendfile-2.1b.20080616/debian/changelog @@ -0,0 +1,459 @@ +sendfile (2.1b.20080616-5.3) unstable; urgency=low + + * Non-maintainer upload. + * Use dh-autoreconf in build to support new architectures (Closes: #726495) + + -- Chen Baozi Thu, 05 Jun 2014 16:46:19 +0800 + +sendfile (2.1b.20080616-5.2) unstable; urgency=low + + * Non-maintainer upload. + * Don't edit /etc/services, /etc/profile and /etc/csh.login + * Cleanup edits to those files from previous versions + Closes: #685631 + * Depend on update-inetd because the postinst script requires the perl + module DebianNet + * Depend on libdpkg-perl for version checks in postinst script + + -- Ivo De Decker Sat, 25 Aug 2012 11:03:41 +0200 + +sendfile (2.1b.20080616-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove all files on purge. Thanks for the patch to + Andreas Beckmann + Closes: #668721 + + -- Andreas Tille Thu, 09 Aug 2012 15:03:55 +0200 + +sendfile (2.1b.20080616-5) unstable; urgency=low + + * Add new config file /etc/profile.d/sendfile and remove old line from + /etc/profile if it is detected during installation (closes: Bug#17545) + + -- Joey Schulze Mon, 13 Jun 2011 17:01:09 +0200 + +sendfile (2.1b.20080616-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Check if /etc/cron.weekly/sendfile is unmodified when upgrading from + lenny, and remove it if so; avoids spurious dpkg warning (closes: #606777) + + -- Chris Butler Sun, 19 Dec 2010 15:31:42 +0000 + +sendfile (2.1b.20080616-4) unstable; urgency=low + + * Terminate weekly cronjob (sf_cleenup) preemptively when no sendfile + program exists (closes: Bug#571935) + * Clean up temporary directory before exiting during weekly cronjob + + -- Joey Schulze Sun, 22 Aug 2010 14:49:42 +0200 + +sendfile (2.1b.20080616-3) unstable; urgency=low + + * Adjust configuration file path in manpages to reality (closes: Bug#540818) + * Update config.guess and config.sub in develop from automake 1.11 + (closes: Bug#535738) + * Convert Authors and Thanks files to UTF-8 when adding to copyright file + * Explicitly specify version 2 of GPL as license + * Remove absolute path from postrm script + + -- Joey Schulze Mon, 25 Jan 2010 16:20:59 +0100 + +sendfile (2.1b.20080616-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "file-in-etc-not-marked-as-conffile /etc/cron.weekly/sendfile" + by adding /etc/cron.weekly/sendfile to debian/conffiles (closes: #553563). + * Fix "replacing libreadline5-dev build dependency with libreadline- + dev" (closes: #553850). + + -- Gregor Herrmann Sat, 28 Nov 2009 13:50:59 +0100 + +sendfile (2.1b.20080616-2) unstable; urgency=low + + * Adjusted permissions of logrotate file, thanks to Jan Sievers + (closes: Bug#487079) + + -- Joey Schulze Thu, 19 Jun 2008 20:16:01 +0200 + +sendfile (2.1b.20080616-1) unstable; urgency=low + + * New upstream version 2.1b from 2008-06-16 + * Adjusted source URL + * Corrected receive(1) manpage + + -- Joey Schulze Thu, 19 Jun 2008 08:50:20 +0200 + +sendfile (2.1b.20080311-2) unstable; urgency=low + + * Fix NULL pointer dereference in src/sendfile.c by Ulf Fischer + (closes: Bug#485285) + + -- Joey Schulze Mon, 16 Jun 2008 11:41:30 +0200 + +sendfile (2.1b.20080311-1) unstable; urgency=low + + * New upstream version 2.1b from 2008-03-11 + * Added new homepage address + + -- Joey Schulze Sun, 15 Jun 2008 13:36:13 +0200 + +sendfile (2.1b-7) unstable; urgency=low + + * Updated lists and addresses + * Added missing dependency for readline + + -- Martin Schulze Thu, 03 Apr 2008 11:31:25 +0200 + +sendfile (2.1b-6) unstable; urgency=low + + * Remove $_Id_$ in configuration file (closes: Bug#437418) + * Added missing buffer termination (closes: Bug#143259) + * Added new report and cleanup script (closes: Bug#61924) + * Suggest for PGP to support encrypted transfers (closes: Bug#94633) + * Removed strip flag from LDFLAGS (closes: Bug#438013) + + -- Martin Schulze Fri, 17 Aug 2007 08:16:01 +0200 + +sendfile (2.1b-5) unstable; urgency=low + + * Untypo pussy(1) (closes: Bug#421255) + * Adjusted dependency to inet-superserver + + -- Martin Schulze Sun, 29 Jul 2007 19:38:10 +0200 + +sendfile (2.1b-4) unstable; urgency=low + + * Only execute update-inetd if the program exists (which is not required + at postrm stage) (closes: Bug#416753) + + -- Martin Schulze Sat, 31 Mar 2007 13:47:33 +0200 + +sendfile (2.1b-3.1) unstable; urgency=high + + * Non-maintainer upload. + * Remove extraneous commands from clean target; we do not need to duplicate + actions in clean that are already present in the .orig.tar.gz. This fixes + an FTBFS, since doc/NEWS now seems to be a pure copy of doc/LIESMICH.neu + and not a symlink, and the .diff.gz can't represent a file becoming a + symlink. (Closes: #411844) + + -- Steinar H. Gunderson Wed, 28 Feb 2007 17:59:15 +0100 + +sendfile (2.1b-3) unstable; urgency=low + + * Upstream: correct exit code now on error [src/sendmsg.c] + * Updated manpage to reflect reality [doc/sendmsg.1] + + -- Martin Schulze Sun, 26 Nov 2006 09:24:32 +0100 + +sendfile (2.1b-2) unstable; urgency=medium + + * Disabled /usr/doc links since the /usr/share/doc transition is + finished (closes: Bug#378648) + * Filesystem cleanup + * Imported new upstream version of receive(1) (closes: Bug#326606) + * Stop depending on netbase and depend on update-inetd instead (closes: + Bug#398553) + * Use proper path to interpreter for pussy (closes: Bug#394116) + * Added logrotate configuration (closes: Bug#148201) + * Added native csh init code configuration (closes: Bug#372088) + + -- Martin Schulze Fri, 17 Nov 2006 19:17:51 +0100 + +sendfile (2.1b-1) unstable; urgency=low + + * New upstream version 2.1b (closes: Bug#164184) + . Incorporates IPv6 support + . Proper quoting of spaces (closes; Bug#143259) + * Enabled IPv6 experimentally [src/globals.h] (closes: Bug#269749) + * Moved vorteile into doc/german + * Installed LIESMICH.spool into doc/german + + -- Martin Schulze Thu, 8 Jun 2006 07:23:58 +0200 + +sendfile (2.1-27) unstable; urgency=medium + + * Added a disclaimer for those people who plan to NMU this package + * Fixed typo in NMU-Disclaimer, thanks to Petter Reinholdtsen (See: + Bug#225895) + * Added missing boundary checks by Steve Kemp [src/sendfile.c, + src/sendmsg.c, src/receive.c] (closes: Bug#168110) + + -- Martin Schulze Tue, 30 May 2006 11:01:55 +0200 + +sendfile (2.1-26) unstable; urgency=low + + * Corrected calculation of free space, also sent upstream (closes: + Bug#98074) + + -- Martin Schulze Thu, 22 Nov 2001 23:48:40 +0100 + +sendfile (2.1-25) unstable; urgency=low + + * Added final newline to pussy(1) + * Synced with new upstream source (now called 2.1a with + revision=2001-02-16 upstream, we've had most of it already) + * Added SHELL=/bin/bash to allow convenient bashisms + * Added dependency to perl | perl5 since scripts make use of POSIX and + Getopt::Std + * Changed path to GPL for reference + * Added support for /usr/share/doc in postinst + * Removed superflous cruft in postrm + * Reorganized postrm + * Added support for DEB_BUILD_OPTIONS to rules + * Added support for DEB_BUILD_OPTIONS to makeconfig + * Moved manpages to /usr/share/doc (closes: Bug#91053) + * Moved other docs to /usr/share/doc/$(package) as well (closes: Bug#91651) + * Changed to Standards-Version 3.5.2.0 + * Many thanks to weasel for preparing a sane patch + * The security problems were fixed, but the BTS wasn't properly + mentioned (closes: Bug#76048, Bug#78603) + * One can send files with spaces included. This was possible with the + previous version as well, I have no clue where and how this feature + got lost agian. (close: Bug#64578) + * Strip long filenames so they actually fit on the screen and sending + them doesn't produce funny multiline status reports (closes: Bug#64817) + * Fixed call to file so it can cope with characters that need to be + escaped for shell processing (closes: Bug#65912) + * Removed bashism from /etc/cron.weekly/sendfile (closes: Bug#67069) + * Added better testing for directories in /etc/cron.weekly/sendfile + (closes: Bug#67069) + * Added sfconf program and included a rudimentary manpage (closes: Bug#78578) + + -- Martin Schulze Sat, 21 Apr 2001 14:28:51 +0200 + +sendfile (2.1-24) unstable; urgency=high + + * Backported security fix from framstag and Colin Phipps (see Bug#76048) + - rfopen() for opening files + - fgetl() as fgets() replacement + - Some code cleaning + * Added support for opening temporary files in a secure manner with + O_CREAT [rfopen()] + * Corrected source URL + * Spaces in filenames are accepted again + * This upload is made to get this security fix reported. A new version + will be uploaded soon which fixes other problems and uses new upstream + source. + + -- Martin Schulze Thu, 19 Apr 2001 20:28:58 +0200 + +sendfile (2.1-23) unstable; urgency=low, closes=62931 + + * Added pussy(1) manpage (closes: Bug#62931) + + -- Martin Schulze Mon, 24 Apr 2000 12:18:40 +0200 + +sendfile (2.1-22) unstable; urgency=low + + * Corrected detection of full spool dir (closes: Bug#61423) + * Corrected documentation of spool directory (closes: Bug#61423) + + -- Martin Schulze Sat, 22 Apr 2000 18:28:43 +0200 + +sendfile (2.1-21) unstable; urgency=low, closes=55713 25033 + + * Synced with upstream revision 2000-01-02 + * Improved manpage receive.1 (closes: Bug#55713) + * Provided check-sendfile for csh as well (closes: Bug#25033) + + -- Martin Schulze Fri, 3 Mar 2000 20:40:00 +0100 + +sendfile (2.1-20) unstable; urgency=low, closes=53928 + + * Corrected perl path for pussy (closes: Bug#53928) + + -- Martin Schulze Mon, 3 Jan 2000 15:21:40 +0100 + +sendfile (2.1-19) unstable; urgency=low + + * Removed debug output + + -- Martin Schulze Mon, 3 Jan 2000 13:43:37 +0100 + +sendfile (2.1-18) unstable; urgency=low, closes=53817 52515 + + * Corrected date routine, removes y2k bug, thanks to Abdallah Chatila + (closes: Bug#53817) + * Corrected use of /etc/sendfile.deny (closes: Bug#52515) + * Installed new version of pussy, self-explanatory + + -- Martin Schulze Sun, 2 Jan 2000 16:51:34 +0100 + +sendfile (2.1-17) unstable; urgency=low, closes=48776 + + * Added missing "fi" (closes: Bug#48776) + + -- Martin Schulze Sun, 31 Oct 1999 23:40:17 +0100 + +sendfile (2.1-16) unstable; urgency=low, closes=41683 47163 47164 + + * Added exit statement to cron script (closes: Bug#41683) + * Added removal block for user logfiles + * Corrected path to sendfile.{deny,allow} (closes: Bug#47163) + * Removal will now remove the entry from inetd.conf (closes: Bug#47164) + + -- Martin Schulze Fri, 29 Oct 1999 01:38:40 +0200 + +sendfile (2.1-15) unstable; urgency=low + + * Corrected last patch and free() memory properly. + + -- Martin Schulze Sat, 3 Jul 1999 02:27:15 +0200 + +sendfile (2.1-14) unstable; urgency=low + + * Fixed another bug that prevented us from sending directories + containing spaces + + -- Martin Schulze Thu, 1 Jul 1999 12:36:39 +0200 + +sendfile (2.1-13) unstable; urgency=low + + * Fixed bug that strips filenames at the first space + + -- Martin Schulze Thu, 24 Jun 1999 09:06:31 +0200 + +sendfile (2.1-12) unstable; urgency=low, closes=34903 35760 + + * glibc 2.1 fix by Espy (closes: Bug#34903) + * Added some more tweaking with makeconfig to comply with our directory + structure (closes: Bug#35760) + * Addded /var/spool/sendfile/OUTGOING with proper mode + + -- Martin Schulze Sun, 23 May 1999 09:48:01 +0200 + +sendfile (2.1-11) unstable; urgency=low, closes=33475 33480 34220 + + * Updated to upstream revision 19990215 + * Removed pussy (Perl User SAFT Server Yin) from package (Bug#33475, + Bug#33480, Bug#34220) + * Test for script before executing /usr/bin/check-sendfile + * Remove call to /usr/bin/check-sendfile by removal and purge + + -- Martin Schulze Sat, 13 Mar 1999 11:35:04 +0100 + +sendfile (2.1-10) unstable; urgency=low, closes=32518 + + * Corrected config dir to /etc/ (closes: Bug#32518) + + -- Martin Schulze Thu, 28 Jan 1999 20:42:42 +0100 + +sendfile (2.1-9) unstable; urgency=low + + * Updated to upstream version 19980712 + * Standards version 2.4.0.1 + * Updated sendmail.cf + + -- Martin Schulze Tue, 26 Jan 1999 22:32:43 +0100 + +sendfile (2.1-8) frozen unstable; urgency=low, closes=30165 + + * Removed prototyping of strdup(), glibc 2.1 fix + + -- Martin Schulze Tue, 12 Jan 1999 00:10:49 +0100 + +sendfile (2.1-7) unstable; urgency=low, closes=24812 + + * Added newline into postinst (-> /etc/profile) (closes: Bug#24812) + + -- Martin Schulze Tue, 21 Jul 1998 02:52:12 +0200 + +sendfile (2.1-6) frozen; urgency=medium, closes=21339 21367 + + * Re-compiled with correct sendfile.cf location (closes: Bug#21367) + * Corrected manpages to reflect /etc as configuration directory + * Still this upload only goes into frozen, unstable will be updated to + the current release soon. + + -- Martin Schulze Sat, 18 Apr 1998 23:55:25 +0200 + +sendfile (2.1-5) frozen; urgency=low, closes=21339 + + * Corrected clean target to behave correctly when links are present + (closes: Bug#21339) + * Upload goes only into frozen, unstable will be updated to the current + release soon. + + -- Martin Schulze Sat, 18 Apr 1998 19:59:50 +0200 + +sendfile (2.1-4) unstable; urgency=low, closes=20874 + + * Compiled with modified deb, no files are owned by gid users anymore + (closes: Bug#20874) + + -- Martin Schulze Sat, 11 Apr 1998 05:05:24 +0200 + +sendfile (2.1-3) unstable; urgency=low + + * Renamed wlock(8) to wlock(1) as request from sendfile author + * Addition for utf7encode(1) from the author + + -- Martin Schulze Fri, 20 Mar 1998 00:17:48 +0100 + +sendfile (2.1-2) unstable; urgency=low + + * Modified Makefile to set links correct as cvs doesn't handle them + right. + * Added manpage for wlock(8) and utf7encode(1) (lintian) + + -- Martin Schulze Thu, 19 Mar 1998 11:05:47 +0100 + +sendfile (2.1-1) unstable; urgency=low + + * New upstream version + * New Standards-Version 2.4.0.0 + * Added fetchfile and wlock binaries + * Added check-sendfile(1) manpage (lintian) + + -- Martin Schulze Wed, 11 Feb 1998 03:35:06 +0100 + +sendfile (1.6-3) unstable; urgency=low, closes=16763 + + * Corrected Standards-Version to 2.3.0.1 (Bug#16763) + + -- Martin Schulze Fri, 9 Jan 1998 02:18:22 +0100 + +sendfile (1.6-2) unstable; urgency=low + + * Compiled against libc6 + * Flagged cron script executable (Bug#12870) + + -- Martin Schulze Wed, 31 Dec 1997 22:19:58 +0100 + +sendfile (1.6-1) unstable; urgency=low + + * Changed Maintainer address to *@debian.org + * Modified manpages to get them man(7) conforming. + * Added new documentation to the package. + + -- Martin Schulze Tue, 17 Jun 1997 23:29:23 +0200 + +sendfile (1.5-3) unstable; urgency=low + + * Converted into new packaging scheme + + -- Martin Schulze Sun, 23 Feb 1997 12:23:17 +0100 + +Sun Dec 22 11:47:54 1996 Martin Schulze + + * debian.rules: Installed ChangeLog's + +Thu Oct 24 09:26:32 1996 Martin Schulze + + * Corrected domain detection routine. utsname.domainname doesn't + return the local domain, instead gethostbyname is called. + +Wed Oct 23 23:11:25 1996 Martin Schulze + + * debian.cron: Rotate user logfiles in /var/spool/sendfile as well + as system wide ones + +Mon Oct 21 23:30:16 1996 Martin Schulze + + * Added Debian packaging information + + * Corrected some manpages + --- sendfile-2.1b.20080616.orig/debian/check-sendfile.1 +++ sendfile-2.1b.20080616/debian/check-sendfile.1 @@ -0,0 +1,45 @@ +.\" check-sendfie - Check if some files have arrived +.\" Copyright (c) 1995-8 Martin Schulze +.\" +.\" 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; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" 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.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +.\" +.TH CHECK-SENDFILE 1 "11 Feb 1998" "Debian GNU/Linux" "Commands" +.SH NAME +check-sendfile \- Check if some files have arrived +.SH SYNOPSIS +.B check-sendfile + +.SH DESCRIPTION +The +.B check-sendfile +command tests if there are files hosed in the user's sendfile spool +area. If so he will be informed about the files. + +This command should be started from /etc/profile to give all users a +chance to notices that some files have arrived in their absence. As +the defauld behaviour of sendfiled is to write a note on the user's +tty he won't notice receiption if he's not logged in. The lack of +need to be logged in is one of +.BR sendfile 's +advantages. + +.SH FILES + +.TP +.I /var/spool/sendfile/$user +Spool area for the specifig user. + +.SH "SEE ALSO" +.BR sendfile (1). --- sendfile-2.1b.20080616.orig/debian/conffiles +++ sendfile-2.1b.20080616/debian/conffiles @@ -0,0 +1,6 @@ +/etc/sendfile.cf +/etc/sendfile.deny +/etc/logrotate.d/sendfile +/etc/csh/login.d/sendfile +/etc/cron.weekly/sendfile +/etc/profile.d/sendfile --- sendfile-2.1b.20080616.orig/debian/control +++ sendfile-2.1b.20080616/debian/control @@ -0,0 +1,28 @@ +Source: sendfile +Section: net +Priority: optional +Maintainer: Martin Schulze +Build-Depends: libreadline-dev, autotools-dev +Standards-Version: 3.5.2.0 + +Package: sendfile +Section: net +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, openbsd-inetd | inet-superserver, perl | perl5, update-inetd, libdpkg-perl +Suggests: pgp-i +Description: Simple Asynchronous File Transfer + Sendfile is an asynchronous file transfer service for the Internet, + like the sendfile facility in Bitnet: Any user A can send files to + another user B without B being active in any way. + . + The existing standard file transfer (ftp) is a synchronous service: + The user must have access to an account on the sending and on the + receiving site, too. + . + Sendfile for Unix, which is an implementation of the SAFT protocol + (Simple Asynchronous File Transfer) now offers you a true + asynchronous file transfer service for the Internet. Virtually any + form of file can be sent, including encrypted ones. The SAFT + protocol will be submitted as an RFC in the near future. +Homepage: http://fex.rus.uni-stuttgart.de/saft/ --- sendfile-2.1b.20080616.orig/debian/copyright +++ sendfile-2.1b.20080616/debian/copyright @@ -0,0 +1,34 @@ +This is the Debian GNU/Linux prepackaged version of sendfile - an +implementation of the SAFT (Simple Asynchronous File Transfer) +protocol for Unix. + +This package was put together by Martin Schulze , +from sources obtained from: + + http://fex.rus.uni-stuttgart.de/download/sendfile-2.1b.tar.gz + +New SAFT homepage: + http://fex.rus.uni-stuttgart.de/saft/ + +Sendfile is put under the GNU General Public License and +Copyright (c) 1995,1996 Ulli Horlacher (framstag@rus.uni-stuttgart.de) + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. + +There is a mailing list covering the SAFT protocol and its sucessor +FEX. The lists address is saft@listserv.uni-stuttgart.de . + +To subscribe to this list, + + . go to + + . or send a mail to saft-request@listserv.uni-stuttgart.de with + the word "subscribe" as subject, or + +The list is archived publically. + +The source of the Debian package is managed through CVS. It is publically +available at or as +<:pserver:anonymous@cvs.infodrom.org/var/cvs/debian/sendfile/>. + --- sendfile-2.1b.20080616.orig/debian/csh +++ sendfile-2.1b.20080616/debian/csh @@ -0,0 +1,5 @@ +#! /bin/csh + +if (-e /usr/bin/check-sendfile) then + /usr/bin/check-sendfile +endif --- sendfile-2.1b.20080616.orig/debian/logrotate +++ sendfile-2.1b.20080616/debian/logrotate @@ -0,0 +1,12 @@ +# +# Logrotate fragment for sendfile +# +/var/spool/sendfile/*/log { + weekly + compress + delaycompress + rotate 7 + missingok + nocreate + sharedscripts +} --- sendfile-2.1b.20080616.orig/debian/nosendfile +++ sendfile-2.1b.20080616/debian/nosendfile @@ -0,0 +1,10 @@ +root +daemon +bin +news +ftp +uucp +anonymous +nobody +OUTGOING +LOG --- sendfile-2.1b.20080616.orig/debian/postinst +++ sendfile-2.1b.20080616/debian/postinst @@ -0,0 +1,55 @@ +#! /usr/bin/perl +# post install script for the Debian GNU/Linux sendfile package + +require DebianNet; +use Dpkg::Version; + +# Now modify the inetd.conf file + +open(INETD, "/etc/inetd.conf"); +@inetd=; +close(INETD); + +if (! grep(/.*sendfiled/, @inetd)) { + $newentry = 'saft stream tcp nowait root /usr/sbin/tcpd /usr/sbin/sendfiled'; + $DebianNet::sep = "## "; DebianNet::add_service($newentry, "OTHER"); +} +undef(@inetd); + +# cleanup edits from versions before 2.1b.20080616-5.2 +# this can be removed after wheezy +if (($ARGV[1] ne "") && + (version_compare($ARGV[1],"2.1b.20080616-5.2") < 0)) { + + # remove line added by old version of sendfile + my $profile = '/etc/profile'; + if (-e $profile) { + open(PROFILE, "$profile"); + @profile=; + close(PROFILE); + + open(PROFILE, ">$profile"); + printf PROFILE "%s", join ('', grep (!/^.*check-sendfile/, @profile)); + close (PROFILE); + } + + # delete /etc/services with only 1 line created by previous versions of + # sendfile + my $services = "/etc/services"; + if (-e $services) { + open(SERVICES, $services); + my @srv = ; + close(SERVICES); + my $srv = join('',@srv); + my $oldsrv = "saft 487/tcp # simple asynchronous file transfer\n"; + if ($srv eq $oldsrv) { + unlink $services; + } + } +} + +if ($ARGV[0] eq 'configure') { + if (defined $ARGV[1] && $ARGV[1] =~ /2\.1b(-[67]|\.20080311-|\.20080616-1)/) { + system "chmod 644 /etc/logrotate.d/sendfile"; + } +} --- sendfile-2.1b.20080616.orig/debian/postrm +++ sendfile-2.1b.20080616/debian/postrm @@ -0,0 +1,26 @@ +#! /bin/sh +# post removal script for the Debian GNU/Linux sendfile package + +set -e + +if [ "$1" = "purge" ] +then + rm -rf /var/log/sendfile >/dev/null + + if [ -d /var/spool/sendfile ] + then + cd /var/spool/sendfile + + if [ -n "`ls`" ]; then + for u in *; do + for num in 7 6 5 4 3 2 1; do + if [ -f $u/log.$num ]; then rm -f $u/log.$num; fi + done + done + fi + cd / + rm -rf /var/spool/sendfile >/dev/null + fi +fi + +test ! -x update-inetd || update-inetd --remove saft --- sendfile-2.1b.20080616.orig/debian/preinst +++ sendfile-2.1b.20080616/debian/preinst @@ -0,0 +1,12 @@ +#!/bin/sh + +# /etc/cron.weekly/sendfile was marked as a conffile in 2.1b.20080616-2.1. +# dpkg will warn about local changes even if there aren't any, so if it's +# unmodified then we remove it. (Bug #606777) + +if [ -f /etc/cron.weekly/sendfile ]; then + MD5="`md5sum /etc/cron.weekly/sendfile | sed -e 's/ .*//'`" + if dpkg --compare-versions "$2" lt "2.1b.20080616-2.1" && [ "${MD5}" = "fe757d596df419aaec4495a9645be94d" ]; then + rm /etc/cron.weekly/sendfile + fi +fi --- sendfile-2.1b.20080616.orig/debian/prerm +++ sendfile-2.1b.20080616/debian/prerm @@ -0,0 +1,8 @@ +#! /bin/bash +# pre removal script for the Debian GNU/Linux sendfile package + +set -e + +if [ "$1" = "remove" -o "$1" = "purge" ]; then + update-inetd --pattern sendfiled --disable saft +fi --- sendfile-2.1b.20080616.orig/debian/profile.d +++ sendfile-2.1b.20080616/debian/profile.d @@ -0,0 +1 @@ +test -x /usr/bin/check-sendfile && /usr/bin/check-sendfile --- sendfile-2.1b.20080616.orig/debian/pussy.1 +++ sendfile-2.1b.20080616/debian/pussy.1 @@ -0,0 +1,52 @@ +.\" Copyright (c) 2000,1 Martin Schulze +.\" +.\" 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; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +.\" +.TH PUSSY 1 "24 April 2000" "" "Linux System Administration" +.SH NAME +pussy \- Perl User SAFT Server Yin +.SH SYNOPSIS +.B pussy +.RB [ " -I " ] +.RB [ " -p " +.IR "port " ] +.RB [ " -v " ] +.RB [ " -x " ] + +.SH DESCRIPTION +.B pussy +is for users which can not install the regular SAFT server +.BR sendfiled (8) +on port 487 for which reasons ever. You do not need root privileges. + +.SH OPTIONS +.TP +.B "-I" +Print instructions. +.TP +.B "-v" +Be verbose. +.TP +.BI "-p " port +Use +.I port +to bind to. +.TP +.B "-x" +Do not write the SAFT port to +.IR $HOME/.plan . + +.SH "SEE ALSO" +.BR sendfiled (8). --- sendfile-2.1b.20080616.orig/debian/rules +++ sendfile-2.1b.20080616/debian/rules @@ -0,0 +1,148 @@ +#! /usr/bin/make -f + +# Copyright 1994-97 joey@infodrom.north.de (Martin Schulze) +# +# 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., 675 Mass Ave., Cambridge, MA 02139, USA. + +SHELL=/bin/bash + +# The name and version of the source +# +source = $(shell grep "^Source: " debian/control|head -1|sed 's/Source: \(.*\)/\1/g') +package = $(shell grep "^Package: " debian/control|head -1|sed 's/Package: \(.*\)/\1/g') +version = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*(\(.*\)\-[^\-]*).*/\1/g') +revision = $(shell grep "^$(source) " debian/changelog|head -1 |sed 's/.*([^\-]*\-\(.*\)).*/\1/g') + +installbin = install -g root -o root -m 755 +installdoc = install -g root -o root -m 644 + +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +STRIP = -s +endif + +build: + cp -f /usr/share/misc/config.sub develop/ + cp -f /usr/share/misc/config.guess develop/ + test -f develop/config.cache || ./makeconfig CONFIG=/etc BINDIR=/usr/bin MANDIR=/usr/share/man SERVERDIR=/usr/bin + perl -i -pe 's/undef\s+ENABLE_MULTIPROTOCOL/define ENABLE_MULTIPROTOCOL/' src/globals.h + $(MAKE) all + touch stamp-build + +clean: debclean + rm -rf stamp-build + $(MAKE) clean + +debclean: +# Cleans debian binary directories to allow binary creation + rm -rf debian/tmp + rm -f debian/{files,substvars} + +binary-indep: +# Nothing to be done here + +binary-arch: debclean + test -f stamp-build || $(MAKE) -f debian/rules build + $(installbin) -d debian/tmp/DEBIAN + chown -R root.root debian/tmp + chmod -R g-ws debian/tmp + $(installbin) debian/{preinst,prerm,postinst,postrm} debian/tmp/DEBIAN + $(installdoc) debian/conffiles debian/tmp/DEBIAN + # + $(installbin) -d debian/tmp/usr/share/doc/$(package){,/german} + $(installdoc) debian/changelog debian/tmp/usr/share/doc/$(package)/changelog.Debian + $(installdoc) debian/copyright debian/tmp/usr/share/doc/$(package) + printf "Authors:\n\n" >> debian/tmp/usr/share/doc/$(package)/copyright + iconv -f latin1 -t utf8 doc/AUTHORS >> debian/tmp/usr/share/doc/$(package)/copyright + echo >> debian/tmp/usr/share/doc/$(package)/copyright + iconv -f latin1 -t utf8 doc/THANKS >> debian/tmp/usr/share/doc/$(package)/copyright + $(installdoc) doc/README{,.too,.fetchfile} debian/tmp/usr/share/doc/$(package) + $(installdoc) doc/ChangeLog debian/tmp/usr/share/doc/$(package)/changelog + $(installdoc) doc/features debian/tmp/usr/share/doc/$(package)/ + gzip -9f debian/tmp/usr/share/doc/$(package)/{changelog.Debian,changelog,README{,.too,.fetchfile},features} + $(installdoc) doc/LIESMICH{,.auch,.neu,.entwickler,.spool} debian/tmp/usr/share/doc/$(package)/german + $(installdoc) doc/doc.txt debian/tmp/usr/share/doc/$(package) + $(installdoc) doc/{doku.txt,vorteile} debian/tmp/usr/share/doc/$(package)/german + gzip -9f debian/tmp/usr/share/doc/$(package)/german/LIESMICH{,.auch,.neu,.entwickler} + gzip -9f debian/tmp/usr/share/doc/$(package)/doc.txt + gzip -9f debian/tmp/usr/share/doc/$(package)/german/{doku.txt,vorteile} + # + $(installbin) -d debian/tmp/usr/bin + $(installbin) $(STRIP) src/{sendfile,receive,sendmsg,utf7encode,fetchfile,wlock} debian/tmp/usr/bin + $(installbin) etc/check_sendfile debian/tmp/usr/bin/check-sendfile + cd debian/tmp/usr/bin && ln -sf utf7encode utf7decode + $(installbin) -d debian/tmp/usr/sbin + $(installbin) $(STRIP) src/sendfiled debian/tmp/usr/sbin + $(installbin) src/pussy debian/tmp/usr/bin + $(installbin) etc/sfconf debian/tmp/usr/bin + # + $(installbin) -d debian/tmp/usr/share/man/man{1,7,8} + $(installdoc) doc/{sendfile,sendmsg,receive,fetchfile}.1 debian/tmp/usr/share/man/man1 + $(installdoc) debian/pussy.1 debian/tmp/usr/share/man/man1 + $(installdoc) debian/sfconf.1 debian/tmp/usr/share/man/man1 + $(installdoc) debian/check-sendfile.1 debian/tmp/usr/share/man/man1 + $(installdoc) doc/utf7encode.1 debian/tmp/usr/share/man/man1 + $(installdoc) doc/wlock.1 debian/tmp/usr/share/man/man1 + $(installdoc) doc/sendfiled.8 debian/tmp/usr/share/man/man8 + $(installdoc) doc/fetchfile.7 debian/tmp/usr/share/man/man7 + gzip -9f debian/tmp/usr/share/man/man?/* + cd debian/tmp/usr/share/man/man1 && ln -s utf7encode.1.gz utf7decode.1.gz + # + $(installbin) -d debian/tmp/etc/cron.weekly + $(installbin) debian/sf_cleanup debian/tmp/etc/cron.weekly/sendfile + # + $(installbin) -d debian/tmp/etc/profile.d + $(installdoc) debian/profile.d debian/tmp/etc/profile.d/sendfile + # + $(installbin) -d debian/tmp/etc/logrotate.d + $(installdoc) debian/logrotate debian/tmp/etc/logrotate.d/sendfile + # + $(installbin) -d debian/tmp/etc/csh/login.d + $(installbin) debian/csh debian/tmp/etc/csh/login.d/sendfile + # + $(installdoc) debian/sendfile.cf debian/tmp/etc + $(installdoc) debian/nosendfile debian/tmp/etc/sendfile.deny + # + $(installbin) -d debian/tmp/var/log/sendfile + $(installbin) -d debian/tmp/var/spool/sendfile + install -o root -g root -m 1777 -d debian/tmp/var/spool/sendfile/OUTGOING + # + dpkg-shlibdeps debian/tmp/usr/bin/{sendfile,receive,sendmsg,utf7encode,fetchfile,wlock} + dpkg-gencontrol -isp + dpkg --build debian/tmp .. + +binary: binary-indep binary-arch + +source diff: + @echo >&2 'source and diff are obsolete - use dpkg-source -b' or dsc; false + +dsc: + -test -d debian/tmp && $(MAKE) -f debian/rules clean + if [ ! -f ../$(source)_$(version).orig.tar.gz -a -f ../orig/$(source)_$(version).orig.tar.gz ]; \ + then \ + ln -s orig/$(source)_$(version).orig.tar.gz ../$(source)_$(version).orig.tar.gz; \ + touch /tmp/stamp-$(source)-link; \ + fi; \ + cd .. && dpkg-source -b $(source)-$(version) + if [ -f /tmp/stamp-$(source)-link ]; then \ + rm ../$(source)_$(version).orig.tar.gz /tmp/stamp-$(source)-link; \ + fi + +checkroot: + $(checkdir) + test root = "`whoami`" + +dist: binary dsc + +.PHONY: binary binary-arch binary-indep clean checkroot + --- sendfile-2.1b.20080616.orig/debian/sendfile.cf +++ sendfile-2.1b.20080616/debian/sendfile.cf @@ -0,0 +1,104 @@ +# sendfile.cf - sendfile(1) configuration file +# Please read the manpage to see more explanations. +# +# Text after a # is a comment and will be ignored. +# If your sendfile-spool is on a NFS volume, you have to +# distinguish between the NFS-clients and the NFS-server! + +## If your sendfile-spool is on a NFS volume, you have to distinguish between +## the NFS-clients and the NFS-server ! + +# accept only messages or files +# (NFS-clients must set "acceptonly = messages" !) +# acceptonly = messages + +# forward address to your generic SAFT-server (e.g. for NFS) +# saftserver = saft.banana.net + +### the following section is only relevant if you have a local sendfile spool +### ( = if the sendfile spool is not an a remote NFS volume) ### + +# you can set here your domain name if necessary +# domain = my.host.org + +# where shall new user configuration directories be created (SPOOL/HOME) +userconfig = SPOOL + +# allow automatic forwarding of files by the local user (on/off) +forwarding = on + +# allow automatic postprocessing of files by the local user (on/off) +piping = on + +# allow remote sender to delete his files afterwards (on/off) +deleting = on + +# maximum allowed files to receive per user +# setting this option too high will slow down your machine! +maxfiles = 200 + +# minimum free disk space for your spool partition in MB +minfree = 5 + +# maximum total disk space usage for spool in MB +# (WARNING! Defining this option will sendfile slow down! Better use minfree) +# maxspool = 100 + +# dontcompress is a list of file extension, which indicate that the +# correspondening file is not compressible. +dontcompress = .zip,.zoo,.arj,.z,.gz,.bz,.bz2,.tgz,.mp3,.gif,.jpg,.tif,.tiff,.png,.avi,.mpeg,.pgp,.deb + +# lanspeed defines what to your LAN belongs: if sending to hosts is faster +# than this value (KB/s), then files will not be compressed. If you set +# lanspeed = 0 then this feature will be disabled and every file which +# is not in the dontcompress list (see above) will be compressed. +lanspeed = 100 + +# notification by message, mail, both or none when a file arrives +notification = message + +# ring the gong when a message arrives (on/off) +bell = on + +# keep files in spool at least xx days, then delete them (0=infinity) +keep = 0 + +# delete aborted or corrupted spool files after xx days (0=never) +deljunk = 10 + +# global logging of file transfer (in/out/both/none) +log = in + +# packet size to send/receive in one chunk +# if you are on a fast and reliable network, set this option to 1024 or 4096 +packet = 512 + +# logging of incoming messages in the user log file (on/off) +msglog = off + +# allow O-SAFT fetchfile extension (on/off) +fetchfile = on + +# internal environment variable PATH for sendfiled +PATH = /usr/local/bin:/bin:/usr/bin:/opt/bin + +# where is the pgp program? (used for O-SAFT/fetchfile) +# optional, if pgp is found in the PATH variable above +# pgp = /usr/local/bin/pgp + +# enforce secure incoming file transfer with pgp (sign/encrypt/both/none) +forcepgp = none + +# allow spooling of outgoing files (on/nostart/off) +# (nostart means a client is not allowed to start the spool daemon) +spooling = on + +# allow parallel sending of spooled files = multiple daemons (on/off) +parallel = on + +# bounce files from outgoing spool back to the local user after xx days +# (when remote host is unreachable) +bounce = 5 + +# retry delivering of files from outgoing spool after xx minutes +retry = 10 --- sendfile-2.1b.20080616.orig/debian/sf_cleanup +++ sendfile-2.1b.20080616/debian/sf_cleanup @@ -0,0 +1,88 @@ +#!/bin/bash + +# deletes old or corrupted files in sendfile incoming spool +# directories which are expired +# see /etc/sendfile.cf for settings + +test -f /etc/sendfile.cf || exit 0 +test -x /usr/bin/sendfile || exit 0 +spooldir=$(sendfile -qW=spool) +cd $spooldir || exit 0 +export LANG=C + +maxage=$(grep '^deljunk' /etc/sendfile.cf) +test -n "$maxage" || exit 0 +maxage=${maxage##*=} +maxage=${maxage/ /} +maxage=${maxage/ /} + +pivot=$spooldir/pivot +touch -d now-${maxage}days $pivot +touch -d now-1day $pivot.yesterday + +tmp=$(tempfile) + +trap "rm -f $tmp $pivot $pivot.yesterday" INT EXIT + +for i in * +do + if [ -z "$(getent passwd "$i")" ] + then + continue + fi + + echo -n > $tmp + if [ -d "$i" ] + then + ( + cd "$i" + for f in $(find -maxdepth 1 -name '*.h') + do + b=${f#./} + b=${b%.h} + + FILE= + SIZE= + while read line + do + case $line in + FILE*) FILE=${line#FILE } + ;; + SIZE*) SIZE=${line#SIZE } + SIZE=${SIZE#* } + ;; + esac + done < $f + size=$(stat $b.d|grep Size) + size=${size#*Size: } + size=${size%% *} + + if [ $SIZE -gt $size ] + then + if [ $b.d -ot $pivot ] + then + logger -i -p daemon.info -t sendfile "sf_cleanup: Expired partial file $b for user $i" + rm -f ${b}.{dh} + else + if [ $b.d -ot $pivot.yesterday ] + then + echo "Partial file $b will expire after $maxage days" >> $tmp + fi + fi + fi + done + ) + if [ -s $tmp ] + then + ( + echo "Subject: Weekly SAFT Report" + echo "From: SAFT Server " + echo + echo "The following incompletely received files have been found in the SAFT" + echo "spool directory $spooldir:" + echo + cat $tmp + ) | /usr/sbin/sendmail $i + fi + fi +done --- sendfile-2.1b.20080616.orig/debian/sfconf.1 +++ sendfile-2.1b.20080616/debian/sfconf.1 @@ -0,0 +1,31 @@ +.\" Copyright (c) 2001 Martin Schulze +.\" +.\" 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; either version 2 of the License, or +.\" (at your option) any later version. +.\" +.\" 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. +.\" +.TH SFCONF 1 "24 April 2000" "" "Linux System Administration" +.SH NAME +sfconf \- sendfile user configuration helper +.SH SYNOPSIS +.B sfconf +.B option +.B argument + +.SH DESCRIPTION +Please call +.B sfconf +without arguments and read the help screen. + +.SH "SEE ALSO" +.BR sendfile (1). --- sendfile-2.1b.20080616.orig/develop/config.guess +++ sendfile-2.1b.20080616/develop/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2005-05-27' +timestamp='2009-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -55,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -106,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -125,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -160,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -168,7 +170,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -199,50 +201,18 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd${UNAME_RELEASE} exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} @@ -354,14 +324,30 @@ case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -562,7 +548,7 @@ echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[45]) + *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -658,8 +644,7 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + eval $set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -671,7 +656,7 @@ # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -800,12 +785,19 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; - i*:MINGW*:*) + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; i*:windows32*:*) @@ -815,12 +807,24 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd | genuineintel) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we @@ -830,7 +834,7 @@ i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:*) + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) @@ -851,6 +855,16 @@ echo ${UNAME_MACHINE}-pc-minix exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) @@ -871,44 +885,32 @@ m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; - mips:Linux:*:*) + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips - #undef mipsel + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit ;; @@ -925,10 +927,13 @@ EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -952,9 +957,15 @@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -970,17 +981,6 @@ elf32-i386) TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -997,7 +997,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -1007,7 +1007,11 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1042,7 +1046,7 @@ i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit ;; i*86:*DOS:*:*) @@ -1086,8 +1090,11 @@ pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. - echo i386-pc-msdosdjgpp + # the processor, so we play safe by assuming i586. + # Note: whatever this is, it MUST be the same as what config.sub + # prints for the "djgpp" host, or else GDB configury will decide that + # this is a cross-build. + echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 @@ -1125,6 +1132,16 @@ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit ;; @@ -1137,7 +1154,7 @@ rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} exit ;; SM[BE]S:UNIX_SV:*:*) @@ -1200,6 +1217,9 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1209,6 +1229,15 @@ SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} exit ;; @@ -1218,7 +1247,6 @@ *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1297,6 +1325,12 @@ i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1457,9 +1491,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- sendfile-2.1b.20080616.orig/develop/config.status +++ sendfile-2.1b.20080616/develop/config.status @@ -652,7 +652,7 @@ s,^\([ #]*\)[^ ]*\([ ]*PACKAGE_BUGREPORT\)[ (].*,\1define\2 "" , s,^\([ #]*\)[^ ]*\([ ]*PACKAGE\)[ (].*,\1define\2 "sendfile" , s,^\([ #]*\)[^ ]*\([ ]*VERSION\)[ (].*,\1define\2 "2.1b" , -s,^\([ #]*\)[^ ]*\([ ]*REVISION\)[ (].*,\1define\2 "20080616" , +s,^\([ #]*\)[^ ]*\([ ]*REVISION\)[ (].*,\1define\2 "20080311" , s,^\([ #]*\)[^ ]*\([ ]*HAVE_DIRENT_H\)[ (].*,\1define\2 1 , s,^\([ #]*\)[^ ]*\([ ]*STDC_HEADERS\)[ (].*,\1define\2 1 , s,^\([ #]*\)[^ ]*\([ ]*HAVE_SYS_WAIT_H\)[ (].*,\1define\2 1 , --- sendfile-2.1b.20080616.orig/develop/config.sub +++ sendfile-2.1b.20080616/develop/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +# Free Software Foundation, Inc. -timestamp='2005-05-12' +timestamp='2009-06-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -71,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -119,8 +120,10 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -150,6 +153,9 @@ os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -171,6 +177,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +197,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -231,23 +245,28 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -256,22 +275,26 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; m6811 | m68hc11 | m6812 | m68hc12) @@ -281,6 +304,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -300,28 +326,32 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ + | avr-* | avr32-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -330,27 +360,33 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -414,6 +450,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -422,10 +462,26 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -454,8 +510,8 @@ basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -493,6 +549,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -647,6 +707,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -662,6 +730,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -687,6 +759,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -762,9 +837,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -786,6 +860,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -795,6 +877,12 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -851,6 +939,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -877,6 +969,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -888,6 +984,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; sh64) basic_machine=sh64-unknown ;; @@ -977,6 +1076,10 @@ basic_machine=tic6x-unknown os=-coff ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -1052,6 +1155,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1090,13 +1197,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1163,26 +1267,30 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1200,7 +1308,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1312,6 +1420,9 @@ -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) @@ -1334,6 +1445,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1343,9 +1460,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1371,6 +1488,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1389,6 +1509,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1497,7 +1620,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) --- sendfile-2.1b.20080616.orig/develop/configure +++ sendfile-2.1b.20080616/develop/configure @@ -1719,7 +1719,7 @@ _ACEOF -REVISION=20080616 +REVISION=20080311 cat >>confdefs.h <<_ACEOF #define REVISION "$REVISION" --- sendfile-2.1b.20080616.orig/develop/configure.in +++ sendfile-2.1b.20080616/develop/configure.in @@ -11,7 +11,7 @@ AC_SUBST(VERSION) AC_DEFINE_UNQUOTED(VERSION, "$VERSION") -REVISION=20080616 +REVISION=20080311 AC_SUBST(REVISION) AC_DEFINE_UNQUOTED(REVISION, "$REVISION") --- sendfile-2.1b.20080616.orig/develop/makefile.src +++ sendfile-2.1b.20080616/develop/makefile.src @@ -7,6 +7,7 @@ LINK=!LINK LDFLAGS=!LDFLAGS LIBS=!LIBS +LIBS_PROMPT= -lreadline PROJECT= sendfile sendmsg receive sendfiled utf7encode fetchfile wlock @@ -36,13 +37,13 @@ $(LINK) $(LDFLAGS) $(SENDFILE_OBJ) -o sendfile $(LIBS) fetchfile: $(FETCHFILE_OBJ) - $(LINK) $(LDFLAGS) $(FETCHFILE_OBJ) -o fetchfile $(LIBS) + $(LINK) $(LDFLAGS) $(FETCHFILE_OBJ) -o fetchfile $(LIBS) $(LIBS_PROMPT) sendmsg: $(SENDMSG_OBJ) - $(LINK) $(LDFLAGS) $(SENDMSG_OBJ) -o sendmsg $(LIBS) + $(LINK) $(LDFLAGS) $(SENDMSG_OBJ) -o sendmsg $(LIBS) $(LIBS_PROMPT) receive: $(RECEIVE_OBJ) - $(LINK) $(LDFLAGS) $(RECEIVE_OBJ) -o receive $(LIBS) + $(LINK) $(LDFLAGS) $(RECEIVE_OBJ) -o receive $(LIBS) $(LIBS_PROMPT) sendfiled: $(SENDFILED_OBJ) $(LINK) $(LDFLAGS) $(SENDFILED_OBJ) -o sendfiled $(LIBS) --- sendfile-2.1b.20080616.orig/doc/receive.1 +++ sendfile-2.1b.20080616/doc/receive.1 @@ -186,7 +186,7 @@ .I /var/spool/sendfile/$USER/log A log of the last transfers. .TP -.I /usr/local/etc/sendfile.deny +.I /etc/sendfile.deny Users which are not allowed to receive files or messages (set by root). .SH SEE ALSO --- sendfile-2.1b.20080616.orig/doc/sendfile.1 +++ sendfile-2.1b.20080616/doc/sendfile.1 @@ -201,7 +201,7 @@ .SH FILES .TP 6 -.I /usr/local/etc/sendfile.deny +.I /etc/sendfile.deny Users which are not allowed to receive files or messages (set by root). .TP .I /var/spool/sendfile/$USER/config/config --- sendfile-2.1b.20080616.orig/doc/sendfiled.8 +++ sendfile-2.1b.20080616/doc/sendfiled.8 @@ -69,7 +69,7 @@ .PP On startup .B sendfiled -reads its configuration file /usr/local/etc/sendfile.cf, but you can +reads its configuration file /etc/sendfile.cf, but you can specify with .B \-c configfile an alternate configuration file. @@ -88,16 +88,16 @@ .SH FILES .TP 6 -.I /usr/local/etc/sendfile.deny +.I /etc/sendfile.deny Users which are not allowed to receive files or messages. .TP -.I /usr/local/etc/sendfile.allow +.I /etc/sendfile.allow Users which are ONLY allowed to receive files or messages. If this file has at least one entry, then -.I /usr/local/etc/sendfile.deny +.I /etc/sendfile.deny will be ignored. .TP -.I /usr/local/etc/sendfile.aliases +.I /etc/sendfile.aliases Alias names for local users. Format is: .ES alias realname @@ -109,7 +109,7 @@ .I /var/spool/sendfile/LOG/out Log file for outgoing files. .TP -.I /usr/local/etc/sendfile.cf +.I /etc/sendfile.cf The system configuration file. See .B sfdconf -i config for a complete description and default values. --- sendfile-2.1b.20080616.orig/doc/sendmsg.1 +++ sendfile-2.1b.20080616/doc/sendmsg.1 @@ -8,7 +8,10 @@ .SH SYNOPSIS .B sendmsg [ -.B \-46vfrmM +.B \-46vVfrmMl +] +[ +.B \-u 'from' ] [ .B \-s 'message' @@ -48,7 +51,10 @@ sendmsg will try to use the adresses in the order they are returned by the resolver. .TP .B -v -Verbose mode: show SAFT protocol messages +Verbose mode: show SAFT protocol messages. +.TP +.B -V +Show version information and exit. .TP .B -f Force sending of messages and ignore tty (re)settings. @@ -62,9 +68,21 @@ .B -M Allow receiving messages on other ttys. .TP +.B -l +Allow sending of multiline messages messages. +.TP .B -s 'message' Send directly -.B message +.BR message . +.TP +.B -u 'from' +Set sender to +.B from +instead of +.BR $LOGNAME . +.TP +.B -q +Quiet mode: print no transfer messages. .SH EXAMPLES .B sendmsg neg@linux.rus.uni-stuttgart.de @@ -74,7 +92,7 @@ .SH FILES .TP 6 -.I /usr/local/etc/sendfile.deny +.I /etc/sendfile.deny Users which are not allowed to receive files or messages (set by root). .TP .I /var/spool/sendfile/$LOGNAME/config/restrictions --- sendfile-2.1b.20080616.orig/etc/sf_cleanup +++ sendfile-2.1b.20080616/etc/sf_cleanup @@ -1,7 +1,7 @@ #!/bin/sh # deletes old or corrupted files in sendfile spool directories which are expired -# see /usr/local/etc/sendfile.cf for settings +# see /etc/sendfile.cf for settings cd `sendfile -qW=spool` || exit 1 --- sendfile-2.1b.20080616.orig/makeconfig +++ sendfile-2.1b.20080616/makeconfig @@ -11,8 +11,13 @@ # default compiling settings CC=gcc -CFLAGS=-O2 -LDFLAGS=-s +LDFLAGS= + +case $DEB_BUILD_OPTIONS in + *debug*) CFLAGS="-g";; + *) CFLAGS="-O2";; +esac + # default installation settings SPOOL=/var/spool/sendfile @@ -114,12 +119,15 @@ cd ../src echo now in `pwd` +if [ "$SYSTEM" != "LINUX" ] +then for i in nsl socket readline; do if grep -i "have_lib$i 1" config.h >/dev/null; then LIBS="$LIBS -l$i"; fi done case "$LIBS" in *readline*) LIBS="$LIBS -L/usr/lib/termcap -ltermcap";; esac +fi echo creating globals.h --- sendfile-2.1b.20080616.orig/src/net.c +++ sendfile-2.1b.20080616/src/net.c @@ -79,6 +79,10 @@ #include #include #include +#include +#include +#include +#include #include "string.h" /* extended string functions */ #include "message.h" /* information, warning and error messages */ @@ -685,6 +689,8 @@ extern int quiet, /* quiet mode flag */ packet_size; /* size of a packet in bytes */ + struct winsize wsize; + char *thisfile = NULL; msec=0; offset=0; @@ -777,6 +783,24 @@ message("",'I',tmp); } + if (!quiet) { + if (ioctl(fileno(stdout), TIOCGWINSZ, &wsize) != 0) + wsize.ws_col = 80; + if (strlen (fname)+40 <= wsize.ws_col) + thisfile = fname; + else { + if ((thisfile = (char *)malloc ( (wsize.ws_col-40) +1)) == NULL) { + snprintf(MAXS(tmp),"error allocating %d bytes",(wsize.ws_col-40) +1); + message("",'E',tmp); + } + memset (thisfile, 0, (wsize.ws_col-40) +1); + + strncpy (thisfile, fname, (wsize.ws_col-40-2) / 2); + strcat (thisfile, ".."); + strncat (thisfile, fname+(strlen (fname) - (wsize.ws_col-40-2) / 2), (wsize.ws_col-40-2) / 2); + } + } + /* get time normal */ #if defined(SOLARIS2) || defined(IRIX) #ifdef _SVID_GETTOD @@ -818,10 +842,15 @@ bytes+=packet_size; percent=(bytes+offset)*100.0/(size+offset); if (!quiet) { + + if (ioctl(fileno(stdout), TIOCGWINSZ, &wsize) != 0) + return (-1); + /* resizeterm(size.ws_row, size.ws_col); wrefresh(curscr); */ + sec2=time(0); if (sec2>sec1) { fprintf(stderr,"%s%s: %3d%% (%lld of %lld kB)\r", - tinfo,fname,percent, + tinfo,thisfile,percent, (bytes+offset-1)/1024+1,(size+offset-1)/1024+1); fflush(stderr); sec1=sec2; @@ -855,6 +884,9 @@ close(ffd); + if (thisfile && strlen (fname)+40 > wsize.ws_col) + free (thisfile); + if (quiet<2) { /* get time difference */ --- sendfile-2.1b.20080616.orig/src/pussy +++ sendfile-2.1b.20080616/src/pussy @@ -1,4 +1,4 @@ -#!/client/bin/perl -w +#! /usr/bin/perl -w # PUSSY - Perl User SAFT Server Yin --- sendfile-2.1b.20080616.orig/src/sendfile.c +++ sendfile-2.1b.20080616/src/sendfile.c @@ -855,7 +855,7 @@ if (quiet<2) message(prg,'I',"you may specify -W=config, -W=spool, or " "-W=userspool"); } - if (argc-optind<1) exit(0); + if (argc-optind<1) {cleanup();exit(0);} } /* check tmp files */