[Pkg-utopia-commits] r512 - packages/experimental/hal/debian/patches
Sjoerd Simons
sjoerd at costa.debian.org
Fri Jan 20 19:06:23 UTC 2006
Author: sjoerd
Date: 2006-01-20 19:06:22 +0000 (Fri, 20 Jan 2006)
New Revision: 512
Modified:
packages/experimental/hal/debian/patches/01_hal_privsep.patch
Log:
Updated patch
Modified: packages/experimental/hal/debian/patches/01_hal_privsep.patch
===================================================================
--- packages/experimental/hal/debian/patches/01_hal_privsep.patch 2006-01-20 09:40:43 UTC (rev 511)
+++ packages/experimental/hal/debian/patches/01_hal_privsep.patch 2006-01-20 19:06:22 UTC (rev 512)
@@ -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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/Makefile.am 2006-01-20 11:27:46.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-19 23:07:05.000000000 +0100
++++ hal-0.5.6/Makefile.in 2006-01-20 11:28:38.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-19 23:07:11.000000000 +0100
++++ hal-0.5.6/configure 2006-01-20 11:28:00.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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/configure.in 2006-01-20 11:27:46.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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/Makefile.am 2006-01-20 11:27:46.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-19 23:06:58.000000000 +0100
++++ hal-0.5.6/hald/Makefile.in 2006-01-20 11:28:31.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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/hald.c 2006-01-20 11:27:46.000000000 +0100
@@ -55,6 +55,7 @@
#include "osspec.h"
#include "hald_dbus.h"
@@ -1172,16 +1172,18 @@
fprintf (stderr,
"\n"
" --daemon=yes|no Become a daemon\n"
-@@ -215,6 +180,8 @@
+@@ -215,8 +180,8 @@
" --use-syslog Print out debug messages to syslog instead of stderr.\n"
" Use this option to get debug messages if HAL runs as\n"
" daemon.\n"
+- " --retain-privileges Run as root instead of normal user (calling of\n"
+- " external scripts to modify fstab etc. will work)\n"
+ " --with-runner Use the program at the specified location as the\n"
+ "helper.\n"
- " --retain-privileges Run as root instead of normal user (calling of\n"
- " external scripts to modify fstab etc. will work)\n"
" --help Show this information and exit\n"
-@@ -261,7 +228,6 @@
+ " --version Output version information and exit"
+ "\n"
+@@ -261,7 +226,6 @@
GError *err = NULL;
gchar data[1];
gsize bytes_read;
@@ -1189,7 +1191,7 @@
/* Empty the pipe */
if (G_IO_STATUS_NORMAL !=
-@@ -273,8 +239,7 @@
+@@ -273,8 +237,7 @@
}
HAL_INFO (("Caught SIGTERM, initiating shutdown"));
@@ -1199,32 +1201,41 @@
exit (0);
out:
-@@ -407,6 +372,7 @@
- gboolean retain_privs;
+@@ -404,12 +367,9 @@
+ {
+ GMainLoop *loop;
+ guint sigterm_iochn_listener_source_id;
+- gboolean retain_privs;
char *path;
char newpath[512];
+-
+- retain_privs = FALSE;
+-
+ char *runner_location = NULL;
- retain_privs = FALSE;
-
-@@ -444,6 +410,7 @@
+ openlog ("hald", LOG_PID, LOG_DAEMON);
+
+@@ -443,7 +403,7 @@
+ {"verbose", 1, NULL, 0},
{"use-syslog", 0, NULL, 0},
{"help", 0, NULL, 0},
- {"retain-privileges", 0, NULL, 0},
+- {"retain-privileges", 0, NULL, 0},
+ {"with-runner", 1, NULL, 0},
{"version", 0, NULL, 0},
{NULL, 0, NULL, 0}
};
-@@ -483,6 +450,8 @@
+@@ -481,8 +441,8 @@
+ usage ();
+ return 1;
}
- } else if (strcmp (opt, "retain-privileges") == 0) {
- retain_privs = TRUE;
+- } else if (strcmp (opt, "retain-privileges") == 0) {
+- retain_privs = TRUE;
+ } else if (strcmp (opt, "with-runner") == 0) {
+ runner_location = strdup(optarg);
} else if (strcmp (opt, "use-syslog") == 0) {
hald_use_syslog = TRUE;
}
-@@ -606,6 +575,10 @@
+@@ -606,13 +566,16 @@
/* set up the local dbus server */
if (!hald_dbus_local_server_init ())
return 1;
@@ -1232,10 +1243,19 @@
+ if (!hald_runner_start_runner(runner_location)) {
+ return 1;
+ }
++
++ drop_privileges();
/* initialize operating system specific parts */
osspec_init ();
-@@ -659,7 +632,7 @@
+
+- if (!retain_privs)
+- drop_privileges();
+-
+ hald_is_initialising = TRUE;
+
+ /* detect devices */
+@@ -659,7 +622,7 @@
HAL_INFO (("Device probing completed"));
if (!hald_dbus_init ()) {
@@ -1246,7 +1266,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/hald_dbus.c 2006-01-20 11:27:46.000000000 +0100
@@ -46,6 +46,7 @@
#include "logger.h"
#include "osspec.h"
@@ -1387,7 +1407,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/hald_dbus.h 2006-01-20 11:27:46.000000000 +0100
@@ -94,6 +94,4 @@
DBusHandlerResult hald_dbus_filter_function (DBusConnection * connection, DBusMessage * message, void *user_data);
@@ -1397,7 +1417,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/hald_runner.c 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,419 @@
+/***************************************************************************
+ * CVSID: $Id$
@@ -1820,7 +1840,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/hald_runner.h 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *
@@ -1899,7 +1919,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/linux2/blockdev.c 2006-01-20 11:27:46.000000000 +0100
@@ -60,6 +60,7 @@
#include "../device_info.h"
#include "../hald_dbus.h"
@@ -2040,7 +2060,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/linux2/classdev.c 2006-01-20 11:27:46.000000000 +0100
@@ -65,6 +65,7 @@
#include "../device_info.h"
#include "../device_store.h"
@@ -2105,7 +2125,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/linux2/osspec.c 2006-01-20 11:27:46.000000000 +0100
@@ -66,6 +66,7 @@
#include "../logger.h"
#include "../hald.h"
@@ -2153,7 +2173,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/util.c 2006-01-20 11:27:46.000000000 +0100
@@ -50,6 +50,7 @@
#include "hald_dbus.h"
@@ -2467,7 +2487,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald/util.h 2006-01-20 11:27:46.000000000 +0100
@@ -81,38 +81,6 @@
const gchar *linestart, guint elem, const gchar *expected,
gboolean reuse_file);
@@ -2509,7 +2529,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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald-runner/Makefile.am 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,16 @@
+## Process this file with automake to produce Makefile.in
+INCLUDES = \
@@ -2529,7 +2549,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-19 23:06:58.000000000 +0100
++++ hal-0.5.6/hald-runner/Makefile.in 2006-01-20 11:28:30.000000000 +0100
@@ -0,0 +1,573 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
@@ -3106,7 +3126,7 @@
+.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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald-runner/main.c 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,219 @@
+/***************************************************************************
+ * CVSID: $Id$
@@ -3329,7 +3349,7 @@
+}
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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald-runner/runner.c 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,335 @@
+/***************************************************************************
+ * CVSID: $Id$
@@ -3668,7 +3688,7 @@
+}
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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald-runner/runner.h 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,56 @@
+/***************************************************************************
+ * CVSID: $Id$
@@ -3728,7 +3748,7 @@
+#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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald-runner/utils.c 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,86 @@
+/***************************************************************************
+ * CVSID: $Id$
@@ -3818,7 +3838,7 @@
+}
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-19 23:05:42.000000000 +0100
++++ hal-0.5.6/hald-runner/utils.h 2006-01-20 11:27:46.000000000 +0100
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * CVSID: $Id$
More information about the Pkg-utopia-commits
mailing list