Attachment #178586 for bug #206336

Lines 11-16 Link Here

(-)head/etc/freebsd-update.conf (+3 lines)
11	# performance.	11	# performance.
12	ServerName update.FreeBSD.org	12	ServerName update.FreeBSD.org
13		13
		14	# Fetch files via the specified HTTP proxy:port.
		15	#HttpProxy proxy.example.net:3128
		16
14	# Components of the base system which should be kept updated.	17	# Components of the base system which should be kept updated.
15	Components src world kernel	18	Components src world kernel
16		19

Lines 54-59 Link Here

(-)head/share/man/man5/freebsd-update.conf.5 (+2 lines)
54	.It Cm ServerName	54	.It Cm ServerName
55	The single parameter following this keyword is the name of the	55	The single parameter following this keyword is the name of the
56	server or server pool from which updates will be downloaded.	56	server or server pool from which updates will be downloaded.
		57	.It Cm HttpProxy
		58	The single parameter following this keyword will be used as HTTP proxy.
57	.It Cm Components	59	.It Cm Components
58	The parameters following this keyword are the components or	60	The parameters following this keyword are the components or
59	sub-components of	61	sub-components of

Lines 98-103 Link Here

(-)head/usr.sbin/freebsd-update/freebsd-update.8 (+2 lines)
98	.It Fl s Ar server	98	.It Fl s Ar server
99	Fetch files from the specified server or server pool.	99	Fetch files from the specified server or server pool.
100	(default: read value from configuration file.)	100	(default: read value from configuration file.)
		101	.It Fl p Ar proxy
		102	Fetch files via the specified HTTP proxy:port.
101	.It Fl t Ar address	103	.It Fl t Ar address
102	Mail output of	104	Mail output of
103	.Cm cron	105	.Cm cron




CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
    KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
    BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
    IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES
    HTTPPROXY"

# Set all the configuration options to "".
nullconfig () {

	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?

			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

Return to bug 206336

Lines 93-99 Link Here

(-)head/usr.sbin/freebsd-update/freebsd-update.sh (-1 / +18 lines)
93	CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE	93	CONFIGOPTIONS="KEYPRINT WORKDIR SERVERNAME MAILTO ALLOWADD ALLOWDELETE
94	KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED	94	KEEPMODIFIEDMETADATA COMPONENTS IGNOREPATHS UPDATEIFUNMODIFIED
95	BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES	95	BASEDIR VERBOSELEVEL TARGETRELEASE STRICTCOMPONENTS MERGECHANGES
96	IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES"	96	IDSIGNOREPATHS BACKUPKERNEL BACKUPKERNELDIR BACKUPKERNELSYMBOLFILES
		97	HTTPPROXY"
97		98
98	# Set all the configuration options to "".	99	# Set all the configuration options to "".
99	nullconfig () {	100	nullconfig () {
Lines 269-274 Link Here
269	fi	270	fi
270	}	271	}
271		272
		273	# When fetching updates, we will use the HTTP proxy:port specified
		274	# in freebsd-update.conf or on the command line
		275	config_HttpProxy () {
		276	if [ -n "${HTTP_PROXY}${http_proxy}" ]; then
		277	echo "env proxy is set to \"${HTTP_PROXY}${http_proxy}\""
		278	return 0
		279	else [ -z ${HttpProxy} ]; then
		280	HTTP_PROXY=$1
		281	export HTTP_PROXY=$1
		282	fi
		283	}
		284
272	# When fetching upgrades, should we assume the user wants exactly the	285	# When fetching upgrades, should we assume the user wants exactly the
273	# components listed in COMPONENTS, rather than trying to guess based on	286	# components listed in COMPONENTS, rather than trying to guess based on
274	# what's currently installed?	287	# what's currently installed?
Lines 457-462 Link Here
457	if [ $# -eq 1 ]; then usage; fi; shift	470	if [ $# -eq 1 ]; then usage; fi; shift
458	config_ServerName $1 \|\| usage	471	config_ServerName $1 \|\| usage
459	;;	472	;;
		473	-p)
		474	if [ $# -eq 1 ]; then usage; fi; shift
		475	config_HttpProxy $1 \|\| usage
		476	;;
460	-r)	477	-r)
461	if [ $# -eq 1 ]; then usage; fi; shift	478	if [ $# -eq 1 ]; then usage; fi; shift
462	config_TargetRelease $1 \|\| usage	479	config_TargetRelease $1 \|\| usage