Change default user to from hal to haldaemon since people may already useHAL_0_2_1

    login called hal or hald (I know of both). Bump version number to 0.2.1
new file
Use HAL_USER macro instead of the hardcoded hal
group policy segfaults dbus-daemon-1 on 0.20, but works in CVS; Now changed
    so only root can use the AgentManager interface

6 files changed, 162 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index fec5ab9d..05e83193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-30  David Zeuthen  <david@fubar.dk>
+
+	* configure.in: Change default user to from hal to haldaemon since
+	people may already use login called hal or hald (I know of both).
+	Bump version number to 0.2.1
+	
+	* packaging/fedora/hal.spec: new file
+
+	* hald/main.c (main): Use HAL_USER macro instead of the hardcoded hal
+
+	* hal.conf.in: group policy segfaults dbus-daemon-1 on 0.20, but works
+	in CVS; Now changed so only root can use the AgentManager interface
+
 2003-12-29  David Zeuthen  <david@fubar.dk>
 
 	* configure.in: add --with-init-scripts and --with-pid-file. Now
diff --git a/Doxyfile b/Doxyfile
index cff53e92..390e5a9a 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -23,7 +23,7 @@ PROJECT_NAME           = HAL
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.2
+PROJECT_NUMBER         = 0.2.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/configure.in b/configure.in
index 98afc7a9..5f533946 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(hal, 0.2, david@fubar.dk)
-AM_INIT_AUTOMAKE(hal, 0.2)
+AC_INIT(hal, 0.2.1, david@fubar.dk)
+AM_INIT_AUTOMAKE(hal, 0.2.1)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
@@ -33,18 +33,18 @@ AC_SUBST(HWDATA_DIR)
 AC_DEFINE_UNQUOTED(HWDATA_DIR,"$HWDATA_DIR", [Where PCI and USB IDs are found])
 
 
-AC_ARG_WITH(hal_user,[  --with-hal-user=<user>  User for running the HAL daemon (hal)])
+AC_ARG_WITH(hal_user,[  --with-hal-user=<user>  User for running the HAL daemon (haldaemon)])
 if test -z "$with_hal_user" ; then
-    HAL_USER=hal
+    HAL_USER=haldaemon
 else
     HAL_USER=$with_hal_user
 fi
 AC_SUBST(HAL_USER)
 AC_DEFINE_UNQUOTED(HAL_USER,"$HAL_USER", [User for running the HAL daemon])
 
-AC_ARG_WITH(hal_group,[  --with-hal-group=<grp>  Group for HAL (hal)])
+AC_ARG_WITH(hal_group,[  --with-hal-group=<grp>  Group for HAL (haldaemon)])
 if test -z "$with_hal_group" ; then
-    HAL_GROUP=hal
+    HAL_GROUP=haldaemon
 else
     HAL_GROUP=$with_hal_group
 fi
diff --git a/hal.conf.in b/hal.conf.in
index 7af473d0..81577c52 100644
--- a/hal.conf.in
+++ b/hal.conf.in
@@ -26,7 +26,8 @@
   </policy>
 
   <!-- Any user in the @HAL_GROUP@ group can use the AgentManager interface -->
-  <policy group="@HAL_GROUP@">
+  <!-- policy group="@HAL_GROUP@" Doesn't work on dbus 0.20. Works in CVS -->
+  <policy user="root">
     <allow send_interface="org.freedesktop.Hal.AgentManager"
            send_destination="org.freedesktop.Hal"/>
     <allow receive_interface="org.freedesktop.Hal.AgentManager"
diff --git a/hald/main.c b/hald/main.c
index 2eb54f46..52953dd9 100644
--- a/hald/main.c
+++ b/hald/main.c
@@ -1826,7 +1826,7 @@ int main(int argc, char* argv[])
     GMainLoop* loop;
     DBusError dbus_error;
 
-    opt_run_as = "hal";
+    opt_run_as = HAL_USER;
 
     while(1)
     {
diff --git a/packaging/fedora/hal.spec b/packaging/fedora/hal.spec
new file mode 100644
index 00000000..203f8aa2
--- /dev/null
+++ b/packaging/fedora/hal.spec
@@ -0,0 +1,139 @@
+%define expat_version           1.95.5
+%define glib2_version           2.2.0
+%define dbus_version            0.20
+
+Summary: Hardware Abstraction Layer
+Name: hal
+Version: 0.2.1
+Release: 1
+URL: http://www.freedesktop.org/software/hal/
+Source0: %{name}-%{version}.tar.gz
+License: AFL/GPL
+Group: System Environment/Libraries
+BuildRoot: %{_tmppath}/%{name}-root
+PreReq: chkconfig
+Packager: David Zeuthen <david@fubar.dk>
+BuildRequires: expat-devel >= %{expat_version}
+BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: dbus-devel    >= %{dbus_version}
+BuildRequires: python python-devel
+Requires: dbus >= ${dbus_version}
+Requires: dbus-glib >= ${dbus_version}
+Requires: glib2 >= ${glib2_version}
+
+%description
+
+HAL is daemon for collection and maintaining information from several
+sources about the hardware on the system. It provdes a live device
+list through D-BUS.
+
+
+%package gnome
+Summary: GNOME based device manager for HAL
+Group: Development/Libraries
+Requires: %name = %{version}-%{release}
+Requires: dbus-python >= ${dbus_version}
+Requires: pygtk2 >= 2.0.0
+Requires: gnome-python2 >= 2.0.0
+
+%description gnome
+GNOME program for displaying the devices detected by HAL
+
+
+%package devel
+Summary: Libraries and headers for HAL
+Group: Development/Libraries
+Requires: %name = %{version}-%{release}
+
+%description devel
+
+Headers and static libraries for HAL.
+
+
+%prep
+%setup -q
+
+%build
+
+%configure
+make
+
+%install
+make install DESTDIR=$RPM_BUILD_ROOT
+
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%clean
+rm -rf %{buildroot}
+
+%pre
+# Add the "haldaemon" user
+/usr/sbin/useradd -c 'HAL daemon' \
+	-s /sbin/nologin -r -d '/' haldaemon 2> /dev/null || :
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add haldaemon
+
+%preun
+if [ $1 = 0 ]; then
+    service haldaemon stop > /dev/null 2>&1
+    /sbin/chkconfig --del haldaemon
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+  service haldaemon condrestart > /dev/null 2>&1
+fi
+
+%files
+%defattr(-,root,root)
+
+%doc COPYING ChangeLog NEWS
+
+%dir %{_sysconfdir}/dbus-1/system.d
+%config %{_sysconfdir}/dbus-1/system.d/hal.conf
+%config %{_sysconfdir}/rc.d/init.d/*
+
+%{_sbindir}/hald
+
+%{_bindir}/lshal
+%{_bindir}/hal-get-property
+%{_bindir}/hal-set-property
+
+%{_libdir}/*hal*.so.*
+
+%{_libexecdir}/hal.hotplug
+/etc/hotplug.d/default/hal.hotplug
+
+%dir %{_datadir}/hal
+%dir %{_datadir}/hal/fdi
+%{_datadir}/hal/fdi/*
+
+
+
+%files devel
+%defattr(-,root,root)
+
+%{_libdir}/lib*.a
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+
+
+
+%files gnome
+%defattr(-,root,root)
+
+%dir %{_datadir}/hal/device-manager
+%{_datadir}/hal/device-manager/*
+%{_bindir}/hal-device-manager
+
+
+
+
+%changelog
+* Tue Dec 30 2003 David Zeuthen <david@fubar.dk> 0.2.1-1
+- initial build
+