diff options
127 files changed, 2931 insertions, 2171 deletions
diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD index bd6687ad1..7614c39e7 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 215080 2014-06-13 10:32:35Z bpiotrowski $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -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=43 _knockpatchver=${_basekernel} pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.40 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.42 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://gnunet.org/knock" license=('GPL2') @@ -34,9 +34,9 @@ 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' + '608bae7e9718c3b178c8a6b5594660e3' '26380d6f05471ef8e065a77d87588009' - 'f22e0a6a7634902f5a00eb25ad677c65' + '5fd18f6d29279ee8e79176b774214b71' '6550ba0e23b7729cd9db2475bde8fac2' '02023949955a138c44bb0c46227a6d18' '2967cecc3af9f954ccc822fd63dca6ff' @@ -44,7 +44,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '4515aaccb905a164f5e44213d264b5ed') + 'fc169cfc460e78637a667465e26493e0') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -124,7 +124,7 @@ build() { #make menuconfig # CLI menu for configuration #make nconfig # new CLI menu for configuration #make xconfig # X-based configuration - #make oldconfig # using old config from previous kernel version + make oldconfig # using old config from previous kernel version # ... or manually edit .config # rewrite configuration diff --git a/kernels/linux-libre-lts-knock/config.i686 b/kernels/linux-libre-lts-knock/config.i686 index 05b32b275..928e57d25 100644 --- a/kernels/linux-libre-lts-knock/config.i686 +++ b/kernels/linux-libre-lts-knock/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.15-1 Kernel Configuration +# Linux/x86 3.10.43 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1719,7 +1719,7 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_SCAN_ASYNC=y # # SCSI Transports @@ -1982,6 +1982,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -3400,6 +3401,7 @@ CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -4817,18 +4819,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5188,7 +5178,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m 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?= <thomas@archlinux.org> -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 <tpowa@archlinux.org> # Contributor (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -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?= <thomas@archlinux.org> -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 <johannes.berg@intel.com> -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: <stable@vger.kernel.org> [3.14] -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> ---- - 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 <tpowa@archlinux.org> # Contributor (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -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 diff --git a/kernels/paxctl/PKGBUILD b/kernels/paxctl/PKGBUILD deleted file mode 100644 index b3277e92c..000000000 --- a/kernels/paxctl/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Contributors: -# sh0 <mee@sh0.org> -# s1gma <s1gma@mindslicer.com> -# henning mueller <henning@orgizm.net> - -pkgname='paxctl' -pkgver='0.7' -pkgrel=3 -pkgdesc='Manages various PaX related program header flags for Elf32, Elf64, binaries' -url=http://pax.grsecurity.net -arch=(i686 x86_64 mips64el) -license=(GPL) -depends=() -source=(http://pax.grsecurity.net/$pkgname-$pkgver.tar.bz2) - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's:/sbin:/usr/bin:' Makefile -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - -sha256sums=('f7077784ca5695bf74061e6f66b86db855e0dcaa1fc94e6251f6ecd0b879cdc8') diff --git a/kernels/xen-docs/PKGBUILD b/kernels/xen-docs/PKGBUILD index 272652dd5..6be95b544 100644 --- a/kernels/xen-docs/PKGBUILD +++ b/kernels/xen-docs/PKGBUILD @@ -2,10 +2,10 @@ # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=xen-docs -pkgver=4.3.1 +pkgver=4.4.0 pkgrel=1 pkgdesc="Xen 4 (docs)" -arch=('i686' 'x86_64' 'mips64el') +arch=('i686' 'x86_64') url="http://www.xen.org/" license=('GPL') makedepends=('markdown' 'transfig' 'ghostscript') @@ -21,4 +21,4 @@ package() { make DESTDIR=$pkgdir install-docs } -md5sums=('7616b8704e1ab89c81f011f0e3703bc8') +md5sums=('fd9031d499af38c5d04108681734027e') diff --git a/kernels/xen/09_xen b/kernels/xen/09_xen index ddb20696f..c00d1ab96 100644 --- a/kernels/xen/09_xen +++ b/kernels/xen/09_xen @@ -1,141 +1,231 @@ -#! /bin/sh -e +#!/usr/bin/env bash + +## +## grub-mkconfig helper script specific to Parabola GNU/Linux-libre +## Contributed by "Keshav Amburay" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm> +## Rebranded for Parabola by "André Silva" <emulatorman@parabola.nu> +## Updated on 08 February 2014 +## +## Script based on do_grub_config() function in Arch Archboot ISO Installer/Setup script +## Some parts taken from /etc/grub.d/10_linux script shipped by GRUB(2) upstream +## +## This script can be freely distributed and/or modified +## under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This script is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## + +## Adapted for use with the xen package, to ensure feature comparity +## Modified by "David Sutton" <kantras - gmail com> + +_FUNC_GRUB_FILE_PRESENT() { + + [[ -z "${GRUB_PLATFORM}" ]] && GRUB_PLATFORM="x86" + + if [[ "${GRUB_PLATFORM}" == "x86" ]]; then + check="--is-x86-linux32" + elif [[ "${GRUB_PLATFORM}" == "i386-xen-pae" ]]; then + check="--is-i386-xen-pae-domu" + elif [[ "${GRUB_PLATFORM}" == "x86_64-xen" ]]; then + check="--is-x86_64-xen-domu" + else + check="--is-${GRUB_PLATFORM}-linux" + fi + + case "${GRUB_PLATFORM}" in + x86) + list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do + if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi + done)" ;; + *) + list="$(for i in "${GRUB_ROOT}"/boot/vmlinuz-linux* ; do + if grub_file_is_not_garbage "${i}" && "${grub_file}" ${check} "${i}" ; then echo -n "${i} " ; fi + done)" ;; + esac +} -if [ -f /usr/share/grub/grub-mkconfig_lib ]; then - . /usr/share/grub/grub-mkconfig_lib -else - # no grub file, so we notify and exit gracefully - echo "Cannot find grub config file, exiting." >&2 - exit 0 -fi +set -e -XEN_HYPERVISOR_CMDLINE="xsave=1" -XEN_LINUX_CMDLINE="console=tty0" -[ -r /etc/xen/grub.conf ] && . /etc/xen/grub.conf +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="/usr/share" +datadir="${datarootdir}" +sysconfdir="/etc" -CLASS="--class gnu-linux --class gnu --class os" +. "${datarootdir}/grub/grub-mkconfig_lib" -if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux -else - if [ "${GRUB_DISTRIBUTOR}" = "Parabola" ] ; then - OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" - elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then - OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" - elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then - OS="${GRUB_DISTRIBUTOR} Linux and GNU" - elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then - OS="${GRUB_DISTRIBUTOR} Linux and GNU" - elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then - OS="${GRUB_DISTRIBUTOR} GNU+Linux" - elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then - OS="${GRUB_DISTRIBUTOR} GNU+Linux" - elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then - OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" - elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then - OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" - else - OS="${GRUB_DISTRIBUTOR} GNU/Linux" - fi - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}" +. "${sysconfdir}/default/grub" + +export XEN_HYPERVISOR_CMDLINE="xsave=1" +export XEN_LINUX_CMDLINE="console=tty0" + +[[ -r "${sysconfdir}/xen/grub.conf" ]] && . "${sysconfdir}/xen/grub.conf" + +[[ -z "${XEN_LINUX_CMDLINE_OVERRIDE}" ]] && XEN_LINUX_CMDLINE_OVERRIDE="0" + +export TEXTDOMAIN="grub" +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class xen --class parabola --class gnu-linux --class gnu --class os" + +[[ "${grub_file}" != "" ]] && _FUNC_GRUB_FILE_PRESENT + +BOOT_PART_FS_UUID="$(${grub_probe} --target="fs_uuid" "/boot" 2>/dev/null)" +BOOT_PART_HINTS_STRING="$(${grub_probe} --target="hints_string" "/boot" 2>/dev/null || true)" +BOOT_PART_FS="$(${grub_probe} --target="fs" "/boot" 2>/dev/null)" + +ROOT_PART_GRUB_DEVICE="$(${grub_probe} --target=device / || true)" +ROOT_PART_FS="$(${grub_probe} --device ${ROOT_PART_GRUB_DEVICE} --target=fs 2> /dev/null || echo "unknown")" + +if [[ "${GRUB_LINUX_ROOT_DEVICE}" == "" ]]; then + + case "${ROOT_PART_FS}" in + btrfs) + rootsubvol="$(make_system_path_relative_to_its_root /)" + rootsubvol="${rootsubvol#/}" + if [[ "${rootsubvol}" != "" ]]; then + GRUB_LINUX_ROOT_DEVICE="subvol=${rootsubvol}" + fi + ;; + zfs) + rpool="$(${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true)" + bootfs="$(make_system_path_relative_to_its_root / | sed -e "s,@$,,")" + GRUB_LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" + ;; + esac + + if [[ "${GRUB_DEVICE_UUID}" == "" ]] || \ + [[ "${GRUB_DISABLE_LINUX_UUID}" == "true" ]] || \ + [[ ! -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ]] || \ + uses_abstraction "${GRUB_DEVICE}" lvm ; then + GRUB_LINUX_ROOT_DEVICE="${GRUB_DEVICE}" + else + GRUB_LINUX_ROOT_DEVICE="UUID=${GRUB_DEVICE_UUID}" + fi fi -# loop-AES arranges things so that /dev/loop/X can be our root device, but -# the initrds that Linux uses don't like that. -case ${GRUB_DEVICE} in - /dev/loop/*|/dev/loop[0-9]) - GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` - ;; -esac - -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ - || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm" ] ; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} +[[ "${GRUB_LINUX_PARAMS}" == "" ]] && GRUB_LINUX_PARAMS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" +if [[ "${XEN_LINUX_CMDLINE_OVERRIDE}" == "0" ]]; then + GRUB_LINUX_PARAMS="${GRUB_LINUX_PARAMS} ${XEN_LINUX_CMDLINE}" else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} + GRUB_LINUX_PARAMS="${XEN_LINUX_CMDLINE}" fi -xen_entry () -{ - os="$1" - xen_version="$2" - version="$3" - xen_args="$4" - args="$5" - printf "menuentry 'Xen %s / %s, with Linux %s' --class xen ${CLASS} {\n" "${xen_version}" "${os}" "${version}" - save_default_entry | sed -e "s/^/\t/" - - if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" - fi - printf '%s\n' "${prepare_boot_cache}" - cat << EOF - echo '$(printf "Loading Xen %s ..." ${xen_version})' - multiboot ${rel_dirname}/${xen_basename} ${rel_dirname}/${xen_basename} ${xen_args} - echo $(printf "$(gettext "Loading Linux %s ...")" ${version}) - module ${rel_dirname}/${basename} ${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args} -EOF - if test -n "${initrd}" ; then - cat << EOF - echo "Loading initial ramdisk ..." - module ${rel_dirname}/${initrd} -EOF - fi - cat << EOF -} -EOF -} - xen_list=`for i in /boot/xen-*.gz /xen-*.gz ; do if grub_file_is_not_garbage "$i" ; then echo -n "$i "; fi done` -prepare_boot_cache= while [ "x$xen_list" != "x" ] ; do xen=`version_find_latest $xen_list` echo "Found Xen hypervisor image: $xen" >&2 - xen_basename=`basename $xen` - xen_dirname=`dirname $xen` - rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` - xen_version=`echo $xen_basename | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"` - alt_xen_version=`echo $xen_version | sed -e "s,\.old$,,g"` + XEN_BASENAME=`basename $xen` + XEN_VERSION=`echo $XEN_BASENAME | sed -e "s,^[^0-9]*-,,g" | sed -e "s,.gz,,g"` + + for _KERNEL_ in ${list} ; do + + echo "Found linux image: ${_KERNEL_}" >&2 + + basename="$(basename "${_KERNEL_}")" + dirname="$(dirname "${_KERNEL_}")" + REAL_DIR="$(make_system_path_relative_to_its_root "${dirname}")" + + _KERNEL_FILE_="$(echo ${_KERNEL_} | sed 's,/boot/,,g')" + _KERNEL_PKG_="pkg-$(echo ${_KERNEL_FILE_} | sed 's,vmlinuz-,,g')" + + _INITRAMFS_="${_KERNEL_FILE_/vmlinuz-/initramfs-}.img" + + if [[ -e "/boot/${_INITRAMFS_}" ]]; then + + echo "Found initramfs image: /boot/${_INITRAMFS_}" >&2 + + cat << EOF + +menuentry "Xen ${XEN_VERSION} / Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel" ${CLASS} { + $(save_default_entry) + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo '$(printf "Loading Xen %s ..." ${XEN_VERSION})' + multiboot ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' + module ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel initramfs ...' + module ${REAL_DIR}/${_INITRAMFS_} +} - list=`for i in /boot/vmlinuz-* /vmlinuz-*; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i "; fi - done` - - while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` - echo -e "\tFound linux image: $linux" >&2 - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` - base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` - alt_version="${base_init}-fallback" - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - initrd= - - for i in "${base_init}.img"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break - fi - done - if test -n "${initrd}" ; then - echo -e "\tFound initrd image: ${dirname}/${initrd}" >&2 - else - # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} +EOF fi + + _INITRAMFS_FALLBACK_="${_KERNEL_FILE_/vmlinuz-/initramfs-}-fallback.img" + + if [[ -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then + + echo "Found fallback initramfs image: /boot/${_INITRAMFS_FALLBACK_}" >&2 + + cat << EOF + +menuentry "Xen ${XEN_VERSION} / Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (fallback initramfs)" ${CLASS} { + $(save_default_entry) + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo '$(printf "Loading Xen %s ..." ${XEN_VERSION})' + multiboot ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' + module ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel fallback initramfs ...' + module ${REAL_DIR}/${_INITRAMFS_FALLBACK_} +} - xen_entry "${OS}" "${xen_version}" "${version}" \ - "${XEN_HYPERVISOR_CMDLINE}" \ - "${XEN_LINUX_CMDLINE}" +EOF + fi + + if [[ ! -e "/boot/${_INITRAMFS_}" ]] && [[ ! -e "/boot/${_INITRAMFS_FALLBACK_}" ]]; then + cat << EOF + +menuentry "Xen ${XEN_VERSION} / Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel (no initramfs)" ${CLASS} { + $(save_default_entry) + if [ x\$feature_all_video_module = xy ]; then + insmod all_video + fi + set gfxpayload=keep + insmod ${BOOT_PART_FS} + if [ x\$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root ${BOOT_PART_HINTS_STRING} ${BOOT_PART_FS_UUID} + else + search --no-floppy --fs-uuid --set=root ${BOOT_PART_FS_UUID} + fi + echo '$(printf "Loading Xen %s ..." ${XEN_VERSION})' + multiboot ${REAL_DIR}/${XEN_BASENAME} ${REAL_DIR}/${XEN_BASENAME} ${XEN_HYPERVISOR_CMDLINE} + echo 'Loading Parabola GNU/Linux-libre ${_KERNEL_PKG_} kernel ...' + module ${REAL_DIR}/${_KERNEL_FILE_} ${REAL_DIR}/${_KERNEL_FILE_} root=${GRUB_LINUX_ROOT_DEVICE} rw ${GRUB_LINUX_PARAMS} +} - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` +EOF + fi + done xen_list=`echo $xen_list | tr ' ' '\n' | grep -vx $xen | tr '\n' ' '` done + diff --git a/kernels/xen/ChangeLog b/kernels/xen/ChangeLog index 8f9ef80fe..17133d08c 100644 --- a/kernels/xen/ChangeLog +++ b/kernels/xen/ChangeLog @@ -1,3 +1,24 @@ +2014-05-17 David Sutton <kantras - gmail.com> + * 4.4.0-4: + Added patch to fix shutdown issues with pvh domains + +2014-05-01 David Sutton <kantras - gmail.com> + * 4.4.0-3: + Added XSA 92 Security patch + Added fix for compiling under GCC 4.9.0 (From Fedora Rawhide SRPM) + Added updates to 09_xen to closer match system 10_linux + +2014-03-11 David Sutton <kantras - gmail.com> + * 4.4.0-2: + Moved xen-syms file so 09_xen won't pick it up as a potential kernel. + Added XSA 89 Security patch + Minor PKGBUILD cleanup/changes + +2014-03-10 David Sutton <kantras - gmail.com> + * 4.4.0-1: + New upstream release + Cleaned up old unnecessary patches + 2014-02-19 David Sutton <kantras - gmail.com> * 4.3.2-1: New upstream release @@ -47,7 +68,7 @@ * 4.3.0-3 : added ChangeLog. - Cleaned up PKGBUILD to match Parabola Package Standards + Cleaned up PKGBUILD to match Package Standards Fixed some path references - /var/run to /run Removed some unnecessary empty directories Updated xenconsoled and xenstored so they use /run for pid file diff --git a/kernels/xen/IVRS-debug.patch b/kernels/xen/IVRS-debug.patch deleted file mode 100644 index 5f6813cb9..000000000 --- a/kernels/xen/IVRS-debug.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/xen/drivers/passthrough/amd/iommu_acpi.c 2013-07-09 05:46:56.000000000 -0500 -+++ b/xen/drivers/passthrough/amd/iommu_acpi.c 2013-08-31 01:26:18.614846438 -0500 -@@ -651,9 +651,9 @@ - return 0; - } - -- AMD_IOMMU_DEBUG("IVHD Special: %04x:%02x:%02x.%u variety %#x handle %#x\n", -+ AMD_IOMMU_DEBUG("IVHD Special: %04x:%02x:%02x.%u variety %#x handle %#x used_id %#x\n", - seg, PCI_BUS(bdf), PCI_SLOT(bdf), PCI_FUNC(bdf), -- special->variety, special->handle); -+ special->variety, special->handle, special->used_id); - add_ivrs_mapping_entry(bdf, bdf, special->header.data_setting, iommu); - - switch ( special->variety ) diff --git a/kernels/xen/PKGBUILD b/kernels/xen/PKGBUILD index 28dc5a786..7313bfd75 100644 --- a/kernels/xen/PKGBUILD +++ b/kernels/xen/PKGBUILD @@ -1,22 +1,23 @@ # Maintainer (Arch): David Sutton <kantras - gmail.com> +# Contributor (Arch): Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com> # Contributor (Arch): Limao Luo # Contributor (Arch): Luceo # Contributor (Arch): Revellion # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=xen -pkgver=4.3.2 -pkgrel=1 +pkgver=4.4.0 +pkgrel=4 pkgdesc="Virtual Machine Hypervisor & Tools (Parabola rebranded)" arch=(i686 x86_64) url="http://www.xenproject.org/" license=(GPL2) -depends=(bin86 bluez bridge-utils curl e2fsprogs gnutls iproute2 libaio libcap-ng libiscsi libjpeg-turbo libpng lzo2 nss pixman pciutils python python2 sdl wget vde2 yajl) +depends=(bin86 bluez bridge-utils curl e2fsprogs gnutls iproute2 libaio libcap-ng libiscsi libjpeg-turbo libpng libseccomp lzo2 nss pixman pciutils python python2 sdl wget vde2 yajl) [[ "$CARCH" == "x86_64" ]] && depends+=(lib32-glibc) makedepends=(cmake dev86 git iasl markdown ocaml-findlib) optdepends=('xen-docs: Official Xen Documentation' 'openvswitch: Optional Networking support') conflicts=(xen-4.2{,-testing-hg} xen-{gdbsx,hg-unstable,rc,git} xen-4.3{,-testing-hg}) -backup=(etc/$pkgname/xend-{config,pci-{permissive,quirks}}.sxp etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf etc/conf.d/xen{stored,consoled,domains} etc/default/xencommons etc/$pkgname/grub.conf) +backup=(etc/modules-load.d/$pkgname.conf etc/$pkgname/xl.conf etc/conf.d/xen{stored,consoled,domains,commons} etc/$pkgname/grub.conf) options=(!buildflags !strip) install=$pkgname.install changelog=ChangeLog @@ -32,11 +33,11 @@ source=(http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2 xen.install 09_xen - bios_workaround.patch - xendomains.patch - TOM-register.patch ati-passthrough.patch - IVRS-debug.patch + localgcc490fix.patch + pvh_pit_init.patch + xsa89.patch + xsa92.patch proc-xen.mount var-lib-xenstored.mount xenconsoled.service @@ -58,7 +59,7 @@ noextract=(lwip-1.3.0.tar.gz gmp-4.3.2.tar.bz2 ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) -sha256sums=('17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69' +sha256sums=('6910a504fe2ffe8db0e7a44756ce1c4c95e1ccbef942a1fc8da27aced5aac021' '632ce8c193ccacc3012bd354bdb733a4be126f7c098e111930aa41dad537405c' '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f' '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e' @@ -68,79 +69,58 @@ sha256sums=('17611d95f955302560ff72d97c08933b4e62bc2e8ffb71400fc54e388746ff69' '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b' '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459' '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775' - '0f6ebf3437974d1708c9e74005b976479ab8ff28adec394208153bf404b411f8' - '74a957d783458b7481c7a09c3ed94ec2e07ee7943e4b7fa33d3684b8d585139e' - '914cc983da1fe89ff125d751c979b4968f8952da21b19b900fcd4e6b33e14552' - '1938ca36bfb62c76ad0642147017ecfaa64588abaa2d88e868f501c4ae83bfd9' - '0fa9426cc499ea3d6e1aa33a8be0e180aed87936814b9b88bb0ef42f6983654a' + '9d41f4456f1ce82ab912467a230b6e78b69b39579bccca1337328945ae7e3edb' + 'b0a3cfe2d524371ee04a26a29ad04cd9f3dae8c5d4a18b6b41576c6c7547f946' 'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3' - '54883171ff9cf5f342a2be5c944df16902ef06b6f2d015b675fa9bd5ed899c7c' + '83d4672470437e0a6d2c371681384d67f2056ba85fe3b7898e2b806edecaebd6' + '7dcf63e1f7158e0d8d5144f549f4e5fe9a532f9da2650c13968aa39b2730d8b2' + '741c8fbbfa8e425d8debba17135d4c2e1e962d15717769bc93d68a65b5dc5ea6' + '184dcb88dfb4540fca33016ffcfe0f4f557449ab5b4ec6a4bf486c75926d23f3' '139eed988bfaf8edc8ccdfd0b668382bd63db48ce17be91776182a7e28e9d88c' 'c19146931c6ab8e53092bd9b2ebbfda5c76fd22ad3b1d42dcda3dd1b61f123ff' 'e4af7891e816b9549ebeff766a78036626c0e278734e5625b8e7d68729530ded' '48d76cc6f25caa79b3f527c96a0883b1decb9012f6616f61336c8d43791bf007' '0bd45d9de6456c4f9adf32e726f2db3a3cd0423c1d161b442e8a1666d2e68e3f' '012cc60ffdcb0e061d04d404eb9232734554aef4dc4b551f66adf82a655e6e41' - '8ee5c5a14064fc2bbfd38d0ec8a6001f541bbe56b9fb534733209a8af148b297' + '633d334c55395fac3f16dbe56dd7b7524d560b513d1895b53c89943033a45f39' '0e1ad0a6a72b0c22025a556c23235a8f663427f1e769c45fe39d1c525bf82eff' '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf' - '78398fb27edfedb432b5f4e4bf87b5dbee41f180c623d29f758234a49d8bf4b4' + '3f0af16958c3e057b9baa5afc47050d9adf7dd553274dd97ae4f35938fefb568' '50a9b7fd19e8beb1dea09755f07318f36be0b7ec53d3c9e74f3266a63e682c0c') -sha512sums=('ec94d849b56ec590b89022075ce43768d8ef44b7be9580ce032509b44c085f0f66495845607a18cd3dea6b89c69bc2a18012705556f59288cd8653c3e5eca302' - 'c5cb1cdff40d2d71fd3e692a9d0efadf2aa17290daf5195391a1c81ddd9dfc913a8e44d5be2b12be85b2a5565ea31631c99c7053564f2fb2225c80ea0bb0e4a4' - '1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d' - '021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e' - '40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3' - '2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5' - '88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad' - 'c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb' - '4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35' - '2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf' - '78bfb62166ffcf136e12985809b3f412e0145a7f17388a559071f644970ccdfd2a02fe9aa4a180069b923c2e4354b061a4057096de856497f10d9cac57eae4b3' - '8667a97e10f09c5ce5ba604e38a073b7d7944f4d24c5c78a7235443b65a8cc7b6e7de90e40aa335bb17fda0858d6b517ba1e8b5a0bd6bba4ad75ad44b73f6c9c' - '7118bf02ff5338e70b3f27f8ea390cd05ea37a4ceabb4adc9d32fc57329e35e98330f0e865261dd4e670436e1a725832598888d44b1e2b17b351f59318860878' - '440b3967bf0f0cecde42111bc602f591edeadfdf7044f1f181029b0ded5fb8fa9d640bc4a4a57daadd350594f86065120ea5e4d833004590a8bfe0ee88b4c316' - 'b89f524015c1299c7b19573ae0637f9d33613f3fdbb3d978a07d294ee18a657bd124852f1cbb85e6d1382aca42ed799e8ee245a161340bb4b759eeccce28df7d' - 'c30a4cbdc942ae36364830ab604ecb46a68466bfbaaef2740aa805acf9e432a0dd7877593d6211437db4d2e7c2deb15f301d5a5571fd28936f01228f13256d3f' - 'e8392dbc66bf83b887de963416b1fe9a4eeccb8faca78c6fc1dd4243544b871625d43423f03d19cf91d80295d43073904c9dbe37241e7432b69566b05b267391' - '6afdf16e32bb837faf6333334f86855a746f1f46fee9673a4fddc62eecf41f9856bc34397807203c6f5071f0b1ce74532214084042154585c0d39514450db25c' - '00e340f4d3635e3850ca24baea1da08467523c17815feb74161e18397b607fef904db2165fd9bf4632a6e8a6e37aeddad4e56965e1c99b5213c98b3f9afc6aad' - '580e0645d7f157928f137f3d8b38d3e2834cb5fa091dbcd28217bbaed494415a35c8973487a1eec726c2f49c8b11d4dd28fdcbe75f14c91a4474cacd8dfb2e99' - 'a0bbd9c14ee0f2b9dc9cf304b531aaefde545e56b4ce4847f12faab4952520ce857a92765ae3a1b25ebd2b7511bb24fc820864d7342ac43a311d8c6551958895' - 'f00034f8b826b828659a0177f0a6454113c625e69a817dfe32e461767f6643e0288bfc2a22d23358504240df627af6e3b8f5ffa0077e241e590b33d3f252e74c' - 'f21cc17009957797630c2e82630b5e93ceac8fdadc5eaa3abf0510ca81a49e5680a80ece63b248354122c5fd5d40c9a495fad15e307a694936fa062e984158c4' - '9e95e05ac7cce383530ede0f8f75b4f8990c7d7d55ef59f3e37c64a75ccc012475595bc1123bc4c2072dd2c1c2f4b744f26d6adb799f7a068195aadde383af89' - 'c996d48737ad31528b0b2b1379e3ebae948d290de9ddc71f33c7c56f0634466bc7afb2eab847e851c19e3c13bb99468a0778d908606486959a40ff3272189bd3' - '53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef' - '04000a802e96c11929cb94c9a2bcafbb4307620192388441d979ea85836c3395954dea53d449c1cc25c3a0a30c49d318b8de59a053c6254f5a81e87864648a9c' - 'ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b') prepare() { cd $pkgname-$pkgver/ - ### Patching - patch -Np1 -i ../xendomains.patch - patch -Np1 -i ../TOM-register.patch + ### Patching - # Uncomment line below if you have a bios which is reporting bad IVRS data - #patch -Np1 -i ../bios_workaround.patch - #patch -Np1 -i ../IVRS-debug.patch + # Security Patches + patch -Np1 -i $srcdir/xsa89.patch + patch -Np1 -i $srcdir/xsa92.patch - # Uncomment line below if you want to enable ATI Passthrough support (some reported successes) + # GCC 4.9.0 compile workaround + patch -Np1 -i $srcdir/localgcc490fix.patch + + # Issue resolution patches + patch -Np1 -i $srcdir/pvh_pit_init.patch + + # Uncomment line below if you want to enable ATI Passthrough support (some reported successes, untested with 4.4) #patch -Np1 -i ../ati-passthrough.patch # Fix Install Paths sed -i 's:/sbin:/bin:' config/StdGNU.mk + sed -i 's:/var/lock:/run/lock:' config/StdGNU.mk + sed -i 's:/var/run:/run:' config/StdGNU.mk # Copy supporting tarballs into place - cp ../lwip-1.3.0.tar.gz stubdom/ - cp ../zlib-1.2.3.tar.gz stubdom/ - cp ../newlib-1.16.0.tar.gz stubdom/ - cp ../pciutils-2.2.9.tar.bz2 stubdom/ - cp ../polarssl-1.1.4-gpl.tgz stubdom/ - cp ../grub-0.97.tar.gz stubdom/ - cp ../tpm_emulator-0.7.4.tar.gz stubdom/ - cp ../gmp-4.3.2.tar.bz2 stubdom/ + cp $srcdir/lwip-1.3.0.tar.gz stubdom/ + cp $srcdir/zlib-1.2.3.tar.gz stubdom/ + cp $srcdir/newlib-1.16.0.tar.gz stubdom/ + cp $srcdir/pciutils-2.2.9.tar.bz2 stubdom/ + cp $srcdir/polarssl-1.1.4-gpl.tgz stubdom/ + cp $srcdir/grub-0.97.tar.gz stubdom/ + cp $srcdir/tpm_emulator-0.7.4.tar.gz stubdom/ + cp $srcdir/gmp-4.3.2.tar.bz2 stubdom/ + cp $srcdir/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz tools/firmware/etherboot/ipxe.tar.gz } @@ -157,6 +137,7 @@ package() { make DESTDIR="$pkgdir" LANG=C PYTHON=python2 install-{xen,tools,stubdom} + # Install files cd ../ for f in ${source[@]}; do [[ $f =~ .mount || $f =~ .service ]] && install -Dm644 $f "$pkgdir"/usr/lib/systemd/system/$f @@ -171,12 +152,17 @@ package() { cd "$pkgdir" # Fix paths in scripts, move to right locations and create missing directories + sed -i 's:/etc/sysconfig:/etc/conf.d:' etc/init.d/xendomains sed -i 's:/var/lock:/run/lock:' etc/init.d/xendomains - sed -i 's:/var/lock:/run/lock:' etc/init.d/xend sed -i 's:/var/lock:/run/lock:' etc/xen/scripts/hotplugpath.sh + sed -i 's:/var/run:/run:' etc/init.d/xencommons sed -i 's:/var/run:/run:' etc/xen/scripts/hotplugpath.sh - mv etc/{init,rc}.d - mv etc/rc.d/xendomains etc/xen/scripts/xendomains + sed -i 's:/var/run:/run:' etc/xen/scripts/locking.sh + + mv etc/init.d/xencommons etc/xen/scripts/xencommons + mv etc/init.d/xendomains etc/xen/scripts/xendomains + mv etc/init.d/xen-watchdog etc/xen/scripts/xen-watchdog + mv etc/default/xencommons etc/conf.d/xencommons mv etc/default/xendomains etc/conf.d/xendomains mv var/xen/dump var/lib/xen/ mkdir var/log/xen/console @@ -189,33 +175,40 @@ package() { cd ../ fi - # Compress and move syms file to a different directory - gzip boot/$pkgname-syms-$pkgver - mv boot/$pkgname-syms-$pkgver.gz usr/share/xen + # Compress syms file and move to a share location + if [[ $CARCH == x86_64 ]]; then + gzip boot/$pkgname-syms-* + mv boot/$pkgname-syms-*.gz usr/share/xen + fi ##### Kill unwanted stuff ##### # hypervisor symlinks - rm -f boot/xen{,-4,-4.3}.gz + rm -f boot/xen{,-4,-4.4}.gz # Documentation cleanup ( see xen-docs package ) rm -rf usr/share/doc - rm -rf usr/share/xen/man + rm -rf usr/share/man # Pointless helper cleanup rm -f usr/bin/xen-python-path - rm -rf usr/libexec # Unnecessary qemu support files rm -rf usr/bin/qemu-*-xen + rm -rf usr/etc + rm -rf usr/libexec rm usr/share/qemu-xen/qemu/{palcode,openbios}-* rm usr/share/xen/qemu/openbios-* - # Clean up udev rules naming, remove depreciated xend.rules + # Clean up udev rules naming mv etc/udev/rules.d/xen-backend.rules etc/udev/rules.d/40-xen-backend.rules - rm etc/udev/rules.d/xend.rules + + # Cleanup additional leftover files + rm -rf usr/include/cacard + rm -f usr/lib/libcacard* + rm -f usr/lib/pkgconfig/libcacard.pc # Clean up left over empty directories - rm -rf var/run var/lock var/xen + rm -rf var/run var/lock var/xen etc/default etc/init.d # adhere to Static Library Packaging Guidelines rm -rf usr/lib/*.a diff --git a/kernels/xen/TOM-register.patch b/kernels/xen/TOM-register.patch deleted file mode 100644 index 88bedbbc0..000000000 --- a/kernels/xen/TOM-register.patch +++ /dev/null @@ -1,187 +0,0 @@ ---- xen-4.3.1/tools/qemu-xen/hw/pc.h -+++ xen-4.3.1-new/tools/qemu-xen/hw/pc.h -@@ -128,15 +128,14 @@ extern int no_hpet; - struct PCII440FXState; - typedef struct PCII440FXState PCII440FXState; - -+#define I440FX_TOM 0xe0000000 -+#define I440FX_XEN_TOM 0xf0000000 -+ - PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, - ISABus **isa_bus, qemu_irq *pic, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, -- hwaddr pci_hole_start, -- hwaddr pci_hole_size, -- hwaddr pci_hole64_start, -- hwaddr pci_hole64_size, - MemoryRegion *pci_memory, - MemoryRegion *ram_memory); - ---- xen-4.3.1/tools/qemu-xen/hw/pc_piix.c -+++ xen-4.3.1-new/tools/qemu-xen/hw/pc_piix.c -@@ -92,9 +92,9 @@ static void pc_init1(MemoryRegion *system_memory, - kvmclock_create(); - } - -- if (ram_size >= 0xe0000000 ) { -- above_4g_mem_size = ram_size - 0xe0000000; -- below_4g_mem_size = 0xe0000000; -+ if (ram_size >= I440FX_TOM) { -+ above_4g_mem_size = ram_size - I440FX_TOM; -+ below_4g_mem_size = I440FX_TOM; - } else { - above_4g_mem_size = 0; - below_4g_mem_size = ram_size; -@@ -129,12 +129,6 @@ static void pc_init1(MemoryRegion *system_memory, - if (pci_enabled) { - pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi, - system_memory, system_io, ram_size, -- below_4g_mem_size, -- 0x100000000ULL - below_4g_mem_size, -- 0x100000000ULL + above_4g_mem_size, -- (sizeof(hwaddr) == 4 -- ? 0 -- : ((uint64_t)1 << 62)), - pci_memory, ram_memory); - } else { - pci_bus = NULL; ---- xen-4.3.1/tools/qemu-xen/hw/piix_pci.c -+++ xen-4.3.1-new/tools/qemu-xen/hw/piix_pci.c -@@ -86,6 +86,14 @@ struct PCII440FXState { - #define I440FX_PAM_SIZE 7 - #define I440FX_SMRAM 0x72 - -+/* The maximum vaule of TOM(top of memory) register in I440FX -+ * is 1G, so it doesn't meet any popular virutal machines, so -+ * define another register to report the base of PCI memory. -+ * Use one byte 0xb0 for the upper 8 bit, they are originally -+ * resevered for host bridge. -+ * */ -+#define I440FX_PCI_HOLE_BASE 0xb0 -+ - static void piix3_set_irq(void *opaque, int pirq, int level); - static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pci_intx); - static void piix3_write_config_xen(PCIDevice *dev, -@@ -101,6 +109,43 @@ static int pci_slot_get_pirq(PCIDevice *pci_dev, int pci_intx) - return (pci_intx + slot_addend) & 3; - } - -+ -+static void i440fx_update_pci_mem_hole(PCII440FXState *f, bool del) -+{ -+ ram_addr_t above_4g_mem_size; -+ hwaddr pci_hole_start, pci_hole_size, pci_hole64_start, pci_hole64_size; -+ -+ pci_hole_start = pci_default_read_config(&f->dev, I440FX_PCI_HOLE_BASE, 1) << 24; -+ pci_hole_size = 0x100000000ULL - pci_hole_start; -+ -+ if (ram_size >= pci_hole_start) { -+ above_4g_mem_size = ram_size - pci_hole_start; -+ } else { -+ above_4g_mem_size = 0; -+ } -+ pci_hole64_start = 0x100000000ULL + above_4g_mem_size; -+ pci_hole64_size = sizeof(hwaddr) == 4 ? 0 : ((uint64_t)1 << 62); -+ -+ if (del) { -+ memory_region_del_subregion(f->system_memory, &f->pci_hole); -+ if (pci_hole64_size) { -+ memory_region_del_subregion(f->system_memory, &f->pci_hole_64bit); -+ } -+ } -+ -+ memory_region_init_alias(&f->pci_hole, "pci-hole", f->pci_address_space, -+ pci_hole_start, pci_hole_size); -+ memory_region_add_subregion(f->system_memory, pci_hole_start, &f->pci_hole); -+ memory_region_init_alias(&f->pci_hole_64bit, "pci-hole64", -+ f->pci_address_space, -+ pci_hole64_start, pci_hole64_size); -+ if (pci_hole64_size) { -+ memory_region_add_subregion(f->system_memory, pci_hole64_start, -+ &f->pci_hole_64bit); -+ } -+} -+ -+ - static void i440fx_update_memory_mappings(PCII440FXState *d) - { - int i; -@@ -136,6 +181,9 @@ static void i440fx_write_config(PCIDevice *dev, - range_covers_byte(address, len, I440FX_SMRAM)) { - i440fx_update_memory_mappings(d); - } -+ if (range_covers_byte(address, len, I440FX_PCI_HOLE_BASE)) { -+ i440fx_update_pci_mem_hole(d, true); -+ } - } - - static int i440fx_load_old(QEMUFile* f, void *opaque, int version_id) -@@ -203,6 +251,10 @@ static int i440fx_initfn(PCIDevice *dev) - - d->dev.config[I440FX_SMRAM] = 0x02; - -+ /* Emulate top of memory, here use 0xe0000000 as default val*/ -+ uint32_t addr = xen_enabled() ? I440FX_XEN_TOM : I440FX_TOM; -+ pci_set_byte(dev->config + I440FX_PCI_HOLE_BASE, (uint8_t)(addr >> 24)); -+ - cpu_smm_register(&i440fx_set_smm, d); - return 0; - } -@@ -214,10 +266,6 @@ static PCIBus *i440fx_common_init(const char *device_name, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, -- hwaddr pci_hole_start, -- hwaddr pci_hole_size, -- hwaddr pci_hole64_start, -- hwaddr pci_hole64_size, - MemoryRegion *pci_address_space, - MemoryRegion *ram_memory) - { -@@ -244,16 +292,6 @@ static PCIBus *i440fx_common_init(const char *device_name, - f->system_memory = address_space_mem; - f->pci_address_space = pci_address_space; - f->ram_memory = ram_memory; -- memory_region_init_alias(&f->pci_hole, "pci-hole", f->pci_address_space, -- pci_hole_start, pci_hole_size); -- memory_region_add_subregion(f->system_memory, pci_hole_start, &f->pci_hole); -- memory_region_init_alias(&f->pci_hole_64bit, "pci-hole64", -- f->pci_address_space, -- pci_hole64_start, pci_hole64_size); -- if (pci_hole64_size) { -- memory_region_add_subregion(f->system_memory, pci_hole64_start, -- &f->pci_hole_64bit); -- } - memory_region_init_alias(&f->smram_region, "smram-region", - f->pci_address_space, 0xa0000, 0x20000); - memory_region_add_subregion_overlap(f->system_memory, 0xa0000, -@@ -295,6 +333,7 @@ static PCIBus *i440fx_common_init(const char *device_name, - (*pi440fx_state)->dev.config[0x57]=ram_size; - - i440fx_update_memory_mappings(f); -+ i440fx_update_pci_mem_hole(f, false); - - return b; - } -@@ -304,10 +343,6 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, -- hwaddr pci_hole_start, -- hwaddr pci_hole_size, -- hwaddr pci_hole64_start, -- hwaddr pci_hole64_size, - MemoryRegion *pci_memory, MemoryRegion *ram_memory) - - { -@@ -315,8 +350,6 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn, - - b = i440fx_common_init("i440FX", pi440fx_state, piix3_devfn, isa_bus, pic, - address_space_mem, address_space_io, ram_size, -- pci_hole_start, pci_hole_size, -- pci_hole64_start, pci_hole64_size, - pci_memory, ram_memory); - return b; - } diff --git a/kernels/xen/bios_workaround.patch b/kernels/xen/bios_workaround.patch deleted file mode 100644 index 12fc00184..000000000 --- a/kernels/xen/bios_workaround.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- xen-4.3.1.orig/xen/drivers/passthrough/amd/iommu_acpi.c 2013-07-09 05:46:56.000000000 -0500 -+++ xen-4.3.1/xen/drivers/passthrough/amd/iommu_acpi.c 2013-07-18 02:31:38.767195258 -0500 -@@ -668,26 +668,26 @@ - */ - for ( apic = 0; apic < nr_ioapics; apic++ ) - { -- if ( IO_APIC_ID(apic) != special->handle ) -+ if ( ioapic_sbdf[IO_APIC_ID(apic)].bdf != ioapic_sbdf[special->handle].bdf ) - continue; - -- if ( special->handle >= ARRAY_SIZE(ioapic_sbdf) ) -+ if ( IO_APIC_ID(apic) >= ARRAY_SIZE(ioapic_sbdf) ) - { - printk(XENLOG_ERR "IVHD Error: IO-APIC %#x entry beyond bounds\n", -- special->handle); -+ IO_APIC_ID(apic)); - return 0; - } - -- if ( ioapic_sbdf[special->handle].pin_setup ) -+ if ( ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) - { -- if ( ioapic_sbdf[special->handle].bdf == bdf && -- ioapic_sbdf[special->handle].seg == seg ) -+ if ( ioapic_sbdf[IO_APIC_ID(apic)].bdf == bdf && -+ ioapic_sbdf[IO_APIC_ID(apic)].seg == seg ) - AMD_IOMMU_DEBUG("IVHD Warning: Duplicate IO-APIC %#x entries\n", -- special->handle); -+ IO_APIC_ID(apic)); - else - { - printk(XENLOG_ERR "IVHD Error: Conflicting IO-APIC %#x entries\n", -- special->handle); -+ IO_APIC_ID(apic)); - if ( amd_iommu_perdev_intremap ) - return 0; - } -@@ -695,10 +695,10 @@ - else - { - /* set device id of ioapic */ -- ioapic_sbdf[special->handle].bdf = bdf; -- ioapic_sbdf[special->handle].seg = seg; -+ ioapic_sbdf[IO_APIC_ID(apic)].bdf = bdf; -+ ioapic_sbdf[IO_APIC_ID(apic)].seg = seg; - -- ioapic_sbdf[special->handle].pin_setup = xzalloc_array( -+ ioapic_sbdf[IO_APIC_ID(apic)].pin_setup = xzalloc_array( - unsigned long, BITS_TO_LONGS(nr_ioapic_entries[apic])); - if ( nr_ioapic_entries[apic] && - !ioapic_sbdf[IO_APIC_ID(apic)].pin_setup ) diff --git a/kernels/xen/grub.conf b/kernels/xen/grub.conf index 9b13008d9..e456973db 100644 --- a/kernels/xen/grub.conf +++ b/kernels/xen/grub.conf @@ -1,2 +1,3 @@ #XEN_HYPERVISOR_CMDLINE="xsave=1" #XEN_LINUX_CMDLINE="console=tty0" +#XEN_LINUX_CMDLINE_OVERRIDE=0 diff --git a/kernels/xen/localgcc490fix.patch b/kernels/xen/localgcc490fix.patch new file mode 100644 index 000000000..c24cdddfb --- /dev/null +++ b/kernels/xen/localgcc490fix.patch @@ -0,0 +1,114 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'> +<head> +<title>xen.git - xen</title> +<meta name='generator' content='cgit v0.10.1'/> +<meta name='robots' content='index, nofollow'/> +<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/> +<link rel='shortcut icon' href='/favicon.ico'/> +<link rel='alternate' title='Atom feed' href='http://pkgs.fedoraproject.org/cgit/xen.git/atom/localgcc490fix.patch?h=master' type='application/atom+xml'/> +</head> +<body> +<div id='cgit'><table id='header'> +<tr> +<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td> +<td class='main'><a href='/cgit/'>index</a> : <a title='xen.git' href='/cgit/xen.git/'>xen.git</a></td><td class='form'><form method='get' action=''> +<select name='h' onchange='this.form.submit();'> +<option value='f10'>f10</option> +<option value='f11'>f11</option> +<option value='f12'>f12</option> +<option value='f13'>f13</option> +<option value='f14'>f14</option> +<option value='f15'>f15</option> +<option value='f16'>f16</option> +<option value='f17'>f17</option> +<option value='f18'>f18</option> +<option value='f19'>f19</option> +<option value='f20'>f20</option> +<option value='f7'>f7</option> +<option value='f8'>f8</option> +<option value='f9'>f9</option> +<option value='master' selected='selected'>master</option> +<option value='private-20060208-sct-branch'>private-20060208-sct-branch</option> +</select> <input type='submit' name='' value='switch'/></form></td></tr> +<tr><td class='sub'>xen</td><td class='sub right'>Jesse Keating</td></tr></table> +<table class='tabs'><tr><td> +<a href='/cgit/xen.git/'>summary</a><a href='/cgit/xen.git/refs/'>refs</a><a href='/cgit/xen.git/log/localgcc490fix.patch'>log</a><a class='active' href='/cgit/xen.git/tree/localgcc490fix.patch'>tree</a><a href='/cgit/xen.git/commit/localgcc490fix.patch'>commit</a><a href='/cgit/xen.git/diff/localgcc490fix.patch'>diff</a><a href='/cgit/xen.git/stats/localgcc490fix.patch'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/xen.git/log/localgcc490fix.patch'> +<select name='qt'> +<option value='grep'>log msg</option> +<option value='author'>author</option> +<option value='committer'>committer</option> +<option value='range'>range</option> +</select> +<input class='txt' type='text' size='10' name='q' value=''/> +<input type='submit' value='search'/> +</form> +</td></tr></table> +<div class='path'>path: <a href='/cgit/xen.git/tree/'>root</a>/<a href='/cgit/xen.git/tree/localgcc490fix.patch'>localgcc490fix.patch</a></div><div class='content'>blob: e34f4d723267328a82ea993aae117d6ce9ed8c6e (<a href='/cgit/xen.git/plain/localgcc490fix.patch'>plain</a>) +<table summary='blob content' class='blob'> +<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a> +<a id='n2' href='#n2'>2</a> +<a id='n3' href='#n3'>3</a> +<a id='n4' href='#n4'>4</a> +<a id='n5' href='#n5'>5</a> +<a id='n6' href='#n6'>6</a> +<a id='n7' href='#n7'>7</a> +<a id='n8' href='#n8'>8</a> +<a id='n9' href='#n9'>9</a> +<a id='n10' href='#n10'>10</a> +<a id='n11' href='#n11'>11</a> +<a id='n12' href='#n12'>12</a> +<a id='n13' href='#n13'>13</a> +<a id='n14' href='#n14'>14</a> +<a id='n15' href='#n15'>15</a> +<a id='n16' href='#n16'>16</a> +<a id='n17' href='#n17'>17</a> +<a id='n18' href='#n18'>18</a> +<a id='n19' href='#n19'>19</a> +<a id='n20' href='#n20'>20</a> +<a id='n21' href='#n21'>21</a> +<a id='n22' href='#n22'>22</a> +<a id='n23' href='#n23'>23</a> +<a id='n24' href='#n24'>24</a> +<a id='n25' href='#n25'>25</a> +<a id='n26' href='#n26'>26</a> +<a id='n27' href='#n27'>27</a> +<a id='n28' href='#n28'>28</a> +<a id='n29' href='#n29'>29</a> +</pre></td> +<td class='lines'><pre><code>--- xen-4.4.0/Config.mk.orig 2014-04-29 20:54:43.117010822 +0100 ++++ xen-4.4.0/Config.mk 2014-04-29 20:58:23.100055325 +0100 +@@ -188,6 +188,8 @@ + CFLAGS += -std=gnu99 + + CFLAGS += -Wall -Wstrict-prototypes ++# add temporary build flags to identify build issues using gcc 4.9.0 ++CFLAGS += -Wno-error=maybe-uninitialized + + # Clang complains about macros that expand to 'if ( ( foo == bar ) ) ...' + # and is over-zealous with the printf format lint +--- xen-4.4.0/tools/blktap2/drivers/block-qcow.c.orig 2014-03-10 10:43:57.000000000 +0000 ++++ xen-4.4.0/tools/blktap2/drivers/block-qcow.c 2014-04-30 21:10:26.270699187 +0100 +@@ -427,6 +427,7 @@ + + if (posix_memalign((void **)&tmp_ptr, 4096, 4096) != 0) { + DPRINTF("ERROR allocating memory for L1 table\n"); ++ return -1; + } + memcpy(tmp_ptr, l1_ptr, 4096); + +@@ -600,6 +601,7 @@ + + if (posix_memalign((void **)&tmp_ptr2, 4096, 4096) != 0) { + DPRINTF("ERROR allocating memory for L1 table\n"); ++ return -1; + } + memcpy(tmp_ptr2, l2_ptr, 4096); + lseek(s->fd, l2_offset + (l2_sector << 12), SEEK_SET); +</code></pre></td></tr></table> +</div> <!-- class=content --> +<div class='footer'>generated by cgit v0.10.1 at 2014-05-04 21:13:33 (GMT)</div> +</div> <!-- id=cgit --> +</body> +</html> diff --git a/kernels/xen/pvh_pit_init.patch b/kernels/xen/pvh_pit_init.patch new file mode 100644 index 000000000..4f14e5ddf --- /dev/null +++ b/kernels/xen/pvh_pit_init.patch @@ -0,0 +1,107 @@ +From 3a148e0a7ee0ae56a498be5ba973314ec50cd999 Mon Sep 17 00:00:00 2001 +From: Mukesh Rathor <mukesh.rathor@oracle.com> +Date: Fri, 4 Apr 2014 10:36:29 +0200 +Subject: [PATCH] x86: call pit_init for pvh also + +During halt of a pvh guest, the guest may do speaker shutdown. This +results in call to handle_speaker_io in xen. It will hang on the vpit +spin lock because it has not been initialized. +Since, pit_init is also called for both pv and hvm, the call is +moved to a more generic place. + +Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +master commit: c30c544b199f70eada597c7352cdcb44648f6dcd +master date: 2014-03-11 13:56:50 +0100 +--- + xen/arch/x86/domain.c | 9 +++++---- + xen/arch/x86/hvm/hvm.c | 2 -- + xen/arch/x86/hvm/i8254.c | 3 +-- + xen/include/asm-x86/hvm/vpt.h | 2 +- + 4 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c +index 6618ae6..bc073e5 100644 +--- a/xen/arch/x86/domain.c ++++ b/xen/arch/x86/domain.c +@@ -422,10 +422,6 @@ int vcpu_initialise(struct vcpu *v) + + /* PV guests by default have a 100Hz ticker. */ + v->periodic_period = MILLISECS(10); +- +- /* PV guests get an emulated PIT too for video BIOSes to use. */ +- if ( v->vcpu_id == 0 ) +- pit_init(v, cpu_khz); + } + + v->arch.schedule_tail = continue_nonidle_domain; +@@ -579,6 +575,9 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags) + tsc_set_info(d, TSC_MODE_DEFAULT, 0UL, 0, 0); + spin_lock_init(&d->arch.vtsc_lock); + ++ /* PV/PVH guests get an emulated PIT too for video BIOSes to use. */ ++ pit_init(d, cpu_khz); ++ + return 0; + + fail: +@@ -1980,6 +1979,8 @@ int domain_relinquish_resources(struct domain *d) + BUG(); + } + ++ pit_deinit(d); ++ + if ( has_hvm_container_domain(d) ) + hvm_domain_relinquish_resources(d); + +diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c +index 6150899..a666471 100644 +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -643,7 +643,6 @@ void hvm_domain_relinquish_resources(struct domain *d) + rtc_deinit(d); + if ( d->vcpu != NULL && d->vcpu[0] != NULL ) + { +- pit_deinit(d); + pmtimer_deinit(d); + hpet_deinit(d); + } +@@ -1217,7 +1216,6 @@ int hvm_vcpu_initialise(struct vcpu *v) + if ( v->vcpu_id == 0 ) + { + /* NB. All these really belong in hvm_domain_initialise(). */ +- pit_init(v, cpu_khz); + pmtimer_init(v); + hpet_init(v); + +diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c +index c0d6bc2..f7493b8 100644 +--- a/xen/arch/x86/hvm/i8254.c ++++ b/xen/arch/x86/hvm/i8254.c +@@ -447,9 +447,8 @@ void pit_reset(struct domain *d) + spin_unlock(&pit->lock); + } + +-void pit_init(struct vcpu *v, unsigned long cpu_khz) ++void pit_init(struct domain *d, unsigned long cpu_khz) + { +- struct domain *d = v->domain; + PITState *pit = domain_vpit(d); + + spin_lock_init(&pit->lock); +diff --git a/xen/include/asm-x86/hvm/vpt.h b/xen/include/asm-x86/hvm/vpt.h +index 87c3a66..9f3ec8d 100644 +--- a/xen/include/asm-x86/hvm/vpt.h ++++ b/xen/include/asm-x86/hvm/vpt.h +@@ -175,7 +175,7 @@ void destroy_periodic_time(struct periodic_time *pt); + int pv_pit_handler(int port, int data, int write); + void pit_reset(struct domain *d); + +-void pit_init(struct vcpu *v, unsigned long cpu_khz); ++void pit_init(struct domain *d, unsigned long cpu_khz); + void pit_stop_channel0_irq(PITState * pit); + void pit_deinit(struct domain *d); + void rtc_init(struct domain *d); +-- +1.7.2.5 + diff --git a/kernels/xen/xen.install b/kernels/xen/xen.install index f1a34d522..aabe063c3 100644 --- a/kernels/xen/xen.install +++ b/kernels/xen/xen.install @@ -1,6 +1,6 @@ install_msg() { cat << __EOF__ -===> IMPORTANT NOTICE: +===> IMPORTANT NOTICES: In order to complete the installation, and enable Xen, at the very least you must: @@ -11,6 +11,7 @@ at the very least you must: systemctl enable xenconsoled.service 3. If you want some domains to automatically start up/shutdown, run the following: systemctl enable xendomains.service +4. xen 4.4 no longer includes the xend daemon or the xm binary For more information refer to the Wiki: https://wiki.parabolagnulinux.org/index.php/Xen @@ -28,8 +29,15 @@ Note: If you are upgrading from one of the previous 4.2 xen builds, and are havi line into your domain config file: device_model_version = "qemu-xen-traditional" - Also remember to rebuild your grub configuration if upgrading from a non-xen 4.3.1 + Also remember to rebuild your grub configuration if upgrading from a non-xen 4.4.0 install. + + xen 4.4 no longer includes the xend daemon or the xm toolset + + This install is now using a new version of the 09_xen file, used when generating + a new grub.cfg file. The new version inherits the default linux-libre kernel command + line settings; to use the old method, uncomment the 'XEN_LINUX_CMDLINE_OVERRIDE' + option in /etc/xen/grub.conf and change the '0' to '1' __EOF__ } @@ -58,7 +66,7 @@ post_remove() { ===> IMPORTANT NOTICE: In order to finish removing Xen, you will need to modify -your bootloader configuration files to load your Linux +your bootloader configuration files to load your Linux-libre kernel instead of Xen kernel. __EOF__ } diff --git a/kernels/xen/xendomains.patch b/kernels/xen/xendomains.patch deleted file mode 100644 index 16f62b65a..000000000 --- a/kernels/xen/xendomains.patch +++ /dev/null @@ -1,108 +0,0 @@ ---- xen-4.3.1.orig/tools/hotplug/Linux/init.d/xendomains 2013-07-19 14:52:52.159013757 -0500 -+++ xen-4.3.1/tools/hotplug/Linux/init.d/xendomains 2013-07-19 14:56:00.079145322 -0500 -@@ -51,17 +51,13 @@ - fi - - # See docs/misc/distro_mapping.txt --if [ -d /var/lock/subsys ]; then -- LOCKFILE=/var/lock/subsys/xendomains -+if [ -d /run/lock/subsys ]; then -+ LOCKFILE=/run/lock/subsys/xendomains - else -- LOCKFILE=/var/lock/xendomains -+ LOCKFILE=/run/lock/xendomains - fi - --if [ -d /etc/sysconfig ]; then -- XENDOM_CONFIG=/etc/sysconfig/xendomains --else -- XENDOM_CONFIG=/etc/default/xendomains --fi -+XENDOM_CONFIG=/etc/conf.d/xendomains - - test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing"; - if [ "$1" = "stop" ]; then exit 0; -@@ -185,8 +181,13 @@ - # read name from xen config file - rdname() - { -- NM=$($CMD create --quiet --dryrun --defconfig "$1" | -- sed -n 's/^.*(name \(.*\))$/\1/p') -+ if [ "$CMD" == "xm" ]; then -+ NM=$($CMD create --quiet --dryrun --defconfig "$1" | -+ sed -n 's/^.*(name \(.*\))$/\1/p') -+ else -+ NM=$($CMD create --quiet --dryrun --defconfig "$1" | -+ perl -pe 's|^.*"name":"(.*?)".*$|$1|') -+ fi - } - - rdnames() -@@ -229,15 +230,15 @@ - rdname $1 - RC=1 - name=;id= -- while read LN; do -- parseln "$LN" || continue -+ while read id; do - if test $id = 0; then continue; fi -+ name=`xenstore-read /local/domain/$id/name` - case $name in - ($NM) - RC=0 - ;; - esac -- done < <($CMD list -l | grep "$LIST_GREP") -+ done < <(xenstore-list /local/domain) - return $RC - } - -@@ -312,6 +313,8 @@ - - all_zombies() - { -+ return 0 -+ - name=;id= - while read LN; do - parseln "$LN" || continue -@@ -363,9 +366,9 @@ - fi - echo -n "Shutting down Xen domains:" - name=;id= -- while read LN; do -- parseln "$LN" || continue -+ while read id; do - if test $id = 0; then continue; fi -+ name=`xenstore-read /local/domain/$id/name` - echo -n " $name" - if test "$XENDOMAINS_AUTO_ONLY" = "true"; then - eval " -@@ -450,7 +453,7 @@ - fi - kill $WDOG_PID >/dev/null 2>&1 - fi -- done < <($CMD list -l | grep "$LIST_GREP") -+ done < <(xenstore-list /local/domain) - - # NB. this shuts down ALL Xen domains (politely), not just the ones in - # AUTODIR/* -@@ -479,15 +482,15 @@ - check_domain_up() - { - name=;id= -- while read LN; do -- parseln "$LN" || continue -+ while read id; do - if test $id = 0; then continue; fi -+ name=`xenstore-read /local/domain/$id/name` - case $name in - ($1) - return 0 - ;; - esac -- done < <($CMD list -l | grep "$LIST_GREP") -+ done < <(xenstore-list /local/domain) - return 1 - } - diff --git a/kernels/xen/xenstored.service b/kernels/xen/xenstored.service index 46e0b3226..b090ce860 100644 --- a/kernels/xen/xenstored.service +++ b/kernels/xen/xenstored.service @@ -15,6 +15,7 @@ PIDFile=/run/xenstored.pid ExecStartPre=/usr/bin/grep -q control_d /proc/xen/capabilities ExecStart=/usr/bin/xenstored --pid-file /run/xenstored.pid $XENSTORED_ARGS ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/name" "$XENDOM0_NAME" +ExecStartPost=/usr/bin/xenstore-write "/local/domain/0/domid" 0 [Install] WantedBy=multi-user.target diff --git a/kernels/xen/xsa89.patch b/kernels/xen/xsa89.patch new file mode 100644 index 000000000..3443e3360 --- /dev/null +++ b/kernels/xen/xsa89.patch @@ -0,0 +1,96 @@ +x86: enforce preemption in HVM_set_mem_access / p2m_set_mem_access() + +Processing up to 4G PFNs may take almost arbitrarily long, so +preemption is needed here. + +This is XSA-89. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Tim Deegan <tim@xen.org> + +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -4593,6 +4593,15 @@ long do_hvm_op(unsigned long op, XEN_GUE + goto param_fail5; + + rc = p2m_set_mem_access(d, a.first_pfn, a.nr, a.hvmmem_access); ++ if ( rc > 0 ) ++ { ++ a.first_pfn += a.nr - rc; ++ a.nr = rc; ++ if ( __copy_to_guest(arg, &a, 1) ) ++ rc = -EFAULT; ++ else ++ rc = -EAGAIN; ++ } + + param_fail5: + rcu_unlock_domain(d); +--- a/xen/arch/x86/mm/p2m.c ++++ b/xen/arch/x86/mm/p2m.c +@@ -1333,15 +1333,14 @@ void p2m_mem_access_resume(struct domain + + /* Set access type for a region of pfns. + * If start_pfn == -1ul, sets the default access type */ +-int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, +- uint32_t nr, hvmmem_access_t access) ++long p2m_set_mem_access(struct domain *d, unsigned long pfn, uint32_t nr, ++ hvmmem_access_t access) + { + struct p2m_domain *p2m = p2m_get_hostp2m(d); +- unsigned long pfn; + p2m_access_t a, _a; + p2m_type_t t; + mfn_t mfn; +- int rc = 0; ++ long rc; + + /* N.B. _not_ static: initializer depends on p2m->default_access */ + p2m_access_t memaccess[] = { +@@ -1364,14 +1363,17 @@ int p2m_set_mem_access(struct domain *d, + a = memaccess[access]; + + /* If request to set default access */ +- if ( start_pfn == ~0ull ) ++ if ( pfn == ~0ul ) + { + p2m->default_access = a; + return 0; + } + ++ if ( !nr ) ++ return 0; ++ + p2m_lock(p2m); +- for ( pfn = start_pfn; pfn < start_pfn + nr; pfn++ ) ++ for ( ; ; ++pfn ) + { + mfn = p2m->get_entry(p2m, pfn, &t, &_a, 0, NULL); + if ( p2m->set_entry(p2m, pfn, mfn, PAGE_ORDER_4K, t, a) == 0 ) +@@ -1379,6 +1381,13 @@ int p2m_set_mem_access(struct domain *d, + rc = -ENOMEM; + break; + } ++ ++ /* Check for continuation if it's not the last interation. */ ++ if ( !--nr || hypercall_preempt_check() ) ++ { ++ rc = nr; ++ break; ++ } + } + p2m_unlock(p2m); + return rc; +--- a/xen/include/asm-x86/p2m.h ++++ b/xen/include/asm-x86/p2m.h +@@ -576,8 +576,8 @@ void p2m_mem_access_resume(struct domain + + /* Set access type for a region of pfns. + * If start_pfn == -1ul, sets the default access type */ +-int p2m_set_mem_access(struct domain *d, unsigned long start_pfn, +- uint32_t nr, hvmmem_access_t access); ++long p2m_set_mem_access(struct domain *d, unsigned long start_pfn, ++ uint32_t nr, hvmmem_access_t access); + + /* Get access type for a pfn + * If pfn == -1ul, gets the default access type */ diff --git a/kernels/xen/xsa92.patch b/kernels/xen/xsa92.patch new file mode 100644 index 000000000..60ef934aa --- /dev/null +++ b/kernels/xen/xsa92.patch @@ -0,0 +1,36 @@ +x86/HVM: restrict HVMOP_set_mem_type + +Permitting arbitrary type changes here has the potential of creating +present P2M (and hence EPT/NPT/IOMMU) entries pointing to an invalid +MFN (INVALID_MFN truncated to the respective hardware structure field's +width). This would become a problem the latest when something real sat +at the end of the physical address space; I'm suspecting though that +other things might break with such bogus entries. + +Along with that drop a bogus (and otherwise becoming stale) log +message. + +Afaict the similar operation in p2m_set_mem_access() is safe. + +This is XSA-92. + +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Tim Deegan <tim@xen.org> + +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -4541,12 +4541,10 @@ long do_hvm_op(unsigned long op, XEN_GUE + rc = -EINVAL; + goto param_fail4; + } +- if ( p2m_is_grant(t) ) ++ if ( !p2m_is_ram(t) && ++ (!p2m_is_hole(t) || a.hvmmem_type != HVMMEM_mmio_dm) ) + { + put_gfn(d, pfn); +- gdprintk(XENLOG_WARNING, +- "type for pfn %#lx changed to grant while " +- "we were working?\n", pfn); + goto param_fail4; + } + else 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 } 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 <alucryd@gmail.com> # Contributor (Arch): mortzu <me@mortzu.de> # Contributor (Arch): fnord0 <fnord0@riseup.net> @@ -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 <sh@lutzhaase.com> # Contributor (Arch): M0Rf30 # Contributor (Arch): Samsagax <samsagax@gmail.com> @@ -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/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD index e29ba491e..73c635297 100644 --- a/libre/bfgminer-libre/PKGBUILD +++ b/libre/bfgminer-libre/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $ +# $Id: PKGBUILD 113111 2014-06-13 18:57:57Z eric $ # Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com> _pkgname=bfgminer pkgname=bfgminer-libre -pkgver=3.10.0 +pkgver=4.0.0 pkgrel=1 -pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation." +pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusbx' 'lm_sensors') makedepends=('uthash' 'yasm') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) -url='https://bitcointalk.org/index.php?topic=168174.0' +url='http://bfgminer.org/' license=('GPL3') -source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2 +source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.txz remove-dangerous-rpath.patch) -sha256sums=('12458aed84abc4a953532fe0645772492701e5d627f56f62d382aa0f458a10d5' +sha256sums=('feec7d4ada6ceae456656b68188df05d095bbd7fc9839368f65dcd52b04f7539' 'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c') prepare() { diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 770e5a224..aee169fd9 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 112255 2014-05-30 17:49:50Z jelle $ +# $Id: PKGBUILD 113113 2014-06-13 19:40:31Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.39.0 +pkgver=1.40.0 pkgrel=1 pkgdesc="Ebook management application, without nonfree libunrar support" arch=('i686' 'x86_64' 'mips64el') @@ -32,8 +32,8 @@ source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver} 'desktop_integration.patch' 'calibre-mount-helper' 'libre.patch') -mkmd5sums=('38aa711c11586eb365bc5ff522cf9b58') -md5sums=('fad9ab43170f284dcb159413093de2e4' +mkmd5sums=('4fb8c0273e9bf14698fe99a89c9e2a65') +md5sums=('d4c862b8b1590b116275393512909284' 'ece36dfd737fa4a346f0a0e59395e949' '675cd87d41342119827ef706055491e7' '073a36adbb3628d21c2dff8b41e84abe') 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 <andyrtr@archlinux.org> 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 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 <emulatorman@parabola.nu> 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 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 <andyrtr@archlinux.org> # Maintainer (Arch): Tom Gundersen <teg@jklm.no> # Contributor (Arch): Rémy Oudompheng <remy@archlinux.org> # Contributor (Arch): Morgan LEFIEUX <comete@archlinuxfr.org> @@ -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') diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD index ebe8a4fc9..2a3de297f 100644 --- a/libre/icecat-firebug/PKGBUILD +++ b/libre/icecat-firebug/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ +# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> pkgname=icecat-firebug -pkgver=1.12.8 +pkgver=2.0 pkgrel=1 pkgdesc="IceCat plugin with tools for web development." arch=(any) @@ -11,8 +11,8 @@ license=('custom:BSD') groups=('icecat-addons') depends=('icecat') provides=('firebug' firefox-firebug=$pkgver) -source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi") -md5sums=('b93528ff22c76f6c3f63f81fe5e49496') +source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi") +md5sums=('d628079b2bd28970be02be48608753b3') package() { # extension diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD index 2c897ae21..dad19082f 100644 --- a/libre/iceweasel-firebug/PKGBUILD +++ b/libre/iceweasel-firebug/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $ +# $Id: PKGBUILD 113091 2014-06-13 13:27:58Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> pkgname=iceweasel-firebug -pkgver=1.12.8 +pkgver=2.0 pkgrel=1 pkgdesc="Iceweasel plugin with tools for web development." arch=(any) @@ -11,8 +11,8 @@ license=('custom:BSD') groups=('iceweasel-addons') depends=('iceweasel-libre') provides=('firebug' firefox-firebug=$pkgver) -source=("${url}releases/firebug/${pkgver%.*}/firebug-$pkgver.xpi") -md5sums=('b93528ff22c76f6c3f63f81fe5e49496') +source=("${url}releases/firebug/$pkgver/firebug-$pkgver.xpi") +md5sums=('d628079b2bd28970be02be48608753b3') package() { # extension diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 52b25edc3..4c43612d0 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -6,8 +6,8 @@ # Based on icecat-l10n package, which is in turn based on firefox-i18n _debname=iceweasel -_debver=29.0.1 -_debrel=deb2 +_debver=30.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -71,85 +71,85 @@ for lang in ${_langpacks[@]}; do done md5sums=('a4593936bf1c7a9ec9368ff249f9cc56' - '5212e031eae6de237047493dd3b17839' - '5256c33646c811243d971c2948d4540f' - '1b4ebf2a5bb60a39a692e6e2bf921bc1' - 'eff8df5362b969fad2d5035f0e293c3b' - '53764ab1290f283f5cb19fa7c7851b5b' - '286a30364cbe548b8ea7869a9ed0e714' - '268d68d7f7ac0c370a55fd7f3f4c494c' - 'f06df37df6355d61b572b6088e6827e8' - '2c87dbb5025d05f95f001ab992ec9da5' - 'a1b079b85c5756b1583a13cd24863e9d' - 'b002a0c681dbac4069943b5db61c95e5' - '310af575e5c39d7962cdb56169262185' - '1f773521b7b6675582439e64d9e3d758' - '02879f164cb7cd9a13af3e1b46fea80d' - '6ea7166c043a7d4c05c210d5261c414c' - 'f65c77f6f15c04275a008d6e58bd541c' - 'c7aa15567191e72dd757691abb1a5ae7' - '46a8e0708537ea2631fe8790a383d5a7' - 'cc693b069aa1d9b4788c02e10ab788d3' - '49b31e547a79005e3e2cc0506389cfff' - 'f4f7b1752d03cb075a17fd03d2ff62de' - 'c2339402fa423f24941cc31d8317c07d' - 'eb95e0d926d08ad7d4d2c07dbaf95f1f' - '7f65d10b78824b6d68823670a2465e3e' - '29e6930e9614730c5a7c7af9918a6bf6' - '707399d8624c1d11e23449ec98ff295a' - '9f38ec248ce6d0effcbb8dc0a57d0451' - 'a142fd17b8a6210b4175787e706a1dd0' - 'f2859ececb5f37952e1251e2a4c12eb2' - '683cc117552326b7956735ce92a615c6' - 'f5fb8323242af74905a252b2aedfb8ac' - 'dd4bb43eb2667ddbce04df69d476b6eb' - '47bae6defee487720cf4af99d4800661' - '0b3140ec20919558f9ec98091701106c' - '82a89d3d33abee4c7a8e6c2fa85e975a' - 'd9ca9caf4db47f7196fc6214e0a88adf' - '0383cd4f92605bf1f9b5ee0f65aed28c' - '1b223a3e494e52c035dc60c573df1e77' - '0ad8bf4d1654e0526046e0c029e13cf5' - '8429ca65a11669c1d42c6f250b650372' - '2cbac1603a4e4363ff7322f8a09b6a86' - '3825833afcd237ef7f647bdbb9b1b385' - '009c5f3e9e3763b7f1aacfab67b351a1' - 'e617f501efd7546e2926dc314b6f4bb0' - '327748b28598bae3c3425c3392a89ee1' - 'c3c38d1e1bff579c05fb470a44d35ea6' - '5d3f5c3cd1ae88ad0fb3b93da2c55089' - '1f8df74964bf45063dfa5d313596cbe0' - '35e562ca13f45c02042619bce9e92e0c' - '57f901a464f6d474267f03980342e4b2' - 'f7fb39449967ad0da8aa567ba2e4cb96' - 'bfb7ac8d35e0418ac351e2f9494eb3eb' - '00543f199dc9043601add130bd35cf7c' - '6bfe70687da3906ff8c60084e7cd11f0' - 'b363419979847f37b61efd36d82b1b22' - '41cf324447d9e4d4d31dc570e013668e' - '3167c6aa26338edbc2fea9286b74ac92' - 'a6d70c9fa7a4eb5c18361f206b0c2853' - 'c22b649ed95516ab2f209d5f457fc7ec' - '05125f937750c8a32b21025dd795ad34' - '0566b26dd4ab9e407566a260b6fa437a' - 'df14368e5407b32f35afec5983d23065' - '26f7f8630d2af347d30158493e72dbc6' - 'e95a43f0267dc0208628a613ab36462d' - 'aa4a9f335e4b16b940e95737176138fa' - '493018de7779e66e2bd405f9a48f583d' - 'a7c85664f9d8d5de735ecb8c83888e34' - '2226e585636f8128bb2cd2bb99119798' - 'f56cc0a56c3549f6209b8075f2c96612' - 'b66c06b84b384ee2dff7ebfe99cfd5bd' - '1a7bee60f76a49385bdae30f2cba57cf' - 'e38da54ece4d168306c36f164fda7cd6' - 'd4d1ac230fdce90aab2a788f07b76c29' - 'ed2daf324d05e140da7c9c3f0530a13f' - 'ba18543af3aca23aa987c4bb1b2d721d' - '01782138beaa302f3937a8654d445349' - '39025e66895473df2a0aedb967c994ad' - 'a6023974d5bb2536afb533f55e146f30' - '6b443a261b5c71861dc162e63e276411' - '3e0d27a1975e62b3289afce485cc6a10' - '4505e984500672d97b9873cdc8f9813f' - '261941346e68fd1d3aae024734e0f9cd') + 'a4ebadbcd3792d8df1d9d781ed71de01' + 'd808ad3e592e61d0b9bc221600f083ee' + '5d337f816a8b0a66764226b490b5e2c8' + '09d45c5b359b83065276ed38e70b96fb' + '2fbbe3cf20242b703d4435204d558bdf' + '41dd62eda1522717e640db9300fa8219' + '7a5c03ecaae02beb41400d7903af771e' + '24cf8ff52b7f7568735910f2272809d4' + '5a0e6ca6b4c3eebf2c13b0897c535168' + '0c997d23e45f3aa8d906c7fefd149950' + 'f3b756e5afdf6bc5ce22e229ef9d810f' + '57a1e272e720b93988a6159c6865d61f' + 'bf16f137b99e9ef816c78e5e4eded227' + 'c503e483e5ab38e7d5fd0b4972fcbc33' + '765e13734512f2e0eb21305dfc8d4159' + '11450005daf415910863362606244dc9' + '2fddb79e2d9ed989313a3ef26600fdac' + 'c89513012b9ebcd635d1d3d0af21c894' + '7100396629a2051ef04112c785a2659c' + 'd239601f870a8d2d21b12fe7b498d0e5' + 'dd0f09e577c528e259ef1cf5d5891f1c' + 'f571a129430b6b86143ac672733e98ba' + '7048e50f5dfd348337c46aae445bdd38' + '1dccd98c3a34cd95c0a11ee49bd68f31' + '086c5270c7cead2207922da4d15295ab' + '5ddb9ac3ae4202aa619cf6c459735d3f' + '60cfabd429c222056a837bd7e0fed2ba' + 'f276e31c1c9381c99c2b193c2fdeb07b' + '97fa118868effc7aef1099404c44d1c7' + '60acbd8824d0e880108c91e9c1ac1fd2' + '74bab6b82f4cfc053b3c3bcc6bd9ad32' + '577cf1c5abc7eafcd089484efba3ca73' + 'e3c478dbc1be5dad585270de58aaa8cd' + '9448c177eeb1a601e540e3eb34061c8d' + '54238a4ddd14929278365282562b8f17' + '9748cdc9ac6d2f24040c7cd671952110' + '38154e8181ceea36939e1b2d1e9332f8' + '85a1bf8e27d54efccb2db596c860db38' + 'a16e4e09c9cec0e4222aff9631605a6f' + 'd7c50c99ccc20cf2e804d68043cbc82b' + '0d696d728e376fc49f04c871dab48b94' + '16fc03a3e98ea4a075394af4ff9380b3' + '895c82fed083616ac88f1f9b49469d7f' + '1619509e3c27400f0350b264c0002f1e' + 'ba65d345b0ac2fbf057eccf27e8f37a0' + '0e3d9acc4be099621a63d48e29516e1b' + 'c12ecc9ae543b59a8ca84f4a39ebc650' + 'e5ab76e0f6d7a26755aff3a4719e6d23' + 'b2e0be67e9e1d6b4791fde0fb0fb9214' + '1a8a299cf4b325f92d6724e8db440ce5' + '42674ca5e2dba846c4f9aafe17f746ef' + '52b261a801eac3690444282c0ce775ce' + '814508f80b8ee14c75f246d12f949c9f' + '287ac8a6e330e74e9da9da0afdb8d143' + 'afaf98af1617be4063ac02522c4781ac' + '1b54b35778cd45c35e970a68dccd8b49' + '26ba16c8126f033e87e066a617a94aec' + '1c7b8f635357d12f79309957f521f6f1' + '5675466e6e11505e7fbddf1b3a7aabd2' + '53c439be649253fb58ae5cd0458d2c4d' + '622509371083bf62233d3489d0709360' + '2e2dbfd3573a8ccf3614bf9ac0619edc' + 'be1f3d3d4aac76fe19be373dd1046859' + 'd01fee3c62ca34fc5c06295a0401eb58' + 'ddf3acdaecfbbe8f8828d66b1f055c51' + '6f21301b43463b19a4f7e73c2d0fd05b' + '8825499cf0120b8cf9a58693644e7b54' + 'd07f0ca31a841317b36c6aa00c7d51b6' + '41435530531cea6b067c69041007ba51' + '3f091773b50248ec33c12e177c4073ef' + 'd5c52bd0cb774ec9afe267d3c38aa994' + 'c5514c3eee68b19969676b73c7c3ea42' + '44a311210e2e3f4b51d134498da0d0bf' + 'e92bb2a8677c7ec8a50fa7ba35d4805f' + '1205b6b370499e2e0c7ef428bc4d2a3f' + '50297f4fda05fb09516345788938f6dc' + '20fe5a27307f924d5c8b4130fa34e18e' + '4629cdcfedd802f7d5d2b7cd0929db8a' + 'ce4a5c30aea9212cd71af9e990e95638' + 'd4b642858a1d8297d33223141a95199e' + '149b2070f4fc5116093221957bba3dfb' + '27b23f1040f2bfface3a13e1152a3d1a') 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 <mh@glandium.org>
-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
- <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
- #endif
-- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
-+ <radio id="self" hidden="true"/>
- <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
- </radiogroup>
- <label id="noSources" hidden="true">&noMigrationSources.label;</label>
-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index d7fec75..d531b83 100644
---- a/browser/components/migration/src/BrowserProfileMigrators.manifest
-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
- #ifdef HAS_IE_MIGRATOR
- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
-diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 3db6720..a3b3dda 100644
---- a/browser/components/migration/src/FirefoxProfileMigrator.js
-+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -128,7 +128,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
-
-
- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
-
- this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 2c91e9a..08962c4 100644
---- a/browser/components/migration/src/MigrationUtils.jsm
-+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -405,12 +405,6 @@ this.MigrationUtils = Object.freeze({
- * @see nsIStringBundle
- */
- getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
-- const OVERRIDES = {
-- "4_firefox": "4_firefox_history_and_bookmarks",
-- "64_firefox": "64_firefox_other"
-- };
-- aKey = OVERRIDES[aKey] || aKey;
--
- if (aReplacements === undefined)
- return getMigrationBundle().GetStringFromName(aKey);
- return getMigrationBundle().formatStringFromName(
-@@ -625,6 +619,17 @@ this.MigrationUtils = Object.freeze({
- },
-
- /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ canMigrate:
-+ function MU_canMigrate(aMigratorKey) {
-+ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
-+ },
-+
-+ /**
- * Cleans up references to migrators and nsIProfileInstance instances.
- */
- finishMigration: function MU_finishMigration() {
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index f67823b..36016b8 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -12,6 +12,7 @@ function ProfileMigrator() {
-
- ProfileMigrator.prototype = {
- migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-+ canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
- QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
- classDescription: "Profile Migrator",
- contractID: "@mozilla.org/toolkit/profile-migrator;1",
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 21cf405..f3c1a6b 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-@@ -17,8 +17,6 @@
- <!ENTITY importFromSafari.accesskey "S">
- <!ENTITY importFromChrome.label "Chrome">
- <!ENTITY importFromChrome.accesskey "C">
--<!ENTITY importFromFirefox.label "Firefox">
--<!ENTITY importFromFirefox.accesskey "X">
-
- <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
-
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 094a9dc..a620905 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.properties
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
-@@ -24,30 +24,30 @@ importedSafariReadingList=Reading List (From Safari)
- 2_ie=Cookies
- 2_safari=Cookies
- 2_chrome=Cookies
--2_firefox=Cookies
-+2_self=Cookies
-
- 4_ie=Browsing History
- 4_safari=Browsing History
- 4_chrome=Browsing History
--4_firefox_history_and_bookmarks=Browsing History and Bookmarks
-+4_self=Browsing History and Bookmarks
-
- 8_ie=Saved Form History
- 8_safari=Saved Form History
- 8_chrome=Saved Form History
--8_firefox=Saved Form History
-+8_self=Saved Form History
-
- 16_ie=Saved Passwords
- 16_safari=Saved Passwords
- 16_chrome=Saved Passwords
--16_firefox=Saved Passwords
-+16_self=Saved Passwords
-
--32_ie=Favorites
-+32_ie=Favourites
- 32_safari=Bookmarks
- 32_chrome=Bookmarks
-
- 64_ie=Other Data
- 64_safari=Other Data
- 64_chrome=Other Data
--64_firefox_other=Other Data
-+64_self=Other Data
-
--128_firefox=Windows and Tabs
-+128_self=Windows and Tabs
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index d46b43b..2253994 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -28,6 +28,58 @@ function onResetProfileLoad() {
- populateResetPane("migratedItems");
- }
-
-+<<<<<<< HEAD
-+=======
-+/**
-+ * Check if reset is supported for the currently running profile.
-+ *
-+ * @return boolean whether reset is supported.
-+ */
-+function resetSupported() {
-+ let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].
-+ getService(Ci.nsIToolkitProfileService);
-+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
-+
-+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
-+ try {
-+ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+ return ("canMigrate" in pm) && pm.canMigrate("self");
-+ }
-+ } catch (e) {
-+ // Catch exception when there is no selected profile.
-+ Cu.reportError(e);
-+ }
-+ return false;
-+}
-+
-+function getMigratedData() {
-+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
-+
-+ // From migration.properties
-+ const MIGRATED_TYPES = [
-+ 4, // History and Bookmarks
-+ 16, // Passwords
-+ 8, // Form History
-+ 2, // Cookies
-+ ];
-+
-+ // Loop over possible data to migrate to give the user a list of what will be preserved.
-+ let dataTypes = [];
-+ for (let itemID of MIGRATED_TYPES) {
-+ try {
-+ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
-+ dataTypes.push(typeName);
-+ } catch (x) {
-+ // Catch exceptions when the string for a data type doesn't exist.
-+ Components.utils.reportError(x);
-+ }
-+ }
-+ return dataTypes;
-+}
-+
-+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
- function onResetProfileAccepted() {
- let retVals = window.arguments[0];
- retVals.reset = true;
-diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index f35c227..7062886 100644
---- a/toolkit/profile/nsIProfileMigrator.idl
-+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
- * @client Toolkit (Startup code)
- * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
- */
--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
- interface nsIProfileMigrator : nsISupports
- {
- /**
-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
- * @note The startup code ignores COM exceptions thrown from this method.
- */
- void migrate(in nsIProfileStartup aStartup, in ACString aKey);
-+
-+ /**
-+ * Returns whether a given migration type is supported.
-+ *
-+ * @param aKey Migrator key
-+ * @returns whether the migrator key is supported.
-+ */
-+ bool canMigrate(in ACString aKey);
- };
-
- %{C++
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index fe66f3b..2ddcd3b 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3952,7 +3952,7 @@ XREMain::XRE_mainRun()
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
- }
- pm->Migrate(&mDirProvider, aKey);
- }
diff --git a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch deleted file mode 100644 index c7c4c355b..000000000 --- a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch +++ /dev/null @@ -1,108 +0,0 @@ -From: Mike Hommey <mh@glandium.org> -Date: Sat, 16 Nov 2013 13:01:17 +0900 -Subject: Fixup "Reset Firefox" after bad merge - ---- - toolkit/content/resetProfile.js | 52 ---------------------------------------- - toolkit/modules/ResetProfile.jsm | 11 +++++---- - 2 files changed, 6 insertions(+), 57 deletions(-) - -diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js -index 2253994..d46b43b 100644 ---- a/toolkit/content/resetProfile.js -+++ b/toolkit/content/resetProfile.js -@@ -28,58 +28,6 @@ function onResetProfileLoad() { - populateResetPane("migratedItems"); - } - --<<<<<<< HEAD --======= --/** -- * Check if reset is supported for the currently running profile. -- * -- * @return boolean whether reset is supported. -- */ --function resetSupported() { -- let profileService = Cc["@mozilla.org/toolkit/profile-service;1"]. -- getService(Ci.nsIToolkitProfileService); -- let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile); -- -- // Reset is only supported for the default profile if the self-migrator used for reset exists. -- try { -- if (currentProfileDir.equals(profileService.selectedProfile.rootDir) && -- "@mozilla.org/toolkit/profile-migrator;1" in Cc) { -- let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); -- return ("canMigrate" in pm) && pm.canMigrate("self"); -- } -- } catch (e) { -- // Catch exception when there is no selected profile. -- Cu.reportError(e); -- } -- return false; --} -- --function getMigratedData() { -- Components.utils.import("resource:///modules/MigrationUtils.jsm"); -- -- // From migration.properties -- const MIGRATED_TYPES = [ -- 4, // History and Bookmarks -- 16, // Passwords -- 8, // Form History -- 2, // Cookies -- ]; -- -- // Loop over possible data to migrate to give the user a list of what will be preserved. -- let dataTypes = []; -- for (let itemID of MIGRATED_TYPES) { -- try { -- let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); -- dataTypes.push(typeName); -- } catch (x) { -- // Catch exceptions when the string for a data type doesn't exist. -- Components.utils.reportError(x); -- } -- } -- return dataTypes; --} -- -->>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic - function onResetProfileAccepted() { - let retVals = window.arguments[0]; - retVals.reset = true; -diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm -index db57f2a..d618d08 100644 ---- a/toolkit/modules/ResetProfile.jsm -+++ b/toolkit/modules/ResetProfile.jsm -@@ -7,8 +7,6 @@ - this.EXPORTED_SYMBOLS = ["ResetProfile"]; - - const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; --#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; --#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; - - Cu.import("resource://gre/modules/Services.jsm"); - -@@ -25,8 +23,11 @@ this.ResetProfile = { - - // Reset is only supported for the default profile if the self-migrator used for reset exists. - try { -- return currentProfileDir.equals(profileService.selectedProfile.rootDir) && -- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc); -+ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) && -+ "@mozilla.org/toolkit/profile-migrator;1" in Cc) { -+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); -+ return ("canMigrate" in pm) && pm.canMigrate("self"); -+ } - } catch (e) { - // Catch exception when there is no selected profile. - Cu.reportError(e); -@@ -50,7 +51,7 @@ this.ResetProfile = { - let dataTypes = []; - for (let itemID of MIGRATED_TYPES) { - try { -- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME); -+ let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); - dataTypes.push(typeName); - } catch (x) { - // Catch exceptions when the string for a data type doesn't exist. diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 083262b48..0a4127d60 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,8 +14,8 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel -_debver=29.0.1 -_debrel=deb2 +_debver=30.0 +_debrel=deb1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -29,19 +29,16 @@ pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based o arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 hicolor-icon-theme hunspell icu libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 clang diffutils gstreamer0.10-base imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) +makedepends=(autoconf2.13 diffutils gst-plugins-base-libs imagemagick imake inetutils libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') -options=(!emptydirs !makeflags) +options=(!emptydirs !makeflags debug) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi optdepends=('networkmanager: Location detection via available WiFi networks' - 'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing' - 'gstreamer0.10-good-plugins: webm and mp4 demuxing' - 'gstreamer0.10-bad-plugins: aac, vp8 and opus decoding' - 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding' - 'gstreamer0.10-ffmpeg: more decoders' + 'gst-plugins-good: h.264 video' + 'gst-libav: h.264 video' 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/sid/${_pkgname}" install=iceweasel.install @@ -57,21 +54,17 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel.desktop iceweasel-install-dir.patch vendor.js - iceweasel-20.0.1-fixed-loading-icon.png - Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - Fixup-Reset-Firefox-after-bad-merge.patch) -md5sums=('4db358c753cb15a526dfe79c6602c886' - '4d786ae63da53ba6da8105fbb50cbad9' - '92a08a18995b915d6a6d0dab93ec6c1d' + iceweasel-20.0.1-fixed-loading-icon.png) +md5sums=('3a603dbbfc9c7e56a8e58cede90a9b0b' + '89e7b2ed2e84fdefcc1eca7d076b72c2' + '2f5cb3df42b09fbfeaee5e72e5433ab9' 'df08eaa1ac3bc6c2356be4fbf8ec8932' - '5d22063ebea2472dd0b1163b32b2050b' + '21d3ffb77ea84ce897016bc713b52ef4' 'b03a979a78484503ba8dddad4f2c96d1' '7b9e5996dd9fe0b186a43a297db1c6b5' '1c42509891cf6843660a5f3c69896e80' '783a5927246f014855b96a3abb92566b' - '6e335a517c68488941340ee1c23f97b0' - '9d1cc7b80085a4438305e9e37d42745b' - '8e165ef85ddd72491f0b48f8954afca6') + '6e335a517c68488941340ee1c23f97b0') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -86,18 +79,10 @@ prepare() { # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true - # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it - rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true - - # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true - quilt push -av install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code - patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch - patch -Np1 -i "$srcdir/Fixup-Reset-Firefox-after-bad-merge.patch" patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname # Patch and remove anything that's left @@ -186,8 +171,6 @@ build() { export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - export CC=clang - export CXX=clang++ if [[ $CARCH == i686 ]]; then # Work around memory address space exhaustion during linking on i686 diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 29b8e9457..71f401e05 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,8 +1,7 @@ -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 171c78a..a02efa8 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -273,11 +273,6 @@ pref("browser.slowStartup.notificationDisabled", false); +diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js +--- mozilla-release.orig/browser/app/profile/firefox.js 2014-06-11 23:44:43.729632510 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2014-06-11 23:54:32.231213278 -0300 +@@ -281,11 +281,6 @@ pref("browser.slowStartup.timeThreshold", 60000); pref("browser.slowStartup.maxSamples", 5); @@ -14,24 +13,24 @@ index 171c78a..a02efa8 100644 pref("browser.enable_automatic_image_resizing", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); -@@ -1298,11 +1293,7 @@ pref("shumway.disabled", true); +@@ -1486,12 +1481,7 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -// Default social providers -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Share\",\"shareURL\":\"https://www.facebook.com/sharer/sharer.php?u=%{url}\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"icon32URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAAsTAAALEwEAmpwYAAADbklEQVRYCc1Xv08UQRj99tctexAuCEFjRE0kGBEtLDSGqIWNxkYKbTAxNlY2JhaGWltNtNFeKgsKKxITK43/gCYW+IsoRhA4D47bH7fn9+bcvdm5JR7sefolC3Ozu9978+bNN7PayUv3HN3umdY0Y6IWBtSJ0HSTarXqTOiuTep6Lj+tdxAcA8RAgSmwdd2aCDs0clldYALb/FvgYVhjmfliVA2XpjEgWo0Attn42Z6WH1RFor5ehwo9XQIUZMoVn4qlCoVMSo62EvD8Kh0b3U2Xz43R2PBO6mUCGDlAf65V6MadZzT/rUimoccc2kYA4BfPHqJb105RzjJigKhRq9kEJUBIjgYVuXeL7SAI6eD+Abp5dTwVHOmEHxT50d8WBYJqSOdPj5BjW8gZR8UNqFR2xagx/65XFYaMH+BGWwiYpi4UkBPPLxTp9v1Z+lHc4DWvCQXWmIy6EjITgKowVd5Jjv7N3Hd6y5esigoOwpkJIAmMpZpLJGdiaaC4F0UmAj6bD84GCEwmB/qxMmRilmnwb/mpjAocHh4UEoNAt5NLZB7oy9OJo0PxqkAtePdhiSqunyC1LQUwWMPQaOr6GRre258Ajn4cP7KHcEXhsxpXbj+lT19X2TMNGTLVAcjcalS8gDwsQ2UOMhH4k8FkcrEn5E5ub2sKohxLK2VR77Hl9RUcsrgeRIEiVOT6z+tDbIeLy+vk+kGTCbXxycet6xhl//3f6bJEkdHYhA+mLtDIvoH4ieev5+juoxdk5+pjhALYEdXIpEB5w+NlSKSzqVQ/+H7IO6BLtl3fngGMiqhGJgIwlM6qpyUGFjySdk8m0Zg0ubeD7X9OIDEFajltRQgUJaUKx69tdgaQa0FMADuahZPMFtcEwNPm2hA7ZI5sK4aoE2NvYI+o8hkCIe7CwTv68zS0q9Dk5vpbm/8FXxitSzmMFHpsGj0wyLUheTwD2Y9fVgh1Ae0EPUgD9241ZEnld+v5kgnVZ/8fE0brVh5BK+1oCqKKF72Dk7HwBsssB/pklU1dfChy3S659H5+uelgIb+8WRv1/uGTV9Sdb5wJFlfW6fPCalMhwhSU1j2xKwKbP838GcOwJja4TqO0bjdmXxYTy1EYjFdCWoCEYZhseH/GDL3yJPHnuW6YmT7P1SlIA4768Hke4vOcsX8BE346lLHhDUQAAAAASUVORK5CYII=\", \"icon64URL\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAACNNJREFUeNrtm3tw1NUVxz/399hHHkgCaCBGEFEEREVFYFQcSoOKdkZay4z+4dDpYIsjHWx1WoTMhFi1gzBSpVgVGbU4U1sHfPESKODwEEnRYDFAICEIeZIQshs2u/v73ds/drMsyW7YLEkl2Z6Z32yy+9v7u+fc7znne8+5KzgvAjDunzlv0M13PjDZ6c4cARj0WhEoaZ1tOn3yq9XLf/tNU0O1D5Ad7wq/OpxpaXOL1j5uZAwuaGlVgwNBhULRm0XXBG6HZrlNa9uRrzfM+3DlgjIgGMsA7rl/XDdHOnNf9vosTfVuvTsaQhdkZ4iykh2rHtqydvkxwI58BhjTfv7MmP55E9/1nLNdfU15ACkVvoAaMCRvRPa+re9+DgTaPjMAx+DrJv3M67Mz+6LybWLb4NfTHhxzx31DDhZvOtqGAgNwWbjGICV9XQJB0e/KobcOP1i8qTzaAEYgaDtNU/V5A9hSaUFLuQEt2gVQSgml+j4CUAIppYgK/m0GkCjZ9xGAUNAu0LUhgJRAAAIVzwBSqVRQH4hlAClRKZAFhOgEASoFECBR8QwgUyQGdJT/B8HzCEiBNKhUJzEgBYIgQsTJAkohe9oFZHgHKvQoHtZ9K3tewfiixXABLdoFeuSSEmkF+PH4QTz7+M3o+ENptzvGtS36uSwmjMpAYF10XCllHCYoe84FlLS555Zs5jx6J6ahY+iCl98pJiDNS1hwSZop+cm91zJmxEBefGsPlu1AxKC67V3gf5oGlZSMuz6Dp2fdhWnoAEwaN5T5hsYLb+4hKB1dcgelFDpB8ifk8thDt3DO5+fZxRvxBV0IjQR0EB3KfD1GhJS0GZnnYuGcKTgdF9ZWx4/No/BJjUUrdtJqm4iL+K5SCmSAiWMHMevhcQzNzaa6ron5SzfQ7HeiaSKx+au4m6HupcJKSYZdZVI4dypuV2yo3zoql0VP3cOiFV/Q4jdiGkGhQFqMGpbJL346kbE3DEYIQWNTC39Ysp4Gr4HQtZDyiRhA0NlmSHZbRM7pr1H0m6lckeHqdGXG3jCYoqfupeC17bT49fNRXIFSNrkDTGbNGM9dtw1D10M1DI/Xx3NLP6OqETRdDy1eglPT4rqA7K56gCIrXfHCvHwGZqUnBMtR113FS/N+xHPLtuJpDa1mVobg0emjmX7vqEjsUErhaw1Q8Mo6yk4F0A1HeOW7kIlFx/u7jworRabLpmhuPjmD+iG7YNDrrhnIS09P5cW/buOeO67lkftvJt3tDE06PE7Qsnh++QYOHPOim86wcVUS0+whJug0ghTMmcK1V2eH8m2UHP++nrwhAyIwjiXDcrN5vXAGhqGhFBeMYUvJ0re2sPfgGTTDGUZrEogVopMgmGQWUCgMEWTBE5MZPSLngnGqas/w9j92s31fJfmThvPM7HyMMKRj+qgmOiBHSsnr73/B5r1V6A53KD4k3bFS8dNgckFQoWPxu1kTGDc6N7JqzR4ff/+smE+2H8FSLkx3FluLawhaG3n2iXwcppGoV/Hemt18tK0c3UwLIfUS2nVafBeQJNUXkAF+/dht3H37cKSUBC2bTTv+w98++YazPg1dT0NoIUhruoMd+2sJrtjI7381rQM3iCVrN33N++tL0c30xFNdp0GQeFRYQhcRIO0gv5xxE/fdfSO2bfNVSTmrPtxLZW0A3XSh6VporaLG1XQHu0pOU/TaOhY8+QAuZ3w6vHnnQd74536EkZ50wOsSE0zcugolbWZOG8GM/LGUVdSw6sM97D/UgGa60QxXzMJDZAq6yb7SJgr//CkLn5pOmsvR4Z5dxUdZ9t6XoKfFjNyXkqZjuoBUCpGgCyhp8eDdQ5k++UaWrdrMlr2VSFxoZlpE8YtNWGgGXx9ppnDZpxTMfTCS8gAOlJ5g8ds7kCItTIi6j6FqMVxAC2sV2RB1ekmLCTcNpH+myeyFH7BxT1Voopoe4RKJXQqhmxw45mXh0o/xeH0opThcXs2iv2wmoFyhAnbC4yX+3PgISMDShrA5XHGa3d9UITRniIeTfHASmsGhEz7mL/mI2TPv4sU3t+KzHAnu7JKpCosOkcSIICAB5hZE0OiRCM0Iwb0b6LPQdI5W+Zn/yucoYYayRk+16eK1xqRMDAHtA0r3lep0lNAjO8kfpCpMqpTF4xZEUqA7rIlOCiKpgADVWXc4FQwgEfHPB5AiByTixIDUCYJx+wJoqdIcJV5VOAWygEZcF7BToT2upFDKtuz2BrAtf8v3mju972cBJX2exso6ok6N64BhOtM11xXXPBz6v6340PcuO+DZfaJkzWqgqY3L64Bqaaz0ZV45Mkc308dG2kd97FLSaq4v317gazr5HeCLRoACFTxbfeBw+oDhWYYj4/rw+30H+rb/VMPxXQsbKnbuABqJOi4vogyRiRB5/XNvvz3zytFTDEf61eF9b0dCKTS36c4afymTsgLeQ9Ly13X/aYnzE1Uy6PV7679trNy1xe+tKwPqAH/0Vla0qw65gH7AFeG/Y3Uy9P45o0bm3PTIaplM6lTK9jWf/OBUyQcrpdXaTIyfsXQb9QcLaAn7vJd2vxY5XxBpo8pwDmgFGsLKx1oeh8OVmUUSLXUlrWZPzbdLag9v+BjUqfDzepKAyDDcZbznGHG+1NmqSKHpVlfbadJqLW+o2LHobNX+PUB1WPkfnHwYyTmX6lI7Lehr3F576NM/+T3V3wH17f2w1xkg2ggXuSvga6p8p+bgmpVKWpXAmVh+2AsNEKogdYYAJa0GT03J4obyf60HTgKe6PTTqw0QOpcQ3wXs4LlDZyq2FXrrS4uBmjDxuCw3G5eIgA46yeC5ho11pWsWW35PWTibBC4Xf+9eBLRPg0q2+s5UvHG6bMNqJYPHw7nXutxZYvIIiMoCSgbrPVX/fv7syS+3AKfC5MOmF4iRpP6RjrId8O5vrNhS1NpUWQLUholUr6muXEoatP3emrWNR9e/avk9R8P+HuxNypPkrk93pGdnK0VtXemaN6UdOHo55vdE5b/0NKx+K4AxtAAAAABJRU5ErkJggg==\", \"description\":\"Easily share the web to your Facebook friends.\",\"author\":\"Facebook\",\"homepageURL\":\"https://www.facebook.com\",\"builtin\":\"true\",\"version\":1}"); - --pref("social.sidebar.open", true); -pref("social.sidebar.unload_timeout_ms", 10000); +- +-pref("dom.identity.enabled", false); +// Removed Facebook sidebar with Iceweasel. - pref("social.allowMultipleWorkers", true); - -diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css -index c270318..049fe6e 100644 ---- a/browser/base/content/abouthome/aboutHome.css -+++ b/browser/base/content/abouthome/aboutHome.css -@@ -49,11 +49,6 @@ a { + // Turn on the CSP 1.0 parser for Content Security Policy headers + pref("security.csp.speccompliant", true); +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2014-06-11 23:51:17.732797819 -0300 +@@ -49,11 +49,6 @@ background-repeat: no-repeat; } @@ -43,7 +42,7 @@ index c270318..049fe6e 100644 #searchForm { display: -moz-box; } -@@ -72,8 +67,7 @@ a { +@@ -72,8 +67,7 @@ #searchEngineLogo { display: inline-block; height: 28px; @@ -53,7 +52,7 @@ index c270318..049fe6e 100644 } #searchText { -@@ -145,48 +139,6 @@ a { +@@ -145,48 +139,6 @@ transition-duration: 0ms; } @@ -102,7 +101,7 @@ index c270318..049fe6e 100644 #launcher { display: -moz-box; -moz-box-align: center; -@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before { +@@ -335,26 +287,25 @@ width: 32px; } @@ -135,7 +134,7 @@ index c270318..049fe6e 100644 } /* [HiDPI] -@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before { +@@ -366,26 +317,6 @@ background-image: url("chrome://branding/content/about-logo@2x.png"); } @@ -162,7 +161,7 @@ index c270318..049fe6e 100644 #downloads::before { content: url("chrome://browser/content/abouthome/downloads@2x.png"); } -@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { +@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before { content: url("chrome://browser/content/abouthome/restore@2x.png"); } @@ -172,10 +171,9 @@ index c270318..049fe6e 100644 - } } -diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js -index 432fcdc..bd1692a 100644 ---- a/browser/base/content/abouthome/aboutHome.js -+++ b/browser/base/content/abouthome/aboutHome.js +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2014-06-11 23:51:17.769464803 -0300 @@ -3,152 +3,44 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -363,7 +361,7 @@ index 432fcdc..bd1692a 100644 // This global tracks if the page has been set up before, to prevent double inits let gInitialized = false; let gObserver = new MutationObserver(function (mutations) { -@@ -156,7 +48,6 @@ let gObserver = new MutationObserver(function (mutations) { +@@ -156,7 +48,6 @@ if (mutation.attributeName == "searchEngineName") { setupSearchEngine(); if (!gInitialized) { @@ -371,7 +369,7 @@ index 432fcdc..bd1692a 100644 gInitialized = true; } return; -@@ -181,117 +72,6 @@ window.addEventListener("pagehide", function() { +@@ -181,117 +72,6 @@ window.removeEventListener("resize", fitToWidth); }); @@ -489,7 +487,7 @@ index 432fcdc..bd1692a 100644 function onSearchSubmit(aEvent) { let searchTerms = document.getElementById("searchText").value; -@@ -350,147 +130,6 @@ function loadSucceeded() +@@ -350,147 +130,6 @@ document.dispatchEvent(event); } @@ -637,10 +635,9 @@ index 432fcdc..bd1692a 100644 function fitToWidth() { if (window.scrollMaxX) { document.body.setAttribute("narrow", "true"); -diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml -index 1d03d38..5d808db 100644 ---- a/browser/base/content/abouthome/aboutHome.xhtml -+++ b/browser/base/content/abouthome/aboutHome.xhtml +diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2014-06-11 23:51:17.789464976 -0300 @@ -43,15 +43,6 @@ <input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/> </form> @@ -665,11 +662,10 @@ index 1d03d38..5d808db 100644 + <a id="aboutGNU" href="http://gnu.org"></a> </body> </html> -diff --git a/browser/base/jar.mn b/browser/base/jar.mn -index 0870527..301c8cb 100644 ---- a/browser/base/jar.mn -+++ b/browser/base/jar.mn -@@ -33,7 +33,7 @@ browser.jar: +diff -Nur mozilla-release.orig/browser/base/jar.mn mozilla-release/browser/base/jar.mn +--- mozilla-release.orig/browser/base/jar.mn 2014-06-05 22:15:17.000000000 -0300 ++++ mozilla-release/browser/base/jar.mn 2014-06-11 23:51:17.812798511 -0300 +@@ -32,7 +32,7 @@ content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) @@ -678,7 +674,7 @@ index 0870527..301c8cb 100644 content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png) content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) -@@ -45,7 +45,6 @@ browser.jar: +@@ -44,7 +44,6 @@ content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) @@ -686,10 +682,9 @@ index 0870527..301c8cb 100644 #ifdef MOZ_SERVICES_HEALTHREPORT content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml) content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js) -diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd -index e84341f..5476d32 100644 ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd +--- mozilla-release.orig/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser/aboutHome.dtd 2014-06-11 23:51:17.836132046 -0300 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -708,10 +703,9 @@ index e84341f..5476d32 100644 <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> <!ENTITY abouthome.settingsButton.label "Settings"> -diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties -index 087cc50..5654eb9 100644 ---- a/browser/locales/en-US/chrome/browser-region/region.properties -+++ b/browser/locales/en-US/chrome/browser-region/region.properties +diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2014-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2014-06-11 23:51:17.842798771 -0300 @@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -734,7 +728,7 @@ index 087cc50..5654eb9 100644 # increment this number when anything gets changed in the list below. This will # cause Firefox to re-read these prefs and inject any new handlers into the -@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +@@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=4 @@ -759,10 +753,9 @@ index 087cc50..5654eb9 100644 -gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s +gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net -diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in -index e925c1e..8c121fc 100644 ---- a/browser/locales/generic/profile/bookmarks.html.in -+++ b/browser/locales/generic/profile/bookmarks.html.in +diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2014-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2014-06-11 23:51:17.869465669 -0300 @@ -15,13 +15,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -790,11 +783,10 @@ index e925c1e..8c121fc 100644 + <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A> </DL><p> </DL><p> -diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -index c3dc6b2..df312e3 100644 ---- a/browser/modules/AboutHome.jsm -+++ b/browser/modules/AboutHome.jsm -@@ -8,7 +8,7 @@ let Cc = Components.classes; +diff -Nur mozilla-release.orig/browser/modules/AboutHome.jsm mozilla-release/browser/modules/AboutHome.jsm +--- mozilla-release.orig/browser/modules/AboutHome.jsm 2014-06-05 22:15:18.000000000 -0300 ++++ mozilla-release/browser/modules/AboutHome.jsm 2014-06-11 23:51:17.926132826 -0300 +@@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -803,9 +795,9 @@ index c3dc6b2..df312e3 100644 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm"); - XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", - "resource://gre/modules/PrivateBrowsingUtils.jsm"); +@@ -18,66 +18,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", + "resource://gre/modules/FxAccounts.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -870,7 +862,7 @@ index c3dc6b2..df312e3 100644 /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -186,18 +126,9 @@ let AboutHome = { +@@ -202,18 +142,9 @@ ss.promiseInitialized.then(function() { let data = { showRestoreLastSession: ss.canRestoreLastSession, diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 8b2b2a5e3..37ad56fda 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -26,6 +26,7 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --enable-pulseaudio +ac_add_options --enable-gstreamer=1.0 ac_add_options --disable-crashreporter ac_add_options --disable-updater 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 <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: Michał Masłowski <mtjm@mtjm.eu> @@ -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 <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> _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 <andrea@archlinux.org # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> _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 <annma@kde.org> -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 <greg@kamago.net> -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 <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _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 <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _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/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?= <thomas@archlinux.org> -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 <johannes.berg@intel.com> -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: <stable@vger.kernel.org> [3.14] -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> ---- - 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 diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 25ee8bd5d..a5e256aa6 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 215080 2014-06-13 10:32:35Z bpiotrowski $ # Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -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=43 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.40 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.42 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,8 +32,8 @@ 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' - '85ce008eaacbb2fc54b81116d35cf946' + '608bae7e9718c3b178c8a6b5594660e3' + 'c4c1ffeb312c2a70685fd960cc328e01' '16867e648e4b9f89bec949cb643888c2' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' @@ -41,7 +41,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' - '4515aaccb905a164f5e44213d264b5ed') + 'fc169cfc460e78637a667465e26493e0') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -118,7 +118,7 @@ build() { #make menuconfig # CLI menu for configuration #make nconfig # new CLI menu for configuration #make xconfig # X-based configuration - #make oldconfig # using old config from previous kernel version + make oldconfig # using old config from previous kernel version # ... or manually edit .config # rewrite configuration diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 942c1a052..11293a2bd 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.15-1 Kernel Configuration +# Linux/x86 3.10.43 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1718,7 +1718,7 @@ CONFIG_SCSI_ENCLOSURE=m CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set -CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_SCSI_SCAN_ASYNC=y # # SCSI Transports @@ -1981,6 +1981,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -3399,6 +3400,7 @@ CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NCT6775=m +# CONFIG_SENSORS_NTC_THERMISTOR is not set CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -4816,18 +4818,6 @@ CONFIG_USB_SERIAL_IPW=m CONFIG_USB_SERIAL_IUU=m CONFIG_USB_SERIAL_KEYSPAN_PDA=m CONFIG_USB_SERIAL_KEYSPAN=m -CONFIG_USB_SERIAL_KEYSPAN_MPR=y -CONFIG_USB_SERIAL_KEYSPAN_USA28=y -CONFIG_USB_SERIAL_KEYSPAN_USA28X=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y -CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y -CONFIG_USB_SERIAL_KEYSPAN_USA19=y -CONFIG_USB_SERIAL_KEYSPAN_USA18X=y -CONFIG_USB_SERIAL_KEYSPAN_USA19W=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y -CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y -CONFIG_USB_SERIAL_KEYSPAN_USA49W=y -CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y CONFIG_USB_SERIAL_KLSI=m CONFIG_USB_SERIAL_KOBIL_SCT=m CONFIG_USB_SERIAL_MCT_U232=m @@ -5187,7 +5177,6 @@ CONFIG_DMA_OF=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y # CONFIG_DMATEST is not set CONFIG_DCA=m 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?= <thomas@archlinux.org> -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 <johannes.berg@intel.com> -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: <stable@vger.kernel.org> [3.14] -Signed-off-by: Johannes Berg <johannes.berg@intel.com> -Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> ---- - 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 <tpowa@archlinux.org> # Maintainer (Arch): Thomas Baechler <thomas@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> @@ -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 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 } 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 <archlinux at cryptocrack dot de> # 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 <schiv@archlinux.org> # Contributor (Arch): Mateusz Herych <heniekk@gmail.com> # Contributor (Arch): Charles Lindsay <charles@chaoslizard.org> @@ -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/" diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD index 5970c5bcb..1a0380bd7 100644 --- a/libre/wings3d-libre/PKGBUILD +++ b/libre/wings3d-libre/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $ +# $Id: PKGBUILD 113127 2014-06-13 22:30:55Z arodseth $ # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> # Contributor (Arch): kappa <kappacurve@gmail.com> # Maintainer: Márcio Silva <coadde@parabola.nu> +_pkgname=wings3d _name=wings -_pkgname=${_name}3d -pkgname=$_pkgname-libre -pkgver=1.5.2 -pkgrel=1.1 +pkgname=wings3d-libre +pkgver=1.5.3 +pkgrel=1 pkgdesc='3D modeling program, without nonfree kerkythea render support' arch=('x86_64' 'i686' 'mips64el') url='http://www.wings3d.com/' @@ -19,47 +19,38 @@ provides=("$_pkgname") conflicts=("$_pkgname") replaces=("$_pkgname") install=$_pkgname.install -source=("$_pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/v$pkgver.tar.gz" +source=("http://downloads.sourceforge.net/project/wings/wings/$pkgver/wings-$pkgver.tar.bz2" "$_pkgname.sh" "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('d86980e4fa91a04ca96b989b0dcba53a37c8cfda4e6d98accb8e7bd9a289094b' +sha256sums=('c08060016f83679ce08947942d31af0e3b5d105525d0df5e993ec6f1a81fdd8e' '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') prepare() { - gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" \ + gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --name 'Wings3D' \ --genericname '3D Modeler' --categories 'Graphics;3DGraphics' - - cd "$_name-$pkgver" - sed -i "s|v1[.]2[.]x[.]y[.]WINGS|v$pkgver.$pkgrel.PARABOLA|" WINGS-VERSION-GEN } build() { - cd "$_name-$pkgver" - export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) - make - make lang + make -C "$_name-$pkgver" all lang } package() { + install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" + install -Dm644 "$_pkgname.desktop" \ + "$pkgdir/usr/share/applications/$_pkgname.desktop" + install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" cd "$_name-$pkgver" - - mkdir -p "$pkgdir/usr/lib/$_pkgname" + install -d "$pkgdir/usr/lib/$_pkgname" for subdir in ebin fonts patches plugins shaders textures; do cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname" done - cd "$srcdir" - install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname" - install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png" - install -Dm644 "$_pkgname.desktop" \ - "$pkgdir/usr/share/applications/$_pkgname.desktop" - msg 'remove nonfree kerkythea render support plugin' - rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_kerky.beam + rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_kerky.beam - msg 'remove obsolete yafray render support plugin' - rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang} + msg 'remove deprecated yafray render support plugin' + rm -v $pkgdir/usr/lib/$_pkgname/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang} } # vim:set ts=2 sw=2 et: diff --git a/libre/wings3d-libre/wings3d.install b/libre/wings3d-libre/wings3d.install index 98f3ea190..ad97d7bab 100644 --- a/libre/wings3d-libre/wings3d.install +++ b/libre/wings3d-libre/wings3d.install @@ -1,5 +1,4 @@ post_upgrade() { - #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor update-desktop-database -q } 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] 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 <jmarshall@xbmc.org> -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 <pupykin.s+arch@gmail.com> # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com> # Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com> # Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor (Arch): Maxime Gauduin <alucryd@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> _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] 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 <eric@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _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') 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 <andyrtr@archlinux.org> # Maintainer: Márcio Silva <coadde@parabola.nu> _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() { diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD index 63559b0e3..259ef463c 100644 --- a/nonprism/evolution-data-server-nonprism/PKGBUILD +++ b/nonprism/evolution-data-server-nonprism/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 212323 2014-05-12 18:57:42Z jgc $ +# $Id: PKGBUILD 214775 2014-06-10 13:56:31Z jgc $ # Maintainer (Arch): Jan de Groot <jgc@archlinux.org> _pkgname=evolution-data-server pkgname=evolution-data-server-nonprism -pkgver=3.12.2 +pkgver=3.12.3 pkgrel=1 pkgdesc="Centralized access to appointments and contacts, without libgdata support" arch=(i686 x86_64) @@ -16,7 +16,7 @@ replaces=("$_pkgname" 'evolution-data-server-coherence') conflicts=($_pkgname) provides=($_pkgname=$pkgver) source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('91c95e17a8c1cd1086dafcd99a40bdf8f5993770f251f8b0a10e5395e3f5a3b6') +sha256sums=('342d96446a9d6bf95bb649f14738a032c1454069201b4743c806ce0d8ad9dd7b') build() { cd "$_pkgname-$pkgver" 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 <andrea@archlinux.org> # Maintainer: André Silva <emulatorman@parabola.nu> _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 <andrea@archlinux.org> # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> # Maintainer: André Silva <emulatorman@parabola.nu> _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 diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD index 98282e094..13d3ce4ea 100644 --- a/nonprism/sylpheed-nonprism/PKGBUILD +++ b/nonprism/sylpheed-nonprism/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108818 2014-04-04 16:07:28Z speps $ +# $Id: PKGBUILD 113099 2014-06-13 15:15:18Z speps $ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Contributor (Arch): Alexander Fehr <pizzapunk gmail com> # Contributor (Arch): dorphell <dorphell@archlinux.org> @@ -7,7 +7,7 @@ _pkgname=sylpheed pkgname=sylpheed-nonprism -pkgver=3.4.1 +pkgver=3.4.2 pkgrel=1 pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ makedepends=('openssl') install="$_pkgname.install" source=("http://sylpheed.sraoss.jp/$_pkgname/v${pkgver%.*}/$_pkgname-$pkgver.tar.bz2" 'nonprism.patch') -md5sums=('9071bb341a6d96244fe7cd5ff013c70d' +md5sums=('d4e53489763ff2cb575ab02890d91dc9' 'e1bddc14962e607cdb899ec082660639') prepare() { diff --git a/pcr/apparmor/PKGBUILD b/pcr/apparmor/PKGBUILD new file mode 100644 index 000000000..6a60e5f0b --- /dev/null +++ b/pcr/apparmor/PKGBUILD @@ -0,0 +1,156 @@ +# Contributor (Arch) : Thomas Kuther <archlinux@kuther.net> +# Contributor (Arch) : Gianni Vialetto <gianni at rootcube dot net> +# Contributor (Arch) : Paul N. Maxwell <msg dot maxwel at gmail dot com> +# Contributor (Arch) : Thomas Mudrunka <harvie@@email..cz> +# Contributor (Arch) : Max Fierke <max@maxfierke.com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +pkgbase=apparmor +pkgname=($pkgbase apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) +pkgver=2.8.3 +#_majorver=${pkgver%.*} # bleh, AUR... +_majorver=2.8 +pkgrel=1 +pkgdesc='Linux application security framework - mandatory access control for programs' +arch=('i686' 'x86_64') +license=('GPL') +url='http://wiki.apparmor.net/index.php/Main_Page' +makedepends=('bzr' 'flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit') + +source=("https://launchpad.net/$pkgname/${_majorver}/$pkgver/+download/$pkgname-$pkgver.tar.gz" + "apparmor_load.sh" + "apparmor_unload.sh" + "apparmor.service") + + +#Configuration +core_perl_dir='/usr/bin/core_perl' +export MAKEFLAGS+=" POD2MAN=${core_perl_dir}/pod2man" +export MAKEFLAGS+=" POD2HTML=${core_perl_dir}/pod2html" +export MAKEFLAGS+=" PROVE=${core_perl_dir}/prove" + + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}/parser" + # avoid depend on texlive-latex + sed -i -e 's/pdflatex/true/g' Makefile + + cd "${srcdir}/${pkgbase}-${pkgver}/utils" + # Set Arch paths + sed -e '/logfiles/ s/syslog /syslog.log /g' \ + -e '/logfiles/ s/messages/messages.log/g' \ + -e '/parser/ s# /sbin/# /usr/bin/#g' \ + -i logprof.conf + # do not build/install vim file with utils package (causes ref to $srcdir and wrong location) + sed -i '/vim/d' Makefile + + cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" + # /usr merge vs. profiles + for i in `find . -name "*sbin*"`; do sed -i -e 's@sbin@bin@g' ${i} && mv ${i} ${i/sbin/bin}; done + for i in klogd ping syslog-ng syslogd; do + sed -e "s@/bin/${i}@/usr/bin/${i}@g" \ + -e "s@bin\.${i}@usr\.bin\.${i}@g" \ + -i bin.${i} && \ + mv bin.${i} usr.bin.${i} + done +} + +build() { + msg2 "Building: apparmor-libapparmor" + cd "${srcdir}/${pkgbase}-${pkgver}/libraries/libapparmor" + unset PERL_MM_OPT + NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr --sbindir=/usr/bin --with-perl --with-python + make + + cd "${srcdir}/${pkgbase}-${pkgver}" + msg2 "Building: apparmor-parser" + make -C parser + + msg2 "Building: apparmor-utils" + make -C utils + + msg2 "Building: apparmor-profiles" + make -C profiles + + msg2 "Building: apparmor-pam" + make -C changehat/pam_apparmor + + msg2 "Building: apparmor-vim" + make -C utils/vim -j1 +} + +package_apparmor() { + pkgdesc='Linux application security framework - mandatory access control for programs (metapackage)' + depends=(apparmor-parser apparmor-libapparmor apparmor-utils apparmor-profiles apparmor-pam apparmor-vim) + optdepends=('linux-apparmor: an arch kernel with AppArmor patches') + install='apparmor.install' +} + +package_apparmor-parser() { + pkgdesc='AppArmor parser - loads AA profiles to kernel module' + depends=('apparmor-libapparmor' 'bash') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C parser install DESTDIR=${pkgdir} + mv "${pkgdir}/lib" "${pkgdir}/usr/lib" + mv "${pkgdir}/sbin" "${pkgdir}/usr/bin" +} + +package_apparmor-libapparmor() { + pkgdesc='AppArmor library' + makedepends=('swig' 'perl' 'python') + depends=('python') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C libraries/libapparmor install DESTDIR=${pkgdir} + install -D -m644 "libraries/libapparmor/swig/perl/LibAppArmor.pm" "${pkgdir}/usr/lib/perl5/vendor_perl/" +} + +package_apparmor-utils() { + pkgdesc='AppArmor userspace utilities' + arch=('any') + depends=('perl' 'perl-locale-gettext' 'perl-term-readkey' + 'perl-file-tail' 'perl-rpc-xml' 'python' 'bash') + install='apparmor-utils.install' + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C utils install DESTDIR=${pkgdir} BINDIR=${pkgdir}/usr/bin + install -D -m755 "${srcdir}/apparmor_load.sh" "${pkgdir}/usr/bin/apparmor_load.sh" + install -D -m755 "${srcdir}/apparmor_unload.sh" "${pkgdir}/usr/bin/apparmor_unload.sh" + install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service" +} + +package_apparmor-profiles() { + pkgdesc='AppArmor sample pre-made profiles' + depends=(apparmor-parser) + arch=('any') + + # backup /etc/apparmor.d/* so using logprof is safe + cd "${srcdir}/${pkgbase}-${pkgver}/profiles/apparmor.d" + declare -a _profiles=(`find -type f|sed 's@./@etc/apparmor.d/@'`) + backup=(`echo ${_profiles[@]}`) + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C profiles install DESTDIR=${pkgdir} +} + +package_apparmor-pam() { + pkgdesc='AppArmor PAM library' + depends=('apparmor-libapparmor' 'pam') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make -C changehat/pam_apparmor install DESTDIR=${pkgdir}/usr + install -D -m644 changehat/pam_apparmor/README "${pkgdir}/usr/share/doc/apparmor/README.pam_apparmor" +} +package_apparmor-vim() { + pkgdesc='AppArmor VIM support' + arch=('any') + depends=('vim') + + cd "${srcdir}/${pkgbase}-${pkgver}/utils/vim" + install -D -m644 apparmor.vim \ + "${pkgdir}/usr/share/vim/vimfiles/syntax/apparmor.vim" +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/apparmor/apparmor-utils.install b/pcr/apparmor/apparmor-utils.install new file mode 100644 index 000000000..85f69d3a3 --- /dev/null +++ b/pcr/apparmor/apparmor-utils.install @@ -0,0 +1,15 @@ +post_install() { +# echo 'Creating /var/log/messages symlink to improve compatibility...' +# ln -sf messages.log /var/log/messages +cat << EOF + +==> Use /etc/apparmor/logprof.conf to change system log file +==> configuration if you have a not-standard syslog-ng.conf. + +EOF +} + +post_upgrade() { + post_install $1 +} + diff --git a/pcr/apparmor/apparmor.install b/pcr/apparmor/apparmor.install new file mode 100644 index 000000000..dc25ea832 --- /dev/null +++ b/pcr/apparmor/apparmor.install @@ -0,0 +1,20 @@ +post_install() { + cat << EOF +==> To enable apparmor, add this to kernel boot line: + + apparmor=1 security=apparmor + +==> Warning: To full functionality you must have kernel +==> with apparmor patchset. +EOF +} + +post_remove() { + cat << EOF +==> To completely remove, delete this from kernel boot line: + + apparmor=1 security=apparmor + +EOF +} + diff --git a/pcr/apparmor/apparmor.service b/pcr/apparmor/apparmor.service new file mode 100644 index 000000000..7cee03ad9 --- /dev/null +++ b/pcr/apparmor/apparmor.service @@ -0,0 +1,11 @@ +[Unit] +Description=AppArmor profiles + +[Service] +Type=oneshot +ExecStart=/usr/bin/apparmor_load.sh +ExecStop=/usr/bin/apparmor_unload.sh +RemainAfterExit=yes + +[Install] +WantedBy=basic.target diff --git a/pcr/apparmor/apparmor_load.sh b/pcr/apparmor/apparmor_load.sh new file mode 100644 index 000000000..30ce04086 --- /dev/null +++ b/pcr/apparmor/apparmor_load.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +aa_profiles='/etc/apparmor.d/' +aa_log='/var/log/apparmor.init.log' +/usr/bin/apparmor_parser -r $(find "$aa_profiles" -maxdepth 1 -type f) 2>> "$aa_log" diff --git a/pcr/apparmor/apparmor_unload.sh b/pcr/apparmor/apparmor_unload.sh new file mode 100644 index 000000000..de13938ab --- /dev/null +++ b/pcr/apparmor/apparmor_unload.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +aa_profiles='/etc/apparmor.d/' +aa_log='/var/log/apparmor.init.log' +PROFILES=`find "$aa_profiles" -maxdepth 1 -type f` +for profile in $PROFILES; do + apparmor_parser -R "$profile" 2>> "$aa_log" +done 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 <dragonlord@aur.archlinux.org> +# Contributor (Arch) : Arto Puranen <purcher@gmail.com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +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 diff --git a/pcr/audit/PKGBUILD b/pcr/audit/PKGBUILD new file mode 100644 index 000000000..0366595f2 --- /dev/null +++ b/pcr/audit/PKGBUILD @@ -0,0 +1,62 @@ +# Contributor (Arch) : <kang@insecure.ws> +# Contributor (Arch) : Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor (Arch) : Connor Behan <connor.behan@gmail.com> +# Contributor (Arch) : henning mueller <henning@orgizm.net> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +pkgname=audit +pkgver=2.3.6 +pkgrel=1 +pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' +url="http://people.redhat.com/sgrubb/audit" +arch=(i686 x86_64) +depends=(krb5 libcap-ng) +makedepends=(libldap swig linux-headers python2) +license=(GPL) +options=(emptydirs) +backup=( + etc/libaudit.conf + etc/audit/audit.rules + etc/audit/auditd.conf + etc/audisp/audispd.conf + etc/audisp/audisp-remote.conf + etc/audisp/zos-remote.conf + etc/audisp/plugins.d/af_unix.conf + etc/audisp/plugins.d/audispd-zos-remote.conf + etc/audisp/plugins.d/au-remote.conf + etc/audisp/plugins.d/syslog.conf +) +source=("$url/$pkgname-$pkgver.tar.gz") + +build() { + cd "$srcdir/$pkgname-$pkgver" + export PYTHON=/usr/bin/python2 + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/audit \ + --with-python=yes \ + --enable-gssapi-krb5=yes \ + --enable-systemd=yes \ + --with-libcap-ng=yes + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + install -d var/log/audit + rm -rf etc/rc.d etc/sysconfig usr/lib/audit + + sed -ri 's|/sbin|/usr/bin|' \ + etc/audit/*.conf \ + etc/audisp/plugins.d/*.conf \ + usr/lib/systemd/system/auditd.service + + chmod 644 usr/lib/systemd/system/auditd.service + mv "$pkgdir"/etc/audit/{rules.d/,}audit.rules +} + 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 <aurelien@hackers.camp> + +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 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 <crt.011@gmail.com> +# Contributor (Arch) : Sébastien Duquette <ekse.0x@gmail.com> +# Contributor (Arch) : icarus <icarus.roaming@gmail.com> +# Contributor (Arch) : Stephane Travostino <stephane.travostino@gmail.com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +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 +} 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 <lambchop468 *AT* gmail.com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +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/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 <fboulogne at april dot org> -# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io> +# Contributor: Francois Boulogne <fboulogne at april dot org> +# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp> 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: diff --git a/pcr/irssi-otr-git/PKGBUILD b/pcr/irssi-otr-git/PKGBUILD new file mode 100644 index 000000000..b4d19d97a --- /dev/null +++ b/pcr/irssi-otr-git/PKGBUILD @@ -0,0 +1,43 @@ +# Contributor (Arch) : quantax -- contact via Arch Linux forum or AUR +# Contributor (Arch) : Federico Cinelli <cinelli.federico@gmail.com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +pkgname=irssi-otr-git +pkgver=20090814 +pkgrel=1 +pkgdesc="Off-the-Record Messaging (OTR) for the Irssi IRC client." +arch=('i686' 'x86_64') +url="http://irssi-otr.tuxfamily.org/" +license=('GPL') +depends=(irssi libotr git) +makedepends=(cmake pkgconfig python) +conflicts=(irssi-otr) +provides=(irssi-otr) +source=('git://git.tuxfamily.org/gitroot/irssiotr/irssiotr.git') + +_gitroot="git://git.tuxfamily.org/gitroot/irssiotr/irssiotr.git" +_gitname="irssiotr" + +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" + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cp -r "$srcdir/$_gitname" "${srcdir}/${_gitname}-build" + cd "$srcdir/$_gitname-build" + + cmake -DCMAKE_INSTALL_PREFIX=/usr . + cp -f LICENSE README irssi + make && make DESTDIR="$pkgdir/" install +} + 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 <christian.babeux@0x80.ca> + +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} +} diff --git a/pcr/lynis/PKGBUILD b/pcr/lynis/PKGBUILD new file mode 100644 index 000000000..24be95c25 --- /dev/null +++ b/pcr/lynis/PKGBUILD @@ -0,0 +1,47 @@ +# Contributor (Arch) : Levente Polyak <levente[at]leventepolyak[dot]net> +# Contributor (Arch) : Sébastien Luttringer <seblu@aur.archlinux.org> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +pkgname=lynis +pkgver=1.5.6 +pkgrel=1 +pkgdesc='Security and system auditing tool to harden Unix/Linux systems' +url='http://cisofy.com/lynis/' +license=('GPL3') +arch=('any') +backup=('etc/lynis/default.prf') +depends=('sh') +optdepends=('net-tools: networking tests') +install=lynis.install +source=(http://cisofy.com/files/${pkgname}-${pkgver}.tar.gz) + +prepare() { + cd ${pkgname}-${pkgver} + # fix non-test includes to let lynis run as user but complain gracefully + chmod o+rx include + chmod o+r include/* + chmod o-r include/tests_* +} + +package() { + cd ${pkgname}-${pkgver} + + # install profile + install -Dm 644 default.prf "${pkgdir}/etc/${pkgname}/default.prf" + + # install binary + install -Dm 755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + + # install plugins, include, db + install -d "${pkgdir}/usr/share/${pkgname}" + cp -a db include plugins "${pkgdir}/usr/share/${pkgname}" + + # install doc files + install -d "${pkgdir}/usr/share/doc/${pkgname}" + install -m 644 -t "${pkgdir}/usr/share/doc/${pkgname}" README INSTALL CHANGELOG FAQ + + # install manpage + install -Dm 644 "${pkgname}.8" "${pkgdir}/usr/share/man/man8/${pkgname}.8" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/pcr/lynis/lynis.install b/pcr/lynis/lynis.install new file mode 100644 index 000000000..abdb081f1 --- /dev/null +++ b/pcr/lynis/lynis.install @@ -0,0 +1,8 @@ +pre_upgrade() { + chmod -R o= /usr/share/lynis + chmod 0755 /usr/share/lynis + # fix non-test includes to let lynis run as user but complain gracefully + chmod o+rx /usr/share/lynis/include + chmod o+r /usr/share/lynis/include/* + chmod o-r /usr/share/lynis/include/tests_* +} diff --git a/pcr/nova/PKGBUILD b/pcr/nova/PKGBUILD index 4da77e669..23e34afc0 100644 --- a/pcr/nova/PKGBUILD +++ b/pcr/nova/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch) : Limao Luo <luolimao+AUR@gmail.com> +# Contributor (Arch) : Limao Luo <luolimao+AUR@gmail.com> # Contributor (Arch) : Josh Chase <jcjoshuachase@gmail.com> # Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> 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 <aurelien@cwb.io> +# Contributor (Arch) : Kyle Keen <keenerd@gmail.com> +# Contributor (Arch) : Gilrain <pierre.buard+aur gmail com> +# Contributor (Arch) : bruenig +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> 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" } diff --git a/pcr/pacman2pacman/PKGBUILD b/pcr/pacman2pacman/PKGBUILD index 7862f5a02..13dcf2e18 100644 --- a/pcr/pacman2pacman/PKGBUILD +++ b/pcr/pacman2pacman/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Joseph Graham <joseph@t67.eu> pkgname=pacman2pacman -pkgver=1.3.0 -pkgrel=1 +pkgver=1.4.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,12 +10,15 @@ depends=(transmission-cli) options=(emptydirs) install=$pkgname.install source=(https://t67.eu/filebin/$pkgname-$pkgver.tar.gz) +md5sums=('c7972067210b67c1b51d81c6f537927a') 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." -} diff --git a/pcr/paraboley/COPYING b/pcr/paraboley/COPYING new file mode 100644 index 000000000..53556406c --- /dev/null +++ b/pcr/paraboley/COPYING @@ -0,0 +1,5 @@ +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. diff --git a/pcr/paraboley/PKGBUILD b/pcr/paraboley/PKGBUILD new file mode 100644 index 000000000..0767b86ca --- /dev/null +++ b/pcr/paraboley/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +pkgname=paraboley +pkgver=0.1 +pkgrel=1 +pkgdesc="Python script to display system infomation alongside the Parabola GNU / Linux-libre logo." +arch=('any') +url="http://XL04D.github.com/paraboley" +license=('GPL') +depends=('python') +makedepends=('git' 'python-distribute') +optdepends=( +'python-mpd-git: python libary for mpd interaction', +'python-logbook-git: for logging' +'imagemagick: for default screenshot command' +) +conflicts=() +provides=('paraboley') +source="git://github.com/XL04D/paraboley.git" + +pkgver() { + cd ${pkgname} + git describe --always | sed 's|-|.|g' +} + +package() { + cd "$srcdir/$pkgname" + python setup.py install --root=${pkgdir} + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/paraboley/COPYING +} diff --git a/pcr/paraboley/README.md b/pcr/paraboley/README.md new file mode 100644 index 000000000..e24e8fe12 --- /dev/null +++ b/pcr/paraboley/README.md @@ -0,0 +1,4 @@ +Paraboley +======== + +Paraboley is a system infomation printer, designed to be used when taking screenshots of computer desktops to provide additional infomation about the operating system setup. Paraboley is designed to be used for Parabola GNU / Linux-libre, and it acordingly prints out the Parabola GNU / Linux-libre logo along side the system infomation.
\ No newline at end of file diff --git a/pcr/paraboley/paraboley b/pcr/paraboley/paraboley new file mode 100755 index 000000000..122b3cbb0 --- /dev/null +++ b/pcr/paraboley/paraboley @@ -0,0 +1,865 @@ +#!/usr/bin/env python +# +# Paraboley is a forked made by Aurélien DESBIRÈRES <aurelien@hackers.camp> +# of archey3 to present the Parabola GNU / Linux-libre logo and informations +# +# archey3 [version 0.5] +# +# Copyright 2010 Melik Manukyan <melik@archlinux.us> +# Copyright 2010-2012 Laurie Clark-Michalek <bluepeppers@archlinux.us> +# Distributed under the terms of the GNU General Public License v3. +# See http://www.gnu.org/licenses/gpl.txt for the full license text. +# +# Simple python script to display an Archlinux logo in ASCII art +# Along with basic system information. + +# Import libraries + +import collections +import subprocess, optparse, re, sys, configparser +from subprocess import Popen, PIPE +from optparse import OptionParser +from getpass import getuser +from time import ctime, sleep +from os import getenv +from datetime import datetime +import re +import os.path +import multiprocessing + +try: + from logbook import Logger, lookup_level +except ImportError: + class Logger(object): + def __init__(self, name, level=0): + self.name = name + self.level = level + debug = info = warn = warning = notice = error = exception = \ + critical = log = lambda *a, **kw: None + + def lookup_level(_): + return 0 + +UNAME_FLAG_MEANINGS = { + 'a': 'System Infomation', + 's': 'Kernel Name', + 'n': 'Hostname', + 'r': 'Kernel Release', + 'v': 'Kernel Version', + 'm': 'Machine Hardware name', + 'p': 'Processor Type', + 'i': 'Hardware Platform', +} + +LOGOS = {'Parabola': '''{c1} +{c1} ## ### {results[0]} +{c1} ## ## ##### {results[1]} +{c1} ## ## ## ####### {results[2]} +{c1} # ## ## ## ######## {results[3]} +{c1} ### # ######### {results[4]} +{c1} ### ######### {results[5]} +{c1} ## ######## {results[6]} +{c1} ####### {results[7]} +{c1} ###### {results[8]} +{c1} ###### {results[9]} +{c1} ##### {results[10]} +{c1} ##### {results[11]} +{c1} #### {results[12]} +{c1} #### {results[13]} +{c1} ### {results[14]} +{c1} ### {results[15]} +{c1} ## {results[16]} +{c1} # {results[17]} +\x1b[0m''' +} + +CLASS_MAPPINGS = {} + +def module_register(name): + """ + Registers the class in the CLASS_MAPPING global. + """ + def decorator(cls): + CLASS_MAPPINGS[name] = cls + return cls + return decorator + +DE_DICT = collections.OrderedDict([ + ('cinnamon', 'Cinnamon'), + ('gnome-session', 'GNOME'), + ('ksmserver', 'KDE'), + ('xfce4-session', 'Xfce'), + ('lxsession', 'LXDE'), + ('', 'None'), + ]) + +WM_DICT = collections.OrderedDict([ + ('awesome', 'Awesome'), + ('beryl', 'Beryl'), + ('blackbox', 'Blackbox'), + ('dwm', 'DWM'), + ('enlightenment', 'Enlightenment'), + ('fluxbox', 'Fluxbox'), + ('fvwm', 'FVWM'), + ('i3', 'i3'), + ('icewm', 'IceWM'), + ('kwin', 'KWin'), + ('metacity', 'Metacity'), + ('musca', 'Musca'), + ('openbox', 'Openbox'), + ('pekwm', 'PekWM'), + ('ratpoison', 'ratpoison'), + ('scrotwm', 'ScrotWM'), + ('subtle', 'subtle'), + ('monsterwm', 'MonsterWM'), + ('wmaker', 'Window Maker'), + ('wmfs', 'Wmfs'), + ('wmii', 'wmii'), + ('xfwm4', 'Xfwm'), + ('emerald', 'Emerald'), + ('compiz', 'Compiz'), + (re.compile('xmonad-*'), 'xmonad'), + ('qtile', 'QTile'), + ('wingo', 'Wingo'), + ('', 'None'), + ]) + +COLORS = { + 'black': '0', + 'red': '1', + 'green': '2', + 'yellow': '3', + 'blue': '4', + 'magenta': '5', + 'cyan': '6', + 'white': '7' +} + +class ArgumentError(Exception): + def __init__(self, caller, message): + msg = "{0}: {1}".format(caller.__class__.__name__, message) + super().__init__(msg) + +# State must be serializable +State = collections.namedtuple("State", "color config logger") + +class display(object): + command_line = '' + stdindata = '' + + def __init__(self, state, args=()): + self.state = state + # Python3 unpacking is awesome + self.arg1, self.arg2, self.arg3, *_ = tuple(args) + ('', '', '') + + @staticmethod + def call_command(command): + """ + Calls a command, waits for it to exit and returns all text from stdout. + Discards all other information. + """ + proc = Popen(command.split(), stdout=PIPE) + proc.wait() + return proc.communicate()[0].decode() + + def run_command(self): + if self.command_line: + if '{arg3}' in self.command_line: + cmd = self.command_line.format(arg1=self.arg1, arg2=self.arg2, + arg3=self.arg3) + elif '{arg2}' in self.command_line: + cmd = self.command_line.format(arg1=self.arg1, arg2=self.arg2) + elif '{arg1}' in self.command_line: + cmd = self.command_line.format(arg1=self.arg1) + else: + cmd = self.command_line + + try: + self.process = Popen(cmd.split(), stdin=PIPE, stdout=PIPE, + stderr=PIPE) + except Exception as e: + self.state.logger.error("Could not run command {0}".format(cmd)) + + def render(self): + (stdoutdata, stderrdata) = self.process.communicate(self.stdindata + or None) + + return self.format_output(stdoutdata.decode()) + + def color_me(self, output, number=None, low=30, low_color='green', + medium=60, medium_color='yellow', high_color='red'): + if number is None and output.isdigit(): + number = int(output) + elif number is None: + return output + + if number <= low: + color_= low_color + elif low < number <= medium: + color_ = medium_color + elif medium < number: + color_ = high_color + + return '{0}{1}{2}'.format(color(self.state, color_), output, + color(self.state, 'clear')) + + regex_class = re.compile("").__class__ + def process_exists(self, key): + global PROCESSES + if isinstance(key, self.regex_class): + for proc in PROCESSES._processes: + if key.search(proc): + return True + return PROCESSES(key) + + +@module_register("fs") +class fsDisplay(display): + command_line = "df -TPh {arg1}" + + conversions = { + 'binary': { + 'K': 2 ** 10, + 'M': 2 ** 20, + 'G': 2 ** 30, + 'T': 2 ** 40, + }, + 'si': { + 'K': 10 ** 3, + 'M': 10 ** 6, + 'G': 10 ** 9, + 'T': 10 ** 12, + }, + } + + def __init__(self, **kwargs): + super().__init__(**kwargs) + if not self.arg1: + msg = "Did not any arguments, require one, the fs to display" + self.state.logger.error(msg) + raise ArgumentError(self, msg) + + def format_output(self, instring): + try: + decimal_point = self.call_command( + 'locale -ck decimal_point').split('\n')[1].split('=')[1] + except Exception as e: + self.state.logger.warning('Could not determine locale decimal point,' + + 'defaulting to \'.\', failed with error {0}'.format(e)) + decimal_point = '.' + values = [line for line in instring.split('\n') if line][1].split() + used = values[3].replace(decimal_point, '.') + total = values[2].replace(decimal_point, '.') + fstype = values[1] + conversion_type = self.state.config.get('fs', 'unit', fallback="si").lower() + conversions = self.conversions[conversion_type] + + mount = '/root' if self.arg1 == '/' else self.arg1 + title = mount.split('/')[-1].title() + + low = self.state.config.getint('fs', 'low_bound', fallback=40) + medium = self.state.config.getint('fs', 'medium_bound', fallback=70) + + try: + #convert to straight float + used_ = float(used[:-1]) * conversions[used[-1].upper()] + total_ = float(total[:-1]) * conversions[total[-1].upper()] + persentage = used_ / total_ * 100 + except Exception as e: + self.state.logger.error( + "Could not colorize output, errored with {0}".format(e)) + return + else: + used = self.color_me(used, persentage, low=low, medium=medium) + + if self.state.config.getboolean("fs", "persentage", fallback=True): + part = '{used} / {total} ({persentage}%) ({fstype})'.format( + used=used, total=total, persentage=int(persentage), + fstype=fstype) + else: + part = '{used} / {total} ({fstype})'.format( + used=used, total=total, fstype=fstype) + return title, part + +@module_register("ram") +class ramDisplay(display): + command_line = "free -m" + + def format_output(self, instring): + ram = ''.join(line for line in str(instring).split('\n') if\ + line.startswith('Mem:')).split() + used = int(ram[2]) - int(ram[5]) - int(ram[6]) + total = int(ram[1]) + title = 'RAM' + try: + persentage = (used / total * 100) + except: + used += ' MB' + else: + used = self.color_me(number=persentage, output=str(used) + ' MB') + part = '{used} / {total} MB'.format(used=used, total=total) + return title, part + +@module_register("sensor") +class sensorDisplay(display): + command_line = "sensors {arg1}" + + def __init__(self, **kwargs): + super().__init__(**kwargs) + + arg_from_conf = self.state.config.get('sensor', 'sensor', + fallback='coretemp-*') + try: + arg_from_arg = kwargs["args"][0] + except IndexError: + self.state.logger.error( + "Did not get any arguments, require one, the sensor to display.") + raise + + if arg_from_arg: + self.arg1 = arg_from_arg + else: + self.arg1 = arg_from_conf + + def format_output(self, instring): + tempinfo = instring.split('\n')[2::4] + + out = [] + for line in tempinfo: + info = [re.sub("\s\s+", "", line) for line in line.split(' ') if\ + line] + value = info[1] + intvalue = int(value[:3]) + if intvalue > 45: + temp = (color(self.state, "red") + info[1] + + color(self.state, "clear")) + elif intvalue in range(30, 45): + temp = (color(self.state, "magenta") + info[1] + + color(self.state, "clear")) + else: + temp = (color(self.state, "green") + info[1] + + color(self.state, "clear")) + out.append((info[0], temp)) + return out + +@module_register("env") +class envDisplay(display): + def __init__(self, **kwargs): + try: + self.arg1 = kwargs["args"][0] + except IndexError: + self.state.logger.error("Did not get any arguments, require one," + + " the env variable to display.") + raise + + super().__init__(**kwargs) + + def render(self): + argvalue = getenv(self.arg1.upper()) + return ('$' + self.arg1.upper(), argvalue) + +@module_register("uname") +class unameDisplay(display): + command_line = "uname {arg1}" + + def __init__(self, **kwargs): + super().__init__(**kwargs) + + try: + flag = kwargs["args"][0] + except IndexError: + self.state.logger.error("Did not get any arguments, require one," + + " the flag to pass to uname") + raise + + arg_from_conf = self.state.config.get('uname', 'argument', fallback="") + arg_from_arg = flag + if arg_from_arg: + self.arg1 = '-' + arg_from_arg + elif arg_from_conf: + self.arg1 = '-' + arg_from_conf + else: + self.arg1 = '' + + def format_output(self, instring): + return (UNAME_FLAG_MEANINGS[self.arg1[1]], instring) + +@module_register("cpu") +class cpuDisplay(display): + command_line = "cat /proc/cpuinfo" + + def format_output(self, instring): + kv = [line.split(":") for line in instring.split("\n") if line] + infodict = {} + for k, v in kv: + infodict[k.strip()] = v.strip() + return "Processor Type", infodict["model name"] + +@module_register("uptime") +class uptimeDisplay(display): + def render(self): + with open("/proc/uptime") as upfile: + raw = upfile.read() + fuptime = int(raw.split('.')[0]) + + day = int(fuptime / 86400) + fuptime = fuptime % 86400 + hour = int(fuptime / 3600) + fuptime = fuptime % 3600 + minute = int(fuptime / 60) + uptime = '{daystring}{hours}:{mins:02d}'.format( + daystring='{days} day{s}, '.format(days=day, s=('s' if day > 1 + else '')) if day else '', + hours = hour, mins = minute + ) + return "Uptime", uptime + +@module_register("packages") +class packageDisplay(display): + command_line = "pacman -Q" + + def format_output(self, instring): + return "Packages", len(instring.rstrip('\n').split('\n')) + +@module_register("distro") +class distroCheck(display): + def render(self): + try: + _ = open("/etc/pacman.conf") + except IOError: + distro = self.call_command("uname -o") + else: + distro = "Parabola" + distro = '{0} {1}'.format(distro, self.call_command("uname -m")) + return "OS", distro + +@module_register("process") +class processCheck(display): + command_line = "ps -u " + getuser() + + render = lambda self: self + + def run_command(self): + super().run_command() + out = str(self.process.communicate()[0]) + + self._processes = set() + for line in out.split("\\n"): + words = line.split() + if len(words) <= 3: + continue + + self._processes.add(words[3]) + + def __call__(self, proc): + if proc in self._processes: + return True + return False + +@module_register("wm") +class wmDisplay(display): + def render(self): + if self.state.config.get('wm', 'manual', fallback=False): + return "WM", self.state.config.get('wm', 'manual') + wm = '' + for key in WM_DICT.keys(): + if self.process_exists(key): + wm = key + break + return "WM", WM_DICT[wm] + +@module_register("de") +class deDisplay(display): + def render(self): + if self.state.config.get('de', 'manual', fallback=False): + return "DE", self.state.config.get('de', 'manual') + de = '' + for key in DE_DICT.keys(): + if self.process_exists(key): + de = key + break + return "DE", DE_DICT[de] + +@module_register("mpd") +class mpdDisplay(display): + """ + Displays certain stat about MPD database. If mpd not installed, output + nothing. + """ + command_line = "mpc stats --host {arg1} --port {arg2}" + + def __init__(self, **kwargs): + super().__init__(**kwargs) + + try: + self.stat = kwargs["args"][0] + except IndexError: + self.state.logger.error("Did not get any arguments, require one," + + " the stat to display.") + self.arg1 = self.state.config.get('mpd', 'host', fallback='localhost') + self.arg2 = self.state.config.getint('mpd', 'port', fallback=6600) + + def format_output(self, instring): + lines = instring.split('\n') + stats = {} + try: + stats['artists'] = lines[0].split(':')[1].strip() + stats['albums'] = lines[1].split(':')[1].strip() + stats['songs'] = lines[2].split(':')[1].strip() + #if people don't have mpc installed then return None) + except: + self.state.logger.error( + "Could not parse mpc output, is mpc installed?") + return + + return ('{statname} in MPD database'.format(statname=self.stat.title()), + stats[self.stat]) + +@module_register("system_upgrade") +class systemUpgrade(display): + + _upgrade_message = 'starting full system upgrade' + + def render(self): + try: + datestr = None + for line in reversed(list(open('/var/log/pacman.log'))): + if line.rstrip().endswith(self._upgrade_message): + datestart = line.find('[') + dateend = line.find(']') + if datestart != -1 and dateend != -1: + datestr = line[datestart + 1 : dateend] + break + except Exception as err: + print(err) + + if not datestr: + datestr = 'Unknown' + else: + currenttime = datetime.today() + updatetime = datetime.strptime(datestr, '%Y-%m-%d %H:%M') + numdays = (currenttime - updatetime).days + datestr = '{0} ({1} days ago)'.format(datestr, numdays) + + return "Last Upgrade", datestr + +#------------ Config ----------- + +class ArcheyConfigParser(configparser.SafeConfigParser): + """ + A parser for the archey config file. + """ + + defaults = {'core': {'align': 'top', + 'color': 'blue', + 'display_modules': + """\ +distro(), uname(n), uname(r), uptime(), wm(), de(), packages(), ram(),\ + cpu(), env(editor), fs(/), mpd(albums)""" + }, + } + + def read(self, file_location=None): + """ + Loads the config options stored in at file_location. If file_location + does not exist, it will attempt to load from the default config location + ($XDG_CONFIG_HOME/archey3.cfg). If that does not exist, it will write a + default config file to $XDG_CONFIG_HOME/archey3.cfg. + """ + + if file_location is None and "XDG_CONFIG_HOME" not in os.environ: + config_location = os.path.expanduser("~/.archey3.cfg") + elif file_location is None: + config_location = os.path.expandvars("$XDG_CONFIG_HOME/archey3.cfg") + else: + config_location = \ + os.path.expandvars(os.path.expanduser(file_location)) + + loaded = super(ArcheyConfigParser, self).read(config_location) + + if file_location == None and not loaded: + self.load_default_config() + self.write_config(config_location) + return [config_location] + if not loaded: + #Try with default + loaded = super(ArcheyConfigParser, self).read() + return loaded + + def load_default_config(self): + """ + Loads the config options stored at self.defaults. + """ + for section, values in self.defaults.items(): + if not self.has_section(section): + self.add_section(section) + + for option, value in values.items(): + #strip any excess spaces + value = re.sub("( +)", " ", value) + self.set(section, option, value) + + def write_config(self, location): + """ + Writes the current config to the given location. + """ + with open(location, 'w') as configfile: + self.write(configfile) + + +#------------ Functions ----------- + +def screenshot(state): + print('Screenshotting in') + screenshot_time = state.config.getint("core", "screenshotwait", fallback=5) + for x in sorted(range(1, screenshot_time + 1), reverse=True): + print('%s' % x, end='') + sys.stdout.flush() + sleep(1.0/3) + for x in range(3): + print('.', end='') + sys.stdout.flush() + sleep(1.0/3) + + print('Say Cheese!') + sys.stdout.flush() + + screenshot_command = state.config.get('core', 'screenshot_command', + fallback="import -window root <datetime>.jpg") + try: + subprocess.check_call( + screenshot_command.replace('<datetime>', + ctime().replace(' ','_')).split(" ")) + except subprocess.CalledProcessError as e: + state.logger.critical('Screenshot failed with return code {0}.'.format( + e.returncode)) + raise + except subprocess.FileNotFoundError: + print("Could not find import command, install imagemagick") + +def color(state, code, bold=False): + """ + Returns a character color sequence acording to the code given, and the + color theme in the state argument. + """ + if code == 2: + bold = True + first_bitty_bit = '\x1b[{0};'.format(int(not bold)) + if code in range(3): + second_bitty_bit = '3{0}m'.format(state.color) + elif code == "clear": + return '\x1b[0m' + else: + second_bitty_bit = '3{0}m'.format(COLORS[code]) + + return first_bitty_bit + second_bitty_bit + +def _mp_render_helper(container): + """ + A little helper to get round the one iterator argument with + multiprocessing.Pool.map. + """ + state = container["state"] + cls_name = container["cls_name"] + args = container["args"] + cls = CLASS_MAPPINGS[cls_name] + return render_class(state, cls, args) + +def render_class(state, cls, args): + """ + Returns the result of the run_command method for the class passed. + """ + try: + instance = cls(args=args, state=State( + logger=Logger(cls.__name__, state.logger.level), + color=state.color, + config=state.config)) + + except Exception as e: + state.logger.error( + "Could not instantiate {0}, failed with error {1}".format( + cls.__name__, e)) + return + try: + instance.run_command() + return instance.render() + except Exception as e: + state.logger.error( + "Could not render line for {0}, failed with error {1}".format( + cls.__name__, e)) + +#------------ Display object --------- + +class Archey(object): + DISPLAY_PARSING_REGEX = "(?P<func>\w+)\((|(?P<args>[\w, /]+))\)" + + def __init__(self, config, options): + log_level = lookup_level(options.log_level) + logger = Logger("Core", log_level) + + self.display = config.get("core", "display_modules") + colorscheme = options.color or config.get( + "core", "color", fallback="blue") + for key in COLORS.keys(): + if key == colorscheme: + colorcode = COLORS[key] + + self.state = State(colorcode, config, logger) + + global PROCESSES + PROCESSES = render_class(self.state, processCheck, ()) + + distro_out = render_class(self.state, distroCheck, ()) + + if not distro_out: + self.state.logger.critical( + "Unrecognised distribution.") + raise RuntimeException("Unrecognised distribution.") + + self.distro_name = ' '.join(distro_out[1].split()[:-1]) + + def run(self, screenshot_=False): + """ + Actually print the logo etc, and take a screenshot if required. + """ + print(self.render()) + + if screenshot_: + screenshot(self.state) + + def render(self): + results = self.prepare_results() + results = self.arrange_results(results) + + return LOGOS[self.distro_name].format(c1=color(self.state, 1), + results = results + ) + + def prepare_results(self): + """ + Renders all classes found in the display array, and then returns them + as a list. The returned list will be exactly 18 items long, with any + left over spaces being filled with empty strings. + """ + poolsize = self.state.config.getint("core", "poolsize", fallback=5) + + pool = multiprocessing.Pool(poolsize) + + arguments = [] + for cls_name, args in self.parse_display(): + arguments.append({ + 'cls_name': cls_name, + 'args': args, + 'state': self.state + }) + raw_out = pool.map(_mp_render_helper, arguments) + outputs = list(map(self.format_item, + filter(bool, raw_out))) + + + return outputs + [""] * (18 - len(outputs)) + + def arrange_results(self, results): + """ + Arranges the results as specified in the config file. + """ + arrangement = self.state.config.get("core", "align", fallback="top") + if arrangement == "top": + return results + elif arrangement == "bottom": + actuall_res = [res for res in results if res] + return [""] * (len(results) - len(actuall_res)) + actuall_res + elif arrangement == "center": + actuall_res = [res for res in results if res] + offset = [""] * int((len(results) - len(actuall_res)) / 2) + return (offset + actuall_res + + [""] * (len(results) - len(actuall_res))) + else: + return results + + def parse_display(self): + """ + Iterates over the display attribute of the Archey class, and tries to + parse them using the DISPLAY_PARSING_REGEX. + """ + for func in self.display.split(","): + func = func.strip() + + info = re.match(self.DISPLAY_PARSING_REGEX, func) + if not info: + self.state.logger.error( + "Could not parse display string {0}".format(func)) + continue + + groups = info.groupdict() + if groups["args"]: + args = [arg.strip() for arg in groups["args"].split(",")] + else: + args = () + + yield groups["func"], args + raise StopIteration + + def format_item(self, item): + title = item[0].rstrip(':') + data = str(item[1]).rstrip() + + #if we're dealing with a fraction + if len(data.split('/')) == 2: + numerator = data.split('/')[0] + numerator = (color(self.state, 1, bold=True) + numerator + + color(self.state, 'clear')) + denominator = data.split('/')[1] + data = '/'.join((numerator, denominator)) + + return "{color}{title}:{clear} {data}".format( + color=color(self.state, 1), + title=title, + data=data, + clear=color(self.state, "clear") + ) + +def main(): + parser = OptionParser( + usage='%prog', + description="""%prog is a utility to display system info and take\ + screenshots""", + version="%prog 0.3") + parser.add_option('-c', '--color', + action='store', type='choice', dest='color', + choices=('black', + 'red', + 'green', + 'yellow', + 'blue', + 'magenta', + 'cyan', + 'white'), + help="""choose a color: black, red, green, yellow, blue, magenta,\ + cyan, white [Default: blue]""") + parser.add_option('-s', '--screenshot', + action='store_true', dest='screenshot', help='Take a screenshot') + parser.add_option('--config', + action='store', dest='config', default=None, + help="Set the location of the config file to load.") + parser.add_option('--debug', + action='store', type='choice', dest='log_level', + choices=('NOTSET', + 'DEBUG', + 'INFO', + 'WARNING', + 'ERROR', + 'CRITICAL'), + default='CRITICAL', + help="The level of errors you wish to display. Choices are\ + NOTSET, DEBUG, INFO, WARNING, ERROR, and CRITICAL. CRITICAL is the default.") + (options, args) = parser.parse_args() + + config = ArcheyConfigParser() + config.read(options.config) + + archey = Archey(config=config, options=options) + archey.run(options.screenshot) + +if __name__ == "__main__": + main() diff --git a/pcr/paraboley/setup.py b/pcr/paraboley/setup.py new file mode 100644 index 000000000..c80486ce1 --- /dev/null +++ b/pcr/paraboley/setup.py @@ -0,0 +1,17 @@ +import os +from setuptools import setup + +def read(fname): + return open(os.path.join(os.path.dirname(__file__), fname)).read() + +setup( + name="Paraboley", + version="0.1", + author="Aurélien DESBRIÈRES", + author_email="aurelien@hackers.camp", + description="A simple python scrip to display an Parabola GNU / Linux-libre logo in ASCII art along with basic system information.", + license="GPL", + url="https://github.com/XL04D/paraboley", + long_description=read("README.md"), + scripts=["paraboley"] +) 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 <etienne at perot dot me> +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" +} diff --git a/pcr/perl-rpc-xml/PKGBUILD b/pcr/perl-rpc-xml/PKGBUILD new file mode 100644 index 000000000..c4d1adb6f --- /dev/null +++ b/pcr/perl-rpc-xml/PKGBUILD @@ -0,0 +1,48 @@ +# Contributor (Arch) : John D Jones III <jnbek1972 -_AT_- the domain name google offers a mail service at ending in dot com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> + +pkgname='perl-rpc-xml' +pkgver='0.78' +pkgrel='2' +pkgdesc="A set of classes for core data, message and XML handling" +arch=('any') +license=('PerlArtistic' 'GPL') +options=('!emptydirs') +depends=('perl-xml-parser>=2.31' 'perl-libwww' 'perl-xml-libxml' 'perl-net-server') +makedepends=() +url='http://search.mcpan.org/dist/RPC-XML' +source=('http://search.cpan.org/CPAN/authors/id/R/RJ/RJRAY/RPC-XML-0.78.tar.gz') +_distdir="RPC-XML-0.78" + +build() { + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \ + PERL_AUTOINSTALL=--skipdeps \ + PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \ + PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \ + MODULEBUILDRC=/dev/null + + cd "$srcdir/$_distdir" + /usr/bin/perl Makefile.PL + make + ) +} + +check() { + cd "$srcdir/$_distdir" + ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" + make test + ) +} + +package() { + cd "$srcdir/$_distdir" + make install + + find "$pkgdir" -name .packlist -o -name perllocal.pod -delete +} + +# Local Variables: +# mode: shell-script +# sh-basic-offset: 2 +# End: +# vim:set ts=2 sw=2 et: 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 <aurelien@hackers.camp> + +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" +} 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 <aurelien@hackers.camp> + +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 +} 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 <aurelien@replicant.io> +# Contributor (Arch) : ? +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> 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/" } diff --git a/pcr/tvenlinux-desktop/PKGBUILD b/pcr/tvenlinux-desktop/PKGBUILD new file mode 100644 index 000000000..0af13211d --- /dev/null +++ b/pcr/tvenlinux-desktop/PKGBUILD @@ -0,0 +1,49 @@ +# Contributor (Arch) : ValHue <vhuelamo at gmail dot com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# https://github.com/ValHue/AUR-PKGBUILDs + +pkgname=tvenlinux-desktop +pkgver=20140127 +pkgrel=2 +pkgdesc="Simple bash script to watch and record TV on GNU/Linux/BSD without capture card/tuner. (TV in Spain, Peru, Chile, Cuba, Venezuela, Bolivia and Argentina)" +url="http://www.tvenlinux.com/" +arch=('i686' 'x86_64') +license=('GPL3') +depends=('mplayer' 'rtmpdump') +optdepends=('zenity: for GTK users' 'kdialog: for QT users' 'curl: for view EPG (Electronic Program Guide)') +source=("http://www.tvenlinux.com/TVenLinux_2.sh" "http://www.tvenlinux.com/busi_tv.png") + +_pkgname="TVenLinux" + +_pkgname_desktop="#!/usr/bin/env xdg-open +[Desktop Entry] +Name=TVenLinux +Exec=TVenLinux +Icon=TVenLinux +Type=Application +Comment=Script to view more than 160 channels in Spanish TDT. +Comment[es]=Script para ver más de 160 canales de TDT en Español. +Terminal=false +Categories=GNOME;AudioVideo;P2P;Video;TV;GTK; +MimeType=x-scheme-handler/sop;" + +pkgver() { + cd "${srcdir}" + cat TVenLinux_2.sh | grep -e 'V_script=' | sed -e 's/V_script=//;s/"//g;s/;//;s/\///g;s/^\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)\(.\)/\5\6\7\8\3\4\1\2/' +} + +build() { + cd "${srcdir}" + mv busi_tv.png ${_pkgname}.png + echo -e "${_pkgname_desktop}" | tee ${_pkgname}.desktop +} + +package() { + cd "${srcdir}" + install -d ${pkgdir}/usr/share/applications + install -d ${pkgdir}/usr/share/pixmaps + install -d ${pkgdir}/usr/bin + install -m 755 ${_pkgname}_2.sh ${pkgdir}/usr/bin/${_pkgname} + install -m 644 ${_pkgname}.desktop ${pkgdir}/usr/share/applications + install -m 644 ${_pkgname}.png ${pkgdir}/usr/share/pixmaps +} 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 <iam at redsquirrel87 dot com> -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@xload.io> +# Contributor (Arch) : Red Squirrel <iam at redsquirrel87 dot com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> # 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 diff --git a/pcr/zulucrypt/PKGBUILD b/pcr/zulucrypt/PKGBUILD index 3beb2a7f8..21683a01f 100644 --- a/pcr/zulucrypt/PKGBUILD +++ b/pcr/zulucrypt/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor: Salan54 <salan at fremenil dot com> -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor (Arch) : Salan54 <salan at fremenil dot com> +# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> pkgname=zulucrypt -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 _altpkgname=zuluCrypt pkgdesc="a cli and gui frontend to cryptsetup." @@ -15,6 +15,7 @@ conflicts=('zulucrypt-git') makedepends=('cmake') options=('!buildflags') source=("https://github.com/mhogomchungu/zuluCrypt/releases/download/${pkgver}/${_altpkgname}-${pkgver}.tar.bz2") + changelog=${pkgname}.changelog install=${pkgname}.install diff --git a/pcr/zulucrypt/zulucrypt.changelog b/pcr/zulucrypt/zulucrypt.changelog index f69f7f5d4..dc4d6fc60 100644 --- a/pcr/zulucrypt/zulucrypt.changelog +++ b/pcr/zulucrypt/zulucrypt.changelog @@ -185,3 +185,6 @@ version 4.7.0 version 4.7.1 -- fix a build issue in gcc 4.9 + +version 4.7.2 +-- add support for opening TrueCrypt volumes using a passphrase together with one or more keyfiles. |