[arch-commits] Commit in gocryptfs/trunk (PKGBUILD build_flags.patch)

[Maxim Baz]

    Date: Sunday, March 17, 2019 @ 21:20:50
  Author: maximbaz
Revision: 442405

upgpkg: gocryptfs 1.7-1

Modified:
  gocryptfs/trunk/PKGBUILD
  gocryptfs/trunk/build_flags.patch

-------------------+
 PKGBUILD          |    9 +++++----
 build_flags.patch |   16 ++++++----------
 2 files changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-17 20:52:10 UTC (rev 442404)
+++ PKGBUILD	2019-03-17 21:20:50 UTC (rev 442405)
@@ -3,7 +3,7 @@
 
 _pkgauthor=rfjakob
 pkgname=gocryptfs
-pkgver=1.6.1
+pkgver=1.7
 pkgrel=1
 pkgdesc='Encrypted overlay filesystem written in Go.'
 arch=('x86_64')
@@ -14,9 +14,9 @@
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgauthor}/${pkgname}/releases/download/v${pkgver}/${pkgname}_v${pkgver}_src-deps.tar.gz"
         "${pkgname}-${pkgver}.tar.gz.asc::https://github.com/${_pkgauthor}/${pkgname}/releases/download/v${pkgver}/${pkgname}_v${pkgver}_src-deps.tar.gz.asc"
         "build_flags.patch")
-sha256sums=('fcaaf59cf7b062a6e216d2fcf69f374254018a9b8f99ae3177ac985f05b6c37b'
+sha256sums=('2d1a2cfd072d554a28ee6e6807474b00ac710fb1aaf7aa81f3d8e94e80f6a703'
             'SKIP'
-            '0e57cf29854c415cc5527d4cdff670ea566d37502dd00262ca4f1a1a34e75c07')
+            'f43c3d2cc8c7f0338dbd553d0189eda269d7ceee6a3539dd6096c18e7344e567')
 validpgpkeys=('FFF3E01444FED7C316A3545A895F5BC123A02740')
 
 prepare() {
@@ -37,6 +37,7 @@
 package() {
     cd "${srcdir}/gopath/src/github.com/${_pkgauthor}/${pkgname}"
     install -Dm755 -t "${pkgdir}/usr/bin/" "${pkgname}"
-    install -Dm644 "Documentation/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
+    install -Dm755 -t "${pkgdir}/usr/bin/" "${pkgname}-xray/${pkgname}-xray"
+    install -Dm644 -t "${pkgdir}/usr/share/man/man1/" "Documentation/${pkgname}.1"
     install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
 }

Modified: build_flags.patch
===================================================================
--- build_flags.patch	2019-03-17 20:52:10 UTC (rev 442404)
+++ build_flags.patch	2019-03-17 21:20:50 UTC (rev 442405)
@@ -1,15 +1,11 @@
 --- a/build.bash
 +++ b/build.bash
-@@ -57,8 +57,10 @@ if [[ -z ${BUILDDATE:-} ]] ; then
- 	BUILDDATE=$(date +%Y-%m-%d)
- fi
+@@ -90,7 +90,7 @@ fi
+ # Actual "go build" call
+ go build "-ldflags=$GO_LDFLAGS" "-gcflags=$TRIM" "-asmflags=$TRIM" "$@"
 
--LDFLAGS="-X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildDate=$BUILDDATE"
--go build "-ldflags=$LDFLAGS" "$@"
-+GO_GCFLAGS="all=-trimpath=$PWD"
-+GO_ASMFLAGS="all=-trimpath=$PWD"
-+GO_LDFLAGS="-extldflags=$LDFLAGS -X main.GitVersion=$GITVERSION -X main.GitVersionFuse=$GITVERSIONFUSE -X main.BuildDate=$BUILDDATE"
-+go build -ldflags "$GO_LDFLAGS" -gcflags "$GO_GCFLAGS" -asmflags "$GO_ASMFLAGS" "$@"
+-(cd gocryptfs-xray; go build "-gcflags=$TRIM" "-asmflags=$TRIM" "$@")
++(cd gocryptfs-xray; go build "-ldflags=$GO_LDFLAGS" "-gcflags=$TRIM" "-asmflags=$TRIM" "$@")
 
- (cd gocryptfs-xray; go build "$@")
+ ./gocryptfs -version