Author: arekm Date: Fri Dec 11 07:48:03 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; fix hald-probe-input segfaults
---- Files affected: packages/hal: hal.spec (1.175 -> 1.176) , hal-out.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/hal/hal.spec diff -u packages/hal/hal.spec:1.175 packages/hal/hal.spec:1.176 --- packages/hal/hal.spec:1.175 Tue Dec 1 10:20:23 2009 +++ packages/hal/hal.spec Fri Dec 11 08:47:57 2009 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): HAL - abstrakcyjna warstwa dostępu do sprzętu Name: hal Version: 0.5.14 -Release: 1 +Release: 2 License: AFL v2.0 or GPL v2 Group: Libraries Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz @@ -21,6 +21,7 @@ Patch3: %{name}-rethink.patch Patch4: %{name}-showexec.patch Patch5: %{name}-x11-zap.patch +Patch6: %{name}-out.patch URL: http://freedesktop.org/Software/hal BuildRequires: PolicyKit-devel >= 0.7 BuildRequires: autoconf >= 2.60 @@ -142,6 +143,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build %{__libtoolize} @@ -295,6 +297,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.176 2009/12/11 07:47:57 arekm +- rel 2; fix hald-probe-input segfaults + Revision 1.175 2009/12/01 09:20:23 patrys - 0.5.14 ================================================================ Index: packages/hal/hal-out.patch diff -u /dev/null packages/hal/hal-out.patch:1.1 --- /dev/null Fri Dec 11 08:48:04 2009 +++ packages/hal/hal-out.patch Fri Dec 11 08:47:57 2009 @@ -0,0 +1,37 @@ +--- hal-0.5.14/hald/linux/probing/probe-input.c~ 2009-08-24 14:42:30.000000000 +0200 ++++ hal-0.5.14/hald/linux/probing/probe-input.c 2009-12-11 08:46:10.518267420 +0100 +@@ -73,7 +73,7 @@ + + button_type = getenv ("HAL_PROP_BUTTON_TYPE"); + if (button_type == NULL) +- goto out; ++ goto out_end; + + if (strcmp (button_type, "lid") == 0) + sw = SW_LID; +@@ -86,15 +86,15 @@ + sw = SW_RADIO; + #endif + else +- goto out; ++ goto out_end; + + device_file = getenv ("HAL_PROP_INPUT_DEVICE"); + if (device_file == NULL) +- goto out; ++ goto out_end; + + udi = getenv ("UDI"); + if (udi == NULL) +- goto out; ++ goto out_end; + + dbus_error_init (&error); + if ((ctx = libhal_ctx_init_direct (&error)) == NULL) +@@ -129,5 +129,6 @@ + libhal_ctx_free (ctx); + } + ++out_end: + return ret; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hal/hal.spec?r1=1.175&r2=1.176&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
