Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9130636c88 
							
						 
					 
					
						
						
							
							Merge branch 'debian'  
						
						... 
						
						
						
						Conflicts:
	misc/qubes-r2.list.in
	misc/qubes-trigger-sync-appmenus.sh
	network/30-qubes-external-ip
	network/qubes-firewall
	vm-systemd/network-proxy-setup.sh
	vm-systemd/prepare-dvm.sh
	vm-systemd/qubes-sysinit.sh 
						
					 
					
						2015-01-30 00:30:24 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							3a0ad108d4 
							
						 
					 
					
						
						
							
							version 3.0.0  
						
						
						
					 
					
						2014-11-22 16:24:18 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							1f1a33be21 
							
						 
					 
					
						
						
							
							Disable R3 repos by default  
						
						
						
					 
					
						2014-11-20 17:04:36 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9b71e6db8b 
							
						 
					 
					
						
						
							
							Update repos and keys for Qubes R3  
						
						
						
					 
					
						2014-11-20 17:01:10 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							48685938ff 
							
						 
					 
					
						
						
							
							qrexec: register exec function  
						
						... 
						
						
						
						Update for shared libqrexec.so API (instead of statically linked one). 
						
					 
					
						2014-11-19 15:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							17350f6f69 
							
						 
					 
					
						
						
							
							Use xenstore.h instead of xs.h  
						
						
						
					 
					
						2014-11-19 15:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							b13844afe1 
							
						 
					 
					
						
						
							
							qrexec: new protocol - direct data vchan connections  
						
						
						
					 
					
						2014-11-19 15:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							d84381b87f 
							
						 
					 
					
						
						
							
							code style: replace tabs with spaces  
						
						
						
					 
					
						2014-11-19 15:34:34 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							b8588c4856 
							
						 
					 
					
						
						
							
							qrexec: remove dom0 targets from makefile  
						
						
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							d00d52fc31 
							
						 
					 
					
						
						
							
							dispvm: restart qubesdb at DispVM start  
						
						... 
						
						
						
						To connect to new qubesdb daemon in dom0. 
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							1f04cf34cc 
							
						 
					 
					
						
						
							
							systemd: fix qubes-service handling  
						
						... 
						
						
						
						qubesdb-list does show only list of paths, without values. Use
qubesdb-multiread instead. Path (argument) must have terminating '/' so
it will be cut of printed paths (service names only). 
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							db35abadc8 
							
						 
					 
					
						
						
							
							Use Qubes DB instead of Xenstore  
						
						
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							a3aab7dab2 
							
						 
					 
					
						
						
							
							rpm: fix typo  
						
						
						
					 
					
						2014-11-19 15:34:33 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							735531a9ba 
							
						 
					 
					
						
						
							
							spec: get backend_vmm from env variable  
						
						... 
						
						
						
						There is no way to pass --define to yum-buildep, but we use VMM name for
required packages names. 
						
					 
					
						2014-11-19 15:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							93ad711f4e 
							
						 
					 
					
						
						
							
							load xen-gntalloc module required by libxenvchan  
						
						
						
					 
					
						2014-11-19 15:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							94f54d6c9f 
							
						 
					 
					
						
						
							
							spec: add dependencies on vchan package (both R: and BR:)  
						
						
						
					 
					
						2014-11-19 15:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski 
							
						 
					 
					
						
						
						
						
							
						
						
							95839ddab5 
							
						 
					 
					
						
						
							
							Update for new vchan API  
						
						
						
					 
					
						2014-11-19 15:34:32 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							ea4eef7de8 
							
						 
					 
					
						
						
							
							network: fix indentation  
						
						
						
					 
					
						2014-11-13 23:19:34 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							599fad53a2 
							
						 
					 
					
						
						
							
							Merge branch 'debian' of  https://github.com/nrgaway/core-agent-linux  into debian  
						
						
						
					 
					
						2014-11-12 03:41:41 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							160bf82583 
							
						 
					 
					
						
						
							
							Merge branch 'debian' of  https://github.com/nrgaway/core-agent-linux  into debian  
						
						
						
					 
					
						2014-11-12 03:40:29 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							4420df01ea 
							
						 
					 
					
						
						
							
							debian: Don't display systemd info in chroot since systemd show does not work in chroot  
						
						
						
					 
					
						2014-11-12 03:39:17 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							4f89980137 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'nrgaway/debian' into debian  
						
						
						
					 
					
						2014-11-11 23:06:45 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							848c53adc2 
							
						 
					 
					
						
						
							
							debian: Updated tinyproxy filter rules  
						
						
						
					 
					
						2014-11-11 13:38:26 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							9bb9e8d9e5 
							
						 
					 
					
						
						
							
							Fix compile flags order (-lX11 moved to the end)  
						
						
						
					 
					
						2014-11-11 01:22:26 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							da6f6bd22b 
							
						 
					 
					
						
						
							
							debian:  Wrong variable name was used to create /usr/share/qubes/xdg/autostart  
						
						
						
					 
					
						2014-11-09 13:27:38 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							51cac340ca 
							
						 
					 
					
						
						
							
							debian: Added functionality to move desktop entry config files to /usr/share/qubes/xdg/autostart to preserve originals  
						
						... 
						
						
						
						Added trigger for new notify agent; removed trigger for old one 
						
					 
					
						2014-11-09 12:58:57 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							ef50c0d7b6 
							
						 
					 
					
						
						
							
							debian: Add new notification agent depends; remove other  
						
						
						
					 
					
						2014-11-09 12:58:48 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							427decd793 
							
						 
					 
					
						
						
							
							network: fix NM uplink config permissions  
						
						... 
						
						
						
						Otherwise NM will not use the file. 
						
					 
					
						2014-11-09 05:35:07 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							7027633e80 
							
						 
					 
					
						
						
							
							network: do not use ifcfg-rh NM plugin  
						
						... 
						
						
						
						Apparently eth0 in ProxyVM can be configured using plain keyfile plugin,
which is present on all distributions. 
						
					 
					
						2014-11-09 05:31:22 +01:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							cadb102781 
							
						 
					 
					
						
						
							
							debian:  More depends for debian as netvm and some configuration tweaks.  
						
						... 
						
						
						
						Jessie base loads as netvm; wheezy base giving bad window error when trying to start nm-applet
Fixed qt MIT-SHM graphics issue 
						
					 
					
						2014-11-08 02:58:07 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							1f93dc0a60 
							
						 
					 
					
						
						
							
							debian: Added more error reporting to track down any missing dependancies  
						
						... 
						
						
						
						Prints various systemd messages when a unit fails to enable/disable/start/stop
Fixed issue with alternate NetworkManager* systemd files not being placed
Removed 'basename -s' since -s option not supported in wheezy 
						
					 
					
						2014-11-07 22:52:32 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							afcff2ca4b 
							
						 
					 
					
						
						
							
							debian: removed commented out depends  
						
						
						
					 
					
						2014-11-07 18:29:05 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							9e065d6d9c 
							
						 
					 
					
						
						
							
							debian: Added all other outstanding triggers contained in rpm_spec as well as triggers if other packages get installed at a later date the configurations will run on them  
						
						
						
					 
					
						2014-11-07 18:28:04 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							79db86a94a 
							
						 
					 
					
						
						
							
							debian: Added postrm disable of other Qubes packages  
						
						
						
					 
					
						2014-11-07 18:26:21 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							abcc01b874 
							
						 
					 
					
						
						
							
							debian:  Added more dependancies  
						
						
						
					 
					
						2014-11-07 18:25:12 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							44230f7f35 
							
						 
					 
					
						
						
							
							debian: Remove absolute path to xenstore-*  
						
						
						
					 
					
						2014-11-07 09:59:41 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							cc26e26be8 
							
						 
					 
					
						
						
							
							debian: apt-get needs to update first  
						
						
						
					 
					
						2014-11-07 03:46:54 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							dbffe57bc9 
							
						 
					 
					
						
						
							
							debian: Revert back to original NetworkManager, ModemManager service names  
						
						
						
					 
					
						2014-11-07 03:32:06 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							96887ea1b8 
							
						 
					 
					
						
						
							
							debian: Add qubes-update-check for Debian  
						
						
						
					 
					
						2014-11-07 03:30:45 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							132729bd79 
							
						 
					 
					
						
						
							
							debian: Prepend package name to maintainers scripts  
						
						
						
					 
					
						2014-11-07 00:16:51 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							4c30f28864 
							
						 
					 
					
						
						
							
							debian: Cleanup  
						
						... 
						
						
						
						'set -e' in place of 'set -x'
Seperated out 'QT_X11_NO_MITSHM=1' export into own profile.d file
Seperated out 'QT_X11_NO_MITSHM=1' sudoers rule to own sudoers.d file
Commented out some services that were being enabled that are not installed (yet)
Reformated trigger section to allow for multiple triggers 
						
					 
					
						2014-11-07 00:09:54 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							a6e6c86764 
							
						 
					 
					
						
						
							
							debian: Made debian proxy filter rules more restrictive  
						
						
						
					 
					
						2014-11-07 00:09:13 -05:00 
						 
				 
			
				
					
						
							
							
								Jason Mehring 
							
						 
					 
					
						
						
						
						
							
						
						
							802626c197 
							
						 
					 
					
						
						
							
							debian: set -e added in place of set -x  
						
						
						
					 
					
						2014-11-07 00:08:26 -05:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							a2bba58877 
							
						 
					 
					
						
						
							
							debian: fix initialization of /etc/hosts  
						
						
						
					 
					
						2014-11-05 05:10:42 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							36b1793739 
							
						 
					 
					
						
						
							
							debian: support for appmenus  
						
						... 
						
						
						
						-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJUWFwAAAoJEIwFIWzgnAk80z0QAKw8VMVP1E4AiFlAQLwW7fcu
 aUKf+i1kw5b7OiL3NRRw+9F79gOVMaHipxtotXei+jv0kKwiUuMOXPRfr8rqQtu5
 7NYeCL/T99aTVfZ6FqR5nZQM2fNhv9/FbnAqB3Uh96VsBBsp8ubnw5QqgOg4p5y2
 yT7OFObsRqhULbHltXVgaC1tND42eCIpsdBp9v8CPevxNuC+t3Q6ORRAV7+4QUwY
 TBESz6pYVQsvkChD/X5/x9lfhZxSyhMCWY71P/78RULdeAjlQV+oJ0q72GtZD4uA
 fvH4tU/wu3Q57IJHTalX/sbqZE7efQ9Xelz0tuc0PEAMcM3F3y6U0NEdE6BKiIQK
 5C6FlgkNM8ymjyHiZjGy4uOkNrIwzcQAZse4sCIt7YhcqepBBly262Ii4lcd93Mp
 ECeLm2/kakschG4QzLxoSShsYGrML+Mq2cceYCwS7e+ts2QoeaQ2l3MyOiTt3iq7
 tWSz1QpyXc2wJnAnLPwE/rKLNvdPy7xDaOSAgBGv56rouFYPtqw4qkTcbvb2Ovd0
 +AMS7R+cJWl4ftmJETmqELP2jkbhOjwqgK7UQWM5jlr8E/oWKVW7SPi8hE0yuppg
 Q2oadaqUb5m+AQIVRP485Fw58pio2+fXvq7w3ExkwQikVd7MTxFHqR3FBZurVlc8
 bxLDKNiYTkVEU7xsJTf7
 =hvgM
 -----END PGP SIGNATURE-----
Merge tag 'hw42_appmenus' into debian
debian: support for appmenus
Conflicts:
	debian/qubes-core-agent.postinst 
						
					 
					
						2014-11-05 04:37:34 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							c817bb0282 
							
						 
					 
					
						
						
							
							little fix for the official template  
						
						... 
						
						
						
						-----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJUWE+GAAoJEIwFIWzgnAk8azoQAJPOdglmiJlu+p5nRQ0ZRP6F
 nammIQhOg1oE0hCTX6H4DnEMnaZmFyGj96JWUX3zES8NF9zYvq4sgJCtZVEK35lm
 /Fxe899NpDlHaHwPqnXoYAKWZnMnyx3Z5XTxYb3A8JQdJCVWJPi2qYw2TBb6iBIp
 hzznI3drhOd8rdkFHXGk/FsBjqFP1mn98GDP4N/XLOZUnK+MiWyxrp0c+QVgybRX
 2XOUhsBPbr/XS/fkMBEia1hJhBf+FYJsFeCARGjYnbI+TKMaPrYaIX6DRqjFMhSS
 eEALEWsYsDiYGerWNBNGxbJ7RWsN4vm+WDfKdi7Hp2TgHeH0z93w40VegU3k7Asx
 NjfehCwT3wjMmtUFYhfhYfIop5305LLLJPPkY/ML+u6Mznzr7OkostMeyMhDxcrq
 lSELqg2HDwEsSwtwEz7kP6fYyfpJRd8yndg48cVonatwPwdjoCMiAz93TIF7Tvvz
 xQaNUidkKL8qQi67ArSQUlQlwGJNngwLRhepaMo0FD4JWSQ5pHc00EYxtJio2LPs
 7prv8ETbTj0bcFb/xKNSxBCGOrLdleHAEdhrpvqHa5nUzMiHw+tMuJbX+f0jOx/Q
 OSgx/dvK9GIyxM7UlsS+Whye3iGeNwsA1ai4TL0n1PFM+DjemBjEbfIl2nxLjG3O
 cXas4+wsl0+qXRk/PDOn
 =6kCH
 -----END PGP SIGNATURE-----
Merge tag 'hw42_debian-systemd-3' into debian
Conflicts:
	debian/control
	Merged postinst scripts from hw42 and nrgaway 
						
					 
					
						2014-11-05 04:35:23 +01:00 
						 
				 
			
				
					
						
							
							
								Marek Marczykowski-Górecki 
							
						 
					 
					
						
						
						
						
							
						
						
							e4e7176a16 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'nrgaway/debian' into debian  
						
						
						
					 
					
						2014-11-05 04:24:41 +01:00 
						 
				 
			
				
					
						
							
							
								HW42 
							
						 
					 
					
						
						
						
						
							
						
						
							f9b658e6ad 
							
						 
					 
					
						
						
							
							debian: add support for qubes appmenus  
						
						
						
					 
					
						2014-11-04 05:53:36 +01:00 
						 
				 
			
				
					
						
							
							
								HW42 
							
						 
					 
					
						
						
						
						
							
						
						
							457196ba58 
							
						 
					 
					
						
						
							
							debian: add dependency on xen-utils since it's needed for proxy/netvm  
						
						... 
						
						
						
						xen-utils provides the /etc/xen/ scripts which are needed for the
network setup. 
						
					 
					
						2014-11-04 04:59:17 +01:00 
						 
				 
			
				
					
						
							
							
								HW42 
							
						 
					 
					
						
						
						
						
							
						
						
							63e915f6d4 
							
						 
					 
					
						
						
							
							Tag for commit  5d68e2cc70 
						
						... 
						
						
						
						-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUTruhAAoJEAY5OLpCz6ck7IcP/i4JXNEMO8vDSgphM50NIIz6
 +hLb+kXBGeL9SsQKRlz000BUOcIsg+d2ibwnTsi1kNuq2OgJOAHAp5hHgHGc5ddG
 0PLFf/Ddexl7/2cG/hKekXiIpXGcuhqgsIfatqcKB228mVLG8y/kqwViIDbMgg10
 X8Aiq1ba0EeHI7xskkPb1hzkszOfLFoEXCRjt+BQsmr+Bll+sAzCS3G9vSbhczFl
 wmTtgOiu2fWsPgOB2O6HYeO0PUUX+jGF/jncZYf85pEwMccNqRIWjSJC6ti533zv
 5x1bWKWFymBAUcTS+xi00FPeatmQ7b5ywMxTwbqIQkE1Mrt436Dz/B1r0E58q0AH
 gu4qG/KPBNdRBD4vPrvLKiyood/XIpvz0+6QqS9rFMKt71OSzmMR1WeLgclCn768
 cR510iZyJjmqe9lLQQTCJr+oqvwiVot7sfsgj1XP5PozalTkdIawioIZjeX5Zz4O
 +zo+P+jIV+P6QbN+0nD+vrW8kSZlM8vt+OVBPhon/bMFxGKZervs7kFUCNPn6fUK
 WNw8lSrKQqJe/a805Ktku8moatVElmexj7XTkII1nnAnEu6/bokJqjCHQ933794l
 ERRwitFN+BWm3OBXq/BsdSnCotT+gnlMEDtuHiD0JHQBGwxAZGQtliQhWLF25Ekh
 BJkmYBjqgnjCsQFUBMnn
 =shGW
 -----END PGP SIGNATURE-----
Merge tag 'mm_5d68e2cc' into debian-systemd
Tag for commit 5d68e2cc70 
						
					 
					
						2014-11-03 04:28:00 +01:00