diff options
author | Shackra Sislock <jorgean@lavabit.com> | 2013-07-12 22:33:07 -0600 |
---|---|---|
committer | Shackra Sislock <jorgean@lavabit.com> | 2013-07-12 22:33:07 -0600 |
commit | 4e2b38c122e49c912ecaa01d1192a0aadd84a808 (patch) | |
tree | f40e1a1f25f9f88fb3eff162ececb59d64dca5e7 /libre | |
parent | 6a5cf0fdeb0c73e7e632fe3ea592b0d6d5acfba3 (diff) | |
parent | e5833d0cd005aaad3d384af45f315d914554d959 (diff) |
merging branches
Diffstat (limited to 'libre')
24 files changed, 297 insertions, 991 deletions
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD new file mode 100644 index 000000000..21bde2beb --- /dev/null +++ b/libre/angband-libre/PKGBUILD @@ -0,0 +1,56 @@ +# Maintainer: Israfel <israfel@lavabit.com> +# Original Maintainer: schuay <jakob.gruber@gmail.com> +# Original Maintainer: Mike Sampson <mike at sambodata dot com> +# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: KillaB <xGenoBlast@gmail.com> +# Contributor: Callan Barrett <wizzomafizzo@gmail.com> +# Contributor: Christian Schmidt <xmucknertx@googlemail.com> +# Contributor: Sebastian Sareyko <public@nooms.de> + +_pkgname=angband +pkgname=angband-libre +pkgver=3.4.1 +pkgrel=1 +pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree sound effects" +arch=('i686' 'x86_64') +url="http://rephial.org/" +license=('GPL2' 'custom') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade') +source=("http://rephial.org/downloads/${pkgver:0:3}/angband-v${pkgver}.tar.gz" "sound.patch") + +build() { + + cd "${srcdir}/angband-v${pkgver}" + + patch -Np1 -i ../sound.patch + + ./configure \ + --prefix=/usr \ + --bindir=/usr/bin \ + --sysconfdir=/usr/share/angband \ + --with-configpath=/usr/share/angband \ + --with-libpath=/usr/share/angband \ + --enable-gtk \ + --enable-sdl \ + --enable-sdl-mixer + + make + +} + +package() { + + cd "${srcdir}/angband-v${pkgver}" + + make DESTDIR="${pkgdir}" install + + rm -f "${pkgdir}/usr/share/angband/*/delete.me" + install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/angband/COPYING" + +} +sha512sums=('76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3' + 'fb3795f7ef5a266e36ef51c9275e65613eeba04fc4283646f21e77ca571b1562c1ad9a11782fe8f1052cefc48b0f3fa1f162bfff88fe8cf62c39e142878d3251') diff --git a/libre/angband-libre/sound.patch b/libre/angband-libre/sound.patch new file mode 100644 index 000000000..e70373b72 --- /dev/null +++ b/libre/angband-libre/sound.patch @@ -0,0 +1,154 @@ +# Removes nonfree sounds +# Made by Israfel <israfel@lavabit.com> +diff -Nur angband-v3.4.1/copying.txt angband-v3.4.1-libre/copying.txt +--- angband-v3.4.1/copying.txt 2012-10-19 15:47:23.000000000 -0400 ++++ angband-v3.4.1-libre/copying.txt 2013-06-29 20:07:03.250510548 -0400 +@@ -27,8 +27,6 @@ + of this file. Currently some of the tiles in the 64x64.png tilesheet were + resized from tiles made by David Gervais for the 32x32 set. + +- * the sounds are freeware, whatever that means. +- + * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick + McConnell, all of whom have agreed to their Angband work being released + under the GPL. +Binary files angband-v3.4.1/lib/xtra/sound/breath.wav and angband-v3.4.1-libre/lib/xtra/sound/breath.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/clunk.wav and angband-v3.4.1-libre/lib/xtra/sound/clunk.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/death.wav and angband-v3.4.1-libre/lib/xtra/sound/death.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/destroy.wav and angband-v3.4.1-libre/lib/xtra/sound/destroy.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/drop.wav and angband-v3.4.1-libre/lib/xtra/sound/drop.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/eat.wav and angband-v3.4.1-libre/lib/xtra/sound/eat.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/flee.wav and angband-v3.4.1-libre/lib/xtra/sound/flee.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/hallu.wav and angband-v3.4.1-libre/lib/xtra/sound/hallu.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/hit1.wav and angband-v3.4.1-libre/lib/xtra/sound/hit1.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/hit.wav and angband-v3.4.1-libre/lib/xtra/sound/hit.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/kill1.wav and angband-v3.4.1-libre/lib/xtra/sound/kill1.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/kill.wav and angband-v3.4.1-libre/lib/xtra/sound/kill.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/level.wav and angband-v3.4.1-libre/lib/xtra/sound/level.wav differ +diff -Nur angband-v3.4.1/lib/xtra/sound/Makefile angband-v3.4.1-libre/lib/xtra/sound/Makefile +--- angband-v3.4.1/lib/xtra/sound/Makefile 2012-10-19 15:47:23.000000000 -0400 ++++ angband-v3.4.1-libre/lib/xtra/sound/Makefile 2013-06-29 20:05:33.734131933 -0400 +@@ -1,9 +1,6 @@ + MKPATH=../../../mk/ + include $(MKPATH)buildsys.mk + +-DATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav drop.wav eat.wav \ +- flee.wav hallu.wav hit.wav hit1.wav kill.wav kill1.wav level.wav \ +- miss.wav miss1.wav money.wav opendoor.wav shutdoor.wav thump.wav \ +- vomit.wav ++DATA = sound.cfg + PACKAGE = xtra/sound + +Binary files angband-v3.4.1/lib/xtra/sound/miss1.wav and angband-v3.4.1-libre/lib/xtra/sound/miss1.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/miss.wav and angband-v3.4.1-libre/lib/xtra/sound/miss.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/money.wav and angband-v3.4.1-libre/lib/xtra/sound/money.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/opendoor.wav and angband-v3.4.1-libre/lib/xtra/sound/opendoor.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/shutdoor.wav and angband-v3.4.1-libre/lib/xtra/sound/shutdoor.wav differ +diff -Nur angband-v3.4.1/lib/xtra/sound/sound.cfg angband-v3.4.1-libre/lib/xtra/sound/sound.cfg +--- angband-v3.4.1/lib/xtra/sound/sound.cfg 2012-10-19 15:47:23.000000000 -0400 ++++ angband-v3.4.1-libre/lib/xtra/sound/sound.cfg 2013-06-29 20:06:41.344730009 -0400 +@@ -41,19 +41,19 @@ + # + + # The shopkeep bought a worthless item. +-store1 = money.wav ++store1 = + + # The shopkeep paid too much for an item. +-store2 = money.wav ++store2 = + + # The shopkeep got away with a good bargain. +-store3 = money.wav ++store3 = + + # The shopkeep got away with a great bargain. +-store4 = money.wav ++store4 = + + # You make a normal transaction (buying or selling). +-store5 = money.wav ++store5 = + + # You enter a store. + store_enter = +@@ -69,7 +69,7 @@ + # + + # You succeed in a melee attack against a monster. +-hit = hit.wav drop.wav hit1.wav ++hit = + + # It was a good hit! + hit_good = +@@ -87,7 +87,7 @@ + hit_hi_superb = + + # You miss a melee attack against a monster. +-miss = miss.wav miss1.wav ++miss = + + # You fire a missile. + shoot = +@@ -99,7 +99,7 @@ + hitpoint_warn = + + # You die. +-death = death.wav ++death = + + # + # Player sounds - status changes +@@ -200,10 +200,10 @@ + money3 = + + # You (or a monster) drop something on the ground. +-drop = clunk.wav ++drop = + + # You gain (or regain) a level. +-level = level.wav ++level = + + # You successfully study a spell or prayer. + study = +@@ -227,19 +227,19 @@ + hitwall = + + # You eat something. +-eat = eat.wav ++eat = + + # You successfully dig through something. +-dig = thump.wav ++dig = + + # You open a door. +-opendoor = opendoor.wav ++opendoor = + + # You shut a door. +-shutdoor = shutdoor.wav ++shutdoor = + + # You teleport from a level (including via recall). +-tplevel = teleport.wav ++tplevel = + + # Default "bell" sound for system messages. + bell = +@@ -294,10 +294,10 @@ + # + + # A monster flees in terror. +-flee = flee.wav ++flee = + + # A monster is killed. +-kill = kill.wav destroy.wav kill1.wav ++kill = + + # A unique is killed. + kill_unique = +Binary files angband-v3.4.1/lib/xtra/sound/thump.wav and angband-v3.4.1-libre/lib/xtra/sound/thump.wav differ +Binary files angband-v3.4.1/lib/xtra/sound/vomit.wav and angband-v3.4.1-libre/lib/xtra/sound/vomit.wav differ diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index ee0744317..00398bb39 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189208 2013-06-29 12:06:26Z bisson $ +# $Id: PKGBUILD 189804 2013-07-08 12:09:48Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -9,7 +9,7 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre pkgver=3.4 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') @@ -30,7 +30,7 @@ provides=$_pkgname=$pkgver makedepends=("audacious>=${pkgver}" 'oss-libre' 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' - 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack' + 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack' 'libnotify' 'lirc-utils-libre' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') @@ -48,7 +48,7 @@ optdepends=('oss-libre: Open Sound System v4 output' 'libmodplug: modplug input' 'fluidsynth: MIDI FluidSynth backend input' 'libcdio-paranoia: CD Digital Audio input' - 'libsidplay: Commodore 64 audio input' + 'libsidplayfp: Commodore 64 audio input' 'wavpack: WavPack input' 'libnotify: libnotify OSD' @@ -108,7 +108,7 @@ prepare() { } build() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${srcdir}/${_pkgname}-${pkgver}" ./configure \ --prefix=/usr \ diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index bb17e745b..6921ab67c 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 188974 2013-06-27 14:08:06Z andyrtr $ +# $Id: PKGBUILD 189893 2013-07-10 19:19:27Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters pkgver=1.0.35 -pkgrel=1 +pkgrel=2 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" license=('GPL') -depends=('lcms2' 'poppler>=0.22.4' 'qpdf>=4.0.0') +depends=('lcms2' 'poppler>=0.22.5' 'qpdf>=5.0.0') makedepends=('ghostscript' 'ttf-dejavu') # ttf-dejavu for make check optdepends=('ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images' 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly' diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD new file mode 100644 index 000000000..d6a1c77b2 --- /dev/null +++ b/libre/epiphany-libre/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 186904 2013-05-31 18:08:27Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> + +_pkgname=epiphany +pkgname=epiphany-libre +pkgver=3.8.2 +pkgrel=1 +install=epiphany.install +pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' + 'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3') +makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +options=('!libtool' '!emptydirs') +groups=('gnome') +url="http://www.gnome.org/projects/epiphany/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz) +sha256sums=('ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a') + +prepare() { + cd $_pkgname-$pkgver + + # Replace Google support to DuckDuckGo HTML + sed -i 's|http://www[.]google[.]com/search?q=search[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search&ie=UTF-8&oe=UTF-8') + sed -i 's|http://www[.]google[.]com/search?q=lala%2Elala[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=lala.lala|g' $(grep -rlI 'http://www[.]google[.]com/search?q=lala%2Elala&ie=UTF-8&oe=UTF-8') + sed -i 's|http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=totalgarbage0xdeadbeef|g' $(grep -rlI 'http://www[.]google[.]com/search?q=totalgarbage0xdeadbeef&ie=UTF-8&oe=UTF-8') + sed -i 's|http://www[.]google[.]com/search?q=search+separated+words+please[&]ie=UTF-8[&]oe=UTF-8|https://duckduckgo.com/html/?q=search+separated+words+please|g' $(grep -rlI 'http://www[.]google[.]com/search?q=search+separated+words+please&ie=UTF-8&oe=UTF-8') + sed -i '\|a quoted string should be searched|d' $(grep -rlI 'a quoted string should be searched') + sed -i 's|http://www[.]google[.]com/search?q=%s[&]amp;ie=UTF-8[&]amp;oe=UTF-8|https://duckduckgo.com/html/?q=%s|g' $(grep -rlI 'http://www[.]google[.]com/search') + sed -i 's|http://www[.]google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com') + sed -i 's|http://google[.]com|https://duckduckgo.com/html|g' $(grep -rlI 'google[.]com') + sed -i 's|mail[.]google[.]com|mail.com|g' $(grep -rlI 'mail[.]google[.]com') + sed -i 's|google[.]com|duckduckgo.com/html|g' $(grep -rlI 'google[.]com') +} + +build() { + cd $_pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + + # https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/libre/epiphany-libre/epiphany.install b/libre/epiphany-libre/epiphany.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/libre/epiphany-libre/epiphany.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD index d286f9cf3..7ae51945f 100644 --- a/libre/mc-libre/PKGBUILD +++ b/libre/mc-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87679 2013-04-05 09:08:28Z schuay $ +# $Id: PKGBUILD 93857 2013-07-11 13:35:59Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> _pkgname=mc pkgname=mc-libre -pkgver=4.8.8 +pkgver=4.8.9 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar and arj recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64') @@ -69,4 +69,4 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('324ff5a192d30d3a3b234c130550eb0a') +md5sums=('e701cc5ced4beed38e1977eba26dad50') diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index af130b5c0..212c3beb0 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,18 +1,19 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=$(LC_ALL=C date -u +%Y%m%d).1 +pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') url='https://projects.parabolagnulinux.org/hackers.git/' license=('GPL') install="${pkgname}.install" -source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig}) +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" + "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig") package() { - cd "${srcdir}/${pkgname}-"* + cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('007c35459478f86484f66323bf90b1e0' +md5sums=('d876a03f772de98905fd7eadf0ad5e1c' 'SKIP') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index a002aa3f7..f7c47e6a5 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185904 2013-05-19 18:27:14Z remy $ +# $Id: PKGBUILD 189858 2013-07-10 07:18:58Z bpiotrowski $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=12 +pkgrel=13 pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)" license=('GPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD deleted file mode 100644 index deb8d4b0e..000000000 --- a/libre/xtensa-unknown-elf-binutils/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -_pkgname=binutils -_target="xtensa-unknown-elf" - -pkgname=${_target}-binutils -pkgver=2.23.2 -pkgrel=2.4 -pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -groups=("${_target}-base-devel") -depends=('glibc>=2.17' 'zlib') -options=('!libtool' '!distcc' '!ccache') -install=${_target}-binutils.install -source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} - binutils-2.23.2-texinfo-5.0.patch) -md5sums=('4f8fa651e35ef262edc01d60fb45702e' - 'dfde4428f08d91f309cdcfe92bf28d08' - '34e439ce23213a91e2af872dfbb5094c') - -prepare() { - cd ${srcdir}/binutils-${pkgver} - - # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935 - # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542 - patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch - - # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure - - mkdir ${srcdir}/binutils-build -} - -build() { - cd ${srcdir}/binutils-build - - ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ - --target=${_target} \ - --disable-nls \ - --with-lib-path=/usr/lib:/usr/local/lib \ - --with-bugurl=https://labs.parabola.nu/ \ - --enable-shared \ - --disable-werror --disable-multilib - - # check the host environment and makes sure all the necessary tools are available - make configure-host - - make tooldir=/usr -} - -package() { - cd ${srcdir}/binutils-build - make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install - - # Remove unwanted files - rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}* - - # Remove unnecessary files and folders - rm $pkgdir/usr/bin/{a{r,s},nm,obj{copy,dump},ranlib,strip} - rm $pkgdir/usr/lib/libiberty.a - rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include - rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info -} diff --git a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch deleted file mode 100644 index 38dc19fb0..000000000 --- a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo -index 45ffa73..3aa3300 100644 ---- a/bfd/doc/bfd.texinfo -+++ b/bfd/doc/bfd.texinfo -@@ -322,7 +324,7 @@ All of BFD lives in one directory. - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -333,7 +335,7 @@ All of BFD lives in one directory. - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 28mar91. -+% Blame: doc@@cygnus.com, 28mar91. - @end tex - - @bye -diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi -index 56a0510..fb1802b 100644 ---- a/binutils/doc/binutils.texi -+++ b/binutils/doc/binutils.texi -@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''. - * objcopy:: Copy and translate object files - * objdump:: Display information from object files - * ranlib:: Generate index to archive contents --* readelf:: Display the contents of ELF format files - * size:: List section sizes and total size - * strings:: List printable strings from files - * strip:: Discard symbols --* elfedit:: Update the ELF header of ELF files - * c++filt:: Filter to demangle encoded C++ symbols - * cxxfilt: c++filt. MS-DOS name for c++filt - * addr2line:: Convert addresses to file and line - * nlmconv:: Converts object code into an NLM --* windres:: Manipulate Windows resources - * windmc:: Generator for Windows message resources -+* windres:: Manipulate Windows resources - * dlltool:: Create files needed to build and use DLLs -+* readelf:: Display the contents of ELF format files -+* elfedit:: Update the ELF header of ELF files - * Common Options:: Command-line options for all utilities - * Selecting the Target System:: How these utilities determine the target - * Reporting Bugs:: Reporting Bugs -@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}. - @c man end - @end ignore - --@node c++filt, addr2line, elfedit, Top -+@node c++filt, addr2line, strip, Top - @chapter c++filt - - @kindex c++filt -@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach}, - - @table @env - --@itemx --input-mach=@var{machine} -+@item --input-mach=@var{machine} - Set the matching input ELF machine type to @var{machine}. If - @option{--input-mach} isn't specified, it will match any ELF - machine types. -@@ -4392,21 +4392,21 @@ machine types. - The supported ELF machine types are, @var{L1OM}, @var{K1OM} and - @var{x86-64}. - --@itemx --output-mach=@var{machine} -+@item --output-mach=@var{machine} - Change the ELF machine type in the ELF header to @var{machine}. The - supported ELF machine types are the same as @option{--input-mach}. - --@itemx --input-type=@var{type} -+@item --input-type=@var{type} - Set the matching input ELF file type to @var{type}. If - @option{--input-type} isn't specified, it will match any ELF file types. - - The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}. - --@itemx --output-type=@var{type} -+@item --output-type=@var{type} - Change the ELF file type in the ELF header to @var{type}. The - supported ELF types are the same as @option{--input-type}. - --@itemx --input-osabi=@var{osabi} -+@item --input-osabi=@var{osabi} - Set the matching input ELF file OSABI to @var{osabi}. If - @option{--input-osabi} isn't specified, it will match any ELF OSABIs. - -@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD}, - @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS}, - @var{NSK}, @var{AROS} and @var{FenixOS}. - --@itemx --output-osabi=@var{osabi} -+@item --output-osabi=@var{osabi} - Change the ELF OSABI in the ELF header to @var{osabi}. The - supported ELF OSABI are the same as @option{--input-osabi}. - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index c7ae2a5..4777ad5 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''. - @ifset ARM - * ARM:: ld and the ARM family - @end ifset --@ifset HPPA --* HPPA ELF32:: ld and HPPA 32-bit ELF --@end ifset - @ifset M68HC11 - * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families - @end ifset -+@ifset HPPA -+* HPPA ELF32:: ld and HPPA 32-bit ELF -+@end ifset - @ifset M68K - * M68K:: ld and Motorola 68K family - @end ifset -@@ -6012,6 +6014,9 @@ functionality are not listed. - @ifset I960 - * i960:: @command{ld} and the Intel 960 family - @end ifset -+@ifset M68HC11 -+* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families -+@end ifset - @ifset ARM - * ARM:: @command{ld} and the ARM family - @end ifset -@@ -6027,9 +6032,6 @@ functionality are not listed. - @ifset MSP430 - * MSP430:: @command{ld} and MSP430 - @end ifset --@ifset M68HC11 --* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families --@end ifset - @ifset POWERPC - * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support - @end ifset -@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same - @printindex cp - - @tex --% I think something like @colophon should be in texinfo. In the -+% I think something like @@colophon should be in texinfo. In the - % meantime: - \long\def\colophon{\hbox to0pt{}\vfill - \centerline{The body of this manual is set in} -@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same - \centerline{{\sl\fontname\tensl\/}} - \centerline{are used for emphasis.}\vfill} - \page\colophon --% Blame: doc@cygnus.com, 28mar91. -+% Blame: doc@@cygnus.com, 28mar91. - @end tex - - @bye --- -1.7.1 - diff --git a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install b/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install deleted file mode 100644 index 9de0533ee..000000000 --- a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install +++ /dev/null @@ -1,17 +0,0 @@ -infodir=usr/share/info -filelist=(as.info bfd.info binutils.info gprof.info ld.info) - -post_upgrade() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD deleted file mode 100644 index 02611d173..000000000 --- a/libre/xtensa-unknown-elf-gcc/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> - -_pkgname=gcc -_target="xtensa-unknown-elf" -_sysroot="/usr/$CHOST/${_target}" - -pkgname=${_target}-gcc -pkgver=4.8.1 -pkgrel=1 -pkgdesc="The GNU Compiler Collection for the Xtensa architecture" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'FDL' 'custom') -url="http://gcc.gnu.org" -makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen') -checkdepends=('dejagnu' 'inetutils') -options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) -md5sums=('3b2386c114cd74185aa3754b58a79304') - -_basedir=gcc-${pkgver} - -prepare() { - cd ${srcdir}/${_basedir} - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - # Parabola installs x86_64 libraries /lib - [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 - - echo ${pkgver} > gcc/BASE-VER - - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - - mkdir ${srcdir}/gcc-build -} - -build() { - cd ${srcdir}/gcc-build - - ${srcdir}/${_basedir}/configure --prefix=/usr \ - --target=${_target} \ - --disable-multilib \ - --disable-nls \ - --disable-shared \ - --disable-threads \ - --enable-languages=c \ - --disable-libquadmath \ - --disable-libssp \ - --with-newlib \ - --disable-werror \ - --libdir=/usr/lib --libexecdir=/usr/lib -# --mandir=/usr/share/man --infodir=/usr/share/info \ -# --with-bugurl=https://labs.parabola.nu/ \ -# --disable-shared --enable-threads=posix \ -# --with-system-zlib --enable-__cxa_atexit \ -# --disable-libunwind-exceptions --enable-clocale=gnu \ -# --disable-libstdcxx-pch \ -# --enable-gnu-unique-object --enable-linker-build-id \ -# --enable-cloog-backend=isl --disable-cloog-version-check \ -# --enable-lto --enable-gold --enable-ld=default \ -# --enable-plugin --with-plugin-ld=ld.gold \ -# --with-linker-hash-style=gnu --disable-install-libiberty \ -# --enable-checking=release \ - make all-gcc -} - -package() -{ - pkgdesc="The GNU Compiler Collection for the Xtensa architecture" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') - groups=("${_target}-devel") - install=${_target}-gcc.install - - cd ${srcdir}/gcc-build - - make -j1 DESTDIR=${pkgdir} install-gcc - - # many packages expect this symlinks - ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc - - # Remove unnecessary files and folders - rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info - rm $pkgdir/usr/share/man/man7/* && rmdir $pkgdir/usr/share/man/man7 -} diff --git a/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install b/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install deleted file mode 100644 index 3407a5e1f..000000000 --- a/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD deleted file mode 100644 index 0a459b10b..000000000 --- a/libre/xtensa-unknown-elf-glibc/PKGBUILD +++ /dev/null @@ -1,155 +0,0 @@ -# $Id: PKGBUILD 186623 2013-05-30 07:47:03Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> - -# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc -# NOTE: valgrind requires rebuilt with each major glibc version - -_pkgname=glibc -_target="xtensa-unknown-elf" -_sysroot="usr/$CHOST/${_target}" - -pkgname=${_target}-glibc -pkgver=2.17 -pkgrel=6 -pkgdesc="GNU C Library for Xtensa processors" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/libc" -license=('GPL' 'LGPL') -groups=('base') -depends=("${_target}-linux-api-headers>=3.7" 'tzdata' 'filesystem>=2013.01') -makedepends=('gcc>=4.7') -backup=(etc/gai.conf - etc/locale.gen - etc/nscd.conf) -options=('!strip') -install=${_target}-glibc.install -source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${pkgver}.tar.xz{,.sig} - glibc-2.17-sync-with-linux37.patch - glibc-2.17-getaddrinfo-stack-overflow.patch - glibc-2.17-regexp-matcher-overrun.patch - nscd.service - nscd.tmpfiles - locale.gen.txt - locale-gen) -md5sums=('87bf675c8ee523ebda4803e8e1cec638' - 'SKIP' - 'fb99380d94598cc76d793deebf630022' - '56d5f2c09503a348281a20ae404b7de3' - '200acc05961b084ee00dde919e64f82d' - 'c1e07c0bec0fe89791bfd9d13fc85edf' - 'bccbe5619e75cf1d97312ec3681c605c' - '07ac979b6ab5eeb778d55f041529d623' - '476e9113489f93b348b21e144b6a8fcf') - - -build() { - cd ${srcdir}/${_pkgname}-${pkgver} - - # combination of upstream commits 318cd0b, b540704 and fc1abbe - patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch - - # CVE-2013-1914 - upstream commit 1cef1b19 - patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch - - # CVE-2013-0242 - upstream commit a445af0b - patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch - - cd ${srcdir} - mkdir glibc-build - cd glibc-build - - if [[ ${CARCH} = "i686" ]]; then - # Hack to fix NPTL issues with Xen, only required on 32bit platforms - # TODO: make separate glibc-xen package for i686 - export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" - fi - - echo "slibdir=/usr/lib" >> configparms - echo "sbindir=/usr/bin" >> configparms - echo "rootsbindir=/usr/bin" >> configparms - - # remove hardening options for building libraries - CFLAGS=${CFLAGS/-fstack-protector/} - CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} - - ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \ - --libdir=/usr/lib --libexecdir=/usr/lib \ - --build=$CHOST --host=$_target \ - --with-headers=/${_sysroot}/include \ - --with-bugurl=https://labs.parabola.nu/ \ - --enable-add-ons=nptl,libidn \ - --enable-obsolete-rpc \ - --enable-kernel=2.6.32 \ - --enable-bind-now --disable-profile \ - --enable-stackguard-randomization \ - --enable-multi-arch - - # build libraries with hardening disabled - echo "build-programs=no" >> configparms - make - - # re-enable hardening for programs - sed -i "/build-programs=/s#no#yes#" configparms - echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms - make - - # remove harding in preparation to run test-suite - sed -i '4,6d' configparms -} - -check() { - # bug to file - the linker commands need to be reordered - LDFLAGS=${LDFLAGS/--as-needed,/} - - cd ${srcdir}/glibc-build - make check -} - -package() { - cd ${srcdir}/glibc-build - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - - make install_root=${pkgdir} install - - rm -f ${pkgdir}/etc/ld.so.{cache,conf} - - install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d} - - install -m644 ${srcdir}/${_pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf - install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system - install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf - - install -m644 ${srcdir}/${_pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf - - install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin - - # create /etc/locale.gen - install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ - ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - - # Do not strip the following files for improved debugging support - # ("improved" as in not breaking gdb and valgrind...): - # ld-${pkgver}.so - # libc-${pkgver}.so - # libpthread-${pkgver}.so - # libthread_db-1.0.so - - cd $pkgdir - strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ - usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ - usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ - usr/lib/getconf/* - [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 - - strip $STRIP_STATIC usr/lib/*.a - - strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ - usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ - usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ - usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,{audit,gconv}/*.so} -} diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch deleted file mode 100644 index aa916ac2c..000000000 --- a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c -index d95c2d1..2309281 100644 ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service, - __typeof (once) old_once = once; - __libc_once (once, gaiconf_init); - /* Sort results according to RFC 3484. */ -- struct sort_result results[nresults]; -- size_t order[nresults]; -+ struct sort_result *results; -+ size_t *order; - struct addrinfo *q; - struct addrinfo *last = NULL; - char *canonname = NULL; -+ bool malloc_results; -+ -+ malloc_results -+ = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t))); -+ if (malloc_results) -+ { -+ results = malloc (nresults * (sizeof (*results) + sizeof (size_t))); -+ if (results == NULL) -+ { -+ __free_in6ai (in6ai); -+ return EAI_MEMORY; -+ } -+ } -+ else -+ results = alloca (nresults * (sizeof (*results) + sizeof (size_t))); -+ order = (size_t *) (results + nresults); - - /* Now we definitely need the interface information. */ - if (! check_pf_called) -@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service, - - /* Fill in the canonical name into the new first entry. */ - p->ai_canonname = canonname; -+ -+ if (malloc_results) -+ free (results); - } - - __free_in6ai (in6ai); --- -1.7.1 - diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch deleted file mode 100644 index b108f9d42..000000000 --- a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/posix/Makefile b/posix/Makefile -index 88d409f..2cacd21 100644 ---- a/posix/Makefile -+++ b/posix/Makefile -@@ -86,7 +86,7 @@ tests := tstgetopt testfnm runtests runptests \ - tst-rfc3484-3 \ - tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \ - bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \ -- bug-getopt5 tst-getopt_long1 -+ bug-getopt5 tst-getopt_long1 bug-regex34 - xtests := bug-ga2 - ifeq (yes,$(build-shared)) - test-srcs := globtest -@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata - bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata - bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata - bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata -+bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata - tst-rxspencer-ARGS = --utf8 rxspencer/tests - tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata -diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c -new file mode 100644 -index 0000000..bb3b613 ---- /dev/null -+++ b/posix/bug-regex34.c -@@ -0,0 +1,46 @@ -+/* Test re_search with multi-byte characters in UTF-8. -+ Copyright (C) 2013 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/>. */ -+ -+#define _GNU_SOURCE 1 -+#include <stdio.h> -+#include <string.h> -+#include <locale.h> -+#include <regex.h> -+ -+static int -+do_test (void) -+{ -+ struct re_pattern_buffer r; -+ /* áá»á½ááºá¯ááºx */ -+ const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax"; -+ -+ if (setlocale (LC_ALL, "en_US.UTF-8") == NULL) -+ { -+ puts ("setlocale failed"); -+ return 1; -+ } -+ memset (&r, 0, sizeof (r)); -+ -+ re_compile_pattern ("[^x]x", 5, &r); -+ /* This was triggering a buffer overflow. */ -+ re_search (&r, s, strlen (s), 0, strlen (s), 0); -+ return 0; -+} -+ -+#define TEST_FUNCTION do_test () -+#include "../test-skeleton.c" -diff --git a/posix/regexec.c b/posix/regexec.c -index 7f2de85..5ca2bf6 100644 ---- a/posix/regexec.c -+++ b/posix/regexec.c -@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, - static int check_node_accept (const re_match_context_t *mctx, - const re_token_t *node, int idx) - internal_function; --static reg_errcode_t extend_buffers (re_match_context_t *mctx) -+static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) - internal_function; - - /* Entry point for POSIX code. */ -@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match, - || (BE (next_char_idx >= mctx->input.valid_len, 0) - && mctx->input.valid_len < mctx->input.len)) - { -- err = extend_buffers (mctx); -+ err = extend_buffers (mctx, next_char_idx + 1); - if (BE (err != REG_NOERROR, 0)) - { - assert (err == REG_ESPACE); -@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) - && mctx->input.valid_len < mctx->input.len)) - { - reg_errcode_t err; -- err = extend_buffers (mctx); -+ err = extend_buffers (mctx, next_state_log_idx + 1); - if (BE (err != REG_NOERROR, 0)) - return err; - } -@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) - if (bkref_str_off >= mctx->input.len) - break; - -- err = extend_buffers (mctx); -+ err = extend_buffers (mctx, bkref_str_off + 1); - if (BE (err != REG_NOERROR, 0)) - return err; - -@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, - - static reg_errcode_t - internal_function __attribute_warn_unused_result__ --extend_buffers (re_match_context_t *mctx) -+extend_buffers (re_match_context_t *mctx, int min_len) - { - reg_errcode_t ret; - re_string_t *pstr = &mctx->input; -@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx) - if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0)) - return REG_ESPACE; - -- /* Double the lengthes of the buffers. */ -- ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2)); -+ /* Double the lengthes of the buffers, but allocate at least MIN_LEN. */ -+ ret = re_string_realloc_buffers (pstr, -+ MAX (min_len, -+ MIN (pstr->len, pstr->bufs_len * 2))); - if (BE (ret != REG_NOERROR, 0)) - return ret; - --- -1.7.1 - diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch deleted file mode 100644 index 24b25c997..000000000 --- a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h -index 06e8414..b62a696 100644 ---- a/sysdeps/gnu/netinet/tcp.h -+++ b/sysdeps/gnu/netinet/tcp.h -@@ -37,20 +37,29 @@ - /* - * User-settable options (used with setsockopt). - */ --#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */ --#define TCP_MAXSEG 2 /* Set maximum segment size */ --#define TCP_CORK 3 /* Control sending of partial frames */ --#define TCP_KEEPIDLE 4 /* Start keeplives after this period */ --#define TCP_KEEPINTVL 5 /* Interval between keepalives */ --#define TCP_KEEPCNT 6 /* Number of keepalives before death */ --#define TCP_SYNCNT 7 /* Number of SYN retransmits */ --#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */ --#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */ --#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */ --#define TCP_INFO 11 /* Information about this connection. */ --#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */ --#define TCP_CONGESTION 13 /* Congestion control algorithm. */ --#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */ -+#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */ -+#define TCP_MAXSEG 2 /* Set maximum segment size */ -+#define TCP_CORK 3 /* Control sending of partial frames */ -+#define TCP_KEEPIDLE 4 /* Start keeplives after this period */ -+#define TCP_KEEPINTVL 5 /* Interval between keepalives */ -+#define TCP_KEEPCNT 6 /* Number of keepalives before death */ -+#define TCP_SYNCNT 7 /* Number of SYN retransmits */ -+#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */ -+#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */ -+#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */ -+#define TCP_INFO 11 /* Information about this connection. */ -+#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */ -+#define TCP_CONGESTION 13 /* Congestion control algorithm. */ -+#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */ -+#define TCP_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */ -+#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/ -+#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */ -+#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */ -+#define TCP_REPAIR 19 /* TCP sock is under repair right now */ -+#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */ -+#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */ -+#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */ -+#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ - - #ifdef __USE_MISC - # include <sys/types.h> -@@ -173,7 +182,9 @@ enum - # define TCPI_OPT_TIMESTAMPS 1 - # define TCPI_OPT_SACK 2 - # define TCPI_OPT_WSCALE 4 --# define TCPI_OPT_ECN 8 -+# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */ -+# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */ -+# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */ - - /* Values for tcpi_state. */ - enum tcp_ca_state -@@ -241,6 +252,49 @@ struct tcp_md5sig - u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */ - }; - -+/* For socket repair options. */ -+struct tcp_repair_opt -+{ -+ u_int32_t opt_code; -+ u_int32_t opt_val; -+}; -+ -+/* Queue to repair, for TCP_REPAIR_QUEUE. */ -+enum -+{ -+ TCP_NO_QUEUE, -+ TCP_RECV_QUEUE, -+ TCP_SEND_QUEUE, -+ TCP_QUEUES_NR, -+}; -+ -+/* For cookie transactions socket options. */ -+#define TCP_COOKIE_MIN 8 /* 64-bits */ -+#define TCP_COOKIE_MAX 16 /* 128-bits */ -+#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX) -+ -+/* Flags for both getsockopt and setsockopt */ -+#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie */ -+#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies, -+ * supercedes everything. */ -+ -+/* Flags for getsockopt */ -+#define TCP_S_DATA_IN (1 << 2) /* Was data received? */ -+#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */ -+ -+#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */ -+#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0 (RFC3226) */ -+ -+struct tcp_cookie_transactions -+{ -+ u_int16_t tcpct_flags; -+ u_int8_t __tcpct_pad1; -+ u_int8_t tcpct_cookie_desired; -+ u_int16_t tcpct_s_data_desired; -+ u_int16_t tcpct_used; -+ u_int8_t tcpct_value[TCP_MSS_DEFAULT]; -+}; -+ - #endif /* Misc. */ - - #endif /* netinet/tcp.h */ -diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h -index df8f167..eadd7d9 100644 ---- a/sysdeps/unix/sysv/linux/bits/socket.h -+++ b/sysdeps/unix/sysv/linux/bits/socket.h -@@ -1,6 +1,5 @@ - /* System-specific socket constants and types. Linux version. -- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012 -- Free Software Foundation, Inc. -+ Copyright (C) 1991-2013 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 -@@ -208,6 +207,8 @@ enum - #define MSG_MORE MSG_MORE - MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/ - #define MSG_WAITFORONE MSG_WAITFORONE -+ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */ -+#define MSG_FASTOPEN MSG_FASTOPEN - - MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file - descriptor received through diff --git a/libre/xtensa-unknown-elf-glibc/locale-gen b/libre/xtensa-unknown-elf-glibc/locale-gen deleted file mode 100644 index 5aff344c4..000000000 --- a/libre/xtensa-unknown-elf-glibc/locale-gen +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -set -e - -LOCALEGEN=/etc/locale.gen -LOCALES=/usr/share/i18n/locales -if [ -n "$POSIXLY_CORRECT" ]; then - unset POSIXLY_CORRECT -fi - - -[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; - -# Remove all old locale dir and locale-archive before generating new -# locale data. -rm -rf /usr/lib/locale/* || true - -umask 022 - -is_entry_ok() { - if [ -n "$locale" -a -n "$charset" ] ; then - true - else - echo "error: Bad entry '$locale $charset'" - false - fi -} - -echo "Generating locales..." -while read locale charset; do \ - case $locale in \#*) continue;; "") continue;; esac; \ - is_entry_ok || continue - echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ - echo -n ".$charset"; \ - echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ - echo -n '...'; \ - if [ -f $LOCALES/$locale ]; then input=$locale; else \ - input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ - localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ - echo ' done'; \ -done < $LOCALEGEN -echo "Generation complete." diff --git a/libre/xtensa-unknown-elf-glibc/locale.gen.txt b/libre/xtensa-unknown-elf-glibc/locale.gen.txt deleted file mode 100644 index ccdd81734..000000000 --- a/libre/xtensa-unknown-elf-glibc/locale.gen.txt +++ /dev/null @@ -1,23 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# <locale> <charset> -# -# where <locale> is one of the locales given in /usr/share/i18n/locales -# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps -# -# Examples: -# en_US ISO-8859-1 -# en_US.UTF-8 UTF-8 -# de_DE ISO-8859-1 -# de_DE@euro ISO-8859-15 -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is included in this file. -# Uncomment the ones you need. -# diff --git a/libre/xtensa-unknown-elf-glibc/nscd.service b/libre/xtensa-unknown-elf-glibc/nscd.service deleted file mode 100644 index bc80a0730..000000000 --- a/libre/xtensa-unknown-elf-glibc/nscd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Name Service Cache Daemon -After=syslog.target - -[Service] -Type=forking -ExecStart=/usr/sbin/nscd -ExecStop=/usr/sbin/nscd --shutdown -ExecReload=/usr/sbin/nscd -i passwd -ExecReload=/usr/sbin/nscd -i group -ExecReload=/usr/sbin/nscd -i hosts -ExecReload=/usr/sbin/nscd -i services -Restart=always -PIDFile=/run/nscd/nscd.pid - -[Install] -WantedBy=multi-user.target diff --git a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles deleted file mode 100644 index 8a24a785e..000000000 --- a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/nscd 0755 root root diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install deleted file mode 100644 index f8147a6cf..000000000 --- a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install +++ /dev/null @@ -1,19 +0,0 @@ -infodir=usr/share/info -filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) - -post_upgrade() { - ldconfig -r . - locale-gen - - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD deleted file mode 100644 index 23dada50b..000000000 --- a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> - -# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc -export ARCH=xtensa -_target=xtensa-unknown-elf -_sysroot="usr/$CHOST/${_target}" - -pkgname=${_target}-linux-libre-api-headers -_basekernel=3.8 -_sublevel=4 -pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -pkgdesc="Kernel headers sanitized for use in userspace for Xtensa processors" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/libc" -license=('GPL2') -provides=("${_target}-linux-api-headers=${pkgver}") -conflicts=("${_target}-linux-api-headers") -replaces=("${_target}-linux-api-headers" ) -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e') - -build() { - cd ${srcdir}/linux-${_basekernel} - - if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" - fi - - make mrproper - make headers_check -} - -package() { - cd ${srcdir}/linux-${_basekernel} - make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install - - # use headers from libdrm - rm -r ${pkgdir}/${_sysroot}/include/drm - - # clean-up unnecessary files generated during install - find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete -} |