Control: tags 923866 + pending Dear maintainer,
I've prepared an NMU for aptly (versioned as 1.3.0+ds1-2.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru aptly-1.3.0+ds1/debian/changelog aptly-1.3.0+ds1/debian/changelog --- aptly-1.3.0+ds1/debian/changelog 2018-10-26 19:22:38.000000000 +0200 +++ aptly-1.3.0+ds1/debian/changelog 2019-03-26 08:59:20.000000000 +0100 @@ -1,3 +1,10 @@ +aptly (1.3.0+ds1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch to fix UUID struct field not encoded in msgpack (Closes: #923866) + + -- Shengjing Zhu <z...@debian.org> Tue, 26 Mar 2019 15:59:20 +0800 + aptly (1.3.0+ds1-2) unstable; urgency=medium * Add NEWS to warn about database compatibility. diff -Nru aptly-1.3.0+ds1/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch aptly-1.3.0+ds1/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch --- aptly-1.3.0+ds1/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch 1970-01-01 01:00:00.000000000 +0100 +++ aptly-1.3.0+ds1/debian/patches/Fix-UUID-struct-field-not-encoded-in-msgpack.patch 2019-03-26 08:59:20.000000000 +0100 @@ -0,0 +1,62 @@ +From: Shengjing Zhu <z...@debian.org> +Date: Tue, 26 Mar 2019 15:49:40 +0800 +Subject: Fix UUID struct field not encoded in msgpack + +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 -Nru aptly-1.3.0+ds1/debian/patches/series aptly-1.3.0+ds1/debian/patches/series --- aptly-1.3.0+ds1/debian/patches/series 2018-10-26 19:22:38.000000000 +0200 +++ aptly-1.3.0+ds1/debian/patches/series 2019-03-26 08:59:20.000000000 +0100 @@ -1,3 +1,4 @@ kjk-lzma.patch pborman-uuid.patch +Fix-UUID-struct-field-not-encoded-in-msgpack.patch
signature.asc
Description: PGP signature
