From e85459c529c3e47500c9817faff7ff2a8da44d7a Mon Sep 17 00:00:00 2001
From: Tobias Frost <tobi@debian.org>
Date: Fri, 5 Apr 2019 17:40:24 +0200
Subject: [PATCH] NMU to fix #923866

---
 debian/changelog                              | 11 ++++
 ...-struct-field-not-encoded-in-msgpack.patch | 59 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 71 insertions(+)
 create mode 100644 debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch

diff --git a/debian/changelog b/debian/changelog
index 8b8aa83c..004f151b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+aptly (1.3.0+ds1-2.1) unstable; urgency=medium
+
+  [ Shengjing Zhu ]
+  * Non-maintainer upload.
+  * Add patch to fix UUID struct field not encoded in msgpack (Closes: #923866)
+
+  [ Tobias Frost ]
+  * Prepare upload.
+
+ -- Tobias Frost <tobi@debian.org>  Fri, 05 Apr 2019 17:19:14 +0200
+
 aptly (1.3.0+ds1-2) unstable; urgency=medium
 
   * Add NEWS to warn about database compatibility.
diff --git a/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch b/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch
new file mode 100644
index 00000000..b738ca10
--- /dev/null
+++ b/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch
@@ -0,0 +1,59 @@
+From: Shengjing Zhu <zhsj@debian.org>
+Date: Tue, 26 Mar 2019 15:49:40 +0800
+Subject: Fix UUID struct field not encoded in msgpack
+Description: golang-github-ugorji-go-codec-dev 1.1.1 takes the json field tag
+ by default, thus the field which has `json:"-"` is ignored when
+ marshal into msgpack.
+Upstream uses the old codec library, so there's no problem.
+Bug-Debian: https://bugs.debian.org/923866
+Forwarded: no
+---
+ deb/local.go    | 4 ++--
+ deb/snapshot.go | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/deb/local.go b/deb/local.go
+index e9fa17c..79cc308 100644
+--- a/deb/local.go
++++ b/deb/local.go
+@@ -14,7 +14,7 @@ import (
+ // LocalRepo is a collection of packages created locally
+ type LocalRepo struct {
+ 	// Permanent internal ID
+-	UUID string `json:"-"`
++	UUID string `codec:"UUID" json:"-"`
+ 	// User-assigned name
+ 	Name string
+ 	// Comment
+@@ -24,7 +24,7 @@ type LocalRepo struct {
+ 	// DefaultComponent
+ 	DefaultComponent string `codec:",omitempty"`
+ 	// Uploaders configuration
+-	Uploaders *Uploaders `code:",omitempty" json:"-"`
++	Uploaders *Uploaders `code:"Uploaders,omitempty" json:"-"`
+ 	// "Snapshot" of current list of packages
+ 	packageRefs *PackageRefList
+ }
+diff --git a/deb/snapshot.go b/deb/snapshot.go
+index fc7689c..1aca3e3 100644
+--- a/deb/snapshot.go
++++ b/deb/snapshot.go
+@@ -19,15 +19,15 @@ import (
+ // Snapshot is immutable state of repository: list of packages
+ type Snapshot struct {
+ 	// Persisten internal ID
+-	UUID string `json:"-"`
++	UUID string `codec:"UUID" json:"-"`
+ 	// Human-readable name
+ 	Name string
+ 	// Date of creation
+ 	CreatedAt time.Time
+ 
+ 	// Source: kind + ID
+-	SourceKind string   `json:"-"`
+-	SourceIDs  []string `json:"-"`
++	SourceKind string   `codec:"SourceKind" json:"-"`
++	SourceIDs  []string `codec:"SourceIDs" json:"-"`
+ 	// Description of how snapshot was created
+ 	Description string
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0751c816..8f02efb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 
 kjk-lzma.patch
 pborman-uuid.patch
+Fix-UUID-struct-field-not-encoded-in-msgpack.patch