From 116630b258c6caa5e613acb1d6e895f1c12303c1 Mon Sep 17 00:00:00 2001 From: jmcneill Date: Thu, 8 Jan 2009 00:21:00 +0000 Subject: Import packagekit version 0.4.0. Much work to do. PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. The actual nuts-and-bolts distro tool (yum, apt, conary, etc) is used by PackageKit using compiled and scripted helpers. PackageKit isn't meant to replace these tools, instead providing a common set of abstractions that can be used by standard GUI and text mode package managers. PackageKit itself is a system activated daemon called packagekitd. Being system activated means that it's only being run when the user is using a text mode or graphical tool, and quits when it's no longer being used. This means we don't delay the boot sequence or session startup and don't consume memory when not being used. --- pkgtools/packagekit/patches/patch-aa | 22 +++++++++++++++ pkgtools/packagekit/patches/patch-ab | 32 +++++++++++++++++++++ pkgtools/packagekit/patches/patch-ac | 32 +++++++++++++++++++++ pkgtools/packagekit/patches/patch-ad | 12 ++++++++ pkgtools/packagekit/patches/patch-ae | 32 +++++++++++++++++++++ pkgtools/packagekit/patches/patch-af | 25 +++++++++++++++++ pkgtools/packagekit/patches/patch-ag | 32 +++++++++++++++++++++ pkgtools/packagekit/patches/patch-ah | 32 +++++++++++++++++++++ pkgtools/packagekit/patches/patch-ai | 13 +++++++++ pkgtools/packagekit/patches/patch-aj | 16 +++++++++++ pkgtools/packagekit/patches/patch-ak | 13 +++++++++ pkgtools/packagekit/patches/patch-al | 25 +++++++++++++++++ pkgtools/packagekit/patches/patch-am | 17 ++++++++++++ pkgtools/packagekit/patches/patch-an | 54 ++++++++++++++++++++++++++++++++++++ pkgtools/packagekit/patches/patch-ao | 15 ++++++++++ pkgtools/packagekit/patches/patch-ap | 30 ++++++++++++++++++++ 16 files changed, 402 insertions(+) create mode 100644 pkgtools/packagekit/patches/patch-aa create mode 100644 pkgtools/packagekit/patches/patch-ab create mode 100644 pkgtools/packagekit/patches/patch-ac create mode 100644 pkgtools/packagekit/patches/patch-ad create mode 100644 pkgtools/packagekit/patches/patch-ae create mode 100644 pkgtools/packagekit/patches/patch-af create mode 100644 pkgtools/packagekit/patches/patch-ag create mode 100644 pkgtools/packagekit/patches/patch-ah create mode 100644 pkgtools/packagekit/patches/patch-ai create mode 100644 pkgtools/packagekit/patches/patch-aj create mode 100644 pkgtools/packagekit/patches/patch-ak create mode 100644 pkgtools/packagekit/patches/patch-al create mode 100644 pkgtools/packagekit/patches/patch-am create mode 100644 pkgtools/packagekit/patches/patch-an create mode 100644 pkgtools/packagekit/patches/patch-ao create mode 100644 pkgtools/packagekit/patches/patch-ap (limited to 'pkgtools/packagekit/patches') diff --git a/pkgtools/packagekit/patches/patch-aa b/pkgtools/packagekit/patches/patch-aa new file mode 100644 index 00000000000..80a3779329c --- /dev/null +++ b/pkgtools/packagekit/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- data/packagekit-background.cron.orig 2008-10-06 06:49:49.000000000 -0400 ++++ data/packagekit-background.cron +@@ -12,7 +12,7 @@ + [ -f /etc/sysconfig/packagekit-background ] && . /etc/sysconfig/packagekit-background + + # are we disabled? +-if [ "$ENABLED" == "no" ]; then ++if [ "$ENABLED" = "no" ]; then + exit 1 + fi + +@@ -25,7 +25,7 @@ PKTMP=$(mktemp /var/run/packagekit-cron. + sleep $RANDOM + + # do action +-if [ "$CHECK_ONLY" == "yes" ]; then ++if [ "$CHECK_ONLY" = "yes" ]; then + pkcon get-updates > $PKTMP + else + pkcon update > $PKTMP diff --git a/pkgtools/packagekit/patches/patch-ab b/pkgtools/packagekit/patches/patch-ab new file mode 100644 index 00000000000..ecc366e8115 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ab @@ -0,0 +1,32 @@ +$NetBSD: patch-ab,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- client/egg-debug.c.orig 2008-11-06 03:19:07.000000000 -0500 ++++ client/egg-debug.c +@@ -39,7 +39,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + + #include "egg-debug.h" + +@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code) + void + egg_debug_backtrace (void) + { ++#ifdef __linux__ + void *call_stack[512]; + int call_stack_size; + char **symbols; +@@ -95,6 +98,9 @@ egg_debug_backtrace (void) + pk_set_console_mode (CONSOLE_RESET); + free (symbols); + } ++#else ++ g_print ("egg_debug_backtrace not implemented on this platform\n"); ++#endif + } + + /** diff --git a/pkgtools/packagekit/patches/patch-ac b/pkgtools/packagekit/patches/patch-ac new file mode 100644 index 00000000000..38033602e04 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ac @@ -0,0 +1,32 @@ +$NetBSD: patch-ac,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- contrib/command-not-found/egg-debug.c.orig 2008-11-06 03:19:07.000000000 -0500 ++++ contrib/command-not-found/egg-debug.c +@@ -39,7 +39,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + + #include "egg-debug.h" + +@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code) + void + egg_debug_backtrace (void) + { ++#ifdef __linux__ + void *call_stack[512]; + int call_stack_size; + char **symbols; +@@ -95,6 +98,9 @@ egg_debug_backtrace (void) + pk_set_console_mode (CONSOLE_RESET); + free (symbols); + } ++#else ++ g_print ("egg_debug_backtrace not implemented on this platform.\n"); ++#endif + } + + /** diff --git a/pkgtools/packagekit/patches/patch-ad b/pkgtools/packagekit/patches/patch-ad new file mode 100644 index 00000000000..a2aa62889cf --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- contrib/command-not-found/pk-command-not-found.c.orig 2008-12-09 03:22:23.000000000 -0500 ++++ contrib/command-not-found/pk-command-not-found.c +@@ -22,6 +22,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include diff --git a/pkgtools/packagekit/patches/patch-ae b/pkgtools/packagekit/patches/patch-ae new file mode 100644 index 00000000000..76c6d1b4367 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ae @@ -0,0 +1,32 @@ +$NetBSD: patch-ae,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- lib/packagekit-glib/egg-debug.c.orig 2008-11-06 03:19:07.000000000 -0500 ++++ lib/packagekit-glib/egg-debug.c +@@ -39,7 +39,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + + #include "egg-debug.h" + +@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code) + void + egg_debug_backtrace (void) + { ++#ifdef __linux__ + void *call_stack[512]; + int call_stack_size; + char **symbols; +@@ -95,6 +98,9 @@ egg_debug_backtrace (void) + pk_set_console_mode (CONSOLE_RESET); + free (symbols); + } ++#else ++ g_print ("egg_debug_backtrace not implemented on this platform\n"); ++#endif + } + + /** diff --git a/pkgtools/packagekit/patches/patch-af b/pkgtools/packagekit/patches/patch-af new file mode 100644 index 00000000000..81049b958d2 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-af @@ -0,0 +1,25 @@ +$NetBSD: patch-af,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- lib/packagekit-glib/pk-client.c.orig 2008-12-09 03:22:23.000000000 -0500 ++++ lib/packagekit-glib/pk-client.c +@@ -33,7 +33,9 @@ + + #include + #include ++#ifdef __linux__ + #include ++#endif + #ifdef HAVE_UNISTD_H + #include + #endif /* HAVE_UNISTD_H */ +@@ -4493,8 +4495,10 @@ pk_client_new (void) + __attribute__ ((constructor)) + void init() + { ++#ifdef __linux__ + /* this is a bandaid */ + prctl (PR_SET_DUMPABLE, 0); ++#endif + } + + /*************************************************************************** diff --git a/pkgtools/packagekit/patches/patch-ag b/pkgtools/packagekit/patches/patch-ag new file mode 100644 index 00000000000..f93c91de28d --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ag @@ -0,0 +1,32 @@ +$NetBSD: patch-ag,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- src/egg-debug.c.orig 2008-11-06 03:19:07.000000000 -0500 ++++ src/egg-debug.c +@@ -39,7 +39,9 @@ + #include + #include + #include ++#ifdef __linux__ + #include ++#endif + + #include "egg-debug.h" + +@@ -78,6 +80,7 @@ pk_set_console_mode (guint console_code) + void + egg_debug_backtrace (void) + { ++#ifdef __linux__ + void *call_stack[512]; + int call_stack_size; + char **symbols; +@@ -95,6 +98,9 @@ egg_debug_backtrace (void) + pk_set_console_mode (CONSOLE_RESET); + free (symbols); + } ++#else ++ g_print ("egg_debug_backtrace not implemented on this platform\n"); ++#endif + } + + /** diff --git a/pkgtools/packagekit/patches/patch-ah b/pkgtools/packagekit/patches/patch-ah new file mode 100644 index 00000000000..fa0d630037d --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ah @@ -0,0 +1,32 @@ +$NetBSD: patch-ah,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- src/pk-main.c.orig 2008-12-04 08:45:11.000000000 -0500 ++++ src/pk-main.c 2009-01-07 08:33:31.000000000 -0500 +@@ -178,9 +178,11 @@ main (int argc, char *argv[]) + PkSyslog *syslog = NULL; + GError *error = NULL; + GOptionContext *context; ++#ifdef __linux__ + const gchar *env_pk_verbose; + const gchar *env_pk_console; + const gchar *env_pk_logging; ++#endif + + const GOptionEntry options[] = { + { "backend", '\0', 0, G_OPTION_ARG_STRING, &backend_name, +@@ -251,6 +253,7 @@ main (int argc, char *argv[]) + goto exit_program; + } + ++#ifdef __linux__ + /* we don't actually need to do this, except it rules out the + * 'it works from the command line but not service activation' bugs */ + env_pk_verbose = g_getenv (EGG_VERBOSE); +@@ -260,6 +263,7 @@ main (int argc, char *argv[]) + g_setenv (EGG_VERBOSE, env_pk_verbose, FALSE); + g_setenv (EGG_CONSOLE, env_pk_console, FALSE); + g_setenv (EGG_LOGGING, env_pk_logging, FALSE); ++#endif + + /* get values from the config file */ + conf = pk_conf_new (); diff --git a/pkgtools/packagekit/patches/patch-ai b/pkgtools/packagekit/patches/patch-ai new file mode 100644 index 00000000000..305c58d8cd3 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- contrib/Makefile.in.orig 2008-12-09 03:25:51.000000000 -0500 ++++ contrib/Makefile.in +@@ -314,7 +314,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = udev $(am__append_1) $(am__append_2) $(am__append_3) \ + $(am__append_4) $(am__append_5) +-bashcompletiondir = ${SYSCONFDIR}/bash_completion.d ++bashcompletiondir = $(PREFIX)/share/examples/packagekit + dist_bashcompletion_DATA = pk-completion.bash + script_SCRIPTS = \ + packagekit-bugreport.sh diff --git a/pkgtools/packagekit/patches/patch-aj b/pkgtools/packagekit/patches/patch-aj new file mode 100644 index 00000000000..feab534a536 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-aj @@ -0,0 +1,16 @@ +$NetBSD: patch-aj,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- contrib/command-not-found/Makefile.in.orig 2008-12-09 03:25:51.000000000 -0500 ++++ contrib/command-not-found/Makefile.in +@@ -346,9 +346,9 @@ pk_command_not_found_LDADD = \ + $(PK_GLIB_LIBS) \ + $(NULL) + +-bashprofiledir = ${SYSCONFDIR}/profile.d ++bashprofiledir = $(PREFIX)/share/examples/packagekit + dist_bashprofile_DATA = PackageKit.sh +-confdir = $(PK_CONF_DIR) ++confdir = $(PREFIX)/share/examples/packagekit + dist_conf_DATA = CommandNotFound.conf + all: all-am + diff --git a/pkgtools/packagekit/patches/patch-ak b/pkgtools/packagekit/patches/patch-ak new file mode 100644 index 00000000000..e0953b0fc72 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- contrib/udev/Makefile.in.orig 2008-12-09 03:25:51.000000000 -0500 ++++ contrib/udev/Makefile.in +@@ -290,7 +290,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-udevrulesdir = ${SYSCONFDIR}/udev/rules.d ++udevrulesdir = $(PREFIX)/share/examples/packagekit + dist_udevrules_DATA = 51-packagekit-firmware.rules + EXTRA_DIST = packagekit-firmware.sh + all: all-am diff --git a/pkgtools/packagekit/patches/patch-al b/pkgtools/packagekit/patches/patch-al new file mode 100644 index 00000000000..2cf162416d1 --- /dev/null +++ b/pkgtools/packagekit/patches/patch-al @@ -0,0 +1,25 @@ +$NetBSD: patch-al,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- data/Makefile.in.orig 2008-12-09 03:25:51.000000000 -0500 ++++ data/Makefile.in +@@ -345,9 +345,9 @@ pkgconfig_DATA = \ + packagekit-qt.pc \ + $(NULL) + +-cronfiledir = ${SYSCONFDIR}/cron.daily ++cronfiledir = $(PREFIX)/share/examples/packagekit + cronfile_SCRIPTS = packagekit-background.cron +-crondatadir = ${SYSCONFDIR}/sysconfig ++crondatadir = $(PREFIX)/share/examples/packagekit + crondata_SCRIPTS = packagekit-background + pmutilsdir = $(libdir)/pm-utils/sleep.d + pmutils_DATA = 95packagekit +@@ -363,7 +363,7 @@ mime_in_files = \ + $(NULL) + + mime_DATA = $(mime_in_files:.xml.in=.xml) +-dbusdir = ${SYSCONFDIR}/dbus-1/system.d ++dbusdir = $(PREFIX)/share/examples/packagekit + dist_dbus_DATA = \ + org.freedesktop.PackageKit.conf \ + org.freedesktop.PackageKitTestBackend.conf \ diff --git a/pkgtools/packagekit/patches/patch-am b/pkgtools/packagekit/patches/patch-am new file mode 100644 index 00000000000..2cb8a0d3d4b --- /dev/null +++ b/pkgtools/packagekit/patches/patch-am @@ -0,0 +1,17 @@ +$NetBSD: patch-am,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- etc/Makefile.in.orig 2008-12-09 03:25:52.000000000 -0500 ++++ etc/Makefile.in +@@ -291,10 +291,10 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + NULL = +-confdir = $(PK_CONF_DIR) ++confdir = $(PREFIX)/share/examples/packagekit + conf_in_files = PackageKit.conf.in + conf_DATA = $(conf_in_files:.conf.in=.conf) +-vendordir = $(PK_CONF_DIR) ++vendordir = $(PREFIX)/share/examples/packagekit + vendor_DATA = Vendor.conf + EXTRA_DIST = \ + $(conf_in_files) \ diff --git a/pkgtools/packagekit/patches/patch-an b/pkgtools/packagekit/patches/patch-an new file mode 100644 index 00000000000..be94522569d --- /dev/null +++ b/pkgtools/packagekit/patches/patch-an @@ -0,0 +1,54 @@ +$NetBSD: patch-an,v 1.1.1.1 2009/01/08 00:21:00 jmcneill Exp $ + +--- configure.ac.orig 2008-12-09 03:22:23.000000000 -0500 ++++ configure.ac 2009-01-07 08:03:23.000000000 -0500 +@@ -353,6 +353,7 @@ + AC_ARG_ENABLE(dummy, AS_HELP_STRING([--enable-dummy],[use the dummy backend]),enable_dummy=$enableval,enable_dummy=yes) + AC_ARG_ENABLE(opkg, AS_HELP_STRING([--enable-opkg],[use the OPKG backend]),enable_opkg=$enableval,enable_opkg=no) + AC_ARG_ENABLE(pisi, AS_HELP_STRING([--enable-pisi],[use the PiSi backend]),enable_pisi=$enableval,enable_pisi=no) ++AC_ARG_ENABLE(pkgsrc, AS_HELP_STRING([--enable-pkgsrc],[use the pkgsrc backend]),enable_pkgsrc=$enableval,enable_pkgsrc=no) + AC_ARG_ENABLE(poldek, AS_HELP_STRING([--enable-poldek],[use the poldek backend]),enable_poldek=$enableval,enable_poldek=no) + AC_ARG_ENABLE(razor, AS_HELP_STRING([--enable-razor],[use the razor backend]),enable_razor=$enableval,enable_razor=no) + AC_ARG_ENABLE(smart, AS_HELP_STRING([--enable-smart],[use the SMART backend]),enable_smart=$enableval,enable_smart=no) +@@ -368,6 +369,7 @@ + AM_CONDITIONAL(BACKEND_TYPE_DUMMY, [test x$enable_dummy = xyes], [using dummy backend]) + AM_CONDITIONAL(BACKEND_TYPE_OPKG, [test x$enable_opkg = xyes], [using OPKG backend]) + AM_CONDITIONAL(BACKEND_TYPE_PISI, [test x$enable_pisi = xyes], [using PiSi backend]) ++AM_CONDITIONAL(BACKEND_TYPE_PKGSRC, [test x$enable_pkgsrc = xyes], [using pkgsrc backend]) + AM_CONDITIONAL(BACKEND_TYPE_POLDEK, [test x$enable_poldek = xyes], [using poldek backend]) + AM_CONDITIONAL(BACKEND_TYPE_RAZOR, [test x$enable_razor = xyes], [using Razor backend]) + AM_CONDITIONAL(BACKEND_TYPE_SMART, [test x$enable_smart = xyes], [using SMART backend]) +@@ -494,7 +496,7 @@ + AC_ARG_WITH([default_backend], + AS_HELP_STRING([--with-default-backend=