Commit Graph

143 Commits

Author SHA1 Message Date
Artturin
a6138b750e makeDBusConf: fail if xsltproc generates empty files
A few people have reported empty files in /etc/dbus-1 which can cause obscure issues.
With this change, users can retry and get non-empty files.

can be tested with
`makeDBusConf { suidHelper = ""; serviceDirectories = []; }`

and adding

```
    rm $out/session.conf
    echo -n "" > $out/session.conf
    # or
    echo "" > $out/session.conf
```
2023-07-11 22:16:39 +03:00
R. Ryantm
6f57740f0b dbus: 1.14.6 -> 1.14.8 2023-06-11 16:59:43 +02:00
Vladimír Čunát
a7ce6c151a
dbus: fill meta.changelog
(so that r-ryantm update-bot shows it)
2023-06-11 10:25:57 +02:00
Randy Eckenrode
a98aaa5031
dbus: fix build with Darwin sandbox enabled 2023-05-25 21:11:41 -04:00
R. Ryantm
32c7999a10 dbus: 1.14.4 -> 1.14.6 2023-03-16 03:02:26 +00:00
Adam Joseph
42815b4a0c treewide: systemdSupport: use lib.meta.availableOn
Many packages have some kind of flag indicating whether or not to build with
systemd support.  Most of these default to `stdenv.isLinux`, but systemd does
not build on (and is marked `broken` for) `isStatic`.  Only a few packages have
the needed `&& !isStatic` in the default value for their parameter.

This commit moves the logic for the default value of these flags into
`systemd.meta.{platforms,badPlatforms}` and evaluates those conditions using
`lib.meta.availableOn`.

This provides three benefits:

1. The default values are set correctly (i.e. including `&& isStatic`)

2. The default values are set consistently

3. The way is paved for any future non-Linux systemd platforms (FreeBSD is
   reported to have experimental systemd support)
2023-01-22 00:27:19 -08:00
Sandro Jäckel
c7f5becba3 dbus: remove unused daemon passhtru 2022-11-21 20:23:00 +01:00
Martin Weinelt
bdb347b42c
dbus: 1.14.0 -> 1.14.4
https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-1.14.4/NEWS

Fixes: CVE-2022-42010, CVE-2022-42011, CVE-2022-42012
2022-10-09 19:33:30 +02:00
bootstrap-prime
5f43dbea70
dbus: use systemdMinimal to avoid dep cycle 2022-07-23 20:37:15 -04:00
Vladimír Čunát
ad24ab01de
makeDBusConf: reduce build closure
*buildInputs take .dev outputs by default, but we don't need it here.
The extra dependency (introduced by commit d172061281) was breaking
tests like nixosTests.containers-imperative and nixosTests.installer.*
https://hydra.nixos.org/eval/1767666#tabs-still-fail
2022-06-18 10:45:36 +02:00
Jan Tojnar
d172061281 makeDBusConf: use upstream XML catalog
dbus package now ships a catalog file so we no longer need to create a custom one.
2022-06-07 22:42:09 +02:00
Jan Tojnar
caf6e09b70 dbus: fix paths in catalog
Upstream is accidentally shipping a pre-generated catalog file in the tarball,
which contains FHS paths. We need to remove it to re-generate it ourselves.
Unfortunately, we are also overriding datadir to different values between
build and installation for reasons, so we need to override dtddir manually.
2022-06-07 22:42:09 +02:00
Artturin
d538cef5a8 dbus: enable strictDeps
output verified with https://github.com/Artturin/diffing

justhad to add system to nativeBuildInputs for
│ │ │ │ +ExecStartPost=-/usr/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus
│ │ │ │ -ExecStartPost=-/nix/store/xwd2br5nzzd5rdil4yb250zfgdng7l8v-systemd-250.4/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDR>
2022-05-11 20:16:31 +03:00
Artturin
be4c9c60c2 dbus: 1.12.20 -> 1.14.0
fprintd: remove dbus patch
2022-05-10 22:51:27 +03:00
Artturin
757ee2ed93 dbus: remove useless nulls 2022-05-10 20:42:31 +03:00
Jan Tojnar
9d06b46973 dbus: Fix crash when running in nix-shell
…that sets long XDG_DATA_DIRS environment variable.
2022-04-20 15:08:32 +02:00
SCOTT-HAMILTON
9a57309c82 dbus: use autoreconfHook and fix static build 2021-11-26 19:26:39 +01:00
Alyssa Ross
f7d585f7ca
dbus: remove broken X11 autolaunch hack
This hack was added so that X11 autolaunch support could be enabled
even when building without X11.  At the time, it was possible to have
the autolaunch support without X11 support.  But later, this stopped
being possible, and so the derivation was changed to only apply the
hack when X11 support was enabled.  But in that case, the same flag
would be added by the build system.

So in summary, this hack is only enabled in the case where it's a
no-op.  Therefore, it can be safely removed.
2021-11-05 20:12:14 +00:00
Alyssa Ross
eae534c584 pkgsMusl.dbus: enable systemd support
We previously weren't able to build systemd for Musl, but now we
can!  (But not statically.)  So there's no longer any reason to have
systemd support in D-Bus disabled by default for pkgsMusl.
2021-11-04 10:43:47 +00:00
Alyssa Ross
b223fa619e dbus: fix eval on BSD
audit and libapparmor are libraries for Linux kernel features, so they
should only be used on Linux, not excluded specifically for Darwin.
2021-06-09 21:40:03 +00:00
Jan Tojnar
0420282780
treewide maintainers: add teams.{freedesktop,gnome} 2021-05-07 15:36:40 +02:00
Vladimír Čunát
9f054b5e1a
treewide: remove worldofpeace from meta.maintainers
(It was requested by them.)
I left one case due to fetching from their personal repo:
pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix
2021-05-07 15:36:40 +02:00
Dmitry Kalinkin
1fbb13bc85
dbus: remove assert that breaks systemd = null deep override
This is another case of #73102
2021-01-28 15:48:50 -05:00
volth
bc0d605cf1 treewide: fix double quoted strings in meta.description
Signed-off-by: Ben Siraphob <bensiraphob@gmail.com>
2021-01-24 19:56:59 +07:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Janne Heß
060d20de24
dbus: Enable AppArmor mediation support 2020-11-18 10:10:25 +01:00
Arnout Engelen
13d86cc8e7
dbus: docs: make id's reproducible
With this parameter, generating docs from the same sources will produce the
same 'bit-by-bit' result each time.

This is particularly important since dbus is part of the 'minimal' testset at
https://r13y.com/

Also submitted upstream (though in a slightly different form):
https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/189
2020-11-07 10:01:22 +01:00
Scott Olson
721402352c dbus: build manpages from xml
The `docbook_xml_dtd_44` and `docbook-xsl-nons` bits are necessary to
prevent `xmlto` from trying to use the network during the build.
2020-10-01 21:44:00 +00:00
R. RyanTM
253431df92 dbus: 1.12.18 -> 1.12.20 2020-07-06 07:39:14 +02:00
R. RyanTM
c766192b30 dbus: 1.12.16 -> 1.12.18 2020-06-09 09:17:52 +00:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
worldofpeace
5cfc0aa7f4 dbus: add worldofpeace to maintainers 2019-10-28 20:41:36 -04:00
(cdep)illabout
b72984e7a3 dbus: enable building with musl
When building dbus with musl, it must not take systemd as a buildInput,
because systemd is not able to be build with musl.
2019-10-28 15:24:44 +01:00
worldofpeace
b3b123a104 dbus: set datadir again
Fixes #69404
2019-09-29 11:08:14 +02:00
worldofpeace
4e581c7b52 make-session-conf: add share/dbus-1/session.d 2019-08-24 15:07:44 -04:00
worldofpeace
9ff1601dc7 make-dbus-conf: use share/xml/dbus-1 2019-08-24 15:07:44 -04:00
worldofpeace
d35a71a2da dbus: delete systemd.patch
Not used anymore.
2019-08-24 15:07:44 -04:00
worldofpeace
a188cfadc6 dbus: stylize, use placeholder 2019-08-24 15:07:44 -04:00
worldofpeace
dc9c69efcf dbus: set runstatedir to /run
else it's /var/run.
2019-08-23 14:20:02 -04:00
worldofpeace
ccd8421dc9 dbus: don't make datadir /etc 2019-08-23 14:19:20 -04:00
Will Dietz
6d7cdd7f8b dbus: 1.12.14 -> 1.12.16
https://gitlab.freedesktop.org/dbus/dbus/blob/dbus-1.12.16/NEWS

It's short and explains the CVE a bit, including below:

> CVE-2019-12749: Do not attempt to carry out DBUS_COOKIE_SHA1
> authentication for identities that differ from the user running the
> DBusServer. Previously, a local attacker could manipulate symbolic
> links in their own home directory to bypass authentication and connect
> to a DBusServer with elevated privileges. The standard system and
> session dbus-daemons in their default configuration were immune to this
> attack because they did not allow DBUS_COOKIE_SHA1, but third-party
> users of DBusServer such as Upstart could be vulnerable.   Thanks to Joe
> Vennix of Apple Information Security.   (dbus#269, Simon McVittie)
2019-06-15 18:16:58 +02:00
Will Dietz
c0af744b18
dbus: 1.12.14
https://gitlab.freedesktop.org/dbus/dbus/blob/dbus-1.12.14/NEWS
2019-05-17 14:52:30 -05:00
Alyssa Ross
ad0d1ff6fd
makeDBusConfig: don't allow substitutions
This is rebuilt virtually every time a NixOS module is enabled or
disabled, so I don't think it makes sense to have it substituted.
It gets in the way of trivial config changes when I would otherwise be
able to rebuild my system entirely offline.
2019-03-17 16:04:08 +00:00
Will Dietz
4046248c74 dbus: 1.12.10 -> 1.12.12 2018-12-07 20:52:11 -06:00
R. RyanTM
be00dbf94c dbus: 1.12.8 -> 1.12.10 (#44789)
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/dbus/versions.
2018-08-09 18:33:17 +02:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
R. RyanTM
bf762d13e3 dbus: 1.12.6 -> 1.12.8
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dbus/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-monitor --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-update-activation-environment help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets -h’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-run-session -h’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-run-session --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-uuidgen --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-launch -h’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-launch --help’ got 0 exit code
- found 1.12.8 with grep in /nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8
- directory tree listing: https://gist.github.com/598fa486a7a2da2a0887e0899dd2ed27
2018-05-02 16:33:55 -07:00
R. RyanTM
e497597354 dbus: 1.10.24 -> 1.12.6
Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dbus/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-monitor --help’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-cleanup-sockets -h’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-cleanup-sockets --help’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-cleanup-sockets help’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-run-session -h’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-run-session --help’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-uuidgen --help’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-launch -h’ got 0 exit code
- ran ‘/nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6/bin/dbus-launch --help’ got 0 exit code
- found 1.12.6 with grep in /nix/store/2fb87ah2lsvnzlah1mkdiwsrv8p01yh6-dbus-1.12.6
- directory tree listing: https://gist.github.com/f7926c86c6572ac1a02dab3468dbbb95
2018-04-07 17:00:36 -07:00
Tor Hedin Brønner
70e8face4c
makeDBusConf: Look for .conf files in share/dbus-1/system.d/ too
Some packages install their dbus config files to `share/dbus-1/system.d` instead
of `etc/dbus-1/system.d`, so look in both places.
2018-03-28 20:41:06 +02:00