Date: Wednesday, January 8, 2014 @ 14:17:00 Author: giovanni Revision: 203346
archrelease: copy trunk to extra-i686, extra-x86_64 Added: amule/repos/extra-i686/PKGBUILD (from rev 203345, amule/trunk/PKGBUILD) amule/repos/extra-i686/amule.install (from rev 203345, amule/trunk/amule.install) amule/repos/extra-i686/amuled.systemd (from rev 203345, amule/trunk/amuled.systemd) amule/repos/extra-i686/amuleweb.systemd (from rev 203345, amule/trunk/amuleweb.systemd) amule/repos/extra-x86_64/PKGBUILD (from rev 203345, amule/trunk/PKGBUILD) amule/repos/extra-x86_64/amule.install (from rev 203345, amule/trunk/amule.install) amule/repos/extra-x86_64/amuled.systemd (from rev 203345, amule/trunk/amuled.systemd) amule/repos/extra-x86_64/amuleweb.systemd (from rev 203345, amule/trunk/amuleweb.systemd) Deleted: amule/repos/extra-i686/PKGBUILD amule/repos/extra-i686/amule.install amule/repos/extra-i686/amuled.systemd amule/repos/extra-i686/amuleweb.systemd amule/repos/extra-x86_64/PKGBUILD amule/repos/extra-x86_64/amule.install amule/repos/extra-x86_64/amuled.systemd amule/repos/extra-x86_64/amuleweb.systemd -------------------------------+ /PKGBUILD | 106 ++++++++++++++++++++++++++++++++++++++++ /amule.install | 58 +++++++++++++++++++++ /amuled.systemd | 22 ++++++++ /amuleweb.systemd | 26 +++++++++ extra-i686/PKGBUILD | 53 -------------------- extra-i686/amule.install | 29 ---------- extra-i686/amuled.systemd | 11 ---- extra-i686/amuleweb.systemd | 13 ---- extra-x86_64/PKGBUILD | 53 -------------------- extra-x86_64/amule.install | 29 ---------- extra-x86_64/amuled.systemd | 11 ---- extra-x86_64/amuleweb.systemd | 13 ---- 12 files changed, 212 insertions(+), 212 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-i686/PKGBUILD 2014-01-08 13:17:00 UTC (rev 203346) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Henrik Ronellenfitsch <seari...@web.de> -# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> -# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> -# Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> - -pkgname=amule -pkgver=10829 -pkgrel=1 -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++' 'libsm') -install=amule.install -source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" - 'amuled.systemd' - 'amuleweb.systemd') -md5sums=('843693d449b81899267d6756ce55a6e0' - '59772c41860e238f1c822feb8ca8d47f' - '05975c5d94bfc41fddb894d98b1115d5') - -build() { - cd "${srcdir}/aMule-SVN-r${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-cas \ - --enable-wxcas \ - --enable-amule-daemon \ - --enable-amulecmd \ - --enable-amule-gui \ - --enable-alc \ - --enable-alcc \ - --enable-webserver \ - --disable-debug \ - --enable-optimize \ - --enable-ccache \ - --enable-geoip \ - --enable-upnp - - make -} - -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" -} Copied: amule/repos/extra-i686/PKGBUILD (from rev 203345, amule/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Henrik Ronellenfitsch <seari...@web.de> +# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> +# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> +# Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> + +pkgname=amule +pkgver=10830 +pkgrel=1 +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++' 'libsm') +install=amule.install +source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" + 'amuled.systemd' + 'amuleweb.systemd') +md5sums=('8ba572ed1c87909ee24652d96f93dc40' + '59772c41860e238f1c822feb8ca8d47f' + '05975c5d94bfc41fddb894d98b1115d5') + +build() { + cd "${srcdir}/aMule-SVN-r${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-cas \ + --enable-wxcas \ + --enable-amule-daemon \ + --enable-amulecmd \ + --enable-amule-gui \ + --enable-alc \ + --enable-alcc \ + --enable-webserver \ + --disable-debug \ + --enable-optimize \ + --enable-ccache \ + --enable-geoip \ + --enable-upnp + + make +} + +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" +} Deleted: extra-i686/amule.install =================================================================== --- extra-i686/amule.install 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-i686/amule.install 2014-01-08 13:17:00 UTC (rev 203346) @@ -1,29 +0,0 @@ -post_install() { - post_upgrade - passwd -l amule &>/dev/null -} - -_config_instructions() { - echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to" - echo "provide [ExternalConnect] configuration." - echo "You also need to specify amuleweb password." - echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information." - echo "amuleweb can be started as 'systemctl start amuleweb'." -} - -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 -d '/var/lib/amule' -m -s /bin/false amule - - if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then - _config_instructions - fi -} - -post_remove() { - # TOTHINK: delete homedir and user account/group? - #getent passwd amule >/dev/null && userdel amule - #getent group amule >/dev/null && groupdel amule - true -} Copied: amule/repos/extra-i686/amule.install (from rev 203345, amule/trunk/amule.install) =================================================================== --- extra-i686/amule.install (rev 0) +++ extra-i686/amule.install 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,29 @@ +post_install() { + post_upgrade + passwd -l amule &>/dev/null +} + +_config_instructions() { + echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to" + echo "provide [ExternalConnect] configuration." + echo "You also need to specify amuleweb password." + echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information." + echo "amuleweb can be started as 'systemctl start amuleweb'." +} + +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 -d '/var/lib/amule' -m -s /bin/false amule + + if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then + _config_instructions + fi +} + +post_remove() { + # TOTHINK: delete homedir and user account/group? + #getent passwd amule >/dev/null && userdel amule + #getent group amule >/dev/null && groupdel amule + true +} Deleted: extra-i686/amuled.systemd =================================================================== --- extra-i686/amuled.systemd 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-i686/amuled.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -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 Copied: amule/repos/extra-i686/amuled.systemd (from rev 203345, amule/trunk/amuled.systemd) =================================================================== --- extra-i686/amuled.systemd (rev 0) +++ extra-i686/amuled.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,11 @@ +[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 Deleted: extra-i686/amuleweb.systemd =================================================================== --- extra-i686/amuleweb.systemd 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-i686/amuleweb.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -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 Copied: amule/repos/extra-i686/amuleweb.systemd (from rev 203345, amule/trunk/amuleweb.systemd) =================================================================== --- extra-i686/amuleweb.systemd (rev 0) +++ extra-i686/amuleweb.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,13 @@ +[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 Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-x86_64/PKGBUILD 2014-01-08 13:17:00 UTC (rev 203346) @@ -1,53 +0,0 @@ -# $Id$ -# Maintainer: Giovanni Scafora <giova...@archlinux.org> -# Contributor: Henrik Ronellenfitsch <seari...@web.de> -# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> -# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> -# Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> - -pkgname=amule -pkgver=10829 -pkgrel=1 -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++' 'libsm') -install=amule.install -source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" - 'amuled.systemd' - 'amuleweb.systemd') -md5sums=('843693d449b81899267d6756ce55a6e0' - '59772c41860e238f1c822feb8ca8d47f' - '05975c5d94bfc41fddb894d98b1115d5') - -build() { - cd "${srcdir}/aMule-SVN-r${pkgver}" - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --enable-cas \ - --enable-wxcas \ - --enable-amule-daemon \ - --enable-amulecmd \ - --enable-amule-gui \ - --enable-alc \ - --enable-alcc \ - --enable-webserver \ - --disable-debug \ - --enable-optimize \ - --enable-ccache \ - --enable-geoip \ - --enable-upnp - - make -} - -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" -} Copied: amule/repos/extra-x86_64/PKGBUILD (from rev 203345, amule/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Giovanni Scafora <giova...@archlinux.org> +# Contributor: Henrik Ronellenfitsch <seari...@web.de> +# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> +# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> +# Contributor: Anatol Pomozov <anatol.pomo...@gmail.com> + +pkgname=amule +pkgver=10830 +pkgrel=1 +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++' 'libsm') +install=amule.install +source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" + 'amuled.systemd' + 'amuleweb.systemd') +md5sums=('8ba572ed1c87909ee24652d96f93dc40' + '59772c41860e238f1c822feb8ca8d47f' + '05975c5d94bfc41fddb894d98b1115d5') + +build() { + cd "${srcdir}/aMule-SVN-r${pkgver}" + + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --enable-cas \ + --enable-wxcas \ + --enable-amule-daemon \ + --enable-amulecmd \ + --enable-amule-gui \ + --enable-alc \ + --enable-alcc \ + --enable-webserver \ + --disable-debug \ + --enable-optimize \ + --enable-ccache \ + --enable-geoip \ + --enable-upnp + + make +} + +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" +} Deleted: extra-x86_64/amule.install =================================================================== --- extra-x86_64/amule.install 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-x86_64/amule.install 2014-01-08 13:17:00 UTC (rev 203346) @@ -1,29 +0,0 @@ -post_install() { - post_upgrade - passwd -l amule &>/dev/null -} - -_config_instructions() { - echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to" - echo "provide [ExternalConnect] configuration." - echo "You also need to specify amuleweb password." - echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information." - echo "amuleweb can be started as 'systemctl start amuleweb'." -} - -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 -d '/var/lib/amule' -m -s /bin/false amule - - if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then - _config_instructions - fi -} - -post_remove() { - # TOTHINK: delete homedir and user account/group? - #getent passwd amule >/dev/null && userdel amule - #getent group amule >/dev/null && groupdel amule - true -} Copied: amule/repos/extra-x86_64/amule.install (from rev 203345, amule/trunk/amule.install) =================================================================== --- extra-x86_64/amule.install (rev 0) +++ extra-x86_64/amule.install 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,29 @@ +post_install() { + post_upgrade + passwd -l amule &>/dev/null +} + +_config_instructions() { + echo "If you plan to use external client (e.g. amuleGUI or amuleweb) then you need to" + echo "provide [ExternalConnect] configuration." + echo "You also need to specify amuleweb password." + echo "Please follow https://wiki.archlinux.org/index.php/AMule for more information." + echo "amuleweb can be started as 'systemctl start amuleweb'." +} + +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 -d '/var/lib/amule' -m -s /bin/false amule + + if [ ! -e /var/lib/amule/.aMule/amule.conf ]; then + _config_instructions + fi +} + +post_remove() { + # TOTHINK: delete homedir and user account/group? + #getent passwd amule >/dev/null && userdel amule + #getent group amule >/dev/null && groupdel amule + true +} Deleted: extra-x86_64/amuled.systemd =================================================================== --- extra-x86_64/amuled.systemd 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-x86_64/amuled.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -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 Copied: amule/repos/extra-x86_64/amuled.systemd (from rev 203345, amule/trunk/amuled.systemd) =================================================================== --- extra-x86_64/amuled.systemd (rev 0) +++ extra-x86_64/amuled.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,11 @@ +[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 Deleted: extra-x86_64/amuleweb.systemd =================================================================== --- extra-x86_64/amuleweb.systemd 2014-01-08 13:16:52 UTC (rev 203345) +++ extra-x86_64/amuleweb.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -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 Copied: amule/repos/extra-x86_64/amuleweb.systemd (from rev 203345, amule/trunk/amuleweb.systemd) =================================================================== --- extra-x86_64/amuleweb.systemd (rev 0) +++ extra-x86_64/amuleweb.systemd 2014-01-08 13:17:00 UTC (rev 203346) @@ -0,0 +1,13 @@ +[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