summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavion2017-09-13 09:21:03 +1000
committerXavion2017-09-13 09:21:03 +1000
commitdf565c75c4a79d4f68356ecb79bcee9d35c744db (patch)
tree666987f8b16a3908ae6c017928d4bbb3949b882e
parentc90826ed705b16d213a13a51edeec8cf02d0ddcd (diff)
downloadaur-df565c75c4a7.tar.gz
Update to 2.1.0.174-3
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD18
-rw-r--r--systemd3
3 files changed, 18 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index af20f832a45..7ab737026f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
pkgbase = logmein-hamachi
pkgdesc = A zero-configuration VPN service
pkgver = 2.1.0.174
- pkgrel = 2
+ pkgrel = 3
url = https://www.vpn.net/linux
arch = i686
arch = x86_64
arch = arm
arch = armv7h
license = custom
- depends = glibc=2.25
conflicts = hamachi
replaces = hamachi
options = !strip
source = https://www.vpn.net/installers/logmein-hamachi-2.1.0.174-x64.tgz
source = systemd
+ source = https://archive.archlinux.org/packages/g/glibc/glibc-2.25-7-x86_64.pkg.tar.xz
sha1sums = dafb47d24d44dd7bd3a80a81b62a297f497f52a5
- sha1sums = 2b8052f91bb47beac1fdab0c0c455a36f8876671
+ sha1sums = c0d5b67ba0a938cef9742568fd09bb2a4b85b513
+ sha1sums = 5d0ac1bf449524db37e94320c0d04d3dbc2d0408
pkgname = logmein-hamachi
diff --git a/PKGBUILD b/PKGBUILD
index cdec95028e3..683c22b1549 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,24 @@
pkgname=logmein-hamachi
pkgver=2.1.0.174
-pkgrel=2
+pkgrel=3
pkgdesc="A zero-configuration VPN service"
url="https://www.vpn.net/linux"
arch=("i686" "x86_64" "arm" "armv7h")
license=("custom")
-depends=("glibc=2.25")
conflicts=("hamachi")
replaces=("hamachi")
options=("!strip")
-[ "${CARCH}" == "i686" ] && _filearch_=x86 && sha1sums=('20cc7a0a4c5fb61a5f6769e4d8fff5dab9293e3e' '2b8052f91bb47beac1fdab0c0c455a36f8876671')
-[ "${CARCH}" == "x86_64" ] && _filearch_=x64 && sha1sums=('dafb47d24d44dd7bd3a80a81b62a297f497f52a5' '2b8052f91bb47beac1fdab0c0c455a36f8876671')
-[ "${CARCH}" == "arm" ] && _filearch_=armel && sha1sums=('328ea87a2f371163a90b9d7518417e5acbcb2da5' '2b8052f91bb47beac1fdab0c0c455a36f8876671')
-[ "${CARCH}" == "armv7h" ] && _filearch_=armhf && sha1sums=('dbd32d89063e2ab72b7e51f5706d0d25586d767b' '2b8052f91bb47beac1fdab0c0c455a36f8876671')
+[ "${CARCH}" == "i686" ] && _filearch_=x86 && sha1sums=('20cc7a0a4c5fb61a5f6769e4d8fff5dab9293e3e' 'c0d5b67ba0a938cef9742568fd09bb2a4b85b513')
+[ "${CARCH}" == "x86_64" ] && _filearch_=x64 && sha1sums=('dafb47d24d44dd7bd3a80a81b62a297f497f52a5' 'c0d5b67ba0a938cef9742568fd09bb2a4b85b513')
+[ "${CARCH}" == "arm" ] && _filearch_=armel && sha1sums=('328ea87a2f371163a90b9d7518417e5acbcb2da5' 'c0d5b67ba0a938cef9742568fd09bb2a4b85b513')
+[ "${CARCH}" == "armv7h" ] && _filearch_=armhf && sha1sums=('dbd32d89063e2ab72b7e51f5706d0d25586d767b' 'c0d5b67ba0a938cef9742568fd09bb2a4b85b513')
source=("https://www.vpn.net/installers/${pkgname}-${pkgver}-${_filearch_}.tgz" "systemd")
+source+=("https://archive.archlinux.org/packages/g/glibc/glibc-2.25-7-x86_64.pkg.tar.xz")
+sha1sums+=("5d0ac1bf449524db37e94320c0d04d3dbc2d0408")
+
package() {
cd "${srcdir}"/${pkgname}-${pkgver}-${_filearch_}
@@ -40,6 +42,10 @@ package() {
ln -sf "/opt/${pkgname}/bin/hamachid" "${pkgdir}"/usr/bin/hamachi
install -m 644 "${srcdir}"/systemd "${pkgdir}"/usr/lib/systemd/system/${pkgname}.service
+ install -d "${pkgdir}"/opt/${pkgname}/glibc225lib
+ install -m755 "${srcdir}/usr/lib/ld-2.25.so" "${pkgdir}"/opt/${pkgname}/glibc225lib
+ install -m755 "${srcdir}"/usr/lib/*.so.* "${pkgdir}"/opt/${pkgname}/glibc225lib
+
# License
ln -sf "/opt/${pkgname}/LICENSE" "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/systemd b/systemd
index 609447e1637..9e3659081ca 100644
--- a/systemd
+++ b/systemd
@@ -3,7 +3,8 @@ Description=LogMeIn Hamachi daemon
After=local-fs.target network.target
[Service]
-ExecStart=/opt/logmein-hamachi/bin/hamachid
+Environment=LD_LIBRARY_PATH=/opt/logmein-hamachi/glibc225lib/
+ExecStart=/opt/logmein-hamachi/glibc225lib/ld-2.25.so /opt/logmein-hamachi/bin/hamachid
Type=forking
[Install]