Merged with the default branch.1.14.0-1

38 files changed, 86 insertions, 618 deletions

diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 855dd6f7..13063fd8 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -22,8 +22,7 @@ include Makefile.php
 include Makefile.python27
 include Makefile.python37
 include Makefile.python38
-include Makefile.go112
-include Makefile.go113
+include Makefile.go
 include Makefile.perl
 include Makefile.ruby
 include Makefile.jsc-common
@@ -36,8 +35,7 @@ include Makefile.php
 include Makefile.python27
 include Makefile.python37
 include Makefile.python38
-include Makefile.go110
-include Makefile.go111
+include Makefile.go
 include Makefile.perl
 include Makefile.ruby
 include Makefile.jsc-common
@@ -50,8 +48,7 @@ include Makefile.php
 include Makefile.python27
 include Makefile.python36
 include Makefile.python37
-include Makefile.go19
-include Makefile.go110
+include Makefile.go
 include Makefile.perl
 include Makefile.ruby
 include Makefile.jsc-common
@@ -66,8 +63,7 @@ include Makefile.python27
 include Makefile.python36
 include Makefile.python37
 include Makefile.python38
-include Makefile.go19
-include Makefile.go110
+include Makefile.go
 include Makefile.perl
 include Makefile.ruby
 include Makefile.jsc-common
@@ -99,7 +95,7 @@ ifeq ($(CODENAME),buster)
 include Makefile.php
 include Makefile.python27
 include Makefile.python37
-include Makefile.go111
+include Makefile.go
 include Makefile.perl
 include Makefile.ruby
 include Makefile.jsc-common
@@ -111,8 +107,7 @@ ifeq ($(CODENAME),stretch)
 include Makefile.php
 include Makefile.python27
 include Makefile.python35
-include Makefile.go17
-include Makefile.go18
+include Makefile.go
 include Makefile.perl
 include Makefile.ruby
 include Makefile.jsc-common
@@ -200,7 +195,7 @@ endif
 debuild/unit_$(VERSION).orig.tar.gz: | debuild/$(SRCDIR)/debian
 	cd ../.. && tar -czf pkg/deb/debuild/$(SRCDIR).tar.gz \
 		--transform "s#^#$(SRCDIR)/#" \
-		LICENSE NOTICE CHANGES README configure auto src test version
+		LICENSE NOTICE CHANGES README configure auto src test version go
 	mv debuild/$(SRCDIR).tar.gz debuild/unit_$(VERSION).orig.tar.gz
 	cd debuild && tar zxf unit_$(VERSION).orig.tar.gz
 
diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go
index 3399f5ca..cdccb5ed 100644
--- a/pkg/deb/Makefile.go
+++ b/pkg/deb/Makefile.go
@@ -8,7 +8,7 @@ MODULE_RELEASE_go=	1
 
 MODULE_CONFARGS_go=	go --go-path=/usr/share/gocode
 MODULE_MAKEARGS_go=	go
-MODULE_INSTARGS_go=	go-install
+MODULE_INSTARGS_go=	go-install-src
 
 MODULE_SOURCES_go=	unit.example-go-app \
 			unit.example-go-config
@@ -17,7 +17,9 @@ BUILD_DEPENDS_go=	golang
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_go)
 
 MODULE_BUILD_DEPENDS_go=,golang
-MODULE_DEPENDS_go=,golang
+MODULE_DEPENDS_go=,golang,unit-dev (= $(VERSION)-$(RELEASE)~$(CODENAME))
+
+MODULE_NOARCH_go=	true
 
 define MODULE_PREINSTALL_go
 	mkdir -p debian/unit-go/usr/share/doc/unit-go/examples/go-app
diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110
deleted file mode 100644
index 0e956d9f..00000000
--- a/pkg/deb/Makefile.go110
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go110
-MODULE_SUFFIX_go110=	go1.10
-
-MODULE_SUMMARY_go110=	Go 1.10 module for NGINX Unit
-
-MODULE_VERSION_go110=	$(VERSION)
-MODULE_RELEASE_go110=	1
-
-MODULE_CONFARGS_go110=	go --go=/usr/lib/go-1.10/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go110=	/usr/lib/go-1.10/bin/go
-MODULE_INSTARGS_go110=	/usr/lib/go-1.10/bin/go-install
-
-MODULE_SOURCES_go110=	unit.example-go-app \
-			unit.example-go1.10-config
-
-BUILD_DEPENDS_go110=	golang-1.10
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go110)
-
-MODULE_BUILD_DEPENDS_go110=,golang-1.10
-MODULE_DEPENDS_go110=,golang-1.10
-
-define MODULE_PREINSTALL_go110
-	mkdir -p debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.10-config debian/unit-go1.10/usr/share/doc/unit-go1.10/examples/unit.config
-endef
-export MODULE_PREINSTALL_go110
-
-define MODULE_POST_go110
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go110) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.10/bin/go build -o /tmp/go1.10-app /usr/share/doc/unit-$(MODULE_SUFFIX_go110)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go110)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go110
diff --git a/pkg/deb/Makefile.go111 b/pkg/deb/Makefile.go111
deleted file mode 100644
index f8ed5ae8..00000000
--- a/pkg/deb/Makefile.go111
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go111
-MODULE_SUFFIX_go111=	go1.11
-
-MODULE_SUMMARY_go111=	Go 1.11 module for NGINX Unit
-
-MODULE_VERSION_go111=	$(VERSION)
-MODULE_RELEASE_go111=	1
-
-MODULE_CONFARGS_go111=	go --go=/usr/lib/go-1.11/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go111=	/usr/lib/go-1.11/bin/go
-MODULE_INSTARGS_go111=	/usr/lib/go-1.11/bin/go-install
-
-MODULE_SOURCES_go111=	unit.example-go-app \
-			unit.example-go1.11-config
-
-BUILD_DEPENDS_go111=	golang-1.11
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go111)
-
-MODULE_BUILD_DEPENDS_go111=,golang-1.11
-MODULE_DEPENDS_go111=,golang-1.11
-
-define MODULE_PREINSTALL_go111
-	mkdir -p debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.11-config debian/unit-go1.11/usr/share/doc/unit-go1.11/examples/unit.config
-endef
-export MODULE_PREINSTALL_go111
-
-define MODULE_POST_go111
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go111) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.11/bin/go build -o /tmp/go1.11-app /usr/share/doc/unit-$(MODULE_SUFFIX_go111)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go111)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go111
diff --git a/pkg/deb/Makefile.go112 b/pkg/deb/Makefile.go112
deleted file mode 100644
index f64ab4c5..00000000
--- a/pkg/deb/Makefile.go112
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go112
-MODULE_SUFFIX_go112=	go1.12
-
-MODULE_SUMMARY_go112=	Go 1.12 module for NGINX Unit
-
-MODULE_VERSION_go112=	$(VERSION)
-MODULE_RELEASE_go112=	1
-
-MODULE_CONFARGS_go112=	go --go=/usr/lib/go-1.12/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go112=	/usr/lib/go-1.12/bin/go
-MODULE_INSTARGS_go112=	/usr/lib/go-1.12/bin/go-install
-
-MODULE_SOURCES_go112=	unit.example-go-app \
-			unit.example-go1.12-config
-
-BUILD_DEPENDS_go112=	golang-1.12
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go112)
-
-MODULE_BUILD_DEPENDS_go112=,golang-1.12
-MODULE_DEPENDS_go112=,golang-1.12
-
-define MODULE_PREINSTALL_go112
-	mkdir -p debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.12-config debian/unit-go1.12/usr/share/doc/unit-go1.12/examples/unit.config
-endef
-export MODULE_PREINSTALL_go112
-
-define MODULE_POST_go112
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go112) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.12/bin/go build -o /tmp/go1.12-app /usr/share/doc/unit-$(MODULE_SUFFIX_go112)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go112)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go112
diff --git a/pkg/deb/Makefile.go113 b/pkg/deb/Makefile.go113
deleted file mode 100644
index ded2e45a..00000000
--- a/pkg/deb/Makefile.go113
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go113
-MODULE_SUFFIX_go113=	go1.13
-
-MODULE_SUMMARY_go113=	Go 1.13 module for NGINX Unit
-
-MODULE_VERSION_go113=	$(VERSION)
-MODULE_RELEASE_go113=	1
-
-MODULE_CONFARGS_go113=	go --go=/usr/lib/go-1.13/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go113=	/usr/lib/go-1.13/bin/go
-MODULE_INSTARGS_go113=	/usr/lib/go-1.13/bin/go-install
-
-MODULE_SOURCES_go113=	unit.example-go-app \
-			unit.example-go1.13-config
-
-BUILD_DEPENDS_go113=	golang-1.13
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go113)
-
-MODULE_BUILD_DEPENDS_go113=,golang-1.13
-MODULE_DEPENDS_go113=,golang-1.13
-
-define MODULE_PREINSTALL_go113
-	mkdir -p debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.13-config debian/unit-go1.13/usr/share/doc/unit-go1.13/examples/unit.config
-endef
-export MODULE_PREINSTALL_go113
-
-define MODULE_POST_go113
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go113) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.13/bin/go build -o /tmp/go1.13-app /usr/share/doc/unit-$(MODULE_SUFFIX_go113)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go113)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go113
diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17
deleted file mode 100644
index d014edd1..00000000
--- a/pkg/deb/Makefile.go17
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go17
-MODULE_SUFFIX_go17=	go1.7
-
-MODULE_SUMMARY_go17=	Go 1.7 module for NGINX Unit
-
-MODULE_VERSION_go17=	$(VERSION)
-MODULE_RELEASE_go17=	1
-
-MODULE_CONFARGS_go17=	go --go=/usr/lib/go-1.7/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go17=	/usr/lib/go-1.7/bin/go
-MODULE_INSTARGS_go17=	/usr/lib/go-1.7/bin/go-install
-
-MODULE_SOURCES_go17=	unit.example-go-app \
-			unit.example-go1.7-config
-
-BUILD_DEPENDS_go17=	golang-1.7
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go17)
-
-MODULE_BUILD_DEPENDS_go17=,golang-1.7
-MODULE_DEPENDS_go17=,golang-1.7
-
-define MODULE_PREINSTALL_go17
-	mkdir -p debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.7-config debian/unit-go1.7/usr/share/doc/unit-go1.7/examples/unit.config
-endef
-export MODULE_PREINSTALL_go17
-
-define MODULE_POST_go17
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go17) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.7/bin/go build -o /tmp/go1.7-app /usr/share/doc/unit-$(MODULE_SUFFIX_go17)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go17)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go17
diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18
deleted file mode 100644
index 597f4804..00000000
--- a/pkg/deb/Makefile.go18
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go18
-MODULE_SUFFIX_go18=	go1.8
-
-MODULE_SUMMARY_go18=	Go 1.8 module for NGINX Unit
-
-MODULE_VERSION_go18=	$(VERSION)
-MODULE_RELEASE_go18=	1
-
-MODULE_CONFARGS_go18=	go --go=/usr/lib/go-1.8/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go18=	/usr/lib/go-1.8/bin/go
-MODULE_INSTARGS_go18=	/usr/lib/go-1.8/bin/go-install
-
-MODULE_SOURCES_go18=	unit.example-go-app \
-			unit.example-go1.8-config
-
-BUILD_DEPENDS_go18=	golang-1.8
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go18)
-
-MODULE_BUILD_DEPENDS_go18=,golang-1.8
-MODULE_DEPENDS_go18=,golang-1.8
-
-define MODULE_PREINSTALL_go18
-	mkdir -p debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.8-config debian/unit-go1.8/usr/share/doc/unit-go1.8/examples/unit.config
-endef
-export MODULE_PREINSTALL_go18
-
-define MODULE_POST_go18
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go18) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.8/bin/go build -o /tmp/go1.8-app /usr/share/doc/unit-$(MODULE_SUFFIX_go18)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go18)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go18
diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19
deleted file mode 100644
index 60d4b239..00000000
--- a/pkg/deb/Makefile.go19
+++ /dev/null
@@ -1,48 +0,0 @@
-MODULES+=		go19
-MODULE_SUFFIX_go19=	go1.9
-
-MODULE_SUMMARY_go19=	Go 1.9 module for NGINX Unit
-
-MODULE_VERSION_go19=	$(VERSION)
-MODULE_RELEASE_go19=	1
-
-MODULE_CONFARGS_go19=	go --go=/usr/lib/go-1.9/bin/go --go-path=/usr/share/gocode
-MODULE_MAKEARGS_go19=	/usr/lib/go-1.9/bin/go
-MODULE_INSTARGS_go19=	/usr/lib/go-1.9/bin/go-install
-
-MODULE_SOURCES_go19=	unit.example-go-app \
-			unit.example-go1.9-config
-
-BUILD_DEPENDS_go19=	golang-1.9
-BUILD_DEPENDS+=		$(BUILD_DEPENDS_go19)
-
-MODULE_BUILD_DEPENDS_go19=,golang-1.9
-MODULE_DEPENDS_go19=,golang-1.9
-
-define MODULE_PREINSTALL_go19
-	mkdir -p debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app
-	install -m 644 -p debian/unit.example-go-app debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/go-app/let-my-people.go
-	install -m 644 -p debian/unit.example-go1.9-config debian/unit-go1.9/usr/share/doc/unit-go1.9/examples/unit.config
-endef
-export MODULE_PREINSTALL_go19
-
-define MODULE_POST_go19
-cat <<BANNER
-----------------------------------------------------------------------
-
-The $(MODULE_SUMMARY_go19) has been installed.
-
-To check out the sample app, run these commands:
-
- GOPATH=/usr/share/gocode /usr/lib/go-1.9/bin/go build -o /tmp/go1.9-app /usr/share/doc/unit-$(MODULE_SUFFIX_go19)/examples/go-app/let-my-people.go
- sudo service unit restart
- cd /usr/share/doc/unit-$(MODULE_SUFFIX_go19)/examples
- sudo curl -X PUT --data-binary @unit.config --unix-socket /var/run/control.unit.sock http://localhost/config
- curl http://localhost:8500/
-
-Online documentation is available at https://unit.nginx.org
-
-----------------------------------------------------------------------
-BANNER
-endef
-export MODULE_POST_go19
diff --git a/pkg/deb/debian.module/rules-noarch.in b/pkg/deb/debian.module/rules-noarch.in
index 823675ba..a24602c4 100644
--- a/pkg/deb/debian.module/rules-noarch.in
+++ b/pkg/deb/debian.module/rules-noarch.in
@@ -27,6 +27,7 @@ config.env.%:
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
 configure.unit: config.env.unit
diff --git a/pkg/deb/debian.module/rules.in b/pkg/deb/debian.module/rules.in
index 1391e01a..8ee277b3 100755
--- a/pkg/deb/debian.module/rules.in
+++ b/pkg/deb/debian.module/rules.in
@@ -27,6 +27,7 @@ config.env.%:
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
 configure.unit: config.env.unit
diff --git a/pkg/deb/debian.module/unit.example-go-app b/pkg/deb/debian.module/unit.example-go-app
index 7ca0c9fd..6eec1dbb 100644
--- a/pkg/deb/debian.module/unit.example-go-app
+++ b/pkg/deb/debian.module/unit.example-go-app
@@ -3,7 +3,7 @@ package main
 import (
     "fmt"
     "net/http"
-    "nginx/unit"
+    "unit.nginx.org/go"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/deb/debian.module/unit.example-go1.10-config b/pkg/deb/debian.module/unit.example-go1.10-config
deleted file mode 100644
index 61790b73..00000000
--- a/pkg/deb/debian.module/unit.example-go1.10-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.10-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-go1.11-config b/pkg/deb/debian.module/unit.example-go1.11-config
deleted file mode 100644
index 5e063a4c..00000000
--- a/pkg/deb/debian.module/unit.example-go1.11-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.11-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-go1.12-config b/pkg/deb/debian.module/unit.example-go1.12-config
deleted file mode 100644
index b49f0aba..00000000
--- a/pkg/deb/debian.module/unit.example-go1.12-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.12-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-go1.13-config b/pkg/deb/debian.module/unit.example-go1.13-config
deleted file mode 100644
index 7dbffb17..00000000
--- a/pkg/deb/debian.module/unit.example-go1.13-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.13-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-go1.7-config b/pkg/deb/debian.module/unit.example-go1.7-config
deleted file mode 100644
index e1a8e1a4..00000000
--- a/pkg/deb/debian.module/unit.example-go1.7-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.7-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-go1.8-config b/pkg/deb/debian.module/unit.example-go1.8-config
deleted file mode 100644
index e570f38c..00000000
--- a/pkg/deb/debian.module/unit.example-go1.8-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.8-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian.module/unit.example-go1.9-config b/pkg/deb/debian.module/unit.example-go1.9-config
deleted file mode 100644
index 90ef7d5f..00000000
--- a/pkg/deb/debian.module/unit.example-go1.9-config
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"applications": {
-		"example_go": {
-			"type": "external",
-			"user": "nobody",
-			"executable": "/tmp/go1.9-app"
-		}
-	},
-
-	"listeners": {
-		"*:8500": {
-			"pass": "applications/example_go"
-		}
-	}
-}
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index bee9223f..a4696793 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -31,6 +31,7 @@ config.env.%:
 	cp -Pa $(CURDIR)/LICENSE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/NOTICE $(BUILDDIR_$*)/
 	cp -Pa $(CURDIR)/README $(BUILDDIR_$*)/
+	cp -Pa $(CURDIR)/go $(BUILDDIR_$*)/
 	touch $@
 
 configure.unit: config.env.unit
diff --git a/pkg/deb/debian/unit.example-go-app b/pkg/deb/debian/unit.example-go-app
index 7ca0c9fd..6eec1dbb 100644
--- a/pkg/deb/debian/unit.example-go-app
+++ b/pkg/deb/debian/unit.example-go-app
@@ -3,7 +3,7 @@ package main
 import (
     "fmt"
     "net/http"
-    "nginx/unit"
+    "unit.nginx.org/go"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full
index cf3b1150..b71b74fb 100644
--- a/pkg/docker/Dockerfile.full
+++ b/pkg/docker/Dockerfile.full
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -22,17 +22,17 @@ RUN set -x \
 	test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
 	apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
 	&& dpkgArch="$(dpkg --print-architecture)" \
-	&& unitPackages="unit=${UNIT_VERSION} unit-php=${UNIT_VERSION} unit-python2.7=${UNIT_VERSION} unit-python3.5=${UNIT_VERSION} unit-perl=${UNIT_VERSION} unit-ruby=${UNIT_VERSION}" \
+	&& unitPackages="unit=${UNIT_VERSION} unit-php=${UNIT_VERSION} unit-python2.7=${UNIT_VERSION} unit-python3.7=${UNIT_VERSION} unit-perl=${UNIT_VERSION} unit-ruby=${UNIT_VERSION}" \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.go1.8-dev b/pkg/docker/Dockerfile.go1.11-dev
index d38b669b..92fa56f6 100644
--- a/pkg/docker/Dockerfile.go1.8-dev
+++ b/pkg/docker/Dockerfile.go1.11-dev
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -22,17 +22,17 @@ RUN set -x \
 	test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
 	apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
 	&& dpkgArch="$(dpkg --print-architecture)" \
-	&& unitPackages="unit=${UNIT_VERSION} unit-go1.8=${UNIT_VERSION} gcc" \
+	&& unitPackages="unit=${UNIT_VERSION} unit-go=${UNIT_VERSION} gcc" \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.go1.7-dev b/pkg/docker/Dockerfile.go1.7-dev
deleted file mode 100644
index 5622271e..00000000
--- a/pkg/docker/Dockerfile.go1.7-dev
+++ /dev/null
@@ -1,93 +0,0 @@
-FROM debian:stretch-slim
-
-LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-
-ENV UNIT_VERSION          1.13.0-1~stretch
-
-RUN set -x \
-	&& apt-get update \
-	&& apt-get install --no-install-recommends --no-install-suggests -y gnupg1 apt-transport-https ca-certificates \
-	&& \
-	NGINX_GPGKEY=573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62; \
-	found=''; \
-	for server in \
-		ha.pool.sks-keyservers.net \
-		hkp://keyserver.ubuntu.com:80 \
-		hkp://p80.pool.sks-keyservers.net:80 \
-		pgp.mit.edu \
-	; do \
-		echo "Fetching GPG key $NGINX_GPGKEY from $server"; \
-		apt-key adv --keyserver "$server" --keyserver-options timeout=10 --recv-keys "$NGINX_GPGKEY" && found=yes && break; \
-	done; \
-	test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
-	apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
-	&& dpkgArch="$(dpkg --print-architecture)" \
-	&& unitPackages="unit=${UNIT_VERSION} unit-go1.7=${UNIT_VERSION} gcc" \
-	&& case "$dpkgArch" in \
-		amd64|i386) \
-# arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
-			&& apt-get update \
-			;; \
-		*) \
-# we're on an architecture upstream doesn't officially build for
-# let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
-			\
-# new directory for storing sources and .deb files
-			&& tempDir="$(mktemp -d)" \
-			&& chmod 777 "$tempDir" \
-# (777 to ensure APT's "_apt" user can access it too)
-			\
-# save list of currently-installed packages so build dependencies can be cleanly removed later
-			&& savedAptMark="$(apt-mark showmanual)" \
-			\
-# build .deb files from upstream's source packages (which are verified by apt-get)
-			&& apt-get update \
-			&& apt-get build-dep -y $unitPackages \
-			&& ( \
-				cd "$tempDir" \
-				&& DEB_BUILD_OPTIONS="nocheck parallel=$(nproc)" \
-					apt-get source --compile $unitPackages \
-			) \
-# we don't remove APT lists here because they get re-downloaded and removed later
-			\
-# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-# (which is done after we install the built packages so we don't have to redownload any overlapping dependencies)
-			&& apt-mark showmanual | xargs apt-mark auto > /dev/null \
-			&& { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; } \
-			\
-# create a temporary local APT repo to install from (so that dependency resolution can be handled by APT, as it should be)
-			&& ls -lAFh "$tempDir" \
-			&& ( cd "$tempDir" && dpkg-scanpackages . > Packages ) \
-			&& grep '^Package: ' "$tempDir/Packages" \
-			&& echo "deb [ trusted=yes ] file://$tempDir ./" > /etc/apt/sources.list.d/temp.list \
-# work around the following APT issue by using "Acquire::GzipIndexes=false" (overriding "/etc/apt/apt.conf.d/docker-gzip-indexes")
-#   Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
-#   ...
-#   E: Failed to fetch store:/var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages  Could not open file /var/lib/apt/lists/partial/_tmp_tmp.ODWljpQfkE_._Packages - open (13: Permission denied)
-			&& apt-get -o Acquire::GzipIndexes=false update \
-			;; \
-	esac \
-	\
-	&& apt-get install --no-install-recommends --no-install-suggests -y \
-						$unitPackages \
-                        curl \
-	&& apt-get remove --purge --auto-remove -y apt-transport-https && rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/unit.list \
-	\
-# if we have leftovers from building, let's purge them (including extra, unnecessary build deps)
-	&& if [ -n "$tempDir" ]; then \
-		apt-get purge -y --auto-remove \
-		&& rm -rf "$tempDir" /etc/apt/sources.list.d/temp.list; \
-	fi
-
-# forward log to docker log collector
-RUN ln -sf /dev/stdout /var/log/unit.log
-
-STOPSIGNAL SIGTERM
-
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN mkdir /docker-entrypoint.d/
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-
-CMD ["unitd", "--no-daemon", "--control", "unix:/var/run/control.unit.sock"]
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index 4567b2da..26a55d9c 100644
--- a/pkg/docker/Dockerfile.minimal
+++ b/pkg/docker/Dockerfile.minimal
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -26,13 +26,13 @@ RUN set -x \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.perl5.24 b/pkg/docker/Dockerfile.perl5.28
index 64d68a4e..3be4a6dc 100644
--- a/pkg/docker/Dockerfile.perl5.24
+++ b/pkg/docker/Dockerfile.perl5.28
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -26,13 +26,13 @@ RUN set -x \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.php7.0 b/pkg/docker/Dockerfile.php7.3
index 649de902..36a2dfbf 100644
--- a/pkg/docker/Dockerfile.php7.0
+++ b/pkg/docker/Dockerfile.php7.3
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -26,13 +26,13 @@ RUN set -x \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7
index e9866349..0dd2f9a5 100644
--- a/pkg/docker/Dockerfile.python2.7
+++ b/pkg/docker/Dockerfile.python2.7
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -26,13 +26,13 @@ RUN set -x \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.python3.5 b/pkg/docker/Dockerfile.python3.7
index 831bc54a..fd6f1639 100644
--- a/pkg/docker/Dockerfile.python3.5
+++ b/pkg/docker/Dockerfile.python3.7
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -22,17 +22,17 @@ RUN set -x \
 	test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \
 	apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \
 	&& dpkgArch="$(dpkg --print-architecture)" \
-	&& unitPackages="unit=${UNIT_VERSION} unit-python3.5=${UNIT_VERSION}" \
+	&& unitPackages="unit=${UNIT_VERSION} unit-python3.7=${UNIT_VERSION}" \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.ruby2.3 b/pkg/docker/Dockerfile.ruby2.5
index 181b2525..034ae542 100644
--- a/pkg/docker/Dockerfile.ruby2.3
+++ b/pkg/docker/Dockerfile.ruby2.5
@@ -1,8 +1,8 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV UNIT_VERSION          1.13.0-1~stretch
+ENV UNIT_VERSION          1.14.0-1~buster
 
 RUN set -x \
 	&& apt-get update \
@@ -26,13 +26,13 @@ RUN set -x \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Dockerfile.tmpl b/pkg/docker/Dockerfile.tmpl
index c721931b..3372ef6f 100644
--- a/pkg/docker/Dockerfile.tmpl
+++ b/pkg/docker/Dockerfile.tmpl
@@ -1,4 +1,4 @@
-FROM debian:stretch-slim
+FROM debian:buster-slim
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
@@ -26,13 +26,13 @@ RUN set -x \
 	&& case "$dpkgArch" in \
 		amd64|i386) \
 # arches officialy built by upstream
-			echo "deb https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			&& apt-get update \
 			;; \
 		*) \
 # we're on an architecture upstream doesn't officially build for
 # let's build binaries from the published source packages
-			echo "deb-src https://packages.nginx.org/unit/debian/ stretch unit" >> /etc/apt/sources.list.d/unit.list \
+			echo "deb-src https://packages.nginx.org/unit/debian/ buster unit" >> /etc/apt/sources.list.d/unit.list \
 			\
 # new directory for storing sources and .deb files
 			&& tempDir="$(mktemp -d)" \
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index e826cb95..d80b8763 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -6,42 +6,29 @@ DEFAULT_RELEASE := 1
 
 VERSION ?= $(NXT_VERSION)
 RELEASE ?= $(DEFAULT_RELEASE)
-CODENAME := stretch
+CODENAME := buster
 
 UNIT_VERSION = $(VERSION)-$(RELEASE)~$(CODENAME)
 
-MODULES = python2.7 python3.5 php7.0 go1.7-dev go1.8-dev perl5.24 ruby2.3 \
+MODULES = python2.7 python3.7 php7.3 go1.11-dev perl5.28 ruby2.5 \
           full minimal
 
-MODULE_php7.0="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION}"
+MODULE_php7.3="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION}"
 
 MODULE_python2.7="unit=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION}"
 
-MODULE_python3.5="unit=$${UNIT_VERSION} unit-python3.5=$${UNIT_VERSION}"
+MODULE_python3.7="unit=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION}"
 
-MODULE_go1.7-dev="unit=$${UNIT_VERSION} unit-go1.7=$${UNIT_VERSION} gcc"
+MODULE_go1.11-dev="unit=$${UNIT_VERSION} unit-go=$${UNIT_VERSION} gcc"
 
-MODULE_go1.8-dev="unit=$${UNIT_VERSION} unit-go1.8=$${UNIT_VERSION} gcc"
+MODULE_perl5.28="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}"
 
-MODULE_perl5.24="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}"
+MODULE_ruby2.5="unit=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
 
-MODULE_ruby2.3="unit=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
-
-MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.5=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
+MODULE_full="unit=$${UNIT_VERSION} unit-php=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION} unit-ruby=$${UNIT_VERSION}"
 
 MODULE_minimal="unit=$${UNIT_VERSION}"
 
-export \
-		MODULE_python2.7 \
- 		MODULE_python3.5 \
- 		MODULE_php7.0 \
- 		MODULE_go1.7-dev \
- 		MODULE_go1.8-dev \
- 		MODULE_perl5.24 \
- 		MODULE_ruby2.3 \
-		MODULE_full \
- 		MODULE_minimal
-
 default:
 	@echo "valid targets: all build dockerfiles push clean"
 
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 4e970e45..34f79bcc 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -57,7 +57,8 @@ endif
 
 ifeq ($(OSVER), centos7)
 include Makefile.php
-include Makefile.python
+include Makefile.python27
+include Makefile.python36
 include Makefile.go
 include Makefile.perl
 include Makefile.jsc-common
@@ -90,7 +91,8 @@ endif
 
 ifeq ($(OSVER), amazonlinux2)
 include Makefile.php
-include Makefile.python
+include Makefile.python27
+include Makefile.python37
 include Makefile.go
 include Makefile.perl
 include Makefile.jsc-common
@@ -202,7 +204,7 @@ endif
 rpmbuild/SOURCES/unit-$(VERSION).tar.gz:
 	cd ../.. && tar -czf pkg/rpm/rpmbuild/SOURCES/unit-$(VERSION).tar.gz \
 		--transform "s#^#unit-$(VERSION)/#" \
-		LICENSE NOTICE CHANGES README configure auto src test version
+		LICENSE NOTICE CHANGES README configure auto src test version go
 
 unit: check-build-depends-unit rpmbuild/SPECS/unit.spec rpmbuild/SOURCES/unit-$(VERSION).tar.gz
 	@echo "===> Building $@ package" ; \
diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go
index 09dffd21..e3891ab4 100644
--- a/pkg/rpm/Makefile.go
+++ b/pkg/rpm/Makefile.go
@@ -8,7 +8,7 @@ MODULE_RELEASE_go=	1
 
 MODULE_CONFARGS_go=	go --go-path=%{gopath}
 MODULE_MAKEARGS_go=	go
-MODULE_INSTARGS_go=	go-install
+MODULE_INSTARGS_go=	go-install-src
 
 MODULE_SOURCES_go=	unit.example-go-app \
 			unit.example-go-config
@@ -25,11 +25,15 @@ BUILD_DEPENDS+=		$(BUILD_DEPENDS_go)
 
 ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed))
 define MODULE_DEFINITIONS_go
+BuildArch: noarch
+Requires: unit-devel == $(VERSION)-$(RELEASE)%{?dist}.ngx
 BuildRequires: $(BUILD_DEPENDS_go)
 %define gopath /usr/share/go/contrib
 endef
 else
 define MODULE_DEFINITIONS_go
+BuildArch: noarch
+Requires: unit-devel == $(VERSION)-$(RELEASE)%{?dist}.ngx
 BuildRequires: $(BUILD_DEPENDS_go)
 endef
 endif
@@ -48,8 +52,8 @@ endef
 export MODULE_PREINSTALL_go
 
 define MODULE_FILES_go
-%dir %{gopath}/src/nginx/unit
-%{gopath}/src/nginx/unit/*
+%dir %{gopath}/src/unit.nginx.org/go
+%{gopath}/src/unit.nginx.org/go/*
 endef
 export MODULE_FILES_go
 
diff --git a/pkg/rpm/Makefile.python27 b/pkg/rpm/Makefile.python27
index 95b392a9..079a8512 100644
--- a/pkg/rpm/Makefile.python27
+++ b/pkg/rpm/Makefile.python27
@@ -17,12 +17,21 @@ ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed sles))
 BUILD_DEPENDS_python27=	python-devel
 else ifneq (,$(findstring $(OSVER),fedora centos8))
 BUILD_DEPENDS_python27=	python2-devel
+else ifneq (,$(findstring $(OSVER),centos7 amazonlinux2))
+BUILD_DEPENDS_python27=	python-devel
 else
 BUILD_DEPENDS_python27=	python27-devel
 endif
 
 BUILD_DEPENDS+=		$(BUILD_DEPENDS_python27)
 
+define MODULE_DEFINITIONS_python27
+%if (0%{?rhel} == 7) || (0%{?amzn} == 2)
+Obsoletes: unit-python
+%endif
+endef
+export MODULE_DEFINITIONS_python27
+
 define MODULE_PREINSTALL_python27
 %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit-python27/examples/python-app
 %{__install} -m 644 -p %{SOURCE100} \
diff --git a/pkg/rpm/Makefile.python36 b/pkg/rpm/Makefile.python36
index 25e33968..827d2253 100644
--- a/pkg/rpm/Makefile.python36
+++ b/pkg/rpm/Makefile.python36
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python36=	python3.6-install
 MODULE_SOURCES_python36=	unit.example-python-app \
 			unit.example-python36-config
 
-ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora))
+ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora centos7))
 BUILD_DEPENDS_python36=	python3-devel
 else
 BUILD_DEPENDS_python36=	python36-devel
diff --git a/pkg/rpm/Makefile.python37 b/pkg/rpm/Makefile.python37
index ed9462b8..563d4539 100644
--- a/pkg/rpm/Makefile.python37
+++ b/pkg/rpm/Makefile.python37
@@ -13,7 +13,7 @@ MODULE_INSTARGS_python37=	python3.7-install
 MODULE_SOURCES_python37=	unit.example-python-app \
 			unit.example-python37-config
 
-ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora))
+ifneq (,$(findstring $(OSVER),opensuse-tumbleweed sles fedora amazonlinux2))
 BUILD_DEPENDS_python37=	python3-devel
 else
 BUILD_DEPENDS_python37=	python37-devel
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.example-go-app b/pkg/rpm/rpmbuild/SOURCES/unit.example-go-app
index 7ca0c9fd..6eec1dbb 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.example-go-app
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.example-go-app
@@ -3,7 +3,7 @@ package main
 import (
     "fmt"
     "net/http"
-    "nginx/unit"
+    "unit.nginx.org/go"
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {