Update SQL Server and Ubuntu libraries to new versions

2 files changed, 44 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ef97c5529b9..b738ba4cf30e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mssql-server
 	pkgdesc = Microsoft SQL Server for Linux
-	pkgver = 14.0.800.90
+	pkgver = 14.0.900.75
 	pkgrel = 1
 	url = https://www.microsoft.com/en-us/sql-server/sql-server-vnext-including-Linux
 	install = mssql-server.install
@@ -10,14 +10,18 @@ pkgbase = mssql-server
 	depends = numactl
 	depends = sssd
 	depends = openssl-1.0>=1.0.2.l
-	noextract = libjemalloc1_3.6.0-9ubuntu1_amd64.deb
-	noextract = libc++1_3.7.0-1_amd64.deb
-	source = https://packages.microsoft.com/ubuntu/16.04/mssql-server/pool/main/m/mssql-server/mssql-server_14.0.800.90-2_amd64.deb
-	source = http://mirrors.kernel.org/ubuntu/pool/universe/j/jemalloc/libjemalloc1_3.6.0-9ubuntu1_amd64.deb
-	source = http://mirrors.kernel.org/ubuntu/pool/universe/libc/libc++/libc++1_3.7.0-1_amd64.deb
-	sha256sums = d6090108af8788df23fd54fffc41876a39372a51a7abf2afed58fc8978c7b9cb
-	sha256sums = 50fd3720d129ad7d659b311bb8436169b851f3671112ef53bf5d03580d4947f1
-	sha256sums = 416f5c17bd9ac8727808918dd2e1af04078691772c5f3f16afb497e33dfc9fd6
+	noextract = ${pkgname}_${_prodver}_amd64.deb
+	noextract = ${_jemalloc}
+	noextract = ${_libcpp}
+	noextract = ${_libcppabi}
+	source = https://packages.microsoft.com/ubuntu/16.04/mssql-server/pool/main/m/mssql-server/mssql-server_14.0.900.75-1_amd64.deb
+	source = http://mirrors.kernel.org/ubuntu/pool/universe/j/jemalloc/libjemalloc1_3.6.0-10_amd64.deb
+	source = http://mirrors.kernel.org/ubuntu/pool/universe/libc/libc++/libc++1_3.9.1-3_amd64.deb
+	source = http://mirrors.kernel.org/ubuntu/pool/universe/libc/libc++/libc++abi1_3.9.1-3_amd64.deb
+	sha256sums = 6365e7a479d94a07e074093e895b02b6dc2a3a158f0d5e22aa70a246cd9a7094
+	sha256sums = 5e31b5dfb21525b9207ff0c70c34c69366300de342edb37070e816e0fbc27ad0
+	sha256sums = acf4594581ff04532c8da7427646e904393791ef7671fff95cde480d7269eafd
+	sha256sums = a3c8214afae4fd966ba277f47ae8554641999634f2b7d40e27705eb7c0d52be3
 
 pkgname = mssql-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 18054961115b..3c906bbac4ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,53 @@
 # Maintainer: Gabriel Morrison Lima Dantas <gabrielmldantas@gmail.com>
 # Contributor: Aleksey Kamenskikh <aleksey.kamenskikh@gmail.com>
 pkgname=mssql-server
-pkgver=14.0.800.90
-_prodver=${pkgver}-2
+pkgver=14.0.900.75
+_prodver=${pkgver}-1
 pkgrel=1
+_libcpp='libc++1_3.9.1-3_amd64.deb'
+_libcppabi='libc++abi1_3.9.1-3_amd64.deb'
+_jemalloc=libjemalloc1_3.6.0-10_amd64.deb
 pkgdesc="Microsoft SQL Server for Linux"
 arch=('x86_64')
 url="https://www.microsoft.com/en-us/sql-server/sql-server-vnext-including-Linux"
 license=('unknown')
 depends=(python2-configparser numactl sssd 'openssl-1.0>=1.0.2.l')
 source=("https://packages.microsoft.com/ubuntu/16.04/mssql-server/pool/main/m/mssql-server/${pkgname}_${_prodver}_amd64.deb"
-        "http://mirrors.kernel.org/ubuntu/pool/universe/j/jemalloc/libjemalloc1_3.6.0-9ubuntu1_amd64.deb"
-        "http://mirrors.kernel.org/ubuntu/pool/universe/libc/libc++/libc++1_3.7.0-1_amd64.deb")
+        "http://mirrors.kernel.org/ubuntu/pool/universe/j/jemalloc/${_jemalloc}"
+        "http://mirrors.kernel.org/ubuntu/pool/universe/libc/libc++/${_libcpp}"
+        "http://mirrors.kernel.org/ubuntu/pool/universe/libc/libc++/${_libcppabi}")
 
-sha256sums=('d6090108af8788df23fd54fffc41876a39372a51a7abf2afed58fc8978c7b9cb'
-            '50fd3720d129ad7d659b311bb8436169b851f3671112ef53bf5d03580d4947f1'
-            '416f5c17bd9ac8727808918dd2e1af04078691772c5f3f16afb497e33dfc9fd6')
-noextract=('libjemalloc1_3.6.0-9ubuntu1_amd64.deb'
-           'libc++1_3.7.0-1_amd64.deb')
+sha256sums=('6365e7a479d94a07e074093e895b02b6dc2a3a158f0d5e22aa70a246cd9a7094'
+            '5e31b5dfb21525b9207ff0c70c34c69366300de342edb37070e816e0fbc27ad0'
+            'acf4594581ff04532c8da7427646e904393791ef7671fff95cde480d7269eafd'
+            'a3c8214afae4fd966ba277f47ae8554641999634f2b7d40e27705eb7c0d52be3')
+noextract=('${pkgname}_${_prodver}_amd64.deb'
+           '${_jemalloc}'
+           '${_libcpp}'
+           '${_libcppabi}')
 install=$pkgname.install
 
 package() {
+  ar x $srcdir/${pkgname}_${_prodver}_amd64.deb
   tar -xf data.tar.xz
+ 
   mkdir jemalloc
   cd jemalloc
-  ar x $srcdir/libjemalloc1_3.6.0-9ubuntu1_amd64.deb
+  ar x $srcdir/$_jemalloc
   tar -xf data.tar.xz
+ 
   cd $srcdir
   mkdir libc++
   cd libc++
-  ar x $srcdir/libc++1_3.7.0-1_amd64.deb
+  ar x $srcdir/$_libcpp
   tar -xf data.tar.xz
+ 
+  cd $srcdir
+  mkdir libc++abi
+  cd libc++abi
+  ar x $srcdir/$_libcppabi
+  tar -xf data.tar.xz
+  
   cd $pkgdir
   mv $srcdir/opt .
   mv $srcdir/usr .
@@ -38,6 +55,9 @@ package() {
   mv $srcdir/jemalloc/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 opt/mssql/lib/
   mv $srcdir/libc++/usr/lib/x86_64-linux-gnu/libc++.so.1 opt/mssql/lib/
   mv $srcdir/libc++/usr/lib/x86_64-linux-gnu/libc++.so.1.0 opt/mssql/lib/
+  mv $srcdir/libc++abi/usr/lib/x86_64-linux-gnu/libc++abi.so.1 opt/mssql/lib
+  mv $srcdir/libc++abi/usr/lib/x86_64-linux-gnu/libc++abi.so.1.0 opt/mssql/lib
+
   for i in $(ls opt/mssql/lib/mssql-conf/*.py); do
       sed 's/#!\/usr\/bin\/python/#!\/usr\/bin\/python2/' $i -i
   done