Bug#969912: buster-pu: package diaspora-installer/0.7.6.1+debian1
Control: tags -1 - moreinfo
On Tue, Sep 8, 2020 at 22:49, Pirate Praveen <praveen@onenetbeyond.org>
wrote:
On 2020, സെപ്റ്റംബർ 8 10:41:40 PM IST, "Adam D.
Barratt" <adam@adam-barratt.org.uk> wrote:
Control: tags -1 + moreinfo
On Tue, 2020-09-08 at 22:31 +0530, Pirate Praveen wrote:
This fixes upgrading from stretch-backports. Attaching the debdiff.
I noticed these issues when upgrading production instance at
https://diasp.in
Judging from the changelog, it looks like this change hasn't been
applied to the package in unstable yet. Is that correct?
Yes, that is correct.
I found the problem in stretch-backports and fixed that first. Then
moved to fixing buster. I intend to fix unstable too. If you want to
wait for fix in unstable, that'd be fine too.
These changes are now part of unstable (0.7.14.0+debian) and I included
one more important bug fix #926968 in the update (which was found when
upgrading from stretch-backports to buster). See the updated debdiff.
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-09 01:27:58.000000000 +0530
@@ -1,3 +1,12 @@
+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
+ * Make config/schedule.yml writeable (Closes: #926968)
+
+ -- Pirate Praveen <praveen@debian.org> Wed, 09 Sep 2020 01:27:58 +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/diaspora-common.links diaspora-installer-0.7.6.1+debian1+deb10u1/debian/diaspora-common.links
--- diaspora-installer-0.7.6.1+debian1/debian/diaspora-common.links 2019-05-01 18:45:53.000000000 +0530
+++ diaspora-installer-0.7.6.1+debian1+deb10u1/debian/diaspora-common.links 2020-09-09 01:27:29.000000000 +0530
@@ -2,6 +2,8 @@
var/lib/diaspora/public usr/share/diaspora/public
var/lib/diaspora/app-assets usr/share/diaspora/app/assets
var/lib/diaspora/.bundle usr/share/diaspora/.bundle
-var/lib/diaspora/Gemfile.lock usr/share/diaspora/Gemfile.lock
+#We use upstream Gemfile.lock for diaspora-installer so move this to diaspora
+#var/lib/diaspora/Gemfile.lock usr/share/diaspora/Gemfile.lock
var/lib/diaspora/oidc_key.pem usr/share/diaspora/config/oidc_key.pem
+var/lib/diaspora/schedule.yml usr/share/diaspora/config/schedule.yml
var/log/diaspora usr/share/diaspora/log
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-09 00:27:27.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/debian/postrm diaspora-installer-0.7.6.1+debian1+deb10u1/debian/postrm
--- diaspora-installer-0.7.6.1+debian1/debian/postrm 2019-05-01 18:45:53.000000000 +0530
+++ diaspora-installer-0.7.6.1+debian1+deb10u1/debian/postrm 2020-09-09 01:27:29.000000000 +0530
@@ -13,7 +13,7 @@
diaspora_home=/usr/share/diaspora
# Keep it in sync with preinst
-diaspora_symlinks_list="Gemfile.lock log tmp public app/assets bin/bundle vendor/bundle config/database.yml config/diaspora.yml config/oidc_key.pem"
+diaspora_symlinks_list="Gemfile.lock log tmp public app/assets bin/bundle vendor/bundle config/database.yml config/diaspora.yml config/oidc_key.pem config/schedule.yml"
diaspora_symlinks_dirs="app bin vendor db config"
case "$1" in
diff -Nru diaspora-installer-0.7.6.1+debian1/debian/preinst diaspora-installer-0.7.6.1+debian1+deb10u1/debian/preinst
--- diaspora-installer-0.7.6.1+debian1/debian/preinst 2019-05-01 18:45:53.000000000 +0530
+++ diaspora-installer-0.7.6.1+debian1+deb10u1/debian/preinst 2020-09-09 01:27:29.000000000 +0530
@@ -4,7 +4,7 @@
diaspora_home=/usr/share/diaspora
# Keep it in sync with postrm
-diaspora_symlinks_list="Gemfile.lock log tmp public app/assets bin/bundle vendor/bundle config/database.yml config/diaspora.yml config/oidc_key.pem"
+diaspora_symlinks_list="Gemfile.lock log tmp public app/assets bin/bundle vendor/bundle config/database.yml config/diaspora.yml config/oidc_key.pem config/schedule.yml"
# Fix bin symlink set by earlier versions
if test -L ${diaspora_home}/bin
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-09 01:27:29.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
Reply to: