Attachment 178586 Details for Bug 206336 – freebsd-update and updated man pages v1

[patch] freebsd-update and updated man pages v1

PR_206336_freebsd-update_head.diff (text/plain), 3.03 KB, created by Olli Hauer on 2017-01-06 21:07:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2017-01-06 21:07:07 UTC

Size: 3.03 KB

patch

obsolete

>Index: head/etc/freebsd-update.conf
>===================================================================
>--- head/etc/freebsd-update.conf	(revision 311512)
>+++ head/etc/freebsd-update.conf	(working copy)
>@@ -11,6 +11,9 @@
> # performance.
> ServerName update.FreeBSD.org
> 
>+# Fetch files via the specified HTTP proxy:port.
>+#HttpProxy proxy.example.net:3128
>+
> # Components of the base system which should be kept updated.
> Components src world kernel
> 
>index: head/share/man/man5/freebsd-update.conf.5
>===================================================================
>--- head/share/man/man5/freebsd-update.conf.5	(revision 311512)
>+++ head/share/man/man5/freebsd-update.conf.5	(working copy)
>@@ -54,6 +54,8 @@
> .It Cm ServerName
> The single parameter following this keyword is the name of the
> server or server pool from which updates will be downloaded.
>+.It Cm HttpProxy
>+The single parameter following this keyword will be used as HTTP proxy.
> .It Cm Components
> The parameters following this keyword are the components or
> sub-components of
>Index: head/usr.sbin/freebsd-update/freebsd-update.8
>===================================================================
>--- head/usr.sbin/freebsd-update/freebsd-update.8	(revision 311512)
>+++ head/usr.sbin/freebsd-update/freebsd-update.8	(working copy)
>@@ -98,6 +98,8 @@
> .It Fl s Ar server
> Fetch files from the specified server or server pool.
> (default: read value from configuration file.)
>+.It Fl p Ar proxy
>+Fetch files via the specified HTTP proxy:port.
> .It Fl t Ar address
> Mail output of
> .Cm cron
>Index: head/usr.sbin/freebsd-update/freebsd-update.sh
>===================================================================
>--- head/usr.sbin/freebsd-update/freebsd-update.sh	(revision 311512)
>+++ head/usr.sbin/freebsd-update/freebsd-update.sh	(working copy)
>@@ -93,7 +93,8 @@
> CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
>     KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
>     BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
>-    IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES"
>+    IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES
>+    HTTPPROXY"
> 
> # Set all the configuration options to "".
> nullconfig () {
>@@ -269,6 +270,18 @@
> 	fi
> }
> 
>+# When fetching updates, we will use the HTTP proxy:port specified
>+# in freebsd-update.conf or on the command line
>+config_HttpProxy () {
>+	if [ -n "${HTTP_PROXY}${http_proxy}" ]; then
>+		echo "env proxy is set to \"${HTTP_PROXY}${http_proxy}\""
>+		return 0
>+	else [ -z ${HttpProxy} ]; then
>+		HTTP_PROXY=$1
>+		export HTTP_PROXY=$1
>+	fi
>+}
>+
> # When fetching upgrades, should we assume the user wants exactly the
> # components listed in COMPONENTS, rather than trying to guess based on
> # what's currently installed?
>@@ -457,6 +470,10 @@
> 			if [ $# -eq 1 ]; then usage; fi; shift
> 			config_ServerName $1 || usage
> 			;;
>+		-p)
>+			if [ $# -eq 1 ]; then usage; fi; shift
>+			config_HttpProxy $1 || usage
>+			;;
> 		-r)
> 			if [ $# -eq 1 ]; then usage; fi; shift
> 			config_TargetRelease $1 || usage

Actions: View | Diff

Attachments on bug 206336: 165716 | 178586