diff options
46 files changed, 1262 insertions, 1199 deletions
diff --git a/community/balsa/PKGBUILD b/community/balsa/PKGBUILD index 8777c8f40..77beb3d7f 100644 --- a/community/balsa/PKGBUILD +++ b/community/balsa/PKGBUILD @@ -1,29 +1,25 @@ -# $Id: PKGBUILD 62139 2012-01-16 19:52:55Z dreisner $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> +# $Id: PKGBUILD 76471 2012-09-18 19:07:49Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=balsa -pkgver=2.4.11 +pkgver=2.4.12 pkgrel=1 pkgdesc="An e-mail client for GNOME" arch=('i686' 'x86_64') -license=('GPL') url='http://pawsa.fedorapeople.org/balsa/' +license=('GPL') depends=('gmime' 'libwebkit' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview2' 'gtkspell' 'gnome-icon-theme' 'desktop-file-utils') makedepends=('perlxml' 'gnome-doc-utils' 'intltool') -install=balsa.install -source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - gmime26.patch) -md5sums=('915c622b6385aa4f83d5eee8f31ee8e8' - '108d33f533558a371189441edce7d7e6') +install=$pkgname.install +source=(http://pawsa.fedorapeople.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('3f72fc69bb7fecb59e64c4cb88dc5083ed58dc76c9345b22d6c15af2c6b1e3c4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gmime26.patch" - autoreconf -fi - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -43,5 +39,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" + make GTK_UPDATE_ICON_CACHE=/bin/true DESTDIR="${pkgdir}" install } diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index eb23cb831..cb43c9935 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 73983 2012-07-18 01:06:02Z ibiru $ +# $Id: PKGBUILD 76448 2012-09-18 16:21:17Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.6.3 -_commit=bbe1084 -pkgrel=2 +pkgver=0.7.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.bitcoin.org/" makedepends=('boost' 'automoc4' 'miniupnpc') conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git') replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git') license=('MIT') -source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver") -sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70') +source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz) +sha256sums=('4b7a44fec28cbd9194a1303dd65bba8f13aa2facd4e06e4a3d1df6d66bc1deb5') build() { - cd "$srcdir/bitcoin-$pkgbase-$_commit" + cd "$srcdir/$pkgbase-$pkgver-linux/src" # and make qt gui qmake @@ -33,7 +32,7 @@ package_bitcoin-qt() { depends=(boost-libs qt miniupnpc) install=bitcoin-qt.install - cd "$srcdir/bitcoin-$pkgbase-$_commit" + cd "$srcdir/$pkgbase-$pkgver-linux/src" install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt install -Dm644 contrib/debian/bitcoin-qt.desktop \ "$pkgdir"/usr/share/applications/bitcoin.desktop @@ -47,7 +46,7 @@ package_bitcoin-daemon() { pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon" depends=(boost-libs miniupnpc openssl) - cd "$srcdir/bitcoin-$pkgbase-$_commit" + cd "$srcdir/$pkgbase-$pkgver-linux/src" install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind install -Dm644 contrib/debian/examples/bitcoin.conf \ "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf" diff --git a/community/cpulimit/PKGBUILD b/community/cpulimit/PKGBUILD index cb73d72cd..a8973bb03 100644 --- a/community/cpulimit/PKGBUILD +++ b/community/cpulimit/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 65094 2012-02-20 03:37:27Z spupykin $ +# $Id: PKGBUILD 76442 2012-09-18 16:13:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cpulimit -pkgver=1.1 -pkgrel=3 +pkgver=20120918 +pkgrel=1 pkgdesc="Limit cpu usage in %. Actualy sends SIGSTOP/SIGCONT" arch=('i686' 'x86_64') url="http://cpulimit.sourceforge.net/" license=("GPL") -depends=(glibc) -source=("http://downloads.sourceforge.net/sourceforge/cpulimit/cpulimit-$pkgver.tar.gz") -md5sums=('f4ff6d4bfaef1258e8f5cd2041e2e2a3') +depends=() +source=("$pkgname-$pkgver.tar.gz::https://github.com/opsengine/cpulimit/tarball/master") +md5sums=('a80b8ec21b668d1c15a29ab1f795d1ba') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/opsengine-cpulimit-* make - install -D -m0755 cpulimit $pkgdir/usr/bin/cpulimit + install -Dm0755 src/cpulimit $pkgdir/usr/bin/cpulimit + install -Dm0644 README $pkgdir/usr/share/doc/$pkgname/README } diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD index c833714fd..da92c34d0 100644 --- a/community/intel-tbb/PKGBUILD +++ b/community/intel-tbb/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74680 2012-08-02 00:56:11Z stephane $ +# $Id: PKGBUILD 76482 2012-09-18 21:17:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Denis Martinez <deuns.martinez AT gmail.com> pkgname=intel-tbb -pkgver=4.0_20120613 +pkgver=4.1_20120718 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64') url='http://www.threadingbuildingblocks.org/' license=('GPL') depends=('gcc-libs') -source=("http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb${pkgver/\./}oss_src.tgz") -sha1sums=('48569b88450a78e8f1e7251500fdd951bb197f1b') +source=("http://threadingbuildingblocks.org/uploads/77/188/4.1/tbb${pkgver/\./}oss_src.tgz") +sha1sums=('3fad942c867f032dc5ddeccd7ca19606eda7065d') build() { cd "${srcdir}"/tbb${pkgver/\./}oss diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 54e8cd33c..d7d070855 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75791 2012-08-31 12:11:31Z spupykin $ +# $Id: PKGBUILD 76459 2012-09-18 17:57:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> @@ -7,7 +7,7 @@ pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=1.0 _pkgsubver=0 -pkgrel=1 +pkgrel=2 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64') @@ -40,7 +40,7 @@ package_lazarus() { optdepends=( 'perl: to run some scirpts in the tools directory' 'gtk2: to compile gtk2 apps' - 'qt4pas: to compile qt apps' + 'qt4pas: to compile qt apps and use help viewer' ) cd $srcdir/${pkgbase} @@ -69,6 +69,9 @@ package_lazarus() { ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild cp -R install/man/man1/* $pkgdir/usr/share/man/man1/ mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus + mkdir -p $pkgdir/usr/lib/lazarus/docs + ln -s /usr/share/doc/lazarus/chm $pkgdir/usr/lib/lazarus/docs/html + rm -r $pkgdir/usr/lib/lazarus/install # license files: /usr/lib/lazarus/COPYING* diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 8440defc4..45698db9a 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74867 2012-08-07 16:06:46Z idevolder $ +# $Id: PKGBUILD 76479 2012-09-18 20:07:49Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.8.1 +pkgver=1.9.0 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-34a9cec -sha256sums=('97cda7935404360b56e3c0698deabcc97548bc357a4e4fecbe89de3db12ca0bc') +_srcfolder=Pulse-Eight-libcec-217b236 +sha256sums=('93c0c56b446f82ef71499fd88186c7212a92b037cb8a19516140216cc0aae68f') options=(!libtool) build() { diff --git a/community/libraw/PKGBUILD b/community/libraw/PKGBUILD index 290049feb..35d7c9317 100644 --- a/community/libraw/PKGBUILD +++ b/community/libraw/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 68974 2012-04-06 18:12:22Z jlichtblau $ +# $Id: PKGBUILD 76466 2012-09-18 18:52:24Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=libraw -pkgver=0.14.6 +pkgver=0.14.7 pkgrel=1 pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('lcms') options=('!makeflags') changelog=$pkgname.changelog source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz) -sha256sums=('dad1ebe182584630d4b0fa8801bfefb83ebccf83d89be2f0e1ca3abcfa0ea80d') +sha256sums=('7307a607249043bb544f3ab3b3a999e1923d72fbed12e4e2239d172e522143da') build() { cd ${srcdir}/LibRaw-${pkgver} diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog index 4a34b34b0..858be0c3f 100644 --- a/community/libraw/libraw.changelog +++ b/community/libraw/libraw.changelog @@ -1,3 +1,6 @@ +2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * libraw 0.14.7-1 + 2012-04-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * libraw 0.14.6-1 diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD index 6cf48d2ea..fccf564df 100644 --- a/community/mp3splt-gtk/PKGBUILD +++ b/community/mp3splt-gtk/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 70795 2012-05-16 17:11:55Z jlichtblau $ +# $Id: PKGBUILD 76430 2012-09-18 04:50:32Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=mp3splt-gtk -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Split mp3 and ogg files without decoding" arch=('i686' 'x86_64') url="http://mp3splt.sourceforge.net/" license=('GPL') -depends=('desktop-file-utils' 'gstreamer0.10-ffmpeg' 'gtk2' 'libmp3splt') +depends=('desktop-file-utils' 'gstreamer0.10-ffmpeg' 'gtk3' 'libmp3splt') makedepends=('pkgconfig') install=$pkgname.install changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz \ - $pkgname.desktop) -sha256sums=('58d2e562b004bc99ad206b4a6726126d170dc9093a35689888b010fe663be23a' - 'a50dd43c28a723c824d658b9468ff3719dcc302c57ecb3b122124e63c20800ed') +source=(http://downloads.sourceforge.net/sourceforge/mp3splt/$pkgname-$pkgver.tar.gz) +sha256sums=('7300383453ca8d3268776163e2afb9b03a0d907d2f29ec6fc1826b41679d4e1c') build() { cd ${srcdir}/$pkgname-$pkgver @@ -26,9 +24,6 @@ build() { package() { cd ${srcdir}/$pkgname-$pkgver - make DESTDIR=${pkgdir} install -#install .desktop file - install -D -m644 ${srcdir}/$pkgname.desktop \ - ${pkgdir}/usr/share/applications/$pkgname.desktop + make DESTDIR=${pkgdir} install } diff --git a/community/mp3splt-gtk/mp3splt-gtk.changelog b/community/mp3splt-gtk/mp3splt-gtk.changelog index 50b711d96..939aa6841 100644 --- a/community/mp3splt-gtk/mp3splt-gtk.changelog +++ b/community/mp3splt-gtk/mp3splt-gtk.changelog @@ -1,24 +1,27 @@ +2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * mp3splt-gtk 0.7.3-1 + 2012-05-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.7.2-1 + * mp3splt-gtk 0.7.2-1 2012-02-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.7.1-1 + * mp3splt-gtk 0.7.1-1 2011-08-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.7-1 + * mp3splt-gtk 0.7-1 2011-04-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * mp3splt-gtk O.6.1a-1 + * mp3splt-gtk 0.6.1a-1 * FS#23275 fixed 2010-10-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.6 + * Update to major release 0.6 2010-04-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.5.9 + * Update to major release 0.5.9 2009-11-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.5.8a + * Update to major release 0.5.8a 2009-11-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * Moved to [community] - 67 votes in AUR diff --git a/community/qmc2/PKGBUILD b/community/qmc2/PKGBUILD index 901c88be5..3ce4c767c 100644 --- a/community/qmc2/PKGBUILD +++ b/community/qmc2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71042 2012-05-22 09:30:39Z spupykin $ +# $Id: PKGBUILD 76435 2012-09-18 12:56:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> pkgname=qmc2 -pkgver=0.36 +pkgver=0.37 pkgrel=1 pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME" url="http://qmc2.arcadehits.net" @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') depends=('qtwebkit' 'phonon' 'sdl') makedepends=('rsync' 'mesa') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2") -md5sums=('db374fcdef5f680729b26af88766c4fb') +md5sums=('0f36197cb1a7ab6f54af43f4f67d7150') build() { cd "$srcdir/$pkgname" diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index ca6612877..7c70fed55 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74068 2012-07-19 10:19:10Z arodseth $ +# $Id: PKGBUILD 76433 2012-09-18 08:42:53Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.2.1 +pkgver=3.2.2 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('x86_64' 'i686') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install=$pkgname.install source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('f95c89074fd73a22b783b5582d3b23cdbd4b7eb38ab407721a702c4a1bcb678c') +sha256sums=('9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8') build() { cd "$srcdir" diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD index 1ce9b482c..fdff92bbd 100644 --- a/community/vsftpd/PKGBUILD +++ b/community/vsftpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 76364 2012-09-16 15:05:42Z bpiotrowski $ +# $Id: PKGBUILD 76440 2012-09-18 15:37:11Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=vsftpd -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc="Very Secure FTP daemon" arch=('i686' 'x86_64') @@ -16,8 +16,8 @@ install=vsftpd.install source=(https://security.appspot.com/downloads/$pkgname-$pkgver.tar.gz{,.asc} vsftpd.xinetd vsftpd.d vsftpd-ssl.socket vsftpd.socket vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) -sha1sums=('a366c82e726892eb50e5e74bac92d832d360da74' - 'c30e2813d190bbead6434dd109b21ec2c1076c81' +sha1sums=('f36976bb1c5df25ac236d8a29e965ba2b825ccd0' + '42c6055c1418ad93340bfa3b176b60f1e5b15e0a' 'c87b4ce56dac15223694a6e86c01ea813b877596' '24f268956c24e78be0c234c6d31f41487922eafe' 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD new file mode 100644 index 000000000..de678da8a --- /dev/null +++ b/community/zathura-pdf-mupdf/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Moritz Lipp <mlq@pwmt.org> + +pkgname=zathura-pdf-mupdf +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Adds pdf support to zathura by using the mupdf library" +arch=('i686' 'x86_64') +url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/" +license=('custom') +depends=('mupdf>=1.1' 'zathura') +conflicts=('zathura-pdf-poppler') +source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") +md5sums=('954b6375b5d81e91cd7477e8a5b4552f') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + make +} + +package(){ + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index fb4bbfa10..e1b9ee542 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166682 2012-09-15 15:19:17Z foutrelis $ +# $Id: PKGBUILD 166770 2012-09-18 20:26:27Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6p1 +_sudover=1.8.6p2 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,7 +16,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz sudo.pam) -sha256sums=('70d6a3ceb6168c879a80a5fa03cdd06178b95d0ecb6bf87aa0bc7c159da944cc' +sha256sums=('d342ba710cc326bfa2065ed8ebe262a72b54a497a686aa4cbbbd0ae3028dcf4b' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 7aa88d362..54bb750c6 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162231 2012-06-24 02:24:03Z bisson $ +# $Id: PKGBUILD 166755 2012-09-18 13:55:25Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav -pkgver=0.97.5 -pkgrel=2 +pkgver=0.97.6 +pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver 'logrotate' 'tmpfiles.d' 'config.patch') -sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9' +sha1sums=('528f774b14b95fdfb8b377f8b41859c48b165e34' 'c9d508c1e5972f0f849d8694c1872455fa9e74de' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'df522b0488f3901e491f148c9300f6bae348c605' diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD index 4043c0d71..907f978bd 100644 --- a/extra/xf86-video-rendition/PKGBUILD +++ b/extra/xf86-video-rendition/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153358 2012-03-12 20:53:56Z andyrtr $ +# $Id: PKGBUILD 166766 2012-09-18 18:43:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-rendition -pkgver=4.2.4 -pkgrel=6 +pkgver=4.2.5 +pkgrel=1 pkgdesc="X.org Rendition video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.903') conflicts=('xorg-server<1.11.99.903') options=('!libtool' '!strip') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - rendition-4.2.4-git.patch) -sha1sums=('16148c25183f7829c22bc9dfdb588c1a16bf4565' - 'e023650fa418be9a92d159acd8ac0bc23704dfb3') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/rendition-4.2.4-git.patch ./configure --prefix=/usr make } diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD index 8c9a6b8a7..4a63a6d46 100644 --- a/extra/xf86-video-s3/PKGBUILD +++ b/extra/xf86-video-s3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158890 2012-05-12 18:14:42Z andyrtr $ +# $Id: PKGBUILD 166769 2012-09-18 18:48:45Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-s3 -pkgver=0.6.4 +pkgver=0.6.5 pkgrel=1 pkgdesc="X.org S3 video driver" arch=(i686 x86_64) @@ -14,12 +14,10 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('9170e57f966d810fdfc2de4473a7c8e814019c31') +sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #patch -Np1 -i "${srcdir}/git-fixes.patch" - #autoreconf -fi ./configure --prefix=/usr make } @@ -29,5 +27,5 @@ package() { make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index 700c6b818..64bcc5bb4 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 -pkgrel=27 +pkgrel=28 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD index 47a48dc9c..16acf66e2 100644 --- a/libre/iceweasel-i18n/PKGBUILD +++ b/libre/iceweasel-i18n/PKGBUILD @@ -9,7 +9,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=15.0 +_debver=15.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -20,7 +20,7 @@ pkgbase=iceweasel-i18n pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -_pkgver=15.0 +_pkgver=15.0.1 pkgver=${_debver}.${_debrel} pkgrel=1 @@ -56,90 +56,90 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { " done -md5sums=('41a9b0d39466ec63707c77feb010f97c' - 'a868d76268f52f911683dce647af46b5' - '9eec699d60ca812ffbbf5939522b8393' - '388f4fbbe2266ba7b4896075c2bdbaef' - 'c64bc2261a3a5767f714a460255b15d5' - '2fc0a0395c1d92dd2529291258b7240b' - '0f59e1738c1b37d54b3bb05c2f7853a3' - '68ebd3ec4fc55187dafbfe599f62112e' - 'be4852fbb9c11b36648205f8f1f6cbd1' - 'e68a36c7cefc90e3c61f7d134bb838c7' - 'd242789df2d520b65fc88c1d3df0eae0' - 'e6c527cde3251a8409f16ea0bb278b03' - 'beeba513659afd8e0887a44a9cc44a57' - 'e8f4d9eee6eb1c270f99ddf08359c672' - '618fa08cfbe2ff33581ace766b2828fb' - '0d31f1a718ed91b6b1df885b205c7a75' - 'd823ae880fb0a193d107bc9546206299' - '4c446ef16e61f335f93eace4251f5d8c' - '2129b44ef2edd6223ff731e05aae5112' - 'ca4b27e3b8b9235235b0c59e7fb5e343' - 'ce2f7887eb064983923d917b094d14c2' - '8a5b6b934eb27b706aa52945256f32cf' - 'd6396fe6459c597572a10d1e02f195eb' - '78281b9ebd8a78f37ff6a8af07518cb7' - '36add693276f7d5c73f59e927d4645e4' - '93cafe70ca3b3b36ba0a56b4b4b4a7f9' - '6d911ee10f75ad316861ee6b8c435887' - 'ccd8d4f9ed54aa56e728508e42ec3538' - '4ef4fb5ef6b814bb414e4fed06ca7b14' - '7b49e8f2479c32c9435151a8e139f411' - '4f5974e5d1ec83a598892b729bbca5dc' - '3caf262ec4e12a3166cccbf2e163ec82' - 'eb4be46606957c856cf5d87c337184ca' - '45001918dacec18fb0db953c56e04032' - '766c6f9a84f6930317603d2014bd0a84' - 'bfe20727eb714f616c4a5cdee7300584' - 'fc6701b477ad209a3edb1429b529027f' - '5fb299bd54fd3fa10cf91d88d77df4e0' - '3b1988b200c303747aebfde97cb9333d' - '79bd597a764676dd1fddcf5e0a2aa646' - '9f63e8b4493063c770b835e80f883b66' - 'e9524c247402faaa8b767a93a5e5773a' - '457ae04a4f7437c0b16d1c021be71574' - '77828bdeef9d6e9b78719be537cb0491' - '4bb2c8bd527aed47ef0c50b3861fb2a4' - '4d94a161e882de38616c8344d1d2994a' - '098f4d49f2335cab2a5070c35d5f69e4' - '0deda71dbfb0b07b378de1de9209e047' - '331fab3aae394ef3a3674f4582d0b538' - '4daa8de8b393385d03379ed49b421bb3' - '60534b0e61dd9499ddb3ff3a29026b2f' - '519299dfc4764e987ece840b630fa8c9' - 'a13a1bc158353eadedd4d9a22f7a78fd' - '39804bd399a955cde36db0e7bfc0afd2' - '1c24d64463fb742fddb438939302a770' - 'a3246566714da549faaefed6a082747e' - '7d06acae2f3a3bc15344502cdef25bf0' - '68b3f9e98df3ddcca5458695297a6581' - '6cc30b2ec4e75c45a41bcd328385e285' - 'a0df4e646a376f8dce539309a057c340' - '8745389d916b522df730ea457fcc7b20' - '4982a6a88b3bf883b21633e3561a41d7' - '41ddec979a26c2fd6b212285cfa26b3c' - '7ac36674bd749e11c2a28cb646ed420c' - 'ba855d101c76ead73e7d4d7a74839a2b' - '4f2abadda53b3f0c0eeeb2bbefc96991' - '67e448c17a2ee9f981743427e6e69d69' - '90a365963d579ecb9d2681f0510b665f' - '92d635cf265e0eec023d80034b0d1cd0' - 'edd7160a59c4210b64bd384ee3196f76' - 'cd3c038c61d7ce643a01808ed88d92d0' - 'e5e07573a583ffc660f6ec846658b266' - '99e79e501170ca8a452d25eed5cfeab6' - 'dd6e06943820e0731d3b1697ac12d353' - 'c263cdeff3879481dc6b7cf44df9364a' - '3656bf7eba6a1042f3fa19c8cb494339' - '923313a52e0bf228fe2d41345401b296' - '1ba11249737fc1e2e61952e17fe764ec' - '8103d1b2f18f25df4b7702e3f1fc23ef' - '5d9cdf21c5bbd7bab97b10d9784f538e' - '4c032777e914f0e30cfeb2d1627f2b14' - '45a462e14b8e2c44d064f4bb6dffd3f5' - '075d374f6ee205df5b0f56629c0234fa' - '49517a540428d07cbf6809d96eecdd85' - '60f7b29f1325a6de41c45af2cb2423ba' - '8a000cb0afcb6655f7c626c05a313873' - '90e94eef2a30d9c20ecb0103d0203981')
\ No newline at end of file +md5sums=('79831dfa9c7bc1d225c1e0731aa1812d' + '5064fdac19ceb7a0e7591e3d5227c71a' + '58e40739dfdef056300b69f3ff243bf7' + '9b1e8be0c7e9f11c1b6833622c41f7f7' + 'f2cc2ab7fd4efb94a0abc2ed9f8dcd99' + '0c6b8d597963363d4deff2ba302933cb' + '4caf1810d3ec159aaee5aabe5fb41015' + '052e9fb61183919a9cef0ba3a21c1065' + '22a4011c70c2c7f2feb56ba9aa1b75b3' + 'e450bdc0489c13da7007046efde141d7' + '1066e9b63a9615e5e705abd050886381' + 'fb21b42b85f72d29ad104ee518f86816' + '261c4edc8eb830256e60221be390d573' + '489f7bf241f72945dd8003b7d579505a' + 'e53715797a28a95dd5ebb094695f5d7d' + '965568dae2adacfaa89af19861bdd3c8' + '2c0f1dadd9dad562405bc10633e9ea55' + '6d35c2d76d364a858f60cbb8b0660a87' + 'b735ed5cffb084c1c91146d27c4023f5' + '263a9856b1a3a00b629a22f2f69c6d4e' + '6b9235119e92fe3625e7ee12ad3cf7f1' + '2a8e8f053bd70a889a15bdac9e7b48de' + '337990a6b6b32cd8602617f0542577ad' + '48613cca6a97c02403cc9690e9fd8d2c' + '8be32d05a78f7276a4a6c4fcad6de138' + 'a6ea3d88bfd8f4ef58e484639cd2a699' + 'c1d0d16819bddceed43b25e4840c5e87' + '2dcd5644c1c95add25902727e9ac7d42' + '15176fb56b7c67949ca1d29ee02ce978' + '5fc634287dae98715ce017421212cc04' + '3076e60893d0e6cd32c679d021d00630' + '0157ff70e0e09a501525c56cd3b88ea4' + 'd96211027a8225e2f72bd68abd664949' + 'ffdfb3c66259660494af038d4079c097' + 'b891b408f643120a985c9cac9e81742a' + '16353581281c2bec3c937e089fb6457e' + '3b74bab168b0e0b463082a7adfef27de' + '350212900b1b5dedfde431f3fabbf9c9' + '06939ccc30180980ea6e12eae31495c9' + '29c8cf5d130e5592b1814dcc51a2dae2' + '18bc79a25230dffe1c27ec017eb96fd1' + '55ffa67fd02875c87b2b59b3359d68b8' + '0ecb61d1344ade52509604e9586b2d4c' + '8eef6c0339ca718a14cdc74b9886908b' + '5b70ad36f87875e1743586e04b12a411' + '18ff63b7fb7b48c240c23d8b7b664ca9' + 'fd70ac793964f2ce3714f302b30406f7' + 'f06d30c67e79b8ba8fe8140dcc6a7135' + '1ce03a6583705dd86d2badc7892fe93d' + '6fd4037255e5cf8839dab79ecef04e27' + '2ac8f87c1506270fd245e94e0ac3518a' + '68ef53993504ce07ff1f6afde33cb81c' + '49c5830b53b99102543eef7314207309' + '8dc5f8b6b93e94b576ea8c10275487e5' + '8f17ba770e49782537f1735260c03541' + '96c8f2567b232854a725163160c65448' + '58e122361c24f596e2ab7a4db0bdee2e' + 'a54c41dc316660ce259451a15601644c' + '6938ca2d179eb378affc3cb42cc2c246' + 'ed3a70fc0f5ede98f3d11183c0d9617b' + 'dd9f39a6c00a2ee8afd86385a6befe61' + 'a2c421a7c15a1756f8b08806b84c448f' + '5bd32e2abf133b3ba7a38c870961a2b5' + '8d3715ee6389fc20989189ece7dac88b' + 'cc3cd43d79e2e952118e589e9cdb1519' + 'bbb1bd76a28f5f339786a15a82dc6511' + '6e305cf35820a7eb81f233ad4cf0c6b3' + 'f268902fa45c71b989ae84bff17dfad7' + 'fc19d4e5c1fe55aed5e7ff81f4c5840a' + '983e4aade5b9f3744db59cd3e36f4957' + '88323b7e6cf6f5e3a4ce1a23fc818f13' + 'e6ab0d4d5e9d3e1b7f7b994998667931' + '572900c28726fc8aa25de53af7769218' + '21b497ea035a29df60fd3e8d07b56ddd' + '8a1667e492f18344ebcbbff72b9397e8' + '007462b1c8d812c56ab5d1856f15ca3e' + '8bd629c3984be0f9deeea91515d7367e' + '6853d129015e003996ccd94cf3873893' + 'def9852b081ab0bfe9217341e1a180e0' + '3c41610d639a0d30fc38bcdfe69925f6' + '934acd8b6f51527c3d384d268b054311' + '390d48709061fe8fa586c6e5ccd36fee' + 'f02a6c5c7ff53d61576d63258e65214c' + 'cdba209a41e8d6336539dab4fb4dcfbf' + '98651af79417b210a85702e40c19d4fb' + '016841fdf23b1e3ee4d4dcb5626a8dad' + '59128bae2e6a3cf053e191bf632c47d6')
\ No newline at end of file diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 59435e71a..8eb6ef769 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,7 +14,7 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=15.0 +_debver=15.0.1 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25' - 'b93090724434e3801375730744e79950' +md5sums=('0936242388cd4c75930c1d2487e15216' + 'ce37c76476b8edf40780d00cf79d0d62' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 0ec26edcd..7b7d47180 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') pkgver=4.9.1 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 03c280487..77bc80f7d 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=42 +_sublevel=43 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,9 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '8f1c9341d99e941b07d1d6f85f1953aa' - '8cd05778fc1c2d8145b3b9932b4e3164' - '87a54dc6251cf2adf35f72ddeddb6ea8' + 'c4b4e6d908e70fc6f991a1789a3ac620' + '2e7d5f58da4d66e87bbe2c9294c50aef' + '77608e2de7b30a08ecd8e422bf2b16bb' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -40,7 +40,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - '1f082cc9e5a18e227f7a044ff429914a') + '2c4870ef22f87ef885f3be392d1aaa90') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -224,11 +224,11 @@ _package() { mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-LTS}/version" - # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" - # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index f4e10c441..74d543f70 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.40-2 Kernel Configuration +# Linux/i386 3.0.43-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -81,7 +81,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_FHANDLE is not set +CONFIG_FHANDLE=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -107,7 +107,6 @@ CONFIG_IRQ_FORCED_THREADING=y # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set # CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=32 @@ -3446,6 +3445,7 @@ CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VIA_CAMERA=m CONFIG_VIDEO_NOON010PC30=m CONFIG_VIDEO_M5MOLS=m CONFIG_SOC_CAMERA=m @@ -3871,7 +3871,9 @@ CONFIG_FB_I810_I2C=y # CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set -# CONFIG_FB_VIA is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set @@ -5052,7 +5054,7 @@ CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 80f5a7aca..e43cc343c 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/x86_64 3.0.40-2 Kernel Configuration +# Linux/x86_64 3.0.43-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -82,7 +82,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_FHANDLE is not set +CONFIG_FHANDLE=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -108,7 +108,6 @@ CONFIG_IRQ_FORCED_THREADING=y # RCU Subsystem # CONFIG_TREE_RCU=y -# CONFIG_TREE_PREEMPT_RCU is not set # CONFIG_PREEMPT_RCU is not set # CONFIG_RCU_TRACE is not set CONFIG_RCU_FANOUT=64 @@ -3280,6 +3279,7 @@ CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m CONFIG_VIDEO_SR030PC30=m +CONFIG_VIDEO_VIA_CAMERA=m CONFIG_VIDEO_NOON010PC30=m CONFIG_VIDEO_M5MOLS=m CONFIG_SOC_CAMERA=m @@ -3684,7 +3684,9 @@ CONFIG_FB_EFI=y # CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set -# CONFIG_FB_VIA is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set @@ -4793,7 +4795,7 @@ CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 05124e7ab..d24939c13 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.42-1-LIBRE-LTS +KERNEL_VERSION=3.0.43-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e63be980b..45888f407 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.5 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -34,9 +34,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-i2c-crash-3.5.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '861f5f97c75b1a572fc5078605248ea3' - '3ba164b409d8024fdd433f3cc4ae1fea' - 'fa1e2ab2f036974199374f015f5a2c46' + '51fd8205ef5bcebc8c777a30c57b1fa2' + 'd83444b46ed5088e47f38cce2641023c' + '1ca6f15729d07ae7b3969eea3b4d8cff' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -45,7 +45,7 @@ md5sums=('2407fc9563a74acaf38aa0c06516eb1c' 'c1d58e712112cf8f95e7831012a1e67a' 'ae13ed1e92bba07e9b17cf5c8d89683c' 'ff4a203dd52e4dfb5d60948bb667d06d' - 'd822cc131b20090f39b0d448b0e1f8be') + 'd5c5a9bb87544c9fbc19c661802f9020') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -65,10 +65,6 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" - # fix alsa powersave bug, probably fixed in 3.5.4 - # https://bugs.archlinux.org/task/31255 - patch -Np1 -i "${srcdir}/alsa-powersave-3.5.x.patch" - # fix broken watchdog # https://bugzilla.kernel.org/show_bug.cgi?id=44991 patch -Np1 -i "${srcdir}/watchdog-3.5.x.patch" @@ -228,11 +224,11 @@ _package() { mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}" echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" - # move module tree /lib -> /usr/lib - mv "$pkgdir/lib" "$pkgdir/usr" - # Now we call depmod... depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" } _package-headers() { diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 54db12ba1..64792e25e 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -73,7 +73,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_FHANDLE is not set +CONFIG_FHANDLE=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -4090,7 +4090,9 @@ CONFIG_FB_I810_I2C=y # CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set -# CONFIG_FB_VIA is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 31da569ad..14112f8c1 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.5.0-2 Kernel Configuration +# Linux/x86_64 3.5.4-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -74,7 +74,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_FHANDLE is not set +CONFIG_FHANDLE=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y @@ -335,7 +335,7 @@ CONFIG_X86_MPPARSE=y CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_XEN=y CONFIG_XEN_DOM0=y CONFIG_XEN_PRIVILEGED_GUEST=y @@ -668,7 +668,7 @@ CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y CONFIG_BINFMT_MISC=y CONFIG_IA32_EMULATION=y CONFIG_IA32_AOUT=m -# CONFIG_X86_X32 is not set +CONFIG_X86_X32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y @@ -2898,6 +2898,7 @@ CONFIG_I2C_SCMI=m # # I2C system bus drivers (mostly embedded / system-on-chip) # +CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PCI=m CONFIG_I2C_EG20T=m # CONFIG_I2C_GPIO is not set @@ -3924,7 +3925,9 @@ CONFIG_FB_EFI=y # CONFIG_FB_S3 is not set # CONFIG_FB_SAVAGE is not set # CONFIG_FB_SIS is not set -# CONFIG_FB_VIA is not set +CONFIG_FB_VIA=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y # CONFIG_FB_NEOMAGIC is not set # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set @@ -5103,7 +5106,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y -CONFIG_EXPORTFS=m +CONFIG_EXPORTFS=y CONFIG_FILE_LOCKING=y CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 0cd51930e..8b449331b 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.5.3-1-LIBRE +KERNEL_VERSION=3.5.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 0968afd17..bcb82132a 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=26 +pkgrel=27 epoch=1 _extramodules=extramodules-3.5-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index be2b8de26..add9fd496 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -11,7 +11,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=5 +pkgrel=6 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 51c847e40..0d01ae1e6 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.5-LIBRE -pkgrel=8 +pkgrel=9 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 917a14f0c..d8c509e4b 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,161 +1,71 @@ # $Id$ -#Maintainer: Ionut Biru <ibiru@archlinux.org> -#Maintainer (Parabola): Jorge López <jorginho@lavabit.com> -#Contributor (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Maintainer (Parabola): Jorge López <jorginho@lavabit.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=virtualbox-libre-modules -pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') -pkgver=4.1.22 -pkgrel=1 +pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') +pkgver=4.2.0 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl-libre' 'linux-libre-headers') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - LocalConfig.kmk 60-vboxguest.rules os_blag_64.png os_blag.png - os_dragora_64.png os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png - os_gnu_64.png os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png - os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png - os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch - free-distros.patch) -md5sums=('84c5beeead094ce52d098105897aadbb' - '4c88bd122677a35f68abd76eb01b378b' - 'ed1341881437455d9735875ddf455fbe' - '8538dba8686d7449cb481c9bae9d722a' - '545c925b46f2ac95e5f8ae407fad101a' - 'f6416f509c2e5460e4dc624e0a57f3c1' - 'bbfb59dd517c020a23701b480187a355' - 'efacfdb61918286ea9bc89866b8fd239' - '7c3eb09995e8bafeef414374e44ad4ce' - 'a49ed3ab6bd0fb084de0ab3dd97ae93e' - '6b432b3305ed446125eef052c38355a6' - 'a70022a468bd3e9daf01818d2d74ac3c' - '6b432b3305ed446125eef052c38355a6' - 'a70022a468bd3e9daf01818d2d74ac3c' - 'a70022a468bd3e9daf01818d2d74ac3c' - '380eb2ab6cad3da198094585853c129c' - 'a60bb9a98abcc3c34156f9051d00df9a' - '3a908ef6952bcf987e63ef2fe4e98d24' - '02e87c39c353634cecacf98f1707fa15' - '0cf41a41e7a415d404d5584e047fd450' - '449cde3b58390284b59c5d663de3edc9' - 'c7951fe6888d939f3a7d0dafe477e82b' - '4da8eeb2ece7e475fc7a0d1003da26c6' - '5e4187af59726d71c5be48d0cd816c34' - 'a9e4724b56ddf99bb2e9a8fab8ad43ba' - '1e47d90affabfbf6dbb07d9d42742d6a') - -_extramodules=extramodules-3.5-LIBRE - - - +makedepends=('linux-libre-headers' + "virtualbox-libre-host-source>=$pkgver" + "virtualbox-libre-guest-source>=$pkgver" + 'expac') build() { - _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" - - export KERN_DIR=/usr/lib/modules/${_kernver}/build - export KERN_INCL=/usr/src/linux-${_kernver}/include/ - - cd "$srcdir/VirtualBox-${pkgver}" - - patch -Np1 -i "$srcdir/libre.patch" - patch -Np1 -i "$srcdir/free-distros.patch" - - ## Removing Nonfree directories - rm -rv "./include/VBox/ExtPack" - rm -rv "./src/VBox/ExtPacks" - rm -rv "./src/VBox/Main/src-helper-apps" - - ## Removing Oracle VM VirtualBox Extension Pack icons - rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns" - rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png - rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico" - rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png - - ## Adding free distros icons - for i in {gnuhurd,dynebolic,venenux,{gnu{,linux},parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do - cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images" - done - - ## Removing non-free OS icons - rm -v "./src/VBox/Frontends/VirtualBox/images/os_"{{{arch,turbo}linux,debian,fedora,gentoo,linux{24,26},macosx,mandriva,{free,net,open}bsd,redhat,solaris,opensuse,oracle{,solaris},ubuntu,win{2k{3,8},7,8,vista,xp},xandros}{,_64},dos,jrockitve,l4,linux{,22,_other},netware,qnx,os2{_other,ecs,warp{3,4,45}},win{2k,31,95,98,_other,me,nt4}}.png - - cp "$srcdir/LocalConfig.kmk" . - - ./configure \ - --with-linux=/usr/src/linux-${_kernver} \ - --disable-java \ - --disable-docs \ - --disable-xpcom \ - --disable-python \ - --disable-sdl-ttf \ - --disable-alsa \ - --disable-pulse \ - --disable-dbus \ - --disable-opengl \ - --build-headless \ - --nofatal - source ./env.sh - kmk all - - make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - make -C "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" + # current kernel libre version + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + # dkms need modification to be run as user + cp -r /var/lib/dkms . + echo "dkms_tree='$srcdir/dkms'" > dkms.conf + # build host modules + msg2 'Host modules' + dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" + # build guest modules + msg2 'Guest modules' + dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" } -package_virtualbox-libre-parabola-modules(){ - pkgdesc="Additions only for Parabola guests (kernel libre modules)" - license=('GPL') - install=virtualbox-libre-parabola-modules.install - depends=('linux-libre>=3.5' 'linux-libre<3.6') - replaces=('virtualbox-archlinux-modules') - conflicts=('virtualbox-archlinux-modules') - provides=("virtualbox-archlinux-modules=$pkgver") - - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - for module in vboxguest.ko vboxsf.ko vboxvideo.ko; do - install -D -m644 ${module} \ - "$pkgdir/usr/lib/modules/${_extramodules}/${module}" - done - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-libre-parabola-modules.install" +package_virtualbox-libre-host-modules(){ + pkgdesc='Host kernel libre modules for VirtualBox' + depends=('linux-libre>=3.5' 'linux-libre<3.6') + provides=("virtualbox-host-modules=${pkgver}") + replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') + conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules') + install=virtualbox-libre-host-modules.install + + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install" } -package_virtualbox-libre-modules(){ - pkgdesc="Kernel libre modules for VirtualBox" - license=('GPL') - install=virtualbox-libre-modules.install - depends=('linux-libre>=3.5' 'linux-libre<3.6') - replaces=('virtualbox-modules') - conflicts=('virtualbox-modules') - provides=("virtualbox-modules=$pkgver") - - source "$srcdir/VirtualBox-${pkgver}/env.sh" - - - cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/src" - - install -D -m644 vboxdrv.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxdrv.ko" - - install -D -m644 vboxnetadp.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetadp.ko" - - install -D -m644 vboxnetflt.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxnetflt.ko" - - install -D -m644 vboxpci.ko \ - "$pkgdir/usr/lib/modules/${_extramodules}/vboxpci.ko" +package_virtualbox-libre-guest-modules(){ + pkgdesc='Guest kernel libre modules for VirtualBox' + license=('GPL') + depends=('linux-libre>=3.5' 'linux-libre<3.6') + provides=("virtualbox-guest-modules=${pkgver}" + replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') + conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules') + install=virtualbox-libre-guest-modules.install + + _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE + _extraver=extramodules-${_kernver%.*}-LIBRE + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" +} - find "${pkgdir}" -name '*.ko' -exec gzip -9 {} + - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-libre-modules.install" -} +# vim:set ts=2 sw=2 et: diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh new file mode 100755 index 000000000..87aefbff0 --- /dev/null +++ b/libre/virtualbox-libre-modules/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if (( $# != 1 )); then + echo "usage: $0 extra" + echo " $0 testing" + exit 1 +fi + +$1-i686-build +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 + +$1-x86_64-build +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -r /var/lib/archbuild/$1-x86_64 + + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-modules.install index 3f2a12a3f..8605cf20a 100644 --- a/libre/virtualbox-libre-modules/virtualbox-libre-modules.install +++ b/libre/virtualbox-libre-modules/virtualbox-libre-modules.install @@ -1,5 +1,5 @@ post_install() { -/bin/cat << EOF +cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index ceff911bc..cff380c81 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -1,32 +1,68 @@ # $Id$ # Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + pkgbase=virtualbox-libre pkgname=('virtualbox-libre' - 'virtualbox-libre-parabola-additions' 'virtualbox-libre-sdk' - 'virtualbox-libre-source' - 'virtualbox-libre-parabola-source') -pkgver=4.1.22 -pkgrel=1.3 + 'virtualbox-libre-host-source' + 'virtualbox-libre-guest-additions' + 'virtualbox-libre-guest-source') +pkgver=4.2.0 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2') +'xalan-c' 'sdl-libre' 'libxmu' 'curl' 'python2' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk7-openjdk' 'gsoap' 'vde2' 'cdrkit') #'xorg-server-devel' 'xf86driproto' 'libxcomposite') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk ipv6_vnc.patch + 10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk change_default_driver_dir.patch vboxservice.conf vboxservice.rc vboxservice.service vboxweb.conf vboxweb.rc vboxweb.service os_blag_64.png os_blag.png os_dragora_64.png os_dragora.png os_dynebolic.png os_gnewsense_64.png os_gnewsense.png os_gnu_64.png os_gnuhurd.png os_gnulinux_64.png os_gnulinux.png os_gnu.png os_musix_64.png os_musix.png os_parabola_64.png os_parabola.png os_trisquel_64.png os_trisquel.png os_ututo_64.png os_ututo.png os_venenux.png libre.patch free-distros.patch) +md5sums=('691b4134983ce7d89b9fb683305cb647' + '5f85710e0b8606de967716ded7b2d351' + 'aa0c090e33aab3e2853b679cc52cba2a' + '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' + '97e193f050574dd272a38e5ee5ebe62b' + '3c08ad30b89add47d3f45121200a5360' + '7d9823507206de9b8528a72af2f18d74' + '07c5f6d86c4b7839d719c8ee0c53653b' + '7e9483b1069a54f181546083ac7e5469' + 'c159d683ba1947290fc2ad2c64194150' + 'bc9efed88e0469cd7fc460d5a5cd7b4b' + '8538dba8686d7449cb481c9bae9d722a' + '545c925b46f2ac95e5f8ae407fad101a' + 'f6416f509c2e5460e4dc624e0a57f3c1' + 'bbfb59dd517c020a23701b480187a355' + 'efacfdb61918286ea9bc89866b8fd239' + '7c3eb09995e8bafeef414374e44ad4ce' + 'a49ed3ab6bd0fb084de0ab3dd97ae93e' + '6b432b3305ed446125eef052c38355a6' + 'a70022a468bd3e9daf01818d2d74ac3c' + '6b432b3305ed446125eef052c38355a6' + 'a70022a468bd3e9daf01818d2d74ac3c' + 'a70022a468bd3e9daf01818d2d74ac3c' + '380eb2ab6cad3da198094585853c129c' + 'a60bb9a98abcc3c34156f9051d00df9a' + '3a908ef6952bcf987e63ef2fe4e98d24' + '02e87c39c353634cecacf98f1707fa15' + '0cf41a41e7a415d404d5584e047fd450' + '449cde3b58390284b59c5d663de3edc9' + 'c7951fe6888d939f3a7d0dafe477e82b' + '4da8eeb2ece7e475fc7a0d1003da26c6' + '5e4187af59726d71c5be48d0cd816c34' + '67cc4c8611890038eb3e4114ae899525' + '058c61d52984c1c3b23006f151ed1562') _extramodules=extramodules-3.5-LIBRE _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true @@ -60,11 +96,14 @@ build() { cp "$srcdir/LocalConfig.kmk" . + # fake makeself binary to compile without nofatal + ln -s /bin/echo makeself + export PATH="$CWD:$PATH" + ./configure --disable-docs \ --enable-webservice \ --enable-vde \ --enable-vnc \ - --nofatal \ --with-linux=/usr/src/linux-${_kernver} source ./env.sh kmk all @@ -77,11 +116,11 @@ build() { package_virtualbox-libre() { pkgdesc="Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)" - depends=('virtualbox-libre-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') + depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng') optdepends=('qt: for VirtualBox GUI' 'vde2: Virtual Distributed Ethernet support' 'virtualbox-libre-sdk: developer kit' - 'virtualbox-libre-source: host kernel libre source modules for non-stock kernels' + 'virtualbox-libre-host-source: host kernel libre source modules for non-stock kernels' 'net-tools: for host-only or bridged networking') backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') @@ -160,24 +199,8 @@ package_virtualbox-libre() { } -package_virtualbox-libre-source() { - pkgdesc="VirtualBox kernel libre modules source" - depends=(dkms gcc make) - replaces=('virtualbox-source') - conflicts=('virtualbox-source') - provides=("virtualbox-source=$pkgver" 'virtualbox-libre-modules') - optdepends=('linux-libre-headers' - 'linux-libre-lts-headers') - install=virtualbox-libre-source.install - - install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source" -} - package_virtualbox-libre-sdk() { - pkgdesc="VirtualBox Software Developer Kit (SDK)" + pkgdesc='VirtualBox Software Developer Kit (SDK)' depends=('python2') replaces=('virtualbox-sdk') conflicts=('virtualbox-sdk') @@ -197,14 +220,46 @@ package_virtualbox-libre-sdk() { mv sdk "$pkgdir/usr/lib/virtualbox" } -package_virtualbox-libre-parabola-additions(){ - pkgdesc="Additions only for Parabola guests (userspace tools)" - depends=('virtualbox-libre-parabola-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') - conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') - provides=("virtualbox-archlinux-additions=${pkgver}") +package_virtualbox-libre-host-source() { + pkgdesc='VirtualBox kernel libre modules source' + depends=('dkms' 'gcc' 'make') + provides=("virtualbox-host-source=$pkgver" 'virtualbox-libre-host-modules') + replaces=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') + conflicts=('virtualbox-host-source' 'virtualbox-source' 'virtualbox-libre-source') + optdepends=('linux-libre-headers' + 'linux-libre-lts-headers') + install=virtualbox-libre-host-source.install + + install -dm755 "$pkgdir/usr/src" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" + cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" +} + +package_virtualbox-libre-guest-source() { + pkgdesc='VirtualBox Additions kernel libre modules source' + depends=('dkms' 'gcc' 'make') + provides=("virtualbox-guest-source=${pkgver}" 'virtualbox-libre-guest-modules') + replaces=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') + conflicts=('virtualbox-guest-source' 'virtualbox-archlinux-source' 'virtualbox-parabola-source') + optdepends=('linux-libre-headers' + 'linux-libre-lts-headers') + install=virtualbox-libre-guest-source.install + + install -dm755 "$pkgdir/usr/src" + source "VirtualBox-$pkgver/env.sh" + cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" + cp -r src "$pkgdir/usr/src/vboxguest-$pkgver" +} + +package_virtualbox-libre-guest-additions(){ + pkgdesc='Additions for guests only (userspace tools)' + depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') + provides=("virtualbox-guest-additions=${pkgver}") + replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions') + conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions') backup=('etc/conf.d/vboxservice') - install=virtualbox-libre-parabola-additions.install + install=virtualbox-libre-guest-additions.install source "VirtualBox-$pkgver/env.sh" @@ -235,55 +290,3 @@ package_virtualbox-libre-parabola-additions(){ install -D -m644 "$srcdir/vboxservice.service" \ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } - -package_virtualbox-libre-parabola-source() { - pkgdesc='VirtualBox Additions kernel libre modules source' - depends=(dkms gcc make) - replaces=('virtualbox-archlinux-source') - conflicts=('virtualbox-archlinux-source') - provides=("virtualbox-archlinux-source=${pkgver}" 'virtualbox-libre-parabola-modules') - optdepends=('linux-libre-headers' - 'linux-libre-lts-headers') - install=virtualbox-libre-parabola-source.install - - install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source" -} - -md5sums=('84c5beeead094ce52d098105897aadbb' - '5f85710e0b8606de967716ded7b2d351' - 'bf5d1eeeec20a042e8af34cd61a9e11b' - '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' - '4ff559f2bea335d59c4012048983ca91' - '97e193f050574dd272a38e5ee5ebe62b' - '3c08ad30b89add47d3f45121200a5360' - '7d9823507206de9b8528a72af2f18d74' - '07c5f6d86c4b7839d719c8ee0c53653b' - '7e9483b1069a54f181546083ac7e5469' - 'c159d683ba1947290fc2ad2c64194150' - 'bc9efed88e0469cd7fc460d5a5cd7b4b' - '8538dba8686d7449cb481c9bae9d722a' - '545c925b46f2ac95e5f8ae407fad101a' - 'f6416f509c2e5460e4dc624e0a57f3c1' - 'bbfb59dd517c020a23701b480187a355' - 'efacfdb61918286ea9bc89866b8fd239' - '7c3eb09995e8bafeef414374e44ad4ce' - 'a49ed3ab6bd0fb084de0ab3dd97ae93e' - '6b432b3305ed446125eef052c38355a6' - 'a70022a468bd3e9daf01818d2d74ac3c' - '6b432b3305ed446125eef052c38355a6' - 'a70022a468bd3e9daf01818d2d74ac3c' - 'a70022a468bd3e9daf01818d2d74ac3c' - '380eb2ab6cad3da198094585853c129c' - 'a60bb9a98abcc3c34156f9051d00df9a' - '3a908ef6952bcf987e63ef2fe4e98d24' - '02e87c39c353634cecacf98f1707fa15' - '0cf41a41e7a415d404d5584e047fd450' - '449cde3b58390284b59c5d663de3edc9' - 'c7951fe6888d939f3a7d0dafe477e82b' - '4da8eeb2ece7e475fc7a0d1003da26c6' - '5e4187af59726d71c5be48d0cd816c34' - 'a9e4724b56ddf99bb2e9a8fab8ad43ba' - '1e47d90affabfbf6dbb07d9d42742d6a') diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch index 47857e05d..ac0a840e3 100644 --- a/libre/virtualbox-libre/free-distros.patch +++ b/libre/virtualbox-libre/free-distros.patch @@ -1,12 +1,73 @@ ---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.569003667 -0300 -+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp 2012-07-25 14:51:03.652333615 -0300 -@@ -44,94 +44,38 @@ - * first matching string found, will be used. */ +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-08-29 11:13:40.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2012-09-19 01:30:56.328334913 -0300 +@@ -44,99 +44,111 @@ + static const osTypePattern gs_OSTypePattern[] = { +- /* DOS: */ - { QRegExp("DOS", Qt::CaseInsensitive), "DOS" }, ++ ++ /* Code names for GNU/Linux distributions */ ++ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, ++ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, ++ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" }, ++ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" }, ++ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" }, ++ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" }, ++ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "GNULinux" }, ++ ++ /* Regular names of GNU/Linux distributions and GNU-Hurd */ ++ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" }, ++ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" }, ++ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" }, ++ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" }, ++ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" }, ++ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" }, ++ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" }, ++ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" }, ++ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" }, ++ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" }, ++ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" }, ++ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" }, ++ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" }, ++ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, ++ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, ++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, ++ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, ++ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" }, ++ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Arc.*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("Arc", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Deb.*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("Deb", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Fe.*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("Fe", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Tur.*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("Tur", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Ub.*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("Ub", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Xa.*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("Xa", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "GNULinux_64" }, ++ { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Knoppix", Qt::CaseInsensitive), "GNULinux" }, ++ { QRegExp("Dsl", Qt::CaseInsensitive), "GNULinux" }, -- /* Windows */ +- /* Windows: */ - { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" }, - { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" }, - { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" }, @@ -27,20 +88,21 @@ - { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" }, - { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" }, - -- /* Solaris */ -- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, -- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*1[01])|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, +- /* Solaris: */ +- { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" }, +- { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" }, +- { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" }, - { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" }, - { QRegExp("So", Qt::CaseInsensitive), "Solaris" }, - -- /* OS/2 */ +- /* OS/2: */ - { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" }, - { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" }, - { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" }, - { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" }, - { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" }, - -- /* Code names for Linux distributions */ +- /* Code names for Linux distributions: */ - { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" }, - { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" }, - { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" }, @@ -48,7 +110,7 @@ - { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" }, - { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" }, - -- /* Regular names of Linux distributions */ +- /* Regular names of Linux distributions: */ - { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" }, - { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" }, - { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" }, @@ -59,8 +121,8 @@ - { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" }, - { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" }, - { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" }, -- { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" }, -- { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" }, +- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" }, +- { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" }, - { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" }, - { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" }, - { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" }, @@ -71,6 +133,8 @@ - { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" }, - { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" }, - { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" }, +- { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" }, +- { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" }, - { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" }, - { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" }, - { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" }, @@ -78,37 +142,8 @@ - { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" }, - { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" }, - { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" }, -+ /* Code names for GNU/Linux distributions */ -+ { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" }, -+ { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" }, -+ { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" }, -+ { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" }, -+ { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" }, -+ { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" }, -+ -+ /* Regular names of GNU/Linux distributions and GNU-Hurd */ -+ { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" }, -+ { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" }, -+ { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" }, -+ { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" }, -+ { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" }, -+ { QRegExp("Bla", Qt::CaseInsensitive), "Blag" }, -+ { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" }, -+ { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" }, -+ { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" }, -+ { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" }, -+ { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" }, -+ { QRegExp("Mus", Qt::CaseInsensitive), "Musix" }, -+ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" }, -+ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" }, -+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" }, -+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" }, -+ { QRegExp("GNU", Qt::CaseInsensitive), "GNU" }, -+ { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" }, -+ { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" }, -+ { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" }, - - /* Other */ +- +- /* Other: */ - { QRegExp("L4", Qt::CaseInsensitive), "L4" }, - { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" }, - { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" }, @@ -121,9 +156,53 @@ - { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" }, - { QRegExp("Net", Qt::CaseInsensitive), "Netware" }, - { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" }, ++ /* Other */ { QRegExp("Ot", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("DOS", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Wi.*98", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Wi.*95", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Wi.*Me", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Wi.*3", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Wi", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("So.*11", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("So.*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("So", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("L4", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Op.*B", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Ne.*B", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("QN", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Net", Qt::CaseInsensitive), "Other" }, ++ { QRegExp("Rocki", Qt::CaseInsensitive), "Other" }, }; + UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup) --- VirtualBox-4.1.18.orig/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.498764160 -0300 +++ VirtualBox-4.1.18/src/VBox/Main/xml/Settings.cpp 2012-07-25 15:14:50.548761649 -0300 @@ -3227,40 +3227,18 @@ @@ -234,546 +313,460 @@ </xsl:choose> </xsl:attribute> <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/> ---- VirtualBox-4.1.18.orig/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.856003691 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/xml/VirtualBox-settings-common.xsd 2012-07-25 15:04:37.892668156 -0300 -@@ -137,75 +137,27 @@ - <xsd:simpleType name="TGuestOSType"> - <xsd:restriction base="xsd:string"> - <xsd:enumeration value="Other"/> -- <xsd:enumeration value="DOS"/> -- <xsd:enumeration value="Netware"/> -- <xsd:enumeration value="L4"/> -- <xsd:enumeration value="Windows31"/> -- <xsd:enumeration value="Windows95"/> -- <xsd:enumeration value="Windows98"/> -- <xsd:enumeration value="WindowsMe"/> -- <xsd:enumeration value="WindowsNT4"/> -- <xsd:enumeration value="Windows2000"/> -- <xsd:enumeration value="WindowsXP"/> -- <xsd:enumeration value="WindowsXP_64"/> -- <xsd:enumeration value="Windows2003"/> -- <xsd:enumeration value="Windows2003_64"/> -- <xsd:enumeration value="WindowsVista"/> -- <xsd:enumeration value="WindowsVista_64"/> -- <xsd:enumeration value="Windows2008"/> -- <xsd:enumeration value="Windows2008_64"/> -- <xsd:enumeration value="Windows7"/> -- <xsd:enumeration value="Windows7_64"/> -- <xsd:enumeration value="Windows8"/> -- <xsd:enumeration value="Windows8_64"/> -- <xsd:enumeration value="WindowsNT"/> -- <xsd:enumeration value="OS2Warp3"/> -- <xsd:enumeration value="OS2Warp4"/> -- <xsd:enumeration value="OS2Warp45"/> -- <xsd:enumeration value="OS2eCS"/> -- <xsd:enumeration value="OS2"/> -- <xsd:enumeration value="Linux22"/> -- <xsd:enumeration value="Linux24"/> -- <xsd:enumeration value="Linux24_64"/> -- <xsd:enumeration value="Linux26"/> -- <xsd:enumeration value="Linux26_64"/> -- <xsd:enumeration value="ArchLinux"/> -- <xsd:enumeration value="ArchLinux_64"/> -- <xsd:enumeration value="Debian"/> -- <xsd:enumeration value="Debian_64"/> -- <xsd:enumeration value="OpenSUSE"/> -- <xsd:enumeration value="OpenSUSE_64"/> -- <xsd:enumeration value="Fedora"/> -- <xsd:enumeration value="Fedora_64"/> -- <xsd:enumeration value="Gentoo"/> -- <xsd:enumeration value="Gentoo_64"/> -- <xsd:enumeration value="Mandriva"/> -- <xsd:enumeration value="Mandriva_64"/> -- <xsd:enumeration value="RedHat"/> -- <xsd:enumeration value="RedHat_64"/> -- <xsd:enumeration value="Turbolinux"/> -- <xsd:enumeration value="Turbolinux_64"/> -- <xsd:enumeration value="Ubuntu"/> -- <xsd:enumeration value="Ubuntu_64"/> -- <xsd:enumeration value="Xandros"/> -- <xsd:enumeration value="Xandros_64"/> -- <xsd:enumeration value="Oracle"/> -- <xsd:enumeration value="Oracle_64"/> -- <xsd:enumeration value="Linux"/> -- <xsd:enumeration value="FreeBSD"/> -- <xsd:enumeration value="FreeBSD_64"/> -- <xsd:enumeration value="OpenBSD"/> -- <xsd:enumeration value="OpenBSD_64"/> -- <xsd:enumeration value="NetBSD"/> -- <xsd:enumeration value="NetBSD_64"/> -- <xsd:enumeration value="Solaris"/> -- <xsd:enumeration value="Solaris_64"/> -- <xsd:enumeration value="OpenSolaris"/> -- <xsd:enumeration value="OpenSolaris_64"/> -- <xsd:enumeration value="QNX"/> -- <xsd:enumeration value="MacOS"/> -- <xsd:enumeration value="MacOS_64"/> -- <xsd:enumeration value="JRockitVE"/> -+ <xsd:enumeration value="GNU"/> -+ <xsd:enumeration value="GNU_64"/> -+ <xsd:enumeration value="GNUHurd"/> -+ <xsd:enumeration value="GNULinux"/> -+ <xsd:enumeration value="GNULinux_64"/> -+ <xsd:enumeration value="Parabola"/> -+ <xsd:enumeration value="Parabola_64"/> -+ <xsd:enumeration value="gNewSense"/> -+ <xsd:enumeration value="gNewSense_64"/> -+ <xsd:enumeration value="Blag"/> -+ <xsd:enumeration value="Blag_64"/> -+ <xsd:enumeration value="Dragora"/> -+ <xsd:enumeration value="Dragora_64"/> -+ <xsd:enumeration value="Ututo"/> -+ <xsd:enumeration value="Ututo_64"/> -+ <xsd:enumeration value="Musix"/> -+ <xsd:enumeration value="Musix_64"/> -+ <xsd:enumeration value="Trisquel"/> -+ <xsd:enumeration value="Trisquel_64"/> -+ <xsd:enumeration value="Dynebolic"/> -+ <xsd:enumeration value="Venenux"/> - </xsd:restriction> - </xsd:simpleType> - ---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.733096866 -0300 -+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-25 15:40:56.796426519 -0300 +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:52:44.572133271 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 01:58:47.789130085 -0300 @@ -1,75 +1,27 @@ - <!DOCTYPE RCC><RCC version="1.0"> - <qresource prefix="/"> -- <file alias="os_archlinux.png">images/os_archlinux.png</file> -- <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file> -- <file alias="os_debian.png">images/os_debian.png</file> -- <file alias="os_debian_64.png">images/os_debian_64.png</file> -- <file alias="os_dos.png">images/os_dos.png</file> -- <file alias="os_fedora.png">images/os_fedora.png</file> -- <file alias="os_fedora_64.png">images/os_fedora_64.png</file> -- <file alias="os_freebsd.png">images/os_freebsd.png</file> -- <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file> -- <file alias="os_gentoo.png">images/os_gentoo.png</file> -- <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file> -- <file alias="os_jrockitve.png">images/os_jrockitve.png</file> -- <file alias="os_l4.png">images/os_l4.png</file> -- <file alias="os_linux_other.png">images/os_linux_other.png</file> -- <file alias="os_linux22.png">images/os_linux22.png</file> -- <file alias="os_linux24.png">images/os_linux24.png</file> -- <file alias="os_linux24_64.png">images/os_linux24_64.png</file> -- <file alias="os_linux26.png">images/os_linux26.png</file> -- <file alias="os_linux26_64.png">images/os_linux26_64.png</file> -- <file alias="os_mandriva.png">images/os_mandriva.png</file> -- <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> -- <file alias="os_netbsd.png">images/os_netbsd.png</file> -- <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file> -- <file alias="os_netware.png">images/os_netware.png</file> -- <file alias="os_openbsd.png">images/os_openbsd.png</file> -- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file> -- <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file> -- <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file> -- <file alias="os_opensuse.png">images/os_opensuse.png</file> -- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file> -- <file alias="os_os2_other.png">images/os_os2_other.png</file> -- <file alias="os_os2ecs.png">images/os_os2ecs.png</file> -- <file alias="os_os2warp3.png">images/os_os2warp3.png</file> -- <file alias="os_os2warp4.png">images/os_os2warp4.png</file> -- <file alias="os_os2warp45.png">images/os_os2warp45.png</file> -+ <file alias="os_parabola.png">images/os_parabola.png</file> -+ <file alias="os_parabola_64.png">images/os_parabola_64.png</file> -+ <file alias="os_gnewsense.png">images/os_gnewsense.png</file> -+ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file> -+ <file alias="os_blag.png">images/os_blag.png</file> -+ <file alias="os_blag_64.png">images/os_blag_64.png</file> -+ <file alias="os_ututo.png">images/os_ututo.png</file> -+ <file alias="os_ututo_64.png">images/os_ututo_64.png</file> -+ <file alias="os_gnu.png">images/os_gnu.png</file> -+ <file alias="os_gnu_64.png">images/os_gnu_64.png</file> -+ <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file> -+ <file alias="os_gnulinux.png">images/os_gnulinux.png</file> -+ <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file> -+ <file alias="os_musix.png">images/os_musix.png</file> -+ <file alias="os_musix_64.png">images/os_musix_64.png</file> -+ <file alias="os_dragora.png">images/os_dragora.png</file> -+ <file alias="os_dragora_64.png">images/os_dragora_64.png</file> - <file alias="os_other.png">images/os_other.png</file> -- <file alias="os_qnx.png">images/os_qnx.png</file> -- <file alias="os_redhat.png">images/os_redhat.png</file> -- <file alias="os_redhat_64.png">images/os_redhat_64.png</file> -- <file alias="os_turbolinux.png">images/os_turbolinux.png</file> -- <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file> -- <file alias="os_solaris.png">images/os_solaris.png</file> -- <file alias="os_solaris_64.png">images/os_solaris_64.png</file> -- <file alias="os_ubuntu.png">images/os_ubuntu.png</file> -- <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file> -- <file alias="os_win_other.png">images/os_win_other.png</file> -- <file alias="os_win2k.png">images/os_win2k.png</file> -- <file alias="os_win2k3.png">images/os_win2k3.png</file> -- <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file> -- <file alias="os_win2k8.png">images/os_win2k8.png</file> -- <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file> -- <file alias="os_win31.png">images/os_win31.png</file> -- <file alias="os_win7.png">images/os_win7.png</file> -- <file alias="os_win7_64.png">images/os_win7_64.png</file> -- <file alias="os_win8.png">images/os_win8.png</file> -- <file alias="os_win8_64.png">images/os_win8_64.png</file> -- <file alias="os_win95.png">images/os_win95.png</file> -- <file alias="os_win98.png">images/os_win98.png</file> -- <file alias="os_winme.png">images/os_winme.png</file> -- <file alias="os_winnt4.png">images/os_winnt4.png</file> -- <file alias="os_winvista.png">images/os_winvista.png</file> -- <file alias="os_winvista_64.png">images/os_winvista_64.png</file> -- <file alias="os_winxp.png">images/os_winxp.png</file> -- <file alias="os_winxp_64.png">images/os_winxp_64.png</file> -- <file alias="os_xandros.png">images/os_xandros.png</file> -- <file alias="os_xandros_64.png">images/os_xandros_64.png</file> -- <file alias="os_oracle.png">images/os_oracle.png</file> -- <file alias="os_oracle_64.png">images/os_oracle_64.png</file> -- <file alias="os_macosx.png">images/os_macosx.png</file> -- <file alias="os_macosx_64.png">images/os_macosx_64.png</file> -+ <file alias="os_dynebolic.png">images/os_dynebolic.png</file> -+ <file alias="os_venenux.png">images/os_venenux.png</file> -+ <file alias="os_trisquel.png">images/os_trisquel.png</file> -+ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file> - <file alias="hd_16px.png">images/hd_16px.png</file> - <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> - <file alias="hd_32px.png">images/hd_32px.png</file> ---- VirtualBox-4.1.20.orig/src/VBox/Main/src-all/Global.cpp 2012-08-20 11:36:24.000000000 -0300 -+++ VirtualBox-4.1.20/src/VBox/Main/src-all/Global.cpp 2012-08-21 14:22:29.148190849 -0300 -@@ -35,284 +35,90 @@ + <RCC> + <qresource prefix="/"> +- <file alias="os_archlinux.png">images/os_archlinux.png</file> +- <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file> +- <file alias="os_debian.png">images/os_debian.png</file> +- <file alias="os_debian_64.png">images/os_debian_64.png</file> +- <file alias="os_dos.png">images/os_dos.png</file> +- <file alias="os_fedora.png">images/os_fedora.png</file> +- <file alias="os_fedora_64.png">images/os_fedora_64.png</file> +- <file alias="os_freebsd.png">images/os_freebsd.png</file> +- <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file> +- <file alias="os_gentoo.png">images/os_gentoo.png</file> +- <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file> +- <file alias="os_jrockitve.png">images/os_jrockitve.png</file> +- <file alias="os_l4.png">images/os_l4.png</file> +- <file alias="os_linux_other.png">images/os_linux_other.png</file> +- <file alias="os_linux22.png">images/os_linux22.png</file> +- <file alias="os_linux24.png">images/os_linux24.png</file> +- <file alias="os_linux24_64.png">images/os_linux24_64.png</file> +- <file alias="os_linux26.png">images/os_linux26.png</file> +- <file alias="os_linux26_64.png">images/os_linux26_64.png</file> +- <file alias="os_mandriva.png">images/os_mandriva.png</file> +- <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file> +- <file alias="os_netbsd.png">images/os_netbsd.png</file> +- <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file> +- <file alias="os_netware.png">images/os_netware.png</file> +- <file alias="os_openbsd.png">images/os_openbsd.png</file> +- <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file> +- <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file> +- <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file> +- <file alias="os_opensuse.png">images/os_opensuse.png</file> +- <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file> +- <file alias="os_os2_other.png">images/os_os2_other.png</file> +- <file alias="os_os2ecs.png">images/os_os2ecs.png</file> +- <file alias="os_os2warp3.png">images/os_os2warp3.png</file> +- <file alias="os_os2warp4.png">images/os_os2warp4.png</file> +- <file alias="os_os2warp45.png">images/os_os2warp45.png</file> + <file alias="os_other.png">images/os_other.png</file> +- <file alias="os_qnx.png">images/os_qnx.png</file> +- <file alias="os_redhat.png">images/os_redhat.png</file> +- <file alias="os_redhat_64.png">images/os_redhat_64.png</file> +- <file alias="os_turbolinux.png">images/os_turbolinux.png</file> +- <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file> +- <file alias="os_solaris.png">images/os_solaris.png</file> +- <file alias="os_solaris_64.png">images/os_solaris_64.png</file> +- <file alias="os_ubuntu.png">images/os_ubuntu.png</file> +- <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file> +- <file alias="os_win_other.png">images/os_win_other.png</file> +- <file alias="os_win2k.png">images/os_win2k.png</file> +- <file alias="os_win2k3.png">images/os_win2k3.png</file> +- <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file> +- <file alias="os_win2k8.png">images/os_win2k8.png</file> +- <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file> +- <file alias="os_win31.png">images/os_win31.png</file> +- <file alias="os_win7.png">images/os_win7.png</file> +- <file alias="os_win7_64.png">images/os_win7_64.png</file> +- <file alias="os_win8.png">images/os_win8.png</file> +- <file alias="os_win8_64.png">images/os_win8_64.png</file> +- <file alias="os_win95.png">images/os_win95.png</file> +- <file alias="os_win98.png">images/os_win98.png</file> +- <file alias="os_winme.png">images/os_winme.png</file> +- <file alias="os_winnt4.png">images/os_winnt4.png</file> +- <file alias="os_winvista.png">images/os_winvista.png</file> +- <file alias="os_winvista_64.png">images/os_winvista_64.png</file> +- <file alias="os_winxp.png">images/os_winxp.png</file> +- <file alias="os_winxp_64.png">images/os_winxp_64.png</file> +- <file alias="os_xandros.png">images/os_xandros.png</file> +- <file alias="os_xandros_64.png">images/os_xandros_64.png</file> +- <file alias="os_oracle.png">images/os_oracle.png</file> +- <file alias="os_oracle_64.png">images/os_oracle_64.png</file> +- <file alias="os_macosx.png">images/os_macosx.png</file> +- <file alias="os_macosx_64.png">images/os_macosx_64.png</file> ++ <file alias="os_parabola.png">images/os_parabola.png</file> ++ <file alias="os_parabola_64.png">images/os_parabola_64.png</file> ++ <file alias="os_gnewsense.png">images/os_gnewsense.png</file> ++ <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file> ++ <file alias="os_blag.png">images/os_blag.png</file> ++ <file alias="os_blag_64.png">images/os_blag_64.png</file> ++ <file alias="os_ututo.png">images/os_ututo.png</file> ++ <file alias="os_ututo_64.png">images/os_ututo_64.png</file> ++ <file alias="os_gnu.png">images/os_gnu.png</file> ++ <file alias="os_gnu_64.png">images/os_gnu_64.png</file> ++ <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file> ++ <file alias="os_gnulinux.png">images/os_gnulinux.png</file> ++ <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file> ++ <file alias="os_musix.png">images/os_musix.png</file> ++ <file alias="os_musix_64.png">images/os_musix_64.png</file> ++ <file alias="os_dragora.png">images/os_dragora.png</file> ++ <file alias="os_dragora_64.png">images/os_dragora_64.png</file> ++ <file alias="os_dynebolic.png">images/os_dynebolic.png</file> ++ <file alias="os_venenux.png">images/os_venenux.png</file> ++ <file alias="os_trisquel.png">images/os_trisquel.png</file> ++ <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file> + <file alias="hd_16px.png">images/hd_16px.png</file> + <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file> + <file alias="hd_32px.png">images/hd_32px.png</file> +--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp 2012-09-08 06:36:02.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp 2012-09-19 03:33:50.143066084 -0300 +@@ -29,296 +29,94 @@ + /* NOTE1: we assume that unknown is always the first entry! + * NOTE2: please use powers of 2 when specifying the size of harddisks since + * '2GB' looks better than '1.95GB' (= 2000MB) */ +- { "Other", "Other", "Other", "Other/Unknown", ++ { "Other", "Other", "Other", "Other/Unknown", VBOXOSTYPE_Unknown, VBOXOSHINT_NONE, 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows31, "Windows 3.1", -- VBOXOSTYPE_Win31, VBOXOSHINT_NONE, +- { "Windows", "Microsoft Windows", "Windows31", "Windows 3.1", +- VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY, - 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows95, "Windows 95", -- VBOXOSTYPE_Win95, VBOXOSHINT_NONE, +- { "Windows", "Microsoft Windows", "Windows95", "Windows 95", +- VBOXOSTYPE_Win95, VBOXOSHINT_FLOPPY, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows98, "Windows 98", -- VBOXOSTYPE_Win98, VBOXOSHINT_NONE, +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "Windows", "Microsoft Windows", "Windows98", "Windows 98", +- VBOXOSTYPE_Win98, VBOXOSHINT_FLOPPY, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "Windows", "Microsoft Windows", "WindowsMe", "Windows ME", +- VBOXOSTYPE_WinMe, VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET, +- 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsMe, "Windows Me", -- VBOXOSTYPE_WinMe, VBOXOSHINT_NONE, -- 64, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT4, "Windows NT 4", +- { "Windows", "Microsoft Windows", "WindowsNT4", "Windows NT 4", - VBOXOSTYPE_WinNT4, VBOXOSHINT_NONE, - 128, 16, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2000, "Windows 2000", +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "Windows", "Microsoft Windows", "Windows2000", "Windows 2000", - VBOXOSTYPE_Win2k, VBOXOSHINT_USBTABLET, - 168, 16, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP, "Windows XP", +- { "Windows", "Microsoft Windows", "WindowsXP", "Windows XP", - VBOXOSTYPE_WinXP, VBOXOSHINT_USBTABLET, - 192, 16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsXP_64, "Windows XP (64 bit)", +- { "Windows", "Microsoft Windows", "WindowsXP_64", "Windows XP (64 bit)", - VBOXOSTYPE_WinXP_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 192, 16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003, "Windows 2003", +- { "Windows", "Microsoft Windows", "Windows2003", "Windows 2003", - VBOXOSTYPE_Win2k3, VBOXOSHINT_USBTABLET, - 256, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2003_64, "Windows 2003 (64 bit)", +- { "Windows", "Microsoft Windows", "Windows2003_64", "Windows 2003 (64 bit)", - VBOXOSTYPE_Win2k3_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 256, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista, "Windows Vista", +- { "Windows", "Microsoft Windows", "WindowsVista", "Windows Vista", - VBOXOSTYPE_WinVista, VBOXOSHINT_USBTABLET, - 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsVista_64, "Windows Vista (64 bit)", +- { "Windows", "Microsoft Windows", "WindowsVista_64", "Windows Vista (64 bit)", - VBOXOSTYPE_WinVista_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008, "Windows 2008", +- { "Windows", "Microsoft Windows", "Windows2008", "Windows 2008", - VBOXOSTYPE_Win2k8, VBOXOSHINT_USBTABLET, - 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows2008_64, "Windows 2008 (64 bit)", +- { "Windows", "Microsoft Windows", "Windows2008_64", "Windows 2008 (64 bit)", - VBOXOSTYPE_Win2k8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7, "Windows 7", +- { "Windows", "Microsoft Windows", "Windows7", "Windows 7", - VBOXOSTYPE_Win7, VBOXOSHINT_USBTABLET, - 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows7_64, "Windows 7 (64 bit)", +- { "Windows", "Microsoft Windows", "Windows7_64", "Windows 7 (64 bit)", - VBOXOSTYPE_Win7_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 512, 16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8, "Windows 8", -- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, +- { "Windows", "Microsoft Windows", "Windows8", "Windows 8", +- VBOXOSTYPE_Win8, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE, - 1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_Windows8_64, "Windows 8 (64 bit)", +- { "Windows", "Microsoft Windows", "Windows8_64", "Windows 8 (64 bit)", - VBOXOSTYPE_Win8_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, -- 1536,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, +- { "Windows", "Microsoft Windows", "Windows2012_64", "Windows 2012 (64 bit)", +- VBOXOSTYPE_Win2k12_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, +- 2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA }, -- { "Windows", "Microsoft Windows", SchemaDefs_OSTypeId_WindowsNT, "Other Windows", +- { "Windows", "Microsoft Windows", "WindowsNT", "Other Windows", - VBOXOSTYPE_WinNT, VBOXOSHINT_NONE, - 512, 16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux22, "Linux 2.2", +- { "Linux", "Linux", "Linux22", "Linux 2.2", - VBOXOSTYPE_Linux22, VBOXOSHINT_RTCUTC, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24, "Linux 2.4", +- { "Linux", "Linux", "Linux24", "Linux 2.4", - VBOXOSTYPE_Linux24, VBOXOSHINT_RTCUTC, - 128, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux24_64, "Linux 2.4 (64 bit)", +- { "Linux", "Linux", "Linux24_64", "Linux 2.4 (64 bit)", - VBOXOSTYPE_Linux24_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, - 128, 4, 4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU, "GNU", ++ { "GNU", "GNU", "GNU", "GNU", + VBOXOSTYPE_GNU, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "GNU", "GNU", SchemaDefs_OSTypeId_GNU_64, "GNU (64 bit)", ++ { "GNU", "GNU", "GNU_64", "GNU (64 bit)", + VBOXOSTYPE_GNU_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -+ { "GNU-Hurd", "GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd, "GNU-Hurd", ++ { "GNU-Hurd", "GNU-Hurd", "GNUHurd", "GNU-Hurd", + VBOXOSTYPE_GNUHurd, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26, "Linux 2.6", +- { "Linux", "Linux", "Linux26", "Linux 2.6", - VBOXOSTYPE_Linux26, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux, "GNU/Linux", ++ { "GNU/Linux", "GNU/Linux", "GNULinux", "GNU/Linux", + VBOXOSTYPE_GNULinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux26_64, "Linux 2.6 (64 bit)", +- { "Linux", "Linux", "Linux26_64", "Linux 2.6 (64 bit)", - VBOXOSTYPE_Linux26_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_GNULinux_64, "GNU/Linux (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "GNULinux_64", "GNU/Linux (64 bit)", + VBOXOSTYPE_GNULinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux, "Arch Linux", +- { "Linux", "Linux", "ArchLinux", "Arch Linux", - VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola, "Parabola GNU/Linux-libre", ++ { "GNU/Linux", "GNU/Linux", "Parabola", "Parabola GNU/Linux-libre", + VBOXOSTYPE_Parabola, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_ArchLinux_64, "Arch Linux (64 bit)", +- { "Linux", "Linux", "ArchLinux_64", "Arch Linux (64 bit)", - VBOXOSTYPE_ArchLinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Parabola_64, "Parabola GNU/Linux-libre (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Parabola_64", "Parabola GNU/Linux-libre (64 bit)", + VBOXOSTYPE_Parabola_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Debian, "Debian", +- { "Linux", "Linux", "Debian", "Debian", - VBOXOSTYPE_Debian, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense, "gNewSense", ++ { "GNU/Linux", "GNU/Linux", "gNewSense", "gNewSense", + VBOXOSTYPE_gNewSense, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Debian_64, "Debian (64 bit)", +- { "Linux", "Linux", "Debian_64", "Debian (64 bit)", - VBOXOSTYPE_Debian_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_gNewSense_64, "gNewSense (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "gNewSense_64", "gNewSense (64 bit)", + VBOXOSTYPE_gNewSense_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, -- { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE, "openSUSE", +- { "Linux", "Linux", "OpenSUSE", "openSUSE", - VBOXOSTYPE_OpenSUSE, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_OpenSUSE_64, "openSUSE (64 bit)", +- { "Linux", "Linux", "OpenSUSE_64", "openSUSE (64 bit)", - VBOXOSTYPE_OpenSUSE_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora, "Fedora", +- { "Linux", "Linux", "Fedora", "Fedora", - VBOXOSTYPE_FedoraCore, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag, "Blag Linux and GNU", ++ { "GNU/Linux", "GNU/Linux", "Blag", "Blag Linux and GNU", + VBOXOSTYPE_Blag, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Fedora_64, "Fedora (64 bit)", +- { "Linux", "Linux", "Fedora_64", "Fedora (64 bit)", - VBOXOSTYPE_FedoraCore_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Blag_64, "Blag Linux and GNU (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Blag_64", "Blag Linux and GNU (64 bit)", + VBOXOSTYPE_Blag_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 768, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo, "Gentoo", +- { "Linux", "Linux", "Gentoo", "Gentoo", - VBOXOSTYPE_Gentoo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora, "Dragora", ++ { "GNU/Linux", "GNU/Linux", "Dragora", "Dragora", + VBOXOSTYPE_Dragora, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Gentoo_64, "Gentoo (64 bit)", +- { "Linux", "Linux", "Gentoo_64", "Gentoo (64 bit)", - VBOXOSTYPE_Gentoo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dragora_64, "Dragora (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Dragora_64", "Dragora (64 bit)", + VBOXOSTYPE_Dragora_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva, "Mandriva", +- { "Linux", "Linux", "Mandriva", "Mandriva", - VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Mandriva_64, "Mandriva (64 bit)", +- { "Linux", "Linux", "Mandriva_64", "Mandriva (64 bit)", - VBOXOSTYPE_Mandriva_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat, "Red Hat", +- { "Linux", "Linux", "RedHat", "Red Hat", - VBOXOSTYPE_RedHat, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo, "Ututo XS", ++ { "GNU/Linux", "GNU/Linux", "Ututo", "Ututo XS", + VBOXOSTYPE_Ututo, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_RedHat_64, "Red Hat (64 bit)", +- { "Linux", "Linux", "RedHat_64", "Red Hat (64 bit)", - VBOXOSTYPE_RedHat_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, - 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Ututo_64, "Ututo XS (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Ututo_64", "Ututo XS (64 bit)", + VBOXOSTYPE_Ututo_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux", +- { "Linux", "Linux", "Turbolinux", "Turbolinux", - VBOXOSTYPE_Turbolinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix, "Musix", ++ { "GNU/Linux", "GNU/Linux", "Musix", "Musix", + VBOXOSTYPE_Musix, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Turbolinux, "Turbolinux (64 bit)", +- { "Linux", "Linux", "Turbolinux_64", "Turbolinux (64 bit)", - VBOXOSTYPE_Turbolinux_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Musix_64, "Musix (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Musix_64", "Musix (64 bit)", + VBOXOSTYPE_Musix_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu, "Ubuntu", +- { "Linux", "Linux", "Ubuntu", "Ubuntu", - VBOXOSTYPE_Ubuntu, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, + StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97}, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel, "Trisquel", ++ { "GNU/Linux", "GNU/Linux", "Trisquel", "Trisquel", + VBOXOSTYPE_Trisquel, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Ubuntu_64, "Ubuntu (64 bit)", +- { "Linux", "Linux", "Ubuntu_64", "Ubuntu (64 bit)", - VBOXOSTYPE_Ubuntu_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Trisquel_64, "Trisquel (64 bit)", ++ { "GNU/Linux", "GNU/Linux", "Trisquel_64", "Trisquel (64 bit)", + VBOXOSTYPE_Trisquel_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, 512, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros, "Xandros", +- { "Linux", "Linux", "Xandros", "Xandros", - VBOXOSTYPE_Xandros, VBOXOSHINT_RTCUTC, - 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Dynebolic, "Dyne:bolic", ++ { "GNU/Linux", "GNU/Linux", "Dynebolic", "Dyne:bolic", + VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Xandros_64, "Xandros (64 bit)", +- { "Linux", "Linux", "Xandros_64", "Xandros (64 bit)", - VBOXOSTYPE_Xandros_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, - 256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, -+ { "GNU/Linux", "GNU/Linux", SchemaDefs_OSTypeId_Venenux, "Venenux", ++ { "GNU/Linux", "GNU/Linux", "Venenux", "Venenux", + VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, + 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle, "Oracle", +- { "Linux", "Linux", "Oracle", "Oracle", - VBOXOSTYPE_Oracle, VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE, - 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Oracle_64, "Oracle (64 bit)", +- { "Linux", "Linux", "Oracle_64", "Oracle (64 bit)", - VBOXOSTYPE_Oracle_x64, VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC, - 512, 12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Linux", "Linux", SchemaDefs_OSTypeId_Linux, "Other Linux", +- { "Linux", "Linux", "Linux", "Other Linux", - VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET, - 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris, "Oracle Solaris 10 5/09 and earlier", +- { "Solaris", "Solaris", "Solaris", "Oracle Solaris 10 5/09 and earlier", - VBOXOSTYPE_Solaris, VBOXOSHINT_NONE, - 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Solaris", "Solaris", SchemaDefs_OSTypeId_Solaris_64, "Oracle Solaris 10 5/09 and earlier (64 bit)", +- { "Solaris", "Solaris", "Solaris_64", "Oracle Solaris 10 5/09 and earlier (64 bit)", - VBOXOSTYPE_Solaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, - 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris, "Oracle Solaris 10 10/09 and later", +- { "Solaris", "Solaris", "OpenSolaris", "Oracle Solaris 10 10/09 and later", - VBOXOSTYPE_OpenSolaris, VBOXOSHINT_USBTABLET, - 768, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Solaris", "Solaris", SchemaDefs_OSTypeId_OpenSolaris_64, "Oracle Solaris 10 10/09 and later (64 bit)", +- { "Solaris", "Solaris", "OpenSolaris_64", "Oracle Solaris 10 10/09 and later (64 bit)", - VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, - 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, - StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD, "FreeBSD", +- { "Solaris", "Solaris", "Solaris11_64", "Oracle Solaris 11 (64 bit)", +- VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET, +- 1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA, +- StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 }, +- { "BSD", "BSD", "FreeBSD", "FreeBSD", - VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE, - 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "BSD", "BSD", SchemaDefs_OSTypeId_FreeBSD_64, "FreeBSD (64 bit)", +- { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)", - VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, - 128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD, "OpenBSD", +- { "BSD", "BSD", "OpenBSD", "OpenBSD", - VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX, - 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "BSD", "BSD", SchemaDefs_OSTypeId_OpenBSD_64, "OpenBSD (64 bit)", +- { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)", - VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, - 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD, "NetBSD", +- { "BSD", "BSD", "NetBSD", "NetBSD", - VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE, - 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "BSD", "BSD", SchemaDefs_OSTypeId_NetBSD_64, "NetBSD (64 bit)", +- { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)", - VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC, - 64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp3, "OS/2 Warp 3", -- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX, +- { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3", +- VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, - 48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp4, "OS/2 Warp 4", -- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX, +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4", +- VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2Warp45, "OS/2 Warp 4.5", -- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX, -- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2eCS, "eComStation", +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5", +- VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY, +- 128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "OS2", "IBM OS/2", "OS2eCS", "eComStation", - VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX, -- 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, +- 256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "OS2", "IBM OS/2", SchemaDefs_OSTypeId_OS2, "Other OS/2", -- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX, +- { "OS2", "IBM OS/2", "OS2", "Other OS/2", +- VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, - 96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE, -- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS, "Mac OS X Server", +- StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, +- { "MacOS", "Mac OS X", "MacOS", "Mac OS X", - VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, -- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, +- 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, - StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA }, -- { "MacOS", "Mac OS X", SchemaDefs_OSTypeId_MacOS_64, "Mac OS X Server (64 bit)", +- { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)", - VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET, -- 1024, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, +- 2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0, - StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA, - ChipsetType_ICH9, AudioControllerType_HDA }, -- { "Other", "Other", SchemaDefs_OSTypeId_DOS, "DOS", -- VBOXOSTYPE_DOS, VBOXOSHINT_NONE, +- { "Other", "Other", "DOS", "DOS", +- VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB, - 32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 }, -- { "Other", "Other", SchemaDefs_OSTypeId_Netware, "Netware", +- { "Other", "Other", "Netware", "Netware", - VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX, - 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Other", "Other", SchemaDefs_OSTypeId_L4, "L4", +- { "Other", "Other", "L4", "L4", - VBOXOSTYPE_L4, VBOXOSHINT_NONE, - 64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Other", "Other", SchemaDefs_OSTypeId_QNX, "QNX", +- { "Other", "Other", "QNX", "QNX", - VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX, - 512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 }, -- { "Other", "Other", SchemaDefs_OSTypeId_JRockitVE, "JRockitVE", +- { "Other", "Other", "JRockitVE", "JRockitVE", - VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE, - 1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE, - StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 }, }; - /** ---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 21:44:01.290876720 -0300 -+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-07-25 22:00:57.819380802 -0300 -@@ -4875,75 +4875,27 @@ + uint32_t Global::cOSTypes = RT_ELEMENTS(Global::sOSTypes); +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-04 09:48:45.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp 2012-09-19 02:10:41.293426675 -0300 +@@ -4283,76 +4283,27 @@ static const char *kOSTypeIcons [][2] = { {"Other", ":/os_other.png"}, @@ -842,6 +835,7 @@ - {"Solaris_64", ":/os_solaris_64.png"}, - {"OpenSolaris", ":/os_oraclesolaris.png"}, - {"OpenSolaris_64", ":/os_oraclesolaris_64.png"}, +- {"Solaris11_64", ":/os_oraclesolaris_64.png"}, - {"QNX", ":/os_qnx.png"}, - {"MacOS", ":/os_macosx.png"}, - {"MacOS_64", ":/os_macosx_64.png"}, @@ -870,32 +864,9 @@ }; for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n) { ---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp.orig 2012-06-20 10:16:38.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorWidget.cpp 2012-07-25 22:07:51.232436783 -0300 -@@ -192,17 +192,10 @@ - if (typeIndex != -1) - mCbType->setCurrentIndex (typeIndex); - } -- /* Or select WinXP item for Windows family as default */ -- else if (familyId == "Windows") -+ /* Or select Parabola GNU/Linux-libre item for GNU/Linux family as default */ -+ else if (familyId == "GNU/Linux") - { -- int xpIndex = mCbType->findData ("WindowsXP", RoleTypeID); -- if (xpIndex != -1) -- mCbType->setCurrentIndex (xpIndex); -- } -- /* Or select Ubuntu item for Linux family as default */ -- else if (familyId == "Linux") -- { -- int ubIndex = mCbType->findData ("Ubuntu", RoleTypeID); -+ int ubIndex = mCbType->findData ("Parabola", RoleTypeID); - if (ubIndex != -1) - mCbType->setCurrentIndex (ubIndex); - } ---- VirtualBox-4.1.18.orig/include/VBox/ostypes.h 2012-06-20 10:07:51.000000000 -0300 -+++ VirtualBox-4.1.18/include/VBox/ostypes.h 2012-07-25 23:20:57.322757456 -0300 -@@ -43,77 +43,27 @@ +--- VirtualBox-4.2.0.orig/include/VBox/ostypes.h 2012-09-08 06:35:56.000000000 -0300 ++++ VirtualBox-4.2.0/include/VBox/ostypes.h 2012-09-19 02:20:24.640916587 -0300 +@@ -43,79 +43,27 @@ typedef enum VBOXOSTYPE { VBOXOSTYPE_Unknown = 0, @@ -920,6 +891,7 @@ - VBOXOSTYPE_Win7_x64 = 0x37100, - VBOXOSTYPE_Win8 = 0x38000, - VBOXOSTYPE_Win8_x64 = 0x38100, +- VBOXOSTYPE_Win2k12_x64 = 0x39100, - VBOXOSTYPE_OS2 = 0x40000, - VBOXOSTYPE_OS2Warp3 = 0x41000, - VBOXOSTYPE_OS2Warp4 = 0x42000, @@ -965,6 +937,7 @@ - VBOXOSTYPE_Solaris_x64 = 0x80100, - VBOXOSTYPE_OpenSolaris = 0x81000, - VBOXOSTYPE_OpenSolaris_x64 = 0x81100, +- VBOXOSTYPE_Solaris11_x64 = 0x82100, - VBOXOSTYPE_L4 = 0x90000, - VBOXOSTYPE_QNX = 0xA0000, - VBOXOSTYPE_MacOS = 0xB0000, @@ -994,7 +967,7 @@ /** The bit number which indicates 64-bit or 32-bit. */ #define VBOXOSTYPE_x64_BIT 8 /** The mask which indicates 64-bit. */ -@@ -129,16 +79,11 @@ +@@ -131,16 +79,11 @@ typedef enum VBOXOSFAMILY { VBOXOSFAMILY_Unknown = 0, @@ -1016,100 +989,100 @@ /** The usual 32-bit hack. */ VBOXOSFAMILY_32BIT_HACK = 0x7fffffff } VBOXOSFAMILY; ---- VirtualBox-4.1.18.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-06-20 10:17:35.000000000 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-07-26 01:28:50.033551279 -0300 -@@ -49,94 +49,33 @@ +--- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-08-03 09:28:30.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp 2012-09-19 02:28:56.055603266 -0300 +@@ -50,94 +50,33 @@ g_osTypes[] = { - { ovf::CIMOSType_CIMOS_Unknown, SchemaDefs_OSTypeId_Other }, -- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2 }, -- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp3 }, -- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp4 }, -- { ovf::CIMOSType_CIMOS_OS2, SchemaDefs_OSTypeId_OS2Warp45 }, -- { ovf::CIMOSType_CIMOS_MSDOS, SchemaDefs_OSTypeId_DOS }, -- { ovf::CIMOSType_CIMOS_WIN3x, SchemaDefs_OSTypeId_Windows31 }, -- { ovf::CIMOSType_CIMOS_WIN95, SchemaDefs_OSTypeId_Windows95 }, -- { ovf::CIMOSType_CIMOS_WIN98, SchemaDefs_OSTypeId_Windows98 }, -- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT }, -- { ovf::CIMOSType_CIMOS_WINNT, SchemaDefs_OSTypeId_WindowsNT4 }, -- { ovf::CIMOSType_CIMOS_NetWare, SchemaDefs_OSTypeId_Netware }, -- { ovf::CIMOSType_CIMOS_NovellOES, SchemaDefs_OSTypeId_Netware }, -- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_Solaris }, -- { ovf::CIMOSType_CIMOS_SunOS, SchemaDefs_OSTypeId_Solaris }, -- { ovf::CIMOSType_CIMOS_FreeBSD, SchemaDefs_OSTypeId_FreeBSD }, -- { ovf::CIMOSType_CIMOS_NetBSD, SchemaDefs_OSTypeId_NetBSD }, -- { ovf::CIMOSType_CIMOS_QNX, SchemaDefs_OSTypeId_QNX }, -- { ovf::CIMOSType_CIMOS_Windows2000, SchemaDefs_OSTypeId_Windows2000 }, -- { ovf::CIMOSType_CIMOS_WindowsMe, SchemaDefs_OSTypeId_WindowsMe }, -- { ovf::CIMOSType_CIMOS_OpenBSD, SchemaDefs_OSTypeId_OpenBSD }, -- { ovf::CIMOSType_CIMOS_WindowsXP, SchemaDefs_OSTypeId_WindowsXP }, -- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, SchemaDefs_OSTypeId_WindowsXP }, -- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, SchemaDefs_OSTypeId_WindowsXP }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, SchemaDefs_OSTypeId_Windows2003 }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, SchemaDefs_OSTypeId_Windows2003_64 }, -- { ovf::CIMOSType_CIMOS_WindowsXP_64, SchemaDefs_OSTypeId_WindowsXP_64 }, -- { ovf::CIMOSType_CIMOS_WindowsVista, SchemaDefs_OSTypeId_WindowsVista }, -- { ovf::CIMOSType_CIMOS_WindowsVista_64, SchemaDefs_OSTypeId_WindowsVista_64 }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, SchemaDefs_OSTypeId_Windows2008 }, -- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, SchemaDefs_OSTypeId_Windows2008_64 }, -- { ovf::CIMOSType_CIMOS_FreeBSD_64, SchemaDefs_OSTypeId_FreeBSD_64 }, -- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS }, -- { ovf::CIMOSType_CIMOS_MACOS, SchemaDefs_OSTypeId_MacOS_64 }, // there is no CIM 64-bit type for this + { ovf::CIMOSType_CIMOS_Unknown, VBOXOSTYPE_Unknown }, +- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2 }, +- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp3 }, +- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp4 }, +- { ovf::CIMOSType_CIMOS_OS2, VBOXOSTYPE_OS2Warp45 }, +- { ovf::CIMOSType_CIMOS_MSDOS, VBOXOSTYPE_DOS }, +- { ovf::CIMOSType_CIMOS_WIN3x, VBOXOSTYPE_Win31 }, +- { ovf::CIMOSType_CIMOS_WIN95, VBOXOSTYPE_Win95 }, +- { ovf::CIMOSType_CIMOS_WIN98, VBOXOSTYPE_Win98 }, +- { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT }, +- { ovf::CIMOSType_CIMOS_WINNT, VBOXOSTYPE_WinNT4 }, +- { ovf::CIMOSType_CIMOS_NetWare, VBOXOSTYPE_Netware }, +- { ovf::CIMOSType_CIMOS_NovellOES, VBOXOSTYPE_Netware }, +- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_Solaris }, +- { ovf::CIMOSType_CIMOS_SunOS, VBOXOSTYPE_Solaris }, +- { ovf::CIMOSType_CIMOS_FreeBSD, VBOXOSTYPE_FreeBSD }, +- { ovf::CIMOSType_CIMOS_NetBSD, VBOXOSTYPE_NetBSD }, +- { ovf::CIMOSType_CIMOS_QNX, VBOXOSTYPE_QNX }, +- { ovf::CIMOSType_CIMOS_Windows2000, VBOXOSTYPE_Win2k }, +- { ovf::CIMOSType_CIMOS_WindowsMe, VBOXOSTYPE_WinMe }, +- { ovf::CIMOSType_CIMOS_OpenBSD, VBOXOSTYPE_OpenBSD }, +- { ovf::CIMOSType_CIMOS_WindowsXP, VBOXOSTYPE_WinXP }, +- { ovf::CIMOSType_CIMOS_WindowsXPEmbedded, VBOXOSTYPE_WinXP }, +- { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService, VBOXOSTYPE_WinXP }, +- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003, VBOXOSTYPE_Win2k3 }, +- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64, VBOXOSTYPE_Win2k3_x64 }, +- { ovf::CIMOSType_CIMOS_WindowsXP_64, VBOXOSTYPE_WinXP_x64 }, +- { ovf::CIMOSType_CIMOS_WindowsVista, VBOXOSTYPE_WinVista }, +- { ovf::CIMOSType_CIMOS_WindowsVista_64, VBOXOSTYPE_WinVista_x64 }, +- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008, VBOXOSTYPE_Win2k8 }, +- { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64, VBOXOSTYPE_Win2k8_x64 }, +- { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_x64 }, +- { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, +- { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this - - // Linuxes -- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, SchemaDefs_OSTypeId_RedHat }, -- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, SchemaDefs_OSTypeId_RedHat_64 }, -- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_Solaris_64 }, -- { ovf::CIMOSType_CIMOS_SUSE, SchemaDefs_OSTypeId_OpenSUSE }, -- { ovf::CIMOSType_CIMOS_SLES, SchemaDefs_OSTypeId_OpenSUSE }, -- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, SchemaDefs_OSTypeId_OpenSUSE }, -- { ovf::CIMOSType_CIMOS_SUSE_64, SchemaDefs_OSTypeId_OpenSUSE_64 }, -- { ovf::CIMOSType_CIMOS_SLES_64, SchemaDefs_OSTypeId_OpenSUSE_64 }, -- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux }, -- { ovf::CIMOSType_CIMOS_LINUX, SchemaDefs_OSTypeId_Linux22 }, -- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, SchemaDefs_OSTypeId_Linux }, -- { ovf::CIMOSType_CIMOS_TurboLinux, SchemaDefs_OSTypeId_Turbolinux }, -- { ovf::CIMOSType_CIMOS_TurboLinux_64, SchemaDefs_OSTypeId_Turbolinux_64 }, -- { ovf::CIMOSType_CIMOS_Mandriva, SchemaDefs_OSTypeId_Mandriva }, -- { ovf::CIMOSType_CIMOS_Mandriva_64, SchemaDefs_OSTypeId_Mandriva_64 }, -- { ovf::CIMOSType_CIMOS_Ubuntu, SchemaDefs_OSTypeId_Ubuntu }, -- { ovf::CIMOSType_CIMOS_Ubuntu_64, SchemaDefs_OSTypeId_Ubuntu_64 }, -- { ovf::CIMOSType_CIMOS_Debian, SchemaDefs_OSTypeId_Debian }, -- { ovf::CIMOSType_CIMOS_Debian_64, SchemaDefs_OSTypeId_Debian_64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_4_x, SchemaDefs_OSTypeId_Linux24 }, -- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, SchemaDefs_OSTypeId_Linux24_64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Linux26 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Linux26_64 }, -- { ovf::CIMOSType_CIMOS_Linux_64, SchemaDefs_OSTypeId_Linux26_64 }, +- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat }, +- { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 }, +- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 }, +- { ovf::CIMOSType_CIMOS_SUSE, VBOXOSTYPE_OpenSUSE }, +- { ovf::CIMOSType_CIMOS_SLES, VBOXOSTYPE_OpenSUSE }, +- { ovf::CIMOSType_CIMOS_NovellLinuxDesktop, VBOXOSTYPE_OpenSUSE }, +- { ovf::CIMOSType_CIMOS_SUSE_64, VBOXOSTYPE_OpenSUSE_x64 }, +- { ovf::CIMOSType_CIMOS_SLES_64, VBOXOSTYPE_OpenSUSE_x64 }, +- { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux }, +- { ovf::CIMOSType_CIMOS_LINUX, VBOXOSTYPE_Linux22 }, +- { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux }, +- { ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux }, +- { ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 }, +- { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva }, +- { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 }, +- { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu }, +- { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 }, +- { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian }, +- { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 }, +- { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 }, +- { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 }, +- { ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 }, - - // types that we have support for but CIM doesn't -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_ArchLinux }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_ArchLinux_64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Fedora }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Fedora_64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Gentoo }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Gentoo_64 }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x, SchemaDefs_OSTypeId_Xandros }, -- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, SchemaDefs_OSTypeId_Xandros_64 }, -- { ovf::CIMOSType_CIMOS_Solaris, SchemaDefs_OSTypeId_OpenSolaris }, -- { ovf::CIMOSType_CIMOS_Solaris_64, SchemaDefs_OSTypeId_OpenSolaris_64 }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_ArchLinux }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_ArchLinux_x64 }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_FedoraCore }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_FedoraCore_x64 }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Gentoo }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Gentoo_x64 }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Xandros }, +- { ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Xandros_x64 }, +- { ovf::CIMOSType_CIMOS_Solaris, VBOXOSTYPE_OpenSolaris }, +- { ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_OpenSolaris_x64 }, - - // types added with CIM 2.25.0 follow: -- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, SchemaDefs_OSTypeId_Windows2008 }, // duplicate, see above --// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM -- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7 }, -- { ovf::CIMOSType_CIMOS_Windows7, SchemaDefs_OSTypeId_Windows7_64 }, // there is no CIM 64-bit type for this -- { ovf::CIMOSType_CIMOS_CentOS, SchemaDefs_OSTypeId_RedHat }, -- { ovf::CIMOSType_CIMOS_CentOS_64, SchemaDefs_OSTypeId_RedHat_64 }, -- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, SchemaDefs_OSTypeId_Oracle }, -- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, SchemaDefs_OSTypeId_Oracle_64 }, -- { ovf::CIMOSType_CIMOS_eComStation, SchemaDefs_OSTypeId_OS2eCS } +- { ovf::CIMOSType_CIMOS_WindowsServer2008R2, VBOXOSTYPE_Win2k8 }, // duplicate, see above +-// { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM +- { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7 }, +- { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7_x64 }, // there is no CIM 64-bit type for this +- { ovf::CIMOSType_CIMOS_CentOS, VBOXOSTYPE_RedHat }, +- { ovf::CIMOSType_CIMOS_CentOS_64, VBOXOSTYPE_RedHat_x64 }, +- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux, VBOXOSTYPE_Oracle }, +- { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64, VBOXOSTYPE_Oracle_x64 }, +- { ovf::CIMOSType_CIMOS_eComStation, VBOXOSTYPE_ECS } - - // there are no CIM types for these, so these turn to "other" on export: -- // SchemaDefs_OSTypeId_OpenBSD -- // SchemaDefs_OSTypeId_OpenBSD_64 -- // SchemaDefs_OSTypeId_NetBSD -- // SchemaDefs_OSTypeId_NetBSD_64 +- // VBOXOSTYPE_OpenBSD +- // VBOXOSTYPE_OpenBSD_x64 +- // VBOXOSTYPE_NetBSD +- // VBOXOSTYPE_NetBSD_x64 + + // Custom OS + { ovf::CIMOSType_CIMOS_GNU, SchemaDefs_OSTypeId_GNU }, @@ -1140,37 +1113,36 @@ }; -@@ -150,53 +89,34 @@ +@@ -151,53 +90,32 @@ /* These are the 32-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern[] = { -- {"Windows NT", SchemaDefs_OSTypeId_WindowsNT4}, -- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP}, -- {"Windows 2000", SchemaDefs_OSTypeId_Windows2000}, -- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003}, -- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista}, -- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008}, -- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE}, -- {"Novell", SchemaDefs_OSTypeId_OpenSUSE}, -- {"Red Hat", SchemaDefs_OSTypeId_RedHat}, -- {"Mandriva", SchemaDefs_OSTypeId_Mandriva}, -- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu}, -- {"Debian", SchemaDefs_OSTypeId_Debian}, -- {"QNX", SchemaDefs_OSTypeId_QNX}, -- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24}, -- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26}, -- {"Linux", SchemaDefs_OSTypeId_Linux}, -- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris}, -- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris}, -- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD}, -- {"NetBSD", SchemaDefs_OSTypeId_NetBSD}, -- {"Windows 95", SchemaDefs_OSTypeId_Windows95}, -- {"Windows 98", SchemaDefs_OSTypeId_Windows98}, -- {"Windows Me", SchemaDefs_OSTypeId_WindowsMe}, -- {"Windows 3.", SchemaDefs_OSTypeId_Windows31}, -- {"DOS", SchemaDefs_OSTypeId_DOS}, -- {"OS2", SchemaDefs_OSTypeId_OS2} -+ +- {"Windows NT", VBOXOSTYPE_WinNT4}, +- {"Windows XP", VBOXOSTYPE_WinXP}, +- {"Windows 2000", VBOXOSTYPE_Win2k}, +- {"Windows 2003", VBOXOSTYPE_Win2k3}, +- {"Windows Vista", VBOXOSTYPE_WinVista}, +- {"Windows 2008", VBOXOSTYPE_Win2k8}, +- {"SUSE", VBOXOSTYPE_OpenSUSE}, +- {"Novell", VBOXOSTYPE_OpenSUSE}, +- {"Red Hat", VBOXOSTYPE_RedHat}, +- {"Mandriva", VBOXOSTYPE_Mandriva}, +- {"Ubuntu", VBOXOSTYPE_Ubuntu}, +- {"Debian", VBOXOSTYPE_Debian}, +- {"QNX", VBOXOSTYPE_QNX}, +- {"Linux 2.4", VBOXOSTYPE_Linux24}, +- {"Linux 2.6", VBOXOSTYPE_Linux26}, +- {"Linux", VBOXOSTYPE_Linux}, +- {"OpenSolaris", VBOXOSTYPE_OpenSolaris}, +- {"Solaris", VBOXOSTYPE_OpenSolaris}, +- {"FreeBSD", VBOXOSTYPE_FreeBSD}, +- {"NetBSD", VBOXOSTYPE_NetBSD}, +- {"Windows 95", VBOXOSTYPE_Win95}, +- {"Windows 98", VBOXOSTYPE_Win98}, +- {"Windows Me", VBOXOSTYPE_WinMe}, +- {"Windows 3.", VBOXOSTYPE_Win31}, +- {"DOS", VBOXOSTYPE_DOS}, +- {"OS2", VBOXOSTYPE_OS2} + {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola}, + {"gNewSense", SchemaDefs_OSTypeId_gNewSense}, + {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag}, @@ -1183,28 +1155,27 @@ + {"GNU", SchemaDefs_OSTypeId_GNU}, + {"GNU-Hurd", SchemaDefs_OSTypeId_GNUHurd}, + {"GNU/Linux", SchemaDefs_OSTypeId_GNULinux}, -+ }; /* These are the 64-Bit ones. They are sorted by priority. */ static const osTypePattern g_osTypesPattern64[] = { -- {"Windows XP", SchemaDefs_OSTypeId_WindowsXP_64}, -- {"Windows 2003", SchemaDefs_OSTypeId_Windows2003_64}, -- {"Windows Vista", SchemaDefs_OSTypeId_WindowsVista_64}, -- {"Windows 2008", SchemaDefs_OSTypeId_Windows2008_64}, -- {"SUSE", SchemaDefs_OSTypeId_OpenSUSE_64}, -- {"Novell", SchemaDefs_OSTypeId_OpenSUSE_64}, -- {"Red Hat", SchemaDefs_OSTypeId_RedHat_64}, -- {"Mandriva", SchemaDefs_OSTypeId_Mandriva_64}, -- {"Ubuntu", SchemaDefs_OSTypeId_Ubuntu_64}, -- {"Debian", SchemaDefs_OSTypeId_Debian_64}, -- {"Linux 2.4", SchemaDefs_OSTypeId_Linux24_64}, -- {"Linux 2.6", SchemaDefs_OSTypeId_Linux26_64}, -- {"Linux", SchemaDefs_OSTypeId_Linux26_64}, -- {"OpenSolaris", SchemaDefs_OSTypeId_OpenSolaris_64}, -- {"Solaris", SchemaDefs_OSTypeId_OpenSolaris_64}, -- {"FreeBSD", SchemaDefs_OSTypeId_FreeBSD_64}, +- {"Windows XP", VBOXOSTYPE_WinXP_x64}, +- {"Windows 2003", VBOXOSTYPE_Win2k3_x64}, +- {"Windows Vista", VBOXOSTYPE_WinVista_x64}, +- {"Windows 2008", VBOXOSTYPE_Win2k8_x64}, +- {"SUSE", VBOXOSTYPE_OpenSUSE_x64}, +- {"Novell", VBOXOSTYPE_OpenSUSE_x64}, +- {"Red Hat", VBOXOSTYPE_RedHat_x64}, +- {"Mandriva", VBOXOSTYPE_Mandriva_x64}, +- {"Ubuntu", VBOXOSTYPE_Ubuntu_x64}, +- {"Debian", VBOXOSTYPE_Debian_x64}, +- {"Linux 2.4", VBOXOSTYPE_Linux24_x64}, +- {"Linux 2.6", VBOXOSTYPE_Linux26_x64}, +- {"Linux", VBOXOSTYPE_Linux26_x64}, +- {"OpenSolaris", VBOXOSTYPE_OpenSolaris_x64}, +- {"Solaris", VBOXOSTYPE_OpenSolaris_x64}, +- {"FreeBSD", VBOXOSTYPE_FreeBSD_x64}, + {"Parabola GNU/Linux-libre", SchemaDefs_OSTypeId_Parabola_64}, + {"gNewSense", SchemaDefs_OSTypeId_gNewSense_64}, + {"Blag Linux and GNU", SchemaDefs_OSTypeId_Blag_64}, @@ -1381,3 +1352,14 @@ #endif rc = VBoxGuestInitDevExt(&g_DevExt, g_IOPortBase, +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-07-18 05:58:09.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp 2012-09-18 22:43:54.956086896 -0300 +@@ -141,7 +141,7 @@ + #ifdef VBOX_WITH_VIDEOHWACCEL + /* Check if 2D video acceleration supported by the guest OS type: */ + QString strguestOSTypeFamily = m_guestOSType.GetFamilyId(); +- m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows"; ++ m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Other"; + #endif /* VBOX_WITH_VIDEOHWACCEL */ + #ifdef VBOX_WITH_CRHGSMI + /* Check if WDDM mode supported by the guest OS type: */ diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index e51d0c0a7..41a34fc84 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ ---- VirtualBox-4.1.18.orig/Config.kmk 2012-07-24 16:38:43.981310996 -0300 -+++ VirtualBox-4.1.18/Config.kmk 2012-07-24 16:38:44.001309865 -0300 +--- VirtualBox-4.2.0.orig/Config.kmk 2012-09-13 05:26:16.000000000 -0300 ++++ VirtualBox-4.2.0/Config.kmk 2012-09-18 21:35:33.118487052 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -10,7 +10,7 @@ # Install paths ## @todo This will change after 4.1 is branched off! # What is now 'bin' and 'lib' will be moved down under 'staged/', except on -@@ -125,9 +122,6 @@ +@@ -129,9 +126,6 @@ endif INST_DOC = doc/ @@ -20,7 +20,7 @@ INST_PACKAGES = packages/ VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK)) -@@ -136,7 +130,6 @@ +@@ -140,7 +134,6 @@ VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS)) VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB)) @@ -28,7 +28,7 @@ VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES)) -@@ -208,7 +201,6 @@ +@@ -215,7 +208,6 @@ export VBOX_ADDITIONS_SH_MODE = release export VBOX_DOCUMENTATION_SH_MODE = release export VBOX_EFI_SH_MODE = release @@ -36,7 +36,7 @@ endif # Some info on the vendor -@@ -361,8 +353,6 @@ +@@ -368,8 +360,6 @@ VBOX_WITH_USB = 1 # Enable the USB 1.1 controller plus virtual USB HID devices. VBOX_WITH_VUSB = 1 @@ -45,7 +45,7 @@ # Enable the ISCSI feature. VBOX_WITH_ISCSI = 1 # Enable INIP support in the ISCSI feature. -@@ -430,9 +420,6 @@ +@@ -439,9 +429,6 @@ ifdef VBOX_WITH_USB VBOX_WITH_VUSB = 1 endif @@ -55,10 +55,11 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -591,15 +578,6 @@ +@@ -609,17 +596,6 @@ + endif ## @} - +- -## @name Extension pack -## @{ -# Enables the extension pack feature. @@ -68,10 +69,11 @@ -# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL -VBOX_WITH_EXTPACK_PUEL_BUILD = 1 -## @} - +- ## @name Misc ## @{ -@@ -777,14 +755,6 @@ + # Enable Seamless mode +@@ -810,14 +786,6 @@ # Skip stuff. # @@ -86,7 +88,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -848,7 +818,6 @@ +@@ -872,7 +840,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -94,7 +96,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -870,7 +839,6 @@ +@@ -894,7 +861,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -102,7 +104,7 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -952,9 +920,6 @@ +@@ -985,9 +951,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -112,7 +114,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1082,10 +1047,6 @@ +@@ -1118,10 +1081,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -123,17 +125,17 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1679,9 +1640,6 @@ - # biossums (set BIOS checksums) - VBOX_BIOSSUMS ?= $(PATH_OBJ)/biossums/biossums$(HOSTSUFF_EXE) +@@ -1744,9 +1703,6 @@ + # bin2c (convert binary files into C arrays) + VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) -# RTManifest (extension pack manifest utility) -VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE) - - # filesplitter (splits java files) - VBOX_FILESPLIT ?= $(PATH_OBJ)/filesplitter/filesplitter$(HOSTSUFF_EXE) + # VBoxCmp (simple /bin/cmp with more sensible output) + VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2461,13 +2419,6 @@ +@@ -2638,13 +2594,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -147,11 +149,10 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -3817,100 +3768,6 @@ - endif +@@ -4100,99 +4049,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) -- + - -# -# Templates used for building the extension packs. @@ -248,9 +249,9 @@ # # Qt 4 # Qt 4 ---- VirtualBox-4.1.18.orig/Makefile.kmk 2012-07-24 17:16:47.078929150 -0300 -+++ VirtualBox-4.1.18/Makefile.kmk 2012-07-24 17:16:47.125592981 -0300 -@@ -446,7 +446,6 @@ +--- VirtualBox-4.2.0.orig/Makefile.kmk 2012-08-29 11:13:46.000000000 -0300 ++++ VirtualBox-4.2.0/Makefile.kmk 2012-09-18 23:43:54.750454776 -0300 +@@ -378,7 +378,6 @@ include/VBox \ include/VBox/vmm \ include/VBox/com \ @@ -258,12 +259,10 @@ include/VBox/HostServices \ include/VBox/GuestHost \ include/VBox/HGSMI \ -@@ -862,191 +861,6 @@ - additions-build-linux.x86.combined \ - additions-packing +@@ -990,200 +989,6 @@ -- --# + + # -# Build the extension packs, all of them. -# -# This is tailored (hardcoded) for the extension pack build box. @@ -325,16 +324,18 @@ -ifeq ($(KBUILD_TARGET),win) - + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -else -- $(call MSG_L1,Building Windows/amd64 extension packs) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.6 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +- $(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +- $(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs) -endif - -extpacks-build-win.x86: -ifeq ($(KBUILD_TARGET),win) - + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -else -- $(call MSG_L1,Building Windows/x86 extension packs) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.16 " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs) -endif - -ifeq ($(KBUILD_TARGET),solaris) @@ -347,17 +348,19 @@ -else -# Serialize 32-bit and 64-bit ASSUMING the same VM builds both. -extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) +- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) - -extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm -- $(call MSG_L1,Building Solaris/amd64 extension packs) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" -- $(call MSG_L1,Building Solaris/x86 extension packs) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.4 " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +- $(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs) +- $(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs) - -extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it -- $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/ -- $(VBOX_KMK_TIME) rsync -a --delete 192.168.27.4:/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/ +- $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/ +- $(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/ - -.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm -.PHONY: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it @@ -370,59 +373,65 @@ -#ifeq ($(KBUILD_TARGET),os2) -# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -#else --# $(VBOX_KMK_TIME) ssh vbox@192.168.27.3 " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) " +-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) " -#endif - -extpacks-build-linux.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64) - + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -else -- $(call MSG_L1,Building Linux/amd64 extension packs) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.12 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +- $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +- $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs) -endif - -extpacks-build-linux.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86) - + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -else -- $(call MSG_L1,Building Linux/x86 extension packs) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.11 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs) -endif - -extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64) -# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -#else --# $(call MSG_L1,Building FreeBSD/amd64 extension packs) --# $(VBOX_KMK_TIME) ssh vbox@192.168.27.17 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +-# $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs) +-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +-# $(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs) -#endif - -extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86) -# + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -#else --# $(call MSG_L1,Building FreeBSD/x86 extension packs) --# $(VBOX_KMK_TIME) ssh vbox@192.168.27.7 " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +-# $(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs) +-# $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +-# $(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs) -#endif - -extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64) - + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -else -- $(call MSG_L1,Building Darwin/amd64 extension packs) -- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.15 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" -- $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.15:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/ +- $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs) +- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all" +- $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/ +- $(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs) -endif - -extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST) -ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86) - + $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK) -else -- $(call MSG_L1,Building Darwin/x86 extension packs) -- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) -- $(VBOX_KMK_TIME) ssh vbox@192.168.27.5 " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" -- $(VBOX_KMK_TIME) rsync -am -v --delete 192.168.27.5:/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/ +- $(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs) +- $(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) +- $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all" +- $(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/ +- $(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs) -endif - - @@ -447,9 +456,10 @@ - extpacks-packing - - - # +-# # Build the test suite, all of it. # + # This is currently tailored (hardcoded) for the additions build box just like --- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp 2012-06-20 10:15:51.000000000 -0300 +++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp 2012-07-24 16:18:03.964493454 -0300 @@ -132,11 +132,6 @@ @@ -474,10 +484,10 @@ extern const PDMDEVREG g_DeviceACPI; extern const PDMDEVREG g_DeviceDMA; extern const PDMDEVREG g_DeviceFloppyController; ---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackManagerImpl.h 2012-06-20 10:17:33.000000000 -0300 -+++ /dev/null 2012-07-24 14:48:18.638572110 -0300 -@@ -1,245 +0,0 @@ --/* $Id: ExtPackManagerImpl.h $ */ +--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ExtPackManagerImpl.h 2012-03-13 11:51:50.000000000 -0300 ++++ /dev/null 2012-09-18 22:18:48.866734195 -0300 +@@ -1,247 +0,0 @@ +-/* $Id: ExtPackManagerImpl.h 39878 2012-01-25 16:30:07Z vboxsync $ */ -/** @file - * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC. - */ @@ -533,6 +543,7 @@ - STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription); - STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion); - STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision); +- STDMETHOD(COMGETTER(Edition))(BSTR *a_pbstrEdition); - STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule); - STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns)); - STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable); @@ -596,6 +607,7 @@ - STDMETHOD(COMGETTER(Description))(BSTR *a_pbstrDescription); - STDMETHOD(COMGETTER(Version))(BSTR *a_pbstrVersion); - STDMETHOD(COMGETTER(Revision))(ULONG *a_puRevision); +- STDMETHOD(COMGETTER(Edition))(BSTR *a_pbstrEdition); - STDMETHOD(COMGETTER(VRDEModule))(BSTR *a_pbstrVrdeModule); - STDMETHOD(COMGETTER(PlugIns))(ComSafeArrayOut(IExtPackPlugIn *, a_paPlugIns)); - STDMETHOD(COMGETTER(Usable))(BOOL *a_pfUsable); @@ -722,10 +734,10 @@ - -#endif -/* vi: set tabstop=4 shiftwidth=4 expandtab: */ ---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ExtPackUtil.h 2012-06-20 10:17:33.000000000 -0300 -+++ /dev/null 2012-07-24 14:48:18.638572110 -0300 +--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ExtPackUtil.h 2012-03-13 11:51:50.000000000 -0300 ++++ /dev/null 2012-09-18 22:18:48.866734195 -0300 @@ -1,137 +0,0 @@ --/* $Id: ExtPackUtil.h $ */ +-/* $Id: ExtPackUtil.h 39878 2012-01-25 16:30:07Z vboxsync $ */ -/** @file - * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++. - */ @@ -839,14 +851,14 @@ - - -void VBoxExtPackInitDesc(PVBOXEXTPACKDESC a_pExtPackDesc); --RTCString *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo); --RTCString *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo); --RTCString *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball); +-RTCString *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo); +-RTCString *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo); +-RTCString *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball); -void VBoxExtPackFreeDesc(PVBOXEXTPACKDESC a_pExtPackDesc); -bool VBoxExtPackIsValidName(const char *pszName); -bool VBoxExtPackIsValidMangledName(const char *pszMangledName, size_t cchMax = RTSTR_MAX); --RTCString *VBoxExtPackMangleName(const char *pszName); --RTCString *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax); +-RTCString *VBoxExtPackMangleName(const char *pszName); +-RTCString *VBoxExtPackUnmangleName(const char *pszMangledName, size_t cbMax); -int VBoxExtPackCalcDir(char *pszExtPackDir, size_t cbExtPackDir, const char *pszParentDir, const char *pszName); -bool VBoxExtPackIsValidVersionString(const char *pszVersion); -bool VBoxExtPackIsValidEditionString(const char *pszEdition); @@ -862,10 +874,10 @@ - -#endif - ---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp 2012-06-20 10:17:34.000000000 -0300 -+++ /dev/null 2012-07-24 14:48:18.638572110 -0300 +--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/ExtPackManagerImpl.cpp 2012-04-03 04:56:24.000000000 -0300 ++++ /dev/null 2012-09-18 22:18:48.866734195 -0300 @@ -1,3126 +0,0 @@ --/* $Id: ExtPackManagerImpl.cpp $ */ +-/* $Id: ExtPackManagerImpl.cpp 40468 2012-03-14 17:07:58Z vboxsync $ */ -/** @file - * VirtualBox Main - interface for Extension Packs, VBoxSVC & VBoxC. - */ @@ -1260,22 +1272,22 @@ - HRESULT hrc = autoCaller.rc(); - if (SUCCEEDED(hrc)) - { -- /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff -- will be changed into a separate */ -- if (m->Desc.strEdition.isEmpty()) -- { -- Bstr str(m->Desc.strVersion); -- str.cloneTo(a_pbstrVersion); -- } -- else -- { -- RTCString strHack(m->Desc.strVersion); -- strHack.append('-'); -- strHack.append(m->Desc.strEdition); +- Bstr str(m->Desc.strVersion); +- str.cloneTo(a_pbstrVersion); +- } +- return hrc; +-} - -- Bstr str(strHack); -- str.cloneTo(a_pbstrVersion); -- } +-STDMETHODIMP ExtPackFile::COMGETTER(Edition)(BSTR *a_pbstrEdition) +-{ +- CheckComArgOutPointerValid(a_pbstrEdition); +- +- AutoCaller autoCaller(this); +- HRESULT hrc = autoCaller.rc(); +- if (SUCCEEDED(hrc)) +- { +- Bstr str(m->Desc.strEdition); +- str.cloneTo(a_pbstrEdition); - } - return hrc; -} @@ -2494,22 +2506,8 @@ - HRESULT hrc = autoCaller.rc(); - if (SUCCEEDED(hrc)) - { -- /* HACK ALERT: This is for easing backporting to 4.1. The edition stuff -- will be changed into a separate */ -- if (m->Desc.strEdition.isEmpty()) -- { -- Bstr str(m->Desc.strVersion); -- str.cloneTo(a_pbstrVersion); -- } -- else -- { -- RTCString strHack(m->Desc.strVersion); -- strHack.append('-'); -- strHack.append(m->Desc.strEdition); -- -- Bstr str(strHack); -- str.cloneTo(a_pbstrVersion); -- } +- Bstr str(m->Desc.strVersion); +- str.cloneTo(a_pbstrVersion); - } - return hrc; -} @@ -2525,6 +2523,20 @@ - return hrc; -} - +-STDMETHODIMP ExtPack::COMGETTER(Edition)(BSTR *a_pbstrEdition) +-{ +- CheckComArgOutPointerValid(a_pbstrEdition); +- +- AutoCaller autoCaller(this); +- HRESULT hrc = autoCaller.rc(); +- if (SUCCEEDED(hrc)) +- { +- Bstr str(m->Desc.strEdition); +- str.cloneTo(a_pbstrEdition); +- } +- return hrc; +-} +- -STDMETHODIMP ExtPack::COMGETTER(VRDEModule)(BSTR *a_pbstrVrdeModule) -{ - CheckComArgOutPointerValid(a_pbstrVrdeModule); @@ -3991,10 +4003,10 @@ -} - -/* vi: set tabstop=4 shiftwidth=4 expandtab: */ ---- VirtualBox-4.1.18.orig/src/VBox/Main/src-all/ExtPackUtil.cpp 2012-06-20 10:17:34.000000000 -0300 -+++ /dev/null 2012-07-24 14:48:18.638572110 -0300 +--- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/ExtPackUtil.cpp 2012-07-18 05:57:58.000000000 -0300 ++++ /dev/null 2012-09-18 22:18:48.866734195 -0300 @@ -1,1385 +0,0 @@ --/* $Id: ExtPackUtil.cpp $ */ +-/* $Id: ExtPackUtil.cpp 41783 2012-06-16 19:24:15Z vboxsync $ */ -/** @file - * VirtualBox Main - Extension Pack Utilities and definitions, VBoxC, VBoxSVC, ++. - */ @@ -4092,7 +4104,7 @@ - * - * @returns NULL on success, pointer to an error message on failure (caller - * deletes it). -- * @param a_pDoc Pointer to the the XML document. +- * @param a_pDoc Pointer to the XML document. - * @param a_pExtPackDesc Where to store the extension pack descriptor. - */ -static RTCString *vboxExtPackLoadDescFromDoc(xml::Document *a_pDoc, PVBOXEXTPACKDESC a_pExtPackDesc) @@ -5389,25 +5401,22 @@ iprt/alloca.h \ iprt/tcp.h \ iprt/localipc.h \ ---- VirtualBox-4.1.18.orig/src/Makefile.kmk 2012-06-20 10:07:57.000000000 -0300 -+++ VirtualBox-4.1.18/src/Makefile.kmk 2012-07-24 22:51:10.206996034 -0300 -@@ -26,14 +26,6 @@ - include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk +--- VirtualBox-4.2.0.orig/src/Makefile.kmk 2012-08-03 09:28:25.000000000 -0300 ++++ VirtualBox-4.2.0/src/Makefile.kmk 2012-09-19 03:01:57.588337894 -0300 +@@ -23,10 +23,8 @@ + if !defined(VBOX_ONLY_ADDITIONS) include $(PATH_SUB_CURRENT)/libs/Makefile.kmk + endif +-if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM) +- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk --else if defined(VBOX_ONLY_EXTPACKS) -- include $(PATH_SUB_CURRENT)/bldprogs/Makefile.kmk -- include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk -- include $(PATH_SUB_CURRENT)/libs/Makefile.kmk -- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS -- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk -- endif -- - else if defined(VBOX_ONLY_TESTSUITE) - include $(PATH_SUB_CURRENT)/libs/Makefile.kmk - include $(PATH_SUB_CURRENT)/VBox/Makefile.kmk ---- VirtualBox-4.1.18.orig/src/VBox/Makefile.kmk 2012-07-24 21:19:55.565641784 -0300 -+++ VirtualBox-4.1.18/src/VBox/Makefile.kmk 2012-07-24 22:12:55.429156962 -0300 +-else if !defined(VBOX_ONLY_BUILD) ++if !defined(VBOX_ONLY_BUILD) + # Normal build. + if1of ($(KBUILD_TARGET_ARCH), x86 amd64) + ifdef VBOX_WITH_REM +--- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk 2012-05-30 07:39:32.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Makefile.kmk 2012-09-19 00:03:08.577726965 -0300 @@ -33,19 +33,6 @@ include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk @@ -5428,17 +5437,15 @@ else ifdef VBOX_ONLY_SDK include $(PATH_SUB_CURRENT)/Main/Makefile.kmk ifdef VBOX_WITH_VRDP -@@ -92,9 +79,6 @@ +@@ -92,7 +79,6 @@ if1of ($(KBUILD_TARGET_ARCH), amd64 x86) include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk endif -- ifndef VBOX_OSE -- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk -- endif +- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk ifdef VBOX_WITH_INSTALLER include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk # Keep this last. endif ---- VirtualBox-4.1.18/src/libs/Makefile.kmk.orig 2012-07-24 21:23:26.938013023 -0300 +--- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk 2012-07-24 21:23:26.938013023 -0300 +++ VirtualBox-4.1.18/src/libs/Makefile.kmk 2012-07-24 21:43:42.557911752 -0300 @@ -48,13 +48,6 @@ include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk @@ -5454,52 +5461,46 @@ # libjpeg for VRDP video redirection if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL) include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk ---- VirtualBox-4.1.18.orig/src/VBox/Devices/Makefile.kmk 2012-07-24 23:06:45.916276235 -0300 -+++ VirtualBox-4.1.18/src/VBox/Devices/Makefile.kmk 2012-07-24 23:17:00.202963228 -0300 -@@ -21,9 +21,7 @@ +--- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk 2012-08-03 09:28:25.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk 2012-09-19 02:54:35.912748288 -0300 +@@ -25,9 +25,7 @@ # Include sub-makefiles. include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk -if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS) - include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk --else if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT) -+if defined(VBOX_WITH_PXE_ROM) && !defined(VBOX_WITHOUT_ETHERBOOT) - include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk - endif - if !defined(VBOX_ONLY_EXTPACKS) # Goes on almost to the end of the file. -@@ -57,9 +55,6 @@ +-else if defined(VBOX_WITH_PXE_ROM) ++if defined(VBOX_WITH_PXE_ROM) + if !defined(VBOX_WITHOUT_ETHERBOOT) + include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk + endif +@@ -71,9 +69,6 @@ ifdef VBOX_WITH_USB VBoxDDU_DEFS += VBOX_WITH_USB IN_USBLIB - VBoxDDU_SDKS.win = WINPSDK W2K3DDK + VBoxDDU_SDKS.win = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) - if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) - VBoxDDU_DEFS += VBOX_WITH_EHCI_IMPL - endif ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN VBoxDDU_DEFS.darwin += VBOX_WITH_NEW_USB_CODE_ON_DARWIN endif -@@ -122,9 +117,6 @@ - VBoxDD_DEFS = VBOX_ACPI - ifdef VBOX_WITH_USB - VBoxDD_DEFS += VBOX_WITH_USB +@@ -326,15 +321,7 @@ + Storage/UsbMsd.cpp + endif + - if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) - VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL - endif - endif - ifdef VBOX_WITH_VUSB - VBoxDD_DEFS += VBOX_WITH_VUSB -@@ -446,11 +438,6 @@ - endif - ifdef VBOX_WITH_USB - DevicesR3_DEFS += VBOX_WITH_USB + VBoxDD_DEFS += VBOX_WITH_USB - if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) -- DevicesR3_DEFS += VBOX_WITH_EHCI_IMPL -- DevicesR3_SOURCES += \ +- VBoxDD_DEFS += VBOX_WITH_EHCI_IMPL +- VBoxDD_SOURCES += \ - USB/DevEHCI.cpp - endif - endif - if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) - DevicesR3_DEFS += VBOX_WITH_PCI_PASSTHROUGH_IMPL -@@ -607,11 +594,6 @@ + + endif # VBOX_WITH_USB + +@@ -869,11 +856,6 @@ ifdef VBOX_WITH_USB VBoxDDGC_DEFS += VBOX_WITH_USB @@ -5511,7 +5512,7 @@ endif ifdef VBOX_WITH_VIDEOHWACCEL -@@ -711,11 +693,6 @@ +@@ -1020,11 +1002,6 @@ endif ifdef VBOX_WITH_USB VBoxDDR0_DEFS += VBOX_WITH_USB @@ -5523,10 +5524,10 @@ endif if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL) -@@ -1204,49 +1181,5 @@ - +@@ -1163,50 +1140,5 @@ endif # !VBOX_ONLY_EXTPACKS + -if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD) - # - # The EHCI (USB 2.0) Extension Pack Modules. @@ -5563,6 +5564,7 @@ - Bus/DevPciRaw.cpp_INCS = Bus - endif - +- - # - # The Intel PXE rom. - # @@ -5571,11 +5573,11 @@ - VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom -endif # VBOX_WITH_EXTPACK_PUEL - - include $(KBUILD_PATH)/subfooter.kmk + include $(FILE_KBUILD_SUB_FOOTER) ---- VirtualBox-4.1.18.orig/src/VBox/Main/Makefile.kmk 2012-07-24 23:38:25.304126039 -0300 -+++ VirtualBox-4.1.18/src/VBox/Main/Makefile.kmk 2012-07-24 23:38:25.350789964 -0300 -@@ -230,14 +230,12 @@ +--- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk 2012-09-04 09:48:44.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk 2012-09-19 00:46:39.251763337 -0300 +@@ -233,14 +233,12 @@ $(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \ $(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \ $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \ @@ -5590,7 +5592,7 @@ $(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,) endif VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE -@@ -290,7 +288,6 @@ +@@ -293,7 +291,6 @@ src-all/SharedFolderImpl.cpp \ src-all/VirtualBoxBase.cpp \ src-all/VirtualBoxErrorInfoImpl.cpp \ @@ -5598,25 +5600,25 @@ src-server/ApplianceImpl.cpp \ src-server/ApplianceImplExport.cpp \ src-server/ApplianceImplImport.cpp \ -@@ -543,8 +540,6 @@ - $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \ - $(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,) \ +@@ -538,8 +535,6 @@ + $(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \ + $(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \ $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \ - $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \ - $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \ - $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) + $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \ + $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,) - VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE -@@ -602,7 +597,6 @@ +@@ -605,7 +600,6 @@ src-all/SharedFolderImpl.cpp \ src-all/VirtualBoxBase.cpp \ src-all/VirtualBoxErrorInfoImpl.cpp \ - $(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \ $(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \ $(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \ - src-client/AdditionsFacilityImpl.cpp \ -@@ -711,22 +705,6 @@ - endif # !win + src-client/Nvram.cpp \ +@@ -733,22 +727,6 @@ + $(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",) -# @@ -5631,7 +5633,7 @@ - src-helper-apps/VBoxExtPackHelperApp.cpp \ - src-all/ExtPackUtil.cpp - VBoxExtPackHelperApp_LIBS = \ -- $(LIB_RUNTIME) +- $(LIB_RUNTIME) -endif # VBOX_WITH_EXTPACK - - @@ -5648,27 +5650,27 @@ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \ $(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \ ---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-24 23:28:17.985011038 -0300 -+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-07-24 23:28:18.051673913 -0300 -@@ -167,18 +167,6 @@ - <file alias="status_check_32px.png">images/status_check_32px.png</file> - <file alias="status_error_16px.png">images/status_error_16px.png</file> - <file alias="status_error_32px.png">images/status_error_32px.png</file> -- <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file> -- <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file> -- <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file> -- <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file> -- <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file> -- <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file> -- <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file> -- <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file> -- <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file> -- <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file> -- <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file> -- <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file> - <file alias="proxy_16px.png">images/proxy_16px.png</file> - <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file> - <file alias="proxy_32px.png">images/proxy_32px.png</file> +--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-05-30 07:39:18.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc 2012-09-19 00:51:25.413310527 -0300 +@@ -169,18 +169,6 @@ + <file alias="status_check_32px.png">images/status_check_32px.png</file> + <file alias="status_error_16px.png">images/status_error_16px.png</file> + <file alias="status_error_32px.png">images/status_error_32px.png</file> +- <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file> +- <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file> +- <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file> +- <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file> +- <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file> +- <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file> +- <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file> +- <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file> +- <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file> +- <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file> +- <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file> +- <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file> + <file alias="proxy_16px.png">images/proxy_16px.png</file> + <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file> + <file alias="proxy_32px.png">images/proxy_32px.png</file> --- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk 2012-07-25 00:32:00.780012664 -0300 +++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk 2012-07-25 00:32:00.806677728 -0300 @@ -170,11 +170,6 @@ @@ -5702,17 +5704,17 @@ -E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \ -E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \ -E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \ ---- VirtualBox-4.1.18.orig/src/VBox/Installer/darwin/Makefile.kmk 2012-07-25 00:36:55.929571374 -0300 -+++ VirtualBox-4.1.18/src/VBox/Installer/darwin/Makefile.kmk 2012-07-25 00:36:55.959569630 -0300 -@@ -629,7 +629,6 @@ +--- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk 2012-09-08 06:36:03.000000000 -0300 ++++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk 2012-09-19 00:55:08.991167973 -0300 +@@ -497,7 +497,6 @@ MacOS/VirtualBoxVM \ MacOS/VBoxNetAdpCtl \ MacOS/VBoxNetDHCP \ - MacOS/VBoxExtPackHelperApp \ - MacOS/VBoxBalloonCtrl + MacOS/VBoxBalloonCtrl \ + MacOS/VBoxAutostart ifdef VBOX_WITH_WEBSERVICES - VBOX_DI_VBAPP_PROGS += \ -@@ -659,7 +658,6 @@ +@@ -522,7 +521,6 @@ Resources/virtualbox.icns \ Resources/virtualbox.png \ Resources/virtualbox-vbox.icns \ diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 9599a3a49..4703da68d 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -21,8 +21,8 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "recompiles the vboxdrv kernel module if necessary." + "libre module by executing<br/><br/>" + " <font color=blue>'pacman -S virtualbox-libre-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-source and " -+ "execute dkms install vboxhost/4.1.18 ." ++ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( @@ -42,7 +42,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - "OSE version and the PUEL version of VirtualBox." + "The VirtualBox kernel libre modules do not match this version of " + "VirtualBox. Reload the modules or if you don't use our stock kernel libre execute<br/><br/> " -+ " <font color=blue>'dkms install vboxhost/4.1.18'</font><br/><br/>" ++ " <font color=blue>'dkms autoinstall'</font><br/><br/>" ); QString g_QStrHintOtherNoDriver = QApplication::tr( @@ -85,7 +85,7 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- + if you don't use our stock kernel libre compile the modules with - sudo /etc/init.d/vboxdrv setup -+ sudo dkms install vboxhost/4.1.18 ++ sudo dkms autoinstall You will not be able to start VMs until this problem is fixed. EOF diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-additions.install b/libre/virtualbox-libre/virtualbox-libre-guest-additions.install new file mode 100755 index 000000000..38bbe807d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-guest-additions.install @@ -0,0 +1,31 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + getent group vboxsf > /dev/null || groupadd -g 109 vboxsf + true +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" + # rename /etc/rc.d/vboxservice + if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then + cat << EOF +==> rc.d vbox-service script was renamed to vboxservice. +EOF + fi + # fix gid of vboxsf + if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then + groupmod -g 109 vboxsf + fi + true +} + +# arg 1: the old package version +post_remove() { + groupdel vboxsf >/dev/null 2>&1 || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-source.install b/libre/virtualbox-libre/virtualbox-libre-guest-source.install new file mode 100755 index 000000000..966fb5681 --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-guest-source.install @@ -0,0 +1,29 @@ +#!/bin/sh + +# arg 1: the new package version +post_install() { + cat << EOF +==> To build and install your modules run dkms install vboxguest/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/virtualbox-libre/virtualbox-libre-host-source.install b/libre/virtualbox-libre/virtualbox-libre-host-source.install new file mode 100755 index 000000000..6a3994c8d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-host-source.install @@ -0,0 +1,29 @@ +#/bin/sh + +# arg 1: the new package version +post_install() { + cat << EOF +==> To build and install your modules run dkms install vboxhost/${1%-*} +==> To do this automatically at startup you can add dkms in your DAEMONS +EOF +} + +# arg 1: the new package version +# arg 2: the old package version +pre_upgrade() { + pre_remove "$2" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install "$1" +} + +# arg 1: the old package version +pre_remove() { + # Remove modules using dkms + [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/testing/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD new file mode 100644 index 000000000..c5493c781 --- /dev/null +++ b/testing/libpipeline/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 166762 2012-09-18 18:12:10Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgname=libpipeline +pkgver=1.2.2 +pkgrel=1 +pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way" +arch=('i686' 'x86_64') +url="http://libpipeline.nongnu.org/" +license=('GPL') +depends=('glibc') +options=('!libtool') +source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz) +md5sums=('4367a3f598d171fd43dfa8620ed16d55') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/testing/man-db/PKGBUILD b/testing/man-db/PKGBUILD index 7ec9750be..9e2a3a8cd 100644 --- a/testing/man-db/PKGBUILD +++ b/testing/man-db/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162091 2012-06-19 18:25:25Z andyrtr $ +# $Id: PKGBUILD 166764 2012-09-18 18:20:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db -pkgver=2.6.2 +pkgver=2.6.3 pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64') @@ -21,8 +21,8 @@ install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} convert-mans man-db.cron.daily) options=('!libtool') -md5sums=('647c48d46c464419185d031d04481ee5' - 'a9de1f9bbe620a5a9b9f5da8c58cd96c' +md5sums=('a593a095599ae97bcacf8d038659a146' + '64975c20b1a6453f9b860ff7f916bcf1' '2b7662a7d5b33fe91f9f3e034361a2f6' 'd30c39ae47560304471b5461719e0f03') diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD index ff4657500..9b0b56838 100644 --- a/testing/sudo/PKGBUILD +++ b/testing/sudo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166746 2012-09-17 15:48:51Z foutrelis $ +# $Id: PKGBUILD 166772 2012-09-18 20:41:58Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_sudover=1.8.6p2 +_sudover=1.8.6p3 pkgver=${_sudover/p/.p} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -16,7 +16,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool') source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz sudo.pam) -sha256sums=('d342ba710cc326bfa2065ed8ebe262a72b54a497a686aa4cbbbd0ae3028dcf4b' +sha256sums=('8130df04268f678880c3f423337c56e7d437a0f508a46b1dfefae16b0b20c92e' 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae') build() { |