[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#928602: unblock: golang-gopkg-sourcemap.v1/1.0.5-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package golang-gopkg-sourcemap.v1

Fixes accessing the Internet during testing, with a patch does:
  * disables the jQuery downloading (Internet access).
  * use Debian package jQuery (libjs-jquery).
  * disable jQuery version-specific integrity tests.

More info in RC bug: #927227

unblock golang-gopkg-sourcemap.v1/1.0.5-2

Thanks!

--
Jongmin Kim

OpenPGP key located at https://jongmin.dev/pgp
OpenPGP fingerprint: 012E 4A06 79E1 4EFC DAAE  9472 D39D 8D29 BAF3 6DF8


diff -Nru golang-gopkg-sourcemap.v1-1.0.5/debian/changelog golang-gopkg-sourcemap.v1-1.0.5/debian/changelog
--- golang-gopkg-sourcemap.v1-1.0.5/debian/changelog	2019-01-25 20:17:13.000000000 +0900
+++ golang-gopkg-sourcemap.v1-1.0.5/debian/changelog	2019-05-06 17:16:33.000000000 +0900
@@ -1,3 +1,16 @@
+golang-gopkg-sourcemap.v1 (1.0.5-2) unstable; urgency=medium
+
+  * Team upload
+  * d/gbp.conf:
+    - Set pristine-tar = False to override any global configs
+    - Set debian/sid as a debian branch
+    - Set upstream as an upstream branch
+  * d/patches:
+    - Use local jQuery artifacts (Closes: #927227)
+    - Disable jQuery version-specific integrity tests
+
+ -- Jongmin Kim <jmkim@pukyong.ac.kr>  Mon, 06 May 2019 17:16:33 +0900
+
 golang-gopkg-sourcemap.v1 (1.0.5-1) unstable; urgency=medium

   * Initial release (Closes: #895216)
diff -Nru golang-gopkg-sourcemap.v1-1.0.5/debian/control golang-gopkg-sourcemap.v1-1.0.5/debian/control
--- golang-gopkg-sourcemap.v1-1.0.5/debian/control	2019-01-25 20:17:13.000000000 +0900
+++ golang-gopkg-sourcemap.v1-1.0.5/debian/control	2019-05-06 17:16:33.000000000 +0900
@@ -5,7 +5,8 @@
 Uploaders: Raju Devidas <rajudev@disroot.org>,
 Build-Depends: debhelper (>= 11),
                dh-golang,
-               golang-any
+               golang-any,
+               libjs-jquery
 Standards-Version: 4.3.0
 Homepage: https://github.com/go-sourcemap/sourcemap
 Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-gopkg-sourcemap.v1.git
@@ -15,7 +16,8 @@

 Package: golang-gopkg-sourcemap.v1-dev
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         libjs-jquery
 Description: Source Maps consumer for Golang
  This package provides the source map consumer functions for Golang.
  You need to provide the sourcemapURL in your program, and afterwards you
diff -Nru golang-gopkg-sourcemap.v1-1.0.5/debian/gbp.conf golang-gopkg-sourcemap.v1-1.0.5/debian/gbp.conf
--- golang-gopkg-sourcemap.v1-1.0.5/debian/gbp.conf	2019-01-25 20:17:13.000000000 +0900
+++ golang-gopkg-sourcemap.v1-1.0.5/debian/gbp.conf	2019-05-06 17:16:33.000000000 +0900
@@ -1,2 +1,7 @@
+[DEFAULT]
+pristine-tar = False
+debian-branch = debian/sid
+upstream-branch = upstream
+
 [clone]
 postclone=origtargz
diff -Nru golang-gopkg-sourcemap.v1-1.0.5/debian/patches/series golang-gopkg-sourcemap.v1-1.0.5/debian/patches/series
--- golang-gopkg-sourcemap.v1-1.0.5/debian/patches/series	1970-01-01 09:00:00.000000000 +0900
+++ golang-gopkg-sourcemap.v1-1.0.5/debian/patches/series	2019-05-06 17:16:33.000000000 +0900
@@ -0,0 +1 @@
+use-local-jquery.patch
diff -Nru golang-gopkg-sourcemap.v1-1.0.5/debian/patches/use-local-jquery.patch golang-gopkg-sourcemap.v1-1.0.5/debian/patches/use-local-jquery.patch
--- golang-gopkg-sourcemap.v1-1.0.5/debian/patches/use-local-jquery.patch	1970-01-01 09:00:00.000000000 +0900
+++ golang-gopkg-sourcemap.v1-1.0.5/debian/patches/use-local-jquery.patch	2019-05-06 17:16:33.000000000 +0900
@@ -0,0 +1,80 @@
+Description: Use local jQuery artifacts
+ The upstream source downloads jQuery 2.0.3 during testing.
+ .
+ The Debian package should never assume that Internet access is available
+ during building. Also, the Debian policy does not allow the embedded
+ code copies.
+ .
+ This patch does:
+  * disables the jQuery downloading (Internet access).
+  * use Debian package jQuery (libjs-jquery).
+  * disable jQuery version-specific integrity tests.
+Bug-Debian: https://bugs.debian.org/927227
+Author: Jongmin Kim <jmkim@pukyong.ac.kr>
+---
+ consumer_test.go |   10 ++++++++--
+ example_test.go  |   10 +++++++---
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/consumer_test.go
++++ b/consumer_test.go
+@@ -10,12 +10,16 @@
+ 	"gopkg.in/sourcemap.v1"
+ )
+
+-const jqSourceMapURL = "http://code.jquery.com/jquery-2.0.3.min.map";
++const jqSourceMapURL = "file:///usr/share/javascript/jquery/jquery.min.map"
+
+ var jqSourceMapBytes []byte
+
+ func init() {
+-	resp, err := http.Get(jqSourceMapURL)
++	trans := &http.Transport{}
++	trans.RegisterProtocol("file", http.NewFileTransport(http.Dir("/")))
++
++	cli := &http.Client{Transport: trans}
++	resp, err := cli.Get(jqSourceMapURL)
+ 	if err != nil {
+ 		panic(err)
+ 	}
+@@ -165,6 +169,7 @@
+ 	}
+ }
+
++/*
+ func TestJQuerySourceMap(t *testing.T) {
+ 	smap, err := sourcemap.Parse(jqSourceMapURL, jqSourceMapBytes)
+ 	if err != nil {
+@@ -185,6 +190,7 @@
+ 		test.assert(t, smap)
+ 	}
+ }
++*/
+
+ // This is a test mapping which maps functions from two different files
+ // (one.js and two.js) to a minified generated source.
+--- a/example_test.go
++++ b/example_test.go
+@@ -9,8 +9,13 @@
+ )
+
+ func ExampleParse() {
+-	mapURL := "http://code.jquery.com/jquery-2.0.3.min.map";
+-	resp, err := http.Get(mapURL)
++	mapURL := "file:///usr/share/javascript/jquery/jquery.min.map"
++
++	trans := &http.Transport{}
++	trans.RegisterProtocol("file", http.NewFileTransport(http.Dir("/")))
++
++	cli := &http.Client{Transport: trans}
++	resp, err := cli.Get(mapURL)
+ 	if err != nil {
+ 		panic(err)
+ 	}
+@@ -29,5 +34,4 @@
+ 	line, column := 5, 6789
+ 	file, fn, line, col, ok := smap.Source(line, column)
+ 	fmt.Println(file, fn, line, col, ok)
+-	// Output: http://code.jquery.com/jquery-2.0.3.js apply 4360 27 true
+ }


-- System Information:
Debian Release: 10.0
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.19.0-4-amd64 (SMP w/16 CPU cores)
Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to en_US.UTF-8)
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled


Reply to: