diff options
author | Aurélien DESBRIÈRES <aurelien@hackers.camp> | 2014-06-20 08:05:48 +0200 |
---|---|---|
committer | Aurélien DESBRIÈRES <aurelien@hackers.camp> | 2014-06-20 08:05:48 +0200 |
commit | 9cbd09c3ed3e4eae8919c0bc1d7b79e93d296f72 (patch) | |
tree | 30ae82810762d01737335a0f66d3003108358d1f | |
parent | a396f6ea95a7c288e02ef627407a27904831ad03 (diff) | |
parent | e346af8e82b0171f06d0923a9e8026276015bb29 (diff) |
Merge branch 'master' of ssh://parabola-git/srv/git/abslibre/abslibre
-rw-r--r-- | libre/linux-libre-grsec/PKGBUILD | 18 | ||||
-rw-r--r-- | libre/linux-libre-grsec/config.i686 | 27 | ||||
-rw-r--r-- | libre/linux-libre-grsec/config.x86_64 | 26 | ||||
-rw-r--r-- | libre/spacefm-libre/PKGBUILD | 51 | ||||
-rw-r--r-- | libre/spacefm-libre/libre.patch | 24 | ||||
-rw-r--r-- | libre/spacefm-libre/spacefm.install | 14 |
6 files changed, 129 insertions, 31 deletions
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 36f0512f2..6e52e8e34 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=6 +_sublevel=8 _grsecver=3.0 -_timestamp=201406101411 +_timestamp=201406191347 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} -pkgrel=2 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +pkgrel=1 +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="https://grsecurity.net/" license=('GPL2') @@ -44,11 +44,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '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' - 'ae83fbc10c77ed665f029502c90a458a711f9188216e34a1354073dba31a1b26' - 'abefdcbacb2c78c0de1168915dc26d16e35ec0e6158e0bbbc84fad819b234404' + '325431cbfe7e2c7f9f956bc7b55ca47b7d20e1eea0e809c1190ac441b4a177bf' + 'aa9d8c11e1c1790e71088ae0a6494b8e44b0734f8e5d4fdeb9b98e0c77427406' 'SKIP' - '670869cdfc522e452332ec953fe860cf1a2974edfe8d0c851fbdba70b6167921' - '64a457c3d7cc4ef530359f2f5132697ab3bf9ea3cb64d13d9dbf68ed66325606' + '43388ea6e769794b087618e9714b850e02d67b29e9d3a1866290aba1b5831bf5' + 'e217c311cac8328b501377621a179f2ea23196dc15035f39f6bd50aad7d08d8b' '9d2f34f1a8c514a7117b9b017a1f7312fb351f4d0b079eed102f89361534d486' 'c5451d5e1eafc4f8d28b1a2958ec3102c124433a414a86450fc32058e004156b' '55bf07738a3286168a7929ae16dbca29defd14e77b9d24c487ae4c3d12bb9eb9' @@ -60,7 +60,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' 'cf2e7a2d00787f754028e7459688c2755a406e632ce48b60952fa4ff7ed6f4b7' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' '763f9323cdefc9ddf74ffeffd856f9eaec4d8d4ef702c88ee1aab429c2d0b389' - 'ce3b8b43ff2650eab53cb790c403392358dad7461c512d4f9c43c523e42f6643') + 'cdc0c5b019689444d21607b39031c8473140a44df40ea4101aaefba6af78b03e') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-grsec/config.i686 b/libre/linux-libre-grsec/config.i686 index 288f1caca..7fb2b46d8 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.6.201406101411-1 Kernel Configuration +# Linux/x86 3.14.8.201406191347-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -142,7 +142,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y # CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_KMEM is not set # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -1474,7 +1474,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set +CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set # CONFIG_SYS_HYPERVISOR is not set @@ -3556,6 +3556,7 @@ CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_MAX6697=m CONFIG_SENSORS_MCP3021=m CONFIG_SENSORS_NCT6775=m +CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PCF8591=m @@ -4073,7 +4074,9 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m CONFIG_VIDEO_SH_VEU=m CONFIG_VIDEO_RENESAS_VSP1=m -# CONFIG_V4L_TEST_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_MEM2MEM_TESTDEV=m # # Supported MMC/SDIO adapters @@ -4888,9 +4891,7 @@ CONFIG_USB=m # CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OTG=y -CONFIG_USB_OTG_WHITELIST=y -# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_OTG is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4911,7 +4912,7 @@ CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m -CONFIG_USB_FOTG210_HCD=m +# CONFIG_USB_FOTG210_HCD is not set CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -5078,7 +5079,7 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -CONFIG_USB_OTG_FSM=m +# CONFIG_USB_OTG_FSM is not set CONFIG_NOP_USB_XCEIV=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m @@ -5099,7 +5100,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # USB Peripheral Controller # CONFIG_USB_FUSB300=m -CONFIG_USB_FOTG210_UDC=m +# CONFIG_USB_FOTG210_UDC is not set CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m @@ -6033,7 +6034,11 @@ CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_FTRACE is not set diff --git a/libre/linux-libre-grsec/config.x86_64 b/libre/linux-libre-grsec/config.x86_64 index fc26220ea..114370e73 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.6.201406101411-1 Kernel Configuration +# Linux/x86 3.14.8.201406191347-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -151,7 +151,7 @@ CONFIG_RESOURCE_COUNTERS=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y # CONFIG_MEMCG_SWAP_ENABLED is not set -CONFIG_MEMCG_KMEM=y +# CONFIG_MEMCG_KMEM is not set # CONFIG_CGROUP_HUGETLB is not set # CONFIG_CGROUP_PERF is not set CONFIG_CGROUP_SCHED=y @@ -1459,7 +1459,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y # CONFIG_FIRMWARE_IN_KERNEL is not set CONFIG_EXTRA_FIRMWARE="" -# CONFIG_FW_LOADER_USER_HELPER is not set +CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_DEBUG_DRIVER is not set # CONFIG_DEBUG_DEVRES is not set CONFIG_SYS_HYPERVISOR=y @@ -3952,7 +3952,9 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m CONFIG_VIDEO_SH_VEU=m CONFIG_VIDEO_RENESAS_VSP1=m -# CONFIG_V4L_TEST_DRIVERS is not set +CONFIG_V4L_TEST_DRIVERS=y +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_MEM2MEM_TESTDEV=m # # Supported MMC/SDIO adapters @@ -4715,9 +4717,7 @@ CONFIG_USB=m # CONFIG_USB_DEFAULT_PERSIST=y CONFIG_USB_DYNAMIC_MINORS=y -CONFIG_USB_OTG=y -CONFIG_USB_OTG_WHITELIST=y -# CONFIG_USB_OTG_BLACKLIST_HUB is not set +# CONFIG_USB_OTG is not set CONFIG_USB_MON=m CONFIG_USB_WUSB=m CONFIG_USB_WUSB_CBAF=m @@ -4738,7 +4738,7 @@ CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m CONFIG_USB_FUSBH200_HCD=m -CONFIG_USB_FOTG210_HCD=m +# CONFIG_USB_FOTG210_HCD is not set CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_PCI=m # CONFIG_USB_OHCI_HCD_SSB is not set @@ -4903,7 +4903,7 @@ CONFIG_USB_XUSBATM=m # USB Physical Layer drivers # CONFIG_USB_PHY=y -CONFIG_USB_OTG_FSM=m +# CONFIG_USB_OTG_FSM is not set CONFIG_NOP_USB_XCEIV=m CONFIG_SAMSUNG_USBPHY=m CONFIG_SAMSUNG_USB2PHY=m @@ -4923,7 +4923,7 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 # # USB Peripheral Controller # -CONFIG_USB_FOTG210_UDC=m +# CONFIG_USB_FOTG210_UDC is not set CONFIG_USB_GR_UDC=m CONFIG_USB_R8A66597=m CONFIG_USB_RENESAS_USBHS_UDC=m @@ -5815,7 +5815,11 @@ CONFIG_OMFS_FS=m # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_QNX6FS_FS is not set -# CONFIG_ROMFS_FS is not set +CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y CONFIG_PSTORE=y # CONFIG_PSTORE_CONSOLE is not set # CONFIG_PSTORE_FTRACE is not set diff --git a/libre/spacefm-libre/PKGBUILD b/libre/spacefm-libre/PKGBUILD new file mode 100644 index 000000000..10b6cec15 --- /dev/null +++ b/libre/spacefm-libre/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 108682 2014-04-01 08:51:32Z bpiotrowski $ +# Maintainer (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ +# Contributor (Arch): ridikulus_rat <the.ridikulus.rat@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> +# Contributor: Edison Ibañez <arkhan.xxx@gmail.com> + +_pkgname=spacefm +pkgname=spacefm-libre +pkgver=0.9.4 +pkgrel=1 +pkgdesc='Multi-panel tabbed file manager, with unar support' +arch=('i686' 'x86_64') +url='http://ignorantguru.github.com/spacefm/' +license=('GPL3') +install=$_pkgname.install +depends=('gtk3' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' + 'systemd' 'bash' 'unar') +makedepends=('intltool' 'gettext') +optdepends=('lsof: device processes' + 'wget: plugin download' + 'gksu: perform as root functionality' + 'udevil: mount as non-root user and mount networks' + 'udisks: mount as non-root user' + 'udisks2: mount as non-root user') +replaces=($_pkgname) +conflicts=($_pkgname) +provides=($_pkgname=$pkgver) +source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz + libre.patch) +md5sums=('daeee7dcccea33d6258a0a9d783470c4' + '30ba2b4b8f5ae7bf1552689b192eab89') + +prepare() { + # replace nonfree unrar with unar support + cd $_pkgname-$pkgver + patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c +} + +build() { + cd $_pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-pixmaps \ + --with-gtk3 + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/libre/spacefm-libre/libre.patch b/libre/spacefm-libre/libre.patch new file mode 100644 index 000000000..82d51f705 --- /dev/null +++ b/libre/spacefm-libre/libre.patch @@ -0,0 +1,24 @@ +From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 +From: Edison Ibañez <arkhan.xxx@gmail.com> +Date: mar, 20 may 2014 10:27:55 -0500 +Subject: [PATCH] replace nonfree unrar with unar support + + +diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c +index ec9fbd7..55648d2 100644 +--- a/src/ptk/ptk-file-archiver.c ++++ b/src/ptk/ptk-file-archiver.c +@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= + { + "application/x-rar", + "rar a -r %o", +- "unrar -o- x", +- "unrar lt", ++ "unar -D ", ++ "unar -D ", + ".rar", "arc_rar", TRUE + }, + { +-- +Gitg + diff --git a/libre/spacefm-libre/spacefm.install b/libre/spacefm-libre/spacefm.install new file mode 100644 index 000000000..76a5d56b9 --- /dev/null +++ b/libre/spacefm-libre/spacefm.install @@ -0,0 +1,14 @@ +post_install() { + update-mime-database /usr/share/mime > /dev/null + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} |