diff -pruN 4.33-3/debian/changelog 4.33-3ubuntu2/debian/changelog --- 4.33-3/debian/changelog 2019-08-19 22:20:00.000000000 +0000 +++ 4.33-3ubuntu2/debian/changelog 2021-02-09 09:57:54.000000000 +0000 @@ -1,3 +1,25 @@ +pollinate (4.33-3ubuntu2) hirsute; urgency=medium + + * d/pollinate.service: ensure cache directory is recreated (LP: #1848923) + + -- Christian Ehrhardt Tue, 09 Feb 2021 10:57:54 +0100 + +pollinate (4.33-3ubuntu1) focal; urgency=medium + + * Merge with Debian unstable. Remaining changes: + - d/p/replace-lsb-release.patch: removed as it's Debian specific + - Use the Ubuntu entropy server and certificate: + + d/pollinate.default: use entropy.ubuntu.com and its certificate + + d/pollinate.install: install the ubuntu.entropy.com certificate + - d/control: add breaks/replaces on pollen 4.21-1 which is when the + check_pollen script moved out of pollen. Case #9 of package transition. + [Can be dropped after 20.04] + * Dropped: + - d/watch: add watch file pointing at launchpad + [Fixed upstream] + + -- Lucas Kanashiro Tue, 19 Nov 2019 18:34:55 -0300 + pollinate (4.33-3) unstable; urgency=medium * upload source package @@ -5,6 +27,19 @@ pollinate (4.33-3) unstable; urgency=med -- Thorsten Alteholz Mon, 19 Aug 2019 22:20:00 +0000 +pollinate (4.33-2ubuntu1) eoan; urgency=medium + + * d/p/replace-lsb-release.patch: removed as it's Debian specific + * Use the Ubuntu entropy server and certificate: + - d/pollinate.default: use entropy.ubuntu.com and its certificate + - d/pollinate.install: install the ubuntu.entropy.com certificate + * d/watch: add watch file pointing at launchpad + * d/control: add breaks/replaces on pollen 4.21-1 which is when the + check_pollen script moved out of pollen. Case #9 of package transition. + [Can be dropped after 20.04] + + -- Andreas Hasenack Tue, 21 May 2019 10:42:07 -0300 + pollinate (4.33-2) unstable; urgency=medium * debian/control: add salsa VCS URLs diff -pruN 4.33-3/debian/control 4.33-3ubuntu2/debian/control --- 4.33-3/debian/control 2019-02-28 18:15:14.000000000 +0000 +++ 4.33-3ubuntu2/debian/control 2021-02-09 09:57:54.000000000 +0000 @@ -1,7 +1,8 @@ Source: pollinate Section: admin Priority: optional -Maintainer: Thorsten Alteholz +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Thorsten Alteholz Build-Depends: debhelper (>= 11) Standards-Version: 4.3.0 Homepage: http://launchpad.net/pollinate @@ -11,6 +12,8 @@ Vcs-Git: https://salsa.debian.org/alteho Package: pollinate Architecture: all Depends: ${misc:Depends}, curl, adduser, xxd | vim-common +Breaks: pollen (<< 4.21-1) +Replaces: pollen (<< 4.21-1) Description: seed the pseudo random number generator This client will connect to one or more Pollen (entropy-as-a-service) servers over an (optionally) encrypted connection and retrieve a random diff -pruN 4.33-3/debian/patches/replace-lsb-release.patch 4.33-3ubuntu2/debian/patches/replace-lsb-release.patch --- 4.33-3/debian/patches/replace-lsb-release.patch 2019-02-04 18:15:14.000000000 +0000 +++ 4.33-3ubuntu2/debian/patches/replace-lsb-release.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Description: in Debian there is no /etc/lsb-release -Author: Thorsten Alteholz -Index: pollinate-4.33/pollinate -=================================================================== ---- pollinate-4.33.orig/pollinate 2018-05-29 22:13:20.000000000 +0200 -+++ pollinate-4.33/pollinate 2019-02-06 16:12:12.298990019 +0100 -@@ -187,7 +187,7 @@ - # Construct a user agent, with useful debug information - # Very similar to Firefox and Chrome - -- . /etc/lsb-release -+ DISTRIB_DESCRIPTION="Debian `cat /etc/debian_version`" - - local pkg_info="" lsb="" platform="" cpu="" up="NA" idle="NA" uptime - read_package_versions && pkg_info="$_RET" diff -pruN 4.33-3/debian/patches/series 4.33-3ubuntu2/debian/patches/series --- 4.33-3/debian/patches/series 2019-02-04 18:15:14.000000000 +0000 +++ 4.33-3ubuntu2/debian/patches/series 2021-02-09 09:57:54.000000000 +0000 @@ -1,2 +1 @@ check-pollen-to-pollinate.patch -replace-lsb-release.patch diff -pruN 4.33-3/debian/pollinate.default 4.33-3ubuntu2/debian/pollinate.default --- 4.33-3/debian/pollinate.default 2019-02-04 18:15:14.000000000 +0000 +++ 4.33-3ubuntu2/debian/pollinate.default 2021-02-09 09:57:54.000000000 +0000 @@ -5,9 +5,6 @@ BINARY=1 QUIET=0 WAIT=10 DEVICE="/dev/urandom" -# -# plese use this SERVER only for testing -#SERVER="https://pollen.debian.alteholz.net/" -SERVER="https://pollen.example.com/" +SERVER="https://entropy.ubuntu.com/" POOL="" -CURL_OPTS="" +CURL_OPTS="--cacert /etc/pollinate/entropy.ubuntu.com.pem --capath /dev/null" diff -pruN 4.33-3/debian/pollinate.install 4.33-3ubuntu2/debian/pollinate.install --- 4.33-3/debian/pollinate.install 2019-02-04 18:15:14.000000000 +0000 +++ 4.33-3ubuntu2/debian/pollinate.install 2021-02-09 09:57:54.000000000 +0000 @@ -1,2 +1,3 @@ pollinate /usr/bin/ +entropy.ubuntu.com.pem /etc/pollinate/ check_pollen /usr/lib/nagios/plugins/ diff -pruN 4.33-3/debian/pollinate.service 4.33-3ubuntu2/debian/pollinate.service --- 4.33-3/debian/pollinate.service 2019-02-28 18:15:14.000000000 +0000 +++ 4.33-3ubuntu2/debian/pollinate.service 2021-02-09 09:57:54.000000000 +0000 @@ -9,6 +9,8 @@ Documentation=https://launchpad.net/poll [Service] User=pollinate ExecStart=/usr/bin/pollinate +CacheDirectory=pollinate +CacheDirectoryMode=0750 Type=oneshot [Install]