From 9ddf3e5a94b0848cdf9e6ffcc586576bb614bc13 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 25 Sep 2012 00:23:17 -0700 Subject: Tue Sep 25 00:23:14 PDT 2012 --- libre/audacious-plugins-libre/PKGBUILD | 10 +- libre/libretools/PKGBUILD | 65 ++++++---- libre/libretools/libretools.install | 4 + libre/virtualbox-libre/60-vboxguest.rules | 2 + libre/virtualbox-libre/PKGBUILD | 141 ++++++++++++++------- libre/virtualbox-libre/vboxdrv-reference.patch | 81 ++---------- .../virtualbox-libre-guest-utils.install | 31 +++++ 7 files changed, 190 insertions(+), 144 deletions(-) create mode 100644 libre/virtualbox-libre/60-vboxguest.rules create mode 100755 libre/virtualbox-libre/virtualbox-libre-guest-utils.install (limited to 'libre') diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index d5b1e5313..1644c5576 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164182 2012-07-27 00:15:41Z bisson $ +# $Id: PKGBUILD 166974 2012-09-23 22:57:12Z bisson $ # Contributor: Alexander Fehr # Contributor: William Rea # Maintainer: Gaetan Bisson @@ -7,12 +7,12 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.3.1 +pkgver=3.3.2 pkgrel=1 pkgdesc='Plugins for Audacious without unfree plugins' url='http://audacious-media-player.org/' +license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') arch=('i686' 'x86_64') -license=('GPL' 'GPL3' 'LGPL' 'custom') # Licensing issues: # The plugins 'scrobbler', stereoplugin', 'wavepack' and 'plugin_echo' have no license notice @@ -60,7 +60,8 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('7775ff82a7fe2a1de7eb8a76322718c845a1f225') +sha1sums=('869d3820263ff35609bfc6f2e69885a00d660513') + build() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure @@ -115,4 +116,5 @@ build() { package() { cd "${srcdir}/${_pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index ecbba4e47..dec731c97 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=libretools pkgname=(libretools libretools-pr libretools-mips64el) -pkgver=20111231 +pkgver=$(date -u +%Y%m%d) pkgrel=2 pkgdesc="Scripts for easing Parabola's tasks" arch=('any') @@ -12,7 +12,6 @@ license=('GPL3+') depends=(openssh rsync git wget) optdepends=('devtools: For chroot (libremkchroot, librechroot, libremakepkg)') makedepends=(git) -backup=(etc/libretools.conf) install=libretools.install source=() md5sums=() @@ -36,42 +35,52 @@ build() { } package_libretools() { - - install -d ${pkgdir}/etc - install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ + backup=(etc/libretools.conf) install -d ${pkgdir}/etc/libretools.d - install -m644 ${_gitname}/cleansystem ${pkgdir}/etc/libretools.d + install -m644 ${_gitname}/libretools.conf ${pkgdir}/etc/ install -d ${pkgdir}/usr/bin - install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin - install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin - install -m755 ${_gitname}/aur ${pkgdir}/usr/bin - install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin - install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin - install -m755 ${_gitname}/lb ${pkgdir}/usr/bin - install -m755 ${_gitname}/librechroot ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin - install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin - install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin/ - install -m755 ${_gitname}/toru ${pkgdir}/usr/bin - install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/sbin - install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin/ + install -m755 ${_gitname}/abslibre-commit ${pkgdir}/usr/bin + install -m755 ${_gitname}/add-mips64el ${pkgdir}/usr/bin + install -m755 ${_gitname}/aur ${pkgdir}/usr/bin + install -m755 ${_gitname}/buildenv ${pkgdir}/usr/sbin + install -m755 ${_gitname}/chcleanup ${pkgdir}/usr/bin + install -m755 ${_gitname}/createworkdir ${pkgdir}/usr/bin + install -m755 ${_gitname}/diff-unfree ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg-build ${pkgdir}/usr/bin + install -m755 ${_gitname}/fullpkg-find ${pkgdir}/usr/bin + install -m755 ${_gitname}/is_built ${pkgdir}/usr/bin + install -m755 ${_gitname}/is_unfree ${pkgdir}/usr/bin + install -m755 ${_gitname}/lb ${pkgdir}/usr/bin + install -m755 ${_gitname}/libreaddiff ${pkgdir}/usr/bin + install -m755 ${_gitname}/librebasebuilder ${pkgdir}/usr/bin + install -m755 ${_gitname}/librechroot ${pkgdir}/usr/sbin + install -m755 ${_gitname}/librecommit ${pkgdir}/usr/bin + install -m755 ${_gitname}/librediff ${pkgdir}/usr/bin + install -m755 ${_gitname}/libremakepkg ${pkgdir}/usr/sbin + install -m755 ${_gitname}/libremessages ${pkgdir}/usr/bin + install -m755 ${_gitname}/libremkchroot ${pkgdir}/usr/bin + install -m755 ${_gitname}/librerelease ${pkgdir}/usr/bin + install -m755 ${_gitname}/librerepkg ${pkgdir}/usr/bin + install -m755 ${_gitname}/librestage ${pkgdir}/usr/bin + install -m755 ${_gitname}/pkgbuild-check-nonfree ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru-path ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru-utils ${pkgdir}/usr/bin + install -m755 ${_gitname}/toru-where ${pkgdir}/usr/bin + install -m755 ${_gitname}/updateabslibre ${pkgdir}/usr/bin + install -m755 ${_gitname}/update-cleansystem ${pkgdir}/usr/sbin install -d ${pkgdir}/usr/share/pacman install -m755 ${_gitname}/rePKGBUILD.proto ${pkgdir}/usr/share/pacman } package_libretools-pr() { + backup=('etc/libretools.d/prtools.conf') + install -d ${pkgdir}/etc/libretools.d install -m644 ${_gitname}/prtools/prtools.conf ${pkgdir}/etc/libretools.d @@ -82,6 +91,8 @@ package_libretools-pr() { } package_libretools-mips64el() { + backup=('etc/libretools.d/mips64el.conf') + install -d ${pkgdir}/etc/libretools.d install -m755 ${_gitname}/mips64el/mips64el.conf ${pkgdir}/etc/libretools.d diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install index 6f8c09d5c..69a0f2467 100644 --- a/libre/libretools/libretools.install +++ b/libre/libretools/libretools.install @@ -1,3 +1,5 @@ +#!/bin/sh + # arg 1: the new package version post_install() { cat < "$pkgdir/etc/vbox/vbox.cfg" #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \ + install -D -m 0644 "$srcdir/VirtualBox-$pkgver/COPYING" \ "$pkgdir/usr/share/licenses/virtualbox/LICENSE" install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules" @@ -214,14 +266,14 @@ package_virtualbox-libre-sdk() { install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" #python sdk pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" + VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir" popd rm -rf sdk/installer mv sdk "$pkgdir/usr/lib/virtualbox" } package_virtualbox-libre-host-source() { - pkgdesc='VirtualBox kernel libre modules source' + pkgdesc='VirtualBox Host 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') @@ -237,9 +289,9 @@ package_virtualbox-libre-host-source() { } package_virtualbox-libre-guest-source() { - pkgdesc='VirtualBox Additions kernel libre modules source' + pkgdesc='VirtualBox Guest kernel libre modules source' depends=('dkms' 'gcc' 'make') - provides=("virtualbox-guest-source=${pkgver}" 'virtualbox-libre-guest-modules') + 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' @@ -252,23 +304,21 @@ package_virtualbox-libre-guest-source() { cp -r src "$pkgdir/usr/src/vboxguest-$pkgver" } -package_virtualbox-libre-guest-additions(){ - pkgdesc='Additions for guests only (userspace tools)' +package_virtualbox-libre-guest-utils(){ + pkgdesc='VirtualBox Guest userspace utilities' 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') + optdepends=('virtualbox-guest-source: Guest kernel libre source modules for non-stock kernels') + provides=("virtualbox-guest-utils=$pkgver") + replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') + conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions') backup=('etc/conf.d/vboxservice') - install=virtualbox-libre-guest-additions.install + install=virtualbox-libre-guest-utils.install source "VirtualBox-$pkgver/env.sh" - - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - + pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" install -d "$pkgdir"/{usr/bin,sbin} install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" install -m755 mount.vboxsf "$pkgdir/sbin" - install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ "$pkgdir"/usr/bin/VBoxClient-all install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ @@ -279,14 +329,15 @@ package_virtualbox-libre-guest-additions(){ install -m755 VBoxOGL*.so "$pkgdir/usr/lib" ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" - + popd + # install udev rules + install -D -m 0644 60-vboxguest.rules \ + "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" # install rc.d script - install -D -m755 "$srcdir/vboxservice.rc" "$pkgdir/etc/rc.d/vboxservice" - + install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice" # install sample config - install -D -m644 "$srcdir/vboxservice.conf" "$pkgdir/etc/conf.d/vboxservice" - + install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice" # install systemd service file - install -D -m644 "$srcdir/vboxservice.service" \ + install -D -m644 vboxservice.service \ "$pkgdir/usr/lib/systemd/system/vboxservice.service" } diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch index 4703da68d..be650440e 100644 --- a/libre/virtualbox-libre/vboxdrv-reference.patch +++ b/libre/virtualbox-libre/vboxdrv-reference.patch @@ -1,88 +1,44 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp --- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -67,38 +67,34 @@ - - /* XXX Temporarily. Don't rely on the user to hack the Makefile himself! */ - QString g_QStrHintLinuxNoMemory = QApplication::tr( -- "This error means that the kernel driver was either not able to " -+ "This error means that the kernel libre driver was either not able to " - "allocate enough memory or that some mapping operation failed." - ); - - QString g_QStrHintLinuxNoDriver = QApplication::tr( -- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " -+ "The VirtualBox Linux-libre kernel driver (vboxdrv) is either not loaded or " +@@ -75,10 +75,9 @@ + "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " -- "module by executing

" + "module by executing

" - " '/etc/init.d/vboxdrv setup'

" - "as root. If it is available in your distribution, you should install the " - "DKMS package first. This package keeps track of Linux kernel changes and " - "recompiles the vboxdrv kernel module if necessary." -+ "libre module by executing

" -+ " 'pacman -S virtualbox-libre-modules'

" -+ "as root. If you don't use our stock kernel libre, install virtualbox-libre-host-source and " ++ " 'pacman -S virtualbox-modules'

" ++ "as root. If you don't use our stock kernel, install virtualbox-host-source and" + "execute dkms autoinstall ." ); QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " -+ "The VirtualBox kernel libre modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Please try completely uninstalling and reinstalling " - "VirtualBox." - ); +@@ -90,11 +89,8 @@ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( -- "The VirtualBox kernel modules do not match this version of " + "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing

" - " '/etc/init.d/vboxdrv setup'

" - "may correct this. Make sure that you do not mix the " - "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

" ++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute

" + " 'dkms autoinstall'

" ); QString g_QStrHintOtherNoDriver = QApplication::tr( -- "Make sure the kernel module has been loaded successfully." -+ "Make sure the kernel libre module has been loaded successfully." - ); - - /* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */ -@@ -590,7 +586,7 @@ - case VERR_VM_DRIVER_NOT_INSTALLED: - case VERR_VM_DRIVER_LOAD_ERROR: - msgText += QApplication::tr ( -- "Cannot access the kernel driver!

"); -+ "Cannot access the kernel libre driver!

"); - # ifdef RT_OS_LINUX - msgText += g_QStrHintLinuxNoDriver; - # else -@@ -603,7 +599,7 @@ - break; - # endif - case VERR_VM_DRIVER_NOT_ACCESSIBLE: -- msgText += QApplication::tr ("Kernel driver not accessible"); -+ msgText += QApplication::tr ("Kernel libre driver not accessible"); - break; - case VERR_VM_DRIVER_VERSION_MISMATCH: - # ifdef RT_OS_LINUX diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh --- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 +++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -30,19 +30,20 @@ - SHUTDOWN="true" - elif ! lsmod|grep -q vboxdrv; then +@@ -32,17 +32,18 @@ cat << EOF --WARNING: The vboxdrv kernel module is not loaded. Either there is no module -- available for the current kernel (`uname -r`) or it failed to + WARNING: The vboxdrv kernel module is not loaded. Either there is no module + available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by -+WARNING: The vboxdrv kernel libre module is not loaded. Either there is no module -+ available for the current kernel libre (`uname -r`) or it failed to -+ load. Please reinstall the kernel libre module virtualbox-libre-modules or -+ if you don't use our stock kernel libre compile the modules with ++ load. Please reinstall the kernel module virtualbox-modules or ++ if you don't use our stock kernel compile the modules with - sudo /etc/init.d/vboxdrv setup + sudo dkms autoinstall @@ -99,14 +55,3 @@ diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox- and if that is not successful, try to re-install the package. -@@ -52,9 +53,8 @@ - - if [ -f /etc/vbox/module_not_compiled ]; then - cat << EOF --WARNING: The compilation of the vboxdrv.ko kernel module failed during the -+WARNING: The compilation of the vboxdrv.ko kernel libre module failed during the - installation for some reason. Starting a VM will not be possible. -- Please consult the User Manual for build instructions. - EOF - fi - \ No newline at end of file diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install new file mode 100755 index 000000000..38bbe807d --- /dev/null +++ b/libre/virtualbox-libre/virtualbox-libre-guest-utils.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: -- cgit v1.2.3-54-g00ecf