Date: Sunday, December 6, 2015 @ 21:25:18 Author: foutrelis Revision: 149166
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: mldonkey/repos/community-staging-i686/ mldonkey/repos/community-staging-i686/PKGBUILD (from rev 149165, mldonkey/trunk/PKGBUILD) mldonkey/repos/community-staging-i686/fix_upnpDiscover.patch (from rev 149165, mldonkey/trunk/fix_upnpDiscover.patch) mldonkey/repos/community-staging-i686/mldonkey.conf (from rev 149165, mldonkey/trunk/mldonkey.conf) mldonkey/repos/community-staging-i686/mldonkey.install (from rev 149165, mldonkey/trunk/mldonkey.install) mldonkey/repos/community-staging-i686/mldonkey.service (from rev 149165, mldonkey/trunk/mldonkey.service) mldonkey/repos/community-staging-i686/mldonkey.tmpfiles (from rev 149165, mldonkey/trunk/mldonkey.tmpfiles) mldonkey/repos/community-staging-x86_64/ mldonkey/repos/community-staging-x86_64/PKGBUILD (from rev 149165, mldonkey/trunk/PKGBUILD) mldonkey/repos/community-staging-x86_64/fix_upnpDiscover.patch (from rev 149165, mldonkey/trunk/fix_upnpDiscover.patch) mldonkey/repos/community-staging-x86_64/mldonkey.conf (from rev 149165, mldonkey/trunk/mldonkey.conf) mldonkey/repos/community-staging-x86_64/mldonkey.install (from rev 149165, mldonkey/trunk/mldonkey.install) mldonkey/repos/community-staging-x86_64/mldonkey.service (from rev 149165, mldonkey/trunk/mldonkey.service) mldonkey/repos/community-staging-x86_64/mldonkey.tmpfiles (from rev 149165, mldonkey/trunk/mldonkey.tmpfiles) -------------------------------------------------+ community-staging-i686/PKGBUILD | 55 ++++++++++++++++++++++ community-staging-i686/fix_upnpDiscover.patch | 13 +++++ community-staging-i686/mldonkey.conf | 2 community-staging-i686/mldonkey.install | 29 +++++++++++ community-staging-i686/mldonkey.service | 10 ++++ community-staging-i686/mldonkey.tmpfiles | 1 community-staging-x86_64/PKGBUILD | 55 ++++++++++++++++++++++ community-staging-x86_64/fix_upnpDiscover.patch | 13 +++++ community-staging-x86_64/mldonkey.conf | 2 community-staging-x86_64/mldonkey.install | 29 +++++++++++ community-staging-x86_64/mldonkey.service | 10 ++++ community-staging-x86_64/mldonkey.tmpfiles | 1 12 files changed, 220 insertions(+) Copied: mldonkey/repos/community-staging-i686/PKGBUILD (from rev 149165, mldonkey/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> + +pkgname=mldonkey +pkgver=3.1.5 +pkgrel=6 +pkgdesc='A multi-network P2P client' +arch=(i686 x86_64) +url='http://mldonkey.sourceforge.net/' +license=(GPL) +depends=(file gd miniupnpc libnatpmp) +makedepends=(gtk2 librsvg) # we build our own version of ocaml and lablgtk2 +optdepends=('librsvg: GUI support' + 'gtk2: GUI support') +backup=(etc/conf.d/mldonkey) +install=mldonkey.install +source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 + mldonkey.conf + mldonkey.service + mldonkey.tmpfiles + http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz + https://forge.ocamlcore.org/frs/download.php/561/lablgtk-2.14.2.tar.gz + fix_upnpDiscover.patch) +sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb' + 'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a' + '778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415' + '45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc' + 'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b' + '4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba' + 'd304bb2eca218dcfbcf7c420bc7375fa2316d5c360325a4e9b48d78d7cf1b7c7') + +prepare() { + cd mldonkey-$pkgver + patch -p1 < ../fix_upnpDiscover.patch +} + +build() { + cd mldonkey-$pkgver + # mldonkey hardcodes its dependencies to some specific version + ln -s "$srcdir"/ocaml-3.12.0.tar.gz "$srcdir"/lablgtk-2.14.2.tar.gz patches/ + ./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp --enable-batch + make +} + +package() { + cd mldonkey-$pkgver + make DESTDIR="$pkgdir" install + + install -Dm644 icons/rsvg/type_source_normal.svg "$pkgdir"/usr/share/icons/mldonkey.svg + install -Dm644 distrib/mldonkey.desktop "$pkgdir"/usr/share/applications/mldonkey.desktop + + install -Dm644 "$srcdir"/mldonkey.conf "$pkgdir"/etc/conf.d/mldonkey + install -Dm644 "$srcdir"/mldonkey.service "$pkgdir"/usr/lib/systemd/system/mldonkey.service + install -Dm644 "$srcdir"/mldonkey.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/mldonkey.conf +} Copied: mldonkey/repos/community-staging-i686/fix_upnpDiscover.patch (from rev 149165, mldonkey/trunk/fix_upnpDiscover.patch) =================================================================== --- community-staging-i686/fix_upnpDiscover.patch (rev 0) +++ community-staging-i686/fix_upnpDiscover.patch 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,13 @@ +diff --git a/src/utils/net/upnp_stubs.c b/src/utils/net/upnp_stubs.c +index 41942f3..272b0cb 100644 +--- a/src/utils/net/upnp_stubs.c ++++ b/src/utils/net/upnp_stubs.c +@@ -640,7 +640,7 @@ upnpPulse( ml_upnpmp_t * map ) + { + struct UPNPDev * devlist; + errno = 0; +- devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0 ); ++ devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0, NULL ); + if( devlist == NULL ) + { + dbg_printf( "upnpDiscover failed (errno %d - %s)\n", errno, str_errno( errno ) ); Copied: mldonkey/repos/community-staging-i686/mldonkey.conf (from rev 149165, mldonkey/trunk/mldonkey.conf) =================================================================== --- community-staging-i686/mldonkey.conf (rev 0) +++ community-staging-i686/mldonkey.conf 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,2 @@ +# Parameters to be passed to the daemon (default is empty) +PARAMS="" Copied: mldonkey/repos/community-staging-i686/mldonkey.install (from rev 149165, mldonkey/trunk/mldonkey.install) =================================================================== --- community-staging-i686/mldonkey.install (rev 0) +++ community-staging-i686/mldonkey.install 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,29 @@ +post_install() { + if ! getent group mldonkey >/dev/null; then + groupadd --system mldonkey + fi + if ! getent passwd mldonkey >/dev/null; then + useradd --system -c 'Mldonkey daemon user' -g mldonkey -d /var/lib/mldonkey -s /bin/false mldonkey + fi + + mkdir -p /var/lib/mldonkey + chown mldonkey:mldonkey /var/lib/mldonkey + + if type -P update-desktop-database &> /dev/null; then + update-desktop-database -q + fi + + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create mldonkey.conf + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if type -P update-desktop-database &> /dev/null; then + update-desktop-database -q + fi +} Copied: mldonkey/repos/community-staging-i686/mldonkey.service (from rev 149165, mldonkey/trunk/mldonkey.service) =================================================================== --- community-staging-i686/mldonkey.service (rev 0) +++ community-staging-i686/mldonkey.service 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,10 @@ +[Unit] +Description=Mldonkey - Multiple Peer-To-Peer Network Client +After=network.target + +[Service] +User=mldonkey +ExecStart=/usr/bin/mlnet -log_to_syslog true -log_file /dev/null -pid /run/mldonkey + +[Install] +WantedBy=multi-user.target Copied: mldonkey/repos/community-staging-i686/mldonkey.tmpfiles (from rev 149165, mldonkey/trunk/mldonkey.tmpfiles) =================================================================== --- community-staging-i686/mldonkey.tmpfiles (rev 0) +++ community-staging-i686/mldonkey.tmpfiles 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1 @@ +d /run/mldonkey 755 mldonkey mldonkey - Copied: mldonkey/repos/community-staging-x86_64/PKGBUILD (from rev 149165, mldonkey/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,55 @@ +# $Id$ +# Maintainer: Anatol Pomozov <anatol.pomo...@gmail.com> + +pkgname=mldonkey +pkgver=3.1.5 +pkgrel=6 +pkgdesc='A multi-network P2P client' +arch=(i686 x86_64) +url='http://mldonkey.sourceforge.net/' +license=(GPL) +depends=(file gd miniupnpc libnatpmp) +makedepends=(gtk2 librsvg) # we build our own version of ocaml and lablgtk2 +optdepends=('librsvg: GUI support' + 'gtk2: GUI support') +backup=(etc/conf.d/mldonkey) +install=mldonkey.install +source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 + mldonkey.conf + mldonkey.service + mldonkey.tmpfiles + http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz + https://forge.ocamlcore.org/frs/download.php/561/lablgtk-2.14.2.tar.gz + fix_upnpDiscover.patch) +sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb' + 'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a' + '778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415' + '45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc' + 'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b' + '4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba' + 'd304bb2eca218dcfbcf7c420bc7375fa2316d5c360325a4e9b48d78d7cf1b7c7') + +prepare() { + cd mldonkey-$pkgver + patch -p1 < ../fix_upnpDiscover.patch +} + +build() { + cd mldonkey-$pkgver + # mldonkey hardcodes its dependencies to some specific version + ln -s "$srcdir"/ocaml-3.12.0.tar.gz "$srcdir"/lablgtk-2.14.2.tar.gz patches/ + ./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp --enable-batch + make +} + +package() { + cd mldonkey-$pkgver + make DESTDIR="$pkgdir" install + + install -Dm644 icons/rsvg/type_source_normal.svg "$pkgdir"/usr/share/icons/mldonkey.svg + install -Dm644 distrib/mldonkey.desktop "$pkgdir"/usr/share/applications/mldonkey.desktop + + install -Dm644 "$srcdir"/mldonkey.conf "$pkgdir"/etc/conf.d/mldonkey + install -Dm644 "$srcdir"/mldonkey.service "$pkgdir"/usr/lib/systemd/system/mldonkey.service + install -Dm644 "$srcdir"/mldonkey.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/mldonkey.conf +} Copied: mldonkey/repos/community-staging-x86_64/fix_upnpDiscover.patch (from rev 149165, mldonkey/trunk/fix_upnpDiscover.patch) =================================================================== --- community-staging-x86_64/fix_upnpDiscover.patch (rev 0) +++ community-staging-x86_64/fix_upnpDiscover.patch 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,13 @@ +diff --git a/src/utils/net/upnp_stubs.c b/src/utils/net/upnp_stubs.c +index 41942f3..272b0cb 100644 +--- a/src/utils/net/upnp_stubs.c ++++ b/src/utils/net/upnp_stubs.c +@@ -640,7 +640,7 @@ upnpPulse( ml_upnpmp_t * map ) + { + struct UPNPDev * devlist; + errno = 0; +- devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0 ); ++ devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0, NULL ); + if( devlist == NULL ) + { + dbg_printf( "upnpDiscover failed (errno %d - %s)\n", errno, str_errno( errno ) ); Copied: mldonkey/repos/community-staging-x86_64/mldonkey.conf (from rev 149165, mldonkey/trunk/mldonkey.conf) =================================================================== --- community-staging-x86_64/mldonkey.conf (rev 0) +++ community-staging-x86_64/mldonkey.conf 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,2 @@ +# Parameters to be passed to the daemon (default is empty) +PARAMS="" Copied: mldonkey/repos/community-staging-x86_64/mldonkey.install (from rev 149165, mldonkey/trunk/mldonkey.install) =================================================================== --- community-staging-x86_64/mldonkey.install (rev 0) +++ community-staging-x86_64/mldonkey.install 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,29 @@ +post_install() { + if ! getent group mldonkey >/dev/null; then + groupadd --system mldonkey + fi + if ! getent passwd mldonkey >/dev/null; then + useradd --system -c 'Mldonkey daemon user' -g mldonkey -d /var/lib/mldonkey -s /bin/false mldonkey + fi + + mkdir -p /var/lib/mldonkey + chown mldonkey:mldonkey /var/lib/mldonkey + + if type -P update-desktop-database &> /dev/null; then + update-desktop-database -q + fi + + if type -P systemd-tmpfiles &> /dev/null; then + systemd-tmpfiles --create mldonkey.conf + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if type -P update-desktop-database &> /dev/null; then + update-desktop-database -q + fi +} Copied: mldonkey/repos/community-staging-x86_64/mldonkey.service (from rev 149165, mldonkey/trunk/mldonkey.service) =================================================================== --- community-staging-x86_64/mldonkey.service (rev 0) +++ community-staging-x86_64/mldonkey.service 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1,10 @@ +[Unit] +Description=Mldonkey - Multiple Peer-To-Peer Network Client +After=network.target + +[Service] +User=mldonkey +ExecStart=/usr/bin/mlnet -log_to_syslog true -log_file /dev/null -pid /run/mldonkey + +[Install] +WantedBy=multi-user.target Copied: mldonkey/repos/community-staging-x86_64/mldonkey.tmpfiles (from rev 149165, mldonkey/trunk/mldonkey.tmpfiles) =================================================================== --- community-staging-x86_64/mldonkey.tmpfiles (rev 0) +++ community-staging-x86_64/mldonkey.tmpfiles 2015-12-06 20:25:18 UTC (rev 149166) @@ -0,0 +1 @@ +d /run/mldonkey 755 mldonkey mldonkey -