summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaochen Tong2019-10-05 15:03:04 +0200
committerHaochen Tong2019-10-05 15:03:04 +0200
commit59ffa4e25f6474acb82886b8c353858038462c7c (patch)
treece7e67d303b60cf56e88095de620e168a04d0b17
parent757a038d5e04604b150fe4d563294db29568b370 (diff)
downloadaur-59ffa4e25f6474acb82886b8c353858038462c7c.tar.gz
cherry-pick some fixes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 9 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c13f4849e94..0f4c96520ce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Oct 8 19:21:32 UTC 2018
pkgbase = tinc-pre
pkgdesc = VPN (Virtual Private Network) daemon (Pre-release)
pkgver = 1.1pre17
- pkgrel = 1
+ pkgrel = 2
url = http://www.tinc-vpn.org/
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 581e8ebbeb4..25863021b39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: Hexchain Tong <i at hexchain dot org>
+# Maintainer: hexchain <i at hexchain dot org>
pkgname=tinc-pre
pkgver=1.1pre17
-pkgrel=1
+pkgrel=2
pkgdesc="VPN (Virtual Private Network) daemon (Pre-release)"
arch=(i686 x86_64 armv7h armv6h)
url="http://www.tinc-vpn.org/"
@@ -18,6 +18,12 @@ sha256sums=('SKIP')
build() {
cd "$srcdir/tinc"
+ export GIT_COMMITTER_NAME="Builder" GIT_COMMITTER_EMAIL="builder@builder.local"
+ git cherry-pick 2b0aeec02d64bb4724da9ff1dbc19b7d35d7c904
+ git cherry-pick f8190b7233871b5b47c3fc8846731d1bbdef78a5
+ git cherry-pick f3ba50ed3d14749b7c1ef100d2a49ac30d3b3853
+ unset GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
+
autoreconf -fsi
./configure \
--prefix=/usr \