From cb607eaf6eb23ddc950c26a11b1fc581c2250339 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 12:40:11 -0300 Subject: xbmc-libre-13.0-5: updating revision from Arch * cleaned and improved pkgbuild * updated install script for 420 uid/gid FIXES: FS#40247 (https://bugs.archlinux.org/task/40247) - [xbmc] optional dependency description for upower is wrong FS#40422 (https://bugs.archlinux.org/task/40422) - [xbmc] /user in PKGBUILD instead of /usr in package() FS#40539 (https://bugs.archlinux.org/task/40539) - [xbmc] .desktop entry has executable attributes --- ...pplications-xbmc.desktop-does-nt-have-exe.patch | 27 ++++++++++++++++++ libre/xbmc-libre/PKGBUILD | 32 ++++++++++++---------- libre/xbmc-libre/xbmc.install | 29 +++++++++++++------- 3 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch diff --git a/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch new file mode 100644 index 000000000..71841758e --- /dev/null +++ b/libre/xbmc-libre/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch @@ -0,0 +1,27 @@ +From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001 +From: BlackEagle +Date: Sun, 25 May 2014 12:10:01 +0200 +Subject: [PATCH] make sure applications/xbmc.desktop does'nt have executable + flag + +Signed-off-by: BlackEagle +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 754f153..bee1fdd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -646,7 +646,7 @@ endif + endif + @# Icons and links + @install -d $(DESTDIR)$(datarootdir)/applications +- @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop ++ @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop + @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps + @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png + @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps +-- +1.9.1 + diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 1aff83340..f865e8820 100644 --- a/libre/xbmc-libre/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 110974 2014-05-11 14:59:58Z idevolder $ +# $Id: PKGBUILD 111871 2014-05-26 05:27:25Z idevolder $ # Maintainer (Arch): Sergej Pupykin # Contributor (Arch): Brad Fanella # Contributor (Arch): [vEX] # Contributor (Arch): Zeqadious # Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor (Arch): Bartłomiej Piotrowski # Maintainer: André Silva _prefix=/usr @@ -12,11 +13,11 @@ _pkgname=xbmc pkgname=xbmc-libre pkgver=13.0 _codename=Gotham_r2 -pkgrel=3 +pkgrel=5 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" -license=('GPL' 'custom') +license=('GPL2') replaces=($_pkgname) conflicts=($_pkgname) provides=($_pkgname=$pkgver) @@ -41,7 +42,7 @@ optdepends=( 'lirc: remote controller support' 'xorg-xinit: autostart xbmc' 'udisks: automount external drives' -'upower: used to trigger power management functionality' +'upower: display battery level' ) install="${_pkgname}.install" mksource=( @@ -53,6 +54,7 @@ source=( "polkit.rules" "enable-external-ffmpeg.patch" '0001-rtmp-check-m_rtmp-for-non-NULL-fixes-crashes-with-mi.patch' + '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' ) mksha256sums=( '663b99f3e196ead51d90f06ccfa864b4e5ade385dfc5972acb0f854d525f2903' @@ -63,6 +65,7 @@ sha256sums=( '4ea78374a08e13a64dcf6a424b111b8bfc11de03ed5829744fc6d9b5fc1ec96e' '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355' '4d643f1bc5a0f9a6bba36c8c2c2d220351acb58172c57d86417b67c02d39fa2b' + '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe' ) mksource() { @@ -76,6 +79,11 @@ 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 "{}" + + sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl + sed 's/python/python2/' -i tools/Linux/xbmc.sh.in msg2 "Use addons.xml from Parabola server (without nonfree addons support)" sed -i -e 's|mirrors[.]xbmc[.]org/addons/gotham/addons.xml|repo.parabolagnulinux.org/other/xbmc-libre/addons/gotham/addons.xml|' addons/repository.xbmc.org/addon.xml @@ -131,19 +139,11 @@ package() { # Running make install make DESTDIR="$pkgdir" install - # Python2 - sed 's/python/python2/g' -i \ - "$pkgdir"/usr/{bin/xbmc,share/xbmc/addons/service.xbmc.versioncheck/service.py} - # Tools - msg2 "Tools" - install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/xbmc-xrandr" \ - "${pkgdir}$_prefix/lib/xbmc/xbmc-xrandr" install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \ "${pkgdir}$_prefix/lib/xbmc/" # Licenses - msg2 "Copy licenses" install -dm755 "${pkgdir}$_prefix/share/licenses/$_pkgname" for licensef in LICENSE.GPL copying.txt; do mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ @@ -154,7 +154,11 @@ package() { install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service" # install polkit rules - install -dm700 "$pkgdir/user/share/polkit-1/rules.d" - install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/user/share/polkit-1/rules.d/10-xbmc.rules" + install -dm700 "$pkgdir/usr/share/polkit-1/rules.d" + install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules" + + # XBMC user home + install -dm 700 "${pkgdir}"/var/lib/xbmc + chown 420:420 "${pkgdir}"/var/lib/xbmc } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install index 8076fe2d3..6e477d103 100644 --- a/libre/xbmc-libre/xbmc.install +++ b/libre/xbmc-libre/xbmc.install @@ -1,19 +1,28 @@ post_install() { - [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent group xbmc > /dev/null || groupadd -r xbmc - getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc - usermod -a -G xbmc,audio,video,network,optical xbmc - mkdir -p var/lib/xbmc - chown -R xbmc:xbmc var/lib/xbmc + update_icons + getent group xbmc > /dev/null || groupadd -g 420 xbmc + getent passwd xbmc > /dev/null || useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc + passwd -l xbmc > /dev/null } post_upgrade() { post_install $1 + if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then + groupmod -g 420 xbmc + fi + if ! id -u xbmc | grep 420 > /dev/null 2>&1; then + usermod -u 420 xbmc + chown -R xbmc:xbmc /var/lib/xbmc + fi } post_remove() { - [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent passwd xbmc > /dev/null && userdel xbmc + update_icons + getent passwd xbmc > /dev/null 2>&1 && userdel xbmc + getent group xbmc > /dev/null 2>&1 && groupdel xbmc +} + +update_icons() { + type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications } -- cgit v1.2.3 From 7093cd981cafcf8dcf5619d4c5a7876c9acade4f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 12:42:08 -0300 Subject: xbmc-libre-lts-12.3-2: updating revision based on xbmc from Arch * cleaned and improved pkgbuild * updated install script for 420 uid/gid FIXES: FS#40264 (https://bugs.archlinux.org/task/40264) - [xbmc] polkit rules should be in /usr/share/polkit-1/rules.d/ FS#40247 (https://bugs.archlinux.org/task/40247) - [xbmc] optional dependency description for upower is wrong FS#40539 (https://bugs.archlinux.org/task/40539) - [xbmc] .desktop entry has executable attributes --- ...pplications-xbmc.desktop-does-nt-have-exe.patch | 27 ++++++ libre/xbmc-libre-lts/PKGBUILD | 103 +++++++++++++-------- libre/xbmc-libre-lts/xbmc.install | 29 ++++-- 3 files changed, 111 insertions(+), 48 deletions(-) create mode 100644 libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch diff --git a/libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch b/libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch new file mode 100644 index 000000000..71841758e --- /dev/null +++ b/libre/xbmc-libre-lts/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch @@ -0,0 +1,27 @@ +From 6abfd7104202121d3e23ddad47e377dfaef22b10 Mon Sep 17 00:00:00 2001 +From: BlackEagle +Date: Sun, 25 May 2014 12:10:01 +0200 +Subject: [PATCH] make sure applications/xbmc.desktop does'nt have executable + flag + +Signed-off-by: BlackEagle +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 754f153..bee1fdd 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -646,7 +646,7 @@ endif + endif + @# Icons and links + @install -d $(DESTDIR)$(datarootdir)/applications +- @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop ++ @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop + @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps + @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png + @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps +-- +1.9.1 + diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD index bd0ab5108..9be7cda0c 100644 --- a/libre/xbmc-libre-lts/PKGBUILD +++ b/libre/xbmc-libre-lts/PKGBUILD @@ -3,6 +3,7 @@ # Contributor (Arch): [vEX] # Contributor (Arch): Zeqadious # Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor (Arch): Bartłomiej Piotrowski # Maintainer: André Silva _prefix=/usr @@ -11,37 +12,53 @@ _pkgname=xbmc pkgname=xbmc-libre-lts pkgver=12.3 _codename=Frodo -pkgrel=1 +pkgrel=2 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" -license=('GPL' 'custom') +license=('GPL2') conflicts=($_pkgname) provides=($_pkgname) -depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' - 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' - 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' - 'tinyxml' 'taglib' 'ffmpeg-compat') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' - 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment') -optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger power management functionality' - 'xorg-xinit: autostart xbmc') +depends=( +'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' +'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate' +'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' +'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' +'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu' +'tinyxml' 'taglib' 'ffmpeg-compat' +) +makedepends=( +'boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec' +'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-runtime-headless' +) +optdepends=( +'libcec: support for Pulse-Eight USB-CEC adapter' +'lirc: remote controller support' +'xorg-xinit: autostart xbmc' +'udisks: automount external drives' +'upower: display battery level' +) install="${_pkgname}.install" -mksource=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") -source=("https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" - "xbmc.service" - "polkit.rules" - "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285") -mkmd5sums=('7ae385ebf8e5cfcb917393235e6efbdb') -md5sums=('7c71af50af55b097e4365a58b70754e8' - 'de331663cc8adc94f2fe44a262cfff58' - '02f7951824ee13103344f36009c0ef2a' - '7fd6399d2ffbdf06b724f0cc2efa0784') +mksource=( + "http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" +) +source=( + "https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz" + 'xbmc.service' + 'polkit.rules' + "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285" + '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch' +) +mkmd5sums=( + '7ae385ebf8e5cfcb917393235e6efbdb' +) +md5sums=( + '7c71af50af55b097e4365a58b70754e8' + 'de331663cc8adc94f2fe44a262cfff58' + '02f7951824ee13103344f36009c0ef2a' + '7fd6399d2ffbdf06b724f0cc2efa0784' + '8998bc505ae4c66604c90b1c005be8c2' +) mksource() { cd "${srcdir}/xbmc-$pkgver-$_codename" @@ -54,6 +71,7 @@ prepare() { cd "${srcdir}/xbmc-$pkgver-$_codename" patch -p0 <$srcdir/libass.patch + patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch" # fix lsb_release dependency sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp @@ -64,7 +82,7 @@ prepare() { } build() { - cd "${srcdir}/xbmc-$pkgver-$_codename" + cd "$srcdir/xbmc-$pkgver-$_codename" # Bootstrapping XBMC ./bootstrap @@ -105,34 +123,43 @@ build() { --enable-external-libraries \ --enable-external-ffmpeg \ --disable-non-free + # Now (finally) build make } package() { - cd "${srcdir}/xbmc-$pkgver-$_codename" + cd "$srcdir/xbmc-$pkgver-$_codename" # Running make install - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir" install # run feh with python2 - sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc + sed -i -e 's/python/python2/g' ${pkgdir}$_prefix/bin/xbmc # lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" + sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}$_prefix/bin/xbmc" + sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}$_prefix/bin/xbmc" # Tools - install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" - install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" + install -D -m 0755 "$srcdir/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" \ + "${pkgdir}$_prefix/lib/xbmc/" # Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}" + install -dm755 "${pkgdir}$_prefix/share/licenses/$_pkgname" for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}" + mv "${pkgdir}$_prefix/share/doc/xbmc/$licensef" \ + "${pkgdir}$_prefix/share/licenses/$_pkgname" done - install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service -# install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules -# chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/ + # install systemd service + install -Dm0644 "$srcdir/xbmc.service" "$pkgdir/usr/lib/systemd/system/xbmc.service" + + # install polkit rules + install -dm700 "$pkgdir/usr/share/polkit-1/rules.d" + install -Dm0644 "$srcdir/polkit.rules" "$pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules" + + # XBMC user home + install -dm 700 "${pkgdir}"/var/lib/xbmc + chown 420:420 "${pkgdir}"/var/lib/xbmc } # vim:set ts=2 sw=2 et: diff --git a/libre/xbmc-libre-lts/xbmc.install b/libre/xbmc-libre-lts/xbmc.install index 8076fe2d3..6e477d103 100644 --- a/libre/xbmc-libre-lts/xbmc.install +++ b/libre/xbmc-libre-lts/xbmc.install @@ -1,19 +1,28 @@ post_install() { - [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent group xbmc > /dev/null || groupadd -r xbmc - getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc - usermod -a -G xbmc,audio,video,network,optical xbmc - mkdir -p var/lib/xbmc - chown -R xbmc:xbmc var/lib/xbmc + update_icons + getent group xbmc > /dev/null || groupadd -g 420 xbmc + getent passwd xbmc > /dev/null || useradd -c 'XBMC user' -u 420 -g xbmc -G audio,video,network,optical -d /var/lib/xbmc -s /sbin/nologin xbmc + passwd -l xbmc > /dev/null } post_upgrade() { post_install $1 + if ! getent group xbmc | cut -d: -f3 | grep 420 > /dev/null 2>&1; then + groupmod -g 420 xbmc + fi + if ! id -u xbmc | grep 420 > /dev/null 2>&1; then + usermod -u 420 xbmc + chown -R xbmc:xbmc /var/lib/xbmc + fi } post_remove() { - [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - getent passwd xbmc > /dev/null && userdel xbmc + update_icons + getent passwd xbmc > /dev/null 2>&1 && userdel xbmc + getent group xbmc > /dev/null 2>&1 && groupdel xbmc +} + +update_icons() { + type -p gtk-update-icon-cache > /dev/null 2>&1 && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor + type -p update-desktop-database > /dev/null 2>&1 && usr/bin/update-desktop-database -q usr/share/applications } -- cgit v1.2.3 From 2bb95a60b721de207bc2d5db4eb2905aa93f1bc0 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 12:53:33 -0300 Subject: kdelibs-libre-4.13.1-3: fix CIFS mount (FS#40475 => https://bugs.archlinux.org/task/40475) --- libre/kdelibs-libre/PKGBUILD | 11 ++++--- libre/kdelibs-libre/fix-cifs-mount.patch | 49 ++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 libre/kdelibs-libre/fix-cifs-mount.patch diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 62ca967ad..696ab790d 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 212815 2014-05-15 13:45:14Z tpowa $ +# $Id: PKGBUILD 213594 2014-05-26 08:53:32Z andrea $ # Maintainer (Arch): Andrea Scarpino # Maintainer: André Silva @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.13.1 -pkgrel=2 +pkgrel=3 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -21,11 +21,12 @@ 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' - 'khtml-fsdg.diff') + 'kde-applications-menu.patch' 'qt4.patch' + 'fix-cifs-mount.patch' 'khtml-fsdg.diff') sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' + '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec' 'a1502a964081ad583a00cf90c56e74bf60121830') prepare() { @@ -34,6 +35,8 @@ 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. patch -p1 -i "${srcdir}"/khtml-fsdg.diff } diff --git a/libre/kdelibs-libre/fix-cifs-mount.patch b/libre/kdelibs-libre/fix-cifs-mount.patch new file mode 100644 index 000000000..98bae4594 --- /dev/null +++ b/libre/kdelibs-libre/fix-cifs-mount.patch @@ -0,0 +1,49 @@ +commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a +Author: Tomáš Trnka +Date: Sun May 25 16:12:36 2014 +0200 + + Revert "Avoid unnecessary automounting in KDiskFreeSpaceInfo::freeSpaceInfo" + + This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5. + + It breaks KIO on CIFS mounts as the check for automounts copied over + from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches + CIFS as well (and for some weird reason KIO checks for available space + before trying to copy files). + + We'll probably have to return to v1 of the abovementioned commit, i.e. + checking for "autofs" explicitly. However, more testing is apparently + necessary to avoid further nasty surprises. + + REVIEW: 117044 + BUG: 334776 + FIXED-IN: 4.13.2 + +diff --git a/kio/kfile/kdiskfreespaceinfo.cpp b/kio/kfile/kdiskfreespaceinfo.cpp +index 5c1fa72..f11eb09 100644 +--- a/kio/kfile/kdiskfreespaceinfo.cpp ++++ b/kio/kfile/kdiskfreespaceinfo.cpp +@@ -33,7 +33,6 @@ + #include + #include + #else +-#include + #include + #endif + +@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo( const QString& path ) + #else + struct statvfs statvfs_buf; + +- // Ignore autofs mountpoints as statvfs would trigger (expensive) automounting +- // This also matches "special" filesystems like /proc where free space has no meaning +- if (mp) { +- QFileInfo fi(info.d->mountPoint); +- if (fi.isDir() && fi.size() == 0) { +- return info; +- } +- } +- + // Prefer mountPoint if available, so that it even works with non-existing files. + const QString pathArg = info.d->mountPoint.isEmpty() ? path : info.d->mountPoint; + if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) { -- cgit v1.2.3 From 9c76e361e991b9281e07f94863fd5058561a38ea Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 12:57:54 -0300 Subject: linux-libre-grsec-3.14.4.201405252047-1: updating version * add optional dependencies on gradm and paxd * enable rwxmap_logging by default (this logging feature never has any false positives. it indicates that PAX_MPROTECT denied an `mprotect` call.) * update the sysctl configuration file to mention paxd --- libre/linux-libre-grsec/PKGBUILD | 10 ++++++---- libre/linux-libre-grsec/sysctl.conf | 14 ++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 6f7e20edf..38427a6a5 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -14,7 +14,7 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel _basekernel=3.14 _sublevel=4 _grsecver=3.0 -_timestamp=201405141623 +_timestamp=201405252047 _pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel}.${_sublevel}.${_timestamp} pkgrel=1 @@ -51,7 +51,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz") sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '01de5e15a2081197859e617c441de5cac9ddf60bed6fcf4dcff7a54e210e7815' - 'e41e5dea54db4311655ccc68b371ac15dcc48f8767ca0a02150af70e831d2e4d' + 'dceb3a6aeb9ba71e68835e37d2add6c6d4c60f6e253b4bd9c20b6a8e82ec0a96' 'SKIP' '0b6dbdf4d1677a39b9a0d55e8d7c66fe644fa77d769e3b673064181222b17467' '8207a533f4fbad05ad26061f924957a7a92436d44a5dd7ca10e61d730c5e0ef9' @@ -71,7 +71,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' 'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be' '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' - 'a37823f0cdf3f318ec3f486f6e4035a7a8f887522d3a563d4dfe155f143ba24f' + '19e59be36d3649fa72f93dc2a942df711935e7cb695632c4818f983363806eca' '3cd53473e049a4809d9dde8ebef73307ce87076d707f3fd5c100844d4a9e8255') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. @@ -214,7 +214,9 @@ _package() { pkgdesc="The ${pkgbase^} kernel and modules with grsecurity/PaX patches" [ "${pkgbase}" = "linux-libre" ] && groups=('base') depends=('coreutils' 'linux-libre-firmware' 'kmod') - optdepends=('crda: to set the correct wireless channels of your country') + optdepends=('crda: to set the correct wireless channels of your country' + 'gradm: to configure and enable Role Based Access Control (RBAC)' + 'paxd: to enable PaX exploit mitigations and apply exceptions automatically') provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") diff --git a/libre/linux-libre-grsec/sysctl.conf b/libre/linux-libre-grsec/sysctl.conf index a1af2c48e..bef8e350d 100644 --- a/libre/linux-libre-grsec/sysctl.conf +++ b/libre/linux-libre-grsec/sysctl.conf @@ -1,11 +1,13 @@ -# All features in the kernel.grsecurity namespace are disabled by default. +# All features in the kernel.grsecurity namespace are disabled by default in +# the kernel and must be enabled here. # -# Disable PaX enforcement by default, due to lacking integration with packages. +# Disable PaX enforcement by default. # -# This is considered a major flaw in this package and will be corrected in the -# future. Many binaries need to be flagged as requiring an exception from the -# PaX rules. +# The `paxd` package sets softmode back to 0 in a configuration file loaded +# after this one. It automatically handles setting exceptions from the PaX +# exploit mitigations after Pacman operations. Altering the setting here rather +# than using `paxd` is not recommended. # kernel.pax.softmode = 1 @@ -77,7 +79,7 @@ kernel.grsecurity.audit_gid = 201 #kernel.grsecurity.signal_logging = 1 #kernel.grsecurity.forkfail_logging = 1 #kernel.grsecurity.timechange_logging = 1 -#kernel.grsecurity.rwxmap_logging = 1 +kernel.grsecurity.rwxmap_logging = 1 # # Executable protections -- cgit v1.2.3 From 8848437f79ba83da5b0a3e3ce0e2559c3303e5f7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 14:26:22 -0300 Subject: linux-libre-grsec: fix checksums --- libre/linux-libre-grsec/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD index 38427a6a5..9b2fa2e12 100644 --- a/libre/linux-libre-grsec/PKGBUILD +++ b/libre/linux-libre-grsec/PKGBUILD @@ -71,7 +71,7 @@ sha256sums=('477555c709b9407fe37dbd70d3331ff9dde1f9d874aba2741f138d07ae6f281b' '79359454c9d8446eb55add2b1cdbf8332bd67dafb01fefb5b1ca090225f64d18' 'f2a5e22c1ba6e9b8a32a7bd4a5327ee95538aa10edcee3cd12578f8ff49bf6be' '384dd13fd4248fd6809da8c6ae29ced55d4a5cacc33ac2ae7522093ec0fb26d4' - '19e59be36d3649fa72f93dc2a942df711935e7cb695632c4818f983363806eca' + 'e734ac2a6e865b70dbe1e55ce55a5bd1b1e0cedea903c6341b9cfbabe420c763' '3cd53473e049a4809d9dde8ebef73307ce87076d707f3fd5c100844d4a9e8255') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. -- cgit v1.2.3 From ef5b159c700ef4f6af4a89c1702b5e984bdddc25 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 23:58:40 -0300 Subject: iceweasel-libre-1:29.0.1.deb2-1: updating version --- libre/iceweasel-libre/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 3a2fcaa9f..083262b48 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -15,7 +15,7 @@ _pgo=true # We're getting this from Debian Sid _debname=iceweasel _debver=29.0.1 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,7 +23,7 @@ _pkgname=iceweasel pkgname=iceweasel-libre epoch=1 pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) @@ -61,7 +61,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch Fixup-Reset-Firefox-after-bad-merge.patch) md5sums=('4db358c753cb15a526dfe79c6602c886' - '134a1bfe72a940ec6673ee6883a03b68' + '4d786ae63da53ba6da8105fbb50cbad9' '92a08a18995b915d6a6d0dab93ec6c1d' 'df08eaa1ac3bc6c2356be4fbf8ec8932' '5d22063ebea2472dd0b1163b32b2050b' -- cgit v1.2.3 From dca20ec6163cbb37dd3dae3d700976ac03749fd9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 26 May 2014 23:59:09 -0300 Subject: iceweasel-l10n-1:29.0.1.deb2-1: updating version --- libre/iceweasel-l10n/PKGBUILD | 166 +++++++++++++++++++++--------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index d0ce56f79..52b25edc3 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -7,7 +7,7 @@ _debname=iceweasel _debver=29.0.1 -_debrel=deb1 +_debrel=deb2 _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' - '20dde1067babde81f704ce50a82c8b62' - '130f1505b2f503eaf65c4a67837de0dc' - '6f234ab023f9c285ff71ed9042acc01c' - '70fbc98150dfd4ced3f71fb755088d4c' - '242820f1e1c31e068273f53df94fde47' - '669ff3dd0895f3de07c87bc1addcd839' - '290324aa7427e5247441d11ac5308f05' - 'b34f0474fcfd2784fdb5e765feccafda' - '1d64b7e693aa424aae5a677fed806fff' - 'da414b29277c6f9395f1822d8fd3fb16' - '8cfd124fe26f0fe8833e926fe28bb41e' - '78699a359bad9cb649c86018f2ce0031' - '0318e32537e525aeb79562de9eb3e405' - '3c6e2e018427a6553216799806d08cd4' - '983b3e1b1303435b71e9965cab38e505' - '2d815e408a65b179ff1f2d7e5421bebf' - 'e63148547572c94e0f505ff331a75991' - 'f33d574fe96014c96c31c461eb387cb2' - 'd1487628607a6cbbc2527da013c75c4a' - '3e38e0beba7e960ceaff6cccf24ebbc5' - 'b9f0427f83b0576f05965390e657b92d' - 'c21fdac75c0f810f6a4dea2f6a39a44a' - '49772d62a8312d35f6c1684850f5d139' - '0b1e295e26ae135249ec9a941c838494' - '8a3b5b38eac912562236cf686b3372fe' - 'c8f1ed871e127f67622ca6dc764d9222' - '570a67198b8a424e1d085b0b45fe71ef' - 'c54101710572a2185643e0e8cf6bfa02' - '439410e99bef6eff125750dbd8815850' - 'd211e12fa6659e23dc7f4d843d5ffefb' - '4bc6c2eb3c0e217d9866d36bb3329443' - 'e51882ad2c40e5c457a9bf61182ca881' - 'ee05d8d0b1a048063184cf1c3a22d395' - '14311b4f0ebc3e63b13891a96e17ab92' - '72ebba1330c54521d656299981d46bba' - 'a6ae3915646efecde58deb461ad90cd2' - '7a4f663fd7a1867c634a472c1d37d032' - 'fd1c2058aed78cf53dbe90a21088f8d9' - 'c97cec2305426d84c47669bbc4cca0b8' - '4504dc398cf0214d1c9df9bf1e9fd365' - 'd05eca95062df11cb7019a79a55479d8' - 'ead9cb17376d80046b3a48a3e297bf82' - '28c3e5862cf3d186151e47c1b0a83031' - 'ec60cd1f8cdef6a1069b675de2f6357f' - '9900061870f2252a28310bb3baa0d1e9' - '7294910167abd6bcf6d7e8e8a1e8d4e1' - '4d71034756fb940678b2c77a3b8683e7' - '7113e80e35fe85d3c138a4a973567874' - '0a098bddeb1e04eaa97adade548c228a' - 'b191cd52ab880d0f36af7d70449e641f' - '4c576697466ee6b52a2d502decc28978' - '41810076a48aec035dba12bb67784adf' - '898b1e051e5c347ad5ae85f0891da64b' - '3dbf3834bc756cf55b3830b628a02f7c' - '0170b0d6ff6096df489f83c28abc1d30' - '2f51cb285bb60c90b6d48ebb467cc9f4' - '85c135a859c7229b8f6857ca1b74ad39' - '1fd72abb889f8a2bb2f7474197c91d08' - '7a1f4f9490140667d28a7986b36f3f00' - '5c549e8015c7fbe454c7c7301e9af88d' - '10fd3c2aea6466fd05918e201ced9823' - '178a02a586e167175ffb92ed5cd6c02c' - '0298f96910350ae32f43dbac1f31e1fa' - 'be67fcd4df0122b4be1b8ded5c64b674' - '9ce98993196822a136526775364ff69b' - 'd18749f86456012caa8220a56cd98490' - 'd0a4c1001e368eb3795fd4ef84c4baef' - '9ab638e71f8b4231c76394b3352dd58b' - '599074d30d653e0c764a0bd9f31f4548' - '657eaa5b81006d9133f993db41269b53' - '5003c5660c36b64230f7badc8b4f0486' - '2c59b068cc242a55206a243c9c2c128e' - '9a960c5cd163aa39bd8eed460a4e1424' - '2a17ec767d0bab5c3934c16f3a1fa7d8' - 'fc316bead4b1f44eec5f561c9a253ba5' - 'cc95521aa45992e95e9353be2b689ef9' - '8f240861e41f4a5f7bf0c927a373b6ea' - '3446dfdd6c3880c0157a5fb487e20933' - '19759937f5ba7e19c060fc322f468375' - '359819e547abdb5cfecb91048c05d15c' - 'c4f2fc13c9130a2ca6a8b44676905da7' - '4d2a8afbe9586d7a8fe1360901e62e35') + '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') -- cgit v1.2.3 From 54bc28a3f089c40cd079112766ba3a750283b601 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 27 May 2014 00:14:24 -0300 Subject: ice{cat,weasel}-noscript-2.6.8.25-1: updating version --- libre/icecat-noscript/PKGBUILD | 6 +++--- libre/iceweasel-noscript/PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 89a4e398e..85eeefc3d 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111326 2014-05-16 16:00:18Z spupykin $ +# $Id: PKGBUILD 111876 2014-05-26 09:29:21Z spupykin $ # Maintainer (Arch): Sergej Pupykin # Maintainer: André Silva _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.8.24 +pkgver=2.6.8.25 pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=($_pkgname=$pkgver) makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('8a7909823e31cf83660b18735d7f3671') +md5sums=('10acb0caabd9301f15e75d770583eda8') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 1da4dd8e6..292c29810 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111326 2014-05-16 16:00:18Z spupykin $ +# $Id: PKGBUILD 111876 2014-05-26 09:29:21Z spupykin $ # Maintainer (Arch): Sergej Pupykin # Maintainer: André Silva _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.8.24 +pkgver=2.6.8.25 pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') @@ -14,7 +14,7 @@ depends=() provides=($_pkgname=$pkgver) makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('8a7909823e31cf83660b18735d7f3671') +md5sums=('10acb0caabd9301f15e75d770583eda8') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` -- cgit v1.2.3