urfave/cli: fix parsing of short opts

Vendor an updated version of urfave/cli to fix the parsing of short
options.  Until the fix is merged upstream, vendor the code from
github.com/vrothberg/cli containing both, the latest urfave/cli and
the bug fix.

Fixes: containers#714
Signed-off-by: Valentin Rothberg <vrothberg@suse.com>

test/e2e/run_test.go

@@ -45,6 +45,15 @@ var _ = Describe("Podman run", func() {
 		Expect(session.ExitCode()).To(Equal(0))
 	})
 
+	It("podman run a container based on local image with short options and args", func() {
+		// regression test for #714
+		session := podmanTest.Podman([]string{"run", ALPINE, "find", "/", "-name", "etc"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		match, _ := session.GrepString("/etc")
+		Expect(match).Should(BeTrue())
+	})
+
 	It("podman run a container based on remote image", func() {
 		session := podmanTest.Podman([]string{"run", "-dt", BB_GLIBC, "ls"})
 		session.WaitWithDefaultTimeout()

vendor.conf

@@ -62,7 +62,7 @@ github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987
 github.com/syndtr/gocapability e7cb7fa329f456b3855136a2642b197bad7366ba
 github.com/tchap/go-patricia v2.2.6
 github.com/ulule/deepcopier master
-github.com/urfave/cli 39908eb08fee7c10d842622a114a5c133fb0a3c6
+github.com/urfave/cli fix-short-opts-parsing https://github.com/vrothberg/cli
 github.com/vbatts/tar-split v0.10.2
 github.com/vishvananda/netlink master
 github.com/vishvananda/netns master