Release 2.3.21

sun-java7: update to 7u17 (x86*) and 7u10 (arm)

Makefile

@@ -1,9 +1,17 @@
-# Makefile for openmamba-desktop-base
-# Copyright (C) 2004-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Makefile for desktop-base-openmamba package
+# Copyright (C) 2004-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@gmail.com>
 
 include VERSION
-include SRPMSVERSIONS
+
+ARCH:=`uname -i`
+
+ifeq ($(ARCH), arm)
+SRPMSVERSIONSFILE = SRPMSVERSIONS.arm
+else
+SRPMSVERSIONSFILE = SRPMSVERSIONS
+endif
+include $(SRPMSVERSIONSFILE)
 
 PACKAGE = desktop-base-openmamba
 DISTROID = openmamba
@@ -27,7 +35,6 @@ SCREENSAVER =
 
 DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z)
 DISTROICON = $(DISTROid)
-ARCH=`uname -i`
 
 DESTDIR =
 
@@ -97,7 +104,7 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po)
 .SUFFIXES: .in .po .mo
 
 .in:; @echo "generating $@..."; \
-       if [ "$(ARCH)" != "x86_64" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
+       if [ "$(ARCH)" != "x86_64" -a "$(ARCH)" != "arm" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \
        sed "s,@distroID@,$(DISTROID),g;\
             s,@distroid@,$(DISTROid),g;\
             s,@distroicon@,$(DISTROICON),g;\
@@ -165,7 +172,11 @@ endif
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/profile.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/
+	cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/
 	cp -r etc/xprofile.d $(DESTDIR)$(sysconfdir)/
+	chmod 755 $(DESTDIR)$(sysconfdir)/profile.d/*.sh
 	chmod 755 $(DESTDIR)$(sysconfdir)/xprofile.d/*.sh
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
@@ -201,7 +212,7 @@ install-distromenu: dist-update
 install-srpms:
 	@$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir)
-	@cat SRPMSVERSIONS > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
+	@cat $(SRPMSVERSIONSFILE) > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE)
 	for pck in $(pck_srpms); do\
 	   rpmbuild -bs SRPMS/$$pck/$${pck}.spec \
 	      --define="_sourcedir `pwd`/SRPMS/$$pck" \

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

@@ -8,7 +8,7 @@
 %define        javaver           %{major}.%{minor}
 %define        jppname           java-%{javaver}-%{origin}
 %define        javaws_ver        %{javaver}
-%define        toplevel_dir      jdk%{javaver}_06
+%define        toplevel_dir      jdk%{javaver}_%{MINOR}
 %define        distversion       %{version}
 %define        label             -%{name}
 %define        jdklnk            jdk7-%{origin}
@@ -23,7 +23,7 @@
 
 Name:          sun-java7
 Version:       @sunjava7ver@
-Release:       2@distroext@
+Release:       1@distroext@
 Epoch:         1
 Summary:       Sun Java Developer's Kit
 Group:         System/Libraries/Java
@@ -53,7 +53,7 @@ Sun Java Developer's Kit.
 %package runtime
 Summary:       Sun Java Platform Runtime Environment
 Group:         System/Libraries/Java
-Obsoletes:     j2re
+#Obsoletes:     j2re
 Provides:      j2re = %{version}
 Provides:      jre = %{version}
 
@@ -69,19 +69,19 @@ Sun Java Platform Runtime Environment.
 %ifarch %{ix86}
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-i586.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b02/jdk-%{version}-linux-i586.tar.gz
 tar xf jdk-%{version}-linux-i586.tar.gz
 %endif
 %ifarch x86_64
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-x64.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b02/jdk-%{version}-linux-x64.tar.gz
 tar xf jdk-%{version}-linux-x64.tar.gz
 %endif
 %ifarch arm
 wget -nv --tries=2 --no-cookies --header \
    "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \
-   http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-arm-sfp.tar.gz
+   http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-arm-sfp.tar.gz
 tar xf jdk-%{version}-linux-arm-sfp.tar.gz
 %endif
 
@@ -527,6 +527,7 @@ fi
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security
 %ifnarch arm
+%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javafx.policy
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javaws.policy
 %endif
 %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklist
@@ -593,6 +594,9 @@ fi
 #  %{toplevel_dir}/jre/README %{toplevel_dir}/jre/Welcome.html
 
 %changelog
+* Wed Apr 10 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 7u17-1mamba
+- update to 7u17
+
 * Sun Aug 19 2012 Silvan Calarco <silvan.calarco@mambasoft.it> 7u6-2mamba
 - rename to sun-java7
 

SRPMSVERSIONS

@@ -1,5 +1,5 @@
-FLASHPLUGIN_VERSION=11.2.202.262
+FLASHPLUGIN_VERSION=11.2.202.280
 WIN32CODECS_VERSION=20110131
 SKYPE_VERSION=4.1.0.20
 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0
-SUN_JAVA7_VERSION=7u6
+SUN_JAVA7_VERSION=7u17

VERSION

@@ -1 +1 @@
-VERSION = 2.3.17
+VERSION = 2.3.21

etc/polkit-1/localauthority/10-vendor.d/60-desktop-policy.pkla

@@ -33,3 +33,10 @@ Action=org.freedesktop.NetworkManager.*
 ResultAny=yes
 ResultInactive=no
 ResultActive=yes
+
+[Normal Staff Permissions]
+Identity=unix-group:sysadmin
+Action=org.kde.kcontrol.kcmclock.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes

etc/profile.d/proxy.sh

@@ -0,0 +1,9 @@
+#
+# openmamba system-wide proxy configuration
+#
+[ -e /etc/sysconfig/proxy ] &&  . /etc/sysconfig/proxy
+[ "$http_proxy" ] && export HTTP_PROXY=$http_proxy
+[ "$https_proxy" ] && export HTTPS_PROXY=$https_proxy
+[ "$ftp_proxy" ] && export FTP_PROXY=$ftp_proxy
+[ "$socks_proxy" ] && export SOCKS_PROXY=$socks_proxy
+[ "$no_proxy" ] && export NO_PROXY=$no_proxy

etc/sudoers.d/proxy

@@ -0,0 +1 @@
+Defaults env_keep += "ftp_proxy http_proxy https_proxy socks_proxy no_proxy FTP_PROXY HTTP_PROXY HTTPS_PROXY SOCKS_PROXY NO_PROXY"

etc/sysconfig/proxy

@@ -0,0 +1,17 @@
+# System proxy configuration file
+
+# Here some examples:
+
+# http_proxy=http://proxy.example.com:8080
+# https_proxy=http://proxy.example.com:8080
+# ftp_proxy=http://proxy.example.com:8080
+# socks_proxy=http://proxy.example.com:8080
+# no_proxy=localhost,127.0.0.1
+
+# http_proxy=http://user:password@proxy.example.com:3128
+# https_proxy=http://user:password@proxy.example.com:3128
+# ftp_proxy=http://user:password@proxy.example.com:3128
+
+# http_proxy=http://domain\\user:password@proxy.example.com:8080
+# https_proxy=http://domain\\user:password@proxy.example.com:8080
+# ftp_proxy=http://domain\\user:password@proxy.example.com:8080

mambabase/mambabase.kmdr

@@ -397,7 +397,7 @@ Released under the terms of the GNU GPL v3 license</string>
    URL_OPTIONS="$URL_OPTIONS&amp;newinst=1"
 }
 dcop @dcopid KommanderIf setChecked BackBox false
-/usr/bin/curl -s -m 30 http://www.openmamba.org/distribution/services/check.html$URL_OPTIONS -o /dev/null
+/usr/bin/wget -T 30 http://www.openmamba.org/distribution/services/check.html$URL_OPTIONS -o /dev/null
 RET=$?
 if [ $RET -eq 0 ]; then
    dcop @dcopid KommanderIf setVisible checkButton false

mambareport/openmamba-makereport

@@ -11,18 +11,15 @@ TEMPFILE=`tempfile`
 . ${ROOT}/etc/sysconfig/machine
 
 [ ! "$SYSTEM_MANUFACTURER" -o "$SYSTEM_MANUFACTURER" = "System manufacturer" ]  && {
-   echo -n "Please enter the name of the system manufacturer: "
-   read SYSTEM_MANUFACTURER
+   SYSTEM_MANUFACTURER=unknown
 }
 
 [ ! "$SYSTEM_PRODUCT_NAME" -o "$SYSTEM_PRODUCT_NAME" = "System Product Name" ]  && {
-   echo -n "Please enter the name of the system product name: "
-   read SYSTEM_PRODUCT_NAME
+   SYSTEM_PRODUCT_NAME=unknown
 }
 
 [ ! "$SYSTEM_SERIAL_NUMBER" -o "$SYSTEM_SERIAL_NUMBER" = "System Serial Number" ]  && {
-   echo -n "Please enter the name of the system serial number: "
-   read SYSTEM_SERIAL_NUMBER
+   SYSTEM_SERIAL_NUMBER=unknown
 }
 
 SYSTEM_MANUFACTURER=`echo $SYSTEM_MANUFACTURER | tr ' ' _`

openmamba-update/openmamba-netsrpms

@@ -2,7 +2,7 @@
 #
 # netsrpm-install.sh - Build srpms that download sources from network
 #
-# Copyright (C) 2003-2012 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (C) 2003-2013 by Silvan Calarco <silvan.calarco@mambasoft.it>
 # Copyright (C) 2005 by Massimo Pintore <massimo.pintore@qilinux.it>
 # Copyright (C) 2005-2007 by Davide Madrisan <davide.madrisan@qilinux.it>
 
@@ -13,7 +13,10 @@ rpmdir=$(rpm --eval=%{_rpmdir} 2>/dev/null)
 while [ "$1" ]; do
    case $1 in
       -c) CHECK_MODE=1 ;;
+      -f) FORCE_MODE=1 ;;
       -u) UPGRADE_MODE=1 ;;
+      -h|--help) PACKAGES= ; break ;;
+      -*) echo "Error: invalid option $1; aborting."; exit 1 ;;
       *) PACKAGES="$PACKAGES $1"
    esac
    shift
@@ -21,9 +24,11 @@ done
 
 if [ -z "$PACKAGES" ]; then
    echo "Usage:
-$me [-c] pkgname ...
+$me [options...] pkgname ...
 
+Options:
 -c: only check and exit (returns: 0: up-to-date; 1: needs update; 2: not installed)
+-f: force reinstallation if already installed
 -u: only upgrade if already installed
 "
    exit 255
@@ -99,8 +104,17 @@ for pckname in $PACKAGES; do
         cpio --quiet --extract --make-directories < $tmpfile ) 2>/dev/null
 
       if [ -f $tmpdir/LICENSE ]; then
-         license-dialog $tmpdir/LICENSE
-         [ $? -ne 0 ] && exit 1
+         if [ "$DISPLAY" ]; then
+            license-dialog $tmpdir/LICENSE
+            [ $? -ne 0 ] && exit 1
+         else
+            echo "You must accept the following license terms:"
+            echo
+            more $tmpdir/LICENSE
+            echo -n "Do you agree with the above license terms [y/N]? "
+            read ans
+            [ "$ans" = "Y" -o "$ans" = "y" ] || exit 1
+         fi
       fi
 
       notify-send -a $"Network software installation" -i $icon "$pckname" $"$pckname installation in progress..."
@@ -116,6 +130,9 @@ for pckname in $PACKAGES; do
       RPM_PATH=`find $tmpdir -name \*.rpm`
 
       # install rpm
+      if [ "$FORCE_MODE" = "1" ]; then
+         sudo smart remove -y $pckname
+      fi
       sudo smart install -y $RPM_PATH
       if [ $? -gt 0 ]; then
          echo "$me: "$"error installing \`$RPM_PATH'."" "$"Aborting..." >&2