From 42e0e06e093e2127345944720f663baa1436b2c9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 7 Jun 2014 00:22:47 -0300 Subject: cups-filters-libre-1.0.54-1: updating version --- libre/cups-filters-libre/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 9c8ae1354..4bc76b463 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 211789 2014-04-26 10:47:56Z andyrtr $ +# $Id: PKGBUILD 214332 2014-06-06 21:41:24Z andyrtr $ # Maintainer (Arch): Andreas Radke pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.53 -pkgrel=2 +pkgver=1.0.54 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" @@ -20,7 +20,7 @@ source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar. provides=("${_pkgname}=${pkgver}" 'foomatic-filters') replaces=("${_pkgname}" 'foomatic-filters') conflicts=("${_pkgname}" 'foomatic-filters') -md5sums=('f9df275dd161eb0364f40c6f00d755a4') +md5sums=('a2785a3dbe5d4977189363828b93d2cf') build() { cd $_pkgname-$pkgver -- cgit v1.2.3-54-g00ecf From 81fac53c45b9325b8900a6de35bd10bb9e947272 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 7 Jun 2014 00:24:51 -0300 Subject: hplip-libre-3.14.6-1: updating version --- libre/hplip-libre/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 89fb50fd2..aa97da2e4 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,5 @@ -# $Id: PKGBUILD 210088 2014-04-09 19:22:29Z andyrtr $ +# $Id: PKGBUILD 214338 2014-06-06 21:56:37Z andyrtr $ +# Maintainer (Arch): Andreas Radke # Maintainer (Arch): Tom Gundersen # Contributor (Arch): Rémy Oudompheng # Contributor (Arch): Morgan LEFIEUX @@ -6,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.14.4 +pkgver=3.14.6 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without printers with nonfree drivers support and hplip-plugin binary blobs recommendation (Parabola rebranded)" arch=('i686' 'x86_64') @@ -22,7 +23,7 @@ optdepends=('cups: for printing support' 'python2-notify: for Desktop notification support' 'python2-reportlab: for pdf output in hp-scan' 'rpcbind: for network support' - 'python2-pyqt4: for running hp-toolbox' + 'python2-pyqt4: for running GUI and hp-toolbox' 'python2-gobject2: for running hp-toolbox' 'libusb: for advanced usb support') replaces=($_pkgname) @@ -31,7 +32,7 @@ provides=($_pkgname=$pkgver) install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} disable_upgrade.patch) -md5sums=('6e8d53fb2284271505d2e1706c01f6c5' +md5sums=('ec14b3bf3ac17a7c00b96e51d4c38114' 'SKIP' 'a853ba0eb0883f4bcee00b4277128b29') -- cgit v1.2.3-54-g00ecf From e34267d71022012bd4f30c53c5ca1e35a7d4beb1 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 11:45:34 -0300 Subject: filesystem-2014.06-1: updating version * add systemd-network user and group in prep for systemd 214 * use nologin rather than /bin/false for disabled accounts * preemptively add systemd-network user/group --- libre/filesystem/PKGBUILD | 8 ++++---- libre/filesystem/filesystem.install | 2 ++ libre/filesystem/group | 1 + libre/filesystem/passwd | 17 +++++++++-------- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 9590f1a83..16d3b8944 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -4,8 +4,8 @@ # Maintainer: André Silva pkgname=filesystem -pkgver=2014.05 -pkgrel=2 +pkgver=2014.06 +pkgrel=1 pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,13 +21,13 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' 'locale.sh') -md5sums=('e26a6b21c1e154e87a5c45e8b8c366fd' +md5sums=('764dca1d786d43fbee33364ccbebfcd3' '6be47d893fd49b2e4a8c0e811b350861' '9e4533df61f0c82d6b2e2371f7376282' '4c4540eeb748bf1f71d631b8c1dcf0b3' 'f28150d4c0b22a017be51b9f7f9977ed' '6e488ffecc8ba142c0cf7e2d7aeb832e' - '932af5f313265a774ec5995d9e720025' + '18a8a3564f40a28d8f9f6060001c6f9e' '2ef2429c2c98d0883906aa6f5363be80' '693c97f2c9a519bb97a17008e92c2b74' '1745349eb24ed21b4cfaa6f423bddb76' diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 62e553ce4..7a43b24df 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -38,6 +38,8 @@ post_upgrade() { _adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin _addgroup systemd-timesync -g 192 _adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin + _addgroup systemd-network -g 193 + _adduser systemd-network -u 193 -g 193 -d / -s /usr/bin/nologin # sync gshadow to group (fixes FS#19869) if ! grep -q '^lock:' etc/gshadow; then diff --git a/libre/filesystem/group b/libre/filesystem/group index 0d0918cbb..3a481a2c0 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -35,3 +35,4 @@ users:x:100: systemd-journal:x:190: systemd-journal-gateway:x:191: systemd-timesync:x:192: +systemd-network:x:193: diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd index b65b7cc8a..2f404bb41 100644 --- a/libre/filesystem/passwd +++ b/libre/filesystem/passwd @@ -1,11 +1,12 @@ root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/bin/false -daemon:x:2:2:daemon:/sbin:/bin/false -mail:x:8:12:mail:/var/spool/mail:/bin/false -ftp:x:14:11:ftp:/srv/ftp:/bin/false -http:x:33:33:http:/srv/http:/bin/false +bin:x:1:1:bin:/bin:/usr/bin/nologin +daemon:x:2:2:daemon:/sbin:/usr/bin/nologin +mail:x:8:12:mail:/var/spool/mail:/usr/bin/nologin +ftp:x:14:11:ftp:/srv/ftp:/usr/bin/nologin +http:x:33:33:http:/srv/http:/usr/bin/nologin uuidd:x:68:68:uuidd:/:/sbin/nologin dbus:x:81:81:dbus:/:/sbin/nologin -nobody:x:99:99:nobody:/:/bin/false -systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/bin/false -systemd-timesync:x:192:192:systemd-timesync:/:/bin/false +nobody:x:99:99:nobody:/:/usr/bin/nologin +systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/usr/bin/nologin +systemd-timesync:x:192:192:systemd-timesync:/:/usr/bin/nologin +systemd-network:x:193:193:systemd-network:/:/usr/bin/nologin -- cgit v1.2.3-54-g00ecf From 970a679911ce269cfbe343a2df835785dadfb032 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 13:08:17 -0300 Subject: linux-libre-3.14.6-1: updating version --- ...tooth-Enable-autosuspend-for-Intel-Blueto.patch | 33 -------------- ...-delay-enabling-smart-FIFO-until-after-be.patch | 52 ---------------------- libre/linux-libre/0015-fix-xsdt-validation.patch | 42 ----------------- libre/linux-libre/PKGBUILD | 36 +++------------ libre/linux-libre/config.i686 | 5 ++- libre/linux-libre/config.x86_64 | 5 ++- 6 files changed, 11 insertions(+), 162 deletions(-) delete mode 100644 libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch delete mode 100644 libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch delete mode 100644 libre/linux-libre/0015-fix-xsdt-validation.patch diff --git a/libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch deleted file mode 100644 index 74283b57c..000000000 --- a/libre/linux-libre/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Thu, 3 Apr 2014 23:59:49 +0200 -Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel - Bluetooth device" - -This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1. - -USB autosuspend still breaks on some xhci controllers, so disable -it by default as long as no solution is found. ---- - drivers/bluetooth/btusb.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index baeaaed..6d6e09e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf, - if (id->driver_info & BTUSB_BCM92035) - hdev->setup = btusb_setup_bcm92035; - -- if (id->driver_info & BTUSB_INTEL) { -- usb_enable_autosuspend(data->udev); -+ if (id->driver_info & BTUSB_INTEL) - hdev->setup = btusb_setup_intel; -- } - - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); --- -1.9.2 - diff --git a/libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch b/libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch deleted file mode 100644 index 7f18091a4..000000000 --- a/libre/linux-libre/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 784c4f0b18f89922ddc0fe21e5ec64cc370bb3f2 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Wed, 19 Mar 2014 18:36:39 +0100 -Subject: [PATCH 10/10] iwlwifi: mvm: delay enabling smart FIFO until after - beacon RX - -If we have no beacon data before association, delay smart FIFO -enablement until after we have this data. - -Not doing so can cause association failures in extremely silent -environments (usually only a shielded box/room) as beacon RX is -not sent to the host immediately, and then the association time -event ends without the host receiving any beacon even though it -was on the air - it's just stuck on the FIFO. - -Cc: [3.14] -Signed-off-by: Johannes Berg -Signed-off-by: Emmanuel Grumbach ---- - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + - drivers/net/wireless/iwlwifi/mvm/sf.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -index c35b866..45e861e 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c -+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, - */ - iwl_mvm_remove_time_event(mvm, mvmvif, - &mvmvif->time_event_data); -+ iwl_mvm_sf_update(mvm, vif, false); - } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | - BSS_CHANGED_QOS)) { - ret = iwl_mvm_power_update_mode(mvm, vif); -diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c -index 8401627..88809b2 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/sf.c -+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c -@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, - return -EINVAL; - if (changed_vif->type != NL80211_IFTYPE_STATION) { - new_state = SF_UNINIT; -- } else if (changed_vif->bss_conf.assoc) { -+ } else if (changed_vif->bss_conf.assoc && -+ changed_vif->bss_conf.dtim_period) { - mvmvif = iwl_mvm_vif_from_mac80211(changed_vif); - sta_id = mvmvif->ap_sta_id; - new_state = SF_FULL_ON; --- -1.9.2 - diff --git a/libre/linux-libre/0015-fix-xsdt-validation.patch b/libre/linux-libre/0015-fix-xsdt-validation.patch deleted file mode 100644 index 82dd2be25..000000000 --- a/libre/linux-libre/0015-fix-xsdt-validation.patch +++ /dev/null @@ -1,42 +0,0 @@ -@@ -, +, @@ - acpi_tb_parse_root_table(). - Commit: 671cc68dc61f029d44b43a681356078e02d8dab8 - Subject: ACPICA: Back port and refine validation of the XSDT root table. ---- - drivers/acpi/acpica/tbutils.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) ---- a/drivers/acpi/acpica/tbutils.c -+++ a/drivers/acpi/acpica/tbutils.c -@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - u32 table_count; - struct acpi_table_header *table; - acpi_physical_address address; -+ acpi_physical_address rsdt_address; - u32 length; - u8 *table_entry; - acpi_status status; -@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - * as per the ACPI specification. - */ - address = (acpi_physical_address) rsdp->xsdt_physical_address; -+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address; - table_entry_size = ACPI_XSDT_ENTRY_SIZE; - } else { - /* Root table is an RSDT (32-bit physical addresses) */ - - address = (acpi_physical_address) rsdp->rsdt_physical_address; -+ rsdt_address = address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - -@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - - /* Fall back to the RSDT */ - -- address = -- (acpi_physical_address) rsdp->rsdt_physical_address; -+ address = rsdt_address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - } - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 9f0dda4ef..56c5ef0ae 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $ +# $Id: PKGBUILD 214389 2014-06-08 19:44:39Z tpowa $ # Maintainer (Arch): Tobias Powalowski # Maintainer (Arch): Thomas Baechler # Maintainer: André Silva @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.5 # nearly always the same as pkgver @@ -32,17 +32,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' - '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' - '0011-kernfs-fix-removed-error-check.patch' '0012-fix-saa7134.patch' - '0015-fix-xsdt-validation.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' - '71891ae6903598f4686e86fdb0d371ff9e179e8dac1d2cf60ca16c5190916745' - 'fca0060bde385e2c292489087af0aa5f48da594221a6d162fc6f8ba2159571e8' + 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' + '32aa542d854f9c87ded3c6acc51537b25e37dd8921af79f71a4f035ed965ede0' + '3f2420725cfe1cd271e8ea6084ad141f54d117965b46adffae92a49e9b8ce0f7' 'dfe01c93d83cdac9ca502715ceb6ac9502d327c939fec2e3052a5a58422dc176' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' @@ -51,12 +47,8 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' - '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. @@ -92,33 +84,15 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Disable usb autosuspend for intel btusb - # See http://www.spinics.net/lists/kernel/msg1716461.html - # Until a solution is found, make sure the driver leaves autosuspend alone - patch -p1 -i "${srcdir}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch" - # Fix generation of symbol CRCs # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d - # FS#39815 - patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch" - - # fix Xorg crash with i810 chipset due to wrong removed error check - # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com - patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch" - # fix saa7134 video # https://bugs.archlinux.org/task/39904 # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix xsdt validation bug - # https://bugs.archlinux.org/task/39811 - # https://bugzilla.kernel.org/show_bug.cgi?id=73911 - patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 184db97b8..8f5a286f3 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -208,6 +208,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -270,7 +271,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -533,6 +533,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 1a32c7bf7..d8408c906 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -217,6 +217,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -281,7 +282,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -541,6 +541,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m -- cgit v1.2.3-54-g00ecf From 0b1a9a69ee2d98301231bd260ad718c551cbbf1c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 13:16:44 -0300 Subject: linux-libre-lts-3.10.42-1: updating version --- libre/linux-libre-lts/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 25ee8bd5d..95fb16388 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213944 2014-06-01 09:21:26Z bpiotrowski $ +# $Id: PKGBUILD 214371 2014-06-07 22:20:59Z bpiotrowski $ # Maintainer (Arch): Tobias Powalowski # Maintainer (Arch): Thomas Baechler # Maintainer: André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=41 +_sublevel=42 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.40 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '870f01e2439758cab57520fc5490c446' + '6efee11f9cb3731db078297ab7ae17d5' '85ce008eaacbb2fc54b81116d35cf946' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '4515aaccb905a164f5e44213d264b5ed') + '4741b27f05fd1868eff20457bfa661c3') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-54-g00ecf From bca4543cfe609ed35728dbee2aa2eb33d9096a01 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 13:18:12 -0300 Subject: linux-libre-lts-knock-3.10.42-1: updating version --- kernels/linux-libre-lts-knock/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index bd6687ad1..55b36cc7a 100644 --- a/kernels/linux-libre-lts-knock/PKGBUILD +++ b/kernels/linux-libre-lts-knock/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213944 2014-06-01 09:21:26Z bpiotrowski $ +# $Id: PKGBUILD 214371 2014-06-07 22:20:59Z bpiotrowski $ # Maintainer (Arch): Tobias Powalowski # Maintainer (Arch): Thomas Baechler # Maintainer: André Silva @@ -10,11 +10,11 @@ pkgbase=linux-libre-lts-knock # Build stock -LIBRE-LTS-KNOCK kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=41 +_sublevel=42 _knockpatchver=${_basekernel} pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.40 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.41 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://gnunet.org/knock" license=('GPL2') @@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '870f01e2439758cab57520fc5490c446' + '6efee11f9cb3731db078297ab7ae17d5' '26380d6f05471ef8e065a77d87588009' 'f22e0a6a7634902f5a00eb25ad677c65' '6550ba0e23b7729cd9db2475bde8fac2' @@ -44,7 +44,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '4515aaccb905a164f5e44213d264b5ed') + '4741b27f05fd1868eff20457bfa661c3') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] -- cgit v1.2.3-54-g00ecf From 0340593f08fe7523d3fa7a2b21a37da788a24607 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 14:00:11 -0300 Subject: linux-libre-{pae,xen}-3.14.6-1: updating version --- ...tooth-Enable-autosuspend-for-Intel-Blueto.patch | 33 -------------- kernels/linux-libre-pae/PKGBUILD | 38 +++------------- kernels/linux-libre-pae/config | 5 ++- ...tooth-Enable-autosuspend-for-Intel-Blueto.patch | 33 -------------- ...-delay-enabling-smart-FIFO-until-after-be.patch | 52 ---------------------- .../linux-libre-xen/0015-fix-xsdt-validation.patch | 42 ----------------- kernels/linux-libre-xen/PKGBUILD | 38 +++------------- kernels/linux-libre-xen/config | 5 ++- 8 files changed, 18 insertions(+), 228 deletions(-) delete mode 100644 kernels/linux-libre-pae/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch delete mode 100644 kernels/linux-libre-xen/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch delete mode 100644 kernels/linux-libre-xen/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch delete mode 100644 kernels/linux-libre-xen/0015-fix-xsdt-validation.patch diff --git a/kernels/linux-libre-pae/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/kernels/linux-libre-pae/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch deleted file mode 100644 index 74283b57c..000000000 --- a/kernels/linux-libre-pae/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Thu, 3 Apr 2014 23:59:49 +0200 -Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel - Bluetooth device" - -This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1. - -USB autosuspend still breaks on some xhci controllers, so disable -it by default as long as no solution is found. ---- - drivers/bluetooth/btusb.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index baeaaed..6d6e09e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf, - if (id->driver_info & BTUSB_BCM92035) - hdev->setup = btusb_setup_bcm92035; - -- if (id->driver_info & BTUSB_INTEL) { -- usb_enable_autosuspend(data->udev); -+ if (id->driver_info & BTUSB_INTEL) - hdev->setup = btusb_setup_intel; -- } - - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); --- -1.9.2 - diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 73e6a725d..5ac87a4be 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $ +# $Id: PKGBUILD 214389 2014-06-08 19:44:39Z tpowa $ # Contributor (Arch): Tobias Powalowski # Contributor (Arch): Thomas Baechler # Maintainer: André Silva @@ -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.14 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,27 +24,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' - '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' - '0011-kernfs-fix-removed-error-check.patch' - '0012-fix-saa7134.patch' - '0015-fix-xsdt-validation.patch') + '0012-fix-saa7134.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' - 'fa4a0141d51dd76d6b57980278a95614d53c51af1cdf983789ed546a47302e2c' + 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' + '3c83319ac7a6a61ce09f8ae750742a6c14e06893061353cdb9bcd1b9e7fb2380' '292d5c553f87246c8dc2d57cadfd2db92a3750173b4588d53c2919743171eca5' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' - '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' - '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4') + '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -74,33 +66,15 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Disable usb autosuspend for intel btusb - # See http://www.spinics.net/lists/kernel/msg1716461.html - # Until a solution is found, make sure the driver leaves autosuspend alone - patch -p1 -i "${srcdir}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch" - # Fix generation of symbol CRCs # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d - # FS#39815 - patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch" - - # fix Xorg crash with i810 chipset due to wrong removed error check - # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com - patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch" - # fix saa7134 video # https://bugs.archlinux.org/task/39904 # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix xsdt validation bug - # https://bugs.archlinux.org/task/39811 - # https://bugzilla.kernel.org/show_bug.cgi?id=73911 - patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 67838aca7..fc9a09805 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -208,6 +208,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -270,7 +271,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -534,6 +534,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/kernels/linux-libre-xen/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/kernels/linux-libre-xen/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch deleted file mode 100644 index 74283b57c..000000000 --- a/kernels/linux-libre-xen/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Thu, 3 Apr 2014 23:59:49 +0200 -Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel - Bluetooth device" - -This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1. - -USB autosuspend still breaks on some xhci controllers, so disable -it by default as long as no solution is found. ---- - drivers/bluetooth/btusb.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index baeaaed..6d6e09e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf, - if (id->driver_info & BTUSB_BCM92035) - hdev->setup = btusb_setup_bcm92035; - -- if (id->driver_info & BTUSB_INTEL) { -- usb_enable_autosuspend(data->udev); -+ if (id->driver_info & BTUSB_INTEL) - hdev->setup = btusb_setup_intel; -- } - - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); --- -1.9.2 - diff --git a/kernels/linux-libre-xen/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch b/kernels/linux-libre-xen/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch deleted file mode 100644 index 7f18091a4..000000000 --- a/kernels/linux-libre-xen/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 784c4f0b18f89922ddc0fe21e5ec64cc370bb3f2 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Wed, 19 Mar 2014 18:36:39 +0100 -Subject: [PATCH 10/10] iwlwifi: mvm: delay enabling smart FIFO until after - beacon RX - -If we have no beacon data before association, delay smart FIFO -enablement until after we have this data. - -Not doing so can cause association failures in extremely silent -environments (usually only a shielded box/room) as beacon RX is -not sent to the host immediately, and then the association time -event ends without the host receiving any beacon even though it -was on the air - it's just stuck on the FIFO. - -Cc: [3.14] -Signed-off-by: Johannes Berg -Signed-off-by: Emmanuel Grumbach ---- - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + - drivers/net/wireless/iwlwifi/mvm/sf.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -index c35b866..45e861e 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c -+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, - */ - iwl_mvm_remove_time_event(mvm, mvmvif, - &mvmvif->time_event_data); -+ iwl_mvm_sf_update(mvm, vif, false); - } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | - BSS_CHANGED_QOS)) { - ret = iwl_mvm_power_update_mode(mvm, vif); -diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c -index 8401627..88809b2 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/sf.c -+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c -@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, - return -EINVAL; - if (changed_vif->type != NL80211_IFTYPE_STATION) { - new_state = SF_UNINIT; -- } else if (changed_vif->bss_conf.assoc) { -+ } else if (changed_vif->bss_conf.assoc && -+ changed_vif->bss_conf.dtim_period) { - mvmvif = iwl_mvm_vif_from_mac80211(changed_vif); - sta_id = mvmvif->ap_sta_id; - new_state = SF_FULL_ON; --- -1.9.2 - diff --git a/kernels/linux-libre-xen/0015-fix-xsdt-validation.patch b/kernels/linux-libre-xen/0015-fix-xsdt-validation.patch deleted file mode 100644 index 82dd2be25..000000000 --- a/kernels/linux-libre-xen/0015-fix-xsdt-validation.patch +++ /dev/null @@ -1,42 +0,0 @@ -@@ -, +, @@ - acpi_tb_parse_root_table(). - Commit: 671cc68dc61f029d44b43a681356078e02d8dab8 - Subject: ACPICA: Back port and refine validation of the XSDT root table. ---- - drivers/acpi/acpica/tbutils.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) ---- a/drivers/acpi/acpica/tbutils.c -+++ a/drivers/acpi/acpica/tbutils.c -@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - u32 table_count; - struct acpi_table_header *table; - acpi_physical_address address; -+ acpi_physical_address rsdt_address; - u32 length; - u8 *table_entry; - acpi_status status; -@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - * as per the ACPI specification. - */ - address = (acpi_physical_address) rsdp->xsdt_physical_address; -+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address; - table_entry_size = ACPI_XSDT_ENTRY_SIZE; - } else { - /* Root table is an RSDT (32-bit physical addresses) */ - - address = (acpi_physical_address) rsdp->rsdt_physical_address; -+ rsdt_address = address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - -@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - - /* Fall back to the RSDT */ - -- address = -- (acpi_physical_address) rsdp->rsdt_physical_address; -+ address = rsdt_address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - } - diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 78a742a33..13c403d84 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 213942 2014-06-01 05:52:43Z tpowa $ +# $Id: PKGBUILD 214389 2014-06-08 19:44:39Z tpowa $ # Contributor (Arch): Tobias Powalowski # Contributor (Arch): Thomas Baechler # Maintainer: André Silva @@ -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.14 -pkgver=${_basekernel}.5 +pkgver=${_basekernel}.6 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,27 +24,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' - '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' - '0011-kernfs-fix-removed-error-check.patch' - '0012-fix-saa7134.patch' - '0015-fix-xsdt-validation.patch') + '0012-fix-saa7134.patch') sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815' - '44d0749d9d2d7f8eec93b260ab5d601433c43d8bf16b6685c3811cf43ba0ed91' + 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' + '435cec36ac9348829cbbbf18f4c26aead26d94b76b89c45c4904a05674f2c370' '7a475ada892857397cf80d2de777825ae94758dc2d9dfa3754ae3d670f4a2f02' '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177' 'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' - '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' - '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4') + '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -74,33 +66,15 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Disable usb autosuspend for intel btusb - # See http://www.spinics.net/lists/kernel/msg1716461.html - # Until a solution is found, make sure the driver leaves autosuspend alone - patch -p1 -i "${srcdir}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch" - # Fix generation of symbol CRCs # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d - # FS#39815 - patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch" - - # fix Xorg crash with i810 chipset due to wrong removed error check - # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com - patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch" - # fix saa7134 video # https://bugs.archlinux.org/task/39904 # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix xsdt validation bug - # https://bugs.archlinux.org/task/39811 - # https://bugzilla.kernel.org/show_bug.cgi?id=73911 - patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config index 7d83b8db4..650e28232 100644 --- a/kernels/linux-libre-xen/config +++ b/kernels/linux-libre-xen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.0-4 Kernel Configuration +# Linux/x86 3.14.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -208,6 +208,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -270,7 +271,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -540,6 +540,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m -- cgit v1.2.3-54-g00ecf From 79d20d502e9ffa17573b8ff91f54186fcba0ea23 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 14:18:50 -0300 Subject: rebuild packages against linux-libre-3.14.6-1 --- libre/acpi_call-libre/PKGBUILD | 4 ++-- libre/bbswitch-libre/PKGBUILD | 4 ++-- libre/tp_smapi-libre/PKGBUILD | 4 ++-- libre/vhba-module-libre/PKGBUILD | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD index 84eabd29c..9652da0db 100644 --- a/libre/acpi_call-libre/PKGBUILD +++ b/libre/acpi_call-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112482 2014-06-02 19:16:06Z foutrelis $ +# $Id: PKGBUILD 112886 2014-06-09 12:13:38Z foutrelis $ # Maintainer (Arch): Maxime Gauduin # Contributor (Arch): mortzu # Contributor (Arch): fnord0 @@ -7,7 +7,7 @@ _pkgname=acpi_call pkgname=acpi_call-libre pkgver=1.1.0 -pkgrel=4 +pkgrel=5 _extramodules=extramodules-3.14-LIBRE pkgdesc='A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre kernel package)' arch=('i686' 'x86_64') diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 9964d4e98..e68b417c6 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112484 2014-06-02 19:16:18Z foutrelis $ +# $Id: PKGBUILD 112888 2014-06-09 12:13:51Z foutrelis $ # Maintainer (Arch): Sven-Hendrik Haase # Contributor (Arch): M0Rf30 # Contributor (Arch): Samsagax @@ -8,7 +8,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.8 _extramodules=extramodules-3.14-LIBRE # Don't forget to update bbswitch.install -pkgrel=8 +pkgrel=9 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") diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index e5db4a11d..4684f48e8 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112490 2014-06-02 19:17:04Z foutrelis $ +# $Id: PKGBUILD 112894 2014-06-09 12:14:37Z foutrelis $ # Maintainer (Arch): Lukas Fleischer # Contributor (Arch): xduugu # Contributor (Arch): nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=46 +pkgrel=47 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 aa7417af2..952935c35 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112492 2014-06-02 19:17:18Z foutrelis $ +# $Id: PKGBUILD 112896 2014-06-09 12:14:50Z foutrelis $ # Maintainer (Arch): Ray Rashif # Contributor (Arch): Mateusz Herych # Contributor (Arch): Charles Lindsay @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.14-LIBRE -pkgrel=26 +pkgrel=27 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" -- cgit v1.2.3-54-g00ecf From ab7300558546cc411f625004d156cd5e2b18e9ec Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 15:37:56 -0300 Subject: xscreensaver-libre-5.29-1: updating version --- libre/xscreensaver-libre/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD index 7fb26c711..5a22d37c9 100644 --- a/libre/xscreensaver-libre/PKGBUILD +++ b/libre/xscreensaver-libre/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 201451 2013-12-12 05:18:26Z eric $ +# $Id: PKGBUILD 214395 2014-06-09 00:20:39Z eric $ # Maintainer (Arch): Eric Bélanger # Maintainer: André Silva _pkgname=xscreensaver pkgname=xscreensaver-libre -pkgver=5.26 +pkgver=5.29 pkgrel=1 pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files" arch=('i686' 'x86_64' 'mips64el') url="http://www.jwz.org/xscreensaver/" license=('BSD') depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww') -makedepends=('bc' 'libxpm' 'gdm') +makedepends=('bc' 'intltool' 'libxpm' 'gdm') optdepends=('gdm: for login manager support') replaces=("${_pkgname}") conflicts=("${_pkgname}") @@ -20,8 +20,8 @@ backup=('etc/pam.d/xscreensaver') mksource=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz) source=(https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz \ xscreensaver-add-electricsheep.diff LICENSE) -mksha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc') -sha1sums=('f041ac860f52fab79c438012ebf58a021ef9bfea' +mksha1sums=('a27a10c6eed024c458e927ee0dc1e6cb306d3335') +sha1sums=('0b0d8d57cac76460cb3a77aa5cd80adcfa856572' 'e8dc57b6471fb3867ee099304ac6bf628351cb98' '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2') -- cgit v1.2.3-54-g00ecf From 58317052c05ee886e332c7a5f7164350feb020fd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 15:40:03 -0300 Subject: claws-mail-nonprism-3.10.1-1: updating version --- nonprism/claws-mail-nonprism/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD index a0aa863a9..7dcfb61d0 100644 --- a/nonprism/claws-mail-nonprism/PKGBUILD +++ b/nonprism/claws-mail-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 213829 2014-05-29 18:40:04Z andyrtr $ +# $Id: PKGBUILD 214747 2014-06-09 09:54:05Z andyrtr $ # Maintainer (Arch): Andreas Radke # Maintainer: Márcio Silva _pkgname=claws-mail pkgname=$_pkgname-nonprism -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.1 +pkgrel=1 pkgdesc="A GTK+ based e-mail client, without libgdata support" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -36,7 +36,7 @@ conflicts=("$_pkgname" "$_pkgname-extra-plugins") provides=("$_pkgname=$pkgver" 'claws') install=$_pkgname.install source=(http://downloads.sourceforge.net/sourceforge/claws-mail/$_pkgname-$pkgver.tar.xz{,.asc}) -sha1sums=('c5e8063ea922b1bd6825f5221347ec8ebfa0ae3b' +sha1sums=('fff74eabee65b78dc842abf34819cc5dd9e7feca' 'SKIP') build() { -- cgit v1.2.3-54-g00ecf From cc880aeb03b73c095aa5b274a5c0f4a1c73513c8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 16:35:58 -0300 Subject: mesa-libcl-10.2.1-1: updating version --- libre/mesa-libcl/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index 8ac6c73da..7415ce3b3 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.1.4 -pkgrel=2 +pkgver=10.2.1 +pkgrel=1 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net license=( @@ -59,7 +59,7 @@ source=( ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 ) sha512sums=( - 3260c535d4ad2123fba29090b6d2d48b508086916b55bfad304936a48b0f79dd176be50a080add59755e9b2cc65c797dcb6a3aad34a1f7a6c30b97ef9428d02d + 71221293cccb24f7b3312bdea5afac7e46e37bd40a17da3c2313198018f144a12f96da5dbeb62784a365c2c9baf294e8ebb50998a6f3763b7659c1154ddb5d6e ) build() { @@ -71,7 +71,7 @@ build() { --enable-r600-llvm-compiler\ --enable-dri3\ --with-clang-libdir=/usr/lib\ - --with-llvm-shared-libs\ + --enable-llvm-shared-libs\ --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast make } -- cgit v1.2.3-54-g00ecf From cfe61ed2e08412c81eee9631fd66b0a81707b95a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 9 Jun 2014 16:36:24 -0300 Subject: lib32-mesa-libcl-10.2.1-1: updating version --- libre-multilib/lib32-mesa-libcl/PKGBUILD | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libre-multilib/lib32-mesa-libcl/PKGBUILD b/libre-multilib/lib32-mesa-libcl/PKGBUILD index 0f35e6942..688cfc137 100644 --- a/libre-multilib/lib32-mesa-libcl/PKGBUILD +++ b/libre-multilib/lib32-mesa-libcl/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=mesa _pkgname=libcl pkgname=lib32-$pkgbase-$_pkgname _pkgflag=libre -pkgver=10.1.4 -pkgrel=3 +pkgver=10.2.1 +pkgrel=1 pkgdesc='Mesa 3-D OpenCL library (32-bit)' url=http://${pkgbase}3d.sourceforge.net license=( @@ -59,7 +59,7 @@ source=( ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 ) sha512sums=( - 3260c535d4ad2123fba29090b6d2d48b508086916b55bfad304936a48b0f79dd176be50a080add59755e9b2cc65c797dcb6a3aad34a1f7a6c30b97ef9428d02d + 71221293cccb24f7b3312bdea5afac7e46e37bd40a17da3c2313198018f144a12f96da5dbeb62784a365c2c9baf294e8ebb50998a6f3763b7659c1154ddb5d6e ) build() { @@ -69,15 +69,13 @@ build() { export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" export LLVM_CONFIG=/usr/bin/llvm-config32 autoreconf -vfi - ./configure --enable-32-bit\ - --libdir=/usr/lib32\ - --prefix=/usr\ + ./configure --prefix=/usr --libdir=/usr/lib32 --enable-32-bit\ --enable-opencl\ --enable-gallium-llvm\ --enable-r600-llvm-compiler\ --enable-dri3\ --with-clang-libdir=/usr/lib\ - --with-llvm-shared-libs\ + --enable-llvm-shared-libs\ --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast make } -- cgit v1.2.3-54-g00ecf From 1c8bfae74e5b595e9a5897de8f447afef9d59b21 Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 09:58:21 +0200 Subject: pacman2pacman --- pcr/pacman2pacman/PKGBUILD | 5 ++++- pcr/pacman2pacman/instructions.install | 41 ---------------------------------- 2 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 pcr/pacman2pacman/instructions.install diff --git a/pcr/pacman2pacman/PKGBUILD b/pcr/pacman2pacman/PKGBUILD index 7862f5a02..f07efff7d 100644 --- a/pcr/pacman2pacman/PKGBUILD +++ b/pcr/pacman2pacman/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Joseph Graham pkgname=pacman2pacman -pkgver=1.3.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="A plugin for pactor to download packages by bittorrent and seed them back up" arch=(any) @@ -10,12 +10,15 @@ depends=(transmission-cli) options=(emptydirs) install=$pkgname.install source=(https://t67.eu/filebin/$pkgname-$pkgver.tar.gz) +md5sums=('736eb3d6d557030f733b4b3f4e08c2be') package() { cd $pkgname mkdir -p "${pkgdir}/srv/pacman2pacman/torrents" + mkdir -p "${pkgdir}/srv/pacman2pacman/dbcache" + chown -R transmission "${pkgdir}/srv/pacman2pacman/" mkdir -p "${pkgdir}/usr/bin" diff --git a/pcr/pacman2pacman/instructions.install b/pcr/pacman2pacman/instructions.install deleted file mode 100644 index 503573305..000000000 --- a/pcr/pacman2pacman/instructions.install +++ /dev/null @@ -1,41 +0,0 @@ -# This is a default template for a post-install scriptlet. -# Uncomment only required functions and remove any functions -# you don't need (and this header). - -## arg 1: the new package version -#pre_install() { - # do something here -#} - -## arg 1: the new package version -post_install() { - # do something here - echo 'transmission-daemon needs to be running for pacman2pacman to work:' - echo 'systemctl start transmission' - echo 'systemctl enable transmission' - echo - echo 'Put the following into /etc/pacman.conf: XferCommand = /usr/bin/pacman2pacman-get %u %o' -} - -## arg 1: the new package version -## arg 2: the old package version -#pre_upgrade() { - # do something here -#} - -## arg 1: the new package version -## arg 2: the old package version -#post_upgrade() { - # do something here -#} - -## arg 1: the old package version -#pre_remove() { - # do something here -#} - -## arg 1: the old package version -post_remove() { - # do something here - echo "Don't forget to remove pacman2pacman from pacman.conf's \`XferCommand' setting." -} -- cgit v1.2.3-54-g00ecf From dab1f3d724bc5ce772677a9e52153275bb54436b Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 11:19:14 +0200 Subject: ums --- pcr/ums/PKGBUILD | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pcr/ums/PKGBUILD b/pcr/ums/PKGBUILD index 35d5878c4..5894c65d1 100644 --- a/pcr/ums/PKGBUILD +++ b/pcr/ums/PKGBUILD @@ -1,9 +1,9 @@ -# Contributor (Arch): Red Squirrel -# Maintainer : Parabola Aurélien DESBRIÈRES +# Contributor (Arch) : Red Squirrel +# Maintainer (Parabola) : Aurélien DESBRIÈRES # Based on PMS PKGBUILD pkgname=ums -pkgver=3.4.0 +pkgver=4.0.0 pkgrel=1 pkgdesc="Universal Media Server: a DLNA-compliant UPnP Media Server." arch=('i686' 'x86_64') @@ -15,18 +15,19 @@ makedepends=("unzip") optdepends=("vlc: For Internet video/audio") [ "$CARCH" = "x86_64" ] && \ optdepends=("vlc: Internet video/audio support" + "dcraw: thumbnails creation support" "lib32-gcc-libs: tsMuxeR support" "lib32-glibc: tsMuxeR support") backup=(opt/ums/UMS.conf \ opt/ums/WEB.conf) -source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver.tgz") +source=("http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/UMS-$pkgver-a1.tgz") package() { mkdir -p $pkgdir/opt/ums mkdir $pkgdir/opt/ums/database mkdir -p $pkgdir/usr/bin - chmod -R 755 $srcdir/$pkgname-$pkgver/plugins $srcdir/$pkgname-$pkgver/documentation - cp -r $srcdir/$pkgname-$pkgver/* $pkgdir/opt/ums/ + chmod -R 755 $srcdir/$pkgname-$pkgver-a1/plugins $srcdir/$pkgname-$pkgver-a1/documentation + cp -r $srcdir/$pkgname-$pkgver-a1/* $pkgdir/opt/ums/ chmod +x $pkgdir/opt/ums/UMS.sh \ $pkgdir/opt/ums/linux/tsMuxeR touch $pkgdir/opt/ums/UMS.conf @@ -41,7 +42,7 @@ package() { $pkgdir/opt/ums/debug.log \ $pkgdir/opt/ums/database - unzip -q -u $srcdir/$pkgname-$pkgver/ums.jar -d ums_jar + unzip -q -u $srcdir/$pkgname-$pkgver-a1/ums.jar -d ums_jar install -d -m 755 $pkgdir/usr/share/pixmaps install -D -m 644 $srcdir/ums_jar/resources/images/logo.png $pkgdir/usr/share/pixmaps/ums.png -- cgit v1.2.3-54-g00ecf From 06fa8fcaa86f113d3cadea0e7da5ead5975c3d09 Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 11:40:10 +0200 Subject: ttf-font-awesome --- pcr/ttf-font-awesome/PKGBUILD | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pcr/ttf-font-awesome/PKGBUILD b/pcr/ttf-font-awesome/PKGBUILD index 37254c735..179d8566c 100644 --- a/pcr/ttf-font-awesome/PKGBUILD +++ b/pcr/ttf-font-awesome/PKGBUILD @@ -1,9 +1,9 @@ -#Contributer (Arch): UNKNOWN o_O -#Maintainer : Parabola Aurélien DESBRIÈRES +# Contributor (Arch) : ? +# Maintainer (Parabola) : Aurélien DESBRIÈRES pkgname=ttf-font-awesome -pkgver=3.2.1 -pkgrel=2 +pkgver=4.0.3 +pkgrel=1 pkgdesc="Iconic font designed for Bootstrap" url="http://fortawesome.github.io/Font-Awesome/" license=('CCPL') @@ -11,9 +11,11 @@ depends=('fontconfig' 'xorg-font-utils') options=("!strip") install=$pkgname.install arch=('any') -source=('http://fortawesome.github.io/Font-Awesome/assets/font-awesome.zip') +source=("https://github.com/FortAwesome/Font-Awesome/archive/master.zip") +#source=("http://fortawesome.github.io/Font-Awesome/assets/font-awesome-$pkgver.zip") + package() { install -d "$pkgdir/usr/share/fonts/TTF" - cp -dpr --no-preserve=ownership "$srcdir/font-awesome/font/"*.ttf "$pkgdir/usr/share/fonts/TTF/" + cp -dpr --no-preserve=ownership "$srcdir/Font-Awesome-master/fonts/"*.ttf "$pkgdir/usr/share/fonts/TTF/" } -- cgit v1.2.3-54-g00ecf From 1a4aeb92c3e7c51179a57a0cc8fb933bb56513e4 Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 14:12:24 +0200 Subject: cowpatty --- pcr/cowpatty/PKGBUILD | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 pcr/cowpatty/PKGBUILD diff --git a/pcr/cowpatty/PKGBUILD b/pcr/cowpatty/PKGBUILD new file mode 100644 index 000000000..c29c53ad8 --- /dev/null +++ b/pcr/cowpatty/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor (Arch) : CRT +# Contributor (Arch) : Sébastien Duquette +# Contributor (Arch) : icarus +# Contributor (Arch) : Stephane Travostino +# Maintainer (Parabola) : Aurélien DESBRIÈRES + +pkgname=cowpatty +pkgver=4.6 +pkgrel=5 +pkgdesc="Wireless WPA/WPA2 PSK handshake cracking utility" +arch=('i686' 'x86_64') +url="http://www.wirelessdefence.org/Contents/coWPAttyMain.htm" +license=('GPL') +depends=('openssl' 'libpcap') +options=('docs' '!makeflags') +source=("http://www.wirelessdefence.org/Contents/Files/cowpatty-$pkgver.tgz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + make + make strip +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" BINDIR="/usr/bin/" install + install -D -m644 dict "$pkgdir"/usr/share/cowpatty/dict + install -D -m644 COPYING "$pkgdir"/usr/share/licenses/"$pkgname"/COPYING +} -- cgit v1.2.3-54-g00ecf From 58e662a21a1c630310cd84a83c9330d993e03f7c Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 14:21:00 +0200 Subject: arno-iptables-firewall --- pcr/arno-iptables-firewall/PKGBUILD | 69 ++++++++++++++++++++++ .../arno-iptables-firewall.patch | 25 ++++++++ .../arno-iptables-firewall.service | 14 +++++ 3 files changed, 108 insertions(+) create mode 100644 pcr/arno-iptables-firewall/PKGBUILD create mode 100644 pcr/arno-iptables-firewall/arno-iptables-firewall.patch create mode 100644 pcr/arno-iptables-firewall/arno-iptables-firewall.service diff --git a/pcr/arno-iptables-firewall/PKGBUILD b/pcr/arno-iptables-firewall/PKGBUILD new file mode 100644 index 000000000..f0def1909 --- /dev/null +++ b/pcr/arno-iptables-firewall/PKGBUILD @@ -0,0 +1,69 @@ +# Contributor (Arch) : Jaroslav Lichtblau +# Contributor (Arch) : Arto Puranen +# Maintainer (Parabola) : Aurélien DESBRIÈRES + +pkgname=arno-iptables-firewall +pkgver=2.0.1d +pkgrel=2 +pkgdesc="A secure stateful firewall for both single and multi-homed machine" +arch=('any') +url=(http://rocky.eld.leidenuniv.nl/joomla/) +license=('GPL') +depends=('iptables' 'iproute2') +makedepends=('patch') +backup=(etc/${pkgname}/firewall.conf + etc/${pkgname}/custom-rules + etc/${pkgname}/plugins/dmz-dnat.conf + etc/${pkgname}/plugins/dsl-ppp-modem.conf + etc/${pkgname}/plugins/dyndns-host-open.conf + etc/${pkgname}/plugins/ids-protection.conf + etc/${pkgname}/plugins/ipsec-vpn.conf + etc/${pkgname}/plugins/ipv6-over-ipv4.conf + etc/${pkgname}/plugins/linux-upnp-igd.conf + etc/${pkgname}/plugins/mac-address-filter.conf + etc/${pkgname}/plugins/multiroute.conf + etc/${pkgname}/plugins/sip-voip.conf + etc/${pkgname}/plugins/ssh-brute-force-protection.conf + etc/${pkgname}/plugins/traffic-accounting.conf + etc/${pkgname}/plugins/traffic-shaper.conf + etc/${pkgname}/plugins/transparent-dnat.conf + etc/${pkgname}/plugins/transparent-proxy.conf) +source=(http://rocky.eld.leidenuniv.nl/${pkgname}/${pkgname}_${pkgver}.tar.gz + ${pkgname}.patch \ + ${pkgname}.service) + +package() { + cd ${srcdir}/${pkgname}_${pkgver} + +# patch + patch -Np0 -i ${srcdir}/${pkgname}.patch + +# conf files + install -d -m 0755 etc/${pkgname}/plugins/ ${pkgdir}/etc/${pkgname}/plugins/ + for i in `find etc/${pkgname} -type f`; do install -T -m 0600 $i ${pkgdir}/$i ;done + install -D -m 0644 share/${pkgname}/environment ${pkgdir}/usr/share/${pkgname}/environment + +# plugins + install -d -m 0755 share/${pkgname}/plugins/ ${pkgdir}/usr/share/${pkgname}/plugins/ + for i in share/${pkgname}/plugins/*plugin; do install -T -m 0644 $i ${pkgdir}/usr/$i ;done + install -D -m 0744 share/${pkgname}/plugins/dyndns-host-open-helper \ + ${pkgdir}/usr/share/${pkgname}/plugins/dyndns-host-open-helper + install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-helper \ + ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-helper + install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-log-rotate \ + ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-log-rotate + install -D -m 0744 share/${pkgname}/plugins/traffic-accounting-show \ + ${pkgdir}/usr/share/${pkgname}/plugins/traffic-accounting-show + +# binary + install -D -m 0744 bin/${pkgname} ${pkgdir}/usr/bin/${pkgname} + install -D -m 0744 bin/arno-fwfilter ${pkgdir}/usr/bin/arno-fwfilter + install -D -m 0744 contrib/adsl-failover ${pkgdir}/usr/bin/adsl-failover + +# man files + install -D -m 0644 share/man/man1/arno-fwfilter.1 ${pkgdir}/usr/share/man/man1/arno-fwfilter.1 + install -D -m 0644 share/man/man8/${pkgname}.8 ${pkgdir}/usr/share/man/man8/${pkgname}.8 + +# systemd script + install -D -m 0644 ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/${pkgname}.service +} diff --git a/pcr/arno-iptables-firewall/arno-iptables-firewall.patch b/pcr/arno-iptables-firewall/arno-iptables-firewall.patch new file mode 100644 index 000000000..298d0c0b8 --- /dev/null +++ b/pcr/arno-iptables-firewall/arno-iptables-firewall.patch @@ -0,0 +1,25 @@ +--- etc/arno-iptables-firewall/firewall.conf 2010-12-30 13:17:02.000000000 +0100 ++++ etc/arno-iptables-firewall/firewall.conf 2011-01-22 21:10:39.000000000 +0100 +@@ -233,18 +233,18 @@ + # 'whereis iptables' to manually locate it), required for (default) IPv4 support + # ----------------------------------------------------------------------------- +-IP4TABLES="/sbin/iptables" ++IP4TABLES="/usr/bin/iptables" + + # (EXPERT SETTING!) Location of the ip6tables-binary (use 'locate ip6tables' or + # 'whereis ip6tables' to manually locate it), required for IPv6 support + # ----------------------------------------------------------------------------- +-IP6TABLES="/sbin/ip6tables" ++IP6TABLES="/usr/bin/ip6tables" + + # (EXPERT SETTING!) Location of the environment file + # ----------------------------------------------------------------------------- +-ENV_FILE="/usr/local/share/arno-iptables-firewall/environment" ++ENV_FILE="/usr/share/arno-iptables-firewall/environment" + + # (EXPERT SETTING!) Location of plugin binary & config files + # ----------------------------------------------------------------------------- +-PLUGIN_BIN_PATH="/usr/local/share/arno-iptables-firewall/plugins" ++PLUGIN_BIN_PATH="/usr/share/arno-iptables-firewall/plugins" + PLUGIN_CONF_PATH="/etc/arno-iptables-firewall/plugins" + diff --git a/pcr/arno-iptables-firewall/arno-iptables-firewall.service b/pcr/arno-iptables-firewall/arno-iptables-firewall.service new file mode 100644 index 000000000..2d81c9869 --- /dev/null +++ b/pcr/arno-iptables-firewall/arno-iptables-firewall.service @@ -0,0 +1,14 @@ +[Unit] +Description=A secure stateful firewall for both single and multi-homed machine +Before=network.target +Wants=network.target + +[Service] +Type=oneshot +ExecStart=/usr/bin/arno-iptables-firewall start +ExecStop=/usr/bin/arno-iptables-firewall stop +ExecReload=/usr/bin/arno-iptables-firewall force-reload +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target -- cgit v1.2.3-54-g00ecf From d3615a2d9bf28c130b3c1f82c93f152d54c4816c Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 19:08:22 +0200 Subject: packer --- pcr/packer/PKGBUILD | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/pcr/packer/PKGBUILD b/pcr/packer/PKGBUILD index f2ea54a76..5354d0192 100644 --- a/pcr/packer/PKGBUILD +++ b/pcr/packer/PKGBUILD @@ -1,36 +1,32 @@ -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres +# Contributor (Arch) : Kyle Keen +# Contributor (Arch) : Gilrain +# Contributor (Arch) : bruenig +# Maintainer (Parabola) : Aurélien DESBRIÈRES pkgname=packer -pkgver=20120302 +pkgver=20131001 pkgrel=1 pkgdesc="Bash wrapper for pacman and aur" -url="http://github.com/bruenig/packer" -license="GPL" +url="http://github.com/keenerd/packer" +license=("GPL3") arch=('any') +source=("https://repo.parabolagnulinux.org/other/~aurelien/packer/packer-${pkgver}.tar.gz") + makedepends=('git') -depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon') +depends=('grep' 'sed' 'bash' 'curl' 'pacman' 'jshon' 'expac') optdepends=('sudo: install and update packages as non-root' 'customizepkg: apply customizepkg modifications') -_gitroot='https://github.com/bruenig/packer.git' -_gitname='packer' -# Xavion is a non-contributing idiot +source=('git+https://github.com/keenerd/packer.git') + + +pkgver() { + cd "$pkgname" + git show -s --format="%ci" HEAD | sed -e 's/-//g' -e 's/ .*//' +} -build() { - cd "$srcdir" - - msg "Connecting to github GIT server...." - - if [ -d "$srcdir/$_gitname" ] ; then - cd $_gitname && git pull origin - else - git clone "$_gitroot" - cd $_gitname - fi - - mkdir -p "$pkgdir/usr/bin/" - mkdir -p "$pkgdir/usr/share/man/man8/" - install -m 755 packer "$pkgdir/usr/bin/packer" - install -m 644 packer.8 "$pkgdir/usr/share/man/man8/packer.8" +package() { + install -Dm755 "$srcdir/$pkgname/packer" "$pkgdir/usr/bin/packer" + install -Dm644 "$srcdir/$pkgname/packer.8" "$pkgdir/usr/share/man/man8/packer.8" } -- cgit v1.2.3-54-g00ecf From 9434f08c80f838beb257aecf7ecb79b7ce0ec96a Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 19:23:20 +0200 Subject: python-xbee --- pcr/python-xbee/PKGBUILD | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 pcr/python-xbee/PKGBUILD diff --git a/pcr/python-xbee/PKGBUILD b/pcr/python-xbee/PKGBUILD new file mode 100644 index 000000000..c0771bf3e --- /dev/null +++ b/pcr/python-xbee/PKGBUILD @@ -0,0 +1,17 @@ +# Contributor (Arch) : ? +# Maintainer (Parabola) : Aurélien DESBRIÈRES + +pkgname=python-xbee +pkgver=2.1.0 +pkgrel=1 +pkgdesc='Python tools for working with XBee radios' +url='https://pypi.python.org/pypi/XBee' +arch=('any') +license=('MIT') +depends=('python' 'python-pyserial') +source=("https://pypi.python.org/packages/source/X/XBee/XBee-${pkgver}.tar.gz") + +package() { + cd XBee-$pkgver + python setup.py install --root="$pkgdir" +} -- cgit v1.2.3-54-g00ecf From f6a9602cf6f03ced84cda8257d79a64671c507d0 Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 19:39:38 +0200 Subject: devmem --- pcr/devmem/PKGBUILD | 24 +++++++++++++++ pcr/ros-hydro-rosserial-xbee/PKGBUILD | 58 +++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 pcr/devmem/PKGBUILD create mode 100644 pcr/ros-hydro-rosserial-xbee/PKGBUILD diff --git a/pcr/devmem/PKGBUILD b/pcr/devmem/PKGBUILD new file mode 100644 index 000000000..ab664447e --- /dev/null +++ b/pcr/devmem/PKGBUILD @@ -0,0 +1,24 @@ +# Contributor (Arch) : Brice Waegeneire < brice dot wge at gmail dot com > +# Contributor (Arch) : Alexander Lam +# Maintainer (Parabola) : Aurélien DESBRIÈRES + +pkgname=devmem +pkgver=2 +pkgrel=2 +pkgdesc="A small utility to access /dev/mem and read/write to any memory location" +arch=('any') +url="http://free-electrons.com/pub/mirror/devmem2.c" +license=('GPL2') +source=("http://free-electrons.com/pub/mirror/${pkgname}${pkgver}.c") + + +build() { + cd "$srcdir/" + gcc devmem2.c -o devmem2 +} + +package() { + install -D -m755 ${srcdir}/devmem2 ${pkgdir}/usr/bin/devmem2 +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ros-hydro-rosserial-xbee/PKGBUILD b/pcr/ros-hydro-rosserial-xbee/PKGBUILD new file mode 100644 index 000000000..cbd21c4ee --- /dev/null +++ b/pcr/ros-hydro-rosserial-xbee/PKGBUILD @@ -0,0 +1,58 @@ +# Script generated with import_catkin_packages.py +# For more information: https://github.com/bchretien/arch-ros-stacks +# pkgdesc="ROS - rosserial_xbee provides tools to do point to multipoint communication between rosserial nodes connected to an xbee." +# url='http://ros.org/wiki/rosserial_xbee' +# Contributor (Arch) : ? +# Contributor (Parabola) : Aurélien DESBRIÈRES + +pkgname='ros-hydro-rosserial-xbee' +pkgver='0.5.5' +_pkgver_patch=0 +arch=('any') +pkgrel=1 +license=('BSD') + +ros_makedepends=(ros-hydro-catkin) +makedepends=('cmake' 'git' 'ros-build-tools' + ${ros_makedepends[@]}) + +ros_depends=(ros-hydro-rospy + ros-hydro-diagnostic-msgs + ros-hydro-rosserial-msgs + ros-hydro-rosserial-python) +depends=(${ros_depends[@]} + python2-pyserial) + +_tag=release/hydro/rosserial_xbee/${pkgver}-${_pkgver_patch} +_dir=rosserial_xbee +source=("${_dir}"::"git+https://github.com/ros-gbp/rosserial-release.git"#tag=${_tag}) +md5sums=('SKIP') + +build() { + # Use ROS environment variables + /usr/share/ros-build-tools/clear-ros-env.sh + [ -f /opt/ros/hydro/setup.bash ] && source /opt/ros/hydro/setup.bash + + # Create build directory + [ -d ${srcdir}/build ] || mkdir ${srcdir}/build + cd ${srcdir}/build + + # Fix Python2/Python3 conflicts + /usr/share/ros-build-tools/fix-python-scripts.sh ${srcdir}/${_dir} + + # Build project + cmake ${srcdir}/${_dir} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCATKIN_BUILD_BINARY_PACKAGE=ON \ + -DCMAKE_INSTALL_PREFIX=/opt/ros/hydro \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ + -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \ + -DSETUPTOOLS_DEB_LAYOUT=OFF + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}/" install +} -- cgit v1.2.3-54-g00ecf From 9b4fa48711271fd0005ce99553fa0dc25f9f731b Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 19:43:14 +0200 Subject: bbb-gadgets --- pcr/bbb-gadgets/LICENSE | 17 +++++++ pcr/bbb-gadgets/PKGBUILD | 30 ++++++++++++ pcr/bbb-gadgets/dhcpd-usb0.conf | 4 ++ pcr/bbb-gadgets/g-ether-load.sh | 71 +++++++++++++++++++++++++++++ pcr/bbb-gadgets/network-gadget-init.service | 11 +++++ pcr/bbb-gadgets/storage-gadget-init.service | 10 ++++ 6 files changed, 143 insertions(+) create mode 100644 pcr/bbb-gadgets/LICENSE create mode 100644 pcr/bbb-gadgets/PKGBUILD create mode 100644 pcr/bbb-gadgets/dhcpd-usb0.conf create mode 100755 pcr/bbb-gadgets/g-ether-load.sh create mode 100644 pcr/bbb-gadgets/network-gadget-init.service create mode 100644 pcr/bbb-gadgets/storage-gadget-init.service diff --git a/pcr/bbb-gadgets/LICENSE b/pcr/bbb-gadgets/LICENSE new file mode 100644 index 000000000..fb950dc69 --- /dev/null +++ b/pcr/bbb-gadgets/LICENSE @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/pcr/bbb-gadgets/PKGBUILD b/pcr/bbb-gadgets/PKGBUILD new file mode 100644 index 000000000..4affed078 --- /dev/null +++ b/pcr/bbb-gadgets/PKGBUILD @@ -0,0 +1,30 @@ +# Contributor (Arch) : Brice Waegeneire < brice dot wge at gmail dot com > +# Maintainer (Parabola) : Aurélien DESBRIÈRES + +pkgname=bbb-gadgets +pkgver=20130905 +pkgrel=3 +pkgdesc="Units to initialize usb gadgets for the BeagleBone Black" +arch=('any') +url="http://www.beagleboard.org/" +license=('MIT') +makedepends=('git') +depends=('bash' 'systemd' 'dhcp' 'devmem') +backup=('etc/dhcpd-usb0.conf') +source=('dhcpd-usb0.conf' + 'g-ether-load.sh' + 'LICENSE' + 'network-gadget-init.service' + 'storage-gadget-init.service') + +package() { + install -d $pkgdir/usr/lib/systemd/system + install -m 0644 $srcdir/*.service $pkgdir/usr/lib/systemd/system + + install -D -m 0644 $srcdir/dhcpd-usb0.conf $pkgdir/etc/dhcpd-usb0.conf + + install -D -m 0755 $srcdir/g-ether-load.sh $pkgdir/usr/bin/g-ether-load.sh + + install -D -m 0644 $srcdir/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + diff --git a/pcr/bbb-gadgets/dhcpd-usb0.conf b/pcr/bbb-gadgets/dhcpd-usb0.conf new file mode 100644 index 000000000..935477523 --- /dev/null +++ b/pcr/bbb-gadgets/dhcpd-usb0.conf @@ -0,0 +1,4 @@ +subnet 192.168.7.0 netmask 255.255.255.0 { + range 192.168.7.1 192.168.7.1; +} + diff --git a/pcr/bbb-gadgets/g-ether-load.sh b/pcr/bbb-gadgets/g-ether-load.sh new file mode 100755 index 000000000..e4f39079d --- /dev/null +++ b/pcr/bbb-gadgets/g-ether-load.sh @@ -0,0 +1,71 @@ +#!/bin/sh + +function get_devmem() +{ + /usr/bin/devmem2 $1 | grep ": " | cut -d ":" -f 2|cut -d "x" -f 2 +} + +function hex_to_mac_addr() +{ + addr=$1 + n=0 + mac_addr=$(echo ${addr} | while read -r -n2 c; do + if [ ! -z "$c" ]; then + if [ $n -ne 0 ] ; then + echo -n ":${c}" + else + echo -n "${c}" + fi + fi + n=$(($n+1)) + done) + echo ${mac_addr} +} + +function reverse_bytes() +{ + addr=$1 + New_addr=$(echo ${addr} | while read -r -n2 c; do + if [ ! -z "$c" ]; then + New_addr=${c}${New_addr} + else echo + echo ${New_addr} + fi + done) + echo ${New_addr} +} + +mac_address="/proc/device-tree/ocp/ethernet@4a100000/slave@4a100300/mac-address" +if [ -f ${mac_address} ] ; then + DEV_ADDR=$(hexdump -v -e '1/1 "%02X" ":"' ${mac_address} | sed 's/.$//') +else + DEVMEM_ADDR_LO=$(get_devmem 0x44e10638|bc) + DEVMEM_ADDR_LO=$(reverse_bytes ${DEVMEM_ADDR_LO}) + + DEVMEM_ADDR_HI=$(get_devmem 0x44e1063C) + DEVMEM_ADDR_HI=$(reverse_bytes ${DEVMEM_ADDR_HI}) + + DEV_ADDR=$(hex_to_mac_addr "${DEVMEM_ADDR_HI}${DEVMEM_ADDR_LO}") +fi + +SERIAL_NUMBER=$(hexdump -e '8/1 "%c"' /sys/bus/i2c/devices/0-0050/eeprom -s 14 -n 2)-$(hexdump -e '8/1 "%c"' /sys/bus/i2c/devices/0-0050/eeprom -s 16 -n 12) +ISBLACK=$(hexdump -e '8/1 "%c"' /sys/bus/i2c/devices/0-0050/eeprom -s 8 -n 4) + +BLACK="" + +if [ "${ISBLACK}" = "BBBK" ] ; then + BLACK="Black" +fi + +if [ "${ISBLACK}" = "BNLT" ] ; then + BLACK="Black" +fi + +modprobe g_multi file=/dev/mmcblk0p1 cdrom=0 stall=0 removable=1 nofua=1 iSerialNumber=${SERIAL_NUMBER} iManufacturer=Circuitco iProduct=BeagleBone${BLACK} host_addr=${DEV_ADDR} + +sleep 1 + +/usr/bin/ifconfig usb0 192.168.7.2 netmask 255.255.255.252 +/usr/bin/route add default gw 192.168.7.1 + +/usr/bin/dhcpd -4 -q -cf /etc/dhcpd-usb0.conf usb0 diff --git a/pcr/bbb-gadgets/network-gadget-init.service b/pcr/bbb-gadgets/network-gadget-init.service new file mode 100644 index 000000000..47573a1ec --- /dev/null +++ b/pcr/bbb-gadgets/network-gadget-init.service @@ -0,0 +1,11 @@ +[Unit] +Description=Start USB Ethernet gadget +Conflicts=storage-gadget-init.service + +[Service] +RemainAfterExit=yes +ExecStart=/usr/bin/g-ether-load.sh +ExecStop=/usr/bin/rmmod g_ether + +[Install] +WantedBy=basic.target diff --git a/pcr/bbb-gadgets/storage-gadget-init.service b/pcr/bbb-gadgets/storage-gadget-init.service new file mode 100644 index 000000000..8c2a30c12 --- /dev/null +++ b/pcr/bbb-gadgets/storage-gadget-init.service @@ -0,0 +1,10 @@ +[Unit] +Description=Start usb mass storage gadget +After=dev-mmcblk0p1.device + +[Service] +Type=simple +ExecStart=/usr/bin/g-ether-load.sh + +[Install] +WantedBy=basic.target -- cgit v1.2.3-54-g00ecf From 537f403835a02948ee2feaa87aebe6af76a97e44 Mon Sep 17 00:00:00 2001 From: Aurélien DESBRIÈRES Date: Tue, 10 Jun 2014 20:15:51 +0200 Subject: ipycli-git --- pcr/ipycli-git/PKGBUILD | 55 ++++++++++++++++++------------------------------- 1 file changed, 20 insertions(+), 35 deletions(-) diff --git a/pcr/ipycli-git/PKGBUILD b/pcr/ipycli-git/PKGBUILD index 7ccf64839..533d96a78 100644 --- a/pcr/ipycli-git/PKGBUILD +++ b/pcr/ipycli-git/PKGBUILD @@ -1,56 +1,41 @@ -# Contributor (Arch): Francois Boulogne -# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières +# Contributor: Francois Boulogne +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES pkgname=ipycli-git -pkgver=20121109 -pkgrel=2 +pkgver=r135.baa33ed +pkgrel=1 pkgdesc="IPython subapp that supports adding arbitrary notebooks from the command line" arch=('i686' 'x86_64') url="https://github.com/dalejung/ipycli/" -license=('UNKNOWN') +license=('BSD') depends=('python2' 'ipython2') optdepends=() makedepends=('git' 'python2') install= provides=() conflicts=() -source=() +source=("git://github.com/dalejung/ipycli.git") +md5sums=("SKIP") +pkgver() { + cd "$srcdir/ipycli" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} -_gitroot="git://github.com/dalejung/ipycli.git" -_gitname="ipycli" - -build() { - - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $_gitname ] ; then - cd $_gitname && git pull origin - msg "The local files are updated." - else - git clone $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd "$srcdir/$_gitname-build" - +package() { + cd "$srcdir/ipycli" #lib - python2 setup.py install --root="${pkgdir}" + python2 setup.py install --root="${pkgdir}" #bin mkdir "${pkgdir}/usr/bin" - cp "bin/nb" "${pkgdir}/usr/bin" - sed -i -e "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/nb" - cp "bin/ipycli" "${pkgdir}/usr/bin" - sed -i -e "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/ipycli" + cp "bin/nb" "${pkgdir}/usr/bin" + sed -i -e "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/nb" + cp "bin/ipycli" "${pkgdir}/usr/bin" + sed -i -e "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" "${pkgdir}/usr/bin/ipycli" #templates/statics - cp -r "ipycli/static" "${pkgdir}/usr/lib/python2.7/site-packages/ipycli/" - cp -r "ipycli/templates" "${pkgdir}/usr/lib/python2.7/site-packages/ipycli/" + cp -r "ipycli/static" "${pkgdir}/usr/lib/python2.7/site-packages/ipycli/" + cp -r "ipycli/templates" "${pkgdir}/usr/lib/python2.7/site-packages/ipycli/" } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 57df863289a196472d9babbc39c7c0ee1af9410d Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Tue, 10 Jun 2014 20:09:38 -0300 Subject: pacman2pacman-1.4.1-2: update version --- pcr/pacman2pacman/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcr/pacman2pacman/PKGBUILD b/pcr/pacman2pacman/PKGBUILD index f07efff7d..13dcf2e18 100644 --- a/pcr/pacman2pacman/PKGBUILD +++ b/pcr/pacman2pacman/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Joseph Graham pkgname=pacman2pacman pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A plugin for pactor to download packages by bittorrent and seed them back up" arch=(any) url="https://wiki.parabolagnulinux.org/Pacman2pacman" @@ -10,7 +10,7 @@ depends=(transmission-cli) options=(emptydirs) install=$pkgname.install source=(https://t67.eu/filebin/$pkgname-$pkgver.tar.gz) -md5sums=('736eb3d6d557030f733b4b3f4e08c2be') +md5sums=('c7972067210b67c1b51d81c6f537927a') package() { cd $pkgname -- cgit v1.2.3-54-g00ecf From 724369dc21715f617963f4939b87a6594cded33d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Jun 2014 16:55:33 -0300 Subject: kde packages: updating libre and nonprism packages to 4.13.2 version --- libre/kdebase-konqueror-libre/PKGBUILD | 6 ++-- libre/kdebase-runtime-libre/PKGBUILD | 8 +++--- libre/kdelibs-libre/PKGBUILD | 16 ++++------- libre/kdelibs-libre/fix-xfreepixmap-call.patch | 24 ---------------- libre/kdelibs-libre/security-fix.patch | 32 ---------------------- libre/kdenetwork-kopete-libre/PKGBUILD | 8 +++--- libre/kdeutils-ark-libre/PKGBUILD | 6 ++-- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 8 +++--- nonprism/kdepim-runtime-nonprism/PKGBUILD | 6 ++-- 9 files changed, 27 insertions(+), 87 deletions(-) delete mode 100644 libre/kdelibs-libre/fix-xfreepixmap-call.patch delete mode 100644 libre/kdelibs-libre/security-fix.patch diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index 8cf04237f..6f2ce3b32 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212468 2014-05-14 19:53:18Z svenstaro $ +# $Id: PKGBUILD 214443 2014-06-09 03:04:24Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz # Maintainer: Michał Masłowski @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -18,7 +18,7 @@ provides=("kdebase-konqueror=$pkgver") makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'baloo-widgets') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" 'konq-about-fsdg.diff') -sha1sums=('9b19ce18bd7e2beb9d43d33fc9a6c98b6452fc50' +sha1sums=('90b4fefcd307df8da6f6eab4da97d9e7be9f2f78' 'd6cbb53c04179b8180f9439eca156b7ff2e76b3a') pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index 65f819c52..468f35da4 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 213013 2014-05-17 10:14:55Z andrea $ +# $Id: PKGBUILD 214415 2014-06-09 03:02:38Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz # Maintainer: André Silva _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kde-runtime' @@ -26,7 +26,7 @@ install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_html.desktop' 'duckduckgo_lite.desktop') -sha1sums=('57b0cd485ec9f7d70b535c136516dd0d3c345311' +sha1sums=('3ee6b1d263b7c87a63951a0ebc4d77a93c92214a' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 696ab790d..60f17de47 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 213594 2014-05-26 08:53:32Z andrea $ +# $Id: PKGBUILD 214788 2014-06-10 17:50:05Z andyrtr $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,12 +21,10 @@ depends=('attica' 'libxss' 'krb5' 'grantlee' 'qca' 'libdbusmenu-qt' 'polkit-qt' makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'qt4.patch' - 'fix-cifs-mount.patch' 'khtml-fsdg.diff') -sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec' + 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') +sha1sums=('c540edeb7da23f5a8feacb4d775bce43f2060a96' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' - '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec' 'a1502a964081ad583a00cf90c56e74bf60121830') prepare() { @@ -35,9 +33,7 @@ prepare() { patch -p1 -i "${srcdir}"/kde-applications-menu.patch # qmake refers to Qt5 patch -p1 -i "${srcdir}"/qt4.patch - - patch -p1 -i "${srcdir}"/fix-cifs-mount.patch - # Don't ask the user to download a plugin, it's probably nonfree. + # don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff } diff --git a/libre/kdelibs-libre/fix-xfreepixmap-call.patch b/libre/kdelibs-libre/fix-xfreepixmap-call.patch deleted file mode 100644 index 5f5354633..000000000 --- a/libre/kdelibs-libre/fix-xfreepixmap-call.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 9323adac35d40da69e3cb18504340e984c4afd05 -Author: Anne-Marie Mahfouf -Date: Fri May 10 17:12:33 2013 +0200 - - Fix crash when quitting apps - - Backport to 4.10 branch - - CCBUG: 319137 - -diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp -index b54fb1a..1925670 100644 ---- a/plasma/private/dialogshadows.cpp -+++ b/plasma/private/dialogshadows.cpp -@@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps() - { - #ifdef Q_WS_X11 - foreach (const QPixmap &pixmap, m_shadowPixmaps) { -+ if (!QX11Info::display()) { -+ return; -+ } - if (!pixmap.isNull()) { - XFreePixmap(QX11Info::display(), pixmap.handle()); - } diff --git a/libre/kdelibs-libre/security-fix.patch b/libre/kdelibs-libre/security-fix.patch deleted file mode 100644 index 3d98a47ae..000000000 --- a/libre/kdelibs-libre/security-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 65d736dab592bced4410ccfa4699de89f78c96ca -Author: Grégory Oestreicher -Date: Wed May 8 23:16:00 2013 +0200 - - Don't show passwords contained in HTTP URLs in error messages - BUG: 319428 - -diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp -index 2d139a9..129fc7b 100644 ---- a/kioslave/http/http.cpp -+++ b/kioslave/http/http.cpp -@@ -3056,7 +3056,7 @@ try_again: - ; // Ignore error - } else { - if (!sendErrorPageNotification()) { -- error(ERR_INTERNAL_SERVER, m_request.url.url()); -+ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl()); - return false; - } - } -@@ -3072,9 +3072,9 @@ try_again: - // Tell that we will only get an error page here. - if (!sendErrorPageNotification()) { - if (m_request.responseCode == 403) -- error(ERR_ACCESS_DENIED, m_request.url.url()); -+ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl()); - else -- error(ERR_DOES_NOT_EXIST, m_request.url.url()); -+ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl()); - return false; - } - } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) { diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 74e2d75fb..1a468243e 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $ +# $Id: PKGBUILD 214656 2014-06-09 03:17:39Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc='Instant Messenger, without nonfree Skype support' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn' makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz") -sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1') +sha1sums=('bf520ce1fd08eb0464753675405b0f362fef2606') prepare() { cd kopete-${pkgver} diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 57d2f0cc9..d97c67589 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 212732 2014-05-14 20:10:50Z svenstaro $ +# $Id: PKGBUILD 214706 2014-06-09 03:21:25Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 pkgdesc='Archiving Tool, with unar support' url='http://kde.org/applications/utilities/ark/' @@ -20,7 +20,7 @@ optdepends=('p7zip' 'zip' 'unzip' 'unar') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz" 'ark-unar-06.patch') -sha1sums=('e3c5dbe62caeb23a6a19e2313192f2d4e75f32e9' +sha1sums=('450aead29450fa1d17016e4bf8b8e5fdca30de05' 'a0a836950f185d9b2245204579f969203036fdec') prepare() { diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index 167f2a659..c8e3185f5 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 214073 2014-06-03 09:46:26Z andrea $ +# $Id: PKGBUILD 214656 2014-06-09 03:17:39Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva _pkgname=kdenetwork-kopete pkgname=kdenetwork-kopete-libre-nonprism -pkgver=4.13.1 -pkgrel=3 +pkgver=4.13.2 +pkgrel=1 pkgdesc='Instant Messenger, without nonfree Skype support and support for unsafe and dangerous for privacy protocols' url='http://kde.org/applications/internet/kopete/' arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-libkdepim') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('99e47bba25606fdccbe1ac04346e9c3acad254d1' +sha1sums=('bf520ce1fd08eb0464753675405b0f362fef2606' 'ddde6ed0b6f281512dc12cb80f712f33c6932c92') prepare() { diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD index 339d9c25a..ae950389c 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 212442 2014-05-14 19:51:52Z svenstaro $ +# $Id: PKGBUILD 214417 2014-06-09 03:02:46Z svenstaro $ # Maintainer (Arch): Andrea Scarpino # Contributor (Arch): Pierre Schmitz # Maintainer: André Silva _pkgname=kdepim-runtime pkgname=kdepim-runtime-nonprism -pkgver=4.13.1 +pkgver=4.13.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence') conflicts=(kdepim-runtime) provides=(kdepim-runtime=$pkgver) source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz") -sha1sums=('e02447616460760232f03124be8b688cd8407196') +sha1sums=('db31fa444f74478cddef1aa7c4ecf4e509f3407c') prepare() { mkdir build -- cgit v1.2.3-54-g00ecf From 63a57aadee0c0d210f1a06c541c6eba887ef6e59 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 11 Jun 2014 17:29:59 -0300 Subject: parcimonie-sh-git --- pcr/parcimonie-sh-git/PKGBUILD | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pcr/parcimonie-sh-git/PKGBUILD diff --git a/pcr/parcimonie-sh-git/PKGBUILD b/pcr/parcimonie-sh-git/PKGBUILD new file mode 100644 index 000000000..da9097afc --- /dev/null +++ b/pcr/parcimonie-sh-git/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Etienne Perot +pkgname=parcimonie-sh-git +pkgver=16.9523a3e +pkgrel=1 +pkgdesc='Bash reimplementation of parcimonie - Refresh your GnuPG keyring without disclosing your whole contact list to the world' +arch=('any') +url='https://github.com/EtiennePerot/parcimonie.sh' +license=('WTFPL') +depends=('bash' 'torsocks' 'tor' 'gnupg') +makedepends=('git') +source=('git+https://github.com/EtiennePerot/parcimonie.sh') +sha512sums=('SKIP') + +pkgver() { + cd "$startdir/parcimonie.sh" + echo "$(git rev-list --count HEAD).$(git rev-parse --short HEAD)" +} + +build() { + : +} + +package() { + cd "$srcdir/parcimonie.sh" + install -D -m644 README.md "${pkgdir}/usr/share/parcimonie.sh/README.md" + install -D -m755 parcimonie.sh "${pkgdir}/usr/share/parcimonie.sh/parcimonie.sh" + install -D -m644 pkg/parcimonie.sh@.service "${pkgdir}/usr/lib/systemd/system/parcimonie.sh@.service" + install -D -m644 pkg/sample-configuration.conf.sample "${pkgdir}/etc/parcimonie.sh.d/sample-configuration.conf.sample" + install -D -m644 pkg/all-users.conf "${pkgdir}/etc/parcimonie.sh.d/all-users.conf" + mkdir -p "${pkgdir}/usr/bin" + ln -sf /usr/share/parcimonie.sh/parcimonie.sh "${pkgdir}/usr/bin/parcimonie.sh" +} -- cgit v1.2.3-54-g00ecf From d79b0b70c7951aa68158d1957dfe6130cf9bf63e Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 11 Jun 2014 17:30:52 -0300 Subject: irssi-otr --- pcr/irssi-otr/PKGBUILD | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pcr/irssi-otr/PKGBUILD diff --git a/pcr/irssi-otr/PKGBUILD b/pcr/irssi-otr/PKGBUILD new file mode 100644 index 000000000..ae8552c33 --- /dev/null +++ b/pcr/irssi-otr/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: Christian Babeux + +pkgname=irssi-otr +pkgver=1.0.0 +pkgrel=1 +pkgdesc="Off-the-Record Messaging (OTR) for the Irssi IRC client" +arch=('i686' 'x86_64') +url="https://github.com/cryptodotis/irssi-otr" +provides=('irssi-otr4') +license=('GPL2') +depends=('libotr>=4.0.0' 'irssi>=0.8.15' 'libgcrypt>=1.5.0' 'glib2') +source=("https://github.com/cryptodotis/irssi-otr/archive/v$pkgver.tar.gz") +sha1sums=('1a981b96317778cdf72c0d2a8b08c44f72d808e5') + +build() +{ + cd "irssi-otr-${pkgver}" + ./bootstrap + ./configure --prefix=/usr + make +} + +package() { + cd "irssi-otr-${pkgver}" + make install DESTDIR=${pkgdir} +} -- cgit v1.2.3-54-g00ecf From 82003723b18bb91b7293874ae3524823ec6795dc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Jun 2014 19:25:30 -0300 Subject: xbmc-libre-13.1-2: updating version FIXES: FS#40656 (https://bugs.archlinux.org/task/40656) - [xbmc] Error when upgrading xbmc while xbmc is running lirc device path given in configure so the trick for standalone is no longer needed and starting xbmc from desktop also works with lirc now --- ...m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch | 75 ---------------------- libre/xbmc-libre/PKGBUILD | 27 ++++---- libre/xbmc-libre/xbmc.install | 10 ++- libre/xbmc-libre/xbmc.service | 2 +- 4 files changed, 22 insertions(+), 92 deletions(-) delete mode 100644 libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch diff --git a/libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch b/libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch deleted file mode 100644 index 20d8e0250..000000000 --- a/libre/xbmc-libre/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch +++ /dev/null @@ -1,75 +0,0 @@ -From a58bcbb0a35ac8e26a880be477705d833330ecc5 Mon Sep 17 00:00:00 2001 -From: Jonathan Marshall -Date: Tue, 6 May 2014 19:40:17 +1200 -Subject: [PATCH 1/7] [rtmp] check m_rtmp for non-NULL - fixes crashes with - missing librtmp - ---- - .../dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp -index b02792a..93fc6f0 100644 ---- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp -+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp -@@ -104,7 +104,8 @@ CDVDInputStreamRTMP::~CDVDInputStreamRTMP() - m_sStreamPlaying = NULL; - - Close(); -- m_libRTMP.Free(m_rtmp); -+ if (m_rtmp) -+ m_libRTMP.Free(m_rtmp); - m_rtmp = NULL; - m_bPaused = false; - } -@@ -139,7 +140,7 @@ bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string& content) - m_sStreamPlaying = NULL; - } - -- if (!CDVDInputStream::Open(strFile, "video/x-flv")) -+ if (!m_rtmp || !CDVDInputStream::Open(strFile, "video/x-flv")) - return false; - - CSingleLock lock(m_RTMPSection); -@@ -181,7 +182,8 @@ void CDVDInputStreamRTMP::Close() - CSingleLock lock(m_RTMPSection); - CDVDInputStream::Close(); - -- m_libRTMP.Close(m_rtmp); -+ if (m_rtmp) -+ m_libRTMP.Close(m_rtmp); - - m_optionvalues.clear(); - m_eof = true; -@@ -190,6 +192,9 @@ void CDVDInputStreamRTMP::Close() - - int CDVDInputStreamRTMP::Read(uint8_t* buf, int buf_size) - { -+ if (!m_rtmp) -+ return -1; -+ - int i = m_libRTMP.Read(m_rtmp, (char *)buf, buf_size); - if (i < 0) - m_eof = true; -@@ -210,7 +215,7 @@ bool CDVDInputStreamRTMP::SeekTime(int iTimeInMsec) - CLog::Log(LOGNOTICE, "RTMP Seek to %i requested", iTimeInMsec); - CSingleLock lock(m_RTMPSection); - -- if (m_libRTMP.SendSeek(m_rtmp, iTimeInMsec)) -+ if (m_rtmp && m_libRTMP.SendSeek(m_rtmp, iTimeInMsec)) - return true; - - return false; -@@ -229,7 +234,8 @@ bool CDVDInputStreamRTMP::Pause(double dTime) - - CLog::Log(LOGNOTICE, "RTMP Pause %s requested", m_bPaused ? "TRUE" : "FALSE"); - -- m_libRTMP.Pause(m_rtmp, m_bPaused); -+ if (m_rtmp) -+ m_libRTMP.Pause(m_rtmp, m_bPaused); - - return true; - } --- -1.9.1 - diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index df4d37f38..bd8e32c35 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 112480 2014-06-02 19:00:07Z idevolder $ +# $Id: PKGBUILD 112817 2014-06-08 08:35:29Z idevolder $ # Maintainer (Arch): Sergej Pupykin # Contributor (Arch): Brad Fanella # Contributor (Arch): [vEX] # Contributor (Arch): Zeqadious # Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Bartłomiej Piotrowski +# Contributor (Arch): Maxime Gauduin # Maintainer: André Silva _prefix=/usr _pkgname=xbmc pkgname=xbmc-libre -pkgver=13.0 -_codename=Gotham_r2 -pkgrel=6 +pkgver=13.1 +_codename=Gotham +pkgrel=2 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -46,23 +47,21 @@ optdepends=( ) install="${_pkgname}.install" mksource=( - "xbmc-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" + "xbmc-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" ) source=( - "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" - "xbmc.service" - "enable-external-ffmpeg.patch" - '0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch' + "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" + 'xbmc.service' + 'enable-external-ffmpeg.patch' '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' ) mksha256sums=( - '663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903' + '344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678' ) sha256sums=( - 'a23b416f7cdc5f2b3d5544fc9a2ac22c4cdddd117ba82fe8aab25805552ff974' - 'f83097388e6c9b301cac78de95cf1797d4aaa11e4021734c28d643320e76d919' + '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f' + '17ea860b675568f516df0289e5663029a2ce1829b0dfa3c71636ef1ae7cd2207' '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' - '4d643f1bc5a0f9a6bba36c8c2c2d220351acb58172c57d86417b67c02d39fa2b' '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' ) @@ -76,7 +75,6 @@ mksource() { prepare() { cd "$srcdir/xbmc-$pkgver-$_codename" patch -p1 -i "$srcdir/enable-external-ffmpeg.patch" - patch -p1 -i "$srcdir/0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch" patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + @@ -126,6 +124,7 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ + --with-lirc-device=/run/lirc/lircd \ --disable-non-free # Now (finally) build diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 406476198..48f337c55 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -10,10 +10,16 @@ post_install() { post_upgrade() { post_install $1 if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then - groupmod -g 420 xbmc + groupmod -g 420 xbmc > /dev/null 2>&1 fi if ! id -u xbmc | grep 420 > /dev/null 2>&1; then - usermod -u 420 xbmc + usermod -u 420 xbmc > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + echo "Changing uid of user xbmc failed" + echo "It is recommended that the uid is changed." + echo "Stop all processes running under the xbmc user and reinstall xbmc" + echo "or change the uid manually. (usermod -u 420 xbmc)" + fi chown -R xbmc:xbmc /var/lib/xbmc fi } diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service index d36ddb05a..81a37ac7e 100644 --- a/libre/xbmc-libre/xbmc.service +++ b/libre/xbmc-libre/xbmc.service @@ -9,7 +9,7 @@ Group = xbmc PAMName=login Type = simple TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7 Restart = on-abort [Install] -- cgit v1.2.3-54-g00ecf From 78766e0875947c13a97bc958cff89abc5d2f6b1b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Jun 2014 22:11:42 -0300 Subject: xbmc-libre-lts-12.3-4: updating revision based on xbmc from Arch FIXES: FS#40656 (https://bugs.archlinux.org/task/40656) - [xbmc] Error when upgrading xbmc while xbmc is running lirc device path given in configure so the trick for standalone is no longer needed and starting xbmc from desktop also works with lirc now --- libre/xbmc-libre-lts/PKGBUILD | 9 +++++---- libre/xbmc-libre-lts/xbmc.install | 10 ++++++++-- libre/xbmc-libre-lts/xbmc.service | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD index 8a146c2dc..5596513a9 100644 --- a/libre/xbmc-libre-lts/PKGBUILD +++ b/libre/xbmc-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ _pkgname=xbmc pkgname=xbmc-libre-lts pkgver=12.3 _codename=Frodo -pkgrel=3 +pkgrel=4 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -43,7 +43,7 @@ mksource=( "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" ) source=( - "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver-$_codename.tar.gz" 'xbmc.service' "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' @@ -52,8 +52,8 @@ mkmd5sums=( '7ae385ebf8e5cfcb917393235e6efbdb' ) md5sums=( - '7c71af50af55b097e4365a58b70754e8' - 'de331663cc8adc94f2fe44a262cfff58' + '10ed8b9cb84b2825d746c26bd5236899' + '12c9b4dfb8dd0d5b20cc230c28388160' '7fd6399d2ffbdf06b724f0cc2efa0784' '8998bc505ae4c66604c90b1c005be8c2' ) @@ -119,6 +119,7 @@ build() { --enable-libusb \ --enable-libcec \ --enable-external-libraries \ + --with-lirc-device=/run/lirc/lircd \ --enable-external-ffmpeg \ --disable-non-free diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install index 406476198..48f337c55 100644 --- a/libre/xbmc-libre-lts/xbmc.install +++ b/libre/xbmc-libre-lts/xbmc.install @@ -10,10 +10,16 @@ post_install() { post_upgrade() { post_install $1 if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then - groupmod -g 420 xbmc + groupmod -g 420 xbmc > /dev/null 2>&1 fi if ! id -u xbmc | grep 420 > /dev/null 2>&1; then - usermod -u 420 xbmc + usermod -u 420 xbmc > /dev/null 2>&1 + if [[ $? -ne 0 ]]; then + echo "Changing uid of user xbmc failed" + echo "It is recommended that the uid is changed." + echo "Stop all processes running under the xbmc user and reinstall xbmc" + echo "or change the uid manually. (usermod -u 420 xbmc)" + fi chown -R xbmc:xbmc /var/lib/xbmc fi } diff --git a/libre/xbmc-libre-lts/xbmc.service b/libre/xbmc-libre-lts/xbmc.service index d36ddb05a..81a37ac7e 100644 --- a/libre/xbmc-libre-lts/xbmc.service +++ b/libre/xbmc-libre-lts/xbmc.service @@ -9,7 +9,7 @@ Group = xbmc PAMName=login Type = simple TTYPath=/dev/tty7 -ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp vt7 +ExecStart = /usr/bin/xinit /usr/bin/dbus-launch --exit-with-session /usr/bin/xbmc-standalone -- :0 -nolisten tcp vt7 Restart = on-abort [Install] -- cgit v1.2.3-54-g00ecf From 721160f8acc254448e3c9cc6b533ec2e183867d6 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 Jun 2014 22:29:54 -0300 Subject: linux-libre-grsec-3.14.6.201406101411-1: updating version * enable chroot_enforce_chdir by default * reword chroot restrictions comment --- ...tooth-Enable-autosuspend-for-Intel-Blueto.patch | 33 -------------- ...-delay-enabling-smart-FIFO-until-after-be.patch | 52 ---------------------- .../0011-kernfs-fix-removed-error-check.patch | 13 ------ .../0015-fix-xsdt-validation.patch | 42 ----------------- libre/linux-libre-grsec/PKGBUILD | 44 ++++-------------- libre/linux-libre-grsec/config.i686 | 5 ++- libre/linux-libre-grsec/config.x86_64 | 5 ++- libre/linux-libre-grsec/sysctl.conf | 4 +- 8 files changed, 17 insertions(+), 181 deletions(-) delete mode 100644 libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch delete mode 100644 libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch delete mode 100644 libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch delete mode 100644 libre/linux-libre-grsec/0015-fix-xsdt-validation.patch diff --git a/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch b/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch deleted file mode 100644 index 74283b57c..000000000 --- a/libre/linux-libre-grsec/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 71d4f3022d1f625d94187f7cda682d2233a692d8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Thomas=20B=C3=A4chler?= -Date: Thu, 3 Apr 2014 23:59:49 +0200 -Subject: [PATCH 05/10] Revert "Bluetooth: Enable autosuspend for Intel - Bluetooth device" - -This reverts commit d2bee8fb6e18f6116aada39851918473761f7ab1. - -USB autosuspend still breaks on some xhci controllers, so disable -it by default as long as no solution is found. ---- - drivers/bluetooth/btusb.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index baeaaed..6d6e09e 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1478,10 +1478,8 @@ static int btusb_probe(struct usb_interface *intf, - if (id->driver_info & BTUSB_BCM92035) - hdev->setup = btusb_setup_bcm92035; - -- if (id->driver_info & BTUSB_INTEL) { -- usb_enable_autosuspend(data->udev); -+ if (id->driver_info & BTUSB_INTEL) - hdev->setup = btusb_setup_intel; -- } - - /* Interface numbers are hardcoded in the specification */ - data->isoc = usb_ifnum_to_if(data->udev, 1); --- -1.9.2 - diff --git a/libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch b/libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch deleted file mode 100644 index 7f18091a4..000000000 --- a/libre/linux-libre-grsec/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 784c4f0b18f89922ddc0fe21e5ec64cc370bb3f2 Mon Sep 17 00:00:00 2001 -From: Johannes Berg -Date: Wed, 19 Mar 2014 18:36:39 +0100 -Subject: [PATCH 10/10] iwlwifi: mvm: delay enabling smart FIFO until after - beacon RX - -If we have no beacon data before association, delay smart FIFO -enablement until after we have this data. - -Not doing so can cause association failures in extremely silent -environments (usually only a shielded box/room) as beacon RX is -not sent to the host immediately, and then the association time -event ends without the host receiving any beacon even though it -was on the air - it's just stuck on the FIFO. - -Cc: [3.14] -Signed-off-by: Johannes Berg -Signed-off-by: Emmanuel Grumbach ---- - drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 + - drivers/net/wireless/iwlwifi/mvm/sf.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -index c35b866..45e861e 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c -+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c -@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_station(struct iwl_mvm *mvm, - */ - iwl_mvm_remove_time_event(mvm, mvmvif, - &mvmvif->time_event_data); -+ iwl_mvm_sf_update(mvm, vif, false); - } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS | - BSS_CHANGED_QOS)) { - ret = iwl_mvm_power_update_mode(mvm, vif); -diff --git a/drivers/net/wireless/iwlwifi/mvm/sf.c b/drivers/net/wireless/iwlwifi/mvm/sf.c -index 8401627..88809b2 100644 ---- a/drivers/net/wireless/iwlwifi/mvm/sf.c -+++ b/drivers/net/wireless/iwlwifi/mvm/sf.c -@@ -274,7 +274,8 @@ int iwl_mvm_sf_update(struct iwl_mvm *mvm, struct ieee80211_vif *changed_vif, - return -EINVAL; - if (changed_vif->type != NL80211_IFTYPE_STATION) { - new_state = SF_UNINIT; -- } else if (changed_vif->bss_conf.assoc) { -+ } else if (changed_vif->bss_conf.assoc && -+ changed_vif->bss_conf.dtim_period) { - mvmvif = iwl_mvm_vif_from_mac80211(changed_vif); - sta_id = mvmvif->ap_sta_id; - new_state = SF_FULL_ON; --- -1.9.2 - diff --git a/libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch b/libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch deleted file mode 100644 index b597595c6..000000000 --- a/libre/linux-libre-grsec/0011-kernfs-fix-removed-error-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c -index 8034706..e01ea4a 100644 ---- a/fs/kernfs/file.c -+++ b/fs/kernfs/file.c -@@ -484,6 +484,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma) - - ops = kernfs_ops(of->kn); - rc = ops->mmap(of, vma); -+ if (rc) -+ goto out_put; - - /* - * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup() diff --git a/libre/linux-libre-grsec/0015-fix-xsdt-validation.patch b/libre/linux-libre-grsec/0015-fix-xsdt-validation.patch deleted file mode 100644 index 82dd2be25..000000000 --- a/libre/linux-libre-grsec/0015-fix-xsdt-validation.patch +++ /dev/null @@ -1,42 +0,0 @@ -@@ -, +, @@ - acpi_tb_parse_root_table(). - Commit: 671cc68dc61f029d44b43a681356078e02d8dab8 - Subject: ACPICA: Back port and refine validation of the XSDT root table. ---- - drivers/acpi/acpica/tbutils.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) ---- a/drivers/acpi/acpica/tbutils.c -+++ a/drivers/acpi/acpica/tbutils.c -@@ -461,6 +461,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - u32 table_count; - struct acpi_table_header *table; - acpi_physical_address address; -+ acpi_physical_address rsdt_address; - u32 length; - u8 *table_entry; - acpi_status status; -@@ -488,11 +489,13 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - * as per the ACPI specification. - */ - address = (acpi_physical_address) rsdp->xsdt_physical_address; -+ rsdt_address = (acpi_physical_address) rsdp->rsdt_physical_address; - table_entry_size = ACPI_XSDT_ENTRY_SIZE; - } else { - /* Root table is an RSDT (32-bit physical addresses) */ - - address = (acpi_physical_address) rsdp->rsdt_physical_address; -+ rsdt_address = address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - -@@ -515,8 +518,7 @@ acpi_status __init acpi_tb_parse_root_table(acpi_physical_address rsdp_address) - - /* Fall back to the RSDT */ - -- address = -- (acpi_physical_address) rsdp->rsdt_physical_address; -+ address = rsdt_address; - table_entry_size = ACPI_RSDT_ENTRY_SIZE; - } - } - diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index b3c73dcef..9fac0ece5 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -12,13 +12,13 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.14 -_sublevel=5 +_sublevel=6 _grsecver=3.0 -_timestamp=201406051310 +_timestamp=201406101411 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} pkgrel=1 -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://grsecurity.net/" license=('GPL2') @@ -39,20 +39,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '0001-Bluetooth-allocate-static-minor-for-vhci.patch' '0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch' '0003-module-remove-MODULE_GENERIC_TABLE.patch' - '0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch' '0006-genksyms-fix-typeof-handling.patch' - '0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch' - '0011-kernfs-fix-removed-error-check.patch' '0012-fix-saa7134.patch' - '0015-fix-xsdt-validation.patch' 'sysctl.conf' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' - '0bc9acbcc6d5fcabcc133a767c55e3040475e950ef80f866038d4ba0033e78d8' - '4011302ac77541893ff1350f02255b45aa6b3ee5c4cb38581d063152dabb5e5a' + 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' + 'abefdcbacb2c78c0de1168915dc26d16e35ec0e6158e0bbbc84fad819b234404' 'SKIP' - 'a82a5b673dae3f1aa8124e91c485cb8648623d560b7543da63fffab2606443d6' - '51e86aeeb4fadbb2ead2b4af115f0bfd04afb83c9959856e3495d704cec55db6' + '670869cdfc522e452332ec953fe860cf1a2974edfe8d0c851fbdba70b6167921' + '64a457c3d7cc4ef530359f2f5132697ab3bf9ea3cb64d13d9dbf68ed66325606' '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' @@ -61,14 +57,10 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '6d72e14552df59e6310f16c176806c408355951724cd5b48a47bf01591b8be02' '52dec83a8805a8642d74d764494acda863e0aa23e3d249e80d4b457e20a3fd29' '65d58f63215ee3c5f9c4fc6bce36fc5311a6c7dbdbe1ad29de40647b47ff9c0d' - '3fffb01cf97a5a7ab9601cb277d2468c0fb1e1cceba4225915f3ffae3a5694ec' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' - 'c0af4622f75c89fef62183e18b7d49998228d4eaa906c6accaf4aa4ff0134f85' - '04f44bf5c181d6dc31905937c1bdccb0f5aecaad3a579e99b302502b9cbe0f7a' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' - '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' - 'e734ac2a6e865b70dbe1e55ce55a5bd1b1e0cedea903c6341b9cfbabe420c763' - '4f1db7c68dbff6d80258de4074af46b989cedcda175776b567cd4658b33c9f99') + '763f9323cdefc9ddf74ffeffd856f9eaec4d8d4ef702c88ee1aab429c2d0b389' + 'ce3b8b43ff2650eab53cb790c403392358dad7461c512d4f9c43c523e42f6643') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -107,33 +99,15 @@ prepare() { patch -p1 -i "${srcdir}/0002-module-allow-multiple-calls-to-MODULE_DEVICE_TABLE-p.patch" patch -p1 -i "${srcdir}/0003-module-remove-MODULE_GENERIC_TABLE.patch" - # Disable usb autosuspend for intel btusb - # See http://www.spinics.net/lists/kernel/msg1716461.html - # Until a solution is found, make sure the driver leaves autosuspend alone - patch -p1 -i "${srcdir}/0005-Revert-Bluetooth-Enable-autosuspend-for-Intel-Blueto.patch" - # Fix generation of symbol CRCs # http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=dc53324060f324e8af6867f57bf4891c13c6ef18 patch -p1 -i "${srcdir}/0006-genksyms-fix-typeof-handling.patch" - # https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/iwlwifi-fixes.git/commit/?id=12f853a89e29f50b17698e17e73c328a35f1498d - # FS#39815 - patch -p1 -i "${srcdir}/0010-iwlwifi-mvm-delay-enabling-smart-FIFO-until-after-be.patch" - - # fix Xorg crash with i810 chipset due to wrong removed error check - # References: http://lkml.kernel.org/g/533D01BD.1010200@googlemail.com - patch -Np1 -i "${srcdir}/0011-kernfs-fix-removed-error-check.patch" - # fix saa7134 video # https://bugs.archlinux.org/task/39904 # https://bugzilla.kernel.org/show_bug.cgi?id=73361 patch -Np1 -i "${srcdir}/0012-fix-saa7134.patch" - # fix xsdt validation bug - # https://bugs.archlinux.org/task/39811 - # https://bugzilla.kernel.org/show_bug.cgi?id=73911 - patch -Np1 -i "${srcdir}/0015-fix-xsdt-validation.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 99ccdb5bf..288f1caca 100644 --- a/libre/linux-libre-grsec/config.i686 +++ b/libre/linux-libre-grsec/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.4.201405281922-1 Kernel Configuration +# Linux/x86 3.14.6.201406101411-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -207,6 +207,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -265,7 +266,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -523,6 +523,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index 2e13102ee..fc26220ea 100644 --- a/libre/linux-libre-grsec/config.x86_64 +++ b/libre/linux-libre-grsec/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.14.4.201405281922-1 Kernel Configuration +# Linux/x86 3.14.6.201406101411-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -216,6 +216,7 @@ CONFIG_SLUB_DEBUG=y # CONFIG_SLAB is not set CONFIG_SLUB=y CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -280,7 +281,6 @@ CONFIG_COMPAT_OLD_SIGACTION=y CONFIG_SLABINFO=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 -# CONFIG_SYSTEM_TRUSTED_KEYRING is not set CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y @@ -534,6 +534,7 @@ CONFIG_PM_CLK=y CONFIG_ACPI=y CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/libre/linux-libre-grsec/sysctl.conf b/libre/linux-libre-grsec/sysctl.conf index bef8e350d..ebd4dd574 100644 --- a/libre/linux-libre-grsec/sysctl.conf +++ b/libre/linux-libre-grsec/sysctl.conf @@ -44,7 +44,7 @@ kernel.grsecurity.fifo_restrictions = 1 #kernel.grsecurity.romount_protect = 1 # -# chroot restrictions (these will break containers) +# chroot restrictions (many of these will break containers) # #kernel.grsecurity.chroot_caps = 1 @@ -57,7 +57,7 @@ kernel.grsecurity.fifo_restrictions = 1 #kernel.grsecurity.chroot_deny_shmat = 1 #kernel.grsecurity.chroot_deny_sysctl = 1 #kernel.grsecurity.chroot_deny_unix = 1 -#kernel.grsecurity.chroot_enforce_chdir = 1 +kernel.grsecurity.chroot_enforce_chdir = 1 #kernel.grsecurity.chroot_findtask = 1 #kernel.grsecurity.chroot_restrict_nice = 1 -- cgit v1.2.3-54-g00ecf From da19b3a585db23bc37d0554f0226279a1d06b827 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 12 Jun 2014 01:44:59 -0300 Subject: iceweasel-libre-1:30.0.deb1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 287 --------------------- .../Fixup-Reset-Firefox-after-bad-merge.patch | 108 -------- libre/iceweasel-libre/PKGBUILD | 41 +-- libre/iceweasel-libre/libre.patch | 108 ++++---- libre/iceweasel-libre/mozconfig | 1 + 5 files changed, 63 insertions(+), 482 deletions(-) delete mode 100644 libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch delete mode 100644 libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch deleted file mode 100644 index 56de11354..000000000 --- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ /dev/null @@ -1,287 +0,0 @@ -From: Mike Hommey -Date: Tue, 5 Jun 2012 08:57:06 +0200 -Subject: Bug 756390 - Make the "Reset Firefox" feature more generic - -diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js -index 91c5c1c..2f8bd1a 100644 ---- a/browser/components/migration/content/migration.js -+++ b/browser/components/migration/content/migration.js -@@ -249,7 +249,7 @@ var MigrationWizard = { - } - - var brandBundle = document.getElementById("brandBundle"); -- // These strings don't exist when not using official branding. If that's -+ // These strings may not exist when not using official branding. If that's - // the case, just skip this page. - try { - var pageTitle = brandBundle.getString("homePageMigrationPageTitle"); -@@ -281,8 +281,8 @@ var MigrationWizard = { - case "chrome": - source = "sourceNameChrome"; - break; -- case "firefox": -- source = "sourceNameFirefox"; -+ case "self": -+ source = "brand"; - break; - } - -@@ -292,7 +292,12 @@ var MigrationWizard = { - var oldHomePageURL = this._migrator.sourceHomePageURL; - - if (oldHomePageURL && source) { -- var appName = MigrationUtils.getLocalizedString(source); -+ var appName; -+ if (source == "brand") { -+ appName = brandBundle.GetStringFromName("brandFullName"); -+ } else { -+ appName = MigrationUtils.getLocalizedString(source); -+ } - var oldHomePageLabel = - brandBundle.getFormattedString("homePageImport", [appName]); - var oldHomePage = document.getElementById("oldHomePage"); -diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul -index f030756..23e37ff 100644 ---- a/browser/components/migration/content/migration.xul -+++ b/browser/components/migration/content/migration.xul -@@ -42,7 +42,7 @@ - #elifdef XP_UNIX - - #endif -- -+