Skip to content
Snippets Groups Projects
Commit af0f4366 authored by Felix Lechner's avatar Felix Lechner
Browse files

Created new changelog entry for Debian revision 2 

Imported upstream commits fixing FTBS on i386 (dirent size)
Built with new version of go-fuse (Closes: #864809)
Passed upstream version, go-fuse version and timestamp to build process (Closes: #868070)
Built with tag 'without_openssl'
Marked changelog for release
parent 8e6a300f
Branches
Tags debian/1.4.2-2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
debian/changelog
+ 10
− 0
View file @ af0f4366
gocryptfs (1.4.2-2) unstable; urgency=medium
* Imported upstream commits fixing FTBS on i386 (dirent size)
* Built with new version of go-fuse (Closes: #864809)
* Passed upstream version, go-fuse version and timestamp to
build process (Closes: #868070)
* Built with tag 'without_openssl'
-- Felix Lechner <felix.lechner@lease-up.com> Fri, 26 Jan 2018 14:02:27 -0800
gocryptfs (1.4.2-1) unstable; urgency=medium
* New upstream version
......
debian/patches/b3185723129725b1b5557912eb323e55033d8f67.patch 0 → 100644
+ 23
− 0
View file @ af0f4366
commit b3185723129725b1b5557912eb323e55033d8f67
Author: Jakob Unterwurzacher <jakobunt@gmail.com>
Date: Thu Jan 25 21:40:48 2018 +0100
syscallcompat: fix reversed warning output
We used to print somewhat strange messages:
Getdents: corrupt entry #1: Reclen=276 > 280. Returning EBADR
Reported at https://github.com/rfjakob/gocryptfs/issues/197
--- a/internal/syscallcompat/getdents_linux.go
+++ b/internal/syscallcompat/getdents_linux.go
@@ -64,7 +64,7 @@ func Getdents(dir string) ([]fuse.DirEnt
}
if int(s.Reclen) > sizeofDirent {
tlog.Warn.Printf("Getdents: corrupt entry #%d: Reclen=%d > %d. Returning EBADR",
- numEntries, sizeofDirent, s.Reclen)
+ numEntries, s.Reclen, sizeofDirent)
return nil, syscall.EBADR
}
offset += int(s.Reclen)
debian/patches/f3838c09d841ebdb071981e190c7579e61ee057f.patch 0 → 100644
+ 35
− 0
View file @ af0f4366
commit f3838c09d841ebdb071981e190c7579e61ee057f
Author: Jakob Unterwurzacher <jakobunt@gmail.com>
Date: Thu Jan 25 22:22:13 2018 +0100
syscallcompat: hardcode maxReclen = 280 for all architectures
Due to padding between entries, it is 280 even on 32-bit architectures.
See https://github.com/rfjakob/gocryptfs/issues/197 for details.
--- a/internal/syscallcompat/getdents_linux.go
+++ b/internal/syscallcompat/getdents_linux.go
@@ -22,6 +22,11 @@ const HaveGetdents = true
const sizeofDirent = int(unsafe.Sizeof(syscall.Dirent{}))
+// maxReclen sanity check: Reclen should never be larger than this.
+// Due to padding between entries, it is 280 even on 32-bit architectures.
+// See https://github.com/rfjakob/gocryptfs/issues/197 for details.
+const maxReclen = 280
+
// Getdents wraps syscall.Getdents and converts the result to []fuse.DirEntry.
// The function takes a path instead of an fd because we need to be able to
// call Lstat on files. Fstatat is not yet available in Go as of v1.9:
@@ -62,9 +67,9 @@ func Getdents(dir string) ([]fuse.DirEnt
// EBADR = Invalid request descriptor
return nil, syscall.EBADR
}
- if int(s.Reclen) > sizeofDirent {
+ if int(s.Reclen) > maxReclen {
tlog.Warn.Printf("Getdents: corrupt entry #%d: Reclen=%d > %d. Returning EBADR",
- numEntries, s.Reclen, sizeofDirent)
+ numEntries, s.Reclen, maxReclen)
return nil, syscall.EBADR
}
offset += int(s.Reclen)
debian/patches/series
+ 2
− 0
View file @ af0f4366
correct-spelling.patch
xray-man-page.patch
b3185723129725b1b5557912eb323e55033d8f67.patch
f3838c09d841ebdb071981e190c7579e61ee057f.patch
debian/rules
+ 16
− 6
View file @ af0f4366
#!/usr/bin/make -f
include /usr/share/dpkg/default.mk
export DH_GOPKG := github.com/rfjakob/gocryptfs
export DH_GOLANG_EXCLUDES := example test
export DH_GOLANG_INSTALL_ALL := 1
PKD = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
PKG = $(shell dpkg-parsechangelog -l$(PKD)/changelog --show-field=Source)
VER ?= $(shell (dpkg-parsechangelog -l$(PKD)/changelog | grep Version | sed 's/Version..//' | sed 's/-.\+//'))
#PKG = $(shell dpkg-parsechangelog -l$(PKD)/changelog --show-field=Source)
PKG = $(DEB_SOURCE)
DEBIAN_VERSION = $(shell (echo $(DEB_VERSION_UPSTREAM) | sed 's/\+dfsg1//'))
#PRODUCT_VERSION = $(shell (grep "version=" setup.py | sed "s/.\+'\(.\+\)'.\+/\1/"))
GOFUSE_VERSION_UPSTREAM=$(shell dpkg-query -f='$${source:Upstream-Version}' -W golang-github-hanwen-go-fuse-dev)
#CHANGELOG_TIMESTAMP=$(shell date -u --rfc-3339=seconds -d@$(SOURCE_DATE_EPOCH))
CHANGELOG_TIMESTAMP=$(shell date -u --rfc-3339=date -d@$(SOURCE_DATE_EPOCH))
DEB_LDFLAGS="-X main.GitVersion=$(DEB_VERSION_UPSTREAM) -X main.GitVersionFuse=$(GOFUSE_VERSION_UPSTREAM) -X main.BuildDate=$(CHANGELOG_TIMESTAMP)"
%:
dh $@ --buildsystem=golang --with=golang
......@@ -15,7 +25,7 @@ CHDATE = $(shell grep "\-\-" debian/changelog | head -1 | sed 's/.\+, //' | sed
DT = $(shell date -d "${CHDATE}" "+%Y-%m-%d")
override_dh_auto_build:
dh_auto_build
dh_auto_build -- -tags without_openssl -ldflags $(DEB_LDFLAGS)
pandoc Documentation/MANPAGE.md -s -t man -o debian/gocryptfs.1
pandoc Documentation/MANPAGE-XRAY.md -s -t man -o debian/gocryptfs-xray.1
......@@ -35,7 +45,7 @@ override_dh_auto_install:
dh_auto_install
rm -rf debian/gocryptfs/usr/share/gocode
get-orig-source: $(info I: $(PKG)_$(VER))
get-orig-source: $(info I: $(DEB_SOURCE)_$(DEBIAN_VERSION))
@echo "# Downloading..."
uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
rm -f gocryptfs_v$(VER)*.tar.gz.pgp
uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(DEBIAN_VERSION) $(PKD)
rm -f gocryptfs_v$(DEBIAN_VERSION)*.tar.gz.pgp
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment