1 files changed, 65 insertions, 72 deletions
diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD
index 28dc5a786..7313bfd75 100644
--- a/kernels/xen/PKGBUILD
+++ b/kernels/xen/PKGBUILD
@@ -1,22 +1,23 @@
 # Maintainer (Arch): David Sutton <kantras - gmail.com>
+# Contributor (Arch): Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com>
 # Contributor (Arch): Limao Luo
 # Contributor (Arch): Luceo
 # Contributor (Arch): Revellion
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=xen
-pkgver=4.3.2
-pkgrel=1
+pkgver=4.4.0
+pkgrel=4
 pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)"
 arch=(i686 x86_64)
 url="http://www.xenproject.org/"
 license=(GPL2)
-depends=(bin86 bluez bridge-utils curl e2fsprogs gnutls iproute2 libaio libcap-ng libiscsi libjpeg-turbo libpng lzo2 nss pixman pciutils python python2 sdl wget vde2 yajl)
+depends=(bin86 bluez bridge-utils curl e2fsprogs gnutls iproute2 libaio libcap-ng libiscsi libjpeg-turbo libpng libseccomp lzo2 nss pixman pciutils python python2 sdl wget vde2 yajl)
 [[ "$CARCH" == "x86_64" ]] && depends+=(lib32-glibc)
 makedepends=(cmake dev86 git iasl markdown ocaml-findlib)
 optdepends=('xen-docs: Official Xen Documentation' 'openvswitch: Optional Networking support')
 conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc,git} xen-4.3{,-testing-hg})
-backup=(etc/$pkgname/xend-{config,pci-{permissive,quirks}}.sxp etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf etc/conf.d/xen{stored,consoled,domains} etc/default/xencommons etc/$pkgname/grub.conf)
+backup=(etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf etc/conf.d/xen{stored,consoled,domains,commons} etc/$pkgname/grub.conf)
 options=(!buildflags !strip)
 install=$pkgname.install
 changelog=ChangeLog
@@ -32,11 +33,11 @@ source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
     http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2
     xen.install
     09_xen
-    bios_workaround.patch
-    xendomains.patch
-    TOM-register.patch
     ati-passthrough.patch
-    IVRS-debug.patch
+    localgcc490fix.patch
+    pvh_pit_init.patch
+    xsa89.patch
+    xsa92.patch
     proc-xen.mount
     var-lib-xenstored.mount
     xenconsoled.service
@@ -58,7 +59,7 @@ noextract=(lwip-1.3.0.tar.gz
     gmp-4.3.2.tar.bz2
     ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz)
 
-sha256sums=('17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69'
+sha256sums=('6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021'
             '632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c'
             '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f'
             '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e'
@@ -68,79 +69,58 @@ sha256sums=('17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69'
             '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b'
             '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459'
             '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775'
-            '0f6ebf3437974d1708c9e74005b976479ab8ff28adec394208153bf404b411f8'
-            '74a957d783458b7481c7a09c3ed94ec2e07ee7943e4b7fa33d3684b8d585139e'
-            '914cc983da1fe89ff125d751c979b4968f8952da21b19b900fcd4e6b33e14552'
-            '1938ca36bfb62c76ad0642147017ecfaa64588abaa2d88e868f501c4ae83bfd9'
-            '0fa9426cc499ea3d6e1aa33a8be0e180aed87936814b9b88bb0ef42f6983654a'
+            '9d41f4456f1ce82ab912467a230b6e78b69b39579bccca1337328945ae7e3edb'
+            'b0a3cfe2d524371ee04a26a29ad04cd9f3dae8c5d4a18b6b41576c6c7547f946'
             'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3'
-            '54883171ff9cf5f342a2be5c944df16902ef06b6f2d015b675fa9bd5ed899c7c'
+            '83d4672470437e0a6d2c371681384d67f2056ba85fe3b7898e2b806edecaebd6'
+            '7dcf63e1f7158e0d8d5144f549f4e5fe9a532f9da2650c13968aa39b2730d8b2'
+            '741c8fbbfa8e425d8debba17135d4c2e1e962d15717769bc93d68a65b5dc5ea6'
+            '184dcb88dfb4540fca33016ffcfe0f4f557449ab5b4ec6a4bf486c75926d23f3'
             '139eed988bfaf8edc8ccdfd0b668382bd63db48ce17be91776182a7e28e9d88c'
             'c19146931c6ab8e53092bd9b2ebbfda5c76fd22ad3b1d42dcda3dd1b61f123ff'
             'e4af7891e816b9549ebeff766a78036626c0e278734e5625b8e7d68729530ded'
             '48d76cc6f25caa79b3f527c96a0883b1decb9012f6616f61336c8d43791bf007'
             '0bd45d9de6456c4f9adf32e726f2db3a3cd0423c1d161b442e8a1666d2e68e3f'
             '012cc60ffdcb0e061d04d404eb9232734554aef4dc4b551f66adf82a655e6e41'
-            '8ee5c5a14064fc2bbfd38d0ec8a6001f541bbe56b9fb534733209a8af148b297'
+            '633d334c55395fac3f16dbe56dd7b7524d560b513d1895b53c89943033a45f39'
             '0e1ad0a6a72b0c22025a556c23235a8f663427f1e769c45fe39d1c525bf82eff'
             '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf'
-            '78398fb27edfedb432b5f4e4bf87b5dbee41f180c623d29f758234a49d8bf4b4'
+            '3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568'
             '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c')
-sha512sums=('ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302'
-            'c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4'
-            '1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d'
-            '021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e'
-            '40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3'
-            '2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5'
-            '88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad'
-            'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb'
-            '4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35'
-            '2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf'
-            '78bfb62166ffcf136e12985809b3f412e0145a7f17388a559071f644970ccdfd2a02fe9aa4a180069b923c2e4354b061a4057096de856497f10d9cac57eae4b3'
-            '8667a97e10f09c5ce5ba604e38a073b7d7944f4d24c5c78a7235443b65a8cc7b6e7de90e40aa335bb17fda0858d6b517ba1e8b5a0bd6bba4ad75ad44b73f6c9c'
-            '7118bf02ff5338e70b3f27f8ea390cd05ea37a4ceabb4adc9d32fc57329e35e98330f0e865261dd4e670436e1a725832598888d44b1e2b17b351f59318860878'
-            '440b3967bf0f0cecde42111bc602f591edeadfdf7044f1f181029b0ded5fb8fa9d640bc4a4a57daadd350594f86065120ea5e4d833004590a8bfe0ee88b4c316'
-            'b89f524015c1299c7b19573ae0637f9d33613f3fdbb3d978a07d294ee18a657bd124852f1cbb85e6d1382aca42ed799e8ee245a161340bb4b759eeccce28df7d'
-            'c30a4cbdc942ae36364830ab604ecb46a68466bfbaaef2740aa805acf9e432a0dd7877593d6211437db4d2e7c2deb15f301d5a5571fd28936f01228f13256d3f'
-            'e8392dbc66bf83b887de963416b1fe9a4eeccb8faca78c6fc1dd4243544b871625d43423f03d19cf91d80295d43073904c9dbe37241e7432b69566b05b267391'
-            '6afdf16e32bb837faf6333334f86855a746f1f46fee9673a4fddc62eecf41f9856bc34397807203c6f5071f0b1ce74532214084042154585c0d39514450db25c'
-            '00e340f4d3635e3850ca24baea1da08467523c17815feb74161e18397b607fef904db2165fd9bf4632a6e8a6e37aeddad4e56965e1c99b5213c98b3f9afc6aad'
-            '580e0645d7f157928f137f3d8b38d3e2834cb5fa091dbcd28217bbaed494415a35c8973487a1eec726c2f49c8b11d4dd28fdcbe75f14c91a4474cacd8dfb2e99'
-            'a0bbd9c14ee0f2b9dc9cf304b531aaefde545e56b4ce4847f12faab4952520ce857a92765ae3a1b25ebd2b7511bb24fc820864d7342ac43a311d8c6551958895'
-            'f00034f8b826b828659a0177f0a6454113c625e69a817dfe32e461767f6643e0288bfc2a22d23358504240df627af6e3b8f5ffa0077e241e590b33d3f252e74c'
-            'f21cc17009957797630c2e82630b5e93ceac8fdadc5eaa3abf0510ca81a49e5680a80ece63b248354122c5fd5d40c9a495fad15e307a694936fa062e984158c4'
-            '9e95e05ac7cce383530ede0f8f75b4f8990c7d7d55ef59f3e37c64a75ccc012475595bc1123bc4c2072dd2c1c2f4b744f26d6adb799f7a068195aadde383af89'
-            'c996d48737ad31528b0b2b1379e3ebae948d290de9ddc71f33c7c56f0634466bc7afb2eab847e851c19e3c13bb99468a0778d908606486959a40ff3272189bd3'
-            '53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef'
-            '04000a802e96c11929cb94c9a2bcafbb4307620192388441d979ea85836c3395954dea53d449c1cc25c3a0a30c49d318b8de59a053c6254f5a81e87864648a9c'
-            'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b')
 
 prepare() {
     cd $pkgname-$pkgver/
 
-    ### Patching
-    patch -Np1 -i ../xendomains.patch
-    patch -Np1 -i ../TOM-register.patch
+    ### Patching 
 
-    # Uncomment line below if you have a bios which is reporting bad IVRS data
-    #patch -Np1 -i ../bios_workaround.patch
-    #patch -Np1 -i ../IVRS-debug.patch
+    # Security Patches
+    patch -Np1 -i $srcdir/xsa89.patch
+    patch -Np1 -i $srcdir/xsa92.patch
 
-    # Uncomment line below if you want to enable ATI Passthrough support (some reported successes)
+    # GCC 4.9.0 compile workaround
+    patch -Np1 -i $srcdir/localgcc490fix.patch
+
+    # Issue resolution patches
+    patch -Np1 -i $srcdir/pvh_pit_init.patch
+
+    # Uncomment line below if you want to enable ATI Passthrough support (some reported successes, untested with 4.4)
     #patch -Np1 -i ../ati-passthrough.patch
 
     # Fix Install Paths
     sed -i 's:/sbin:/bin:' config/StdGNU.mk
+    sed -i 's:/var/lock:/run/lock:' config/StdGNU.mk
+    sed -i 's:/var/run:/run:' config/StdGNU.mk
 
     # Copy supporting tarballs into place
-    cp ../lwip-1.3.0.tar.gz stubdom/
-    cp ../zlib-1.2.3.tar.gz stubdom/
-    cp ../newlib-1.16.0.tar.gz stubdom/
-    cp ../pciutils-2.2.9.tar.bz2 stubdom/
-    cp ../polarssl-1.1.4-gpl.tgz stubdom/
-    cp ../grub-0.97.tar.gz stubdom/
-    cp ../tpm_emulator-0.7.4.tar.gz stubdom/
-    cp ../gmp-4.3.2.tar.bz2 stubdom/
+    cp $srcdir/lwip-1.3.0.tar.gz stubdom/
+    cp $srcdir/zlib-1.2.3.tar.gz stubdom/
+    cp $srcdir/newlib-1.16.0.tar.gz stubdom/
+    cp $srcdir/pciutils-2.2.9.tar.bz2 stubdom/
+    cp $srcdir/polarssl-1.1.4-gpl.tgz stubdom/
+    cp $srcdir/grub-0.97.tar.gz stubdom/
+    cp $srcdir/tpm_emulator-0.7.4.tar.gz stubdom/
+    cp $srcdir/gmp-4.3.2.tar.bz2 stubdom/
+    cp $srcdir/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz tools/firmware/etherboot/ipxe.tar.gz
 
 }
 
@@ -157,6 +137,7 @@ package() {
 
     make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install-{xen,tools,stubdom}
 
+    # Install files
     cd ../
     for f in ${source[@]}; do
         [[ $f =~ .mount || $f =~ .service ]] && install -Dm644 $f "$pkgdir"/usr/lib/systemd/system/$f
@@ -171,12 +152,17 @@ package() {
     cd "$pkgdir"
 
     # Fix paths in scripts, move to right locations and create missing directories
+    sed -i 's:/etc/sysconfig:/etc/conf.d:' etc/init.d/xendomains
     sed -i 's:/var/lock:/run/lock:' etc/init.d/xendomains
-    sed -i 's:/var/lock:/run/lock:' etc/init.d/xend
     sed -i 's:/var/lock:/run/lock:' etc/xen/scripts/hotplugpath.sh
+    sed -i 's:/var/run:/run:' etc/init.d/xencommons
     sed -i 's:/var/run:/run:' etc/xen/scripts/hotplugpath.sh
-    mv etc/{init,rc}.d
-    mv etc/rc.d/xendomains etc/xen/scripts/xendomains
+    sed -i 's:/var/run:/run:' etc/xen/scripts/locking.sh
+
+    mv etc/init.d/xencommons etc/xen/scripts/xencommons
+    mv etc/init.d/xendomains etc/xen/scripts/xendomains
+    mv etc/init.d/xen-watchdog etc/xen/scripts/xen-watchdog
+    mv etc/default/xencommons etc/conf.d/xencommons
     mv etc/default/xendomains etc/conf.d/xendomains
     mv var/xen/dump var/lib/xen/
     mkdir var/log/xen/console
@@ -189,33 +175,40 @@ package() {
 	cd ../
     fi
 
-    # Compress and move syms file to a different directory
-    gzip boot/$pkgname-syms-$pkgver
-    mv boot/$pkgname-syms-$pkgver.gz usr/share/xen
+    # Compress syms file and move to a share location
+    if [[ $CARCH == x86_64 ]]; then
+      gzip boot/$pkgname-syms-*
+      mv boot/$pkgname-syms-*.gz usr/share/xen
+    fi
 
     ##### Kill unwanted stuff #####
     # hypervisor symlinks
-    rm -f boot/xen{,-4,-4.3}.gz
+    rm -f boot/xen{,-4,-4.4}.gz
 
     # Documentation cleanup ( see xen-docs package )
     rm -rf usr/share/doc
-    rm -rf usr/share/xen/man
+    rm -rf usr/share/man
 
     # Pointless helper cleanup
     rm -f usr/bin/xen-python-path
-    rm -rf usr/libexec
 
     # Unnecessary qemu support files
     rm -rf usr/bin/qemu-*-xen
+    rm -rf usr/etc
+    rm -rf usr/libexec
     rm usr/share/qemu-xen/qemu/{palcode,openbios}-*
     rm usr/share/xen/qemu/openbios-*
 
-    # Clean up udev rules naming, remove depreciated xend.rules
+    # Clean up udev rules naming
     mv etc/udev/rules.d/xen-backend.rules etc/udev/rules.d/40-xen-backend.rules
-    rm etc/udev/rules.d/xend.rules
+
+    # Cleanup additional leftover files
+    rm -rf usr/include/cacard 
+    rm -f usr/lib/libcacard*
+    rm -f usr/lib/pkgconfig/libcacard.pc
 
     # Clean up left over empty directories
-    rm -rf var/run var/lock var/xen
+    rm -rf var/run var/lock var/xen etc/default etc/init.d
 
     # adhere to Static Library Packaging Guidelines
     rm -rf usr/lib/*.a