Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit hal
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 06 Mar 2007 09:06:40 +0100
  • Message-id: <20070306080641.40ECE67817E@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package hal
checked in at Tue Mar 6 09:06:40 CET 2007.

--------
--- hal/hal.changes 2007-02-28 14:52:36.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2007-03-05 23:23:41.045442000 +0100
@@ -1,0 +2,35 @@
+Mon Mar 5 22:32:44 CET 2007 - dkukawka@xxxxxxx
+
+- updated to current git HEAD and included hal-info, install
+ also NEWS/COPYING/Changelog ...
+- removed upstream gone patches:
+ * hal-configure.diff
+ * hal-fix_blockdev_g_assert.diff
+ * hal-fix-consider-nice-logic_223517.diff
+ * hal-fix-cpufreq-add-capability.diff
+ * hal-fix-dbus_error_is_set.diff
+ * hal-fix-lcd_brightness_sonypi.diff
+ * hal-fix-luks_do_not_sanitize_password.diff
+ * hal-fix-merge-copy_property.diff
+ * hal-fix-missformated_dbus_error.diff
+ * hal-fix-mount_options.diff
+ * hal-fix-mountpoint-hal_mtab_nonASCII.diff
+ * hal-fix-path_eject_binary.diff
+ * hal-fix-segfault_in_xenCode.diff
+ * hal-fix-wireless_detection_rt2500pci.diff
+ * hal-add-pm-utils-support.diff
+ * hal-add-alsa_hw-specific_devices.diff
+- removed no longer needed patches (wasn't used in 10.2):
+ * hal-toport-mount_159475.diff
+ * hal-toport-mount_device_fstab_with_user_option_172870.diff
+- updated patches:
+ * hal-add-tabletPC_support.diff
+ * hal-add-standby-support.diff
+- added new patches:
+ * hal-fix-compiler_warning_create_cache.diff
+ * hal-fix-compiler_warning_dell-addon.diff
+ * hal-fix-compiler_warning_libhal.diff
+ * hal-fix-compiler_warning_storage-cleanup-mountpoint.diff
+ * hal-fix-compiler_warning_UID_data_type.diff
+
+-------------------------------------------------------------------

Old:
----
hal-0.5.8_git20061106.tar.bz2
hal-add-alsa_hw-specific_devices.diff
hal-add-pm-utils-support.diff
hal-configure.diff
hal-fix_blockdev_g_assert.diff
hal-fix-consider-nice-logic_223517.diff
hal-fix-cpufreq-add-capability.diff
hal-fix-dbus_error_is_set.diff
hal-fix-lcd_brightness_sonypi.diff
hal-fix-luks_do_not_sanitize_password.diff
hal-fix-merge-copy_property.diff
hal-fix-missformated_dbus_error.diff
hal-fix-mount_options.diff
hal-fix-mountpoint-hal_mtab_nonASCII.diff
hal-fix-path_eject_binary.diff
hal-fix-segfault_in_xenCode.diff
hal-fix-wireless_detection_rt2500pci.diff
hal-toport-mount_159475.diff
hal-toport-mount_device_fstab_with_user_option_172870.diff

New:
----
hal-0.5.8_git20070305.tar.bz2
hal-fix-compiler_warning_create_cache.diff
hal-fix-compiler_warning_dell-addon.diff
hal-fix-compiler_warning_libhal.diff
hal-fix-compiler_warning_storage-cleanup-mountpoint.diff
hal-fix-compiler_warning_UID_data_type.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.nG9488/_old 2007-03-06 09:06:21.000000000 +0100
+++ /var/tmp/diff_new_pack.nG9488/_new 2007-03-06 09:06:21.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.8_git20061106)
+# spec file for package hal (Version 0.5.8_git20070305)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,66 +11,52 @@
# norootforbuild

Name: hal
-BuildRequires: PolicyKit dbus-1-glib-devel docbook-utils doxygen glib2-devel gtkdoc html-dtd intltool libusb libvolume_id-devel pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+%ifarch %ix86 x86_64
+BuildRequires: PolicyKit dbus-1-glib-devel docbook-utils doxygen glib2-devel gtkdoc html-dtd intltool libsmbios libsmbios-devel libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+%else
+BuildRequires: PolicyKit dbus-1-glib-devel docbook-utils doxygen glib2-devel gtkdoc html-dtd intltool libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+%endif
Requires: pm-utils
URL: http://freedesktop.org/Software/hal
%define dbus_version 0.61
%define dbus_release 1
License: Other uncritical OpenSource License
Group: System/Daemons
-Version: 0.5.8_git20061106
-Release: 38
+Version: 0.5.8_git20070305
+Release: 1
Autoreqprov: on
Summary: Daemon for Collecting Hardware Information
# SUSE specific patches
Patch0: %{name}-add-tabletPC_support.diff
-Patch1: %{name}-fix-mount_options.diff
-Patch2: %{name}-panasonic-acpi-suse.diff
-Patch3: %{name}-allow_uid_for_ntfs.diff
-Patch4: %{name}-fix-storage-policy-fixed-drives.diff
+Patch1: %{name}-panasonic-acpi-suse.diff
+Patch2: %{name}-allow_uid_for_ntfs.diff
+Patch3: %{name}-fix-storage-policy-fixed-drives.diff
# SUSE specific temporary patches
-Patch10: hal-fix-path_eject_binary.diff
-Patch11: hal-revert-git-multisession.diff
+Patch10: hal-revert-git-multisession.diff
+Patch11: hal-add-standby-support.diff
#
# submitted (or planed to do in next time) upstream patches
-Patch100: hal-performance_pci.ids_v5.diff
-Patch101: hal-add-standby-support.diff
-Patch102: hal-fix-util_compute_time_remaining_warning_highTime.diff
-Patch103: hal-fix-power-privileges.diff
-Patch104: hal-pci.diff
-Patch105: hal-add-pm-utils-support.diff
-Patch106: hal-configure.diff
-Patch107: hal-fix-wireless_detection_rt2500pci.diff
-Patch108: hal-fix-cpufreq-add-capability.diff
-Patch109: hal-fix-dbus_error_is_set.diff
-Patch110: hal-add-alsa_hw-specific_devices.diff
-Patch111: hal-fix_blockdev_g_assert.diff
-Patch112: hal-fix-merge-copy_property.diff
-Patch113: hal-fix-segfault_in_xenCode.diff
-Patch114: hal-fix-luks_do_not_sanitize_password.diff
-Patch115: hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
-Patch116: hal-fix-consider-nice-logic_223517.diff
-Patch117: hal-fix-lcd_brightness_sonypi.diff
-Patch118: hal-fix-mountpoint-hal_mtab_nonASCII.diff
-Patch119: hal-fix-missformated_dbus_error.diff
+Patch100: hal-fix-util_compute_time_remaining_warning_highTime.diff
+Patch101: hal-fix-power-privileges.diff
+Patch102: hal-pci.diff
+Patch103: hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
+Patch104: hal-fix-compiler_warning_dell-addon.diff
+Patch105: hal-fix-compiler_warning_storage-cleanup-mountpoint.diff
+Patch106: hal-fix-compiler_warning_libhal.diff
+Patch107: hal-fix-compiler_warning_create_cache.diff
+Patch108: hal-fix-compiler_warning_UID_data_type.diff
#
-# patches for testing:
-#Patch300:
-##
-## external patches from HAL List and backports patches we need to port or to check
-# unclear how to fix this atm
-Patch400: %{name}-toport-mount_159475.diff
-# Kay Sievers is working on a integration in the hal mount binary
-Patch401: %{name}-toport-mount_device_fstab_with_user_option_172870.diff
+# need to backport
+Patch400: hal-performance_pci.ids_v5.diff
# Sources:
Source0: %{name}-%{version}.tar.bz2
-Source1: rc.hal
-Source2: 90-hal.rules
+SOurce1: hal-info-20070305.tar.bz2
+Source2: rc.hal
+Source3: 90-hal.rules
Prereq: /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs
-%ifarch %ix86 x86_64 ia64
-Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils, pmtools
-%else
Requires: dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils
+%ifarch %ix86 x86_64 ia64
+Requires: pmtools, libsmbios-libs >= 0.12.4
%endif
Provides: hotplugctl
Obsoletes: hotplugctl
@@ -149,39 +135,32 @@
David Zeuthen <david@xxxxxxxx>

%prep
-%setup -n %{name}-%{version} -q
+%setup -n . -T -D
+rm -rf $RPM_BUILD_DIR/*
+for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
+pushd %{name}-%{version}
%patch0 -p1
+%patch1 -p0
+%patch2 -p1
+%patch3 -p0
+%patch10 -p1
+%patch11 -p0
%patch100 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p1
-%patch4 -p0
-%patch101
-%patch102 -p1
+%patch101 -p1
+%patch102 -p0
%patch103 -p1
-%patch104
-%patch105
-%patch106
-%patch10 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
%patch107 -p1
-%patch108 -p0
-%patch109 -p1
-%patch110 -p1
-%patch111 -p1
-%patch112 -p1
-%patch113 -p1
-%patch114 -p1
-%patch11 -p1
-%patch115 -p1
-%patch116 -p0
-%patch117 -p0
-%patch118 -p1
-%patch119 -p0
-#%patch300 -p1
+%patch108 -p1
+popd
+#%patch400 -p1

%build
export CFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
export CXXFLAGS="${RPM_OPT_FLAGS} -fstack-protector"
+pushd %{name}-%{version}
autoreconf -fi
./configure \
--prefix=%{_prefix} \
@@ -204,12 +183,28 @@
--enable-acpi-acpid \
--disable-acpi-proc \
--disable-gtk-doc \
+ --enable-parted \
+ --enable-policy-kit \
--enable-docbook-docs \
--enable-doxygen-docs
make
+popd
+pushd hal-info-*
+./configure \
+ --prefix=%{_prefix} \
+ --sysconfdir=%{_sysconfdir} \
+ --disable-recall

%install
+#install hal
+pushd %{name}-%{version}
+make DESTDIR=$RPM_BUILD_ROOT install
+install -m 644 {README,AUTHORS,ChangeLog,COPYING,INSTALL,NEWS} $RPM_BUILD_ROOT/%{_datadir}/doc/packages/hal
+popd
+#install hal-info
+pushd hal-info-*
make DESTDIR=$RPM_BUILD_ROOT install
+popd
mkdir -p $RPM_BUILD_ROOT/etc/hal
mkdir -p $RPM_BUILD_ROOT/etc/dbus-1/system.d
mkdir -p $RPM_BUILD_ROOT/etc/init.d
@@ -217,11 +212,12 @@
mkdir -p $RPM_BUILD_ROOT/usr/sbin
mkdir -p $RPM_BUILD_ROOT/usr/share/hal/device-manager
mkdir -p $RPM_BUILD_ROOT/usr/share/hal/scripts
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/haldaemon
-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/90-hal.rules
+install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/haldaemon
+install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/90-hal.rules
ln -sf %{_sysconfdir}/init.d/haldaemon $RPM_BUILD_ROOT/%{_sbindir}/rchal
#rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
install -d $RPM_BUILD_ROOT/%{_localstatedir}/run/hal
+install -d $RPM_BUILD_ROOT/%{_localstatedir}/cache/hald
rm -f $RPM_BUILD_ROOT/etc/hotplug.d/default/20-hal.hotplug

%clean
@@ -259,7 +255,7 @@
%config %{_sysconfdir}/dbus-1/system.d/hal.conf
%{_sysconfdir}/hal/*
%{_sysconfdir}/udev/rules.d/90-hal.rules
-%{_sysconfdir}//PolicyKit/privilege.d/*
+%{_sysconfdir}/PolicyKit/privilege.d/*
%{_bindir}/lshal
%{_bindir}/hal-*-property
%{_bindir}/hal-device
@@ -267,12 +263,12 @@
%{_datadir}/hal/fdi/*
%{_libexecdir}/hal/*
%{_datadir}/locale/*/LC_MESSAGES/hal.mo
-%{_datadir}/doc/packages/hal/conf/*
-%{_datadir}/doc/packages/hal/spec/*
+%{_datadir}/doc/packages/hal/*
%{_libdir}/*hal*.so.*
%{_sbindir}/hal*
%{_sbindir}/rchal
%attr(-,haldaemon,haldaemon) %{_localstatedir}/run/hal
+%attr(-,haldaemon,haldaemon) %{_localstatedir}/cache/hald

%files -n hal-devel
%defattr(-, root, root)
@@ -291,6 +287,38 @@
%{_bindir}/hal-device-manager

%changelog
+* Mon Mar 05 2007 - dkukawka@xxxxxxx
+- updated to current git HEAD and included hal-info, install
+ also NEWS/COPYING/Changelog ...
+- removed upstream gone patches:
+ * hal-configure.diff
+ * hal-fix_blockdev_g_assert.diff
+ * hal-fix-consider-nice-logic_223517.diff
+ * hal-fix-cpufreq-add-capability.diff
+ * hal-fix-dbus_error_is_set.diff
+ * hal-fix-lcd_brightness_sonypi.diff
+ * hal-fix-luks_do_not_sanitize_password.diff
+ * hal-fix-merge-copy_property.diff
+ * hal-fix-missformated_dbus_error.diff
+ * hal-fix-mount_options.diff
+ * hal-fix-mountpoint-hal_mtab_nonASCII.diff
+ * hal-fix-path_eject_binary.diff
+ * hal-fix-segfault_in_xenCode.diff
+ * hal-fix-wireless_detection_rt2500pci.diff
+ * hal-add-pm-utils-support.diff
+ * hal-add-alsa_hw-specific_devices.diff
+- removed no longer needed patches (wasn't used in 10.2):
+ * hal-toport-mount_159475.diff
+ * hal-toport-mount_device_fstab_with_user_option_172870.diff
+- updated patches:
+ * hal-add-tabletPC_support.diff
+ * hal-add-standby-support.diff
+- added new patches:
+ * hal-fix-compiler_warning_create_cache.diff
+ * hal-fix-compiler_warning_dell-addon.diff
+ * hal-fix-compiler_warning_libhal.diff
+ * hal-fix-compiler_warning_storage-cleanup-mountpoint.diff
+ * hal-fix-compiler_warning_UID_data_type.diff
* Wed Feb 28 2007 - dkukawka@xxxxxxx
- fixed bugs:
- b.n.c #249757: remove useless debug putput from marcro to


++++++ hal-0.5.8_git20061106.tar.bz2 -> hal-0.5.8_git20070305.tar.bz2 ++++++
++++ 109961 lines of diff (skipped)

++++++ hal-add-standby-support.diff ++++++
--- /var/tmp/diff_new_pack.nG9488/_old 2007-03-06 09:06:25.000000000 +0100
+++ /var/tmp/diff_new_pack.nG9488/_new 2007-03-06 09:06:25.000000000 +0100
@@ -2,7 +2,7 @@
================================================================================
--- doc/spec/hal-spec-properties.xml
+++ doc/spec/hal-spec-properties.xml
-@@ -5396,7 +5396,7 @@
+@@ -5650,7 +5650,7 @@
<entry></entry>
<entry>Yes</entry>
<entry>
@@ -11,7 +11,7 @@
NB. This may not mean the machine is able to suspend
successfully.
</entry>
-@@ -5408,19 +5408,31 @@
+@@ -5662,13 +5662,25 @@
<entry></entry>
<entry>Yes</entry>
<entry>
@@ -26,34 +26,18 @@
+ <literal>power_management.can_standby</literal> (bool)
+ </entry>
+ <entry></entry>
-+ <entry>Yes</entry>
++ <entry>No</entry>
+ <entry>
+ If standby (S1) support is compiled into the kernel.
+ NB. This may not mean the machine is able to standby
+ successfully.
-+ </entry>
++ </entry>
+ </row>
+ <row>
+ <entry>
- <literal>power_management.can_suspend_to_ram</literal> (bool)
+ <literal>power_management.is_powersave_set</literal> (bool)
</entry>
- <entry></entry>
- <entry>No</entry>
- <entry>
-- If suspend support is compiled into the kernel.
-+ If suspend (S3) support is compiled into the kernel.
- NB. This may not mean the machine is able to suspend
- successfully.
- WARNING: This key is depreciated and power_management.can_suspend
-@@ -5434,7 +5446,7 @@
- <entry></entry>
- <entry>No</entry>
- <entry>
-- If hibernation support is compiled into the kernel.
-+ If hibernation (S4) support is compiled into the kernel.
- NB. This may not mean the machine is able to hibernate
- successfully.
- WARNING: This key is depreciated and power_management.can_hibernate
+ <entry/>
--- fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+++ fdi/policy/10osvendor/10-power-mgmt-policy.fdi
@@ -36,6 +36,11 @@

++++++ hal-add-tabletPC_support.diff ++++++
--- /var/tmp/diff_new_pack.nG9488/_old 2007-03-06 09:06:25.000000000 +0100
+++ /var/tmp/diff_new_pack.nG9488/_new 2007-03-06 09:06:25.000000000 +0100
@@ -12,11 +12,11 @@
tools/hal-system-setserial.c | 107 ++++++++++++++++++++++++
6 files changed, 178 insertions(+), 3 deletions(-)

-diff --git a/fdi/information/10freedesktop/10-tabletPCs.fdi b/fdi/information/10freedesktop/10-tabletPCs.fdi
+diff --git a/fdi/policy/10osvendor/10-tabletPCs.fdi b/fdi/policy/10osvendor/10-tabletPCs.fdi
new file mode 100644
index 0000000..d653721
--- /dev/null
-+++ b/fdi/information/10freedesktop/10-tabletPCs.fdi
++++ b/fdi/policy/10osvendor/10-tabletPCs.fdi
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
@@ -42,20 +42,17 @@
+ </device>
+
+</deviceinfo>
-diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
-index 031e1e5..5aa4c55 100644
---- a/fdi/information/10freedesktop/Makefile.am
-+++ b/fdi/information/10freedesktop/Makefile.am
-@@ -7,7 +7,8 @@ dist_fdi_DATA = 10-usb-card-readers.fdi
- 10-wireless-mice.fdi \
- 10-camera-ptp.fdi \
- 10-usb-pda.fdi \
-- 10-cd-dvd-burner.fdi
-+ 10-cd-dvd-burner.fdi \
-+ 10-tabletPCs.fdi
+diff --git a/fdi/policy/10osvendor/Makefile.am b/fdi/policy/10osvendor/Makefile.am
+--- a/fdi/policy/10osvendor/Makefile.am 2007-03-05 14:34:37.000000000 +0100
++++ b/fdi/policy/10osvendor/Makefile.am 2007-03-05 14:35:03.000000000 +0100
+@@ -7,6 +7,7 @@
+ 10-toshiba-buttons.fdi \
+ 10-bluetooth-switch.fdi \
+ 10-laptop-panel-mgmt-policy.fdi \
++ 10-tabletPCs.fdi \
+ 15-storage-luks.fdi \
+ 20-storage-methods.fdi

- check:
- for f in $(dist_fdi_DATA); do \
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 9f1a86a..6ffe7c6 100644
--- a/hald/linux/device.c
@@ -127,33 +124,26 @@
index 7d84238..887afe9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
-@@ -1,6 +1,5 @@
- ## Process this file with automake to produce Makefile.in
-
--
- SUBDIRS = device-manager
-
- if HALD_COMPILE_LINUX
-@@ -55,7 +54,8 @@ libexec_PROGRAMS =
+@@ -55,7 +55,8 @@
hal-storage-eject \
+ hal-storage-closetray \
hal-storage-cleanup-mountpoint \
- hal-storage-cleanup-all-mountpoints \
-- hal-system-power-pmu
-+ hal-system-power-pmu \
+- hal-storage-cleanup-all-mountpoints
++ hal-storage-cleanup-all-mountpoints \
+ hal-system-setserial

- hal_storage_mount_SOURCES = hal-storage-mount.c hal-storage-shared.c hal-storage-shared.h
- hal_storage_mount_LDADD = @GLIB_LIBS@ @POLKIT_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/libhal-storage/libhal-storage.la
-@@ -75,6 +75,9 @@ hal_storage_cleanup_all_mountpoints_LDAD
- hal_system_power_pmu_SOURCES = hal-system-power-pmu.c
- hal_system_power_pmu_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
+ if HAVE_PMU
+ libexec_PROGRAMS += \
+@@ -94,6 +95,9 @@
+ hal_storage_cleanup_all_mountpoints_SOURCES = hal-storage-cleanup-all-mountpoints.c hal-storage-shared.c hal-storage-shared.h
+ hal_storage_cleanup_all_mountpoints_LDADD = @GLIB_LIBS@ @POLKIT_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/libhal-storage/libhal-storage.la

+hal_system_setserial_SOURCES = hal-system-setserial.c
+hal_system_setserial_LDADD = -lpopt @GLIB_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
+
- scriptdir = $(libdir)/hal/scripts
-
- script_SCRIPTS = \
+ if HAVE_PMU
+ hal_system_power_pmu_SOURCES = hal-system-power-pmu.c
+ hal_system_power_pmu_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
diff --git a/tools/hal-system-setserial.c b/tools/hal-system-setserial.c
new file mode 100644
index 0000000..6cac923

++++++ hal-fix-compiler_warning_create_cache.diff ++++++
diff --git a/hald/create_cache.c b/hald/create_cache.c
index 84dabae..f4fccbf 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -238,7 +238,7 @@ static void store_value(struct fdi_context *fdi_ctx, const char *value, size_t v
p = malloc(value_len + 1);

if(!p)
- DIE(("Could not allocate %d bytes", value_len + 1));
+ DIE(("Could not allocate %lu bytes", (long unsigned) value_len + 1));

memcpy(p, value, value_len);
p[value_len] = '\0';
++++++ hal-fix-compiler_warning_dell-addon.diff ++++++
diff --git a/hald/linux/addons/addon-dell-backlight.cpp b/hald/linux/addons/addon-dell-backlight.cpp
index 946e09b..39a73b6 100644
--- a/hald/linux/addons/addon-dell-backlight.cpp
+++ b/hald/linux/addons/addon-dell-backlight.cpp
@@ -144,7 +144,7 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
&err,
DBUS_TYPE_INT32, &brightness,
DBUS_TYPE_INVALID)) {
- if (brightness < minValue || brightness > maxValue) {
+ if (brightness < (int) minValue || brightness > (int) maxValue) {
reply = dbus_message_new_error (message,
"org.freedesktop.Hal.Device.LaptopPanel.Invalid",
"Brightness level is invalid");
@@ -178,9 +178,9 @@ filter_function (DBusConnection *connection, DBusMessage *message, void *userdat
DBUS_TYPE_INVALID)) {
int brightness = read_backlight (AC);

- if (brightness < minValue)
+ if (brightness < (int) minValue)
brightness = minValue;
- else if (brightness > maxValue)
+ else if (brightness > (int) maxValue)
brightness = maxValue;

reply = dbus_message_new_method_return (message);
++++++ hal-fix-compiler_warning_libhal.diff ++++++
diff --git a/libhal/libhal.c b/libhal/libhal.c
index 89c8a93..f40d6a4 100644
--- a/libhal/libhal.c
+++ b/libhal/libhal.c
@@ -2877,8 +2877,8 @@ libhal_ctx_new (void)
ctx = calloc (1, sizeof (LibHalContext));
if (ctx == NULL) {
fprintf (stderr,
- "%s %d : Failed to allocate %d bytes\n",
- __FILE__, __LINE__, sizeof (LibHalContext));
+ "%s %d : Failed to allocate %lu bytes\n",
+ __FILE__, __LINE__, (unsigned long) sizeof (LibHalContext));
return NULL;
}

++++++ hal-fix-compiler_warning_storage-cleanup-mountpoint.diff ++++++
diff --git a/tools/hal-storage-cleanup-mountpoint.c b/tools/hal-storage-cleanup-mountpoint.c
index 4c3b317..3a54b87 100644
--- a/tools/hal-storage-cleanup-mountpoint.c
+++ b/tools/hal-storage-cleanup-mountpoint.c
@@ -154,7 +154,7 @@ do_cleanup (const char *mount_point)

g_strfreev (lines);

- printf ("removing directory", mount_point);
+ printf ("removing directory: %s", mount_point);

/* remove directory */
if (g_rmdir (mount_point) != 0) {
++++++ hal-fix-compiler_warning_UID_data_type.diff ++++++
diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index dccadc4..7627e2b 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -931,7 +931,7 @@ device_get_all_properties (DBusConnection * connection,
}

typedef struct {
- uid_t uid; /* uid of caller */
+ unsigned long uid; /* uid of caller */
#ifdef HAVE_CONKIT
pid_t pid; /* process ID of caller */
gboolean in_active_session; /* caller is in an active session */
@@ -1059,7 +1059,7 @@ ci_tracker_get_info (const char *system_bus_unique_name)

dbus_error_init (&error);
ci->uid = dbus_bus_get_unix_user (dbus_connection, system_bus_unique_name, &error);
- if (ci->uid == (unsigned long) -1 || dbus_error_is_set (&error)) {
+ if (ci->uid == ((unsigned long) -1) || dbus_error_is_set (&error)) {
HAL_WARNING (("Could not get uid for connection: %s %s", error.name, error.message));
dbus_error_free (&error);
goto error;
@@ -3385,7 +3385,7 @@ hald_exec_method (HalDevice *d, CallerInfo *ci, DBusConnection *connection, dbus
}
#endif /* HAVE_CONKIT */

- sprintf (uid_export, "HAL_METHOD_INVOKED_BY_UID=%d", ci->uid);
+ sprintf (uid_export, "HAL_METHOD_INVOKED_BY_UID=%lu", ci->uid);
extra_env[0] = uid_export;
snprintf (sender_export, sizeof (sender_export),
"HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME=%s", dbus_message_get_sender (message));


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >