Adding upstream version 0.85.7.upstream/0.85.7

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 19 insertions, 6 deletions

diff --git a/man/sbuild.1.in b/man/sbuild.1.in
index 71a11cd..ec71399 100644
--- a/man/sbuild.1.in
+++ b/man/sbuild.1.in
@@ -54,6 +54,8 @@ sbuild \- build debian packages from source
 .RB [ \-\-source\-only\-changes ]
 .RB [ \-\-no\-source\-only\-changes ]
 .RB [ \-j \[or] \-\-jobs=\fIn\fP ]
+.RB [ \-\-enable\-network ]
+.RB [ \-\-no\-enable\-network ]
 .RB [ \-\-debbuildopt=\fIoption\fP ]
 .RB [ \-\-debbuildopts=\fIoptions\fP ]
 .RB [ \-\-dpkg\-source\-opt=\fIoptions\fP ]
@@ -99,7 +101,7 @@ sbuild \- build debian packages from source
 .RB [ \-\-setup\-hook=\fIhook-script\fP ]
 .RB [ \-\-build\-dep\-resolver=\fIresolver\fP ]
 .RB [ \-\-resolve\-alternatives \[or] \-\-no\-resolve\-alternatives ]
-.RB [ \-\-extra\-package=\fIpackage.deb\fP ]
+.RB [ \-\-extra\-package=\fIpackage.deb|directory\fP ]
 .RB [ \-\-extra\-repository=\fIspec\fP ]
 .RB [ \-\-extra\-repository\-key=\fIfile.asc\fP ]
 .RB [ \-\-build\-path=\fIstring\fP ]
@@ -387,6 +389,18 @@ This command line option appends the appropriate \fB\-j\fP option to the \fBDPKG
 .BR sbuild.conf (5)
 for more information.
 .TP
+.BR \-\-enable\-network
+Enable network access during build.  This command line option sets the
+\fBENABLE_NETWORK\fP configuration variable. See
+.BR sbuild.conf (5)
+for more information.
+.TP
+.BR \-\-no\-enable\-network
+Don't enable network access during build (only implemented for the unshare mode) (default).  This
+command line option sets the \fBENABLE_NETWORK\fP configuration variable. See
+.BR sbuild.conf (5)
+for more information.
+.TP
 .BR \-\-debbuildopt=\fIoption\fP
 Pass the specified option directly to dpkg\-buildpackage in addition to the
 options already passed by sbuild. This option can be passed multiple times
@@ -1239,11 +1253,10 @@ has the alias) \fI$distribution\-$arch\-sbuild\fP, \fI$distribution\-sbuild\fP,
 The used chroot name can be overridden using the \-c or \-\-chroot options.
 .TP
 .BR sudo
-This chroot mode is deprecated and only provided for backwards compatibility
-and testing purposes. It operates by plainly entering the chosen chroot
-directory using "sudo chroot". Thus, this backend also does not provide
-ephemeral chroots. The sudo chroot mode searches for a symlink or directory
-located at \fI/etc/sbuild/chroot/\fP or in the current directory, prefixed with
+It operates by plainly entering the chosen chroot directory using "sudo
+chroot". Thus, this backend also does not provide ephemeral chroots. The sudo
+chroot mode searches for a symlink or directory located at
+\fI/etc/sbuild/chroot/\fP or in the current directory, prefixed with
 \fIchroot\-\fP. The expected names are resolved in the same order as for the
 schroot chroot mode and can be overridden using the \-c or \-\-chroot options.
 .TP