summaryrefslogtreecommitdiff
path: root/lxde-base
diff options
context:
space:
mode:
Diffstat (limited to 'lxde-base')
-rw-r--r--lxde-base/Manifest.gzbin2716 -> 2715 bytes
-rw-r--r--lxde-base/lxdm/Manifest3
-rw-r--r--lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch18
-rw-r--r--lxde-base/lxdm/lxdm-0.5.3-r4.ebuild14
4 files changed, 29 insertions, 6 deletions
diff --git a/lxde-base/Manifest.gz b/lxde-base/Manifest.gz
index 4af7d06351a1..b62de71eee89 100644
--- a/lxde-base/Manifest.gz
+++ b/lxde-base/Manifest.gz
Binary files differ
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 0428b72b74e8..fb72f9bb2e68 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,6 +1,7 @@
AUX Xsession 1974 BLAKE2B 229ba66250e025cb207d9e22a50aab356bfa185cbc65ea87d62a2ebe02c3d3b156c3d414674ca6ed2ab9e466f058ee91e9d3feabe17f9494b397b219ecd0c688 SHA512 497c420601e171ae3e753f2277119bd39eb0cb4e6968b5294c54ec1673d96553787f4e02c3a0bb1d0270048e721ee96aa4b3df0caed8ae40b12d726c6abf90da
AUX lxdm-0.5.3-pam.patch 470 BLAKE2B cf386ca0237f7bd4362867083e5c395cdd3e9187ab2c5bfbbcd4e9e405e7f9c9e2ed9e47e1c6ff8ce7cc6d9b04a19e7f03920892e97fa9b7f91b7f76cae2b890 SHA512 b64caec5b27f92ef2c2dc5fbaa0c067d6450bbaa23c057599c741b1f930bcbe47c07ff68f8ea6b35a610edff820aea7071bdde5edbecd47851a2d80f833f8ed2
+AUX lxdm-0.5.3-portable-msghdr.patch 467 BLAKE2B 36af5469e59197d6b43908a05448c37d269e6f800c6197b47f589c2e7425a9daa568d2c40526a312a2cc691c05540a88174e15034be1207e862577d2e994cd77 SHA512 3bfe7213c8d2a983d0dac681f3af783148d1e6ba67e6a3f3a1e09b5b8d9dbe7a6fbaf87bc4e62c79e2144ad143f6c170d0a90df0b3ad50c543ab7cfab2b6d21b
AUX lxdm-0.5.3-upstream-fixes.patch 5836 BLAKE2B 0e76a7c92a9b5c57dc85fa9659653b29ea449810ee4bf596e4691e91cc4ed1645b6b75e64bd7fe35f2488f469bad237633042b43e10d10afd0ce7f8fa29bdd9b SHA512 c67186af1f3288633e5a3b8a25167f92999209c99dac4257b330d9046eb0524eb766032dc6e2870a9843afa8ede88defcb1f0e1cff57ece5bc9d5d1121446070
DIST lxdm-0.5.3.tar.xz 239132 BLAKE2B 9d27feb60452af49127972ce0ecdc25122f5f86961f65512fd6c185c5d6ca03e637fab703fa2df156dba8a3d0ef4e7cf9f55e20762ba49bb14dc4ee8a82b1fa3 SHA512 0e3539c595a71cb850c1756dd075b8d477a4e111a4167714057cac06650e9587f338f797f14122e7b2a2f4ad35b38cd7172b83e996758abeeaf0146d65bbc26f
-EBUILD lxdm-0.5.3-r4.ebuild 2032 BLAKE2B f2e55d46111009b0964014219a81c98bd63ef3988929c437f383cbd8487f98c806e077e65e2ee7720a0d99518608f6dfec21943489bc9eddbd439eaf972a5431 SHA512 d2da4889515c1848cd55393cb1e6f5d6f824740edee3e6e63fab3433af1f9f92dc1c65032cb567aa35f1618fa408181b1137811839146df84b3b8ea251621d97
+EBUILD lxdm-0.5.3-r4.ebuild 2075 BLAKE2B 38296d4c49bc2ab4c2862072893dc4215eb855ccb89c934c4963759a0b533a397600cb5239b4f336996039ee135d25a585fbcd1a5efdcca516f1e1e708691a3b SHA512 f3d1bb93bef8874ee728ec782b096e83171132f0b65c9307991c63b43a0320f5a38092decf0394a7f1705081a772189c4d2c9a03b40aad2e385c561c845aabae
MISC metadata.xml 321 BLAKE2B 9b47c35de91df4ace007c6d3864b2a06366e7f98053ef4751d851247f3f26d6853383db9a759cd48d5bba37c1874bf31dc3f7ced247e20b5848947142b1061b0 SHA512 783ed64627aa0725e726ade932dcfa204aa2b855dd6e28d2be3aea7c92164c5c7509f1dad861befafe040c04699f8aee297f5c193d2cae21589de2b9a28a5e5d
diff --git a/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch b/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch
new file mode 100644
index 000000000000..dc7f8ad016e9
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.5.3-portable-msghdr.patch
@@ -0,0 +1,18 @@
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -117,7 +117,15 @@
+ char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024];
+ struct sockaddr_un peer;
+ struct iovec v={buf,sizeof(buf)};
+- struct msghdr h={&peer,sizeof(peer),&v,1,ctrl,sizeof(ctrl),0};
++ struct msghdr h={
++ .msg_name = &peer,
++ .msg_namelen = sizeof(peer),
++ .msg_iov = &v,
++ .msg_iovlen = 1,
++ .msg_control = ctrl,
++ .msg_controllen = sizeof(ctrl),
++ .msg_flags = 0
++ };
+ struct cmsghdr *cmptr;
+ int ret;
diff --git a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
index 1242ecf466fa..f4ccc1ad9647 100644
--- a/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
+++ b/lxde-base/lxdm/lxdm-0.5.3-r4.ebuild
@@ -42,15 +42,19 @@ DOCS=( AUTHORS README TODO )
REQUIRED_USE="?? ( elogind systemd ) elogind? ( pam ) systemd? ( pam )"
+PATCHES=(
+ # Fix consolekit and selinux
+ "${FILESDIR}/${P}-pam.patch"
+ # Apply all upstream fixes in git until 2016-11-11
+ "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
+ "${FILESDIR}/lxdm-0.5.3-portable-msghdr.patch"
+)
+
src_prepare() {
# Upstream bug, tarball contains pre-made lxdm.conf
rm "${S}"/data/lxdm.conf || die
- # Fix consolekit and selinux
- eapply "${FILESDIR}/${P}-pam.patch"
- # Apply all upstream fixes in git until 2016-11-11
- eapply "${FILESDIR}/lxdm-0.5.3-upstream-fixes.patch"
- eapply_user
+ default
# this replaces the bootstrap/autogen script in most packages
eautoreconf