Sun Jun 9 00:50:45 PDT 2013

4 files changed, 5 insertions, 72 deletions

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index fc02817fe..61b564fab 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,25 +1,19 @@
-# $Id: PKGBUILD 187176 2013-06-04 19:44:11Z giovanni $
+# $Id: PKGBUILD 188084 2013-06-08 17:28:25Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
-# Contributor: Anatol Pomozov <anatol@google.com>
 
 pkgname=amule
 pkgver=10803
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
 depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
-install=amule.install
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
-        'amuled.systemd'
-        'amuleweb.systemd')
-md5sums=('febf14f5b1185f25acde64f61b78ed38'
-         '59772c41860e238f1c822feb8ca8d47f'
-         '05975c5d94bfc41fddb894d98b1115d5')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
+md5sums=('febf14f5b1185f25acde64f61b78ed38')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
@@ -46,8 +40,5 @@ build() {
 package() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
-  make DESTDIR=${pkgdir} install
-
-  install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
-  install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
+  make DESTDIR=${pkgdir}/ install
 }
diff --git a/extra/amule/amule.install b/extra/amule/amule.install
deleted file mode 100644
index 397f68bf2..000000000
--- a/extra/amule/amule.install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
-  post_upgrade
-  passwd -l amule &>/dev/null
-
-  # Generate a random password for amuled<->amuleweb communication
-  ec_password=$(tr -cd '[:alnum:]' < /dev/urandom | fold -w30 | head -n1)
-  encripted_ec_password=$(echo -n $ec_password | md5sum | cut -d ' ' -f 1)
-  # Create a config file
-  sudo -u amule mkdir -p /var/lib/amule/.aMule
-  echo "[ExternalConnect]
-AcceptExternalConnections=1
-ECPassword=$encripted_ec_password" > /var/lib/amule/.aMule/amule.conf
-
-  sudo -u amule /usr/bin/amuleweb --write-config --password=$ec_password --admin-pass=amule
-
-  echo "A new password for extarnal configuration is generated: $ec_password"
-  echo "Please follow https://wiki.archlinux.org/index.php/AMule how to setup"
-  echo "external connection (e.g. using amule-gui tool)."
-  echo "amuleweb can be started as 'systemctl start amuleweb'."
-  echo "Password for amuleweb: amule"
-}
-
-post_upgrade() {
-  # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-  getent group amule >/dev/null || groupadd amule
-  getent passwd amule >/dev/null || useradd -c 'aMule Client' -g amule -b '/var/lib' -m -s /bin/false amule
-}
-
-post_remove(){
-  /usr/bin/systemctl stop amuled.service amuleweb.service
-
-  getent passwd amule >/dev/null && userdel amule
-  getent group amule >/dev/null && groupdel amule
-}
diff --git a/extra/amule/amuled.systemd b/extra/amule/amuled.systemd
deleted file mode 100644
index e1878dfd9..000000000
--- a/extra/amule/amuled.systemd
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=aMule Daemon
-After=network.target
-
-# This assumes that a user 'amule' exists, with a writeable home directory
-[Service]
-User=amule
-ExecStart=/usr/bin/amuled
-
-[Install]
-WantedBy=multi-user.target
diff --git a/extra/amule/amuleweb.systemd b/extra/amule/amuleweb.systemd
deleted file mode 100644
index 1799f4ae8..000000000
--- a/extra/amule/amuleweb.systemd
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=aMule Webserver
-Requires=amuled.service
-
-[Service]
-User=amule
-ExecStart=/usr/bin/amuleweb --quiet
-# If amuled still starting then amuleweb exits, restart until amuleweb is up 
-Restart=on-success
-RestartSec=3s
-
-[Install]
-WantedBy=multi-user.target