From 3ff90101074484f08d42a36a095206b516d182c0 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 20 Oct 2013 01:03:58 -0700 Subject: Sun Oct 20 01:03:34 PDT 2013 --- community/freeorion/PKGBUILD | 4 +- community/gdal/PKGBUILD | 4 +- community/nodejs/PKGBUILD | 6 +- community/python-pymongo/PKGBUILD | 15 +- community/python-pytables/PKGBUILD | 4 +- community/python2-xapian/PKGBUILD | 11 +- community/rubinius/PKGBUILD | 30 +- community/vtk/PKGBUILD | 4 +- community/zeromq/PKGBUILD | 9 +- core/dosfstools/PKGBUILD | 6 +- core/gcc/PKGBUILD | 14 +- core/libtool/PKGBUILD | 8 +- core/logrotate/PKGBUILD | 8 +- core/logrotate/logrotate.cron.daily | 6 +- core/pam/PKGBUILD | 15 +- core/pam/pam.install | 2 +- core/xinetd/PKGBUILD | 13 +- core/xinetd/fix-CVE-2013-4342.patch | 13 + extra/gnome-calculator/PKGBUILD | 6 +- extra/hdf5-cpp-fortran/PKGBUILD | 4 +- extra/hdf5-openmpi/PKGBUILD | 4 +- extra/hdf5/PKGBUILD | 6 +- extra/hdf5/mpi.patch | 18 - extra/mesa/PKGBUILD | 6 +- extra/netcdf/PKGBUILD | 6 +- extra/octave/PKGBUILD | 4 +- extra/pyqt5/PKGBUILD | 4 +- extra/qpdf/PKGBUILD | 6 +- extra/qt5/PKGBUILD | 7 +- extra/samba/PKGBUILD | 16 +- extra/samba/swat.socket | 9 - extra/samba/swat.xinetd | 10 - extra/samba/swat@.service | 7 - extra/vc/PKGBUILD | 13 +- extra/vigra/PKGBUILD | 10 +- libre-testing/syslinux/PKGBUILD | 169 -------- libre-testing/syslinux/splash.png | Bin 11947 -> 0 bytes libre-testing/syslinux/splash.xcf | Bin 30757 -> 0 bytes .../syslinux/syslinux-6.00-efi-export-kbdmap.patch | 38 -- .../syslinux/syslinux-6.00-efi-fix-libcom32.patch | 45 -- .../syslinux-dont-build-dos-windows-targets.patch | 12 - libre-testing/syslinux/syslinux-install_update | 461 --------------------- libre-testing/syslinux/syslinux.cfg | 78 ---- libre-testing/syslinux/syslinux.install | 36 -- libre/linux-libre-lts/PKGBUILD | 10 +- libre/mesa-libcl/PKGBUILD | 4 +- libre/syslinux/PKGBUILD | 193 +++++++-- .../syslinux/syslinux-6.00-efi-export-kbdmap.patch | 38 ++ .../syslinux/syslinux-6.00-efi-fix-libcom32.patch | 45 ++ .../syslinux/syslinux-6.02-fix-chainloading.patch | 47 +++ .../syslinux-dont-build-dos-windows-targets.patch | 6 +- libre/syslinux/syslinux-install_update | 104 +++-- libre/syslinux/syslinux.cfg | 31 +- libre/syslinux/syslinux.install | 25 +- libre/vim/PKGBUILD | 228 ++++++++++ libre/vim/gvim.desktop | 63 +++ libre/vim/gvim.install | 11 + libre/vim/parabola.vim | 27 ++ libre/vim/vimrc | 16 + pcr/xchat-otr/PKGBUILD | 31 ++ 60 files changed, 890 insertions(+), 1136 deletions(-) create mode 100644 core/xinetd/fix-CVE-2013-4342.patch delete mode 100644 extra/hdf5/mpi.patch delete mode 100644 extra/samba/swat.socket delete mode 100644 extra/samba/swat.xinetd delete mode 100644 extra/samba/swat@.service delete mode 100644 libre-testing/syslinux/PKGBUILD delete mode 100644 libre-testing/syslinux/splash.png delete mode 100644 libre-testing/syslinux/splash.xcf delete mode 100644 libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch delete mode 100644 libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch delete mode 100644 libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch delete mode 100644 libre-testing/syslinux/syslinux-install_update delete mode 100644 libre-testing/syslinux/syslinux.cfg delete mode 100644 libre-testing/syslinux/syslinux.install create mode 100644 libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch create mode 100644 libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch create mode 100644 libre/syslinux/syslinux-6.02-fix-chainloading.patch create mode 100644 libre/vim/PKGBUILD create mode 100644 libre/vim/gvim.desktop create mode 100644 libre/vim/gvim.install create mode 100644 libre/vim/parabola.vim create mode 100644 libre/vim/vimrc create mode 100644 pcr/xchat-otr/PKGBUILD diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD index f63c1e3a5..2639d3686 100644 --- a/community/freeorion/PKGBUILD +++ b/community/freeorion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98796 2013-10-18 19:26:47Z arodseth $ +# $Id: PKGBUILD 98802 2013-10-18 22:43:31Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Elmo Todurov # Contributor: guini @@ -9,7 +9,7 @@ pkgname=freeorion pkgver=0.4.3 pkgrel=3 -_svnrev=6454 +_svnrev=6281 #6454 _pyversion=2.7 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion' arch=('x86_64' 'i686') diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD index d2e69c4d9..8c4fa06a5 100644 --- a/community/gdal/PKGBUILD +++ b/community/gdal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 94922 2013-08-01 07:01:13Z bpiotrowski $ +# $Id: PKGBUILD 98822 2013-10-19 13:51:33Z bpiotrowski $ # Maintainer: Jaroslav Lichtblau # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea pkgname=gdal pkgver=1.10.0 -pkgrel=2 +pkgrel=5 pkgdesc="A translator library for raster geospatial data formats" arch=('i686' 'x86_64') url="http://www.gdal.org/" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index b2a2985d2..f1541fa4e 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 97916 2013-10-01 05:49:26Z bpiotrowski $ +# $Id: PKGBUILD 98813 2013-10-19 09:02:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.20 +pkgver=0.10.21 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz) -sha256sums=('b5af00d4d43644f37caa2dad5fa81e6f898ebb7b238f02a1cddfcff11c81e649') +sha256sums=('7c125bf22c1756064f2a68310d4822f77c8134ce178b2faa6155671a8124140d') prepare() { cd node-v$pkgver diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD index 223b665d5..cc7ccaece 100644 --- a/community/python-pymongo/PKGBUILD +++ b/community/python-pymongo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 98558 2013-10-14 02:55:13Z fyan $ +# $Id: PKGBUILD 98824 2013-10-19 20:51:12Z arodseth $ # Maintainer: Alexander Rødseth # Maintainer: Felix Yan # Contributor: Thomas S Hatch @@ -7,33 +7,32 @@ pkgbase=python-pymongo pkgname=('python-pymongo' 'python2-pymongo') pkgver=2.6.3 -pkgrel=1 -pkgdesc='Python driver for MongoDB' +pkgrel=2 +pkgdesc='Python module for using MongoDB' arch=('x86_64' 'i686') license=('APACHE') url='http://pypi.python.org/pypi/pymongo/' makedepends=('python-setuptools' 'python2-setuptools') +optdepends=('mongodb: High-performance schema-free document-oriented database') source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") +sha256sums=('cabe1d785ad5db6ed8ff70dcb9c987958fc75400f066ec78911ca3f37184a4e2') build() { - cd "$srcdir" - cp -a "pymongo-$pkgver" "pymongo2-$pkgver" } package_python2-pymongo() { depends=('python2') - cd "$srcdir/pymongo2-$pkgver" + cd "pymongo2-$pkgver" python2 setup.py install --root="$pkgdir" --optimize=1 } package_python-pymongo() { depends=('python') - cd "$srcdir/pymongo-$pkgver" + cd "pymongo-$pkgver" python setup.py install --root="$pkgdir" --optimize=1 } # vim:set ts=2 sw=2 et: -sha512sums=('6da3cbf035b52379c24df37b76e1eb743b12c1026116e28e4e7b6450e2674d730f9c8c2dd85f352c6ee4c9f604decaffc2dbc57fe64268bd7522d8ce155cca9e') diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD index 02b6a74a5..13b571262 100644 --- a/community/python-pytables/PKGBUILD +++ b/community/python-pytables/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93702 2013-07-08 14:16:08Z aginiewicz $ +# $Id: PKGBUILD 98817 2013-10-19 13:44:44Z bpiotrowski $ # Maintainer: Andrzej Giniewicz # Contributor: Sebastien Binet pkgbase=python-pytables pkgname=('python2-pytables' 'python-pytables') pkgver=3.0.0 -pkgrel=3 +pkgrel=4 arch=("i686" "x86_64") pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data" url="http://www.pytables.org" diff --git a/community/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD index 644433171..9e02f497c 100644 --- a/community/python2-xapian/PKGBUILD +++ b/community/python2-xapian/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 98789 2013-10-18 14:46:35Z fyan $ +# $Id: PKGBUILD 98807 2013-10-19 01:51:15Z fyan $ # Maintainer: Felix Yan # Contributor: DonVla # Contributor: Hervé Cauwelier pkgname=python2-xapian _realname=xapian-bindings -pkgver=1.3.1 +pkgver=1.2.15 +epoch=1 pkgrel=1 pkgdesc="Python bindings for Xapian" arch=(i686 x86_64) url="http://xapian.org/docs/bindings/python/" license=('GPL') -depends=('python2' "xapian-core=$pkgver") +depends=('python2' "xapian-core=$epoch:$pkgver") source=("http://oligarchy.co.uk/xapian/${pkgver}/${_realname}-$pkgver.tar.gz") build() { cd "$srcdir/${_realname}-$pkgver" - ./configure XAPIAN_CONFIG=/usr/bin/xapian-config-1.3 \ + ./configure XAPIAN_CONFIG=/usr/bin/xapian-config \ --prefix=/usr --with-python \ PYTHON=/usr/bin/python2 @@ -31,4 +32,4 @@ package() { make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: -sha512sums=('e295ab93fe61e038bb5f95786f80ff36bc9cbc486c4d03e457fabc6efa97e7119411afa3aafd29786ab9237505b03c27fdb5d524fdb43db2c2f3550cd41c7396') +sha512sums=('b3733308f0446fa041dcae677b3d3316bd8e775fcd1a1770ca2fab5b60e40463bbbce210cb1161161f6e9f1ff5e5473d38c2dab922b7f4f2705ac165d991c0ec') diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD index e51cf9e29..a2494068f 100644 --- a/community/rubinius/PKGBUILD +++ b/community/rubinius/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 98780 2013-10-18 13:13:13Z heftig $ +# $Id: PKGBUILD 98826 2013-10-19 20:58:03Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgbase=rubinius pkgname=(rubinius rubinius-ruby) -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="Ruby runtime written in Ruby, designed for concurrency" arch=(i686 x86_64) @@ -12,36 +12,20 @@ license=(custom) depends=(llvm-libs libffi openssl libyaml) makedepends=(llvm ruby chrpath) options=(!emptydirs) - -_gems=(bundler-1.3.5.gem - daedalus-core-0.0.1.gem - gems-0.8.3.gem - redcard-1.1.0.gem - rubinius-bridge-1.0.3.gem) - source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2 + http://rubygems.org/downloads/bundler-1.3.5.gem gemrc) - -for _i in "${_gems[@]}"; do - source+=( http://rubygems.org/downloads/${_i} ) -done - -sha256sums=('78d7c2af7ebdf9b477a682cf4793e56e4139abed3cd752282e422d56e63b65b6' - '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614' +sha256sums=('e142c3f201e4ae9f3a6e6671298baabbd9bd906509c663adcf080bff4181ee96' '08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4' - 'baa2a27713fac17ca21bc2515a227cde4b10aa1a01e1365e1ee5372c72816ff0' - '2bcf69bb8fb90dd1f926fb7d8f2d8c9857540e04385ac742999a05c74fe24a05' - '60c73d440f29fc3577eec86de00d55ee5351647d2d450ea48bc6d2ae5a62b8fc' - '246ba09a6506e1c380acccc0e3058e83fec89904572d3214f797ccb604453981') + '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614') prepare() { export GEM_HOME="$srcdir/gemdir" + cd $pkgbase-$pkgver mkdir -p "$GEM_HOME" - gem install --no-user-install -N bundler-1.3.5.gem - cp -n "${_gems[@]}" $pkgbase-$pkgver/vendor/cache + gem install --no-user-install -N ../bundler-1.3.5.gem - cd $pkgbase-$pkgver "$GEM_HOME/bin/bundle" install --local } diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index bcfecb3e8..5db9de80b 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94911 2013-08-01 06:55:45Z bpiotrowski $ +# $Id: PKGBUILD 98818 2013-10-19 13:44:45Z bpiotrowski $ # Maintainer: Andrzej Giniewicz # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Christofer Bertonha @@ -12,7 +12,7 @@ pkgname=vtk pkgver=5.10.1 -pkgrel=9 +pkgrel=10 pkgdesc='A software system for 3D computer graphics, image processing, and visualization.' arch=('i686' 'x86_64') url='http://www.vtk.org/' diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD index 6dd79f795..a91968c25 100644 --- a/community/zeromq/PKGBUILD +++ b/community/zeromq/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 98801 2013-10-18 21:18:46Z kkeen $ +# $Id: PKGBUILD 98805 2013-10-18 23:13:16Z kkeen $ # Maintainer: Kyle Keen pkgname=zeromq pkgver=4.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ." arch=('i686' 'x86_64') url="http://www.zeromq.org" license=('LGPL') -depends=('gcc-libs' 'util-linux') -makedepends=('python2' 'libsodium') -optdepends=('libsodium: for NaCl crypto') +depends=('gcc-libs' 'util-linux' 'libsodium') +makedepends=('python2') source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz https://raw.github.com/zeromq/cppzmq/master/zmq.hpp) md5sums=('e738c310d135e20fa48c5b348da18e22' diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD index 944137a02..d44ff7311 100644 --- a/core/dosfstools/PKGBUILD +++ b/core/dosfstools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191697 2013-07-29 09:44:27Z tpowa $ +# $Id: PKGBUILD 196781 2013-10-19 06:36:41Z tpowa $ # Maintainer: dorphell # Committer: Judd Vinet pkgname=dosfstools -pkgver=3.0.22 +pkgver=3.0.23 pkgrel=1 pkgdesc="DOS filesystem utilities" arch=(i686 x86_64) @@ -10,7 +10,7 @@ depends=('glibc') source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig}) url="http://www.daniel-baumann.ch/software/dosfstools/" license=('GPL2') -md5sums=('301f01ca8a734011c0257134bcf475c8' +md5sums=('bfdca786880a7f1cc9ce8ac68cb1fd51' 'SKIP') build() { diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index aa9d7a479..3cd19c24e 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 193063 2013-08-15 12:08:11Z allan $ +# $Id: PKGBUILD 196786 2013-10-19 06:54:05Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') -pkgver=4.8.1 -pkgrel=3 -_snapshot=4.8-20130725 +pkgver=4.8.2 +pkgrel=1 +#_snapshot=4.8-20130725 pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -15,10 +15,10 @@ 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) - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 gcc-4.8-filename-output.patch) -md5sums=('e21f259bc4c44e61e19a780ad5badfeb' +md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d' '40cb437805e2f7a006aa0d0c3098ab0f') diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index ba2fa2443..8f82cd3f5 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188783 2013-06-20 06:35:11Z allan $ +# $Id: PKGBUILD 196787 2013-10-19 06:54:06Z allan $ # Maintainer: Allan McRae # Contributor: judd @@ -6,12 +6,12 @@ pkgname=('libtool' 'libltdl') pkgver=2.4.2 -pkgrel=10 +pkgrel=11 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" license=('GPL') -makedepends=('gcc=4.8.1') +makedepends=('gcc=4.8.2') options=('!libtool') source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig}) md5sums=('2ec8997e0c07249eb4cbd072417d70fe' @@ -29,7 +29,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.1') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.8.2') groups=('base-devel') install=libtool.install diff --git a/core/logrotate/PKGBUILD b/core/logrotate/PKGBUILD index c296ce957..a6cdd75d3 100644 --- a/core/logrotate/PKGBUILD +++ b/core/logrotate/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 192722 2013-08-14 17:32:14Z pierre $ +# $Id: PKGBUILD 196792 2013-10-19 09:14:49Z pierre $ # Maintainer: Pierre Schmitz pkgname=logrotate -pkgver=3.8.6 +pkgver=3.8.7 pkgrel=1 pkgdesc="Rotates system logs automatically" arch=('i686' 'x86_64') @@ -16,10 +16,10 @@ source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar 'paths.patch' 'logrotate.conf' 'logrotate.cron.daily') -md5sums=('cd0082bbd7248e627ec659f2442fcdf9' +md5sums=('99e08503ef24c3e2e3ff74cc5f3be213' 'e76526bcd6fc33c9d921e1cb1eff1ffb' '86209d257c8b8bc0ae34d6f6ef057c0f' - '3909380f8a55fa160f62ed976a8bef4b') + 'dd5fd26724274fd9c827eadad60ff4c5') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/core/logrotate/logrotate.cron.daily b/core/logrotate/logrotate.cron.daily index 37d9e534c..11fe09c52 100755 --- a/core/logrotate/logrotate.cron.daily +++ b/core/logrotate/logrotate.cron.daily @@ -16,7 +16,11 @@ if [ -x /usr/bin/nice ]; then fi if [ -x /usr/bin/ionice ]; then - CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}" + IONICE_CMD="/usr/bin/ionice -c ${IONICE_CLASS:-2}" + if [ $IONICE_CLASS -ne 3 ]; then + IONICE_CMD="${IONICE_CMD} -n ${IONICE_PRIORITY:-7}" + fi + CMD_LOGROTATE="${IONICE_CMD} ${CMD_LOGROTATE}" fi ${CMD_LOGROTATE} diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 756f55a6e..a3c10cdca 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186139 2013-05-21 09:11:14Z tpowa $ +# $Id: PKGBUILD 196782 2013-10-19 06:36:42Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: judd pkgname=pam -pkgver=1.1.6 -pkgrel=4 +pkgver=1.1.8 +pkgrel=1 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') license=('GPL2') @@ -15,18 +15,15 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespac source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 ftp://ftp.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 - pam_unix2-glibc216.patch - pam_namespace-build-1.1.6.patch) + pam_unix2-glibc216.patch) options=('!libtool' '!emptydirs') -md5sums=('7b73e58b7ce79ffa321d408de06db2c4' +md5sums=('35b6091af95981b1b2cd60d813b5e4ee' 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' - 'dac109f68e04a4df37575fda6001ea17' - '440a510164ba5eb69bf41e129746ff44') + 'dac109f68e04a4df37575fda6001ea17') build() { cd $srcdir/Linux-PAM-$pkgver ./configure --libdir=/usr/lib --sbindir=/usr/bin - patch -Np0 -i ../pam_namespace-build-1.1.6.patch make cd $srcdir/pam_unix2-2.9.1 diff --git a/core/pam/pam.install b/core/pam/pam.install index 9d4588084..55ea99700 100644 --- a/core/pam/pam.install +++ b/core/pam/pam.install @@ -2,7 +2,7 @@ post_install() { # need to run this immediately -- pacman only runs it at the end of # all package installs - /sbin/ldconfig -r . + usr/bin/ldconfig -r . } # arg 1: the new package version diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD index cb2526137..53d5b93ec 100644 --- a/core/xinetd/PKGBUILD +++ b/core/xinetd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186292 2013-05-24 07:53:31Z tpowa $ +# $Id: PKGBUILD 196783 2013-10-19 06:36:43Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Judd pkgname=xinetd pkgver=2.3.15 -pkgrel=3 +pkgrel=4 pkgdesc="A secure replacement for inetd" arch=('i686' 'x86_64') url="http://www.xinetd.org/" @@ -15,16 +15,21 @@ source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz xinetd.conf servers services - xinetd.service) + xinetd.service + fix-CVE-2013-4342.patch) md5sums=('77358478fd58efa6366accae99b8b04c' 'f109f699a07bc8cfb5791060f5e87f9e' '21f47b4aa20921cfaddddd9f9a407f81' '9fa2061dc7dd738c8424251deb86f81e' - '38be35b6e7146dc59902e243d9063b4c') + '38be35b6e7146dc59902e243d9063b4c' + 'b14615c73753ceffbcc96d5e08f3c18d') prepare() { cd $srcdir/$pkgname-$pkgver sed -i "s#${prefix}/man#${prefix}/share/man#" configure + # fix #37310 + # https://bugzilla.redhat.com/show_bug.cgi?id=1006100#c + patch -Np1 -i $srcdir/fix-CVE-2013-4342.patch } build() { diff --git a/core/xinetd/fix-CVE-2013-4342.patch b/core/xinetd/fix-CVE-2013-4342.patch new file mode 100644 index 000000000..83506c9c3 --- /dev/null +++ b/core/xinetd/fix-CVE-2013-4342.patch @@ -0,0 +1,13 @@ +diff --git a/xinetd/builtins.c b/xinetd/builtins.c +index e61502f..a414cf3 100644 +--- a/xinetd/builtins.c ++++ b/xinetd/builtins.c +@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) + if( SC_IS_INTERNAL( scp ) ) { + SC_INTERNAL(scp, nserp); + } else { +- exec_server(nserp); ++ child_process(nserp); + } + } + diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD index a7b0d1b87..44e53c207 100644 --- a/extra/gnome-calculator/PKGBUILD +++ b/extra/gnome-calculator/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 196051 2013-10-07 11:51:12Z jgc $ +# $Id: PKGBUILD 196809 2013-10-19 20:33:48Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-calculator -pkgver=3.10.0 +pkgver=3.10.1 pkgrel=1 pkgdesc="GNOME Scientific calculator" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=(!emptydirs) url="http://www.gnome.org" install=gnome-calculator.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d76ad21286ea20308bb6302833ce8e5846df7e8ccd2b7ac0a48619f0d6cf2cb1') +sha256sums=('9268f06e53647e9a61a773b7ae499d4fd3097843060fc9baa8f97912247df48f') build() { cd $pkgname-$pkgver diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD index 6400ab0dd..9911b4067 100644 --- a/extra/hdf5-cpp-fortran/PKGBUILD +++ b/extra/hdf5-cpp-fortran/PKGBUILD @@ -6,7 +6,7 @@ pkgname=hdf5-cpp-fortran _pkgname=hdf5 -pkgver=1.8.10_patch1 +pkgver=1.8.11 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data" @@ -18,7 +18,7 @@ conflicts=('hdf5') provides=('hdf5') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb') +sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e') build() { cd $srcdir/${_pkgname}-${pkgver/_/-} diff --git a/extra/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD index 1baabfe14..ae92a41f1 100644 --- a/extra/hdf5-openmpi/PKGBUILD +++ b/extra/hdf5-openmpi/PKGBUILD @@ -8,7 +8,7 @@ pkgname=hdf5-openmpi _pkgname=hdf5 -pkgver=1.8.10_patch1 +pkgver=1.8.11 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)" @@ -21,7 +21,7 @@ conflicts=('hdf5') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${_pkgname}-${pkgver/_/-}.tar.bz2 mpi.patch) options=('!libtool') -sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb' +sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e' '658d4a3e537c9c76da3200effa8f95b656a21936') build() { diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD index 2370ae917..176260962 100644 --- a/extra/hdf5/PKGBUILD +++ b/extra/hdf5/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 185120 2013-05-11 09:31:27Z ronald $ +# $Id: PKGBUILD 196801 2013-10-19 13:44:23Z bpiotrowski $ # Maintainer: Ronald van Haren # Contributor: Stefan Husmann # Contributor: damir # Contributor: Tom K pkgname=hdf5 -pkgver=1.8.10_patch1 +pkgver=1.8.11 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="General purpose library and file format for storing scientific data" @@ -15,7 +15,7 @@ depends=('zlib' 'sh') makedepends=('time') source=(ftp://ftp.hdfgroup.org/HDF5/current/src/${pkgname}-${pkgver/_/-}.tar.bz2) options=('!libtool') -sha1sums=('458cb91496e313debd55d52a7f89459a5469cceb') +sha1sums=('87ded0894b104cf23a4b965f4ac0a567f8612e5e') build() { cd $srcdir/${pkgname}-${pkgver/_/-} diff --git a/extra/hdf5/mpi.patch b/extra/hdf5/mpi.patch deleted file mode 100644 index 4fadc13e2..000000000 --- a/extra/hdf5/mpi.patch +++ /dev/null @@ -1,18 +0,0 @@ -Prevent accidental inclusion of mpi c++ headers -when hdf5.h is included third party library - -https://bugs.gentoo.org/show_bug.cgi?id=420777 -https://bugs.archlinux.org/task/33343 - ---- a/src/H5public.h -+++ b/src/H5public.h -@@ -58,6 +58,8 @@ - # include - #endif - #ifdef H5_HAVE_PARALLEL -+# define OMPI_SKIP_MPICXX /* Make sure that cxx specific headers are not included */ -+# define MPICH_SKIP_MPICXX - # include - #ifndef MPI_FILE_NULL /*MPIO may be defined in mpi.h already */ - # include - diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 9dab6f140..51b04e035 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 196157 2013-10-07 12:17:10Z jgc $ +# $Id: PKGBUILD 196793 2013-10-19 09:44:02Z lcarlier $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgbase=mesa pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl') -pkgver=9.2.1 +pkgver=9.2.2 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' @@ -14,7 +14,7 @@ license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('dd4c82667d9c19c28a553b12eba3f8a0' +md5sums=('20887f8020db7d1736a01ae9cd5d8c38' '5c65a0fe315dd347e09b1f2826a1df5a') build() { diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD index 933eba7e2..95922d26a 100644 --- a/extra/netcdf/PKGBUILD +++ b/extra/netcdf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178109 2013-02-16 12:42:26Z ronald $ +# $Id: PKGBUILD 196804 2013-10-19 13:44:25Z bpiotrowski $ # Maintainer: Ronald van Haren # Contributor: damir pkgname=netcdf -pkgver=4.2.1.1 +pkgver=4.3.0 pkgrel=1 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library" arch=("i686" "x86_64") @@ -13,7 +13,7 @@ optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings') options=('!libtool' '!makeflags') license=('custom') source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz) -sha1sums=('76631cb4e6b767c224338415cf6e5f5ff9bd1238') +sha1sums=('31b4b3b17146cc8c14a8c7be3fe5f28e5a8a5deb') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD index aa9c67891..30e2a80cd 100644 --- a/extra/octave/PKGBUILD +++ b/extra/octave/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 191854 2013-07-31 16:20:12Z bpiotrowski $ +# $Id: PKGBUILD 196805 2013-10-19 13:44:27Z bpiotrowski $ # Maintainer: Ronald van Haren # Contributor : shining # Contributor : cyberdune pkgname=octave pkgver=3.6.4 -pkgrel=3 +pkgrel=4 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD index 55ec23185..d0e4eb205 100644 --- a/extra/pyqt5/PKGBUILD +++ b/extra/pyqt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196761 2013-10-18 08:36:23Z andrea $ +# $Id: PKGBUILD 196797 2013-10-19 12:28:10Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Yichao Yu # Contributor: Douglas Soares de Andrade @@ -8,7 +8,7 @@ pkgbase=pyqt5 pkgname=pyqt5 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5') pkgver=5.1.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://riverbankcomputing.co.uk/software/pyqt/intro" license=('GPL') diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD index 67135dd5f..2133fc4a6 100644 --- a/extra/qpdf/PKGBUILD +++ b/extra/qpdf/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 189895 2013-07-10 19:20:25Z andyrtr $ +# $Id: PKGBUILD 196791 2013-10-19 07:41:36Z andyrtr $ # Maintainer: AndyRTR # Contributor: Miguel Revilla # Contributor: David Sotelo # Contributor: Nuno Araujo pkgname=qpdf -pkgver=5.0.0 +pkgver=5.0.1 pkgrel=1 pkgdesc="QPDF: A Content-Preserving PDF Transformation System" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('pcre' 'perl') makedepends=('make') options=('!libtool') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('d501c61a8979132f6d601641483850cc') +md5sums=('6efd89c18461cb73f77bb60cb2da4bce') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 04e7fc8cb..f0571dd7e 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196747 2013-10-17 14:02:54Z andyrtr $ +# $Id: PKGBUILD 196795 2013-10-19 12:27:27Z andrea $ # Maintainer: Andrea Scarpino pkgbase=qt5 @@ -21,7 +21,7 @@ pkgname=('qt5-base' 'qt5-x11extras' 'qt5-xmlpatterns') pkgver=5.1.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL' 'FDL' 'custom') @@ -87,8 +87,7 @@ build() { -no-rpath \ -optimized-qmake \ -dbus-linked \ - -reduce-relocations \ - -opengl es2 + -reduce-relocations make diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index f779c4aa2..6946dae64 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -10,11 +10,11 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=4.0.10 +pkgver=4.1.0 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=4.0.10 +_realver=4.1.0 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -24,7 +24,6 @@ makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus') source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz samba.logrotate - swat.xinetd samba.pam samba.service samba.conf.d @@ -32,8 +31,6 @@ source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz smbd.socket nmbd.service smbd@.service - swat.socket - swat@.service winbindd.service samba.conf) ### UNINSTALL dmapi package before building!!! @@ -76,7 +73,6 @@ _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,a --with-piddir=/var/run \ --with-ads \ --with-ldap \ - --with-swat \ --with-winbind \ --with-acl-support \ --enable-gnutls \ @@ -211,7 +207,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # install systemd files install -d -m755 ${pkgdir}/usr/lib/systemd/system - #for i in smbd nmbd swat winbindd; do + #for i in smbd nmbd winbindd; do install -m644 ${srcdir}/*.service ${pkgdir}/usr/lib/systemd/system/ install -m644 ${srcdir}/*.socket ${pkgdir}/usr/lib/systemd/system/ install -d -m755 ${pkgdir}/etc/conf.d @@ -227,7 +223,6 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ chmod 700 ${pkgdir}/etc/samba/private install -D -m644 ${srcdir}/samba.logrotate ${pkgdir}/etc/logrotate.d/samba - install -D -m644 ${srcdir}/swat.xinetd ${pkgdir}/etc/xinetd.d/swat install -D -m644 ${srcdir}/samba.pam ${pkgdir}/etc/pam.d/samba # winbind krb5 locator @@ -245,9 +240,8 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \ # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('220740f75035b2221e3b9a848e19d1ea' +md5sums=('f448d18ae678c72afb72e0510cd69710' '5697da77590ec092cc8a883bae06093c' - 'ee8507839745cf17d2fb5401be7da6a8' '96f82c38f3f540b53f3e5144900acf17' 'ee4763a656cf00d92bfda31b6bb2c5cb' '6c447748a064d631435dbef0a3dcf32f' @@ -255,7 +249,5 @@ md5sums=('220740f75035b2221e3b9a848e19d1ea' 'a78b9aa93eb14b0ac445897395693225' 'df6380c73cb73163968eabc8650f7358' '70afd2db60a2e8eff7615dbdecd887ac' - '6db11f3dd2112a4b7a73007b189bef3f' - 'fd6be0cf1e5b3f0c3599fdb95455d19f' 'd5f56f43e1280bba20f6bbd88d16fa41' '49abd7b719e3713a3f75a8a50958e381') diff --git a/extra/samba/swat.socket b/extra/samba/swat.socket deleted file mode 100644 index e703413fc..000000000 --- a/extra/samba/swat.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SWAT Samba Web Admin Tool - -[Socket] -ListenStream=127.0.0.1:901 -Accept=true - -[Install] -WantedBy=sockets.target diff --git a/extra/samba/swat.xinetd b/extra/samba/swat.xinetd deleted file mode 100644 index b083ad860..000000000 --- a/extra/samba/swat.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service swat -{ - socket_type = stream - wait = no - user = root - server = /usr/bin/swat - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/extra/samba/swat@.service b/extra/samba/swat@.service deleted file mode 100644 index ebbc31c47..000000000 --- a/extra/samba/swat@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=SWAT Samba Web Admin Tool -After=local-fs.target - -[Service] -ExecStart=/usr/bin/swat -StandardInput=socket diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD index 77a4e49f9..a6d50bc14 100644 --- a/extra/vc/PKGBUILD +++ b/extra/vc/PKGBUILD @@ -1,20 +1,23 @@ -# $Id: PKGBUILD 188826 2013-06-22 07:21:35Z andrea $ +# $Id: PKGBUILD 196799 2013-10-19 12:28:25Z andrea $ # Maintainer: Andrea Scarpino # Contributor: PedsXing pkgname=vc -pkgver=0.7.2 +pkgver=0.7.3 pkgrel=1 pkgdesc="A library to ease explicit vectorization of C++ code" url='http://code.compeng.uni-frankfurt.de/projects/vc/' arch=('x86_64' 'i686') license=('LGPL3') makedepends=('cmake') -source=("http://code.compeng.uni-frankfurt.de/attachments/download/164/Vc-${pkgver}.tar.gz") -md5sums=('f54dd2945f9e5a38945e50b4a3f7a901') +source=("http://code.compeng.uni-frankfurt.de/attachments/download/174/Vc-${pkgver}.tar.gz") +md5sums=('a55e2871a33dbcbbe444c22ccef47dbd') + +prepare() { + mkdir build +} build() { - mkdir build cd build cmake ../Vc-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD index 9d86b59ad..21edadbfc 100644 --- a/extra/vigra/PKGBUILD +++ b/extra/vigra/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 191605 2013-07-27 08:12:19Z andyrtr $ +# $Id: PKGBUILD 196806 2013-10-19 13:44:27Z bpiotrowski $ # Maintainer: AndyRTR # Contributor: Lukas Jirkovsky pkgbase=vigra pkgname=('vigra' 'vigra-doc') pkgver=1.9.0 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url="http://hci.iwr.uni-heidelberg.de/vigra/" license=('custom:MIT') makedepends=(# runtime deps - 'libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw' + 'libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.11' 'fftw' # additional makedeps - 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost>=1.54.0' 'python2-numpy') + 'cmake' 'python2-nose' 'doxygen' 'python2-sphinx' 'boost' 'python2-numpy') options=('!libtool') source=(http://kogs-www.informatik.uni-hamburg.de/~koethe/vigra/${pkgname}-${pkgver}-src.tar.gz) md5sums=('b6155afe1ea967917d2be16d98a85404') @@ -34,7 +34,7 @@ check() { package_vigra() { pkgdesc="Computer vision library" - depends=('libpng>=1.5.7' 'libtiff>=4.0.0' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.7' 'fftw') + depends=('libpng' 'libtiff' 'openexr' 'gcc-libs' 'sh' 'hdf5>=1.8.11' 'fftw') optdepends=('python2: for python bindings' 'boost-libs: for python bindings') diff --git a/libre-testing/syslinux/PKGBUILD b/libre-testing/syslinux/PKGBUILD deleted file mode 100644 index 8a8845f0b..000000000 --- a/libre-testing/syslinux/PKGBUILD +++ /dev/null @@ -1,169 +0,0 @@ -# Maintainer: Tobias Powalowski -# Maintainer: Thomas Bächler -# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> -# Maintainer (Parabola): André Silva - -pkgname="syslinux" -pkgver="6.01" -pkgrel="4.1" -arch=('x86_64' 'i686') -pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" -url="http://syslinux.zytor.com/" -license=('GPL2') -options=('!makeflags' '!emptydirs') -backup=('boot/syslinux/syslinux.cfg' - 'boot/syslinux/splash.png') -makedepends=('python2' 'nasm' 'gnu-efi-libs') -depends=('perl' 'glibc') -optdepends=('perl-passwd-md5: For md5pass' - 'perl-digest-sha1: For sha1pass' - 'mtools: For mkdiskimage and syslinux support' - 'gptfdisk: For GPT support' - 'util-linux: For isohybrid' - 'efibootmgr: For EFI support' - 'dosfstools: For EFI support') -md5sums=('5fe8959b92255143a334167ca1c395a6' - 'f048880b57e2c5a7017ff8804bfda327' - '0e7d47e1f791f0c5e7bd40ed5c6d80cc' - 'cb46ca47c6b6323127d908440057d98f') - -install="${pkgname}.install" - -source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz" - 'syslinux.cfg' - 'syslinux-install_update' - 'splash.png') - -_build_syslinux_bios() { - - rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios" - cd "${srcdir}/${pkgname}-${pkgver}-bios/" - - ## Do not try to build syslinux with our default LDFLAGS, it will fail - unset LDFLAGS - - make PYTHON="python2" bios - make PYTHON="python2" bios installer - -} - -_build_syslinux_efi64() { - - rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64" - cd "${srcdir}/${pkgname}-${pkgver}-efi64/" - - ## Unset all compiler FLAGS for efi64 build - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - make PYTHON="python2" efi64 - make PYTHON="python2" efi64 installer - -} - -_build_syslinux_efi32() { - - rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true - cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32" - cd "${srcdir}/${pkgname}-${pkgver}-efi32/" - - ## Unset all compiler FLAGS for efi32 build - unset CFLAGS - unset CPPFLAGS - unset CXXFLAGS - unset LDFLAGS - unset MAKEFLAGS - - make PYTHON="python2" efi32 - make PYTHON="python2" efi32 installer - -} - -build() { - - cd "${srcdir}/${pkgname}-${pkgver}/" - - ## Do not try to build the Windows or DOS installers and DIAG files - sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true - - ## Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true - - ## Build syslinux-efi - if [[ "${CARCH}" == "x86_64" ]]; then - _build_syslinux_efi64 - fi - - if [[ "${CARCH}" == "i686" ]]; then - _build_syslinux_efi32 - fi - - ## Build syslinux-bios - _build_syslinux_bios - -} - -_package_syslinux_bios() { - - cd "${srcdir}/${pkgname}-${pkgver}-bios/" - - ## Install Syslinux bios - make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install - - ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir - rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true - rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true - rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true - - ## Remove com32 and diag dirs - rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true - rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true - - ## Move extlinux binary to /usr/bin - install -d "${pkgdir}/usr/bin" - mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux" - rm -rf "${pkgdir}/sbin/" - - ## Install docs - install -d "${pkgdir}/usr/share/doc" - cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux" - - ## Install the default configuration - install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg" - - ## Install the installation and update script - ## This script is maintained at git://gist.github.com/772138.git - ## Script not yet updated for syslinux-efi - install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update" - - # Install Parabola splash - install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png" -} - -package() { - - cd "${srcdir}/${pkgname}-${pkgver}/" - - if [[ "${CARCH}" == "x86_64" ]]; then - cd "${srcdir}/${pkgname}-${pkgver}-efi64/" - make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install - fi - - if [[ "${CARCH}" == "i686" ]]; then - cd "${srcdir}/${pkgname}-${pkgver}-efi32/" - make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install - fi - - _package_syslinux_bios - -} diff --git a/libre-testing/syslinux/splash.png b/libre-testing/syslinux/splash.png deleted file mode 100644 index eac14536b..000000000 Binary files a/libre-testing/syslinux/splash.png and /dev/null differ diff --git a/libre-testing/syslinux/splash.xcf b/libre-testing/syslinux/splash.xcf deleted file mode 100644 index c27d04445..000000000 Binary files a/libre-testing/syslinux/splash.xcf and /dev/null differ diff --git a/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch b/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch deleted file mode 100644 index cbcd9a6da..000000000 --- a/libre-testing/syslinux/syslinux-6.00-efi-export-kbdmap.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2a81889c7d680fbe51de63dbbeb4e8c290ec46fa Mon Sep 17 00:00:00 2001 -From: Matt Fleming -Date: Fri, 21 Jun 2013 07:14:24 +0000 -Subject: efi: Tag symbols with __export - -I missed some symbols previously that are required to be exported when -loading vesamenu.c32. - -Signed-off-by: Matt Fleming ---- -diff --git a/efi/main.c b/efi/main.c -index 51ff9f3..71333a4 100644 ---- a/efi/main.c -+++ b/efi/main.c -@@ -21,7 +21,7 @@ uint32_t _IdleTimer = 0; - char __lowmem_heap[32]; - uint32_t BIOS_timer_next; - uint32_t timer_irq; --uint8_t KbdMap[256]; -+__export uint8_t KbdMap[256]; - char aux_seg[256]; - - static inline EFI_STATUS -diff --git a/efi/vesa.c b/efi/vesa.c -index d259f60..b4a541b 100644 ---- a/efi/vesa.c -+++ b/efi/vesa.c -@@ -297,7 +297,7 @@ static int efi_vesacon_font_query(uint8_t **font) - return cp865_8x16_font_height; - } - --int __vesacon_i915resolution(int x, int y) -+__export int __vesacon_i915resolution(int x, int y) - { - /* We don't support this function */ - return 1; --- -cgit v0.9.2 diff --git a/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch b/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch deleted file mode 100644 index 7460cd195..000000000 --- a/libre-testing/syslinux/syslinux-6.00-efi-fix-libcom32.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 013ef7679a573b3b3454f914f3a7f865991db9f2 Mon Sep 17 00:00:00 2001 -From: Matt Fleming -Date: Fri, 21 Jun 2013 07:13:16 +0000 -Subject: efi: Export __bcopyxx_len - -We need to provide a __bcopyxx_len symbol for EFI because it's -referenced in generic code in libcom32.c32. Without this change, -libcom32.c32 will fail to load under EFI. - -Signed-off-by: Matt Fleming ---- -diff --git a/core/include/core.h b/core/include/core.h -index 5736d39..127ac65 100644 ---- a/core/include/core.h -+++ b/core/include/core.h -@@ -26,6 +26,7 @@ extern char cmd_line[]; - extern char ConfigFile[]; - extern char syslinux_banner[]; - extern char copyright_str[]; -+extern unsigned int __bcopyxx_len; - - /* - * Mark symbols that are only used by BIOS as __weak until we can move -@@ -35,7 +36,6 @@ extern char copyright_str[]; - extern __weak uint16_t BIOSName; - extern __weak char KernelName[]; - extern __weak char StackBuf[]; --extern __weak unsigned int __bcopyxx_len; - - extern uint8_t KbdMap[256]; - -diff --git a/efi/main.c b/efi/main.c -index 438e88c..51ff9f3 100644 ---- a/efi/main.c -+++ b/efi/main.c -@@ -153,6 +153,7 @@ void pxenv(void) - uint16_t BIOS_fbm = 1; - far_ptr_t InitStack; - far_ptr_t PXEEntry; -+__export unsigned int __bcopyxx_len = 0; - - void gpxe_unload(void) - { --- -cgit v0.9.2 diff --git a/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch deleted file mode 100644 index 54151ab87..000000000 --- a/libre-testing/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile ---- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200 -+++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200 -@@ -54,7 +54,7 @@ - # files that depend only on the B phase, but may have to be regenerated - # for "make installer". - BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \ -- diag libinstaller dos win32 win64 dosutil txt -+ libinstaller txt - ITARGET = - IOBJECTS = $(ITARGET) \ - utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/libre-testing/syslinux/syslinux-install_update b/libre-testing/syslinux/syslinux-install_update deleted file mode 100644 index 4dc09696a..000000000 --- a/libre-testing/syslinux/syslinux-install_update +++ /dev/null @@ -1,461 +0,0 @@ -#!/usr/bin/env bash -# -# Syslinux Installer / Updater Script (for BIOS only) -# Copyright (C) 2013 Matthew Gyurgyik -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -#----------------- -# Exit Codes: -# 1 - get_boot_device or other function failed -# 2 - install/update failed -# 3 - set_active failed -# 4 - install_mbr failed -# -shopt -s nullglob - -bios_libpath="/usr/lib/syslinux/bios/" -bios_bootpath="/boot/syslinux/" -EXTLINUX="/usr/bin/extlinux" - -bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) -bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" -pciids_file="/usr/share/hwdata/pci.ids" - -## Helper functions ## -# Taken from libui-sh -# $1 needle -# $2 set (array) haystack -check_is_in() { - local needle="$1" element - shift - for element; do - [[ $element = $needle ]] && return 0 - done - return 1 -} - -# return true when blockdevice is an md raid, otherwise return a unset value -# get all devices that are part of raid device $1 -device_is_raid() { - [[ $1 && -f /proc/mdstat ]] || return 1 - local devmajor=$(stat -c %t "$1") - (( devmajor == 9 )) -} - -mdraid_all_slaves() { - local slave slaves - for slave in /sys/class/block/${1##*/}/slaves/*; do - source "$slave/uevent" - slaves="$slaves/dev/$DEVNAME " - unset DEVNAME - done - echo $slaves -} - -# Check /sys/block to see if device is partitioned -# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist -# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist -dev_is_part() { - # $1 - blockdevice - local dev=$1 - - # If block device uevent file should be found - # If a partition is passed in path shouldn't exist - if [[ $dev = *cciss* ]]; then - [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1 - elif [[ $dev = *ida* ]]; then - [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1 - else - [[ -f /sys/block/${dev##*/}/dev ]] && return 1 - fi - - return 0 -} - -# If EFI PART is present in the first 8 bytes then it must be a GPT disk -device_is_gpt() { - local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null) - [[ $partsig = "EFI PART" ]] -} - -clear_gpt_attr2() { - # $1 - Block Device, no partitions - local disk=$1 - - # Special Exception for cciss controllers - if [[ $disk = *cciss* ]]; then - for part in /dev/cciss/${disk##*/}*p*; do - local partnum="${part##*[[:alpha:]]}" - sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null - done - # Smart 2 Controllers - elif [[ $disk = *ida* ]]; then - for part in /dev/ida/${disk##*/}*p*; do - local partnum="${part##*[[:alpha:]]}" - sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null - done - else - for part in /sys/block/${disk##*/}/${disk##*/}*; do - local partnum="${part##*[[:alpha:]]}" - sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null - done - fi - return 0 -} - -usage() { -cat << EOF -usage: $0 options - -This script will install or upgrade Syslinux (for BIOS only) - -OPTIONS: - -h Show this message - -i Install Syslinux - -u Update Syslinux - -a Set Boot flag on boot partiton - -m Install Syslinux MBR - -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists - - Arguments Required: - -c Chroot install (ex: -c /mnt) - -Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) - $0 -u # (update) -EOF -} - -# Trys to find the partition that /boot resides on -# This will either be on /boot or / (root) -getBoot() { - if [[ ! -d "$bios_bootpath" ]]; then - echo "Could not find $bios_bootpath" - echo "Is boot mounted? Is Syslinux installed?" - exit 1 - fi - - syslinux_fs=(ext2 ext3 ext4 btrfs vfat) - - # Use DATA from findmnt see rc.sysint for more info - if [[ -f /proc/self/mountinfo ]]; then - read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/") - read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot") - else - echo "Could not find /proc/self/mountinfo" - echo "Are you running a kernel greater than 2.6.24?" - exit 1 - fi - - if [[ $bootfs ]]; then - if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then - echo "/boot file system is not supported by Syslinux" - exit 1 - fi - boot="boot" - bootpart="$bootdev" - elif [[ $rootfs ]]; then - if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then - echo "/ (root) file system is not supported by Syslinux" - exit 1 - fi - boot="root" - bootpart="$rootdev" - else - echo "Could not find filesystem on / (root) or /boot." - exit 1 - fi -} - -# We store the partition table type either gpt or mbr in var ptb -# In rare cases a user could have one raid disk using mbr and another using gpt -# In such cases we accept that the output may be incomplete - -# Calls get_ptb() for $bootpart or for all device in RAID -declare -A bootdevs -get_boot_devices() { - if device_is_raid "$bootpart"; then - slaves=$(mdraid_all_slaves "$bootpart") - - for slave in ${slaves[@]}; do - local disk="${slave%%[[:digit:]]*}" - device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" - bootdevs[$slave]="$ptb" - done - else - local disk="${bootpart%%[[:digit:]]*}" - device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR" - bootdevs[$bootpart]="$ptb" - fi -} - -# Function Assumes the boot partition should be marked as active -# All other partitions should not have the boot flag set -set_active() { - # If any bootdev is a block device without partitions bail - # we want to set the boot flag on partitioned disk - for dev in "${!bootdevs[@]}"; do - dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; } - done - - # Clear BIOS Bootable Legacy Attribute for GPT drives - # In rare cases where a RAID device has slaves on the same block device - # Attribute 2 will be cleared for each partition multiple times - for dev in "${!bootdevs[@]}"; do - local ptb="${bootdevs[$dev]}" - if [[ "$ptb" = GPT ]]; then - local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda - clear_gpt_attr2 "$disk" - fi - done - - # Set the boot flag on bootdevs (generated from get_boot_devices) - for part in "${!bootdevs[@]}"; do - local ptb="${bootdevs[$part]}" - local partnum="${part##*[[:alpha:]]}" - case "$part" in - *[[:digit:]]p[[:digit:]]*) - local disk="${part%%p$partnum}" # get everything before p1 - ;; - *) - local disk="${part%%[[:digit:]]*}" - ;; - esac - - if [[ "$ptb" = MBR ]]; then - if sfdisk "$disk" -A "$partnum" &>/dev/null; then - echo "Boot Flag Set - $part" - else - echo "FAILED to Set the boot flag on $part" - exit 3 - fi - elif [[ "$ptb" = GPT ]]; then - if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then - echo "Attribute Legacy Bios Bootable Set - $part" - else - echo "FAILED to set attribute Legacy BIOS Bootable on $part" - exit 3 - fi - fi - done - return 0 -} - -install_mbr() { - # If any bootdev is a block device without partitions bail - # we want to install the mbr to a partitioned disk - for dev in "${!bootdevs[@]}"; do - dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; } - done - - for part in "${!bootdevs[@]}"; do - local partnum="${part##*[[:alpha:]]}" - case "$part" in - *[[:digit:]]p[[:digit:]]*) - local disk="${part%%p$partnum}" # get everything before p1 - ;; - *) - local disk="${part%%[[:digit:]]*}" - ;; - esac - local ptb="${bootdevs[$part]}" - - # We want to install to the root of the block device - # If the device is a partition - ABORT! - dev_is_part "$disk" && \ - { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} - - if [[ "$ptb" = MBR ]]; then - mbrfile="$bios_libpath/mbr.bin" - elif [[ "$ptb" = GPT ]]; then - mbrfile="$bios_libpath/gptmbr.bin" - fi - - if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then - echo "Installed MBR ($mbrfile) to $disk" - else - echo "Error Installing MBR ($mbrfile) to $disk" - exit 4 - fi - done - return 0 -} - -install_modules() { - # Copy all com32 files to /boot - for file in "${bios_libpath}"/*.c32; do - file=${file##*/} - rm "$bios_bootpath/$file" &> /dev/null - if [[ "$boot" = root ]]; then - # Symlink files if /boot resides on the same partition as root - ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$bios_libpath/$file" "$bios_bootpath/$file" - fi - done - - # Copy / Symlink pci.ids if pci.ids exists on the FS - if [[ -f $pciids_file ]]; then - rm "$bios_bootpath/pci.ids" &> /dev/null - if [[ "$boot" = root ]]; then - ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null - elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null - fi - fi -} - -_install() { - install_modules - - if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot" - "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null - else - "$EXTLINUX" --install "$bios_bootpath" &> /dev/null - fi - - if (( $? )); then - echo "Syslinux BIOS install failed" - exit 2 - else - echo "Syslinux BIOS install successful" - fi - - touch "$CHROOT/$bios_autoupdate_file" -} - -update() { - install_modules - - if device_is_raid $bootpart; then - echo "Detected RAID on /boot" - "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null - else - "$EXTLINUX" --update "$bios_bootpath" &> /dev/null - fi - - if (($?)); then - echo "Syslinux BIOS update failed" - exit 2 - else - echo "Syslinux BIOS update successful" - fi -} - -if (( $# == 0 )); then - usage - exit 1 -fi - -while getopts "c:uihmas" opt; do - case $opt in - c) - CHROOT=$(readlink -e "$OPTARG") - if [[ -z $CHROOT ]]; then - echo "error: chroot path ``$OPTARG does not exist"; - exit 1 - fi - ;; - h) - USAGE="True" - ;; - i) - INSTALL="True" - ;; - u) - UPDATE="True" - ;; - m) - MBR="True" - ;; - a) - SET_ACTIVE="True" - ;; - s) - # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $bios_autoupdate_file ]]; then - UPDATE="True" - else - exit 0 - fi - ;; - *) - usage - exit 1 - ;; - esac -done - -if [[ $USAGE ]]; then - usage - exit 0 -fi - -# Make sure only root can run our script -if (( $(id -u) != 0 )); then - echo "This script must be run as root" 1>&2 - exit 1 -fi - -# Display Usage Information if both Install and Update are passed -if [[ $INSTALL && $UPDATE ]]; then - usage - exit 1 -fi - -# If a chroot dir is path set variables to reflect chroot -if [[ "$CHROOT" ]]; then - bios_libpath="$CHROOT$bios_libpath" - bios_bootpath="$CHROOT$bios_bootpath" - EXTLINUX="$CHROOT$EXTLINUX" -fi - -# Exit if no /boot path exists -if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bios_bootpath is empty!" - echo "Is /boot mounted?" - exit 1 -fi - -# Get the boot device if any of these options are passed -if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then - getBoot -fi - -# Install or Update -if [[ $INSTALL ]]; then - _install || exit -elif [[ $UPDATE ]]; then - update || exit -fi - - -# SET_ACTIVE and MBR -if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then - get_boot_devices - - if [[ $SET_ACTIVE ]]; then - set_active || exit - fi - - if [[ $MBR ]]; then - install_mbr || exit - fi -fi - -exit 0 - -# vim: set et sw=4: diff --git a/libre-testing/syslinux/syslinux.cfg b/libre-testing/syslinux/syslinux.cfg deleted file mode 100644 index 0c0c6339a..000000000 --- a/libre-testing/syslinux/syslinux.cfg +++ /dev/null @@ -1,78 +0,0 @@ -# Config file for Syslinux - -# /boot/syslinux/syslinux.cfg -# -# Comboot modules: -# * menu.c32 - provides a text menu -# * vesamenu.c32 - provides a graphical menu -# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders -# * hdt.c32 - hardware detection tool -# * reboot.c32 - reboots the system -# -# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. -# If /usr and /boot are on the same file system, symlink the files instead -# of copying them. -# -# If you do not use a menu, a 'boot:' prompt will be shown and the system -# will boot automatically after 5 seconds. -# -# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux -# The wiki provides further configuration examples - -DEFAULT parabola -PROMPT 0 # Set to 1 if you always want to display the boot: prompt -TIMEOUT 50 -# You can create syslinux keymaps with the keytab-lilo tool -#KBDMAP de.ktl - -# Menu Configuration -# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux -#UI menu.c32 -UI vesamenu.c32 - -# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu -MENU TITLE Parabola GNU/Linux-libre -MENU BACKGROUND splash.png -MENU COLOR border 35;40 #ff777caa #a0000000 std -MENU COLOR title 1;35;40 #ff777caa #a0000000 std -MENU COLOR sel 7;35;47 #e0ffffff #20777caa all -MENU COLOR unsel 35;40 #ff777caa #a0000000 std -MENU COLOR help 35;40 #c0b2b2b2 #a0000000 std -MENU COLOR timeout_msg 35;40 #ff777caa #00000000 std -MENU COLOR timeout 1;35;40 #ff777caa #00000000 std -MENU COLOR msg07 35;40 #ff777caa #a0000000 std -MENU COLOR tabmsg 35;40 #ff777caa #00000000 std - -# boot sections follow -# -# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line. -# -#-* - -LABEL parabola - MENU LABEL Parabola GNU/Linux-libre - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 rw - INITRD ../initramfs-linux-libre.img - -LABEL parabolafallback - MENU LABEL Parabola GNU/Linux-libre Fallback - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 rw - INITRD ../initramfs-linux-libre-fallback.img - -# If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) -# LABEL memtest -# MENU LABEL Memtest86+ -# LINUX ../memtest86+/memtest.bin - -LABEL hdt - MENU LABEL HDT (Hardware Detection Tool) - COM32 hdt.c32 - -LABEL reboot - MENU LABEL Reboot - COM32 reboot.c32 - -LABEL poweroff - MENU LABEL Poweroff - COM32 poweroff.c32 diff --git a/libre-testing/syslinux/syslinux.install b/libre-testing/syslinux/syslinux.install deleted file mode 100644 index ac8553a97..000000000 --- a/libre-testing/syslinux/syslinux.install +++ /dev/null @@ -1,36 +0,0 @@ -post_install() { - echo "==> If you want to use syslinux as your BIOS bootloader" - echo "==> edit /boot/syslinux/syslinux.cfg and run" - echo "==> # /usr/bin/syslinux-install_update -i -a -m" - echo "==> to install it." - - cat << EOF -Syslinux efi64 and efi32 files have been installed at -/usr/lib/syslinux/{efi64,efi32}/ respectively. - -To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and -syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry -using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi -EOF - -} - -post_upgrade() { - # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists - /usr/bin/syslinux-install_update -s - # update to 5.01 message - if [ "$(vercmp $2 5.01)" -lt 0 ]; then - echo "If you used syslinux-install_update to install syslinux:" - echo "==> If you want to use syslinux with menu and all modules please rerun" - echo "==> # /usr/bin/syslinux-install_update -i -a -m" - echo "" - echo "If you manually installed syslinux:" - echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory." - echo "==> If (/ and /boot on seperate fs):" - echo "==> # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux" - echo "==> If (/ and /boot on same fs):" - echo "==> # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux" - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 7055936c0..4bf66c9b5 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 196512 2013-10-14 16:06:39Z andyrtr $ +# $Id: PKGBUILD 196788 2013-10-19 07:01:13Z andyrtr $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -10,10 +10,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=16 +_sublevel=17 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.16 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '652908bcd4527803abd98f762d45501f' + '9a4ad6408ff3a2def1735f24b5ff02c5' '59a0759df09a59d48d0c470895c50cbb' 'ad7f5988deb617e3789f95d7e675860d' 'c072b17032e80debc6a8626299245d46' @@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - '8aab6ab727f49dffcae5fd1c3c7c5bdb') + '3b9f1cce64377f70eb8bf5978db629d5') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD index bf77c087d..411834c5d 100644 --- a/libre/mesa-libcl/PKGBUILD +++ b/libre/mesa-libcl/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa _pkgname=libcl pkgname=$pkgbase-$_pkgname _pkgflag=libre -pkgver=9.2.1 +pkgver=9.2.2 pkgrel=1 pkgdesc='Mesa 3-D OpenCL library' url=http://${pkgbase}3d.sourceforge.net @@ -28,7 +28,7 @@ conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) options=(!libtool) source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 -sha512sums=1dbc59b348618dde85e00b318fa5bbc58c29c3f56f8f77260569f155e5e787e56a2b5efff6b0e8cafedc915ccb465c547a10501f39e3d20a57c4e654968de62e +sha512sums=6b1ac41f28a81bf920fd4ea80586192f6465863992ec13b718c61fb7d4a41ac3bbb146bfa4a81c48189092e7b59a9452d11d675d628a6098dd8fc48a5aa304ca build() { cd $srcdir/${pkgbase^}-$pkgver diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD index 01505c5d2..a2ca4c657 100644 --- a/libre/syslinux/PKGBUILD +++ b/libre/syslinux/PKGBUILD @@ -1,57 +1,172 @@ -# Maintainer: Thomas Bächler # Maintainer: Tobias Powalowski +# Maintainer: Thomas Bächler +# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva -pkgname=syslinux -pkgver=4.07 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgname="syslinux" +pkgver="6.02" +pkgrel="3" +arch=('x86_64' 'i686') pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)" url="http://syslinux.zytor.com/" license=('GPL2') +options=('!makeflags' '!emptydirs') +backup=('boot/syslinux/syslinux.cfg' + 'boot/syslinux/splash.png') +makedepends=('python2' 'nasm' 'gnu-efi-libs') depends=('perl' 'glibc') optdepends=('perl-passwd-md5: For md5pass' 'perl-digest-sha1: For sha1pass' 'mtools: For mkdiskimage and syslinux support' 'gptfdisk: For GPT support' - 'util-linux: For isohybrid') -makedepends=('nasm') -backup=('boot/syslinux/syslinux.cfg' - 'boot/syslinux/splash.png') -install=syslinux.install -source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2 - syslinux-dont-build-dos-windows-targets.patch - syslinux.cfg - syslinux-install_update - splash.png) -md5sums=('9ff6e1b94efab931fb4717b600d88779' - '1528c376e43f0eaccaa80d8ad1bc13b4' - 'a43bd903face611bcc148522265dfe6c' - '8559fb3daf3afa8688600d8a38118918' + 'util-linux: For isohybrid' + 'efibootmgr: For EFI support' + 'dosfstools: For EFI support') +md5sums=('6f275813a1b08cf852e55c0a3f8fbc78' + 'f048880b57e2c5a7017ff8804bfda327' + '0e7d47e1f791f0c5e7bd40ed5c6d80cc' + '9dbede6b71a4de9e46aac4aad65334d7' 'cb46ca47c6b6323127d908440057d98f') +install="${pkgname}.install" + +source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgver}.tar.xz" + 'syslinux.cfg' + 'syslinux-install_update' + 'syslinux-6.02-fix-chainloading.patch' + 'splash.png') + +_build_syslinux_bios() { + + rm -rf "${srcdir}/${pkgname}-${pkgver}-bios/" || true + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-bios" + cd "${srcdir}/${pkgname}-${pkgver}-bios/" + + ## Do not try to build syslinux with our default LDFLAGS, it will fail + unset LDFLAGS + make PYTHON="python2" bios + make PYTHON="python2" bios installer +} + +_build_syslinux_efi64() { + + rm -rf "${srcdir}/${pkgname}-${pkgver}-efi64/" || true + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi64" + cd "${srcdir}/${pkgname}-${pkgver}-efi64/" + + ## Unset all compiler FLAGS for efi64 build + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + make PYTHON="python2" efi64 + make PYTHON="python2" efi64 installer +} + +_build_syslinux_efi32() { + + rm -rf "${srcdir}/${pkgname}-${pkgver}-efi32/" || true + cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-${pkgver}-efi32" + cd "${srcdir}/${pkgname}-${pkgver}-efi32/" + + ## Unset all compiler FLAGS for efi32 build + unset CFLAGS + unset CPPFLAGS + unset CXXFLAGS + unset LDFLAGS + unset MAKEFLAGS + + make PYTHON="python2" efi32 + make PYTHON="python2" efi32 installer +} + build() { - # Do not try to build syslinux with our default LDFLAGS, it will fail - unset LDFLAGS - cd "$srcdir"/$pkgname-${pkgver} - # Do not try to build the Windows or DOS installers - patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch - # Fix FHS manpage path - sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk - make installer - make -C utils - make -C com32 + + cd "${srcdir}/${pkgname}-${pkgver}/" + + ## Do not try to build the Windows or DOS installers and DIAG files + sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true + + ## Fix FHS manpage path + sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true + + # fix chainloading + # http://bugzilla.syslinux.org/show_bug.cgi?id=31 + # http://www.syslinux.org/archives/2013-October/020971.html + patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch" + + ## Build syslinux-efi + if [[ "${CARCH}" == "x86_64" ]]; then + _build_syslinux_efi64 + fi + + if [[ "${CARCH}" == "i686" ]]; then + _build_syslinux_efi32 + fi + + ## Build syslinux-bios + _build_syslinux_bios + +} + +_package_syslinux_bios() { + + cd "${srcdir}/${pkgname}-${pkgver}-bios/" + + ## Install Syslinux bios + make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/bios/" bios install + + ## Remove syslinux.exe,syslinux64.exe,syslinux.com and dosutil dir + rm "${pkgdir}/usr/lib/syslinux/bios"/syslinux.{com,exe} || true + rm "${pkgdir}/usr/lib/syslinux/bios/syslinux64.exe" || true + rm -rf "${pkgdir}/usr/lib/syslinux/bios/dosutil/" || true + + ## Remove com32 and diag dirs + rm -rf "${pkgdir}/usr/lib/syslinux/bios/diag/" || true + rm -rf "${pkgdir}/usr/lib/syslinux/bios/com32/" || true + + ## Move extlinux binary to /usr/bin + install -d "${pkgdir}/usr/bin" + mv "${pkgdir}/sbin/extlinux" "${pkgdir}/usr/bin/extlinux" + rm -rf "${pkgdir}/sbin/" + + ## Install docs + install -d "${pkgdir}/usr/share/doc" + cp -ar "${srcdir}/${pkgname}-${pkgver}/doc" "${pkgdir}/usr/share/doc/syslinux" + + ## Install the default configuration + install -D -m0644 "${srcdir}/syslinux.cfg" "${pkgdir}/boot/syslinux/syslinux.cfg" + + ## Install the installation and update script + ## This script is maintained at git://gist.github.com/772138.git + ## Script not yet updated for syslinux-efi + install -D -m0755 "${srcdir}/syslinux-install_update" "${pkgdir}/usr/bin/syslinux-install_update" + + # Install Parabola splash + install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png" } package() { - cd "$srcdir"/$pkgname-${pkgver} - make INSTALLROOT="$pkgdir" SBINDIR=/usr/bin AUXDIR=/usr/lib/syslinux install - - # Install the default configuration - install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg - # Install Parabola splash - install -D -m644 "$srcdir"/splash.png "$pkgdir"/boot/syslinux/splash.png - # Install the installation and update script - # This script is maintained at git://gist.github.com/772138.git - install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/bin/syslinux-install_update + + cd "${srcdir}/${pkgname}-${pkgver}/" + + if [[ "${CARCH}" == "x86_64" ]]; then + cd "${srcdir}/${pkgname}-${pkgver}-efi64/" + make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi64 install + fi + + if [[ "${CARCH}" == "i686" ]]; then + cd "${srcdir}/${pkgname}-${pkgver}-efi32/" + make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install + fi + + _package_syslinux_bios + } diff --git a/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch new file mode 100644 index 000000000..cbcd9a6da --- /dev/null +++ b/libre/syslinux/syslinux-6.00-efi-export-kbdmap.patch @@ -0,0 +1,38 @@ +From 2a81889c7d680fbe51de63dbbeb4e8c290ec46fa Mon Sep 17 00:00:00 2001 +From: Matt Fleming +Date: Fri, 21 Jun 2013 07:14:24 +0000 +Subject: efi: Tag symbols with __export + +I missed some symbols previously that are required to be exported when +loading vesamenu.c32. + +Signed-off-by: Matt Fleming +--- +diff --git a/efi/main.c b/efi/main.c +index 51ff9f3..71333a4 100644 +--- a/efi/main.c ++++ b/efi/main.c +@@ -21,7 +21,7 @@ uint32_t _IdleTimer = 0; + char __lowmem_heap[32]; + uint32_t BIOS_timer_next; + uint32_t timer_irq; +-uint8_t KbdMap[256]; ++__export uint8_t KbdMap[256]; + char aux_seg[256]; + + static inline EFI_STATUS +diff --git a/efi/vesa.c b/efi/vesa.c +index d259f60..b4a541b 100644 +--- a/efi/vesa.c ++++ b/efi/vesa.c +@@ -297,7 +297,7 @@ static int efi_vesacon_font_query(uint8_t **font) + return cp865_8x16_font_height; + } + +-int __vesacon_i915resolution(int x, int y) ++__export int __vesacon_i915resolution(int x, int y) + { + /* We don't support this function */ + return 1; +-- +cgit v0.9.2 diff --git a/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch new file mode 100644 index 000000000..7460cd195 --- /dev/null +++ b/libre/syslinux/syslinux-6.00-efi-fix-libcom32.patch @@ -0,0 +1,45 @@ +From 013ef7679a573b3b3454f914f3a7f865991db9f2 Mon Sep 17 00:00:00 2001 +From: Matt Fleming +Date: Fri, 21 Jun 2013 07:13:16 +0000 +Subject: efi: Export __bcopyxx_len + +We need to provide a __bcopyxx_len symbol for EFI because it's +referenced in generic code in libcom32.c32. Without this change, +libcom32.c32 will fail to load under EFI. + +Signed-off-by: Matt Fleming +--- +diff --git a/core/include/core.h b/core/include/core.h +index 5736d39..127ac65 100644 +--- a/core/include/core.h ++++ b/core/include/core.h +@@ -26,6 +26,7 @@ extern char cmd_line[]; + extern char ConfigFile[]; + extern char syslinux_banner[]; + extern char copyright_str[]; ++extern unsigned int __bcopyxx_len; + + /* + * Mark symbols that are only used by BIOS as __weak until we can move +@@ -35,7 +36,6 @@ extern char copyright_str[]; + extern __weak uint16_t BIOSName; + extern __weak char KernelName[]; + extern __weak char StackBuf[]; +-extern __weak unsigned int __bcopyxx_len; + + extern uint8_t KbdMap[256]; + +diff --git a/efi/main.c b/efi/main.c +index 438e88c..51ff9f3 100644 +--- a/efi/main.c ++++ b/efi/main.c +@@ -153,6 +153,7 @@ void pxenv(void) + uint16_t BIOS_fbm = 1; + far_ptr_t InitStack; + far_ptr_t PXEEntry; ++__export unsigned int __bcopyxx_len = 0; + + void gpxe_unload(void) + { +-- +cgit v0.9.2 diff --git a/libre/syslinux/syslinux-6.02-fix-chainloading.patch b/libre/syslinux/syslinux-6.02-fix-chainloading.patch new file mode 100644 index 000000000..6fd7ef4a8 --- /dev/null +++ b/libre/syslinux/syslinux-6.02-fix-chainloading.patch @@ -0,0 +1,47 @@ +Reported-by: Dark Raven +Signed-off-by: Raphael S. Carvalho +--- + com32/lib/syslinux/disk.c | 22 ++++++++++++++-------- + 1 files changed, 14 insertions(+), 8 deletions(-) + +diff --git a/com32/lib/syslinux/disk.c b/com32/lib/syslinux/disk.c +index 0b0c737..47ecb52 100644 +--- a/com32/lib/syslinux/disk.c ++++ b/com32/lib/syslinux/disk.c +@@ -171,22 +171,28 @@ out: + static void *ebios_setup(const struct disk_info *const diskinfo, com32sys_t *inreg, + uint64_t lba, uint8_t count, uint8_t op_code) + { +- static __lowmem struct disk_ebios_dapa dapa; ++ static struct disk_ebios_dapa *dapa = NULL; + void *buf; + ++ if (!dapa) { ++ dapa = lmalloc(sizeof *dapa); ++ if (!dapa) ++ return NULL; ++ } ++ + buf = lmalloc(count * diskinfo->bps); + if (!buf) + return NULL; + +- dapa.len = sizeof(dapa); +- dapa.count = count; +- dapa.off = OFFS(buf); +- dapa.seg = SEG(buf); +- dapa.lba = lba; ++ dapa->len = sizeof(*dapa); ++ dapa->count = count; ++ dapa->off = OFFS(buf); ++ dapa->seg = SEG(buf); ++ dapa->lba = lba; + + inreg->eax.b[1] = op_code; +- inreg->esi.w[0] = OFFS(&dapa); +- inreg->ds = SEG(&dapa); ++ inreg->esi.w[0] = OFFS(dapa); ++ inreg->ds = SEG(dapa); + inreg->edx.b[0] = diskinfo->disk; + + return buf; diff --git a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch index 2b86ab828..54151ab87 100644 --- a/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch +++ b/libre/syslinux/syslinux-dont-build-dos-windows-targets.patch @@ -4,9 +4,9 @@ diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile @@ -54,7 +54,7 @@ # files that depend only on the B phase, but may have to be regenerated # for "make installer". - BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \ -- diag libinstaller dos win32 win64 dosutil -+ libinstaller + BSUBDIRS = codepage com32 lzo core memdisk mbr memdump gpxe sample \ +- diag libinstaller dos win32 win64 dosutil txt ++ libinstaller txt ITARGET = IOBJECTS = $(ITARGET) \ utils/gethostip utils/isohybrid utils/mkdiskimage \ diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update index 34fe8e916..4dc09696a 100644 --- a/libre/syslinux/syslinux-install_update +++ b/libre/syslinux/syslinux-install_update @@ -1,7 +1,7 @@ -#!/bin/bash +#!/usr/bin/env bash # -# Sylinux Installer / Updater Scripts -# Copyright (C) 2011 Matthew Gyurgyik +# Syslinux Installer / Updater Script (for BIOS only) +# Copyright (C) 2013 Matthew Gyurgyik # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -26,13 +26,13 @@ # shopt -s nullglob -libpath="/usr/lib/syslinux" -bootpath="/boot/syslinux" -extlinux="/usr/bin/extlinux" +bios_libpath="/usr/lib/syslinux/bios/" +bios_bootpath="/boot/syslinux/" +EXTLINUX="/usr/bin/extlinux" -autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE -com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com) -pciids_file=/usr/share/hwdata/pci.ids +bios_core_modules=(config.c32 chain.c32 ldlinux.c32 libcom32.c32 libgpl.c32 liblua.c32 libmenu.c32 libutil.c32 linux.c32 menu.c32 vesamenu.c32) +bios_autoupdate_file="/boot/syslinux/SYSLINUX_AUTOUPDATE" +pciids_file="/usr/share/hwdata/pci.ids" ## Helper functions ## # Taken from libui-sh @@ -120,7 +120,7 @@ usage() { cat << EOF usage: $0 options -This script will install or upgrade Syslinux +This script will install or upgrade Syslinux (for BIOS only) OPTIONS: -h Show this message @@ -133,16 +133,16 @@ OPTIONS: Arguments Required: -c Chroot install (ex: -c /mnt) -Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr) - syslinux-install_update.sh -u (update) +Example Usage: $0 -i -a -m # (install, set boot flag, install mbr) + $0 -u # (update) EOF } # Trys to find the partition that /boot resides on # This will either be on /boot or / (root) getBoot() { - if [[ ! -d "$bootpath" ]]; then - echo "Could not find $bootpath" + if [[ ! -d "$bios_bootpath" ]]; then + echo "Could not find $bios_bootpath" echo "Is boot mounted? Is Syslinux installed?" exit 1 fi @@ -278,9 +278,9 @@ install_mbr() { { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;} if [[ "$ptb" = MBR ]]; then - mbrfile="$libpath/mbr.bin" + mbrfile="$bios_libpath/mbr.bin" elif [[ "$ptb" = GPT ]]; then - mbrfile="$libpath/gptmbr.bin" + mbrfile="$bios_libpath/gptmbr.bin" fi if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then @@ -293,67 +293,65 @@ install_mbr() { return 0 } -_install() { - # Copy files to /boot - for file in "${com32_files[@]}"; do - # Symlink files even if links exist +install_modules() { + # Copy all com32 files to /boot + for file in "${bios_libpath}"/*.c32; do + file=${file##*/} + rm "$bios_bootpath/$file" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null + # Symlink files if /boot resides on the same partition as root + ln -sf "${bios_libpath#$CHROOT}/$file" "$bios_bootpath/$file" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$libpath/$file" "$bootpath/$file" + cp "$bios_libpath/$file" "$bios_bootpath/$file" fi done - # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS - if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then + # Copy / Symlink pci.ids if pci.ids exists on the FS + if [[ -f $pciids_file ]]; then + rm "$bios_bootpath/pci.ids" &> /dev/null if [[ "$boot" = root ]]; then - ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null + ln -sf "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null elif [[ "$boot" = boot ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null + cp "$pciids_file" "$bios_bootpath/pci.ids" &> /dev/null fi fi +} + +_install() { + install_modules if device_is_raid "$bootpart"; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --install "$bootpath" -r > /dev/null 2>&1 + echo "Detected RAID on /boot" + "$EXTLINUX" --install "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --install "$bootpath" > /dev/null 2>&1 + "$EXTLINUX" --install "$bios_bootpath" &> /dev/null fi if (( $? )); then - echo "Syslinux install failed" + echo "Syslinux BIOS install failed" exit 2 else - echo "Syslinux install successful" + echo "Syslinux BIOS install successful" fi - touch "$CHROOT/$autoupdate_file" + touch "$CHROOT/$bios_autoupdate_file" } update() { - # Update any com and c32 files in /boot - if [[ "$boot" = boot ]]; then - for file in "$bootpath"/*.{c32,com}; do - file=$(basename "$file") - cp "$libpath/$file" "$bootpath/$file" &> /dev/null - done - if [[ -f "$bootpath/pci.ids" ]]; then - cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null - fi - fi + install_modules if device_is_raid $bootpart; then - echo "Detected RAID on /boot - installing Syslinux with --raid" - "$extlinux" --update "$bootpath" -r &> /dev/null + echo "Detected RAID on /boot" + "$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null else - "$extlinux" --update "$bootpath" &> /dev/null + "$EXTLINUX" --update "$bios_bootpath" &> /dev/null fi if (($?)); then - echo "Syslinux update failed" + echo "Syslinux BIOS update failed" exit 2 else - echo "Syslinux update successful" + echo "Syslinux BIOS update successful" fi } @@ -388,7 +386,7 @@ while getopts "c:uihmas" opt; do ;; s) # If AUTOUPDATE_FILE does not exist exit the script - if [[ -f $autoupdate_file ]]; then + if [[ -f $bios_autoupdate_file ]]; then UPDATE="True" else exit 0 @@ -420,14 +418,14 @@ fi # If a chroot dir is path set variables to reflect chroot if [[ "$CHROOT" ]]; then - libpath="$CHROOT$libpath" - bootpath="$CHROOT$bootpath" - extlinux="$CHROOT$extlinux" + bios_libpath="$CHROOT$bios_libpath" + bios_bootpath="$CHROOT$bios_bootpath" + EXTLINUX="$CHROOT$EXTLINUX" fi # Exit if no /boot path exists -if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then - echo "Error: $bootpath is empty!" +if ( f=("$bios_bootpath"/*); (( ! ${#f[@]} )) ); then + echo "Error: $bios_bootpath is empty!" echo "Is /boot mounted?" exit 1 fi diff --git a/libre/syslinux/syslinux.cfg b/libre/syslinux/syslinux.cfg index e7199438f..0c0c6339a 100644 --- a/libre/syslinux/syslinux.cfg +++ b/libre/syslinux/syslinux.cfg @@ -7,7 +7,6 @@ # * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders # * hdt.c32 - hardware detection tool # * reboot.c32 - reboots the system -# * poweroff.com - shutdown the system # # To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux. # If /usr and /boot are on the same file system, symlink the files instead @@ -50,21 +49,21 @@ MENU COLOR tabmsg 35;40 #ff777caa #00000000 std #-* LABEL parabola - MENU LABEL Parabola GNU/Linux-libre - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 rw - INITRD ../initramfs-linux-libre.img + MENU LABEL Parabola GNU/Linux-libre + LINUX ../vmlinuz-linux-libre + APPEND root=/dev/sda3 rw + INITRD ../initramfs-linux-libre.img LABEL parabolafallback - MENU LABEL Parabola GNU/Linux-libre Fallback - LINUX ../vmlinuz-linux-libre - APPEND root=/dev/sda3 rw - INITRD ../initramfs-linux-libre-fallback.img + MENU LABEL Parabola GNU/Linux-libre Fallback + LINUX ../vmlinuz-linux-libre + APPEND root=/dev/sda3 rw + INITRD ../initramfs-linux-libre-fallback.img # If you want Memtest on syslinux, use this LABEL section to launch it (install the memtest86+ package) -# LABEL memtest -# MENU LABEL Memtest86+ -# LINUX ../memtest86+/memtest.bin +# LABEL memtest +# MENU LABEL Memtest86+ +# LINUX ../memtest86+/memtest.bin LABEL hdt MENU LABEL HDT (Hardware Detection Tool) @@ -73,7 +72,7 @@ LABEL hdt LABEL reboot MENU LABEL Reboot COM32 reboot.c32 - -LABEL off - MENU LABEL Power Off - COMBOOT poweroff.com + +LABEL poweroff + MENU LABEL Poweroff + COM32 poweroff.c32 diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install index 89dbf4e86..ac8553a97 100644 --- a/libre/syslinux/syslinux.install +++ b/libre/syslinux/syslinux.install @@ -1,13 +1,36 @@ post_install() { - echo "==> If you want to use syslinux as your bootloader" + echo "==> If you want to use syslinux as your BIOS bootloader" echo "==> edit /boot/syslinux/syslinux.cfg and run" echo "==> # /usr/bin/syslinux-install_update -i -a -m" echo "==> to install it." + + cat << EOF +Syslinux efi64 and efi32 files have been installed at +/usr/lib/syslinux/{efi64,efi32}/ respectively. + +To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and +syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry +using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi +EOF + } post_upgrade() { # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists /usr/bin/syslinux-install_update -s + # update to 5.01 message + if [ "$(vercmp $2 5.01)" -lt 0 ]; then + echo "If you used syslinux-install_update to install syslinux:" + echo "==> If you want to use syslinux with menu and all modules please rerun" + echo "==> # /usr/bin/syslinux-install_update -i -a -m" + echo "" + echo "If you manually installed syslinux:" + echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory." + echo "==> If (/ and /boot on seperate fs):" + echo "==> # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux" + echo "==> If (/ and /boot on same fs):" + echo "==> # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux" + fi } # vim:set ts=2 sw=2 et: diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD new file mode 100644 index 000000000..a2d30c600 --- /dev/null +++ b/libre/vim/PKGBUILD @@ -0,0 +1,228 @@ +# Maintainer: Thomas Dziedzic +# Contributor: Jan "heftig" Steffens +# Contributor: tobias [ tobias at archlinux org ] +# Contributor: Daniel J Griffiths +# Maintainer (Parabola): André Silva + +pkgbase=vim +pkgname=('vim' 'gvim' 'vim-runtime') +_topver=7.4 +_patchlevel=16 +__hgrev=d17ef148ada4 +_versiondir="vim${_topver//./}" +pkgver=${_topver}.${_patchlevel} +pkgrel=2 +arch=('i686' 'x86_64') +license=('custom:vim') +url="http://www.vim.org" +makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua') +source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" + "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig" + 'vimrc' + 'parabola.vim' + 'gvim.desktop') +md5sums=('733cce44a08ea953ad0e1f9d574670e0' + 'SKIP' + '27820c2bdc34624674c561ae6476bc6a' + 'a8c21928eefd766e211f987879a9199c' + 'd90413bd21f400313a785bb4010120cd') + +# source PKGBUILD && mksource +mksource() { + [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) + + __hgroot='http://vim.googlecode.com/hg/' + __hgrepo='vim' + __hgbranch='default' + + hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} + + pushd ${__hgrepo} + if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then + printf 'You are not building the latest revision!\n' + printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" + fi + popd + + mv vim ${pkgname}-${pkgver} + find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; + rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} + tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* + rm -r ${pkgname}-${pkgver} + + gpg --detach-sign ${pkgname}-${pkgver}.tar.xz + + scp ${pkgname}-${pkgver}.tar.xz nym:/srv/ftp/other/vim/ + scp ${pkgname}-${pkgver}.tar.xz.sig nym:/srv/ftp/other/vim/ +} + +build() { + cp -a ${pkgname}-${pkgver} vim-build + + # define the place for the global (g)vimrc file (set to /etc/vimrc) + sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \ + vim-build/src/feature.h + + (cd vim-build/src && autoconf) + + cp -a vim-build gvim-build + + cd "${srcdir}"/vim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Parabola GNU/Linux-libre' \ + --enable-gpm \ + --enable-acl \ + --with-x=no \ + --disable-gui \ + --enable-multibyte \ + --enable-cscope \ + --disable-netbeans \ + --enable-perlinterp \ + --disable-pythoninterp \ + --disable-python3interp \ + --disable-rubyinterp \ + --disable-luainterp + + make + + cd "${srcdir}"/gvim-build + + ./configure \ + --prefix=/usr \ + --localstatedir=/var/lib/vim \ + --with-features=huge \ + --with-compiledby='Parabola GNU/Linux-libre' \ + --enable-gpm \ + --enable-acl \ + --with-x=yes \ + --enable-gui=gtk2 \ + --enable-multibyte \ + --enable-cscope \ + --enable-netbeans \ + --enable-perlinterp \ + --enable-pythoninterp \ + --disable-python3interp \ + --enable-rubyinterp \ + --enable-luainterp + + make +} + +check() { + # disable tests because they seem to freeze + + cd "${srcdir}"/vim-build + + #make test + + cd "${srcdir}"/gvim-build + + #make test +} + +package_vim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (built for the vim-runtime rebranded package)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') + conflicts=('gvim') + + cd "${srcdir}"/vim-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + rm -f evim.1 # this does not make sense if we have no GUI + done + + # Runtime provided by runtime package + rm -r "${pkgdir}"/usr/share/vim + + # license + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_gvim() { + pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI), (built for the vim-runtime rebranded package)' + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'ruby' 'libxt' + 'desktop-file-utils' 'gtk2' 'lua' 'python2') + provides=("vim=${pkgver}-${pkgrel}") + conflicts=('vim') + install=gvim.install + + cd "${srcdir}"/gvim-build + make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install + + # provided by (n)vi in core + rm "${pkgdir}"/usr/bin/{ex,view} + + # delete some manpages + find "${pkgdir}"/usr/share/man -type d -name 'man1' 2>/dev/null | \ + while read _mandir; do + cd ${_mandir} + rm -f ex.1 view.1 # provided by (n)vi + done + + # Move the runtime for later packaging + mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install + + # freedesktop links + install -Dm644 "${srcdir}"/gvim.desktop \ + "${pkgdir}"/usr/share/applications/gvim.desktop + install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png + + # license + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt +} + +package_vim-runtime() { + pkgdesc='Runtime for vim and gvim (Parabola rebranded)' + depends=('perl' 'gawk') + backup=('etc/vimrc') + + # Install the runtime split from gvim + install -dm755 "${pkgdir}"/usr/share + mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim + + # Don't forget logtalk.dict + install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict + + # fix FS#17216 + sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \ + "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim + + # patch filetype.vim for better handling of pacman related files + sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim + sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \ + "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim + + # rc files + install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc + install -Dm644 "${srcdir}"/parabola.vim \ + "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim + + # rgb.txt file + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ + "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt + + # license + install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime + ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \ + "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt +} + +# vim:set sw=2 sts=2 et: diff --git a/libre/vim/gvim.desktop b/libre/vim/gvim.desktop new file mode 100644 index 000000000..675357da5 --- /dev/null +++ b/libre/vim/gvim.desktop @@ -0,0 +1,63 @@ +[Desktop Entry] +Name=Vi IMproved +Name[bg]=Vi Ðåäàêòîð +Name[ca]=Vi Millorat +Name[da]=Vi forbedret +Name[eo]=VIM +Name[et]=Täiustatud Vi (vim) +Name[fr]=Vi étendu (VIM) +Name[he]=רפושמ Vi +Name[hu]=Vi +Name[is]=Vi IMproved ritillinn +Name[it]=Vi iMproved +Name[no]=Vi IMproved (forbedret VI) +Name[pl]=Poprawiony VI (vim) +Name[ro]=VIM +Name[ru]=Улучшенный VI +Name[sk]=Vi IMpreved +Name[sl]=Izboljšani vi (vim) +Name[sv]=Förbättrad Vi +Name[zh_CN.GB2312]=改进的 Vi +Comment=Powerful text editor with scripting functions and macro recorder +Comment[bg]=Ðåäàêòîð ñ ìíîãî âúçìîæíîñòè +Comment[ca]=Editor vi potent +Comment[cs]=Mocný textový editor vi +Comment[da]=En kraftig vi tekstbehandler +Comment[de]=Ein leistungsfähiger vi-Editor +Comment[el]=Πανίσχυρος διορθωτής vi +Comment[eo]=VIM similas al redaktilo "vi", sed havas aldonajn ecojn +Comment[es]=Una versión mejorada del editor vi +Comment[et]=Võimas tekstiredaktor vi +Comment[fi]=Tehokas vi-tekstieditori +Comment[fr]=Éditeur vi puissant +Comment[gl]=Potente editor vi +Comment[he]=Vi המצועה בר ךרועה +Comment[hr]=Napredni vi uređivač +Comment[hu]=Vi szövegszerkesztő +Comment[is]=Öflug útgáfa vi ritilsins +Comment[it]=Un editor vi potenziato +Comment[ja]=強力なViエディタ +Comment[lt]=Galingas vi redaktorius +Comment[mk]=Моќен VI уредувач +Comment[nl]=Krachtige vi-editor +Comment[no]=En kraftig vi-redigerer +Comment[no_NY]=Kraftig vi-tekstredigeringsprogram +Comment[pl]=Edytor vi +Comment[pt]=Um poderoso editor de texto +Comment[ro]=Un editor de texte VI, puternic +Comment[ru]=Мощный текстовый редактор vi +Comment[sk]=Silný textový procesor vi +Comment[sl]=Zmogljivi urejevalnik vi +Comment[sr]=Moćni vi editor +Comment[sv]=En kraftfull texteditor +Comment[ta]=ºì¾¢Å¡öó¾ vi ¦¾¡ÌôÀ¡Ç÷ +Comment[tr]=Güçlü vi düzenleyicisi +Comment[uk]=Потужний редактор vi +Comment[zh_CN.GB2312]=功能强大的 vi 编辑器 +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; +Exec=gvim -f %F +Icon=gvim +Type=Application +Terminal=false +X-XClassHintResName=VIM +Categories=Utility;TextEditor; diff --git a/libre/vim/gvim.install b/libre/vim/gvim.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/libre/vim/gvim.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/libre/vim/parabola.vim b/libre/vim/parabola.vim new file mode 100644 index 000000000..bc3c1f82e --- /dev/null +++ b/libre/vim/parabola.vim @@ -0,0 +1,27 @@ +" The Parabola GNU/Linux-libre global vimrc - setting only a few sane defaults +" +" Maintainer: Tobias Kieslich [tobias funnychar archlinux dot org] +" Maintainer for Parabola rebranding: André Silva [emulatorman funnychar parabola dot nu] +" +" NEVER EDIT THIS FILE, IT'S OVERWRITTEN UPON UPGRADES, GLOBAL CONFIGURATION +" SHALL BE DONE IN /etc/vimrc, USER SPECIFIC CONFIGURATION IN ~/.vimrc + +" Normally we use vim-extensions. If you want true vi-compatibility +" remove change the following statements +set nocompatible " Use Vim defaults instead of 100% vi compatibility +set backspace=indent,eol,start " more powerful backspacing + +" Now we set some defaults for the editor +set history=50 " keep 50 lines of command line history +set ruler " show the cursor position all the time + +" Suffixes that get lower priority when doing tab completion for filenames. +" These are files we are not likely to want to edit or read. +set suffixes=.bak,~,.swp,.o,.info,.aux,.log,.dvi,.bbl,.blg,.brf,.cb,.ind,.idx,.ilg,.inx,.out,.toc + + +if has('gui_running') + " Make shift-insert work like in Xterm + map + map! +endif diff --git a/libre/vim/vimrc b/libre/vim/vimrc new file mode 100644 index 000000000..fc67e7eb0 --- /dev/null +++ b/libre/vim/vimrc @@ -0,0 +1,16 @@ +" All system-wide defaults are set in $VIMRUNTIME/parabola.vim (usually just +" /usr/share/vim/vimfiles/parabola.vim) and sourced by the call to :runtime +" you can find below. If you wish to change any of those settings, you should +" do it in this file (/etc/vimrc), since parabola.vim will be overwritten +" everytime an upgrade of the vim packages is performed. It is recommended to +" make changes after sourcing parabola.vim since it alters the value of the +" 'compatible' option. + +" This line should not be removed as it ensures that various options are +" properly set to work with the Vim-related packages. +runtime! parabola.vim + +" If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' +" Or better yet, read /usr/share/vim/vim74/vimrc_example.vim or the vim manual +" and configure vim to your own liking! + diff --git a/pcr/xchat-otr/PKGBUILD b/pcr/xchat-otr/PKGBUILD new file mode 100644 index 000000000..7bc6e8c41 --- /dev/null +++ b/pcr/xchat-otr/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Tom +# Based on a quantax contribution for irssi-otr + +pkgname=xchat-otr +pkgver=0.3 +pkgrel=2 +pkgdesc="Off-the-Record Messaging (OTR) plugin for the XChat IRC client" +arch=('i686' 'x86_64') +url="http://irssi-otr.tuxfamily.org/" +license=('GPL') +depends=('xchat' 'libotr3') +makedepends=('cmake' 'pkgconfig' 'python') +source=("ftp://download.tuxfamily.org/irssiotr/${pkgname}-${pkgver}.tar.gz" + 'http://xchat.org/docs/xchat-plugin.h') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + mkdir -p ${srcdir}/${pkgname}-${pkgver}/xchat + install -m 644 ${srcdir}/xchat-plugin.h ${srcdir}/${pkgname}-${pkgver}/xchat/ || return 1 + find ${srcdir}/${pkgname}-${pkgver} -type f -print0 | xargs -0 sed -i 's@libotr/@libotr3/@g' + cmake -DXCHAT_INCLUDE_DIR=${srcdir}/${pkgname}-${pkgver} -DCMAKE_INSTALL_PREFIX=/usr . -DLIBOTR_LIBRARY=/usr/lib/libotr3.so + make || return 1 + make DESTDIR=${pkgdir} install || return 1 + mv ${pkgdir}/usr/share/doc/irssi-otr ${pkgdir}/usr/share/doc/xchat-otr || return 1 + install -m 644 ${srcdir}/${pkgname}-${pkgver}/README.xchat ${pkgdir}/usr/share/doc/xchat-otr || return 1 + rm ${pkgdir}/usr/share/doc/xchat-otr/LICENSE || return 1 +} + +md5sums=('49706959af491c721a8a5a62bd224670' + '5ee7da5abedc78a30b90e737370d8f0b') + -- cgit v1.2.3-54-g00ecf