From a6e4651e25989c5dfb59841b3cf7e69025ccff60 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 3 Aug 2013 18:32:15 -0400 Subject: [PATCH 1/6] feat(profiles): Add systemd profile from my Gentoo systemd-only overlay. No need for me to maintain a similar profile in two entirely different ways. This is also one tiny step towards cleaning up our profiles in general. Original here: https://github.com/marineam/systemd-only-overlay As part of this change the baselayout dependency on openrc is now handled via a use flag instead of package.provided. We didn't previously include a virtual/init package but Gentoo has one and I needed it for my generic systemd-only overlay so might as well include it here if it is needed in the future. --- .../profiles/features/systemd/make.defaults | 1 + .../features/systemd/package.accept_keywords | 9 +++++++++ .../profiles/features/systemd/package.mask | 4 ++++ .../profiles/features/systemd/package.unmask | 3 +++ .../profiles/features/systemd/packages | 2 ++ .../profiles/features/systemd/packages.build | 2 ++ .../profiles/features/systemd/use.mask | 2 ++ .../baselayout/baselayout-2.2-r100.ebuild | 6 ++++-- .../coreos-overlay/virtual/init/init-0.ebuild | 20 +++++++++++++++++++ 9 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask create mode 100644 sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults new file mode 100644 index 0000000000..31b1813175 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults @@ -0,0 +1 @@ +USE="systemd" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords new file mode 100644 index 0000000000..f8ac58ccf3 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords @@ -0,0 +1,9 @@ +sys-apps/systemd ~amd64 ~x86 +sys-apps/systemd-ui ~amd64 ~x86 +sys-apps/systemd-sysv-utils ~amd64 ~x86 +sys-apps/efunctions ~amd64 ~x86 + +# Various dependencies that also need to be up-to-date +sys-apps/hwids ~amd64 ~x86 +sys-apps/kmod ~amd64 ~x86 +virtual/udev ~amd64 ~x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask new file mode 100644 index 0000000000..3123811515 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.mask @@ -0,0 +1,4 @@ +# Mask sysvinit+openrc and runit+openrc in favor of systemd +sys-apps/sysvinit +sys-apps/openrc +sys-process/runit diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask new file mode 100644 index 0000000000..98fe7d9c06 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.unmask @@ -0,0 +1,3 @@ +sys-apps/systemd +sys-apps/systemd-ui +sys-apps/systemd-sysv-utils diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages new file mode 100644 index 0000000000..b0731093a1 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages @@ -0,0 +1,2 @@ +# Add systemd to the 'system' set +*sys-apps/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build new file mode 100644 index 0000000000..0c10a6cd7a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build @@ -0,0 +1,2 @@ +sys-apps/dbus +sys-apps/efunctions diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask new file mode 100644 index 0000000000..6259b323fc --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/use.mask @@ -0,0 +1,2 @@ +openrc +-systemd diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild index a7a09b2e37..7a073d2c6a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/baselayout/baselayout-2.2-r100.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.14 2013/05/20 17:56:20 ago Exp $ +EAPI=1 inherit eutils multilib DESCRIPTION="Filesystem baselayout and init scripts" @@ -12,9 +13,10 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2 LICENSE="GPL-2" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="build kernel_linux" +IUSE="build kernel_linux +openrc" -PDEPEND="sys-apps/openrc" +PDEPEND="openrc? ( sys-apps/openrc ) + !openrc? ( sys-apps/efunctions )" pkg_setup() { multilib_layout diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild new file mode 100644 index 0000000000..c08454afae --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/virtual/init/init-0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/virtual/init/init-0.ebuild,v 1.16 2012/05/16 07:40:58 heroxbd Exp $ + +DESCRIPTION="Virtual for various init implementations" +HOMEPAGE="" +SRC_URI="" + +LICENSE="" +SLOT="0" +KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="!prefix? ( + kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 + sys-apps/systemd-sysv-utils + sys-process/runit ) ) + kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) + )" +DEPEND="" From bb47bc354a59d23061d98181196718adecd06dce Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 3 Aug 2013 18:40:31 -0400 Subject: [PATCH 2/6] fix(profiles): Use systemd profile, clean init stuff from other places. Now the default/linux profile pulls in the systemd-only profile, all other things systemd/openrc/init references can go away now. --- .../third_party/coreos-overlay/profiles/base/make.defaults | 2 +- .../profiles/default/linux/package.accept_keywords | 7 ------- .../coreos-overlay/profiles/default/linux/package.provided | 4 ---- .../coreos-overlay/profiles/default/linux/package.unmask | 1 - .../coreos-overlay/profiles/default/linux/parent | 1 + .../profiles/targets/coreos/package.accept_keywords | 3 --- .../coreos-overlay/profiles/targets/coreos/package.use | 1 - 7 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index f5f2956412..6e7daf2336 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -140,7 +140,7 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" # Extra use flags for Core OS SDK (and possibly targets) # Previously defined in make.conf -USE="${USE} hardened cros_host pic pie expat -introspection -cups -openrc" +USE="${USE} hardened cros_host pic pie expat -introspection -cups" # Enable bindist for both SDK and targets USE="${USE} bindist" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords index abc7e274ab..efcad30663 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords @@ -64,12 +64,6 @@ =sys-devel/llvm-3.2 ~amd64 =dev-python/pyusb-1.0.0_alpha3 ~amd64 -# Accept the unstable nature of systemd -=sys-apps/systemd-197-r1 ~amd64 -=sys-apps/systemd-204 ~amd64 -=sys-apps/systemd-sysv-utils-194 ~amd64 -=sys-apps/dbus-1.6.8-r1 ~amd64 - # Get updated core code =sys-auth/pam_pwdfile-0.99-r1 ~amd64 =net-misc/tlsdate-0.0.5 ~amd64 @@ -95,7 +89,6 @@ # Everything needed for the boot engine >=sys-apps/kexec-tools-2.0.4-r1 ~amd64 >=sys-kernel/dracut-027-r3 ~amd64 -=sys-apps/sysvinit-tools-2.88-r4 ~amd64 # Needed for docker =sys-fs/aufs-util-3.7.6 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided index 9cb0c2094b..7e87b34be8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided @@ -5,7 +5,3 @@ # even a simple mta (like ssmtp). http://crosbug.com/5777 mail-mta/ssmtp-2.64 net-mail/mailbase-1 - -# Ideally baselayout should have a use flag to select between openrc -# and systemd but this works in the mean time. -sys-apps/openrc-9999 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask deleted file mode 100644 index 38b2155e32..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.unmask +++ /dev/null @@ -1 +0,0 @@ -=sys-apps/systemd-sysv-utils-194 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent new file mode 100644 index 0000000000..a243617a91 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent @@ -0,0 +1 @@ +../../features/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords index cb364ffe02..04665bebc6 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords @@ -64,10 +64,8 @@ =sys-apps/i2c-tools-3.0.2 amd64 arm x86 =sys-apps/keyutils-1.1 amd64 arm x86 =sys-apps/net-tools-1.60_p20090728014017-r1 amd64 arm x86 -=sys-apps/openrc-0.4.3-r4 amd64 arm x86 =sys-apps/rescan-scsi-bus-1.29 amd64 arm x86 =sys-apps/sg3_utils-1.27.20090411 amd64 arm x86 -=sys-apps/sysvinit-2.86-r12 amd64 arm x86 =sys-apps/usbutils-0.86-r1 amd64 arm x86 =sys-apps/util-linux-2.16.1 amd64 arm x86 =sys-auth/consolekit-0.3.0-r3 amd64 arm x86 @@ -79,7 +77,6 @@ =sys-fs/avfs-1.0.0 amd64 arm x86 =sys-fs/lvm2-2.02.73-r1 amd64 arm x86 =sys-fs/squashfs-4.2 amd64 arm x86 -=sys-fs/udev-171-r2 amd64 arm x86 =sys-block/btrace-1.0.0 amd64 arm x86 =x11-libs/libdrm-2.4.24 amd64 arm x86 =sys-libs/libhx-3.1 amd64 arm x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use index b07becfbf6..c0d05cd4cd 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use @@ -60,7 +60,6 @@ sys-auth/polkit -introspection sys-block/parted device-mapper sys-fs/lvm2 -lvm1 -readline -static -thin sys-fs/ntfs3g -crypt -external-fuse ntfsprogs suid -sys-fs/udev -devfs-compat -rule_generator hwdb acl gudev sys-fs/squashfs lzo sys-libs/gdbm -berkdb sys-libs/ncurses minimal From 806979675ead6dea4e1897e61c53d55cd2cb5422 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 3 Aug 2013 20:16:41 -0400 Subject: [PATCH 3/6] bump(sys-kernel/dracut): bump to 031 from gentoo Only local modification is to remove the sysvinit dependency --- .../coreos-overlay/sys-kernel/dracut/Manifest | 2 +- .../{dracut-029.ebuild => dracut-031.ebuild} | 22 ++++++------------- ...cut-functions.sh-support-for-altern.patch} | 8 +++---- ...too.conf-let-udevdir-be-handled-by-.patch} | 6 ++--- 4 files changed, 15 insertions(+), 23 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/{dracut-029.ebuild => dracut-031.ebuild} (93%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/{029-0001-dracut-functions.sh-support-for-altern.patch => 031-0001-dracut-functions.sh-support-for-altern.patch} (90%) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/{029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch => 031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch} (89%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest index bb834da0ab..3f603aef4d 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/Manifest @@ -1 +1 @@ -DIST dracut-029.tar.bz2 259163 SHA256 f32f9deb42a03878d96a06a1b365ea26cc46345fc55631502ee2f68a4c6271b9 SHA512 0b68ab67e1b9cf98b7f4fdc29e73e68495077cd7c127c6d732e5f9c26a1312c48323ce3e9595e4d08b0d6766438cda425d04bded1286b70725b53c781e572c96 WHIRLPOOL 877f6dea157e7d6435ac983121fc8e69823960a173420a3e4eb448fe95de7f0bd69d48c17090fcf99d8bafc2bf35e30fd3723fddc481512d579f93e44c06c3a8 +DIST dracut-031.tar.bz2 260601 SHA256 a62fd3d22600adc0f370d2eff474f9aec51bc3dfb2be619647f258a9805bbb77 SHA512 ddde1279cff61b6fd8567f5e21b5f8d95e935e42520a342960432749c6a085637a5e049e6fd121d491727aea3b35af59e86c8b80e55180f3b5e496aff2b6eb23 WHIRLPOOL 46c9d2a3717fd8c36aac269a213a433f6534b2a547e0b23a31ffca9a4101c69c7253358fccb8a55a0ab9b19d4c4218eb902c49a6cc0fc08c48e3cd70c40eebc2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-029.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-031.ebuild similarity index 93% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-029.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-031.ebuild index 92196d5c1a..b9ea3e2906 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-029.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/dracut-031.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.1 2013/05/20 18:22:56 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031.ebuild,v 1.1 2013/08/03 21:07:51 aidecoe Exp $ EAPI=4 -inherit eutils linux-info systemd +inherit bash-completion-r1 eutils linux-info systemd add_req_use_for() { local dep="$1"; shift @@ -71,11 +71,9 @@ CDEPEND="virtual/udev RDEPEND="${CDEPEND} app-arch/cpio >=app-shells/bash-4.0 - >=app-shells/dash-0.5.4.11 >=sys-apps/baselayout-1.12.14-r1 - || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] ) + >sys-apps/kmod-5[tools] >=sys-apps/util-linux-2.21 - sys-apps/sysvinit-tools virtual/pkgconfig debug? ( dev-util/strace ) @@ -172,14 +170,7 @@ src_prepare() { src_configure() { local myconf="--libdir='${MY_LIBDIR}'" - local bashcompletiondir=/usr/share/bash-completion - - if $(tc-getPKG_CONFIG) bash-completion --exists; then - bashcompletiondir="$($(tc-getPKG_CONFIG) bash-completion \ - --variable=completionsdir)" - fi - - myconf+=" --bashcompletiondir=${bashcompletiondir}" + myconf+=" --bashcompletiondir=$(get_bashcompdir)" if use dracut_modules_systemd; then myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'" @@ -189,8 +180,6 @@ src_configure() { } src_compile() { - emake doc - if use optimization; then ewarn "Enabling experimental optimization!" tc-export CC @@ -254,6 +243,9 @@ src_install() { # Remove extra modules which go to future dracut-extras rm_module 05busybox 97masterkey 98ecryptfs 98integrity + + # dash module is no longer supported + rm_module 00dash } pkg_postinst() { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch similarity index 90% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch index ca079ad40d..a36324a01c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch @@ -1,4 +1,4 @@ -From 3688462730a97d4cc5644dab87aadf147d8c72f0 Mon Sep 17 00:00:00 2001 +From 9a45dcf7c92d7e7b4ee7b0ff6ab61ae1a90f03f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 6 Jan 2013 13:35:01 +0100 Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs - @@ -13,10 +13,10 @@ Credits go to Alexander Tsoy . 1 file changed, 9 insertions(+) diff --git a/dracut-functions.sh b/dracut-functions.sh -index eba7412..d888f4c 100755 +index eb1278e..eaa023c 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh -@@ -961,6 +961,15 @@ inst_rules() { +@@ -960,6 +960,15 @@ inst_rules() { inst_dir "$_target" for _rule in "$@"; do if [ "${_rule#/}" = "$_rule" ]; then @@ -33,5 +33,5 @@ index eba7412..d888f4c 100755 if [[ -f $r/$_rule ]]; then _found="$r/$_rule" -- -1.8.1.5 +1.8.3.2 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch similarity index 89% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch index d110afa839..34f8e038d5 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch @@ -1,4 +1,4 @@ -From 624a97d4e2b548889b5f758ed6a908a1495b44be Mon Sep 17 00:00:00 2001 +From fc2bb603bc17e67c66ffcf53a282aa6fb6a6261c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 16 Dec 2012 20:02:48 +0100 Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and @@ -12,7 +12,7 @@ in old and new locations. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example -index 1361a30..b78e5c6 100644 +index 26e7314..f9617f0 100644 --- a/dracut.conf.d/gentoo.conf.example +++ b/dracut.conf.d/gentoo.conf.example @@ -1,7 +1,8 @@ @@ -26,5 +26,5 @@ index 1361a30..b78e5c6 100644 # -- -1.8.1.5 +1.8.3.2 From 07632fc1854616256a5503a52d5c91b66ccfe60d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 3 Aug 2013 20:21:14 -0400 Subject: [PATCH 4/6] drop(sys-apps/sysvinit-tools): was only required by dracut < 031 031 includes a shell reimplementation of pidof which is the only tool I could find that it used from sysvinit. --- .../sys-apps/sysvinit-tools/Manifest | 5 -- .../sys-apps/sysvinit-tools/files/README | 13 ---- .../files/sysvinit-2.88-makefile.patch | 60 ---------------- .../files/sysvinit-2.88-selinux.patch | 38 ---------- .../sysvinit-tools-2.88-r4.ebuild | 70 ------------------- 5 files changed, 186 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/README delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-makefile.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-selinux.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/sysvinit-tools-2.88-r4.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/Manifest deleted file mode 100644 index 8a8a5cbcc4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX README 295 SHA256 f842d28cd3372d4b96588dd4b6242901a20df404d0a84c9f0e01ce79790d9027 SHA512 be439cc96a7c99e14ac7c7e4c1bbad3857e2147f8896acc991a428e0f7c927090617d69d43ea43a953d9e8637fa1f8b6ed6358a03d85de3f0059d036697eeeb9 WHIRLPOOL da680781443eec7a0e39ca4f1e02d253d0a4ab71d36ae878208ea09cc67cb016bd98addc886280be6237b519fddcabd4a7bf4c659b28d38f45bf9364a354fb79 -AUX sysvinit-2.88-makefile.patch 1545 SHA256 34d6ee50be139ad08b620569df11ac6a4cdf3dae737733dda21a716c4064c194 SHA512 d19e260902f69dd19bfaa4f3e415a816388663a7f89b9d102b27f44c5f2d0654b64ab2e5689a20a3975ff0801e4fb96ef7b6737bfb4ba9466ec58c477de322aa WHIRLPOOL bba46046a59969ac2007c3c932bf07646a5ebece72a216990c185b8eeead724e88cd349219ae528060b9c71a5df97d1e3221691cdbb77e16c9522014c836a76d -AUX sysvinit-2.88-selinux.patch 1041 SHA256 e987ab6e478e5b3987ae1c6e338cfc66ae356f704d0c3ea932f9e4335b4986f0 SHA512 46eeb3ab2dd25f314b9f60b2dc8a7da2aa2aafb978953a730ccc36456d240e317930e86df69ce2592cf45978f3307dfc2522b24ae1158e64ff17dfa6ed84dcb8 WHIRLPOOL 4fe319df09759addf9499367a6da47e8effe93ec0a4ba5b7e7b1d0c746b324a303cdc81eb360c81e529faf41260d69e2b4364d6695b390db9dba1e3d1693c872 -DIST sysvinit-2.88dsf.tar.bz2 105551 SHA256 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf WHIRLPOOL f4809e19ea2c72c733d3c09a4964d7a6e67b091d1f1d9ef276515b2f138148bfbf516034d3fb1009289f9520f2fbe9e29687f432bba06fb437ebd6e2b9ef570c -EBUILD sysvinit-tools-2.88-r4.ebuild 1759 SHA256 09f4ca7c8114782e8de706e7d1f8545f93464df3cae573abccd0e9b24007ee4a SHA512 983eda068ba0bd91b5640951ed34688eda70e32d486bce351d5434cdadc113826ff418f64051a37a0dd223427dafe426eb140c49466b867ae7ea98c6019e5b71 WHIRLPOOL 2eeb14a42fd7c81ce5b40a65a196a162bd10f2da7b06cee156fa3c4604e1bdab234322e8da3ddc004492b501659853d475ad0498983af58bff9709dbebbacd75 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/README b/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/README deleted file mode 100644 index 7ea05b5579..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/README +++ /dev/null @@ -1,13 +0,0 @@ -This is a stripped down version of sysvinit which only -installs the following programs: - -/usr/bin/last -/usr/bin/mesg -/usr/bin/wall -/usr/bin/lastb -/sbin/killall5 -/sbin/fstab-decode -/bin/pidof - -It is made with the only purpose of having a system -with only systemd installed. Use at your own risk. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-makefile.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-makefile.patch deleted file mode 100644 index 22f463cddb..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-makefile.patch +++ /dev/null @@ -1,60 +0,0 @@ -http://savannah.nongnu.org/bugs/index.php?29758 - -From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001 -From: wfink -Date: Tue, 4 May 2010 07:50:12 +0000 -Subject: [PATCH] Fix sysvinit bug #29758 - -git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2 - -diff --git a/src/Makefile b/src/Makefile -index e2b8028..19675c5 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN) - init: LDLIBS += $(INITLIBS) $(STATIC) - init: init.o init_utmp.o - --halt: halt.o ifdown.o hddown.o utmp.o reboot.h -+halt: halt.o ifdown.o hddown.o utmp.o - --last: last.o oldutmp.h -+last: last.o - - mesg: mesg.o - -@@ -109,7 +109,7 @@ sulogin: sulogin.o - - wall: dowall.o wall.o - --shutdown: dowall.o shutdown.o utmp.o reboot.h -+shutdown: dowall.o shutdown.o utmp.o - - bootlogd: LDLIBS += -lutil - bootlogd: bootlogd.o -@@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF) - sulogin.o: sulogin.c - - init.o: CPPFLAGS += $(SELINUX_DEF) --init.o: init.c init.h set.h reboot.h initreq.h -+init.o: init.c init.h initreq.h paths.h reboot.h set.h - --utmp.o: utmp.c init.h -+utmp.o: - - init_utmp.o: CPPFLAGS += -DINIT_MAIN --init_utmp.o: utmp.c init.h -+init_utmp.o: utmp.c init.h initreq.h paths.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< - -+utmpdump.o: utmpdump.c oldutmp.h -+ -+shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h -+ -+halt.o: halt.c reboot.h -+ -+last.o: last.c oldutmp.h -+ - cleanobjs: - rm -f *.o *.bak - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-selinux.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-selinux.patch deleted file mode 100644 index 91b7435b25..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/files/sysvinit-2.88-selinux.patch +++ /dev/null @@ -1,38 +0,0 @@ -http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90 -https://bugs.gentoo.org/326697 - ---- sysvinit/trunk/src/init.c 2010/05/07 15:16:26 89 -+++ sysvinit/trunk/src/init.c 2010/05/17 09:44:34 90 -@@ -54,10 +54,6 @@ - - #ifdef WITH_SELINUX - # include --# include --# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */ --# define MNT_DETACH 2 --# endif - #endif - - #ifdef __i386__ -@@ -2872,11 +2868,9 @@ - - #ifdef WITH_SELINUX - if (getenv("SELINUX_INIT") == NULL) { -- const int rc = mount("proc", "/proc", "proc", 0, 0); -- if (is_selinux_enabled() > 0) { -- putenv("SELINUX_INIT=YES"); -- if (rc == 0) umount2("/proc", MNT_DETACH); -+ if (is_selinux_enabled() != 1) { - if (selinux_init_load_policy(&enforce) == 0) { -+ putenv("SELINUX_INIT=YES"); - execv(myname, argv); - } else { - if (enforce > 0) { -@@ -2887,7 +2881,6 @@ - } - } - } -- if (rc == 0) umount2("/proc", MNT_DETACH); - } - #endif - /* Start booting. */ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/sysvinit-tools-2.88-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/sysvinit-tools-2.88-r4.ebuild deleted file mode 100644 index ae13eb8ede..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/sysvinit-tools/sysvinit-tools-2.88-r4.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit eutils toolchain-funcs flag-o-matic - -MY_PN="sysvinit" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${MY_PN}/${MY_P}dsf.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="selinux ibm static" - -RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )" -DEPEND="${RDEPEND} - virtual/os-headers - !sys-apps/sysvinit" - -ONLY_INSTALL_REGEXP="last\\|mesg\\|wall\\|lastb\\|killall5\\|fstab-decode\\|pidof" - -S=${WORKDIR}/${MY_P}dsf - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${MY_P}-makefile.patch #319197 - epatch "${FILESDIR}"/${MY_P}-selinux.patch #326697 - sed -i '/^CPPFLAGS =$/d' src/Makefile -} - -src_compile() { - local myconf - - tc-export CC - append-lfs-flags - use static && append-ldflags -static - use selinux && myconf=WITH_SELINUX=yes - emake -C src ${myconf} || die -} - -src_install() { - emake -C src install ROOT="${D}" || die - find "${D}" -xtype f | grep -v "${ONLY_INSTALL_REGEXP}" | xargs /bin/rm -f - rmdir "${D}"/usr/include - rmdir "${D}"/usr/share/man/man5 - dodoc "${FILESDIR}"/README -} - -pkg_postinst() { - ewarn "This is an stripped down version of sysvinit which only" - ewarn "installs the following programs:" - ewarn "" - ewarn "/usr/bin/last" - ewarn "/usr/bin/mesg" - ewarn "/usr/bin/wall" - ewarn "/usr/bin/lastb" - ewarn "/sbin/killall5" - ewarn "/sbin/fstab-decode" - ewarn "/bin/pidof" - ewarn "" - ewarn "See: https://bugs.gentoo.org/show_bug.cgi?id=399615" - ewarn "" - ewarn "It is not guaranteed to work, and it will probably eat" - ewarn "your system and make it unusable. Use at your own risk." -} From 78789264636ef7039b0b5b504eaa212d3076c237 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 3 Aug 2013 20:25:54 -0400 Subject: [PATCH 5/6] drop(sys-apps/dbus): Moved to portage-stable --- .../coreos-overlay/sys-apps/dbus/ChangeLog | 1483 ----------------- .../coreos-overlay/sys-apps/dbus/Manifest | 4 - .../sys-apps/dbus/dbus-1.2.20-r4.ebuild | 142 -- .../sys-apps/dbus/dbus-1.4.1-r1.ebuild | 1 - .../sys-apps/dbus/dbus-1.4.1.ebuild | 203 --- .../sys-apps/dbus/dbus-1.4.12-r2.ebuild | 202 --- .../sys-apps/dbus/dbus-1.4.12-r5.ebuild | 209 --- .../sys-apps/dbus/dbus-1.6.8-r1.ebuild | 195 --- .../sys-apps/dbus/dbus-1.6.8.ebuild | 187 --- .../sys-apps/dbus/files/30-dbus | 9 - .../sys-apps/dbus/files/80-dbus | 13 - .../dbus/files/dbus-1.4.0-asneeded.patch | 94 -- .../dbus/files/dbus-1.4.12-match-rules.patch | 10 - .../files/dbus-1.4.12-send-print-fixed.patch | 343 ---- .../dbus/files/dbus-1.4.12-send-unix-fd.patch | 33 - .../files/dbus-1.4.12-send-variant-dict.patch | 58 - ...pping-capabilities-only-include-AUDI.patch | 39 - .../sys-apps/dbus/files/dbus-gold.patch | 12 - .../dbus/files/dbus-send-print-fixed.patch | 340 ---- .../sys-apps/dbus/files/dbus.init-1.0 | 51 - .../sys-apps/dbus/files/dbus.initd | 50 - .../files/org.freedesktop.DBus.Properties.xml | 21 - .../coreos-overlay/sys-apps/dbus/metadata.xml | 11 - 23 files changed, 3710 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild delete mode 120000 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.4.1-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.4.1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.4.12-r2.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.4.12-r5.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.8-r1.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.6.8.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/30-dbus delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/80-dbus delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-match-rules.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml delete mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog deleted file mode 100644 index e1a9edcac1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/ChangeLog +++ /dev/null @@ -1,1483 +0,0 @@ -# ChangeLog for sys-apps/dbus -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.365 2013/01/20 13:30:07 ssuominen Exp $ - - 20 Jan 2013; Samuli Suominen -files/dbus.init-1.0, - -files/dbus-1.4.0-asneeded.patch, -dbus-1.4.20.ebuild, -dbus-1.6.2.ebuild: - old - - 20 Jan 2013; Sergey Popov dbus-1.4.20.ebuild, - dbus-1.6.2.ebuild, dbus-1.6.8.ebuild: - Make build.log verbose, wrt bug #453086 - - 17 Nov 2012; Pacho Ramos dbus-1.6.8-r1.ebuild: - Show elog messages only when needed (#440526 by poletti.marco), disable silent - rules. - - 14 Oct 2012; Raúl Porcel dbus-1.6.8.ebuild: - ia64/s390/sh/sparc stable wrt #416725 - - 14 Oct 2012; Anthony G. Basile dbus-1.6.8.ebuild: - stable ppc ppc64, bug #436028 - - 14 Oct 2012; Matt Turner dbus-1.6.8.ebuild: - Stable on alpha, bug 436028. - - 06 Oct 2012; Markus Meier dbus-1.6.8.ebuild: - arm stable, bug #436028 - - 04 Oct 2012; Agostino Sarubbo dbus-1.6.8.ebuild: - Stable for amd64, wrt bug #436028 - -*dbus-1.6.8-r1 (04 Oct 2012) - - 04 Oct 2012; Pawel Hajdan jr dbus-1.6.8.ebuild, - +dbus-1.6.8-r1.ebuild: - x86 stable wrt security bug #436028 (systemd-specific code rolled to -r1, - since systemd is not stable) - - 02 Oct 2012; Jeroen Roovers dbus-1.6.8.ebuild: - Stable for HPPA (bug #436028). - - 29 Sep 2012; Zac Medico dbus-1.6.8.ebuild: - Fix for prefix and add ~x86-linux keyword. - - 29 Sep 2012; Samuli Suominen -dbus-1.4.16.ebuild, - -dbus-1.6.0.ebuild, -dbus-1.6.4.ebuild, -dbus-1.6.4-r1.ebuild, - -files/dbus-1.6.4-CVE-2012-3524-Don-t-access-environment-variables-or-.patch: - old - -*dbus-1.6.8 (29 Sep 2012) - - 29 Sep 2012; Samuli Suominen +dbus-1.6.8.ebuild: - Version bump. - -*dbus-1.6.4-r1 (22 Sep 2012) - - 22 Sep 2012; Samuli Suominen dbus-1.6.4.ebuild, - +dbus-1.6.4-r1.ebuild, - +files/dbus-1.6.4-CVE-2012-3524-Don-t-access-environment-variables-or-.patch: - Import patch for CVE-2012-3524 from Fedora 18. Again, -r0 is for stable and - -r1 for ~arch because of the systemd dependency. - - 25 Aug 2012; Mike Frysinger dbus-1.4.16.ebuild: - Drop useless -vf args to mv #432632 by Joshua B. Kahlenberg. - - 25 Jul 2012; Markus Meier dbus-1.6.2.ebuild: - arm stable, bug #416725 - - 21 Jul 2012; Jeff Horelick dbus-1.6.2.ebuild: - marked x86 per bug 416725 - - 21 Jul 2012; Samuli Suominen dbus-1.6.2.ebuild: - amd64/ppc/ppc64 stable wrt #416725 - - 21 Jul 2012; Samuli Suominen dbus-1.6.2.ebuild: - Use has_version instead of dependency for sys-apps/systemd regarding - stabilization. This is only for 1.6.2 and will be left as-is for 1.6.4. - -*dbus-1.6.4 (20 Jul 2012) - - 20 Jul 2012; Samuli Suominen +dbus-1.6.4.ebuild: - Version bump wrt #427402 by "teidakankan" - - 20 Jul 2012; Jeroen Roovers dbus-1.6.2.ebuild: - Stable for HPPA (bug #416725). - - 15 Jul 2012; Raúl Porcel dbus-1.4.20.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #412535 - - 12 Jul 2012; Akinori Hattori dbus-1.4.20.ebuild: - ia64 stable wrt bug #412535 - -*dbus-1.6.2 (27 Jun 2012) - - 27 Jun 2012; Samuli Suominen +dbus-1.6.2.ebuild: - Version bump. - - 06 Jun 2012; Samuli Suominen -dbus-1.4.16-r2.ebuild, - -dbus-1.4.18.ebuild, -dbus-1.5.12.ebuild, -dbus-1.5.12-r1.ebuild: - old - -*dbus-1.6.0 (06 Jun 2012) - - 06 Jun 2012; Samuli Suominen +dbus-1.6.0.ebuild: - Version bump. - -*dbus-1.5.12-r1 (29 May 2012) - - 29 May 2012; Samuli Suominen dbus-1.4.20.ebuild, - +dbus-1.5.12-r1.ebuild, - +files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch: - When dropping capabilities only include AUDIT caps if we have them wrt - #405975. This makes audit/selinux enabled D-Bus work in a Linux container. - Thanks to Jory A. Pratt and Hinnerk van Bruinehsen. - - 24 May 2012; Mike Frysinger dbus-1.4.16-r2.ebuild, - dbus-1.4.16.ebuild, dbus-1.4.18.ebuild, dbus-1.4.20.ebuild, - dbus-1.5.12.ebuild: - Inherit user for enewuser/etc... - - 16 May 2012; Jeroen Roovers dbus-1.4.20.ebuild: - Stable for HPPA (bug #412535). - - 15 May 2012; Samuli Suominen dbus-1.5.12.ebuild: - This is ready to enter ~arch. - -*dbus-1.5.12 (11 May 2012) - - 11 May 2012; Samuli Suominen +dbus-1.5.12.ebuild, - metadata.xml: - Version bump to development series. File dbus-1.4.0-asneeded.patch fails to - apply and should be looked into before keywording. - - 05 May 2012; Brent Baude dbus-1.4.20.ebuild: - Marking dbus-1.4.20 ppc for bug 412535 - - 05 May 2012; Raúl Porcel dbus-1.4.18.ebuild: - Revert - - 05 May 2012; Raúl Porcel dbus-1.4.18.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #403843 - - 04 May 2012; Jeff Horelick dbus-1.4.16.ebuild, - dbus-1.4.16-r2.ebuild, dbus-1.4.18.ebuild, dbus-1.4.20.ebuild: - dev-util/pkgconfig -> virtual/pkgconfig - - 28 Apr 2012; Alexis Ballier dbus-1.4.20.ebuild: - keyword ~amd64-fbsd - - 23 Apr 2012; Brent Baude dbus-1.4.20.ebuild: - Marking dbus-1.4.20 ppc64 for bug 412535 - - 22 Apr 2012; Markus Meier dbus-1.4.20.ebuild: - arm stable, bug #412535 - - 18 Apr 2012; Jeff Horelick dbus-1.4.20.ebuild: - marked x86 per bug 412535 - - 18 Apr 2012; Agostino Sarubbo dbus-1.4.20.ebuild: - Stable for amd64, wrt bug #412535 - -*dbus-1.4.20 (29 Mar 2012) - - 29 Mar 2012; Samuli Suominen +dbus-1.4.20.ebuild: - Version bump wrt #410179 by Agostino Sarubbo. Stop keeping deprecated - /usr/lib/dbus-1.0/services directory. Create symlink from /etc/machine-id to - /var/lib/dbus/machine-id because it's defined through - -DDBUS_MACHINE_UUID_FILE for tools/dbus-launch.c and might be used in unknown - reverse dependencies. - - 12 Mar 2012; Markus Meier dbus-1.4.18.ebuild: - arm stable, bug #403843 - - 12 Mar 2012; Jeff Horelick dbus-1.4.18.ebuild: - marked x86 per bug 403843 - - 09 Mar 2012; Samuli Suominen dbus-1.4.18.ebuild: - Punt PYTHON_DEPEND usage for USE="test" because we want it only in DEPEND - instead of both DEPEND and RDEPEND. - - 09 Mar 2012; Samuli Suominen dbus-1.4.18.ebuild: - amd64/ppc/ppc64 stable wrt #403843 - - 27 Feb 2012; Jeroen Roovers dbus-1.4.18.ebuild: - Stable for HPPA (bug #403843). - - 17 Feb 2012; Tobias Klausmann dbus-1.4.16-r2.ebuild: - Stable on alpha, bug #401513 - -*dbus-1.4.18 (14 Feb 2012) - - 14 Feb 2012; Samuli Suominen +dbus-1.4.18.ebuild: - Version bump. - - 01 Feb 2012; Samuli Suominen -dbus-1.4.12.ebuild: - old - - 01 Feb 2012; Samuli Suominen dbus-1.4.16.ebuild: - ppc/ppc64 stable wrt #387257 - - 27 Nov 2011; Raúl Porcel dbus-1.4.16.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #387257 - - 12 Nov 2011; Samuli Suominen dbus-1.4.16-r2.ebuild: - Fix missing SLOT in glib block by Jeroen Roovers - - 11 Nov 2011; Samuli Suominen -dbus-1.4.16-r1.ebuild: - old - - 11 Nov 2011; Samuli Suominen dbus-1.4.16-r2.ebuild: - Block any glib with obsolete path to machine-id wrt #390143 by Ewgenij - Starostin - -*dbus-1.4.16-r2 (05 Nov 2011) - - 05 Nov 2011; Samuli Suominen +dbus-1.4.16-r2.ebuild, - +files/dbus.initd: - Fix dbus-uuidgen call in init.d wrt #387713, Comment #10 by Pacho Ramos - - 29 Oct 2011; Markus Meier dbus-1.4.16.ebuild: - arm stable, bug #387257 - - 23 Oct 2011; Markus Meier dbus-1.4.16.ebuild: - x86 stable, bug #387257 - -*dbus-1.4.16-r1 (20 Oct 2011) - - 20 Oct 2011; Ian Stakenvicius +dbus-1.4.16-r1.ebuild: - Dropped keepdir on /var/run/dbus as the init.d script already ensures this - path exists (bug 387897) - - 19 Oct 2011; Jeroen Roovers dbus-1.4.16.ebuild: - Stable for HPPA (bug #387257). - - 16 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: - amd64 stable wrt #387257 - - 16 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: - Don't pass --enable-asserts with USE="debug" wrt #386699 - - 16 Oct 2011; Samuli Suominen metadata.xml: - Drop semi-inactive maintainers and use herd. - - 16 Oct 2011; Samuli Suominen -dbus-1.4.14.ebuild: - old - - 04 Oct 2011; Samuli Suominen dbus-1.4.16.ebuild: - Fix install location of system-activation.txt and remove useless dohtml wrt - #385421 by Chris Mayo - -*dbus-1.4.16 (26 Sep 2011) - - 26 Sep 2011; Samuli Suominen +dbus-1.4.16.ebuild: - Version bump wrt #384293 by "ScytheMan" - - 23 Sep 2011; Lars Wendler files/dbus.init-1.0: - non-maintainer commit: Fixed warnings in init script (bug #381883). - - 05 Aug 2011; Samuli Suominen -dbus-1.4.6.ebuild, - -dbus-1.4.8-r1.ebuild, -dbus-1.4.10.ebuild: - [This is a placeholder. Please ignore.] - -*dbus-1.4.14 (05 Aug 2011) - - 05 Aug 2011; Samuli Suominen +dbus-1.4.14.ebuild: - Version bump wrt #377603 by Sebastian Pipping. Fix API documentation building - and installing wrt #372293 by Chris Mayo. - - 03 Jul 2011; Kacper Kowalik dbus-1.4.12.ebuild: - ppc64 stable wrt #371261 - - 26 Jun 2011; Raúl Porcel dbus-1.4.12.ebuild: - arm/ia64/s390/sh/sparc/x86 stable wrt #371261 - - 22 Jun 2011; Brent Baude dbus-1.4.12.ebuild: - Marking dbus-1.4.12 ppc for bug 371261 - - 21 Jun 2011; Tobias Klausmann dbus-1.4.12.ebuild: - Stable on alpha, bug #371261 - - 17 Jun 2011; Markos Chandras dbus-1.4.12.ebuild: - Stable on amd64 wrt bug #371261 - - 16 Jun 2011; Samuli Suominen dbus-1.4.12.ebuild: - Fix missing dev-libs/glib and dev-libs/dbus-glib deps and USE="test" handling - wrt #371927 by Patrick Lauer - - 14 Jun 2011; Jeroen Roovers dbus-1.4.12.ebuild: - Stable for HPPA (bug #371261). - -*dbus-1.4.12 (12 Jun 2011) - - 12 Jun 2011; Samuli Suominen +dbus-1.4.12.ebuild: - Version bump wrt security #371261 - -*dbus-1.4.10 (08 Jun 2011) - - 08 Jun 2011; Samuli Suominen +dbus-1.4.10.ebuild: - Version bump and move machine-id from /var/lib/dbus to /etc wrt #370451 by - Michał Górny. - -*dbus-1.4.8-r1 (05 May 2011) - - 05 May 2011; Samuli Suominen +dbus-1.4.8-r1.ebuild: - Use systemd.eclass to get path for unit files wrt #365941 by Michał Górny. - - 26 Apr 2011; Samuli Suominen dbus-1.4.8.ebuild: - dev-libs/expat is required for building too. - - 23 Apr 2011; Samuli Suominen dbus-1.4.6.ebuild: - ppc64 stable wrt #360769 - - 23 Apr 2011; Raúl Porcel dbus-1.4.6.ebuild: - alpha/ia64/s390/sh/sparc stable wrt #360769 - -*dbus-1.4.8 (20 Apr 2011) - - 20 Apr 2011; Samuli Suominen +dbus-1.4.8.ebuild: - Version bump wrt #363399. Pass --without-systemdsystemunitdir to disable - systemd support wrt #363961. - - 15 Apr 2011; Christian Faulhammer dbus-1.4.6.ebuild: - stable x86, bug 360769 - - 12 Apr 2011; Jeroen Roovers dbus-1.4.6.ebuild: - Stable for HPPA (bug #360769). - - 10 Apr 2011; Markus Meier dbus-1.4.6.ebuild: - arm stable, bug #360769 - - 27 Mar 2011; Christoph Mende dbus-1.4.6.ebuild: - Stable on amd64 wrt bug #360769 - - 27 Mar 2011; Brent Baude dbus-1.4.6.ebuild: - Marking dbus-1.4.6 ppc for bug 360769 - - 03 Mar 2011; Arfrever Frehtes Taifersar Arahesis - dbus-1.4.1.ebuild, dbus-1.4.6.ebuild: - Use Python 2 during running tests (bug #357081). - -*dbus-1.4.6 (26 Feb 2011) - - 26 Feb 2011; Samuli Suominen +dbus-1.4.6.ebuild: - Version bump. - - 11 Jan 2011; Kacper Kowalik dbus-1.4.1.ebuild: - ppc stable wrt #348766 - - 04 Jan 2011; Raúl Porcel dbus-1.4.1.ebuild: - ia64/s390/sh/sparc stable wrt #348766 - - 02 Jan 2011; Tobias Klausmann dbus-1.4.1.ebuild: - Stable on alpha, bug #348766 - - 27 Dec 2010; Markus Meier dbus-1.4.1.ebuild: - arm stable, bug #348766 - - 24 Dec 2010; Samuli Suominen dbus-1.4.1.ebuild: - Use virtualx.eclass for testsuite wrt #349403 by "Nikoli". - - 23 Dec 2010; Jeroen Roovers dbus-1.4.1.ebuild: - Stable for HPPA (bug #348766). - - 22 Dec 2010; Samuli Suominen dbus-1.4.1.ebuild: - amd64/ppc64 stable wrt security #348766 - - 22 Dec 2010; Pawel Hajdan jr dbus-1.4.1.ebuild: - x86 stable wrt security bug #348766 - -*dbus-1.4.1 (21 Dec 2010) - - 21 Dec 2010; Samuli Suominen +dbus-1.4.1.ebuild: - Version bump wrt #348766 by Tim Sammut. - - 30 Oct 2010; Samuli Suominen dbus-1.4.0.ebuild: - ppc64 stable wrt #343323 - - 20 Sep 2010; Samuli Suominen dbus-1.4.0.ebuild: - Remove pregenerated files from tarball wrt #337989 by Xake. - - 18 Sep 2010; Samuli Suominen dbus-1.4.0.ebuild: - Remove USE conditional for removing .la files as dbus ships functional - pkg-config file. Remove annoying ebeep. - - 13 Sep 2010; Maciej Mrozowski dbus-1.2.24-r2.ebuild, - dbus-1.4.0.ebuild: - Fix html docs installation, bug 336762. Fix by 'zimous'. - -*dbus-1.4.0 (12 Sep 2010) - - 12 Sep 2010; Maciej Mrozowski +dbus-1.4.0.ebuild, - +files/dbus-1.4.0-asneeded.patch: - Version bump 1.4.0: ported as-needed patch, static-libs, remove .la files, - sorted deps, dohtml QA fix - -*dbus-1.3.0-r3 (09 Sep 2010) -*dbus-1.2.24-r2 (09 Sep 2010) - - 09 Sep 2010; Gilles Dartiguelongue -dbus-1.2.3-r1.ebuild, - -files/dbus-1.2.3-bsd.patch, - -files/dbus-1.2.3-panic-from-dbus_signature_validate.patch, - +dbus-1.2.24-r2.ebuild, +dbus-1.3.0-r3.ebuild: - Apply thread safety patch from master, bug #336588. Sync dbus-1.2 with 1.3 - ebuild enhancements. Clean up old revision. - -*dbus-1.3.0-r2 (05 Aug 2010) -*dbus-1.2.24-r1 (05 Aug 2010) - - 05 Aug 2010; Jim Ramsay +files/80-dbus, - +dbus-1.2.24-r1.ebuild, +dbus-1.3.0-r2.ebuild: - Fix xinitrc.d dbus startup script for interoperability with consolekit - (Bug 329317) - - 05 Aug 2010; Maciej Mrozowski - +files/dbus-1.2.24-thread-safety.patch: - Commited backport from master to 1.2.24 (bug - https://bugs.freedesktop.org/show_bug.cgi?id=17754) - patch to fix thread - safety in protected_change_timeout for further review. - - 10 Jul 2010; Jeroen Roovers dbus-1.2.24.ebuild: - Stable for HPPA (bug #321637). - - 24 May 2010; Raúl Porcel dbus-1.2.24.ebuild: - alpha/arm/ia64/s390/sh/sparc stable wrt #297031 - - 11 May 2010; Brent Baude dbus-1.2.24.ebuild: - stable ppc64, bug 297031 - - 20 Apr 2010; Samuli Suominen dbus-1.2.3-r1.ebuild, - dbus-1.2.24.ebuild, dbus-1.3.0-r1.ebuild: - Remove outdated revdep-rebuild message wrt #313959 by Dirk-Lüder Kreie. - - 16 Apr 2010; Brent Baude dbus-1.2.24.ebuild: - stable ppc, bug 297031 - - 15 Apr 2010; Steev Klimaszewski -dbus-1.2.12.ebuild: - dbus: Remove dbus 1.2.12, it only had unstable keywords, and 1.2.24 is - currently being stabled. - - 09 Apr 2010; Pacho Ramos dbus-1.2.24.ebuild: - amd64 stable, bug 297031 - - 08 Apr 2010; Christian Faulhammer dbus-1.2.24.ebuild: - stable x86, bug 297031 - - 26 Mar 2010; Samuli Suominen dbus-1.2.24.ebuild, - dbus-1.3.0-r1.ebuild: - Don't unpack() in src_prepare and create messagebus user in pkg_setup() - wrt #222551 by Tim Yamin. - -*dbus-1.2.24 (25 Mar 2010) - - 25 Mar 2010; -dbus-1.2.22.ebuild, +dbus-1.2.24.ebuild: - dbus: New upstream release, fixes a crasher with syslogging. Also move - to using EAPI-2, side results are not dying after successfully - installing when using xorg-server-9999 (and eventually xorg-server 1.8.) - Should also fix bug #222551, so that the messagebus user/group get - created before src_install. - -*dbus-1.2.22 (21 Mar 2010) - - 21 Mar 2010; -dbus-1.2.20.ebuild, +dbus-1.2.22.ebuild: - dbus: bump 1.2.20 to 1.2.22 - -*dbus-1.2.20 (03 Feb 2010) - - 03 Feb 2010; -files/0001-Fix-inotify-shutdown.patch, - -dbus-1.2.18.ebuild, - -files/0002-Fix-compilation-in-disable-selinux-case.patch, - +dbus-1.2.20.ebuild: - New upstream release, includes the 2 patches we had applied to 1.2.18 - -*dbus-1.2.18 (03 Feb 2010) - - 03 Feb 2010; +files/0001-Fix-inotify-shutdown.patch, - +dbus-1.2.18.ebuild, - +files/0002-Fix-compilation-in-disable-selinux-case.patch: - Bump dbus, add 2 patches from upstream, one to fix a compilation issue - with selinux disabled, the other to move the shutdown handler into - inotify. - - 23 Nov 2009; Gilles Dartiguelongue dbus-1.3.0-r1.ebuild: - Add missing docbook-xml-dtd:4.1.2 dependency, bug #293867. - - 05 Nov 2009; Gilles Dartiguelongue dbus-1.3.0-r1.ebuild: - Build doc in and only once, bug #291735. - -*dbus-1.3.0-r1 (01 Nov 2009) - - 01 Nov 2009; Gilles Dartiguelongue +dbus-1.3.0-r1.ebuild: - Version bump. - * Do not install unsafe, test dedicated dbus, bug #287722. - * Generate dbus UUID at postinst, bug #258516. - * Generate and install doxygen doc, bug #194077. - * Drop -rdynamic, dbus handles it by itself with USE=debug, bug #267090. - * Do not die because of unsupported CFLAG, bug #274456. - - 08 Aug 2009; Diego E. Pettenò dbus-1.3.0.ebuild, - +files/dbus-1.3.0-no-cloexec.patch: - Add patch from upstream to fix check for cloexec (bug #280299). No - revbump, but it didn't use cloexec there before. - - 08 Aug 2009; Diego E. Pettenò dbus-1.3.0.ebuild: - Remove ~x86-fbsd keyword as per bug #280299 for now. - - 05 Aug 2009; Samuli Suominen dbus-1.3.0.ebuild, - +files/dbus-1.3.0-asneeded.patch: - Fix test suite building with -Wl,--as-needed (undefined reference to - clock_gettime) wrt #280170. - -*dbus-1.3.0 (03 Aug 2009) - - 03 Aug 2009; +dbus-1.3.0.ebuild: - Add dbus 1.3.0. - - 26 Jul 2009; Gilles Dartiguelongue - -files/dbus-1.0.1-fixfilecreation.patch, -dbus-1.0.2-r2.ebuild, - -dbus-1.1.4.ebuild, -files/dbus-1.1.4-xdisplay_null.patch, - -dbus-1.1.20.ebuild, -files/dbus-1.1.20-fix-build.patch, - -dbus-1.2.1.ebuild, -dbus-1.2.3.ebuild: - Clean up old revisions, notably for security issues, bug #271769. - - 23 Apr 2009; Nirbheek Chauhan dbus-1.2.12: - Fix bug 267125 (murphy's law causes a two-character change before cvs - commit to cause build-failure) - - 23 Apr 2009; Nirbheek Chauhan dbus-1.2.12: - Fix bug 267111 (check if xorg-server is installed before checking for hal - USE flag on it) - -*dbus-1.2.12 (21 Apr 2009) - - 21 Apr 2009; Nirbheek Chauhan +dbus-1.2.12.ebuild: - Add dbus-1.2.12, reviewed by steev - - 05 Feb 2009; Alexis Ballier - +files/dbus-1.2.3-bsd.patch, dbus-1.2.3-r1.ebuild: - Backport an upstream patch to fix runtime error on FreeBSD, bug #236779 - and rekeyword it for x86-fbsd - - 15 Jan 2009; Peter Alfredsen metadata.xml: - Compnerd retired. - - 13 Jan 2009; Doug Goldstein metadata.xml: - gentopia is becoming freedesktop - - 25 Nov 2008; Alexis Ballier dbus-1.2.3.ebuild, - dbus-1.2.3-r1.ebuild: - keyword -x86-fbsd, doesn't work, bug #236779 - - 11 Oct 2008; Tobias Scherbaum - dbus-1.2.3-r1.ebuild: - ppc stable, bug #240308 - - 08 Oct 2008; Raúl Porcel dbus-1.2.3-r1.ebuild: - alpha/ia64 stable wrt #240308 - - 07 Oct 2008; Friedrich Oslage dbus-1.2.3-r1.ebuild: - Stable on sparc, security bug #240308 - - 07 Oct 2008; Jeroen Roovers dbus-1.2.3-r1.ebuild: - Stable for HPPA (bug #240308). - - 06 Oct 2008; Markus Meier dbus-1.2.3-r1.ebuild: - amd64/x86 stable, bug #240308 - - 06 Oct 2008; Markus Rothe dbus-1.2.3-r1.ebuild: - Stable on ppc64; bug #240308 - -*dbus-1.2.3-r1 (06 Oct 2008) - - 06 Oct 2008; Doug Goldstein - +files/dbus-1.2.3-panic-from-dbus_signature_validate.patch, - +dbus-1.2.3-r1.ebuild: - Fix potential DoS issue. fdo bug #17803. Gentoo bug #240308 - - 06 Oct 2008; dbus-1.0.2-r2.ebuild, dbus-1.1.4.ebuild, - dbus-1.1.20.ebuild, dbus-1.2.1.ebuild, dbus-1.2.3.ebuild: - Remove the autotools calls, and the enewuser/enewgroup || die calls. - -*dbus-1.2.3 (12 Aug 2008) - - 12 Aug 2008; Steev Klimaszewski +dbus-1.2.3.ebuild: - Bump dbus to 1.2.3 - -*dbus-1.2.1 (05 Apr 2008) - - 05 Apr 2008; Steev Klimaszewski +dbus-1.2.1.ebuild: - New release, includes X11 building fix and other misc changes. - - 04 Mar 2008; Tobias Scherbaum dbus-1.1.20.ebuild: - ppc stable, bug #211451 - - 29 Feb 2008; Jeroen Roovers dbus-1.1.20.ebuild: - Stable for HPPA (bug #211451). - - 29 Feb 2008; Brent Baude dbus-1.1.20.ebuild: - Marking dbus-1.1.20 ppc64 for bug 211451 - - 28 Feb 2008; Raúl Porcel dbus-1.1.20.ebuild: - alpha/ia64/sparc stable wrt security #211451 - - 28 Feb 2008; Christian Faulhammer dbus-1.1.20.ebuild: - stable x86, security bug 211451 - - 28 Feb 2008; Steve Dibb dbus-1.1.20.ebuild: - amd64 stable, sec bug 211451 - - 28 Feb 2008; Steev Klimaszewski - +files/dbus-1.1.20-fix-build.patch, dbus-1.1.20.ebuild: - Add patch so dbus 1.1.20 builds without X - -*dbus-1.1.20 (27 Feb 2008) - - 27 Feb 2008; Doug Klima +dbus-1.1.20.ebuild: - fix for CVE-2008-0595. potentially fixes bug #211076 - - 12 Feb 2008; Steev Klimaszewski dbus-1.1.4.ebuild: - Disable libaudit when not using SELinux. Should close bug #209571. - Thanks to jamatik for reporting. - - 07 Feb 2008; Steev Klimaszewski dbus-1.1.4.ebuild: - Only patch if we are building with use X, the patch causes an error when - built without X. Fixes bug #209175. Thanks to Nikolay S. Rybaloff for - reporting. - - 06 Feb 2008; Steev Klimaszewski dbus-1.0.2-r2.ebuild, - dbus-1.1.4.ebuild: - Fix minor elog typo. Closes bug #208799. Thanks to Imre Péntek - for reporting. - - 05 Feb 2008; Steev Klimaszewski - +files/dbus-1.1.4-xdisplay_null.patch, dbus-1.1.4.ebuild: - Add a patch from Matthias Clasen to fix dbus-launch hanging around after you - exit X - - 18 Jan 2008; Steev Klimaszewski dbus-1.1.4.ebuild: - Change make install to use emake. Add warning along with ebeep to inform - users using Xorg with the hal useflag that restarting DBus will also restart - their X session. - -*dbus-1.1.4 (17 Jan 2008) - - 17 Jan 2008; Steev Klimaszewski - -files/dbus-inotify-fix-thoenig-01.patch, -dbus-1.1.3-r1.ebuild, - +dbus-1.1.4.ebuild: - New release candidate - the same as 1.1.3-r1 but upstream felt it was better - to release a new tarball - -*dbus-1.1.3-r1 (17 Jan 2008) - - 17 Jan 2008; Steev Klimaszewski - +files/dbus-inotify-fix-thoenig-01.patch, -dbus-1.1.3.ebuild, - +dbus-1.1.3-r1.ebuild: - Bug in 1.1.3's inotify release, adding a patch with a revision bump from - Timo Hoenig to fix the issue. - -*dbus-1.1.3 (16 Jan 2008) - - 16 Jan 2008; Steev Klimaszewski +dbus-1.1.3.ebuild: - New upstream release, this is 1.2RC0, very stable release, give it some - testing! - - 13 Dec 2007; Doug Klima -dbus-1.0.2-r1.ebuild: - remove old version - - 11 Jul 2007; Roy Marples dbus-1.0.2-r2.ebuild: - Keyworded ~sparc-fbsd. - Only install files in /etc/X11 if we USE X. - Fix QA warnings regaring kenerl_linux and kernel_FreeBSD. - - 05 Jun 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: - generate the machine-id during pkg_postinst() for users that only use a - session bus - - 13 May 2007; Joshua Kinard dbus-1.0.2-r2.ebuild: - Stable on mips, per #174807. - - 22 Apr 2007; Tobias Scherbaum - dbus-1.0.2-r2.ebuild: - ppc stable, bug #174807 - - 17 Apr 2007; Jeroen Roovers dbus-1.0.2-r2.ebuild: - Stable for HPPA (bug #174807). - - 17 Apr 2007; Gustavo Zacarias dbus-1.0.2-r2.ebuild: - Stable on sparc wrt #174807 - - 16 Apr 2007; Bryan Østergaard dbus-1.0.2-r2.ebuild: - Stable on Alpha, bug 174807. - - 16 Apr 2007; Raúl Porcel dbus-1.0.2-r2.ebuild: - ia64 stable wrt bug 174807 - - 16 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: - Change elog as per bug #168262 - - 16 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: - keepdir system.d for bug #157629 - - 16 Apr 2007; Markus Rothe dbus-1.0.2-r2.ebuild: - Stable on ppc64 - - 06 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: - Fix up SELinux support - - 04 Apr 2007; Doug Goldstein files/dbus.init-1.0: - Remove init script hack for parallel starting since HAL is now fixed. - - 04 Apr 2007; Doug Goldstein dbus-1.0.2-r2.ebuild: - stable for amd64 and x86 - -*dbus-1.0.2-r2 (03 Apr 2007) - - 03 Apr 2007; Doug Goldstein - -files/dbus-0.60-decls-ansi-c.patch, - -files/dbus-0.60-mono-return-null-fix.diff, -files/dbus-0.60-qt-pc.patch, - -files/dbus.init-0.61, -files/dbus-0.61-i-hate-qt-so-much.patch, - -files/dbus-0.61-libxml-dep.patch, - -files/dbus-0.61-mono-tools-update.diff, - -files/dbus-0.61-qt-disabling.patch, - -files/dbus-0.62-match-rule-security-fix.patch, metadata.xml, - -dbus-0.61-r1.ebuild, -dbus-0.62-r2.ebuild, -dbus-1.0.2.ebuild, - +dbus-1.0.2-r2.ebuild: - rev bump to add -rdynamic to get backtraces. Clean up old files and ebuilds. - -*dbus-1.0.2-r1 (23 Feb 2007) - - 23 Feb 2007; Roy Marples files/dbus.init-1.0, - +dbus-1.0.2-r1.ebuild: - Bump for a non bash init script. - - 09 Feb 2007; Alexander H. Færøy dbus-1.0.2.ebuild: - Stable on MIPS; bug #154522 - - 09 Feb 2007; Bryan Østergaard dbus-1.0.2.ebuild: - Stable on Alpha, bug 154522. - - 06 Feb 2007; Doug Goldstein dbus-0.62-r2.ebuild: - Removing keywords for ebuilds that are no longer supported. alpha and mips - are on unsupported versions still - - 29 Jan 2007; Gustavo Zacarias dbus-1.0.2.ebuild: - Stable on sparc wrt #154522 - - 23 Jan 2007; Jeroen Roovers dbus-1.0.2.ebuild: - Stable for HPPA (bug #154522). - - 22 Jan 2007; Olivier Crête dbus-1.0.2.ebuild: - Stable on amd64 per bug #154522 - - 21 Jan 2007; Andrej Kacian dbus-1.0.2.ebuild: - Stable on x86, bug #154522. - - 21 Jan 2007; Markus Rothe dbus-1.0.2.ebuild: - Stable on ppc64; bug #154522 - - 21 Jan 2007; nixnut dbus-1.0.2.ebuild: - Stable on ppc wrt bug 154522 - - 08 Jan 2007; Roy Marples files/dbus.init-1.0: - init script needs localmount so it can create a pidfile correctly. - init script is after bootmisc so the pidfile doesn't get erased in a - parallel boot. - - 05 Jan 2007; Saleem Abdulrasool dbus-0.62-r2.ebuild: - fix up debug codepaths for qt bindings (bug #160112), disable qt4 on mips - - 05 Jan 2007; Doug Goldstein dbus-0.61-r1.ebuild, - dbus-0.62-r2.ebuild, dbus-1.0.2.ebuild: - remove debug.eclass and add debug USE flag - - 18 Dec 2006; Bryan Østergaard Manifest: - Fix broken digest. Thanks to Caster reporting it in #gentoo-bugs. - - 17 Dec 2006; Alexander H. Færøy - +files/dbus-0.60-decls-ansi-c.patch, - +files/dbus-0.60-mono-return-null-fix.diff, +files/dbus-0.60-qt-pc.patch, - +files/dbus-0.61-i-hate-qt-so-much.patch, - +files/dbus-0.61-libxml-dep.patch, +files/dbus-0.61-qt-disabling.patch, - +dbus-0.61-r1.ebuild: - Regenrating dbus-0.61-r1 with mips stable only. - - 17 Dec 2006; Doug Goldstein -dbus-0.61-r1.ebuild, - -dbus-0.62-r1.ebuild: - Removing security affected versions. This means mips loses their stable, - but they were warned. - - 16 Dec 2006; Bryan Østergaard dbus-0.62-r2.ebuild: - Stable on Alpha, bug 154522. - - 13 Dec 2006; Brent Baude dbus-0.62-r2.ebuild: - Marking dbus-0.62-r2 ppc64 for bug 156681 - - 13 Dec 2006; Jeroen Roovers dbus-0.62-r2.ebuild: - Stable for HPPA (bug #156681). - - 13 Dec 2006; Michael Cummings dbus-0.62-r2.ebuild: - Keywording amd64, bug 156681 - - 13 Dec 2006; Gustavo Zacarias dbus-0.62-r2.ebuild: - Stable on sparc wrt security #156681 - - 13 Dec 2006; Tobias Scherbaum dbus-0.62-r2.ebuild: - ppc stable, bug #156681 - - 13 Dec 2006; Christian Faulhammer dbus-0.62-r2.ebuild: - stable x86, security bug #156681 - -*dbus-0.62-r2 (13 Dec 2006) - - 13 Dec 2006; Doug Goldstein - +files/dbus-0.62-match-rule-security-fix.patch, +dbus-0.62-r2.ebuild: - Backported security fix for CVE-2006-6107 to 0.6x series - - 13 Dec 2006; Doug Goldstein dbus-0.62-r1.ebuild, - dbus-1.0.2.ebuild: - re-adding ~mips to dbus-0.62-r1 & dbus-1.0.2 - -*dbus-1.0.2 (13 Dec 2006) - - 13 Dec 2006; Doug Goldstein - -files/dbus-1.0.1-pthread-holder-fix.diff, -dbus-1.0.1.ebuild, - -dbus-1.0.1-r1.ebuild, -dbus-1.0.1-r2.ebuild, +dbus-1.0.2.ebuild: - Rev bump 1.0.2. Security fix for CVE-2006-6107. Gentoo bug #156681. fd.o bug - #9142. Removing prior vunerable versions (except current stable) - - 10 Dec 2006; Lars Weiler dbus-0.62-r1.ebuild: - Stable on ppc now; bug #154522. - -*dbus-1.0.1-r2 (04 Dec 2006) - - 04 Dec 2006; Doug Goldstein - +files/dbus-1.0.1-fixfilecreation.patch, dbus-1.0.1-r1.ebuild, - +dbus-1.0.1-r2.ebuild: - Fix dnotify on file creation - - 02 Dec 2006; Doug Goldstein dbus-0.62-r1.ebuild: - Fix bug #156225. Masking -fstack-protector-all - - 01 Dec 2006; Jeroen Roovers dbus-0.62-r1.ebuild: - Stable for HPPA (bug #154522, on HPPA weeks last longer!). - -*dbus-1.0.1-r1 (19 Nov 2006) - - 19 Nov 2006; Doug Goldstein -files/dbus.init-0.95, - -files/dbus-0.95-pass-context.patch, +files/dbus.init-1.0, - +files/dbus-1.0.1-pthread-holder-fix.diff, -dbus-0.95.ebuild, - dbus-1.0.1.ebuild, +dbus-1.0.1-r1.ebuild: - pthreads assertion fix from upstream - - 19 Nov 2006; Lars Weiler dbus-0.62-r1.ebuild: - Reverting to ~ppc due to build-failure with current stable qt - (x11-libs/qt-4.1.4-r2); see bug #154522. - - 18 Nov 2006; nixnut dbus-0.62-r1.ebuild: - Stable on ppc wrt bug 154522 - -*dbus-1.0.1 (17 Nov 2006) - - 17 Nov 2006; Steev Klimaszewski -dbus-1.0.0.ebuild, - +dbus-1.0.1.ebuild: - New point release of D-Bus. Fixes an issue with dbus_threads_init_default - asserting when called. It also cleans up the uuid documentation and makes - uuid's conform to the spec. - - 17 Nov 2006; Andrej Kacian dbus-0.62-r1.ebuild: - Stable on x86, bug #154522. - - 15 Nov 2006; Markus Rothe dbus-0.62-r1.ebuild: - Stable on ppc64; bug #154522 - - 10 Nov 2006; Steve Dibb dbus-0.62-r1.ebuild: - amd64 stable, bug 154522 - -*dbus-1.0 (10 Nov 2006) - - 10 Nov 2006; Doug Goldstein -dbus-0.94.ebuild, - +dbus-1.0.0.ebuild: - Adding D-Bus 1.0.0 - - 09 Nov 2006; Gustavo Zacarias dbus-0.62-r1.ebuild: - Stable on sparc wrt #154522 - - 06 Nov 2006; Timothy Redaelli dbus-0.95.ebuild: - Added ~x86-fbsd keyword. - - 05 Nov 2006; Doug Goldstein - +files/dbus-0.95-pass-context.patch, dbus-0.62-r1.ebuild, - dbus-0.95.ebuild: - Apply patch from FreeDesktop.org bug #8298 for FreeBSD support. Removed an - unnecessary patch and comment from 0.62 since we switched to expat from - libxml. - -*dbus-0.95 (05 Nov 2006) - - 05 Nov 2006; Doug Goldstein +files/dbus.init-0.95, - +dbus-0.95.ebuild: - rev bump. Changed init script to generate machine id as per new upstream - recommendation. Cleaned up initscript. - - 05 Nov 2006; Ilya A. Volynets-Evenbakh - dbus-0.61-r1.ebuild: - Stabilize dbus on mips - - 03 Nov 2006; Sven Wegener dbus-0.62-r1.ebuild, - dbus-0.94.ebuild: - Fixup the hasq check. - - 02 Nov 2006; Caleb Tennis dbus-0.62-r1.ebuild: - Modify ebuild to build only against Qt-4.1, as it fails against Qt-4.2 - - even with dbus disabled - - 31 Oct 2006; Doug Goldstein dbus-0.62-r1.ebuild: - Fixing bug #149656 - - 31 Oct 2006; Doug Goldstein -files/dbus.init-0.60, - -files/dbus-0.60-gcj.patch, -files/dbus-0.60-gcj-2.patch, - -files/dbus-0.60-mono-arguments.patch, -files/dbus-0.60-mono-docs.patch, - -files/dbus-0.60-qdbusmarshall.patch, -files/dbus-0.60-qt.patch, - -dbus-0.60-r4.ebuild, -dbus-0.62.ebuild: - Removed previous versions and old patches - - 30 Oct 2006; Doug Goldstein -dbus-0.91.ebuild: - Removing dbus 0.91 since it's for dbus-core - -*dbus-0.94 (30 Oct 2006) - - 30 Oct 2006; Doug Goldstein +dbus-0.94.ebuild: - Moving dbus-core back over as dbus - - 20 Oct 2006; Aron Griffis dbus-0.61-r1.ebuild: - Mark 0.61-r1 stable on alpha - - 22 Sep 2006; Doug Goldstein - -files/dbus-0.23.2-python_api.patch, -files/dbus-0.23.2-version_fix.patch, - -files/dbus-0.23-dbus_session_connect.patch, - -files/dbus-0.23-fd_set.patch, -files/dbus-0.23-pyexecdir.patch, - -files/dbus-0.23-qt.patch, -files/dbus-dnotify_configure-01.diff, - -files/dbus-dnotify_watchdirs-01.diff, -files/dbus, - -dbus-0.23.4-r1.ebuild: - Removed the old dbus-0.23 series\! - -*dbus-0.62-r1 (21 Sep 2006) - - 21 Sep 2006; Doug Goldstein -dbus-0.50-r2.ebuild, - +dbus-0.62-r1.ebuild: - Switching to expat from libxml2 since now libxml2 suffers from bitrot - instead of expat. Removed old version. - - 23 Aug 2006; Jeroen Roovers dbus-0.61-r1.ebuild: - Stable for HPPA (bug #137325). - - 23 Aug 2006; Steev Klimaszewski dbus-0.91.ebuild: - Block versions less than ourself. So we can up/downgrade properly. - - 21 Aug 2006; Stefan Schweizer dbus-0.91.ebuild: - qt3 was missing in IUSE, thanks jakub - - 20 Aug 2006; Stefan Schweizer dbus-0.91.ebuild: - depend on old qt3 bindings for backwards compatibility, new apps should - directly depend on the bindings - -*dbus-0.91 (18 Aug 2006) - - 18 Aug 2006; Steev Klimaszewski +dbus-0.91.ebuild: - New upstream release, package.masked because there are no qt3 bindings, - someone needs to either work on them, or incorporate them into the KDE apps - that use dbus, this MUST stay package.masked until KDE bumps to all using - QT4, or someone steps up and fixes the qt3 bindings (they need a lot of - love) - - 12 Jul 2006; Aron Griffis dbus-0.61-r1.ebuild: - Mark 0.61-r1 stable on ia64. #137325 - - 05 Jul 2006; Chris Gianelloni dbus-0.61-r1.ebuild: - Stable on x86 wrt bug #137325. - - 04 Jul 2006; Doug Goldstein dbus-0.62.ebuild: - Fix typo that shouldn't really affect compiles - - 03 Jul 2006; Luis Medinas dbus-0.61-r1.ebuild: - Stable on amd64. Bug #137325. - - 02 Jul 2006; Lars Weiler dbus-0.61-r1.ebuild: - Stable on ppc; bug #137325. - - 30 Jun 2006; Markus Rothe dbus-0.61-r1.ebuild: - Stable on ppc64; bug #137325 - - 30 Jun 2006; Gustavo Zacarias dbus-0.61-r1.ebuild: - Stable on sparc wrt #137325 - - 30 Jun 2006; Doug Goldstein dbus-0.62.ebuild: - updating qt4 depends bug #138391 - - 24 Jun 2006; Doug Goldstein dbus-0.23.4-r1.ebuild, - dbus-0.50-r2.ebuild: - USE flag change qt->qt3/qt4 bug #137785 - - 23 Jun 2006; Doug Goldstein -dbus-0.50-r1.ebuild, - -dbus-0.60-r3.ebuild, dbus-0.60-r4.ebuild, dbus-0.61-r1.ebuild: - removing old revs. Changed qt USE flag to qt3/qt4 in all instances - - 20 Jun 2006; Doug Goldstein dbus-0.62.ebuild: - Unfortunately genstef was wrong and didn't speak to anyone before making the - change that he did. Now he understand it, switching back. - - 20 Jun 2006; Stefan Schweizer dbus-0.62.ebuild: - qt3 -> qt, fix digest - -*dbus-0.62 (20 Jun 2006) - - 20 Jun 2006; Doug Goldstein +dbus-0.62.ebuild: - Rev bumped to 0.62. Had to remove arm, sh, and mips due to repoman issues. - Bug #137325 - - 27 Apr 2006; Alec Warner files/digest-dbus-0.23.4-r1, - files/digest-dbus-0.50-r1, files/digest-dbus-0.50-r2, - files/digest-dbus-0.60-r4, Manifest: - Fixing SHA256 digest, pass four - - 21 Apr 2006; Steev Klimaszewski files/dbus.init-0.60: - Update the dbus 0.60 init script as well with the nscd/dns dependencies. - - 21 Apr 2006; Steev Klimaszewski files/dbus.init-0.61: - Update the 0.61 init script to start after nscd/dns, fixes an apparent problem - reported by Uberlord on amd64. - - 09 Apr 2006; Steev Klimaszewski dbus-0.23.4-r1.ebuild, - dbus-0.50-r1.ebuild, dbus-0.50-r2.ebuild, dbus-0.60-r3.ebuild, - dbus-0.60-r4.ebuild: - Migrate the xml2 useflag to be xml, per bug #79178 - -*dbus-0.61-r1 (27 Mar 2006) - - 27 Mar 2006; Doug Goldstein - +files/dbus-0.60-mono-return-null-fix.diff, +files/dbus.init-0.61, - +dbus-0.61-r1.ebuild: - Mono bindings fix. New Initscript - - 16 Mar 2006; Doug Goldstein - +files/dbus-0.61-i-hate-qt-so-much.patch, - +files/dbus-0.61-libxml-dep.patch, +files/dbus-0.61-qt-disabling.patch, - dbus-0.61.ebuild: - Adding some necessary patches to fix QT mess. - - 15 Mar 2006; Doug Goldstein dbus-0.61.ebuild: - disable QT4 support - - 14 Mar 2006; Joe McCann - +files/dbus-0.60-decls-ansi-c.patch: - Add missing patch to cvs - - 14 Mar 2006; Doug Goldstein files/dbus.init-0.60: - Handle PEBCAK error - -*dbus-0.61 (14 Mar 2006) - - 14 Mar 2006; Doug Goldstein - +files/dbus-0.61-mono-tools-update.diff, +dbus-0.61.ebuild: - rev bump. dropped gcj support since the bindings are unmaintained and broken - and were problematic. Fixed monodoc depends to only require monodoc rather - then mono-tools as well. - - 10 Mar 2006; Michael Hanselmann dbus-0.60-r4.ebuild: - Stable on ppc. - - 21 Feb 2006; Jeroen Roovers dbus-0.60-r4.ebuild: - Stable on hppa. - - 19 Feb 2006; Joshua Kinard dbus-0.60-r4.ebuild: - Revert mips stabilization for 0.60-r4. According to geoman, there are still - some unresolved issues with it on mips. - - 19 Feb 2006; Joshua Kinard dbus-0.60-r4.ebuild: - Marked stable on mips. - - 19 Feb 2006; Saleem Abdulrasool dbus-0.60-r4.ebuild: - stable on x86 as per bug 122846 - - 17 Feb 2006; Aron Griffis dbus-0.60-r4.ebuild: - Mark 0.60-r4 stable on alpha/ia64 - - 16 Feb 2006; Chris Gianelloni dbus-0.23.4-r1.ebuild: - Ported dbus-0.23.4-r1.ebuild to modular X dependencies. - - 16 Feb 2006; dbus-0.60-r4.ebuild: - Marked stable on amd64 - - 16 Feb 2006; Gustavo Zacarias dbus-0.60-r4.ebuild: - Stable on sparc wrt #122846 - - 15 Feb 2006; Markus Rothe dbus-0.60-r4.ebuild: - Stable on ppc64; bug #122846 - - 07 Feb 2006; Aron Griffis dbus-0.60-r3.ebuild: - Mark 0.60-r3 stable on alpha - - 01 Feb 2006; Doug Goldstein ChangeLog: - New patch for gcj handling detection of jar. Use emake -j1 to let gcj - compile. 2 AMD64 fixes as well. - - 22 Jan 2006; Tobias Scherbaum dbus-0.60-r3.ebuild: - ppc stable, bug #113826 - - 22 Jan 2006; Markus Rothe dbus-0.60-r3.ebuild: - Stable on ppc64; bug #113826 - - 22 Jan 2006; dbus-0.60-r3.ebuild: - Marked stable on amd64 per bug #113826 - - 21 Jan 2006; Saleem Abdulrasool dbus-0.60-r3.ebuild: - stable on x86 as per bug #113818 - - 20 Jan 2006; Gustavo Zacarias dbus-0.60-r3.ebuild: - Stable on sparc wrt #119634 #113826 - - 19 Jan 2006; Saleem Abdulrasool dbus-0.50-r1.ebuild, - dbus-0.50-r2.ebuild, dbus-0.60-r3.ebuild: - Fix GTK+ dependencies as per bug #119415 - - 06 Jan 2006; Chris PeBenito dbus-0.60-r3.ebuild: - Add explicit handling of SELinux support. - - 04 Jan 2006; Doug Goldstein -dbus-0.23-r3.ebuild, - dbus-0.60-r3.ebuild: - Some more ideas with QT. Even though it's now acknowledged by the QT guys - that it's a bug on their side. Changed gcj to detect current running version - rather then best installed. (thx eradicator) - - 03 Jan 2006; Rene Nussbaumer dbus-0.23.4-r1.ebuild: - Stable on hppa. - - 03 Jan 2006; dbus-0.23.4-r1.ebuild: - Stable on IA64; bug #116242. - -*dbus-0.60-r3 (03 Jan 2006) - - 03 Jan 2006; Doug Goldstein -dbus-0.60-r2.ebuild, - +dbus-0.60-r3.ebuild: - No changes, just rev bump since I didn't fix the init script before it hit - the mirrors. - - 02 Jan 2006; Doug Goldstein dbus-0.60-r2.ebuild: - switched to newinitd - - 02 Jan 2006; Michael Hanselmann dbus-0.23.4-r1.ebuild: - Stable on ppc. - - 02 Jan 2006; Doug Goldstein dbus-0.23.4-r1.ebuild: - Tweaked some QT related stuff. - -*dbus-0.60-r2 (02 Jan 2006) - - 02 Jan 2006; Doug Goldstein - +files/dbus-0.60-gcj.patch, +files/dbus-0.60-mono-docs.patch, - +files/dbus-0.60-qt.patch, +files/dbus-0.60-qt-pc.patch, - -dbus-0.60-r1.ebuild, +dbus-0.60-r2.ebuild: - Fixed gcj issues. Fixed QT issues (except QT4 support, only QT3 support). - Added dbus-qt-1.pc file. Fixed issues when USE="doc mono". - - 31 Dec 2005; Markus Rothe dbus-0.23.4-r1.ebuild: - Stable on ppc64 - - 30 Dec 2005; Gustavo Zacarias dbus-0.23.4-r1.ebuild: - Stable on sparc wrt #116242 - - 30 Dec 2005; Doug Goldstein - -files/dbus-0.23.2-abi_api.patch, -dbus-0.36.2.ebuild: - compnerd got nutsy and messed up the digest. Also deleted 1 unnecessary patch. - - 30 Dec 2005; Saleem Abdulrasool - dbus-0.23.4-r1.ebuild: - stable on x86 - - 29 Dec 2005; Simon Stelling dbus-0.23.4-r1.ebuild: - stable on amd64 - - 26 Dec 2005; Saleem Abdulrasool dbus-0.50-r2.ebuild: - Dropping the gcj USE flag as it is currently not functional. - - 26 Dec 2005; Bryan Østergaard dbus-0.50-r2.ebuild: - Comment out gcj support since it really didn't work. - -*dbus-0.60-r1 (21 Dec 2005) -*dbus-0.50-r2 (21 Dec 2005) - - 21 Dec 2005; Doug Goldstein -dbus-0.23.2.ebuild, - -dbus-0.23.2-r1.ebuild, -dbus-0.23.4.ebuild, -dbus-0.50.ebuild, - +dbus-0.50-r2.ebuild, -dbus-0.60.ebuild, +dbus-0.60-r1.ebuild: - change libxml2 depend to 2.6.21 because of bugs in that package made dbus - mem usage insane when using it. copied QT fixes to dbus 0.60. Changed the - verbose and checks to only be run when compiled with debug USE flag. Added - support for Java bindings. Fixed up depends in general. Cleaned up ebuilds - in general. - - 17 Dec 2005; Guy Martin dbus-0.50-r1.ebuild: - Stable on hppa. - - 03 Dec 2005; Saleem Abdulrasool dbus-0.60.ebuild: - Fixing use flag hell. - -*dbus-0.60 (01 Dec 2005) - - 01 Dec 2005; Saleem Abdulrasool +dbus-0.60.ebuild: - Ading 0.60 to the tree. This is to test things against it and start patching. - There was a API/ABI change. - - 27 Nov 2005; Saleem Abdulrasool dbus-0.50-r1.ebuild: - Bumping mondoc deps and adding in mono-tools dep to prevent breaking on new - style layout of monodoc. Resolves bug #113528 - - 24 Nov 2005; Marcus D. Hanwell dbus-0.50-r1.ebuild: - Set the qt3 directory and moc, closes bugs 112965, 103667 and 109823. - - 08 Nov 2005; Stefan Briesenick files/dbus: - fixed init-script. - -*dbus-0.50-r1 (08 Nov 2005) - - 08 Nov 2005; Saleem Abdulrasool files/dbus, - +dbus-0.50-r1.ebuild: - Changing the initscript (with revbump). Minor cosmetic changes (changed to - doinit). - - 07 Nov 2005; Diego Pettenò dbus-0.50.ebuild: - Don't enable dnotify for every system, but just when using Linux kernel, as - it's a Linux feature. - - 07 Nov 2005; Steev Klimaszewski dbus-0.36.2.ebuild, - dbus-0.50.ebuild: - Change the path for the system socket back into /var/run/dbus/ - This fixeds Bug #96451. Thanks to joem for pointing it out, as - well as kwant for filing the bug. - -*dbus-0.50 (07 Nov 2005) - - 07 Nov 2005; Steev Klimaszewski - +files/dbus-dnotify_configure-01.diff, - +files/dbus-dnotify_watchdirs-01.diff, +dbus-0.50.ebuild: - Version bump. Add patches to fix dnotify support. - - 05 Nov 2005; Stephen P. Becker dbus-0.36.2.ebuild: - added ~mips keyword - - 01 Nov 2005; Doug Goldstein dbus-0.36.2.ebuild: - make dbus depend on gtk+ 2.6 while they claim gtk+ 2.0, they use 2.6 API - calls. fixes bug #111118 - - 19 Oct 2005; Stephen P. Becker dbus-0.23.4-r1.ebuild: - added ~mips keyword - - 15 Sep 2005; dbus-0.23.4-r1.ebuild: - Make hal not pass /bin/false as a shell to ecommit. Bug #103421 - -*dbus-0.36.2 (10 Sep 2005) - - 10 Sep 2005; Doug Goldstein -dbus-0.36.1.ebuild, - +dbus-0.36.2.ebuild: - Rev Bump for security reasons - - 26 Aug 2005; Doug Goldstein dbus-0.36.1.ebuild: - Fixing bug #103421 - -*dbus-0.36.1 (25 Aug 2005) - - 25 Aug 2005; Doug Goldstein -dbus-0.36.ebuild, - +dbus-0.36.1.ebuild: - rev bump. Should fix amd64 issues. bug #103601 - -*dbus-0.36 (24 Aug 2005) - - 24 Aug 2005; Doug Goldstein -dbus-0.35.2.ebuild, - +dbus-0.36.ebuild: - revision bump. Make sure we're using the messagebus user as well. - -*dbus-0.35.2 (18 Aug 2005) - - 18 Aug 2005; Doug Goldstein metadata.xml, - +dbus-0.35.2.ebuild: - added dbus 0.35.2 to tree, p.mask'd as per Gnome herd's request - added self to maintainership to receive the issues - - 27 Jul 2005; Guy Martin dbus-0.23-r3.ebuild, - dbus-0.23.4-r1.ebuild: - Stable on hppa. - - 22 Jul 2005; Gustavo Zacarias dbus-0.23-r3.ebuild: - Stable on sparc - -*dbus-0.23.4-r1 (14 Jul 2005) - - 14 Jul 2005; Marinus Schraal dbus-0.23.4-r1.ebuild : - Fix location of system socket (#96451) - - 07 Jul 2005; Caleb Tennis dbus-0.23-r3.ebuild, - dbus-0.23.2.ebuild, dbus-0.23.2-r1.ebuild: - Fix qt dep - -*dbus-0.23.4 (15 Mar 2005) - - 15 Mar 2005; foser dbus-0.23.4.ebuild : - New release, fix qt dep (#84256) - - 11 Mar 2005; Martin Schlemmer files/dbus: - Fix rcscript to not clobber return of stop() due to existance of pidfile or - not. - - 10 Mar 2005; Peter Johanson dbus-0.23-r3.ebuild, - dbus-0.23.2-r1.ebuild, dbus-0.23.2.ebuild: - mono moved from dev-dotnet -> dev-lang - -*dbus-0.23.2-r1 (06 Mar 2005) - - 06 Mar 2005; foser dbus-0.23.2-r1.ebuild : - Add patch to fix abi/api issues (#83979) - Add session launch script (#77504) - -*dbus-0.23.2 (03 Mar 2005) - - 03 Mar 2005; foser dbus-0.23.2.ebuild : - New release (#81794) - Add patch to work around mono lib versioning problem (#81794) - - 27 Feb 2005; Jason Wever dbus-0.23-r3.ebuild: - Added ~sparc keyword. - - 20 Feb 2005; Aron Griffis dbus-0.23-r3.ebuild: - stable on ia64 #80601 - - 11 Feb 2005; Jan Brinkmann dbus-0.23-r3.ebuild: - stable on amd64. see #80601 - - 10 Feb 2005; Michael Hanselmann dbus-0.23-r3.ebuild: - Stable on ppc. - - 10 Feb 2005; Markus Rothe dbus-0.23-r3.ebuild: - Stable on ppc64; bug #80601 - -*dbus-0.23-r3 (09 Feb 2005) - - 09 Feb 2005; foser dbus-0.23-r3.ebuild : - Bump to remove mono dep (still ~arch :/) so we can mark stable - - 07 Feb 2005; Jeremy Huddleston - +files/dbus-0.23-pyexecdir.patch, dbus-0.23-r2.ebuild: - Multilib fix for python. - -*dbus-0.23-r2 (06 Feb 2005) - - 06 Feb 2005; foser dbus-0.23-r2.ebuild : - Add include fix (#78617) - Add fix for unsafe default permissions (#80601) - Fix the X switch to actually work - - 20 Jan 2005; Aron Griffis dbus-0.22-r1.ebuild, - dbus-0.22-r2.ebuild, dbus-0.22-r3.ebuild, dbus-0.23-r1.ebuild: - mark 0.22-r1 stable on ia64; add ~ia64 to the rest - -*dbus-0.23-r1 (21 Jan 2005) - - 21 Jan 2005; foser dbus-0.23-r1.ebuild : - Keep the right services dir - - 13 Jan 2005; Heinrich Wendel +files/dbus-0.23-qt.patch, - dbus-0.23.ebuild: - fix qt again - -*dbus-0.23 (13 Jan 2005) - - 13 Jan 2005; foser dbus-0.23.ebuild : - New release, minor ebuild fixes - Add some touch statements for #77833 - - 08 Jan 2005; Tom Martin dbus-0.22-r1.ebuild: - Stable on amd64. - -*dbus-0.22-r3 (29 Dec 2004) - - 29 Dec 2004; Heinrich Wendel +files/dbus-0.22-qt.patch, - +dbus-0.22-r3.ebuild: - readd qt support, bug #65504 - - 17 Dec 2004; Markus Rothe dbus-0.22-r2.ebuild: - Stable on ppc64 - - 11 Nov 2004; Mike Gardiner dbus-0.22-r1.ebuild, - dbus-0.22-r2.ebuild: - Keyworded ppc for GNOME 2.8 - - 08 Nov 2004; Markus Rothe dbus-0.22-r2.ebuild: - Marked ~ppc64 - -*dbus-0.22-r2 (31 Oct 2004) - - 31 Oct 2004; foser dbus-0.22-r2.ebuild : - Re-enable mono USE - Add a couple of patches to get the mono bindings up to par - - 29 Oct 2004; foser dbus-0.22-r1.ebuild : - Disable mono USE, so we can mark stable - - 21 Oct 2004; Aron Griffis dbus-0.22-r1.ebuild: - add ~ia64 - - 15 Oct 2004; foser dbus-0.22-r1.ebuild : - Disable qt bindings for now (#65504) - Fix LICENSE - -*dbus-0.22-r1 (21 Sep 2004) - - 21 Sep 2004; foser dbus-0.22-r1.ebuild : - Add python bindings patch to make hal-device-manager work - Add inherit python for the python modules - - 18 Sep 2004; Travis Tilley dbus-0.22.ebuild: - added a fix that gets around a lib64 sandbox bug and added ~amd64 keyword - - 03 Sep 2004; Pieter Van den Abeele dbus-0.22.ebuild: - Masked dbus-0.22.ebuild stable for ppc - -*dbus-0.22 (17 Aug 2004) - - 17 Aug 2004; foser dbus-0.22.ebuild : - Readd mono & libxml2 building - Fix licensing to dual GPL-2 AFL-2.1 (#60280) - Fix init script to also work when a user session is running, thanks to Marcel Martin (#60280) - Set the session socket dir to /tmp (should probably be reconsidered) - Disable doc building, it works halfway but doesn't get installed right - - 11 Aug 2004; foser dbus-0.21.ebuild : - Add messagebus user creation (#52462) - - 08 Aug 2004; David Holm dbus-0.21.ebuild: - Added to ~ppc. - - 25 Jun 2004; Aron Griffis dbus-0.21.ebuild: - QA - fix use invocation - -*dbus-0.21 (07 Apr 2004) - - 07 Apr 2004; foser dbus-0.21.ebuild : - Overhaul of the whole ebuild, lots of cleanups. - Fixed deps (#43806) - Fixed api doc building & installation - Added init script & postinst note (#46101) - Added myself as maintainer for this package to metadat - - 17 Feb 2004; Aron Griffis dbus-0.20.ebuild: - Remove all KEYWORDS other than ~x86, since none of the support stuff (i.e. - mono) is marked on the other platforms - -*dbus-0.20 (04 Dec 2003) - - 04 Dec 2003; Seemant Kulleen dbus-0.12.ebuild, - dbus-0.20.ebuild: - version bump. Ebuild provided by: James Dumay in bug - #35301 - - 14 Nov 2003; Seemant Kulleen dbus-0.13.ebuild: - qt disabled, because the bindings are broken currently - -*dbus-0.13 (03 Oct 2003) - - 03 Oct 2003; Seemant Kulleen dbus-0.13.ebuild: - version bump - -*dbus-0.12 (12 Sep 2003) - 12 Sep 2003; Seemant Kulleen : - version bump - -*dbus-0.11 (21 Jun 2003) - - 21 Jun 2003; Seemant Kulleen dbus-0.11.ebuild, - files/dbus-0.11-cvs-update.patch: - dbus thingy from freedesktop.org -- for upcoming apps like xmms2 etc diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest deleted file mode 100644 index 9bd4ec7411..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST dbus-1.2.20.tar.gz 1672544 SHA256 0ef086d738710384d525130797ee86a0ce2daebffa7dc4d28386503ef7448011 SHA512 69ffc868e3652a7aca3c3097806d4533aaac895ab6449e26784af9647e605e2b603c836b2ffa2c536d597f92f789a72cc8e3ff71e853ef767b5be9a885594de5 WHIRLPOOL 3c88e8494c93cb030a557f2b94bfc96f76f0faf54ff6de092f26d8cc7ddf653d1a882a8091d945f9aca4ec6362e90dced04995bd18eace6f92bb10efa364c23c -DIST dbus-1.4.1.tar.gz 1850139 SHA256 caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd SHA512 ddfe9c641f40ce3bc13fc60bd4163241f837887515c25b2cb0d8497aa41f23724da6b7e265aafe67ffdfd5864ffaabe4b2e3d14dc6fcf2f464903b2b36fe53ba WHIRLPOOL d09e1657d823fcb0f9e4eb4fa3d6ec75c9007958cfee00e885663eb7877d7d2da41cdd284d9359731b0348c38c336e5fdfe3921c03cde31532679520f6b1d0f3 -DIST dbus-1.4.12.tar.gz 1878025 SHA256 da3c97fd546610558d588799e27c4fa81101e754acbcd34747a42c131f30dbe7 SHA512 71154e42e98b172b6abad91abff7fb83f646bb2c4601922b4355eb10aaab4e23aca0607a66346d4e38b64433b0501149f3a498a80f18f0e5ac69cd83e883229d WHIRLPOOL ee617df19913cc70a14eda149ac3f2aabb2cc06c77aaf9237476a61b1507dfdc46b07589ecf028e161b1fa05030813b342ff09999d6191d1b4c7361da479bf37 -DIST dbus-1.6.8.tar.gz 1929630 SHA256 fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac SHA512 eb26f1dfb6c6e3757a408a98e0f4012eda926e2f8ee7a2356ebd567a2e4a7d96effca7cec6e6b4f9e7bc578cbdd7b703d00158343a260859aff0718c76f296b0 WHIRLPOOL b614da2bc57376c8ad626ed2469e9a2cfcf7a2debba97187728048ad73e0c5075b290766d088e470b266fcad3e3cf2ec2c9c8477f1f7c5a232f1f74cadc83c1a diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild deleted file mode 100644 index 2353fb5788..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/dbus-1.2.20-r4.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.12.ebuild,v 1.3 2009/04/23 05:46:44 nirbheek Exp $ - -inherit eutils multilib flag-o-matic - -DESCRIPTION="A message bus system, a simple way for applications to talk to each other" -HOMEPAGE="http://dbus.freedesktop.org/" -SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz" - -LICENSE="|| ( GPL-2 AFL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="debug doc selinux test X" - -RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 ) - selinux? ( sys-libs/libselinux - sec-policy/selinux-dbus ) - >=dev-libs/expat-1.95.8 - !contexts/dbus_contexts - -+ -+ 4096 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch deleted file mode 100644 index bf1a829933..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-print-fixed.patch +++ /dev/null @@ -1,343 +0,0 @@ -diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c -index 75d00ac..abb45ee 100644 ---- a/tools/dbus-print-message.c -+++ b/tools/dbus-print-message.c -@@ -142,6 +142,284 @@ print_ay (DBusMessageIter *iter, int depth) - free (bytes); - } - -+#include -+#define DBUS_INT64_PRINTF_ARGUMENT PRIi64 -+#define DBUS_UINT64_PRINTF_ARGUMENT PRIu64 -+#define MAXPFX 4096 -+ -+static int -+pf_can_simple(DBusMessageIter *iter) -+{ -+ switch (dbus_message_iter_get_arg_type(iter)) -+ { -+ case DBUS_TYPE_STRING: -+ case DBUS_TYPE_INT16: -+ case DBUS_TYPE_INT32: -+ case DBUS_TYPE_UINT16: -+ case DBUS_TYPE_UINT32: -+ case DBUS_TYPE_INT64: -+ case DBUS_TYPE_UINT64: -+ case DBUS_TYPE_BYTE: -+ case DBUS_TYPE_BOOLEAN: -+ case DBUS_TYPE_DOUBLE: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+static void pf_key(DBusMessageIter *iter, const char *pfx, char *buf, size_t sz) -+{ -+ char *sv; -+ dbus_bool_t bv; -+ dbus_int16_t i16v; -+ dbus_int32_t i32v; -+ dbus_int64_t i64v; -+ dbus_uint16_t u16v; -+ dbus_uint32_t u32v; -+ dbus_uint64_t u64v; -+ unsigned char u8v; -+ double dv; -+ -+ switch (dbus_message_iter_get_arg_type(iter)) { -+ case DBUS_TYPE_STRING: -+ dbus_message_iter_get_basic(iter, &sv); -+ snprintf(buf, sz, "%s/%s", pfx, sv); -+ break; -+ case DBUS_TYPE_BOOLEAN: -+ dbus_message_iter_get_basic(iter, &bv); -+ snprintf(buf, sz, "%s/%s", pfx, (bv ? "true" : "false")); -+ break; -+ case DBUS_TYPE_INT16: -+ dbus_message_iter_get_basic(iter, &i16v); -+ snprintf(buf, sz, "%s/%d", pfx, i16v); -+ break; -+ case DBUS_TYPE_INT32: -+ dbus_message_iter_get_basic(iter, &i32v); -+ snprintf(buf, sz, "%s/%d", pfx, i32v); -+ break; -+ case DBUS_TYPE_INT64: -+ dbus_message_iter_get_basic(iter, &i64v); -+#ifdef DBUS_INT64_PRINTF_ARGUMENT -+ snprintf(buf, sz, "%s/%" DBUS_INT64_PRINTF_ARGUMENT, pfx, i64v); -+#else -+ snprintf(buf, sz, "%s/[int64]", pfx); -+#endif -+ break; -+ case DBUS_TYPE_UINT16: -+ dbus_message_iter_get_basic(iter, &u16v); -+ snprintf(buf, sz, "%s/%u", pfx, u16v); -+ break; -+ case DBUS_TYPE_UINT32: -+ dbus_message_iter_get_basic(iter, &u32v); -+ snprintf(buf, sz, "%s/%u", pfx, u32v); -+ break; -+ case DBUS_TYPE_UINT64: -+ dbus_message_iter_get_basic(iter, &u64v); -+#ifdef DBUS_UINT64_PRINTF_ARGUMENT -+ snprintf(buf, sz, "%s/%" DBUS_UINT64_PRINTF_ARGUMENT, pfx, u64v); -+#else -+ snprintf(buf, sz, "%s/[uint64]", pfx); -+#endif -+ break; -+ case DBUS_TYPE_BYTE: -+ dbus_message_iter_get_basic(iter, &u8v); -+ snprintf(buf, sz, "%s/%02x", pfx, (unsigned int)u8v & 0xFF); -+ break; -+ case DBUS_TYPE_DOUBLE: -+ dbus_message_iter_get_basic(iter, &dv); -+ snprintf(buf, sz, "%s/%g", pfx, dv); -+ break; -+ default: -+ snprintf(buf, sz, "%s/[pf-unknown]", pfx); -+ break; -+ } -+} -+ -+static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all); -+ -+static void pf_string(DBusMessageIter *iter, const char *pfx) -+{ -+ char *val; -+ dbus_message_iter_get_basic(iter, &val); -+ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", val); -+} -+ -+static void pf_boolean(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_bool_t bv; -+ dbus_message_iter_get_basic(iter, &bv); -+ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", (bv ? "true" : "false")); -+} -+ -+static void pf_uint16(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_uint16_t uv; -+ dbus_message_iter_get_basic(iter, &uv); -+ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); -+} -+ -+static void pf_int16(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_int16_t iv; -+ dbus_message_iter_get_basic(iter, &iv); -+ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); -+} -+ -+static void pf_uint32(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_uint32_t uv; -+ dbus_message_iter_get_basic(iter, &uv); -+ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); -+} -+ -+static void pf_int32(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_int32_t iv; -+ dbus_message_iter_get_basic(iter, &iv); -+ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); -+} -+ -+static void pf_uint64(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_uint64_t uv; -+ dbus_message_iter_get_basic(iter, &uv); -+#ifdef DBUS_UINT64_PRINTF_ARGUMENT -+ printf("%s%s%" DBUS_UINT64_PRINTF_ARGUMENT "\n", pfx, pfx[0] ? " " : "", uv); -+#else -+ printf("%s%s[uint64]\n", pfx, pfx[0] ? " " : ""); -+#endif -+} -+ -+static void pf_int64(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_int64_t iv; -+ dbus_message_iter_get_basic(iter, &iv); -+#ifdef DBUS_INT64_PRINTF_ARGUMENT -+ printf("%s%s%" DBUS_INT64_PRINTF_ARGUMENT "\n", pfx, pfx[0] ? " " : "", iv); -+#else -+ printf("%s%s[int64]\n", pfx, pfx[0] ? " " : ""); -+#endif -+} -+ -+static void pf_double(DBusMessageIter *iter, const char *pfx) -+{ -+ double dv; -+ dbus_message_iter_get_basic(iter, &dv); -+ printf("%s%s%g\n", pfx, pfx[0] ? " " : "", dv); -+} -+ -+static void pf_byte(DBusMessageIter *iter, const char *pfx) -+{ -+ unsigned char bv; -+ dbus_message_iter_get_basic(iter, &bv); -+ printf("%s%s%02x\n", pfx, pfx[0] ? " " : "", (unsigned int)bv & 0xFF); -+} -+ -+static void pf_array(DBusMessageIter *iter, const char *pfx) -+{ -+ int type; -+ DBusMessageIter subiter; -+ char npfx[MAXPFX]; -+ int i = 0; -+ -+ dbus_message_iter_recurse(iter, &subiter); -+ type = dbus_message_iter_get_arg_type(&subiter); -+ -+ while (type != DBUS_TYPE_INVALID) -+ { -+ snprintf(npfx, sizeof(npfx), "%s/%d", pfx, i); -+ print_fixed_iter(&subiter, npfx, 0); -+ dbus_message_iter_next(&subiter); -+ type = dbus_message_iter_get_arg_type(&subiter); -+ i++; -+ } -+} -+ -+static void pf_variant(DBusMessageIter *iter, const char *pfx) -+{ -+ DBusMessageIter subiter; -+ dbus_message_iter_recurse(iter, &subiter); -+ print_fixed_iter(&subiter, pfx, 0); -+} -+ -+static void pf_dict(DBusMessageIter *iter, const char *pfx) -+{ -+ DBusMessageIter subiter; -+ char npfx[MAXPFX]; -+ -+ dbus_message_iter_recurse(iter, &subiter); -+ /* Nasty hack to make string -> thing dicts more parseable. */ -+ if (pf_can_simple(&subiter)) -+ { -+ pf_key(&subiter, pfx, npfx, sizeof(npfx)); -+ } -+ else -+ { -+ snprintf(npfx, MAXPFX, "%s/[complex-key]", pfx); -+ } -+ dbus_message_iter_next(&subiter); -+ print_fixed_iter(&subiter, npfx, 0); -+} -+ -+static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all) -+{ -+ static struct { -+ int type; -+ void (*func)(DBusMessageIter *iter, const char *pfx); -+ } printers[] = { -+ { DBUS_TYPE_STRING, pf_string }, -+ { DBUS_TYPE_ARRAY, pf_array }, -+ { DBUS_TYPE_STRUCT, pf_array }, /* yes, really. They're identical. */ -+ { DBUS_TYPE_VARIANT, pf_variant }, -+ { DBUS_TYPE_DICT_ENTRY, pf_dict }, -+ { DBUS_TYPE_BOOLEAN, pf_boolean }, -+ { DBUS_TYPE_UINT32, pf_uint32 }, -+ { DBUS_TYPE_INT32, pf_int32 }, -+ { DBUS_TYPE_SIGNATURE, pf_string }, -+ { DBUS_TYPE_OBJECT_PATH, pf_string }, -+ { DBUS_TYPE_INT16, pf_int16 }, -+ { DBUS_TYPE_UINT16, pf_uint16 }, -+ { DBUS_TYPE_INT64, pf_int64 }, -+ { DBUS_TYPE_UINT64, pf_uint64 }, -+ { DBUS_TYPE_DOUBLE, pf_double }, -+ { DBUS_TYPE_BYTE, pf_byte }, -+ { 0, NULL } -+ }; -+ int type; -+ int i; -+ -+ do -+ { -+ type = dbus_message_iter_get_arg_type(iter); -+ if (type == DBUS_TYPE_INVALID) -+ return; -+ for (i = 0; printers[i].func; i++) -+ { -+ if (printers[i].type == type) -+ { -+ printers[i].func(iter, pfx); -+ break; -+ } -+ } -+ if (!printers[i].func) -+ { -+ printf("print-fixed-iter: no idea what %d is\n", type); -+ } -+ } -+ while (all && dbus_message_iter_next(iter)); -+} -+ -+void print_message_fixed(DBusMessage *msg) -+{ -+ DBusMessageIter iter; -+ int type; -+ -+ type = dbus_message_get_type(msg); -+ dbus_message_iter_init(msg, &iter); -+ print_fixed_iter(&iter, "", 1); -+} -+ - static void - print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth) - { -diff --git a/tools/dbus-print-message.h b/tools/dbus-print-message.h -index 26700d8..cb72efd 100644 ---- a/tools/dbus-print-message.h -+++ b/tools/dbus-print-message.h -@@ -26,6 +26,7 @@ - #include - #include - -+void print_message_fixed (DBusMessage *message); - void print_message (DBusMessage *message, dbus_bool_t literal); - - #endif /* DBUS_PRINT_MESSAGE_H */ -diff --git a/tools/dbus-send.c b/tools/dbus-send.c -index c7d5090..ffd9b71 100644 ---- a/tools/dbus-send.c -+++ b/tools/dbus-send.c -@@ -51,7 +51,7 @@ static const char *appname; - static void - usage (int ecode) - { -- fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] [contents ...]\n", appname); -+ fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--fixed] [--reply-timeout=MSEC] [contents ...]\n", appname); - exit (ecode); - } - -@@ -242,6 +242,7 @@ main (int argc, char *argv[]) - const char *type_str = NULL; - const char *address = NULL; - int session_or_system = FALSE; -+ int fixed = 0; - - appname = argv[0]; - -@@ -298,6 +299,8 @@ main (int argc, char *argv[]) - type_str = strchr (arg, '=') + 1; - else if (!strcmp(arg, "--help")) - usage (0); -+ else if (!strcmp(arg, "--fixed")) -+ fixed = 1; - else if (arg[0] == '-') - usage (1); - else if (path == NULL) -@@ -524,7 +527,10 @@ main (int argc, char *argv[]) - - if (reply) - { -- print_message (reply, print_reply_literal); -+ if (fixed) -+ print_message_fixed (reply); -+ else -+ print_message (reply, print_reply_literal); - dbus_message_unref (reply); - } - } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch deleted file mode 100644 index 990a520d4a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-unix-fd.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/tools/dbus-send.c b/tools/dbus-send.c -index cde0bb7..0a6f79a 100644 ---- a/tools/dbus-send.c -+++ b/tools/dbus-send.c -@@ -67,6 +67,7 @@ append_arg (DBusMessageIter *iter, int type, const char *value) - double d; - unsigned char byte; - dbus_bool_t v_BOOLEAN; -+ int _int; - - /* FIXME - we are ignoring OOM returns on all these functions */ - switch (type) -@@ -137,6 +138,11 @@ append_arg (DBusMessageIter *iter, int type, const char *value) - } - break; - -+ case DBUS_TYPE_UNIX_FD: -+ _int = strtoul (value, NULL, 0); -+ dbus_message_iter_append_basic (iter, DBUS_TYPE_UNIX_FD, &_int); -+ break; -+ - default: - fprintf (stderr, "%s: Unsupported data type %c\n", appname, (char) type); - exit (1); -@@ -215,6 +221,8 @@ type_from_name (const char *arg) - type = DBUS_TYPE_BOOLEAN; - else if (!strcmp (arg, "objpath")) - type = DBUS_TYPE_OBJECT_PATH; -+ else if (!strcmp (arg, "fd")) -+ type = DBUS_TYPE_UNIX_FD; - else - { - fprintf (stderr, "%s: Unknown type \"%s\"\n", appname, arg); diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch deleted file mode 100644 index 68bec09432..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.4.12-send-variant-dict.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/tools/dbus-send.c b/tools/dbus-send.c -index 0a6f79a..6c56306 100644 ---- a/tools/dbus-send.c -+++ b/tools/dbus-send.c -@@ -164,6 +164,8 @@ append_array (DBusMessageIter *iter, int type, const char *value) - free (dupval); - } - -+static int type_from_name(const char *name); -+ - static void - append_dict (DBusMessageIter *iter, int keytype, int valtype, const char *value) - { -@@ -187,7 +189,30 @@ append_dict (DBusMessageIter *iter, int keytype, int valtype, const char *value) - fprintf (stderr, "%s: Malformed dictionary\n", appname); - exit (1); - } -- append_arg (&subiter, valtype, val); -+ if (valtype == DBUS_TYPE_VARIANT) -+ { -+ char sig[2]; -+ char *c = strchr(val, ':'); -+ if (!c) -+ { -+ fprintf (stderr, "Missing type in variant dict\n"); -+ exit (1); -+ } -+ *(c++) = '\0'; -+ sig[0] = type_from_name(val); -+ sig[1] = '\0'; -+ DBusMessageIter subsubiter; -+ dbus_message_iter_open_container (&subiter, -+ DBUS_TYPE_VARIANT, -+ sig, -+ &subsubiter); -+ append_arg(&subsubiter, sig[0], c); -+ dbus_message_iter_close_container (&subiter, &subsubiter); -+ } -+ else -+ { -+ append_arg (&subiter, valtype, val); -+ } - - dbus_message_iter_close_container (iter, &subiter); - val = strtok (NULL, ","); -@@ -473,7 +498,11 @@ main (int argc, char *argv[]) - exit (1); - } - *(c++) = 0; -- secondary_type = type_from_name (arg); -+ if (!strcmp(arg, "variant")) -+ /* Hack: support variant values for dictionaries. */ -+ secondary_type = DBUS_TYPE_VARIANT; -+ else -+ secondary_type = type_from_name (arg); - sig[0] = DBUS_DICT_ENTRY_BEGIN_CHAR; - sig[1] = type; - sig[2] = secondary_type; diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch deleted file mode 100644 index 45d610c5ef..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://bugs.gentoo.org/405975 - -From e1b83fb58eadfd02227673db9a7e2833d29b0c98 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Mon, 23 Apr 2012 00:32:43 +0200 -Subject: [PATCH] selinux: when dropping capabilities only include AUDIT caps - if we have them - -When we drop capabilities we shouldn't assume we can keep -CAP_AUDIT_WRITE unconditionally, since it will not be available when -running in containers. - -This patch only adds CAP_AUDIT_WRITE to the list of caps we keep if we -actually have it in the first place. - -This makes audit/selinux enabled D-Bus work in a Linux container. ---- - bus/selinux.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/bus/selinux.c b/bus/selinux.c -index 36287e9..1bfc791 100644 ---- a/bus/selinux.c -+++ b/bus/selinux.c -@@ -1053,8 +1053,9 @@ _dbus_change_to_daemon_user (const char *user, - int rc; - - capng_clear (CAPNG_SELECT_BOTH); -- capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, -- CAP_AUDIT_WRITE); -+ if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE)) -+ capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED, -+ CAP_AUDIT_WRITE); - rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP); - if (rc) - { --- -1.7.10 - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch deleted file mode 100644 index 53f4b94438..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-gold.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/dbus-1.2.20/configure b/dbus-1.2.20.patched/configure -index 0bfd213..728d40b 100755 ---- a/dbus-1.2.20/configure -+++ b/dbus-1.2.20.patched/configure -@@ -9933,6 +9933,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie - fi - supports_anon_versioning=no - case `$LD -v 2>&1` in -+ *GNU\ gold*) supports_anon_versioning=yes ;; - *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch deleted file mode 100644 index 1e13c73ab9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus-send-print-fixed.patch +++ /dev/null @@ -1,340 +0,0 @@ -diff --git a/tools/dbus-print-message.c b/tools/dbus-print-message.c -index 75d00ac..abb45ee 100644 ---- a/tools/dbus-print-message.c -+++ b/tools/dbus-print-message.c -@@ -142,6 +142,281 @@ print_ay (DBusMessageIter *iter, int depth) - free (bytes); - } - -+#define MAXPFX 4096 -+ -+static int -+pf_can_simple(DBusMessageIter *iter) -+{ -+ switch (dbus_message_iter_get_arg_type(iter)) -+ { -+ case DBUS_TYPE_STRING: -+ case DBUS_TYPE_INT16: -+ case DBUS_TYPE_INT32: -+ case DBUS_TYPE_UINT16: -+ case DBUS_TYPE_UINT32: -+ case DBUS_TYPE_INT64: -+ case DBUS_TYPE_UINT64: -+ case DBUS_TYPE_BYTE: -+ case DBUS_TYPE_BOOLEAN: -+ case DBUS_TYPE_DOUBLE: -+ return 1; -+ default: -+ return 0; -+ } -+} -+ -+static void pf_key(DBusMessageIter *iter, const char *pfx, char *buf, size_t sz) -+{ -+ char *sv; -+ dbus_bool_t bv; -+ dbus_int16_t i16v; -+ dbus_int32_t i32v; -+ dbus_int64_t i64v; -+ dbus_uint16_t u16v; -+ dbus_uint32_t u32v; -+ dbus_uint64_t u64v; -+ unsigned char u8v; -+ double dv; -+ -+ switch (dbus_message_iter_get_arg_type(iter)) { -+ case DBUS_TYPE_STRING: -+ dbus_message_iter_get_basic(iter, &sv); -+ snprintf(buf, sz, "%s/%s", pfx, sv); -+ break; -+ case DBUS_TYPE_BOOLEAN: -+ dbus_message_iter_get_basic(iter, &bv); -+ snprintf(buf, sz, "%s/%s", pfx, (bv ? "true" : "false")); -+ break; -+ case DBUS_TYPE_INT16: -+ dbus_message_iter_get_basic(iter, &i16v); -+ snprintf(buf, sz, "%s/%d", pfx, i16v); -+ break; -+ case DBUS_TYPE_INT32: -+ dbus_message_iter_get_basic(iter, &i32v); -+ snprintf(buf, sz, "%s/%d", pfx, i32v); -+ break; -+ case DBUS_TYPE_INT64: -+ dbus_message_iter_get_basic(iter, &i64v); -+#ifdef DBUS_INT64_PRINTF_MODIFIER -+ snprintf(buf, sz, "%s/%" DBUS_INT64_PRINTF_MODIFIER "d", pfx, i64v); -+#else -+ snprintf(buf, sz, "%s/[int64]", pfx); -+#endif -+ break; -+ case DBUS_TYPE_UINT16: -+ dbus_message_iter_get_basic(iter, &u16v); -+ snprintf(buf, sz, "%s/%u", pfx, u16v); -+ break; -+ case DBUS_TYPE_UINT32: -+ dbus_message_iter_get_basic(iter, &u32v); -+ snprintf(buf, sz, "%s/%u", pfx, u32v); -+ break; -+ case DBUS_TYPE_UINT64: -+ dbus_message_iter_get_basic(iter, &u64v); -+#ifdef DBUS_UINT64_PRINTF_MODIFIER -+ snprintf(buf, sz, "%s/%" DBUS_UINT64_PRINTF_MODIFIER "u", pfx, u64v); -+#else -+ snprintf(buf, sz, "%s/[uint64]", pfx); -+#endif -+ break; -+ case DBUS_TYPE_BYTE: -+ dbus_message_iter_get_basic(iter, &u8v); -+ snprintf(buf, sz, "%s/%02x", pfx, (unsigned int)u8v & 0xFF); -+ break; -+ case DBUS_TYPE_DOUBLE: -+ dbus_message_iter_get_basic(iter, &dv); -+ snprintf(buf, sz, "%s/%g", pfx, dv); -+ break; -+ default: -+ snprintf(buf, sz, "%s/[pf-unknown]", pfx); -+ break; -+ } -+} -+ -+static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all); -+ -+static void pf_string(DBusMessageIter *iter, const char *pfx) -+{ -+ char *val; -+ dbus_message_iter_get_basic(iter, &val); -+ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", val); -+} -+ -+static void pf_boolean(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_bool_t bv; -+ dbus_message_iter_get_basic(iter, &bv); -+ printf("%s%s%s\n", pfx, pfx[0] ? " " : "", (bv ? "true" : "false")); -+} -+ -+static void pf_uint16(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_uint16_t uv; -+ dbus_message_iter_get_basic(iter, &uv); -+ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); -+} -+ -+static void pf_int16(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_int16_t iv; -+ dbus_message_iter_get_basic(iter, &iv); -+ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); -+} -+ -+static void pf_uint32(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_uint32_t uv; -+ dbus_message_iter_get_basic(iter, &uv); -+ printf("%s%s%u\n", pfx, pfx[0] ? " " : "", uv); -+} -+ -+static void pf_int32(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_int32_t iv; -+ dbus_message_iter_get_basic(iter, &iv); -+ printf("%s%s%d\n", pfx, pfx[0] ? " " : "", iv); -+} -+ -+static void pf_uint64(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_uint64_t uv; -+ dbus_message_iter_get_basic(iter, &uv); -+#ifdef DBUS_UINT64_PRINTF_MODIFIER -+ printf("%s%s%" DBUS_UINT64_PRINTF_MODIFIER "u\n", pfx, pfx[0] ? " " : "", uv); -+#else -+ printf("%s%s[uint64]\n", pfx, pfx[0] ? " " : ""); -+#endif -+} -+ -+static void pf_int64(DBusMessageIter *iter, const char *pfx) -+{ -+ dbus_int64_t iv; -+ dbus_message_iter_get_basic(iter, &iv); -+#ifdef DBUS_INT64_PRINTF_MODIFIER -+ printf("%s%s%" DBUS_INT64_PRINTF_MODIFIER "d\n", pfx, pfx[0] ? " " : "", iv); -+#else -+ printf("%s%s[int64]\n", pfx, pfx[0] ? " " : ""); -+#endif -+} -+ -+static void pf_double(DBusMessageIter *iter, const char *pfx) -+{ -+ double dv; -+ dbus_message_iter_get_basic(iter, &dv); -+ printf("%s%s%g\n", pfx, pfx[0] ? " " : "", dv); -+} -+ -+static void pf_byte(DBusMessageIter *iter, const char *pfx) -+{ -+ unsigned char bv; -+ dbus_message_iter_get_basic(iter, &bv); -+ printf("%s%s%02x\n", pfx, pfx[0] ? " " : "", (unsigned int)bv & 0xFF); -+} -+ -+static void pf_array(DBusMessageIter *iter, const char *pfx) -+{ -+ int type; -+ DBusMessageIter subiter; -+ char npfx[MAXPFX]; -+ int i = 0; -+ -+ dbus_message_iter_recurse(iter, &subiter); -+ type = dbus_message_iter_get_arg_type(&subiter); -+ -+ while (type != DBUS_TYPE_INVALID) -+ { -+ snprintf(npfx, sizeof(npfx), "%s/%d", pfx, i); -+ print_fixed_iter(&subiter, npfx, 0); -+ dbus_message_iter_next(&subiter); -+ type = dbus_message_iter_get_arg_type(&subiter); -+ i++; -+ } -+} -+ -+static void pf_variant(DBusMessageIter *iter, const char *pfx) -+{ -+ DBusMessageIter subiter; -+ dbus_message_iter_recurse(iter, &subiter); -+ print_fixed_iter(&subiter, pfx, 0); -+} -+ -+static void pf_dict(DBusMessageIter *iter, const char *pfx) -+{ -+ DBusMessageIter subiter; -+ char npfx[MAXPFX]; -+ -+ dbus_message_iter_recurse(iter, &subiter); -+ /* Nasty hack to make string -> thing dicts more parseable. */ -+ if (pf_can_simple(&subiter)) -+ { -+ pf_key(&subiter, pfx, npfx, sizeof(npfx)); -+ } -+ else -+ { -+ snprintf(npfx, MAXPFX, "%s/[complex-key]", pfx); -+ } -+ dbus_message_iter_next(&subiter); -+ print_fixed_iter(&subiter, npfx, 0); -+} -+ -+static void print_fixed_iter(DBusMessageIter *iter, const char *pfx, int all) -+{ -+ static struct { -+ int type; -+ void (*func)(DBusMessageIter *iter, const char *pfx); -+ } printers[] = { -+ { DBUS_TYPE_STRING, pf_string }, -+ { DBUS_TYPE_ARRAY, pf_array }, -+ { DBUS_TYPE_STRUCT, pf_array }, /* yes, really. They're identical. */ -+ { DBUS_TYPE_VARIANT, pf_variant }, -+ { DBUS_TYPE_DICT_ENTRY, pf_dict }, -+ { DBUS_TYPE_BOOLEAN, pf_boolean }, -+ { DBUS_TYPE_UINT32, pf_uint32 }, -+ { DBUS_TYPE_INT32, pf_int32 }, -+ { DBUS_TYPE_SIGNATURE, pf_string }, -+ { DBUS_TYPE_OBJECT_PATH, pf_string }, -+ { DBUS_TYPE_INT16, pf_int16 }, -+ { DBUS_TYPE_UINT16, pf_uint16 }, -+ { DBUS_TYPE_INT64, pf_int64 }, -+ { DBUS_TYPE_UINT64, pf_uint64 }, -+ { DBUS_TYPE_DOUBLE, pf_double }, -+ { DBUS_TYPE_BYTE, pf_byte }, -+ { 0, NULL } -+ }; -+ int type; -+ int i; -+ -+ do -+ { -+ type = dbus_message_iter_get_arg_type(iter); -+ if (type == DBUS_TYPE_INVALID) -+ return; -+ for (i = 0; printers[i].func; i++) -+ { -+ if (printers[i].type == type) -+ { -+ printers[i].func(iter, pfx); -+ break; -+ } -+ } -+ if (!printers[i].func) -+ { -+ printf("print-fixed-iter: no idea what %d is\n", type); -+ } -+ } -+ while (all && dbus_message_iter_next(iter)); -+} -+ -+void print_message_fixed(DBusMessage *msg) -+{ -+ DBusMessageIter iter; -+ int type; -+ -+ type = dbus_message_get_type(msg); -+ dbus_message_iter_init(msg, &iter); -+ print_fixed_iter(&iter, "", 1); -+} -+ - static void - print_iter (DBusMessageIter *iter, dbus_bool_t literal, int depth) - { -diff --git a/tools/dbus-print-message.h b/tools/dbus-print-message.h -index 26700d8..cb72efd 100644 ---- a/tools/dbus-print-message.h -+++ b/tools/dbus-print-message.h -@@ -26,6 +26,7 @@ - #include - #include - -+void print_message_fixed (DBusMessage *message); - void print_message (DBusMessage *message, dbus_bool_t literal); - - #endif /* DBUS_PRINT_MESSAGE_H */ -diff --git a/tools/dbus-send.c b/tools/dbus-send.c -index c7d5090..ffd9b71 100644 ---- a/tools/dbus-send.c -+++ b/tools/dbus-send.c -@@ -51,7 +51,7 @@ static const char *appname; - static void - usage (int ecode) - { -- fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--reply-timeout=MSEC] [contents ...]\n", appname); -+ fprintf (stderr, "Usage: %s [--help] [--system | --session | --address=ADDRESS] [--dest=NAME] [--type=TYPE] [--print-reply=(literal)] [--fixed] [--reply-timeout=MSEC] [contents ...]\n", appname); - exit (ecode); - } - -@@ -242,6 +242,7 @@ main (int argc, char *argv[]) - const char *type_str = NULL; - const char *address = NULL; - int session_or_system = FALSE; -+ int fixed = 0; - - appname = argv[0]; - -@@ -298,6 +299,8 @@ main (int argc, char *argv[]) - type_str = strchr (arg, '=') + 1; - else if (!strcmp(arg, "--help")) - usage (0); -+ else if (!strcmp(arg, "--fixed")) -+ fixed = 1; - else if (arg[0] == '-') - usage (1); - else if (path == NULL) -@@ -526,7 +529,10 @@ main (int argc, char *argv[]) - - if (reply) - { -- print_message (reply, print_reply_literal); -+ if (fixed) -+ print_message_fixed (reply); -+ else -+ print_message (reply, print_reply_literal); - dbus_message_unref (reply); - } - } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 deleted file mode 100644 index e96ea05cd1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.init-1.0 +++ /dev/null @@ -1,51 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.4 2007/04/04 13:35:25 cardoe Exp $ - -opts="reload" - -depend() { - need localmount - after bootmisc -} - -start() { - ebegin "Starting D-BUS system messagebus" - - /usr/bin/dbus-uuidgen --ensure - - # We need to test if /var/run/dbus exists, since script will fail if it does not - [ ! -e /var/run/dbus ] && mkdir /var/run/dbus - - start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system - eend $? -} - -stop() { - local retval - - ebegin "Stopping D-BUS system messagebus" - - start-stop-daemon --stop --pidfile /var/run/dbus.pid - retval=$? - - eend ${retval} - - [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket - - return ${retval} -} - -reload() { - local retval - - ebegin "Reloading D-BUS messagebus config" - - /usr/bin/dbus-send --print-reply --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig > /dev/null - retval=$? - eend ${retval} - return ${retval} -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd deleted file mode 100644 index 65271f69c6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/dbus.initd +++ /dev/null @@ -1,50 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $ - -extra_started_commands="reload" - -depend() { - need localmount - after bootmisc -} - -start() { - ebegin "Starting D-BUS system messagebus" - /usr/bin/dbus-uuidgen --ensure=/etc/machine-id - - # We need to test if /var/run/dbus exists, since script will fail if it does not - [ ! -e /var/run/dbus ] && mkdir /var/run/dbus - - start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system - eend $? -} - -stop() { - local retval - - ebegin "Stopping D-BUS system messagebus" - - start-stop-daemon --stop --pidfile /var/run/dbus.pid - retval=$? - - eend ${retval} - - [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket - - return ${retval} -} - -reload() { - local retval - - ebegin "Reloading D-BUS messagebus config" - - /usr/bin/dbus-send --print-reply --system --type=method_call \ - --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.ReloadConfig > /dev/null - retval=$? - eend ${retval} - return ${retval} -} diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml deleted file mode 100644 index 694155f5d3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/files/org.freedesktop.DBus.Properties.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml b/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml deleted file mode 100644 index 4e9b563738..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/dbus/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - freedesktop - - freedesktop-bugs@gentoo.org - - - Build with sys-apps/systemd at_console support - - From bcd2cea31b592df06b6057dadfc3e094c4238910 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 4 Aug 2013 14:22:52 -0400 Subject: [PATCH 6/6] fix(profiles): Disable systemd use flag for dbus on targets. This flag enables 'at_console' policy support using logind. I don't think we actually have a use for that and having it disabled hasn't caused anything weird that I know of so far so leave it disabled. Enabling this flag causes a circular dependency between systemd and dbus which is resolved in catalyst bootstrapped builds like the SDK but for target builds this is a problem. --- .../coreos-overlay/profiles/targets/coreos/package.use | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use index c0d05cd4cd..a302e2e791 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use @@ -50,7 +50,7 @@ net-wireless/bluez-test alsa -consolekit -readline test-programs net-wireless/wpa_supplicant dbus debug -readline ssl sci-geosciences/gpsd -python -ntp -X dbus garmin minimal ocean tntc usb -sockets sys-apps/busybox -pam -selinux -sys-apps/dbus -X +sys-apps/dbus -X -systemd sys-apps/iproute2 ipv6 # mosys: crosbug.com/p/11630 sys-apps/mosys static