diff options
author | root <root@rshg054.dnsready.net> | 2013-06-29 01:17:51 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-06-29 01:17:51 -0700 |
commit | 8421e68301cd00265bc8db838e69254316c7133a (patch) | |
tree | af089edb7cb6846d1fcb4ffc98d3e4f38ea18345 /libre | |
parent | 0a66b29837912ffee94e074fc35ba46896a96f2a (diff) |
Sat Jun 29 01:17:51 PDT 2013
Diffstat (limited to 'libre')
43 files changed, 989 insertions, 52 deletions
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 7be8ca825..f8e66c762 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=4 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") @@ -25,7 +25,7 @@ build() { cd ${srcdir}/${_pkgname}-${pkgver} _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - + make KDIR=/usr/src/linux-${_kernver} } diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f1c6481d5..518e25312 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92970 2013-06-21 08:06:15Z tpowa $ +# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=47 +pkgrel=48 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch new file mode 100644 index 000000000..a859efabe --- /dev/null +++ b/libre/dkms-libre/01-broken-uninstall.patch @@ -0,0 +1,22 @@ +diff --git a/dkms b/dkms +index abb01a4..265b69a 100644 +--- a/dkms ++++ b/dkms +@@ -162,11 +162,14 @@ set_kernel_source_dir() + + # A little test function for DKMS commands that only work on one kernel. + have_one_kernel() { +- (( ${#kernelver[@]} > 1 )) && \ +- die 4 $"The action $1 does not support multiple kernel version" \ +- $"parameters on the command line." +- [[ $all ]] && die 5 $"The action $1 does not support the --all" \ +- $"parameter." ++ if (( ${#kernelver[@]} != 1 )); then ++ die 4 $"The action $1 does not support multiple kernel version" \ ++ $"parameters on the command line." ++ fi ++ if [[ $all ]]; then ++ die 5 $"The action $1 does not support the --all" \ ++ $"parameter." ++ fi + } diff --git a/libre/dkms-libre/02-no-kernel-hook.patch b/libre/dkms-libre/02-no-kernel-hook.patch new file mode 100644 index 000000000..f01f22002 --- /dev/null +++ b/libre/dkms-libre/02-no-kernel-hook.patch @@ -0,0 +1,13 @@ +# Author: Sébastien Luttringer <seblu@seblu.net> +--- a/Makefile 2011-12-07 19:23:51.000000000 +0100 ++++ b/Makefile 2013-05-13 00:48:19.620000000 +0200 +@@ -46,9 +46,6 @@ + gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz + chmod 0644 $(MAN)/dkms.8.gz + touch --reference=dkms.8 $(MAN)/dkms.8.gz +- mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d +- install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms +- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms + + DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec + diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD new file mode 100644 index 000000000..99caab5fa --- /dev/null +++ b/libre/dkms-libre/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com) +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=dkms +pkgname=dkms-libre +pkgver=2.2.0.3 +pkgrel=14 +pkgdesc='Dynamic Kernel Modules System, with linux-libre-headers and linux-libre-lts-headers recommendation' +arch=('any') +url='http://linux.dell.com/dkms/' +license=('GPL2') +depends=('bash' 'kmod' 'gcc' 'make' 'patch') +optdepends=('linux-libre-headers: build modules against linux-libre kernel' + 'linux-libre-lts-headers: build modules against linux-libre-lts kernel') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +backup=('etc/dkms/framework.conf' 'etc/default/dkms') +install=$_pkgname.install +source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz" + "$_pkgname.default" + "$_pkgname.service" + "$_pkgname.systemd" + '01-broken-uninstall.patch' + '02-no-kernel-hook.patch') +md5sums=('11a8aaade2ebec2803653837c7593030' + '33be2fbf1bcc1b3fb2f38d9e7eaa809d' + '02e9744e3fdc3d2f68e46966fb32e260' + '267632312aa52a190ec0db0758920dd3' + '2dfd8656dc79afd229c1481a90fb645b' + '82d520c39c99c34977e48b313a189c6c') + +prepare() { + # patch + patches=("$srcdir"/*.patch) + cd $_pkgname-$pkgver + for p in "${patches[@]}"; do + msg2 "Apply patch: ${p##*/}" + patch -p1 -i "$p" + done + # /usr move + msg2 '/usr move patching' + for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do + sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i" + done + # fix hardcoded paths + sed -i "s|/sbin/depmod|depmod|" dkms +} + +package() { + # systemd + install -D -m 644 $_pkgname.service "$pkgdir/usr/lib/systemd/system/$_pkgname.service" + install -D -m 755 $_pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$_pkgname" + install -D -m 644 $_pkgname.default "$pkgdir/etc/default/$_pkgname" + # upstream installer + cd $_pkgname-$pkgver + make \ + DESTDIR="$pkgdir" \ + SBIN="$pkgdir/usr/bin" \ + BASHDIR="$pkgdir/usr/share/bash-completion/completions" \ + install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/dkms-libre/dkms.default b/libre/dkms-libre/dkms.default new file mode 100644 index 000000000..d430855bb --- /dev/null +++ b/libre/dkms-libre/dkms.default @@ -0,0 +1,9 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +# With LOAD set to yes, modules listed as installed will be loaded with +# systemctl start dkms.service. Default is yes. +LOAD=yes + +# With UNLOAD set to yes, modules listed as installed will be unloaded with +# systemctl stop dkms.service. Default is no. +UNLOAD=no diff --git a/libre/dkms-libre/dkms.hook b/libre/dkms-libre/dkms.hook new file mode 100644 index 000000000..3d656e32d --- /dev/null +++ b/libre/dkms-libre/dkms.hook @@ -0,0 +1,12 @@ +#!/bin/bash + +dkms_autoinstall() { + export TMPDIR=/dev/shm + status 'Starting DKMS autoinstall' dkms autoinstall + unset TMPDIR +} + +add_hook single_udevlaunched dkms_autoinstall +add_hook sysinit_udevlaunched dkms_autoinstall + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.install b/libre/dkms-libre/dkms.install new file mode 100644 index 000000000..4dd18dd19 --- /dev/null +++ b/libre/dkms-libre/dkms.install @@ -0,0 +1,13 @@ +#!/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then + cat << EOF +===> dkms startup config file moved to /etc/default/dkms +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.service b/libre/dkms-libre/dkms.service new file mode 100644 index 000000000..0e679a949 --- /dev/null +++ b/libre/dkms-libre/dkms.service @@ -0,0 +1,11 @@ +[Unit] +Description=Dynamic Kernel Modules System + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/dkms start +ExecStop=/usr/lib/systemd/scripts/dkms stop + +[Install] +WantedBy=multi-user.target diff --git a/libre/dkms-libre/dkms.systemd b/libre/dkms-libre/dkms.systemd new file mode 100644 index 000000000..03e6bfe97 --- /dev/null +++ b/libre/dkms-libre/dkms.systemd @@ -0,0 +1,61 @@ +#!/bin/bash + +. /etc/default/dkms + +# list dkms modules for the current running kernel +list_dkms_modules() { + shopt -s nullglob + declare -a DKMS_MOULES + # dkms status needs uname -r to list correctly intalled version for current kernel + local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p')) + for p in "${modules_path[@]}"; do + for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do + m=${m##*/} + m=${m%.gz} + m=${m%.ko} + DKMS_MODULES+=("$m") + done + done +} + +# load installed kernel modules for the current kernel version +load_dkms_modules() { + local ret=0 + list_dkms_modules + for m in "${DKMS_MODULES[@]}"; do + modprobe "$m" + ret+=$? + done + return $ret +} + +# unload installed kernel modules for the current kernel version +unload_dkms_modules() { + list_dkms_modules + # ask for removal + for m in "${DKMS_MODULES[@]}"; do + modprobe --remove --quiet "$m" + done + # check modules are unloaded + # sometimes modprobe -r fail but modules are removed + for m in "${DKMS_MODULES[@]}"; do + [[ -e /sys/modules/$m ]] && return 1 + done + return 0 +} + +case "$1" in + start) + dkms autoinstall -k "$(uname -r)" + [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules + ;; + stop) + [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules + ;; + *) + echo "usage: $0 {start|stop}" >&2 + ;; +esac + +: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/ipsec-tools-libre/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD new file mode 100644 index 000000000..6de9bd7d5 --- /dev/null +++ b/libre/ipsec-tools-libre/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Allan Henriksen <allan.henriksen@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=ipsec-tools +pkgname=ipsec-tools-libre +pkgver=0.8.1 +pkgrel=4 +pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)" +arch=('i686' 'x86_64' 'mips64el') +url="http://ipsec-tools.sourceforge.net/" +depends=('readline' 'openssl' 'krb5') +makedepends=('linux-libre-headers') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +license=('GPL') +options=('!makeflags' '!libtool') +source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2 + racoon.service + ipsec.service + ipsec-tools-linux-3.7-compat.patch) +md5sums=('d38b39f291ba2962387c3232e7335dd8' + '3a64a9e3b498c6da90450ffb0b758aea' + '387a0b0c4f10e42b2bb62282885cdc9c' + 'ae1dd20c83dcfce3dedb46ee73e83613') + +build() { + cd $srcdir/$_pkgname-$pkgver + + patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch + sed -i 's#-Werror##' configure.ac + + ./bootstrap + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ + --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ + --enable-adminport --enable-gssapi \ + --with-kernel-headers=/lib/modules/`pacman -Q linux-libre-headers | cut -f2 -d\ `-LIBRE/build/include + make +} + +package() { + cd $srcdir/$_pkgname-$pkgver + make DESTDIR=$pkgdir install + install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service + install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service +} diff --git a/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch new file mode 100644 index 000000000..46b11ee51 --- /dev/null +++ b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch @@ -0,0 +1,50 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -74,9 +74,10 @@ case "$host_os" in + [ KERNEL_INCLUDE="/lib/modules/`uname -r`/build/include" ]) + + AC_CHECK_HEADER($KERNEL_INCLUDE/linux/pfkeyv2.h, , +- [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, +- KERNEL_INCLUDE=/usr/src/linux/include , +- [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ++ [ AC_CHECK_HEADER($KERNEL_INCLUDE/uapi/linux/pfkeyv2.h, , ++ [ AC_CHECK_HEADER(/usr/src/linux/include/linux/pfkeyv2.h, ++ KERNEL_INCLUDE=/usr/src/linux/include , ++ [ AC_MSG_ERROR([Unable to find linux-2.6 kernel headers. Aborting.]) ] ) ] ) ] ) + AC_SUBST(KERNEL_INCLUDE) + # We need the configure script to run with correct kernel headers. + # However we don't want to point to kernel source tree in compile time, +@@ -643,7 +644,14 @@ AC_EGREP_CPP(yes, + #ifdef SADB_X_EXT_NAT_T_TYPE + yes + #endif +-], [kernel_natt="yes"]) ++], [kernel_natt="yes"], [ ++ AC_EGREP_CPP(yes, ++ [#include <uapi/linux/pfkeyv2.h> ++ #ifdef SADB_X_EXT_NAT_T_TYPE ++ yes ++ #endif ++ ], [kernel_natt="yes"]) ++]) + ;; + freebsd*|netbsd*) + # NetBSD case +--- a/src/include-glibc/Makefile.am ++++ b/src/include-glibc/Makefile.am +@@ -1,14 +1,7 @@ +- +-.includes: ${top_builddir}/config.status +- ln -snf $(KERNEL_INCLUDE)/linux +- touch .includes +- +-all: .includes +- + EXTRA_DIST = \ + glibc-bugs.h \ + net/pfkeyv2.h \ + netinet/ipsec.h \ + sys/queue.h + +-DISTCLEANFILES = .includes linux ++DISTCLEANFILES = linux diff --git a/libre/ipsec-tools-libre/ipsec.service b/libre/ipsec-tools-libre/ipsec.service new file mode 100644 index 000000000..483a5b58d --- /dev/null +++ b/libre/ipsec-tools-libre/ipsec.service @@ -0,0 +1,12 @@ +[Unit] +Description=Load IPSec Security Policy Database +After=syslog.target network.target + +[Service] +Type=oneshot +RemainAfterExit=true +ExecStart=/usr/bin/setkey -f /etc/ipsec.conf +ExecStop=/usr/bin/setkey -F -P ; /usr/bin/setkey -F + +[Install] +WantedBy=multi-user.target diff --git a/libre/ipsec-tools-libre/racoon.service b/libre/ipsec-tools-libre/racoon.service new file mode 100644 index 000000000..95324bd5d --- /dev/null +++ b/libre/ipsec-tools-libre/racoon.service @@ -0,0 +1,10 @@ +[Unit] +Description=Racoon IKEv1 key management daemon for IPSEC +After=syslog.target network.target + +[Service] +Type=forking +ExecStart=/usr/bin/racoon + +[Install] +WantedBy=multi-user.target diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 8a224dfa3..56137aaf3 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.7 +_kernver=3.9.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=8 +pkgrel=9 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 7be04b12f..434a922af 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188793 2013-06-21 07:29:45Z tpowa $ +# $Id: PKGBUILD 189000 2013-06-28 06:57:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,10 +8,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=83 +_sublevel=84 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.82 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.83 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '43f2b35b0a8bbe8442627874b4179644' - 'fe0e9b4415b82f306fc1b63eb9a742a4' - '69a689019ea0b6ed46b387907f14bc8a' + 'a2ab5e3c758f35d0a2ffe33b23cfe04d' + '6ab0f1a509481d93117b7630105757cc' + '18dfa330a7da88d7c09c3e24a5cd608f' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'cc33faaec0f6c99ff03838a146d62250') + '1327df75d631529dcf29f46f474cf16d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 849fd016b..a1d065a1a 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1438,8 +1438,8 @@ CONFIG_OF_PCI=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index fe5875138..a5dc36205 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1381,8 +1381,8 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 0f4605cea..57539c3aa 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188791 2013-06-21 06:32:50Z tpowa $ +# $Id: PKGBUILD 188998 2013-06-28 05:50:01Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4f5c670da16dc80fe9482892b636f99d' - 'e6c4e42d67aaff6d057983c499ebcace' - 'e23ad17eb5051f5ccd332bbb474df4d9' + 'b628d7ff09667dc5546993bb83461d45' + '5bb868d38a27edafac1eb114cd2f3659' + 'c180de34b0450d7eef8e0c1a68433d7c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '0375f682754ef52216fd522494875301') + '30092ce96affb12f89a9eddfad966741') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index f6951a2b6..e84812997 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1581,8 +1581,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/config.i686.3.10 b/libre/linux-libre/config.i686.3.10 index 129ab764f..9eaa84b4f 100644 --- a/libre/linux-libre/config.i686.3.10 +++ b/libre/linux-libre/config.i686.3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc6 Kernel Configuration +# Linux/x86 3.10.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1586,8 +1586,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -3924,7 +3924,6 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -3970,6 +3969,7 @@ CONFIG_SMS_SIANO_RC=y # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -4047,7 +4047,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4597,7 +4596,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set -CONFIG_SND_SOC_SI476X=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 44a03558f..0937bed6f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1530,8 +1530,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/config.x86_64.3.10 b/libre/linux-libre/config.x86_64.3.10 index 4c4838cca..ed592fa43 100644 --- a/libre/linux-libre/config.x86_64.3.10 +++ b/libre/linux-libre/config.x86_64.3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc6 Kernel Configuration +# Linux/x86 3.10.0-rc7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1536,8 +1536,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -3793,7 +3793,6 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -3838,6 +3837,7 @@ CONFIG_SMS_SIANO_RC=y # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3915,7 +3915,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4415,7 +4414,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set -CONFIG_SND_SOC_SI476X=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 91710f5eb..fc749260c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188799 2013-06-21 08:04:28Z tpowa $ +# $Id: PKGBUILD 189186 2013-06-28 18:41:29Z foutrelis $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=48 +pkgrel=49 epoch=1 _extramodules=extramodules-3.9-LIBRE arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre>=3.9' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD new file mode 100644 index 000000000..1702cca70 --- /dev/null +++ b/libre/newton-dynamics-libre/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 84449 2013-02-19 04:20:15Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com> +# Contributor: Christophe Robin (bombstrike) <crobin@php.net> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +_pkgname=newton-dynamics +pkgname=newton-dynamics-libre +pkgver=2.36 +pkgrel=1 +pkgdesc="A simple physics API" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.newtondynamics.com" +license=('custom') +depends=() +makedepends=('unar') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar") +noextract=("newton-dynamics-${pkgver}.rar") +md5sums=('0dffa112d0a6ea39ad9e904e555da69a') + +build() { + _srcdir="${srcdir}/newton-dynamics-${pkgver}" + [[ "$CARCH" = "i686" ]] && platform="linux32" + [[ "$CARCH" = "x86_64" ]] && platform="linux64" + builddir="${_srcdir}/coreLibrary_200/projets/${platform}" + + # clean build directory + [[ -d "${_srcdir}" ]] && rm -Rf "${_srcdir}" + + # decompress package + cd "${srcdir}" + unar "newton-dynamics-${pkgver}.rar" + + # needed for building + mkdir -p "${_srcdir}/packages/${platform}" + + ## build lib + cd "${builddir}" + sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile + sed -i 's/Debug\.cpp.*$/Debug \\/g' makefile + make +} + +package() { + install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a" + install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so" + install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h" +} diff --git a/libre/newton-dynamics-libre/assert-fix.patch b/libre/newton-dynamics-libre/assert-fix.patch new file mode 100644 index 000000000..83dfdd790 --- /dev/null +++ b/libre/newton-dynamics-libre/assert-fix.patch @@ -0,0 +1,13 @@ +Index: source/core/dgTypes.cpp +=================================================================== +--- source/core/dgTypes.cpp (revision 506) ++++ source/core/dgTypes.cpp (working copy) +@@ -515,7 +515,7 @@ + return 0;
+ }
+ _ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64)));
+- _ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));
++ _ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));
+
+ dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64));
+ dgInt32 stride2 = stride + 2;
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD new file mode 100644 index 000000000..ab51da0cd --- /dev/null +++ b/libre/oss-libre/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $ +# Maintainer: Kyle Keen <keenerd@gmail.com> +# Contributor: Florian Pritz <bluewind@xinu.at> +# Contributor: Paulo Matias <matiasΘarchlinux-br·org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=oss-libre +pkgver=4.2_2007 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://developer.opensound.com/" +license=('GPL2') +makedepends=('gtk2') +source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" + "rm-init-scripts.patch" + "soundon.patch" + "remove-hal.patch" + "linux-3.8.patch" + "oss.service" +) +md5sums=('f995118db1759fee3bcd38483940da6f' + 'b9a380a0ac8896390d71ac13676f27e1' + '65f07fe241bfbf912f76d8b6d8f276b5' + 'cd7f1dc6166bba8c94d96f3a28e948a5' + 'effecefb774f1d08ef9f0af0ad205c34' + '39c46b10a6bc56fc146d669a61bd3028') +_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl + +build() { + cd "${srcdir}/${_dir}" + + # Avoid these flags conflicting with OSS build system. + unset CFLAGS + unset LDFLAGS + unset OSFLAGS + unset LIBRARIES + export NO_WARNING_CHECKS=yes + + msg "Preparing the build environment." + cd "${srcdir}" + + # Create build directory and configure + rm -rf build + mkdir build && cd build + "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm + + # ossvermagic hardcodes /lib/modules *grumble* + sed -i 's|/lib/modules|/usr&|' \ + os_cmd/Linux/ossvermagic/ossvermagic.c + + pushd "$srcdir/$_dir" + patch -p0 -i "${srcdir}/linux-3.8.patch" + popd + + msg "Building OSS." + make build + + msg "Patching init scripts." + cd "${srcdir}/build/prototype" + rm usr/lib/oss/etc/S89oss + patch -p0 -i "${srcdir}/rm-init-scripts.patch" + patch -p0 -i "${srcdir}/soundon.patch" + # remove hal dependency + patch -p0 -i "${srcdir}/remove-hal.patch" + rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi + + # fix kernel module directories + sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon + sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh + sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh + sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh + sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ + usr/lib/oss/build/install.sh \ + usr/lib/oss/scripts/restore_drv.sh \ + usr/lib/oss/scripts/setup-alsa.sh \ + usr/lib/oss/scripts/remove_drv.sh \ + usr/lib/oss/build/Makefile.tmpl \ + usr/lib/oss/build/Makefile.osscore \ + usr/lib/oss/cuckoo/Makefile +} + +package() { + pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation (built for the linux-libre-headers package)" + depends=('gcc' 'make' 'linux-libre-headers' 'libtool' 'sed') + optdepends=('gtk2: for graphical mixer (ossxmix)') + replaces=('oss') + conflicts=('oss' 'oss-linux' 'oss-linux-free' 'oss-testing') + provides=("oss=${pkgver}") + backup=('usr/lib/oss/soundon.user') + install=oss.install + + cd "${srcdir}/build/prototype" + cp -a * "${pkgdir}" + + cd "$pkgdir" + mv usr/sbin/* usr/bin + rmdir usr/sbin + chmod -R a+r . # All files can have read permission (FS#13815) + find . -type d -exec chmod a+x '{}' \; # Make namcap happy + install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/oss-libre/linux-3.8.patch b/libre/oss-libre/linux-3.8.patch new file mode 100644 index 000000000..46200e01a --- /dev/null +++ b/libre/oss-libre/linux-3.8.patch @@ -0,0 +1,40 @@ +--- setup/Linux/oss/build/pci_wrapper.inc 2009-08-27 05:19:07.000000000 +0300 ++++ setup/Linux/oss/build/pci_wrapper.inc 2013-02-08 13:56:10.519794975 +0200 +@@ -17,7 +17,11 @@ + static dev_map_t dev_map[MAX_INSTANCE]; + static int n_devmap = 0; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) + static int __devinit ++#else ++static int ++#endif + osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid) + { + oss_device_t *osdev; +@@ -65,7 +69,11 @@ + return 0; + } + +-static void __devexit ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) ++static int __devexit ++#else ++static int ++#endif + osspci_remove (struct pci_dev *pcidev) + { + int i; +@@ -80,10 +88,11 @@ + pci_disable_device (dev_map[i].pcidev); + osdev_delete (osdev); + +- return; ++ return 0; + } + + printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n"); ++ return -EIO; + } + + void diff --git a/libre/oss-libre/oss.install b/libre/oss-libre/oss.install new file mode 100644 index 000000000..9bd4e1fbc --- /dev/null +++ b/libre/oss-libre/oss.install @@ -0,0 +1,25 @@ +post_install() { + echo "Running OSS install script..." + sh /usr/lib/oss/build/install.sh &>/dev/null + echo + echo " Note that OSS can't currently work together with kernel" + echo " ALSA modules, so they were moved out by the OSS install" + echo " scripts. If you want the ALSA kernel modules back, you can" + echo " just remove this package using pacman." +} + +post_upgrade() { + echo "Running OSS update script..." + sh /usr/lib/oss/build/install.sh &>/dev/null +} + +pre_remove() { + # Restore any replaced ALSA drivers. + sh /usr/lib/oss/scripts/restore_drv.sh +} + +post_remove() { + echo " Open Sound System was now removed, and the ALSA kernel" + echo " modules were restored." +} + diff --git a/libre/oss-libre/oss.service b/libre/oss-libre/oss.service new file mode 100644 index 000000000..0200d2477 --- /dev/null +++ b/libre/oss-libre/oss.service @@ -0,0 +1,12 @@ +[Unit] +Description=Open Sound System v4 +Before=sound.target + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/soundon +ExecStop=/usr/bin/soundoff + +[Install] +WantedBy=multi-user.target diff --git a/libre/oss-libre/remove-hal.patch b/libre/oss-libre/remove-hal.patch new file mode 100644 index 000000000..27e2ef2de --- /dev/null +++ b/libre/oss-libre/remove-hal.patch @@ -0,0 +1,20 @@ +Date: Tue Aug 2 16:37:31 CEST 2011 +Author: Florian Pritz <bluewind@xinu.at> +This removes all hal dependencies + +References: +http://www.archlinux.org/todo/92/ + +--- usr/lib/oss/build/install_2011-08-02_162647.sh 2011-08-02 16:26:47.000000000 +0200 ++++ usr/lib/oss/build/install.sh 2011-08-02 16:27:13.000000000 +0200 +@@ -336,10 +336,4 @@ + echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs + fi + +-# Hal 0.5.0+ hotplug +-mkdir -p /usr/lib/hal/scripts +-ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/ +-mkdir -p /usr/share/hal/fdi/policy/20thirdparty/ +-ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/ +- + exit 0 diff --git a/libre/oss-libre/rm-init-scripts.patch b/libre/oss-libre/rm-init-scripts.patch new file mode 100644 index 000000000..981ff605f --- /dev/null +++ b/libre/oss-libre/rm-init-scripts.patch @@ -0,0 +1,52 @@ +--- usr/lib/oss/build/install.sh.orig 2008-09-25 11:41:47.180167692 -0300 ++++ usr/lib/oss/build/install.sh 2008-09-25 11:41:47.180167692 -0300 +@@ -290,38 +290,6 @@ + echo + fi + +-if ! test -d /etc/init.d +-then +- mkdir /etc/init.d +-fi +- +-rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss +-cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss +- +-chmod 744 /etc/init.d/oss +- +-if test -x /sbin/chkconfig +-then +- /sbin/chkconfig oss on > /dev/null 2>&1 +-else +- if test -x /usr/sbin/update-rc.d +- then +- /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1 +- else +- if test -d etc/rc.d/rc3.d +- then +- rm -f /etc/rc.d/rc3.d/S89oss +- ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss +- else +- if test -d /etc/rc3.d +- then +- rm -f /etc/rc3.d/S89oss +- ln -s /etc/init.d/oss /etc/rc3.d/S89oss +- fi +- fi +- fi +-fi +- + # Install ALSA interface module (Cuckoo) + #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 + #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1 +--- usr/lib/oss/scripts/restore_drv.sh.orig 2008-09-25 11:41:47.210168487 -0300 ++++ usr/lib/oss/scripts/restore_drv.sh 2008-09-25 11:41:47.210168487 -0300 +@@ -18,8 +18,6 @@ + fi + fi + +-rm -f /etc/init.d/oss +- + if ! test -d /lib/modules/`uname -r`/kernel/sound + then + if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2 diff --git a/libre/oss-libre/soundon.patch b/libre/oss-libre/soundon.patch new file mode 100644 index 000000000..4702b8680 --- /dev/null +++ b/libre/oss-libre/soundon.patch @@ -0,0 +1,28 @@ +--- usr/sbin/soundon.old 2009-09-04 06:35:26.000000000 +0100 ++++ usr/sbin/soundon 2009-11-15 13:59:53.000000000 +0000 +@@ -255,7 +255,10 @@ + then + if test "`uname -m` " = "x86_64 " + then +- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 ++ # Fix for compatibility with Arch's directory structure ++ # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed ++ ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 ++ #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 + #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 + else + if test -s /lib/libasound.so.2 +@@ -278,8 +281,11 @@ + then + if test "`uname -m` " = "x86_64 " + then +- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 +- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 ++ # Fix for compatibility with Arch's directory structure ++ ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib ++ ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib ++ #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 ++ #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 + else + if test -s /lib/libasound.so.2 + then diff --git a/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD new file mode 100644 index 000000000..02a181b55 --- /dev/null +++ b/libre/tomoyo-tools-libre/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 92638 2013-06-10 09:53:54Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=tomoyo-tools +pkgname=tomoyo-tools-libre +_basever=2.5.0 +_timestamp=20130406 +_file=53357 +pkgver=${_basever}.${_timestamp} +pkgrel=1 +pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)' +arch=('i686' 'x86_64' 'mips64el') +url='http://tomoyo.sourceforge.jp' +#url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' +license=('GPL') +depends=('ncurses' 'linux-libre>=3.2') +replaces=${_pkgname} +conflicts=${_pkgname} +provides=${_pkgname}=${pkgver} +install=tomoyo-tools.install +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz") +md5sums=('8888f83fcb87823d714ff551e8680d0d') + +prepare() { + cd "${srcdir}/${_pkgname}" + sed -i \ + -e 's|usr/sbin|usr/bin|g' \ + -e 's|sbin|usr/bin|g' \ + usr_lib_tomoyo/init_policy.c +} + +build() { + cd "${srcdir}/${_pkgname}" + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin +} + +package() { + cd "${srcdir}/${_pkgname}" + make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install +} diff --git a/libre/tomoyo-tools-libre/tomoyo-tools.install b/libre/tomoyo-tools-libre/tomoyo-tools.install new file mode 100644 index 000000000..c23df1212 --- /dev/null +++ b/libre/tomoyo-tools-libre/tomoyo-tools.install @@ -0,0 +1,11 @@ +post_install () { + echo + echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' to the kernel" + echo " boot options and initialize policy with this command:" + echo " /usr/lib/tomoyo/init_policy" + echo +} + +post_upgrade () { + post_install $1 +} diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index be76b876e..d1f32979d 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92980 2013-06-21 09:45:26Z tpowa $ +# $Id: PKGBUILD 93220 2013-06-28 18:55:23Z foutrelis $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=24 +pkgrel=25 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 780c957b8..caa3016d1 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92982 2013-06-21 09:46:01Z tpowa $ +# $Id: PKGBUILD 93222 2013-06-28 18:56:50Z foutrelis $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.9-LIBRE -pkgrel=3 +pkgrel=4 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index c6d47275d..5e11fd6df 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 93048 2013-06-23 10:27:06Z bpiotrowski $ +# $Id: PKGBUILD 93205 2013-06-28 17:53:08Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -19,6 +19,9 @@ makedepends=('linux-libre' 'sed' 'bc') +# remember to also adjust the .install files and the package deps below +_extramodules=extramodules-3.9-LIBRE + build() { _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 87d775d4e..9c0c0729c 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=xarchiver pkgname=xarchiver-libre pkgver=0.5.2 -pkgrel=5 +pkgrel=5.1 pkgdesc="GTK+ frontend to various command line archivers" arch=('i686' 'x86_64') url="http://xarchiver.sourceforge.net" @@ -21,7 +21,7 @@ optdepends=('tar: TAR support' 'bzip2: BZIP2 support' 'zip: ZIP support' 'unzip: ZIP support' - 'ununrar: RAR support' + 'unar: RAR support' 'p7zip: 7z support' 'arj: ARJ support' 'lha: LHA support' diff --git a/libre/xbmc-libre/ChangeLog b/libre/xbmc-libre/ChangeLog new file mode 100644 index 000000000..66ae97e3b --- /dev/null +++ b/libre/xbmc-libre/ChangeLog @@ -0,0 +1,69 @@ +2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com> + * 9.11-15 : + Made it back compliant with FHS ( thx pierre for pointing that out ) + namcap checked and modified to fit its needs as far as it was possible + +2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-10 : + Try and fix some autoconf issues (thanks Gentoo ebuild). + +2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-9 : + Replace some libtool 'ltmain.sh' scripts with the one from libtool + installed with Arch. + Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault + on systems using the nvidia driver. + +2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-8 : + Fix some include's so that gcc 4.3.x is happy, shouldn't complain about + undefined '::realloc' anymore. + Remove Mac OS X specific files. + +2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-7 : + Moved libcdio, pmount, smbclient and unrar to optdepends. + Removed unneeded dependency on sdl_gfx. + Removed dependency on libpng as sdl_image depends on it. + +2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-6 : + Added libpng to dependency list. + Added gawk to dependency list. + Removed '--disable-mms' and '--enable-halmount' configure flags as they + are not mentioned as supported in the configure script. + +2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-5 : + Added libmad to the dependency list. + Streamripper 1.64.0+ does not include tre anymore, removed streamripper + and added tre instead. + Removed subversion from makedepends. + +2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-4 : + Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not + fail any longer. + +2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-3 : + Added lirc to the optdepends array. + +2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-2 : + Added install file which informs users that a display depth of at + least 24-bit is required. + +2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com> + + * 8.10-1 : + Initial package, based on previous work by Zeqadious. diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD new file mode 100644 index 000000000..3595b95cf --- /dev/null +++ b/libre/xbmc-libre/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> +# Contributor: Zeqadious <zeqadious.at.gmail.dot.com> +# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > + +_prefix=/usr + +_pkgname=xbmc +pkgname=xbmc-libre +pkgver=12.2 +pkgrel=4 +pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation included" +arch=('i686' 'x86_64') +url="http://xbmc.org" +license=('GPL' 'custom') +depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' + 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' + 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' + 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' + 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' + 'tinyxml' 'taglib') +makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' + 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') +optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' + 'pulseaudio: pulseaudio support' + 'lirc: remote controller support' + 'udisks: automount external drives' + 'upower: used to trigger suspend functionality' + 'libarchive: access compressed files without unpacking them' + 'xorg-xinit: autostart xbmc') +install="${_pkgname}.install" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" + "xbmc.service") +md5sums=('489f3877decae4e265ece54f9eaef0ba' + '76fae229ebc3bcfaab7e7f27e4fb51f5') + +build() { + cd "${srcdir}/xbmc-$pkgver" + + # fix lsb_release dependency + sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp + sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp + + # Bootstrapping XBMC + ./bootstrap + + # Configuring XBMC + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-debug \ + --enable-optimizations \ + --enable-gl \ + --enable-sdl \ + --enable-vaapi \ + --enable-vdpau \ + --enable-xvba \ + --enable-joystick \ + --enable-xrandr \ + --enable-rsxs \ + --enable-projectm \ + --enable-x11 \ + --enable-pulse \ + --enable-rtmp \ + --enable-samba \ + --enable-nfs \ + --enable-afpclient \ + --enable-airplay \ + --enable-airtunes \ + --enable-ffmpeg-libvorbis \ + --enable-dvdcss \ + --disable-hal \ + --enable-avahi \ + --enable-webserver \ + --enable-optical-drive \ + --enable-libbluray \ + --enable-texturepacker \ + --enable-udev \ + --enable-libusb \ + --enable-libcec \ + --enable-external-libraries \ + --disable-external-ffmpeg + # Now (finally) build + make +} + +package() { + cd "${srcdir}/xbmc-$pkgver" + # Running make install + make DESTDIR="${pkgdir}" install + + # run feh with python2 + sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc + + # lsb_release fix + sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" + sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" + + # Tools + install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" + install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" + + # Licenses + install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}" + for licensef in LICENSE.GPL copying.txt; do + mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}" + done + + # systemd stuff + install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service +} +# vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install new file mode 100644 index 000000000..b104b33e8 --- /dev/null +++ b/libre/xbmc-libre/xbmc.install @@ -0,0 +1,16 @@ +post_install() { + [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications + getent group xbmc > /dev/null || groupadd xbmc + getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc + usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 + echo "You may want to remove xbmc user and group" +} diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service new file mode 100644 index 000000000..431582f1b --- /dev/null +++ b/libre/xbmc-libre/xbmc.service @@ -0,0 +1,13 @@ +[Unit] +Description = Starts instance of XBMC using xinit +After = remote-fs.target + +[Service] +User = xbmc +Group = xbmc +Type = simple +ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp +Restart = always + +[Install] +WantedBy = multi-user.target |