From d23cb678fb7978c1b4a062ffbb5e1bddbfcffbb6 Mon Sep 17 00:00:00 2001
From: Andrea Cotza <andrea@cotza.me>
Date: Sat, 3 Oct 2015 22:31:35 +0200
Subject: [PATCH] Update to rtorrent 0.9.6 / libtorrent 0.13.6

---
 scripts/install | 13 ++++++++++---
 scripts/upgrade | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 9b89fe7..7de765d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -17,7 +17,14 @@ fi
 
 # Install sources
 if [ "$debian_version" = "jessie" ]; then
-  sudo apt-get install -y deb-multimedia-keyring
+  cd /tmp
+  wget http://www.deb-multimedia.org/pool/main/d/deb-multimedia-keyring/deb-multimedia-keyring_2015.6.1_all.deb
+  sudo dpkg -i deb-multimedia-keyring_2015.6.1_all.deb
+  
+  if [ -f /etc/apt/sources.list.d/rutorrent.list ]; then
+    sudo rm /etc/apt/sources.list.d/rutorrent.list
+  fi
+
   echo 'deb http://ftp2.fr.debian.org/debian/ jessie main non-free' | sudo tee -a /etc/apt/sources.list.d/rutorrent.list
   echo 'deb-src http://ftp2.fr.debian.org/debian/ jessie main non-free' | sudo tee -a /etc/apt/sources.list.d/rutorrent.list
   echo 'deb ftp://ftp.deb-multimedia.org jessie main non-free' | sudo tee -a /etc/apt/sources.list.d/rutorrent.list
@@ -42,7 +49,7 @@ sudo make install
 cd /tmp
 sudo git clone https://github.com/rakshasa/libtorrent.git
 cd libtorrent
-sudo git checkout 0.13.4
+sudo git checkout 0.13.6
 sudo ./autogen.sh
 sudo ./configure
 sudo make
@@ -52,7 +59,7 @@ sudo make install
 cd /tmp
 sudo git clone https://github.com/rakshasa/rtorrent.git
 cd rtorrent
-sudo git checkout 0.9.4
+sudo git checkout 0.9.6
 sudo ./autogen.sh
 sudo ./configure --with-xmlrpc-c
 sudo make
diff --git a/scripts/upgrade b/scripts/upgrade
index e69de29..ec6fb45 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+sudo service rtorrent stop
+
+# Build libtorrent
+cd /tmp
+sudo git clone https://github.com/rakshasa/libtorrent.git
+cd libtorrent
+sudo git checkout 0.13.6
+sudo ./autogen.sh
+sudo ./configure
+sudo make
+sudo make install
+
+# Build rtorrent
+cd /tmp
+sudo git clone https://github.com/rakshasa/rtorrent.git
+cd rtorrent
+sudo git checkout 0.9.6
+sudo ./autogen.sh
+sudo ./configure --with-xmlrpc-c
+sudo make
+sudo make install
+
+sudo service rtorrent start