X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/5684f71fa0f6c1b765aa53e22ca3b024c578b9c9..1d4219eef6b88cb08b957378b0ca1f9762996eac:/debian/apt.postinst

diff --git a/debian/apt.postinst b/debian/apt.postinst
index b8f3edbe5..1f98fcece 100755
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,13 +15,17 @@ set -e
 
 case "$1" in
     configure)
-	if dpkg --compare-versions "$2" lt 1.0.7; then
+	if dpkg --compare-versions "$2" lt 1.1~exp4; then
 	    # apt-key before 0.9.10 could leave empty keyrings around
 	    find /etc/apt/trusted.gpg.d/ -name '*.gpg' | while read keyring; do
 		if ! test -s "$keyring"; then
 		    rm -f "$keyring"
 		fi
 	    done
+	    # apt-key before 0.9.8.2 could create 0600 trusted.gpg file
+	    if test -e /etc/apt/trusted.gpg ; then
+	        chmod -f 0644 /etc/apt/trusted.gpg || true
+	    fi
 	fi
 
 	if dpkg --compare-versions "$2" lt-nl 0.9.9.5; then
@@ -36,9 +40,14 @@ case "$1" in
 	fi
 
 	# add unprivileged user for the apt methods
-	adduser --force-badname --system -home /var/empty \
+	adduser --force-badname --system --home /nonexistent  \
 	    --no-create-home --quiet _apt || true
 
+	# Fixup any mistake in the home directory of the _apt user
+	if dpkg --compare-versions "$2" lt-nl 1.1~exp10~; then
+	    usermod --home /nonexistent _apt
+	fi
+
 	# deal with upgrades from experimental
 	if dpkg --compare-versions "$2" 'eq' '1.1~exp3'; then
 	    # libapt will setup partial/ at runtime