From c49036bd458a2f6e577caeaf3df157b587b1ca6d Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Mon, 8 Jan 2007 14:48:30 +0000 Subject: [PATCH] Added patches/netrc.dpatch: Document the .netrc file support in the manpage. --- debian/control | 2 +- debian/patches/00list | 2 + debian/patches/netrc-doc.dpatch | 88 +++++++++++++++++++++++++++++++++ debian/rules | 6 ++- 4 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 debian/patches/00list create mode 100644 debian/patches/netrc-doc.dpatch diff --git a/debian/control b/debian/control index ef8b3f3..e16a4c5 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: cadaver Section: web Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon26-gnutls-dev +Build-Depends: debhelper (>= 5), libncurses5-dev, libxml2-dev | libxml-dev, libreadline5-dev, zlib1g-dev (>= 1:1.1.3), libneon26-gnutls-dev, dpatch Standards-Version: 3.7.2 Package: cadaver diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..39eb04c --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,2 @@ +netrc-doc.dpatch + diff --git a/debian/patches/netrc-doc.dpatch b/debian/patches/netrc-doc.dpatch new file mode 100644 index 0000000..0179ec3 --- /dev/null +++ b/debian/patches/netrc-doc.dpatch @@ -0,0 +1,88 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## netrc-doc.dpatch by Sebastian Harl +## +## DP: Document the .netrc file support. + +@DPATCH@ + +--- a/doc/cadaver.1 2007-01-08 15:32:18.000000000 +0100 ++++ b/doc/cadaver.1 2007-01-08 15:32:13.000000000 +0100 +@@ -14,6 +14,12 @@ + .BR smbclient (1). + A user familiar with these tools should be quite + comfortable with cadaver. ++ ++.B cadaver ++supports automatically logging in to servers requiring authentication via ++a .netrc file (similar to ++.BR ftp (1) ++- see section "THE .netrc FILE" below). + .SH OPTIONS + .IP "-e, --expect100" + Enable sending of `Expect: 100-continue' header. +@@ -93,6 +99,55 @@ + Logout of authentication session + .IP "help [command]" + Display help message ++.SH THE .netrc FILE ++The file ++.I ~/.netrc ++may be used to automatically login to a server requiring authentication. The ++following tokens (separated by spaces, tabs or newlines) may be used: ++ ++.B machine ++.I host ++.RS ++Identify a remote machine ++.I host ++which is compared with the hostname given on the command line or as an ++argument to the ++.B open ++command. ++Any subsequent tokens up to the end of file or the next ++.B machine ++or ++.B default ++token are associated with this entry. ++.RE ++ ++.B default ++.RS ++This is equivalent to the ++.B machine ++token but matches any hostname. Only one ++.B default ++token may be used and it must be after all ++.B machine ++tokens. ++.RE ++ ++.B login ++.I username ++.RS ++Specifies the username to use when logging in to the remote machine. ++.RE ++ ++.B password ++.I string ++.br ++.B passwd ++.I string ++.RS ++Specifies the password to use when logging in to the remote machine. ++.RE ++ ++Any other tokens (as described in ftp(1)) are ignored. + .SH EXAMPLES + .IP "cadaver http://dav.example.com/" + Connects to the server myserver.example.com, opening the root collection. +@@ -105,6 +160,9 @@ + .SH FILES + .IP "~/.cadaverrc" + Individual user settings that can override cadaver defaults. ++.IP "~/.netrc" ++Login and initialization information used by the auto-login process. See ++section "THE .netrc FILE" for details. + .SH AUTHOR + Joe Orton + .SH SEE ALSO diff --git a/debian/rules b/debian/rules index 1fdc8d0..bf9b99e 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,8 @@ else CFLAGS += -O2 endif +include /usr/share/dpatch/dpatch.make + $(BUILDDIR)/config.status: configure dh_testdir [ -e $(BUILDDIR) ] || mkdir $(BUILDDIR) @@ -31,7 +33,7 @@ $(BUILDDIR)/config.status: configure build: build-stamp -build-stamp: $(BUILDDIR)/config.status +build-stamp: $(BUILDDIR)/config.status patch dh_testdir dh_clean @@ -40,7 +42,7 @@ build-stamp: $(BUILDDIR)/config.status touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp -- 2.30.2