[maemo-commits] [maemo-commits] r17643 - in projects/haf/trunk/hildon-initscripts: . debian

[From: subversion at stage.maemo.org]

Author: schulhof
Date: 2009-03-12 10:29:12 +0200 (Thu, 12 Mar 2009)
New Revision: 17643

Modified:
   projects/haf/trunk/hildon-initscripts/configure.ac
   projects/haf/trunk/hildon-initscripts/debian/changelog
   projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.install
   projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.postinst
   projects/haf/trunk/hildon-initscripts/debian/rules
Log:
NB#105194 fix

Modified: projects/haf/trunk/hildon-initscripts/configure.ac
===================================================================
--- projects/haf/trunk/hildon-initscripts/configure.ac	2009-03-11 20:50:32 UTC (rev 17642)
+++ projects/haf/trunk/hildon-initscripts/configure.ac	2009-03-12 08:29:12 UTC (rev 17643)
@@ -1,4 +1,4 @@
-AC_INIT([hildon-initscripts], [1.21])
+AC_INIT([hildon-initscripts], [1.22])
 AC_CONFIG_SRCDIR([run-standalone.sh])
 
 AM_INIT_AUTOMAKE

Modified: projects/haf/trunk/hildon-initscripts/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/changelog	2009-03-11 20:50:32 UTC (rev 17642)
+++ projects/haf/trunk/hildon-initscripts/debian/changelog	2009-03-12 08:29:12 UTC (rev 17643)
@@ -1,3 +1,10 @@
+hildon-initscripts (1.22-1unreleased) unstable; urgency=low
+
+  * Don't touch $HOME in postinst. Instead, distribute /etc/skel/.osso/
+  * Fixes: NB#105194 (hildon-initscripts must not access $HOME)
+
+ -- Gabriel Schulhof <gabriel.schulhof at nokia.com>  Thu, 12 Mar 2009 10:20:38 +0200
+
 hildon-initscripts (1.21-1) unstable; urgency=low
 
   * Completely gutted osso-gtk.defs. We now rely on theme-config >= 0.7 to ensure

Modified: projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.install
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.install	2009-03-11 20:50:32 UTC (rev 17642)
+++ projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.install	2009-03-12 08:29:12 UTC (rev 17643)
@@ -1,4 +1,5 @@
 /etc/osso-af-init/osso-gtk.defs
 /etc/osso-af-init/current-gtk-theme.default
 /etc/osso-af-init/current-gtk-key-theme.default
+/etc/skel/.osso/
 /usr/bin/run-standalone.sh

Modified: projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.postinst
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.postinst	2009-03-11 20:50:32 UTC (rev 17642)
+++ projects/haf/trunk/hildon-initscripts/debian/hildon-initscripts.postinst	2009-03-12 08:29:12 UTC (rev 17643)
@@ -1,28 +1,13 @@
 #!/bin/sh
-TGT=''
-if [ -e /targets/links/scratchbox.config ] ; then
-  . /targets/links/scratchbox.config
-  TGT=$SBOX_TARGET_DIR
-  USER=user
-fi
 
-USER=user
-GROUP=users
+HOME=/etc/skel
 
-HOME="$TGT/home/$USER"
-if [ ! -d $HOME/.osso ]; then
-  mkdir -p $HOME/.osso
-  chown $USER:$GROUP $HOME/.osso
-fi
-
 DEFAULTCONF=$HOME/.osso/current-gtk-theme
 if [ ! -e $DEFAULTCONF ]; then
   cp -f /etc/osso-af-init/current-gtk-theme.default $DEFAULTCONF
-  chown $USER:$GROUP $DEFAULTCONF
 fi
 
 DEFAULTKEYCONF=$HOME/.osso/current-gtk-key-theme
 if [ ! -e $DEFAULTKEYCONF ]; then
   cp -f /etc/osso-af-init/current-gtk-key-theme.default $DEFAULTKEYCONF
-  chown $USER:$GROUP $DEFAULTKEYCONF
 fi

Modified: projects/haf/trunk/hildon-initscripts/debian/rules
===================================================================
--- projects/haf/trunk/hildon-initscripts/debian/rules	2009-03-11 20:50:32 UTC (rev 17642)
+++ projects/haf/trunk/hildon-initscripts/debian/rules	2009-03-12 08:29:12 UTC (rev 17643)
@@ -35,6 +35,7 @@
 	dh_installdirs
 	
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/build
+	mkdir -p $(CURDIR)/debian/build/etc/skel/.osso
 
 binary-indep: build install
 	dh_testdir