Upgrade to Anaconda 2.4.1

5 files changed, 47 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4645b3458b78..83c5a6550620 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Dec 14 19:20:13 UTC 2015
 pkgbase = anaconda
 	pkgdesc = Completely free enterprise-ready Python distribution for large-scale data processing, predictive analytics, and scientific computing.
-	pkgver = 2.4.0
+	pkgver = 2.4.1
 	pkgrel = 3
 	url = https://store.continuum.io/cshop/anaconda/
 	arch = x86
@@ -9,14 +11,14 @@ pkgbase = anaconda
 	makedepends = patch
 	options = !strip
 	options = libtool
-	source = https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda3-2.4.0-Linux-x86_64.sh
+	source = https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda3-2.4.1-Linux-x86_64.sh
 	source = installer_sh_x86.patch
 	source = installer_sh_x86_64.patch
 	source = conda_install.patch
-	sha256sums = fb4e480059e991f2fa632b5a9bcdd284c7f0677814cd719c11d524453f96a40d
-	sha256sums = e5110519a6977fc0636fb94148d1b7bc070167cda3402d4a2cdecd7dbb4eca08
-	sha256sums = fe62ec395b9346f721a8ad7f73bb1c98cb8ce65de06e9aeef3be99c5e040364b
-	sha256sums = 2cc1cfc80f8255dd4b350a6645ebf23c445cb0e82bee40e5a3bf8d0812e39e44
+	sha256sums = 0735e69199fc37135930ea2fd4fb6ad0adef215a2a7ba9fd6b0a0a4daaadb1cf
+	sha256sums = 30859478b4974d61077f921c00020f2e2d5340a262302de8a0bee8369cec3014
+	sha256sums = 386b289912d4e2a6d0cf9d436922de09b5a801d95d3acc421f1638380b3628d4
+	sha256sums = 906f21f96c5d5d086a03761824cb8f2043d0491604d8abc5481412495b912cc5
 
 pkgname = anaconda
 
diff --git a/PKGBUILD b/PKGBUILD
index 2e41efb1ff9c..a38483d8f29c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor : Martin Wimpress <code@flexion.org>
 
 pkgname=anaconda
-pkgver=2.4.0
+pkgver=2.4.1
 pkgrel=3
 pkgdesc="Completely free enterprise-ready Python distribution for large-scale data processing, predictive analytics, and scientific computing."
 arch=('x86' 'x86_64')
@@ -14,17 +14,17 @@ source=("https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.r
         "installer_sh_x86_64.patch"
         "conda_install.patch")
 options=(!strip libtool)
-sha256sums=('fb4e480059e991f2fa632b5a9bcdd284c7f0677814cd719c11d524453f96a40d'
-            'e5110519a6977fc0636fb94148d1b7bc070167cda3402d4a2cdecd7dbb4eca08'
-            'fe62ec395b9346f721a8ad7f73bb1c98cb8ce65de06e9aeef3be99c5e040364b'
-            '2cc1cfc80f8255dd4b350a6645ebf23c445cb0e82bee40e5a3bf8d0812e39e44')
-_pythonver='3.5.0-1'
-_condaver='3.18.3'
+sha256sums=('0735e69199fc37135930ea2fd4fb6ad0adef215a2a7ba9fd6b0a0a4daaadb1cf'
+            '30859478b4974d61077f921c00020f2e2d5340a262302de8a0bee8369cec3014'
+            '386b289912d4e2a6d0cf9d436922de09b5a801d95d3acc421f1638380b3628d4'
+            '906f21f96c5d5d086a03761824cb8f2043d0491604d8abc5481412495b912cc5')
+_pythonver='3.5.1-0'
+_condaver='3.18.8'
 
 _pkgarch=`uname -m`
 if [ "$CARCH" == "x86" ]; then
     _pkgarch="x86"
-    sha256sums[0]='f6080c6493cefc603cfeb67aaf6c3c4c6b80a66788f03db48ffd3cfa52017c0a'
+    sha256sums[0]='00d13413f5b8129e863dabcc2296a181c697056c5ed210739a0aa06454ab7038'
     source[0]="https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda3-${pkgver}-Linux-x86.sh"
 fi
 
diff --git a/conda_install.patch b/conda_install.patch
index 89a7bb992b2a..25eb2401a503 100644
--- a/conda_install.patch
+++ b/conda_install.patch
@@ -1,6 +1,6 @@
---- a/pkgs/conda-3.18.3-py35_0/lib/python3.5/site-packages/conda/install.py	2015-11-25 09:59:32.301105554 +0100
-+++ b/pkgs/conda-3.18.3-py35_0/lib/python3.5/site-packages/conda/install.py	2015-11-25 10:17:19.506243545 +0100
-@@ -257,21 +257,23 @@
+--- a/pkgs/conda-3.18.8-py35_0/lib/python3.5/site-packages/conda/install.py	2015-12-14 20:17:29.635535906 +0100
++++ b/pkgs/conda-3.18.8-py35_0/lib/python3.5/site-packages/conda/install.py	2015-12-14 20:17:29.638869204 +0100
+@@ -267,21 +267,23 @@
      return res
  
  def update_prefix(path, new_prefix, placeholder=prefix_placeholder,
@@ -28,7 +28,7 @@
      else:
          sys.exit("Invalid mode:" % mode)
  
-@@ -586,7 +588,7 @@
+@@ -588,7 +590,7 @@
  def load_meta(prefix, dist):
      return is_linked(prefix, dist)
  
@@ -37,7 +37,7 @@
      '''
      Set up a package in a specified (environment) prefix.  We assume that
      the package has been extracted (using extract() above).
-@@ -639,7 +641,7 @@
+@@ -641,7 +643,7 @@
          for f in sorted(has_prefix_files):
              placeholder, mode = has_prefix_files[f]
              try:
@@ -46,7 +46,7 @@
              except PaddingError:
                  sys.exit("ERROR: placeholder '%s' too short in: %s\n" %
                           (placeholder, dist))
-@@ -767,6 +769,10 @@
+@@ -769,6 +771,10 @@
                   default=sys.prefix,
                   help="prefix (defaults to %default)")
  
@@ -57,7 +57,7 @@
      p.add_option('--pkgs-dir',
                   action="store",
                   default=join(sys.prefix, 'pkgs'),
-@@ -796,9 +802,14 @@
+@@ -798,9 +804,14 @@
  
      pkgs_dir = opts.pkgs_dir
      prefix = opts.prefix
@@ -72,7 +72,7 @@
  
      if opts.list:
          pprint(sorted(linked(prefix)))
-@@ -813,7 +824,7 @@
+@@ -815,7 +826,7 @@
          for dist in dists:
              if opts.verbose or linktype == LINK_COPY:
                  print("linking: %s" % dist)
@@ -81,7 +81,7 @@
          messages(prefix)
  
      elif opts.extract:
-@@ -823,7 +834,7 @@
+@@ -825,7 +836,7 @@
          linktype = (LINK_HARD
                      if try_hard_link(pkgs_dir, prefix, dist) else
                      LINK_COPY)
diff --git a/installer_sh_x86.patch b/installer_sh_x86.patch
index 2661f7684426..230871bc2456 100644
--- a/installer_sh_x86.patch
+++ b/installer_sh_x86.patch
@@ -1,32 +1,32 @@
---- a/Anaconda3-2.4.0-Linux-x86.sh	2015-11-25 09:24:34.653797870 +0100
-+++ b/Anaconda3-2.4.0-Linux-x86.sh	2015-11-25 09:51:24.299710869 +0100
+--- a/Anaconda3-2.4.1-Linux-x86.sh	2015-12-14 20:11:17.819411594 +0100
++++ b/Anaconda3-2.4.1-Linux-x86.sh	2015-12-14 20:12:39.158562465 +0100
 @@ -73,9 +73,9 @@
      fi
  fi
  # verify the size of the installer
--wc -c "$THIS_PATH" | grep 290842015 >/dev/null
-+wc -c "$THIS_PATH" | grep 290842022 >/dev/null
+-wc -c "$THIS_PATH" | grep 265518790 >/dev/null
++wc -c "$THIS_PATH" | grep 265518797 >/dev/null
  if (( $? )); then
--    echo "ERROR: size of $THIS_FILE should be 290842015 bytes" >&2
-+    echo "ERROR: size of $THIS_FILE should be 290842022 bytes" >&2
+-    echo "ERROR: size of $THIS_FILE should be 265518790 bytes" >&2
++    echo "ERROR: size of $THIS_FILE should be 265518797 bytes" >&2
      exit 1
  fi
  
-@@ -415,7 +415,7 @@
- extract_dist _cache-0.0-py35_x0
+@@ -426,7 +426,7 @@
+ extract_dist anaconda-2.4.1-np110py35_0
  
  mkdir $PREFIX/envs
 -mkdir $HOME/.continuum 2>/dev/null
 +#mkdir $HOME/.continuum 2>/dev/null
  
- PYTHON="$PREFIX/pkgs/python-3.5.0-1/bin/python -E"
+ PYTHON="$PREFIX/pkgs/python-3.5.1-0/bin/python -E"
  $PYTHON -V
-@@ -425,7 +425,7 @@
+@@ -436,7 +436,7 @@
      uname -a
      exit 1
  fi
 -
 +exit 0
  echo "creating default environment..."
- CONDA_INSTALL="$PREFIX/pkgs/conda-3.18.3-py35_0/lib/python3.5/site-packages/conda/install.py"
+ CONDA_INSTALL="$PREFIX/pkgs/conda-3.18.8-py35_0/lib/python3.5/site-packages/conda/install.py"
  $PYTHON $CONDA_INSTALL --prefix=$PREFIX --pkgs-dir=$PREFIX/pkgs --link-all || exit 1
diff --git a/installer_sh_x86_64.patch b/installer_sh_x86_64.patch
index 7a4a1db43882..5e046a96517c 100644
--- a/installer_sh_x86_64.patch
+++ b/installer_sh_x86_64.patch
@@ -1,32 +1,32 @@
---- a/Anaconda3-2.4.0-Linux-x86_64.sh	2015-11-25 09:24:34.503799502 +0100
-+++ b/Anaconda3-2.4.0-Linux-x86_64.sh	2015-11-25 09:52:22.885744680 +0100
+--- a/Anaconda3-2.4.1-Linux-x86_64.sh	2015-12-14 20:11:17.672746459 +0100
++++ b/Anaconda3-2.4.1-Linux-x86_64.sh	2015-12-14 20:14:09.677617530 +0100
 @@ -70,9 +70,9 @@
      fi
  fi
  # verify the size of the installer
--wc -c "$THIS_PATH" | grep 299023674 >/dev/null
-+wc -c "$THIS_PATH" | grep 299023681 >/dev/null
+-wc -c "$THIS_PATH" | grep 283797156 >/dev/null
++wc -c "$THIS_PATH" | grep 283797163 >/dev/null
  if (( $? )); then
--    echo "ERROR: size of $THIS_FILE should be 299023674 bytes" >&2
-+    echo "ERROR: size of $THIS_FILE should be 299023681 bytes" >&2
+-    echo "ERROR: size of $THIS_FILE should be 283797156 bytes" >&2
++    echo "ERROR: size of $THIS_FILE should be 283797163 bytes" >&2
      exit 1
  fi
  
-@@ -414,7 +414,7 @@
- extract_dist _cache-0.0-py35_x0
+@@ -427,7 +427,7 @@
+ extract_dist anaconda-2.4.1-np110py35_0
  
  mkdir $PREFIX/envs
 -mkdir $HOME/.continuum 2>/dev/null
 +#mkdir $HOME/.continuum 2>/dev/null
  
- PYTHON="$PREFIX/pkgs/python-3.5.0-1/bin/python -E"
+ PYTHON="$PREFIX/pkgs/python-3.5.1-0/bin/python -E"
  $PYTHON -V
-@@ -424,7 +424,7 @@
+@@ -437,7 +437,7 @@
      uname -a
      exit 1
  fi
 -
 +exit 0
  echo "creating default environment..."
- CONDA_INSTALL="$PREFIX/pkgs/conda-3.18.3-py35_0/lib/python3.5/site-packages/conda/install.py"
+ CONDA_INSTALL="$PREFIX/pkgs/conda-3.18.8-py35_0/lib/python3.5/site-packages/conda/install.py"
  $PYTHON $CONDA_INSTALL --prefix=$PREFIX --pkgs-dir=$PREFIX/pkgs --link-all || exit 1