Merge branch 'integration-4.1' into master_olpcmaster_olpc

12 files changed, 638 insertions, 4 deletions

diff --git a/examples/dextrose4-xo1.ini b/examples/dextrose4-xo1.ini
new file mode 100644
index 0000000..5865329
--- /dev/null
+++ b/examples/dextrose4-xo1.ini
@@ -0,0 +1,223 @@
+; Dextrose4 F18 Sugar 0.97.7
+[global]
+fedora_release=18
+fedora_arch=i386
+olpc_version_major=13
+olpc_version_minor=1
+olpc_version_release=0
+target_platform=XO-1
+langs=en_US,en_AU,en_GB,hi_IN,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN
+customization_info=Dextrose 4 International
+image_name=dx4g%%03d
+
+
+[repos]
+fedora=fedora,fedora-updates,fedora-updates-testing
+olpc_publicrpms_1=1,f18
+olpc_publicrpms_2=1,f18-xo1
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+custom_repo_1=1,dextrose,http://download.sugarlabs.org/dextrose/daily/v4
+
+[yumcfg]
+addrepo_1=1,olpc-f18,http://rpmdropbox.laptop.org/f18/
+addrepo_2=1,olpc-f18-xo1,http://rpmdropbox.laptop.org/f18-xo1/
+addrepo_3=1,dextrose,http://download.sugarlabs.org/dextrose/daily/v4
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+[base]
+versioned_fs=0
+prepopulate_run=0
+make_iso=0
+compress_iso=0
+make_tree_tarball=1
+python_optimize=2
+
+[bootanim]
+
+[buildnr_from_file]
+path=latestbuild
+
+[custom_packages]
+add_packages=
+; '/etc/powerd/postresume.d/disable_mesh.sh' is no more required.
+; now, mesh is being disabled via kernel parameter.
+; see 'config/disable_mesh.sh' for details.
+;       dextrose-platform,
+; being replaced by sugar-client (alsroot's awesome work!)
+;       dextrose-updater,
+; remove ds-backup-client 
+;
+; now no more needed, via the fix to au#1563.
+;       sugar-client,
+; FIXME: plugins not available for the XO-1.75
+;       gstreamer-plugins-bad,
+;       gstreamer-plugins-ugly,
+;       gstreamer-ffmpeg,
+;        sugar-control-frame,
+;        sugar-control-accessibility,
+        hunspell-es,
+        hunspell-pt,
+        ipython,
+        liberation-mono-fonts,
+        liberation-serif-fonts,
+        liberation-sans-fonts,
+        pulseaudio-module-x11,
+        telepathy-idle,
+        telepathy-sofiasip,
+        x11vnc,
+        httpd,
+; au#1588: need "openssl-devel" package, for "libcrypto.so".
+        openssl-devel,
+        mod_ssl,
+
+; accessibility packages
+; Already added as dependencies for sugar-control-accessibility
+;       ax,
+;       CapitalFont,
+;       FlatbedCursors,
+;       magnifier-Ceibal,
+
+; temporary workaround for yum pulling in the wrong versions of Sugar packages
+; first and disregarding the dependencies of the DX3 versions of Sugar.
+        python-xlib,
+        upower,
+; Wasn't being picked automatically unlike previous builds      
+        chkconfig,
+; 	Not in dx4:
+;        sugar-hidden-network-connect,
+; sl#3285
+        rsyslog,
+        cronie,
+; sl#3336
+        ntp,
+        ntpdate,
+; uy#1792: needed to register "Documents" (and other special) folders.
+        xdg-user-dirs,
+
+[custom_scripts]
+custom_script_1=%(oob_config_dir)s/disable_mesh.sh
+custom_script_2=%(oob_config_dir)s/sugar-client-conf.sh
+
+[xo1]
+
+[gnome]
+
+[jffs2_image]
+
+; still too many open blockers for XO-1 idle suspend to work well
+[powerd]
+enable_idle_suspend=0
+
+[sd_card_image]
+; 4GB image
+size_1=3865470566
+; 2GB image
+;size_2=1932735283,2gb
+keep_disk_image=1
+compress_disk_image=1
+make_zd=0
+
+
+[sugar]
+favorites_view_del=
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.StopWatchActivity,
+	org.laptop.sugar.ReadActivity
+favorites_view_add=
+	org.laptop.Words,
+	org.laptop.community.TypingTurtle,
+	org.laptop.physics,
+	org.sugarlabs.AbacusActivity,
+	org.gnome.Labyrinth,
+protected_activities=
+	org.laptop.AbiWordActivity,
+	org.laptop.Oficina,
+	org.laptop.WebActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.RecordActivity,
+	edu.mit.media.ScratchActivity,
+	org.laptop.TurtleArtActivity,
+	org.vpri.EtoysActivityt,
+	net.gcompris,
+	org.tuxpaint,
+	org.gnome.Labyrinth,
+	org.laptop.Memorize,
+	org.worldwideworkshop.olpc.JigsawPuzzle,
+	org.laptop.Terminal,
+	vu.lux.olpc.Speak,
+	org.sugarlabs.AbacusActivity,
+	org.laptop.ImageViewerActivity,
+	org.laptop.Chat,
+	org.sugarlabs.VisualMatchActivity,
+	org.worldwideworkshop.PollBuilder,
+	org.laptop.TamTamMini,
+	com.socialtext.SocialCalcActivity,
+	org.vpri.EtoysActivity,
+
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1Lite
+install_activities=0
+
+
+[sugarlabs_activities]
+sugar_version=0.90
+activities=
+	com.jotaro.ImplodeActivity,
+; has been removed from activities.sugarlabs.org (not Open Source)
+;	edu.mit.media.ScratchActivity,
+	org.eq.FotoToon,
+	org.laptop.AbiWordActivity,
+	org.laptop.Arithmetic,
+	org.laptop.Chat,
+	org.laptop.Log,
+	org.laptop.ImageViewerActivity,
+	org.laptop.MeasureActivity,
+	org.laptop.Memorize,
+	org.laptop.RecordActivity,
+	org.laptop.TamTamMini,
+	org.laptop.Terminal,
+	org.laptop.TurtleArtActivity,
+	org.laptop.WebActivity,
+	org.laptop.Words,
+	org.laptop.community.Colors,
+	org.laptop.community.TypingTurtle,
+	org.laptop.physics,
+	org.laptop.sugar.GetBooksActivity,
+	org.laptop.sugar.ReadActivity,
+	org.sugarlabs.AbacusActivity,
+	org.vpri.EtoysActivity,
+	vu.lux.olpc.Maze,
+	vu.lux.olpc.Speak,
+
+; wasn't downloadable on 2011-03-16
+;	org.laptop.community.tetrismat,
+	org.worldwideworkshop.olpc.FlipSticks,
+	com.laptop.Ruler,
+	org.laptop.community.TurtleMachine,
+	org.laptop.community.Spirolaterals,
+	org.worldwideworkshop.PollBuilder,
+
+	org.gnome.Labyrinth,
+	org.sugarlabs.VisualMatchActivity,
+	org.laptop.sugar.Jukebox,
+	org.laptop.Oficina,
+	com.garycmartin.Moon,
+
+; AC "priority" activities
+	org.laptop.Pippy,
+	org.laptop.AcousticMeasure,
+	org.laptop.Calculate,
+	org.laptop.StopWatchActivity,
+	org.sugarlabs.IRC,
+
+
+
+
+
+[x11]
+
+[xo1]
+
+
+
diff --git a/examples/olpc-os-11.3.1-xo1.5.ini b/examples/olpc-os-11.3.1-xo1.5.ini
new file mode 100644
index 0000000..9b3293b
--- /dev/null
+++ b/examples/olpc-os-11.3.1-xo1.5.ini
@@ -0,0 +1,78 @@
+[global]
+suggested_oob_version=4.1
+fedora_release=14
+olpc_version_major=11
+olpc_version_minor=3
+olpc_version_release=1
+target_platform=XO-1.5
+langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de
+modules=
+	base,
+	xo1_5,
+	buildnr_from_file,
+	yumcfg,
+	sd_card_image,
+	usb_update,
+	repos,
+	x11,
+	sugar,
+	sugar_activity_group,
+	gnome
+
+[sd_card_image]
+; 8GB image
+size_3=7730941132,zd8
+; 4GB image
+size_1=3865470566,zd4
+; 2GB image
+size_2=1932735283,zd2
+
+[repos]
+fedora_arch=i386
+olpc_frozen_1=0,koji.dist-f14-i686
+olpc_frozen_2=0,koji.dist-f14-i686-updates-11.3.1
+olpc_frozen_3=1,local.11.3.1
+olpc_frozen_4=1,local.11.3.1-xo1.5
+add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.3.1
+
+[yumcfg]
+addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
+addrepo_2=1,olpc-f14-xo1.5,http://rpmdropbox.laptop.org/f14-xo1.5/
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+[sugar]
+favorites_view_add=
+	org.sugarlabs.InfoSlicer,
+	org.sugarlabs.IRC,
+	org.laptop.physics,
+	org.laptop.Words,
+	org.laptop.community.TypingTurtle,
+	org.gnome.Labyrinth,
+	org.laptop.sugar.GetBooksActivity,
+	org.laptop.WikipediaActivity,
+	org.laptop.WikipediaActivityEN,
+	org.laptop.StopWatchActivity,
+	org.laptop.RecordActivity,
+	org.laptop.community.Finance,
+	tv.alterna.Clock,
+	org.eq.FotoToon,
+	org.sugarlabs.AbacusActivity,
+	org.sugarlabs.PortfolioActivity
+favorites_view_del=
+	org.laptop.sugar.ReadActivity,
+	org.laptop.TamTamSynthLab
+protected_activities=
+	org.laptop.WebActivity,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.AbiWordActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.ImageViewerActivity,
+	org.laptop.RecordActivity
+
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1
+
+[buildnr_from_file]
+path=%(oob_config_dir)s/latestbuild-xo1.5-11.3.1
+
diff --git a/examples/olpc-os-11.3.1-xo1.75.ini b/examples/olpc-os-11.3.1-xo1.75.ini
new file mode 100644
index 0000000..53b7f99
--- /dev/null
+++ b/examples/olpc-os-11.3.1-xo1.75.ini
@@ -0,0 +1,76 @@
+[global]
+suggested_oob_version=4.1
+fedora_release=14
+olpc_version_major=11
+olpc_version_minor=3
+olpc_version_release=1
+target_platform=XO-1.75
+langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de
+modules=
+	base,
+	xo1_75,
+	buildnr_from_file,
+	yumcfg,
+	sd_card_image,
+	usb_update,
+	repos,
+	x11,
+	sugar,
+	sugar_activity_group,
+	gnome
+
+[sd_card_image]
+; 4GB image
+size_1=3865470566,zd4
+; 8GB image
+size_2=7730941132,zd8
+
+[repos]
+fedora_arch=arm
+olpc_frozen_1=0,koji.dist-f14-armv5tel
+olpc_frozen_2=0,koji.dist-f14-armv5tel-updates-11.3.1
+olpc_frozen_3=1,local.11.3.1
+olpc_frozen_4=1,local.11.3.1-xo1.75
+add_excludes_to=koji.dist-f14-armv5tel,koji.dist-f14-armv5tel-updates-11.3.1
+
+[yumcfg]
+addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
+addrepo_2=1,olpc-f14-xo1.75,http://rpmdropbox.laptop.org/f14-xo1.75/
+add_excludes_to=fedora,fedora-updates
+
+[sugar]
+favorites_view_add=
+	org.sugarlabs.InfoSlicer,
+	org.sugarlabs.IRC,
+	org.laptop.physics,
+	org.laptop.Words,
+	org.laptop.community.TypingTurtle,
+	org.gnome.Labyrinth,
+	org.laptop.sugar.GetBooksActivity,
+	org.laptop.WikipediaActivity,
+	org.laptop.WikipediaActivityEN,
+	org.laptop.StopWatchActivity,
+	org.laptop.RecordActivity,
+	org.laptop.community.Finance,
+	tv.alterna.Clock,
+	org.eq.FotoToon,
+	org.sugarlabs.AbacusActivity,
+	org.sugarlabs.PortfolioActivity
+favorites_view_del=
+	org.laptop.sugar.ReadActivity,
+	org.laptop.TamTamSynthLab
+protected_activities=
+	org.laptop.WebActivity,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.AbiWordActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.ImageViewerActivity,
+	org.laptop.RecordActivity
+
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1
+
+[buildnr_from_file]
+path=%(oob_config_dir)s/latestbuild-xo1.75-11.3.1
+
diff --git a/examples/olpc-os-11.3.1-xo1.ini b/examples/olpc-os-11.3.1-xo1.ini
new file mode 100644
index 0000000..93819ef
--- /dev/null
+++ b/examples/olpc-os-11.3.1-xo1.ini
@@ -0,0 +1,63 @@
+[global]
+suggested_oob_version=4.1
+fedora_release=14
+olpc_version_major=11
+olpc_version_minor=3
+olpc_version_release=1
+target_platform=XO-1
+langs=en_US,en_AU,es,ar,pt,pt_BR,fr,ht,mn,mr_IN,am_ET,km_KH,ne_NP,ur_PK,rw,ps,fa_AF,si,zh_CN,de
+modules=
+	base,
+	xo1,
+	buildnr_from_file,
+	yumcfg,
+	jffs2_image,
+	usb_update,
+	repos,
+	x11,
+	powerd,
+	sugar,
+	sugar_activity_group,
+	gnome
+
+[repos]
+fedora_arch=i386
+olpc_frozen_1=0,koji.dist-f14-i686
+olpc_frozen_2=0,koji.dist-f14-i686-updates-11.3.1
+olpc_frozen_3=1,local.11.3.1
+olpc_frozen_4=1,local.11.3.1-xo1
+add_excludes_to=koji.dist-f14-i686,koji.dist-f14-i686-updates-11.3.1
+
+[yumcfg]
+addrepo_1=1,olpc-f14,http://rpmdropbox.laptop.org/f14/
+addrepo_2=1,olpc-f14-xo1,http://rpmdropbox.laptop.org/f14-xo1/
+add_excludes_to=fedora,fedora-updates,fedora-updates-testing
+
+[sugar]
+favorites_view_add=
+	tv.alterna.Clock,
+	org.eq.FotoToon,
+	org.sugarlabs.AbacusActivity,
+	org.sugarlabs.PortfolioActivity
+favorites_view_del=
+	org.laptop.sugar.ReadActivity,
+	org.laptop.TamTamSynthLab
+protected_activities=
+	org.laptop.WebActivity,
+	org.laptop.Terminal,
+	org.laptop.Log,
+	org.laptop.AbiWordActivity,
+	org.laptop.sugar.ReadActivity,
+	org.laptop.ImageViewerActivity,
+	org.laptop.RecordActivity
+
+[sugar_activity_group]
+url=http://wiki.laptop.org/go/Activities/G1G1Lite
+
+[buildnr_from_file]
+path=%(oob_config_dir)s/latestbuild-xo1-11.3.1
+
+; still too many open blockers for XO-1 idle suspend to work well
+[powerd]
+enable_idle_suspend=0
+
diff --git a/modules/base/kspkglist.10.core.inc b/modules/base/kspkglist.10.core.inc
index eccbfb5..ee25e3c 100644
--- a/modules/base/kspkglist.10.core.inc
+++ b/modules/base/kspkglist.10.core.inc
@@ -30,6 +30,7 @@ PolicyKit-olpc
 ds-backup-client
 olpc-powerd
 olpc-powerd-dbus
+olpc-firmware
 
 # graphical base environment
 olpc-kbdshim
diff --git a/modules/base/kspost.11.core.inc b/modules/base/kspost.11.core.inc
new file mode 100644
index 0000000..f806a4a
--- /dev/null
+++ b/modules/base/kspost.11.core.inc
@@ -0,0 +1,3 @@
+# Disable "requiretty" for "wheel" group, so that "sudo" commands are be able to run in a terminal-less environment.
+echo "Defaults:%wheel !requiretty" >> /etc/sudoers
+
diff --git a/modules/base/kspost.12.core.inc b/modules/base/kspost.12.core.inc
new file mode 100644
index 0000000..7b94284
--- /dev/null
+++ b/modules/base/kspost.12.core.inc
@@ -0,0 +1,4 @@
+# sl#3267, enable ctrl+alt+erase to restart sugar for all xo-[1,1.5,1.75] laptops
+sed -i -e '/DontZap/d' /usr/share/olpc-utils/xorg.conf.d/xo1.conf
+sed -i -e '/DontZap/d' /usr/share/olpc-utils/xorg.conf.d/xo1.5.conf
+sed -i -e '/DontZap/d' /usr/share/olpc-utils/xorg.conf.d/xo1.75.conf
diff --git a/modules/base/kspost.13.core.inc b/modules/base/kspost.13.core.inc
new file mode 100644
index 0000000..54d74fc
--- /dev/null
+++ b/modules/base/kspost.13.core.inc
@@ -0,0 +1,6 @@
+# Set microphone recording level
+# don't think this is the right place JV
+# might need to patch olpc-configure
+echo "/usr/bin/amixer set \"Master Surround\" 31 unmute" > /etc/rc.d/rc.local
+echo "/usr/bin/alsactl store" >> /etc/rc.d/rc.local
+
diff --git a/modules/base/kspost.14.core.inc b/modules/base/kspost.14.core.inc
new file mode 100644
index 0000000..8dbbe60
--- /dev/null
+++ b/modules/base/kspost.14.core.inc
@@ -0,0 +1,59 @@
+cat << EOF > /usr/bin/yumfix
+#!/usr/bin/env python
+# Copyright (C) 2011, OLPC-AU.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import os
+import sys
+import string
+import gettext
+import gconf
+
+def main():
+    
+
+    ## JV export http_proxy from .gconf
+    yumtmp = open("/tmp/yum.conf.mod", "w")
+    if not os.path.exists('/home/olpc/.gconf/system/proxy'):
+        yumtmp.close()
+        sys.exit(1)
+    sys_dir = '/system/http_proxy'
+    client = gconf.client_get_default()
+    use_proxy = client.get_string('/system/proxy/mode')
+    if use_proxy != 'none':
+        http_host = client.get_string('%s/host' % sys_dir)
+        http_port = client.get_int('%s/port' % sys_dir)
+        proxy_info = '%s:%d' % (http_host, http_port)
+        yumtmp.write('proxy=http://%s\n' % proxy_info)
+        use_auth = client.get_bool('%s/use_authentication' % sys_dir)
+        if use_auth is True:
+            auth_user = client.get_string('%s/authentication_user' % sys_dir)
+            yumtmp.write('proxy_username %s\n' % auth_user)
+            auth_pass = client.get_string('%s/authentication_password' % sys_dir)
+            yumtmp.write('proxy_password %s\n' % auth_pass)
+    else:
+        pass
+    yumtmp.close()
+
+main()
+
+EOF
+chmod 755 /usr/bin/yumfix
+
+# run the above from ~/.xsession
+echo "/usr/bin/yumfix" > /home/olpc/.xsession
+
+echo "include=/tmp/yum.conf.mod" >> /etc/yum.conf
diff --git a/modules/x11/kspost.60.misc.inc b/modules/x11/kspost.60.misc.inc
index 4b91dbd..f5745d5 100644
--- a/modules/x11/kspost.60.misc.inc
+++ b/modules/x11/kspost.60.misc.inc
@@ -1,6 +1,3 @@
-# Workaround an unknown bug where TamTam sound is crackly on XO-1.5 (#9414)
-sed -i -e 's/dmix.rate 48000/dmix.rate 44100/' /usr/share/alsa/alsa.conf
-
 # Don't try and autospawn pulseaudio (#9470)
 sed -i -e 's/; autospawn = yes/autospawn = no/' /etc/pulse/client.conf
 
diff --git a/modules/x11/kspost.90.tweaks.inc b/modules/x11/kspost.90.tweaks.inc
new file mode 100644
index 0000000..f930144
--- /dev/null
+++ b/modules/x11/kspost.90.tweaks.inc
@@ -0,0 +1,124 @@
+
+#au#704: add permissions for '/etc/ntp/step-tickers' file
+chmod 0777 /etc/ntp
+chmod 0777 /etc/ntp/step-tickers
+# also, make the file empty.
+echo > /etc/ntp/step-tickers
+
+# uy#1375 : Utility Functions.
+SearchAndReplaceRegex()
+{
+       cat $1 | sed "s/$2/$3/g" > temp
+       cat temp > $1
+}
+
+SearchAndDeleteLineContainingRegex()
+{
+       cat $1 | sed "/$2/d" > temp
+       cat temp > $1
+}
+
+# uy#1375 (a): Append to "/home/olpc/.xsession"
+#              Done in "config/sugar-client-conf.sh"
+
+# uy#1375 (b): Add "/home/olpc/xmodmap.conf"
+filename="/home/olpc/xmodmap.conf"
+echo "keycode 224 = F13" >> $filename
+
+# uy#1375 (c): Modify "/usr/share/X11/xkb/keycodes/evdev"
+filename="/usr/share/X11/xkb/keycodes/evdev"
+SearchAndDeleteLineContainingRegex $filename " *<LWIN> = 133; *"
+SearchAndReplaceRegex $filename "<CAPS> = 66;" "<CAPS> = 133;"
+
+# uy#1769 : Set up "httpd", to host "WebDAV" shares.
+#
+#
+# Make the directories (if not already), and set the permissions.
+#
+mkdir -p /var/www/web1/web/.Sugar-Metadata
+chmod -R 0777 /var/www/web1/
+
+# Some necessary tweaks in "httpd" service.
+#
+rm /etc/httpd/logs
+mkdir /etc/httpd/logs
+
+# Generate the ssl-key and certificate.
+# Note that initially, all XOs will be having the same pair
+# (since the same image will be installled on all XOs).
+#
+# However, a new unique pair will be generated per XO, once the user
+# creates her sugar-profile (on first startup of the XO).
+mkdir -p /home/olpc/.sugar/default
+openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" -keyout /home/olpc/.sugar/default/ssl.key -out /home/olpc/.sugar/defaul
+
+# Replace the key- and crt-path in conf-file, so that secure-transfer may be enabled.
+#
+filename="/etc/httpd/conf.d/ssl.conf"
+SearchAndReplaceRegex $filename "SSLCertificateKeyFile \/etc\/pki\/tls\/private\/localhost.key" "SSLCertificateKeyFile \/home\/olpc\/.sugar\/default\/ssl.key"
+SearchAndReplaceRegex $filename "SSLCertificateFile \/etc\/pki\/tls\/certs\/localhost.crt" "SSLCertificateFile \/home\/olpc\/.sugar\/default\/ssl.crt"
+
+# Create the password file for WebDAV.
+#
+htpasswd -bc /var/www/web1/passwd.dav test olpc
+
+# Finally, configure "VirtualHost".
+filename="/etc/httpd/conf.d/ssl.conf"
+SearchAndDeleteLineContainingRegex $filename "<\/VirtualHost>"
+cat << EOF >> /etc/httpd/conf.d/ssl.conf
+
+        DocumentRoot /var/www/web1/web
+        <Directory /var/www/web1/web/>
+                Options Indexes MultiViews
+                AllowOverride None
+                Order allow,deny
+                allow from all
+        </Directory>
+
+        Alias /webdav /var/www/web1/web
+
+        <Location /webdav>
+            DAV On
+            AuthType Basic
+            AuthName "webdav"
+            AuthUserFile /var/www/web1/passwd.dav
+            Require valid-user
+        </Location>
+</VirtualHost>
+EOF
+
+# Change the startup preferences of services.
+#
+/sbin/chkconfig httpd --levels 5 on
+
+# uy#1769 customizations end.
+
+
+# uy#1792: Have a documents folder (if not already,
+#         as is the case in non-gnome image).
+#
+#          Note that, this folder needs to be registered,
+#          to be recognized as a special folder.
+if [ ! -d "/home/olpc/Documents" ]; then
+    mkdir "/home/olpc/Documents"
+    xdg-user-dirs-update
+    chmod -R 0777 /home/olpc/Documents
+fi
+
+
+# au#1588: Need to make soft-links, to join library-versions.
+ln -s /usr/lib/libssl.so.10    /usr/lib/libssl.so.8
+ln -s /usr/lib/libcrypto.so    /usr/lib/libcrypto.so.8
+
+
+# disable login sound
+rm /usr/share/gnome/autostart/libcanberra-login-sound.desktop
+
+
+# disable hot-corners (some deployments begged us to do it, let's see how many will beg us to revert this)
+gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t int /desktop/sugar/frame/corner_delay 1000
+
+
+# enable ad-hoc icon 
+gconftool-2 --direct --config-source xml:readwrite:/etc/gconf/gconf.xml.defaults --type bool --set /desktop/sugar/network/adhoc true
+
diff --git a/osbuilder.py b/osbuilder.py
index de4a15d..3713241 100755
--- a/osbuilder.py
+++ b/osbuilder.py
@@ -18,7 +18,7 @@
 #
 
 # canonical source of version number
-VERSION="3.0.0_pre2"
+VERSION="4.1.0"
 
 # "make install" modifies this in the installed copy
 INSTALLED=0