[Pkg-utopia-commits] r507 - packages/experimental/hal/debian/patches
Sjoerd Simons
sjoerd at costa.debian.org
Thu Jan 19 22:09:25 UTC 2006
Author: sjoerd
Date: 2006-01-19 22:09:25 +0000 (Thu, 19 Jan 2006)
New Revision: 507
Modified:
packages/experimental/hal/debian/patches/01_hal_privsep.patch
Log:
Update the patch to fix some issues
Modified: packages/experimental/hal/debian/patches/01_hal_privsep.patch
===================================================================
--- packages/experimental/hal/debian/patches/01_hal_privsep.patch 2006-01-19 22:01:04 UTC (rev 506)
+++ packages/experimental/hal/debian/patches/01_hal_privsep.patch 2006-01-19 22:09:25 UTC (rev 507)
@@ -1,6 +1,6 @@
diff -ruN hal-0.5.6-old/Makefile.am hal-0.5.6/Makefile.am
--- hal-0.5.6-old/Makefile.am 2005-08-26 22:27:21.000000000 +0200
-+++ hal-0.5.6/Makefile.am 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/Makefile.am 2006-01-19 23:05:42.000000000 +0100
@@ -1,7 +1,7 @@
## Process this file with automake to produce Makefile.in
@@ -13,7 +13,7 @@
pkgconfig_DATA = hal.pc hal-storage.pc
diff -ruN hal-0.5.6-old/Makefile.in hal-0.5.6/Makefile.in
--- hal-0.5.6-old/Makefile.in 2006-01-17 02:07:51.000000000 +0100
-+++ hal-0.5.6/Makefile.in 2006-01-17 22:24:43.000000000 +0100
++++ hal-0.5.6/Makefile.in 2006-01-19 23:07:05.000000000 +0100
@@ -295,8 +295,8 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@ -27,7 +27,7 @@
pkgconfig_DATA = hal.pc hal-storage.pc
diff -ruN hal-0.5.6-old/configure hal-0.5.6/configure
--- hal-0.5.6-old/configure 2006-01-17 01:26:24.000000000 +0100
-+++ hal-0.5.6/configure 2006-01-17 22:24:58.000000000 +0100
++++ hal-0.5.6/configure 2006-01-19 23:07:11.000000000 +0100
@@ -1201,7 +1201,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
@@ -1033,7 +1033,7 @@
sed "$ac_vpsub
diff -ruN hal-0.5.6-old/configure.in hal-0.5.6/configure.in
--- hal-0.5.6-old/configure.in 2006-01-17 01:25:32.000000000 +0100
-+++ hal-0.5.6/configure.in 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/configure.in 2006-01-19 23:05:42.000000000 +0100
@@ -486,6 +486,7 @@
hald/linux2/addons/Makefile
hald/solaris/Makefile
@@ -1044,7 +1044,7 @@
tools/Makefile
diff -ruN hal-0.5.6-old/hald/Makefile.am hal-0.5.6/hald/Makefile.am
--- hal-0.5.6-old/hald/Makefile.am 2005-12-08 19:23:23.000000000 +0100
-+++ hal-0.5.6/hald/Makefile.am 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/Makefile.am 2006-01-19 23:05:42.000000000 +0100
@@ -40,6 +40,7 @@
hald_SOURCES = \
hald_marshal.h hald_marshal.c \
@@ -1055,7 +1055,7 @@
device_store.h device_store.c \
diff -ruN hal-0.5.6-old/hald/Makefile.in hal-0.5.6/hald/Makefile.in
--- hal-0.5.6-old/hald/Makefile.in 2006-01-17 02:07:48.000000000 +0100
-+++ hal-0.5.6/hald/Makefile.in 2006-01-17 22:24:36.000000000 +0100
++++ hal-0.5.6/hald/Makefile.in 2006-01-19 23:06:58.000000000 +0100
@@ -53,9 +53,9 @@
sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(sbin_PROGRAMS)
@@ -1087,7 +1087,7 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/util.Po at am__quote@
diff -ruN hal-0.5.6-old/hald/hald.c hal-0.5.6/hald/hald.c
--- hal-0.5.6-old/hald/hald.c 2006-01-13 03:24:10.000000000 +0100
-+++ hal-0.5.6/hald/hald.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/hald.c 2006-01-19 23:05:42.000000000 +0100
@@ -55,6 +55,7 @@
#include "osspec.h"
#include "hald_dbus.h"
@@ -1246,7 +1246,7 @@
diff -ruN hal-0.5.6-old/hald/hald_dbus.c hal-0.5.6/hald/hald_dbus.c
--- hal-0.5.6-old/hald/hald_dbus.c 2006-01-13 03:24:10.000000000 +0100
-+++ hal-0.5.6/hald/hald_dbus.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/hald_dbus.c 2006-01-19 23:05:42.000000000 +0100
@@ -46,6 +46,7 @@
#include "logger.h"
#include "osspec.h"
@@ -1387,7 +1387,7 @@
diff -ruN hal-0.5.6-old/hald/hald_dbus.h hal-0.5.6/hald/hald_dbus.h
--- hal-0.5.6-old/hald/hald_dbus.h 2005-11-02 16:38:13.000000000 +0100
-+++ hal-0.5.6/hald/hald_dbus.h 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/hald_dbus.h 2006-01-19 23:05:42.000000000 +0100
@@ -94,6 +94,4 @@
DBusHandlerResult hald_dbus_filter_function (DBusConnection * connection, DBusMessage * message, void *user_data);
@@ -1397,7 +1397,7 @@
#endif /* HAL_DBUS_H */
diff -ruN hal-0.5.6-old/hald/hald_runner.c hal-0.5.6/hald/hald_runner.c
--- hal-0.5.6-old/hald/hald_runner.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald/hald_runner.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/hald_runner.c 2006-01-19 23:05:42.000000000 +0100
@@ -0,0 +1,419 @@
+/***************************************************************************
+ * CVSID: $Id$
@@ -1820,7 +1820,7 @@
+}
diff -ruN hal-0.5.6-old/hald/hald_runner.h hal-0.5.6/hald/hald_runner.h
--- hal-0.5.6-old/hald/hald_runner.h 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald/hald_runner.h 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/hald_runner.h 2006-01-19 23:05:42.000000000 +0100
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *
@@ -1899,7 +1899,7 @@
+#endif
diff -ruN hal-0.5.6-old/hald/linux2/blockdev.c hal-0.5.6/hald/linux2/blockdev.c
--- hal-0.5.6-old/hald/linux2/blockdev.c 2006-01-08 18:58:02.000000000 +0100
-+++ hal-0.5.6/hald/linux2/blockdev.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/linux2/blockdev.c 2006-01-19 23:05:42.000000000 +0100
@@ -60,6 +60,7 @@
#include "../device_info.h"
#include "../hald_dbus.h"
@@ -2040,7 +2040,7 @@
out:
diff -ruN hal-0.5.6-old/hald/linux2/classdev.c hal-0.5.6/hald/linux2/classdev.c
--- hal-0.5.6-old/hald/linux2/classdev.c 2006-01-17 01:25:34.000000000 +0100
-+++ hal-0.5.6/hald/linux2/classdev.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/linux2/classdev.c 2006-01-19 23:05:42.000000000 +0100
@@ -65,6 +65,7 @@
#include "../device_info.h"
#include "../device_store.h"
@@ -2105,7 +2105,7 @@
void
diff -ruN hal-0.5.6-old/hald/linux2/osspec.c hal-0.5.6/hald/linux2/osspec.c
--- hal-0.5.6-old/hald/linux2/osspec.c 2006-01-13 03:24:10.000000000 +0100
-+++ hal-0.5.6/hald/linux2/osspec.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/linux2/osspec.c 2006-01-19 23:05:42.000000000 +0100
@@ -66,6 +66,7 @@
#include "../logger.h"
#include "../hald.h"
@@ -2153,7 +2153,7 @@
DBusHandlerResult
diff -ruN hal-0.5.6-old/hald/util.c hal-0.5.6/hald/util.c
--- hal-0.5.6-old/hald/util.c 2005-12-08 19:23:23.000000000 +0100
-+++ hal-0.5.6/hald/util.c 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/util.c 2006-01-19 23:05:42.000000000 +0100
@@ -50,6 +50,7 @@
#include "hald_dbus.h"
@@ -2467,7 +2467,7 @@
{
diff -ruN hal-0.5.6-old/hald/util.h hal-0.5.6/hald/util.h
--- hal-0.5.6-old/hald/util.h 2005-11-14 17:16:03.000000000 +0100
-+++ hal-0.5.6/hald/util.h 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald/util.h 2006-01-19 23:05:42.000000000 +0100
@@ -81,38 +81,6 @@
const gchar *linestart, guint elem, const gchar *expected,
gboolean reuse_file);
@@ -2509,7 +2509,7 @@
typedef void (*HalCalloutsDone) (HalDevice *d, gpointer userdata1, gpointer userdata2);
diff -ruN hal-0.5.6-old/hald-runner/Makefile.am hal-0.5.6/hald-runner/Makefile.am
--- hal-0.5.6-old/hald-runner/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/Makefile.am 2006-01-17 22:24:03.000000000 +0100
++++ hal-0.5.6/hald-runner/Makefile.am 2006-01-19 23:05:42.000000000 +0100
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+INCLUDES = \
@@ -2529,7 +2529,7 @@
+hald_runner_LDADD = @PACKAGE_LIBS@ @DBUS_LIBS@
diff -ruN hal-0.5.6-old/hald-runner/Makefile.in hal-0.5.6/hald-runner/Makefile.in
--- hal-0.5.6-old/hald-runner/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/Makefile.in 2006-01-17 22:24:35.000000000 +0100
++++ hal-0.5.6/hald-runner/Makefile.in 2006-01-19 23:06:58.000000000 +0100
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -3106,8 +3106,32 @@
+.NOEXPORT:
diff -ruN hal-0.5.6-old/hald-runner/main.c hal-0.5.6/hald-runner/main.c
--- hal-0.5.6-old/hald-runner/main.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/main.c 2006-01-17 22:24:03.000000000 +0100
-@@ -0,0 +1,195 @@
++++ hal-0.5.6/hald-runner/main.c 2006-01-19 23:05:42.000000000 +0100
+@@ -0,0 +1,219 @@
++/***************************************************************************
++ * CVSID: $Id$
++ *
++ * main.c - Main dbus interface of the hald runner
++ *
++ * Copyright (C) 2006 Sjoerd Simons, <sjoerd at luon.net>
++ *
++ * Licensed under the Academic Free License version 2.1
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ **************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#define DBUS_API_SUBJECT_TO_CHANGE
@@ -3305,8 +3329,32 @@
+}
diff -ruN hal-0.5.6-old/hald-runner/runner.c hal-0.5.6/hald-runner/runner.c
--- hal-0.5.6-old/hald-runner/runner.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/runner.c 2006-01-17 22:24:03.000000000 +0100
-@@ -0,0 +1,307 @@
++++ hal-0.5.6/hald-runner/runner.c 2006-01-19 23:05:42.000000000 +0100
+@@ -0,0 +1,335 @@
++/***************************************************************************
++ * CVSID: $Id$
++ *
++ * runner.c - Process running code
++ *
++ * Copyright (C) 2006 Sjoerd Simons, <sjoerd at luon.net>
++ *
++ * Licensed under the Academic Free License version 2.1
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ **************************************************************************/
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
@@ -3392,6 +3440,9 @@
+ DBusMessageIter iter;
+ int i;
+
++ if (con == NULL || msg == NULL)
++ return;
++
+ reply = dbus_message_new_method_return(msg);
+ g_assert(reply != NULL);
+
@@ -3512,7 +3563,8 @@
+ run_data *rd = NULL;
+ GList *list;
+
-+ printf("Run started %s (%d)\n!", r->argv[0], r->timeout);
++ printf("Run started %s (%d) (%d) \n!", r->argv[0], r->timeout,
++ r->error_on_stderr);
+ if (r->input != NULL) {
+ stdin_p = &stdin_v;
+ }
@@ -3616,8 +3668,32 @@
+}
diff -ruN hal-0.5.6-old/hald-runner/runner.h hal-0.5.6/hald-runner/runner.h
--- hal-0.5.6-old/hald-runner/runner.h 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/runner.h 2006-01-17 22:24:03.000000000 +0100
-@@ -0,0 +1,32 @@
++++ hal-0.5.6/hald-runner/runner.h 2006-01-19 23:05:42.000000000 +0100
+@@ -0,0 +1,56 @@
++/***************************************************************************
++ * CVSID: $Id$
++ *
++ * runner.h - Process running interface
++ *
++ * Copyright (C) 2006 Sjoerd Simons, <sjoerd at luon.net>
++ *
++ * Licensed under the Academic Free License version 2.1
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ **************************************************************************/
+#ifndef RUNNER_H
+#define RUNNER_H
+
@@ -3652,8 +3728,32 @@
+#endif /* RUNNER_H */
diff -ruN hal-0.5.6-old/hald-runner/utils.c hal-0.5.6/hald-runner/utils.c
--- hal-0.5.6-old/hald-runner/utils.c 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/utils.c 2006-01-17 22:24:03.000000000 +0100
-@@ -0,0 +1,62 @@
++++ hal-0.5.6/hald-runner/utils.c 2006-01-19 23:05:42.000000000 +0100
+@@ -0,0 +1,86 @@
++/***************************************************************************
++ * CVSID: $Id$
++ *
++ * utils.c - Some utils for the hald runner
++ *
++ * Copyright (C) 2006 Sjoerd Simons, <sjoerd at luon.net>
++ *
++ * Licensed under the Academic Free License version 2.1
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ **************************************************************************/
+#include <stdio.h>
+#include <stdlib.h>
+#define DBUS_API_SUBJECT_TO_CHANGE
@@ -3718,8 +3818,32 @@
+}
diff -ruN hal-0.5.6-old/hald-runner/utils.h hal-0.5.6/hald-runner/utils.h
--- hal-0.5.6-old/hald-runner/utils.h 1970-01-01 01:00:00.000000000 +0100
-+++ hal-0.5.6/hald-runner/utils.h 2006-01-17 22:24:03.000000000 +0100
-@@ -0,0 +1,11 @@
++++ hal-0.5.6/hald-runner/utils.h 2006-01-19 23:05:42.000000000 +0100
+@@ -0,0 +1,35 @@
++/***************************************************************************
++ * CVSID: $Id$
++ *
++ * utils.h - Some utils for the hald runner
++ *
++ * Copyright (C) 2006 Sjoerd Simons, <sjoerd at luon.net>
++ *
++ * Licensed under the Academic Free License version 2.1
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ *
++ **************************************************************************/
+#ifndef UTILS_H
+#define UTILS_H
+
More information about the Pkg-utopia-commits
mailing list