4 files changed, 188 insertions, 132 deletions

diff --git a/sysutils/packer/Makefile b/sysutils/packer/Makefile
index 762f73d7de26..81e3f1a80b39 100644
--- a/sysutils/packer/Makefile
+++ b/sysutils/packer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	packer
-PORTVERSION=	0.7.5
+PORTVERSION=	0.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -11,104 +11,147 @@ COMMENT=	Tool for creating machine images
 BUILD_DEPENDS=	${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	mitchellh:DEFAULT,cli,iochan,mapstructure,osext,panicwrap,prefixedio,gofs,gophercloud,goamz,multistep,govnc \
-		hashicorp:atlas,checkpoint,msgpack,version,yamux golang:crypto,protobuf,net,oauth2,appengine \
-		vaughan0:goini going:toolkit racker:perigee \
-		ActiveState:tail howeyc:fsnotify zoutaiqi:gosshold \
-		google:apiclient GoogleCloudPlatform:gcloud go-tomb:tomb
-GH_PROJECT=	cli:cli iochan:iochan mapstructure:mapstructure osext:osext \
-		panicwrap:panicwrap prefixedio:prefixedio atlas-go:atlas \
-		go-checkpoint:checkpoint go-msgpack:msgpack go-version:version \
-		yamux:yamux crypto:crypto go-ini:goini protobuf:protobuf \
-		toolkit:toolkit perigee:perigee tail:tail go-fs:gofs \
-		gophercloud-fork-40444fb:gophercloud goamz:goamz \
-		multistep:multistep go-vnc:govnc fsnotify:fsnotify net:net \
-		oauth2:oauth2 gosshold:gosshold google-api-go-client:apiclient \
-		appengine:appengine gcloud-golang:gcloud tomb:tomb
-GH_TAGNAME=	e3c2e3d:cli b584a32:iochan 740c764:mapstructure 0dd3f91:osext \
-		45cbfd3:panicwrap 89d9b53:prefixedio \
-		0008374:atlas efefdc6:checkpoint 71c2886:msgpack \
-		bb92ddd:version 9feabe6:yamux 1fbbd62:crypto a98ad7e:goini \
-		abd3b41:protobuf 6185c18:toolkit d281986:perigee \
-		068b729:tail 590e633:gofs 40444fb:gophercloud 52a0104:goamz \
-		162146f:multistep 6fca135:govnc 6b1ef89:fsnotify \
-		8aa6e20:net b3f9a68:oauth2 967f522:gosshold fa1ebc5:apiclient \
-		c98f627:appengine eaf111a:gcloud dd63297:tomb
+GH_ACCOUNT=	mitchellh:DEFAULT,cli,gofs,govnc,iochan,mapstructure \
+		mitchellh:multistep,osext,panicwrap,prefixedio,reflectwalk \
+		hashicorp:atlas,checkpoint,gomultierror,msgpack,version,yamux \
+		google:apiclient,goquerystr aws:awssdkgo \
+		golang:crypto,net,oauth2 go-fsnotify:fsnotify \
+		GoogleCloudPlatform:gcloud digitalocean:godo vaughan0:goini \
+		rackspace:gophercloud zoutaiqi:gosshold nu7hatch:gouuid \
+		tent:hlink pierrec:lz4,xxhash klauspost:pgzip satori:suuid \
+		ActiveState:tail go-tomb:tomb going:toolkit \
+		masterzen:winrm,simplexml,xmlpath packer-community:winrmcp \
+		dylanmei:iso8601,winrmtest
+GH_PROJECT=	cli:cli go-fs:gofs go-vnc:govnc iochan:iochan \
+		mapstructure:mapstructure multistep:multistep osext:osext \
+		panicwrap:panicwrap prefixedio:prefixedio \
+		reflectwalk:reflectwalk atlas-go:atlas go-checkpoint:checkpoint \
+		go-multierror:gomultierror go-msgpack:msgpack \
+		go-version:version yamux:yamux google-api-go-client:apiclient \
+		go-querystring:goquerystr aws-sdk-go:awssdkgo crypto:crypto \
+		net:net oauth2:oauth2 fsnotify:fsnotify gcloud-golang:gcloud \
+		godo:godo go-ini:goini gophercloud:gophercloud \
+		gosshold:gosshold gouuid:gouuid http-link-go:hlink lz4:lz4 \
+		xxHash:xxhash pgzip:pgzip go.uuid:suuid tail:tail tomb:tomb \
+		toolkit:toolkit winrm:winrm simplexml:simplexml xmlpath:xmlpath \
+		winrmcp:winrmcp iso8601:iso8601 winrmtest:winrmtest
+GH_TAGNAME=	8102d0e:cli a34c1b9:gofs 723ed98:govnc 87b45ff:iochan \
+		2caf8ef:mapstructure 162146f:multistep 0dd3f91:osext \
+		45cbfd3:panicwrap 89d9b53:prefixedio eecf4c7:reflectwalk \
+		1b40363:atlas 88326f6:checkpoint 56912fb:gomultierror \
+		fa3f638:msgpack 999359b:version b2e5585:yamux a09229c:apiclient \
+		547ef5a:goquerystr 469e9fb:awssdkgo cc04154:crypto d9558e5:net \
+		8914e50:oauth2 ea925a0:fsnotify feda659:gcloud e2a34fa:godo \
+		a98ad7e:goini f956c6c:gophercloud 967f522:gosshold \
+		179d4d0:gouuid ac974c6:hlink 4bdd4b0:lz4 284d0fc:xxhash \
+		49eeca5:pgzip afe1e2d:suuid 4b368d1:tail dd63297:tomb \
+		5bff591:toolkit 1323390:winrm 95ba304:simplexml 13f4951:xmlpath \
+		743b1af:winrmcp 2075bf1:iso8601 3e9661c:winrmtest
 
 STRIP=		# stripping can break go binaries
 
-PLUGINS=	builder-amazon-chroot builder-amazon-ebs builder-amazon-instance \
-	builder-digitalocean builder-docker builder-googlecompute builder-null \
-	builder-openstack builder-parallels-iso builder-parallels-pvm \
-	builder-qemu builder-virtualbox-iso builder-virtualbox-ovf builder-vmware-iso \
+PLUGINS=	builder-amazon-chroot builder-amazon-ebs \
+	builder-amazon-instance builder-digitalocean builder-docker \
+	builder-file builder-googlecompute builder-null builder-openstack \
+	builder-parallels-iso builder-parallels-pvm builder-qemu \
+	builder-virtualbox-iso builder-virtualbox-ovf builder-vmware-iso \
 	builder-vmware-vmx post-processor-atlas post-processor-compress \
-	post-processor-docker-import post-processor-docker-push post-processor-docker-save \
-	post-processor-docker-tag post-processor-vagrant post-processor-vagrant-cloud \
-	post-processor-vsphere provisioner-ansible-local provisioner-chef-client \
-	provisioner-chef-solo provisioner-file provisioner-puppet-masterless \
-	provisioner-puppet-server provisioner-salt-masterless provisioner-shell
+	post-processor-docker-import post-processor-docker-push \
+	post-processor-docker-save post-processor-docker-tag \
+	post-processor-vagrant post-processor-vagrant-cloud \
+	post-processor-vsphere provisioner-ansible-local \
+	provisioner-chef-client provisioner-chef-solo provisioner-file \
+	provisioner-powershell provisioner-puppet-masterless \
+	provisioner-puppet-server provisioner-salt-masterless provisioner-shell \
+	provisioner-shell-local provisioner-windows-restart provisioner-windows-shell
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 .for src in .gitignore .travis.yml CHANGELOG.md CONTRIBUTING.md LICENSE \
-	Makefile README.md Vagrantfile builder checkpoint.go command \
-	commands.go common communicator config.go config_unix.go \
-	config_windows.go fix log.go main.go main_test.go packer panic.go \
-	plugin post-processor provisioner scripts signal.go stdin.go test \
-	version.go website
+	Makefile README.md Vagrantfile appveyor.yml builder checkpoint.go \
+	command commands.go common communicator config.go config_unix.go \
+	config_windows.go contrib fix helper log.go main.go main_test.go packer \
+	panic.go plugin post-processor provisioner scripts signal.go stdin.go \
+	template test version.go website
 	@${MV} ${WRKSRC}/${src} \
 		${WRKSRC}/src/github.com/mitchellh/${PORTNAME}
 .endfor
+	@${MKDIR} ${WRKSRC}/src/code.google.com/p
 	@${MKDIR} ${WRKSRC}/src/github.com/ActiveState
-	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
-	@${MKDIR} ${WRKSRC}/src/github.com/golang
+	@${MKDIR} ${WRKSRC}/src/github.com/aws
+	@${MKDIR} ${WRKSRC}/src/github.com/digitalocean
+	@${MKDIR} ${WRKSRC}/src/github.com/dylanmei
+	@${MKDIR} ${WRKSRC}/src/github.com/dylanmei
 	@${MKDIR} ${WRKSRC}/src/github.com/going
+	@${MKDIR} ${WRKSRC}/src/github.com/golang
+	@${MKDIR} ${WRKSRC}/src/github.com/google
+	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
 	@${MKDIR} ${WRKSRC}/src/github.com/howeyc
+	@${MKDIR} ${WRKSRC}/src/github.com/klauspost
+	@${MKDIR} ${WRKSRC}/src/github.com/masterzen
+	@${MKDIR} ${WRKSRC}/src/github.com/nu7hatch
+	@${MKDIR} ${WRKSRC}/src/github.com/packer-community
+	@${MKDIR} ${WRKSRC}/src/github.com/pierrec
 	@${MKDIR} ${WRKSRC}/src/github.com/racker
+	@${MKDIR} ${WRKSRC}/src/github.com/rackspace
+	@${MKDIR} ${WRKSRC}/src/github.com/satori
+	@${MKDIR} ${WRKSRC}/src/github.com/tent
 	@${MKDIR} ${WRKSRC}/src/github.com/vaughan0
 	@${MKDIR} ${WRKSRC}/src/golang.org/x
-	@${MKDIR} ${WRKSRC}/src/gopkg.in
-	@${MKDIR} ${WRKSRC}/src/code.google.com/p
 	@${MKDIR} ${WRKSRC}/src/google.golang.org
-	@${MV} ${WRKSRC_tail} ${WRKSRC}/src/github.com/ActiveState/tail
+	@${MKDIR} ${WRKSRC}/src/gopkg.in
+	@${MV} ${WRKSRC_apiclient} ${WRKSRC}/src/google.golang.org/api
+	@${MV} ${WRKSRC_atlas} ${WRKSRC}/src/github.com/hashicorp/atlas-go
+	@${MV} ${WRKSRC_awssdkgo} ${WRKSRC}/src/github.com/aws/aws-sdk-go
+	@${MV} ${WRKSRC_checkpoint} ${WRKSRC}/src/github.com/hashicorp/go-checkpoint
 	@${MV} ${WRKSRC_cli} ${WRKSRC}/src/github.com/mitchellh/cli
+	@${MV} ${WRKSRC_fsnotify} ${WRKSRC}/src/gopkg.in/fsnotify.v0
+	@${MV} ${WRKSRC_gcloud} ${WRKSRC}/src/google.golang.org/cloud
+	@${MV} ${WRKSRC_godo} ${WRKSRC}/src/github.com/digitalocean/godo
+	@${MV} ${WRKSRC_gofs} ${WRKSRC}/src/github.com/mitchellh/go-fs
+	@${MV} ${WRKSRC_goini} ${WRKSRC}/src/github.com/vaughan0/go-ini
+	@${MV} ${WRKSRC_gomultierror} ${WRKSRC}/src/github.com/hashicorp/go-multierror
+	@${MV} ${WRKSRC_gophercloud} ${WRKSRC}/src/github.com/rackspace/gophercloud
+	@${MV} ${WRKSRC_goquerystr} ${WRKSRC}/src/github.com/google/go-querystring
+	@${MV} ${WRKSRC_gosshold} ${WRKSRC}/src/code.google.com/p/gosshold
+	@${MV} ${WRKSRC_gouuid} ${WRKSRC}/src/github.com/nu7hatch/gouuid
+	@${MV} ${WRKSRC_govnc} ${WRKSRC}/src/github.com/mitchellh/go-vnc
+	@${MV} ${WRKSRC_hlink} ${WRKSRC}/src/github.com/tent/http-link-go
 	@${MV} ${WRKSRC_iochan} ${WRKSRC}/src/github.com/mitchellh/iochan
+	@${MV} ${WRKSRC_iso8601} ${WRKSRC}/src/github.com/dylanmei/iso8601
+	@${MV} ${WRKSRC_lz4} ${WRKSRC}/src/github.com/pierrec/lz4
 	@${MV} ${WRKSRC_mapstructure} ${WRKSRC}/src/github.com/mitchellh/mapstructure
+	@${MV} ${WRKSRC_msgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack
+	@${MV} ${WRKSRC_multistep} ${WRKSRC}/src/github.com/mitchellh/multistep
+	@${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2
 	@${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/mitchellh/osext
 	@${MV} ${WRKSRC_panicwrap} ${WRKSRC}/src/github.com/mitchellh/panicwrap
+	@${MV} ${WRKSRC_pgzip} ${WRKSRC}/src/github.com/klauspost/pgzip
 	@${MV} ${WRKSRC_prefixedio} ${WRKSRC}/src/github.com/mitchellh/prefixedio
-	@${MV} ${WRKSRC_gofs} ${WRKSRC}/src/github.com/mitchellh/go-fs
-	@${MV} ${WRKSRC_gophercloud} ${WRKSRC}/src/github.com/mitchellh/gophercloud-fork-40444fb
-	@${MV} ${WRKSRC_goamz} ${WRKSRC}/src/github.com/mitchellh/goamz
-	@${MV} ${WRKSRC_multistep} ${WRKSRC}/src/github.com/mitchellh/multistep
-	@${MV} ${WRKSRC_govnc} ${WRKSRC}/src/github.com/mitchellh/go-vnc
-	@${MV} ${WRKSRC_atlas} ${WRKSRC}/src/github.com/hashicorp/atlas-go
-	@${MV} ${WRKSRC_checkpoint} ${WRKSRC}/src/github.com/hashicorp/go-checkpoint
-	@${MV} ${WRKSRC_msgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack
+	@${MV} ${WRKSRC_reflectwalk} ${WRKSRC}/src/github.com/mitchellh/reflectwalk
+	@${MV} ${WRKSRC_simplexml} ${WRKSRC}/src/github.com/masterzen/simplexml
+	@${MV} ${WRKSRC_suuid} ${WRKSRC}/src/github.com/satori/go.uuid
+	@${MV} ${WRKSRC_tail} ${WRKSRC}/src/github.com/ActiveState/tail
+	@${MV} ${WRKSRC_tomb} ${WRKSRC}/src/gopkg.in/tomb.v1
+	@${MV} ${WRKSRC_toolkit} ${WRKSRC}/src/github.com/going/toolkit
 	@${MV} ${WRKSRC_version} ${WRKSRC}/src/github.com/hashicorp/go-version
+	@${MV} ${WRKSRC_winrmcp} ${WRKSRC}/src/github.com/packer-community/winrmcp
+	@${MV} ${WRKSRC_winrmtest} ${WRKSRC}/src/github.com/dylanmei/winrmtest
+	@${MV} ${WRKSRC_winrm} ${WRKSRC}/src/github.com/masterzen/winrm
+	@${MV} ${WRKSRC_xmlpath} ${WRKSRC}/src/github.com/masterzen/xmlpath
+	@${MV} ${WRKSRC_xxhash} ${WRKSRC}/src/github.com/pierrec/xxHash
 	@${MV} ${WRKSRC_yamux} ${WRKSRC}/src/github.com/hashicorp/yamux
-	@${MV} ${WRKSRC_protobuf} ${WRKSRC}/src/github.com/golang/protobuf
-	@${MV} ${WRKSRC_goini} ${WRKSRC}/src/github.com/vaughan0/go-ini
-	@${MV} ${WRKSRC_fsnotify} ${WRKSRC}/src/github.com/howeyc/fsnotify
 	@${CP} -r ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net
 	@${MV} ${WRKSRC_net} ${WRKSRC}/src/github.com/golang/net
 	@${CP} -r ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
-	@${MV} ${WRKSRC_oauth2} ${WRKSRC}/src/golang.org/x/oauth2
-	@${MV} ${WRKSRC_gosshold} ${WRKSRC}/src/code.google.com/p/gosshold
 	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/code.google.com/p/go.crypto
-	@${MV} ${WRKSRC_apiclient} ${WRKSRC}/src/code.google.com/p/google-api-go-client
-	@${MV} ${WRKSRC_appengine} ${WRKSRC}/src/google.golang.org/appengine
-	@${MV} ${WRKSRC_gcloud} ${WRKSRC}/src/google.golang.org/cloud
-	@${MV} ${WRKSRC_tomb} ${WRKSRC}/src/gopkg.in/tomb.v1
-	@${MV} ${WRKSRC_perigee} ${WRKSRC}/src/github.com/racker/perigee
-	@${MV} ${WRKSRC_toolkit} ${WRKSRC}/src/github.com/going/toolkit
 	@${FIND} ${WRKSRC}/src/code.google.com/p/go.crypto -type f -name '*.go' -exec \
 		${REINPLACE_CMD} -e 's,golang.org/x/crypto/ssh,code.google.com/p/go.crypto/ssh,g' {} +
 
 do-build:
-	cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
+	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}
 .for plugin in ${PLUGINS}
-	cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}-${plugin} github.com/mitchellh/packer/plugin/${plugin}
+	@cd ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}; ${SETENV} GOPATH=${WRKSRC} go build -o bin/${PORTNAME}-${plugin} github.com/mitchellh/packer/plugin/${plugin}
 .endfor
 
 do-install:
diff --git a/sysutils/packer/distinfo b/sysutils/packer/distinfo
index e77827760e55..30c5814e13f8 100644
--- a/sysutils/packer/distinfo
+++ b/sysutils/packer/distinfo
@@ -1,62 +1,88 @@
-SHA256 (mitchellh-packer-v0.7.5_GH0.tar.gz) = a245712c5b73c89cc5e97c00c270c8955c4b90ef7915c4fa93fc90e1adbdb645
-SIZE (mitchellh-packer-v0.7.5_GH0.tar.gz) = 899730
-SHA256 (mitchellh-cli-e3c2e3d_GH0.tar.gz) = 9042c6d2ad5da705c1ae7d0f12d07dc76e87f6dbea524df52edee0c00982cf36
-SIZE (mitchellh-cli-e3c2e3d_GH0.tar.gz) = 12178
-SHA256 (mitchellh-iochan-b584a32_GH0.tar.gz) = b03f64996f9d79505030532257e25f7a5af1de69babca35d4d3ed5b36278c209
-SIZE (mitchellh-iochan-b584a32_GH0.tar.gz) = 1106
-SHA256 (mitchellh-mapstructure-740c764_GH0.tar.gz) = d68a258cdb95fc5f2971cd50ad29c0c479f6c3420ddeec386077626e517b5f71
-SIZE (mitchellh-mapstructure-740c764_GH0.tar.gz) = 11943
+SHA256 (mitchellh-packer-v0.8.1_GH0.tar.gz) = 74667fae3b6426da5057f9613af5e2900c863f31a1b21812437be694e5b481f9
+SIZE (mitchellh-packer-v0.8.1_GH0.tar.gz) = 1075706
+SHA256 (mitchellh-cli-8102d0e_GH0.tar.gz) = 673be64ba7e1e285db690e7c5dc15c416874c2ed135356ea808b5e11c364f380
+SIZE (mitchellh-cli-8102d0e_GH0.tar.gz) = 13045
+SHA256 (mitchellh-go-fs-a34c1b9_GH0.tar.gz) = 517c42182c0f8f7b5a0d929f488b224383011170855d7ff9f1cf977f519fe257
+SIZE (mitchellh-go-fs-a34c1b9_GH0.tar.gz) = 16205
+SHA256 (mitchellh-go-vnc-723ed98_GH0.tar.gz) = c0c316e6df51e59a7d95b618cdb010a93243402acd8af1ce5b441ded6ae92731
+SIZE (mitchellh-go-vnc-723ed98_GH0.tar.gz) = 9364
+SHA256 (mitchellh-iochan-87b45ff_GH0.tar.gz) = f929e7740412611e37e5c3984dc32828bc2b47df91351eafefb36460abee4565
+SIZE (mitchellh-iochan-87b45ff_GH0.tar.gz) = 1782
+SHA256 (mitchellh-mapstructure-2caf8ef_GH0.tar.gz) = f75b52b5aec85313d7bac7f13cee2eeeddb652c94667806e31fd84dca3a0ff7e
+SIZE (mitchellh-mapstructure-2caf8ef_GH0.tar.gz) = 13810
+SHA256 (mitchellh-multistep-162146f_GH0.tar.gz) = 286aefea1cf82cccae06577310b1b7ceb11253c66dd1c9fcee966e09ba35e99b
+SIZE (mitchellh-multistep-162146f_GH0.tar.gz) = 6135
 SHA256 (mitchellh-osext-0dd3f91_GH0.tar.gz) = 3e5374bf20fc761425a8845f05658f3219afd025a871de181ab28b5797a4b5fd
 SIZE (mitchellh-osext-0dd3f91_GH0.tar.gz) = 2787
 SHA256 (mitchellh-panicwrap-45cbfd3_GH0.tar.gz) = 20587733dbdc7623dbe0e8bec3ef0b62e39ce10fe464c6204a74153fc43edf44
 SIZE (mitchellh-panicwrap-45cbfd3_GH0.tar.gz) = 7231
 SHA256 (mitchellh-prefixedio-89d9b53_GH0.tar.gz) = 144419c3adcfe38a90fd18f2c4a156d7e1267430103301cf95363dfa8515dfda
 SIZE (mitchellh-prefixedio-89d9b53_GH0.tar.gz) = 3112
-SHA256 (mitchellh-go-fs-590e633_GH0.tar.gz) = 8ac84c9f0105514cdb65a23c7032edb8d9e129ea4a36b1735e1d0fc2510ec5c1
-SIZE (mitchellh-go-fs-590e633_GH0.tar.gz) = 15621
-SHA256 (mitchellh-gophercloud-fork-40444fb-40444fb_GH0.tar.gz) = 71e6f5e3124b6287a488ff65194e7600dc7da84807e30d4243f61955e0509648
-SIZE (mitchellh-gophercloud-fork-40444fb-40444fb_GH0.tar.gz) = 36401
-SHA256 (mitchellh-goamz-52a0104_GH0.tar.gz) = ba4291e087dfb0af0c51d9e51fe7d28461c02b5014d95aa836fb61d8794b629e
-SIZE (mitchellh-goamz-52a0104_GH0.tar.gz) = 128548
-SHA256 (mitchellh-multistep-162146f_GH0.tar.gz) = 286aefea1cf82cccae06577310b1b7ceb11253c66dd1c9fcee966e09ba35e99b
-SIZE (mitchellh-multistep-162146f_GH0.tar.gz) = 6135
-SHA256 (mitchellh-go-vnc-6fca135_GH0.tar.gz) = 2558ffbebd66254510f4ccec6279601237451a04f0b054c020d7059f6a7c6c12
-SIZE (mitchellh-go-vnc-6fca135_GH0.tar.gz) = 7442
-SHA256 (hashicorp-atlas-go-0008374_GH0.tar.gz) = 90d68517beeb07ab44665e864b84b609626a6ad843435bbfc326daed3150c7b5
-SIZE (hashicorp-atlas-go-0008374_GH0.tar.gz) = 32262
-SHA256 (hashicorp-go-checkpoint-efefdc6_GH0.tar.gz) = 1eb29284f788079f1ce99dc4d4e3275042d81c62452b6024978a837e076c9b68
-SIZE (hashicorp-go-checkpoint-efefdc6_GH0.tar.gz) = 9732
-SHA256 (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 052a52b77e262daa6f4bb618970d6673dd77713be031c6da18bd3aff5bc1448d
-SIZE (hashicorp-go-msgpack-71c2886_GH0.tar.gz) = 49479
-SHA256 (hashicorp-go-version-bb92ddd_GH0.tar.gz) = b56e9cff11ea7950d6a10cee7df7dfd3e65ad078d5fee0070f0d620449d3120d
-SIZE (hashicorp-go-version-bb92ddd_GH0.tar.gz) = 10384
-SHA256 (hashicorp-yamux-9feabe6_GH0.tar.gz) = 7d38c98227d61c02f455ed2a5a01f8627f20da7b03e1869ec36bc44d95933290
-SIZE (hashicorp-yamux-9feabe6_GH0.tar.gz) = 18592
-SHA256 (golang-crypto-1fbbd62_GH0.tar.gz) = 18d28dd6700907b19fca11affe7a4f97cd02addf82539896e64c3cc2d710760e
-SIZE (golang-crypto-1fbbd62_GH0.tar.gz) = 852289
-SHA256 (golang-protobuf-abd3b41_GH0.tar.gz) = 4d3d8931fb57c5738f99458e70864b3f55b8d0000f5ea206c0bef7304aedd997
-SIZE (golang-protobuf-abd3b41_GH0.tar.gz) = 127498
-SHA256 (golang-net-8aa6e20_GH0.tar.gz) = 79c20fc3801127a8f61594fe9393cc972f02668f19dbde575c5b8ac05910cf5c
-SIZE (golang-net-8aa6e20_GH0.tar.gz) = 413241
-SHA256 (golang-oauth2-b3f9a68_GH0.tar.gz) = 1aeb842f5a8161858c6896b8661380fea34db90bee493615eecba759cb990dc8
-SIZE (golang-oauth2-b3f9a68_GH0.tar.gz) = 17530
-SHA256 (golang-appengine-c98f627_GH0.tar.gz) = 4dceac412388e795f9b3b40bc34c8cc3e99ed7599a3e4ebcd273e85abd6fe343
-SIZE (golang-appengine-c98f627_GH0.tar.gz) = 166119
+SHA256 (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = a681b9f5f9a8c24d01d9e05a088dc2053fa637060cf4fa8a4232d5ef4f00ca11
+SIZE (mitchellh-reflectwalk-eecf4c7_GH0.tar.gz) = 4272
+SHA256 (hashicorp-atlas-go-1b40363_GH0.tar.gz) = f8e2e53a2f48aaf59960d2e60d2247deca76d4f1450453c45a7cb83239ff13ed
+SIZE (hashicorp-atlas-go-1b40363_GH0.tar.gz) = 37101
+SHA256 (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 49133eeca2707d2c025219f261dd3ebd8155fe22907c412445b8ffc7a4137755
+SIZE (hashicorp-go-checkpoint-88326f6_GH0.tar.gz) = 9826
+SHA256 (hashicorp-go-multierror-56912fb_GH0.tar.gz) = de765913740311a2be5f9dd1267a79cfe79ed18c94039a905000acb56068c64a
+SIZE (hashicorp-go-multierror-56912fb_GH0.tar.gz) = 8432
+SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
+SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
+SHA256 (hashicorp-go-version-999359b_GH0.tar.gz) = 59ebc270b121626de3ccdd34f35b255961e7626876c854d9ddbe9070dc4ce7e6
+SIZE (hashicorp-go-version-999359b_GH0.tar.gz) = 10417
+SHA256 (hashicorp-yamux-b2e5585_GH0.tar.gz) = 38e3b567240898d870c5134cace538bfc7df9105d2d0cdd487fb1bd5e8e895f4
+SIZE (hashicorp-yamux-b2e5585_GH0.tar.gz) = 19245
+SHA256 (google-google-api-go-client-a09229c_GH0.tar.gz) = 86e82412f28ad16366cef45f6675952d65706dd3178c93e8ebe78ee2b2025e11
+SIZE (google-google-api-go-client-a09229c_GH0.tar.gz) = 2328174
+SHA256 (google-go-querystring-547ef5a_GH0.tar.gz) = 949a780dfac94ce95521a1eb29d4f4bd4df20a02f8786cf817611b3e52ce0853
+SIZE (google-go-querystring-547ef5a_GH0.tar.gz) = 7228
+SHA256 (aws-aws-sdk-go-469e9fb_GH0.tar.gz) = 7e5116b0a7dc7c5ec01ab9bef06982a6f8531eb8072eea1260af8e18b130186d
+SIZE (aws-aws-sdk-go-469e9fb_GH0.tar.gz) = 1938924
+SHA256 (golang-crypto-cc04154_GH0.tar.gz) = 15a5483d0eead03b33d318bef6ffc1417b1bd37d2457816d6113602b6e612726
+SIZE (golang-crypto-cc04154_GH0.tar.gz) = 874102
+SHA256 (golang-net-d9558e5_GH0.tar.gz) = 2f44ad362219ec7f5e28a2b8e9938a8495c19b29b0267cd9ecf853f3c16b3995
+SIZE (golang-net-d9558e5_GH0.tar.gz) = 472869
+SHA256 (golang-oauth2-8914e50_GH0.tar.gz) = 966a5e96103684ff98e2de76ab4115935ead5dd24e11cdd9f6f655bd95dbac0d
+SIZE (golang-oauth2-8914e50_GH0.tar.gz) = 32042
+SHA256 (go-fsnotify-fsnotify-ea925a0_GH0.tar.gz) = 8ceb939c0ac7c214b25f1aa4d5ba4233209af51cbd44941c1a689fd947bda872
+SIZE (go-fsnotify-fsnotify-ea925a0_GH0.tar.gz) = 19562
+SHA256 (GoogleCloudPlatform-gcloud-golang-feda659_GH0.tar.gz) = 9b91e06329a763f3a220b9c32e456982de46c3101b3f824865e1131487472cbb
+SIZE (GoogleCloudPlatform-gcloud-golang-feda659_GH0.tar.gz) = 163608
+SHA256 (digitalocean-godo-e2a34fa_GH0.tar.gz) = 421e4541f5728c8322a3469e3cb067ffc6e7f69d3a932f444db67406f1b5b7a4
+SIZE (digitalocean-godo-e2a34fa_GH0.tar.gz) = 25495
 SHA256 (vaughan0-go-ini-a98ad7e_GH0.tar.gz) = f8daa0afa08af1fdce4747074602078c72f49fd60c7d8dc3d07b6b7e70cd5f82
 SIZE (vaughan0-go-ini-a98ad7e_GH0.tar.gz) = 3694
-SHA256 (going-toolkit-6185c18_GH0.tar.gz) = 7a04f581fabb81e4dc0b52f22f72cde642195a9276fe3e3a6d6a10a452a98e6c
-SIZE (going-toolkit-6185c18_GH0.tar.gz) = 1297671
-SHA256 (racker-perigee-d281986_GH0.tar.gz) = 9764760d435329d354fd2e67114d50d7be401af20102f4b5e9d626b170f7dd54
-SIZE (racker-perigee-d281986_GH0.tar.gz) = 10403
-SHA256 (ActiveState-tail-068b729_GH0.tar.gz) = 00714c04cd2af4ef5a360cb48ac81bdba8564f79f7242e805729602a755e7410
-SIZE (ActiveState-tail-068b729_GH0.tar.gz) = 13463
-SHA256 (howeyc-fsnotify-6b1ef89_GH0.tar.gz) = bcc1841b7c7d768111b27ea5c4af8137f058b03b23407aa30f59452602efc524
-SIZE (howeyc-fsnotify-6b1ef89_GH0.tar.gz) = 19296
+SHA256 (rackspace-gophercloud-f956c6c_GH0.tar.gz) = 1b2923d97f42a49f71373807c00e4f4e971a5f5ee1b1cf7a9968ad47f040b242
+SIZE (rackspace-gophercloud-f956c6c_GH0.tar.gz) = 334562
 SHA256 (zoutaiqi-gosshold-967f522_GH0.tar.gz) = 25592a2b7c8ac3b79c0701dc2af2786aee986799e1512e9848c415dbc4200868
 SIZE (zoutaiqi-gosshold-967f522_GH0.tar.gz) = 82109
-SHA256 (google-google-api-go-client-fa1ebc5_GH0.tar.gz) = b047f8df8ceaf14bb4533bc68180e746dccaf8b5897fccdf943437431aafeaf4
-SIZE (google-google-api-go-client-fa1ebc5_GH0.tar.gz) = 1552984
-SHA256 (GoogleCloudPlatform-gcloud-golang-eaf111a_GH0.tar.gz) = ec9524123c9c588527128c0a00f9caa07adc508debe2d8047cc9c09484e46b7f
-SIZE (GoogleCloudPlatform-gcloud-golang-eaf111a_GH0.tar.gz) = 81145
+SHA256 (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 8c910070e1acc74e66f727e0ff6a28f84009c941ace87be8766c13f964dab3fc
+SIZE (nu7hatch-gouuid-179d4d0_GH0.tar.gz) = 3737
+SHA256 (tent-http-link-go-ac974c6_GH0.tar.gz) = 1b1d379175cc877e21c4a474efb7b9fc46e682d02e46b716daadcbcbfd2f6d90
+SIZE (tent-http-link-go-ac974c6_GH0.tar.gz) = 3406
+SHA256 (pierrec-lz4-4bdd4b0_GH0.tar.gz) = cee8101858a3817729be800ed88639ec5b123cec085d547ad7b61eb19ee0a51e
+SIZE (pierrec-lz4-4bdd4b0_GH0.tar.gz) = 14920
+SHA256 (pierrec-xxHash-284d0fc_GH0.tar.gz) = aa1066ce7030b5f2077e07ae6195c6cdd34d6e2f7babfbc86fa83b69256d117c
+SIZE (pierrec-xxHash-284d0fc_GH0.tar.gz) = 5596
+SHA256 (klauspost-pgzip-49eeca5_GH0.tar.gz) = cda43f53e1785268d8d10dc2943564e4ae051ab110ed74e8f375064e9f165312
+SIZE (klauspost-pgzip-49eeca5_GH0.tar.gz) = 116117
+SHA256 (satori-go.uuid-afe1e2d_GH0.tar.gz) = 9a7230686a99098e50ced69108ff06f84e263756f63d38604b24732839f8e436
+SIZE (satori-go.uuid-afe1e2d_GH0.tar.gz) = 6550
+SHA256 (ActiveState-tail-4b368d1_GH0.tar.gz) = ed6a9870889ebe38d5a152657828aa03e773becb93e824aee633095d22c2b942
+SIZE (ActiveState-tail-4b368d1_GH0.tar.gz) = 13870
 SHA256 (go-tomb-tomb-dd63297_GH0.tar.gz) = 38f8b3d8b5f4ee0d7f48f0bd8fb5dad50afc23b1612c64f10bb711e70ad22235
 SIZE (go-tomb-tomb-dd63297_GH0.tar.gz) = 3627
+SHA256 (going-toolkit-5bff591_GH0.tar.gz) = 6d1775830d53198ddcbcea9f6073bebdf3f04f2c6b54497d6dc5931a4ebd97da
+SIZE (going-toolkit-5bff591_GH0.tar.gz) = 1297714
+SHA256 (masterzen-winrm-1323390_GH0.tar.gz) = 8d9a39562c4d3a6f9d615916d9ee7d2dbdd974943a31693d8dab9aa5f801cf0a
+SIZE (masterzen-winrm-1323390_GH0.tar.gz) = 22210
+SHA256 (masterzen-simplexml-95ba304_GH0.tar.gz) = d18f8ed120db84d37772d95a5174b5c3078743074209eb9b08bed108e52a348f
+SIZE (masterzen-simplexml-95ba304_GH0.tar.gz) = 6731
+SHA256 (masterzen-xmlpath-13f4951_GH0.tar.gz) = 8f1b82a29d42616886c080a33dcc0884d5f2fd8579b7c4e8fc0e371b4f645e44
+SIZE (masterzen-xmlpath-13f4951_GH0.tar.gz) = 13320
+SHA256 (packer-community-winrmcp-743b1af_GH0.tar.gz) = 012dc4d47fe091e7ba825b9ba7d03b0b34d8afb885284ba8396fb2d72a172e36
+SIZE (packer-community-winrmcp-743b1af_GH0.tar.gz) = 5957
+SHA256 (dylanmei-iso8601-2075bf1_GH0.tar.gz) = c0bf90f3cbc2ff0c107f16e44fe5383de8972d6b3555f113e1ac7eeeaf769657
+SIZE (dylanmei-iso8601-2075bf1_GH0.tar.gz) = 2436
+SHA256 (dylanmei-winrmtest-3e9661c_GH0.tar.gz) = 1087fc4b04196981b7c1412556e88646619481c9b548caa5aaa9f54cdb4d93d5
+SIZE (dylanmei-winrmtest-3e9661c_GH0.tar.gz) = 3673
diff --git a/sysutils/packer/files/patch-src_github.com_mitchellh_packer_post-processor_atlas_util.go b/sysutils/packer/files/patch-src_github.com_mitchellh_packer_post-processor_atlas_util.go
deleted file mode 100644
index 129e7c32d80b..000000000000
--- a/sysutils/packer/files/patch-src_github.com_mitchellh_packer_post-processor_atlas_util.go
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/github.com/mitchellh/packer/post-processor/atlas/util.go.orig	2014-12-10 02:57:03 UTC
-+++ src/github.com/mitchellh/packer/post-processor/atlas/util.go
-@@ -13,11 +13,12 @@ import (
- func longestCommonPrefix(vs []string) string {
- 	// Find the shortest string
- 	var shortest string
--	length := math.MaxUint32
-+        var length int64
-+	length = math.MaxUint32
- 	for _, v := range vs {
--		if len(v) < length {
-+		if int64(len(v)) < length {
- 			shortest = v
--			length = len(v)
-+			length = int64(len(v))
- 		}
- 	}
- 
diff --git a/sysutils/packer/pkg-plist b/sysutils/packer/pkg-plist
index 610ea7248df4..996eeea608c0 100644
--- a/sysutils/packer/pkg-plist
+++ b/sysutils/packer/pkg-plist
@@ -4,6 +4,7 @@ bin/packer-builder-amazon-ebs
 bin/packer-builder-amazon-instance
 bin/packer-builder-digitalocean
 bin/packer-builder-docker
+bin/packer-builder-file
 bin/packer-builder-googlecompute
 bin/packer-builder-null
 bin/packer-builder-openstack
@@ -27,7 +28,11 @@ bin/packer-provisioner-ansible-local
 bin/packer-provisioner-chef-client
 bin/packer-provisioner-chef-solo
 bin/packer-provisioner-file
+bin/packer-provisioner-powershell
 bin/packer-provisioner-puppet-masterless
 bin/packer-provisioner-puppet-server
 bin/packer-provisioner-salt-masterless
 bin/packer-provisioner-shell
+bin/packer-provisioner-shell-local
+bin/packer-provisioner-windows-restart
+bin/packer-provisioner-windows-shell