Commit f0f927ad authored by Yaroslav Halchenko's avatar Yaroslav Halchenko

Support popularity-contest >= 1.61 encrypting submissions

- provide GPG public key for encryption of submissions
parent 0c66e6ba
neurodebian (0.33~a1) UNRELEASED; urgency=medium
* Support popularity-contest >= 1.61 encrypting submissions:
- provide GPG public key for encryption of submissions
-- Yaroslav Halchenko <debian@onerussian.com> Wed, 06 Aug 2014 16:21:04 -0400
neurodebian (0.32) neurodebian; urgency=low
[ Michael Hanke ]
......
usr/share/popularity-contest
etc/popularity-contest.d
popcon/neurodebian.conf /etc/popularity-contest.d
popcon/neurodebian-popcon.gpg /usr/share/popularity-contest
#!/bin/bash -e
# following to be duplicated within postrm as well, but may be with
# "Removing" message
popcon_conf=/etc/popularity-contest.conf
if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
nd_popcon_conf=/etc/popularity-contest.d/neurodebian.conf
remove_neurodebian_popcon_pre161() {
# Adjust popularity-contest.conf
if [ -e "$popcon_conf" ] \
&& grep -q "http://neuro.debian.net/cgi-bin/popcon-submit.cgi" $popcon_conf; then
#echo "Removing NeuroDebian url for Popularity Contest submissions."
# First remove any explicit mentioning and then empty additions
sed -i -e 's,http://neuro.debian.net/cgi-bin/popcon-submit.cgi,,g' \
-e '/SUBMITURLS+=" *"/d' \
-e '/SUBMITURLS="$SUBMITURLS *"/d' \
"$popcon_conf"
fi
}
add_neurodebian_popcon_pre161() {
# Adjust main popularity-contest configuration file. Should be
# used only with older versions of the popularity contest.
if [ -e "$popcon_conf" ]; then
# Fix dashism missing += operator
if grep -q 'SUBMITURLS+="' "$popcon_conf"; then
......@@ -14,6 +31,26 @@ if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
echo -e 'SUBMITURLS="$SUBMITURLS http://neuro.debian.net/cgi-bin/popcon-submit.cgi"' >> "$popcon_conf"
fi
fi
}
add_neurodebian_popcon_161() {
# 1.60 introduced encryption and a way to provide multiple keys to
# encrypt submissions to multiple servers.
# "Installation" is taken care of through installing files under
# /etc/popularity-contest.d, so no additional actions necessary here
:
}
popcon_version=$(dpkg -l popularity-contest | tail -n 1 | awk '{print $3;}')
if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then
if dpkg --compare-versions $popcon_version lt 1.61; then
add_neurodebian_popcon_pre161
else
# Assure that we have no "old" settings for submission
remove_neurodebian_popcon_pre161 || :
fi
fi
#DEBHELPER#
......@@ -2,11 +2,12 @@
#DEBHELPER#
# If requested to be purged -- remove our entry
popcon_conf=/etc/popularity-contest.conf
if [ "$1" = "purge" ]; then
nd_popcon_conf=/etc/popularity-contest.d/neurodebian.conf
remove_neurodebian_popcon_pre161() {
# Adjust popularity-contest.conf
if [ -e "$popcon_conf" ]; then
if [ -e "$popcon_conf" ] \
&& grep -q "http://neuro.debian.net/cgi-bin/popcon-submit.cgi" $popcon_conf; then
echo "Removing NeuroDebian url for Popularity Contest submissions."
# First remove any explicit mentioning and then empty additions
sed -i -e 's,http://neuro.debian.net/cgi-bin/popcon-submit.cgi,,g' \
......@@ -14,4 +15,9 @@ if [ "$1" = "purge" ]; then
-e '/SUBMITURLS="$SUBMITURLS *"/d' \
"$popcon_conf"
fi
}
# If requested to be purged -- remove our entry
if [ "$1" = "purge" ]; then
remove_neurodebian_popcon_pre161
fi
KEYRING="$KEYRING --keyring /usr/share/popularity-contest/neurodebian-popcon.gpg"
POPCONKEY="$POPCONKEY -r 0x544665CB8B48DE1D"
SUBMITURLS="$SUBMITURLS http://neuro.debian.net/cgi-bin/popcon-submit.cgi"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment