diff options
author | root <root@rshg054.dnsready.net> | 2011-10-05 23:14:45 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-10-05 23:14:45 +0000 |
commit | 068f1f30c0bba25b6b88cefbe982a72535fa1951 (patch) | |
tree | 1cbc872f02ee675155a7dc79fc637b4f2ed7e5e8 /community | |
parent | 3567a49f79d2dbf828b723ab54982fa6c7ea1c80 (diff) |
Wed Oct 5 23:14:44 UTC 2011
Diffstat (limited to 'community')
-rw-r--r-- | community/ejabberd/PKGBUILD | 8 | ||||
-rw-r--r-- | community/ejabberd/ejabberd | 1 | ||||
-rw-r--r-- | community/ejabberd/ejabberd.install | 1 | ||||
-rw-r--r-- | community/gtranslator/PKGBUILD | 9 | ||||
-rw-r--r-- | community/mcelog/PKGBUILD | 11 | ||||
-rw-r--r-- | community/packagekit/PKGBUILD | 6 | ||||
-rw-r--r-- | community/setconf/PKGBUILD | 32 | ||||
-rw-r--r-- | community/simple-scan/PKGBUILD | 22 | ||||
-rw-r--r-- | community/simple-scan/simple-scan.install | 22 | ||||
-rw-r--r-- | community/speed-dreams/PKGBUILD | 14 | ||||
-rw-r--r-- | community/unetbootin/PKGBUILD | 33 | ||||
-rw-r--r-- | community/unetbootin/unetbootin.install | 12 | ||||
-rw-r--r-- | community/virtualbox/PKGBUILD | 33 | ||||
-rw-r--r-- | community/virtualbox/vbox-service.conf | 2 | ||||
-rwxr-xr-x | community/virtualbox/vbox-service.rc | 39 | ||||
-rwxr-xr-x | community/virtualbox/vboxbuild | 78 | ||||
-rw-r--r-- | community/virtualbox/vboxdrv-reference.patch | 8 | ||||
-rw-r--r-- | community/virtualbox/virtualbox.install | 4 |
18 files changed, 262 insertions, 73 deletions
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index beb61f679..999899238 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 48921 2011-06-07 16:36:53Z spupykin $ +# $Id: PKGBUILD 56262 2011-10-04 09:38:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=ejabberd -pkgver=2.1.8 +pkgver=2.1.9 pkgrel=1 pkgdesc="An erlang jabber server" arch=(i686 x86_64) @@ -18,8 +18,8 @@ install=ejabberd.install source=(http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tar.gz \ ejabberd \ ejabberd.logrotate) -md5sums=('d7dae7e5a7986c5ad71beac2798cc406' - 'd2ed73bc83b7f0e423a3fd7fdf1b43d6' +md5sums=('29ca14ea62f90736322e4e6720331352' + '8b15d22edef4e9fdd310aa617435aaf2' 'f97c8a96160f30e0aecc9526c12e6606') build() { diff --git a/community/ejabberd/ejabberd b/community/ejabberd/ejabberd index 3f5ee5637..1d59bebef 100644 --- a/community/ejabberd/ejabberd +++ b/community/ejabberd/ejabberd @@ -6,6 +6,7 @@ cd / get_pid() { + pidof epmd >/dev/null || { echo '' ; return 0; } # get port from 'epmd -names', then get pid from 'netstat -tlnp' PORT=`epmd -names | grep ejabberd | cut -f5 -d\ ` [ -z "$PORT" ] && { echo '' ; return 0; } diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install index 4f9fa0a8f..579be7ed3 100644 --- a/community/ejabberd/ejabberd.install +++ b/community/ejabberd/ejabberd.install @@ -22,4 +22,3 @@ post_remove() { userdel ejabberd groupdel jabber } - diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 9f48a13f6..2278e70ac 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 54573 2011-08-20 18:10:22Z jlichtblau $ +# $Id: PKGBUILD 56273 2011-10-04 13:27:12Z jelle $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator pkgver=2.90.5 -pkgrel=1 +pkgrel=2 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64') url="http://projects.gnome.org/gtranslator/" license=('GPL') -depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') +depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell' 'iso-codes' 'libgda4' 'libpeas' 'libunique' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gnome-utils' 'gucharmap' 'json-glib') optdepends=('gtkspell: spell check' 'gucharmap: for charmap plugin' @@ -19,7 +19,7 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.90/$pkgname-$pkgver.tar.bz2) -sha256sums=('7b4b3e20a946b553625de73a7503cd8e5d5825a21aeed292348b7b234197c5f7') +sha256sums=('26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -33,4 +33,3 @@ package() { make DESTDIR=${pkgdir} install } -sha256sums=('26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505') diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD index 036f48748..2acfd7516 100644 --- a/community/mcelog/PKGBUILD +++ b/community/mcelog/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 54638 2011-08-22 09:43:49Z spupykin $ +# $Id: PKGBUILD 56264 2011-10-04 09:39:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Thomas Mudrunka <harvie@@email..cz> # Maintainer: Thomas Mudrunka <harvie@@email..cz> pkgname=mcelog pkgver=1.0pre3 -pkgrel=2 +pkgrel=3 pkgdesc="Print machine check event log from x86-64 kernel" url="http://freshmeat.net/projects/mcelog/" license=("GPL") arch=('i686' 'x86_64') depends=() +options=('docs') source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz" "${pkgname}.rc") md5sums=('b42f2214de6f4feb992556149edc67fa' @@ -23,8 +24,10 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - install -Dm0755 mcelog "${pkgdir}/usr/sbin/mcelog" + mkdir -p $pkgdir/usr/share/doc/mcelog + make install prefix=$pkgdir/usr etcprefix=$pkgdir DOCDIR=$pkgdir/usr/share/doc/mcelog install -Dm0755 mcelog.cron "${pkgdir}/usr/sbin/mcelog.cron" - install -Dm0644 mcelog.8 "${pkgdir}/usr/share/man/man8/mcelog.8" install -Dm0755 "${srcdir}/mcelog.rc" "${pkgdir}/etc/rc.d/mcelog" + install -Dm0644 mcelog.logrotate "${pkgdir}/etc/logrotate.d/mcelog.logrotate" + install -Dm0644 README "${pkgdir}/usr/share/doc/mcelog/README" } diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index 847c39601..d9706478b 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 55209 2011-09-06 10:19:56Z jconder $ +# $Id: PKGBUILD 56266 2011-10-04 10:14:17Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') -pkgver=0.6.18 +pkgver=0.6.19 pkgrel=1 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.xz") -sha256sums=('38e22db73360b50e4b495d03a8d7e44e1fd1525ac44fb4a3bbac99ad21779c32') +sha256sums=('961c6408de08ebaf15c09e74afd06918d699be8974b5c35c2c9663e5b12b5223') build() { cd "$srcdir/PackageKit-$pkgver" diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD new file mode 100644 index 000000000..27a2eb3a9 --- /dev/null +++ b/community/setconf/PKGBUILD @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +pkgname=setconf +pkgver=0.2 +pkgrel=7 +pkgdesc="A utility to easily change settings in Makefiles and other configuration files" +arch=('x86_64' 'i686') +url="http://setconf.roboticoverlords.org/" +license=('GPL') +depends=('pcre' 'gc') +makedepends=('shedskin>=0.1.2') +md5sums=('ccd0ca9527d8406d5393d77a6a56686b') +source=("http://${pkgname}.roboticoverlords.org/${pkgname}-${pkgver}.tbz2") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + shedskin ${pkgname}.py + make CPPFLAGS="-march=native -fomit-frame-pointer" +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + install -Dm755 "${pkgname}" "$pkgdir/usr/bin/${pkgname}" + install -Dm644 "${pkgname}.1.gz" \ + "$pkgdir/usr/share/man/man1/${pkgname}.1.gz" + install -Dm644 COPYING \ + "$pkgdir/usr/share/licenses/${pkgname}/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD index cc7906392..bc08d2ef9 100644 --- a/community/simple-scan/PKGBUILD +++ b/community/simple-scan/PKGBUILD @@ -2,31 +2,27 @@ # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=simple-scan -pkgver=2.32.0.2 +pkgver=3.2.0 pkgrel=1 pkgdesc='Simple scanning utility' arch=('i686' 'x86_64') url='http://launchpad.net/simple-scan' license=('GPL3') -depends=('sane' 'gconf') +depends=('sane' 'dconf' 'gtk3' 'colord' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') -install="${pkgname}.install" -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8435b0a31aba1255caf685eb57b18e06') +install=simple-scan.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('175a852f132f85e861ded99d546137fb4299ad9ce2836eaac9d645fbfcbefbac') build() { - cd ${pkgname}-${pkgver} - + cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - --disable-schemas-install - + --disable-schemas-compile make } package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } diff --git a/community/simple-scan/simple-scan.install b/community/simple-scan/simple-scan.install index 9893818d9..5919c0b22 100644 --- a/community/simple-scan/simple-scan.install +++ b/community/simple-scan/simple-scan.install @@ -1,24 +1,18 @@ -pkgname=simple-scan - post_install() { - echo -n "Installing GConf schemas..." - usr/sbin/gconfpkg --install ${pkgname} - - [ $? -eq 0 ] && echo " Done." || echo " FAILED!" + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } pre_upgrade() { - pre_remove $1 + if (( $(vercmp $2 3.1.3) < 0 )); then + usr/sbin/gconfpkg --uninstall simple-scan + fi } post_upgrade() { - post_install $1 + post_install } -pre_remove() { - echo -n "Removing GConf schemas..." - usr/sbin/gconfpkg --uninstall ${pkgname} - - [ $? -eq 0 ] && echo " Done." || echo " FAILED!" +post_remove() { + post_install } - diff --git a/community/speed-dreams/PKGBUILD b/community/speed-dreams/PKGBUILD index 63c8dbe13..990763d56 100644 --- a/community/speed-dreams/PKGBUILD +++ b/community/speed-dreams/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55048 2011-09-01 02:59:17Z svenstaro $ +# $Id: PKGBUILD 56288 2011-10-04 20:51:38Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Adrián Chaves Fernández, aka Gallaecio <adriyetichaves@gmail.com> # Contributor: Shahar Weiss <sweiss4@gmx.net> (build() code from his TORCS' PKGBUILD) pkgname=speed-dreams -pkgver=2.0.0a3 -_pkgver=2.0.0-a3-r3412 -pkgrel=4 +pkgver=2.0.0b1 +_pkgver=2.0.0-b1-r3937 +pkgrel=1 pkgdesc="A racing simulator with rich graphics and physics" arch=('i686' 'x86_64') url="http://speed-dreams.sourceforge.net/" @@ -14,7 +14,7 @@ depends=('sdl' 'freealut' 'freeglut' 'libpng' 'libxi' 'libxmu' 'libxrandr' 'plib makedepends=('cmake' 'p7zip') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${_pkgver}-src.tar.7z" "${pkgname}.desktop") -md5sums=('659837e8866c59c85279c31fcaba4144' +md5sums=('5299fe23aec3641827039ae3c69de460' '6b45e9c40984ebb79a1dfaddbfabde92') build() { @@ -28,7 +28,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DSD_BINDIR=/usr/bin \ -DSD_DATADIR=/usr/share/speed-dreams-2 \ - -DSD_LIBDIR=/usr/lib/speed-dreams-2 + -DSD_LIBDIR=/usr/lib/speed-dreams-2 \ + -DOPTION_OFFICIAL_ONLY:BOOL=ON make } @@ -49,7 +50,6 @@ package() { rm -r "${pkgdir}/usr/share/doc/${pkgname}/man" mkdir -p "${pkgdir}/usr/share/man/man6/${pkgname}" - rm doc/man/speed-dreams.es.6 cp doc/man/* "${pkgdir}/usr/share/man/man6/${pkgname}" # Symlink for backwards compatibility diff --git a/community/unetbootin/PKGBUILD b/community/unetbootin/PKGBUILD new file mode 100644 index 000000000..8f10db3a5 --- /dev/null +++ b/community/unetbootin/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 56275 2011-10-04 15:12:06Z arodseth $ +# Contributor: Det <nimetonmaili at gmail a-dot com> +# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com> +pkgname=unetbootin +pkgver=555 +pkgrel=1 +pkgdesc="Lets you create bootable Live USB drives" +url="http://unetbootin.sourceforge.net/" +license=('GPL') +arch=('x86_64' 'i686') +depends=('syslinux' 'p7zip' 'qt' 'mtools') +optdepends=('gksu: for graphically requesting the root password' + 'kdebase-runtime: for graphically requesting the root password') +install=${pkgname}.install +source=(http://downloads.sourceforge.net/project/${pkgname}/UNetbootin/${pkgver}/${pkgname}-source-${pkgver}.tar.gz) +sha1sums=('52adee7c2bf05834d59231e6a06ff8522203f4de') + +build() { + lupdate ${pkgname}.pro + lrelease ${pkgname}.pro + qmake + make +} + +package() { + install -Dm755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}" + mkdir -p "${pkgdir}/usr/share/${pkgname}" + install -m644 ${pkgname}_*.qm "${pkgdir}/usr/share/${pkgname}/" + install -Dm644 ${pkgname}.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop" + for i in 16x16 22x22 24x24 32x32 48x48 256x256; do + install -D ${pkgname}_${i/x*/}.png "${pkgdir}/usr/share/icons/hicolor/${i}/apps/${pkgname}.png" + done +} diff --git a/community/unetbootin/unetbootin.install b/community/unetbootin/unetbootin.install new file mode 100644 index 000000000..a09dc920d --- /dev/null +++ b/community/unetbootin/unetbootin.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 388b3ed53..8739d2a86 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 54264 2011-08-15 19:54:32Z ibiru $ +# $Id: PKGBUILD 56277 2011-10-04 15:42:56Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-archlinux-additions' 'virtualbox-archlinux-modules' 'virtualbox-sdk') -pkgver=4.1.2 +pkgver=4.1.4 pkgrel=1 arch=('i686' 'x86_64') url='http://virtualbox.org' @@ -14,8 +14,8 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - change_default_driver_dir.patch) + 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild + change_default_driver_dir.patch vbox-service.conf vbox-service.rc) _kernver=3.0-ARCH build() { @@ -113,7 +113,7 @@ package_virtualbox() { #sources for modules cp -r src ${pkgdir}/usr/lib/virtualbox #install compilation script - install -D -m 755 "${srcdir}/vboxdrv.sh" "${pkgdir}/etc/rc.d/vboxdrv" + install -D -m 755 "${srcdir}/vboxbuild" "${pkgdir}/usr/bin/vboxbuild" } package_virtualbox-sdk() { @@ -148,16 +148,10 @@ package_virtualbox-archlinux-additions(){ install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" install -m755 mount.vboxsf "$pkgdir/sbin" - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ - "$pkgdir"/etc/X11/xorg.conf.d/50-vboxmouse.conf - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \ - "$pkgdir"/lib/udev/rules.d/70-xorg-vboxmouse.rules install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv_110.so \ - "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" install -D vboxvideo_drv_110.so \ "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" install -d "$pkgdir/usr/lib/xorg/modules/dri" @@ -165,6 +159,11 @@ package_virtualbox-archlinux-additions(){ ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" + # install rc.d script + install -D -m755 "${srcdir}/vbox-service.rc" "${pkgdir}/etc/rc.d/vbox-service" + + # install sample config + install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service" } package_virtualbox-archlinux-modules(){ @@ -193,13 +192,15 @@ package_virtualbox-archlinux-modules(){ sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-archlinux-modules.install" } -md5sums=('945d2c94c15a4f47280be4b01b67e244' - 'cc75a674add48f8b25af2b5e69530a6f' +md5sums=('dc6e6801b3823332b6ca2e9915221aae' + 'bc048d1e58d84ece4a186199ee48d4c8' '44efb3c4be214daa453a317d527f1f30' '32a232b43852b9a08cb11a7bcd64b347' '5f85710e0b8606de967716ded7b2d351' 'ed1341881437455d9735875ddf455fbe' - '4cf75d9c091199a47a7a1bc2f4e347d9' + 'cc3f278bc273011aa95277500a76f677' '78ffa67ff131680f1d2b6f06d4325c5b' - '790a1456345fe74b6b714d71f90a1c6d' - '97e193f050574dd272a38e5ee5ebe62b') + 'dda3811f7d94ac55f12b4de707a7c2c2' + '97e193f050574dd272a38e5ee5ebe62b' + '3c08ad30b89add47d3f45121200a5360' + '778d865e56e31cc592fbfa257fdcfce7') diff --git a/community/virtualbox/vbox-service.conf b/community/virtualbox/vbox-service.conf new file mode 100644 index 000000000..9d4ec629f --- /dev/null +++ b/community/virtualbox/vbox-service.conf @@ -0,0 +1,2 @@ +# VBoxService -h +VBOX_SERVICE_OPTION="" diff --git a/community/virtualbox/vbox-service.rc b/community/virtualbox/vbox-service.rc new file mode 100755 index 000000000..c1af2134d --- /dev/null +++ b/community/virtualbox/vbox-service.rc @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/vbox-service + +name=VBoxService +PID=$(pidof -o %PPID $name) + +case "$1" in + start) + stat_busy "Starting $name service" + [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; + stop) + stat_busy "Stopping $name service" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + status) + stat_busy "Checking $name status"; + ck_status $name + ;; + *) + echo "usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit 0 + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/vboxbuild b/community/virtualbox/vboxbuild new file mode 100755 index 000000000..1058744c5 --- /dev/null +++ b/community/virtualbox/vboxbuild @@ -0,0 +1,78 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/vbox/vbox.cfg + +MODLIST=() +LOG="/var/log/vbox-install.log" +>| "$LOG" + +if [[ $INSTALL_DIR ]]; then + VBOXMANAGE=$INSTALL_DIR/VBoxManage + BUILDVBOXDRV=$INSTALL_DIR/src/vboxdrv/build_in_tmp + BUILDVBOXNETFLT=$INSTALL_DIR/src/vboxnetflt/build_in_tmp + BUILDVBOXNETADP=$INSTALL_DIR/src/vboxnetadp/build_in_tmp + BUILDVBOXPCI=$INSTALL_DIR/src/vboxpci/build_in_tmp +else + echo "error: missing vbox.cfg" + exit 1 +fi + +if [[ -f /proc/modules ]]; then + IFS=$'\n' read -r -d '' -a MODLIST < \ + <(grep -oE '^vbox(pci|netflt|netadp|drv)' /proc/modules) +fi + +if (( ${#MODLIST[*]} )); then + stat_busy "Unloading VirtualBox kernel modules" + modprobe -ar "${MODLIST[@]}" && stat_done || stat_fail +fi + +for kdir in /lib/modules/*; do + if [[ ! -d $kdir/kernel ]]; then + # found a stale kernel + mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*) + if (( ${#mods[@]} )); then + stat_busy "Removing all old VirtualBox kernel modules" + if rm -f "${mods[@]}" && + rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then + stat_done + else + stat_fail + fi + fi + fi +done + +# default to the currently running kernel +if (( ! $# )); then + set -- $(uname -r) +fi + +for kernver; do + export KERN_DIR=/lib/modules/$kernver/build + if [[ ! -d $KERN_DIR ]]; then + printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \ + "$KERN_DIR" + continue + fi + + stat_busy "Recompiling VirtualBox kernel modules ($kernver)" + for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do + if ! ${!build} \ + --save-module-symvers /tmp/vboxdrv-Module.symvers \ + --no-print-directory install >> $LOG 2>&1; then + echo "Look at $LOG to find out what went wrong" + stat_fail + continue + fi + done + stat_done +done + +if (( ${#MODLIST[*]} )); then + stat_busy "Reloading VirtualBox kernel modules" + modprobe -a "${MODLIST[@]}" && stat_done || stat_fail +fi + diff --git a/community/virtualbox/vboxdrv-reference.patch b/community/virtualbox/vboxdrv-reference.patch index 05d840f05..c310dbc8d 100644 --- a/community/virtualbox/vboxdrv-reference.patch +++ b/community/virtualbox/vboxdrv-reference.patch @@ -8,7 +8,7 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" - "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " - "package first. This package keeps track of Linux kernel changes and " -+ " <font color=blue>'rc.d setup vboxdrv'</font><br/><br/>" ++ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" + "as root. This package keeps track of Linux kernel changes and" "recompiles the vboxdrv kernel module if necessary." ); @@ -18,7 +18,7 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp V "VirtualBox. The installation of VirtualBox was apparently not " "successful. Executing<br/><br/>" - " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -+ " <font color=blue>'rc.d setup vboxdrv'</font><br/><br/>" ++ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>" "may correct this. Make sure that you do not mix the " "OSE version and the PUEL version of VirtualBox." ); @@ -30,7 +30,7 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- load. Please recompile the kernel module and install it by - sudo /etc/init.d/vboxdrv setup -+ sudo rc.d setup vboxdrv ++ sudo /usr/bin/vboxbuild You will not be able to start VMs until this problem is fixed. EOF @@ -39,7 +39,7 @@ diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- WARNING: The character device /dev/vboxdrv does not exist. Try - sudo /etc/init.d/vboxdrv restart -+ sudo rc.d restart vboxdrv ++ sudo /usr/bin/vboxbuild and if that is not successful, try to re-install the package. diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install index 97a1b52f9..0eac014f2 100644 --- a/community/virtualbox/virtualbox.install +++ b/community/virtualbox/virtualbox.install @@ -31,7 +31,7 @@ post_install() { ===> To load it automatically, add vboxdrv module ===> to the MODULES array in /etc/rc.conf. -*** To compile the modules do rc.d setup vboxdrv *** +*** To compile the modules do /usr/bin/vboxbuild *** EOF utils @@ -40,7 +40,7 @@ EOF post_upgrade() { getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers /bin/cat << EOF -*** To recompile the modules do rc.d setup vboxdrv *** +*** To recompile the modules do /usr/bin/vboxbuild *** EOF utils } |