diff --git a/community/boinc/PKGBUILD b/community/boinc/PKGBUILD index 7599ac7b9..26b52e967 100644 --- a/community/boinc/PKGBUILD +++ b/community/boinc/PKGBUILD @@ -9,8 +9,8 @@ pkgbase=boinc pkgname=(boinc boinc-nox) -pkgver=7.8.6 -_tag="client_release/7.8/$pkgver" +pkgver=7.10.3 +_tag="client_release/7/$pkgver" pkgrel=1 arch=('x86_64') url="http://boinc.berkeley.edu/" @@ -20,25 +20,18 @@ makedepends=('curl' 'freeglut' 'glu' 'inetutils' 'libnotify' 'libnsl' 'libxmu' ' install=$pkgbase.install options=('!staticlibs') source=("$pkgbase-$pkgver.tar.gz::https://github.com/BOINC/boinc/archive/$_tag.tar.gz" - https://github.com/BOINC/boinc/commit/e86f29e7fbc78faff6c9b9c8356ffe59049c116f.patch boinc.bash boinc.desktop - boinc.service boinc.sysusers) -sha512sums=('e565fff30bc7214ae48548ae726544be3c8b09455a8c78a9e30410fd6cffe3b04b2e5c7f54381fa4190aa8adb259243b7d6443b6760c038ed8347edfed1ba997' - '565ac560d4ea1c82f238153c47d076d63eb2d839cba10de9fb7c86c8b89b9994f807347a564c3e05d75231019e259c3afc399b203eb0bd83ac2572db54c4e56f' +sha512sums=('06232f4cfa95d2769ee2a3b624883b7e695b3e0b4ef249802510c1a131858c675971ca3750b7b9842c66709c1f2e21325e5b788d683d0ea598cf6a37f9fa023e' 'dec4bb6e571c2d99e1f57295149399eee03a8ec41b07ec3f7f197b910d246dcd6a5eb880301c9cd3a039d8c5aa6b07babf6ab4cae5f242c419c8cd71f56b90f5' 'b3fcd703a6f683d246242543c2f7b5fcfe403cb95b7786f1418b24c3dfb7c54c6b8c4816c0e9ae56b5ee4e4cae63f153ec522b04bf02f4f835dd90ac0e0ae204' - '395343369cc02da33a0d61bdc45fd8812f4f881a2efbb684b07f8d727d1896ef558c875d42e93e7743004e1efe6226361b53c0ea1cb1e8323ec605caa833774e' '85804d7e6b7e07f06e93e8c42507f5cd0b9415257d6ac7421603a2b6084699d847ae9720c1cf9e9793b750dfb768375116843b988b287ee7c66c1374e18f7934') prepare() { mv boinc-client_release-*-$pkgver $pkgbase-$pkgver cd $pkgbase-$pkgver - # https://github.com/BOINC/boinc/pull/2092 - patch -p1 -i ../e86f29e7fbc78faff6c9b9c8356ffe59049c116f.patch - cp -r "$srcdir"/$pkgbase-$pkgver{,-nox} ./_autosetup @@ -60,6 +53,7 @@ build() { cd "$srcdir"/$pkgbase-$pkgver LDFLAGS='-lX11' ./configure \ --prefix=/usr \ + --sysconfdir=/etc \ --enable-libraries \ --enable-unicode \ --enable-shared \ @@ -79,6 +73,7 @@ build() { cd "$srcdir"/$pkgbase-$pkgver-nox PKG_CONFIG=/usr/bin/pkg-config ./configure \ --prefix=/usr \ + --sysconfdir=/etc \ --enable-libraries \ --enable-unicode \ --enable-shared \ @@ -102,9 +97,6 @@ package_boinc() { make DESTDIR="$pkgdir" install - #install systemd unit - install -Dm644 "${srcdir}/$pkgbase.service" "${pkgdir}/usr/lib/systemd/system/$pkgbase.service" - #install sysusers conf install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf" @@ -131,9 +123,6 @@ package_boinc-nox() { make DESTDIR="$pkgdir" install - #install systemd unit - install -Dm644 "${srcdir}/$pkgbase.service" "${pkgdir}/usr/lib/systemd/system/$pkgbase.service" - #install sysusers conf install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf" diff --git a/community/boinc/boinc.install b/community/boinc/boinc.install index da9a28674..1ef04493a 100644 --- a/community/boinc/boinc.install +++ b/community/boinc/boinc.install @@ -6,3 +6,10 @@ post_install() { mkdir -p var/lib/boinc chown -R boinc:boinc var/lib/boinc } + +post_upgrade() { + if (( $(vercmp $2 7.10.3) < 0)); then + echo "Since 7.10.3, upstream provided boinc-client.service is used instead of our own one." + echo "Please enable/start the new boinc-client.service if desired." + fi +} diff --git a/community/boinc/boinc.service b/community/boinc/boinc.service deleted file mode 100644 index 12634ff5a..000000000 --- a/community/boinc/boinc.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=BOINC Daemon - -[Service] -User=boinc -Nice=19 -ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio - -[Install] -WantedBy=multi-user.target