diff options
-rw-r--r-- | libre/filesystem/PKGBUILD | 44 | ||||
-rw-r--r-- | libre/filesystem/filesystem.install | 3 | ||||
-rw-r--r-- | libre/filesystem/group | 1 | ||||
-rw-r--r-- | libre/filesystem/gshadow | 1 | ||||
-rw-r--r-- | libre/grub2/PKGBUILD | 21 | ||||
-rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/kdelibs-libre/fix-application-crashes.patch | 49 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 5 | ||||
-rw-r--r-- | libre/linux-libre/3.4.2-rpc_pipefs.patch | 1 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 5 | ||||
-rw-r--r-- | social/gnuhealth/PKGBUILD | 5 |
13 files changed, 109 insertions, 52 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 3443dacb4..215001c4e 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160797 2012-06-06 10:14:15Z dreisner $ +# $Id: PKGBUILD 162111 2012-06-20 09:33:31Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> -# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem pkgver=2012.6 -pkgrel=2 +pkgrel=4 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -19,24 +19,6 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc 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') -md5sums=('772fe869b921698cc3e6fde73c4ac85a' - '6be47d893fd49b2e4a8c0e811b350861' - '13753e4e0964f3652b0cc60a28528bdf' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '8a9042a2cedf6b6b47eb8973f14289cb' - 'b8355d9d2782f424f4cedcf682651be0' - 'ca716f853860199c1286e7939b2f2666' - 'e5d8323a4dbee7a6d0d2a19cbf4b819f' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'd2dc4e39dbdea75b107f91789e3274ab' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130') package() { cd ${pkgdir} @@ -96,3 +78,21 @@ package() { done ln -s ../man usr/local/share/man } +md5sums=('45940618da782cc391c59f88ab3333c3' + '6be47d893fd49b2e4a8c0e811b350861' + '13753e4e0964f3652b0cc60a28528bdf' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '8a9042a2cedf6b6b47eb8973f14289cb' + 'b8355d9d2782f424f4cedcf682651be0' + 'ca716f853860199c1286e7939b2f2666' + 'e5d8323a4dbee7a6d0d2a19cbf4b819f' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'f95416882cef800edef08382a1176b7d' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + 'a8a962370cd0128465d514e6a1f74130') diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index f880b6496..c8717f01b 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -40,9 +40,10 @@ post_upgrade() { _adduser http -u 33 -d /srv/http -g http -s /bin/false _addgroup scanner -g 96 _addgroup rfkill -g 24 + _addgroup lock -g 54 # sync gshadow to group (fixes FS#19869 - if ! grep -q '^rfkill:' etc/gshadow; then + if ! grep -q '^lock:' etc/gshadow; then grpconv >/dev/null fi diff --git a/libre/filesystem/group b/libre/filesystem/group index 261746d9e..6e8e773d8 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -19,6 +19,7 @@ rfkill:x:24: smmsp:x:25: http:x:33: games:x:50: +lock:x:54: network:x:90: video:x:91: audio:x:92: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index ed176823e..c5c76354e 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -19,6 +19,7 @@ rfkill:x:: smmsp::: http::: games::: +lock::: network:x:: video:x:: audio::: diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index a5051900f..1ef7c3934 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _grub_bzr_rev="4232" -_pkgver="2.00~beta4" +_pkgver="2.00~beta6" _grub_lua_ver=24 _grub_gpxe_ver=12 @@ -12,7 +12,7 @@ _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase=grub2 -pkgver=2.00beta4 +pkgver=2.00beta6 pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') @@ -30,15 +30,14 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+' - 'grub-install.fix') + '20_memtest86+') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' +sha1sums=('0ba5ccf6e6761911f9bf236e21f8f77a2d29ebdb' '89290031b974780c6df76893836d2477d4add895' 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' @@ -46,8 +45,8 @@ sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' '31aa740fc225b3f3ed4917843038f9e8658a71be' '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' '9735043d518e16f147f64ef283eceb2549fed860' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' - '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7') + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') + _build_grub2-common_and_bios() { ## copy the source for building the common/bios package @@ -58,10 +57,6 @@ _build_grub2-common_and_bios() { patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo - ## upstream grub-install fix - ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html - patch -Np0 -i "${srcdir}/grub-install.fix" - ## add the grub-extra sources export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/" install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -204,7 +199,7 @@ package_grub2-common() { options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') cd "${srcdir}/grub_bios-${_pkgver}" - make DESTDIR="${pkgdir}/" install + make bashcompletiondir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}/" install ## install extra /etc/grub.d/ files install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 0ddf606ec..fed954896 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 160936 2012-06-07 06:38:07Z andrea $ +# $Id: PKGBUILD 162049 2012-06-19 08:17:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.8.4 -pkgrel=1 +pkgrel=3 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -24,10 +24,12 @@ install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' + 'fix-application-crashes.patch' 'khtml-fsdg.diff') sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' + 'c271c712bf202f517015b597d61cfe1aed0db82b' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -39,6 +41,8 @@ build() { # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch + # KDEBUG 301453 + patch -p1 -i "${srcdir}"/fix-application-crashes.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-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch new file mode 100644 index 000000000..8ac385483 --- /dev/null +++ b/libre/kdelibs-libre/fix-application-crashes.patch @@ -0,0 +1,49 @@ +From: Vishesh Handa <me@vhanda.in> +Date: Wed, 13 Jun 2012 21:26:31 +0000 +Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d +--- +Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" + +This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. + +This is done so that 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -94,7 +94,7 @@ public: + + // we may get disconnected from the server but we don't want to try + // to connect every time the model is requested +- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { ++ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { + delete localSocketModel; + localSocketModel = 0; + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + +From: Vishesh Handa <me@vhanda.in> +Date: Wed, 13 Jun 2012 21:25:32 +0000 +Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us." +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=76e0376d7582cfe5b898c56bf3779ca2279dace8 +--- +Revert "Disconnect before re-connecting. Soprano does not do that for us." + +This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. + +This is being done so that KDE 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -97,7 +97,6 @@ public: + if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { + delete localSocketModel; + localSocketModel = 0; +- localSocketClient.disconnect(); + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + kDebug() << "Connecting to local socket" << socketName; + if ( localSocketClient.connect( socketName ) ) { + diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index f8c0edc6a..9c2909331 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgbase=linux-libre-lts @@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE-LTS _basekernel=3.0 -_sublevel=34 +_sublevel=35 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver pkgrel=1 @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '627ea698f9e8613f5d239ac2e6622c4e' + '7104adc7c0c6ab88820fce6d34ac595c' '9cfcf3807201ce44aa720571232a10ce' '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index ba3511bcf..b3426d278 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,10 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.34-1-LIBRE-LTS +KERNEL_VERSION=3.0.35-1-LIBRE-LTS + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' post_install () { # updating module dependencies diff --git a/libre/linux-libre/3.4.2-rpc_pipefs.patch b/libre/linux-libre/3.4.2-rpc_pipefs.patch index 5c3245669..db53b3813 100644 --- a/libre/linux-libre/3.4.2-rpc_pipefs.patch +++ b/libre/linux-libre/3.4.2-rpc_pipefs.patch @@ -31,4 +31,3 @@ index 0404047..21fde99 100644 -- 1.7.7.6 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7ff0def9e..3c9b2a8cc 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> # Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> @@ -12,10 +12,10 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.4 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -35,7 +35,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.4.2-rpc_pipefs.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - 'ea827952923c8a926c0831ad3f124190' + '0187759260fd998fc2130e069df5b054' '669c3f9d5c6a2109bad8e511287826c3' '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -44,7 +44,7 @@ md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '0851216ee7ac3aad76438bb937314fd1' + '5a7baeab35f968bf9a6ab115d14586c7' '972b3b460764780ee48f031a043a9c09') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 2f2944e2b..b70fd9663 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,10 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.2-2-LIBRE +KERNEL_VERSION=3.4.3-1-LIBRE + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' post_install () { # updating module dependencies diff --git a/social/gnuhealth/PKGBUILD b/social/gnuhealth/PKGBUILD index f1da528ff..10d059d4a 100644 --- a/social/gnuhealth/PKGBUILD +++ b/social/gnuhealth/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: SpepS <dreamspepser at yahoo dot it> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=gnuhealth -pkgver=1.6.1 +pkgver=1.6.2 pkgrel=1 pkgdesc="A free Health and Hospital Information System" arch=(any) @@ -9,7 +10,7 @@ url="http://health.gnu.org/" license=('GPL3') depends=('trytond') source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz") -md5sums=('fef8c811ca6de3fdd6e2430d644e13c9') +md5sums=('f36bb82a7a142c99da0218d9a889344c') build() { cd "$srcdir/$pkgname-$pkgver" |