6.0.0-3561779

4 files changed, 115 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2db36bfa583..aaca200b86c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,11 @@
+# Generated by mksrcinfo v8
+# Mon Oct 10 14:39:48 UTC 2016
 pkgbase = vmware-vcli
-	pkgdesc = The vCLI utilities make it possible to manage VMWare ESX servers (with the possibility of using vCenter). For make package, place VMware-vSphere-CLI-5.5.0-1549297.{your_arch}.tar.gz to PKGBUILD directory.
-	pkgver = 5.5.0.2043780
+	pkgdesc = VMware vSphere Command-Line Interface (vCLI); run commands against vSphere and ESX/ESXi
+	pkgver = 6.0.0.3561779
 	pkgrel = 1
-	url = https://my.vmware.com/web/vmware/details?productId=351&downloadGroup=VCLI55U1
+	url = https://developercenter.vmware.com/tool/vsphere_cli/6.0
+	install = vmware-vcli.install
 	arch = i686
 	arch = x86_64
 	license = custom:vmware
@@ -10,8 +13,12 @@ pkgbase = vmware-vcli
 	depends = openssl
 	depends = libxml2
 	depends = perl
-	depends = perl-xml-sax
+	depends = kmod
+	depends = krb5
+	depends = perl-xml-libxml
+	depends = perl-bytes-random-secure
 	depends = perl-crypt-ssleay
+	depends = perl-xml-sax
 	depends = perl-archive-zip
 	depends = perl-html-parser
 	depends = perl-data-dump
@@ -20,7 +27,12 @@ pkgbase = vmware-vcli
 	depends = perl-lwp-protocol-https
 	depends = perl-class-methodmaker
 	depends = perl-net-ssleay
-	depends = perl-xml-libxml
+	source = for-arch.patch
+	md5sums = c46fcc7bac0d9b0c710f52cfe286d34a
+	source_i686 = file://./VMware-vSphere-CLI-6.0.0-3561779.i386.tar.gz
+	md5sums_i686 = b54d011f10525044abac1876006245b0
+	source_x86_64 = file://./VMware-vSphere-CLI-6.0.0-3561779.x86_64.tar.gz
+	md5sums_x86_64 = ea5e46142bc342558150f52da21aaf5e
 
 pkgname = vmware-vcli
 
diff --git a/PKGBUILD b/PKGBUILD
index 7d06380884cf..6f0c6e3ad78e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,46 @@
+# Maintainer:  Jonathan Steel <jsteel at archlinux.org>
 # Contributor: ReNoM <renom@list.ru>
+
 pkgname=vmware-vcli
-pkgver=5.5.0.2043780
+_pkgver=6.0.0-3561779
+pkgver=${_pkgver//-/.}
 pkgrel=1
-pkgdesc="The vCLI utilities make it possible to manage VMWare ESX servers (with the possibility of using vCenter). For make package, place VMware-vSphere-CLI-5.5.0-1549297.{your_arch}.tar.gz to PKGBUILD directory."
+pkgdesc="VMware vSphere Command-Line Interface (vCLI); run commands against vSphere and ESX/ESXi"
 arch=('i686' 'x86_64')
-url="https://my.vmware.com/web/vmware/details?productId=351&downloadGroup=VCLI55U1"
+url="https://developercenter.vmware.com/tool/vsphere_cli/6.0"
 license=('custom:vmware')
-depends=(e2fsprogs openssl libxml2 perl perl-xml-sax perl-crypt-ssleay perl-archive-zip perl-html-parser perl-data-dump perl-soap-lite perl-uri perl-lwp-protocol-https perl-class-methodmaker perl-net-ssleay perl-xml-libxml)
-[ "$CARCH" == "i686" ] && source=(VMware-vSphere-CLI-5.5.0-2043780.i386.tar.gz for-arch.patch)
-[ "$CARCH" == "x86_64" ] && source=(VMware-vSphere-CLI-5.5.0-2043780.x86_64.tar.gz for-arch.patch)
-
-[ "$CARCH" == "i686" ] && sha256sums=('0717672728f8abc9066927127d48a3570fcf1d931a1a6e0bbfcfd2df7cb6629a' '45707476b36341e3ecf04378f2bf6310b2abb5534cf1168c8a245bf791f5c94c')
-[ "$CARCH" == "x86_64" ] && sha256sums=('23e4ae5fdab120ff73bb1163297c6c98b0b3d14e8134ed7fad7e21204d902003' '45707476b36341e3ecf04378f2bf6310b2abb5534cf1168c8a245bf791f5c94c')
+depends=(e2fsprogs openssl libxml2 perl kmod krb5
+  perl-xml-libxml perl-bytes-random-secure perl-crypt-ssleay perl-xml-sax
+  perl-archive-zip perl-html-parser perl-data-dump perl-soap-lite perl-uri
+  perl-lwp-protocol-https perl-class-methodmaker perl-net-ssleay )
+install=$pkgname.install
+source=(for-arch.patch)
+source_i686=(file://./VMware-vSphere-CLI-$_pkgver.i386.tar.gz)
+source_x86_64=(file://./VMware-vSphere-CLI-$_pkgver.x86_64.tar.gz)
+md5sums=('c46fcc7bac0d9b0c710f52cfe286d34a')
+md5sums_i686=('b54d011f10525044abac1876006245b0')
+md5sums_x86_64=('ea5e46142bc342558150f52da21aaf5e')
 
 build() {
-	cd "$srcdir"
-	patch -p0 < for-arch.patch
+  cd "vmware-vsphere-cli-distrib"
+  patch -Np0 < ../for-arch.patch
 }
 
-package ()
-{
-	cd "$pkgdir"
-	mkdir -p usr/bin
-	mkdir -p usr/lib/perl5/core_perl
-	cd "$srcdir/vmware-vsphere-cli-distrib"
-	export ftp_proxy=""
-	export http_proxy=""
-	./vmware-install.pl --prefix=../../pkg/vmware-vcli
-	cd "$pkgdir"
-	rm usr/lib/perl5/core_perl/Data/Dumper.pm
-	rm usr/lib/perl5/core_perl/auto/Data/Dumper/Dumper.so
-	mv bin/* usr/bin/
-	rmdir bin
-	mv lib/* usr/lib/
-	rmdir lib
-}
+package() {
+  cd "vmware-vsphere-cli-distrib"
+
+  mkdir -p "$pkgdir"/usr/bin
+  mkdir -p "$pkgdir"/usr/lib/perl5/core_perl
 
+  ./vmware-install.pl --prefix="$pkgdir"
+
+  rm "$pkgdir"/usr/lib/perl5/core_perl/Data/Dumper.pm
+  rm "$pkgdir"/usr/lib/perl5/core_perl/auto/Data/Dumper/Dumper.so
+  rm -rf "$pkgdir"/usr/lib/perl5/core_perl/MIME/
+  rm -rf "$pkgdir"/usr/lib/perl5/core_perl/auto/MIME/
+
+  mv "$pkgdir"/bin/* "$pkgdir"/usr/bin/
+  rmdir "$pkgdir"/bin
+  mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/
+  rmdir "$pkgdir"/lib
+}
diff --git a/for-arch.patch b/for-arch.patch
index 5c77a9ee9624..c20696c723ff 100644
--- a/for-arch.patch
+++ b/for-arch.patch
@@ -1,5 +1,5 @@
---- vmware-vsphere-cli-distrib/bin/vmware-uninstall-vSphere-CLI.pl	2012-07-13 04:42:55.000000000 +0400
-+++ vmware-vsphere-cli-distrib1/vmware-install.pl	2013-04-25 15:10:01.398219700 +0400
+--- vmware-install.pl.orig	2016-10-05 16:22:21.214845710 +0100
++++ bin/vmware-uninstall-vSphere-CLI.pl	2016-10-10 14:40:27.453829269 +0100
 @@ -766,7 +766,7 @@
  # Constants
  my $cInstallerFileName = 'vmware-install.pl';
@@ -27,12 +27,12 @@
      my $dst_loc = $dst_dir . '/' . $file;
      if (-l $dst_loc) {
        install_symlink(readlink($dst_loc), $src_loc);
-@@ -2181,25 +2181,25 @@
+@@ -2198,35 +2198,31 @@
  sub install_content_vicli_perl {
     my %patch;
     my $shipped_ssl_version = '0.9.8';
 -   my $installed_ssl_version = '0';
-+   my $installed_ssl_version = '1.0.0';
++   my $installed_ssl_version = '1.0.2';
     my $minimum_ssl_version = '0.9.7';
 -   my $ssleay_installed = 0;
 +   my $ssleay_installed = 1;
@@ -50,10 +50,10 @@
     my $libxml_perl_installed = 1;
  
 -   my $e2fsprogs_installed = 0;
+-   my $e2fsprogs_version = '0';
 +   my $e2fsprogs_installed = 1;
-    my $e2fsprogs_version = '0';
--   my $minimum_e2fsprogs_version = '1.38';
-+   my $minimum_e2fsprogs_version = '1.42';
++   my $e2fsprogs_version = '1.43';
+    my $minimum_e2fsprogs_version = '1.38';
     my $e2fsprogs_devel_installed = 0;
     my $internet_available = 0;
 -   my $install_rhel55_local = 0;
@@ -61,7 +61,17 @@
  
     my $vicliName = vmware_product_name();
     if ($] < 5.008) {
-@@ -2608,16 +2608,16 @@
+       error($vicliName . " requires Perl version 5.8 or later.\n\n");
+    }
+ 
+-   unless(direct_command("perldoc -V 2> /dev/null")) {
+-      print wrap("warning: " . $vicliName . " requires Perldoc.\n Please install perldoc.\n\n");
+-   }
+-
+    if ( file_name_exist("/etc/redhat-release")) {
+       my $msg = "This " . vmware_product_name() . " installer includes precompiled Perl modules for RHEL.\n"
+                 . "Answering yes will install the precompiled modules, and answering no will install from CPAN.\n"
+@@ -2704,16 +2700,16 @@
  
        undef %patch;
        if ($] >= 5.010 && ( -e "./lib/5.10/$module->{'path'}/lib" ) )  {
@@ -82,35 +92,69 @@
        }
  
        if ($] < 5.010) {
-@@ -2736,21 +2736,21 @@
+@@ -2776,7 +2772,7 @@
+ 
+   my $previous = $gOption{'default'};
+   $gOption{'default'} = 0;
+-  show_EULA();
++  #show_EULA();
+   $gOption{'default'} = $previous;
+ 
+   if ((check_disk_space('.', '/usr/lib')) < 0) {
+@@ -2846,29 +2842,25 @@
    db_add_answer('LIBDIR', $libdir);
  
    # Install a symlink for ESXCLI, which is in the library
 -  install_symlink("$libdir/bin/esxcli/esxcli", "$bindir/esxcli");
-+  install_symlink("/lib/vmware-vcli/bin/esxcli/esxcli", "$bindir/esxcli");
++  install_symlink("/usr/lib/vmware-vcli/bin/esxcli/esxcli", "$bindir/esxcli");
+   # Install a symlink for DCLI, which is in the library
+-  install_symlink("$libdir/bin/vmware-dcli/dcli", "$bindir/dcli");
+-  safe_chmod(755, "$bindir/esxcli");
+-  safe_chmod(755, "$bindir/dcli");
++  install_symlink("/usr/lib/vmware-vcli/bin/vmware-dcli/dcli", "$bindir/dcli");
  
    # Install a symlink for VCLI
 -  if ( "$rootdir/bin" ne "/usr/bin") {
 -     install_bin_symlink('./bin', "$rootdir/bin");
 -     install_symlink("$libdir/bin/esxcli/esxcli", "/usr/bin/esxcli");
+-     install_symlink("$libdir/bin/vmware-dcli/dcli", "/usr/bin/dcli");
 +  if ( "$rootdir/bin" ne "../../pkg/vmware-vcli/usr/bin") {
 +     install_bin_symlink('./bin', "/bin");
-+     install_symlink("/lib/vmware-vcli/bin/esxcli/esxcli", "../../pkg/vmware-vcli/usr/bin/esxcli");
++     install_symlink("/usr/lib/vmware-vcli/bin/esxcli/esxcli", "esxcli");
++     install_symlink("/usr/lib/vmware-vcli/bin/vmware-dcli/dcli", "dcli");
+      # Making esxcli and dcli executable
+-	 safe_chmod(755, "/usr/bin/esxcli");
+-     safe_chmod(755, "/usr/bin/dcli");
    }
  
    # Install a symlink to make /lib point to the correct library
    # based on the architecture of our system
    if (is64BitUserLand()) {
 -     install_symlink("$libdir/lib64", "$libdir/lib");
-+     install_symlink("/lib/vmware-vcli/lib64", "$libdir/lib");
++     install_symlink("/usr/lib/vmware-vcli/lib64", "$libdir/lib");
    }
    else {
 -     install_symlink("$libdir/lib32", "$libdir/lib");
-+     install_symlink("/lib/vmware-vcli/lib32", "$libdir/lib");
++     install_symlink("/usr/lib/vmware-vcli/lib32", "$libdir/lib");
    }
  
    # Make sure that, in particular, libvmacore.so's exec text permission needs
-@@ -3742,9 +3742,9 @@
+@@ -2879,12 +2871,12 @@
+   }
+ 
+   # Install vSphere SDK for Perl content excluding "apps"
+-  $docdir = $rootdir . '/share/doc/vmware-vcli';
++  $docdir = $rootdir . '/usr/share/doc/vmware-vcli';
+   install_dir('./doc', $docdir, \%patch, 0x1);
+   db_add_answer('DOCDIR', $docdir);
+ 
+   # Install resxtop man files
+-  $mandir = "$rootdir/share/man/man1";
++  $mandir = "$rootdir/usr/share/man/man1";
+   undef %patch;
+   install_dir('./man', $mandir, \%patch, 0x1);
+ 
+@@ -3860,9 +3852,9 @@
       error($chk_msg);
     }
  
diff --git a/vmware-vcli.install b/vmware-vcli.install
new file mode 100644
index 000000000000..e2f176feb0ed
--- /dev/null
+++ b/vmware-vcli.install
@@ -0,0 +1,4 @@
+post_install() {
+  echo "==> You must read and accept the VMware End User License Agreement
+==> /usr/share/doc/vmware-vcli/EULA before using this software"
+}