8 files changed, 47 insertions, 91 deletions

diff --git a/Makefile.test b/Makefile.test
index c15916d..7befb39 100644
--- a/Makefile.test
+++ b/Makefile.test
@@ -1,110 +1,110 @@
 #!/usr/bin/make -f
 export OPIEDIR:=$(shell pwd)
 export TOPDIR:=$(OPIEDIR)
 export QMAKE:=$(OPIEDIR)/qmake/qmake
 
 export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
 
 noconfig_targets := xconfig menuconfig config oldconfig randconfig \
                     defconfig allyesconfig allnoconfig allmodconfig
 
-configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in $(TOPDIR)/config.in
+configs += $(TOPDIR)/core/applets/restartapplet2/config.in $(TOPDIR)/core/applets/config.in $(TOPDIR)/core/apps/config.in $(TOPDIR)/core/multimedia/config.in $(TOPDIR)/core/pim/config.in $(TOPDIR)/core/pim/today/plugins/config.in $(TOPDIR)/core/settings/config.in $(TOPDIR)/core/config.in $(TOPDIR)/development/config.in $(TOPDIR)/inputmethods/config.in $(TOPDIR)/libopie/ofileselector/config.in $(TOPDIR)/libopie/pim/config.in $(TOPDIR)/libsql/config.in $(TOPDIR)/noncore/applets/config.in $(TOPDIR)/noncore/apps/opie-console/test/config.in $(TOPDIR)/noncore/apps/config.in $(TOPDIR)/noncore/comm/config.in $(TOPDIR)/noncore/decorations/config.in $(TOPDIR)/noncore/games/config.in $(TOPDIR)/noncore/graphics/config.in $(TOPDIR)/noncore/multimedia/config.in $(TOPDIR)/noncore/net/config.in $(TOPDIR)/noncore/net/opietooth/config.in $(TOPDIR)/noncore/settings/config.in $(TOPDIR)/noncore/styles/config.in $(TOPDIR)/noncore/tools/calc2/config.in $(TOPDIR)/noncore/tools/config.in $(TOPDIR)/noncore/unsupported/opiemail/ifaces/config.in $(TOPDIR)/noncore/unsupported/config.in $(TOPDIR)/noncore/config.in $(TOPDIR)/noncore/todayplugins/config.in
 
 # $(TOPDIR)/.config depends on .depends.cfgs, as it depends on $(configs)
 # in order to have a full set of config.in files.
 # .depends depends on $(TOPDIR)/.config
 # everything else depends on .depends, to ensure the dependencies are
 # intact.
 #
 # NOTE: The order in which things happen in this makefile is
         # -critical-. Do not rearrange this!
  
 all : $(TOPDIR)/.config
 
 $(TOPDIR)/.config : $(TOPDIR)/.depends.cfgs
 
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(TOPDIR)/.depends.cfgs
 
 clean-configs : $(TOPDIR)/.depends.cfgs
         @echo "Wiping generated config.in files..."
         @-rm -f $(configs)
 
 -include $(TOPDIR)/.depends.cfgs
 
 all menuconfig xconfig oldconfig config randconfig allyesconfig allnoconfig defconfig : $(configs)
 
 $(TOPDIR)/.config: $(TOPDIR)/.depends.cfgs $(configs)
         $(call descend,scripts/kconfig,conf)
         @if [ ! -e $@ ]; then \
                 cp $(TOPDIR)/def-configs/opie $@; \
         fi;
         @$(MAKE) -C scripts/kconfig conf;
         ./scripts/kconfig/conf -s ./config.in
 
 # config rules must have the $(configs) var defined
 # at the time that they run. we must ensure that .depends.cfgs
 # is built and included by the time we reach this point.
 
 xconfig :
         $(call descend,scripts/kconfig,qconf)
         LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(TOPDIR)/scripts/kconfig \
                 ./scripts/kconfig/qconf ./config.in
 
 menuconfig : scripts/lxdialog/lxdialog
         $(call descend,scripts/kconfig,mconf)
         ./scripts/kconfig/mconf ./config.in
 
 config :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf ./config.in
  
 oldconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -o ./config.in
  
 randconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -r ./config.in
  
 allyesconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -y ./config.in
  
 allnoconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -n ./config.in
  
 defconfig :
         $(call descend,scripts/kconfig,conf)
         ./scripts/kconfig/conf -d ./config.in
 
 
 export
 
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
 export include-config := 1
 
 -include $(TOPDIR)/.config
 -include $(TOPDIR)/.depends
 
 endif
 
 -include $(TOPDIR)/..config.cmd
 
 export QMAKESPEC=$(QMAKESPECSDIR)/$(patsubst "%",%,$(CONFIG_SPECFILE))
 
 ifdef CONFIG_OPTIMIZATIONS
 export CFLAGS_RELEASE=$(patsubst "%,%,$(CONFIG_OPTIMIZATIONS))
 export CFLAGS_RELEASE:=$(patsubst %",%,$(CFLAGS_RELEASE))
 endif
 
 all clean: $(subdir-y)
 
 $(subdir-y) : $(if $(CONFIG_LIBQPE),$(TOPDIR)/stamp-headers) \
         $(if $(CONFIG_LIBQPE-X11),$(TOPDIR)/stamp-headers-x11) \
         $(TOPDIR)/library/custom.h
 
 clean : $(TOPDIR)/.config
 
 include $(TOPDIR)/Rules.make
diff --git a/config.in.in b/config.in.in
deleted file mode 100644
index 679292f..0000000
--- a/config.in.in
+++ b/dev/null
@@ -1,73 +0,0 @@
-mainmenu "Opie Configuration"
-menu "Build Parameters"
-
-#choice
-# prompt "Build Processor family"
-#  default BUILD_X86
-#  help
-#    Please select the architecture of the machine you will be
-#    building the OpenZaurus buildroot on.
-#
-#  config BUILD_X86
-#    boolean "X86 Architecture"
-#
-#endchoice
-
-choice
-  prompt "Target Machine"
-  default TARGET_X86
-  help
-    Please select the architecture of the machine you will be
-    building the OpenZaurus buildroot for.
-
-  config TARGET_X86
-    boolean "Intel X86"
-
-  config TARGET_SHARP
-    boolean "Sharp Zaurus SL-5x00 - stock"
-
-#  config TARGET_OZ
-#    boolean "Sharp Zaurus SL-5x00 - OpenZaurus"
-
-  config TARGET_IPAQ
-    boolean "Ipaq"
-
-endchoice
-
-config OPTIMIZE
-  boolean "Use optimizations"
-  default "y" if ! TARGET_X86
-
-config SPECFILE
-  string
-  default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
-  default "linux-g++" if TARGET_X86 && X11
-  default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
-  default "linux-g++" if TARGET_SHARP && X11
-#  default "linux-oz-g++" if TARGET_OZ
-  default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
-  default "linux-g++" if TARGET_IPAQ && X11
-
-config CUSTOMFILE
-  string
-  default "custom-ipaq.h" if TARGET_IPAQ
-  default "custom-sharp.h" if TARGET_SHARP
-  
-
-config OPTIMIZATIONS
-  string "Optimization flags"
-  depends OPTIMIZE
-  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_IPAQ
-  default "-march=armv4 -mtune=strongarm1100 -mapcs-32 -fexpensive-optimizations -fomit-frame-pointer -O2" if TARGET_SHARP
-
-#config CROSS
-#  string "Crosscompilation prefix"
-#  default "arm-linux-"
-#  help
-#    Crosscompilation prefix is the prefix which will be prepended
-#    to all compilation commands. For example, a crosscompilation prefix
-#    of arm-linux-, results in the build calling arm-linux-gcc as its CC.
-
-endmenu
-
-@sources@
diff --git a/development/keyview/config.in b/development/keyview/config.in
index ce934d3..6c29e1d 100644
--- a/development/keyview/config.in
+++ b/development/keyview/config.in
@@ -1,4 +1,4 @@
-#  config #KEYVIEW
-#    boolean "keyview"
-#    default "y"
-#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+  config KEYVIEW
+    boolean "Keyview (Debugging tool for viewing keypresses)"
+    default "y"
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/example/config.in b/example/config.in
deleted file mode 100644
index b3e07d3..0000000
--- a/example/config.in
+++ b/dev/null
@@ -1,4 +0,0 @@
-#  config #EXAMPLE
-#    boolean "example"
-#    default "y"
-#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/libopie/config.in b/libopie/config.in
index 5894d0f..19279d8 100644
--- a/libopie/config.in
+++ b/libopie/config.in
@@ -1,6 +1,3 @@
   config LIBOPIE
     boolean "Opie library"
     default "y"
-
-  source libopie/ofileselector/config.in
-  source libopie/pim/config.in
diff --git a/libsql/test/config.in b/libsql/test/config.in
deleted file mode 100644
index 238d27f..0000000
--- a/libsql/test/config.in
+++ b/dev/null
@@ -1,4 +0,0 @@
-#  config #TEST
-#    boolean "test"
-#    default "y"
-#    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
diff --git a/scripts/deps.pl b/scripts/deps.pl
index feced6e..a219e36 100755
--- a/scripts/deps.pl
+++ b/scripts/deps.pl
@@ -1,77 +1,77 @@
 #!/usr/bin/perl -w
 
 use strict;
 
 my %depends;
 my %tokenpath;
 
 sub getdepends ($$)
 {
         my ($token, $path, $intoken);
         $token = shift || return;
         $token =~ s/CONFIG_//;
         $path = shift || return;
 #print "opening $path/config.in\n";
         #print "token is $token\n";
         open( FILE, "< $path/config.in" ) || return;
         $intoken = 0;
         while( <FILE> ) {
                 if( $intoken == 1 ) {
                         /depends\S*(.*)/ && return $1;
                         if( /\S*(config|menu)/ ) {
                                 $intoken = 0;
                                 return;
                         }
                 } else {
                         /$token/ || next;
                         $intoken = 1;
                 }
                 /$token/ || next;
         }
         close( FILE );
         return;
 }
 
 sub makedepends ($$)
 {
         my ($depends, $tokenpath, $token, $depword, $mustbesep, $state);
         $depends = shift || return;
         $tokenpath = shift || return;
         $mustbesep = 0;
 
         for $token (keys %$depends){
                 print ${$tokenpath}{$token} . " : ";
                 for (split(/\s+/, ${$depends}{$token})){
                         /^\s+$/ && next;
                         /\&\&/ && next;
                         /\|\|/ && next;
                         /^$/ && next;
                         /^\($/ && next;
                         /^\)$/ && next;
                         /^on$/ && next;
                         /^!$/ && next;
                         if(defined(${$tokenpath}{"CONFIG_" . $_})){
                                 print '$(if $(CONFIG_' . $_ . '),' . ${$tokenpath}{"CONFIG_" . $_} . ') ';
                         } else {
-                                print STDERR "Warning: unable to locate path for token CONFIG_$_\n";
+        #                       print STDERR "Warning: unable to locate path for token CONFIG_$_\n";
                         }
                 }
                 print "\n";
         }
 }
 
 while( <> ) {
         my $dep;
         my ($token, $path, $pro);
         chomp;
         s/^\s*//g;
         s/\s*$//g;
         ($token, $path, $pro) = split(/\s+/,$_);
         $tokenpath{$token} = $path;
         $dep = getdepends($token, $path);
         if( $dep ) {
                 $depends{$token} = $dep;
         }
 }
 
 makedepends(\%depends, \%tokenpath);
diff --git a/share/opie-login/pre-session b/share/opie-login/pre-session
index 8219f94..6bf9e4c 100644
--- a/share/opie-login/pre-session
+++ b/share/opie-login/pre-session
@@ -1,16 +1,56 @@
 #!/bin/sh
 
 USER=$1
 
+# NOTE about permissions in OpenZaurus
+        # The devices in question here by default
+        #are accessible to everyone in the group in
+        #question.  We wish to ensure that, as a policy
+        #choice, a login to opie makes access to these
+        #devices exclusive by 1) changing device ownership
+        #to the user, and 2) removing group access.
+#
+        #A better implementation would probably be to store
+        #existing device permissions at load time, and restore
+        #them at exit, rather than making assumptions about
+        #user/group ownership, or permissions.
+
+permin ()
+{
+        if [ -e $1 ]
+        then
+                
+        chown $USER $1
+        chmod g-rw $1
+
+        else
+                return 1
+        fi
+}
+
+permout ()
+{
+                [ -e $1 ]&& chown root $1
+                [ -e $1 ]&& chmod g+rw $1
+}
+
 if [ -e /proc/hal/model ]; then
 
   # fix for misconfigured devfsd
   chmod +x /dev/sound /dev/touchscreen /dev/fb /dev/vc
 
   [ -e /dev/sound/dsp ]     && chown $USER /dev/sound/dsp
   [ -e /dev/sound/mixer ]   && chown $USER /dev/sound/mixer
   [ -e /dev/touchscreen/0 ] && chown $USER /dev/touchscreen/0
   [ -e /dev/fb/0 ]          && chown $USER /dev/fb/0
   [ -e /dev/vc/0 ]          && chown $USER /dev/vc/0
-fi
 
+else
+
+  for dev in /dev/dsp /dev/dsp1 /dev/mixer \
+          /dev/ts /dev/fb0 
+  do
+        permin( $dev )
+  done
+
+fi