Version bump with bug fixes

In prep for Rstudio 1.3:
- Patched out their decision to rely on a self-contained boost.
- Modified the server user to be rstudio-server

The self-contained boost is not only hard to maintain, but will
drastically inflate the package size.
The attached patch removes their check, and allows cmake to find the
system boost instead.

4 files changed, 31 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33d60b7b61be..1a1185410612 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-server-git
 	pkgdesc = A new integrated development environment (IDE) for R programming language
-	pkgver = v1.2.1330.r329.g7747ad37e6
+	pkgver = v1.2.1330.r1174.g6830132b14
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-server-git.install
@@ -29,10 +29,12 @@ pkgbase = rstudio-server-git
 	source = rstudio-server.service
 	source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip
 	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.2.zip
+	source = boost-system.patch
 	md5sums = SKIP
 	md5sums = eea28f7865720f6c8d5de12f3f631880
 	md5sums = e2617189fe5c138945b8cc95f26bd476
 	md5sums = c295406d68c5ef364e445068599aa6d4
+	md5sums = 135db966cb49800cf0f66c7f9ac063e7
 
 pkgname = rstudio-server-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a0cce28a8b1..2183f47a2f02 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 #
 pkgname=rstudio-server-git
 _gitname="rstudio"
-pkgver=v1.2.1330.r329.g7747ad37e6
+pkgver=v1.2.1330.r1174.g6830132b14
 _gwtver=2.8.2
 _ginver=2.1.2
 _clangver=3.8.0
@@ -25,11 +25,13 @@ source=('git://github.com/rstudio/rstudio.git'
 	'rstudio-server.service'
 	"https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
 	"https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip"
+	"boost-system.patch"
 )
 md5sums=('SKIP'
          'eea28f7865720f6c8d5de12f3f631880'
          'e2617189fe5c138945b8cc95f26bd476'
-         'c295406d68c5ef364e445068599aa6d4')
+         'c295406d68c5ef364e445068599aa6d4'
+         '135db966cb49800cf0f66c7f9ac063e7')
          
 
 pkgver() {
@@ -39,6 +41,7 @@ pkgver() {
 
 prepare () {
 	cd ${srcdir}/$_gitname
+	patch -p1 < $srcdir/boost-system.patch
 
 	msg "Extracting dependencies..."
 	    cd "${srcdir}/${_gitname}/src/gwt"
@@ -76,7 +79,8 @@ build() {
   mkdir "${srcdir}/$_gitname/build"
   cd "${srcdir}/$_gitname/build"
   # Configure cmake 
-  cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DCMAKE_DL_LIBRARIES=/usr/lib64/libdl.so -DCMAKE_LIBR_DOC_DIR=/usr/share/doc/R -DCMAKE_LIBR_EXECUTABLE=/usr/bin/R -DCMAKE_LIBR_HOME=/usr/lib64/R -DCMAKE_LIBR_INCLUDE_DIRS=/usr/include/R -DCMAKE_LIBR_CORE_LIBRARY=usr/lib64/R/lib/libR.so ..
+  #cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DCMAKE_DL_LIBRARIES=/usr/lib64/libdl.so -DCMAKE_LIBR_DOC_DIR=/usr/share/doc/R -DCMAKE_LIBR_EXECUTABLE=/usr/bin/R -DCMAKE_LIBR_HOME=/usr/lib64/R -DCMAKE_LIBR_INCLUDE_DIRS=/usr/include/R -DCMAKE_LIBR_CORE_LIBRARY=usr/lib64/R/lib/libR.so  -DRSTUDIO_USE_SYSTEM_BOOST=Yes ..
+  cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server ..
 
 }
 
@@ -91,7 +95,7 @@ package() {
   install -d "${pkgdir}/etc/pam.d"
   install -Dm 644 "${pkgdir}/usr/lib/rstudio-server/extras/pam/rstudio" "${pkgdir}/etc/pam.d/rstudio"
   # rstudio home directory
-  install -d "${pkgdir}/srv/rstudio"
+  install -d "${pkgdir}/srv/rstudio-server"
 #  mv "${pkgdir}/usr/lib/rstudio-server/www" "${pkgdir}/srv/rstudio"
 #  rm -rf "${pkgdir}/usr/lib/rstudio-server/extras"
   install -d "${pkgdir}/usr/lib//systemd/system"
diff --git a/boost-system.patch b/boost-system.patch
new file mode 100644
index 000000000000..1c88899db5c2
--- /dev/null
+++ b/boost-system.patch
@@ -0,0 +1,13 @@
+diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
+index 4cdfb88bfa..4c40f9bb51 100644
+--- a/src/cpp/CMakeLists.txt
++++ b/src/cpp/CMakeLists.txt
+@@ -210,7 +210,7 @@ list(APPEND BOOST_LIBS
+ )
+ 
+ # tell cmake not to look for boost on system paths.
+-set(Boost_NO_SYSTEM_PATHS ON)
++#set(Boost_NO_SYSTEM_PATHS ON)
+ # UNIX BOOST
+ if(UNIX)
+    # prefer static link to our custom built version
diff --git a/rstudio-server-git.install b/rstudio-server-git.install
index ce23cf967caa..53dbfad828b2 100644
--- a/rstudio-server-git.install
+++ b/rstudio-server-git.install
@@ -1,17 +1,17 @@
 post_install() {
-  getent group "rstudio" &>/dev/null || groupadd -r rstudio 1>/dev/null
-  getent passwd "rstudio" &>/dev/null || useradd -r -g rstudio -d "/srv/rstudio" -s "/bin/sh" rstudio 1>/dev/null
-  chown -R rstudio:rstudio /srv/rstudio
+  getent group "rstudio-server" &>/dev/null || groupadd -r rstudio-server 1>/dev/null
+  getent passwd "rstudio-server" &>/dev/null || useradd -r -g rstudio-server -d "/srv/rstudio-server" -s "/bin/sh" rstudio-server 1>/dev/null
+  chown -R rstudio-server:rstudio-server /srv/rstudio-server
   
   
 }
 
 post_remove() {
-  if getent passwd "rstudio" >/dev/null; then
-    userdel rstudio >/dev/null
+  if getent passwd "rstudio-server" >/dev/null; then
+    userdel rstudio-server >/dev/null
   fi
-  if getent group "rstudio" >/dev/null; then
-    groupdel rstudio >/dev/null
+  if getent group "rstudio-server" >/dev/null; then
+    groupdel rstudio-server >/dev/null
   fi
   rm -f /usr/sbin/rstudio-server
 }