diff options
35 files changed, 515 insertions, 1371 deletions
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index b503a36af..264e05339 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 90996 2013-05-17 06:59:15Z bpiotrowski $ +# $Id: PKGBUILD 93729 2013-07-09 07:18:03Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.4.1 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD index 0480f56ab..e5aee3cbc 100644 --- a/community/oath-toolkit/PKGBUILD +++ b/community/oath-toolkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82117 2013-01-08 20:25:25Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# $Id: PKGBUILD 93727 2013-07-08 23:58:49Z seblu $ +# Maintainer: Sébastien Luttringer # Contributor: Christian Hesse <mail@eworm.de> # Contributor: L42y <423300@gmail.com> pkgname=oath-toolkit -pkgver=2.0.2 +pkgver=2.2.0 pkgrel=1 pkgdesc='OATH one-time password toolkit' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL3') depends=('glibc' 'pam' 'xmlsec') options=('!libtool') source=("http://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('35232dfcaf0e77377f926d561fe5086d') +md5sums=('2afc64577936a1a79cff72b0718c9636') build() { cd $pkgname-$pkgver diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index 4ea0575c4..88fdabef2 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187032 2013-06-03 11:15:16Z allan $ +# $Id: PKGBUILD 189849 2013-07-09 13:17:26Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=13 -pkgrel=2 +pkgver=14 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -16,7 +16,7 @@ conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" "depmod-search.conf") -md5sums=('d5aba43b9370cd52f3cb35e82a1aa595' +md5sums=('38009d0d6f10678a3ec22ccd29210d13' 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index d8a134240..e51af1986 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 186498 2013-05-27 20:01:02Z tpowa $ +# $Id: PKGBUILD 189852 2013-07-09 13:39:02Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs -pkgver=3.6.22 -pkgrel=2 +pkgver=3.6.23 +pkgrel=1 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL') groups=('base') depends=('util-linux') -source=("http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v3.6.22/${pkgname}-${pkgver}.tar.xz") -md5sums=('91d2fdb5eeaa15c8afcc9e815179690d') +source=("http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${pkgver}/${pkgname}-${pkgver}.tar.xz") build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,3 +28,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } +md5sums=('e7224bbda4d366ba9b11cdf98616c8f6') diff --git a/cross/xtensa-unknown-elf-binutils-lts/PKGBUILD b/cross/xtensa-unknown-elf-binutils-lts/PKGBUILD new file mode 100644 index 000000000..27ef7c824 --- /dev/null +++ b/cross/xtensa-unknown-elf-binutils-lts/PKGBUILD @@ -0,0 +1,75 @@ +# $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}-${_pkgname}-lts +pkgver=2.23.1 +pkgrel=3 +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') +provides=("${_target}-${_pkgname}") +conflicts=("${_target}-${_pkgname}") +options=('!libtool' '!distcc' '!ccache') +install=${_target}-binutils.install +source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig} + https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/binutils.patch + binutils-2.23.2-texinfo-5.0.patch) +md5sums=('33adb18c3048d057ac58d07a3f1adb38' + '1869b37216e7d7eff7e335a69e0882fd' + '7077126d96e9a755a0eaddb5505efe68' + '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 + + # open-ath9k-htc-firmware patch + patch -p1 -i ${srcdir}/binutils.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/cross/xtensa-unknown-elf-binutils-lts/binutils-2.23.2-texinfo-5.0.patch index 38dc19fb0..38dc19fb0 100644 --- a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch +++ b/cross/xtensa-unknown-elf-binutils-lts/binutils-2.23.2-texinfo-5.0.patch diff --git a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install b/cross/xtensa-unknown-elf-binutils-lts/xtensa-unknown-elf-binutils.install index 9de0533ee..9de0533ee 100644 --- a/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install +++ b/cross/xtensa-unknown-elf-binutils-lts/xtensa-unknown-elf-binutils.install diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/cross/xtensa-unknown-elf-binutils/PKGBUILD index deb8d4b0e..deb8d4b0e 100644 --- a/libre/xtensa-unknown-elf-binutils/PKGBUILD +++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD diff --git a/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch new file mode 100644 index 000000000..38dc19fb0 --- /dev/null +++ b/cross/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch @@ -0,0 +1,162 @@ +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-glibc/xtensa-unknown-elf-glibc.install b/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install index f8147a6cf..9de0533ee 100644 --- a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install +++ b/cross/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install @@ -1,19 +1,17 @@ infodir=usr/share/info -filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) +filelist=(as.info bfd.info binutils.info gprof.info ld.info) post_upgrade() { - ldconfig -r . - locale-gen - - [[ -x usr/bin/install-info ]] || return 0 + [ -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 + [ -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/cross/xtensa-unknown-elf-gcc-lts/PKGBUILD b/cross/xtensa-unknown-elf-gcc-lts/PKGBUILD new file mode 100644 index 000000000..83b4f326b --- /dev/null +++ b/cross/xtensa-unknown-elf-gcc-lts/PKGBUILD @@ -0,0 +1,99 @@ +# $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}-${_pkgname}-lts +pkgver=4.7.2 +pkgrel=3 +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=("${_target}-binutils-lts>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen') +checkdepends=('dejagnu' 'inetutils') +provides=("${_target}-${_pkgname}") +conflicts=("${_target}-${_pkgname}") +options=('!libtool' '!emptydirs') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + https://raw.github.com/qca/open-ath9k-htc-firmware/1.3.2/local/patches/gcc.patch) + +md5sums=('cc308a0891e778cfda7a151ab8a6e762' + '81372ee980289a9f6df01dad31c64a63') + +_basedir=gcc-${pkgver} + +prepare() { + cd ${srcdir}/${_basedir} + + # open-ath9k-htc-firmware patch + patch -p1 -i ${srcdir}/gcc.patch + + # 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 + + # fix texinfo "@itemx" and "@item" + sed -i "s|[@]itemx|@item|;" $(grep -rlI '[@]itemx' | grep .texi) $(grep -rlI '[@]itemx' | grep .txh) +} + +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 \ + --disable-werror \ + --libdir=/usr/lib --libexecdir=/usr/lib +# --with-newlib \ +# --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=("${_target}-binutils-lts>=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/cross/xtensa-unknown-elf-gcc-lts/xtensa-unknown-elf-gcc.install index 3407a5e1f..3407a5e1f 100644 --- a/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install +++ b/cross/xtensa-unknown-elf-gcc-lts/xtensa-unknown-elf-gcc.install diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD index 02611d173..270dc6299 100644 --- a/libre/xtensa-unknown-elf-gcc/PKGBUILD +++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD @@ -9,12 +9,12 @@ _sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-gcc pkgver=4.8.1 -pkgrel=1 +pkgrel=1.2 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') +makedepends=("${_target}-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) @@ -69,10 +69,9 @@ build() { make all-gcc } -package() -{ +package() { pkgdesc="The GNU Compiler Collection for the Xtensa architecture" - depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') + depends=("${_target}-binutils>=2.23" 'libmpc' 'cloog') groups=("${_target}-devel") install=${_target}-gcc.install diff --git a/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install b/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install new file mode 100644 index 000000000..3407a5e1f --- /dev/null +++ b/cross/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install @@ -0,0 +1,20 @@ +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-linux-libre-api-headers/PKGBUILD b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD index 23dada50b..5885001c0 100644 --- a/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD +++ b/cross/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD @@ -5,14 +5,14 @@ # toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc export ARCH=xtensa _target=xtensa-unknown-elf -_sysroot="usr/$CHOST/${_target}" +_sysroot="/usr/${_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" +pkgrel=1.3 +pkgdesc="Kernel headers sanitized for use in userspace for the Xtensa architecture" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" license=('GPL2') @@ -37,10 +37,10 @@ build() { package() { cd ${srcdir}/linux-${_basekernel} - make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install + make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir} headers_install # use headers from libdrm - rm -r ${pkgdir}/${_sysroot}/include/drm + rm -r ${pkgdir}/include/drm # clean-up unnecessary files generated during install find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD index a7cf9580c..afa12600d 100644 --- a/extra/accountsservice/PKGBUILD +++ b/extra/accountsservice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185560 2013-05-15 07:14:20Z heftig $ +# $Id: PKGBUILD 189848 2013-07-09 13:13:14Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.32 +pkgver=0.6.34 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -12,8 +12,8 @@ depends=('glib2' 'polkit' 'systemd') makedepends=('intltool' 'gobject-introspection' 'vala') options=('!libtool') source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch) -md5sums=('0c2c87f3bf982bdab54be887fed25bc5' - '1d5cf127e5aac407fe7c37b2f4fd503c') +md5sums=('dbf4323b688a314b4bf76890ad6d5279' + '45ef529fb38d32ec7a1d03005dd20ced') build() { cd $pkgname-$pkgver diff --git a/extra/accountsservice/more-exclusions.patch b/extra/accountsservice/more-exclusions.patch index 46a80c4c9..b9753b24b 100644 --- a/extra/accountsservice/more-exclusions.patch +++ b/extra/accountsservice/more-exclusions.patch @@ -1,12 +1,11 @@ -diff --git i/src/daemon.c w/src/daemon.c -index c65eca3..9166055 100644 ---- i/src/daemon.c -+++ w/src/daemon.c -@@ -77,6 +77,7 @@ static const char *default_excludes[] = { - "games", - "man", - "at", -+ "git", - NULL - }; +diff -u -r accountsservice-0.6.34/src/daemon.c accountsservice-0.6.34-more/src/daemon.c +--- accountsservice-0.6.34/src/daemon.c 2013-06-11 17:50:37.000000000 +0200 ++++ accountsservice-0.6.34-more/src/daemon.c 2013-07-09 15:06:46.608425655 +0200 +@@ -55,6 +55,7 @@ + #endif + static const char *default_excludes[] = { ++ "git", + "bin", + "root", + "daemon", diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD index c3995f60b..6981e52be 100644 --- a/extra/alsa-lib/PKGBUILD +++ b/extra/alsa-lib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186216 2013-05-22 06:35:12Z tpowa $ +# $Id: PKGBUILD 189842 2013-07-09 13:01:47Z tpowa $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=alsa-lib -pkgver=1.0.27.1 +pkgver=1.0.27.2 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -24,4 +24,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } -md5sums=('17102aaab10e9d4b19f6b02937bab015') +md5sums=('69129a7c37697f81ac092335e9fa452b') diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 8d022c38d..c3323c732 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185565 2013-05-15 07:56:22Z heftig $ +# $Id: PKGBUILD 189847 2013-07-09 13:12:40Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -16,7 +16,7 @@ groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dd35b54b82190ba01f0c481e2d073ccddaa325ce80964b655dc167752b6bc2f5') +sha256sums=('1526921201fabe833733e7c2552dfbe62085fd18d325a27c2fffb332e5e418bd') build() { cd $pkgname-$pkgver diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index f0bf3edf9..9adee070c 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180803 2013-03-26 11:49:32Z foutrelis $ +# $Id: PKGBUILD 189840 2013-07-09 09:22:21Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk -pkgver=0.8.6 -pkgrel=2 +pkgver=0.8.7 +pkgrel=1 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" @@ -15,14 +15,11 @@ provides=("gdisk=$pkgver") conflicts=('gdisk') replaces=('gdisk') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2') +sha256sums=('39e61d9f3701e95db1bcb83ce8fb211b22f33548e3c75b17f22067c6968e91e3') build() { cd "$srcdir/$pkgname-$pkgver" - # Get rid of annoying debug message (have sent email to upstream author) - sed -i '/Entering GPTPart::SetName/d' gptpart.cc - make } diff --git a/extra/qemu/65-kvm.rules b/extra/qemu/65-kvm.rules index c2f7317aa..be955fd87 100644 --- a/extra/qemu/65-kvm.rules +++ b/extra/qemu/65-kvm.rules @@ -1 +1,2 @@ KERNEL=="kvm", GROUP="kvm", MODE="0660" +KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index 8a635ed4d..9220a8fee 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,34 +1,32 @@ -# $Id: PKGBUILD 185570 2013-05-15 08:05:29Z bpiotrowski $ +# $Id: PKGBUILD 189853 2013-07-09 13:42:03Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu -pkgver=1.4.2 +pkgver=1.5.1 pkgrel=2 pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') url="http://wiki.qemu.org/Index.html" makedepends=('texi2html' 'perl' 'python2') -depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' 'libiscsi') +depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2' + 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl' + 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp' + 'libiscsi') backup=('etc/qemu/target-x86_64.conf') install=qemu.install source=(http://wiki.qemu.org/download/${pkgname}-${pkgver}.tar.bz2 65-kvm.rules) replaces=('qemu-kvm') -options=(!strip !libtool) - -prepare() -{ - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/lib64/lib/g' ldscripts/x86_64.ld -} +options=(!strip) build () { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list=alsa,sdl,pa \ - --python=/usr/bin/python2 \ - --audio-card-list=ac97,sb16,es1370,hda \ - --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu + cd "${srcdir}/${pkgname}-${pkgver}" + # gtk gui breaks keymappings at the moment + ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl'\ + --python=/usr/bin/python2 --smbd=/usr/bin/smbd \ + --enable-mixemu --libexecdir=/usr/lib/qemu \ + --disable-gtk --enable-linux-aio --enable-seccomp make } @@ -53,5 +51,5 @@ package() { done } -md5sums=('b3eafa033ae4b8faba584f9f141b888f' - 'b316a066d2f1bb57d8f5b7ea1d0d1caf') +md5sums=('b56e73bdcfdb214d5c68e13111aca96f' + '9d6de26867a05c306157e3d3c612b28a') diff --git a/extra/qemu/qemu.install b/extra/qemu/qemu.install index f4fabcc54..79ee83536 100644 --- a/extra/qemu/qemu.install +++ b/extra/qemu/qemu.install @@ -2,8 +2,6 @@ post_install() { # groupadd kvm -f -g 78 - echo ">>> PLEASE READ FOR KVM USAGE!" - echo ">>> Add yourself to the group 'kvm'." } post_upgrade() { diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index c201d7bf1..1b5a1435d 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189205 2013-06-29 11:28:10Z tpowa $ +# $Id: PKGBUILD 189851 2013-07-09 13:36:09Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -16,7 +16,7 @@ _COMPILER="GCC46" ####### pkgname="refind-efi" -pkgver="0.7.0" +pkgver="0.7.1" pkgrel="1" pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs" url="http://www.rodsbooks.com/refind/index.html" @@ -26,40 +26,47 @@ license=('GPL3' 'custom') makedepends=('subversion' 'python2') depends=('dosfstools' 'efibootmgr') optdepends=('mactel-boot: For bless command in Apple Mac systems' - 'bash: For /usr/bin/refind-mkfont script' - 'imagemagick: For /usr/bin/refind-mkfont script') + 'bash: For refind-mkfont script' + 'imagemagick: For refind-mkfont script') options=('!strip' 'docs' '!makeflags') install="${pkgname}.install" source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip" - 'UDK-MdePkg-Revert-PathNodeCount.patch' 'refind_linux.conf') for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModulePkg ; do source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}") done +sha1sums=('5e4b15202efc658e58e68e64af8a1b2c84aab175' + '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') + [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64" [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32" [[ "${CARCH}" == "x86_64" ]] && _TIANO_S_ARCH="x64" [[ "${CARCH}" == "i686" ]] && _TIANO_S_ARCH="ia32" -_tianocore_udk_common() { +_setup_env_vars() { - ## Unset all FLAGS - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - ## Setup UDK Environment variables + msg "Setup UDK PATH ENV variables" export _UDK_DIR="${srcdir}/${_TIANO_DIR_}_build" export EDK_TOOLS_PATH="${_UDK_DIR}/BaseTools" +} + +_prepare_tianocore_sources() { + + _setup_env_vars + + msg "Delete old UDK BUILD dir" rm -rf "${_UDK_DIR}/" || true mkdir -p "${_UDK_DIR}/" @@ -69,103 +76,127 @@ _tianocore_udk_common() { cd "${_UDK_DIR}/" - ## Fix PcdMaximumPathNodeCount compile error - patch -Np1 -R -i "${srcdir}/UDK-MdePkg-Revert-PathNodeCount.patch" - echo - - ## Cleanup UDK config files + msg "Cleanup UDK config files" rm -rf "${_UDK_DIR}/Build/" || true rm -rf "${_UDK_DIR}/Conf/" || true mkdir -p "${_UDK_DIR}/Conf/" mkdir -p "${_UDK_DIR}/Build/" - ## UDK BaseTools requires python2 + msg "Use python2 for UDK BaseTools" sed 's|python |python2 |g' -i "${EDK_TOOLS_PATH}/BinWrappers/PosixLike"/* || true sed 's|python |python2 |g' -i "${EDK_TOOLS_PATH}/Tests/GNUmakefile" - ## Fix GCC Warning as error + msg "Fix GCC Warning as error" sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Source/C/Makefiles/header.makefile" || true sed 's|-Werror |-Wno-error -Wno-unused-but-set-variable |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true - ## Fix GCC >=4.7 error - gcc: error: unrecognized command line option '-melf_x86_64' + msg "Fix GCC >=4.7 error - gcc: error: unrecognized command line option '-melf_x86_64'" sed 's| -m64 --64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true sed 's|--64 | |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true sed 's| -m64 -melf_x86_64| -m64|g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true - ## Remove GCC -g debug option and add -0s -mabi=ms + msg "Remove GCC -g debug option and add -0s -mabi=ms" sed 's|DEFINE GCC_ALL_CC_FLAGS = -g |DEFINE GCC_ALL_CC_FLAGS = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true sed 's|DEFINE GCC44_ALL_CC_FLAGS = -g |DEFINE GCC44_ALL_CC_FLAGS = -Os -mabi=ms |g' -i "${EDK_TOOLS_PATH}/Conf/tools_def.template" || true - ## Fix UDK Target Platform + msg "Fix UDK Target Platform" sed "s|ACTIVE_PLATFORM = Nt32Pkg/Nt32Pkg.dsc|ACTIVE_PLATFORM = ${_UDK_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true sed "s|TARGET = DEBUG|TARGET = ${_TIANOCORE_TARGET}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true sed "s|TOOL_CHAIN_TAG = MYTOOLS|TOOL_CHAIN_TAG = ${_COMPILER}|g" -i "${EDK_TOOLS_PATH}/Conf/target.template" || true - ## Setup UDK Environment + msg "Fix UDK Target ARCH for rEFInd" + sed "s|X64|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true + sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true + chmod +x "${_UDK_DIR}/BaseTools/BuildEnv" - source "${_UDK_DIR}/BaseTools/BuildEnv" BaseTools - echo - ## Compile UDK BaseTools - make -C "${EDK_TOOLS_PATH}" - echo +} + +_prepare_refind_sources() { - ## Compile UDK x86_64-UEFI Libraries - "${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "${_TIANO_ARCH}" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}" - echo + cd "${srcdir}/refind-${pkgver}/" - ## Fix UDK Target ARCH for rEFInd - sed "s|IA32|${_TIANO_ARCH}|g" -i "${_UDK_DIR}/Conf/target.txt" || true + msg "Fix UDK Path in rEFInd Makefiles" + sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/Make.tiano" || true + sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true + sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true + +} + +prepare() { + + msg "Prepare Tianocore Sources" + _prepare_tianocore_sources + + msg "Prepare rEFInd Sources" + _prepare_refind_sources } build() { - _tianocore_udk_common + _setup_env_vars + + cd "${_UDK_DIR}/" + + msg "Unset all compiler FLAGS" + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + msg "Setup UDK Environment" + source "${_UDK_DIR}/BaseTools/BuildEnv" BaseTools echo - cd "${srcdir}/refind-${pkgver}/" + msg "Compile UDK BaseTools" + make -C "${EDK_TOOLS_PATH}" + echo - ## Fix UDK Path in rEFInd Makefiles - sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/Make.tiano" || true - sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/filesystems/Make.tiano" || true - sed "s|EDK2BASE = /usr/local/UDK2010/MyWorkSpace|EDK2BASE = ${_UDK_DIR}|g" -i "${srcdir}/refind-${pkgver}/gptsync/Make.tiano" || true + msg "Compile UDK Libraries" + "${EDK_TOOLS_PATH}/BinWrappers/PosixLike/build" -p "${_UDK_TARGET}" -a "${_TIANO_ARCH}" -b "${_TIANOCORE_TARGET}" -t "${_COMPILER}" + echo + + cd "${srcdir}/refind-${pkgver}/" - ## Unset all FLAGS + msg "Unset all compiler FLAGS" unset CFLAGS unset CPPFLAGS unset CXXFLAGS unset LDFLAGS unset MAKEFLAGS - ## Compile refind.efi + msg "Compile rEFInd UEFI application" make tiano + echo - ## Compile UEFI FS drivers + msg "Compile UEFI FS drivers" make fs + echo } package() { - ## Install the rEFInd UEFI application + msg "Install the rEFInd UEFI application" install -d "${pkgdir}/usr/lib/refind/" install -D -m0644 "${srcdir}/refind-${pkgver}/refind/refind_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/refind_${_TIANO_S_ARCH}.efi" - ## Install UEFI drivers built from rEFInd + msg "Install UEFI drivers built from rEFInd" install -d "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" install -D -m0644 "${srcdir}/refind-${pkgver}/drivers_${_TIANO_S_ARCH}"/*.efi "${pkgdir}/usr/lib/refind/drivers_${_TIANO_S_ARCH}/" - ## Install UEFI applications built from rEFInd + msg "Install UEFI applications built from rEFInd" install -d "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}" install -D -m0644 "${srcdir}/refind-${pkgver}/gptsync/gptsync_${_TIANO_S_ARCH}.efi" "${pkgdir}/usr/lib/refind/tools_${_TIANO_S_ARCH}/gptsync_${_TIANO_S_ARCH}.efi" - ## Install the rEFInd config file + msg "Install the rEFInd config file" install -d "${pkgdir}/usr/lib/refind/config/" install -D -m0644 "${srcdir}/refind-${pkgver}/refind.conf-sample" "${pkgdir}/usr/lib/refind/config/refind.conf" install -D -m0644 "${srcdir}/refind_linux.conf" "${pkgdir}/usr/lib/refind/config/refind_linux.conf" - ## Install the rEFInd docs + msg "Install the rEFInd docs" install -d "${pkgdir}/usr/share/refind/docs/html/" install -d "${pkgdir}/usr/share/refind/docs/Styles/" install -D -m0644 "${srcdir}/refind-${pkgver}/docs/refind"/* "${pkgdir}/usr/share/refind/docs/html/" @@ -174,37 +205,29 @@ package() { install -D -m0644 "${srcdir}/refind-${pkgver}/NEWS.txt" "${pkgdir}/usr/share/refind/docs/NEWS" rm -f "${pkgdir}/usr/share/refind/docs/html/.DS_Store" || true - ## Install the rEFInd fonts + msg "Install the rEFInd fonts" install -d "${pkgdir}/usr/share/refind/fonts/" install -D -m0644 "${srcdir}/refind-${pkgver}/fonts"/* "${pkgdir}/usr/share/refind/fonts/" rm -f "${pkgdir}/usr/share/refind/fonts/mkfont.sh" - ## Install the rEFInd mkfont.sh + msg "Install the rEFInd mkfont.sh" install -d "${pkgdir}/usr/bin/" install -D -m0755 "${srcdir}/refind-${pkgver}/fonts/mkfont.sh" "${pkgdir}/usr/bin/refind-mkfont" - ## Install the rEFInd icons + msg "Install the rEFInd icons" install -d "${pkgdir}/usr/share/refind/icons/" install -D -m0644 "${srcdir}/refind-${pkgver}/icons"/* "${pkgdir}/usr/share/refind/icons/" - ## Install the rEFInd images + msg "Install the rEFInd images" install -d "${pkgdir}/usr/share/refind/images/" install -D -m0644 "${srcdir}/refind-${pkgver}/images"/*.{png,bmp} "${pkgdir}/usr/share/refind/images/" - ## Install the rEFInd keys + msg "Install the rEFInd keys" install -d "${pkgdir}/usr/share/refind/keys/" install -D -m0644 "${srcdir}/refind-${pkgver}/keys"/* "${pkgdir}/usr/share/refind/keys/" - ## Install the rEFIt license file, since rEFInd is a fork of rEFIt + msg "Install the rEFIt license file, since rEFInd is a fork of rEFIt" install -d "${pkgdir}/usr/share/licenses/refind/" install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" } -sha1sums=('f71f00dbbe8c068c9ef80f468835c998832d364f' - '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') diff --git a/extra/refind-efi/UDK-MdePkg-Revert-PathNodeCount.patch b/extra/refind-efi/UDK-MdePkg-Revert-PathNodeCount.patch deleted file mode 100644 index 1b8f5a44b..000000000 --- a/extra/refind-efi/UDK-MdePkg-Revert-PathNodeCount.patch +++ /dev/null @@ -1,660 +0,0 @@ -commit 771729c77fa49cf0ff17491f371003c4f5d66f85 -Author: niruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524> -Date: Mon Sep 24 03:20:35 2012 +0000 - - Add new API IsDevicePathValid() to UefiDevicePathLib. - - Signed-off-by: Ruiyu Ni<ruiyu.ni@intel.com> - Reviewed-by: Liming Gao<liming.gao@intel.com> - Reviewed-by: Kinney Michael D<michael.d.kinney@intel.com> - - git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13737 6f19259b-4bc3-4df7-8a09-765794883524 - -diff --git a/MdePkg/Include/Library/DevicePathLib.h b/MdePkg/Include/Library/DevicePathLib.h -index 68b1f1b..37acd45 100644 ---- a/MdePkg/Include/Library/DevicePathLib.h -+++ b/MdePkg/Include/Library/DevicePathLib.h -@@ -4,7 +4,7 @@ - This library provides defines, macros, and functions to help create and parse
- EFI_DEVICE_PATH_PROTOCOL structures.
-
--Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-+Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials are licensed and made available under
- the terms and conditions of the BSD License that accompanies this distribution.
- The full text of the license may be found at
-@@ -21,6 +21,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - #define END_DEVICE_PATH_LENGTH (sizeof (EFI_DEVICE_PATH_PROTOCOL))
-
- /**
-+ Determine whether a given device path is valid.
-+ If DevicePath is NULL, then ASSERT().
-+
-+ @param DevicePath A pointer to a device path data structure.
-+ @param MaxSize The maximum size of the device path data structure.
-+
-+ @retval TRUE DevicePath is valid.
-+ @retval FALSE The length of any node node in the DevicePath is less
-+ than sizeof (EFI_DEVICE_PATH_PROTOCOL).
-+ @retval FALSE If MaxSize is not zero, the size of the DevicePath
-+ exceeds MaxSize.
-+ @retval FALSE If PcdMaximumDevicePathNodeCount is not zero, the node
-+ count of the DevicePath exceeds PcdMaximumDevicePathNodeCount.
-+**/
-+BOOLEAN
-+EFIAPI
-+IsDevicePathValid (
-+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
-+ IN UINTN MaxSize
-+ );
-+
-+/**
- Returns the Type field of a device path node.
-
- Returns the Type field of the device path node specified by Node.
-@@ -123,7 +145,8 @@ IsDevicePathEndType ( - Determines if a device path node is an end node of an entire device path.
-
- Determines if a device path node specified by Node is an end node of an entire device path.
-- If Node represents the end of an entire device path, then TRUE is returned. Otherwise, FALSE is returned.
-+ If Node represents the end of an entire device path, then TRUE is returned.
-+ Otherwise, FALSE is returned.
-
- If Node is NULL, then ASSERT().
-
-@@ -143,7 +166,8 @@ IsDevicePathEnd ( - Determines if a device path node is an end node of a device path instance.
-
- Determines if a device path node specified by Node is an end node of a device path instance.
-- If Node represents the end of a device path instance, then TRUE is returned. Otherwise, FALSE is returned.
-+ If Node represents the end of a device path instance, then TRUE is returned.
-+ Otherwise, FALSE is returned.
-
- If Node is NULL, then ASSERT().
-
-@@ -169,6 +193,7 @@ IsDevicePathEndInstance ( -
- If Node is NULL, then ASSERT().
- If NodeLength >= 0x10000, then ASSERT().
-+ If NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL), then ASSERT().
-
- @param Node A pointer to a device path node data structure.
- @param Length The length, in bytes, of the device path node.
-@@ -208,13 +233,14 @@ SetDevicePathEndNode ( - /**
- Returns the size of a device path in bytes.
-
-- This function returns the size, in bytes, of the device path data structure specified by
-- DevicePath including the end of device path node. If DevicePath is NULL, then 0 is returned.
-+ This function returns the size, in bytes, of the device path data structure
-+ specified by DevicePath including the end of device path node.
-+ If DevicePath is NULL or invalid, then 0 is returned.
-
-- @param DevicePath A pointer to a device path data structure.
--
-- @retval 0 DevicePath is NULL.
-- @retval Others The size of a device path in bytes.
-+ @param DevicePath A pointer to a device path data structure.
-+
-+ @retval 0 If DevicePath is NULL or invalid.
-+ @retval Others The size of a device path in bytes.
-
- **/
- UINTN
-@@ -235,7 +261,7 @@ GetDevicePathSize ( -
- @param DevicePath A pointer to a device path data structure.
-
-- @retval NULL DevicePath is NULL.
-+ @retval NULL DevicePath is NULL or invalid.
- @retval Others A pointer to the duplicated device path.
-
- **/
-@@ -263,6 +289,7 @@ DuplicateDevicePath ( - @param SecondDevicePath A pointer to a device path data structure.
-
- @retval NULL If there is not enough memory for the newly allocated buffer.
-+ @retval NULL If FirstDevicePath or SecondDevicePath is invalid.
- @retval Others A pointer to the new device path if success.
- Or a copy an end-of-device-path if both FirstDevicePath and SecondDevicePath are NULL.
-
-@@ -316,6 +343,7 @@ AppendDevicePathNode ( - and a new end-of-device-path-instance node is inserted between.
- If DevicePath is NULL, then a copy if DevicePathInstance is returned.
- If DevicePathInstance is NULL, then NULL is returned.
-+ If DevicePath or DevicePathInstance is invalid, then NULL is returned.
- If there is not enough memory to allocate space for the new device path, then NULL is returned.
- The memory is allocated from EFI boot services memory. It is the responsibility of the caller to
- free the memory allocated.
-@@ -341,6 +369,7 @@ AppendDevicePathInstance ( - point to the next device path instance in the device path (or NULL if no more) and updates Size
- to hold the size of the device path instance copy.
- If DevicePath is NULL, then NULL is returned.
-+ If DevicePath points to a invalid device path, then NULL is returned.
- If there is not enough memory to allocate space for the new device path, then NULL is returned.
- The memory is allocated from EFI boot services memory. It is the responsibility of the caller to
- free the memory allocated.
-@@ -394,12 +423,13 @@ CreateDeviceNode ( - Determines if a device path is single or multi-instance.
-
- This function returns TRUE if the device path specified by DevicePath is multi-instance.
-- Otherwise, FALSE is returned. If DevicePath is NULL, then FALSE is returned.
-+ Otherwise, FALSE is returned.
-+ If DevicePath is NULL or invalid, then FALSE is returned.
-
- @param DevicePath A pointer to a device path data structure.
-
- @retval TRUE DevicePath is multi-instance.
-- @retval FALSE DevicePath is not multi-instance, or DevicePath is NULL.
-+ @retval FALSE DevicePath is not multi-instance, or DevicePath is NULL or invalid.
-
- **/
- BOOLEAN
-diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c -index db065e4..a91a7a3 100644 ---- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c -+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.c -@@ -8,7 +8,7 @@ - environment varibles. Multi-instance device paths should never be placed
- on a Handle.
-
-- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
-@@ -28,6 +28,7 @@ - #include <Library/MemoryAllocationLib.h>
- #include <Library/UefiBootServicesTableLib.h>
- #include <Library/BaseLib.h>
-+#include <Library/PcdLib.h>
-
- //
- // Template for an end-of-device path node.
-@@ -42,6 +43,61 @@ GLOBAL_REMOVE_IF_UNREFERENCED CONST EFI_DEVICE_PATH_PROTOCOL mUefiDevicePathLib - };
-
- /**
-+ Determine whether a given device path is valid.
-+ If DevicePath is NULL, then ASSERT().
-+
-+ @param DevicePath A pointer to a device path data structure.
-+ @param MaxSize The maximum size of the device path data structure.
-+
-+ @retval TRUE DevicePath is valid.
-+ @retval FALSE The length of any node node in the DevicePath is less
-+ than sizeof (EFI_DEVICE_PATH_PROTOCOL).
-+ @retval FALSE If MaxSize is not zero, the size of the DevicePath
-+ exceeds MaxSize.
-+ @retval FALSE If PcdMaximumDevicePathNodeCount is not zero, the node
-+ count of the DevicePath exceeds PcdMaximumDevicePathNodeCount.
-+**/
-+BOOLEAN
-+EFIAPI
-+IsDevicePathValid (
-+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
-+ IN UINTN MaxSize
-+ )
-+{
-+ UINTN Count;
-+ UINTN Size;
-+ UINTN NodeLength;
-+
-+ ASSERT (DevicePath != NULL);
-+
-+ for (Count = 0, Size = 0; !IsDevicePathEnd (DevicePath); DevicePath = NextDevicePathNode (DevicePath)) {
-+ NodeLength = DevicePathNodeLength (DevicePath);
-+ if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
-+ return FALSE;
-+ }
-+
-+ if (MaxSize > 0) {
-+ Size += NodeLength;
-+ if (Size + END_DEVICE_PATH_LENGTH > MaxSize) {
-+ return FALSE;
-+ }
-+ }
-+
-+ if (PcdGet32 (PcdMaximumDevicePathNodeCount) > 0) {
-+ Count++;
-+ if (Count >= PcdGet32 (PcdMaximumDevicePathNodeCount)) {
-+ return FALSE;
-+ }
-+ }
-+ }
-+
-+ //
-+ // Only return TRUE when the End Device Path node is valid.
-+ //
-+ return (BOOLEAN) (DevicePathNodeLength (DevicePath) == END_DEVICE_PATH_LENGTH);
-+}
-+
-+/**
- Returns the Type field of a device path node.
-
- Returns the Type field of the device path node specified by Node.
-@@ -106,8 +162,12 @@ DevicePathNodeLength ( - IN CONST VOID *Node
- )
- {
-+ UINTN Length;
-+
- ASSERT (Node != NULL);
-- return ReadUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0]);
-+ Length = ReadUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0]);
-+ ASSERT (Length >= sizeof (EFI_DEVICE_PATH_PROTOCOL));
-+ return Length;
- }
-
- /**
-@@ -227,7 +287,8 @@ IsDevicePathEndInstance ( - be used to set the contents of the Length field.
-
- If Node is NULL, then ASSERT().
-- If NodeLength >= 0x10000, then ASSERT().
-+ If NodeLength >= SIZE_64KB, then ASSERT().
-+ If NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL), then ASSERT().
-
- @param Node A pointer to a device path node data structure.
- @param Length The length, in bytes, of the device path node.
-@@ -243,7 +304,7 @@ SetDevicePathNodeLength ( - )
- {
- ASSERT (Node != NULL);
-- ASSERT (Length < 0x10000);
-+ ASSERT ((Length >= sizeof (EFI_DEVICE_PATH_PROTOCOL)) && (Length < SIZE_64KB));
- return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(Length));
- }
-
-@@ -277,12 +338,12 @@ SetDevicePathEndNode ( - Returns the size of a device path in bytes.
-
- This function returns the size, in bytes, of the device path data structure
-- specified by DevicePath including the end of device path node. If DevicePath
-- is NULL, then 0 is returned.
-+ specified by DevicePath including the end of device path node.
-+ If DevicePath is NULL or invalid, then 0 is returned.
-
- @param DevicePath A pointer to a device path data structure.
--
-- @retval 0 If DevicePath is NULL.
-+
-+ @retval 0 If DevicePath is NULL or invalid.
- @retval Others The size of a device path in bytes.
-
- **/
-@@ -298,6 +359,10 @@ GetDevicePathSize ( - return 0;
- }
-
-+ if (!IsDevicePathValid (DevicePath, 0)) {
-+ return 0;
-+ }
-+
- //
- // Search for the end of the device path structure
- //
-@@ -324,7 +389,7 @@ GetDevicePathSize ( -
- @param DevicePath A pointer to a device path data structure.
-
-- @retval NULL If DevicePath is NULL.
-+ @retval NULL DevicePath is NULL or invalid.
- @retval Others A pointer to the duplicated device path.
-
- **/
-@@ -370,6 +435,7 @@ DuplicateDevicePath ( - @param SecondDevicePath A pointer to a device path data structure.
-
- @retval NULL If there is not enough memory for the newly allocated buffer.
-+ @retval NULL If FirstDevicePath or SecondDevicePath is invalid.
- @retval Others A pointer to the new device path if success.
- Or a copy an end-of-device-path if both FirstDevicePath and SecondDevicePath are NULL.
-
-@@ -398,6 +464,10 @@ AppendDevicePath ( - return DuplicateDevicePath (FirstDevicePath);
- }
-
-+ if (!IsDevicePathValid (FirstDevicePath, 0) || !IsDevicePathValid (SecondDevicePath, 0)) {
-+ return NULL;
-+ }
-+
- //
- // Allocate space for the combined device path. It only has one end node of
- // length EFI_DEVICE_PATH_PROTOCOL.
-@@ -500,6 +570,7 @@ AppendDevicePathNode ( - path instance and a new end-of-device-path-instance node is inserted between.
- If DevicePath is NULL, then a copy if DevicePathInstance is returned.
- If DevicePathInstance is NULL, then NULL is returned.
-+ If DevicePath or DevicePathInstance is invalid, then NULL is returned.
- If there is not enough memory to allocate space for the new device path, then
- NULL is returned.
- The memory is allocated from EFI boot services memory. It is the responsibility
-@@ -531,6 +602,10 @@ AppendDevicePathInstance ( - return NULL;
- }
-
-+ if (!IsDevicePathValid (DevicePath, 0) || !IsDevicePathValid (DevicePathInstance, 0)) {
-+ return NULL;
-+ }
-+
- SrcSize = GetDevicePathSize (DevicePath);
- InstanceSize = GetDevicePathSize (DevicePathInstance);
-
-@@ -559,6 +634,7 @@ AppendDevicePathInstance ( - DevicePath to point to the next device path instance in the device path (or NULL
- if no more) and updates Size to hold the size of the device path instance copy.
- If DevicePath is NULL, then NULL is returned.
-+ If DevicePath points to a invalid device path, then NULL is returned.
- If there is not enough memory to allocate space for the new device path, then
- NULL is returned.
- The memory is allocated from EFI boot services memory. It is the responsibility
-@@ -596,6 +672,10 @@ GetNextDevicePathInstance ( - return NULL;
- }
-
-+ if (!IsDevicePathValid (*DevicePath, 0)) {
-+ return NULL;
-+ }
-+
- //
- // Find the end of the device path instance
- //
-@@ -681,13 +761,14 @@ CreateDeviceNode ( -
- This function returns TRUE if the device path specified by DevicePath is
- multi-instance.
-- Otherwise, FALSE is returned. If DevicePath is NULL, then FALSE is returned.
-+ Otherwise, FALSE is returned.
-+ If DevicePath is NULL or invalid, then FALSE is returned.
-
- @param DevicePath A pointer to a device path data structure.
-
- @retval TRUE DevicePath is multi-instance.
-- @retval FALSE DevicePath is not multi-instance or DevicePath
-- is NULL.
-+ @retval FALSE DevicePath is not multi-instance, or DevicePath
-+ is NULL or invalid.
-
- **/
- BOOLEAN
-@@ -702,6 +783,10 @@ IsDevicePathMultiInstance ( - return FALSE;
- }
-
-+ if (!IsDevicePathValid (DevicePath, 0)) {
-+ return FALSE;
-+ }
-+
- Node = DevicePath;
- while (!IsDevicePathEnd (Node)) {
- if (IsDevicePathEndInstance (Node)) {
-@@ -776,15 +861,14 @@ FileDevicePath ( - IN CONST CHAR16 *FileName
- )
- {
-- UINT16 Size;
-+ UINTN Size;
- FILEPATH_DEVICE_PATH *FilePath;
- EFI_DEVICE_PATH_PROTOCOL *DevicePath;
- EFI_DEVICE_PATH_PROTOCOL *FileDevicePath;
-
- DevicePath = NULL;
-
-- Size = (UINT16) StrSize (FileName);
--
-+ Size = StrSize (FileName);
- FileDevicePath = AllocatePool (Size + SIZE_OF_FILEPATH_DEVICE_PATH + END_DEVICE_PATH_LENGTH);
- if (FileDevicePath != NULL) {
- FilePath = (FILEPATH_DEVICE_PATH *) FileDevicePath;
-diff --git a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf -index c34301d..2ae151d 100644 ---- a/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf -+++ b/MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf -@@ -3,7 +3,7 @@ - #
- # Device Path Library that layers on top of the Memory Allocation Library.
- #
--# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
- #
- # This program and the accompanying materials
- # are licensed and made available under the terms and conditions of the BSD License
-@@ -42,8 +42,10 @@ - MemoryAllocationLib
- DebugLib
- BaseMemoryLib
--
-+ PcdLib
-
- [Protocols]
- gEfiDevicePathProtocolGuid ## CONSUMES
-
-+[Pcd]
-+ gEfiMdePkgTokenSpaceGuid.PcdMaximumDevicePathNodeCount
-diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c -index 8275dd6..1052988 100644 ---- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c -+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLib.c -@@ -2,7 +2,7 @@ - Library instance that implement UEFI Device Path Library class based on protocol
- gEfiDevicePathUtilitiesProtocolGuid.
-
-- Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-+ Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>
- This program and the accompanying materials
- are licensed and made available under the terms and conditions of the BSD License
- which accompanies this distribution. The full text of the license may be found at
-@@ -24,6 +24,7 @@ - #include <Library/MemoryAllocationLib.h>
- #include <Library/BaseMemoryLib.h>
- #include <Library/UefiBootServicesTableLib.h>
-+#include <Library/PcdLib.h>
-
- EFI_DEVICE_PATH_UTILITIES_PROTOCOL *mDevicePathUtilities = NULL;
-
-@@ -72,6 +73,61 @@ DevicePathLibConstructor ( - }
-
- /**
-+ Determine whether a given device path is valid.
-+ If DevicePath is NULL, then ASSERT().
-+
-+ @param DevicePath A pointer to a device path data structure.
-+ @param MaxSize The maximum size of the device path data structure.
-+
-+ @retval TRUE DevicePath is valid.
-+ @retval FALSE The length of any node node in the DevicePath is less
-+ than sizeof (EFI_DEVICE_PATH_PROTOCOL).
-+ @retval FALSE If MaxSize is not zero, the size of the DevicePath
-+ exceeds MaxSize.
-+ @retval FALSE If PcdMaximumDevicePathNodeCount is not zero, the node
-+ count of the DevicePath exceeds PcdMaximumDevicePathNodeCount.
-+**/
-+BOOLEAN
-+EFIAPI
-+IsDevicePathValid (
-+ IN CONST EFI_DEVICE_PATH_PROTOCOL *DevicePath,
-+ IN UINTN MaxSize
-+ )
-+{
-+ UINTN Count;
-+ UINTN Size;
-+ UINTN NodeLength;
-+
-+ ASSERT (DevicePath != NULL);
-+
-+ for (Count = 0, Size = 0; !IsDevicePathEnd (DevicePath); DevicePath = NextDevicePathNode (DevicePath)) {
-+ NodeLength = DevicePathNodeLength (DevicePath);
-+ if (NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL)) {
-+ return FALSE;
-+ }
-+
-+ if (MaxSize > 0) {
-+ Size += NodeLength;
-+ if (Size + END_DEVICE_PATH_LENGTH > MaxSize) {
-+ return FALSE;
-+ }
-+ }
-+
-+ if (PcdGet32 (PcdMaximumDevicePathNodeCount) > 0) {
-+ Count++;
-+ if (Count >= PcdGet32 (PcdMaximumDevicePathNodeCount)) {
-+ return FALSE;
-+ }
-+ }
-+ }
-+
-+ //
-+ // Only return TRUE when the End Device Path node is valid.
-+ //
-+ return (BOOLEAN) (DevicePathNodeLength (DevicePath) == END_DEVICE_PATH_LENGTH);
-+}
-+
-+/**
- Returns the Type field of a device path node.
-
- Returns the Type field of the device path node specified by Node.
-@@ -136,8 +192,12 @@ DevicePathNodeLength ( - IN CONST VOID *Node
- )
- {
-+ UINTN Length;
-+
- ASSERT (Node != NULL);
-- return ReadUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0]);
-+ Length = ReadUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0]);
-+ ASSERT (Length >= sizeof (EFI_DEVICE_PATH_PROTOCOL));
-+ return Length;
- }
-
- /**
-@@ -256,7 +316,8 @@ IsDevicePathEndInstance ( - be used to set the contents of the Length field.
-
- If Node is NULL, then ASSERT().
-- If NodeLength >= 0x10000, then ASSERT().
-+ If NodeLength >= SIZE_64KB, then ASSERT().
-+ If NodeLength < sizeof (EFI_DEVICE_PATH_PROTOCOL), then ASSERT().
-
- @param Node A pointer to a device path node data structure.
- @param Length The length, in bytes, of the device path node.
-@@ -272,7 +333,7 @@ SetDevicePathNodeLength ( - )
- {
- ASSERT (Node != NULL);
-- ASSERT (Length < 0x10000);
-+ ASSERT ((Length >= sizeof (EFI_DEVICE_PATH_PROTOCOL)) && (Length < SIZE_64KB));
- return WriteUnaligned16 ((UINT16 *)&((EFI_DEVICE_PATH_PROTOCOL *)(Node))->Length[0], (UINT16)(Length));
- }
-
-@@ -305,13 +366,14 @@ SetDevicePathEndNode ( - /**
- Returns the size of a device path in bytes.
-
-- This function returns the size, in bytes, of the device path data structure specified by
-- DevicePath including the end of device path node. If DevicePath is NULL, then 0 is returned.
-+ This function returns the size, in bytes, of the device path data structure
-+ specified by DevicePath including the end of device path node.
-+ If DevicePath is NULL or invalid, then 0 is returned.
-
-- @param DevicePath A pointer to a device path data structure.
--
-- @retval 0 If DevicePath is NULL.
-- @retval Others The size of a device path in bytes.
-+ @param DevicePath A pointer to a device path data structure.
-+
-+ @retval 0 If DevicePath is NULL or invalid.
-+ @retval Others The size of a device path in bytes.
-
- **/
- UINTN
-@@ -336,7 +398,7 @@ GetDevicePathSize ( -
- @param DevicePath A pointer to a device path data structure.
-
-- @retval NULL If DevicePath is NULL.
-+ @retval NULL If DevicePath is NULL or invalid.
- @retval Others A pointer to the duplicated device path.
-
- **/
-@@ -367,6 +429,7 @@ DuplicateDevicePath ( - @param SecondDevicePath A pointer to a device path data structure.
-
- @retval NULL If there is not enough memory for the newly allocated buffer.
-+ @retval NULL If FirstDevicePath or SecondDevicePath is invalid.
- @retval Others A pointer to the new device path if success.
- Or a copy an end-of-device-path if both FirstDevicePath and
- SecondDevicePath are NULL.
-@@ -431,6 +494,7 @@ AppendDevicePathNode ( - path instance and a new end-of-device-path-instance node is inserted between.
- If DevicePath is NULL, then a copy if DevicePathInstance is returned.
- If DevicePathInstance is NULL, then NULL is returned.
-+ If DevicePath or DevicePathInstance is invalid, then NULL is returned.
- If there is not enough memory to allocate space for the new device path, then
- NULL is returned.
- The memory is allocated from EFI boot services memory. It is the responsibility
-@@ -524,15 +588,16 @@ CreateDeviceNode ( - /**
- Determines if a device path is single or multi-instance.
-
-- This function returns TRUE if the device path specified by DevicePath is
-+ This function returns TRUE if the device path specified by DevicePath is
- multi-instance.
-- Otherwise, FALSE is returned. If DevicePath is NULL, then FALSE is returned.
-+ Otherwise, FALSE is returned.
-+ If DevicePath is NULL or invalid, then FALSE is returned.
-
- @param DevicePath A pointer to a device path data structure.
-
- @retval TRUE DevicePath is multi-instance.
-- @retval FALSE DevicePath is not multi-instance or DevicePath
-- is NULL.
-+ @retval FALSE DevicePath is not multi-instance, or DevicePath
-+ is NULL or invalid.
-
- **/
- BOOLEAN
-diff --git a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf -index 3393830..16b47e3 100644 ---- a/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf -+++ b/MdePkg/Library/UefiDevicePathLibDevicePathProtocol/UefiDevicePathLibDevicePathProtocol.inf -@@ -4,7 +4,7 @@ - # Device Path Library that layers on top of the UEFI 2.0 Device Path Protocol.
- # This library is not available for EFI 1.10 modules.
- #
--# Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR>
-+# Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>
- #
- # This program and the accompanying materials
- # are licensed and made available under the terms and conditions of the BSD License
-@@ -44,11 +44,14 @@ - MemoryAllocationLib
- BaseLib
- DebugLib
--
-+ PcdLib
-
- [Protocols]
- gEfiDevicePathProtocolGuid ## CONSUMES
- gEfiDevicePathUtilitiesProtocolGuid ## CONSUMES
-
-+[Pcd]
-+ gEfiMdePkgTokenSpaceGuid.PcdMaximumDevicePathNodeCount
-+
- [Depex.common.DXE_DRIVER, Depex.common.DXE_RUNTIME_DRIVER, Depex.common.DXE_SAL_DRIVER, Depex.common.DXE_SMM_DRIVER]
- gEfiDevicePathUtilitiesProtocolGuid
-diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec -index b29cb01..aefba3f 100644 ---- a/MdePkg/MdePkg.dec -+++ b/MdePkg/MdePkg.dec -@@ -1287,6 +1287,9 @@ - ## Indicates the maximum node number of linked list
- gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000|UINT32|0x00000003
-
-+ ## Indicates the maximum node number of device path
-+ gEfiMdePkgTokenSpaceGuid.PcdMaximumDevicePathNodeCount|0|UINT32|0x00000029
-+
- ## Indicates the timeout tick of holding spin lock
- gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000|UINT32|0x00000004
-
diff --git a/extra/refind-efi/refind_include_more_shell_paths.patch b/extra/refind-efi/refind_include_more_shell_paths.patch deleted file mode 100644 index 078322e1a..000000000 --- a/extra/refind-efi/refind_include_more_shell_paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/refind/main.c b/refind/main.c -index beac3bf..1a2cf58 100644 ---- a/refind/main.c -+++ b/refind/main.c -@@ -62,5 +62,5 @@ - #define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\EFI\\tools\\shellia32.efi,\\shellia32.efi" - #define DRIVER_DIRS L"drivers,drivers_ia32" - #else --#define SHELL_NAMES L"\\EFI\\tools\\shell.efi" -+#define SHELL_NAMES L"\\EFI\\tools\\shell.efi,\\shell.efi" - #define DRIVER_DIRS L"drivers" - #endif - 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/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 |