diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-03 16:47:08 -0300 |
commit | a420f5c4c2a4eeb411175d086b339b620dba309d (patch) | |
tree | aa810cc98c17cf30cad06226c22f8256c056430e | |
parent | 0ec0464a32563349252dda85e9176a9475d6fc34 (diff) | |
parent | 81de702a6fc79e430129a7d2b708d90f43ae5ba1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vdrift/PKGBUILD
community-testing/widelands/PKGBUILD
core/cracklib/PKGBUILD
core/systemd/PKGBUILD
extra/imagemagick/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/libreoffice/PKGBUILD
testing/mpfr/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
testing/yp-tools/PKGBUILD
72 files changed, 2854 insertions, 646 deletions
diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD new file mode 100644 index 000000000..c4f67ddbb --- /dev/null +++ b/community-testing/freedroidrpg/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 75738 2012-08-30 16:55:50Z heftig $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: nut543 <kfs1@online.no> + +#pkgbase=freedroidrpg +#pkgname=('freedroidrpg' 'freedroidrpg-data') +pkgname='freedroidrpg' +pkgver=0.15.1 +pkgrel=2 +arch=('i686' 'x86_64') +# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') +depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') +optdepends=('python2' 'espeak') +pkgdesc="a mature science fiction role playing game set in the future" +url="http://freedroid.sourceforge.net" +license=("GPL") +source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidRPG-$pkgver.tar.gz + freedroidrpg.jpg + freedroidrpg.desktop) +md5sums=('b95ea6abae46bea6ee3ace9a1902f682' + 'b73d9dac44c7e83a6c80fbe4eb96ba79' + '9a10c2a2064439cdcff5b945dfb1c3ac') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir/ install + install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg + install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop +} diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop new file mode 100644 index 000000000..33ee2f5b8 --- /dev/null +++ b/community-testing/freedroidrpg/freedroidrpg.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=freedroidrpg +Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG +Exec=freedroidRPG +Encoding=UTF-8 +Icon=/usr/share/icons/freedroidrpg.jpg +Categories=Game;RolePlaying; +Terminal=false +StartupNotify=false diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg Binary files differnew file mode 100644 index 000000000..4daa89313 --- /dev/null +++ b/community-testing/freedroidrpg/freedroidrpg.jpg diff --git a/community-testing/girara/PKGBUILD b/community-testing/girara/PKGBUILD new file mode 100644 index 000000000..f9973b8c1 --- /dev/null +++ b/community-testing/girara/PKGBUILD @@ -0,0 +1,81 @@ +# $Id: PKGBUILD 75776 2012-08-31 00:57:20Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: mlq <mlq@pwmt.org> + +pkgbase=girara +pkgname=(girara-common girara-gtk2 girara-gtk3) +pkgver=0.1.4 +pkgrel=1 +pkgdesc="user interface library" +arch=('i686' 'x86_64') +url="http://pwmt.org/projects/girara" +license=('custom') +makedepends=('gtk3' 'gtk2') +source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) +md5sums=('f348fbe96ceda4a89142cec92de08d25') + +build() { + true +} + +package_girara-common() { + depends=() + pkgdesc="user interface library - common files" + + cd "$srcdir/girara-$pkgver" + + make clean + + # install header + make DESTDIR="$pkgdir/" install-headers + + # install language files + make DESTDIR="$pkgdir/" -C po install + + # remove pkgconfig files + rm -r $pkgdir/usr/lib/pkgconfig + + # install license + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_girara-gtk2() { + depends=('gtk2' 'girara-common') + provides=('girara') + + cd "$srcdir/girara-$pkgver" + + make clean + make GIRARA_GTK_VERSION=2 + + # install files + make GIRARA_GTK_VERSION=2 DESTDIR="$pkgdir/" install + + # remove common files + rm -r "$pkgdir/usr/include" + rm -r "$pkgdir/usr/share" + + # install license + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_girara-gtk3() { + depends=('gtk3' 'girara-common') + provides=('girara') + + cd "$srcdir/girara-$pkgver" + + make clean + make GIRARA_GTK_VERSION=3 + + # install files + make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install + + # remove common files + rm -r "$pkgdir/usr/include" + rm -r "$pkgdir/usr/share" + + # install license + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-testing/lincity-ng/PKGBUILD b/community-testing/lincity-ng/PKGBUILD new file mode 100644 index 000000000..8f6d046ef --- /dev/null +++ b/community-testing/lincity-ng/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 75765 2012-08-30 21:20:22Z lcarlier $ +# Maintainer: Eric Bélanger <eric@archlinux.org> + +pkgname=lincity-ng +pkgver=2.0 +pkgrel=5.1 +pkgdesc="A city simulation game" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/LinCity-NG" +license=('GPL' 'custom') +depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl') +makedepends=('ftjam' 'mesa') +source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + jam +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + jam -sprefix="${pkgdir}/usr" install + install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt" + install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt" +} diff --git a/community-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD new file mode 100644 index 000000000..09fe4712c --- /dev/null +++ b/community-testing/tmw/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 75740 2012-08-30 16:55:56Z heftig $ +# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> +# Maintainer: Mateusz Herych <heniekk@gmail.com> + +pkgname=tmw +pkgver=0.6.1 +pkgrel=1 +pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." +arch=('i686' 'x86_64') +url="http://themanaworld.org" +license=('GPL') +depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' + 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') +makedepends=('cmake' 'mesa') +#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) +source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver) +md5sums=('b021e368c813fb95bea00bbf02e6d607') + +build() { + cd $srcdir/mana-mana-* + cmake . -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/mana-mana-* + make DESTDIR="$pkgdir" install +} diff --git a/community-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD new file mode 100644 index 000000000..901d43506 --- /dev/null +++ b/community-testing/warmux/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 75742 2012-08-30 16:56:08Z heftig $ +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: pukyxd +# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> + +pkgname=warmux +pkgver=11.04.1 +pkgrel=5 +pkgdesc="A clone of the worms game" +arch=('i686' 'x86_64') +url="http://www.wormux.org/" +license=('GPL') +makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') +replaces=('wormux') +source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + include-zlib.patch + gcc-fix.patch) +md5sums=('26ff65c43a9bb61a3f0529c98b943e35' + 'c8285955e880f80e3c68312715a3061c' + 'ab50d613d3fa3f71262b1d2fc71641b1') + +build() { + cd "${srcdir}/${pkgname}-${pkgver/.1/}" + + # libpng 1.5 fix + patch -Np1 -i ../include-zlib.patch + # gcc fix + patch -Np1 -i ../gcc-fix.patch + + ./configure --prefix=/usr + make +} + +package() { + depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") + + cd "${srcdir}/${pkgname}-${pkgver/.1/}" + + make DESTDIR="${pkgdir}" install + rm -r ${pkgdir}/usr/share/warmux +} diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch new file mode 100644 index 000000000..1ac476b92 --- /dev/null +++ b/community-testing/warmux/gcc-fix.patch @@ -0,0 +1,36 @@ +## i-love-you-lordheavy.patch [diff] +diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp +--- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 +@@ -81,7 +81,7 @@ + } + + // Build an action from a network packet +-Action::Action(const char *buffer, DistantComputer* _creator) ++Action::Action(char *buffer, DistantComputer* _creator) + { + m_creator = _creator; + +diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h +--- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 ++++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 +@@ -168,7 +168,7 @@ + Action(Action_t type, Double value1, Double value2); + + // Build an action from a network packet +- Action(const char* buffer, DistantComputer* _creator); ++ Action(char* buffer, DistantComputer* _creator); + + ~Action(); + +Description: Fix FTBFS with gcc 4.7. +Author: Felix Geyer <debfx-pkg@fobos.de> + +--- warmux-11.04.1+repack.orig/tools/list_games/main.cpp ++++ warmux-11.04.1+repack/tools/list_games/main.cpp +@@ -1,4 +1,5 @@ + #include <stdio.h> ++#include <unistd.h> + #include <WARMUX_types.h> + #include <WARMUX_network.h> + #include <WARMUX_index_server.h> diff --git a/community-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch new file mode 100644 index 000000000..c7e77aba1 --- /dev/null +++ b/community-testing/warmux/include-zlib.patch @@ -0,0 +1,11 @@ +diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp +--- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 ++++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 +@@ -25,6 +25,7 @@ + #include <SDL_image.h> + #include <SDL_rotozoom.h> + #include <png.h> ++#include <zlib.h> + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/community-testing/zathura-djvu/PKGBUILD b/community-testing/zathura-djvu/PKGBUILD new file mode 100644 index 000000000..be797feb3 --- /dev/null +++ b/community-testing/zathura-djvu/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 75779 2012-08-31 00:57:33Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: karnath <karnathtorjian@gmail.com> + +pkgname=zathura-djvu +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Adds DjVu support to zathura by using the djvulibre library" +arch=('i686' 'x86_64') +url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" +license=('custom') +depends=('djvulibre' 'zathura') +source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz") +md5sums=('c3525b43b74bb0777a2b3561f7dcde06') + +build(){ + cd "${srcdir}/$pkgname-$pkgver" + make +} +package(){ + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + diff --git a/community-testing/zathura-pdf-poppler/PKGBUILD b/community-testing/zathura-pdf-poppler/PKGBUILD new file mode 100644 index 000000000..b1320b1cb --- /dev/null +++ b/community-testing/zathura-pdf-poppler/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: karnath <karnathtorjian@gmail.com> + +pkgname=zathura-pdf-poppler +pkgver=0.2.1 +pkgrel=1 +pkgdesc="Adds pdf support to zathura by using the poppler engine" +arch=('i686' 'x86_64') +url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" +license=('custom') +depends=('poppler-glib' 'zathura') +source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") +md5sums=('6f36fe141f8e5e9e8d71eb143eaaa1c1') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + make +} +package(){ + cd "${srcdir}/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-testing/zathura/PKGBUILD b/community-testing/zathura/PKGBUILD new file mode 100644 index 000000000..cd7da39a5 --- /dev/null +++ b/community-testing/zathura/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 75777 2012-08-31 00:57:27Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: ML <neldoreth> + +pkgname=zathura +pkgver=0.2.1 +pkgrel=1 +pkgdesc="a document viewer" +arch=('i686' 'x86_64') +url="http://pwmt.org/projects/zathura/" +license=('custom') +depends=('girara-gtk2' 'cairo' 'sqlite') +makedepends=('python2-docutils') +optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') +install=zathura.install +source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz + bash-completion) +md5sums=('2b606a5db61c80b0f1208e9f1df468c2' + 'cac20c37f0e77ba62a8138788f4ccabb') + +build() { + cd $srcdir/zathura-$pkgver + make ZATHURA_GTK_VERSION=2 +} + +package() { + cd $srcdir/zathura-$pkgver + make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 + install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura +} diff --git a/community-testing/zathura/bash-completion b/community-testing/zathura/bash-completion new file mode 100644 index 000000000..41c3825b6 --- /dev/null +++ b/community-testing/zathura/bash-completion @@ -0,0 +1,29 @@ +_zathura() { + _init_completion || return + + EXTENTIONS='' + for PLUGIN in /usr/lib/zathura/*.so; do + case ${PLUGIN##*/} in + pdf.so) + EXTENTIONS="$EXTENTIONS|pdf" + ;; + ps.so) + EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" + ;; + djvu.so) + EXTENTIONS="$EXTENTIONS|djvu|djv" + ;; + epub.so) + EXTENTIONS="$EXTENTIONS|epub" + ;; + cb.so) + EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" + ;; + *) + ;; + esac + done + + _filedir "${EXTENTIONS#|}" +} && +complete -F _zathura zathura diff --git a/community-testing/zathura/zathura.install b/community-testing/zathura/zathura.install new file mode 100644 index 000000000..f450cf9b8 --- /dev/null +++ b/community-testing/zathura/zathura.install @@ -0,0 +1,13 @@ +post_install() { + which gtk-update-icon-cache >/dev/null && \ + [ -d usr/share/icons/hicolor ] && \ + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD index e4751816e..361d3e90c 100644 --- a/community/apper/PKGBUILD +++ b/community/apper/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74244 2012-07-23 06:20:32Z idevolder $ +# $Id: PKGBUILD 75748 2012-08-30 17:50:49Z idevolder $ # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor: Valeriy Lyasotskiy <onestep@ukr.net> # Contributor: Zom <zom@eevul.org> @@ -6,7 +6,7 @@ pkgname=apper _pkgmainver=0.7 pkgver=0.7.2 -pkgrel=3 +pkgrel=4 pkgdesc="KDE tools for PackageKit" arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/Apper?content=84745" @@ -15,7 +15,7 @@ depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17') makedepends=('cmake' 'automoc4' 'chrpath') install="$pkgname.install" provides=('kpackagekit') -conflicts=('kpackagekit') +conflicts=('kpackagekit' 'gnome-packagekit') replaces=('kpackagekit') source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") sha256sums=('975fede728e7ab96d8e244ae721a2e15ae40b9fb1cd189a1f4afd46c400b219f') diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 9477323b4..14db62c38 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74790 2012-08-05 09:41:39Z giovanni $ +# $Id: PKGBUILD 75753 2012-08-30 21:02:36Z spupykin $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils pkgver=2.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64' 'mips64el') url="http://cxx-gtk-utils.sourceforge.net/" diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index 7d62a91bb..1c08888cc 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69752 2012-04-23 09:14:35Z ibiru $ +# $Id: PKGBUILD 75754 2012-08-30 21:02:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger <m.fellinger@gmail.com> pkgname=couchdb pkgver=1.2.0 -pkgrel=3 +pkgrel=4 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64' 'mips64el') url="http://couchdb.apache.org" @@ -17,18 +17,14 @@ backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc} - "rc-script.patch" "configure-fix.patch") + "rc-script.patch") md5sums=('a5cbbcaac288831b3d8a08b725657f10' '890a85b22219ea113a4901a289c442f8' - '8a3b1a1ff98a6411827ad991db7a355b' - 'fd1669544d08bda09c3318873d51db1e') + '8a3b1a1ff98a6411827ad991db7a355b') build() { cd "$srcdir/apache-$pkgname-$pkgver" - # workaround for FS#26827 - patch -Np1 < $srcdir/configure-fix.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 815214d2f..7d6c53646 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70011 2012-04-28 09:24:04Z allan $ +# $Id: PKGBUILD 75755 2012-08-30 21:02:52Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=freemat pkgver=4.1 -pkgrel=3 +pkgrel=4 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64' 'mips64el') url="http://freemat.sourceforge.net" diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 1a6789832..c95de8618 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72406 2012-06-13 13:47:51Z tdziedzic $ +# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.17 -pkgrel=3 +pkgrel=4 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64' 'mips64el') url="http://hedgewars.org" diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 2c92df1e7..5a1c3ea57 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 73620 2012-07-12 08:51:08Z spupykin $ +# $Id: PKGBUILD 75757 2012-08-30 21:03:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.9.2 -pkgrel=2 +pkgrel=3 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64' 'mips64el') # http://download.kde.org/stable/kdenlive/ diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 1bcf9cf0a..49ec571c1 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69742 2012-04-23 09:08:05Z ibiru $ +# $Id: PKGBUILD 75745 2012-08-30 17:41:15Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver -pkgver=0.9.2 -pkgrel=2 +pkgver=0.9.3 +pkgrel=1 pkgdesc="C/C++ debugger for GNOME" arch=('x86_64' 'i686') license=('GPL') @@ -14,7 +14,7 @@ makedepends=('boost' 'intltool' 'gnome-doc-utils') install=nemiver.install source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!libtool' '!emptydirs') -sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520') +sha256sums=('27b8845e54a61ba597050eb16640aaaf2bf21be3191081c9ddd3a34fc2ae617d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/openscenegraph/PKGBUILD b/community/openscenegraph/PKGBUILD index 068a93971..2cc27e414 100644 --- a/community/openscenegraph/PKGBUILD +++ b/community/openscenegraph/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73482 2012-07-08 09:31:14Z ibiru $ +# $Id: PKGBUILD 75758 2012-08-30 21:03:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Hans Janssen <janserv@gmail.com> # Contributor: my64 <packages@obordes.com> @@ -6,7 +6,7 @@ pkgname=openscenegraph pkgver=3.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="An Open Source, high performance real-time graphics toolkit" arch=('i686' 'x86_64') license=('custom:OSGPL') diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD index e079d256a..22f568893 100644 --- a/community/passenger/PKGBUILD +++ b/community/passenger/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72940 2012-06-25 10:53:59Z spupykin $ +# $Id: PKGBUILD 75759 2012-08-30 21:03:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=passenger -pkgver=3.0.13 +pkgver=3.0.15 pkgrel=1 -_pkgdlnr=76249 +_pkgdlnr=76337 pkgdesc="mod_rails passenger" arch=('i686' 'x86_64' 'mips64el') url="http://www.modrails.com" @@ -14,13 +14,13 @@ makedepends=('apache') install=passenger.install options=('!emptydirs') source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz - build-fix-git-2012-05-17.diff) -md5sums=('1b3a65c77feee86e64891daae66c0c3d' - 'e2d3409bae3676232f411f03abac440c') + build-fix.patch) +md5sums=('532d977eabb4acd5a831b3526ddd8ac4' + 'ee4699596dffb5357fdac4e3b2c98ee1') build(){ cd $srcdir/passenger-$pkgver -# patch -p1 <$srcdir/build-fix-git-2012-05-17.diff + patch -p1 <$srcdir/build-fix.patch ./bin/passenger-install-apache2-module -a rake nginx diff --git a/community/passenger/build-fix.patch b/community/passenger/build-fix.patch new file mode 100644 index 000000000..cdbb78e68 --- /dev/null +++ b/community/passenger/build-fix.patch @@ -0,0 +1,12 @@ +diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp +--- passenger-3.0.15/ext/boost/thread/xtime.hpp 2012-04-16 11:43:52.000000000 +0400 ++++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp 2012-08-29 11:06:02.000000000 +0400 +@@ -18,6 +18,8 @@ + + namespace boost { + ++#undef TIME_UTC ++ + enum xtime_clock_types + { + TIME_UTC=1 diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index 12fcded92..03a001505 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75387 2012-08-21 18:40:56Z bpiotrowski $ +# $Id: PKGBUILD 75760 2012-08-30 21:03:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.6.3 -pkgrel=1 +pkgver=1.6.0 +pkgrel=2 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -26,20 +26,17 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'arch32-config' 'arch32-copyfiles' 'arch32-mount' - 'arch32-nssdatabases' - 'fix-bash-completion.patch') -md5sums=('f6b1badef213ce8e9ef37bb3fc213390' + 'arch32-nssdatabases') +md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195' 'a8d77cac806a0a9adef3f93cdbeb280a' '1e34db5387c4e5de911e15d8a9208bdb' '5a3f7b839c7e0b8933748da7c5b6385b' '06db41d42f9fce5449a28feb76ded556' 'f0d5d5b5e34a860f6f90b5628c680f46' - 'af1da6edd8c8c0dafeeb2c2c4e0c840b' - '5ba775d4f401e2c167414caa548b71e5') + 'af1da6edd8c8c0dafeeb2c2c4e0c840b') build() { cd ${pkgname}-${pkgver} - patch -p1 -i ${srcdir}/fix-bash-completion.patch export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" ./configure \ --prefix=/usr \ diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index c912d1a35..7d3850cfb 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 73075 2012-06-30 11:58:09Z giovanni $ +# $Id: PKGBUILD 75761 2012-08-30 21:03:36Z spupykin $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.5.902 +pkgver=0.5.3 pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/sigil/" license=('GPL3') -depends=('qtwebkit') -makedepends=('cmake' 'gendesk') +depends=('qtwebkit' 'boost-libs') +makedepends=('cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('7e44ce266fc2539888edd0e1ee66b05d') +md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc') build() { cd "${srcdir}" diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD index 86b092245..716576c5a 100644 --- a/community/wt/PKGBUILD +++ b/community/wt/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74507 2012-07-29 20:16:09Z svenstaro $ +# $Id: PKGBUILD 75763 2012-08-30 21:03:49Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Denis Martinez <deuns.martinez@gmail.com> pkgname=wt -pkgver=3.2.2.1 -_pkgver=3.2.2-p1 +pkgver=3.2.2 +_pkgver=3.2.2 pkgrel=2 pkgdesc="a C++ library and application server for developing and deploying web applications" arch=('i686' 'x86_64' 'mips64el') url="http://www.webtoolkit.eu/" license=('GPL') -depends=('boost-libs') -makedepends=('boost' 'cmake>=2.8' +depends=('boost-libs>=1.36') +makedepends=('boost>=1.36' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt') optdepends=('openssl: for SSL support in built-in webserver' 'zlib: for compression in HTTP protocol' @@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver' 'qt: for the Wt/Qt interopability example (wtwithqt)') backup=('etc/wt/wt_config.xml') source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz) -md5sums=('d436430a4f1ae5fbcf038e645e4b5260') +md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa') build() { cd ${srcdir}/${pkgname}-${_pkgver} diff --git a/core/cracklib/PKGBUILD b/core/cracklib/PKGBUILD index 8b0eec86c..b7719fd34 100644 --- a/core/cracklib/PKGBUILD +++ b/core/cracklib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142311 2011-11-08 10:56:31Z tpowa $ +# $Id: PKGBUILD 165794 2012-08-30 15:23:51Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> pkgname=cracklib -pkgver=2.8.18 -pkgrel=2.1 +pkgver=2.8.19 +pkgrel=1 pkgdesc="Password Checking Library" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ url="http://sourceforge.net/projects/cracklib" depends=('glibc' 'zlib') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('79053ad8bc714a44cd660cb12116211b') +md5sums=('ca0ec168d9c6466612204e8dfb2df8a9') build() { cd $srcdir/$pkgname-$pkgver diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index c24a915bd..96385c96b 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157234 2012-04-26 13:06:13Z tpowa $ +# $Id: PKGBUILD 165796 2012-08-30 15:24:19Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.b rpcbind) md5sums=('1a77ddb1aaea8099ab19c351eeb26316' 'c02ac36a98baac70b8a26190524b7b73' - 'd2615f4c0d58f154aab6e294997ac9be' + 'a7b23a32be2eb52d7dec52da36d4eba1' '78a963654f57cbb209e228884767836e') build() { diff --git a/core/rpcbind/rpcbind.service b/core/rpcbind/rpcbind.service index 418ba1e05..3bc764efc 100644 --- a/core/rpcbind/rpcbind.service +++ b/core/rpcbind/rpcbind.service @@ -1,6 +1,8 @@ [Unit] Description=RPC Bind -Requires=network.target +After=network.target +Wants=rpcbind.target +Before=rpcbind.target [Service] Type=forking diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index e0fb25eb2..7b3c73692 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -2,48 +2,37 @@ # Contributor: Tom Gundersen <teg@jklm.no> pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=188 -pkgrel=2 +pkgname=('systemd' 'systemd-sysvcompat') +pkgver=189 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz') + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' + 'pam' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' '0001-Reinstate-TIMEOUT-handling.patch' - 'locale.sh' - 0001-shutdown-recursively-mark-root-as-private-before-piv.patch - 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 'use-split-usr-path.patch') -md5sums=('d89b42699695554949d072ef46c0dfc9' +md5sums=('ac2eb313f5dce79622f60aac56bca66d' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' '5543be25f205f853a21fa5ee68e03f0d' - 'f15956945052bb911e5df81cf5e7e5dc' - '49d145ef3ca299025c085555314212b6' - 'bccb994f4cfbd251b6c34d7d90a6ba0f' '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" - # still waiting on ipw2x00 to get fixed... + # still waiting on ipw2x00, et al to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" - patch -Np1 <"$srcdir/use-split-usr-path.patch" - - # http://bugs.archlinux.org/task/31089 - # upstream c516c8d17f77a1c761447f4c40c8dfffeda2e06d - patch -Np1 <"$srcdir/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch" - # http://bugs.archlinux.org/task/31092 - # upstream 4bfa638d43c05e8db052cd55818765bb3575a405 - patch -Np1 <"$srcdir/0001-shutdown-recursively-mark-root-as-private-before-piv.patch" + # hang onto this until we do the /{,s}bin merge + patch -Np1 <"$srcdir/use-split-usr-path.patch" ./configure \ --libexecdir=/usr/lib \ @@ -53,25 +42,25 @@ build() { --enable-gtk-doc \ --disable-audit \ --disable-ima \ - --with-pamlibdir=/usr/lib/security \ --with-distro=arch \ --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + --with-pci-ids-path=/usr/share/hwdata/pci.ids make } package_systemd() { pkgdesc="system and service manager" - depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' - "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: legacy generator for initialization scripts' + depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' + 'pam' 'util-linux' 'xz') + provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'systemd-tools' 'udev') + optdepends=('initscripts: legacy support for /etc/rc.conf' 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'cryptsetup: required for encrypted block devices') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -80,7 +69,8 @@ package_systemd() { etc/systemd/system.conf etc/systemd/user.conf etc/systemd/logind.conf - etc/systemd/journald.conf) + etc/systemd/journald.conf + etc/udev/udev.conf) install="systemd.install" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install @@ -101,104 +91,13 @@ package_systemd() { rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" - ### get rid of RPM macros - rm -r "$pkgdir/etc/rpm/macros.systemd" + # get rid of RPM macros + rm -r "$pkgdir/etc/rpm" # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. # https://pokersource.info/show_bug.cgi?id=50989 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - ### split off libsystemd (libs, includes, pkgconfig, man3) - rm -rf "$srcdir/_libsystemd" - install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} - cd "$srcdir"/_libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig - - ### split out manpages for sysvcompat - rm -rf "$srcdir/_sysvcompat" - install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ - mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$srcdir"/_sysvcompat/usr/share/man/man8 - - ### split out systemd-tools/udev - rm -rf "$srcdir/_tools" - install -dm755 \ - "$srcdir"/_tools/etc/udev \ - "$srcdir"/_tools/usr/bin \ - "$srcdir"/_tools/usr/include \ - "$srcdir"/_tools/usr/lib/udev \ - "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ - "$srcdir"/_tools/usr/lib/girepository-1.0 \ - "$srcdir"/_tools/usr/share/pkgconfig \ - "$srcdir"/_tools/usr/share/gir-1.0 \ - "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ - "$srcdir"/_tools/usr/share/man/man{1,5,7,8} - - cd "$srcdir/_tools" - mv "$pkgdir"/etc/udev etc - mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc - mv "$pkgdir"/usr/bin/udevadm usr/bin - mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin - mv "$pkgdir"/usr/lib/pkgconfig usr/lib - mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd - mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system - mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants - mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants - mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib - mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib - mv "$pkgdir"/usr/lib/udev usr/lib - mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include - mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib - mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0 usr/share - mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 - mv "$pkgdir"/usr/share/man/man8/{systemd-tmpfiles,udevadm}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man8/systemd-udevd{,.service,{-control,-kernel}.socket}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 - mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 - mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin - mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd -} - -package_systemd-sysvcompat() { - pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') - - mv "$srcdir/_sysvcompat"/* "$pkgdir" - - install -dm755 "$pkgdir/sbin" - for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" - done - - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" - - install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" -} - -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('xz') - - mv "$srcdir/_libsystemd"/* "$pkgdir" -} - -package_systemd-tools() { - pkgdesc='standalone tools from systemd' - url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') - optdepends=('cryptsetup: required for encrypted block devices') - provides=("udev=$pkgver") - conflicts=('udev') - replaces=('udev') - install='systemd-tools.install' - - mv "$srcdir/_tools/"* "$pkgdir" - # the path to udevadm is hardcoded in some places install -d "$pkgdir/sbin" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" @@ -220,8 +119,27 @@ package_systemd-tools() { install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" # XXX: kill off coredump rule until the journal can recover coredumps - # this file needs to come back as part of systemd, not systemd-tools rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit') + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" } # vim: ft=sh syn=sh et diff --git a/core/systemd/systemd.install b/core/systemd/systemd.install index e369f094d..784926e17 100644 --- a/core/systemd/systemd.install +++ b/core/systemd/systemd.install @@ -8,22 +8,14 @@ post_install() { # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service + systemd-machine-id-setup + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd" } post_upgrade() { - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi + systemd-machine-id-setup # getty@tty1.service is no longer enabled by default, but we don't want to break # existing setups. diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 51081072d..ea67c706d 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165455 2012-08-20 08:43:02Z andrea $ +# $Id: PKGBUILD 165807 2012-08-30 18:32:15Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -21,8 +21,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.5.0 -pkgrel=2 +pkgver=2.5.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('bea9b5e9d95691caaba385ef5522a60d') +md5sums=('7bc75d770bfd7ffd5f70386c25970888') build() { mkdir build diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index ff60556ce..e339943bf 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 164788 2012-08-05 11:49:39Z andyrtr $ +# $Id: PKGBUILD 165815 2012-08-30 20:33:31Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.22 +pkgver=3.1.0 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit makedepends=('strace') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7b3db90934c2d410c573e37efce3d579' - '33aab6d202af8d6f8f51cfb9249b6d50') +md5sums=('db88d8fc44e44be4a0a14b24aa204bbf' + 'c3fa5f3bda5ebe7f37cc997717bb8476') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD index 5e351a09d..baa62dbb6 100644 --- a/extra/ifplugd/PKGBUILD +++ b/extra/ifplugd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165779 2012-08-29 20:42:40Z thomas $ +# $Id: PKGBUILD 165791 2012-08-30 09:38:27Z thomas $ # Contributor: Manolis Tzanidakis # Contributor: kevin <kevin@archlinux.org> # Maintainer: pkgname=ifplugd pkgver=0.28 -pkgrel=12 +pkgrel=13 pkgdesc="A daemon which brings up/down network interfaces upon cable insertion/removal." arch=('i686' 'x86_64' 'mips64el') url="http://0pointer.de/lennart/projects/ifplugd" @@ -23,7 +23,7 @@ source=($url/${pkgname}-${pkgver}.tar.gz md5sums=('df6f4bab52f46ffd6eb1f5912d4ccee3' '54eb22844b5aeed161c0b80aa9008570' 'f26dbd7597d9d637f0b2b104b11ab820' - '158bda9014eb35979af9b094feca5fe1' + '1ea9aa64415a5a9e27b84634cd08a7f2' 'f2e8a37af52b79ee0e3c5bcc2470ce10' '3dc2ce45d0e12d155ecc7a5bc9e3ee04') diff --git a/extra/ifplugd/ifplugd b/extra/ifplugd/ifplugd index f6c8db938..354238fe2 100644 --- a/extra/ifplugd/ifplugd +++ b/extra/ifplugd/ifplugd @@ -24,7 +24,7 @@ case $1 in for nic in "${net_ifs[@]}"; do # only start if a PID doesn't already exist - if [[ ! -f /var/run/ifplugd.$nic.pid ]]; + if [[ ! -f /var/run/ifplugd.$nic.pid ]]; then /usr/bin/ifplugd-daemon $nic # use presence of PID file to check for start success diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index c1ba3fe96..f86b0d8bd 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165104 2012-08-11 06:10:43Z eric $ +# $Id: PKGBUILD 165819 2012-08-30 20:53:00Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.9.0 +pkgver=6.7.9.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('531a150014119573a04eed28df6192137f4799bc' +sha1sums=('a22342f53903f2fe6debc099136263412f2b6571' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -25,7 +25,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ --disable-openmp --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ --without-gvc --without-djvu --without-autotrace --without-webp \ --without-jbig --without-fpx --without-dps --without-fftw make @@ -33,7 +33,7 @@ build() { check() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} - make check +# make check } package_imagemagick() { diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 70130c1a1..1b2ec8cfd 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 165281 2012-08-14 20:41:57Z andyrtr $ +# $Id: PKGBUILD 165816 2012-08-30 20:33:39Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.38 +pkgver=2.4.39 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -16,8 +16,8 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('3e5a2f318edaf1eef41e7e6c85aa9596d6f9f8b083ec4d7d6710ffbb8921e7e9' - 'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7' +sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d' + '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch index 6745f4bc4..a8de91d9d 100644 --- a/extra/libdrm/no-pthread-stubs.patch +++ b/extra/libdrm/no-pthread-stubs.patch @@ -62,7 +62,7 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la libdrm_radeon_ladir = $(libdir) - libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined + libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined -libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ +libdrm_radeon_la_LIBADD = ../libdrm.la diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 4940ba1c7..d1f56eda6 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163968 2012-07-23 03:03:08Z allan $ +# $Id: PKGBUILD 165814 2012-08-30 20:33:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -16,10 +16,10 @@ if [ "${_git}" = "true" ]; then else pkgver=8.0.4 fi -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' - 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'udev>=183') + 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'systemd-tools') [[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm') url="http://mesa3d.sourceforge.net" license=('custom') @@ -67,7 +67,6 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ --enable-shared-dricore \ @@ -81,6 +80,7 @@ if [ "${_git}" = "true" ]; then ./configure --prefix=/usr \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --enable-gallium-egl \ + --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -89,7 +89,6 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ --enable-shared-dricore \ @@ -142,12 +141,15 @@ package_libglapi() { } package_libgbm() { - depends=('glibc') + depends=('systemd-tools') pkgdesc="Mesa gbm library" cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" + install -m755 -d ${pkgdir}/usr/{include,lib/gbm} bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + bin/minstall src/gbm/main/gbm.h "${pkgdir}/usr/include/" + bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" + bin/minstall lib/gbm/gbm_gallium_drm.so* "${pkgdir}/usr/lib/gbm/" install -m755 -d "${pkgdir}/usr/lib/pkgconfig" bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" @@ -177,7 +179,7 @@ package_libgles() { } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') + depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'libgbm' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" cd ${srcdir}/?esa-* @@ -228,12 +230,14 @@ package_mesa() { rm -f "${pkgdir}/usr/lib/libEGL"* rm -rf "${pkgdir}/usr/lib/egl" rm -f "${pkgdir}/usr/lib/libOSMesa"* + rm -rf "${pkgdir}/usr/lib/gbm" rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} rm -rf "${pkgdir}/usr/lib/xorg" rm -f "${pkgdir}/usr/include/GL/glew.h" rm -f "${pkgdir}/usr/include/GL/glxew.h" rm -f "${pkgdir}/usr/include/GL/wglew.h" rm -f "${pkgdir}/usr/include/GL/glut.h" + rm -f "${pkgdir}/usr/include/gbm.h" rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} install -m755 -d "${pkgdir}/usr/share/licenses/mesa" @@ -241,7 +245,7 @@ package_mesa() { } package_ati-dri() { - depends=("libgl=${pkgver}") + depends=("libgl=${pkgver}" 'libffi') pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') @@ -251,6 +255,11 @@ package_ati-dri() { # gallium3D driver for r300,r600 make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + # gallium egl drivers + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib/gbm" + bin/minstall lib/gbm/pipe_r{300,600}.so* "${pkgdir}/usr/lib/gbm/" + } package_intel-dri() { @@ -272,8 +281,12 @@ package_nouveau-dri() { } package_svga-dri() { - depends=("mesa=${pkgver}") + depends=("mesa=${pkgver}" 'libffi') pkgdesc="Gallium3D VMware guest GL driver" make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install + # gallium egl driver + cd ${srcdir}/?esa-* + install -m755 -d "${pkgdir}/usr/lib/gbm" + bin/minstall lib/gbm/pipe_vmwgfx.so* "${pkgdir}/usr/lib/gbm/" } diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD index 2eaa31f62..c48bbde13 100644 --- a/extra/watchdog/PKGBUILD +++ b/extra/watchdog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 158941 2012-05-13 14:21:11Z thomas $ +# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=watchdog pkgver=5.12 -pkgrel=1 +pkgrel=2 pkgdesc="Watchdog daemon" arch=(i686 x86_64 'mips64el') url="http://sourceforge.net/projects/watchdog" @@ -15,11 +15,13 @@ backup=(etc/watchdog.conf source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz watchdog.sh watchdog.cf - watchdog-5.12-fix-oom-in-wd_keepalive.patch) + watchdog-5.12-fix-oom-in-wd_keepalive.patch + watchdog.systemd) md5sums=('cea28bea70e54f3625062bc808aef9af' - '854451f554718b55186599faaa8d85f6' + 'f57d33967eb9404dd52e3c4e73795a20' '01c1e2e13f515131180b4ebe9b8b7cc3' - 'c90c2686975b5254f82b3de683f1f442') + 'c90c2686975b5254f82b3de683f1f442' + 'a835ae5cbdbb21c19a468dedb5d734e4') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -29,7 +31,10 @@ build() { --prefix=/usr \ --mandir=/usr/share/man \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var \ + --with-pidfile=/run/watchdog.pid \ + --with-ka_pidfile=/run/wd_keepalive.pid + make } @@ -40,6 +45,7 @@ package() { install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil} install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil} done + install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh index 00d5078a9..54f78454f 100644 --- a/extra/watchdog/watchdog.sh +++ b/extra/watchdog/watchdog.sh @@ -3,7 +3,7 @@ . /etc/rc.conf . /etc/rc.d/functions -PID="$( cat /var/run/watchdog.pid 2>/dev/null )" +PID="$( cat /run/watchdog.pid 2>/dev/null )" [ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog case "$1" in @@ -31,7 +31,7 @@ case "$1" in stat_done fi - rm -f /var/run/watchdog.pid + rm -f /run/watchdog.pid ;; restart) $0 stop diff --git a/extra/watchdog/watchdog.systemd b/extra/watchdog/watchdog.systemd new file mode 100644 index 000000000..57c73fb45 --- /dev/null +++ b/extra/watchdog/watchdog.systemd @@ -0,0 +1,10 @@ +[Unit] +Description=Watchdog Daemon + +[Service] +Type=forking +PIDFile=/run/watchdog.pid +ExecStart=/usr/sbin/watchdog + +[Install] +WantedBy=multi-user.target diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index e6f2e82b8..aebc6cef0 100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> -# Contributor: emulatorman <andre.paulista@adinet.com.uy> +# Maintainer : Márcio Silva <coadde@lavabit.com> +# Maintainer : André Silva <emulatorman@lavabit.com> # Based on firefox-i18n package @@ -10,125 +11,230 @@ # - (optionally) edit PKGBUILD.in # - Run 'make'. It will take care of everything else for you. -_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) +_langpacks=( + af + ak + ar + as + ast + be + bg + bn-BD + bn-IN + br + bs + ca + cs + csb + cy + da + de + el + en-GB + en-US + en-ZA + eo + es-AR + es-CL + es-ES + es-MX + et + eu + fa + ff + fi + fr + fy-NL + ga-IE + gd + gl + gu-IN + he + hi-IN + hr + hu + hy-AM + id + is + it + ja + kk + km + kn + ko + ku + lg + lij + lt + lv + mai + mk + ml + mr + nb-NO + nl + nn-NO + nso + or + pa-IN + pl + pt-BR + pt-PT + rm + ro + ru + si + sk + sl + son + sq + sr + sv-SE + ta-LK + ta + te + th + tr + uk + vi + zh-CN + zh-TW + zu +) -pkgbase='icecat-i18n' -pkgname=($(for lang in ${_langpacks[@]} - do echo icecat-i18n-$lang | tr A-Z a-z - done)) -_pkgver=12.0 -pkgver=12.0 -pkgrel=2 -pkgdesc="Language packs for GNUzilla IceCat." -arch=('any') -license=('MPL') -url="http://www.gnu.org/software/gnuzilla/" -depends=("icecat=${pkgver}") -source=($(for lang in ${_langpacks[@]} - do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi - done)) -noextract=($(for lang in ${_langpacks[@]} - do echo $lang.xpi - done)) +pkgbase=icecat-i18n +pkgname=( + $(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done) +) +_pkgver=14.0 +pkgver=14.0 +pkgrel=1 +pkgdesc='Language packs for GNUzilla IceCat.' +arch=( + any +) +license=( + MPL +) +url=http://www.gnu.org/software/gnuzilla/ +depends=( + ${pkgbase%-i18n}=$pkgver +) +source=( + $(for lang in ${_langpacks[@]} + do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi + done) +) +noextract=( + $(for lang in ${_langpacks[@]} + do echo $lang.xpi + done) +) build() { - cd "${srcdir}" + cd $srcdir } -_path="/usr/lib/icecat/extensions/" +_path=/usr/lib/${pkgbase%-i18n}/extensions/ for lang in ${_langpacks[@]} do eval " package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { - install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' + install -Dm644 $srcdir/$lang.xpi \"\${pkgdir}\"'${_path}langpack-${lang}@firefox.mozilla.org.xpi' } " done -md5sums=('334d06cd9e32b2c3df5129dba4f0f474' - '99954e582ddb9bbd8965e6468e7d9799' - 'a2b777edb9a595b4c427716458ffdeb6' - '2d1796a37f2e927b5939de257dddab4e' - '17589c7d8994d4f62fd95fddc2c0c796' - '27f9d4029dbab73d9f5c6a7c169c1811' - '5d13f0aeb780e4d3693bf62be21e6e11' - 'c47f6aaa0b33261e7277f6d807e88396' - '0d87bb53f0b71634c189eeb3f3d64bc5' - '2ada422bef681cee2bd7e667a9090d6a' - 'fc8bc018c6d41c2fcb883734e37b518a' - '5e9b488cd52a42e235169de3a4b4cea2' - '0b781ce69f571797d3dc1fd5b70d882c' - '5ae943ee2293fd427a0072f1c95dd2e9' - '15d2a2076008efefdb7d031f4d0b1663' - '71a45cefe3b5f45de4ff784ca1a4fe1e' - '98e6f6de8c0184f339cc1b88e31e285b' - '43f9c2a3e9580b6a2adcc36dba4c0755' - 'a12665f7c8e6121e82c6c0be91da3f2a' - '7268181e8190cb62685c365fb99d9102' - '6f60912c53bd21acd99ee11abd5862d9' - '25f2c8a6665f6aef75204b1bcd0c0ff1' - '6e3516383f6eaad4bc1abe5fdd212d26' - 'c76f8a91086735c8252eab0d90e163e6' - '85cf430e36e70713b715fca4e1ac3410' - '60f3573882bbd1dc0ed0f16518660bf9' - '6c51beefb2da7add8c8c635efc2fc565' - 'e2d4d8182716b329249619d227d449f1' - '28facbc470554488b0a722cb0c3d53d3' - '3b167b50c188ef190fbad18077aacc0d' - 'f8edd8921fb8fa24099d1725fc478a2b' - '5b90202d9288d073e5f401b498355c13' - 'ec8478b6e0420484de8d7332bafafac2' - '9d932bc91062a58b0509b5395403c708' - 'bba6d905218c4a2b3d6e289e3ef35186' - 'b32d1ad6e5c8ed52cde0ea351290fd17' - 'd0d1d307c87ec8c8102527944f05887e' - '2605d5226c23205f3c7cd5466059b802' - '2b800c1c729d3b65ae38050bd4c06af1' - '8744ce05e573acefa9f802e53da2aea4' - 'edd3e216b37ee32fd517c2b49e85439a' - 'd9786706c058b1e4acac62f07deac285' - '6377004ddaa6731734696509be6dda53' - 'c73bd01ab8c5a25e234e51082978f7f5' - 'b44a3df07e663803234c72f359d06422' - '81c646a84b4f56d4721bec4013c123bf' - '9b678f5dbb7243b9e5751d04b988b640' - 'c237afb9ed6819a6219383590a8ee448' - 'b27c9236866dd55ee01a6e3929752767' - '8d527119a84f22840a919bc35ed612c0' - '1b51158c8c218544654245c418943c3a' - '1314bbc8cde2babcf6e807f7f958152c' - '59eb9146f16189932d9d5eea536cd8af' - 'a427b45282c6f8f4f1646050e9a93f71' - '618771f03f807603b2efed2760f6004c' - '56ca63d8c797d47fd3b6c094390990d7' - '24bde56465d7ab923fed3e23eca59d42' - 'ff9858a371df54c25f77ea4a5d1091f9' - '6135b885b12ccc64d5c93f385d5c62ad' - 'f98347a6ae9db6faef247373fd5092df' - 'e58f094448b085636c9e9435ef22fb53' - 'ed073cd4a1f3bbdcec1ee56334d8b9d3' - '988a1c279f94941bd4ab3b90cfad0bbe' - 'd8bc3ee80be944051f975a2534651ce1' - 'bd94ef18efe11eeee93a0ff1dc602301' - '20a8381c88b1735c558316936469c1a9' - '064d6f05f7b4c1ce8c5e0f083eccef15' - 'c22c4fb9da7cdee2cb29119e7c4f3696' - '50071d48b92f373713f6f8ee483b6f7d' - '518fbbf3838332da2e561565d29281bf' - '2a5a42ad2110e7e24c967233fdc0dc2c' - 'd21424a551ff625034b6e015f0eddcc4' - '829a1e6fe575e761f97564f68a1859ec' - 'd1047468370b7cbb766ed688107ca879' - '27f3609a99c3be8e59cfc700e251a5d7' - 'c7eb3ef0bedc610065713da9a55e2bf9' - '9125fcb792da1e58f00c43ec5b7bce97' - '5b9dd2a8ac84aace97a6095042ea537b' - '13be748a3331f2a9fac691dec7173aa8' - '0b694233f5385e0e5898d4b64a683bbc' - 'ad037272aabcc3b58fd2141447113905' - '347f53738950c9927b19ec3462840696' - '4fc25f81dd0b744aaaea5705dd36d943' - '5c96e79fc7463907b1c635586c910a71' - '50b1dcbd0eaf9d62b3f9050598298933' - 'c40de39f9502a8789f8301581cad25b4') +sha512sums=( + 765390ba04d88b4b56cebab007f9f593e33c54fe3cd8dbbafdb48171db68e23cd4e1c3d8360f2ef641a537e27f1d6db1aa8a0bdade854d3151359ecab6676af9 + 2b21f849299e7185163ce99e91aa612f64094cdf792bb855eb8836be940c0ef1cdfd33da080a793def714874810b269373f0c80830f42919f967417356efb86f + 86a79b1a785c967d56bb492a1c5867c42ac00832813a72027cc0a51dd940c1020dc7c911109efd9eb4ef1a9d996eea6382cd0a03a6a53e3347f909a28a3a943d + 727e3f44812c9c56620b7871fcffb28ebabef460fc52f483402fae787d90f3f197703e0bbde689a744e1135602b5ee765023402e0d365812e8521f8cf9dd2791 + 06989be3fd8d73f7887dae3bac7b0bdc80c7a11b7e6c8630da0ee4652f0ffbd60e01c049242ab3b61555f84485ce9b2f098c80cf6dba41538442cdc5cbdded9b + bc9e19e9e216df4acb8d9bccae2e0e426ab402998934ad9393cf86a2a81c6d20c7ba622d1f312dd70a62c8659b611421904ba0aa5aa7e3eb7ece5ed578cbdd81 + f12d343a5b5f9f35d3d112f041baa29919bfda8bf4c22353ac899ee65eda438c6a9ed243e7a03fb659aff0f9c448bfa5146807b8d3eafa9dd7b8384d7a0d8124 + 11cedfcd91a550fa1f65d1eca4ebac97ecd7c823e7a41e74f908ae1dc0b36b7cbb0c91c2640de5a0ba61c6820c0101c195bb31482376880025b494b280c7274d + 51f0b5e575f99b718b5ca96416148cced3a2c3fcd512e7135d3062fbc6e3c0ede86cb5bbda4a0bed43f6bd73d5c493a97c5bfbf373a92edb48b4a299b27a4f4d + de166d28ba81758d002712c408eada0ca5955e9b6275bc5f491177496f79f8de9dd5d5cd10cda5bc7671c56d7b5d15e136910d671da58ab1363b4dae769b58c9 + 79c0d107c1c61cd6281e0c545f10389a9968b7f49f27a4ff531c729c608cfff9107430f6d7b323a9f00cd2259ef5787db817b7aaa226272e7347413e0a50be83 + a1f5399254c5ce261468dbf539072371a51796de02331e173f8c44704f95d7784280115f7ba1deb46874caeccdeb925d9fe540dc8b5ada5970df6274a06f3429 + 11a278717f5da5a6d284242863bda3142ba4263946104fdbd86545f741127a368138bd4f7d0bd7bf377795d5d36fc61544b585dc044d5a6ddf93ce077f1e747f + 34a995016f4d7bff5c972bb4ef252a0ddac4f0b36943c7e4f8fbb899827aec307a081a7a30f1cb1fdf8c84af82f8f32675c57c45c39f7e47f21aacb75438be48 + fc5d410a903912f05886c4573a3b199efae22f8c9810a7bfc6acf8b5851b1791d97bd562a9c77204b7cf9091e0731ffe332c640d8693165f69cb934e8d523e04 + ab03d3e5391f806b6733078501d8a767cf2267d126cba284d473de21a7c976e55bd7ba63e3489336232ee9f5a7672b8c436e19adcfc68fe2a69db4e08b6f4b19 + fa55b4a26a346c21f0b98c137c4fabbd7aaaa61de45da89ca26c78044d23be8333f2d0c849ec5a34ff7517a556a979ee98b1ce87f02174fcb695632bbbb5edeb + 1ac410bd9b30d917b77ebac3ba08e25adaa4a20a6a77d13229a0efedca7a3b650777a6ca71675fde69f06137b09150dd2dee89760b93801dcf14b2801e6e5ad8 + 0b37ef6936f78c0384c36be7ad174cb90b5ca55b77128de6cdb6663de191144392728fccabc2baca25cb2d0f1ba69b80598bbf531e18b473a9515b553c1f594c + e2d4d6f1fc470d17dfc35b193c20f23b07dfbe54cad1b4f47d2f534493ea297dbdaf15e6c9b1556049c2db314dde66701a0624ef8af8f85f9cebbbf30f50ab3f + c3874b81b84de34fd9cfbb8b009dd033e57ffc726f7b607d895a917e4eb7ef9770ec0e24e0c41cdcd82f29c8140438101c1d1263ee64fbe0117c6b1510c0ed54 + e06f5da5fd157045be13459635b881cd09c92cc5f56af7d745afbdb52889ff18e23a75475331cc13471d9e7aefe157f43ae83074856d81e4f4ad0a9b275d58a5 + f04c77b037b04bf69929cdd712126b6c08a786d7a66181b3e536ca97c750506963b699dd8c4374fc01a86e694100f3fd9ed15d88ada0ef52364f492c5f61bb16 + f538442bf340e7856522288498de54a28dd0b25f36ad7897d1e444e46e98d17c0e5432c6f40e02c49cacacbe5b6b87a4db0dfec3f79e52df91ef278e15afdd73 + 9154c78adb5ec3d4c5dcb69bd61fb2b9a98a908f3fb6344ca5ba2ac96145ab8e770ad786b2c704f522c9f6cf61fdaf256e309e85bf105bbd83df892840804fca + 5c80bddaf0e51984034aac3d211327f89209673cceee5fc30dc4d9958cf44f564ce7aae995795987885c560a427a0098958fdcbf4534f5c84ec9778a3cd555c5 + 1d8a8a3fe5b2ade77dbd7b6f7fee74cd82452ec4eeee42bcb590b6f919fbccd9d345dc1ac2c171d265882e3583b6826778df73713e23df4c4ca66cfed594971b + 6d060b98e0a1d27b87d2e3b4c038756897af223759a53e3ce31beca9244d27f71610e5bc87ffbc5c53aced569165067ebf07720e33ee2ac27105a981dbc201d4 + 646eaaedec5aca57f26c0e1a8cc415e1607efc72a1f37205c40a22ee38e334ec138851375b0091c5d5ea5d8c5d7a2e2e90422e6aec0ddf6079a46f09696911b0 + a7619e2cd951f2b6c87f54386159fbffe5ef3895b05ac5422c76403b8cfd31b05ce98e3dd1532b79e81629adab828149c7154ba861d0bd4760a24ba74a8f4293 + 06dc48e0368927111fc7b4d3ea86c1a8a3a4b077fe0bddd434cf388c9048d2ea0cbd6184becfb2d02005c2e3ed6351e019a086a705c558a8e1e2df0a2816516f + 5b2120ffe02f469c1b52f0c4d9255619781aeac36e40c8df700707c955118ec298b78474ac2a17cf9d2823f049e9e15596fc58c4cffb5ac07315f9a73f7e2ad3 + c3141419942b85f93b2d6f5643544987f57e2805f1586c40ba91b814876cdf635f2500d350ad2a335cf440405716ed8e212221a7a9140cd8a4c3edee67fd3658 + 5fab16a0210bb6d6bcd18701ec0ff669bf5a971dd9f6953186864e09758ca37283af88c7dfec120cef87b9372bad61ac76d8248dad2bea68ca86b3a6410bc446 + d793679d2b51ecf41c0265e9bd9549d8bdae7d1db2afee631088bbf0aee314f16037840fcef8a1241519b952cdebec7f3eecedf3583ccdb92514d855d8577eb8 + bf658f472d23871cb3b54f9100bf3e935985625b4607330dff318315b9b56eae913c020ec69b0465f6a5cb3ac508e39bc0597e65cc940c20db7a63e3728dd632 + be75a19e56a39b597a88133071ca8f8d8ad2931d9accf47db3370d72c5d0dc9fd1c206f70ba64643a1657198ee930eb8884f36e2f9a2e7dbafb9bcd624c1c993 + b2ba8025736c7c8b40661826908c046e9ba8d61c1f273594d043c56f62dec39ed8e27c428a9444b946c2f638bdf60af5b9c5bd90b578d37dcdd884a9b0766d83 + cb140b72c26eb8e0d150cfac0da9a74932f2764911764d2ba326a6c059547e8e6ad1a5b5f6630b55f8dff1290182672c0c6016cf863b22a0e17524a79c1b835e + 5b6426c3c68ead2e9dd4975d18d671bdead44e455ee2802935fa34d153a9a651af765f25731ff0cd462823c85e60b3ad13b9e4a340c80e5b6435d9cb74545a89 + 03501a4808ba5cb0c9a94b61843a33604fde88d00bac2cc0e141975cef5ccc2ad4de219bcc077b92191fa45ba228dff3920c206add564a4331ccfbe02a8f69db + 5277580baa12169d15396ee08d019f5a1fa4cca86ba52e0e2dd05b0f497599cd5c560638ed502b842328c3e767a0f2bffcb6cfdbeada4d7613ff9f9040bd416f + 6656d0508d65c6e860fe66f5d1180c6040f03ac0579a85dded1f3e2b3d26341be4da8c423029927443ac99dfd52a954aa21f1a06a729ecaa4dca1522ccdd9333 + 4dcc6b8f1305d3b9ee3b6f90a92d169d8c9a3d6aec52b92c320a9cad88fc7c26567a343e201d943c56e721c587d2bbd74bbcfdb29fc0a2691f85e9262fad5dbd + 046b6d47386940892f07a10f564b9bbd0fdf7094a0e1f468f42d4b33514d8122b54a78fd6de09ad442a497eba266ad459733a86eda417c87db91d988c9d1ce2d + 0334bb286b560fa28ce9763868110970043155a24f6fec9b01611639add7b2f98781692d4ef84244d67c91afe477a9b1984aaedcba570ad0169c77d904cf865f + 6dda8b0cd0b5862520812ad2e2d4a5ee7d4be030565dcec55cefb0ff3eb960fb1f18aa52ee437d96890ccc35483d93b4fa684ea042cbb530d038d99770e45760 + 5ba5df20669dd3b337dae8de5f909def9747f4c22c041108ca30398ff59004c4a37dbfe88c243d55af23ef85fbe4509d4a4ddda772626f5170573f89a6f7990b + 9dd8b244130b291d16390fabf3470235892ae2506f7020fb5e1a3dcf142a5f771e3ebc91a6b14036721dd216751764a2d5cd74a6f60db92cdbe62e97f69d6af5 + a64ef951b6f0e23d8407414b9c1a5f5c8eabf89d7680fcbedb5acb70a9ca7e4c3253437e2af23c4287ecb5638587bceed4a87edc990056b26199e8cd9b955275 + 57459b8e13110e89acaa042a3c7bcfdde40c8f5e7fe00277f38960e23a9e750b1a85fba35fff29c8eca0d0d6c2e38a357cc2692a80af70feef8816225a88805b + 33cd4be72524c0d0877760a882c79e47fff8036e455103a2587d2eb694715f081a5c95355a8a536df08da4a62c8872001db2a9a1431fe9803d2267a3e02334e9 + 5e653ab0eb49e89408b51f34a549f0f1ac20868d121f9688f04a53788748b69f7f4628355fb23de6c1f69aefbb244d646debf345bed8f98a9f16f1fbd785f116 + 04bcfcf4683ff0f0596e703ea280d843d42f5e883a7c252518c1cc1953b7a7391b38adcab720a020164fa6adfbdfc8f40255109641880c83815b4b5bdb218378 + 6d550a3a1b4e1c375e6754e0e81e049bb10c04ec87614266123076dbc71b518bac4dc03233c7f8fb022302e1d5f7ed0064efdf6a21a98d17b8b0600b04b540fb + a8a14d0095ed6cb5b6e06f9737cbd7923c4fbce394671e510e275198312144706fa3e3063f4f57a3cd4ec9b08714f8e6b9d01943613b0147502be77647cc9440 + 3fa8938e38ea904b31a086b7cf8221b5ec4aa3c125fab79a9c88e68cc799595117d2199b6fc80e8b7cc1a809e1a10c230a929f420e4ef25bbd04775a0dfd52e1 + 1cb6fca6e8214603b1d60f5c0a187514b002704d33811ce229129a223fd63d55b4aafb1ccd1ed21d003f32b983bff8f785c74b488673edb8a5027f336dfde5d4 + 6566215d680dabf8184ba6edd33ddeeec09d2e2544250e7cf5026c4ea420de6273568056ac403739649d1f2636764459525b847f9d6e21ff860d211bdd3a0eed + 2c085539c1ab882b0370b2112d517b8f1be1f5869560fa5c0242ccc159c01b9f1c770593e72cafa6eecc3e3e623fe33a9901b2e0d576d98c85219122cdb34317 + 1f7e9eb6351e8de6b709c0a31b1cfcbfa108288da5b5b99ea88235e568b84ee0a3eabd8814c5f4b9935caca467f4a8e4531317ba8abf2d6d3121def8682fa961 + fde912f0a7cfac59fad72a56ddfe6c7ff10fc51a53ac5b89229f08f18c4ff689eb15d2980d32433b640f62941e7b38c4bf147b7728c22849fb04da46a13ec707 + e8b4de904e52503028ba50ec96fc4cf151ccae03bf42240c680204fa1794233374db6a4cc3a2e13965c28af2984be9f55288b0a9f522ec0d1ae738829da04b52 + 5bf071de14dce19ef5faa4b0b35a0618eb65093283c22d4da16b45839b6b3cfd4314fb8173f419dd3596b9684fd7c6ca1258098e0b9c4167b1546987c0e93b1e + ba0af0ad267b49e2890e77568882eae7d34846208472bfa3299934ae6d40a9864e39340a8228dd6215988a3238dd59dc84856e0d7cb4375601b0018683e867e7 + 3aac042bc0107e8f5d25009266f61272edbb70cad3dd0e984344738995a2119df247a4664bbd1c2bf9f7f889d0f8cb7039b6e852208f2f0c6040ef8953072cc4 + 8c1621ad105104b6dff50fa769c2504d66ef0d1c716f954ab1eb83742efad48be22ec718d4520a262bc733b42c72ef1a0085d1a1868124c5c18a1b4141b89041 + 1da09d13349b54f21ccaa46c0d96c320ee940af10591755a55e8953187a6159b1e1ebe087e3061888dbdc43ee767ed59259312d10e04f1374c45a715d09935ff + f0430e711a97bc9b0603620ac4a9adf7f63916c5ccdea3db588679df6a36fc4ccf7a17c9f581f7fab679002c50e4f0b8708ae5a2ee9bce4cb1d39bcc2dc05aef + bef2db0771b5f7053366d0a2f4fc9cce96649af1aec497bb5f38b9fd3affa0fc662a194d2f69f8cc49121037350690b6506da6f6659c41bef734089c8c7da784 + b7585ac1320f12915f01359a573eeff3524fbe24a583476f12a18ce16389c00802f4e48ebc2d4ecdb002dbcca97a44ad5721b0445bcfe0dee220f7d90abef4a5 + 59e278a846484b7c57c978b66658031d23dfc297f63bd756f82701b700906f74322de60988cd481a84c48a7d5e828e411e2ca7e4e58f7f695016b6ffbd680af1 + 21dc4bcdece71d8d310e179c010dc6c4b089ab55315ba7c67aee7da5a93b3ffc22f27e0c10087137c594adf1114abdbeda2424d5ee8c4944e6ad2a780d93acfb + bf16ae0501316c61656147bdff8140e9f75bfbc9ee625e791b11531d019a6431d9c9ee4110f2d566ae4f11c8d6d4d035c3ebed1a0f6ee0d98f2ede52bcc91e16 + 32161e5a951c353456564b6b0a203e148986322eccf7169630bda6fe8e3913485d431940595a27ff3e9ed71d3a9f2b2a2fd2835363e5db69a2982273e321186c + 01f6d21908175d58123faa91ec0545a173226052632ef636a3b6ded2b77bd6554532eb94e2a87ae2a64ef62cceacf3fc800360232b11a51cc91dfde4397190d8 + 8f8275d5a4582b524a6dd31ee81afffe1ca8371a87f50cfb663ab397a5906f6ad485b7ed7c49781af9bce82ef5e34f2d3de883ed45a5972ccb187cdbdae9c7c7 + 7183274b7d97652ae635a971dd539d46d16a397eac1f3e51c93c53fb8abfd6eb01cdfd41f7c951847291b033a17e6566ea2b9a629dc5796f012bf1993ca14b40 + b35822f1b09062a9c5b6fa41e036657f68def07a15ee9d5f078d372fdc17bb36fa42f08c1a3ed73bb7eb63d290041f441a580c19ee1f2fe789575aa6361b0293 + c9d05ac24a63799805ebe257c11675c1400a014e0d8c408a02e9b3842ec7bf40922a76120297b6796bba3adff0d2449abe1068085176f0deec0463756e3b5c3d + 28ff49291b5cfc51acd878fee3e2de6693bc060ac8f4b1233d44cd5797bf2815c0a563f07decd38647d384f183fb9f945e1040d77bfde4503320a5af2b91482f + 8a137bc5d30e662a28fb809615ebf480503e278a5882aa81b71260d8c548b73e0401e458a6dc4cf0e9e9a61bbadb72a5d8c4e636d7ce616672bf7f10bd4dc810 + cfa399cf459b2487f260a7287b1ddfcbc8ecde9bda160f6f8036bbff7389a383be5acadbfad092b72cbf7d77d8b053fbe98b3df0ae6f01029b92e78bbbf681ba + 5553b2e0193fe0aa65cc88171b5358949906ee01292bc2b2aaf1bc7c330b703d998901999aa5dd923861886b589411b221ae00fc3323cc3bb23068dd21220601 + 502426fc851b9ce8782a7c73b6024492b8e7a46764eaaf2a3b4fef7546312dde9ae9d6a83619f93c3fa96e85767d0cae668f3f9d4cf16427d9b8e7f55163df41 + 5b48c402f4ac36366d157a30db3c36e0bbbf6f8601a498ef0d7cfac4899ed5a168826caae7427f949cef7c54fada0c4886b5f7b7c9efb933fc246781845d5db4 + e8b0a1580757da961551580dcb83fe5dca1a99e446fc9b0bf302e7eded06f4ad795650743b387c0ce05840f238940e0013019b4b36d9eaff1272057fe2949c0a + b2d8be6934966c477c07f6c7fbe341148b7cdb75aeb51ac0fbe15b72c933a2886454057237ae968a3ce7d3d8b7132b8d9f488dac8e68f6ed451c608c17738f27 +) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index aba495176..c90dc65f6 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): emulatorman <andre.paulista@adinet.com.uy> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> @@ -14,101 +14,95 @@ # the value for 'browser.dictionaries.download.url' in 'libre.patch' _pgo=false - -_pkgname=icecat -pkgver=13.0.1 +pkgname=icecat +pkgver=14.0 pkgrel=2 - -if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi -if $_pgo; then - pkgname+='-pgo' -fi - -pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +arch=(i686 x86_64 mips64el) +license=(GPL2 MPL LGPL) depends=( - 'alsa-lib' - 'dbus-glib' - 'desktop-file-utils' - 'gtk2' - 'hicolor-icon-theme' - 'hunspell' - 'libevent' - 'libnotify' - 'libvpx' - 'libxt' - 'mime-types' - 'mozilla-common' - 'mozilla-searchplugins' - 'nss>=3.13.1' - 'sqlite3' - 'startup-notification' + alsa-lib + dbus-glib + desktop-file-utils + gtk2 + hicolor-icon-theme + hunspell + libevent + libnotify + libvpx + libxt + mime-types + mozilla-common + mozilla-searchplugins + 'nss>=3.13.3' + sqlite3 + startup-notification ) makedepends=( - 'autoconf2.13' - 'diffutils' - 'imagemagick' - 'libidl2' - 'librsvg' - 'libxslt' - 'mesa' - 'pkg-config' - 'python2' - 'unzip' - 'wireless_tools' - 'zip' + autoconf2.13 + diffutils + imagemagick + libidl2 + librsvg + libxslt + mesa + pkg-config + python2 + unzip + wireless_tools + zip +) +optdepends=( + 'wireless_tools: Location detection via available WiFi networks' ) if $_pgo; then - makedepends+=('xorg-server-xvfb') + makedepends+=(xorg-server-xvfb) options=(!ccache) fi - -url="http://www.gnu.org/software/gnuzilla/" -install=icecat.install -source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/${pkgname}-${pkgver}.tar.gz - mozconfig - mozconfig.pgo - xulrunner-copy-stub.patch - libre.patch - icecat.desktop - icecat-safe.desktop - icecat-install-dir.patch - vendor.js - cairo.patch) - -md5sums=('ba249f3e889089dc64615333dd324791' - '3117865902d1a20ab61d75707be9888e' - 'ac29b01c189f20abae2f3eef1618ffc0' - '683c4540ab84c220937feb7d1a1450ee' - 'cd52a6e3f138fa92267600cc53ff4247' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - '268e65c8fcae6152e156c09760a18dfd' - '0d053487907de4376d67d8f499c5502b' - '721c59ffc14f14cb0d3a90b7e84df70e') - -if [ "$_pkgname" != "$pkgname" ]; then - provides+=("$_pkgname") - conflicts+=("$_pkgname") -fi +options=(!emptydirs) +url=http://www.gnu.org/software/gnuzilla/ +install=$pkgname.install +source=( + ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz + mozconfig + mozconfig.pgo + xulrunner-copy-stub.patch + libre.patch + $pkgname.desktop + $pkgname-safe.desktop + $pkgname-install-dir.patch + vendor.js + cairo.patch +) +md5sums=( + 6bb02202cd568e8a4f43239b8f52a4a7 + 3117865902d1a20ab61d75707be9888e + ac29b01c189f20abae2f3eef1618ffc0 + 3009b176cc5f9b1e416b1bf7c45b064b + 72e6bb9ebebe555b4ab961add3df3b27 + e81ad01dbc16ba28bf92ba4b7c309ca7 + d93fe402b87cd000a869e1fd6badc6c9 + b320085e7effa2890a79f4f45760614b + 0d053487907de4376d67d8f499c5502b + c8552d030494443218d88792f4dbbd0f +) build() { - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - mv "$_pkgname-$pkgver" "$srcdir/mozilla-build" - cd "$srcdir/mozilla-build" - - patch -Np1 -i "$srcdir/icecat-install-dir.patch" # install to /usr/lib/$pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix - patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff - patch -Np1 -i "$srcdir/cairo.patch" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + mv $pkgname-$pkgver $srcdir/gnuzilla-build + cd $srcdir/gnuzilla-build + cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig + cat $srcdir/mozconfig.pgo >> .mozconfig fi + patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname + patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix + patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff + patch -Np1 -i $srcdir/cairo.patch # fix cairo + + # Fix for use nspr, sqlite and nss external + sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \ + browser/installer/Makefile.in [ "$CARCH" = "mips64el" ] && echo "ac_add_options --disable-ipc" >> .mozconfig @@ -117,7 +111,7 @@ build() { browser/base/Makefile.in # This is a bug, we should fix it. - if [ "$CARCH" = "mips64el" ]; then + if [ $CARCH = mips64el ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -131,44 +125,43 @@ build() { fi chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export PYTHON=/usr/bin/python2 if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS kill $! || true else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi } package() { - cd "$srcdir/mozilla-build" - make -j1 -f client.mk DESTDIR="$pkgdir" install + cd $srcdir/gnuzilla-build + make -j1 -f client.mk DESTDIR=$pkgdir install - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" + install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref - brandingdir="browser/branding/unofficial" - icondir="$pkgdir/usr/share/icons/hicolor" + brandingdir=browser/branding/unofficial + icondir=$pkgdir/usr/share/icons/hicolor for i in 16x16 32x32 48x48; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" + install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png done - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications" - install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications" + for d in $pkgname $pkgname-safe; do + install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop + done - rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" + rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries + ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation + ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins + ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins # We don't want the development stuff - rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - - # Fix a bug with https-everywhere (duplicate rules) - #rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" + rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl} # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" + ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin } diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch index 981eff883..a1fabee90 100644 --- a/libre/icecat/cairo.patch +++ b/libre/icecat/cairo.patch @@ -1,16 +1,6 @@ -From: Uli Schlachter <psychon@znc.in> -Date: Thu, 17 May 2012 10:51:11 +0200 -Subject: Bug 722975 - Make system cairo work again - ---- - gfx/thebes/gfxPlatform.cpp | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp -index fb06fba..a0edefc 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp -@@ -436,11 +436,9 @@ void SourceBufferDestroy(void *srcBuffer) +@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer) static_cast<SourceSurface*>(srcBuffer)->Release(); } @@ -24,7 +14,7 @@ index fb06fba..a0edefc 100644 origSurf->SetData(&kSourceSurface, NULL, NULL); } -@@ -512,14 +510,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa +@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa imgSurface->Stride(), format); diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch index 6609650da..eb698f307 100644 --- a/libre/icecat/icecat-install-dir.patch +++ b/libre/icecat/icecat-install-dir.patch @@ -1,9 +1,8 @@ -diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk.in ---- icecat-12.0.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500 -+++ icecat-12.0/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500 +--- a/config/autoconf.mk.in ++++ b/config/autoconf.mk.in @@ -74,8 +74,8 @@ mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) @@ -12,9 +11,9 @@ diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk. DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur icecat-12.0.orig/js/src/config/autoconf.mk.in icecat-12.0/js/src/config/autoconf.mk.in ---- icecat-12.0.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500 -+++ icecat-12.0/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500 +diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in +--- a/js/src/config/autoconf.mk.in ++++ b/js/src/config/autoconf.mk.in @@ -60,8 +60,8 @@ datadir = @datadir@ mandir = @mandir@ diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index a4c76b6f5..18dfcc177 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,36 +1,27 @@ -diff -Naur icecat-13.0.1/browser/app/profile/firefox.js icecat-13.0.1-libre/browser/app/profile/firefox.js ---- icecat-13.0.1/browser/app/profile/firefox.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/app/profile/firefox.js 2012-07-17 21:35:32.600229972 -0300 -@@ -65,6 +65,7 @@ +diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -70,6 +70,7 @@ pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); - pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); - pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -@@ -82,7 +83,7 @@ + pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html"); + pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html"); +@@ -87,7 +88,7 @@ pref("extensions.update.autoUpdateDefault", true); // Dictionary download preference -pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "about:blank"); ++pref("browser.dictionaries.download.url","http://www.gnu.org/software/gnuzilla/addons.html"); // The minimum delay in seconds for the timer to fire. // default=2 minutes -@@ -247,7 +248,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); --pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.startup.homepage", "about:home"); - - // 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 -diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js ---- icecat-13.0.1/browser/base/content/abouthome/aboutHome.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js 2012-07-17 23:19:05.593724417 -0300 -@@ -37,104 +37,6 @@ +diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js +--- a/browser/base/content/abouthome/aboutHome.js ++++ b/browser/base/content/abouthome/aboutHome.js +@@ -38,104 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ @@ -135,18 +126,19 @@ diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/b // The process of adding a new default snippet involves: // * add a new entity to aboutHome.dtd // * add a <span/> for it in aboutHome.xhtml -@@ -142,7 +44,7 @@ +@@ -143,7 +45,7 @@ // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" +- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" -, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" ++ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1" +, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2" ]; const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. -diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties ---- icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-17 22:01:56.786224684 -0300 +diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties +--- a/browser/locales/en-US/chrome/browser-region/region.properties ++++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -1,28 +1,28 @@ # Default search engine -browser.search.defaultenginename=Google @@ -183,7 +175,7 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location # for your locale's URL but do not translate them. --browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} +-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} +browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will @@ -210,9 +202,9 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in ---- icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in 2012-07-17 23:34:22.488558721 -0300 +diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +--- a/browser/locales/generic/profile/bookmarks.html.in ++++ b/browser/locales/generic/profile/bookmarks.html.in @@ -11,13 +11,20 @@ <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> <DD>@bookmarks_toolbarfolder_description@ @@ -240,9 +232,9 @@ diff -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in iceca + <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> </DL><p> </DL><p> -diff -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/build/pgo/blueprint/elements.html ---- icecat-13.0.1/build/pgo/blueprint/elements.html 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/build/pgo/blueprint/elements.html 2012-07-17 21:44:48.052812473 -0300 +diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html +--- a/build/pgo/blueprint/elements.html ++++ b/build/pgo/blueprint/elements.html @@ -143,7 +143,7 @@ </p> <p> @@ -252,9 +244,9 @@ diff -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/b </p> <p> <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> -diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul ---- icecat-13.0.1/dom/ipc/test.xul 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/dom/ipc/test.xul 2012-07-17 21:48:08.242020288 -0300 +diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul @@ -294,6 +294,6 @@ oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> </toolbar> @@ -263,9 +255,9 @@ diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul + <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="page" remote="true"/> <label id="messageLog" value="" crop="center"/> </window> -diff -Naur icecat-13.0.1/layout/ipc/test-ipcbrowser.xul icecat-13.0.1-libre/layout/ipc/test-ipcbrowser.xul ---- icecat-13.0.1/layout/ipc/test-ipcbrowser.xul 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/layout/ipc/test-ipcbrowser.xul 2012-07-17 21:48:50.526879514 -0300 +diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul +--- a/layout/ipc/test-ipcbrowser.xul ++++ b/layout/ipc/test-ipcbrowser.xul @@ -69,6 +69,6 @@ label="setViewportScale"/> </toolbar> @@ -274,10 +266,10 @@ diff -Naur icecat-13.0.1/layout/ipc/test-ipcbrowser.xul icecat-13.0.1-libre/layo + <browser type="content" src="https://duckduckgo.com/lite" flex="1" id="content" remote="true"/> </window> -diff -Naur icecat-13.0.1/mobile/android/app/mobile.js icecat-13.0.1-libre/mobile/android/app/mobile.js ---- icecat-13.0.1/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300 -@@ -226,13 +226,13 @@ +diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js +--- a/mobile/android/app/mobile.js ++++ b/mobile/android/app/mobile.js +@@ -230,13 +230,13 @@ /* preferences for the Get Add-ons pane */ pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); @@ -288,28 +280,19 @@ diff -Naur icecat-13.0.1/mobile/android/app/mobile.js icecat-13.0.1-libre/mobile -pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/"); -pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html"); /* preference for the locale picker */ pref("extensions.getLocales.get.url", ""); -@@ -252,7 +252,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="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); -diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties ---- icecat-13.0.1/mobile/locales/en-US/chrome/region.properties 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/mobile/locales/en-US/chrome/region.properties 2012-07-17 22:01:03.952816711 -0300 +diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties +--- a/mobile/locales/en-US/chrome/region.properties ++++ b/mobile/locales/en-US/chrome/region.properties @@ -1,18 +1,18 @@ # Default search engine -browser.search.defaultenginename=Google @@ -331,7 +314,7 @@ diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13 +browser.contentHandlers.types.1.uri=about:blank # Keyword URL (for location bar searches) --keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= +-keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= +keyword.URL=https://duckduckgo.com/lite/?q= # increment this number when anything gets changed in the list below. This will @@ -354,9 +337,9 @@ diff -Naur icecat-13.0.1/mobile/locales/en-US/chrome/region.properties icecat-13 +gecko.handlerService.schemes.mailto.0.uriTemplate=about:blank +gecko.handlerService.schemes.mailto.1.name= +gecko.handlerService.schemes.mailto.1.uriTemplate=about:blank -diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul/app/mobile.js ---- icecat-13.0.1/mobile/xul/app/mobile.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/mobile/xul/app/mobile.js 2012-07-17 22:08:34.513828987 -0300 +diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js +--- a/mobile/xul/app/mobile.js ++++ b/mobile/xul/app/mobile.js @@ -221,13 +221,13 @@ /* preferences for the Get Add-ons pane */ pref("extensions.getAddons.cache.enabled", true); @@ -368,13 +351,13 @@ diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul -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%"); -pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.recommended.url","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.browseURL","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.search.url","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.browseAddons","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.get.url","http://www.gnu.org/s/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html"); /* preference for the locale picker */ pref("extensions.getLocales.get.url", ""); @@ -382,26 +365,26 @@ diff -Naur icecat-13.0.1/mobile/xul/app/mobile.js icecat-13.0.1-libre/mobile/xul 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="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); +-pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); ++pref("keyword.URL","https://duckduckgo.com/lite/?q="); pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); -diff -Naur icecat-13.0.1/modules/libpref/src/init/all.js icecat-13.0.1-libre/modules/libpref/src/init/all.js ---- icecat-13.0.1/modules/libpref/src/init/all.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/modules/libpref/src/init/all.js 2012-07-17 22:16:45.176878991 -0300 -@@ -47,7 +47,7 @@ - // SYNTAX HINTS: dashes are delimiters. Use underscores instead. - // The first character after a period must be alphabetic. +diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js +--- a/modules/libpref/src/init/all.js ++++ b/modules/libpref/src/init/all.js +@@ -52,7 +52,7 @@ + * - Computed values (e.g. 50 * 1024) don't work. + */ --pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", "https://duckduckgo.com/lite/?q="); +-pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); ++pref("keyword.URL","https://duckduckgo.com/lite/?q="); pref("keyword.enabled", false); pref("general.useragent.locale", "chrome://global/locale/intl.properties"); pref("general.useragent.compatMode.firefox", false); -diff -Naur icecat-13.0.1/toolkit/locales/en-US/chrome/global-region/region.properties icecat-13.0.1-libre/toolkit/locales/en-US/chrome/global-region/region.properties ---- icecat-13.0.1/toolkit/locales/en-US/chrome/global-region/region.properties 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/toolkit/locales/en-US/chrome/global-region/region.properties 2012-07-17 21:58:17.176492031 -0300 +diff -Naur a/toolkit/locales/en-US/chrome/global-region/region.properties b/toolkit/locales/en-US/chrome/global-region/region.properties +--- a/toolkit/locales/en-US/chrome/global-region/region.properties ++++ b/toolkit/locales/en-US/chrome/global-region/region.properties @@ -4,10 +4,10 @@ pluginStartupMessage=Starting Plugin for type diff --git a/libre/icecat/xulrunner-copy-stub.patch b/libre/icecat/xulrunner-copy-stub.patch index d69bb4b16..8ccf127df 100644 --- a/libre/icecat/xulrunner-copy-stub.patch +++ b/libre/icecat/xulrunner-copy-stub.patch @@ -1,6 +1,6 @@ ---- icecat-12.0/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 -+++ icecat-12.0/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 -@@ -224,7 +224,7 @@ +--- a/browser/app/Makefile.in ++++ b/browser/app/Makefile.in +@@ -233,7 +233,7 @@ else ifdef LIBXUL_SDK libs:: 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 index 4a0507271..240c3d4e8 100644 --- 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 @@ -41,10 +41,10 @@ index 0e8ccf5..fa46c08 100644 brandBundle.getFormattedString("homePageImport", [appName]);
var oldHomePage = document.getElementById("oldHomePage");
diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index 4bcc1d9..c4db956 100644
+index f030756..23e37ff 100644
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
-@@ -74,7 +74,7 @@
+@@ -42,7 +42,7 @@
#elifdef XP_UNIX
<radio id="chrome" label="&importFromChrome.label;" accesskey="&importFromChrome.accesskey;"/>
#endif
@@ -54,7 +54,7 @@ index 4bcc1d9..c4db956 100644 </radiogroup>
<label id="noSources" hidden="true">&noMigrationSources.label;</label>
diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index 527771f..782b38f 100644
+index d7fec75..d531b83 100644
--- a/browser/components/migration/src/BrowserProfileMigrators.manifest
+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
@@ -63,11 +63,11 @@ index 527771f..782b38f 100644 component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
-contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
+ #ifdef HAS_IE_MIGRATOR
component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
- component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js
diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 8f14f49..8dc175d 100644
+index a6598fe..8f83da8 100644
--- a/browser/components/migration/src/FirefoxProfileMigrator.js
+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
@@ -80,7 +80,7 @@ index 8f14f49..8dc175d 100644 const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 9460e6d..8db6827 100644
+index 0669aa8..19552e3 100644
--- a/browser/components/migration/src/MigrationUtils.jsm
+++ b/browser/components/migration/src/MigrationUtils.jsm
@@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({
@@ -126,10 +126,10 @@ index 744f117..59e5a4c 100644 classDescription: "Profile Migrator",
contractID: "@mozilla.org/toolkit/profile-migrator;1",
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 0b4b776..ce26fbd 100644
+index 21cf405..f3c1a6b 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 @@
+@@ -17,8 +17,6 @@
<!ENTITY importFromSafari.accesskey "S">
<!ENTITY importFromChrome.label "Chrome">
<!ENTITY importFromChrome.accesskey "C">
@@ -139,10 +139,10 @@ index 0b4b776..ce26fbd 100644 <!ENTITY noMigrationSources.label "No programs that contain bookmarks, history or password data could be found.">
diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index f522a66..be26460 100644
+index ab82d85..915f6b8 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
+@@ -8,7 +8,6 @@ profileName_format=%S %S
sourceNameIE=Internet Explorer
sourceNameSafari=Safari
sourceNameChrome=Google Chrome
@@ -150,7 +150,7 @@ index f522a66..be26460 100644 importedBookmarksFolder=From %S
-@@ -18,29 +17,29 @@ importedSafariReadingList=Reading List (From Safari)
+@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari)
2_ie=Cookies
2_safari=Cookies
2_chrome=Cookies
@@ -177,79 +177,72 @@ index f522a66..be26460 100644 32_ie=Favorites
32_safari=Bookmarks
- 32_chrome=Bookmarks
--32_firefox=Bookmarks
-+32_self=Bookmarks
-
+@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari)
64_ie=Other Data
64_safari=Other Data
64_chrome=Other Data
-64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
-diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js
-index 957d4d8..1af3629 100644
---- a/toolkit/content/aboutSupport.js
-+++ b/toolkit/content/aboutSupport.js
-@@ -616,13 +616,13 @@ function populateResetBox() {
- .getService(Ci.nsIToolkitProfileService);
+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+index 697b217..b6e1709 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/resetProfileProgress.xul (resetProfileProgress.xul)
+ * content/global/treeUtils.js (treeUtils.js)
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index dcb4065..09c1146 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -36,13 +36,13 @@ function resetSupported() {
+ 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.
+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
try {
- if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) ||
-- !("@mozilla.org/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";
+- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
+- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ return ("canMigrate" in pm) && pm.canMigrate("self");
++ }
} catch (e) {
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index 84de6cd..3126da6 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -6,6 +6,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+ // Catch exception when there is no selected profile.
+ Cu.reportError(e);
+@@ -53,9 +53,6 @@ function resetSupported() {
+ function getMigratedData() {
+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
- // based on onImportItemsPageShow from migration.js
- function onResetProfileLoad() {
-+<<<<<<< HEAD
- #expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
- #expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
-
-@@ -16,16 +17,22 @@ function onResetProfileLoad() {
- "8_" + MOZ_APP_NAME, // Form History
- "2_" + MOZ_APP_NAME, // Cookies
- ];
-+=======
-+ Components.utils.import("resource:///modules/MigrationUtils.jsm");
-+ const MAX_MIGRATED_TYPES = 16;
-+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
-
- var migratedItems = document.getElementById("migratedItems");
-- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
-- "/locale/migration/migration.properties");
-
- // Loop over possible data to migrate to give the user a list of what will be preserved.
- for (var itemStringName of MIGRATED_TYPES) {
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-
+ // From migration.properties
+ const MIGRATED_TYPES = [
+ 4, // History and Bookmarks
+@@ -68,7 +65,7 @@ function getMigratedData() {
+ let dataTypes = [];
+ for (let itemID of MIGRATED_TYPES) {
try {
- var checkbox = document.createElement("label");
-+<<<<<<< HEAD
- checkbox.setAttribute("value", bundle.GetStringFromName(itemStringName));
-+=======
-+ checkbox.setAttribute("value", MigrationUtils.getLocalizedString(itemID + "_self"));
-+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
- migratedItems.appendChild(checkbox);
+- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
+ dataTypes.push(typeName);
} catch (x) {
// Catch exceptions when the string for a data type doesn't exist.
diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index e941336..5b264af 100644
+index f35c227..7062886 100644
--- a/toolkit/profile/nsIProfileMigrator.idl
+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports
+@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
* @client Toolkit (Startup code)
* @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
*/
@@ -258,7 +251,7 @@ index e941336..5b264af 100644 interface nsIProfileMigrator : nsISupports
{
/**
-@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports
+@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
* @note The startup code ignores COM exceptions thrown from this method.
*/
void migrate(in nsIProfileStartup aStartup, in ACString aKey);
@@ -274,15 +267,15 @@ index e941336..5b264af 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index d2db0e2..45a4b0d 100644
+index e5d3042..6de3390 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3642,7 +3642,7 @@ XREMain::XRE_mainRun()
- if (gDoProfileReset) {
- // Automatically migrate from the current application if we just
- // reset the profile.
-- aKey = MOZ_APP_NAME;
-+ aKey = "self";
+@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun()
+ if (gDoProfileReset) {
+ // Automatically migrate from the current application if we just
+ // reset the profile.
+- aKey = MOZ_APP_NAME;
++ aKey = "self";
+ }
pm->Migrate(&mDirProvider, aKey);
- // Set the new profile as the default after migration.
- rv = SetCurrentProfileAsDefault(mProfileSvc, mProfD);
+ }
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 259413591..59435e71a 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -14,15 +14,15 @@ _pgo=false # We're getting this from Debian Experimental _debname=iceweasel -_debver=14.0.1 -_debrel=2 +_debver=15.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=${_debver}.${_debrel} -pkgrel=2 +pkgrel=1 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -52,8 +52,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" vendor.js shared-libs.patch Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('8e4f3987d37c8e73b168948d0771b872' - '8689c150a4d3a0a688ad2db6044feac6' +md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25' + 'b93090724434e3801375730744e79950' 'eab149c1994ab14392e55af3abb08e80' 'ac29b01c189f20abae2f3eef1618ffc0' 'a485a2b5dc544a8a2bd40c985d2e5813' @@ -61,7 +61,7 @@ md5sums=('8e4f3987d37c8e73b168948d0771b872' 'e529742c0a425648087bc3ce537fe4c5' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93' - '88350bc611361a1ff635f5c960c6d6ee') + 'c52fac65c1e06290a5108b75c31ace79') if [ "$_pkgname" != "$pkgname" ]; then provides+=("$_pkgname=$pkgver") @@ -129,7 +129,7 @@ package() { cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="$pkgdir" install - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" + install -Dm644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/preferences/vendor.js" # I don't even know why we're hitting the objdir, and ConnOS didn't. _brandingdir=debian/branding diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 0eefec6df..cde66e1db 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2012.08.21 +pkgver=2012.09.1 pkgrel=1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('any') @@ -24,10 +24,13 @@ optdepends=('dhcpcd: DHCP network configuration' makedepends=(asciidoc) install=initscripts.install source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig}) -md5sums=('abf911f25417e8fd3c7d787e6f4f1e9e' - '993fd80840cb8d0090e2c93b95a2b71c') package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install + + # moved to filesystem + rm -rf ${pkgdir}/etc/profile.d } +md5sums=('16039aeb4c996194d9466a8c66a06f5a' + '522804c7981c32c3c779964844d64377') diff --git a/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch b/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch new file mode 100644 index 000000000..ce91bbe82 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch @@ -0,0 +1,65 @@ +diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c +index 6c17530..acfe668 100644 +--- a/string/test-strncasecmp.c ++++ b/string/test-strncasecmp.c +@@ -1,5 +1,5 @@ + /* Test and measure strncasecmp functions. +- Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc. ++ Copyright (C) 1999-2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Written by Jakub Jelinek <jakub@redhat.com>, 1999. + +@@ -251,9 +251,9 @@ do_random_tests (void) + } + } + +- ++/* Regression test for BZ #12205 */ + static void +-check1 (void) ++bz12205 (void) + { + static char cp [4096+16] __attribute__ ((aligned(4096))); + static char gotrel[4096] __attribute__ ((aligned(4096))); +@@ -270,6 +270,15 @@ check1 (void) + check_result (impl, s1, s2, n, exp_result); + } + ++/* Regression test for BZ #14195 */ ++static void ++bz14195 (void) ++{ ++ const char *empty_string = ""; ++ FOR_EACH_IMPL (impl, 0) ++ check_result (impl, empty_string, "", 5, 0); ++} ++ + int + test_main (void) + { +@@ -277,7 +286,8 @@ test_main (void) + + test_init (); + +- check1 (); ++ bz12205 (); ++ bz14195 (); + + printf ("%23s", ""); + FOR_EACH_IMPL (impl, 0) +diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +index 5e6321e..9735ad0 100644 +--- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S ++++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S +@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp): + # endif + jne L(neq_sncmp) + test %cl, %cl +- je L(eq) ++ je L(eq_sncmp) + + cmp $1, REM + je L(eq_sncmp) +-- +1.7.3.4 + diff --git a/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch b/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch new file mode 100644 index 000000000..526296325 --- /dev/null +++ b/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch @@ -0,0 +1,389 @@ +diff --git a/stdlib/Makefile b/stdlib/Makefile +index f7811c5..79c9acb 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -68,7 +68,8 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ + tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \ + tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \ + tst-makecontext2 tst-strtod6 tst-unsetenv1 \ +- tst-makecontext3 bug-getcontext bug-fmtmsg1 ++ tst-makecontext3 bug-getcontext bug-fmtmsg1 \ ++ tst-strtod-overflow + + include ../Makeconfig + +diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c +index 2166a08..a8a7ea8 100644 +--- a/stdlib/strtod_l.c ++++ b/stdlib/strtod_l.c +@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **, + #include <math.h> + #include <stdlib.h> + #include <string.h> ++#include <stdint.h> + + /* The gmp headers need some configuration frobs. */ + #define HAVE_ALLOCA 1 +@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **, + #include "longlong.h" + #include "fpioconst.h" + +-#define NDEBUG 1 + #include <assert.h> + + +@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1]; + /* Return a floating point number of the needed type according to the given + multi-precision number after possible rounding. */ + static FLOAT +-round_and_return (mp_limb_t *retval, int exponent, int negative, ++round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + mp_limb_t round_limb, mp_size_t round_bit, int more_bits) + { + if (exponent < MIN_EXP - 1) + { +- mp_size_t shift = MIN_EXP - 1 - exponent; +- +- if (shift > MANT_DIG) ++ if (exponent < MIN_EXP - 1 - MANT_DIG) + { + __set_errno (ERANGE); + return 0.0; + } + ++ mp_size_t shift = MIN_EXP - 1 - exponent; ++ + more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0; + if (shift == MANT_DIG) + /* This is a special case to handle the very seldom case where +@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + __set_errno (ERANGE); + } + ++ if (exponent > MAX_EXP) ++ goto overflow; ++ + if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0 + && (more_bits || (retval[0] & 1) != 0 + || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0)) +@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + } + + if (exponent > MAX_EXP) ++ overflow: + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; + + return MPN2FLOAT (retval, exponent, negative); +@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + factor for the resulting number (see code) multiply by it. */ + static const STRING_TYPE * + str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, +- int *exponent ++ intmax_t *exponent + #ifndef USE_WIDE_CHAR + , const char *decimal, size_t decimal_len, const char *thousands + #endif +@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + cy += __mpn_add_1 (n, n, *nsize, low); + if (cy != 0) + { ++ assert (*nsize < MPNSIZE); + n[*nsize] = cy; + ++(*nsize); + } +@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + } + while (--digcnt > 0); + +- if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB) ++ if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt) + { + low *= _tens_in_limb[*exponent]; + start = _tens_in_limb[cnt + *exponent]; +@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + cy = __mpn_mul_1 (n, n, *nsize, start); + cy += __mpn_add_1 (n, n, *nsize, low); + if (cy != 0) +- n[(*nsize)++] = cy; ++ { ++ assert (*nsize < MPNSIZE); ++ n[(*nsize)++] = cy; ++ } + } + + return str; +@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + { + int negative; /* The sign of the number. */ + MPN_VAR (num); /* MP representation of the number. */ +- int exponent; /* Exponent of the number. */ ++ intmax_t exponent; /* Exponent of the number. */ + + /* Numbers starting `0X' or `0x' have to be processed with base 16. */ + int base = 10; +@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* Points at the character following the integer and fractional digits. */ + const STRING_TYPE *expp; + /* Total number of digit and number of digits in integer part. */ +- int dig_no, int_no, lead_zero; ++ size_t dig_no, int_no, lead_zero; + /* Contains the last character read. */ + CHAR_TYPE c; + +@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + are all or any is really a fractional digit will be decided + later. */ + int_no = dig_no; +- lead_zero = int_no == 0 ? -1 : 0; ++ lead_zero = int_no == 0 ? (size_t) -1 : 0; + + /* Read the fractional digits. A special case are the 'american + style' numbers like `16.' i.e. with decimal point but without +@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c); + lo >= L_('a') && lo <= L_('f'); }))) + { +- if (c != L_('0') && lead_zero == -1) ++ if (c != L_('0') && lead_zero == (size_t) -1) + lead_zero = dig_no - int_no; + ++dig_no; + c = *++cp; + } + } ++ assert (dig_no <= (uintmax_t) INTMAX_MAX); + + /* Remember start of exponent (if any). */ + expp = cp; +@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + + if (c >= L_('0') && c <= L_('9')) + { +- int exp_limit; ++ intmax_t exp_limit; + + /* Get the exponent limit. */ + if (base == 16) +- exp_limit = (exp_negative ? +- -MIN_EXP + MANT_DIG + 4 * int_no : +- MAX_EXP - 4 * int_no + 4 * lead_zero + 3); ++ { ++ if (exp_negative) ++ { ++ assert (int_no <= (uintmax_t) (INTMAX_MAX ++ + MIN_EXP - MANT_DIG) / 4); ++ exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no; ++ } ++ else ++ { ++ if (int_no) ++ { ++ assert (lead_zero == 0 ++ && int_no <= (uintmax_t) INTMAX_MAX / 4); ++ exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3; ++ } ++ else if (lead_zero == (size_t) -1) ++ { ++ /* The number is zero and this limit is ++ arbitrary. */ ++ exp_limit = MAX_EXP + 3; ++ } ++ else ++ { ++ assert (lead_zero ++ <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4); ++ exp_limit = (MAX_EXP ++ + 4 * (intmax_t) lead_zero ++ + 3); ++ } ++ } ++ } + else +- exp_limit = (exp_negative ? +- -MIN_10_EXP + MANT_DIG + int_no : +- MAX_10_EXP - int_no + lead_zero + 1); ++ { ++ if (exp_negative) ++ { ++ assert (int_no ++ <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG)); ++ exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no; ++ } ++ else ++ { ++ if (int_no) ++ { ++ assert (lead_zero == 0 ++ && int_no <= (uintmax_t) INTMAX_MAX); ++ exp_limit = MAX_10_EXP - (intmax_t) int_no + 1; ++ } ++ else if (lead_zero == (size_t) -1) ++ { ++ /* The number is zero and this limit is ++ arbitrary. */ ++ exp_limit = MAX_10_EXP + 1; ++ } ++ else ++ { ++ assert (lead_zero ++ <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1)); ++ exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1; ++ } ++ } ++ } ++ ++ if (exp_limit < 0) ++ exp_limit = 0; + + do + { +- exponent *= 10; +- exponent += c - L_('0'); +- +- if (__builtin_expect (exponent > exp_limit, 0)) ++ if (__builtin_expect ((exponent > exp_limit / 10 ++ || (exponent == exp_limit / 10 ++ && c - L_('0') > exp_limit % 10)), 0)) + /* The exponent is too large/small to represent a valid + number. */ + { +@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* We have to take care for special situation: a joker + might have written "0.0e100000" which is in fact + zero. */ +- if (lead_zero == -1) ++ if (lead_zero == (size_t) -1) + result = negative ? -0.0 : 0.0; + else + { +@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* NOTREACHED */ + } + ++ exponent *= 10; ++ exponent += c - L_('0'); ++ + c = *++cp; + } + while (c >= L_('0') && c <= L_('9')); +@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + } + #endif + startp += lead_zero + decimal_len; +- exponent -= base == 16 ? 4 * lead_zero : lead_zero; ++ assert (lead_zero <= (base == 16 ++ ? (uintmax_t) INTMAX_MAX / 4 ++ : (uintmax_t) INTMAX_MAX)); ++ assert (lead_zero <= (base == 16 ++ ? ((uintmax_t) exponent ++ - (uintmax_t) INTMAX_MIN) / 4 ++ : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN))); ++ exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero; + dig_no -= lead_zero; + } + +@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + } + + /* Adjust the exponent for the bits we are shifting in. */ +- exponent += bits - 1 + (int_no - 1) * 4; ++ assert (int_no <= (uintmax_t) (exponent < 0 ++ ? (INTMAX_MAX - bits + 1) / 4 ++ : (INTMAX_MAX - exponent - bits + 1) / 4)); ++ exponent += bits - 1 + ((intmax_t) int_no - 1) * 4; + + while (--dig_no > 0 && idx >= 0) + { +@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + really integer digits or belong to the fractional part; i.e. we normalize + 123e-2 to 1.23. */ + { +- register int incr = (exponent < 0 ? MAX (-int_no, exponent) +- : MIN (dig_no - int_no, exponent)); ++ register intmax_t incr = (exponent < 0 ++ ? MAX (-(intmax_t) int_no, exponent) ++ : MIN ((intmax_t) dig_no - (intmax_t) int_no, ++ exponent)); + int_no += incr; + exponent -= incr; + } + +- if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0)) ++ if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0)) + { + __set_errno (ERANGE); + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; +@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + digits we should have enough bits for the result. The remaining + decimal digits give us the information that more bits are following. + This can be used while rounding. (Two added as a safety margin.) */ +- if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2) ++ if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2) + { + dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2; + more_bits = 1; +@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + else + more_bits = 0; + +- neg_exp = dig_no - int_no - exponent; ++ neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent; + + /* Construct the denominator. */ + densize = 0; +diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c +new file mode 100644 +index 0000000..668d55b +--- /dev/null ++++ b/stdlib/tst-strtod-overflow.c +@@ -0,0 +1,48 @@ ++/* Test for integer/buffer overflow in strtod. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#define EXPONENT "e-2147483649" ++#define SIZE 214748364 ++ ++static int ++do_test (void) ++{ ++ char *p = malloc (1 + SIZE + sizeof (EXPONENT)); ++ if (p == NULL) ++ { ++ puts ("malloc failed, cannot test for overflow"); ++ return 0; ++ } ++ p[0] = '1'; ++ memset (p + 1, '0', SIZE); ++ memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT)); ++ double d = strtod (p, NULL); ++ if (d != 0) ++ { ++ printf ("strtod returned wrong value: %a\n", d); ++ return 1; ++ } ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +-- +1.7.3.4 + diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD new file mode 100644 index 000000000..0c7057908 --- /dev/null +++ b/pcr/mednafen-server/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgname=mednafen-server +pkgver=0.5.0 +pkgrel=1 +pkgdesc='A server multi-system gaming emulator' +url=http://${pkgname%-server}.sourceforge.net/ +license=( + GPL +) +arch=( + i686 + x86_64 + mips64el +) +source=( + http://downloads.sourceforge.net/project/${pkgname%-server}/Mednafen-Server/$pkgver/$pkgname-$pkgver.tar.gz + ${pkgname}d + $pkgname.service +) +sha512sums=( + 700b2021e5085761b90bb5ee802ff9ccded3cdade76682fe9faa98ebbb0653c9b00baea5baa1c486f850bad606aae33a88e4d9486015babb210648aa0cd4542d + 55cba761db9c10978a5146e4f92ccce2a645e0566d0744e745b36ede56a0332d1cb1f6c8a09df6a1c01320b539f07ccd7073b2d85eca6b340449a1c3b9761407 + cd3d19b789ec7f62c4b8f5fe0f93e7836fab5406a3416434701caf6404cce02c7223dcb8b82bd1e4b00bdcf4df623f0cd44f850a7f79a7be73e04c0804972700 +) + +build() { + cd $srcdir/$pkgname + ./configure --prefix=/usr + make +} + +package() { + cd $srcdir/$pkgname + make DESTDIR=$pkgdir install + install -Dm644 standard.conf $pkgdir/etc/$pkgname/standard.conf + install -Dm644 $srcdir/${pkgname}d $pkgdir/etc/rc.d/$pkgname + install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service +} diff --git a/pcr/mednafen-server/mednafen-server.service b/pcr/mednafen-server/mednafen-server.service new file mode 100644 index 000000000..9ee392432 --- /dev/null +++ b/pcr/mednafen-server/mednafen-server.service @@ -0,0 +1,9 @@ +[Unit] +Description=Mednafen Server Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/mednafen-server /etc/mednafen-server/standard.conf >/var/log/mednafen-server.log 2>/var/log/mednafen-server.log.2 + +[Install] +WantedBy=multi-user.target diff --git a/pcr/mednafen-server/mednafen-serverd b/pcr/mednafen-server/mednafen-serverd new file mode 100755 index 000000000..d6033f6af --- /dev/null +++ b/pcr/mednafen-server/mednafen-serverd @@ -0,0 +1,41 @@ +#!/bin/bash + +# source application-specific settings +MED_ARGS= +[ -f /etc/mednafen-server/standard.conf ] && . /etc/mednafen-server/standard.conf + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/mednafen-server) +case "$1" in + start) + stat_busy "Starting Mednafen Server Daemon" + [ -z "$PID" ] && /usr/bin/mednafen-server ${MED_ARGS} >/var/log/mednafen-server.log 2>/var/log/mednafen-server.log.2 + PID=$(pidof -o %PPID /usr/bin/mednafen-server) + if [ -z "$PID" ]; then + stat_fail + else + add_daemon mednafen-server + stat_done + fi + ;; + stop) + stat_busy "Stopping Mednafen Server Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon mednafen-server + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/mpfr/mpfr-3.1.1-p2.patch b/testing/mpfr/mpfr-3.1.1-p2.patch new file mode 100644 index 000000000..43dfcbfe3 --- /dev/null +++ b/testing/mpfr/mpfr-3.1.1-p2.patch @@ -0,0 +1,405 @@ +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:28:51.000000000 +0000 +@@ -0,0 +1 @@ ++get_decimal64 +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-07-03 15:01:13.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:28:51.000000000 +0000 +@@ -1 +1 @@ +-3.1.1 ++3.1.1-p1 +diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c +--- mpfr-3.1.1-a/src/get_d64.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/get_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -32,6 +32,10 @@ + + #ifdef MPFR_WANT_DECIMAL_FLOATS + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + #ifdef DPD_FORMAT + static int T[1000] = { + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32, +@@ -142,26 +146,14 @@ + static _Decimal64 + get_decimal64_min (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 0; +- x.s.manh = 0; +- x.s.manl = 1; +- return x.d; ++ return negative ? - 1E-398dd : 1E-398dd; + } + + /* construct the decimal64 largest finite number with given sign */ + static _Decimal64 + get_decimal64_max (int negative) + { +- union ieee_double_extract x; +- +- x.s.sig = (negative) ? 1 : 0; +- x.s.exp = 1919; +- x.s.manh = 1048575; /* 2^20-1 */ +- x.s.manl = ~0; +- return x.d; ++ return negative ? - DEC64_MAX : DEC64_MAX; + } + + /* one-to-one conversion: +@@ -334,7 +326,8 @@ + /* the largest decimal64 number is just below 10^(385) < 2^1279 */ + else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */ + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +@@ -354,6 +347,15 @@ + which corresponds to s=[0.]1000...000 and e=-397 */ + if (e < -397) + { ++ if (rnd_mode == MPFR_RNDN && e == -398) ++ { ++ /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal), ++ src should round to +/- 1E-398 in MPFR_RNDN. */ ++ mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA); ++ return e == -398 && s[negative] <= '5' ? ++ get_decimal64_zero (negative) : ++ get_decimal64_min (negative); ++ } + if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN + || (rnd_mode == MPFR_RNDD && negative == 0) + || (rnd_mode == MPFR_RNDU && negative != 0)) +@@ -379,7 +381,8 @@ + which corresponds to s=[0.]9999...999 and e=385 */ + else if (e > 385) + { +- if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0) ++ if (rnd_mode == MPFR_RNDZ ++ || (rnd_mode == MPFR_RNDU && negative != 0) + || (rnd_mode == MPFR_RNDD && negative == 0)) + return get_decimal64_max (negative); + else +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-07-03 15:01:19.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1" ++#define MPFR_VERSION_STRING "3.1.1-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-07-03 15:01:18.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1"; ++ return "3.1.1-p1"; + } +diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c +--- mpfr-3.1.1-a/tests/tget_set_d64.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tget_set_d64.c 2012-08-30 09:28:51.000000000 +0000 +@@ -25,6 +25,10 @@ + #include <stdlib.h> /* for exit */ + #include "mpfr-test.h" + ++#ifndef DEC64_MAX ++# define DEC64_MAX 9.999999999999999E384dd ++#endif ++ + /* #define DEBUG */ + + static void +@@ -149,6 +153,15 @@ + mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ); + mpfr_set (y, x, MPFR_RNDZ); + d = mpfr_get_decimal64 (x, MPFR_RNDU); ++ ASSERT_ALWAYS (d == DEC64_MAX); ++ mpfr_set_ui (x, 0, MPFR_RNDZ); ++ mpfr_set_decimal64 (x, d, MPFR_RNDZ); ++ ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); ++ ++ mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ); ++ mpfr_set (y, x, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDA); ++ ASSERT_ALWAYS (d == -DEC64_MAX); + mpfr_set_ui (x, 0, MPFR_RNDZ); + mpfr_set_decimal64 (x, d, MPFR_RNDZ); + ASSERT_ALWAYS (mpfr_cmp (x, y) == 0); +@@ -225,6 +238,83 @@ + mpfr_clear (x); + } + ++static void ++check_overflow (void) ++{ ++ mpfr_t x; ++ int err = 0, neg, rnd; ++ ++ mpfr_init2 (x, 96); ++ for (neg = 0; neg < 2; neg++) ++ RND_LOOP (rnd) ++ { ++ _Decimal64 d, e; ++ mpfr_rnd_t r = (mpfr_rnd_t) rnd; ++ int sign = neg ? -1 : 1; ++ ++ e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX; ++ /* This tests the binary exponent e > 1279 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 1 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the decimal exponent e > 385 case of get_d64.c */ ++ mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 2 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ /* This tests the last else (-382 <= e <= 385) of get_d64.c */ ++ mpfr_set_decimal64 (x, e, MPFR_RNDA); ++ d = mpfr_get_decimal64 (x, r); ++ if (d != e) ++ { ++ printf ("Error 3 in check_overflow for %s, %s\n", ++ neg ? "negative" : "positive", ++ mpfr_print_rnd_mode (r)); ++ err = 1; ++ } ++ } ++ mpfr_clear (x); ++ if (err) ++ exit (1); ++} ++ ++static void ++check_tiny (void) ++{ ++ mpfr_t x; ++ _Decimal64 d; ++ ++ /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round ++ to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between ++ 0 and 1E-398 is not a representable binary number, so that there ++ are no tests for it. */ ++ mpfr_init2 (x, 128); ++ mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == 1.0E-398dd); ++ mpfr_neg (x, x, MPFR_RNDN); ++ d = mpfr_get_decimal64 (x, MPFR_RNDN); ++ MPFR_ASSERTN (d == -1.0E-398dd); ++ mpfr_clear (x); ++} ++ + int + main (void) + { +@@ -241,6 +331,8 @@ + check_inf_nan (); + check_random (); + check_native (); ++ check_overflow (); ++ check_tiny (); + + tests_end_mpfr (); + return 0; +diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES +--- mpfr-3.1.1-a/PATCHES 2012-08-30 09:35:12.000000000 +0000 ++++ mpfr-3.1.1-b/PATCHES 2012-08-30 09:35:12.000000000 +0000 +@@ -0,0 +1 @@ ++strtofr-ternary-value +diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION +--- mpfr-3.1.1-a/VERSION 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/VERSION 2012-08-30 09:35:12.000000000 +0000 +@@ -1 +1 @@ +-3.1.1-p1 ++3.1.1-p2 +diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h +--- mpfr-3.1.1-a/src/mpfr.h 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/mpfr.h 2012-08-30 09:35:12.000000000 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "3.1.1-p1" ++#define MPFR_VERSION_STRING "3.1.1-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c +--- mpfr-3.1.1-a/src/strtofr.c 2012-07-03 15:01:16.000000000 +0000 ++++ mpfr-3.1.1-b/src/strtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -667,6 +667,20 @@ + /* (z, exp_z) = base^(exp_base-pstr_size) */ + z = result + 2*ysize + 1; + err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize); ++ /* Since we want y/z rounded toward zero, we must get an upper ++ bound of z. If err >= 0, the error on z is bounded by 2^err. */ ++ if (err >= 0) ++ { ++ mp_limb_t cy; ++ unsigned long h = err / GMP_NUMB_BITS; ++ unsigned long l = err - h * GMP_NUMB_BITS; ++ ++ if (h >= ysize) /* not enough precision in z */ ++ goto next_loop; ++ cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l); ++ if (cy != 0) /* the code below requires z on ysize limbs */ ++ goto next_loop; ++ } + exact = exact && (err == -1); + if (err == -2) + goto underflow; /* FIXME: Sure? */ +@@ -730,6 +744,7 @@ + MPFR_RNDN, rnd, MPFR_PREC(x))) + break; + ++ next_loop: + /* update the prec for next loop */ + MPFR_ZIV_NEXT (loop, prec); + } /* loop */ +diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c +--- mpfr-3.1.1-a/src/version.c 2012-08-30 09:28:51.000000000 +0000 ++++ mpfr-3.1.1-b/src/version.c 2012-08-30 09:35:12.000000000 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.1-p1"; ++ return "3.1.1-p2"; + } +diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c +--- mpfr-3.1.1-a/tests/tstrtofr.c 2012-07-03 15:01:24.000000000 +0000 ++++ mpfr-3.1.1-b/tests/tstrtofr.c 2012-08-30 09:35:12.000000000 +0000 +@@ -1105,6 +1105,92 @@ + mpfr_clear (y); + } + ++/* From a bug reported by Joseph S. Myers ++ https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */ ++static void ++bug20120814 (void) ++{ ++ mpfr_exp_t emin = -30, e; ++ mpfr_t x, y; ++ int r; ++ char s[64], *p; ++ ++ mpfr_init2 (x, 2); ++ mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN); ++ mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD); ++ s[0] = s[1]; ++ s[1] = '.'; ++ for (p = s; *p != 0; p++) ; ++ *p = 'e'; ++ sprintf (p + 1, "%d", (int) e - 1); ++ ++ mpfr_init2 (y, 4); ++ r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN); ++ if (r <= 0 || ! mpfr_equal_p (x, y)) ++ { ++ printf ("Error in bug20120814\n"); ++ printf ("mpfr_strtofr failed on string \"%s\"\n", s); ++ printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin); ++ printf ("Got inex = %-6d and y = ", r); ++ mpfr_dump (y); ++ exit (1); ++ } ++ ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ ++static void ++bug20120829 (void) ++{ ++ mpfr_t x1, x2, e; ++ int inex1, inex2, i, r; ++ char s[48] = "1e-1"; ++ ++ mpfr_init2 (e, 128); ++ mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0); ++ ++ inex1 = mpfr_set_si (e, -1, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ ++ for (i = 1; i <= sizeof(s) - 5; i++) ++ { ++ s[3+i] = '0'; ++ s[4+i] = 0; ++ inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ RND_LOOP(r) ++ { ++ mpfr_rnd_t rnd = (mpfr_rnd_t) r; ++ ++ inex1 = mpfr_exp10 (x1, e, rnd); ++ inex1 = SIGN (inex1); ++ inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd); ++ inex2 = SIGN (inex2); ++ /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do: ++ strtofr.c:...: MPFR assertion failed: cy == 0 ++ r8396 is OK. ++ On 64-bit machines, for i = 15, ++ r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0) ++ r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize ++ r8394 and r8396 are OK. ++ */ ++ if (! mpfr_equal_p (x1, x2) || inex1 != inex2) ++ { ++ printf ("Error in bug20120829 for i = %d, rnd = %s\n", ++ i, mpfr_print_rnd_mode (rnd)); ++ printf ("Expected inex = %d, x = ", inex1); ++ mpfr_dump (x1); ++ printf ("Got inex = %d, x = ", inex2); ++ mpfr_dump (x2); ++ exit (1); ++ } ++ } ++ } ++ ++ mpfr_clears (e, x1, x2, (mpfr_ptr) 0); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -1117,6 +1203,8 @@ + check_retval (); + bug20081028 (); + test20100310 (); ++ bug20120814 (); ++ bug20120829 (); + + tests_end_mpfr (); + return 0; diff --git a/testing/perl-sdl/PKGBUILD b/testing/perl-sdl/PKGBUILD new file mode 100644 index 000000000..682be8a60 --- /dev/null +++ b/testing/perl-sdl/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 165797 2012-08-30 16:55:08Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgname=perl-sdl +pkgver=2.540 +pkgrel=2 +pkgdesc="Simple DirectMedia Layer for Perl" +arch=(i686 x86_64) +license=(LGPL) +url="http://sdl.perl.org" +depends=(perl-alien-sdl perl-tie-simple + sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg) +makedepends=('perl-module-build>=0.40') +options=('!emptydirs') +replaces=(sdl_perl) +conflicts=(sdl_perl) +provides=("sdl_perl=$pkgver") +# http://search.cpan.org/dist/SDL/ +_author=JTPALMER +source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz) +md5sums=('1a5d7849cbdfde4982b28458e38ab172') + +build() { + cd SDL-$pkgver + # Perl selects the proper CFLAGS set for binary modules + unset CFLAGS + # install module in vendor directories + perl Build.PL installdirs=vendor + perl Build +} + +check() { + cd SDL-$pkgver + perl Build test || true +} + +package() { + cd SDL-$pkgver + perl Build install destdir="$pkgdir" +} diff --git a/testing/ppp/PKGBUILD b/testing/ppp/PKGBUILD new file mode 100644 index 000000000..d91c4a825 --- /dev/null +++ b/testing/ppp/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 165805 2012-08-30 17:53:10Z thomas $ +# Maintainer: Thomas Baechler <thomas@archlinux.org> +pkgname=ppp +pkgver=2.4.5 +pkgrel=4 +pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking" +arch=(i686 x86_64) +url="http://www.samba.org/ppp/" +license=('custom:GPL/BSD') +groups=('base') +depends=('glibc' 'libpcap>=1.0.0') +backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down}) +source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz + options + pon + poff + ppp + plog + pon.1 + ip-up + ip-down + ip-up.d.dns.sh + ip-down.d.dns.sh + ppp.systemd) +md5sums=('4621bc56167b6953ec4071043fe0ec57' + '7a9259a8f038073eeea7e4552ff1849f' + '48c024f73a80c8b69c4def22f86902cc' + '2d811f8470ccdea3b8c4505a438483e9' + '7561c73b557292d5ba1a9c5dbd270fde' + '86cdaf133f7a79fb464f02d83afc7734' + '44cc662ba9aa61dd9add3ddd4c5ded57' + 'e4beb16ed600b61336d50b2bd2df7cd5' + '2fa0671f40711e69194ccf60979f8b33' + '4a074d74c29625b254a1db720cb87b99' + '8d1be5af8e46393ba6eb273377831e38' + 'fafead5c9d66d0574e6f0a2e5f4d4631') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # fix CFLAGS + # -D_GNU_SOURCE is needed for IPv6 to work apparently + export CFLAGS="$CFLAGS -D_GNU_SOURCE" + sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux + sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux + sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux + sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux + sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux + + # enable active filter + sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux + # enable ipv6 support + sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux + # Enable Microsoft proprietary Callback Control Protocol + sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux + + # Fix build error with recent kernels + rm include/linux/if_pppol2tp.h + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/usr" install + install -D -m644 ../options "${pkgdir}/etc/ppp/options" + install -D -m755 ../ip-up "${pkgdir}/etc/ppp/ip-up" + install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down" + install -d -m755 "${pkgdir}/etc/ppp/ip-up.d" + install -d -m755 "${pkgdir}/etc/ppp/ip-down.d" + install -m755 ../ip-up.d.dns.sh "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh" + install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh" + install -D -m755 ../pon "${pkgdir}/usr/bin/pon" + install -D -m755 ../poff "${pkgdir}/usr/bin/poff" + install -D -m755 ../plog "${pkgdir}/usr/sbin/plog" + install -D -m600 etc.ppp/pap-secrets "${pkgdir}/etc/ppp/pap-secrets" + install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets" + install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp" + install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1" + install -d -m755 "${pkgdir}/etc/ppp/peers" + chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so + install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service +} diff --git a/testing/ppp/ip-down b/testing/ppp/ip-down new file mode 100644 index 000000000..301f3ab9b --- /dev/null +++ b/testing/ppp/ip-down @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd after the connection has ended. +# + +# Execute all scripts in /etc/ppp/ip-up.d/ +for ipdown in /etc/ppp/ip-down.d/*.sh; do + if [ -x $ipdown ]; then + # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam + $ipdown "$@" + fi +done diff --git a/testing/ppp/ip-down.d.dns.sh b/testing/ppp/ip-down.d.dns.sh new file mode 100644 index 000000000..9e19f7d1b --- /dev/null +++ b/testing/ppp/ip-down.d.dns.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf diff --git a/testing/ppp/ip-up b/testing/ppp/ip-up new file mode 100644 index 000000000..20473d73a --- /dev/null +++ b/testing/ppp/ip-up @@ -0,0 +1,12 @@ +#!/bin/sh +# +# This script is run by pppd when there's a successful ppp connection. +# + +# Execute all scripts in /etc/ppp/ip-up.d/ +for ipup in /etc/ppp/ip-up.d/*.sh; do + if [ -x $ipup ]; then + # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam + $ipup "$@" + fi +done diff --git a/testing/ppp/ip-up.d.dns.sh b/testing/ppp/ip-up.d.dns.sh new file mode 100644 index 000000000..f9df543a4 --- /dev/null +++ b/testing/ppp/ip-up.d.dns.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then + [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME} + mv /etc/ppp/resolv.conf /etc/resolv.conf + chmod 644 /etc/resolv.conf +fi diff --git a/testing/ppp/options b/testing/ppp/options new file mode 100644 index 000000000..63691842c --- /dev/null +++ b/testing/ppp/options @@ -0,0 +1,352 @@ +# /etc/ppp/options +# +# Originally created by Jim Knoble <jmknoble@mercury.interpath.net> +# Modified for Debian by alvar Bray <alvar@meiko.co.uk> +# Modified for PPP Server setup by Christoph Lameter <clameter@debian.org> +# Modified for ArchLinux by Manolis Tzanidakis <manolis@archlinux.org> +# +# To quickly see what options are active in this file, use this command: +# egrep -v '#|^ *$' /etc/ppp/options + +# Specify which DNS Servers the incoming Win95 or WinNT Connection should use +# Two Servers can be remotely configured +# ms-dns 192.168.1.1 +# ms-dns 192.168.1.2 + +# Specify which WINS Servers the incoming connection Win95 or WinNT should use +# ms-wins 192.168.1.50 +# ms-wins 192.168.1.51 + +# Run the executable or shell command specified after pppd has +# terminated the link. This script could, for example, issue commands +# to the modem to cause it to hang up if hardware modem control signals +# were not available. +#disconnect "chat -- \d+++\d\c OK ath0 OK" + +# async character map -- 32-bit hex; each bit is a character +# that needs to be escaped for pppd to receive it. 0x00000001 +# represents '\x01', and 0x80000000 represents '\x1f'. +asyncmap 0 + +# Require the peer to authenticate itself before allowing network +# packets to be sent or received. +# Please do not disable this setting. It is expected to be standard in +# future releases of pppd. Use the call option (see manpage) to disable +# authentication for specific peers. +auth + +# Use hardware flow control (i.e. RTS/CTS) to control the flow of data +# on the serial port. +crtscts + +# Use software flow control (i.e. XON/XOFF) to control the flow of data +# on the serial port. +#xonxoff + +# Specifies that certain characters should be escaped on transmission +# (regardless of whether the peer requests them to be escaped with its +# async control character map). The characters to be escaped are +# specified as a list of hex numbers separated by commas. Note that +# almost any character can be specified for the escape option, unlike +# the asyncmap option which only allows control characters to be +# specified. The characters which may not be escaped are those with hex +# values 0x20 - 0x3f or 0x5e. +#escape 11,13,ff + +# Don't use the modem control lines. +#local + +# Specifies that pppd should use a UUCP-style lock on the serial device +# to ensure exclusive access to the device. +lock + +# Don't show the passwords when logging the contents of PAP packets. +# This is the default. +hide-password + +# When logging the contents of PAP packets, this option causes pppd to +# show the password string in the log message. +#show-password + +# Use the modem control lines. On Ultrix, this option implies hardware +# flow control, as for the crtscts option. (This option is not fully +# implemented.) +modem + +# Set the MRU [Maximum Receive Unit] value to <n> for negotiation. pppd +# will ask the peer to send packets of no more than <n> bytes. The +# minimum MRU value is 128. The default MRU value is 1500. A value of +# 296 is recommended for slow links (40 bytes for TCP/IP header + 256 +# bytes of data). +#mru 542 + +# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot" +# notation (e.g. 255.255.255.0). +#netmask 255.255.255.0 + +# Disables the default behaviour when no local IP address is specified, +# which is to determine (if possible) the local IP address from the +# hostname. With this option, the peer will have to supply the local IP +# address during IPCP negotiation (unless it specified explicitly on the +# command line or in an options file). +#noipdefault + +# Enables the "passive" option in the LCP. With this option, pppd will +# attempt to initiate a connection; if no reply is received from the +# peer, pppd will then just wait passively for a valid LCP packet from +# the peer (instead of exiting, as it does without this option). +#passive + +# With this option, pppd will not transmit LCP packets to initiate a +# connection until a valid LCP packet is received from the peer (as for +# the "passive" option with old versions of pppd). +#silent + +# Don't request or allow negotiation of any options for LCP and IPCP +# (use default values). +#-all + +# Disable Address/Control compression negotiation (use default, i.e. +# address/control field disabled). +#-ac + +# Disable asyncmap negotiation (use the default asyncmap, i.e. escape +# all control characters). +#-am + +# Don't fork to become a background process (otherwise pppd will do so +# if a serial device is specified). +#-detach + +# Disable IP address negotiation (with this option, the remote IP +# address must be specified with an option on the command line or in +# an options file). +#-ip + +# Disable IPCP negotiation and IP communication. This option should +# only be required if the peer is buggy and gets confused by requests +# from pppd for IPCP negotiation. +#noip + +# Disable magic number negotiation. With this option, pppd cannot +# detect a looped-back line. +#-mn + +# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e. +# 1500). +#-mru + +# Disable protocol field compression negotiation (use default, i.e. +# protocol field compression disabled). +#-pc + +# Require the peer to authenticate itself using PAP. +#+pap + +# Don't agree to authenticate using PAP. +#-pap + +# Require the peer to authenticate itself using CHAP [Cryptographic +# Handshake Authentication Protocol] authentication. +#+chap + +# Don't agree to authenticate using CHAP. +#-chap + +# Disable negotiation of Van Jacobson style IP header compression (use +# default, i.e. no compression). +#-vj + +# Increase debugging level (same as -d). If this option is given, pppd +# will log the contents of all control packets sent or received in a +# readable form. The packets are logged through syslog with facility +# daemon and level debug. This information can be directed to a file by +# setting up /etc/syslog.conf appropriately (see syslog.conf(5)). (If +# pppd is compiled with extra debugging enabled, it will log messages +# using facility local2 instead of daemon). +#debug + +# Append the domain name <d> to the local host name for authentication +# purposes. For example, if gethostname() returns the name porsche, +# but the fully qualified domain name is porsche.Quotron.COM, you would +# use the domain option to set the domain name to Quotron.COM. +#domain <d> + +# Enable debugging code in the kernel-level PPP driver. The argument n +# is a number which is the sum of the following values: 1 to enable +# general debug messages, 2 to request that the contents of received +# packets be printed, and 4 to request that the contents of transmitted +# packets be printed. +#kdebug n + +# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer +# requests a smaller value via MRU negotiation, pppd will request that +# the kernel networking code send data packets of no more than n bytes +# through the PPP network interface. +#mtu <n> + +# Set the name of the local system for authentication purposes to <n>. +# This is a privileged option. With this option, pppd will use lines in the +# secrets files which have <n> as the second field when looking for a +# secret to use in authenticating the peer. In addition, unless overridden +# with the user option, <n> will be used as the name to send to the peer +# when authenticating the local system to the peer. (Note that pppd does +# not append the domain name to <n>.) +#name <n> + +# Enforce the use of the hostname as the name of the local system for +# authentication purposes (overrides the name option). +#usehostname + +# Set the assumed name of the remote system for authentication purposes +# to <n>. +#remotename <n> + +# Add an entry to this system's ARP [Address Resolution Protocol] +# table with the IP address of the peer and the Ethernet address of this +# system. +proxyarp + +# Use the system password database for authenticating the peer using +# PAP. Note: mgetty already provides this option. If this is specified +# then dialin from users using a script under Linux to fire up ppp wont work. +# login + +# If this option is given, pppd will send an LCP echo-request frame to the +# peer every n seconds. Normally the peer should respond to the echo-request +# by sending an echo-reply. This option can be used with the +# lcp-echo-failure option to detect that the peer is no longer connected. +lcp-echo-interval 30 + +# If this option is given, pppd will presume the peer to be dead if n +# LCP echo-requests are sent without receiving a valid LCP echo-reply. +# If this happens, pppd will terminate the connection. Use of this +# option requires a non-zero value for the lcp-echo-interval parameter. +# This option can be used to enable pppd to terminate after the physical +# connection has been broken (e.g., the modem has hung up) in +# situations where no hardware modem control lines are available. +lcp-echo-failure 4 + +# Set the LCP restart interval (retransmission timeout) to <n> seconds +# (default 3). +#lcp-restart <n> + +# Set the maximum number of LCP terminate-request transmissions to <n> +# (default 3). +#lcp-max-terminate <n> + +# Set the maximum number of LCP configure-request transmissions to <n> +# (default 10). +#lcp-max-configure <n> + +# Set the maximum number of LCP configure-NAKs returned before starting +# to send configure-Rejects instead to <n> (default 10). +#lcp-max-failure <n> + +# Set the IPCP restart interval (retransmission timeout) to <n> +# seconds (default 3). +#ipcp-restart <n> + +# Set the maximum number of IPCP terminate-request transmissions to <n> +# (default 3). +#ipcp-max-terminate <n> + +# Set the maximum number of IPCP configure-request transmissions to <n> +# (default 10). +#ipcp-max-configure <n> + +# Set the maximum number of IPCP configure-NAKs returned before starting +# to send configure-Rejects instead to <n> (default 10). +#ipcp-max-failure <n> + +# Set the PAP restart interval (retransmission timeout) to <n> seconds +# (default 3). +#pap-restart <n> + +# Set the maximum number of PAP authenticate-request transmissions to +# <n> (default 10). +#pap-max-authreq <n> + +# Set the maximum time that pppd will wait for the peer to authenticate +# itself with PAP to <n> seconds (0 means no limit). +#pap-timeout <n> + +# Set the CHAP restart interval (retransmission timeout for +# challenges) to <n> seconds (default 3). +#chap-restart <n> + +# Set the maximum number of CHAP challenge transmissions to <n> +# (default 10). +#chap-max-challenge + +# If this option is given, pppd will rechallenge the peer every <n> +# seconds. +#chap-interval <n> + +# With this option, pppd will accept the peer's idea of our local IP +# address, even if the local IP address was specified in an option. +#ipcp-accept-local + +# With this option, pppd will accept the peer's idea of its (remote) IP +# address, even if the remote IP address was specified in an option. +#ipcp-accept-remote + +# Disable the IPXCP and IPX protocols. +# To let pppd pass IPX packets comment this out --- you'll probably also +# want to install ipxripd, and have the Internal IPX Network option enabled +# in your kernel. /usr/doc/HOWTO/IPX-HOWTO.gz contains more info. +noipx + +# Exit once a connection has been made and terminated. This is the default, +# unless the `persist' or `demand' option has been specified. +#nopersist + +# Do not exit after a connection is terminated; instead try to reopen +# the connection. +#persist + +# Terminate after n consecutive failed connection attempts. +# A value of 0 means no limit. The default value is 10. +#maxfail <n> + +# Initiate the link only on demand, i.e. when data traffic is present. +# With this option, the remote IP address must be specified by the user on +# the command line or in an options file. Pppd will initially configure +# the interface and enable it for IP traffic without connecting to the peer. +# When traffic is available, pppd will connect to the peer and perform +# negotiation, authentication, etc. When this is completed, pppd will +# commence passing data packets (i.e., IP packets) across the link. +#demand + +# Specifies that pppd should disconnect if the link is idle for <n> seconds. +# The link is idle when no data packets (i.e. IP packets) are being sent or +# received. Note: it is not advisable to use this option with the persist +# option without the demand option. If the active-filter option is given, +# data packets which are rejected by the specified activity filter also +# count as the link being idle. +#idle <n> + +# Specifies how many seconds to wait before re-initiating the link after +# it terminates. This option only has any effect if the persist or demand +# option is used. The holdoff period is not applied if the link was +# terminated because it was idle. +#holdoff <n> + +# Wait for up n milliseconds after the connect script finishes for a valid +# PPP packet from the peer. At the end of this time, or when a valid PPP +# packet is received from the peer, pppd will commence negotiation by +# sending its first LCP packet. The default value is 1000 (1 second). +# This wait period only applies if the connect or pty option is used. +#connect-delay <n> + +# Packet filtering: for more information, see pppd(8) +# Any packets matching the filter expression will be interpreted as link +# activity, and will cause a "demand" connection to be activated, and reset +# the idle connection timer. (idle option) +# The filter expression is akin to that of tcpdump(1) +#active-filter <filter-expression> + +# uncomment the line below this if you use PPPoE +#plugin /usr/lib/pppd/plugins/pppoe.so + +# ---<End of File>--- diff --git a/testing/ppp/plog b/testing/ppp/plog new file mode 100644 index 000000000..84d2c7340 --- /dev/null +++ b/testing/ppp/plog @@ -0,0 +1,7 @@ +#!/bin/sh + +if [ -s /var/log/ppp.log ]; then + exec tail "$@" /var/log/ppp.log +else + exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\[' +fi diff --git a/testing/ppp/poff b/testing/ppp/poff new file mode 100644 index 000000000..8b4dffc59 --- /dev/null +++ b/testing/ppp/poff @@ -0,0 +1,103 @@ +#!/bin/sh + +# Written by John Hasler <john@dhh.gt.org> and based on work +# by Phil Hands <phil@hands.com>. Distributed under the GNU GPL + +if [ -x /usr/bin/kill ]; then + KILL="/usr/bin/kill" +else + KILL="/bin/kill" +fi +SIG=TERM +DONE="stopped" +MODE="" + +usage () +{ + cat <<!EOF! +usage: $0 [option] [provider] +options: + -r Cause pppd to drop the line and redial. + -d Toggle the state of pppd's debug option. + -c Cause pppd to renegotiate compression. + -a Stop all pppd's. 'provider' will be ignored. + -h Print this help summary and exit. + -v Print version and exit. + none Stop pppd. + +Options may not be combined. + +If 'provider' is omitted pppd will be stopped or signalled if and only if +there is exactly one running unless the '-a' option was given. If +'provider' is supplied the pppd controlling the connection to that +provider will be stopped or signalled. +!EOF! +} + +# Get option. If there are none replace the "?" that getopts puts in +# FLAG on error with "null". +getopts rdcavh FLAG +if [ "$?" -ne 0 ]; then + FLAG="null" +fi + +# Check for additional options. Should be none. +getopts :rdcavh DUMMY +if [ "$?" -eq 0 ]; then + echo "$0: Illegal option -- ${OPTARG}." + exit 1 +fi + +case $FLAG in + "r") SIG=HUP; DONE=signalled; shift ;; + "d") SIG=USR1; DONE=signalled; shift ;; + "c") SIG=USR2; DONE=signalled; shift ;; + "a") MODE="all"; shift ;; + "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;; + "h") usage; exit 0 ;; + "?") exit 1; +esac + +# Get the PIDs of all the pppds running. Could also get these from +# /var/run, but pppd doesn't create .pid files until ppp is up. +PIDS=`pidof pppd` + +# poff is pointless if pppd isn't running. +if test -z "$PIDS"; then + echo "$0: No pppd is running. None ${DONE}." + exit 1 +fi + +# Find out how many pppd's are running. +N=`echo "$PIDS" | wc -w` + +# If there are no arguments we can't do anything if there is more than one +# pppd running. +if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then + echo "$0: More than one pppd running and no "-a" option and +no arguments supplied. Nothing ${DONE}." + exit 1 +fi + +# If either there are no arguments or '-a' was specified kill all the +# pppd's. +if test "$#" -eq 0 -o "$MODE" = "all" ; then + $KILL -$SIG $PIDS || { + echo "$0: $KILL failed. None ${DONE}." + exit 1 + } + exit 0 +fi + +# There is an argument, so kill the pppd started on that provider. +PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'` +if test -n "$PID" ; then + $KILL -$SIG $PID || { + echo "$0: $KILL failed. None ${DONE}." + exit 1 + } +else + echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}." + exit 1 +fi +exit 0 diff --git a/testing/ppp/pon b/testing/ppp/pon new file mode 100644 index 000000000..36885050b --- /dev/null +++ b/testing/ppp/pon @@ -0,0 +1,32 @@ +#!/bin/sh + +case "$1" in + -*) echo " +Usage: pon [provider] [arguments] + +If you specify one argument, a PPP connection will be started using +settings from the appropriate file in the /etc/ppp/peers/ directory, and +any additional arguments supplied will be passed as extra arguments to +pppd. +" + exit 0 + ;; +esac + +if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then + echo " +Please configure /etc/ppp/peers/provider or use a command line argument to +use another file in /etc/ppp/peers/ directory. +" + exit 1 +fi + +if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then + echo " +The file /etc/ppp/peers/$1 does not exist. +" + exit 1 +fi + +exec /usr/sbin/pppd call ${@:-provider} + diff --git a/testing/ppp/pon.1 b/testing/ppp/pon.1 new file mode 100644 index 000000000..bb3220564 --- /dev/null +++ b/testing/ppp/pon.1 @@ -0,0 +1,121 @@ +.\" This manual is published under the GPL. +.\" All guidelines specified in the GPL apply here. +.\" To get an ascii file: +.\" groff -man -Tascii pon.1 > pon.txt +.\" +.TH PON 1 "July 2000" "Debian Project" "Debian PPPD" +.SH NAME +pon, poff, plog \- starts up, shuts down or lists the log of PPP connections +.SH SYNOPSIS +.B pon +[ isp-name [ options ] ] +.br +.B poff +[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ] +.br +.B plog +[ arguments ] +.SH DESCRIPTION +This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP +scripts, which allow users to control PPP connections. +.. +.SS pon +\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP +file, if it exists and is executable. Otherwise, a PPP connection will be +started using configuration from \fI/etc/ppp/peers/provider\fP. +This is the default behaviour unless an \fBisp-name\fP argument is given. +.PP +For instance, to use ISP configuration "myisp" run: +.IP +pon myisp +.PP +\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP. +You can pass additional \fBoptions\fP after the ISP name, too. +\fBpon\fP can be used to run multiple, simultaneous PPP connections. +.. +.SS poff +\fBpoff\fP closes a PPP connection. If more than one PPP connection exists, +the one named in the argument to \fBpoff\fP will be killed, e.g. +.IP +poff myprovider2 +.PP +will terminate the connection to myprovider2, and leave the PPP connections +to e.g. "myprovider1" or "myprovider3" up and running. +.PP +\fBpoff\fP takes the following command line options: +.RS +.TP +.B "\-r" +causes the connection to be redialed after it is dropped. +.TP +.B "\-d" +toggles the state of pppd's debug option. +.TP +.B "\-c" +causes +.BR pppd (8) +to renegotiate compression. +.TP +.B "\-a" +stops all running ppp connections. If the argument \fBisp-name\fP +is given it will be ignored. +.TP +.B "\-h" +displays help information. +.TP +.B "\-v" +prints the version and exits. +.PP +If no argument is given, \fBpoff\fP will stop or signal pppd if and only +if there is exactly one running. If more than one connection is active, +it will exit with an error code of 1. +.. +.SS plog +\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that +file doesn't exist, it shows you the last few lines of your +\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd. +This script makes use of the +.BR tail (1) +command, so arguments that can be passed to +.BR tail (1) +can also be passed to \fBplog\fP. +.PP +Note: the \fBplog\fP script can only be used by root or another system +administrator in group "adm", due to security reasons. Also, to have all +pppd-generated information in one logfile, that plog can show, you need the +following line in your \fI/etc/syslog.conf\fP file: +.PP +local2.* -/var/log/ppp.log +.RE +.SH FILES +.TP +.I /etc/ppp/options +PPPd system options file. +.TP +.I /etc/ppp/pap-secrets +System PAP passwords file. +.TP +.I /etc/ppp/chap-secrets +System CHAP passwords file. +.TP +.I /etc/ppp/peers/ +Directory holding the peer options files. The default file is called +\fIprovider\fP. +.TP +.I /etc/chatscripts/provider +The chat script invoked from the default \fI/etc/ppp/peers/provider\fP. +.TP +.I /var/log/ppp.log +The default PPP log file. +.SH AUTHORS +The p-commands were written by Christoph Lameter <clameter@debian.org>. +Updated and revised by Philip Hands <phil@hands.com>. +.br +This manual was written by Othmar Pasteka <othmar@tron.at>. Modified +by Rob Levin <lilo@openprojects.net>, with some extensions taken from +the old p-commands manual written by John Hasler <jhasler@debian.org>. +.SH "SEE ALSO" +.BR pppd (8), +.BR chat (8), +.BR tail (1). + diff --git a/testing/ppp/ppp b/testing/ppp/ppp new file mode 100644 index 000000000..16e01bad7 --- /dev/null +++ b/testing/ppp/ppp @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/pppd` +case "$1" in + start) + stat_busy "Starting PPP daemon" + [ -z "$PID" ] && /usr/bin/pon + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon ppp + stat_done + fi + ;; + stop) + stat_busy "Stopping PPP daemon" + [ ! -z "$PID" ] && poff -a &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ppp + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/ppp/ppp.systemd b/testing/ppp/ppp.systemd new file mode 100644 index 000000000..a5c490a73 --- /dev/null +++ b/testing/ppp/ppp.systemd @@ -0,0 +1,9 @@ +[Unit] +Description=PPP link to %I +Before=network.target + +[Service] +ExecStart=/usr/sbin/pppd call %I nodetach + +[Install] +WantedBy=multi-user.target diff --git a/testing/sdl_gfx/PKGBUILD b/testing/sdl_gfx/PKGBUILD new file mode 100644 index 000000000..3a6b7c442 --- /dev/null +++ b/testing/sdl_gfx/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 165798 2012-08-30 16:55:11Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgname=sdl_gfx +pkgver=2.0.24 +pkgrel=1 +pkgdesc="SDL Graphic Primitives" +arch=('i686' 'x86_64') +license=('LGPL') +options=(!libtool) +url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" +source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz) +depends=('sdl') +md5sums=('838514185ff9a3b6377760aaa52fef8a') + +build() { + cd SDL_gfx-${pkgver} + + if [ "${CARCH}" == "x86_64" ]; then + ./configure --prefix=/usr --disable-mmx + else + ./configure --prefix=/usr + fi + + make +} + +package() { + cd SDL_gfx-${pkgver} + make DESTDIR=${pkgdir} install +} |