diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-06 12:03:23 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-06 12:03:23 -0300 |
| commit | 602bbc9f8ca0debe0fe88aac1ddc969c405f96b0 (patch) | |
| tree | 34c0b1890fadd22588d98422a3cc2c2909094216 | |
| parent | a356d89e91e7ce1dd622d6dfe1b13412923d3b96 (diff) | |
| parent | 664b1c2195b2884102cc2d5a56a13702f8ee44fe (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/postgresql/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
75 files changed, 2131 insertions, 168 deletions
diff --git a/community-staging/freerdp/PKGBUILD b/community-staging/freerdp/PKGBUILD new file mode 100644 index 000000000..3856e430d --- /dev/null +++ b/community-staging/freerdp/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 71965 2012-06-04 08:07:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> + +pkgname=freerdp +pkgver=1.0.1 +pkgrel=5 +pkgdesc="Free RDP client" +arch=('i686' 'x86_64') +url="http://freerdp.sourceforge.net" +license=('GPL') +depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage' + 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv') +makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl') +conflicts=('freerdp-git') +changelog=${pkgname}.changelog +options=('!libtool') +source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz) +md5sums=('c843185e0ff22ce8409954651718f338') + +build() { + cd `find ${srcdir}/ -type d -name freerdp-\*` + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib . + make +} + +package() { + cd `find ${srcdir}/ -type d -name freerdp-\*` + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/freerdp/freerdp.changelog b/community-staging/freerdp/freerdp.changelog new file mode 100644 index 000000000..d47f165c3 --- /dev/null +++ b/community-staging/freerdp/freerdp.changelog @@ -0,0 +1,2 @@ +0.7.1-1 to 0.7.1-2 +* Added x86_64 to supported architectures (tested by figue). diff --git a/community-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD new file mode 100644 index 000000000..36e5d9d58 --- /dev/null +++ b/community-staging/gpac/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 71952 2012-06-04 05:51:49Z ebelanger $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=gpac +pkgver=4065 +pkgrel=1 +pkgdesc="A multimedia framework based on the MPEG-4 Systems standard" +arch=('i686' 'x86_64') +url="http://gpac.sourceforge.net" +license=('LGPL') +depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa') +makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad') +optdepends=('jack: for jack support' 'a52dec: for A52 support' + 'faad2: for AAC support' 'libmad: for mp3 support') +options=('!makeflags') +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8' + 'a015cef1fd003c57bd91a6d0959ccd58df2357d4') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1) + _svnver=$pkgver + _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac" + _svnmod="$pkgname-$pkgver" + mkdir ${pkgname}-$pkgver + pushd ${pkgname}-$pkgver + svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod + find . -depth -type d -name .svn -exec rm -rf {} \; + tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/* + popd + rm -r ${pkgname}-${pkgver} + gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install-lib +} diff --git a/community-staging/mlt/PKGBUILD b/community-staging/mlt/PKGBUILD new file mode 100644 index 000000000..cf3850a57 --- /dev/null +++ b/community-staging/mlt/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 71967 2012-06-04 08:11:28Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> +# Contributor: funkyou <spamopfer@nickname.berlin.de> +# Contributor: tardo <tardo@nagi-fanboi.net> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> + +pkgbase=mlt +pkgname=('mlt' 'mlt-python-bindings') +pkgver=0.7.8 +pkgrel=3 +pkgdesc="An open source multimedia framework" +arch=('i686' 'x86_64') +url="http://www.mltframework.org" +license=('GPL') +makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg' + 'frei0r-plugins' 'swig' 'python2' "jack" "ladspa") +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('4bdce45d832e065ac4c8c8ca56765e1d') + +build() { + # mlt + cd "$srcdir/mlt-$pkgver" + +# [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2= + SSE2=--disable-sse2 + + msg "SSE2=$SSE2" + ./configure --prefix=/usr --enable-gpl \ + --qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \ + --avformat-vdpau \ + --avformat-swscale $SSE2 + make + + # mlt python bindings + cd "$srcdir/mlt-$pkgver/src/swig/python" + sed -i 's_path=`which python_path=`which python2_' build + sed -i 's_`python -c_`python2 -c_' build + sed -i 's#python-config#python2-config#' build + ./build +} + +package_mlt() { + depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins') + optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa") + conflicts=('mlt++<=0.3.8') + + cd "$srcdir/mlt-$pkgver" + make DESTDIR="$pkgdir" install +} + +package_mlt-python-bindings() { + depends=('python2' 'mlt') + + cd "$srcdir/mlt-$pkgver/src/swig/python" + mkdir -p "$pkgdir/usr/lib/python2.7/" + install -m755 mlt.py "$pkgdir/usr/lib/python2.7/" + install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/" + install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/" +} diff --git a/community-staging/mplayer2/PKGBUILD b/community-staging/mplayer2/PKGBUILD new file mode 100644 index 000000000..58577ab8b --- /dev/null +++ b/community-staging/mplayer2/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 71950 2012-06-04 05:22:54Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Martin Panter <vadmium+aur@gmail.com> +# Contributor: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=mplayer2 +pkgver=20120517 +pkgrel=3 +pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.mplayer2.org/" +install=$pkgname.install +depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig' + 'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss' + 'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau' + 'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu') +makedepends=('mesa' 'unzip' 'yasm') +backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') +provides=('mplayer') +conflicts=('mplayer') +options=(!emptydirs) +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) +md5sums=('814cc9545937e13796df1d4747c3c5d0') + +build() { + cd "${srcdir}"/$pkgname-$pkgver + + sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop + + ./configure --prefix=/usr \ + --enable-runtime-cpudetection \ + --disable-speex \ + --disable-openal \ + --disable-libdv \ + --disable-musepack \ + --disable-mga \ + --language=all \ + --enable-translation \ + --confdir=/etc/mplayer + make +} + +package() { + cd "${srcdir}"/$pkgname-$pkgver + + make DESTDIR="${pkgdir}" install + install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/ + install -dm755 "${pkgdir}"/usr/share/mplayer/ + ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf + + install -dm755 "${pkgdir}"/usr/share/applications/ + install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/ +} diff --git a/community-staging/mplayer2/mplayer2.install b/community-staging/mplayer2/mplayer2.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/community-staging/mplayer2/mplayer2.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD new file mode 100644 index 000000000..927177a73 --- /dev/null +++ b/community-staging/mythtv/PKGBUILD @@ -0,0 +1,73 @@ +# $Id: PKGBUILD 71990 2012-06-05 02:18:34Z jconder $ +# Maintainer: Jonathan Conder <jonno.conder@gmail.com> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: <kleptophobiac@gmail.com> +# Contributor: dorphell <dorphell@archlinux.org> + +pkgname=mythtv +pkgver=0.25 +pkgrel=4 +epoch=1 +pkgdesc="A Homebrew PVR project" +arch=('i686' 'x86_64') +url="http://www.mythtv.org/" +license=('GPL') +depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' + 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa' + 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' + 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' + 'x264') +makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm') +optdepends=('glew: for GPU commercial flagging' + 'libcec: for consumer electronics control capabilities' + 'libxml2: to read blu-ray metadata' + 'openssl: for AirTunes (RAOP) support' + 'xmltv: to download tv listings') +conflicts=('myththemes' 'mythplugins-mythvideo') +replaces=('myththemes' 'mythplugins-mythvideo') +backup=('etc/conf.d/mythbackend') +install='mythtv.install' +source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'mythtv_0.25_gcc_4.7.patch' + 'mythbackend.rc' + 'mythbackend.conf') +md5sums=('e49c81de40e279c83dcb1b2aa9a45748' + '6090f5f22a8584db80b76cf19869ee41' + '62fd98347c56b1d9b795792f83269d25' + 'ab962d83614cbd0ac11ce3fcc929829d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + + patch -Np1 -i "$srcdir/mythtv_0.25_gcc_4.7.patch" + sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php' + + ARCH="${CARCH/_/-}" + ./configure --prefix=/usr \ + --cpu="$ARCH" \ + --disable-altivec \ + --disable-audio-jack \ + --disable-ccache \ + --disable-distcc \ + --enable-libfftw3 \ + --enable-libmp3lame \ + --enable-libx264 \ + --enable-vaapi \ + --python=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make INSTALL_ROOT="$pkgdir" install + + install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend" + install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend" + install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql" + + mkdir -p "$pkgdir/usr/share/mythtv" + cp -R 'contrib' "$pkgdir/usr/share/mythtv" + mkdir -p "$pkgdir/var/log/mythtv" +} diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf new file mode 100644 index 000000000..49bbca877 --- /dev/null +++ b/community-staging/mythtv/mythbackend.conf @@ -0,0 +1,53 @@ +# +# Copyright (c) by the MythTV Development Team. +# +# Derived from work by: +# +# Michael Thomson <linux at m-thomson dot net> +# Stu Tomlinson <stu at nosnilmot dot com> +# Axel Thimm <axel.thimm at atrpms dot net> +# Adopted for ArchLinux: +# Jürgen Hoetzel <juergen@archinux.org> +# +# 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 2 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, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +############################################################################### +# +# User who should start the mythbackend process +# +# Running mythbackend as non-root requires you to ensure that audio/video +# devices used for recording have suitable user permissions. One way +# to achieve this is to modify existing or create new udev rules which +# assign these devices to a non-root group with rw permissions and add +# your mythbackend user to that group. Be aware that console.perms can +# also affect device permissions and may need additional configuration. +# Running as non-root may also introduce increased process latency. +# +# MBE_USER='root' + +# +# Startup options for mythbackend (see 'mythbackend --help' for a list). +# +# MBE_OPTS='' + +# +# Directory holding the mythbackend log file +# +# LOG_PATH='/var/log/mythtv' + +# +# Logging options for mythbackend (see 'mythbackend -v help' for a list) +# +# LOG_OPTS='' diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc new file mode 100644 index 000000000..2b3c2d52e --- /dev/null +++ b/community-staging/mythtv/mythbackend.rc @@ -0,0 +1,73 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/profile + +############################################################################### +# Default values to use if none are supplied in the config file. +# +# User who should start the mythbackend process +MBE_USER='root' + +# Startup options for mythbackend +MBE_OPTS='' + +# Directory holding the mythbackend log file +LOG_PATH='/var/log/mythtv' + +# Logging options for mythbackend +LOG_OPTS='' +############################################################################### + +CONFIG_FILE=/etc/conf.d/mythbackend +PIDFILE=/var/run/mythbackend.pid + +if [[ -r "$CONFIG_FILE" ]]; then + . "$CONFIG_FILE" +fi + +PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)" +export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)" + +case "$1" in + start) + stat_busy "Starting MythTV Backend" + + if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then + stat_fail + exit 0 + fi + + touch "$PIDFILE" + chown "$MBE_USER" "$PIDFILE" "$LOG_PATH" + + MBE_CMD="/usr/bin/mythbackend --daemon \ + --logpath "$LOG_PATH" $LOG_OPTS \ + --pidfile "$PIDFILE" $MBE_OPTS" + if su "$MBE_USER" -c "$MBE_CMD"; then + add_daemon mythbackend + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping MythTV Backend" + if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then + rm_daemon mythbackend + stat_done + rm -f "$PIDFILE" + else + stat_fail + fi + ;; + restart) + "$0" stop + "$0" start + ;; + *) + echo "usage: $0 (start|stop|restart)" + ;; +esac +exit 0 diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install new file mode 100644 index 000000000..c29a53454 --- /dev/null +++ b/community-staging/mythtv/mythtv.install @@ -0,0 +1,11 @@ +post_install() { + echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!" +} + +post_upgrade() { + return +} + +post_remove() { + echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'" +} diff --git a/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch b/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch new file mode 100644 index 000000000..83c8244a0 --- /dev/null +++ b/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch @@ -0,0 +1,107 @@ +*** a/libs/libmythbase/compat.h 2012-03-31 20:52:30.430461503 -0400 +--- b/libs/libmythbase/compat.h 2012-03-31 20:59:05.935585911 -0400 +*************** +*** 44,49 **** +--- 44,51 ---- + # include <sys/resource.h> // for setpriority + # include <sys/socket.h> + # include <sys/wait.h> // For WIFEXITED on Mac OS X ++ # include <stdio.h> // for snprintf(), used by inline dlerror() ++ # include <unistd.h> // for usleep() + #endif + + #ifdef USING_MINGW +*** a/libs/libmyth/rssparse.h 2012-03-31 20:52:30.427453729 -0400 +--- b/libs/libmyth/rssparse.h 2012-03-31 21:51:11.687438044 -0400 +*************** +*** 13,18 **** +--- 13,19 ---- + #include <QPair> + #include <QMap> + #include <QVariant> ++ #include <sys/types.h> + + #include "mythexp.h" + +*** a/libs/libmythtv/audioinput.h 2012-03-31 22:41:55.626923063 -0400 +--- b/libs/libmythtv/audioinput.h 2012-03-31 22:41:22.478248297 -0400 +*************** +*** 22,27 **** +--- 22,28 ---- + #define _AUDIOINPUT_H_ + + #include <QString> ++ #include <unistd.h> + + class AudioInput + { +*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 20:52:29.923150437 -0400 +--- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400 +*************** +*** 398,404 **** + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +--- 398,404 ---- + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +*************** +*** 446,452 **** + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ + : "memory"\ + );\ + tmp += 4;\ +--- 446,452 ---- + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ + : "memory"\ + );\ + tmp += 4;\ +*************** +*** 823,829 **** + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +--- 823,829 ---- + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +*************** +*** 878,884 **** + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" +--- 878,884 ---- + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index fd4f67aad..be10ff296 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70105 2012-04-29 13:20:28Z spupykin $ +# $Id: PKGBUILD 71958 2012-06-04 07:52:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> pkgname=darktable -pkgver=1.0.3 +pkgver=1.0.4 _pkgver=1.0 pkgrel=1 pkgdesc="Utility to organize and develop raw images" @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('9877a012b2b39f0e5859783db508f580') +md5sums=('244b7e3e2eb907f1602225b1b36a8b0c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD index f5bad7794..dd375db38 100644 --- a/community/gnustep-back/PKGBUILD +++ b/community/gnustep-back/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 68860 2012-04-04 09:31:08Z allan $ +# $Id: PKGBUILD 71960 2012-06-04 07:53:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-back pkgver=0.22.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GNUstep GUI Backend" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=('LGPL') -depends=(libgl libxmu gcc-libs freetype2 libart-lgpl) +depends=(libgl libxmu gcc-libs freetype2 cairo) makedepends=('gnustep-gui' 'libffi' 'gcc-objc') conflicts=('gnustep-back-svn') groups=('gnustep-core') diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD index 27bef3dfc..0d17ce958 100644 --- a/community/gnustep-gui/PKGBUILD +++ b/community/gnustep-gui/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 68864 2012-04-04 09:31:23Z allan $ +# $Id: PKGBUILD 71962 2012-06-04 07:59:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-gui pkgver=0.22.0 -pkgrel=2 +pkgrel=3 pkgdesc="The GNUstep GUI class library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnustep.org/" license=('LGPL') -depends=('gnustep-base' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') -makedepends=('gcc-objc') +depends=('gnustep-back' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') +makedepends=('gcc-objc' 'gnustep-base' 'gnustep-make') conflicts=('gnustep-gui-svn') groups=('gnustep-core') options=('!makeflags') diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD index 8bc7333ad..9ecbf0343 100644 --- a/community/gpsbabel/PKGBUILD +++ b/community/gpsbabel/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 61077 2011-12-21 20:51:01Z andrea $ +# $Id: PKGBUILD 71956 2012-06-04 07:44:12Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> pkgname=gpsbabel -pkgver=1.4.2 -pkgrel=4 +pkgver=1.4.3 +pkgrel=1 pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.gpsbabel.org" license=('GPL') depends=('libusb-compat' 'expat') -makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit') +makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit' 'openjdk6') optdepends=('qt' 'qtwebkit') options=('docs') source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz" "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD") -md5sums=('76ea9f7852be2e98aa18976c4697ca93' +md5sums=('916f7e124f6df911a24e1ea323e9c529' '7bdbd243e29a8831842d31c079f04c45') build() { diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD new file mode 100644 index 000000000..82ee965fe --- /dev/null +++ b/community/oath-toolkit/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 71971 2012-06-04 09:43:43Z seblu $ +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: L42y <423300@gmail.com> + +pkgname=oath-toolkit +pkgver=1.12.3 +pkgrel=1 +pkgdesc='OATH one-time password toolkit' +arch=('i686' 'x86_64') +url='http://www.nongnu.org/oath-toolkit/' +license=('GPL3') +depends=('pam') +options=('!libtool') +source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('52c1d8914c4182b19dea4a82d6837eb2') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Install basic docs too + install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README" + install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD index 61213fb31..6fe9a87ba 100644 --- a/community/oolite/PKGBUILD +++ b/community/oolite/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 71561 2012-05-29 10:35:05Z svenstaro $ +# $Id: PKGBUILD 71988 2012-06-05 00:13:47Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lone_Wolf <lonewolf@xs4all.nl> pkgname=oolite pkgver=1.76.1 -pkgrel=1 +pkgrel=2 pkgdesc="A space-sim based on the classic Elite" arch=('i686' 'x86_64' 'mips64el') url="http://oolite-linux.berlios.de" license=('GPL2') -depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu') +depends=('gnustep-gui' 'sdl_mixer' 'mesa' 'espeak' 'nspr' 'python2' 'icu' 'gnustep-base') makedepends=('gcc-objc' 'gnustep-make' 'curl' 'zip') options=(!makeflags) source=(oolite diff --git a/community/paraview/PKGBUILD b/community/paraview/PKGBUILD index 3e55bf594..efa138d53 100644 --- a/community/paraview/PKGBUILD +++ b/community/paraview/PKGBUILD @@ -1,17 +1,19 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Michele Mocciola <mickele> # Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name> pkgname=paraview -pkgver=3.14.0 -pkgrel=2 +pkgver=3.14.1 +pkgrel=1 pkgdesc='Parallel Visualization Application using VTK' arch=('i686' 'x86_64' 'mips64el') url='http://www.paraview.org' license=('custom') -depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2' +depends=('qt' 'python2' 'libgl' 'unixodbc' 'postgresql-libs' 'libxt' 'qtwebkit' + 'libmysqlclient' 'mesa' 'openmpi' 'boost-libs' 'libcgns2' # export as avi support - 'ffmpeg' + #'ffmpeg' # The following is a list of libraries we explicitly tell cmake to use the system library of 'hdf5' 'freetype2' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'expat' 'libxml2' 'libtheora' ) @@ -19,26 +21,32 @@ makedepends=('cmake' 'desktop-file-utils' 'boost') source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}-Source.tar.gz" 'paraview.png' 'paraview.desktop' - 'fix-build-with-zlib-1.2.6.diff' - 'ffmpeg-0.8.diff') -md5sums=('a260bd891fd75d0e276a581a3603edff' - 'db623002bc71a257ddfdd0c9c7b14c3f' - '4e4b7172ed18171c37446fd7c4f1e8f5' - 'e4506b4ed0d2ae60072388f098be6c33' - 'e992321c9d1def6034d0fa6607b40c5a') + 'paraview-3.14.1-gcc47.patch' + 'doubletostring.patch' + 'fix_FTBFS_boost149.patch' + 'kwprocessxml_rpath.patch') +sha1sums=('1326c6e941fb9d12c548b14ca10932b49b5e3ffd' + 'a2dff014e1235dfaa93cd523286f9c97601d3bbc' + '9cd5b19b4072d8d5512bb97a141eb878adf73ab5' + 'dd8486082733bb6d13a741b52f4bbea804862295' + '9e85e47337ef66de7263b3d2f80a56e0cc307d61' + 'a9982155202b2cc93597e1fa66d12f2ffbbf287a' + '9e04dc858f0e8f30ce4595d6e5691f0463a02ea7') build() { - cd ${srcdir}/ParaView-${pkgver}-Source + cd "${srcdir}"/ParaView-${pkgver}-Source + + patch -Np1 -i ../paraview-3.14.1-gcc47.patch - # fix http://paraview.org/Bug/view.php?id=12924 - patch -Np0 -i ${srcdir}/fix-build-with-zlib-1.2.6.diff + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=640305 + patch -Np1 -i ../kwprocessxml_rpath.patch - # fix http://www.vtk.org/Bug/view.php?id=12691 - cd VTK - patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff + patch -Np1 -i ../fix_FTBFS_boost149.patch - mkdir ${srcdir}/build - cd ${srcdir}/build + patch -Np1 -i ../doubletostring.patch + + mkdir "${srcdir}"/build + cd "${srcdir}"/build # flags to enable using system libs local cmake_system_flags="" @@ -47,13 +55,15 @@ build() { done # flags to use python2 instead of python which is 3.x.x on archlinux - local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so" + local cmake_system_python_flags="-DPYTHON_EXECUTABLE:PATH=/usr/bin/python2 \ + -DPYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7 -DPYTHON_LIBRARY:PATH=/usr/lib/libpython2.7.so" - # enable when http://paraview.org/Bug/view.php?id=12718 gets fixed + # enable when http://paraview.org/Bug/view.php?id=12852 gets fixed #-DCMAKE_SKIP_RPATH:BOOL=YES \ # the following flags enable the feature request at https://bugs.archlinux.org/task/27525 # -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON -DVISIT_BUILD_READER_CGNS:BOOL=ON cmake \ + -DCMAKE_SKIP_RPATH:BOOL=YES \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DVTK_USE_BOOST:BOOL=ON \ @@ -62,7 +72,7 @@ build() { -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \ -DPARAVIEW_USE_VISITBRIDGE:BOOL=ON \ -DVISIT_BUILD_READER_CGNS:BOOL=ON \ - -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \ + -DVTK_USE_FFMPEG_ENCODER:BOOL=OFF \ ${cmake_system_flags} \ ${cmake_system_python_flags} \ ../ParaView-${pkgver}-Source @@ -71,14 +81,14 @@ build() { } package() { - cd build + cd "${srcdir}"/build - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install # Install license - install -Dm644 ${srcdir}/ParaView-${pkgver}-Source/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE + install -Dm644 "${srcdir}"/ParaView-${pkgver}-Source/License_v1.2.txt "${pkgdir}"/usr/share/licenses/paraview/LICENSE # Install desktop shortcuts - install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png - desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop + install -Dm644 "${srcdir}"/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png + desktop-file-install --dir="${pkgdir}"/usr/share/applications "${srcdir}"/paraview.desktop } diff --git a/community/paraview/doubletostring.patch b/community/paraview/doubletostring.patch new file mode 100644 index 000000000..5aaa398fd --- /dev/null +++ b/community/paraview/doubletostring.patch @@ -0,0 +1,11 @@ +diff -Naur ParaView-3.14.1-Source.ori/Utilities/VisItBridge/databases/paraDIS/RC_cpp_lib/RCLibPoint.h ParaView-3.14.1-Source/Utilities/VisItBridge/databases/paraDIS/RC_cpp_lib/RCLibPoint.h +--- ParaView-3.14.1-Source.ori/Utilities/VisItBridge/databases/paraDIS/RC_cpp_lib/RCLibPoint.h 2012-04-02 12:56:35.000000000 -0400 ++++ ParaView-3.14.1-Source/Utilities/VisItBridge/databases/paraDIS/RC_cpp_lib/RCLibPoint.h 2012-06-04 12:27:44.184445953 -0400 +@@ -6,6 +6,7 @@ + #include <iomanip> + #include <istream> + #include "DebugStream.h" ++#include "stringutil.h" + + namespace rclib { + using namespace std; diff --git a/community/paraview/fix_FTBFS_boost149.patch b/community/paraview/fix_FTBFS_boost149.patch new file mode 100644 index 000000000..b04d3917c --- /dev/null +++ b/community/paraview/fix_FTBFS_boost149.patch @@ -0,0 +1,27 @@ +Description: fix FTBFS with boost 1.49 +Author: Dominique Belhachemi <domibel@debian.org> +Origin: http://anonscm.debian.org/gitweb/?p=collab-maint/vtk.git;a=commitdiff;h=55084a11b450e53b2e8786e23dd64a6a6b846e6b +Last-Update: 2012-05-07 + +--- a/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx ++++ b/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx +@@ -49,11 +49,17 @@ + + #if BOOST_VERSION >= 104800 // Boost 1.48.x + namespace { +- vtkIdType unwrap_edge_id(vtkEdgeType const &e) { ++ vtkIdType unwrap_edge_id(vtkEdgeType const &e) ++ { + return e.Id; + } +- vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) { ++ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) ++ { ++# if BOOST_VERSION == 104800 + return e.underlying_desc.Id; ++# else ++ return e.underlying_descx.Id; ++# endif + } + } + #endif diff --git a/community/paraview/kwprocessxml_rpath.patch b/community/paraview/kwprocessxml_rpath.patch new file mode 100644 index 000000000..b36feb6fc --- /dev/null +++ b/community/paraview/kwprocessxml_rpath.patch @@ -0,0 +1,26 @@ +Description: This patch forces building of kwProcessXML as shared forwarded + executable in our case (even is CMAKE_SKIP_RPATH is OFF in debian) +Author: Mathieu Malaterre <mathieu.malaterre@gmail.com> +Bug-Debian: http://bugs.debian.org/640305 +Last-Update: 2011-09-13 + +--- a/Common/KWCommon/CMakeLists.txt ++++ b/Common/KWCommon/CMakeLists.txt +@@ -225,7 +225,7 @@ + IF(KWCOMMON_BUILD_PROCESSXML) + # For shared libraries on non-windows systems use the KWSys shared-forward + # implementation to make sure shared libraries are found. +- IF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH) ++ IF(BUILD_SHARED_LIBS ) + IF(NOT WIN32) + SET(KWCommon_FORWARD_DIR_BUILD ${EXECUTABLE_OUTPUT_PATH}) + SET(KWCommon_FORWARD_BIN_TO_LIB "..${KWCommon_INSTALL_LIB_DIR}") +@@ -248,7 +248,7 @@ + COMPONENT Development) + ENDIF(NOT KWCommon_INSTALL_NO_DEVELOPMENT) + ENDIF(NOT WIN32) +- ENDIF(BUILD_SHARED_LIBS AND CMAKE_SKIP_RPATH) ++ ENDIF(BUILD_SHARED_LIBS ) + + ADD_EXECUTABLE(kwProcessXML${KWCommon_EXE_SUFFIX} ProcessXML.cxx) + TARGET_LINK_LIBRARIES(kwProcessXML${KWCommon_EXE_SUFFIX} vtkCommon vtksys) diff --git a/community/paraview/paraview-3.14.1-gcc47.patch b/community/paraview/paraview-3.14.1-gcc47.patch new file mode 100644 index 000000000..792926719 --- /dev/null +++ b/community/paraview/paraview-3.14.1-gcc47.patch @@ -0,0 +1,36 @@ +diff -Naur ParaView-3.14.1-Source.ori/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx ParaView-3.14.1-Source/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx +--- ParaView-3.14.1-Source.ori/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-04-02 12:56:37.000000000 -0400 ++++ ParaView-3.14.1-Source/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx 2012-05-10 11:40:21.101841603 -0400 +@@ -21,6 +21,8 @@ + //files around for inspection. Otherwise it deletes the temporary files it + //creates and returns success. + ++#include <unistd.h> ++ + #include "vtkXdmfWriter.h" + + #include "vtkCellData.h" +diff -Naur ParaView-3.14.1-Source.ori/VTK/Rendering/vtkFreeTypeTools.cxx ParaView-3.14.1-Source/VTK/Rendering/vtkFreeTypeTools.cxx +--- ParaView-3.14.1-Source.ori/VTK/Rendering/vtkFreeTypeTools.cxx 2012-04-02 12:57:30.000000000 -0400 ++++ ParaView-3.14.1-Source/VTK/Rendering/vtkFreeTypeTools.cxx 2012-05-10 11:38:48.618504485 -0400 +@@ -35,6 +35,8 @@ + using namespace ftgl; + #endif + ++#include <stdint.h> ++ + // Print debug info + #define VTK_FTFC_DEBUG 0 + #define VTK_FTFC_DEBUG_CD 0 +diff -Naur ParaView-3.14.1-Source.ori/VTK/Rendering/vtkFreeTypeUtilities.cxx ParaView-3.14.1-Source/VTK/Rendering/vtkFreeTypeUtilities.cxx +--- ParaView-3.14.1-Source.ori/VTK/Rendering/vtkFreeTypeUtilities.cxx 2012-04-02 12:57:30.000000000 -0400 ++++ ParaView-3.14.1-Source/VTK/Rendering/vtkFreeTypeUtilities.cxx 2012-05-10 11:38:48.618504485 -0400 +@@ -36,6 +36,8 @@ + using namespace ftgl; + #endif + ++#include <stdint.h> ++ + // Print debug info + + #define VTK_FTFC_DEBUG 0 diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index 19d6269fa..c526c5f7d 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,24 +1,20 @@ -# $Id: PKGBUILD 71280 2012-05-26 07:55:10Z pschmitz $ +# $Id: PKGBUILD 71982 2012-06-04 19:27:21Z jelle $ # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Maintainer: Jelle van der Waa <jelle@vdwaa.nl> pkgname=pdf2djvu -pkgver=0.7.12 +pkgver=0.7.13 pkgrel=1 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64' 'mips64el') url="http://pdf2djvu.googlecode.com" license=('GPL') -depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs') -makedepends=('pstreams') -source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz" - "poppler-0.20.patch") -md5sums=('4fd56c0763b56b4081fc9c85be16d9d7' - '9f9c5b098a3a13256beac04553ee67c3') +depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') +makedepends=('pstreams' 'python2-nose' 'ttf-liberation') +source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 <$srcdir/poppler-0.20.patch ./configure --prefix=/usr make } @@ -28,3 +24,10 @@ package() { make install DESTDIR=${pkgdir} install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 } +check() { + + cd ${srcdir}/${pkgname}-${pkgver} + sed -i 's/nosetests/nosetests2/' tests/Makefile + make test +} +md5sums=('b5327c5949057711a8250dffb6ccfd2d') diff --git a/community/python2-gevent/PKGBUILD b/community/python2-gevent/PKGBUILD new file mode 100644 index 000000000..c35d3ac2b --- /dev/null +++ b/community/python2-gevent/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Ralf Schmitt <ralf@systemexit.de> + +pkgname=python2-gevent +pkgver=0.13.7 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="Python network library that uses greenlet and libevent for easy and scalable concurrency" +license=("MIT") +url="http://www.gevent.org/" +depends=('libevent' 'python2-greenlet') +makedepends=('python2-distribute') + +source=(http://pypi.python.org/packages/source/g/gevent/gevent-$pkgver.tar.gz) + +build() { + cd "$srcdir/gevent-$pkgver" + python2 setup.py build +} + +package() { + cd "$srcdir/gevent-$pkgver" + python2 setup.py install -O1 --root="$pkgdir" + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm0644 LICENSE.pyevent "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pyevent" +} + +md5sums=('c74004730c2543260b751b0aa782987c') +sha1sums=('2b9c63b84e21a36e244a7c825b9bdbaa98b7ec66') diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD new file mode 100644 index 000000000..38546a68d --- /dev/null +++ b/community/python2-greenlet/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 70305 2012-05-04 08:21:08Z mtorromeo $ +# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Ralf Schmitt <ralf@systemexit.de> + +pkgname=python2-greenlet +pkgver=0.3.4 +pkgrel=1 +pkgdesc="python coroutine library" +license=("MIT") +url="http://pypi.python.org/pypi/greenlet" +depends=('python2') +source=(http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.zip) +arch=('i686' 'x86_64') + +md5sums=('530a69acebbb0d66eb5abd83523d8272') +sha1sums=('1bff62c43e179d3f4866f31a8258a259c82b4803') + +build() { + cd "$srcdir/greenlet-$pkgver" + python2 setup.py build +} + +package() { + cd "$srcdir/greenlet-$pkgver" + python2 setup.py install --root="$pkgdir" + install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF" +} diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index f443acb06..56f4c933a 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 66446 2012-02-24 23:40:09Z jlichtblau $ +# $Id: PKGBUILD 71984 2012-06-04 19:39:36Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64' 'mips64el') @@ -11,17 +11,17 @@ license=('GPL') depends=('ncurses' 'gtk2') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d') +sha256sums=('c2cdb40ca03ea3e0464c2f0f68d27013fd447c0b67b0a5f87521f95c855e7658') build() { - cd ${srcdir} + cd ${srcdir}/$pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd ${srcdir} + cd ${srcdir}/$pkgname-$pkgver make DESTDIR=${pkgdir} install } diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index 136202fba..953f35aaa 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2012-06-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.3-1 + 2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.7.2-1 diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index 3097354dd..862be193a 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 155758 2012-04-06 07:00:20Z remy $ +# $Id: PKGBUILD 160750 2012-06-04 21:42:23Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.15 -pkgrel=2 +pkgver=2.16 +pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64' 'mips64el') url="http://asymptote.sourceforge.net/" @@ -17,7 +17,7 @@ optdepends=('python2: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('e0fb336c195fb21a39e3d0f3acd4881ce5e170a7') +sha1sums=('ca110698b8c710eb93830f0fa55d29503c39e92a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index ac3920d41..e91f781b2 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158091 2012-05-02 18:12:22Z schiv $ +# $Id: PKGBUILD 160732 2012-06-04 18:03:37Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.4.0 +pkgver=2.4.1 pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ optdepends=('opencv-docs' 'python2-numpy: Python 2.x interface') options=('!libtool') source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") -md5sums=('1fcda4ed3d0655f033ac30be8bad4882') +md5sums=('144aafa12260150490ce77d8debc1a23') _cmakeopts=('-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD index 0e8c1874f..af1a2f3fd 100644 --- a/extra/postgresql-old-upgrade/PKGBUILD +++ b/extra/postgresql-old-upgrade/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 151565 2012-02-27 18:03:37Z dan $ +# $Id: PKGBUILD 160728 2012-06-04 17:55:37Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=postgresql-old-upgrade -pkgver=9.0.7 +pkgver=9.0.8 _majorver=${pkgver%.*} pkgrel=1 pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade" @@ -37,5 +37,5 @@ package() { rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/" } -md5sums=('27e67f48607c29df8ca6aab2a6fdf0b8') -sha256sums=('dabe26d71d8b595f9514da1363dc20c3f4b90b6908026dd06984cac448a6d833') +md5sums=('0e830b0f6538e04b788c3208060256ef') +sha256sums=('a2981ba8a64b396e2111fee5a9216275e49a2e79e839152a5e4367afd44c0bc2') diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index 85d3efa56..0fe507e95 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160571 2012-06-02 10:28:50Z bluewind $ +# $Id: PKGBUILD 160730 2012-06-04 17:58:05Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') -pkgver=9.1.3 +pkgver=9.1.4 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') @@ -134,12 +134,12 @@ package_postgresql() { "${pkgdir}/etc/logrotate.d/postgresql" } -md5sums=('641e1915f7ebfdc9f138e4c55b6aec0e' +md5sums=('a8035688dba988b782725ac1aec60186' '1ddd1df8010549f237e7983bb326025e' 'a54d09a20ab1672adf08f037df188d53' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137') -sha256sums=('7a79800a624031c1d9bc9cdce73cb40050100ac50a82050cbf7bbbd16ac4d5d5' +sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712' '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index d2bfa1a1f..bfb5a20ff 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 153262 2012-03-12 17:29:57Z jgc $ +# $Id: PKGBUILD 160766 2012-06-05 08:51:20Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=1.2 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') -makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi') url="http://gstreamer.freedesktop.org/" options=(!libtool !emptydirs) source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz) @@ -26,10 +26,15 @@ build() { sed -e 's/gst sys ext/gst/' -i Makefile } +# Disable for now: 2 tests fail, one of them is because of not having a camera during build. +#check() { +# cd "${srcdir}/gst-plugins-bad-${pkgver}" +# make check +#} + package_gstreamer0.10-bad-libre() { pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)" depends=('gstreamer0.10-base>=0.10.34') - groups=('gstreamer0.10-plugins') provides=("gstreamer0.10-bad=$pkgver") conflicts=('gstreamer0.10-bad') replaces=('gstreamer0.10-bad') @@ -40,7 +45,7 @@ package_gstreamer0.10-bad-libre() { package_gstreamer0.10-bad-libre-plugins() { pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)" - depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg') + depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi') groups=('gstreamer0.10-plugins') install=gstreamer0.10-bad-plugins.install provides=("gstreamer0.10-bad-plugins=$pkgver") 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 new file mode 100644 index 000000000..4da03a569 --- /dev/null +++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -0,0 +1,271 @@ +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
+
+---
+ browser/components/migration/content/migration.js | 15 ++++++++++-----
+ browser/components/migration/content/migration.xul | 2 +-
+ .../migration/src/BrowserProfileMigrators.manifest | 2 +-
+ .../components/migration/src/FirefoxProfileMigrator.js | 2 +-
+ browser/components/migration/src/ProfileMigrator.js | 4 ++++
+ .../en-US/chrome/browser/migration/migration.dtd | 2 --
+ .../en-US/chrome/browser/migration/migration.properties | 11 +++++------
+ toolkit/content/aboutSupport.js | 8 ++++----
+ toolkit/content/jar.mn | 2 +-
+ toolkit/content/resetProfile.js | 6 ++----
+ toolkit/profile/nsIProfileMigrator.idl | 10 +++++++++-
+ toolkit/xre/nsAppRunner.cpp | 2 +-
+ 83 files changed, 394 insertions(+), 382 deletions(-)
+
+diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
+index ffb0c34..442a5ff 100644
+--- a/browser/components/migration/content/migration.js
++++ b/browser/components/migration/content/migration.js
+@@ -314,7 +314,7 @@ var MigrationWizard = {
+ }
+
+ var bundle = 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 = bundle.getString("homePageMigrationPageTitle");
+@@ -346,8 +346,8 @@ var MigrationWizard = {
+ case "chrome":
+ source = "sourceNameChrome";
+ break;
+- case "firefox":
+- source = "sourceNameFirefox";
++ case "self":
++ source = "brand";
+ break;
+ }
+
+@@ -357,8 +357,13 @@ var MigrationWizard = {
+ var oldHomePageURL = this._migrator.sourceHomePageURL;
+
+ if (oldHomePageURL && source) {
+- var bundle2 = document.getElementById("bundle");
+- var appName = bundle2.getString(source);
++ var appName;
++ if (source == "brand") {
++ appName = bundle.GetStringFromName("brandFullName");
++ } else {
++ var bundle2 = document.getElementById("bundle");
++ appName = bundle2.getString(source);
++ }
+ var oldHomePageLabel = bundle.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 f8653b1..f3ac62a 100644
+--- a/browser/components/migration/content/migration.xul
++++ b/browser/components/migration/content/migration.xul
+@@ -76,7 +76,7 @@
+ #endif
+ #endif
+ <radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
+- <radio id="firefox" label="&importFromFirefox.label;" accesskey="&importFromFirefox.accesskey;"/>
++ <radio id="self" hidden="true"/>
+ <radio id="fromfile" label="&importFromHTMLFile.label;" accesskey="&importFromHTMLFile.accesskey;" hidden="true"/>
+ <radio id="nothing" label="&importFromNothing.label;" accesskey="&importFromNothing.accesskey;" hidden="true"/>
+ </radiogroup>
+diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
+index f49e481..e490ddf 100644
+--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
++++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
+@@ -3,4 +3,4 @@ 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}
+diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
+index 7b4a6e4..add5bc4 100644
+--- a/browser/components/migration/src/FirefoxProfileMigrator.js
++++ b/browser/components/migration/src/FirefoxProfileMigrator.js
+@@ -448,7 +448,7 @@ FirefoxProfileMigrator.prototype = {
+ ]),
+
+ classDescription: "Firefox Profile Migrator",
+- contractID: "@mozilla.org/profile/migrator;1?app=browser&type=firefox",
++ contractID: "@mozilla.org/profile/migrator;1?app=browser&type=self",
+ classID: Components.ID("{91185366-ba97-4438-acba-48deaca63386}")
+ };
+
+diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
+index ea66675..fe4df10 100644
+--- a/browser/components/migration/src/ProfileMigrator.js
++++ b/browser/components/migration/src/ProfileMigrator.js
+@@ -51,6 +51,10 @@ ProfileMigrator.prototype = {
+ params);
+ },
+
++ canMigrate: function PM__canMigrate(aMigratorKey) {
++ return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
++ },
++
+ _toCString: function PM__toCString(aStr) {
+ let cstr = Cc["@mozilla.org/supports-cstring;1"].
+ createInstance(Ci.nsISupportsCString);
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+index 86e9d0b..8df7864 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
++++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
+@@ -13,8 +13,6 @@
+ <!ENTITY importFromSafari.accesskey "S">
+ <!ENTITY importFromChrome.label "Chrome">
+ <!ENTITY importFromChrome.accesskey "C">
+-<!ENTITY importFromFirefox.label "Firefox">
+-<!ENTITY importFromFirefox.accesskey "X">
+ <!ENTITY importFromHTMLFile.label "From an HTML File">
+ <!ENTITY importFromHTMLFile.accesskey "F">
+
+diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
+index 495ed78..0272654 100644
+--- a/browser/locales/en-US/chrome/browser/migration/migration.properties
++++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
+@@ -4,7 +4,6 @@ profileName_format=%S %S
+ sourceNameIE=Internet Explorer
+ sourceNameSafari=Safari
+ sourceNameChrome=Google Chrome
+-sourceNameFirefox=Mozilla Firefox
+
+ importedBookmarksFolder=From %S
+ importedSearchURLsFolder=Keyword Searches (From %S)
+@@ -21,27 +20,27 @@ importedSafariBookmarks=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=Browsing History
++4_self=Browsing History
+
+ 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_safari=Bookmarks
+ 32_chrome=Bookmarks
+-32_firefox=Bookmarks
++32_self=Bookmarks
+
+ 64_ie=Other Data
+ 64_safari=Other Data
+diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
+index c86d80c..ff1ccfe 100644
+--- a/toolkit/content/aboutSupport.js
++++ b/toolkit/content/aboutSupport.js
+@@ -608,13 +608,13 @@ function populateResetBox() {
+ .getService(Ci.nsIToolkitProfileService);
+ let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-
+ // Only show the reset box for the default profile if the self-migrator used for reset exists.
+ try {
+ if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||
+- !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc))
++ !("@mozilla.org/toolkit/profile-migrator;1" in Cc))
++ return;
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ if (!("canMigrate" in pm) || !pm.canMigrate("self"))
+ return;
+ document.getElementById("reset-box").style.visibility = "visible";
+ } catch (e) {
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 6f0d2d6..da7342b 100644
+--- a/toolkit/content/jar.mn
++++ b/toolkit/content/jar.mn
+@@ -38,7 +38,7 @@ toolkit.jar:
+ + content/global/mozilla.xhtml (mozilla.xhtml)
+ *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js)
+ content/global/resetProfile.css (resetProfile.css)
+-* content/global/resetProfile.js (resetProfile.js)
++ content/global/resetProfile.js (resetProfile.js)
+ * content/global/resetProfile.xul (resetProfile.xul)
+ * content/global/treeUtils.js (treeUtils.js)
+ *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index 975a9ed..d8e46b1 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -6,12 +6,10 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+
+ // based on onImportItemsPageShow from migration.js
+ function onResetProfileLoad() {
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+ const MAX_MIGRATED_TYPES = 16;
+
+ var migratedItems = document.getElementById("migratedItems");
+- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
++ var bundle = Services.strings.createBundle("chrome://browser" +
+ "/locale/migration/migration.properties");
+
+ // Loop over possible data to migrate to give the user a list of what will be preserved. This
+@@ -21,7 +19,7 @@ function onResetProfileLoad() {
+ var itemID = Math.pow(2, i);
+ try {
+ var checkbox = document.createElement("label");
+- checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME));
++ checkbox.setAttribute("value", bundle.GetStringFromName(itemID + "_self"));
+ migratedItems.appendChild(checkbox);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist because it's not migrated
+diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
+index e941336..5b264af 100644
+--- a/toolkit/profile/nsIProfileMigrator.idl
++++ b/toolkit/profile/nsIProfileMigrator.idl
+@@ -69,7 +69,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
+ {
+ /**
+@@ -92,6 +92,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 32eef5c..dbe1580 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -3561,7 +3561,7 @@ XRE_main(int argc, char* argv[], const nsXREAppData* aAppData)
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ pm->Migrate(&dirProvider, aKey);
+ // Set the new profile as the default after migration.
+ rv = SetCurrentProfileAsDefault(profileSvc, profD);
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 85ede7409..3875bbc3d 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -3,6 +3,7 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> +# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> @@ -12,8 +13,8 @@ _pgo=false # We're getting this from Debian Sid _debname=iceweasel -_debver=12.0 -_debrel=7 +_debver=13.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -49,17 +50,19 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" libre.patch iceweasel-install-dir.patch region.properties - vendor.js) -md5sums=('b45f57bfe21b0e6db4f0683e794917cb' - '08aa0a949d9cbb26116490f7878a62fe' - 'd7ad1c025d2442427a06cc702906ef0d' + vendor.js + Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) +md5sums=('e440446bb92dc1c0311346c68024590b' + 'cb8bfb543002a5d78db7e8661f9f87ec' + 'a9848e41461776bc4bf8d2de824b1204' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' - '64be2fab525189c285ee04495d628035' + '1c23b150a9c2eeb378f167a1dfa09d89' 'e529742c0a425648087bc3ce537fe4c5' 'f1c76e7e244257856a386ca2de69bdf0' - '0d053487907de4376d67d8f499c5502b') + '0d053487907de4376d67d8f499c5502b' + '41ce105f0c1877fe22e0c0ec45e09565') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") @@ -78,6 +81,9 @@ dpkg-source() { # Doesn't apply and seems unimportant rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true +# This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it + rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true + quilt push -a find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? cd .. @@ -98,6 +104,10 @@ if [ $NOEXTRACT -eq 0 ]; then patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix patch -Np1 -i "$srcdir/libre.patch" + +# Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch + patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" + fi cd "$srcdir/mozilla-build" diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index ecebbb3ce..7b4e6a395 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,13 +1,13 @@ -diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js ---- mozilla-build/browser/app/profile/firefox.js.orig 2012-03-20 01:04:55.890545738 -0300 -+++ mozilla-build/browser/app/profile/firefox.js 2012-03-20 01:05:03.330545430 -0300 +diff -urN iceweasel-13.0.orig/browser/app/profile/firefox.js iceweasel-13.0/browser/app/profile/firefox.js +--- mozilla-build.orig/browser/app/profile/firefox.js 2012-06-01 09:03:47.000000000 -0300 ++++ mozilla-build/browser/app/profile/firefox.js 2012-06-05 19:53:08.847012282 -0300 @@ -64,11 +64,11 @@ // Preferences for AMO integration pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); -pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%/%COMPATIBILITY_MODE%"); +pref("extensions.getAddons.get.url", ""); @@ -18,7 +18,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // Blocklist preferences pref("extensions.blocklist.enabled", true); -@@ -80,7 +80,7 @@ +@@ -92,7 +92,7 @@ pref("extensions.autoDisableScopes", 15); // Dictionary download preference @@ -27,7 +27,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // The minimum delay in seconds for the timer to fire. // default=2 minutes -@@ -200,7 +200,7 @@ +@@ -218,7 +218,7 @@ pref("extensions.update.interval", 86400); // Check for updates to Extensions and // Themes every day // Non-symmetric (not shared by extensions) extension-specific [update] preferences @@ -36,7 +36,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br pref("extensions.dss.enabled", false); // Dynamic Skin Switching pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next // restart. -@@ -234,7 +234,7 @@ +@@ -252,7 +252,7 @@ // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore pref("browser.startup.page", 1); @@ -45,7 +45,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -@@ -324,7 +324,7 @@ +@@ -345,7 +345,7 @@ pref("browser.download.manager.resumeOnWakeDelay", 10000); // search engines URL @@ -54,7 +54,7 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -@@ -563,7 +563,7 @@ +@@ -593,7 +593,7 @@ pref("accessibility.typeaheadfind.flashBar", 1); // plugin finder service url @@ -63,21 +63,9 @@ diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/br // by default we show an infobar message when pages require plugins the user has not installed, or are outdated pref("plugins.hide_infobar_for_missing_plugin", false); -diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js ---- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 -+++ iceweasel-9.0.1/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 -@@ -59,7 +59,7 @@ - // Broader than we'd like, but after this changed from api-secure.recaptcha.net - // we had no choice. At least we only do this for the duration of setup. - // See discussion in Bugs 508112 and 653307. --const RECAPTCHA_DOMAIN = "https://www.google.com"; -+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; - - Cu.import("resource://services-sync/main.js"); - Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties ---- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 -+++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +diff -urN iceweasel-13.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-13.0/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-build.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-build/browser/locales/en-US/chrome/browser-region/region.properties 2012-06-05 20:07:51.593611484 -0300 @@ -1,8 +1,8 @@ # Default search engine -browser.search.defaultenginename=Google @@ -98,9 +86,9 @@ diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/regio # 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 -diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html ---- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 -+++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html +--- mozilla-build.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300 ++++ mozilla-build/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300 @@ -143,7 +143,7 @@ </p> <p> @@ -110,10 +98,10 @@ diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1 </p> <p> <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> -diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul ---- iceweasel-9.0.1.orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 -+++ iceweasel-9.0.1/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 -@@ -301,6 +301,6 @@ +diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul +--- mozilla-build.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300 ++++ mozilla-build/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300 +@@ -294,6 +294,6 @@ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> </toolbar> @@ -121,9 +109,9 @@ diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul + <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/> <label id="messageLog" value="" crop="center"/> </window> -diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul ---- iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000 -+++ iceweasel-9.0.1/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000 +diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul +--- mozilla-build.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300 ++++ mozilla-build/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300 @@ -69,6 +69,6 @@ label="setViewportScale"/> </toolbar> @@ -132,16 +120,16 @@ diff -urN iceweasel-9.0.1.orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0.1/la + <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content" remote="true"/> </window> -diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/xul/app/mobile.js ---- mozilla-build/mobile/xul/app/mobile.js.orig 2012-03-20 01:02:30.300551777 -0300 -+++ mozilla-build/mobile/xul/app/mobile.js 2012-03-20 01:02:40.820551342 -0300 -@@ -220,13 +220,12 @@ +diff -urN iceweasel-13.0.orig/mobile/xul/app/mobile.js iceweasel-13.0/mobile/xul/app/mobile.js +--- mozilla-build.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300 ++++ mozilla-build/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300 +@@ -221,13 +221,12 @@ /* preferences for the Get Add-ons pane */ pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); -pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); -pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); -pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%"); -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); @@ -155,8 +143,8 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x /* preference for the locale picker */ pref("extensions.getLocales.get.url", ""); -@@ -239,7 +240,7 @@ - pref("privacy.popups.showBrowserMessage", true); +@@ -247,7 +246,7 @@ + pref("dom.disable_window_open_dialog_feature", true); pref("keyword.enabled", true); -pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q="); @@ -164,9 +152,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/xul/app/mobile.js iceweasel-9.0.1/mobile/x pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); -diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties ---- iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000 -+++ iceweasel-9.0.1/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000 +diff -urN iceweasel-13.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-13.0/mobile/locales/en-US/chrome/region.properties +--- mozilla-build.orig/mobile/locales/en-US/chrome/region.properties 2012-06-01 09:04:14.000000000 -0300 ++++ mozilla-build/mobile/locales/en-US/chrome/region.properties 2012-06-05 20:53:03.264432170 -0300 @@ -1,8 +1,8 @@ # Default search engine -browser.search.defaultenginename=Google @@ -187,9 +175,9 @@ diff -urN iceweasel-9.0.1.orig/mobile/locales/en-US/chrome/region.properties ice # 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 -diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/modules/libpref/src/init/all.js ---- iceweasel-9.0.1.orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000 -+++ iceweasel-9.0.1/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000 +diff -urN iceweasel-13.0.orig/modules/libpref/src/init/all.js iceweasel-13.0/modules/libpref/src/init/all.js +--- mozilla-build.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300 ++++ mozilla-build/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300 @@ -47,7 +47,7 @@ // SYNTAX HINTS: dashes are delimiters. Use underscores instead. // The first character after a period must be alphabetic. @@ -199,9 +187,9 @@ diff -urN iceweasel-9.0.1.orig/modules/libpref/src/init/all.js iceweasel-9.0.1/m pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); -diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties ---- iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000 -+++ iceweasel-9.0.1/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000 +diff -urN iceweasel-13.0.orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-13.0/toolkit/locales/en-US/chrome/global-region/region.properties +--- mozilla-build.orig/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-01 09:04:20.000000000 -0300 ++++ mozilla-build/toolkit/locales/en-US/chrome/global-region/region.properties 2012-06-05 20:58:59.068158482 -0300 @@ -4,10 +4,10 @@ pluginStartupMessage=Starting Plugin for type @@ -219,15 +207,15 @@ diff -urN iceweasel-9.0.1.orig/toolkit/locales/en-US/chrome/global-region/region +plugindoc_label=gnuzilla.gnu.org +plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html ---- iceweasel-10.0.orig/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:34.279657460 -0300 -+++ iceweasel-10.0/browser/locales/generic/profile/bookmarks.html.in 2012-02-07 15:40:19.226324812 -0300 -@@ -11,13 +11,13 @@ +diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-13.0/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-build.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-build/browser/locales/generic/profile/bookmarks.html.in 2012-06-05 21:03:38.239300038 -0300 +@@ -11,13 +11,12 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ <DL><p> - <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> -+ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</A> -+ <DT><A HREF="https://parabolagnulinux.org/">Parabola</A> ++ <DT><A HREF="https://parabolagnulinux.org/">Parabola GNU/Linux-libre</A> </DL><p> <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> <DL><p> diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 3593442f9..6ca3d1e8b 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -9,9 +9,9 @@ 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=32 +_sublevel=33 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.31 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.32 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,9 +32,9 @@ 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' - '1fc88c19baf04fbb37385712ad9c4d57' - 'df7e69a7b238c6492b589cc2beb894d2' - '2ef390e115d6ae1c074c30fec9258442' + '3076be33631914b638eb9f313dc17d08' + '9cfcf3807201ce44aa720571232a10ce' + '8bb5c5aa217202c3ac3798ba7798e07d' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -42,7 +42,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' - 'bacdceaf5ce186cfe69dffc89cd246a0') + '9c4fed22ad8ea99a54d20c22a63ad3d7') 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-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 7094b2731..83bab0f8c 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -4998,7 +4998,8 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y CONFIG_DMI_SYSFS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m CONFIG_SIGMA=m # CONFIG_GOOGLE_FIRMWARE is not set diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index f7cd1263b..fa7be5e5b 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -4739,7 +4739,8 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y CONFIG_DMI_SYSFS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m CONFIG_SIGMA=m # CONFIG_GOOGLE_FIRMWARE is not set diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 6cd9761a7..b6a6f731c 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.32-1-LIBRE-LTS +KERNEL_VERSION=3.0.33-1-LIBRE-LTS post_install () { # updating module dependencies diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8c1d72f35..6cc824d30 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,18 +12,17 @@ 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=6 -#pkgver=${_basekernel}.${_sublevel} -pkgver=${_basekernel} -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver -pkgrel=1.2 +_sublevel=1 +pkgver=${_basekernel}.${_sublevel} +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -35,16 +34,16 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' - #'6d9d139e4b53802615833372728cc0e4' - '631bee7d8e6e125f859fc51200699685' - '54f6db6c3b747fbee10cb02460ba66f0' + '9b5bcbc2f77807f66a50d5e34d4ce42e' + '669c3f9d5c6a2109bad8e511287826c3' + '454231e14419e56a5281eb7bc6fde83e' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - 'de092ff42e61e88a67f50c351c2ad7c0') + 'f70a4bf0ee00d8be680cfbd65459836d') 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/config.i686 b/libre/linux-libre/config.i686 index 0bea26739..a6e1a6310 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -411,6 +411,7 @@ CONFIG_X86_REBOOTFIXUPS=y CONFIG_MICROCODE=m # CONFIG_MICROCODE_INTEL is not set # CONFIG_MICROCODE_AMD is not set +CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m # CONFIG_NOHIGHMEM is not set @@ -5177,7 +5178,8 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y CONFIG_DMI_SYSFS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set # diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 8a4734dac..9f3698ac2 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_64 3.4.0-1 Kernel Configuration +# Linux/x86_64 3.4.1-1 Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -389,6 +389,7 @@ CONFIG_I8K=m CONFIG_MICROCODE=m # CONFIG_MICROCODE_INTEL is not set # CONFIG_MICROCODE_AMD is not set +CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m CONFIG_ARCH_PHYS_ADDR_T_64BIT=y @@ -4949,7 +4950,8 @@ CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y CONFIG_DMI_SYSFS=m -# CONFIG_ISCSI_IBFT_FIND is not set +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m # CONFIG_GOOGLE_FIRMWARE is not set # diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6a2a2795a..74143e1cd 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.0-1.2-LIBRE +KERNEL_VERSION=3.4.1-1-LIBRE post_install () { # updating module dependencies diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..2518ad291 --- /dev/null +++ b/staging/kdemultimedia/PKGBUILD @@ -0,0 +1,113 @@ +# $Id: PKGBUILD 160743 2012-06-04 20:00:59Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.8.3 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse' + 'libmusicbrainz3' 'taglib' 'libcanberra') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'mplayerthumbs.config' + 'ffmpeg0.11.patch') +sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683' + '48331f7e2dab760c20708b81fe6c4d47c83a63e7') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs + patch -p1 -i ${srcdir}/ffmpeg0.11.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_TunePimp=OFF + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia-dragonplayer.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'taglib') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/staging/kdemultimedia/ffmpeg0.11.patch b/staging/kdemultimedia/ffmpeg0.11.patch new file mode 100644 index 000000000..527ac3992 --- /dev/null +++ b/staging/kdemultimedia/ffmpeg0.11.patch @@ -0,0 +1,29 @@ +From: Christoph Feck <christoph@maxiom.de> +Date: Tue, 29 May 2012 13:53:18 +0000 +Subject: Two deprecated calls have been removed from ffmpeg 0.11. +X-Git-Tag: v4.8.80 +X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c +--- +Two deprecated calls have been removed from ffmpeg 0.11. + +BUG:300732 +--- + + +--- a/ffmpegthumbnailer/moviedecoder.cpp ++++ b/ffmpegthumbnailer/moviedecoder.cpp +@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder() + void MovieDecoder::initialize(const QString& filename) + { + av_register_all(); +- avcodec_init(); + avcodec_register_all(); + + QFileInfo fileInfo(filename); + +- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) { ++ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) { + kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath(); + return; + } + diff --git a/staging/kdemultimedia/kdemultimedia-dragonplayer.install b/staging/kdemultimedia/kdemultimedia-dragonplayer.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/staging/kdemultimedia/kdemultimedia-dragonplayer.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdemultimedia/kdemultimedia.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/staging/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/staging/kradio/PKGBUILD b/staging/kradio/PKGBUILD new file mode 100644 index 000000000..2071f88e9 --- /dev/null +++ b/staging/kradio/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 160707 2012-06-04 07:57:09Z eric $ +# Maintainer: +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=kradio +pkgver=4.0.4 +pkgrel=2 +arch=('i686' 'x86_64') +license=('GPL2') +pkgdesc="A comfortable KDE internet and AM/FM radio application" +url="http://kradio.sourceforge.net/" +depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg') +makedepends=('automoc4' 'cmake') +install=$pkgname.install +source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc}) +md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e' + '51c6d4ec0047d2df595b458bde285012') + +build() { + cd "$srcdir" + mkdir build + cd build + cmake ../${pkgname}4-$pkgver \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/staging/kradio/kradio.install b/staging/kradio/kradio.install new file mode 100644 index 000000000..460e85d7f --- /dev/null +++ b/staging/kradio/kradio.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone new file mode 100644 index 000000000..509c311f6 --- /dev/null +++ b/testing/bind/127.0.0.zone @@ -0,0 +1,11 @@ +$ORIGIN 0.0.127.in-addr.arpa. + +@ 1D IN SOA localhost. root.localhost. ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS localhost. +1 1D IN PTR localhost. diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD new file mode 100644 index 000000000..f154121ed --- /dev/null +++ b/testing/bind/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 160726 2012-06-04 16:39:43Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Contributor: Mario Vazquez <mario_vazq@hotmail.com> + +pkgname=bind + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.9.1.P1 +_pkgver=9.9.1-P1 +pkgrel=1 + +pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +options=('!makeflags' '!libtool') +depends=('openssl' 'krb5' 'libxml2') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'root.hint::http://www.internic.net/zones/named.root' + 'remove-tools.patch' + 'named' + 'named.conf' + 'named.conf.d' + 'named.logrotate' + 'localhost.zone' + '127.0.0.zone') +sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' + 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' + '18f477f510df31e6c6f547ee2d5fc46e973479bf' + '46232e9db243c6c05e170a1781d7a7f413be5d03' + '5ca7a5f2a132548a090a045a2df3acea6b35d9eb' + '7848edbfb9a848843f57c11c02b0289eefd42d00' + '9ffb5c3f72390a517aeae557e32349d5d278cb63' + '76a0d4cd1b913db177a5a375bebc47e5956866ec' + '53be0f1437ebe595240d8dbdd819939582b97fb9') + +provides=('dns-server') + +install=install +backup=('etc/logrotate.d/named' + 'etc/conf.d/named' + 'etc/named.conf') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-tools.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-libxml2 \ + --with-libtool \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + make DESTDIR="${pkgdir}" install + + rmdir "${pkgdir}/var/run" + install -d "${pkgdir}"/usr/share/doc/bind + install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind/ + + install -D -m755 ../named "${pkgdir}"/etc/rc.d/named + install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named + install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named + install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf + + install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named + install -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named/ + install -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named/ +} diff --git a/testing/bind/install b/testing/bind/install new file mode 100644 index 000000000..287d0e05b --- /dev/null +++ b/testing/bind/install @@ -0,0 +1,21 @@ +post_install() { + getent group named &>/dev/null || groupadd -g 40 named + getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named + passwd -l named &>/dev/null + + touch var/log/named.log + chown named:named var/log/named.log + + # create an rndc.key if it doesn't already exist + if [[ ! -s etc/rndc.key ]]; then + usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key + chown root:named etc/rndc.key + chmod 640 etc/rndc.key + fi +} + +pre_remove() { + getent passwd named &>/dev/null && userdel named >/dev/null + getent group named &>/dev/null && groupdel named >/dev/null + return 0 +} diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone new file mode 100644 index 000000000..e3ff9641c --- /dev/null +++ b/testing/bind/localhost.zone @@ -0,0 +1,10 @@ +$ORIGIN localhost. +@ 1D IN SOA @ root ( + 42 ; serial (yyyymmdd##) + 3H ; refresh + 15M ; retry + 1W ; expiry + 1D ) ; minimum ttl + + 1D IN NS @ + 1D IN A 127.0.0.1 diff --git a/testing/bind/named b/testing/bind/named new file mode 100755 index 000000000..7907f9983 --- /dev/null +++ b/testing/bind/named @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/named + +[[ -d /var/run/named ]] || mkdir -p /var/run/named +chown named:named /var/run/named + +PIDFILE=/var/run/named/named.pid +PID=$(cat $PIDFILE 2>/dev/null) +readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; } + +case "$1" in + start) + stat_busy "Starting BIND" + [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon named + stat_done + fi + ;; + stop) + stat_busy "Stopping BIND" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon named + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + reload) + stat_busy "Reloading BIND" + [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + stat_done + fi + ;; + *) + echo "usage: $0 {start|stop|reload|restart}" +esac +exit 0 diff --git a/testing/bind/named.conf b/testing/bind/named.conf new file mode 100644 index 000000000..38fb12cbe --- /dev/null +++ b/testing/bind/named.conf @@ -0,0 +1,64 @@ +// +// /etc/named.conf +// + +options { + directory "/var/named"; + pid-file "/var/run/named/named.pid"; + auth-nxdomain yes; + datasize default; +// Uncomment these to enable IPv6 connections support +// IPv4 will still work: +// listen-on-v6 { any; }; +// Add this for no IPv4: +// listen-on { none; }; + + // Default security settings. + allow-recursion { 127.0.0.1; }; + allow-transfer { none; }; + allow-update { none; }; + version none; + hostname none; + server-id none; +}; + +zone "localhost" IN { + type master; + file "localhost.zone"; + allow-transfer { any; }; +}; + +zone "0.0.127.in-addr.arpa" IN { + type master; + file "127.0.0.zone"; + allow-transfer { any; }; +}; + +zone "." IN { + type hint; + file "root.hint"; +}; + +//zone "example.org" IN { +// type slave; +// file "example.zone"; +// masters { +// 192.168.1.100; +// }; +// allow-query { any; }; +// allow-transfer { any; }; +//}; + +logging { + channel xfer-log { + file "/var/log/named.log"; + print-category yes; + print-severity yes; + print-time yes; + severity info; + }; + category xfer-in { xfer-log; }; + category xfer-out { xfer-log; }; + category notify { xfer-log; }; +}; + diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d new file mode 100644 index 000000000..aecbd2307 --- /dev/null +++ b/testing/bind/named.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to BIND +# +NAMED_ARGS="-u named" diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate new file mode 100644 index 000000000..ef1a2d032 --- /dev/null +++ b/testing/bind/named.logrotate @@ -0,0 +1,6 @@ +/var/log/named.log { + missingok + postrotate + /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/bind/remove-tools.patch b/testing/bind/remove-tools.patch new file mode 100644 index 000000000..cbd1c53ad --- /dev/null +++ b/testing/bind/remove-tools.patch @@ -0,0 +1,12 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:14:17.025674400 -0700 +@@ -19,7 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ ++SUBDIRS = named rndc dnssec tests tools nsupdate \ + check confgen @PKCS11_TOOLS@ + TARGETS = + diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD new file mode 100644 index 000000000..8a276fdf4 --- /dev/null +++ b/testing/dnsutils/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 160725 2012-06-04 16:38:08Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: mario <mario_vazq@hotmail.com> + +pkgname=dnsutils + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.9.1.P1 +_pkgver=9.9.1-P1 +pkgrel=1 + +pkgdesc='DNS utilities: dig host nslookup' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'remove-bind.patch') +sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8' + 'b465ef6160b004838f04de9978fe1be8422af777') + +replaces=('bind-tools' 'host') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-bind.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + # hack to remove unused bloat from the binaries + CFLAGS+=' -fdata-sections -ffunction-sections' + LDFLAGS+=' -Wl,--gc-sections' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd bin; make DESTDIR="${pkgdir}" install +} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch new file mode 100644 index 000000000..19d650964 --- /dev/null +++ b/testing/dnsutils/remove-bind.patch @@ -0,0 +1,25 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig + TARGETS = + + @BIND9_MAKE_RULES@ +diff -aur old/lib/Makefile.in new/lib/Makefile.in +--- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 ++++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD new file mode 100644 index 000000000..e2d9a63a5 --- /dev/null +++ b/testing/fakeroot/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 160705 2012-06-04 05:04:59Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Jochem Kossen <j.kossen@home.nl> + +pkgname=fakeroot +pkgver=1.18.4 +pkgrel=1 +pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user" +arch=('i686' 'x86_64') +license=('GPL') +url="http://packages.debian.org/fakeroot" +groups=('base-devel') +install=fakeroot.install +depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh') +options=('!libtool') +source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2) +md5sums=('706171d8d520b1ca1576ac73f2ceb4f3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \ + --disable-static --with-ipc=sysv + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install + + install -dm755 ${pkgdir}/etc/ld.so.conf.d/ + echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf + + # install README for sysv/tcp usage + install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README +} diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install new file mode 100644 index 000000000..986c91b06 --- /dev/null +++ b/testing/fakeroot/fakeroot.install @@ -0,0 +1,14 @@ +post_install() { + sbin/ldconfig -r . +} + +post_upgrade() { + if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then + sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf + fi + sbin/ldconfig -r . +} + +pre_remove() { + sbin/ldconfig -r . +} diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD new file mode 100644 index 000000000..b621753ac --- /dev/null +++ b/testing/gnome-session/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 160710 2012-06-04 09:14:43Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=gnome-session +pkgver=3.4.2 +pkgrel=2 +pkgdesc="The GNOME Session Handler" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' + 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' + 'startup-notification' 'upower') +makedepends=('intltool' 'mesa' 'xtrans') +options=('!emptydirs') +install=gnome-session.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gnome-session-3.3.1-llvmpipe.patch timeout.patch) +sha256sums=('6c2cbc86b63bb4869f4f95e7771ec6eee0c02965b732d634de5c8122607c4356' + '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' + '1942c8144711cf4bc0e776edd366579849e266a446b48cca0205d7ab82241782') + +build() { + cd $pkgname-$pkgver + + # Allow software rendering + patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch + + # Increase timeout, for slow machines + patch -Np1 -i ../timeout.patch + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ + --disable-schemas-compile --enable-systemd + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch new file mode 100644 index 000000000..40da1c9b7 --- /dev/null +++ b/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch @@ -0,0 +1,9 @@ +diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility +--- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 ++++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 +@@ -20,4 +20,4 @@ + + # Gallium has softpipe and llvmpipe + -softpipe +--llvmpipe ++#llvmpipe diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/testing/gnome-session/gnome-session.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-session/timeout.patch b/testing/gnome-session/timeout.patch new file mode 100644 index 000000000..20500206b --- /dev/null +++ b/testing/gnome-session/timeout.patch @@ -0,0 +1,12 @@ +diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c +--- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c 2011-03-22 21:31:43.000000000 +0100 ++++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c 2012-06-04 11:06:35.911690067 +0200 +@@ -30,7 +30,7 @@ + #include <X11/Xatom.h> + + /* Wait up to this long for a running check to finish */ +-#define PROPERTY_CHANGE_TIMEOUT 5000 ++#define PROPERTY_CHANGE_TIMEOUT 10000 + + /* Values used for the _GNOME_SESSION_ACCELERATED root window property */ + #define NO_ACCEL 0 diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..14f6fe697 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 160752 2012-06-04 22:09:41Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.10.2 +pkgrel=1 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar + krb5-1.10.1-gcc47.patch + krb5-kadmind + krb5-kdc + krb5-kpropd) +sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' + '78b759d566b1fdefd9bbcd06df14f07f12effe96' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + '7f402078fa65bb9ff1beb6cbbbb017450df78560') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized + # in this function [-Werror=maybe-uninitialized] + # As this is generated code, just ignore the complaint. + patch -Np2 -i ../../krb5-1.10.1-gcc47.patch + rm lib/krb5/krb/deltat.c + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap \ + --without-system-verto + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install + + # Fix FS#29889 + install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-1.10.1-gcc47.patch b/testing/krb5/krb5-1.10.1-gcc47.patch new file mode 100644 index 000000000..ffd01c2a3 --- /dev/null +++ b/testing/krb5/krb5-1.10.1-gcc47.patch @@ -0,0 +1,11 @@ +diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y +--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400 ++++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400 +@@ -44,6 +44,7 @@ + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wuninitialized" ++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #endif + + #include <ctype.h> diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/testing/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/pam/PKGBUILD b/testing/pam/PKGBUILD new file mode 100644 index 000000000..b01833990 --- /dev/null +++ b/testing/pam/PKGBUILD @@ -0,0 +1,60 @@ +# $Id: PKGBUILD 160722 2012-06-04 15:56:13Z dreisner $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=pam +pkgver=1.1.5 +pkgrel=4 +pkgdesc="PAM (Pluggable Authentication Modules) library" +arch=('i686' 'x86_64') +license=('GPL2') +url="http://www.kernel.org/pub/linux/libs/pam/" +depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase') +makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') +backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment) +source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 + #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 + ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2/pam_unix2-2.6.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('927ee5585bdec5256c75117e9348aa47' + 'e2788389a6c59224110a45fcff30e02b') + +build() { + cd $srcdir/Linux-PAM-$pkgver + ./configure --libdir=/usr/lib + make + + cd $srcdir/pam_unix2-2.6 + ./configure --libdir=/usr/lib + make +} + +package() { + cd $srcdir/Linux-PAM-$pkgver + make DESTDIR=$pkgdir install + + # build pam_unix2 module + # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2 + cd $srcdir/pam_unix2-2.6 + make DESTDIR=$pkgdir install + + # add the realtime permissions for audio users + sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf + cat >>$pkgdir/etc/security/limits.conf <<_EOT +* - rtprio 0 +* - nice 0 +@audio - rtprio 65 +@audio - nice -10 +@audio - memlock 40000 +_EOT + + # fix some missing symlinks from old pam for compatibility + cd $pkgdir/usr/lib/security + ln -s pam_unix.so pam_unix_acct.so + ln -s pam_unix.so pam_unix_auth.so + ln -s pam_unix.so pam_unix_passwd.so + ln -s pam_unix.so pam_unix_session.so + + # set unix_chkpwd uid + chmod +s $pkgdir/sbin/unix_chkpwd +} diff --git a/testing/pam/other b/testing/pam/other new file mode 100644 index 000000000..08498b423 --- /dev/null +++ b/testing/pam/other @@ -0,0 +1,5 @@ +#%PAM-1.0 +auth required pam_unix.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so diff --git a/testing/pam/pam.install b/testing/pam/pam.install new file mode 100644 index 000000000..9d4588084 --- /dev/null +++ b/testing/pam/pam.install @@ -0,0 +1,12 @@ +# arg 1: the new package version +post_install() { + # need to run this immediately -- pacman only runs it at the end of + # all package installs + /sbin/ldconfig -r . +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} |