summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/glfw/PKGBUILD6
-rw-r--r--community/homebank/PKGBUILD7
-rw-r--r--community/homebank/homebank.changelog3
-rw-r--r--community/qmmp/PKGBUILD6
-rw-r--r--community/qmmp/qmmp.changelog3
-rw-r--r--core/cryptsetup/PKGBUILD11
-rw-r--r--core/cryptsetup/sd-encrypt42
-rw-r--r--core/gnupg/PKGBUILD6
-rw-r--r--core/iw/PKGBUILD8
-rw-r--r--extra/boo/PKGBUILD4
-rw-r--r--extra/libssh/PKGBUILD8
-rw-r--r--extra/most/PKGBUILD4
-rw-r--r--extra/qemu/PKGBUILD13
-rw-r--r--extra/sane/1.0.23-hp2400c.patch81
-rw-r--r--extra/sane/PKGBUILD20
-rw-r--r--extra/sane/kodakaio.c.patch11
-rw-r--r--kernels/linux-libre-pae/3.11.1-fix-skge.patch34
-rw-r--r--kernels/linux-libre-pae/PKGBUILD11
-rw-r--r--kernels/linux-libre-xen/3.11.1-fix-skge.patch34
-rw-r--r--kernels/linux-libre-xen/PKGBUILD11
-rw-r--r--libre/linux-libre/3.11.1-fix-skge.patch34
-rw-r--r--libre/linux-libre/PKGBUILD15
22 files changed, 104 insertions, 268 deletions
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index ab6e00719..7d44ad480 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96501 2013-08-30 19:17:19Z svenstaro $
+# $Id: PKGBUILD 98064 2013-10-05 08:59:45Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: philefou <tuxication AT gmail DOT com>
# Contributor: lindquist <tomas@famolsen.dk>
@@ -7,7 +7,7 @@
# Contributor: SpepS <dreamspepser at yahoo dot it>
pkgname=glfw
-pkgver=3.0.2
+pkgver=3.0.3
pkgrel=1
pkgdesc="A free, open source, portable framework for OpenGL application development"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ license=('custom:ZLIB')
depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput')
makedepends=('mesa' 'cmake' 'doxygen')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('35a3ef5e0a8137e6984c5fb892edb06c')
+md5sums=('623977c096b28c25528e3c958e9fb3fd')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index 069b6dfa2..92e2c0987 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 97728 2013-09-28 06:50:13Z jlichtblau $
+# $Id: PKGBUILD 98074 2013-10-05 17:19:13Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=homebank
-pkgver=4.5.3
+pkgver=4.5.4
pkgrel=1
pkgdesc="Free, easy, personal accounting for everyone"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('intltool')
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz)
-sha256sums=('b3318255676a09e7d6f26a8d750f77f40cfeb1b54dffaff8765f14a85f98ae74')
+sha256sums=('b3dd7df29d1de38b04c3bce3ade1f6266c1dc91aefa1106e37852edeab39b083')
build() {
cd ${srcdir}/$pkgname-$pkgver
@@ -28,4 +28,3 @@ package() {
make DESTDIR="${pkgdir}" install
}
-sha256sums=('d636b02b9113bc371c40b6497089ac0ba156e9a89c412f4629c7da8374030ebb')
diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog
index ad68aa5d1..f2e6255c2 100644
--- a/community/homebank/homebank.changelog
+++ b/community/homebank/homebank.changelog
@@ -1,3 +1,6 @@
+2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * homebank 4.5.4-1
+
2013-09-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* homebank 4.5.3-1
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 1cf72bb4b..d53624260 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 97772 2013-09-29 15:11:39Z jlichtblau $
+#$Id: PKGBUILD 98072 2013-10-05 17:15:55Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=qmmp
-pkgver=0.7.2
+pkgver=0.7.3
pkgrel=1
pkgdesc="Qt4 based audio-player"
arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support'
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('8e6b50ced58e247972060bb5a5156ea2c74b03f33df92e87591d09f685b82081')
+sha256sums=('57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index 998f7c17d..d279bfb82 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.7.3-1
+
2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* qmmp 0.7.2-1
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 54d20aec7..47d9cb4a3 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193404 2013-08-19 17:24:16Z thomas $
+# $Id: PKGBUILD 195910 2013-10-05 07:30:48Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=cryptsetup
pkgver=1.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
arch=(i686 x86_64)
license=('GPL')
@@ -13,11 +13,13 @@ options=('!libtool' '!emptydirs')
source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
encrypt_hook
- encrypt_install)
+ encrypt_install
+ sd-encrypt)
md5sums=('cd834da49fbe92dd66df02cc5c61280f'
'SKIP'
'c279d86d6dc18322c054d2272ebb9e90'
- '21c45f9cab3e0b5165f68358884fbd0f')
+ '21c45f9cab3e0b5165f68358884fbd0f'
+ '6cf7e170ecd13e42fe829209628fdb4d')
build() {
cd "${srcdir}"/$pkgname-${pkgver}
@@ -31,6 +33,7 @@ package() {
# install hook
install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
+ install -D -m644 "${srcdir}"/sd-encrypt "${pkgdir}"/usr/lib/initcpio/install/sd-encrypt
# usrmove
cd "$pkgdir"/usr
diff --git a/core/cryptsetup/sd-encrypt b/core/cryptsetup/sd-encrypt
new file mode 100644
index 000000000..c18fd2f24
--- /dev/null
+++ b/core/cryptsetup/sd-encrypt
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+build() {
+ local mod
+
+ add_module dm-crypt
+ if [[ $CRYPTO_MODULES ]]; then
+ for mod in $CRYPTO_MODULES; do
+ add_module "$mod"
+ done
+ else
+ add_all_modules '/crypto/'
+ fi
+
+ add_binary "dmsetup"
+ add_file "/usr/lib/udev/rules.d/10-dm.rules"
+ add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
+ add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
+ add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
+
+ add_systemd_unit cryptsetup.target
+ add_binary /usr/lib/systemd/system-generators/systemd-cryptsetup-generator
+ add_binary /usr/lib/systemd/systemd-cryptsetup
+
+ add_systemd_unit systemd-ask-password-console.path
+ add_systemd_unit systemd-ask-password-console.service
+
+ [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
+}
+
+help() {
+ cat <<HELPEOF
+This hook allows for an encrypted root device with systemd initramfs.
+
+See the manpage of systemd-cryptsetup-generator(8) for available kernel
+command line options. Alternatively, if the file /etc/crypttab.initramfs
+exists, it will be added to the initramfs as /etc/crypttab. See the
+crypttab(5) manpage for more information on crypttab syntax.
+HELPEOF
+}
+
+# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index 7f84851d2..9ac8772f7 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193522 2013-08-21 22:25:01Z bisson $
+# $Id: PKGBUILD 195927 2013-10-05 17:40:59Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=gnupg
-pkgver=2.0.21
+pkgver=2.0.22
pkgrel=1
pkgdesc='Complete and free implementation of the OpenPGP standard'
url='http://www.gnupg.org/'
@@ -18,7 +18,7 @@ makedepends=('curl' 'libldap' 'libusb-compat')
depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr')
source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}
'protect-tool-env.patch')
-sha1sums=('5ba8cce72eb4fd1a3ac1a282d25d7c7b90d3bf26' 'SKIP'
+sha1sums=('9ba9ee288e9bf813e0f1e25cbe06b58d3072d8b8' 'SKIP'
'2ec97ba55ae47ff0d63bc813b8c64cb79cef11db')
install=install
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index ddd497948..48da071f1 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 187031 2013-06-03 11:15:15Z allan $
+# $Id: PKGBUILD 195909 2013-10-05 07:30:47Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=iw
-pkgver=3.10
-pkgrel=2
+pkgver=3.11
+pkgrel=1
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
arch=("i686" "x86_64")
url="http://wireless.kernel.org/en/users/Documentation/iw"
@@ -11,7 +11,7 @@ license=("GPL")
depends=("libnl")
makedepends=("linux-api-headers")
source=(https://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('456ee212cfb728e292667caa508a7dff902666c78579814756a3012d68d64fe9')
+sha256sums=('e90327323821a8219abac56298919076c4bac6636464ca91356f02cfe40530ff')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/extra/boo/PKGBUILD b/extra/boo/PKGBUILD
index 27ae5ff7e..8243ba40e 100644
--- a/extra/boo/PKGBUILD
+++ b/extra/boo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 149602 2012-02-08 17:29:14Z stephane $
+# $Id: PKGBUILD 195921 2013-10-05 12:22:09Z bpiotrowski $
# Maintainer: Hugo Doria <hugo@archlinux.org>
# Contributor: tardo <tardo@nagi-fanboi.net>
# Contributor: Brice Carpentier <brice@dlfp.org>
pkgname=boo
pkgver=0.9.4.9
-pkgrel=2
+pkgrel=3
pkgdesc="A wrist friendly language for the CLI"
arch=('i686' 'x86_64')
url="http://boo.codehaus.org/"
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index fa668b5be..16405b14d 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180604 2013-03-24 15:55:47Z tomegun $
+# $Id: PKGBUILD 195938 2013-10-05 20:32:06Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: ice-man <icemanf@gmail.com>
# Contributor: sergeantspoon <sergeantspoon@archlinux.us>
pkgname=libssh
-pkgver=0.5.4
+pkgver=0.5.5
pkgrel=1
pkgdesc="Library for accessing ssh client services through C libraries"
url="http://www.libssh.org/"
@@ -13,7 +13,7 @@ license=('LGPL')
arch=('i686' 'x86_64')
depends=('openssl')
makedepends=('cmake' 'doxygen')
-source=("https://red.libssh.org/attachments/download/41/${pkgname}-${pkgver}.tar.gz")
+source=("https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz")
build() {
cd "${srcdir}"
@@ -29,4 +29,4 @@ package(){
cd "${srcdir}"/build
make DESTDIR="${pkgdir}" install
}
-md5sums=('b8b4e733c13dfabae33b2688ef82dacc')
+md5sums=('bb308196756c7255c0969583d917136b')
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index 0f11f741e..d716d4234 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176312 2013-01-29 13:46:57Z stephane $
+# $Id: PKGBUILD 195919 2013-10-05 12:05:12Z bpiotrowski $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: juergen <juergen@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=most
pkgver=5.0.0a
-pkgrel=5
+pkgrel=6
pkgdesc="A terminal pager similar to 'more' and 'less'"
arch=('i686' 'x86_64')
depends=('slang')
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 458e6c515..b97721f09 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194681 2013-09-21 21:20:52Z tpowa $
+# $Id: PKGBUILD 195926 2013-10-05 14:25:32Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=('qemu' 'libcacard')
-pkgver=1.5.3
-pkgrel=1
+pkgver=1.6.0
+pkgrel=4
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url="http://wiki.qemu.org/Index.html"
@@ -20,7 +20,7 @@ build ()
./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
--python=/usr/bin/python2 --smbd=/usr/bin/smbd \
--enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
- --disable-gtk --enable-linux-aio --enable-seccomp
+ --disable-gtk --enable-linux-aio --enable-seccomp --localstatedir=/var
make
}
@@ -33,9 +33,12 @@ package_qemu() {
backup=('etc/qemu/target-x86_64.conf')
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ # provided by seabios package
rm "${pkgdir}/usr/share/qemu/bios.bin"
rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
+ # remove conflicting /var/run directory
+ rm -r "${pkgdir}/var"
install -D -m644 "${srcdir}/65-kvm.rules" \
"${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
# bridge_helper needs suid
@@ -66,5 +69,5 @@ package_libcacard() {
cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
}
-md5sums=('7a7ce91bea6a69e55b3c6e20e4999898'
+md5sums=('f3f39308472d629aca57a255a0c91ba9'
'9d6de26867a05c306157e3d3c612b28a')
diff --git a/extra/sane/1.0.23-hp2400c.patch b/extra/sane/1.0.23-hp2400c.patch
deleted file mode 100644
index 8bfd29b66..000000000
--- a/extra/sane/1.0.23-hp2400c.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 9a8b640d8da2190ff1695169bfa45ce633b5e8c2 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?St=C3=A9phane=20Voltz?= <stef.dev@free.fr>
-Date: Mon, 3 Jun 2013 06:33:08 +0200
-Subject: [PATCH] bug 314293 fix
-
-- don't use non-existent end of records
----
- ChangeLog | 3 +++
- backend/genesys_gl646.c | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c
-index c6a5af5..2d5cddc 100644
---- a/backend/genesys_gl646.c
-+++ b/backend/genesys_gl646.c
-@@ -550,7 +550,7 @@ get_lowest_resolution (int sensor, SANE_Bool color)
- i = 0;
- dpi = 9600;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* computes distance and keep mode if it is closer than previous */
- if (sensor == sensor_master[i].sensor
-@@ -584,7 +584,7 @@ get_closest_resolution (int sensor, int required, SANE_Bool color)
- dpi = 0;
- dist = 9600;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -627,7 +627,7 @@ is_half_ccd (int sensor, int required, SANE_Bool color)
-
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -658,7 +658,7 @@ get_cksel (int sensor, int required, SANE_Bool color)
-
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- /* exit on perfect match */
- if (sensor == sensor_master[i].sensor
-@@ -746,7 +746,7 @@ gl646_setup_registers (Genesys_Device * dev,
- * sensor mode setting */
- i = 0;
- nb = sizeof (sensor_master) / sizeof (Sensor_Master);
-- while (sensor_master[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- if (dev->model->ccd_type == sensor_master[i].sensor
- && sensor_master[i].dpi == xresolution
-@@ -768,7 +768,7 @@ gl646_setup_registers (Genesys_Device * dev,
- * motor mode setting */
- i = 0;
- nb = sizeof (motor_master) / sizeof (Motor_Master);
-- while (motor_master[i].motor != -1 && i < nb)
-+ while (i < nb)
- {
- if (dev->model->motor_type == motor_master[i].motor
- && motor_master[i].dpi == resolution
-@@ -789,7 +789,7 @@ gl646_setup_registers (Genesys_Device * dev,
- /* now we can search for the specific sensor settings */
- i = 0;
- nb = sizeof (sensor_settings) / sizeof (Sensor_Settings);
-- while (sensor_settings[i].sensor != -1 && i < nb)
-+ while (i < nb)
- {
- if (sensor->sensor == sensor_settings[i].sensor
- && sensor->cksel == sensor_settings[i].cksel)
---
-1.7.2.5
-
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 966dccd0c..b2a096bd8 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 187017 2013-06-03 10:25:11Z tpowa $
+# $Id: PKGBUILD 195929 2013-10-05 19:26:39Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Simo L. <neotuli@yahoo.com>
# Contributor: eric <eric@archlinux.org>
pkgname=sane
-pkgver=1.0.23
-pkgrel=7
+pkgver=1.0.24
+pkgrel=1
pkgdesc="Scanner Access Now Easy"
url="http://www.sane-project.org/"
arch=('i686' 'x86_64')
@@ -18,17 +18,11 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
'sane.xinetd'
'saned.socket'
'saned.service'
- 'kodakaio.c.patch'
- 'network.patch'
- '1.0.23-hp2400c.patch')
+ 'network.patch')
options=(!libtool)
prepare() {
cd "${srcdir}/${pkgname}-backends-${pkgver}"
- # fix FS#35549
- patch -Np1 -i ${srcdir}/1.0.23-hp2400c.patch
- # fix FS#33657
- patch -Np0 -i ${srcdir}/kodakaio.c.patch
# fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
patch -Np1 -i ${srcdir}/network.patch
}
@@ -71,10 +65,8 @@ package () {
install -D -m644 ${srcdir}/saned.service \
"${pkgdir}/usr/lib/systemd/system/saned@.service"
}
-md5sums=('e226a89c54173efea80e91e9a5eb6573'
+md5sums=('1ca68e536cd7c1852322822f5f6ac3a4'
'bc2c8b4f7b3012c8936c7da21f60e2ac'
'e57e9e15528f47f5f1b3f1411135ed5d'
'3f9fe36b0c4ff0b01b53b1cffa5d9700'
- 'e65dbefb7c3d69955fb6eb3ace14aa12'
- '44e77692c52db15b0f530a1d9a8e1296'
- '0c8bfabcaa499c4a2583aa2fe53d1686')
+ '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
deleted file mode 100644
index 95cb1ee9a..000000000
--- a/extra/sane/kodakaio.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/kodakaio.c.bad 2013-01-31 20:42:10.627296894 +0100
-+++ backend/kodakaio.c 2013-01-31 20:42:46.040397213 +0100
-@@ -2197,7 +2197,7 @@
-
- reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT,
- "dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
-- if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
-+ if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
-
- return 0;
- }
diff --git a/kernels/linux-libre-pae/3.11.1-fix-skge.patch b/kernels/linux-libre-pae/3.11.1-fix-skge.patch
deleted file mode 100644
index 26d90e080..000000000
--- a/kernels/linux-libre-pae/3.11.1-fix-skge.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400
-+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400
-@@ -3086,23 +3086,27 @@
- PCI_DMA_FROMDEVICE);
- skge_rx_reuse(e, skge->rx_buf_size);
- } else {
-+ struct skge_element ee;
- struct sk_buff *nskb;
-
- nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size);
- if (!nskb)
- goto resubmit;
-
-+ ee = *e;
-+
-+ skb = ee.skb;
-+ prefetch(skb->data);
-+
- if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
- dev_kfree_skb(nskb);
- goto resubmit;
- }
-
- pci_unmap_single(skge->hw->pdev,
-- dma_unmap_addr(e, mapaddr),
-- dma_unmap_len(e, maplen),
-+ dma_unmap_addr(&ee, mapaddr),
-+ dma_unmap_len(&ee, maplen),
- PCI_DMA_FROMDEVICE);
-- skb = e->skb;
-- prefetch(skb->data);
- }
-
- skb_put(skb, len);
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index d648ee9e4..81d8181f1 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195190 2013-09-27 06:12:11Z tpowa $
+# $Id: PKGBUILD 195840 2013-10-02 00:02:27Z thomas $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.11
-pkgver=${_basekernel}.2
+pkgver=${_basekernel}.3
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -22,16 +22,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.11.1-fix-skge.patch'
'3.11-haswell-intel_pstate.patch')
md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- '33426579c358003b46a3cc2171ae6505'
+ 'fbbc311a2ba15cfe2f533df71081d954'
'bef7b3ced683c4dc9361f8739ec9f566'
'f302c931bd85309da9d9792b4cc96467'
'36e90334b12b2e9d53fd92129ee98f5b'
'98beb36f9b8cf16e58de2483ea9985e3'
'd50c1ac47394e9aec637002ef3392bd1'
- '4fcee2b4485492dcfdead632275198eb'
'1040ae6c10d4a68f89899f94a2318a17')
_kernelname=${pkgbase#linux-libre}
@@ -52,9 +50,6 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # #36865 fix broken skge network module
- patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch"
-
# add intel haswell support to intel_pstate
# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
# will be in 3.12
diff --git a/kernels/linux-libre-xen/3.11.1-fix-skge.patch b/kernels/linux-libre-xen/3.11.1-fix-skge.patch
deleted file mode 100644
index 26d90e080..000000000
--- a/kernels/linux-libre-xen/3.11.1-fix-skge.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400
-+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400
-@@ -3086,23 +3086,27 @@
- PCI_DMA_FROMDEVICE);
- skge_rx_reuse(e, skge->rx_buf_size);
- } else {
-+ struct skge_element ee;
- struct sk_buff *nskb;
-
- nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size);
- if (!nskb)
- goto resubmit;
-
-+ ee = *e;
-+
-+ skb = ee.skb;
-+ prefetch(skb->data);
-+
- if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
- dev_kfree_skb(nskb);
- goto resubmit;
- }
-
- pci_unmap_single(skge->hw->pdev,
-- dma_unmap_addr(e, mapaddr),
-- dma_unmap_len(e, maplen),
-+ dma_unmap_addr(&ee, mapaddr),
-+ dma_unmap_len(&ee, maplen),
- PCI_DMA_FROMDEVICE);
-- skb = e->skb;
-- prefetch(skb->data);
- }
-
- skb_put(skb, len);
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index eeafa749f..962b9232d 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195190 2013-09-27 06:12:11Z tpowa $
+# $Id: PKGBUILD 195840 2013-10-02 00:02:27Z thomas $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,7 +6,7 @@
pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.11
-pkgver=${_basekernel}.2
+pkgver=${_basekernel}.3
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -22,16 +22,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.11.1-fix-skge.patch'
'3.11-haswell-intel_pstate.patch')
md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- '33426579c358003b46a3cc2171ae6505'
+ 'fbbc311a2ba15cfe2f533df71081d954'
'212338fa662436f9590026c9a71d82f7'
'b7c2805bb287a644c0a303bf7721e534'
'36e90334b12b2e9d53fd92129ee98f5b'
'98beb36f9b8cf16e58de2483ea9985e3'
'd50c1ac47394e9aec637002ef3392bd1'
- '4fcee2b4485492dcfdead632275198eb'
'1040ae6c10d4a68f89899f94a2318a17')
_kernelname=${pkgbase#linux-libre}
@@ -52,9 +50,6 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # #36865 fix broken skge network module
- patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch"
-
# add intel haswell support to intel_pstate
# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
# will be in 3.12
diff --git a/libre/linux-libre/3.11.1-fix-skge.patch b/libre/linux-libre/3.11.1-fix-skge.patch
deleted file mode 100644
index 26d90e080..000000000
--- a/libre/linux-libre/3.11.1-fix-skge.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/drivers/net/ethernet/marvell/skge.c 2013-09-02 16:46:10.000000000 -0400
-+++ b/drivers/net/ethernet/marvell/skge.c 2013-09-22 11:14:10.232067541 -0400
-@@ -3086,23 +3086,27 @@
- PCI_DMA_FROMDEVICE);
- skge_rx_reuse(e, skge->rx_buf_size);
- } else {
-+ struct skge_element ee;
- struct sk_buff *nskb;
-
- nskb = netdev_alloc_skb_ip_align(dev, skge->rx_buf_size);
- if (!nskb)
- goto resubmit;
-
-+ ee = *e;
-+
-+ skb = ee.skb;
-+ prefetch(skb->data);
-+
- if (skge_rx_setup(skge, e, nskb, skge->rx_buf_size) < 0) {
- dev_kfree_skb(nskb);
- goto resubmit;
- }
-
- pci_unmap_single(skge->hw->pdev,
-- dma_unmap_addr(e, mapaddr),
-- dma_unmap_len(e, maplen),
-+ dma_unmap_addr(&ee, mapaddr),
-+ dma_unmap_len(&ee, maplen),
- PCI_DMA_FROMDEVICE);
-- skb = e->skb;
-- prefetch(skb->data);
- }
-
- skb_put(skb, len);
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 6f233515d..9852968ad 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195190 2013-09-27 06:12:11Z tpowa $
+# $Id: PKGBUILD 195840 2013-10-02 00:02:27Z thomas $
# 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.11
-_sublevel=2
+_sublevel=3
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -30,11 +30,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.11.1-fix-skge.patch'
'3.11-haswell-intel_pstate.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- '33426579c358003b46a3cc2171ae6505'
+ 'fbbc311a2ba15cfe2f533df71081d954'
'b7718a81faf845ab53234336122ad631'
'f7ee88ffc93b665345b6ee89ff192e1f'
'e49ac236dfeef709f91a3d993ea7b62c'
@@ -43,9 +42,8 @@ md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
'36e90334b12b2e9d53fd92129ee98f5b'
'98beb36f9b8cf16e58de2483ea9985e3'
'd50c1ac47394e9aec637002ef3392bd1'
- '4fcee2b4485492dcfdead632275198eb'
'1040ae6c10d4a68f89899f94a2318a17'
- '135ff203ec680a91e87eed4df72f453d')
+ 'e6db810c0d41180acca55f545b1681fb')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -70,9 +68,6 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
- # #36865 fix broken skge network module
- patch -Np1 -i "${srcdir}/3.11.1-fix-skge.patch"
-
# add intel haswell support to intel_pstate
# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
# will be in 3.12
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-22 06:44:27 +0000