Merging upstream version 20221001.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 126 insertions, 47 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 104ed32..2e8d065 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,55 +1,77 @@
+2022-10-01	Daniel Baumann <daniel.baumann@progress-linux.org>
+
+	* Releasing version 20221001.
+
+	[ Daniel Baumann ]
+	* Updating copyright notices for 2022.
+	* Updating license with newer GPL-3 version containing https instead of http links.
+	* Updating http links to https in GPL license references.
+	* Adding release and upload targets to makefile.
+	* Regenerating changelog from git commits.
+	* Adding progress-linux-8-horok-archive-key [5C90CE5793571B1004C1798CAE39F2D6D4F1E4D9] to apt.progress-linux.org PGP keyring.
+
 2021-10-08	Daniel Baumann <daniel.baumann@progress-linux.org>
 
 	* Releasing version 20211008.
 
 	[ Daniel Baumann ]
-	* Adding new keys to apt@progress-linux.org pgp keyring:
-	  - 0x076B33250B5DD18B Progress Linux 7 (graograman) Archive Key
+	* Adding progress-linux-7-graograman-archive-key [331782F92DAFE94DAF949C80076B33250B5DD18B] to apt.progress-linux.org PGP keyring.
 
 2021-01-01	Daniel Baumann <daniel.baumann@progress-linux.org>
 
 	* Releasing version 20210101.
 
 	[ Daniel Baumann ]
-	* Updating copyright notices for 2021.
 	* Updating manpage for 2021.
+	* Updating copyright notices for 2021.
 
 2020-10-01	Daniel Baumann <daniel.baumann@progress-linux.org>
 
 	* Releasing version 20201001.
 
 	[ Daniel Baumann ]
-	* Adding new keys to apt@progress-linux.org pgp keyring:
-	  - 0x753373FBB95C4EA6 Progress Linux 6 (fuchur) Archive Key
+	* Adding progress-linux-6-fuchur-archive-key [6930AC0684340211DAA809A7753373FBB95C4EA6] to apt.progress-linux.org PGP keyring.
 
 2019-01-01	Daniel Baumann <daniel.baumann@progress-linux.org>
 
 	* Releasing version 20190101.
 
 	[ Daniel Baumann ]
-	* Updating makefile for generic usage.
-	* Adding gitignore file.
-	* Adding changelog, license, and version files.
-	* Adding progress-linux.7 manpage.
-	* Adding pgp keyring for maintainers@lists.progress-linux.org:
-	  - 0x3E6CA28DAAF8DD14 Daniel Baumann <daniel.baumann@progress-linux.org>
-	  - 0xA40FAD739EBBCF3F David Kunz <david.kunz@dknet.ch>
-	  - 0xD64A2FAE095EF799 Sakirnth Nagarasa <sakirnth@gmail.com>
-	  - 0xE4CC883990A08B76 Simon Spöhel <simon@spoehel.ch>
-	  - 0x6F3E6153163E0577 Tom Jampen <tom@cryptography.ch>
-	* Adding pgp keyring for sysadmin@progress-linux.org:
-	  - 0x3E6CA28DAAF8DD14 Daniel Baumann <daniel.baumann@progress-linux.org>
-	  - 0x9599105258AFBFE4 Progress Linux System Administration <system-administration@progress-linux.org>
-	* Adding ssh keyring for maintainers@lists.progress-linux.org:
-	  - SHA256:M1aZ/6i/aSAvy9FhttTw8Tg1iYfi6zbjNvm4XEm1KT0 daniel.baumann@progress-linux.org
-	  - SHA256:jK29lwUAx0biP/yw0PKjPlmgSdUw4E9h0QKxlAbOPnU david.kunz@dknet.ch
-	  - SHA256:eVYLAJ1V4Zt9u6iP4o4pKe/IqLFCTpkaO2XAPml5puw sakirnth@gmail.com
-	  - SHA256:Od2NxP/O8s66bl/2vjytk4hF8H5slVF7dDvRcoBA2tY simon@spoehel.ch
-	  - SHA256:Y/FYnIUSZa3li9nBQgcZI3cuRGB5eC98+nizIdMJvpI tom@cryptography.ch
-	* Adding ssh keyring for sysadmin@progress-linux.org:
-	  - SHA256:M1aZ/6i/aSAvy9FhttTw8Tg1iYfi6zbjNvm4XEm1KT0 daniel.baumann@progress-linux.org
-	  - SHA256:9Pw2Lzb7GsxBHSw/cEOQl4GfIeU3XFJz/YG44zktTcM system-administration@progress-linux.org
+	* Adding gitignore.
+	* Updating Makefile to move from keys to keyrings.
+	* Removing PGP keys in order to move to keyrings.
+	* Adding progress-linux-5-engywuck-archive-key [82768FE8792232743702185103CED5154316222A] to apt.progress-linux.org PGP keyring.
+	* Adding system-administration@progress-linux.org [25E908D033818B1CAA42E05F9599105258AFBFE4] to sysadmin@progress-linux.org PGP keyring.
+	* Adding daniel.baumann@progress-linux.org [95409F2944B1C6D44C6B49D53E6CA28DAAF8DD14] to sysadmin@progress-linux.org PGP keyring.
+	* Adding daniel.baumann@progress-linux.org [95409F2944B1C6D44C6B49D53E6CA28DAAF8DD14] to maintainers@lists.progress-linux.org PGP keyring.
+	* Adding david.kunz@dknet.ch [DB6105A0412DA07CD8F43621A40FAD739EBBCF3F] to maintainers@lists.progress-linux.org PGP keyring.
+	* Adding sakirnth@gmail.com [900F6DCAD20AD1819F9E8A6AD64A2FAE095EF799] to maintainers@lists.progress-linux.org PGP keyring.
+	* Adding simon@spoehel.ch [504EE0636C211A2673BC9844E4CC883990A08B76] to maintainers@lists.progress-linux.org PGP keyring.
+	* Adding tom@cryptography.ch [9E932D1E0B31CF850AFC799E6F3E6153163E0577] to maintainers@lists.progress-linux.org PGP keyring.
+	* Removing SSH keys in order to move to keyrings.
+	* Adding ssh.progress-linux.org [SHA256:KdNCtjZ1nQCz+gli84BRYJBSrJXj8EBn56ziWTLgUS8] to ssh.progress-linux.org SSH keyring.
+	* Adding system-administration@progress-linux.org [SHA256:9Pw2Lzb7GsxBHSw/cEOQl4GfIeU3XFJz/YG44zktTcM] to sysadmin@progress-linux.org SSH keyring.
+	* Adding daniel.baumann@progress-linux.org [SHA256:M1aZ/6i/aSAvy9FhttTw8Tg1iYfi6zbjNvm4XEm1KT0] to sysadmin@progress-linux.org SSH keyring.
+	* Adding daniel.baumann@progress-linux.org [SHA256:M1aZ/6i/aSAvy9FhttTw8Tg1iYfi6zbjNvm4XEm1KT0] to maintainers@lists.progress-linux.org SSH keyring.
+	* Adding david.kunz@dknet.ch [SHA256:jK29lwUAx0biP/yw0PKjPlmgSdUw4E9h0QKxlAbOPnU] to maintainers@lists.progress-linux.org SSH keyring.
+	* Adding sakirnth@gmail.com [SHA256:eVYLAJ1V4Zt9u6iP4o4pKe/IqLFCTpkaO2XAPml5puw] to maintainers@lists.progress-linux.org SSH keyring.
+	* Adding simon@spoehel.ch [SHA256:Od2NxP/O8s66bl/2vjytk4hF8H5slVF7dDvRcoBA2tY] to maintainers@lists.progress-linux.org SSH keyring.
+	* Adding tom@cryptography.ch [SHA256:Y/FYnIUSZa3li9nBQgcZI3cuRGB5eC98+nizIdMJvpI] to maintainers@lists.progress-linux.org SSH keyring.
+	* Updating Makefile to install documentation files.
+	* Adding CHANGELOG.txt.
+	* Adding LICENSE.txt.
+	* Adding VERSION.txt.
+	* Updating Makefile to install manpage files.
+	* Adding manpages/progress-linux.7.
+	* Updating Makefile to be project aware.
 
 2018-12-01	Daniel Baumann <daniel.baumann@progress-linux.org>
 
 	* Releasing version 20181201.
+
+	[ Daniel Baumann ]
+	* Adding Makefile.
+	* Adding PGP key: progress-linux-5-engywuck-archive-key [82768FE8792232743702185103CED5154316222A]
+	* Adding PGP key: system-administration@progress-linux.org [25E908D033818B1CAA42E05F9599105258AFBFE4]
+	* Adding SSH key: ssh.progress-linux.org [SHA256:KdNCtjZ1nQCz+gli84BRYJBSrJXj8EBn56ziWTLgUS8]
+	* Adding SSH key: system-administration@progress-linux.org [SHA256:9Pw2Lzb7GsxBHSw/cEOQl4GfIeU3XFJz/YG44zktTcM]
diff --git a/LICENSE.txt b/LICENSE.txt
index 94a9ed0..f288702 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Makefile b/Makefile
index 030f4bb..a2c6379 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org>
+# Copyright (C) 2010-2022 Daniel Baumann <daniel.baumann@progress-linux.org>
 #
 # SPDX-License-Identifier: GPL-3.0+
 #
@@ -13,11 +13,14 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 SHELL := sh -e
 
 PROJECT := progress-linux
+SOFTWARE := progress-linux
+
+VERSION := $(shell cat VERSION.txt)
 
 all: build
 
@@ -87,8 +90,8 @@ install: install-doc install-man install-pgp install-ssh
 
 install-doc:
 	# install doc
-	mkdir -p $(DESTDIR)/usr/share/doc/$(PROJECT)
-	cp *.txt $(DESTDIR)/usr/share/doc/$(PROJECT)
+	mkdir -p $(DESTDIR)/usr/share/doc/$(SOFTWARE)
+	cp *.txt $(DESTDIR)/usr/share/doc/$(SOFTWARE)
 
 install-man:
 	# install manpages
@@ -103,19 +106,19 @@ install-man:
 
 install-pgp: build-pgp
 	# install pgp keyrings
-	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/pgp-keys
-	cp pgp-keys/*.gpg $(DESTDIR)/usr/share/$(PROJECT)/pgp-keys
+	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)/pgp-keys
+	cp pgp-keys/*.gpg $(DESTDIR)/usr/share/$(SOFTWARE)/pgp-keys
 
 install-ssh: build-ssh
 	# install ssh keyrings
-	mkdir -p $(DESTDIR)/usr/share/$(PROJECT)/ssh-keys
-	cp ssh-keys/*.pub $(DESTDIR)/usr/share/$(PROJECT)/ssh-keys
+	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)/ssh-keys
+	cp ssh-keys/*.pub $(DESTDIR)/usr/share/$(SOFTWARE)/ssh-keys
 
 uninstall: uninstall-doc uninstall-man uninstall-pgp uninstall-ssh
 
 uninstall-doc:
 	# uninstall doc
-	rm -rf $(DESTDIR)/usr/share/doc/$(PROJECT)
+	rm -rf $(DESTDIR)/usr/share/doc/$(SOFTWARE)
 
 uninstall-man:
 	# uninstall manpages
@@ -130,12 +133,36 @@ uninstall-man:
 
 uninstall-pgp:
 	# uninstall pgp keyrings
-	rm -rf $(DESTDIR)/usr/share/$(PROJECT)/pgp-keys
-	-rmdir --parents $(DESTDIR)/usr/share/$(PROJECT)
+	rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/pgp-keys
+	-rmdir --parents $(DESTDIR)/usr/share/$(SOFTWARE)
 
 uninstall-ssh:
 	# uninstall ssh keyrings
-	rm -rf $(DESTDIR)/usr/share/$(PROJECT)/ssh-keys
-	-rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(PROJECT)
+	rm -rf $(DESTDIR)/usr/share/$(SOFTWARE)/ssh-keys
+	-rmdir --ignore-fail-on-non-empty --parents $(DESTDIR)/usr/share/$(SOFTWARE)
 
 reinstall: clean uninstall build install
+
+distclean: clean
+	rm -rf $(SOFTWARE)-$(VERSION)
+
+release: distclean
+	git commit -a -s -S -m 'Releasing version $(VERSION).' || true
+	git tag -s -m 'Tagging version $(VERSION).' v$(VERSION) || true
+
+	mkdir -p $(SOFTWARE)-$(VERSION)
+	find . -mindepth 1 -maxdepth 1 -and -not -name ".git*" -and -not -name debian -and -not -name $(SOFTWARE)-$(VERSION) -exec cp \-a {} $(SOFTWARE)-$(VERSION) \;
+
+	for FORMAT in xz lzip; \
+	do \
+		EXTENSION=$$(echo $${FORMAT} | cut -b-2); \
+		tar --$${FORMAT} -cf ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION} $(SOFTWARE)-$(VERSION); \
+		sha512sum ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION} > ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}.sha512; \
+		gpg --default-key 0x3E6CA28DAAF8DD14 --armor -b ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}; \
+		mv ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}.asc ../$(SOFTWARE)-$(VERSION).tar.$${EXTENSION}.sig; \
+	done
+
+	rm -rf $(SOFTWARE)-$(VERSION)
+
+upload:
+	scp ../$(SOFTWARE)-$(VERSION).* get.progress-linux.org:/srv/get.progress-linux.org/packages/$(SOFTWARE)/upstream
diff --git a/VERSION.txt b/VERSION.txt
index 202e0fe..5e34ca4 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-20211008
+20221001
diff --git a/manpages/progress-linux.7 b/manpages/progress-linux.7
index a2731e2..80bed8c 100644
--- a/manpages/progress-linux.7
+++ b/manpages/progress-linux.7
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2010-2021 Daniel Baumann <daniel.baumann@progress-linux.org>
+.\" Copyright (C) 2010-2022 Daniel Baumann <daniel.baumann@progress-linux.org>
 .\"
 .\" SPDX-License-Identifier: GPL-3.0+
 .\"
@@ -13,7 +13,7 @@
 .\" GNU General Public License for more details.
 .\"
 .\" You should have received a copy of the GNU General Public License
-.\" along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 .TH PROGRESS\-LINUX 7 2021\-01\-01 20210101 "Progress Linux"
 
diff --git a/pgp-keys/apt.progress-linux.org/progress-linux-8-horok-archive-key.pub b/pgp-keys/apt.progress-linux.org/progress-linux-8-horok-archive-key.pub
new file mode 100644
index 0000000..98c0b9a
--- /dev/null
+++ b/pgp-keys/apt.progress-linux.org/progress-linux-8-horok-archive-key.pub
@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYziYpBYJKwYBBAHaRw8BAQdAVnPVGA4jFXmCx/b+26w44eE/AhRfUIu8NibZ
+FHQKSpa0T1Byb2dyZXNzIExpbnV4IDggKGhvcm9rKSBBcmNoaXZlIEtleSA8c3lz
+dGVtLWFkbWluaXN0cmF0aW9uQHByb2dyZXNzLWxpbnV4Lm9yZz6IlgQTFggAPhYh
+BFyQzleTVxsQBMF5jK458tbU8eTZBQJjOJikAhsDBQkDwmcABQsJCAcCBhUKCQgL
+AgQWAgMBAh4BAheAAAoJEK458tbU8eTZgGoBAIcPflL+6ZiY1aK43HsYT14vLb85
+B/TcIW8hvyUOdX9VAP4oF83VsnR5DMYL4kF111gB7nCwtTt26iJoWY3XG2xyC7g4
+BGM4mKQSCisGAQQBl1UBBQEBB0BOpzRFPelT9D518lcvAMK7Otg+U6zyG2PSJgxI
+aDKUWAMBCAeIfgQYFggAJhYhBFyQzleTVxsQBMF5jK458tbU8eTZBQJjOJikAhsM
+BQkDwmcAAAoJEK458tbU8eTZS9cBANijbKv/ilVVYjbs6MU9kkbFi2m7HBE1KtB7
+vCWFyDHkAP9PAuwJnMgYwwf47Gm7vztx8n2gIi0JpGsqaS3nb1l5AQ==
+=lseo
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/pgp-keys/apt.progress-linux.org/progress-linux-8-horok-archive-key.pub.sig b/pgp-keys/apt.progress-linux.org/progress-linux-8-horok-archive-key.pub.sig
new file mode 100644
index 0000000..4bad085
--- /dev/null
+++ b/pgp-keys/apt.progress-linux.org/progress-linux-8-horok-archive-key.pub.sig
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEgTbtJcfWfpLHSkKSVc8b+YaruccFAmM4mQIACgkQVc8b+Yar
+ucf5+BAAvARMmGd6zG0rJxU9seulmaPApHe/Rp+De3u3UytIsQdGy19cZjtfAgfm
+Iomelj8jeANe2zIFK4HAcysbCbNnf89amNwGRywb2Vef+kp7nHuGNbpRj4O3g56g
+Gx/8goMIbeobAJrrNIZqy8mxI4wGNnS7KVHcrDuUOVo2batiF8qbPkcsEzsw2rqj
+iEsHLri4KaIVNduFhjhZ3t0gwgbiuaZcM1ypNXwcUumOsDx9HM7Q0pgxIQ3Mp3/R
+zz42M8MbPu5tj0jHpj7uRhYALdq0e8WPy9ukQXTaAMbSXI0iE5YEhDedrnRIGAVb
+Zu2VZNIh0CPQkQ7gZQ/OFHyAlW6Rp9YVBNAQqVEbHWkgJQLZkAEzfMB2mQoxIzxR
+A+8Br9ZAL+buQ0+5fxTMwQ6tFlAJ5kgoxY1hbhmisIDiixaLgJkSuyg9IwFGvdJt
+p+Ik/hw+6QOTwPxVtMzl97/VepFYzbFMT4+XiGiLx4693YZ3mxOzpxefUiWtF09q
+jhdIRkkpTSe72GyfcH/3wlGDXdmG/1JPyD51LesRdO+Py3KEvENU5Zwd/ePtQrUf
+a/b96oXbvEsCx+PLrEGhDssT5oZDQe9pYYxzNaYR5/VvNWw5RLppZ6BSkWZ0tuD/
+4QVD9RtVPdIh1ZgzTB5g36PTl9YYRaKSvl7bUUiTxh5Vt93wUtw=
+=CnKh
+-----END PGP SIGNATURE-----