flavors rev 89

firefox: update from last cooking...
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Apr 02 14:23:38 2011 +0200 (2011-04-02)
parents 08ab1f351208
children fac5fe1b750b
files core-4in1/receipt firefox/packages.list firefox/receipt firefox/rootfs/etc/daemons.conf firefox/rootfs/etc/init.d/wpa_supplicant firefox/rootfs/etc/lxpanel/default/config firefox/rootfs/etc/lxpanel/default/panels/bottom firefox/rootfs/etc/lxpanel/default/panels/panel firefox/rootfs/etc/skel/Desktop/slitaz-doc.desktop firefox/rootfs/etc/slitaz/applications.conf firefox/rootfs/etc/wpa_supplicant.conf firefox/rootfs/etc/xdg/openbox/autostart.sh
line diff
     1.1 --- a/core-4in1/receipt	Sat Apr 02 11:50:33 2011 +0200
     1.2 +++ b/core-4in1/receipt	Sat Apr 02 14:23:38 2011 +0200
     1.3 @@ -2,11 +2,11 @@
     1.4  
     1.5  FLAVOR="core-4in1"
     1.6  SHORT_DESC="SliTaz core system with core-basic, justx and base alternatives"
     1.7 -VERSION="20101112"
     1.8 +VERSION="20110328"
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  ROOTFS_SELECTION="160M core 128M core-basic 96M justx 32M base"
    1.11  
    1.12  FRUGAL_RAM="160M"
    1.13 -ROOTFS_SIZE="104.5M"
    1.14 -INITRAMFS_SIZE="27.8M"
    1.15 +ROOTFS_SIZE="105.8M"
    1.16 +INITRAMFS_SIZE="28.0M"
    1.17  ISO_SIZE="31.0M"
     2.1 --- a/firefox/packages.list	Sat Apr 02 11:50:33 2011 +0200
     2.2 +++ b/firefox/packages.list	Sat Apr 02 14:23:38 2011 +0200
     2.3 @@ -1,19 +1,29 @@
     2.4 +915resolution
     2.5 +acl
     2.6  alsa-lib
     2.7  alsaplayer
     2.8  alsa-utils
     2.9 +asunder
    2.10  atk
    2.11 +atkmm
    2.12  attr
    2.13 +beaver
    2.14  busybox
    2.15  bzlib
    2.16  cairo
    2.17 +cairomm
    2.18 +cdparanoia-III
    2.19  cdrkit
    2.20  clearlooks
    2.21  dbus
    2.22  dbus-glib
    2.23 +depmod
    2.24  desktop-file-utils
    2.25  dialog
    2.26  dropbear
    2.27  e2fsprogs
    2.28 +enchant
    2.29 +epdfview
    2.30  expat
    2.31  firefox
    2.32  fontconfig
    2.33 @@ -22,74 +32,104 @@
    2.34  galculator
    2.35  gamin
    2.36  gcc-lib-base
    2.37 -get-google-earth
    2.38 -get-opera
    2.39 -get-skype
    2.40 -get-wifi-firmware
    2.41 +gcolor2
    2.42 +gdk-pixbuf
    2.43 +gettext-base
    2.44  glib
    2.45  glibc-base
    2.46 +glibmm
    2.47 +gparted
    2.48  gpxe
    2.49  grub4dos-linux
    2.50  gtk+
    2.51  gtkdialog
    2.52 +gtkmm
    2.53  hal
    2.54  hardinfo
    2.55  hicolor-icon-theme
    2.56  isapnptools
    2.57 +isomaster
    2.58  jpeg
    2.59  kbd-busybox
    2.60 +lcms
    2.61  leafpad
    2.62  libcap
    2.63 +libcddb
    2.64  libcomerr
    2.65  libcrypto
    2.66 -libdrm
    2.67  libgcrypt
    2.68  libgio
    2.69 +libgiomm
    2.70  libglade
    2.71 +libgnutls
    2.72 +libgpg-error
    2.73 +libjpeg
    2.74  libmad
    2.75 +libnotify
    2.76  libogg
    2.77  libpng
    2.78 +libsexy
    2.79 +libsigc++
    2.80 +libsoup
    2.81 +libsqlite
    2.82  libssl
    2.83 +libtasn1
    2.84 +libtaz
    2.85 +libunique
    2.86 +libusb
    2.87 +libusb-compat
    2.88  libvorbis
    2.89 +libwebkit
    2.90  libxcb
    2.91  libxml2
    2.92 +libxslt
    2.93  linux
    2.94 -linux-acpi
    2.95  linux-crypto
    2.96 +linux-firmware
    2.97  linux-sound
    2.98  linux-wireless
    2.99  locale-de
   2.100  locale-es
   2.101  locale-fr
   2.102  locale-pt
   2.103 +lostirc
   2.104 +lua
   2.105  lxappearance
   2.106  lxpanel
   2.107  lxtask
   2.108  lzlib
   2.109  lzma
   2.110  menu-cache
   2.111 -mesa
   2.112 +mhwaveedit
   2.113 +mtpaint
   2.114  nano
   2.115  nanochess
   2.116  ncurses
   2.117 +ncurses-common
   2.118 +ncursesw
   2.119  ntfs-3g
   2.120  ntfsprogs
   2.121  obconf
   2.122  openbox
   2.123  pango
   2.124 +pangomm
   2.125 +parted
   2.126  pciutils
   2.127  pcmanfm
   2.128  pcmciautils
   2.129  pcre
   2.130  pixman
   2.131 +poppler
   2.132  popt
   2.133  ppp
   2.134 +readline
   2.135  rp-pppoe
   2.136  shared-mime-info
   2.137  slim
   2.138  slitaz-base-files
   2.139  slitaz-boot-scripts
   2.140  slitaz-configs
   2.141 +slitaz-configs-base
   2.142  slitaz-doc
   2.143  slitaz-icon
   2.144  slitaz-menus
   2.145 @@ -112,7 +152,6 @@
   2.146  ttf-dejavu
   2.147  udev
   2.148  util-linux-ng-blkid
   2.149 -util-linux-ng-cfdisk
   2.150  util-linux-ng-getopt
   2.151  util-linux-ng-uuid
   2.152  viewnior
   2.153 @@ -144,6 +183,7 @@
   2.154  xorg-libXpm
   2.155  xorg-libXrandr
   2.156  xorg-libXrender
   2.157 +xorg-libXss
   2.158  xorg-libXt
   2.159  xorg-libXtst
   2.160  xorg-libXxf86vm
   2.161 @@ -156,6 +196,5 @@
   2.162  xorg-xf86-video-vesa
   2.163  xorg-xkbcomp
   2.164  xorg-xkeyboard-config
   2.165 -xorg-xrandr
   2.166  xterm
   2.167  zlib
     3.1 --- a/firefox/receipt	Sat Apr 02 11:50:33 2011 +0200
     3.2 +++ b/firefox/receipt	Sat Apr 02 14:23:38 2011 +0200
     3.3 @@ -2,10 +2,10 @@
     3.4  
     3.5  FLAVOR="firefox"
     3.6  SHORT_DESC="Small desktop Mozilla Firefox."
     3.7 -VERSION="20091225"
     3.8 +VERSION="20110328"
     3.9  MAINTAINER="pankso@slitaz.org"
    3.10  
    3.11 -FRUGAL_RAM="160M"
    3.12 -ROOTFS_SIZE="92.0M"
    3.13 -INITRAMFS_SIZE="25.3M"
    3.14 -ISO_SIZE="29.0M"
    3.15 +FRUGAL_RAM="192M"
    3.16 +ROOTFS_SIZE="127.3M"
    3.17 +INITRAMFS_SIZE="36.7M"
    3.18 +ISO_SIZE="40.0M"
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/firefox/rootfs/etc/daemons.conf	Sat Apr 02 14:23:38 2011 +0200
     4.3 @@ -0,0 +1,36 @@
     4.4 +# /etc/daemons.conf - Daemons options configuration file.
     4.5 +#
     4.6 +# This file is used for setting options to start daemons at boot time or from
     4.7 +# the command line (/etc/init.d/daemon-name start). Please check /etc/rcS.conf
     4.8 +# to automatically start a daemon at boot.
     4.9 +#
    4.10 +
    4.11 +# DBUS daemon options.
    4.12 +DBUS_OPTIONS="--system"
    4.13 +
    4.14 +# HAL daemon options.
    4.15 +HALD_OPTIONS="--daemon=yes"
    4.16 +
    4.17 +# LightTPD Web server options.
    4.18 +LIGHTTPD_OPTIONS="-f /etc/lighttpd/lighttpd.conf"
    4.19 +
    4.20 +# Dropbear SSH server options.
    4.21 +DROPBEAR_OPTIONS="-w -g -b /etc/dropbear/banner"
    4.22 +
    4.23 +# Rsync daemon options.
    4.24 +RSYNCD_OPTIONS="--daemon"
    4.25 +
    4.26 +# Cron daemon options.
    4.27 +CROND_OPTIONS="-b"
    4.28 +
    4.29 +# Domain Name Server options.
    4.30 +DNSD_OPTIONS="-d"
    4.31 +
    4.32 +# Super server options
    4.33 +INETD_OPTIONS=""
    4.34 +# Tftp daemon options.
    4.35 +TFTPD_OPTIONS="-r /boot"
    4.36 +
    4.37 +# wpa_supplicant daemon options
    4.38 +WPA_OPTIONS="-B -P/var/run/wpa_supplicant.pid -c/etc/wpa_supplicant.conf -i$(. /etc/network.conf ; echo $WIFI_INTERFACE)"
    4.39 +
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/firefox/rootfs/etc/init.d/wpa_supplicant	Sat Apr 02 14:23:38 2011 +0200
     5.3 @@ -0,0 +1,55 @@
     5.4 +#!/bin/sh
     5.5 +# /etc/init.d/wpa_supplicant: Start, stop and restart wpa_supplicant deamon
     5.6 +# on SliTaz, at boot time or with the command line.
     5.7 +#
     5.8 +# To start daemon at boot time, just put the right name in the $RUN_DAEMONS
     5.9 +# variable of /etc/rcS.conf and configure options with /etc/daemons.conf.
    5.10 +#
    5.11 +. /etc/init.d/rc.functions
    5.12 +. /etc/daemons.conf
    5.13 +
    5.14 +NAME=wpa_supplicant
    5.15 +DESC="wpa_supplicant deamon"
    5.16 +DAEMON=/usr/bin/wpa_supplicant
    5.17 +OPTIONS=$WPA_OPTIONS
    5.18 +PIDFILE=/var/run/wpa_supplicant.pid
    5.19 +
    5.20 +case "$1" in
    5.21 +  start)
    5.22 +    if [ -f $PIDFILE ] ; then
    5.23 +      echo "$NAME already running."
    5.24 +      exit 1
    5.25 +    fi
    5.26 +    echo -n "Starting $DESC: $NAME... "
    5.27 +    $DAEMON $OPTIONS 
    5.28 +    status
    5.29 +    ;;
    5.30 +  stop)
    5.31 +    if [ ! -f $PIDFILE ] ; then
    5.32 +      echo "$NAME is not running."
    5.33 +      exit 1
    5.34 +    fi
    5.35 +    echo -n "Stopping $DESC: $NAME... "
    5.36 +    kill `cat $PIDFILE`
    5.37 +    status
    5.38 +    ;;
    5.39 +  restart)
    5.40 +    if [ ! -f $PIDFILE ] ; then
    5.41 +      echo "$NAME is not running."
    5.42 +      exit 1
    5.43 +    fi
    5.44 +    echo -n "Restarting $DESC: $NAME... "
    5.45 +    kill `cat $PIDFILE`
    5.46 +    sleep 2
    5.47 +    $DAEMON $OPTIONS
    5.48 +    status
    5.49 +    ;;
    5.50 +  *)
    5.51 +    echo ""
    5.52 +    echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]"
    5.53 +    echo ""
    5.54 +    exit 1
    5.55 +    ;;
    5.56 +esac
    5.57 +
    5.58 +exit 0
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/firefox/rootfs/etc/lxpanel/default/config	Sat Apr 02 14:23:38 2011 +0200
     6.3 @@ -0,0 +1,4 @@
     6.4 +[Command]
     6.5 +FileManager=pcmanfm %s
     6.6 +Terminal=terminal
     6.7 +Logout=desktopbox logout
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/firefox/rootfs/etc/lxpanel/default/panels/bottom	Sat Apr 02 14:23:38 2011 +0200
     7.3 @@ -0,0 +1,60 @@
     7.4 +# lxpanel <profile> config file. Manually editing is not recommended.
     7.5 +# Use preference dialog in lxpanel to adjust config when you can.
     7.6 +
     7.7 +Global {
     7.8 +    edge=bottom
     7.9 +    allign=center
    7.10 +    margin=0
    7.11 +    widthtype=percent
    7.12 +    width=100
    7.13 +    height=24
    7.14 +    transparent=1
    7.15 +    tintcolor=#ffffff
    7.16 +    alpha=20
    7.17 +    autohide=0
    7.18 +    heightwhenhidden=2
    7.19 +    setdocktype=0
    7.20 +    setpartialstrut=1
    7.21 +    usefontcolor=1
    7.22 +    fontcolor=#ffffff
    7.23 +    background=0
    7.24 +    iconsize=24
    7.25 +}
    7.26 +
    7.27 +Plugin {
    7.28 +    type = pager
    7.29 +}
    7.30 +
    7.31 +Plugin {
    7.32 +    type = space
    7.33 +    Config {
    7.34 +        Size=4
    7.35 +    }
    7.36 +}
    7.37 +
    7.38 +Plugin {
    7.39 +    type = taskbar
    7.40 +    expand=1
    7.41 +    Config {
    7.42 +        tooltips=1
    7.43 +        IconsOnly=0
    7.44 +        ShowAllDesks=0
    7.45 +        UseMouseWheel=1
    7.46 +        UseUrgencyHint=1
    7.47 +        FlatButton=1
    7.48 +        MaxTaskWidth=200
    7.49 +        spacing=2
    7.50 +        GroupedTasks=1
    7.51 +    }
    7.52 +}
    7.53 +
    7.54 +Plugin {
    7.55 +    type = dclock
    7.56 +    Config {
    7.57 +        ClockFmt=%R
    7.58 +        TooltipFmt=%A %x
    7.59 +        BoldFont=1
    7.60 +        IconOnly=0
    7.61 +    }
    7.62 +}
    7.63 +
     8.1 --- a/firefox/rootfs/etc/lxpanel/default/panels/panel	Sat Apr 02 11:50:33 2011 +0200
     8.2 +++ b/firefox/rootfs/etc/lxpanel/default/panels/panel	Sat Apr 02 14:23:38 2011 +0200
     8.3 @@ -2,18 +2,18 @@
     8.4  # Use preference dialog in lxpanel to adjust config when you can.
     8.5  
     8.6  Global {
     8.7 -    edge=bottom
     8.8 +    edge=top
     8.9      allign=center
    8.10      margin=0
    8.11      widthtype=percent
    8.12      width=100
    8.13      height=24
    8.14      transparent=1
    8.15 -    tintcolor=#000000
    8.16 -    alpha=0
    8.17 +    tintcolor=#ffffff
    8.18 +    alpha=20
    8.19      autohide=0
    8.20      heightwhenhidden=2
    8.21 -    setdocktype=1
    8.22 +    setdocktype=0
    8.23      setpartialstrut=1
    8.24      usefontcolor=1
    8.25      fontcolor=#ffffff
    8.26 @@ -32,19 +32,21 @@
    8.27  Plugin {
    8.28      type = menu
    8.29      Config {
    8.30 +        name=SliTazMenu.directory
    8.31          image=/usr/share/pixmaps/slitaz-menu.png
    8.32 +        name=SliTazMenu.directory
    8.33          system {
    8.34          }
    8.35          separator {
    8.36          }
    8.37          item {
    8.38 -            image=/usr/share/icons/SliTaz/16x16/categories/applications-system.png
    8.39 +			image=exec
    8.40              command=run
    8.41          }
    8.42          separator {
    8.43          }
    8.44          item {
    8.45 -            image=/usr/share/pixmaps/logout.png
    8.46 +            image=logout
    8.47              command=logout
    8.48          }
    8.49      }
    8.50 @@ -52,51 +54,14 @@
    8.51  
    8.52  Plugin {
    8.53      type = space
    8.54 +    expand=1
    8.55      Config {
    8.56 -        Size=4
    8.57 +        Size=2
    8.58      }
    8.59  }
    8.60  
    8.61  Plugin {
    8.62 -    type = launchbar
    8.63 -    Config {
    8.64 -        Button {
    8.65 -            id=xterm.desktop
    8.66 -        }
    8.67 -        Button {
    8.68 -            id=firefox.desktop
    8.69 -        }
    8.70 -    }
    8.71 -}
    8.72 -
    8.73 -Plugin {
    8.74 -    type = pager
    8.75 -}
    8.76 -
    8.77 -Plugin {
    8.78 -    type = wincmd
    8.79 -    Config {
    8.80 -        image=window-manager
    8.81 -        Button1=iconify
    8.82 -        Button2=shade
    8.83 -        Toggle=0
    8.84 -    }
    8.85 -}
    8.86 -
    8.87 -Plugin {
    8.88 -    type = taskbar
    8.89 -    expand=1
    8.90 -    Config {
    8.91 -        tooltips=1
    8.92 -        IconsOnly=0
    8.93 -        ShowAllDesks=0
    8.94 -        UseMouseWheel=1
    8.95 -        UseUrgencyHint=1
    8.96 -        FlatButton=1
    8.97 -        MaxTaskWidth=200
    8.98 -        spacing=1
    8.99 -        GroupedTasks=0
   8.100 -    }
   8.101 +    type = tray
   8.102  }
   8.103  
   8.104  Plugin {
   8.105 @@ -107,10 +72,6 @@
   8.106  }
   8.107  
   8.108  Plugin {
   8.109 -    type = tray
   8.110 -}
   8.111 -
   8.112 -Plugin {
   8.113      type = volumealsa
   8.114  }
   8.115  
   8.116 @@ -124,7 +85,7 @@
   8.117  Plugin {
   8.118      type = netstatus
   8.119      Config {
   8.120 -        iface=eth0
   8.121 +        iface=wlan0
   8.122          configtool=subox netbox %i
   8.123      }
   8.124  }
   8.125 @@ -163,23 +124,3 @@
   8.126      }
   8.127  }
   8.128  
   8.129 -Plugin {
   8.130 -    type = launchbar
   8.131 -    Config {
   8.132 -        Button {
   8.133 -            id=tazpkgbox.desktop
   8.134 -        }
   8.135 -    }
   8.136 -}
   8.137 -
   8.138 -Plugin {
   8.139 -    type = dclock
   8.140 -    Config {
   8.141 -        ClockFmt=%R
   8.142 -        TooltipFmt=%A %x
   8.143 -        Action=desktopbox calendar
   8.144 -        BoldFont=0
   8.145 -        IconOnly=0
   8.146 -    }
   8.147 -}
   8.148 -
     9.1 --- a/firefox/rootfs/etc/skel/Desktop/slitaz-doc.desktop	Sat Apr 02 11:50:33 2011 +0200
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,5 +0,0 @@
     9.4 -[Desktop Entry]
     9.5 -Name=Documentation
     9.6 -Exec=GtkLauncher file:///usr/share/doc/slitaz/index.html
     9.7 -Icon=slitaz-doc.png
     9.8 -Type=Application
    10.1 --- a/firefox/rootfs/etc/slitaz/applications.conf	Sat Apr 02 11:50:33 2011 +0200
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,18 +0,0 @@
    10.4 -# SliTaz default applications configuration file. Thes apps can be
    10.5 -# started throught wrappers: browser, editor and terminal.
    10.6 -#
    10.7 -
    10.8 -# File manager.
    10.9 -FILE_MANAGER="pcmanfm"
   10.10 -
   10.11 -# Web browser.
   10.12 -BROWSER="firefox"
   10.13 -
   10.14 -# Text editor.
   10.15 -EDITOR="leafpad"
   10.16 -
   10.17 -# X terminal.
   10.18 -TERMINAL="xterm"
   10.19 -
   10.20 -# Window manager.
   10.21 -WINDOW_MANAGER="openbox"
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/firefox/rootfs/etc/wpa_supplicant.conf	Sat Apr 02 14:23:38 2011 +0200
    11.3 @@ -0,0 +1,754 @@
    11.4 +##### Example wpa_supplicant configuration file ###############################
    11.5 +#
    11.6 +# This file describes configuration file format and lists all available option.
    11.7 +# Please also take a look at simpler configuration examples in 'examples'
    11.8 +# subdirectory.
    11.9 +#
   11.10 +# Empty lines and lines starting with # are ignored
   11.11 +
   11.12 +# NOTE! This file may contain password information and should probably be made
   11.13 +# readable only by root user on multiuser systems.
   11.14 +
   11.15 +# Note: All file paths in this configuration file should use full (absolute,
   11.16 +# not relative to working directory) path in order to allow working directory
   11.17 +# to be changed. This can happen if wpa_supplicant is run in the background.
   11.18 +
   11.19 +# Whether to allow wpa_supplicant to update (overwrite) configuration
   11.20 +#
   11.21 +# This option can be used to allow wpa_supplicant to overwrite configuration
   11.22 +# file whenever configuration is changed (e.g., new network block is added with
   11.23 +# wpa_cli or wpa_gui, or a password is changed). This is required for
   11.24 +# wpa_cli/wpa_gui to be able to store the configuration changes permanently.
   11.25 +# Please note that overwriting configuration file will remove the comments from
   11.26 +# it.
   11.27 +#update_config=1
   11.28 +
   11.29 +# global configuration (shared by all network blocks)
   11.30 +#
   11.31 +# Parameters for the control interface. If this is specified, wpa_supplicant
   11.32 +# will open a control interface that is available for external programs to
   11.33 +# manage wpa_supplicant. The meaning of this string depends on which control
   11.34 +# interface mechanism is used. For all cases, the existance of this parameter
   11.35 +# in configuration is used to determine whether the control interface is
   11.36 +# enabled.
   11.37 +#
   11.38 +# For UNIX domain sockets (default on Linux and BSD): This is a directory that
   11.39 +# will be created for UNIX domain sockets for listening to requests from
   11.40 +# external programs (CLI/GUI, etc.) for status information and configuration.
   11.41 +# The socket file will be named based on the interface name, so multiple
   11.42 +# wpa_supplicant processes can be run at the same time if more than one
   11.43 +# interface is used.
   11.44 +# /var/run/wpa_supplicant is the recommended directory for sockets and by
   11.45 +# default, wpa_cli will use it when trying to connect with wpa_supplicant.
   11.46 +#
   11.47 +# Access control for the control interface can be configured by setting the
   11.48 +# directory to allow only members of a group to use sockets. This way, it is
   11.49 +# possible to run wpa_supplicant as root (since it needs to change network
   11.50 +# configuration and open raw sockets) and still allow GUI/CLI components to be
   11.51 +# run as non-root users. However, since the control interface can be used to
   11.52 +# change the network configuration, this access needs to be protected in many
   11.53 +# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you
   11.54 +# want to allow non-root users to use the control interface, add a new group
   11.55 +# and change this value to match with that group. Add users that should have
   11.56 +# control interface access to this group. If this variable is commented out or
   11.57 +# not included in the configuration file, group will not be changed from the
   11.58 +# value it got by default when the directory or socket was created.
   11.59 +#
   11.60 +# When configuring both the directory and group, use following format:
   11.61 +# DIR=/var/run/wpa_supplicant GROUP=wheel
   11.62 +# DIR=/var/run/wpa_supplicant GROUP=0
   11.63 +# (group can be either group name or gid)
   11.64 +#
   11.65 +# For UDP connections (default on Windows): The value will be ignored. This
   11.66 +# variable is just used to select that the control interface is to be created.
   11.67 +# The value can be set to, e.g., udp (ctrl_interface=udp)
   11.68 +#
   11.69 +# For Windows Named Pipe: This value can be used to set the security descriptor
   11.70 +# for controlling access to the control interface. Security descriptor can be
   11.71 +# set using Security Descriptor String Format (see http://msdn.microsoft.com/
   11.72 +# library/default.asp?url=/library/en-us/secauthz/security/
   11.73 +# security_descriptor_string_format.asp). The descriptor string needs to be
   11.74 +# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
   11.75 +# DACL (which will reject all connections). See README-Windows.txt for more
   11.76 +# information about SDDL string format.
   11.77 +#
   11.78 +ctrl_interface=/var/run/wpa_supplicant
   11.79 +
   11.80 +# Ensure that only root can read the WPA configuration
   11.81 +ctrl_interface_group=0
   11.82 +
   11.83 +
   11.84 +# IEEE 802.1X/EAPOL version
   11.85 +# wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
   11.86 +# EAPOL version 2. However, there are many APs that do not handle the new
   11.87 +# version number correctly (they seem to drop the frames completely). In order
   11.88 +# to make wpa_supplicant interoperate with these APs, the version number is set
   11.89 +# to 1 by default. This configuration value can be used to set it to the new
   11.90 +# version (2).
   11.91 +eapol_version=1
   11.92 +
   11.93 +# AP scanning/selection
   11.94 +# By default, wpa_supplicant requests driver to perform AP scanning and then
   11.95 +# uses the scan results to select a suitable AP. Another alternative is to
   11.96 +# allow the driver to take care of AP scanning and selection and use
   11.97 +# wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association
   11.98 +# information from the driver.
   11.99 +# 1: wpa_supplicant initiates scanning and AP selection
  11.100 +# 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
  11.101 +#    parameters (e.g., WPA IE generation); this mode can also be used with
  11.102 +#    non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
  11.103 +#    APs (i.e., external program needs to control association). This mode must
  11.104 +#    also be used when using wired Ethernet drivers.
  11.105 +# 2: like 0, but associate with APs using security policy and SSID (but not
  11.106 +#    BSSID); this can be used, e.g., with ndiswrapper and NDIS drivers to
  11.107 +#    enable operation with hidden SSIDs and optimized roaming; in this mode,
  11.108 +#    the network blocks in the configuration file are tried one by one until
  11.109 +#    the driver reports successful association; each network block should have
  11.110 +#    explicit security policy (i.e., only one option in the lists) for
  11.111 +#    key_mgmt, pairwise, group, proto variables
  11.112 +ap_scan=1
  11.113 +
  11.114 +# EAP fast re-authentication
  11.115 +# By default, fast re-authentication is enabled for all EAP methods that
  11.116 +# support it. This variable can be used to disable fast re-authentication.
  11.117 +# Normally, there is no need to disable this.
  11.118 +fast_reauth=1
  11.119 +
  11.120 +# OpenSSL Engine support
  11.121 +# These options can be used to load OpenSSL engines.
  11.122 +# The two engines that are supported currently are shown below:
  11.123 +# They are both from the opensc project (http://www.opensc.org/)
  11.124 +# By default no engines are loaded.
  11.125 +# make the opensc engine available
  11.126 +#opensc_engine_path=/usr/lib/opensc/engine_opensc.so
  11.127 +# make the pkcs11 engine available
  11.128 +#pkcs11_engine_path=/usr/lib/opensc/engine_pkcs11.so
  11.129 +# configure the path to the pkcs11 module required by the pkcs11 engine
  11.130 +#pkcs11_module_path=/usr/lib/pkcs11/opensc-pkcs11.so
  11.131 +
  11.132 +# Dynamic EAP methods
  11.133 +# If EAP methods were built dynamically as shared object files, they need to be
  11.134 +# loaded here before being used in the network blocks. By default, EAP methods
  11.135 +# are included statically in the build, so these lines are not needed
  11.136 +#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so
  11.137 +#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so
  11.138 +
  11.139 +# Driver interface parameters
  11.140 +# This field can be used to configure arbitrary driver interace parameters. The
  11.141 +# format is specific to the selected driver interface. This field is not used
  11.142 +# in most cases.
  11.143 +#driver_param="field=value"
  11.144 +
  11.145 +# Maximum lifetime for PMKSA in seconds; default 43200
  11.146 +#dot11RSNAConfigPMKLifetime=43200
  11.147 +# Threshold for reauthentication (percentage of PMK lifetime); default 70
  11.148 +#dot11RSNAConfigPMKReauthThreshold=70
  11.149 +# Timeout for security association negotiation in seconds; default 60
  11.150 +#dot11RSNAConfigSATimeout=60
  11.151 +
  11.152 +# network block
  11.153 +#
  11.154 +# Each network (usually AP's sharing the same SSID) is configured as a separate
  11.155 +# block in this configuration file. The network blocks are in preference order
  11.156 +# (the first match is used).
  11.157 +#
  11.158 +# network block fields:
  11.159 +#
  11.160 +# disabled:
  11.161 +#	0 = this network can be used (default)
  11.162 +#	1 = this network block is disabled (can be enabled through ctrl_iface,
  11.163 +#	    e.g., with wpa_cli or wpa_gui)
  11.164 +#
  11.165 +# id_str: Network identifier string for external scripts. This value is passed
  11.166 +#	to external action script through wpa_cli as WPA_ID_STR environment
  11.167 +#	variable to make it easier to do network specific configuration.
  11.168 +#
  11.169 +# ssid: SSID (mandatory); either as an ASCII string with double quotation or
  11.170 +#	as hex string; network name
  11.171 +#
  11.172 +# scan_ssid:
  11.173 +#	0 = do not scan this SSID with specific Probe Request frames (default)
  11.174 +#	1 = scan with SSID-specific Probe Request frames (this can be used to
  11.175 +#	    find APs that do not accept broadcast SSID or use multiple SSIDs;
  11.176 +#	    this will add latency to scanning, so enable this only when needed)
  11.177 +#
  11.178 +# bssid: BSSID (optional); if set, this network block is used only when
  11.179 +#	associating with the AP using the configured BSSID
  11.180 +#
  11.181 +# priority: priority group (integer)
  11.182 +# By default, all networks will get same priority group (0). If some of the
  11.183 +# networks are more desirable, this field can be used to change the order in
  11.184 +# which wpa_supplicant goes through the networks when selecting a BSS. The
  11.185 +# priority groups will be iterated in decreasing priority (i.e., the larger the
  11.186 +# priority value, the sooner the network is matched against the scan results).
  11.187 +# Within each priority group, networks will be selected based on security
  11.188 +# policy, signal strength, etc.
  11.189 +# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not
  11.190 +# using this priority to select the order for scanning. Instead, they try the
  11.191 +# networks in the order that used in the configuration file.
  11.192 +#
  11.193 +# mode: IEEE 802.11 operation mode
  11.194 +# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
  11.195 +# 1 = IBSS (ad-hoc, peer-to-peer)
  11.196 +# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP)
  11.197 +# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has
  11.198 +# to be set to 2 for IBSS. WPA-None requires following network block options:
  11.199 +# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not
  11.200 +# both), and psk must also be set.
  11.201 +#
  11.202 +# frequency: Channel frequency in megahertz (MHz) for IBSS, e.g.,
  11.203 +# 2412 = IEEE 802.11b/g channel 1. This value is used to configure the initial
  11.204 +# channel for IBSS (adhoc) networks. It is ignored in the infrastructure mode.
  11.205 +# In addition, this value is only used by the station that creates the IBSS. If
  11.206 +# an IBSS network with the configured SSID is already present, the frequency of
  11.207 +# the network will be used instead of this configured value.
  11.208 +#
  11.209 +# proto: list of accepted protocols
  11.210 +# WPA = WPA/IEEE 802.11i/D3.0
  11.211 +# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
  11.212 +# If not set, this defaults to: WPA RSN
  11.213 +#
  11.214 +# key_mgmt: list of accepted authenticated key management protocols
  11.215 +# WPA-PSK = WPA pre-shared key (this requires 'psk' field)
  11.216 +# WPA-EAP = WPA using EAP authentication (this can use an external
  11.217 +#	program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication
  11.218 +# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically
  11.219 +#	generated WEP keys
  11.220 +# NONE = WPA is not used; plaintext or static WEP could be used
  11.221 +# If not set, this defaults to: WPA-PSK WPA-EAP
  11.222 +#
  11.223 +# auth_alg: list of allowed IEEE 802.11 authentication algorithms
  11.224 +# OPEN = Open System authentication (required for WPA/WPA2)
  11.225 +# SHARED = Shared Key authentication (requires static WEP keys)
  11.226 +# LEAP = LEAP/Network EAP (only used with LEAP)
  11.227 +# If not set, automatic selection is used (Open System with LEAP enabled if
  11.228 +# LEAP is allowed as one of the EAP methods).
  11.229 +#
  11.230 +# pairwise: list of accepted pairwise (unicast) ciphers for WPA
  11.231 +# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
  11.232 +# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
  11.233 +# NONE = Use only Group Keys (deprecated, should not be included if APs support
  11.234 +#	pairwise keys)
  11.235 +# If not set, this defaults to: CCMP TKIP
  11.236 +#
  11.237 +# group: list of accepted group (broadcast/multicast) ciphers for WPA
  11.238 +# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
  11.239 +# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
  11.240 +# WEP104 = WEP (Wired Equivalent Privacy) with 104-bit key
  11.241 +# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE 802.11]
  11.242 +# If not set, this defaults to: CCMP TKIP WEP104 WEP40
  11.243 +#
  11.244 +# psk: WPA preshared key; 256-bit pre-shared key
  11.245 +# The key used in WPA-PSK mode can be entered either as 64 hex-digits, i.e.,
  11.246 +# 32 bytes or as an ASCII passphrase (in which case, the real PSK will be
  11.247 +# generated using the passphrase and SSID). ASCII passphrase must be between
  11.248 +# 8 and 63 characters (inclusive).
  11.249 +# This field is not needed, if WPA-EAP is used.
  11.250 +# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys
  11.251 +# from ASCII passphrase. This process uses lot of CPU and wpa_supplicant
  11.252 +# startup and reconfiguration time can be optimized by generating the PSK only
  11.253 +# only when the passphrase or SSID has actually changed.
  11.254 +#
  11.255 +# eapol_flags: IEEE 802.1X/EAPOL options (bit field)
  11.256 +# Dynamic WEP key required for non-WPA mode
  11.257 +# bit0 (1): require dynamically generated unicast WEP key
  11.258 +# bit1 (2): require dynamically generated broadcast WEP key
  11.259 +# 	(3 = require both keys; default)
  11.260 +# Note: When using wired authentication, eapol_flags must be set to 0 for the
  11.261 +# authentication to be completed successfully.
  11.262 +#
  11.263 +# mixed_cell: This option can be used to configure whether so called mixed
  11.264 +# cells, i.e., networks that use both plaintext and encryption in the same
  11.265 +# SSID, are allowed when selecting a BSS form scan results.
  11.266 +# 0 = disabled (default)
  11.267 +# 1 = enabled
  11.268 +#
  11.269 +# proactive_key_caching:
  11.270 +# Enable/disable opportunistic PMKSA caching for WPA2.
  11.271 +# 0 = disabled (default)
  11.272 +# 1 = enabled
  11.273 +#
  11.274 +# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or
  11.275 +# hex without quotation, e.g., 0102030405)
  11.276 +# wep_tx_keyidx: Default WEP key index (TX) (0..3)
  11.277 +#
  11.278 +# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e DLS) is
  11.279 +# allowed. This is only used with RSN/WPA2.
  11.280 +# 0 = disabled (default)
  11.281 +# 1 = enabled
  11.282 +#peerkey=1
  11.283 +#
  11.284 +# Following fields are only used with internal EAP implementation.
  11.285 +# eap: space-separated list of accepted EAP methods
  11.286 +#	MD5 = EAP-MD5 (unsecure and does not generate keying material ->
  11.287 +#			cannot be used with WPA; to be used as a Phase 2 method
  11.288 +#			with EAP-PEAP or EAP-TTLS)
  11.289 +#       MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be used
  11.290 +#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
  11.291 +#       OTP = EAP-OTP (cannot be used separately with WPA; to be used
  11.292 +#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
  11.293 +#       GTC = EAP-GTC (cannot be used separately with WPA; to be used
  11.294 +#		as a Phase 2 method with EAP-PEAP or EAP-TTLS)
  11.295 +#	TLS = EAP-TLS (client and server certificate)
  11.296 +#	PEAP = EAP-PEAP (with tunnelled EAP authentication)
  11.297 +#	TTLS = EAP-TTLS (with tunnelled EAP or PAP/CHAP/MSCHAP/MSCHAPV2
  11.298 +#			 authentication)
  11.299 +#	If not set, all compiled in methods are allowed.
  11.300 +#
  11.301 +# identity: Identity string for EAP
  11.302 +# anonymous_identity: Anonymous identity string for EAP (to be used as the
  11.303 +#	unencrypted identity with EAP types that support different tunnelled
  11.304 +#	identity, e.g., EAP-TTLS)
  11.305 +# password: Password string for EAP
  11.306 +# ca_cert: File path to CA certificate file (PEM/DER). This file can have one
  11.307 +#	or more trusted CA certificates. If ca_cert and ca_path are not
  11.308 +#	included, server certificate will not be verified. This is insecure and
  11.309 +#	a trusted CA certificate should always be configured when using
  11.310 +#	EAP-TLS/TTLS/PEAP. Full path should be used since working directory may
  11.311 +#	change when wpa_supplicant is run in the background.
  11.312 +#	On Windows, trusted CA certificates can be loaded from the system
  11.313 +#	certificate store by setting this to cert_store://<name>, e.g.,
  11.314 +#	ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".
  11.315 +#	Note that when running wpa_supplicant as an application, the user
  11.316 +#	certificate store (My user account) is used, whereas computer store
  11.317 +#	(Computer account) is used when running wpasvc as a service.
  11.318 +# ca_path: Directory path for CA certificate files (PEM). This path may
  11.319 +#	contain multiple CA certificates in OpenSSL format. Common use for this
  11.320 +#	is to point to system trusted CA list which is often installed into
  11.321 +#	directory like /etc/ssl/certs. If configured, these certificates are
  11.322 +#	added to the list of trusted CAs. ca_cert may also be included in that
  11.323 +#	case, but it is not required.
  11.324 +# client_cert: File path to client certificate file (PEM/DER)
  11.325 +#	Full path should be used since working directory may change when
  11.326 +#	wpa_supplicant is run in the background.
  11.327 +#	Alternatively, a named configuration blob can be used by setting this
  11.328 +#	to blob://<blob name>.
  11.329 +# private_key: File path to client private key file (PEM/DER/PFX)
  11.330 +#	When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be
  11.331 +#	commented out. Both the private key and certificate will be read from
  11.332 +#	the PKCS#12 file in this case. Full path should be used since working
  11.333 +#	directory may change when wpa_supplicant is run in the background.
  11.334 +#	Windows certificate store can be used by leaving client_cert out and
  11.335 +#	configuring private_key in one of the following formats:
  11.336 +#	cert://substring_to_match
  11.337 +#	hash://certificate_thumbprint_in_hex
  11.338 +#	for example: private_key="hash://63093aa9c47f56ae88334c7b65a4"
  11.339 +#	Note that when running wpa_supplicant as an application, the user
  11.340 +#	certificate store (My user account) is used, whereas computer store
  11.341 +#	(Computer account) is used when running wpasvc as a service.
  11.342 +#	Alternatively, a named configuration blob can be used by setting this
  11.343 +#	to blob://<blob name>.
  11.344 +# private_key_passwd: Password for private key file (if left out, this will be
  11.345 +#	asked through control interface)
  11.346 +# dh_file: File path to DH/DSA parameters file (in PEM format)
  11.347 +#	This is an optional configuration file for setting parameters for an
  11.348 +#	ephemeral DH key exchange. In most cases, the default RSA
  11.349 +#	authentication does not use this configuration. However, it is possible
  11.350 +#	setup RSA to use ephemeral DH key exchange. In addition, ciphers with
  11.351 +#	DSA keys always use ephemeral DH keys. This can be used to achieve
  11.352 +#	forward secrecy. If the file is in DSA parameters format, it will be
  11.353 +#	automatically converted into DH params.
  11.354 +# subject_match: Substring to be matched against the subject of the
  11.355 +#	authentication server certificate. If this string is set, the server
  11.356 +#	sertificate is only accepted if it contains this string in the subject.
  11.357 +#	The subject string is in following format:
  11.358 +#	/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com
  11.359 +# altsubject_match: Semicolon separated string of entries to be matched against
  11.360 +#	the alternative subject name of the authentication server certificate.
  11.361 +#	If this string is set, the server sertificate is only accepted if it
  11.362 +#	contains one of the entries in an alternative subject name extension.
  11.363 +#	altSubjectName string is in following format: TYPE:VALUE
  11.364 +#	Example: EMAIL:server@example.com
  11.365 +#	Example: DNS:server.example.com;DNS:server2.example.com
  11.366 +#	Following types are supported: EMAIL, DNS, URI
  11.367 +# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters
  11.368 +#	(string with field-value pairs, e.g., "peapver=0" or
  11.369 +#	"peapver=1 peaplabel=1")
  11.370 +#	'peapver' can be used to force which PEAP version (0 or 1) is used.
  11.371 +#	'peaplabel=1' can be used to force new label, "client PEAP encryption",
  11.372 +#	to be used during key derivation when PEAPv1 or newer. Most existing
  11.373 +#	PEAPv1 implementation seem to be using the old label, "client EAP
  11.374 +#	encryption", and wpa_supplicant is now using that as the default value.
  11.375 +#	Some servers, e.g., Radiator, may require peaplabel=1 configuration to
  11.376 +#	interoperate with PEAPv1; see eap_testing.txt for more details.
  11.377 +#	'peap_outer_success=0' can be used to terminate PEAP authentication on
  11.378 +#	tunneled EAP-Success. This is required with some RADIUS servers that
  11.379 +#	implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g.,
  11.380 +#	Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode)
  11.381 +#	include_tls_length=1 can be used to force wpa_supplicant to include
  11.382 +#	TLS Message Length field in all TLS messages even if they are not
  11.383 +#	fragmented.
  11.384 +#	sim_min_num_chal=3 can be used to configure EAP-SIM to require three
  11.385 +#	challenges (by default, it accepts 2 or 3)
  11.386 +# phase2: Phase2 (inner authentication with TLS tunnel) parameters
  11.387 +#	(string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or
  11.388 +#	"autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS)
  11.389 +# Following certificate/private key fields are used in inner Phase2
  11.390 +# authentication when using EAP-TTLS or EAP-PEAP.
  11.391 +# ca_cert2: File path to CA certificate file. This file can have one or more
  11.392 +#	trusted CA certificates. If ca_cert2 and ca_path2 are not included,
  11.393 +#	server certificate will not be verified. This is insecure and a trusted
  11.394 +#	CA certificate should always be configured.
  11.395 +# ca_path2: Directory path for CA certificate files (PEM)
  11.396 +# client_cert2: File path to client certificate file
  11.397 +# private_key2: File path to client private key file
  11.398 +# private_key2_passwd: Password for private key file
  11.399 +# dh_file2: File path to DH/DSA parameters file (in PEM format)
  11.400 +# subject_match2: Substring to be matched against the subject of the
  11.401 +#	authentication server certificate.
  11.402 +# altsubject_match2: Substring to be matched against the alternative subject
  11.403 +#	name of the authentication server certificate.
  11.404 +#
  11.405 +# fragment_size: Maximum EAP fragment size in bytes (default 1398).
  11.406 +#	This value limits the fragment size for EAP methods that support
  11.407 +#	fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set
  11.408 +#	small enough to make the EAP messages fit in MTU of the network
  11.409 +#	interface used for EAPOL. The default value is suitable for most
  11.410 +#	cases.
  11.411 +#
  11.412 +# EAP-PSK variables:
  11.413 +# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
  11.414 +# nai: user NAI
  11.415 +#
  11.416 +# EAP-PAX variables:
  11.417 +# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
  11.418 +#
  11.419 +# EAP-SAKE variables:
  11.420 +# eappsk: 32-byte (256-bit, 64 hex digits) pre-shared key in hex format
  11.421 +#	(this is concatenation of Root-Secret-A and Root-Secret-B)
  11.422 +# nai: user NAI (PEERID)
  11.423 +#
  11.424 +# EAP-GPSK variables:
  11.425 +# eappsk: Pre-shared key in hex format (at least 128 bits, i.e., 32 hex digits)
  11.426 +# nai: user NAI (ID_Client)
  11.427 +#
  11.428 +# EAP-FAST variables:
  11.429 +# pac_file: File path for the PAC entries. wpa_supplicant will need to be able
  11.430 +#	to create this file and write updates to it when PAC is being
  11.431 +#	provisioned or refreshed. Full path to the file should be used since
  11.432 +#	working directory may change when wpa_supplicant is run in the
  11.433 +#	background. Alternatively, a named configuration blob can be used by
  11.434 +#	setting this to blob://<blob name>
  11.435 +# phase1: fast_provisioning=1 option enables in-line provisioning of EAP-FAST
  11.436 +#	credentials (PAC)
  11.437 +#
  11.438 +# wpa_supplicant supports number of "EAP workarounds" to work around
  11.439 +# interoperability issues with incorrectly behaving authentication servers.
  11.440 +# These are enabled by default because some of the issues are present in large
  11.441 +# number of authentication servers. Strict EAP conformance mode can be
  11.442 +# configured by disabling workarounds with eap_workaround=0.
  11.443 +
  11.444 +# Example blocks:
  11.445 +
  11.446 +# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers
  11.447 +#network={
  11.448 +#	ssid="simple"
  11.449 +#	psk="very secret passphrase"
  11.450 +#	priority=5
  11.451 +#}
  11.452 +
  11.453 +# Same as previous, but request SSID-specific scanning (for APs that reject
  11.454 +# broadcast SSID)
  11.455 +#network={
  11.456 +#	ssid="second ssid"
  11.457 +#	scan_ssid=1
  11.458 +#	psk="very secret passphrase"
  11.459 +#	priority=2
  11.460 +#}
  11.461 +
  11.462 +# Only WPA-PSK is used. Any valid cipher combination is accepted.
  11.463 +#network={
  11.464 +#	ssid="example"
  11.465 +#	proto=WPA
  11.466 +#	key_mgmt=WPA-PSK
  11.467 +#	pairwise=CCMP TKIP
  11.468 +#	group=CCMP TKIP WEP104 WEP40
  11.469 +#	psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
  11.470 +#	priority=2
  11.471 +#}
  11.472 +
  11.473 +# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used WEP104
  11.474 +# or WEP40 as the group cipher will not be accepted.
  11.475 +#network={
  11.476 +#	ssid="example"
  11.477 +#	proto=RSN
  11.478 +#	key_mgmt=WPA-EAP
  11.479 +#	pairwise=CCMP TKIP
  11.480 +#	group=CCMP TKIP
  11.481 +#	eap=TLS
  11.482 +#	identity="user@example.com"
  11.483 +#	ca_cert="/etc/cert/ca.pem"
  11.484 +#	client_cert="/etc/cert/user.pem"
  11.485 +#	private_key="/etc/cert/user.prv"
  11.486 +#	private_key_passwd="password"
  11.487 +#	priority=1
  11.488 +#}
  11.489 +
  11.490 +# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new peaplabel
  11.491 +# (e.g., Radiator)
  11.492 +#network={
  11.493 +#	ssid="example"
  11.494 +#	key_mgmt=WPA-EAP
  11.495 +#	eap=PEAP
  11.496 +#	identity="user@example.com"
  11.497 +#	password="foobar"
  11.498 +#	ca_cert="/etc/cert/ca.pem"
  11.499 +#	phase1="peaplabel=1"
  11.500 +#	phase2="auth=MSCHAPV2"
  11.501 +#	priority=10
  11.502 +#}
  11.503 +
  11.504 +# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the
  11.505 +# unencrypted use. Real identity is sent only within an encrypted TLS tunnel.
  11.506 +#network={
  11.507 +#	ssid="example"
  11.508 +#	key_mgmt=WPA-EAP
  11.509 +#	eap=TTLS
  11.510 +#	identity="user@example.com"
  11.511 +#	anonymous_identity="anonymous@example.com"
  11.512 +#	password="foobar"
  11.513 +#	ca_cert="/etc/cert/ca.pem"
  11.514 +#	priority=2
  11.515 +#}
  11.516 +
  11.517 +# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the unencrypted
  11.518 +# use. Real identity is sent only within an encrypted TLS tunnel.
  11.519 +#network={
  11.520 +#	ssid="example"
  11.521 +#	key_mgmt=WPA-EAP
  11.522 +#	eap=TTLS
  11.523 +#	identity="user@example.com"
  11.524 +#	anonymous_identity="anonymous@example.com"
  11.525 +#	password="foobar"
  11.526 +#	ca_cert="/etc/cert/ca.pem"
  11.527 +#	phase2="auth=MSCHAPV2"
  11.528 +#}
  11.529 +
  11.530 +# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner
  11.531 +# authentication.
  11.532 +#network={
  11.533 +#	ssid="example"
  11.534 +#	key_mgmt=WPA-EAP
  11.535 +#	eap=TTLS
  11.536 +	# Phase1 / outer authentication
  11.537 +#	anonymous_identity="anonymous@example.com"
  11.538 +#	ca_cert="/etc/cert/ca.pem"
  11.539 +	# Phase 2 / inner authentication
  11.540 +#	phase2="autheap=TLS"
  11.541 +#	ca_cert2="/etc/cert/ca2.pem"
  11.542 +#	client_cert2="/etc/cer/user.pem"
  11.543 +#	private_key2="/etc/cer/user.prv"
  11.544 +#	private_key2_passwd="password"
  11.545 +#	priority=2
  11.546 +#}
  11.547 +
  11.548 +# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise and
  11.549 +# group cipher.
  11.550 +#network={
  11.551 +#	ssid="example"
  11.552 +#	bssid=00:11:22:33:44:55
  11.553 +#	proto=WPA RSN
  11.554 +#	key_mgmt=WPA-PSK WPA-EAP
  11.555 +#	pairwise=CCMP
  11.556 +#	group=CCMP
  11.557 +#	psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
  11.558 +#}
  11.559 +
  11.560 +# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP
  11.561 +# and all valid ciphers.
  11.562 +#network={
  11.563 +#	ssid=00010203
  11.564 +#	psk=000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
  11.565 +#}
  11.566 +
  11.567 +
  11.568 +# EAP-SIM with a GSM SIM or USIM
  11.569 +#network={
  11.570 +#	ssid="eap-sim-test"
  11.571 +#	key_mgmt=WPA-EAP
  11.572 +#	eap=SIM
  11.573 +#	pin="1234"
  11.574 +#	pcsc=""
  11.575 +#}
  11.576 +
  11.577 +
  11.578 +# EAP-PSK
  11.579 +#network={
  11.580 +#	ssid="eap-psk-test"
  11.581 +#	key_mgmt=WPA-EAP
  11.582 +#	eap=PSK
  11.583 +#	identity="eap_psk_user"
  11.584 +#	eappsk=06b4be19da289f475aa46a33cb793029
  11.585 +#	nai="eap_psk_user@example.com"
  11.586 +#}
  11.587 +
  11.588 +
  11.589 +# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA) using
  11.590 +# EAP-TLS for authentication and key generation; require both unicast and
  11.591 +# broadcast WEP keys.
  11.592 +#network={
  11.593 +#	ssid="1x-test"
  11.594 +#	key_mgmt=IEEE8021X
  11.595 +#	eap=TLS
  11.596 +#	identity="user@example.com"
  11.597 +#	ca_cert="/etc/cert/ca.pem"
  11.598 +#	client_cert="/etc/cert/user.pem"
  11.599 +#	private_key="/etc/cert/user.prv"
  11.600 +#	private_key_passwd="password"
  11.601 +#	eapol_flags=3
  11.602 +#}
  11.603 +
  11.604 +
  11.605 +# LEAP with dynamic WEP keys
  11.606 +#network={
  11.607 +#	ssid="leap-example"
  11.608 +#	key_mgmt=IEEE8021X
  11.609 +#	eap=LEAP
  11.610 +#	identity="user"
  11.611 +#	password="foobar"
  11.612 +#}
  11.613 +
  11.614 +# EAP-FAST with WPA (WPA or WPA2)
  11.615 +#network={
  11.616 +#	ssid="eap-fast-test"
  11.617 +#	key_mgmt=WPA-EAP
  11.618 +#	eap=FAST
  11.619 +#	anonymous_identity="FAST-000102030405"
  11.620 +#	identity="username"
  11.621 +#	password="password"
  11.622 +#	phase1="fast_provisioning=1"
  11.623 +#	pac_file="/etc/wpa_supplicant.eap-fast-pac"
  11.624 +#}
  11.625 +
  11.626 +#network={
  11.627 +#	ssid="eap-fast-test"
  11.628 +#	key_mgmt=WPA-EAP
  11.629 +#	eap=FAST
  11.630 +#	anonymous_identity="FAST-000102030405"
  11.631 +#	identity="username"
  11.632 +#	password="password"
  11.633 +#	phase1="fast_provisioning=1"
  11.634 +#	pac_file="blob://eap-fast-pac"
  11.635 +#}
  11.636 +
  11.637 +# Plaintext connection (no WPA, no IEEE 802.1X)
  11.638 +#network={
  11.639 +#	ssid="plaintext-test"
  11.640 +#	key_mgmt=NONE
  11.641 +#}
  11.642 +
  11.643 +
  11.644 +# Shared WEP key connection (no WPA, no IEEE 802.1X)
  11.645 +#network={
  11.646 +#	ssid="static-wep-test"
  11.647 +#	key_mgmt=NONE
  11.648 +#	wep_key0="abcde"
  11.649 +#	wep_key1=0102030405
  11.650 +#	wep_key2="1234567890123"
  11.651 +#	wep_tx_keyidx=0
  11.652 +#	priority=5
  11.653 +#}
  11.654 +
  11.655 +
  11.656 +# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key
  11.657 +# IEEE 802.11 authentication
  11.658 +#network={
  11.659 +#	ssid="static-wep-test2"
  11.660 +#	key_mgmt=NONE
  11.661 +#	wep_key0="abcde"
  11.662 +#	wep_key1=0102030405
  11.663 +#	wep_key2="1234567890123"
  11.664 +#	wep_tx_keyidx=0
  11.665 +#	priority=5
  11.666 +#	auth_alg=SHARED
  11.667 +#}
  11.668 +
  11.669 +
  11.670 +# IBSS/ad-hoc network with WPA-None/TKIP.
  11.671 +#network={
  11.672 +#	ssid="test adhoc"
  11.673 +#	mode=1
  11.674 +#	frequency=2412
  11.675 +#	proto=WPA
  11.676 +#	key_mgmt=WPA-NONE
  11.677 +#	pairwise=NONE
  11.678 +#	group=TKIP
  11.679 +#	psk="secret passphrase"
  11.680 +#}
  11.681 +
  11.682 +
  11.683 +# Catch all example that allows more or less all configuration modes
  11.684 +#network={
  11.685 +#	ssid="example"
  11.686 +#	scan_ssid=1
  11.687 +#	key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
  11.688 +#	pairwise=CCMP TKIP
  11.689 +#	group=CCMP TKIP WEP104 WEP40
  11.690 +#	psk="very secret passphrase"
  11.691 +#	eap=TTLS PEAP TLS
  11.692 +#	identity="user@example.com"
  11.693 +#	password="foobar"
  11.694 +#	ca_cert="/etc/cert/ca.pem"
  11.695 +#	client_cert="/etc/cert/user.pem"
  11.696 +#	private_key="/etc/cert/user.prv"
  11.697 +#	private_key_passwd="password"
  11.698 +#	phase1="peaplabel=0"
  11.699 +#}
  11.700 +
  11.701 +# Example of EAP-TLS with smartcard (openssl engine)
  11.702 +#network={
  11.703 +#	ssid="example"
  11.704 +#	key_mgmt=WPA-EAP
  11.705 +#	eap=TLS
  11.706 +#	proto=RSN
  11.707 +#	pairwise=CCMP TKIP
  11.708 +#	group=CCMP TKIP
  11.709 +#	identity="user@example.com"
  11.710 +#	ca_cert="/etc/cert/ca.pem"
  11.711 +#	client_cert="/etc/cert/user.pem"
  11.712 +#
  11.713 +#	engine=1
  11.714 +
  11.715 +	# The engine configured here must be available. Look at
  11.716 +	# OpenSSL engine support in the global section.
  11.717 +	# The key available through the engine must be the private key
  11.718 +	# matching the client certificate configured above.
  11.719 +
  11.720 +	# use the opensc engine
  11.721 +	#engine_id="opensc"
  11.722 +	#key_id="45"
  11.723 +
  11.724 +	# use the pkcs11 engine
  11.725 +#	engine_id="pkcs11"
  11.726 +#	key_id="id_45"
  11.727 +#
  11.728 +	# Optional PIN configuration; this can be left out and PIN will be
  11.729 +	# asked through the control interface
  11.730 +#	pin="1234"
  11.731 +#}
  11.732 +
  11.733 +# Example configuration showing how to use an inlined blob as a CA certificate
  11.734 +# data instead of using external file
  11.735 +#network={
  11.736 +#	ssid="example"
  11.737 +#	key_mgmt=WPA-EAP
  11.738 +#	eap=TTLS
  11.739 +#	identity="user@example.com"
  11.740 +#	anonymous_identity="anonymous@example.com"
  11.741 +#	password="foobar"
  11.742 +#	ca_cert="blob://exampleblob"
  11.743 +#	priority=20
  11.744 +#}
  11.745 +
  11.746 +#blob-base64-exampleblob={
  11.747 +#SGVsbG8gV29ybGQhCg==
  11.748 +#}
  11.749 +
  11.750 +
  11.751 +# Wildcard match for SSID (plaintext APs only). This example select any
  11.752 +# open AP regardless of its SSID.
  11.753 +network={
  11.754 +	key_mgmt=NONE
  11.755 +}
  11.756 +
  11.757 +
    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/firefox/rootfs/etc/xdg/openbox/autostart.sh	Sat Apr 02 14:23:38 2011 +0200
    12.3 @@ -0,0 +1,32 @@
    12.4 +# This shell script is run before Openbox launches.
    12.5 +# Environment variables set here are passed to the Openbox session.
    12.6 +
    12.7 +# DBUS message bus (automount removable devices)
    12.8 +dbus-launch --exit-with-session &
    12.9 +
   12.10 +# Handle Hal events with Ivman (notification with desktopbox).
   12.11 +#ivman &
   12.12 +
   12.13 +# Start PCmanFM as daemon for Wallpaper and desktop icons.
   12.14 +pcmanfm -d &
   12.15 +
   12.16 +# Start the Freedesktop panel standard menu.
   12.17 +lxpanel &
   12.18 +
   12.19 +# Start Parcellite clipboard manager.
   12.20 +#parcellite &
   12.21 +
   12.22 +# Launch Xpad desktop notes utility.
   12.23 +#xpad &
   12.24 +
   12.25 +# Desktop effects composer.
   12.26 +#xcompmgr -c -r 10 &
   12.27 +
   12.28 +# Set a background image using hsetroot (depends on imlib2).
   12.29 +#hsetroot -fill /usr/share/images/slitaz-background.png &
   12.30 +
   12.31 +# Background color with xsetroot.
   12.32 +#xsetroot -solid "#222222" &
   12.33 +
   12.34 +# Wbar2 icon bar
   12.35 +#$(sleep 3 && wbar) &