Skip to content

Instantly share code, notes, and snippets.

@samuelsadok
Created June 16, 2018 15:49
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save samuelsadok/8814934fec98a0f845ad9095b6559c7b to your computer and use it in GitHub Desktop.
Save samuelsadok/8814934fec98a0f845ad9095b6559c7b to your computer and use it in GitHub Desktop.
diff --git a/0001-fix-groups.patch b/0001-fix-groups.patch
new file mode 100644
index 0000000..6c67335
--- /dev/null
+++ b/0001-fix-groups.patch
@@ -0,0 +1,17 @@
+diff --git a/security/privileges.go b/security/privileges.go
+index 24cd345..1c601a9 100644
+--- a/security/privileges.go
++++ b/security/privileges.go
+@@ -97,9 +97,9 @@ func SetProcessPrivileges(target *user.User) error {
+ if err := setGids(-1, egid); err != nil {
+ return err
+ }
+- if err := setGroups(target); err != nil {
+- return err
+- }
++ //if err := setGroups(target); err != nil {
++ // return err
++ //}
+ // If not setting privs to root, we want to avoid dropping the uid
+ // util the very end.
+ if euid != 0 {
diff --git a/PKGBUILD b/PKGBUILD
index fd0d4e1..432eb46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Eric Biggers <ebiggers3 at gmail dot com>
pkgname=fscrypt-git
-pkgver=0.2.3.0.ge131cec
-pkgrel=1
+pkgver=0.2.3.8.g3e32282
+pkgrel=2
pkgdesc='A tool for managing Linux filesystem encryption'
arch=('x86_64' 'i686')
url='https://github.com/google/fscrypt'
@@ -10,8 +10,8 @@ license=('Apache')
makedepends=('git' 'go')
depends=('pam')
provides=('fscrypt')
-source=('git://github.com/google/fscrypt.git')
-sha256sums=('SKIP')
+source=('git://github.com/google/fscrypt.git' '0001-fix-groups.patch')
+sha256sums=('SKIP' '47aaef7f6d7f8ea8894001e8ec60810e52f343832f201417d710cd548814a31e')
pkgver() {
cd "${srcdir}/fscrypt"
@@ -22,6 +22,8 @@ prepare() {
export GOPATH="${srcdir}/go"
mkdir -p "${GOPATH}/src/github.com/google"
ln -sf "${srcdir}/fscrypt" "${GOPATH}/src/github.com/google/"
+ cd "${srcdir}/fscrypt"
+ patch -Np1 -i "${srcdir}/0001-fix-groups.patch"
}
build() {
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment