[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#969912: marked as done (buster-pu: package diaspora-installer/0.7.6.1+debian1)



Your message dated Sat, 26 Sep 2020 11:36:30 +0100
with message-id <d50ba4de424290cd2840a09ef19950156fcf51ab.camel@adam-barratt.org.uk>
and subject line Closing bugs for fixes included in 10.6 point release
has caused the Debian Bug report #969912,
regarding buster-pu: package diaspora-installer/0.7.6.1+debian1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
969912: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=969912
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu

This fixes upgrading from stretch-backports. Attaching the debdiff.

I noticed these issues when upgrading production instance at https://diasp.in
(I hope I don't have to a file a bug).

Let me know if I can upload it.

-- System Information:
Debian Release: 10.5
 APT prefers stable
 APT policy: (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 5.4.0-0.bpo.4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_IN, LC_CTYPE=en_IN (charmap=UTF-8), LANGUAGE=en_IN:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled


diff -Nru diaspora-installer-0.7.6.1+debian1/debian/changelog diaspora-installer-0.7.6.1+debian1+deb10u1/debian/changelog
--- diaspora-installer-0.7.6.1+debian1/debian/changelog	2019-05-01 18:45:53.000000000 +0530
+++ diaspora-installer-0.7.6.1+debian1+deb10u1/debian/changelog	2020-09-08 21:05:18.000000000 +0530
@@ -1,3 +1,11 @@
+diaspora-installer (0.7.6.1+debian1+deb10u1) buster; urgency=medium
+
+  * Use --frozen option to bundle install to use upstream Gemfile.lock
+  * Don't exclude Gemfile.lock during upgrades
+  * Don't overiwrite config/oidc_key.pem during upgrades
+
+ -- Pirate Praveen <praveen@debian.org>  Tue, 08 Sep 2020 21:05:18 +0530
+
 diaspora-installer (0.7.6.1+debian1) unstable; urgency=medium
 
   * Use system bundler (Closes: #919978)
diff -Nru diaspora-installer-0.7.6.1+debian1/debian/postinst diaspora-installer-0.7.6.1+debian1+deb10u1/debian/postinst
--- diaspora-installer-0.7.6.1+debian1/debian/postinst	2019-05-01 18:45:53.000000000 +0530
+++ diaspora-installer-0.7.6.1+debian1+deb10u1/debian/postinst	2020-09-08 21:04:25.000000000 +0530
@@ -41,8 +41,7 @@
 
 	echo "Installing gems with rubygems ..."
 	su ${diaspora_user} -s /bin/sh -c "mkdir -p ~/vendor/bundle"
-	su ${diaspora_user} -s /bin/sh -c "touch ~/Gemfile.lock && truncate -s 0 ~/Gemfile.lock"
-	su ${diaspora_user} -s /bin/sh -c "bundle install --path vendor/bundle --with ${BUNDLE_WITH} --without development test"
+	su ${diaspora_user} -s /bin/sh -c "bundle install --frozen --path vendor/bundle --with ${BUNDLE_WITH} --without development test"
         # Fix permissions (see #847286, #866862)
 	su ${diaspora_user} -s /bin/sh -c "find ${diaspora_user_home}/vendor/bundle -type f -exec chmod go-w {} \;"
 
diff -Nru diaspora-installer-0.7.6.1+debian1/diaspora-download.sh diaspora-installer-0.7.6.1+debian1+deb10u1/diaspora-download.sh
--- diaspora-installer-0.7.6.1+debian1/diaspora-download.sh	2019-05-01 18:45:53.000000000 +0530
+++ diaspora-installer-0.7.6.1+debian1+deb10u1/diaspora-download.sh	2020-09-08 21:04:58.000000000 +0530
@@ -36,7 +36,8 @@
     
 echo "diaspora archive to copy: ${diaspora_archive}"
 
-rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude app/assets --exclude public --exclude Gemfile.lock
+# Exclude user generated or files or directories
+rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb --exclude app/assets --exclude public --exclude config/oidc_key.pem
 cp -r  ${diaspora_cache}/${diaspora_archive}/app/assets/* ${diaspora_user_home}/app-assets
 cp -r  ${diaspora_cache}/${diaspora_archive}/public/* ${diaspora_user_home}/public
 chown -R ${diaspora_user}: ${diaspora_user_home}/public

--- End Message ---
--- Begin Message ---
Package: release.debian.org
Version: 10.6

Hi,

Each of these bugs relates to an update that was included in today's
stable point release.

Regards,

Adam

--- End Message ---

Reply to: