3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

87 commits

Author SHA1 Message Date
Vladimír Čunát 3efef09866
dbus: maintenance 1.10.16 -> 1.10.18 2017-04-18 18:44:22 +02:00
Nikolay Amiantov c05ac3ea12 makeDBusConf: re-add XDG directories for session bus
Fixes #23770.
2017-03-12 22:15:51 +03:00
Vladimír Čunát 9458018a87
dbus: 1.10.14 -> 1.10.16
It's for "security" issue that's considered unexploitable with a sane
config.
2017-02-20 21:38:24 +01:00
aszlig c5b2714bc7
dbus: Put DTDs into $out instead of $doc
First of all, these "documents" are not really documentation, so it
really doesn't make much sense to put it into $doc.

The main point however is that the installer tests are failing since
this was introduced in ac0cdc1952.

One way to circumvent this is putting dbus.doc into
system.extraDependencies of the installer tests, but given the first
point this sounds a bit odd to me.

So I went for the second way of putting it into $out, because it's now
basically necessary to build a NixOS system.

With this the NixOS installer tests should now work again, although I
have only tested this with the installer.simple test.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:38 +01:00
aszlig fc6684054d
make-dbus-conf: Use libxslt.bin instead of .dev
The problem with using libxslt as buildInputs is that the dev output is
used for building the dbus config.

This is one of the reasons why the installer tests are failing since
ac0cdc1952, because the tests do not have
libxslt.dev in their closure and really shouldn't.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:34 +01:00
aszlig edce2b759c
make-dbus-conf: Don't try to access network
This is the output of the builder:

building path(s) `/nix/store/khkcfb8433i9mabb6wnb8ik6p9skg644-dbus-1'
error : connection refused
error : connection refused

However, even when using --nonet we'd still get this:

I/O error : Attempt to load network entity
http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd

So in order to avoid this, we now provide an XML catalog file, mapping
the public URLs to the local DTD paths inside the store instead of using
--path (which doesn't seem to work with xsltproc).

Tested this by comparing the SHA256 (nix-hash --type sha256) of the
output path generated by:

nix-build -E '(import ./. {}).makeDBusConf {
  suidHelper = "SUIDHELPER";
  serviceDirectories = [ "SERVICEDIR1" "SERVICEDIR1" ];
}'

... with the SHA256 of the generated output path prior to this commit
and they have the same hash:

6f3f9594b12fddbff9407b85252b6f649da11f56b7fd514f761966c11399a7ab

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar
2017-02-20 03:24:26 +01:00
Nikolay Amiantov 3e23ec4450 makeDBusConf: init
Use XSLT transform to modify stock dbus configuration file. This is needed
because some dbus components doesn't support <include> so we need to put our
core configuration in the main file.
2017-02-16 15:41:23 +03:00
Nikolay Amiantov 300c9a6c3d dbus: use /etc as datadir, install dtd 2017-02-16 15:41:23 +03:00
Nikolay Amiantov 4877a5664e dbus: don't search for units in current-system 2017-02-02 00:58:45 +03:00
Vladimír Čunát ea42d6fe62
dbus: 1.10.12 -> 1.10.14 2016-12-03 12:32:11 +01:00
Graham Christensen bc1317c163
dbus: 1.10.10 -> 1.10.12 for CVE-2015-0245 2016-10-19 08:31:14 -04:00
Peter Hoeg 639e5401ff dbus: add socket activation but do not enable it
The following changes are included:

1) install user unit files from upstream dbus
2) use absolute paths to config for --system and --session instances
3) make socket activation of user units configurable

There has been a number of PRs to address this, so this one does the
bare minimum, which is to make the functionality available and
configurable but defaults to off.

Related PRs:
 - #18382
 - #18222

(cherry picked from commit f7215c9b5b)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-30 13:14:53 +02:00
Eelco Dolstra 7c239702b5 Merge remote-tracking branch 'origin/master' into staging 2016-09-05 19:10:12 +02:00
Alexander Ried 8604117b48 dbus: remove unused imports 2016-09-05 15:03:35 +02:00
Vladimír Čunát 741527adef dbus: 1.10.8. -> 1.10.10
NEWS seem safe, and there are only "fixes" in there.
2016-09-04 20:42:28 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Thomas Tuegel f04e0e70e8 Revert "Revert "dbus: 1.8.20 -> 1.10.8""
This reverts commit 9eb107dc52.
2016-05-02 13:01:59 -05:00
Thomas Tuegel 9eb107dc52 Revert "dbus: 1.8.20 -> 1.10.8"
This reverts commit d088e0621e.

The D-Bus update breaks logind and polkit.

(cherry picked from commit 2e06e5eb36)

Hydra had rebuilt this on staging, fixing many test problems.
There were also phonon changes in these rebuilds, but the amount of
binaries affected by them is relatively low and I'm not yet fully
convinced of their stability.
2016-04-24 20:08:39 +02:00
Thomas Tuegel d088e0621e dbus: 1.8.20 -> 1.10.8 2016-04-20 10:01:06 -05:00
Luca Bruno e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Vladimír Čunát a0ce1b48ed dbus: fix build of dbus without x11Support 2015-10-28 12:04:47 +01:00
Vladimír Čunát 783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát 1ff829deeb dbus: maintenance update 2015-07-23 14:42:47 +02:00
Vladimír Čunát deb33d513f dbus: small update 2015-06-07 09:22:13 +02:00
Spencer Whitt 80edc95494 dbus: Build on Darwin 2015-05-04 10:56:49 -04:00
William A. Kennington III 232b71c6e8 Fix some platforms 2015-04-25 21:27:53 -07:00
Jan Malakhovski 380ee53fff dbus: rename useX11 option into x11Support, cleanup a bit 2015-03-29 23:28:30 +00:00
Vladimír Čunát 464212e01a dbus: security bump to fix CVE-2015-0245 2015-03-09 15:55:23 +01:00
Vladimír Čunát 8ec4c682a7 dbus.{tools,daemon}: don't provide a wrong dbus-1.pc
Fixes #6086.
I think this will rebuild most of KDE and GNOME due to strigi and upower.
2015-02-01 11:43:18 +01:00
Vladimír Čunát 1c0477c08c dbus: a security-hardening update 2015-01-13 18:01:27 +01:00
Domen Kožar 9b7b2ce8eb Revert "Introduce patchShebangsPhase ran in preConfigurePhases"
This reverts commit 512fbb280f.

See #5368
2015-01-08 10:26:49 +01:00
Domen Kožar 512fbb280f Introduce patchShebangsPhase ran in preConfigurePhases
(cherry picked from commit 91c7e8747af1fdc2a70cd98594ccbb12a5c6902d)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-01-02 02:58:32 +01:00
Vladimír Čunát 443e0fcbea dbus: small update, fixing boot on slow machines
See http://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.8
2014-11-24 23:06:12 +01:00
Vladimír Čunát 827ec7b3d6 dbus: security update, CVE-2014-3636 2014-11-10 21:34:02 +01:00
Vladimír Čunát 151da1950e dbus: minor update, including security fixes
CVE-2014-3635..3639
2014-09-16 20:11:06 +02:00
aszlig 4d8ee7d8cb
dbus: Don't search for Xlibs if useX11 is false.
This particularily fails when using non-chrooted builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-17 08:40:47 +02:00
Luca Bruno 1e1deda543 dbus tools: not supported on darwin 2014-08-09 14:32:54 +02:00
Vladimír Čunát 1dc09826f8 dbus: DOS-security update 1.8.4 -> .6
CVE-2014-{3532,3533}
2014-07-02 22:22:43 +02:00
Vladimír Čunát cfc457eda5 dbus: security-only update, CVE-2014-3477 (DOS) 2014-06-11 06:53:59 +02:00
Vladimír Čunát 3bb121e50e dbus: minor update 1.8.0 -> .2 2014-05-03 11:31:28 +02:00
Eelco Dolstra 83b43cfe51 dbus: Merge tools and daemon
This resolves a cyclic dependency: the daemon depends on tools (for
dbus-send) while tools depends on the daemon.  Keeping them separate
doesn't seem very useful in any case.
2014-04-22 17:38:53 +02:00
Eelco Dolstra ee9c068b0c systemd: Update to 212
Note that systemd no longer depends on dbus, so we're rid of the
cyclic dependency problem between systemd and dbus.

This commit incorporates from wkennington's systemd branch
(203dcff45002a63f6be75c65f1017021318cc839,
1f842558a95947261ece66f707bfa24faf5a9d88).
2014-04-16 00:59:26 +02:00
Vladimír Čunát d6349df0dd put systemd unit dirs on the right place
Also see #1936.
2014-03-13 21:44:51 +01:00
William A. Kennington III 8534fdf3fe dbus: Update from 1.6.12 -> 1.8.0 2014-02-20 21:05:01 +01:00
Vladimír Čunát 5ddbacecb5 dbus: minor update 1.6.14 -> .16 "fortify agility" 2013-11-05 08:19:23 +01:00
Marc Weber 78f7baf3b7 Fix .deepOverride on poppler, glib
By moving the default derivation into callPackage call, close #1115.
2013-10-26 13:54:24 +02:00
Vladimír Čunát c1ed13dad0 Merge branch 'master' into x-updates 2013-09-08 12:04:20 +02:00
Jason \"Don\" O'Conal ac39ba7953 dbus_tools: fix build on darwin (close #929) 2013-09-08 10:49:20 +02:00
Vladimír Čunát 0cf8a74e82 dbus: minor update, style refactoring, parallel build 2013-09-06 15:51:38 +02:00
Vladimír Čunát 1f81984293 non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00