[arch-commits] Commit in fscrypt/repos/community-x86_64 (5 files)

[Anatol Pomozov]

    Date: Tuesday, February 11, 2020 @ 17:02:57
  Author: anatolik
Revision: 567785

archrelease: copy trunk to community-x86_64

Added:
  fscrypt/repos/community-x86_64/PKGBUILD
    (from rev 567784, fscrypt/trunk/PKGBUILD)
  fscrypt/repos/community-x86_64/pam_config
    (from rev 567784, fscrypt/trunk/pam_config)
  fscrypt/repos/community-x86_64/reprobuild.patch
    (from rev 567784, fscrypt/trunk/reprobuild.patch)
Deleted:
  fscrypt/repos/community-x86_64/PKGBUILD
  fscrypt/repos/community-x86_64/pam_config

------------------+
 PKGBUILD         |   69 ++++++++++++++++++++++++++---------------------------
 pam_config       |    4 +--
 reprobuild.patch |   14 ++++++++++
 3 files changed, 51 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-11 17:02:30 UTC (rev 567784)
+++ PKGBUILD	2020-02-11 17:02:57 UTC (rev 567785)
@@ -1,34 +0,0 @@
-# Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
-# Maintainer: Eric Biggers <ebiggers3 at gmail dot com>
-
-pkgname=fscrypt
-pkgver=0.2.5
-pkgrel=1
-pkgdesc='A tool for managing Linux filesystem encryption'
-arch=('x86_64')
-url='https://github.com/google/fscrypt'
-license=('Apache')
-makedepends=('go')
-depends=('pam')
-source=("fscrypt-$pkgver.zip::https://github.com/google/fscrypt/archive/v$pkgver.zip"
-        "pam_config")
-sha256sums=('7ec0dfe6d28079829dfd52bde20821d96957b3399fa47b3b2f4b7ae39b977dc7'
-            'ae6ceaefc6d936c95a9b7a3f925111ffb946e6fd0152373247f1d40132f05aef')
-
-prepare() {
-  cd "fscrypt-$pkgver"
-  # TODO: replace it with $SOURCE_DATE_EPOCH?
-  sed "s/\$(shell date)//g" -i Makefile
-}
-
-build() {
-  cd "fscrypt-$pkgver"
-  make
-}
-
-package() {
-  cd "fscrypt-$pkgver"
-  install -Dm755 -t "$pkgdir/usr/bin/" bin/fscrypt
-  install -Dm755 -t "$pkgdir/usr/lib/security/" bin/pam_fscrypt.so
-  install -Dm644 -t "$pkgdir/usr/share/licenses/fscrypt/" LICENSE
-}

Copied: fscrypt/repos/community-x86_64/PKGBUILD (from rev 567784, fscrypt/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-02-11 17:02:57 UTC (rev 567785)
@@ -0,0 +1,35 @@
+# Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
+# Maintainer: Eric Biggers <ebiggers3 at gmail dot com>
+
+pkgname=fscrypt
+pkgver=0.2.6
+pkgrel=1
+pkgdesc='A tool for managing Linux filesystem encryption'
+arch=('x86_64')
+url='https://github.com/google/fscrypt'
+license=('Apache')
+makedepends=('go')
+depends=('pam')
+source=("fscrypt-$pkgver.zip::https://github.com/google/fscrypt/archive/v$pkgver.zip"
+        "pam_config"
+        "reprobuild.patch")
+sha256sums=('8717a8edec2367ccb6c2d934880603f7f454f9f68030370885015c6d309125fa'
+            'ae6ceaefc6d936c95a9b7a3f925111ffb946e6fd0152373247f1d40132f05aef'
+            'cad9f7964dbb0caaa07250c60805096e2be58a739aa0af1edd8d55582582055a')
+
+prepare() {
+  cd "fscrypt-$pkgver"
+  patch -p1 < ../reprobuild.patch
+}
+
+build() {
+  cd "fscrypt-$pkgver"
+  BUILDDATE="`date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}"`" make
+}
+
+package() {
+  cd "fscrypt-$pkgver"
+  install -Dm755 -t "$pkgdir/usr/bin/" bin/fscrypt
+  install -Dm755 -t "$pkgdir/usr/lib/security/" bin/pam_fscrypt.so
+  install -Dm644 -t "$pkgdir/usr/share/licenses/fscrypt/" LICENSE
+}

Deleted: pam_config
===================================================================
--- pam_config	2020-02-11 17:02:30 UTC (rev 567784)
+++ pam_config	2020-02-11 17:02:57 UTC (rev 567785)
@@ -1,2 +0,0 @@
-# Allow fscrypt to check your login passphrase when you create a login protector
-auth		required	pam_unix.so

Copied: fscrypt/repos/community-x86_64/pam_config (from rev 567784, fscrypt/trunk/pam_config)
===================================================================
--- pam_config	                        (rev 0)
+++ pam_config	2020-02-11 17:02:57 UTC (rev 567785)
@@ -0,0 +1,2 @@
+# Allow fscrypt to check your login passphrase when you create a login protector
+auth		required	pam_unix.so

Copied: fscrypt/repos/community-x86_64/reprobuild.patch (from rev 567784, fscrypt/trunk/reprobuild.patch)
===================================================================
--- reprobuild.patch	                        (rev 0)
+++ reprobuild.patch	2020-02-11 17:02:57 UTC (rev 567785)
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index f7add11..840a160 100644
+--- a/Makefile
++++ b/Makefile
+@@ -67,7 +67,8 @@ GO_LINK_FLAGS := -s -w
+ TAG_VERSION := $(shell git describe --tags)
+ VERSION_FLAG := -X "main.version=$(if $(TAG_VERSION),$(TAG_VERSION),$(VERSION))"
+ # Flag to embed the date and time of the build into the binary.
+-DATE_FLAG := -X "main.buildTime=$(shell date)"
++BUILDDATE ?= $(shell date)
++DATE_FLAG := -X "main.buildTime='"$(BUILDDATE)"'"
+ 
+ override GO_LINK_FLAGS += $(VERSION_FLAG) $(DATE_FLAG) -extldflags "$(LDFLAGS)"
+ override GO_FLAGS += --ldflags '$(GO_LINK_FLAGS)'