2.0.6

driskell · May 9, 2020 · ebb13ce · ebb13ce
1 parent ff4c653
commit ebb13ce
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 2.0.6
+
+*9th May 2020*
+
+* Fix several issues when shutting down with outstanding payloads, to prevent
+hanging forever
+
 ## 2.0.5
 
 *18th February 2017*

diff --git a/contrib/deb-systemd/changelog b/contrib/deb-systemd/changelog
@@ -1,3 +1,15 @@
+log-courier (2.0.6-1) UNRELEASED; urgency=low
+
+  * Upgrade to v2.0.6
+
+ -- Jason Woods (Driskell) <[email protected]>  Sat, 9 May 2020 00:00:00 +0100
+
+log-courier (2.0.5-1) UNRELEASED; urgency=low
+
+  * Upgrade to v2.0.5
+
+ -- Jason Woods (Driskell) <[email protected]>  Sat, 18 Feb 2017 00:00:00 +0100
+
 log-courier (2.0.4-1) UNRELEASED; urgency=low
 
   * Upgrade to v2.0.4

diff --git a/contrib/deb-systemd/control b/contrib/deb-systemd/control
@@ -3,7 +3,7 @@ Section: contrib/admin
 Priority: optional
 Standards-Version: 3.9.5
 Maintainer: Jason Woods (Driskell) <[email protected]>
-Build-Depends: debhelper (>= 9), dh-systemd, golang-1.5, git
+Build-Depends: debhelper (>= 9), dh-systemd, golang, git
 
 Package: log-courier
 Architecture: any

diff --git a/contrib/deb-systemd/rules b/contrib/deb-systemd/rules
@@ -18,8 +18,8 @@ override_dh_auto_build:
 	mkdir -p _workspace/src/github.com/driskell
 	ln -nsf $$(pwd) _workspace/src/github.com/driskell/log-courier
 	cd "_workspace/src/github.com/driskell/log-courier"; \
-		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go-1.5/bin go generate . ./lc-admin; \
-		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go-1.5/bin go install . ./lc-admin ./lc-tlscert
+		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go/bin go generate . ./lc-admin; \
+		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go/bin go install . ./lc-admin ./lc-tlscert
 
 override_dh_auto_test:
 	# Maybe tests in future

diff --git a/contrib/deb-upstart/changelog b/contrib/deb-upstart/changelog
@@ -1,3 +1,15 @@
+log-courier (2.0.6-1) UNRELEASED; urgency=low
+
+  * Upgrade to v2.0.6
+
+ -- Jason Woods (Driskell) <[email protected]>  Sat, 9 May 2020 00:00:00 +0100
+
+log-courier (2.0.5-1) UNRELEASED; urgency=low
+
+  * Upgrade to v2.0.5
+
+ -- Jason Woods (Driskell) <[email protected]>  Sat, 18 Feb 2017 00:00:00 +0100
+
 log-courier (2.0.4-1) UNRELEASED; urgency=low
 
   * Upgrade to v2.0.4

diff --git a/contrib/deb-upstart/control b/contrib/deb-upstart/control
@@ -3,7 +3,7 @@ Section: contrib/admin
 Priority: optional
 Standards-Version: 3.9.5
 Maintainer: Jason Woods (Driskell) <[email protected]>
-Build-Depends: debhelper (>= 9), golang-1.5, git
+Build-Depends: debhelper (>= 9), golang, git
 
 Package: log-courier
 Architecture: any

diff --git a/contrib/deb-upstart/rules b/contrib/deb-upstart/rules
@@ -18,8 +18,8 @@ override_dh_auto_build:
 	mkdir -p _workspace/src/github.com/driskell
 	ln -nsf $$(pwd) _workspace/src/github.com/driskell/log-courier
 	cd "_workspace/src/github.com/driskell/log-courier"; \
-		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go-1.5/bin go generate . ./lc-admin; \
-		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go-1.5/bin go install . ./lc-admin ./lc-tlscert
+		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go/bin go generate . ./lc-admin; \
+		GOPATH=$$(pwd)/_workspace PATH=$$PATH:/usr/lib/go/bin go install . ./lc-admin ./lc-tlscert
 
 override_dh_auto_test:
 	# Maybe tests in future

diff --git a/contrib/ppa_builder b/contrib/ppa_builder
diff --git a/contrib/rpm/log-courier.spec b/contrib/rpm/log-courier.spec
@@ -4,7 +4,7 @@
 
 Summary: Log Courier
 Name: log-courier
-Version: 2.0.4
+Version: 2.0.6
 Release: 1%{dist}
 License: Apache
 Group: System Environment/Libraries
@@ -13,11 +13,6 @@ URL: https://github.com/driskell/log-courier
 Source: https://github.com/driskell/log-courier/archive/v%{version}.zip
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-# Get this from the great Jason Brooks:
-#   https://copr.fedorainfracloud.org/coprs/jasonbrooks/docker/package/golang/
-# We could also get from a RedHat dev, but currently broken and leaking out 1.6:
-#   https://copr.fedorainfracloud.org/coprs/jcajka/golang1.5/package/golang/
-# For RHEL6, 1.5.1 can be obtained from EPEL, but it is not available to RHEL7
 BuildRequires: golang >= 1.5
 BuildRequires: git
 
@@ -157,6 +152,12 @@ fi
 %ghost %{_var}/lib/log-courier/.log-courier
 
 %changelog
+* Sat May 9 2020 Jason Woods <[email protected]> - 2.0.6-1
+- Upgrade to 2.0.6
+
+* Sat Feb 18 2017 Jason Woods <[email protected]> - 2.0.5-1
+- Upgrade to 2.0.5
+
 * Fri Jun 10 2016 Jason Woods <[email protected]> - 2.0.4-1
 - Upgrade to 2.0.4