- remove setuid bit from cpufreq-selectorgnome-applets-2_10_1-9FC-4-split

- set it up for consolehelper use
- hardcode it to /usr/bin (hack) to make sure it runs the consolehelper
    version
- take out the checks for 'is it setuid or am I root'

3 files changed, 30 insertions, 3 deletions

diff --git a/cpufreq-selector.app b/cpufreq-selector.app
new file mode 100644
index 0000000..6a738ec
--- /dev/null
+++ b/cpufreq-selector.app
@@ -0,0 +1 @@
+FALLBACK=true
diff --git a/cpufreq-selector.pam b/cpufreq-selector.pam
new file mode 100644
index 0000000..321c2ee
--- /dev/null
+++ b/cpufreq-selector.pam
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth       sufficient	pam_rootok.so
+auth       required	pam_console.so
+account    required	pam_permit.so
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 82595c0..f4cb06f 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -15,7 +15,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.10.1
-Release:        8
+Release:        9
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -25,6 +25,7 @@ Patch0:		gnome-applets-2.10.1-use-old-modemlights.patch
 Patch1:		gnome-applets-2.10.1-fix-docs-error.patch
 Patch2:		gnome-applets-2.10.1-use-builtin-apm.patch
 Patch3:		gnome-applets-2.3.6-ppp-command.patch
+Patch4:		gnome-applets-2.10.1-cpufreq.patch
 URL:		http://www.gnome.org/
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -51,6 +52,12 @@ Requires:	gstreamer-plugins >= %{gstreamer_plugins_version}
 # For wireless-applet backwards compat
 Requires:       gnome-netstatus >= 2.8.0-2
 
+# For cpufreq-selector
+Requires:	usermode
+Source10:	cpufreq-selector.app
+Source11:	cpufreq-selector.pam
+
+
 Obsoletes:      battstat_applet
 Obsoletes:      gnome-cpufreq-applet
 
@@ -65,6 +72,7 @@ small utilities for the GNOME panel.
 %patch0 -p1 -b .use-old-modemlights
 %patch1 -p1 -b .fix-docs-error
 %patch2 -p1 -b .use-builtin-apm
+%patch4 -p1 -b .cpufreq
 
 cp gswitchit/gswitchit-applet.png  gswitchit/gswitchit-properties-capplet.png
 
@@ -77,7 +85,7 @@ tar xjf %{SOURCE1}
 autoconf
 %build
 
-%configure
+%configure  --enable-suid=no
 make
 
 %install
@@ -92,6 +100,15 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 # Clean up unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
 
+
+# usermode-ify cpufreq-selector
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_bindir}/cpufreq-selector $RPM_BUILD_ROOT%{_sbindir}
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/cpufreq-selector
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/{pam.d,security/console.apps}
+install -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/cpufreq-selector
+install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cpufreq-selector
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,7 +138,6 @@ fi
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING ChangeLog NEWS README
-
 %{_datadir}/pixmaps
 %{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/gnome-2.0/ui/*
@@ -132,7 +148,10 @@ fi
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*
 %{_libexecdir}/*
+%{_sbindir}/*
 %{_sysconfdir}/gconf/schemas/*
+%{_sysconfdir}/pam.d/*
+%{_sysconfdir}/security/console.apps/*
 %{_sysconfdir}/sound
 
 # These are really devel files, but we don't want a devel package
@@ -141,6 +160,9 @@ fi
 %{_libdir}/pkgconfig/gswitchit.pc
 
 %changelog
+* Fri May 27 2005 Bill Nottingham <notting@redhat.com> 1:2.10.1-9
+- remove setuid bit from cpufreq-selector, usermode-ify it
+
 * Thu May 19 2005 Ray Strode <rstrode@redhat.com> 1:2.10.1-8
 - Install modemlights gconf schema (bug 157764).