summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMantas Mikulėnas2016-11-02 19:33:07 +0200
committerMantas Mikulėnas2016-11-02 19:33:07 +0200
commitdbc91eb1fa24f4bb84a5bca37db39d0c78980b6a (patch)
tree6da500c0be9bc61b1ccea9ce95113b0c2aea013a
parent6bbbb53853edfa2fa7617f1b6b3ceb723c973bcb (diff)
downloadaur-dbc91eb1fa24f4bb84a5bca37db39d0c78980b6a.tar.gz
release 6.0.1477634051
Which has fixed the conflicts upstream anyway.
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD16
2 files changed, 10 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c06d11af0fcc..245b07f5e50c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Wed Mar 16 11:04:38 UTC 2016
+# Wed Nov 2 17:30:25 UTC 2016
pkgbase = globus-toolkit
pkgdesc = Toolkit for building grids
- pkgver = 6.0.1453307864
+ pkgver = 6.0.1477634051
pkgrel = 1
url = http://toolkit.globus.org/
install = globus.install
@@ -10,16 +10,16 @@ pkgbase = globus-toolkit
arch = x86_64
license = APACHE
optdepends = igtf-trust-anchors: EUGridPMA trusted certificate authorities
- provides = globus=6.0.1453307864
+ provides = globus=6.0.1477634051
provides = gsissh=6.4p1
- provides = myproxy=6.0.1453307864
+ provides = myproxy=6.0.1477634051
conflicts = globus
conflicts = myproxy
replaces = globus
options = !emptydirs
- source = http://toolkit.globus.org/ftppub/gt6/installers/src/globus_toolkit-6.0.1453307864.tar.gz
+ source = http://toolkit.globus.org/ftppub/gt6/installers/src/globus_toolkit-6.0.1477634051.tar.gz
source = globus.sysusers
- sha512sums = b2963b9b99e962dd4ab7db8eb129e8b1e64cadffaca8a55276e26e9ee9fa8ce2052859d01e3fad1b54c5b70b3322d4669d1ff0e1ef62032e0017771296c65610
+ sha512sums = 614f5861100dfb669e4301529fd63aa1ab171e0280729f5c488809bed8e8e586514c3c15ab5ac10838b60822aa47a6071eca280d8bd64b02b3936da68737e3c9
sha512sums = d2283c775e549e6e72366887a592248b1ae46a83134034fd66c05982e2fb5fde8300e6f68a5b52818adfc53656e77086dcf767b93759868cb3797dae2777cb00
pkgname = globus-toolkit
diff --git a/PKGBUILD b/PKGBUILD
index 46a4f67fdcaa..2e5d19ff64f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Thiago Yukio Kikuchi Oliveira <stratust@gmail.com>
pkgname=globus-toolkit
-pkgver=6.0.1453307864
+pkgver=6.0.1477634051
pkgrel=1
pkgdesc="Toolkit for building grids"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ replaces=(globus)
conflicts=(globus myproxy)
source=(http://toolkit.globus.org/ftppub/gt6/installers/src/globus_toolkit-$pkgver.tar.gz
globus.sysusers)
-sha512sums=('b2963b9b99e962dd4ab7db8eb129e8b1e64cadffaca8a55276e26e9ee9fa8ce2052859d01e3fad1b54c5b70b3322d4669d1ff0e1ef62032e0017771296c65610'
+sha512sums=('614f5861100dfb669e4301529fd63aa1ab171e0280729f5c488809bed8e8e586514c3c15ab5ac10838b60822aa47a6071eca280d8bd64b02b3936da68737e3c9'
'd2283c775e549e6e72366887a592248b1ae46a83134034fd66c05982e2fb5fde8300e6f68a5b52818adfc53656e77086dcf767b93759868cb3797dae2777cb00')
install="globus.install"
options=(!emptydirs)
@@ -25,9 +25,10 @@ build() {
# "libtool: cannot install to a path not ending in /usr/lib"
./configure -C \
--prefix=/usr \
+ --includedir=/usr/include/globus \
+ --libexecdir=/usr/lib/$pkgname \
--sbindir=/usr/bin \
--sysconfdir=/etc/globus \
- --includedir=/usr/include/globus \
--enable-myproxy ;
make
}
@@ -39,15 +40,6 @@ package() {
mkdir -p "$pkgdir"/usr/share/doc/globus/
mv "$pkgdir"/etc/globus/*.default "$pkgdir"/usr/share/doc/globus/
mv "$pkgdir"/etc/globus/init.d "$pkgdir"/usr/share/doc/globus/
- mv "$pkgdir"/usr/bin/sshd "$pkgdir"/usr/bin/ssh.d/sshd
- mv "$pkgdir"/usr/doc/gsi_openssh "$pkgdir"/usr/share/doc/
-
- # handle duplicates which already exist under ssh.d/
- for f in "$pkgdir"/usr/share/man/man*/*; do
- if [[ -e ${f%/*}/ssh.d/${f##*/} ]]; then
- mv "$f" "$f"globus
- fi
- done
cd "$srcdir"
install -Dm 644 globus.sysusers "$pkgdir"/usr/lib/sysusers.d/globus.conf