Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9644d86845d11f67751a099c56320ad269218354'

Browse Source 
* commit '9644d86845d11f67751a099c56320ad269218354':
  sudoers.d: Stops QT from using the MIT-SHM X11 Shared Memory Extension
  debian: Move python-xdg to depends section in debian/control
This commit is contained in:
Marek Marczykowski-Górecki 2015-09-02 00:45:42 +02:00
commit f09d176d05
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -121,6 +121,7 @@ install-common:
install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes install -D -m 0440 misc/qubes.sudoers $(DESTDIR)/etc/sudoers.d/qubes
install -D -m 0440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
install -d $(DESTDIR)/var/lib/qubes install -d $(DESTDIR)/var/lib/qubes
@ -220,6 +221,5 @@ install-deb: install-common install-systemd install-systemd-dropins
install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/ install -m 644 network/80-qubes.conf $(DESTDIR)/etc/sysctl.d/
install -D -m 644 misc/profile.d_qt_x11_no_mitshm.sh $(DESTDIR)/etc/profile.d/qt_x11_no_mitshm.sh install -D -m 644 misc/profile.d_qt_x11_no_mitshm.sh $(DESTDIR)/etc/profile.d/qt_x11_no_mitshm.sh
install -D -m 440 misc/sudoers.d_umask $(DESTDIR)/etc/sudoers.d/umask install -D -m 440 misc/sudoers.d_umask $(DESTDIR)/etc/sudoers.d/umask
install -D -m 440 misc/sudoers.d_qt_x11_no_mitshm $(DESTDIR)/etc/sudoers.d/qt_x11_no_mitshm
install-vm: install-rh install-common install-vm: install-rh install-common

2
debian/control vendored
View File

@ -25,6 +25,7 @@ Depends:
psmisc, psmisc,
python2.7, python2.7,
python-gi, python-gi,
python-xdg,
qubes-utils (>= 3.0.1), qubes-utils (>= 3.0.1),
sudo, sudo,
systemd, systemd,
@ -49,7 +50,6 @@ Recommends:
network-manager-gnome, network-manager-gnome,
ntpdate, ntpdate,
python-nautilus, python-nautilus,
python-xdg,
system-config-printer, system-config-printer,
tinyproxy, tinyproxy,
xsettingsd, xsettingsd,

1
rpm_spec/core-vm.spec
View File

@ -357,6 +357,7 @@ rm -f %{name}-%{version}
%config(noreplace) /etc/qubes-rpc/qubes.GetImageRGBA %config(noreplace) /etc/qubes-rpc/qubes.GetImageRGBA
%config(noreplace) /etc/qubes-rpc/qubes.SetDateTime %config(noreplace) /etc/qubes-rpc/qubes.SetDateTime
%config(noreplace) /etc/sudoers.d/qubes %config(noreplace) /etc/sudoers.d/qubes
%config(noreplace) /etc/sudoers.d/qt_x11_no_mitshm
%config(noreplace) /etc/sysconfig/iptables.qubes %config(noreplace) /etc/sysconfig/iptables.qubes
%config(noreplace) /etc/sysconfig/ip6tables.qubes %config(noreplace) /etc/sysconfig/ip6tables.qubes
/usr/lib/qubes/init/iptables /usr/lib/qubes/init/iptables