Release 2.4.15

Also removes trashbin in KDE desktop but this is intentional.

Makefile

@@ -47,6 +47,11 @@ sysconfdir = /etc
 sbindir = ${exec_prefix}/sbin
 bindir = ${exec_prefix}/bin
 datadir = ${prefix}/share
+ifeq ($(ARCH), x86_64)
+libexecdir = ${prefix}/libexec64
+else
+libexecdir = ${prefix}/libexec
+endif
 initrddir = ${sysconfdir}/rc.d/init.d
 mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
@@ -91,6 +96,7 @@ pck_infiles := $(wildcard kde/config/*.in \
                           kde/wallpapers/*.in \
                           menu/*.in menu/applications/*.in menu/applications/*/*.in \
                           SRPMS/*/*.in \
+                          remote-support-mambasoft/*.in \
                           desktop/*.in)
 pck_sysconfigfile := distroutils.sysconfig
 
@@ -118,6 +124,7 @@ pck_catalogs3 := $(wildcard openmamba-update/po/*.po)
             s,@sysconfigfile@,$(SYSCONFIGFILE),g;\
             s,@datadir@,${datadir},g;\
             s,@bindir@,$(bindir),g;\
+            s,@libexecdir@,$(libexecdir),g;\
             s,@distrobindir@,$(distrobindir),g;\
             s,@distrodesktopdir@,$(distrodesktopdir),g;\
             s,@distrosrpmsdir@,$(distrosrpmsdir),g;\
@@ -232,6 +239,7 @@ install-icons:
 	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
 	   $(INSTALL_DIR) $(DESTDIR)$(iconsdir)/$$i/apps/; \
 	   $(INSTALL_DATA) mambabase/mamba-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mamba.png; \
+	   $(INSTALL_DATA) remote-support-mambasoft/mambasoft-$$i.png $(DESTDIR)$(iconsdir)/$$i/apps/mambasoft.png; \
 	done
 ifeq ($(WITHKDE3TOOLS),1)
 	@for i in 16x16 22x22 32x32 48x48 64x64 128x128; do \
@@ -243,7 +251,6 @@ endif
 
 install-mambabase:
 	@$(INSTALL_DIR) $(DESTDIR)$(mambabasedatadir)
-	$(INSTALL_DATA) mambabase/mambabase.db $(DESTDIR)$(mambabasedatadir)
 	$(INSTALL_SCRIPT) mambabase/mambabase.sh $(DESTDIR)$(mambabasedatadir)
 ifeq ($(WITHKDE3TOOLS),1)
 	$(INSTALL_SCRIPT) mambabase/mambabase.kmdr $(DESTDIR)$(mambabasedatadir)
@@ -276,6 +283,10 @@ ifeq ($(WITHKDE3TOOLS),1)
 	$(INSTALL_DATA) mambawelcome/mambawelcome.target $(DESTDIR)$(systemdsystemdir)/mambawelcome.target
 endif
 
+install-remote-support-mambasoft:
+	$(INSTALL_SCRIPT) remote-support-mambasoft/remote-support-mambasoft.sh $(DESTDIR)$(bindir)/remote-support-mambasoft
+	$(INSTALL_DATA) remote-support-mambasoft/remote-support-mambasoft.desktop $(DESTDIR)$(xdg_appsdir)
+
 install-xramdr:
 	@$(INSTALL_DIR) $(DESTDIR)$(xramdrdatadir)
 	$(INSTALL_SCRIPT) xramdr/70521-xramdr.kmdr $(DESTDIR)$(xramdrdatadir)/xramdr.kmdr
@@ -308,6 +319,7 @@ install: $(pck_infiles:.in=) \
 	install-mambabase \
 	install-mambawelcome \
 	install-mambareport \
+	install-remote-support-mambasoft \
 	install-bootrecover \
 	install-locales \
 	install-icons

SRPMS/sun-java7/sun-java7.spec.in

@@ -1,7 +1,8 @@
 %define        JRE_NSVER         7
-
-%define        MAJOR             %(echo %version | cut -du -f1)
-%define        MINOR             %(echo %version | cut -du -f2)
+%define        pkgver            %(echo %version | tr _ -)
+%define        realver           %(echo %version | cut -d_ -f1)
+%define        MAJOR             %(echo %realver | cut -du -f1)
+%define        MINOR             %(echo %realver | cut -du -f2)
 %define        major             1.%{MAJOR}
 %define        minor             0
 %define        origin            sun
@@ -9,7 +10,7 @@
 %define        jppname           java-%{javaver}-%{origin}
 %define        javaws_ver        %{javaver}
 %define        toplevel_dir      jdk%{javaver}_%{MINOR}
-%define        distversion       %{version}
+%define        distversion       %{realver}
 %define        label             -%{name}
 %define        jdklnk            jdk7-%{origin}
 %define        jrelnk            jre7-%{origin}
@@ -32,14 +33,9 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           http://www.oracle.com/technetwork/java/javase/overview/index.html
 Source:        LICENSE
-#Source0:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-i586.tar.gz
-#Source1:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-x64.tar.gz
-#Source2:       http://download.oracle.com/otn-pub/java/jdk/7u6-b24/jdk-%{version}-linux-arm-sfp.tar.gz
-#Source3:       sun-java7-jdk-profile
-#Source4:       sun-java7-jre-profile
 BuildRequires: jpackage-utils
-Provides:      jdk = %{version}
-Provides:      jdk2 = %{version}
+Provides:      jdk = %{realver}
+Provides:      jdk2 = %{realver}
 License:       Oracle Binary Code License
 Requires:      shared-mime-info
 Requires:      desktop-file-utils
@@ -54,8 +50,8 @@ Sun Java Developer's Kit.
 Summary:       Sun Java Platform Runtime Environment
 Group:         System/Libraries/Java
 #Obsoletes:     j2re
-Provides:      j2re = %{version}
-Provides:      jre = %{version}
+Provides:      j2re = %{realver}
+Provides:      jre = %{realver}
 
 %description runtime
 Sun Java Platform Runtime Environment.
@@ -69,20 +65,20 @@ Sun Java Platform Runtime Environment.
 %ifarch %{ix86}
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b13/jdk-%{version}-linux-i586.tar.gz
-tar xf jdk-%{version}-linux-i586.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-i586.tar.gz
+tar xf jdk-%{realver}-linux-i586.tar.gz
 %endif
 %ifarch x86_64
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b13/jdk-%{version}-linux-x64.tar.gz
-tar xf jdk-%{version}-linux-x64.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-x64.tar.gz
+tar xf jdk-%{realver}-linux-x64.tar.gz
 %endif
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b13/jdk-%{version}-linux-arm-vfp-sflt.tar.gz
-tar xf jdk-%{version}-linux-arm-sfp.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{pkgver}/jdk-%{realver}-linux-arm-vfp-sflt.tar.gz
+tar xf jdk-%{realver}-linux-arm-sfp.tar.gz
 %endif
 
 cd %{toplevel_dir}
@@ -126,8 +122,8 @@ pushd %{buildroot}%{jvmjardir}
    ln -s %{_jvmdir}/%{jredir}/lib/rt.jar sasl-%{javaver}.jar
 #  ln -s %{_jvmdir}/%{jredir}/lib/rt.jar xml-commons-apis.jar
    for jar in *-%{javaver}.jar ; do
-      #if [ %{version} != %{javaver} ]; then
-         #ln -fs ${jar} $(echo $jar | sed "s|-%{version}.jar|-%{javaver}.jar|g")
+      #if [ %{realver} != %{javaver} ]; then
+         #ln -fs ${jar} $(echo $jar | sed "s|-%{realver}.jar|-%{javaver}.jar|g")
       #fi
       ln -fs ${jar} $(echo $jar | sed "s|-%{javaver}.jar|.jar|g")
    done
@@ -148,9 +144,9 @@ mkdir -p %{buildroot}%{_datadir}/icons/mini
 install -m 644 jre/plugin/desktop/%{origin}_java.png \
    %{buildroot}%{_datadir}/pixmaps/%{name}.png
 ln -s %{_datadir}/pixmaps/%{name}.png %{buildroot}%{_datadir}/icons/mini/%{name}.png
-
 install -d %{buildroot}%{_libdir}/mozilla/plugins
-pushd %{buildroot}%{_jvmdir}/%{jredir}
+%endif
+%ifarch %{ix86}
 ln -s %{_jvmdir}/%{jredir}/plugin/i386/ns%{JRE_NSVER}/libjavaplugin_oji.so \
    %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin_oji.so
 ln -s %{_jvmdir}/%{jredir}/plugin/i386/ns%{JRE_NSVER}/libjavaplugin_oji.so \
@@ -161,7 +157,12 @@ ln -s %{_jvmdir}/%{jredir}/lib/i386/libjavaplugin_nscp.so \
    %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin_nscp.so
 ln -s %{_jvmdir}/%{jredir}/lib/i386/libnpjp2.so \
    %{buildroot}%{_libdir}/mozilla/plugins/libnpjp2-7.so
-popd
+%endif
+%ifarch x86_64
+ln -s %{_jvmdir}/%{jredir}/lib/amd64/libjavaplugin_jni.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libjava7plugin_jni.so
+ln -s %{_jvmdir}/%{jredir}/lib/amd64/libnpjp2.so \
+   %{buildroot}%{_libdir}/mozilla/plugins/libnpjp2-7.so
 %endif
 
 install -d -m 755 %{buildroot}%{_jvmprivdir}/%{name}/jce/vanilla
@@ -600,6 +601,10 @@ fi
 #  %{toplevel_dir}/jre/README %{toplevel_dir}/jre/Welcome.html
 
 %changelog
+* Sat Oct 11 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 7u67_b01-1mamba
+- fix x86_64 mozulla plugin symlinks
+- support for pkg download code (b01) in version
+
 * Fri Mar 26 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 7u51-2mamba
 - update wget download string (see https://ivan-site.com/2012/05/download-oracle-java-jre-jdk-using-a-script/)
 - dont' install fxavcodecplugin-52.so to remove dependencies on old libav library; fxavcodecplugin-53.so is provided requiring ffmpeg0

SRPMSVERSIONS

@@ -2,26 +2,26 @@
 SRPMVERSION["b43-firmware"]=4.150.10.5
 SRPMRELEASE["b43-firmware"]=1mamba
 # flashplugin
-SRPMVERSION["flashplugin"]=11.2.202.394
+SRPMVERSION["flashplugin"]="`curl -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
 SRPMRELEASE["flashplugin"]=1mamba
 # msttcorefonts
 SRPMVERSION["msttcorefonts"]=1.3
 SRPMRELEASE["msttcorefonts"]=7mamba
 # skype
-SRPMVERSION["skype"]=4.3.0.37
+SRPMVERSION["skype"]="`curl -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|" 2>/dev/null`"
 SRPMRELEASE["skype"]=2mamba
 # spotify
 SRPMVERSION["spotify"]=20140117
 SRPMRELEASE["spotify"]=1mamba
 # sun-java7
-SRPMVERSION["sun-java7"]=7u51
-SRPMRELEASE["sun-java7"]=2mamba
+SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+SRPMRELEASE["sun-java7"]=1mamba
 # virtualbox-extension-pack
-SRPMVERSION["virtualbox-extension-pack"]=4.3.12
+SRPMVERSION["virtualbox-extension-pack"]=4.3.20
 SRPMRELEASE["virtualbox-extension-pack"]=1mamba
 # win32codecs
 SRPMVERSION["win32codecs"]=20110131
 SRPMRELEASE["win32codecs"]=1mamba
 # chromium-pepper-flash
-SRPMVERSION["chromium-pepper-flash"]=37.0.2062.120
+SRPMVERSION["chromium-pepper-flash"]="`curl -s "http://googlechromereleases.blogspot.it/" | grep "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`"
 SRPMRELEASE["chromium-pepper-flash"]=1mamba

SRPMSVERSIONS.arm

@@ -1,2 +1,2 @@
-SRPMVERSION["sun-java7"]=7u51
-SRPMRELEASE["sun-java7"]=2mamba
+SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+SRPMRELEASE["sun-java7"]=1mamba

VERSION

@@ -1 +1 @@
-VERSION = 2.4.7
+VERSION = 2.4.15

desktop/desktop-firsttime.sh.in

@@ -5,7 +5,7 @@
 # This file is called by startkde after the kpersonalizer has been
 # executed for first access configuration
 #
-# Copyright (c) 2005-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2005-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (c) 2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 if [ ! -e $HOME/Desktop/.directory ]; then
@@ -20,7 +20,6 @@ if [ ! -e $HOME/Desktop/.directory ]; then
    if [ -r @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 ]; then
       mkdir -p $HOME/Desktop
       ( cd $HOME/Desktop >/dev/null
-        tar xjf @distrodesktopdir@/desktop-common.tar.bz2
         tar xjf @distrodesktopdir@/desktop-$LANG_ADD.tar.bz2 )
    fi
 

mambabase/mambabase.db

@@ -1,41 +0,0 @@
-# openmamba base packages database
-# Copyright (c) 2008 by Silvan Calarco <silvan.calarco@mambasoft.it>
-
-BASE_PKGS="\
-syslog-ng logrotate ntp kdegraphics kdemultimedia \
-vixie-cron kdepim openssh-server kdeartwork \
-hsfmodem xscreensaver xscreensaver-gl samba-server \
-kdeadmin kdeaddons unrar k3b k3b-i18n-${LANG:0:2} firefox qjackctl \
-foomatic guarddog kpackage synaptic kpackage smb4k \
-kdenetwork kdeutils ndisgtk libqt4 ftp \
-alsaplayer-output-alsa alsaplayer-output-oss \
-compiz-fusion-plugins-extra compiz-fusion-plugins-main \
-compizconfig-settings-manager lsb pcmcia-utils mambatray"
-
-OFFICE_PKGS="OpenOffice OpenOffice-help-${LANG:0:2} evolution gnucash"
-
-VIDEO_PKGS="vlc kaffeine kdetv kino lives miro DVDAuthorWizard DVDRipOMatic DVDStyler"
-
-AUDIO_PKGS="amarok xmms"
-
-AUDIO_PROF_PKGS="\
-qtractor rosegarden ZynAddSubFX qsynth kino hydrogen \
-adrour mixxx timidity audacity muse puredata"
-
-INTERNET_PKGS="aMule ktorrent amsn pidgin kopete ekiga"
-
-GRAPHICS_PKGS="gimp digikam blender GQView makehuman sodipodi cheese"
-
-GAMES_PKGS="\
-tuxracer ksudoku pingus gnuchess powermanga FlightGear frozen-bubble \
-kdegames kdetoys monkey-bubble pathological neverball tuxkart xmame \
-gsokoban gtans ksirk moagg knights"
-
-VIRTUALIZATION_PKGS="wine virtualbox kvm QtEmu"
-
-DEVEL_PKGS="gcc libstdc++6-devel kernel-mamba-source glibc-devel rpm-devel"
-
-ALL_PKGS="\
-$BASE_PKGS $OFFICE_PKGS $VIDEO_PKGS $AUDIO_PKGS \
-$AUDIO_PROF_PKGS $INTERNET_PKGS $GRAPHICS_PKGS \
-$GAMES_PKGS $VIRTUALIZATION_PKGS $DEVEL_PKGS"

mambabase/mambabase.desktop

@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=openmamba base components
-Name[iy]=Componenti base di openmamba
+Name[it]=Componenti base di openmamba
 GenericName=openmamba base components installer
 GenericName[it]=Installazione dei componenti base di openmamba
 Exec=kmdr-executor /usr/share/openmamba/mambabase/mambabase.kmdr

mambabase/mambabase.kmdr

@@ -841,366 +841,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
-        <widget class="Label">
-            <property name="name">
-                <cstring>Label17</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>10</x>
-                    <y>50</y>
-                    <width>570</width>
-                    <height>110</height>
-                </rect>
-            </property>
-            <property name="text">
-                <string>The following components are recommended for optimal desktop use but do not have an Open Source license. 
-
-Warning: you'll have to accept a license agreement for most selected packages.</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignTop</set>
-            </property>
-        </widget>
-        <widget class="GroupBox">
-            <property name="name">
-                <cstring>GroupBox2_2_2</cstring>
-            </property>
-            <property name="geometry">
-                <rect>
-                    <x>10</x>
-                    <y>131</y>
-                    <width>560</width>
-                    <height>270</height>
-                </rect>
-            </property>
-            <property name="title">
-                <string>Proprietary software installations/updates</string>
-            </property>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>Label9_2_2</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>-10</x>
-                        <y>-20</y>
-                        <width>161</width>
-                        <height>21</height>
-                    </rect>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_nvidia_legacy</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>40</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>NVIDIA propri&amp;etary video driver (legacy) from openmamba.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_fglrx_legacy</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>80</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>AMD/ATI proprietary video driver (le&amp;gacy) from openmamba.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_codecs</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>160</y>
-                        <width>500</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>&amp;Win32 codecs from mplayerhq.hu</string>
-                </property>
-                <property name="checked">
-                    <bool>false</bool>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_msttcf</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>140</y>
-                        <width>410</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>MS TrueT&amp;ype core fonts from sourceforge</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_flash</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>120</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>F&amp;lash plugin from adobe.com</string>
-                </property>
-                <property name="checked">
-                    <bool>false</bool>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_skype</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>200</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>S&amp;kype from skype.com</string>
-                </property>
-                <property name="accel">
-                    <number>276824139</number>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_java</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>180</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Oracle &amp;Java 7 from oracle.com</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_spotify</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>220</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Spot&amp;ify from spotify.com</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_virtualbox</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>240</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Virtualbo&amp;x extension pack from virtualbox.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_b43</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>100</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>&amp;Broadcom B43 proprietary firmware from openwrt.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_fglrx</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>60</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>AMD/ATI proprietary video driver from openmamba.org</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="CheckBox">
-                <property name="name">
-                    <cstring>inst_nvidia</cstring>
-                </property>
-                <property name="enabled">
-                    <bool>true</bool>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>20</x>
-                        <y>20</y>
-                        <width>510</width>
-                        <height>20</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>NVIDIA proprietary video &amp;driver from openmamba.org</string>
-                </property>
-                <property name="tristate">
-                    <bool>false</bool>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                        <string></string>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-        </widget>
         <widget class="ScriptObject">
             <property name="name">
                 <cstring>checkform3</cstring>
@@ -1258,6 +898,11 @@ if [ $? -eq 0 ]; then
    dcop @dcopid KommanderIf setEnabled inst_skype false
 fi
 
+openmamba-netsrpms -c broadcom-sta &gt; /dev/null
+if [ $? -eq 0 ]; then
+   dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false
+fi
+
 openmamba-netsrpms -c b43-firmware &gt; /dev/null
 if [ $? -eq 0 ]; then
    dcop @dcopid KommanderIf setEnabled inst_b43 false
@@ -1275,6 +920,391 @@ fi</string>
                 </stringlist>
             </property>
         </widget>
+        <widget class="GroupBox">
+            <property name="name">
+                <cstring>GroupBox2_2_2</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>111</y>
+                    <width>560</width>
+                    <height>290</height>
+                </rect>
+            </property>
+            <property name="title">
+                <string>Proprietary software installations/updates</string>
+            </property>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>Label9_2_2</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>-10</x>
+                        <y>-20</y>
+                        <width>161</width>
+                        <height>21</height>
+                    </rect>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_nvidia_legacy</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>40</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>NVIDIA propri&amp;etary video driver (legacy) from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_fglrx</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>60</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>AMD/ATI proprietary video driver from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_virtualbox</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>260</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Virtualbo&amp;x extension pack from virtualbox.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_spotify</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>240</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Spot&amp;ify from spotify.com</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_skype</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>220</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>S&amp;kype from skype.com</string>
+                </property>
+                <property name="accel">
+                    <number>276824139</number>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_java</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>200</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Oracle &amp;Java 7 from oracle.com</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_msttcf</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>160</y>
+                        <width>410</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>MS TrueT&amp;ype core fonts from sourceforge</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_flash</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>140</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>F&amp;lash plugin from adobe.com</string>
+                </property>
+                <property name="checked">
+                    <bool>false</bool>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_codecs</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>180</y>
+                        <width>500</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&amp;Win32 codecs from mplayerhq.hu</string>
+                </property>
+                <property name="checked">
+                    <bool>false</bool>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_nvidia</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>20</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>NVIDIA proprietary video &amp;driver from openmamba.org</string>
+                </property>
+                <property name="tristate">
+                    <bool>false</bool>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_fglrx_legacy</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>80</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>AMD/ATI proprietary video driver (le&amp;gacy) from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_b43</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>120</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>&amp;Broadcom B43 proprietary firmware from openwrt.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+            <widget class="CheckBox">
+                <property name="name">
+                    <cstring>inst_broadcom_sta</cstring>
+                </property>
+                <property name="enabled">
+                    <bool>true</bool>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>20</x>
+                        <y>100</y>
+                        <width>510</width>
+                        <height>20</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>Broadcom-sta proprietary wireless driver from openmamba.org</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                        <string></string>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
+        </widget>
+        <widget class="Label">
+            <property name="name">
+                <cstring>Label17</cstring>
+            </property>
+            <property name="geometry">
+                <rect>
+                    <x>10</x>
+                    <y>50</y>
+                    <width>570</width>
+                    <height>60</height>
+                </rect>
+            </property>
+            <property name="text">
+                <string>The following components are recommended for optimal desktop use but do not have an Open Source license. 
+WARNING: you'll have to accept a license agreement for most selected packages.</string>
+            </property>
+            <property name="alignment">
+                <set>WordBreak|AlignTop</set>
+            </property>
+        </widget>
     </widget>
     <widget class="QWidget">
         <property name="name">
@@ -1455,6 +1485,7 @@ INSTALL_NVIDIA='@inst_nvidia.checked()'
 INSTALL_NVIDIA_LEGACY='@inst_nvidia_legacy.checked()'
 INSTALL_FGLRX='@inst_fglrx.checked()'
 INSTALL_FGLRX_LEGACY='@inst_fglrx_legacy.checked()'
+INSTALL_BROADCOM_STA='@inst_broadcom_sta.checked()'
 INSTALL_B43='@inst_b43.checked()'
 INSTALL_JAVA='@inst_java.checked()'
 INSTALL_SPOTIFY='@inst_spotify.checked()'

mambabase/mambabase.sh

@@ -85,6 +85,7 @@ TOTAL_PROGRESS=10
 [ "$INSTALL_NVIDIA_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_FGLRX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_FGLRX_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
+[ "$INSTALL_BROADCOM_STA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_B43" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_SPOTIFY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
 [ "$INSTALL_VIRTUALBOX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
@@ -194,6 +195,12 @@ if [ "$INSTALL_FGLRX_LEGACY" = "1" ]; then
    rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy
 fi
 
+if [ "$INSTALL_BROADCOM_STA" = "1" ]; then
+   echo $"Installing Broadcom proprietary wireless driver"
+   dcop_write $"Installing Broadcom proprietary wireless driver..." 10
+   rpm -q --whatprovides broadcom-sta >/dev/null || apt_get_parsed install -y broadcom-sta
+fi
+
 if [ "$INSTALL_B43" = "1" ]; then
    echo $"Installing Broadcom B43 proprietary firmware"
    dcop_write $"Installing Broadcom B43 proprietary firmware..." 10
@@ -241,13 +248,19 @@ if [ "$INSTALL_SKYPE" = "1" ]; then
    /usr/bin/openmamba-netsrpms skype
 fi
 
+if [ "$INSTALL_JAVA" = "1" ]; then
+   dcop_write $"Installing Oracle Java 7..." 10
+   /usr/bin/openmamba-netsrpms sun-java7
+fi
+
+if [ "$INSTALL_JRE" = "1" ]; then
+   dcop_write $"Installing Sun Java Runtime Environment..." 10
+   apt_get_parsed install -y $SUN_JAVA_RUNTIME_PKGS
+fi
+
 if [ "$INSTALL_JDK" = "1" ]; then
    dcop_write $"Installing Sun Java Developers Kit..." 10
    apt_get_parsed install -y $SUN_JAVA_PKGS
-
-elif [ "$INSTALL_JRE" = "1" ]; then
-   dcop_write $"Installing Sun Java Runtime Environment..." 10
-   apt_get_parsed install -y $SUN_JAVA_RUNTIME_PKGS
 fi
 
 dcop_write $"Installation completed." -1

mambabase/po/es.po

@@ -156,14 +156,12 @@ msgstr "Seleccionar los componentes no Open Source"
 msgid ""
 "The following components are recommended for optimal desktop use but do not "
 "have an Open Source license. \n"
-"\n"
-"Warning: you'll have to accept a license agreement for each selected "
+"WARNING: you'll have to accept a license agreement for each selected "
 "packages."
 msgstr ""
 "Los siguientes componentes son recomendados para un uso óptimo del desktop pero "
 "no tienen una licencia Open Source. \n"
-"\n"
-"Atención: debes aceptar una licencia específica para cada uno de los "
+"ATENCION: debes aceptar una licencia específica para cada uno de los "
 "componentes seleccionados."
 
 #: _from_rc.cc:32

mambabase/po/it.po

@@ -156,14 +156,12 @@ msgstr "Scegliere i componenti non Open Source"
 msgid ""
 "The following components are recommended for optimal desktop use but do not "
 "have an Open Source license. \n"
-"\n"
-"Warning: you'll have to accept a license agreement for each selected "
+"WARNING: you'll have to accept a license agreement for each selected "
 "packages."
 msgstr ""
 "I seguenti componenti sono raccomandati per un uso ottimale del desktop ma "
 "non hanno una licenza Open Source. \n"
-"\n"
-"Attenzione: occorre accettare una licenza specifica per ognuno dei "
+"ATTENZIONE: occorre accettare una licenza specifica per ognuno dei "
 "componenti selezionati."
 
 #: _from_rc.cc:32

mambareport/openmamba-makereport

@@ -155,7 +155,7 @@ catfile /etc/sysconfig/machine "machine information from BIOS"
 catfile /proc/cpuinfo "processor(s) information"
 catfile /proc/meminfo "System memory information"
 catcommand "/usr/sbin/lspci -nn" "PCI hardware information (short)"
-catcommand /usr/sbin/lsusb "USB hardware information"
+catcommand /usr/bin/lsusb "USB hardware information"
 catcommand /sbin/lsmod "Loadel kernel modules"
 catcommand "rpm -qa|grep kernel-mamba" "Installed kernel packages"
 catcommand "ls -l /etc/alternatives" "System alternatives"

mambawelcome/mambawelcome-init

@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # mambawelcome - start mambawelcome on first time system execution
-# Copyright (c) 2007-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 
 if [ $UID != 0 ]; then
    echo "$0: must be superuser." >&2

mambawelcome/mambawelcome.kmdr

@@ -276,7 +276,7 @@ touch /root/.mambawelcome-not-completed</string>
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco
+                    <string>Copyright (c) 2007-2014 by Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">

mambawelcome/mambawelcome.po

@@ -36,7 +36,7 @@ msgstr ""
 
 #: _from_rc.cc:8
 msgid ""
-"Copyright (c) 2007-2008 by mambaSoft di Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
 

mambawelcome/mambawelcome.sh

@@ -1,5 +1,5 @@
 # openmamba mambawelcome script
-# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 #
@@ -39,7 +39,7 @@ DCOPID=$2
 
 echo $"\
 openmamba mambawelcome script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 dcop_write $"Configuring..." 5
@@ -158,6 +158,7 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
    elif [ "${INSTALL_DOMAIN}" != "localdomain" ]; then
       hostnamectl set-hostname $INSTALL_HOSTNAME.$INSTALL_DOMAIN
    fi
+   [ -e /usr/sbin/hciconfig ] && /usr/sbin/hciconfig hci0 name $INSTALL_HOSTNAME 2>&1 >/dev/null
 }
 
 # set samba configuration file

mambawelcome/po/es.po

@@ -62,10 +62,10 @@ msgstr ""
 
 #: _from_rc.cc:11
 msgid ""
-"Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Expedido según los términos de la licencia GNU GPL versione 3"
 
 #: _from_rc.cc:12
@@ -247,11 +247,11 @@ msgstr "            Usa $0 -y para ejecutar la operación."
 #: mambawelcome.sh:39
 msgid ""
 "openmamba mambawelcome script - version $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 ""
 msgstr ""
 "openmamba mambawelcome script - versión $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 ""
 #: mambawelcome.sh:44
 msgid "Configuring..."

mambawelcome/po/it.po

@@ -62,10 +62,10 @@ msgstr ""
 
 #: _from_rc.cc:11
 msgid ""
-"Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco\n"
+"Copyright (c) 2007-2014 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL versione 3"
 
 #: _from_rc.cc:12
@@ -247,11 +247,11 @@ msgstr "            Usa $0 -y per lanciare l'operazione."
 #: mambawelcome.sh:39
 msgid ""
 "openmamba mambawelcome script - version $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 ""
 msgstr ""
 "openmamba mambawelcome script - versione $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2014 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 ""
 #: mambawelcome.sh:44
 msgid "Configuring..."

mambawelcome/po/it.po~

@@ -1,282 +0,0 @@
-#: _from_rc.cc:1
-msgid "openmamba first time wizard"
-msgstr "primo avvio di openmamba"
-
-#: _from_rc.cc:2
-msgid "Welcome!"
-msgstr "Benvenuto!"
-
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#: _from_rc.cc:3 _from_rc.cc:7 _from_rc.cc:8 _from_rc.cc:18 _from_rc.cc:20
-#: _from_rc.cc:21 _from_rc.cc:23 _from_rc.cc:45 _from_rc.cc:48
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-26 22:51+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: _from_rc.cc:4
-msgid "Welcome to openmamba GNU/Linux!"
-msgstr "Benvenuto su openmamba GNU/Linux!"
-
-#: _from_rc.cc:11
-msgid ""
-"In a few moments you will start using a high-technology "
-"operating system and the most modern Open Source applications.<br><br>\n"
-"openmamba is based on Free/Libre/Open Source software and is distributed "
-"under the terms of the GNU GPLv3 license.<br>\n"
-"<br>\n"
-"The next dialogs will ask you some basic information that is required to "
-"complete the installation of openmamba on this computer.<br>"
-msgstr ""
-"Stai per iniziare ad utilizzare un sistema operativo ad "
-"alta tecnologia ed i più moderni programmi Open Source.<br><br>\n"
-"openmamba è basato su software Free/Libero/Open Source ed è distribuito "
-"secondo i termini della libenza GNU GPL versione 3.<br>\n"
-"<br>\n"
-"Nei dialoghi successivi saranno richieste alcune informazioni basilari necessarie per "
-"completare l'installazione di openmamba su questo computer.<br>"
-
-#: _from_rc.cc:6
-msgid "<b>Please, press the Next button to proceed.</b>"
-msgstr "<b>Premi il pulsante Successivo per proseguire.</b>"
-
-#: _from_rc.cc:9
-msgid "Version 0.4"
-msgstr ""
-
-#: _from_rc.cc:10
-msgid "GNU/Linux"
-msgstr ""
-
-#: _from_rc.cc:11
-msgid ""
-"Copyright (c) 2007-2008 by mambaSoft di Silvan Calarco\n"
-"Released under the terms of the GNU GPL v3 license"
-msgstr ""
-"Copyright (c) 2007-2008 by mambaSoft di Silvan Calarco\n"
-"Rilasciato secondo i termini della licenza GNU GPL versione 3"
-
-#: _from_rc.cc:12
-msgid "License"
-msgstr "Licenza"
-
-#: _from_rc.cc:13
-msgid "Full license text"
-msgstr "Testo completo della licenza"
-
-#: _from_rc.cc:14
-msgid "&I've read and accept the licensing terms"
-msgstr "&Ho letto ed accetto i termini della licenza"
-
-#: _from_rc.cc:15
-msgid ""
-"The openmamba GNU/Linux distribution is released under the terms of the GNU "
-"GPL v3 license."
-msgstr ""
-"La distribuzione openmamba GNU/Linux è rilasciata secondo i termini della licenza "
-"GNU/GPL versione 3."
-
-#: _from_rc.cc:16
-msgid "Please read carefully and accept the license before proceeding."
-msgstr "Per favore, leggi attentamente ed accetta la licenza prima di proseguire."
-
-#: _from_rc.cc:17
-msgid "User details"
-msgstr "Informazioni sull'utente"
-
-#: _from_rc.cc:19
-msgid "User:"
-msgstr "Nome utente:"
-
-#: _from_rc.cc:22
-msgid "Autologin:"
-msgstr "Accesso automatico:"
-
-#: _from_rc.cc:24
-msgid "Password:"
-msgstr ""
-
-#: _from_rc.cc:25 _from_rc.cc:42
-msgid "Confirm password:"
-msgstr "Conferma password:"
-
-#: _from_rc.cc:26
-msgid "Full name:"
-msgstr "Nome e cognome"
-
-#: _from_rc.cc:27
-msgid "About yourself"
-msgstr "Informazioni sull'utente"
-
-#: _from_rc.cc:28
-msgid ""
-"An user with administrator privileges will be created.\n"
-"\n"
-"The information requested below will be used to identify yourself as the "
-"user of this system when you access the desktop. If autologin is checked the "
-"system will not ask for cretentials and automatically access the desktop "
-"environment when you turn on the computer."
-msgstr ""
-"Verrà creato un utente con i privilegi di amministratore.\n"
-"\n"
-"Le informazioni richieste di seguito saranno usate per identificarti come "
-"utente di questo sistema quando accedi al desktop. Se il login automatico è "
-"abilitato il sistema non richiederà credenziali ed accederà automaticamente "
-"all'ambiente desktop all'avvio."
-
-#: _from_rc.cc:29 _from_rc.cc:31
-msgid "System information"
-msgstr "Informazioni sul sistema"
-
-#: _from_rc.cc:30
-msgid "About the system"
-msgstr "Informazioni sul sistema"
-
-#: _from_rc.cc:32
-msgid "Workgroup:"
-msgstr ""
-
-#: _from_rc.cc:33
-msgid "Domain:"
-msgstr "Dominio:"
-
-#: _from_rc.cc:34
-msgid "localdomain"
-msgstr ""
-
-#: _from_rc.cc:35
-msgid "WORKGROUP"
-msgstr ""
-
-#: _from_rc.cc:36
-msgid "openmamba"
-msgstr ""
-
-#: _from_rc.cc:37
-msgid "Hostname:"
-msgstr "Nome macchina:"
-
-#: _from_rc.cc:38
-msgid "Please choose a name for the system (e.g. mymachine)"
-msgstr "Scegli un nome per il sistema (es. miocomputer)"
-
-#: _from_rc.cc:39
-msgid ""
-"Please enter Domain and Workgroup. If you don't know these information ask "
-"your network administrator or leave the default."
-msgstr ""
-"Inserisci il dominio e workgroup. Se non conosci queste informazioni chiedi "
-"all'amministratore della tua rete o lascia i valori predefiniti."
-
-#: _from_rc.cc:40
-msgid "Superuser password"
-msgstr "Password del superutente (root)"
-
-#: _from_rc.cc:41
-msgid "Root password:"
-msgstr "Password di root:"
-
-#: _from_rc.cc:43
-msgid ""
-"The superuser is a special system user called <b>root</b> that has full "
-"privileges on the system. This password is required to perform many system "
-"maintenance and configuration tasks."
-msgstr ""
-"Il superutente è un utente speciale del sistema chiamato <b>root</b> che ha pieni "
-"privilegi nel sistema. Questa password è richiesta per effettuare operazioni di "
-"configurazione e mantenimento."
-
-#: _from_rc.cc:44
-msgid "Installation progress"
-msgstr "Avanzamento dell'installazione"
-
-#: _from_rc.cc:46
-msgid "Launching installation script..."
-msgstr "Avvio dell'installazione..."
-
-#: _from_rc.cc:47
-msgid "System configuration in progress..."
-msgstr "Configurazione del sistema in corso..."
-
-#: _from_rc.cc:49
-msgid ""
-"<b>Thank you for providing the requested information!</b><br><br>\n"
-"Configuration has been completed and the system is now ready for use."
-"<br><br>\n"
-"<b>TIP:</b> remember user and superuser passwords and never reveal this "
-"information in order to keep your system and data safe."
-msgstr ""
-"<b>Grazie per aver fornito le informazioni richieste!</b><br><br>\n"
-"La configurazione è stata completata ed il sistema è ora pronto per l'uso."
-"<br><br>\n"
-"<b>SUGGERIMENTO:</b> ricorda le password dell'utente e del superutente e non rivelare "
-"mai questa informazione per mantenere il tuo sistema ed i tuoi dati sicuri."
-
-#: _from_rc.cc:50
-msgid "<b>Please, press the Finish button to start using openmamba.</b>"
-msgstr "<b>Premi il pulsante Fine per cominicare ad usare openmamba.</b>"
-
-#: mambawelcome.kmdr:1302
-msgid "Configuration completed."
-msgstr "Configurazione completata."
-
-#: mambawelcome.sh:15
-msgid "Installation aborted; press Next to see the error log."
-msgstr "Installazione annullata; premi Successivo per vedere gli errori."
-#: mambawelcome.sh:16
-msgid "Installation aborted :-("
-msgstr "Installazione annullata :-("
-#: mambawelcome.sh:31
-msgid "Warning: this script is intended to be run by mambawelcome.kmdr."
-msgstr "Attenzione: questo script dev'essere lanciato da mambawelcome.kmdr."
-#: mambawelcome.sh:32
-msgid "         Use $0 -y to actually start the operation."
-msgstr "            Usa $0 -y per lanciare l'operazione."
-#: mambawelcome.sh:39
-msgid ""
-"openmamba mambawelcome script - version $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
-""
-msgstr ""
-"openmamba mambawelcome script - versione $VERSION\n"
-"Copyright (c) 2007-2008 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
-""
-#: mambawelcome.sh:44
-msgid "Configuring..."
-msgstr "Configurazione..."
-#: mambawelcome.sh:47
-msgid "Error: cannot read input file $INPUT_FILE; aborting."
-msgstr "Errore: non posso leggere il file di input $INPUT_FILE; uscita."
-#: mambawelcome.sh:57
-msgid "Configuring users and host..."
-msgstr "Configurazione degli utenti e della macchina..."
-#: mambawelcome.sh:58
-msgid "Configuring users and host"
-msgstr "Configurazione degli utenti e della macchina"
-#: mambawelcome.sh:64
-msgid "Error: could not create user; aborting."
-msgstr "Errore: non posso creare l'utente; uscita."
-#: mambawelcome.sh:68
-msgid "Error: could not set user password; aborting."
-msgstr "Errore: non posso impostare la password per l'utente; uscita."
-#: mambawelcome.sh:74
-msgid "Info: enabling user autologin"
-msgstr "Info: attivazione del login automatico"
-#: mambawelcome.sh:125
-msgid "Installation completed."
-msgstr "Installazione completata."
-#: mambawelcome.sh:127
-msgid "Installation done."
-msgstr "Installazione completata."

openmamba-update/openmamba-netsrpms

@@ -58,7 +58,12 @@ for pckname in $PACKAGES; do
 
    icon=`grep Icon= /usr/share/applications/openmamba-$pckname.desktop | sed "s|Icon=||"`
 
-   SRPM_VERSION=${SRPMVERSION[${pckname}]}-${SRPMRELEASE[${pckname}]}
+   SRPMVER="${SRPMVERSION[${pckname}]}"
+   if [ "$SRPMVER" ]; then
+      SRPM_VERSION=${SRPMVER}-${SRPMRELEASE[${pckname}]}
+   else
+      SRPM_VERSION=
+   fi
 
    RPM_INSTALLED=`rpm -q $pckname`
    [ $? -eq 0 ] || RPM_INSTALLED=
@@ -72,13 +77,13 @@ for pckname in $PACKAGES; do
    echo $"Last version:      $SRPM_VERSION"
    echo
 
-   if [ "$RPM_INSTALLED_VERSION" != "$SRPM_VERSION" ]; then
+   if [ "$SRPM_VERSION" -a "$RPM_INSTALLED_VERSION" != "$SRPM_VERSION" ]; then
       if [ "$RPM_INSTALLED_VERSION" ]; then
          UPDATE_NEEDED=1
       elif [ "$UPGRADE_MODE" ]; then
          continue
       fi
-   elif [ ! "$FORCE_MODE" ]; then
+   elif [ ! "$FORCE_MODE" -a "$SRPM_VERSION" ]; then
       continue
    fi
 

remote-support-mambasoft/remote-support-mambasoft.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=mambaSoft remote support
+Name[it]=Supporto remoto mambaSoft
+GenericName=Remote assistance
+GenericName[it]=Assistenza remota
+Exec=/usr/bin/remote-support-mambasoft < /dev/null
+Icon=mambasoft
+Terminal=0
+Type=Application
+Categories=X-openmamba;

remote-support-mambasoft/remote-support-mambasoft.sh.in

@@ -0,0 +1,5 @@
+#!/bin/bash
+[ "$1" ] && LOCAL_PORT=$1 || LOCAL_PORT=22
+[ "$2" ] && REMOTE_PORT=$2 || REMOTE_PORT=$(($LOCAL_PORT + 45000))
+export SSH_ASKPASS=@libexecdir@/openssh/ssh-askpass
+ssh -p 4424 -N -R $REMOTE_PORT:localhost:$LOCAL_PORT assistenza@services.mambasoft.it