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

Bug#858180: marked as done (unblock: diaspora-installer/0.6.3.0+debian3)

Your message dated Sun, 30 Apr 2017 19:01:39 +0200
with message-id <20170430170139.xdgg7zm4this3seu@betterave.cristau.org>
and subject line Re: Bug#858180: unblock: diaspora-installer/0.6.3.0+debian2
has caused the Debian Bug report #858180,
regarding unblock: diaspora-installer/0.6.3.0+debian3
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.)


-- 
858180: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858180
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package diaspora-installer

This fixes RC bug #856720

migrate-to-0.6.3.0.sh is just used as a note, its not used anywhere and
its not installed.

unblock diaspora-installer/0.6.3.0+debian2

-- System Information:
Debian Release: 9.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 4.9.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=ml_IN.UTF-8, LC_CTYPE=ml_IN.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

diff -Nru diaspora-installer-0.6.3.0+debian1/debian/changelog diaspora-installer-0.6.3.0+debian2/debian/changelog
--- diaspora-installer-0.6.3.0+debian1/debian/changelog	2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/debian/changelog	2017-03-17 11:43:04.000000000 +0530
@@ -1,3 +1,12 @@
+diaspora-installer (0.6.3.0+debian2) unstable; urgency=medium
+
+  * Change section to net (Closes: #832219)
+  * Crete public/source.tar.gz only if the file is missing
+  * Fix diaspora backup logic for updates (to remove files removed upstream)
+    (Closes: #856720)
+
+ -- Pirate Praveen <praveen@debian.org>  Fri, 17 Mar 2017 11:43:04 +0530
+
 diaspora-installer (0.6.3.0+debian1) unstable; urgency=medium
 
   * Install 0.6.3.0 version
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/control diaspora-installer-0.6.3.0+debian2/debian/control
--- diaspora-installer-0.6.3.0+debian1/debian/control	2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/debian/control	2017-03-15 10:12:32.000000000 +0530
@@ -1,5 +1,5 @@
 Source: diaspora-installer
-Section: ruby
+Section: net
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
 Uploaders: Pirate Praveen <praveen@debian.org>
@@ -15,7 +15,7 @@
 
 Package: diaspora-installer
 Architecture: all
-Section: contrib/ruby
+Section: contrib/net
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: build-essential,
          diaspora-common (= ${source:Version}),
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/postinst diaspora-installer-0.6.3.0+debian2/debian/postinst
--- diaspora-installer-0.6.3.0+debian1/debian/postinst	2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/debian/postinst	2017-03-17 11:12:41.000000000 +0530
@@ -56,8 +56,9 @@
 
 	echo "Precompiling assets..."
 	su diaspora -s /bin/sh -c 'bundle exec rake tmp:cache:clear assets:precompile'
+        # preinst creates backup (to be able to remove files removed upstream)
         echo "Remove backup..."
-        rm -rf ${diaspora_home}-backup.*
+        rm -rf ${diaspora_home}/.backup.*
 
         # Starting diaspora
         service diaspora start
diff -Nru diaspora-installer-0.6.3.0+debian1/debian/preinst diaspora-installer-0.6.3.0+debian2/debian/preinst
--- diaspora-installer-0.6.3.0+debian1/debian/preinst	2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/debian/preinst	2017-03-17 11:12:41.000000000 +0530
@@ -2,6 +2,7 @@
 set -e
 
 diaspora_home=/usr/share/diaspora
+diaspora_symlinks_list="Gemfile.lock log tmp app/assets bin/bundle vendor/bundle db/schema.rb config/database.yml config/diaspora/yml"
 
 # Fix bin symlink set by earlier versions
 if test -L ${diaspora_home}/bin
@@ -10,20 +11,21 @@
 fi
 
 # Backup the previous version
-# Just keep the config and vendor/bundle
+# Just keep the modified files/directories
+# We need this to remove files removed upstream
 backup() {
-    cp -r ${diaspora_home}/config ${diaspora_home}-config
-    cp -r ${diaspora_home}/vendor/bundle ${diaspora_home}-vendor-bundle
-    cp -r ${diaspora_home}/.bundle ${diaspora_home}.bundle
     backup_suffix=$(openssl rand -hex 4)
-    mv ${diaspora_home} ${diaspora_home}-backup.${backup-suffix}
-    mkdir ${diaspora_home}
-    mkdir ${diaspora_home}/vendor
-    mv ${diaspora_home}-config ${diaspora_home}/config
-    mv ${diaspora_home}-vendor-bundle ${diaspora_home}/vendor/bundle
-    mv ${diaspora_home}.bundle ${diaspora_home}/.bundle
-    mv ${diaspora_home}-backup.${backup-suffix}/public ${diaspora_home}/public
-	
+    backup_dir=${diaspora_home}/.backup.${backup_suffix}
+    mkdir  ${backup_dir}
+    mv ${diaspora_home}/* ${backup_dir}
+
+    for i in vendor,app,bin,db,config; do
+      mkdir ${diaspora_home}/$i
+    done
+
+    for i in ${diaspora_symlinks_list}; do
+      mv ${backup_dir}/$i ${diaspora_home}/$i
+    done
 }
  
 case "$1" in
diff -Nru diaspora-installer-0.6.3.0+debian1/diaspora-download.sh diaspora-installer-0.6.3.0+debian2/diaspora-download.sh
--- diaspora-installer-0.6.3.0+debian1/diaspora-download.sh	2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/diaspora-download.sh	2017-03-17 11:00:01.000000000 +0530
@@ -33,7 +33,7 @@
     
 echo "diaspora archive to copy: ${diaspora_archive}"
 
-rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb --exclude app/assets --exclude public
+rsync -a ${diaspora_cache}/${diaspora_archive}/* ${diaspora_home} --exclude tmp --exclude log --exclude db/schema.rb --exclude app/assets --exclude public --exclude Gemfile.lock
 cp -r  ${diaspora_cache}/${diaspora_archive}/db/schema.rb ${diaspora_user_home}/db-schema.rb.template
 cp -r  ${diaspora_cache}/${diaspora_archive}/app/assets/* ${diaspora_user_home}/app-assets
 cp -r  ${diaspora_cache}/${diaspora_archive}/public/* ${diaspora_user_home}/public
diff -Nru diaspora-installer-0.6.3.0+debian1/migrate-to-0.6.3.0.sh diaspora-installer-0.6.3.0+debian2/migrate-to-0.6.3.0.sh
--- diaspora-installer-0.6.3.0+debian1/migrate-to-0.6.3.0.sh	1970-01-01 05:30:00.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/migrate-to-0.6.3.0.sh	2017-02-20 12:12:28.000000000 +0530
@@ -0,0 +1,61 @@
+# This is required if updating from a version before 0.6.3.0
+test "$(getent passwd diaspora | cut -d: -f6)" = "/var/lib/$user"  ||\
+ usermod -d /var/lib/diaspora diaspora
+mkdir -p /var/lib/diaspora
+
+for i in public .bundle Gemfile.lock
+do
+  if [ -L /usr/share/diaspora/$i ]; then
+    echo -n ""
+  elif [ -d /usr/share/diaspora/$i ]; then
+    mv /usr/share/diaspora/$i /var/lib/diaspora
+    ln -sf /var/lib/diaspora/$i /usr/share/diaspora/$i
+  fi
+  mkdir -p /var/lib/diaspora/$i
+done
+
+if [ -L /usr/share/diaspora/app/assets ]; then
+  echo -n ""
+elif [ -d /usr/share/diaspora/app/assets ]; then
+  mkdir -p /var/lib/diaspora/app-assets
+  ln -sf /var/lib/diaspora/app-assets /usr/share/diaspora/app/assets
+fi
+mkdir -p /var/lib/diaspora/app-assets
+
+if [ -L /usr/share/diaspora/vendor/bundle ]; then
+  echo -n ""
+elif [ -d /usr/share/diaspora/vendor/bundle ]; then
+  mv /usr/share/diaspora/vendor/bundle /var/lib/diaspora/vendor-bundle
+  ln -sf /var/lib/diaspora/vendor-bundle /usr/share/diaspora/vendor/bundle
+fi
+mkdir -p /var/lib/diaspora/vendor-bundle
+
+mkdir -p /run/diaspora
+if [ -L /usr/share/diaspora/tmp ]; then
+  echo -n ""
+elif [ -d /usr/share/diaspora/tmp ]; then
+  mv /usr/share/diaspora/tmp/* /run/diaspora/
+  rmdir /usr/share/diaspora/tmp/
+  ln -sf /run/diaspora /usr/share/diaspora/tmp
+fi
+mkdir -p /run/diaspora/pids
+
+mkdir -p /var/log/diaspora
+if [ -L /usr/share/diaspora/log ]; then
+  echo -n ""
+elif [ -d /usr/share/diaspora/log ]; then
+  mv /usr/share/diaspora/log/* /var/log/diaspora/
+  rm -rf /usr/share/diaspora/log
+  ln -sf /var/log/diaspora /usr/share/diaspora/log
+fi
+
+if [ -L /usr/share/diaspora/db/schema.rb ]; then
+  echo -n ""
+elif [ -f /usr/share/diaspora/db/schema.rb ]; then
+  mv /usr/share/diaspora/db/schema.rb /var/lib/diaspora/db-schema.rb
+  ln -sf /var/lib/diaspora/db-schema.rb /usr/share/diaspora/db/schema.rb
+fi
+
+chown diaspora: -R /var/lib/diaspora
+chown diaspora: -R /var/log/diaspora
+chown diaspora:www-data -R /run/diaspora
diff -Nru diaspora-installer-0.6.3.0+debian1/rake-tasks.sh diaspora-installer-0.6.3.0+debian2/rake-tasks.sh
--- diaspora-installer-0.6.3.0+debian1/rake-tasks.sh	2017-01-26 04:39:32.000000000 +0530
+++ diaspora-installer-0.6.3.0+debian2/rake-tasks.sh	2017-03-15 17:12:32.000000000 +0530
@@ -2,7 +2,9 @@
 # Read configuration values	
 . /etc/diaspora/diaspora-common.conf
 
-su diaspora -s /bin/sh -c 'touch public/source.tar.gz'
+# Create an empty public/source.tar.gz for diaspora package
+# script/server checks for its existence
+su diaspora -s /bin/sh -c 'test -f public/source.tar.gz || touch public/source.tar.gz'
 
 if grep https ${diaspora_conf}
 then

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
--- Begin Message --- 
On Sun, Mar 19, 2017 at 19:19:34 +0530, Pirate Praveen wrote:

> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock package diaspora-installer
> 
diaspora-installer was removed from stretch a month ago, and isn't
coming back, so closing this request.

Cheers,
Julien

--- End Message ---
Reply to: