[arch-commits] Commit in amule/trunk (4 files)
Date: Thursday, June 15, 2017 @ 07:08:01
Author: arojas
Revision: 237107
Switch to sysusers
Added:
amule/trunk/amule.sysusers
amule/trunk/amule.tmpfiles
Modified:
amule/trunk/PKGBUILD
amule/trunk/amule.install
+
PKGBUILD | 29 +
amule.install |5 -
amule.sysusers |2 ++
amule.tmpfiles |1 +
4 files changed, 20 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-15 06:52:16 UTC (rev 237106)
+++ PKGBUILD2017-06-15 07:08:01 UTC (rev 237107)
@@ -1,5 +1,6 @@
# $Id$
-# Maintainer: Giovanni Scafora
+# Maintainer: Antonio Rojas
+# Contributor: Giovanni Scafora
# Contributor: Henrik Ronellenfitsch
# Contributor: Alessio Sergi
# Contributor: Dario 'Dax' Vilardi
@@ -7,20 +8,21 @@
pkgname=amule
pkgver=10990
-pkgrel=1
+pkgrel=2
pkgdesc="An eMule-like client for ed2k p2p network"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
url="http://www.amule.org";
-license=('GPL')
-depends=('wxgtk2' 'gd' 'geoip' 'libupnp' 'crypto++' 'boost-libs')
-makedepends=('git' 'ccache' 'boost')
+license=(GPL)
+depends=(wxgtk2 gd geoip libupnp crypto++ boost-libs)
+makedepends=(git ccache boost)
install=amule.install
source=("git://repo.or.cz/amule.git#tag=amule-svn-r$pkgver"
-'amuled.systemd'
-'amuleweb.systemd')
+amuled.systemd amuleweb.systemd amule.sysusers amule.tmpfiles)
sha256sums=('SKIP'
'527a2cca6d56b8269722aafc77a89734f59a929f946f342bd0f69b256f9c7522'
-'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2')
+'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
+'bb25648a121c85f8b2d9b83ccfa691a5f1f475aeaae4570ecde7581baa3bf0ac'
+'e9d1b7019c7075b0f8616c6507a767b87de8f899936680e9ff5829d8cbba224d')
build() {
cd amule
@@ -47,8 +49,11 @@
package() {
cd amule
- make DESTDIR=${pkgdir} install
+ 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"
+ install -Dm644 "$srcdir"/amuled.systemd
"$pkgdir"/usr/lib/systemd/system/amuled.service
+ install -Dm644 "$srcdir"/amuleweb.systemd
"$pkgdir"/usr/lib/systemd/system/amuleweb.service
+ install -Dm644 "$srcdir"/amule.sysusers
"$pkgdir"/usr/lib/sysusers.d/amule.conf
+ install -Dm644 "$srcdir"/amule.tmpfiles
"$pkgdir"/usr/lib/tmpfiles.d/amule.conf
+
}
Modified: amule.install
===
--- amule.install 2017-06-15 06:52:16 UTC (rev 237106)
+++ amule.install 2017-06-15 07:08:01 UTC (rev 237107)
@@ -1,6 +1,5 @@
post_install() {
post_upgrade
- passwd -l amule &>/dev/null
}
_config_instructions() {
@@ -12,10 +11,6 @@
}
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 --system -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
Added: amule.sysusers
===
--- amule.sysusers (rev 0)
+++ amule.sysusers 2017-06-15 07:08:01 UTC (rev 237107)
@@ -0,0 +1,2 @@
+u amule - "aMule Client" /var/lib/amule
+g amule -
Added: amule.tmpfiles
===
--- amule.tmpfiles (rev 0)
+++ amule.tmpfiles 2017-06-15 07:08:01 UTC (rev 237107)
@@ -0,0 +1 @@
+d /var/lib/amule 0750 amule amule
[arch-commits] Commit in amule/trunk (4 files)
Date: Sunday, October 27, 2013 @ 15:10:11
Author: giovanni
Revision: 197596
upgpkg: amule 10808-2
Fixed FS35728
Added:
amule/trunk/amule.install
amule/trunk/amuled.systemd
amule/trunk/amuleweb.systemd
Modified:
amule/trunk/PKGBUILD
--+
PKGBUILD | 17 +
amule.install| 29 +
amuled.systemd | 11 +++
amuleweb.systemd | 13 +
4 files changed, 66 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-10-27 14:08:48 UTC (rev 197595)
+++ PKGBUILD2013-10-27 14:10:11 UTC (rev 197596)
@@ -3,17 +3,23 @@
# Contributor: Henrik Ronellenfitsch
# Contributor: Alessio Sergi
# Contributor: Dario 'Dax' Vilardi
+# Contributor: Anatol Pomozov
pkgname=amule
pkgver=10808
-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++')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2";)
-md5sums=('68099241871f4e47eee06bebc7ce20a1')
+install=amule.install
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2";
+'amuled.systemd'
+'amuleweb.systemd')
+md5sums=('68099241871f4e47eee06bebc7ce20a1'
+ '59772c41860e238f1c822feb8ca8d47f'
+ '05975c5d94bfc41fddb894d98b1115d5')
build() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
@@ -40,5 +46,8 @@
package() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
- make DESTDIR=${pkgdir}/ install
+ 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"
}
Added: amule.install
===
--- amule.install (rev 0)
+++ amule.install 2013-10-27 14:10:11 UTC (rev 197596)
@@ -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
+}
Added: amuled.systemd
===
--- amuled.systemd (rev 0)
+++ amuled.systemd 2013-10-27 14:10:11 UTC (rev 197596)
@@ -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
Added: amuleweb.systemd
===
--- amuleweb.systemd(rev 0)
+++ amuleweb.systemd2013-10-27 14:10:11 UTC (rev 197596)
@@ -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
[arch-commits] Commit in amule/trunk (4 files)
Date: Saturday, June 8, 2013 @ 19:28:18
Author: giovanni
Revision: 188083
upgpkg: amule 10803-2
reverted to the previous release
Modified:
amule/trunk/PKGBUILD
Deleted:
amule/trunk/amule.install
amule/trunk/amuled.systemd
amule/trunk/amuleweb.systemd
--+
PKGBUILD | 17 -
amule.install| 34 --
amuled.systemd | 11 ---
amuleweb.systemd | 13 -
4 files changed, 4 insertions(+), 71 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-08 11:18:26 UTC (rev 188082)
+++ PKGBUILD2013-06-08 17:28:18 UTC (rev 188083)
@@ -3,23 +3,17 @@
# Contributor: Henrik Ronellenfitsch
# Contributor: Alessio Sergi
# Contributor: Dario 'Dax' Vilardi
-# Contributor: Anatol Pomozov
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 @@
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
}
Deleted: amule.install
===
--- amule.install 2013-06-08 11:18:26 UTC (rev 188082)
+++ amule.install 2013-06-08 17:28:18 UTC (rev 188083)
@@ -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
-}
Deleted: amuled.systemd
===
--- amuled.systemd 2013-06-08 11:18:26 UTC (rev 188082)
+++ amuled.systemd 2013-06-08 17:28:18 UTC (rev 188083)
@@ -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
Deleted: amuleweb.systemd
===
--- amuleweb.systemd2013-06-08 11:18:26 UTC (rev 188082)
+++ amuleweb.systemd2013-06-08 17:28:18 UTC (rev 188083)
@@ -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
[arch-commits] Commit in amule/trunk (4 files)
Date: Tuesday, June 4, 2013 @ 21:44:02
Author: giovanni
Revision: 187175
upgpkg: amule 10803-1
upstream release
Added:
amule/trunk/amule.install
amule/trunk/amuled.systemd
amule/trunk/amuleweb.systemd
Modified:
amule/trunk/PKGBUILD
--+
PKGBUILD | 19 ++-
amule.install| 34 ++
amuled.systemd | 11 +++
amuleweb.systemd | 13 +
4 files changed, 72 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-06-04 19:27:54 UTC (rev 187174)
+++ PKGBUILD2013-06-04 19:44:02 UTC (rev 187175)
@@ -3,17 +3,23 @@
# Contributor: Henrik Ronellenfitsch
# Contributor: Alessio Sergi
# Contributor: Dario 'Dax' Vilardi
+# Contributor: Anatol Pomozov
pkgname=amule
-pkgver=10802
-pkgrel=2
+pkgver=10803
+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++')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2";)
-md5sums=('46bbfbfba0af431b6baa0c30bd35600c')
+install=amule.install
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2";
+'amuled.systemd'
+'amuleweb.systemd')
+md5sums=('febf14f5b1185f25acde64f61b78ed38'
+ '59772c41860e238f1c822feb8ca8d47f'
+ '05975c5d94bfc41fddb894d98b1115d5')
build() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
@@ -40,5 +46,8 @@
package() {
cd "${srcdir}/aMule-SVN-r${pkgver}"
- make DESTDIR=${pkgdir}/ install
+ 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"
}
Added: amule.install
===
--- amule.install (rev 0)
+++ amule.install 2013-06-04 19:44:02 UTC (rev 187175)
@@ -0,0 +1,34 @@
+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
+}
Added: amuled.systemd
===
--- amuled.systemd (rev 0)
+++ amuled.systemd 2013-06-04 19:44:02 UTC (rev 187175)
@@ -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
Added: amuleweb.systemd
===
--- amuleweb.systemd(rev 0)
+++ amuleweb.systemd2013-06-04 19:44:02 UTC (rev 187175)
@@ -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
