Update to r10983

3 files changed, 18 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ac6e532c546..79a56e65fa2a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu Sep 29 22:51:29 UTC 2016
+# Sun Jan 15 14:09:33 UTC 2017
 pkgbase = amule-daemon
 	pkgdesc = An eMule-like client for the eD2k and Kademlia p2p networks. (Only Daemon, CLI tools and Webserver)
-	pkgver = r10964
+	pkgver = r10983
 	pkgrel = 1
 	url = http://www.amule.org
 	install = amule-daemon.install
@@ -10,7 +10,6 @@ pkgbase = amule-daemon
 	arch = x86_64
 	arch = armv7h
 	license = GPL
-	makedepends = ccache
 	makedepends = boost
 	depends = wxbase-light
 	depends = crypto++
@@ -19,16 +18,16 @@ pkgbase = amule-daemon
 	depends = boost-libs
 	optdepends = kamule: AmuleGUI for KDE
 	conflicts = amule
-	source = http://amule.sourceforge.net/tarballs/aMule-SVN-r10964.tar.bz2
+	source = http://amule.sourceforge.net/tarballs/aMule-SVN-r10983.tar.bz2
 	source = amuled.service
 	source = amuled@.service
 	source = amuleweb.service
 	source = amule.sysuser
-	sha1sums = cdd36b953d36db1308f92794232ce98243438a53
-	sha1sums = 3a2b451c3a35ab1745dd88726fe1454bc1227542
-	sha1sums = 4c4638e39f01c782e0e32d950fd29b4a6f4a398a
-	sha1sums = 128049ba8dce9dedc16357b7027736d99d583761
-	sha1sums = 266dd97212b5e269f6c9b0665880cd76e68d83ea
+	sha256sums = 484d8d0ae4c3f7b3b696d5e5f96b7d7d10025aa36f6c5fc919593268224cd29f
+	sha256sums = 835a1058ba926e4c0cfcfbd9ac2266abd057753fdf85f7bb9da7e217432e7e56
+	sha256sums = 84cde583acf2b431a6363eb9d6f6ed98177826add1f80b483da837e5fef52bf4
+	sha256sums = f50c46605d3ae977913f4dcf0c7405e0bdc84322d1fc877ae851706f0e1ae5fd
+	sha256sums = bc870ebde3c5e009605ca76435790ea260a848160db643bf37e4f9de48b5e56c
 
 pkgname = amule-daemon
 
diff --git a/PKGBUILD b/PKGBUILD
index a1771f5701d7..799db2e2ba0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 
 pkgname=amule-daemon
-pkgver=r10964
+pkgver=r10983
 pkgrel=1
 pkgdesc='An eMule-like client for the eD2k and Kademlia p2p networks. (Only Daemon, CLI tools and Webserver)'
 url='http://www.amule.org'
@@ -13,9 +13,7 @@ depends=('wxbase-light'
          'libpng'
          'boost-libs'
          )
-makedepends=('ccache'
-             'boost'
-             )
+makedepends=('boost')
 conflicts=('amule')
 optdepends=('kamule: AmuleGUI for KDE')
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-${pkgver}.tar.bz2"
@@ -24,12 +22,12 @@ source=("http://amule.sourceforge.net/tarballs/aMule-SVN-${pkgver}.tar.bz2"
         'amuleweb.service'
         'amule.sysuser'
         )
-sha1sums=('cdd36b953d36db1308f92794232ce98243438a53'
-          '3a2b451c3a35ab1745dd88726fe1454bc1227542'
-          '4c4638e39f01c782e0e32d950fd29b4a6f4a398a'
-          '128049ba8dce9dedc16357b7027736d99d583761'
-          '266dd97212b5e269f6c9b0665880cd76e68d83ea'
-          )
+sha256sums=('484d8d0ae4c3f7b3b696d5e5f96b7d7d10025aa36f6c5fc919593268224cd29f'
+            '835a1058ba926e4c0cfcfbd9ac2266abd057753fdf85f7bb9da7e217432e7e56'
+            '84cde583acf2b431a6363eb9d6f6ed98177826add1f80b483da837e5fef52bf4'
+            'f50c46605d3ae977913f4dcf0c7405e0bdc84322d1fc877ae851706f0e1ae5fd'
+            'bc870ebde3c5e009605ca76435790ea260a848160db643bf37e4f9de48b5e56c'
+            )
 install=amule-daemon.install
 
 prepare() {
@@ -44,7 +42,7 @@ build() {
   ../"aMule-SVN-${pkgver}"/configure \
     --prefix=/usr \
     --disable-monolithic \
-    --enable-{alcc,amule-daemon,amulecmd,ccache,fileview,optimize,upnp,webserver,mmap} \
+    --enable-{alcc,amule-daemon,amulecmd,fileview,optimize,upnp,webserver,mmap} \
     --with-boost=/usr/include \
     --with-toolkit=base \
     --with-wx-config=/usr/lib/wx/config/base-unicode-3.0
diff --git a/amule-daemon.install b/amule-daemon.install
index 6e561e844617..1579e001c963 100644
--- a/amule-daemon.install
+++ b/amule-daemon.install
@@ -11,7 +11,7 @@ _instructions() {
   ${blue}->${all_off} You also need to specify amuleweb password.
      Please follow ${bold}https://wiki.archlinux.org/index.php/AMule${all_off} for more information.
   ${blue}->${all_off} Service '${bold}amule${all_off}' can be started as '${bold}systemctl start amule${all_off}'.
-  ${blue}->${all_off} Service '${bold}amule@${all_off}' (by user) can be started as '${bold}systemctl start amule@${all_off}'
+  ${blue}->${all_off} Service '${bold}amule@${all_off}' (by user) can be started as '${bold}systemctl start amule@USER${all_off}'
   ${blue}->${all_off} Service '${bold}amuleweb${all_off}' can be started as '${bold}systemctl start amuleweb${all_off}'.\n"
 }
 
@@ -46,8 +46,6 @@ post_upgrade() {
     _instructions_if_amuled_exist
   fi
 
-  systemd-sysusers amule.conf
-
   install -dm744 -o amule -g amule /var/lib/amule
 }