diff options
Diffstat (limited to 'libre')
114 files changed, 2928 insertions, 1229 deletions
diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD index b464d7f76..2a0c570fd 100644 --- a/libre/acpi_call/PKGBUILD +++ b/libre/acpi_call/PKGBUILD @@ -9,8 +9,8 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then - _basekernel=4.13 - _archrel=75 + _basekernel=4.14 + _archrel=90 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=4.9 @@ -18,36 +18,31 @@ elif [[ ${_kernelname} == -lts ]]; then _parabolarel=1 fi -_pkgname=acpi_call -pkgname=${_pkgname}${_kernelname} +pkgbase=acpi_call pkgver=1.1.0 pkgrel=${_archrel}.parabola${_parabolarel}.basekernel${_basekernel} _extramodules=extramodules-${_basekernel}${_kernelname} pkgdesc="A linux kernel module that enables calls to ACPI methods through /proc/acpi/call (built for the linux-libre${_kernelname} kernel package)" arch=('i686' 'x86_64' 'armv7h') -url="http://github.com/mkottman/${_pkgname}" +url="http://github.com/mkottman/${pkgbase}" license=('GPL') # Generic (you shouldn't have to modify any of these variables) _toohigh=$(IFS=. read a b <<<$_basekernel; echo $a.$((b+1))) -depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") -makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}") +makedepends=("linux-libre${_kernelname}-headers>=${_basekernel}" "linux-libre${_kernelname}-headers<${_toohigh}" "linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") makedepends+=('libelf') -replaces=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") -[[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola") -conflicts=("${_pkgname}-libre${_kernelname}" "${_pkgname}-parabola${_kernelname}") -[[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola") if [[ ${_kernelname} != "" ]]; then - provides=("${_pkgname}") + provides=("${pkgbase}") fi -install='kmod.install' -source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz") -sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0') +source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" + 'dkms.conf') +sha256sums=('d0d14b42944282724fca76f57d598eed794ef97448f387d1c489d85ad813f2f0' + '32e6ea6523b13132c6c7838bba7fbf3d040ba2d35a892c2c356245612720df8a') prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd "${pkgbase}-${pkgver}" if [[ ${_basekernel} > 3.16 ]]; then # Fix build with Linux-libre 3.17-gnu @@ -61,29 +56,56 @@ prepare() { } build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KVERSION="${_kernver}" + cd "${pkgbase}-${pkgver}" + make KVERSION="$(cat /usr/lib/modules/$_extramodules/version)" } -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" +_package() { + depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") + replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}") + [[ -n ${_kernelname} ]] && replaces+=("${_pkgname}${_kernelname}-parabola") + conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}") + [[ -n ${_kernelname} ]] && conflicts+=("${_pkgname}${_kernelname}-parabola") - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}" + cd $pkgbase-$pkgver # Actually install - install -dm 755 "${pkgdir}"/usr/lib/{modules/${_extramodules},modules-load.d} - install -m 644 ${_pkgname}.ko "${pkgdir}"/usr/lib/modules/${_extramodules} - gzip "${pkgdir}"/usr/lib/modules/${_extramodules}/${_pkgname}.ko - echo ${_pkgname} > "${pkgdir}"/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf + install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 acpi_call.ko + find "$pkgdir" -name '*.ko' -exec gzip -n {} + + + echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call${_kernelname}.conf" - install -dm 755 "${pkgdir}"/usr/share/${_pkgname}${_kernelname} - cp -dr --no-preserve='ownership' {examples,support} "${pkgdir}"/usr/share/${_pkgname}${_kernelname}/ + mkdir -p "$pkgdir/usr/share/acpi_call${_kernelname}" + cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support } -# vim: ts=2 sw=2 et: +if [[ ${_kernelname} == "" ]]; then + _package-dkms() { + depends=(dkms) + provides=("acpi_call=$pkgver-$pkgrel") + conflicts=(acpi_call) + + cd $pkgbase-$pkgver + + # Actually install + install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile acpi_call.c ../dkms.conf + + echo acpi_call | install -Dm644 /dev/stdin "$pkgdir/usr/lib/modules-load.d/acpi_call.conf" + + mkdir -p "$pkgdir/usr/share/acpi_call" + cp -t "$pkgdir/usr/share/acpi_call" -dr --no-preserve=ownership examples support + } + + pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms") +else + pkgname=("${pkgbase}${_kernelname}") +fi + +for _p in ${pkgname[@]}; do + eval "package_${_p}() { + $(declare -f "_package${_p#${pkgbase}${_kernelname}}") + _package${_p#${pkgbase}${_kernelname}} + }" +done + +# vim:set ts=2 sw=2 et: diff --git a/libre/acpi_call/dkms.conf b/libre/acpi_call/dkms.conf new file mode 100644 index 000000000..edc5c2482 --- /dev/null +++ b/libre/acpi_call/dkms.conf @@ -0,0 +1,9 @@ +PACKAGE_NAME="acpi_call" +PACKAGE_VERSION="#MODULE_VERSION#" +AUTOINSTALL="yes" + +MAKE[0]="make KVERSION=$kernelver" +CLEAN="make clean" + +BUILT_MODULE_NAME[0]="acpi_call" +DEST_MODULE_LOCATION[0]="/kernel/drivers/acpi" diff --git a/libre/acpi_call/kmod.install b/libre/acpi_call/kmod.install deleted file mode 100644 index 40caa464f..000000000 --- a/libre/acpi_call/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -_EXTRAMODULES= - -post_install() { - echo ">>> Updating module dependencies. Please wait ..." - depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1 -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/arrayfire/PKGBUILD b/libre/arrayfire/PKGBUILD index 353f270e4..3868d0a16 100644 --- a/libre/arrayfire/PKGBUILD +++ b/libre/arrayfire/PKGBUILD @@ -6,7 +6,7 @@ pkgname=arrayfire pkgdesc="High performance software library for parallel computing with an easy-to-use API, without nonfree cuda and nvidia-utils support and nonfree SIFT algorithm" url='http://arrayfire.com' pkgver=3.5.1 -arch=('i686' 'x86_64' 'armv7h') +arch=('i686' 'x86_64') pkgrel=1.parabola1 license=('BSD3') makedepends=('cmake' 'graphviz' 'doxygen' 'opencl-headers' 'glfw' 'glew' 'boost' 'git' 'python' 'gcc') diff --git a/libre/b43-tools/PKGBUILD b/libre/b43-tools/PKGBUILD index f3c022578..39423778a 100644 --- a/libre/b43-tools/PKGBUILD +++ b/libre/b43-tools/PKGBUILD @@ -3,7 +3,7 @@ pkgname=b43-tools pkgver=019 -pkgrel=2 +pkgrel=2.1 pkgdesc="Tools for the Broadcom 43xx series WLAN chip" arch=('i686' 'x86_64' 'armv7h') url="https://github.com/mbuesch/b43-tools" @@ -12,8 +12,9 @@ depends=('python2') makedepends=('bison' 'flex' 'python2') provides=("b43-fwcutter=$pkgver") conflicts=('b43-fwcutter') +replaces=('b43-fwcutter') source=("https://github.com/mbuesch/b43-tools/archive/b43-fwcutter-019.tar.gz") -md5sums=('d8387ec57b8bced796b0f9231077501a') +sha256sums=('6fe82827655cf978a649c2c3f8221bc22bded28e4ec2f4ab0a7df487ea1ea4aa') build() { cd "$srcdir/b43-tools-b43-fwcutter-$pkgver" diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD index 1555321f6..809d97224 100644 --- a/libre/bbswitch/PKGBUILD +++ b/libre/bbswitch/PKGBUILD @@ -9,8 +9,8 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then - _basekernel=4.13 - _archrel=81 + _basekernel=4.14 + _archrel=96 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=4.9 @@ -40,10 +40,8 @@ source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/Bumblebee-Project/bbswi sha256sums=('76cabd3f734fb4fe6ebfe3ec9814138d0d6f47d47238521ecbd6a986b60d1477') build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - + cd "${pkgbase}-${pkgver}" _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - make KDIR=/lib/modules/${_kernver}/build } @@ -51,18 +49,10 @@ _package() { depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}") conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}") - install='kmod.install' - - cd "${srcdir}/${pkgbase}-${pkgver}" - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}" - - # Actually install - install -Dm644 ${pkgbase}.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/${pkgbase}.ko - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/${pkgbase}.ko" + cd "${pkgbase}-${pkgver}" + install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 bbswitch.ko + find "${pkgdir}" -name '*.ko' -exec gzip -n {} + } if [[ ${_kernelname} == "" ]]; then @@ -71,11 +61,8 @@ if [[ ${_kernelname} == "" ]]; then conflicts=('bbswitch') provides=('bbswitch') - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -dm755 "${pkgdir}/usr/src/${pkgbase}-${pkgver}/" - - install -Dm644 Makefile bbswitch.c dkms/dkms.conf "${pkgdir}/usr/src/${pkgbase}-${pkgver}/" + cd "${pkgbase}-${pkgver}" + install -Dt "${pkgdir}/usr/src/${pkgbase}-${pkgver}" -m644 Makefile bbswitch.c dkms/dkms.conf } pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms") diff --git a/libre/bbswitch/kmod.install b/libre/bbswitch/kmod.install deleted file mode 100644 index 40caa464f..000000000 --- a/libre/bbswitch/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -_EXTRAMODULES= - -post_install() { - echo ">>> Updating module dependencies. Please wait ..." - depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1 -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/bitlbee/PKGBUILD b/libre/bitlbee/PKGBUILD deleted file mode 100644 index a0a2111e6..000000000 --- a/libre/bitlbee/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 287876 2017-02-01 15:04:41Z bpiotrowski $ -# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org> -# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org> -# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor (Arch): simo <simo@archlinux.org> -# Contributor (Arch): FUBAR <mrfubar@gmail.com> -# Maintainer: Márcio Silva <coadde@hyperbola.info> - -pkgname=bitlbee -pkgver=3.5.1 -pkgrel=1.parabola1 -pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support' -url='http://www.bitlbee.org/' -license=('GPL') -arch=('i686' 'x86_64' 'armv7h') -depends=('gnutls' 'glib2') -makedepends=('python' 'libotr') -optdepends=('libotr: for OTR encryption support') -replaces=("${pkgname}-libre" "${pkgname}-parabola") -conflicts=("${pkgname}-libre" "${pkgname}-parabola") -source=("http://get.bitlbee.org/src/$pkgname-$pkgver.tar.gz" - 'bitlbee.tmpfiles') -sha1sums=('de0767facdb7729253ae4d6ef6e3637ebd54939a' - '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') -backup=('etc/bitlbee/bitlbee.conf' - 'etc/bitlbee/motd.txt') -install=bitlbee.install - -build() { - cd "$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --etcdir=/etc/bitlbee \ - --sbindir=/usr/bin \ - --pidfile=/run/bitlbee/bitlbee.pid \ - --ipcsocket=/run/bitlbee/bitlbee.sock \ - --systemdsystemunitdir=/usr/lib/systemd/system \ - --ssl=gnutls \ - --strip=0 \ - --otr=plugin \ - --skype=0 - - make -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd} - - install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee" - install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf" -} diff --git a/libre/bitlbee/bitlbee.install b/libre/bitlbee/bitlbee.install deleted file mode 100644 index 2db5f795c..000000000 --- a/libre/bitlbee/bitlbee.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - if ! getent group bitlbee &>/dev/null; then - groupadd -r -g 65 bitlbee >/dev/null - fi - if ! getent passwd bitlbee &>/dev/null; then - useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null - fi -} - -post_upgrade() { - post_install -} diff --git a/libre/bitlbee/bitlbee.tmpfiles b/libre/bitlbee/bitlbee.tmpfiles deleted file mode 100644 index da72a0a79..000000000 --- a/libre/bitlbee/bitlbee.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -d /run/bitlbee 0755 bitlbee bitlbee - - diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 2b40070d6..1793f2952 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -19,7 +19,7 @@ pkgbase='blender' pkgname=("${pkgbase}" "${pkgbase}-addon-gimp" "${pkgbase}-addon-povray") pkgver=2.79rc2 #[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit} -pkgrel='5.parabola1' +pkgrel='5.parabola2' epoch='17' pkgdesc='A fully integrated 3D graphics creation suite, without nonfree CUDA support' diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 79b2ccf98..b1d5f819b 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -11,7 +11,7 @@ # Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info> pkgname=calibre -pkgver=3.13.0 +pkgver=3.15.0 pkgrel=1.parabola1 arch=(x86_64 i686 armv7h) @@ -27,9 +27,9 @@ depends=(python2-six python2-dateutil python2-cssutils python2-dukpy python2-netifaces python2-cssselect python2-apsw qt5-webkit qt5-svg python2-regex python2-pygments mtdev desktop-file-utils gtk-update-icon-cache optipng udisks2) -depends_x86_64=(icu=60.1) -depends_i686=(icu=60.1) -depends_armv7h=(icu=60.1) +depends_x86_64=("icu>=60" "icu<61") +depends_i686=("icu>=60" "icu<61") +depends_armv7h=("icu>=60" "icu<61") makedepends=(qt5-x11extras xdg-utils) optdepends=('ipython2: to use calibre-debug' 'poppler: required for converting pdf to html') @@ -37,13 +37,13 @@ replaces=($pkgname-libre) conflicts=($pkgname-libre) # for updated libre.patch commit id see: https://gitlab.com/libreforks/calibre/tags -_commit='ce5c919653b60aa8aea611b3ee19dba8' +_commit='11f261b5db0b2f0d23e5067368ce73d6' source=("https://download.calibre-ebook.com/$pkgver/calibre-$pkgver.tar.xz" "https://calibre-ebook.com/signatures/$pkgname-$pkgver.tar.xz.sig" "https://gitlab.com/libreforks/calibre/uploads/$_commit/libre.patch") -sha256sums=('84c980e80b61d12797c91bfa0b6ba81926e2fef49ca3082c3e5ea80d161e13a9' +sha256sums=('8746f52315561d606fd7120fec8284c2e4433f6ead14639c40b4b5f1522273ff' 'SKIP' - '87b55892d8ba896dd1b29949769001fa5521f85f664b675eb118bba66a42dc5e') + 'b218de451ac29081071b6ba965c543bfeb6fb9c5a1bdcedfa02b27811c986dd6') validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') prepare() { diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index 96d174567..dee544aa6 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -11,7 +11,7 @@ pkgname=clementine _pkgname=$pkgname-libre pkgver=1.3.1 -pkgrel=10.parabola1 +pkgrel=11.parabola1 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' url="http://www.$pkgname-player.org/" license=('GPL') @@ -20,7 +20,7 @@ replaces=("$_pkgname") conflicts=("$_pkgname") depends=('chromaprint' 'crypto++' 'fftw' 'gcc-libs' 'glew' 'glib2' 'glibc' 'gst-plugins-base-libs' 'gstreamer' 'libcdio' 'libechonest' 'libgl' - 'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf' 'qjson' + 'libgpod' 'liblastfm' 'libmtp' 'libpulse' 'libx11' 'protobuf<3.6' 'qjson' 'qt4' 'sqlite' 'taglib' 'zlib') makedepends=('boost' 'cmake' 'mesa' 'sparsehash') optdepends=('gst-plugins-base: "Base" plugin libraries' diff --git a/libre/cool-retro-term/PKGBUILD b/libre/cool-retro-term/PKGBUILD index b7adba51e..4f53a3b3c 100644 --- a/libre/cool-retro-term/PKGBUILD +++ b/libre/cool-retro-term/PKGBUILD @@ -5,22 +5,22 @@ # Maintainer: André Silva <emulatorman@hyperbola.info> pkgname=cool-retro-term -pkgver=1.0.0 -pkgrel=4.parabola1 +pkgver=1.0.1 +pkgrel=1.parabola1 pkgdesc='A good looking terminal emulator which mimics the old cathode display, without nonfree fonts' arch=('i686' 'x86_64' 'armv7h') url='https://github.com/Swordfish90/cool-retro-term' license=('GPL3') depends=('qmltermwidget' 'qt5-quickcontrols' 'qt5-graphicaleffects' 'hicolor-icon-theme') -mksource=("https://github.com/Swordfish90/cool-retro-term/archive/v$pkgver.tar.gz") +mksource=("https://github.com/Swordfish90/cool-retro-term/archive/$pkgver.tar.gz") source=("https://repo.parabola.nu/other/cool-retro-term-libre/cool-retro-term-libre-$pkgver.tar.gz") -mksha256sums=('db799084680545b6961e1b3d1bb7ff0cb8105e82279fe734c2c07c32525350d9') -sha256sums=('a59fb6ead92d02873dc0d423c5a60c43bcc48a732b7616f8aef76f1f5f2bd357') +mksha256sums=('45cd756c61bb6ee3ae7796f221da8d2b137e47f00c3d24839d0ac01ed19a6b42') +sha256sums=('9bc8e23ac33dea077e84247e067548bfb78db29ab0fc361de65c4df780bd16dc') mksource() { cd "$srcdir/$pkgname-$pkgver" - rm -rv app/qml/fonts/{1977-{apple2,commodore-pet},1982-commodore64,modern-envy-code-r} + rm -rv app/qml/fonts/{1977-{apple2,commodore-pet},1982-commodore64} } prepare() { diff --git a/libre/faenza-icon-theme/PKGBUILD b/libre/faenza-icon-theme/PKGBUILD index da9e41c80..df26df8e2 100644 --- a/libre/faenza-icon-theme/PKGBUILD +++ b/libre/faenza-icon-theme/PKGBUILD @@ -11,7 +11,7 @@ pkgname=faenza-icon-theme pkgver=1.3.1 -pkgrel=4.parabola1 +pkgrel=4.parabola2 pkgdesc='Icon theme designed for Equinox GTK theme, without nonfree distros and application icons (Parabola rebranded)' url='http://gnome-look.org/content/show.php/Faenza?content=128143' license=('GPL3') diff --git a/libre/faience-icon-theme/PKGBUILD b/libre/faience-icon-theme/PKGBUILD index 1cbce9e12..963413e51 100644 --- a/libre/faience-icon-theme/PKGBUILD +++ b/libre/faience-icon-theme/PKGBUILD @@ -2,13 +2,14 @@ # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com> # Contributor (Arch): Ner0 <darkelfdarkelf666@yahoo.co.uk> # Contributor (Arch): Sander Deryckere <sanderd17@gmail.com> -# Maintainer: André Silva <emulatorman@hyperbola.info> +# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Jorge Araya Navarro <elcorreo@deshackra.com> -# Contributor: Márcio Silva <coadde@hyperbola.info> pkgname=faience-icon-theme pkgver=0.5.1 -pkgrel=3.parabola1 +pkgrel=3.parabola2 pkgdesc='An icon theme based on Faenza, without nonfree distros and application icons (Parabola rebranded)' url='http://tiheum.deviantart.com/art/Faience-icon-theme-255099649' license=('GPL3') diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index 344d32877..264690b2d 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -6,12 +6,12 @@ pkgname=filesystem pkgver=2017.10 -pkgrel=2.parabola1 +pkgrel=2.parabola2 pkgdesc='Base Parabola GNU/Linux-libre files' arch=('i686' 'x86_64' 'armv7h') license=('GPL') url='https://www.parabola.nu' -groups=('base' 'base-openrc') +groups=('base') depends=('iana-etc') replaces=(filesystem-parabola) conflicts=(filesystem-parabola) diff --git a/libre/glib2-static/0001-docs-Fix-building-with-meson.patch b/libre/glib2-static/0001-docs-Fix-building-with-meson.patch new file mode 100644 index 000000000..02f69b700 --- /dev/null +++ b/libre/glib2-static/0001-docs-Fix-building-with-meson.patch @@ -0,0 +1,85 @@ +From a7cbd565aad04f92cbd9ac36696a9d033ae6bcc0 Mon Sep 17 00:00:00 2001 +From: Armin K <krejzi@email.com> +Date: Fri, 25 Aug 2017 13:36:23 +0200 +Subject: [PATCH] docs: Fix building with meson + +This fixes {gio,gobject}-doc ninja targets as well as +install process when gtk-doc is enabled +--- + docs/reference/gio/meson.build | 15 ++++++++++++++- + docs/reference/gobject/meson.build | 13 ++++++++++++- + 2 files changed, 26 insertions(+), 2 deletions(-) + +diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build +index 7f0467726..8f8dc7ce5 100644 +--- a/docs/reference/gio/meson.build ++++ b/docs/reference/gio/meson.build +@@ -52,9 +52,12 @@ if get_option('with-docs') != 'no' + 'gnetworkmonitorbase.h', + 'gnetworkmonitornetlink.h', + 'gnetworkmonitornm.h', ++ 'gnetworkmonitorportal.h', + 'gnotificationbackend.h', + 'gnotification-private.h', ++ 'gosxappinfo.h', + 'gpollfilemonitor.h', ++ 'gproxyresolverportal.h', + 'gregistrysettingsbackend.h', + 'gresourcefile.h', + 'gsettingsbackendinternal.h', +@@ -95,12 +98,22 @@ if get_option('with-docs') != 'no' + configuration: version_conf + ) + ++ # Meson uses paths relative to meson.source_root() in dependencies, ++ # which is invalid relative to current_source_dir(), so the compile ++ # process fails to find glib headers ++ top_build_dir = meson.build_root() ++ top_source_dir = meson.source_root() ++ glib_top_build_dir = join_paths(top_build_dir, 'glib') ++ glib_top_source_dir = join_paths(top_source_dir, 'glib') ++ ++ scan_dep = declare_dependency(include_directories : [ top_source_dir, glib_top_build_dir, glib_top_source_dir ]) ++ + gnome.gtkdoc('gio', + main_xml : 'gio-docs.xml', + namespace : 'g', + gobject_typesfile : 'gio.types', + mode : 'none', +- dependencies : [libgio_dep, libgobject_dep, libglib_dep], ++ dependencies : [libgio_dep, libgobject_dep, libglib_dep, scan_dep], + src_dir : 'gio', + scan_args : [ + '--rebuild-types', +diff --git a/docs/reference/gobject/meson.build b/docs/reference/gobject/meson.build +index 1025e174f..9ec1f9123 100644 +--- a/docs/reference/gobject/meson.build ++++ b/docs/reference/gobject/meson.build +@@ -17,12 +17,23 @@ if get_option('with-docs') != 'no' + configuration: version_conf + ) + ++ # Meson uses paths relative to meson.source_root() in dependencies, ++ # which is invalid relative to current_source_dir(), so the compile ++ # process fails to find glib headers ++ doc_source_dir = meson.current_source_dir() ++ top_build_dir = meson.build_root() ++ top_source_dir = meson.source_root() ++ glib_top_build_dir = join_paths(top_build_dir, 'glib') ++ glib_top_source_dir = join_paths(top_source_dir, 'glib') ++ ++ scan_dep = declare_dependency(include_directories : [ doc_source_dir, top_source_dir, glib_top_build_dir, glib_top_source_dir ]) ++ + gnome.gtkdoc('gobject', + main_xml : 'gobject-docs.xml', + namespace : 'g', + gobject_typesfile : join_paths(meson.current_source_dir(), 'gobject.types'), + mode : 'none', +- dependencies : [libgobject_dep, libglib_dep], ++ dependencies : [libgobject_dep, libglib_dep, scan_dep], + src_dir : 'gobject', + scan_args : [ + '--deprecated-guards=G_DISABLE_DEPRECATED', +-- +2.14.1 + diff --git a/libre/glib2-static/0001-meson-Build-with-static-linkage.patch b/libre/glib2-static/0001-meson-Build-with-static-linkage.patch new file mode 100644 index 000000000..d7fa59bfa --- /dev/null +++ b/libre/glib2-static/0001-meson-Build-with-static-linkage.patch @@ -0,0 +1,126 @@ +From 241041b0b38e5851bb1a166cbd9393bbdd6eea06 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@lukeshu.com> +Date: Sun, 24 Dec 2017 03:42:06 -0500 +Subject: [PATCH] meson: Build with static linkage. + +This switches all libraries from using shared_library() to +static_library(). For some reason, switching them to just library() (which +should obey default_library) doesn't allow -Ddefault_library=static to set +most of them to static. I suspect it's a bug in meson 0.44.0-1. + +This also amends libglib_dep to include the pkg-config's Libs.private. +--- + gio/meson.build | 2 +- + gio/tests/gdbus-object-manager-example/meson.build | 2 +- + gio/tests/modules/meson.build | 4 ++-- + glib/meson.build | 3 ++- + gmodule/meson.build | 2 +- + gobject/meson.build | 2 +- + gthread/meson.build | 2 +- + 7 files changed, 9 insertions(+), 8 deletions(-) + +diff --git a/gio/meson.build b/gio/meson.build +index d7030aa29..b904841b2 100644 +--- a/gio/meson.build ++++ b/gio/meson.build +@@ -711,7 +711,7 @@ else + gio_dtrace_hdr = [] + endif + +-libgio = shared_library('gio-2.0', ++libgio = static_library('gio-2.0', + gioenumtypes_h, gioenumtypes_c, gnetworking_h, gio_sources, + gio_dtrace_hdr, gio_dtrace_obj, + version : library_version, +diff --git a/gio/tests/gdbus-object-manager-example/meson.build b/gio/tests/gdbus-object-manager-example/meson.build +index 630357378..b92d6ea9d 100644 +--- a/gio/tests/gdbus-object-manager-example/meson.build ++++ b/gio/tests/gdbus-object-manager-example/meson.build +@@ -14,7 +14,7 @@ gdbus_example_objectmanager_generated = custom_target('gdbus-example-objectmanag + '--generate-docbook', 'gdbus-example-objectmanager-generated', + '@INPUT@']) + +-libgdbus_example_objectmanager = shared_library('libgdbus-example-objectmanager', ++libgdbus_example_objectmanager = static_library('libgdbus-example-objectmanager', + gdbus_example_objectmanager_generated, + c_args : ['-DHAVE_CONFIG_H=1'] + gio_c_args, + dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep], +diff --git a/gio/tests/modules/meson.build b/gio/tests/modules/meson.build +index c219015d3..21a43c5ee 100644 +--- a/gio/tests/modules/meson.build ++++ b/gio/tests/modules/meson.build +@@ -1,10 +1,10 @@ +-libtestmodulea = shared_library('testmodulea', 'test-module-a.c', ++libtestmodulea = static_library('testmodulea', 'test-module-a.c', + install : false, + dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep], + c_args : [ ] + ) + +-libtestmoduleb = shared_library('testmoduleb', 'test-module-b.c', ++libtestmoduleb = static_library('testmoduleb', 'test-module-b.c', + install : false, + dependencies : [libglib_dep, libgobject_dep, libgmodule_dep, libgio_dep], + c_args : [ ] +diff --git a/glib/meson.build b/glib/meson.build +index e46d2deb6..371e5bfbf 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -220,7 +220,7 @@ if use_pcre_static_flag + pcre_static_args = ['-DPCRE_STATIC'] + endif + +-libglib = shared_library('glib-2.0', ++libglib = static_library('glib-2.0', + glib_dtrace_obj, glib_dtrace_hdr, + sources : [deprecated_sources, glib_sources, thread_src, plat_src], + version : library_version, +@@ -235,6 +235,7 @@ libglib = shared_library('glib-2.0', + ) + + libglib_dep = declare_dependency(link_with : libglib, ++ dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps, + # We sadly need to export configinc here because everyone includes <glib/*.h> + include_directories : [configinc, glibinc]) + +diff --git a/gmodule/meson.build b/gmodule/meson.build +index fd0219d92..841fc1e91 100644 +--- a/gmodule/meson.build ++++ b/gmodule/meson.build +@@ -87,7 +87,7 @@ gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in', + + install_headers(['gmodule.h'], subdir : 'glib-2.0') + +-libgmodule = shared_library('gmodule-2.0', ++libgmodule = static_library('gmodule-2.0', + sources : ['gmodule.c'], + version : library_version, + soversion : soversion, +diff --git a/gobject/meson.build b/gobject/meson.build +index 9c722ce30..feac8fa92 100644 +--- a/gobject/meson.build ++++ b/gobject/meson.build +@@ -53,7 +53,7 @@ else + gobject_dtrace_hdr = [] + endif + +-libgobject = shared_library('gobject-2.0', ++libgobject = static_library('gobject-2.0', + gobject_dtrace_obj, gobject_dtrace_hdr, + sources : [gobject_c_sources], + version : library_version, +diff --git a/gthread/meson.build b/gthread/meson.build +index 2d5913a91..63e6dd86b 100644 +--- a/gthread/meson.build ++++ b/gthread/meson.build +@@ -1,6 +1,6 @@ + # Just a skeleton lib for backwards compatibility since all the functionaliy + # has been moved into glib now +-libgthread = shared_library('gthread-2.0', ++libgthread = static_library('gthread-2.0', + sources : [ 'gthread-impl.c' ], + version : library_version, + soversion : soversion, +-- +2.15.1 + diff --git a/libre/glib2-static/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch b/libre/glib2-static/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch new file mode 100644 index 000000000..10c85a3f4 --- /dev/null +++ b/libre/glib2-static/0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch @@ -0,0 +1,50 @@ +From b454a60bf154332bd5961880700b7d08aec98995 Mon Sep 17 00:00:00 2001 +Message-Id: <b454a60bf154332bd5961880700b7d08aec98995.1508856243.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 24 Oct 2017 16:29:49 +0200 +Subject: [PATCH] meson: Fix GDB scripts install_dir for *nix + +Disable installation on Windows for now as this would use a colon in the +directory name. + +https://bugzilla.gnome.org/show_bug.cgi?id=788772 +--- + glib/meson.build | 5 +++-- + gobject/meson.build | 5 +++-- + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/glib/meson.build b/glib/meson.build +index 1da0bcd3cc601b9e..33ece2d0221c1850 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -283,8 +283,9 @@ configure_file( + input: 'libglib-gdb.py.in', + output: 'libglib-2.0.so.@0@-gdb.py'.format(library_version), + configuration: gdb_conf, +- install: true, +- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load' + get_option('libdir')) ++ # FIXME: Figure out how to install this on Windows ++ install: host_system != 'windows', ++ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir) + ) + + if enable_systemtap +diff --git a/gobject/meson.build b/gobject/meson.build +index 5a8289e6f054818e..0c8c0cb26f053d1c 100644 +--- a/gobject/meson.build ++++ b/gobject/meson.build +@@ -100,8 +100,9 @@ configure_file( + input: 'libgobject-gdb.py.in', + output: 'libgobject-2.0.so.@0@-gdb.py'.format(library_version), + configuration: gdb_conf, +- install: true, +- install_dir: join_paths(get_option('datadir'), 'gdb/auto-load/' + get_option('libdir')) ++ # FIXME: Figure out how to install this on Windows ++ install: host_system != 'windows', ++ install_dir: join_paths(glib_datadir, 'gdb', 'auto-load', './' + glib_libdir) + ) + + if enable_systemtap +-- +2.14.2 + diff --git a/libre/glib2-static/0001-meson-Fix-libmount-support.patch b/libre/glib2-static/0001-meson-Fix-libmount-support.patch new file mode 100644 index 000000000..c85f047c0 --- /dev/null +++ b/libre/glib2-static/0001-meson-Fix-libmount-support.patch @@ -0,0 +1,41 @@ +From c93756c8f066a1e35fa2f46b231771d78e292600 Mon Sep 17 00:00:00 2001 +Message-Id: <c93756c8f066a1e35fa2f46b231771d78e292600.1509419562.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Tue, 31 Oct 2017 04:11:42 +0100 +Subject: [PATCH] meson: Fix libmount support + +The define was still missing. +--- + config.h.meson | 3 +++ + meson.build | 1 + + 2 files changed, 4 insertions(+) + +diff --git a/config.h.meson b/config.h.meson +index c67e1792f4af1ada..3f310b3c960fcb29 100644 +--- a/config.h.meson ++++ b/config.h.meson +@@ -247,6 +247,9 @@ + /* Define if libelf is available */ + #mesondefine HAVE_LIBELF + ++/* Define if libmount is available */ ++#mesondefine HAVE_LIBMOUNT ++ + /* Define to 1 if you have the <linux/magic.h> header file. */ + #mesondefine HAVE_LINUX_MAGIC_H + +diff --git a/meson.build b/meson.build +index 208c23087627de1e..cd9cbf2ce10595c2 100644 +--- a/meson.build ++++ b/meson.build +@@ -1535,6 +1535,7 @@ if use_system_pcre + endif + if libmount_dep.length() == 1 and libmount_dep[0].found() + glib_conf.set('LIBMOUNT_LIBS', '-lmount') ++ glib_conf.set('HAVE_LIBMOUNT', 1) + endif + glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules') + # FIXME: Missing: +-- +2.15.0 + diff --git a/libre/glib2-static/0001-meson-Fix-permissions-of-installed-scripts.patch b/libre/glib2-static/0001-meson-Fix-permissions-of-installed-scripts.patch new file mode 100644 index 000000000..d89868acf --- /dev/null +++ b/libre/glib2-static/0001-meson-Fix-permissions-of-installed-scripts.patch @@ -0,0 +1,50 @@ +From e36f79439be76f125b67081eb4605b377d738cca Mon Sep 17 00:00:00 2001 +Message-Id: <e36f79439be76f125b67081eb4605b377d738cca.1505389490.git.jan.steffens@gmail.com> +From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> +Date: Thu, 14 Sep 2017 07:36:37 +0200 +Subject: [PATCH] meson: Fix permissions of installed scripts + +configure_file preserves the attributes, so the templates need to be +executable for the (installed) outputs to be executable. +--- + gio/gdbus-2.0/codegen/gdbus-codegen.in | 0 + gio/gdbus-2.0/codegen/meson.build | 1 - + glib-gettextize.in | 0 + gobject/meson.build | 1 - + 4 files changed, 2 deletions(-) + mode change 100644 => 100755 gio/gdbus-2.0/codegen/gdbus-codegen.in + mode change 100644 => 100755 glib-gettextize.in + +diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in +old mode 100644 +new mode 100755 +diff --git a/gio/gdbus-2.0/codegen/meson.build b/gio/gdbus-2.0/codegen/meson.build +index 0e9ffbdfade70779..93d9106adba17a89 100644 +--- a/gio/gdbus-2.0/codegen/meson.build ++++ b/gio/gdbus-2.0/codegen/meson.build +@@ -13,7 +13,6 @@ gdbus_codegen_conf.set('VERSION', glib_version) + gdbus_codegen_conf.set('PYTHON', python.path()) + + # Install gdbus-codegen executable +-# FIXME: Set permissions + gdbus_codegen = configure_file(input : 'gdbus-codegen.in', + output : 'gdbus-codegen', + install : true, +diff --git a/glib-gettextize.in b/glib-gettextize.in +old mode 100644 +new mode 100755 +diff --git a/gobject/meson.build b/gobject/meson.build +index 0d39f2bbc36f816e..01f37a33a623f4b8 100644 +--- a/gobject/meson.build ++++ b/gobject/meson.build +@@ -76,7 +76,6 @@ python_tools_conf.set('VERSION', glib_version) + python_tools_conf.set('PYTHON', python.path()) + + foreach tool: python_tools +- # FIXME: Ensure we set the appropriate permissions + tool_bin = configure_file( + input : tool + '.in', + output : tool, +-- +2.14.1 + diff --git a/libre/glib2-static/PKGBUILD b/libre/glib2-static/PKGBUILD index 71e1fc1d3..585082103 100644 --- a/libre/glib2-static/PKGBUILD +++ b/libre/glib2-static/PKGBUILD @@ -1,19 +1,45 @@ -# Maintainer: Márcio Silva <coadde@hyperbola.info> -# based of glib2 +# Maintainer (Arch:glib2) Jan de Groot <jgc@archlinux.org> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: Márcio Silva <coadde@hyperbola.info> + +# glib 2.54 added meson as the preferred build system, and core/glib2 +# switched to that. However, the meson build doesn't support static +# linkage, so we're stuck with the old autotools build system. -pkgbase=glib2 pkgname=glib2-static -pkgver=2.50.2 -pkgrel=1 -pkgdesc="Low level core library (static libraries only)" -url="http://www.gtk.org/" -arch=(i686 x86_64 armv7h) -makedepends=(python git) -_commit=224f8171dceca920cfd8a4b446726b7610cdafd9 # tags/2.50.2^0 -source=("git://git.gnome.org/glib#commit=$_commit" - revert-warn-glib-compile-schemas.patch) +pkgver=2.54.2 +pkgrel=2.parabola2 +pkgdesc="Low level core library" +url="https://wiki.gnome.org/Projects/GLib" +license=(LGPL2.1) +arch=(x86_64) +arch+=(i686 armv7h) +depends=(pcre libffi libutil-linux zlib) +_depends=(pcre-static libffi-static libutil-linux-static zlib) +makedepends=(gettext gtk-doc shared-mime-info python libelf git util-linux meson dbus) +makedepends+=("${_depends[@]}") +checkdepends=(desktop-file-utils) +optdepends=('python: for gdbus-codegen and gtester-report' + 'libelf: gresource inspection tool') +options=(!emptydirs) +_commit=52b3e434d849e2b0233d6d3d663b5dda82ab263e # tags/2.54.2^0 +source=("git+https://git.gnome.org/browse/glib#commit=$_commit" + 0001-docs-Fix-building-with-meson.patch + 0001-meson-Fix-permissions-of-installed-scripts.patch + 0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch + 0001-meson-Fix-libmount-support.patch + libs.diff + noisy-glib-compile-schemas.diff + glib-compile-schemas.hook gio-querymodules.hook) sha256sums=('SKIP' - '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') + '8b289f3e1a5a3b29d310d45610468199acfe6f2b38a0d1be38c9224437a0e40c' + '12b1a2f4e304e4c03e48ae9564d73ae38619bbb7711a013138939ff8e5cc2327' + 'f53d5acfda4b7141a4813f1e49610e9176dc5bdf8e867d88290e34d91a40ebcb' + '14c0dcfb4efb690f7cb44673faf31f5eb40ac68c01974eddb53d5aa7ae366629' + '2fb828f51727bd9c8b48cfd9d6833c8b4ff82803331f6e2340b0ec8edfe57c52' + '81a4df0b638730cffb7fa263c04841f7ca6b9c9578ee5045db6f30ff0c3fc531' + 'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3' + '5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6') pkgver() { cd glib @@ -21,34 +47,72 @@ pkgver() { } prepare() { + mkdir -p build glib2-docs/usr/share cd glib - patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=786796 + patch -Np1 -i ../0001-docs-Fix-building-with-meson.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=787671 + patch -Np1 -i ../0001-meson-Fix-permissions-of-installed-scripts.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=788772 + patch -Np1 -i ../0001-meson-Fix-GDB-scripts-install_dir-for-nix.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=789681 + patch -Np1 -i ../0001-meson-Fix-libmount-support.patch + + # https://bugzilla.gnome.org/show_bug.cgi?id=788773 + patch -Np1 -i ../libs.diff + + # Suppress noise from glib-compile-schemas.hook + patch -Np1 -i ../noisy-glib-compile-schemas.diff + NOCONFIGURE=1 ./autogen.sh } - + build() { - cd glib - ./configure --prefix=/usr --libdir=/usr/lib \ - --disable-fam --enable-static - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + cd build + ../glib/configure --prefix=/usr --libdir=/usr/lib \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam \ + --disable-gtk-doc \ + --disable-shared --enable-static \ + $(check_option debug y && echo --enable-debug=yes) make } -check() { - cd glib - # Takes an effing long time - #make -k check || : +_check() { + cd build + rm -rf "$srcdir/test-home" + mkdir "$srcdir/test-home" + HOME="$srcdir/test-home" make -j1 check } package() { + pkgdesc+=" (static libraries)" depends=(glib2) + optdepends=() options=(staticlibs) - license=(LGPL) - cd glib - make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install + cd build + make DESTDIR="$pkgdir" install + + rm -vr -- \ + "$pkgdir"/usr/bin/ \ + "$pkgdir"/usr/include/ \ + "$pkgdir"/usr/lib/glib-*/ \ + "$pkgdir"/usr/lib/pkgconfig/ \ + "$pkgdir"/usr/share/ +} + +package_glib2-docs() { + pkgdesc="Documentation for GLib" + depends=() + optdepends=() + license+=(custom) - # remove conflicting files - rm -vr ${pkgdir}/usr/{bin,lib/{glib-*,pkgconfig},include,share} - rm -v ${pkgdir}/usr/lib/lib*.so* + mv glib2-docs/* "$pkgdir" + install -Dt "$pkgdir/usr/share/licenses/glib2-docs" -m644 glib/docs/reference/COPYING } diff --git a/libre/glib2-static/gio-querymodules.hook b/libre/glib2-static/gio-querymodules.hook new file mode 100644 index 000000000..193233398 --- /dev/null +++ b/libre/glib2-static/gio-querymodules.hook @@ -0,0 +1,11 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/lib/gio/modules/*.so + +[Action] +Description = Updating GIO module cache... +When = PostTransaction +Exec = /usr/bin/gio-querymodules /usr/lib/gio/modules diff --git a/libre/glib2-static/glib-compile-schemas.hook b/libre/glib2-static/glib-compile-schemas.hook new file mode 100644 index 000000000..04dc59b1a --- /dev/null +++ b/libre/glib2-static/glib-compile-schemas.hook @@ -0,0 +1,12 @@ +[Trigger] +Type = File +Operation = Install +Operation = Upgrade +Operation = Remove +Target = usr/share/glib-2.0/schemas/*.gschema.xml +Target = usr/share/glib-2.0/schemas/*.gschema.override + +[Action] +Description = Compiling GSettings XML schema files... +When = PostTransaction +Exec = /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas diff --git a/libre/glib2-static/libs.diff b/libre/glib2-static/libs.diff new file mode 100644 index 000000000..eef85b814 --- /dev/null +++ b/libre/glib2-static/libs.diff @@ -0,0 +1,110 @@ +diff --git i/gio/meson.build w/gio/meson.build +index 4a10d49d7eb3229c..77537a77a26dcb5b 100644 +--- i/gio/meson.build ++++ w/gio/meson.build +@@ -741,7 +741,7 @@ libgio = shared_library('gio-2.0', + libgobject_dep, libgmodule_dep] + platform_deps + network_libs, + c_args : gio_c_args, + # intl.lib is not compatible with SAFESEH +- link_args : noseh_link_args, ++ link_args : noseh_link_args + library_link_args, + ) + + libgio_dep = declare_dependency(link_with : libgio, +diff --git i/glib/meson.build w/glib/meson.build +index f12a8b45bbbfec8f..2a505b3dd79ef163 100644 +--- i/glib/meson.build ++++ w/glib/meson.build +@@ -227,7 +227,7 @@ libglib = shared_library('glib-2.0', + soversion : soversion, + install : true, + # intl.lib is not compatible with SAFESEH +- link_args : noseh_link_args, ++ link_args : noseh_link_args + library_link_args, + include_directories : configinc, + link_with : [charset_lib, gnulib_lib], + dependencies : [pcre, thread_dep, libintl, librt] + libiconv + platform_deps, +diff --git i/gmodule/meson.build w/gmodule/meson.build +index 191bca2446f9977e..fd0219d9225f2f3f 100644 +--- i/gmodule/meson.build ++++ w/gmodule/meson.build +@@ -37,7 +37,7 @@ elif cc.has_function('NSLinkModule') + elif cc.links(dlopen_dlsym_test_code, args : '-ldl', name : 'dlopen() and dlsym() in libdl') + g_module_impl = 'G_MODULE_IMPL_DL' + libdl_dep = cc.find_library('dl') +- g_module_lib_args = '-ldl' ++ g_module_lib_args = ['-ldl'] + endif + + # additional checks for G_MODULE_IMPL_DL +@@ -72,25 +72,29 @@ if g_module_impl == '' + message('WARNING: No suitable GModule implementation found!') + endif + ++# For pc files ++glib_conf.set('G_MODULE_SUPPORTED', g_module_impl == '0' ? 'false' : 'true') ++glib_conf.set('G_MODULE_LIBS', ' '.join(g_module_lib_args)) ++ + gmoduleconf_conf.set('G_MODULE_IMPL', g_module_impl) +-gmoduleconf_conf.set('G_MODULE_SUPPORTED', g_module_impl != '0') + gmoduleconf_conf.set('G_MODULE_HAVE_DLERROR', g_module_have_dlerror) + gmoduleconf_conf.set('G_MODULE_NEED_USCORE', g_module_need_uscore) + gmoduleconf_conf.set('G_MODULE_BROKEN_RTLD_GLOBAL', g_module_broken_rtld_global) + + gmoduleconf_h = configure_file(input : 'gmoduleconf.h.in', + output : 'gmoduleconf.h', + configuration : gmoduleconf_conf) + + install_headers(['gmodule.h'], subdir : 'glib-2.0') + + libgmodule = shared_library('gmodule-2.0', + sources : ['gmodule.c'], + version : library_version, + soversion : soversion, + install : true, + include_directories : [configinc, gmoduleinc], + dependencies : [libdl_dep, libglib_dep], ++ link_args : library_link_args, + c_args : ['-DG_LOG_DOMAIN="GModule"', '-DG_DISABLE_DEPRECATED'] + glib_hidden_visibility_args) + + libgmodule_dep = declare_dependency(link_with : libgmodule, +diff --git i/gobject/meson.build w/gobject/meson.build +index 65ffef0697b3bad4..32f6f91db12f29b6 100644 +--- i/gobject/meson.build ++++ w/gobject/meson.build +@@ -61,6 +61,7 @@ libgobject = shared_library('gobject-2.0', + install : true, + include_directories : [configinc], + dependencies : [libintl, libffi_dep, libglib_dep], ++ link_args : library_link_args, + c_args : ['-DG_LOG_DOMAIN="GLib-GObject"', '-DGOBJECT_COMPILATION'] + glib_hidden_visibility_args) + + libgobject_dep = declare_dependency(link_with : libgobject, +diff --git i/gthread/meson.build w/gthread/meson.build +index 8ccac3369894bda4..2d5913a91525460f 100644 +--- i/gthread/meson.build ++++ w/gthread/meson.build +@@ -6,4 +6,5 @@ libgthread = shared_library('gthread-2.0', + soversion : soversion, + install : true, + dependencies : [libglib_dep], ++ link_args : library_link_args, + c_args : ['-DG_LOG_DOMAIN="GThread"' ] + glib_hidden_visibility_args) +diff --git i/meson.build w/meson.build +index 208c23087627de1e..dd860592b26c9973 100644 +--- i/meson.build ++++ w/meson.build +@@ -1541,6 +1541,13 @@ glib_conf.set('GIO_MODULE_DIR', '${libdir}/gio/modules') + # @G_MODULE_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @G_LIBS_EXTRA@ + # @PCRE_REQUIRES@ @GLIB_EXTRA_CFLAGS@ @G_THREAD_CFLAGS@ + ++# HACK ++glib_conf.set('G_THREAD_LIBS', '-pthread') ++glib_conf.set('G_THREAD_CFLAGS', '-pthread') ++glib_conf.set('G_MODULE_LDFLAGS', '-Wl,--export-dynamic') ++glib_conf.set('PCRE_REQUIRES', 'libpcre') ++library_link_args = [ '-Wl,-z,nodelete' ] ++ + # Tracing: dtrace + want_dtrace = get_option('enable-dtrace') + enable_dtrace = false diff --git a/libre/glib2-static/noisy-glib-compile-schemas.diff b/libre/glib2-static/noisy-glib-compile-schemas.diff new file mode 100644 index 000000000..f5f2d9482 --- /dev/null +++ b/libre/glib2-static/noisy-glib-compile-schemas.diff @@ -0,0 +1,24 @@ +diff --git i/gio/glib-compile-schemas.c w/gio/glib-compile-schemas.c +index b8de0907248f6860..130f89b1728f7932 100644 +--- i/gio/glib-compile-schemas.c ++++ w/gio/glib-compile-schemas.c +@@ -1219,19 +1219,6 @@ parse_state_start_schema (ParseState *state, + return; + } + +- if (path && (g_str_has_prefix (path, "/apps/") || +- g_str_has_prefix (path, "/desktop/") || +- g_str_has_prefix (path, "/system/"))) +- { +- gchar *message = NULL; +- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " +- "Paths starting with " +- "“/apps/”, “/desktop/” or “/system/” are deprecated."), +- id, path); +- g_printerr ("%s\n", message); +- g_free (message); +- } +- + state->schema_state = schema_state_new (path, gettext_domain, + extends, extends_name, list_of); + diff --git a/libre/glib2-static/revert-warn-glib-compile-schemas.patch b/libre/glib2-static/revert-warn-glib-compile-schemas.patch deleted file mode 100644 index 75b05103c..000000000 --- a/libre/glib2-static/revert-warn-glib-compile-schemas.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Thu, 12 Apr 2012 23:55:34 +0000 -Subject: glib-compile-schemas: warn about bad dconf paths - -For quite some time the recommended usage of GSettings and dconf has -been to use paths like /org/gnome/example/. Use of /apps/ has spilled -over from GConf and is continuing to make its way into a number of -applications as they port. - -glib-compile-schemas will now warn about these types of paths being -used. This generates a lot of noise, but hopefully it will reduce the -number of ported applications making this mistake. ---- -diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index cf02389..27d0181 100644 ---- a/gio/glib-compile-schemas.c -+++ b/gio/glib-compile-schemas.c -@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state, - return; - } - -+ if (path && (g_str_has_prefix (path, "/apps/") || -+ g_str_has_prefix (path, "/desktop/") || -+ g_str_has_prefix (path, "/system/"))) -+ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with " -+ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path); -+ - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - --- -cgit v0.9.0.2 diff --git a/libre/gnormalize/PKGBUILD b/libre/gnormalize/PKGBUILD index 7b0005f04..4a2930da4 100644 --- a/libre/gnormalize/PKGBUILD +++ b/libre/gnormalize/PKGBUILD @@ -2,18 +2,19 @@ # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> # Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com> # Contributor (Arch): Corrado Primier <bardo@aur.archlinux.org> -# Contributor (Arch):JZsolt Varadi (karmaxxl) -# Maintainer: André Silva <emulatorman@hyperbola.info> +# Contributor (Arch): JZsolt Varadi (karmaxxl) +# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gnormalize pkgver=0.63 -pkgrel=6.parabola1 +pkgrel=7.parabola1 pkgdesc='Audio normalizer, converter, encoder/decoder, ripper, tagger and player, without nonfree faac and mac recommendation' arch=('any') -url='http://gnormalize.sourceforge.net/' +url='https://gnormalize.sourceforge.net/' license=('GPL') -depends=('perl' 'cddb_get' 'desktop-file-utils' 'gtk2-perl' 'hicolor-icon-theme') -makedepends=('xz' 'gendesk') +depends=('cddb_get' 'gtk2-perl') +makedepends=('gendesk') optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer' 'lame: MP3 encoding' 'mpg321: MP3 playing' @@ -27,15 +28,17 @@ optdepends=('flac: FLAC encoding, FLAC playing in conjunction with mplayer' 'wavegain: sound normalization') replaces=("${pkgname}-libre" "${pkgname}-parabola") conflicts=("${pkgname}-libre" "${pkgname}-parabola") -source=("http://downloads.sourceforge.net/sourceforge/gnormalize/${pkgname}-${pkgver}.tar.gz") +source=("https://downloads.sourceforge.net/sourceforge/gnormalize/${pkgname}-${pkgver}.tar.gz") sha256sums=('80fd9aa2da8d7fcc88bd180be2adce1aed863bedba7d715144029bd95b61ccb6') prepare() { cd "$pkgname-$pkgver" - gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --mimetypes \ - 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg' lzma -qd gnormalize.1.lzma + gendesk -f -n \ + --pkgname "$pkgname" \ + --pkgdesc "$pkgdesc" \ + --mimetypes 'audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg' } package() { @@ -46,14 +49,13 @@ package() { install -d "$pkgdir/usr/share/$pkgname/animations" install -m644 animations/*.gif "$pkgdir/usr/share/$pkgname/animations/" install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - install -Dm644 "icons/$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "icons/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" for i in 16 32 48 ; do install -Dm644 "icons/gnormalize-$i.png" \ "$pkgdir/usr/share/icons/hicolor/${i}x$i/apps/$pkgname.png" done - install -Dm644 "$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" } -# vim:set ts=2 sw=2 et: +# vim: ts=2 sw=2 et: diff --git a/libre/handbrake/PKGBUILD b/libre/handbrake/PKGBUILD index 36168de10..d9ed392b8 100644 --- a/libre/handbrake/PKGBUILD +++ b/libre/handbrake/PKGBUILD @@ -6,7 +6,7 @@ pkgname=('handbrake' 'handbrake-cli') pkgver=1.0.7 -pkgrel=2.parabola3 +pkgrel=2.parabola4 arch=('i686' 'x86_64' 'armv7h') url="https://handbrake.fr/" license=('GPL') diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD index a63bae4ac..7fe36ad4e 100644 --- a/libre/hardinfo/PKGBUILD +++ b/libre/hardinfo/PKGBUILD @@ -1,10 +1,11 @@ # $Id: PKGBUILD 115005 2014-07-05 03:31:29Z eric $ # Maintainer (Arch): Eric Bélanger <eric@archlinux.org> -# Contributor: Márcio Silva <coadde@hyperbola.info> +# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=hardinfo pkgver=0.5.1 -pkgrel=6.parabola1 +pkgrel=6.parabola2 pkgdesc="A system information and benchmark tool (Parabola rebranded)" arch=('i686' 'x86_64' 'armv7h') url="http://sourceforge.net/projects/hardinfo.berlios/" diff --git a/libre/hex-a-hop/PKGBUILD b/libre/hex-a-hop/PKGBUILD index 418f33257..2380a0b70 100644 --- a/libre/hex-a-hop/PKGBUILD +++ b/libre/hex-a-hop/PKGBUILD @@ -6,7 +6,7 @@ pkgname=hex-a-hop pkgver=1.1.0 -pkgrel=5.parabola1 +pkgrel=5.parabola2 pkgdesc='Hex-a-hop is a puzzle game based on hexagonal tiles, without nonfree music data' arch=('i686' 'x86_64' 'armv7h') url='http://hexahop.sourceforge.net/' diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 55d93274c..8f0bbd3d0 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=$_pkgbase-l10n _calbase=iceowl epoch=1 -pkgver=52.5.0 +pkgver=52.5.2 pkgrel=1 # look here: https://developer.mozilla.org/en-US/docs/Mozilla/Calendar/Calendar_Versions -_calver=5.4.4 +_calver=5.4.5.2 arch=('any') @@ -147,121 +147,121 @@ EOF sha256sums=('49b419449431d8d64e20427a2e7105e3ac1ffc41e677a5f9a8eb276f5b82df4a' 'acc2cf95661be7cb8928fca89e08d0681685409ff2428e4e3d25baf1af427b38' 'e6edcc7c478d73ca5a17e4889acd302d55201ec5c29de545d3f44165201923db' - '0e0b7f56a2423908bf8b955c79b2834be01b278c40370a76eb33bbb7c8d91288' - '2fef7722c98933a5312778f2d83f9a4f0827992d53bfb4659c96222c2adec2f5' - 'e63212a8b45661609cdba50ce7c6546dd8c843fc8573cbfd3ffd99f6f63ee548' - 'bf3b9fd262a39fbda4c5332d5a6c0ef4c62aff9697cc466f5450d526d838d390' - 'ad60b7728a0f5e168e0fde4b15b3db15145577d78361855678591f1fc5d5e8f8' - 'fe785892f2d325cbef207213574b1a6de439b05f6ccefcd795dc28460b75a184' - 'b8a0c2c9510e5ed0db024fe4d3c93f9800ca3821e38f12ef955f909fed148dd5' - '999955eef1a3fcc26e7d3e821c7c442b718589ddcc18543ad9bd2df746900731' - '602742c53ca47490fcc7c6739e5ac55cd810507d64a7197869cfdcf0a3cf38c6' - '64aa1c1daa8e0f8393bafb01d939832d3beaeeec56bbb63b0bb7491860a68e05' - 'ff3db99a4bbccf2260db06bdf1338f9fc5e7738ca425eb49f5bc0f2a81e09c96' - 'c9e19643701feb3cb491411f5c2d664ce2f8bb40087e853ca0395b45a5cc16a0' - 'e381077092de1febf51fc314a38eb18918ee7dbfc3d0dce25c6570d7f727289a' - 'f1f0807475ada0ba5c51abe2e925cc0ea76402f6563821479f1dcacd024c00eb' - 'f0121e767536ec5bfb180894026fc123e7517069883ad8ec64ae257253a75777' - 'a1556c9f00713a36e4dc9d1668f5648d5b3ef1b585f300da5aefb516ed8363fa' - '0636a1dbd920490a5c79dc99bed9da4a878c3cc6b6f83ac59ed18b372407b5bb' - '10d7ed81fc96d8ee9c071d52bb321a5b21eb18df6b400da74203e824fc74db6b' - '89ab726735ded22e7b866882a8d6658285f7f5f5c271fce82e5a72826fc14eda' - '8524e2f25a6eecbb938e3a2a7053922b19c588f608f08e8d23983680c127be64' - 'c5c5f6dc7b64470760252bac71cf7d237c52372761d672d355f13af78978c93c' - '6cb3b1abfe7d768bd11b34ff2d1e94b96f44e983f9eb431456b29a657cb975e6' - 'f510b370b6c4b2bfa90002a3b66b747c4f3cc36b29502d4f6c18be1109d9cb88' - 'c08d696739fcdea3fb90630e12402a5fb676f2921b68b3abef9f53d5b3bdd560' - 'dac4b706f308c25d4a0b5d185ad045d0e1641e95856456e98f4e7c972b7b965a' - '4abdc6c9215599196e7709d133e9018420416fbf04f87a57c048441c190567b2' - '501f5497be3b9ced345e106d90fe6a0ff3f29151be988ea4fa00b099beb749e3' - '73489740fad937466e55dee110ce39c0044c03fa1de71322edab290d961b88a6' - 'c6eaf83141cc92e50ea239af69470b87f389f13b398d659c99812c0725a2f52f' - 'bb8cab599453f8737f1f5a6d93ed85af28b7f159ba221cec35622b5e6642f722' - '2cf8af9f69b43babc0434026f02f7b6323fc68e7f5ffa754ceca899f962217b8' - '5e7f676fa829b69e525f0ea79efb1b717942995b541759b8decedc02aed53252' - 'aaa0a9c5c268160dad9def19b719f3b4017f60131a98e9b90401b9cf80c39dc8' - '3e908983fff54ad4c8e1986d455fc88f0920c775e560179e4a86085c825b0c08' - '7d7ce32e58ea15e2a3b350de7eb51c2ed53d2fe29c3f0b3c5ff6946c176d0f5b' - '598c5be6944b8dd958dc6570bec7b5815ab92272d8a076f167530738545a4d88' - '4fe34db7dee5602327e3b04c611e5864e11b2113834ac637e81ed462158f3d7a' - 'e835338bac38ada1df429aaec855cb597d3ab6bc0defcb2c190a44b677573187' - '3d6c0c9dfe0e36bdcfb68ce4466ea4b57e075180b8444c3ce947bcf6bcac95bd' - '809fd7fee8e3bff560f41842ba0cee8bb7969569475ec84940098e3984ac0117' - '7ffeab82cbc745699e4ebc11b16e105232c4e3ba618e07917ea6700eaa926768' - '7d9ec24a64f3bca5b6202671b5de7b18219a80fd25c1c2cb4a91b149860069bd' - 'c5337fbb7f30216815d4a841a62baec666be00ee102e775de8f5642ce63b589e' - 'cf9d5778489a126131564bea4eba998bd1ad8b998b5ed1248cb5d4354ec7ce90' - '989642c287371550f1bba03db9d1cdb5314d7a7c0307e3158100fb9ebe565935' - '65c2aa6b47232e6c2f2190b7a830dfdaebe0db1a0c3209e2ea93a6ace42afc03' - 'b9fc9d6b6a8a9bc2de9ffabb4c3242eba5537cdfa4d5120f90eb172820fd1dc8' - 'a00c861d3e9a5059a163a2e024948e51b47f045120d6dbf3dd7966dc26ac896b' - 'adb845ecba559ba24d4f83fa43a9c9958ac332660283b9b581dd15a0633bd172' - 'daf6547b38739914c37d29e00db577117c49b6264622a2df0abb8a2aa3514ecd' - '21b1ab1a42ee71ac81abfa154148cb78130eccef749b0714dc6aff5ad29fe70b' - '28d5ac2757c37a237dbf3f2f89cdff3db580aab4612c4267ebedf54aae0e79b8' - '0c6d4698b3d5e8f891f2225c5ae624f5bee2726363c0130d56c4e9aada675705' - '1352edd2a53a0e387c8bb1b1b2118b5202c459226b85e61d4325973b59e2b273' - 'd77cd8f59a3da93ff1f46da5cc3bb53073b349f7eb32f24132bb8164a8dfa717' - '7148321bb727a3fcb4c45805f8b4d3e105d5a15ce969e62d37af36e4dace28e8' - '903bc6e737d558dad64cb9fdbdeedd5a6d40eb2d707c9ba161bcac7d46b4f028' - '097e95ae272cbe5d8162543f0d73a08ac851e1ba47db49d710ba50e1d1e4517b' - '57d4088b77c0eef84432d362bb95cc3be60a5d7f20155aa3a35a8fc5d3e4a091' - 'edd49644fff4781d6216ede9529fa9725a2b6d2bf316ca24f87ea2286f0558e8' - '034fc0bae38ac6e7086bde0be1ca38f9c3ddc0364049cd7ffb48665c0fb64dc3' - 'fff11a2367a3f66d26c3811a6f31b7ad904ffc30d59bbdb1cd7df9c3d9f2a967' - '7ea938162cbcdf0013823ccbd34f91a9160d8a8343c734253d6b4d46a50126b7' - 'd08695ac033775799dd51916b160379a9d4bc01b001f6fd6ad96b871784f9e88' - '5152521ee4b30c28caf7de657a66afda77560f852c134f3770c4645a0b374a8e' - '854f89c1950d4228e27a80e895db3a8eca76800c4585c9d38d6c35ea12c05ae5' - '0700b4cbf29b9c82f65818516c8fa9d714e2b7c0db19abb26fbaf23df8f98bc4' - 'ca08e44966a954dbf254c756642d344af4741d74b44a1dfd440ec45d1e472826' - '56fe86d1ac35a0a4e1e8feb766de0f37b388db3281d4c1bf413d404d783aff62' - '9679cad040c80ae6af3be8df426c9b6a5385fa0b93b84107824134e8a30e96be' - '0d0d48e352527df52b3fa1cba94b88e7d73b73d1a255360ad7955a614475a21f' - '96692b96fa112a36adcbcacebff50aefc2c5b238f4cb62903f655612e710b15d' - '91e8fc3d74dcfafef6f25f6e7a0393e8f0294582ba45c73d2dfc98caa9a7f184' - '2187b796b2d00d9d5e5a110a1375f0aa8f024189775acf28843d582003458787' - 'f590f9f3b05863791e76fd08f81ee550be495b05646d0d5fda07c38549621eaa' - '6b9a33ba3f9a6df7c7cab474135b455735c462d20346b686dcc541c2d36503d0' - '4aa321fbce68b67f8e4e0371821caab8eda99c4cd185d64f02e4c60f71dfadd3' - 'bc067a57105dca990e4bd1caab8a97700ea4597386ad56f98cfa7ba3d46a9079' - '158b074340e5d1f4a90674ce353aeef6a0f4e2c9a3d0cec6cd9a5ece4e8811cb' - '0fc2952a7e4818e09db1f9a8fa4b9231a70e7fd4ca485450be070b8eb6bab89f' - 'a40f4bdb4fbdb5382d0c07d194456de4b22b2248de3cf9783e2d5620769a6ac3' - '195fcb82fe47932b5c11abe794770d0b669bc14bb8c2b7ef5ea9359351cd5731' - 'caaf3b31ef3d58c12c5f3d9131df440975cb3dcdf4c054103cc11fdbd97af26b' - '1b4190c8f40fe991f7763f47a845a78eb1ead50478e54b08a14931323eba313c' - 'cb4d9c4bba6b48cc3a19aa70d4bfbe6488c625f8430516e18af00fcfbd666752' - 'a75890f2b40bc4c00366714566bf7a70761d3ecbeba6e9a564edadda25f613d2' - '6746b18f1bcebee956e4534f3ce35e27463c8c5695857b4cfa3c6f7a94f200d5' - '2a1382528433d231e87429c03bd9cd9c5364cd262546364c304f345a06ab1748' - 'bfc22f3fecc0276a61ff5a5caa8e2d8df6163b5b44274c253b76fa9f7620fd03' - 'a38c0bb5c33dc136964137c5787431dc12fc73ad07417f9eadea83a087ecb6df' - '3f833b5ab550d78a1742f0ede383ef2f8b805fbcef932f418e68d8feeb041b01' - 'cbb1aadb62806bca13e7e39e6c558437a68527ad3be1b318ef0688dfabdaab46' - 'cd006b0f06a0f00637c53fd672f957ccc0ef83e3e0a6991c7bc6d2e57be558b5' - '655fcc55cafbe2c815c406492a6b1eaf8e383e024ec4f42a7572cda45cefbe1a' - 'e186af9039fdeaa3ce67ef25f459d818c34c58774f1915198024ad2188b9088e' - '6287de67ad7f8bb7611d176aca686c41b2ffcd1e62915fac428bbb8870274ffe' - '603f4edaf71587f47325a069e81c36df3b87ac48d657f9ccdbe1ec284d2ef620' - '747cf2f2bd51dc75a578ac627c0400803851820025081ee19889324b11c65f44' - '33122aa1bff13fdf68a913a17a29d8b9d3ee7c775ddb6e4b1f67be6417079556' - 'db26bc2144442a89d5787abe6b1626208ff20e09d1d03d9a87082ff8ab3df78c' - '918b0bdea1840eceb1042c8aaaaf7e87e2b3a703412bc38c76a34b86f66235da' - '3e919889ec0229f618ea0bdec5845f05142addd7944d19688395ddd4201f8e22' - '46d831ac2588bfc1619852330b9294270244405eb386b76856e32265063c49ab' - 'fbe62ac01731d3f3a22ae011331ed4cdbe18b76b0e66c8762bdafe944516d43f' - '4fe46c39efe4bf2bbdb95b1c028d432a0a53845ae30ce09192107bbbe3217e50' - '05bbf2256b886db58ce87883f13e93b5a380b3ed37dd09c6e03378b476e88a3c' - '1b0fafc37ebcf2b0bc59b29bf1984bb551cec84ce8a73bfabf4b064a3f9065f9' - 'da213cde7f941a27bb4ac47d079263b354bcc2a6696ff7e2634990b9ae6f9e91' - '1b35e8894ab8ebe4703ef98de95e797e9d3bf3b885de0872de2dff95b0095509' - '473cbf34c33c5def816af70c5248d6027432f12169b6e6bef60861524242e1aa' - 'd9b35b7513fe1cc4f211369a6083ee31d9dd87d38fd9c5fc5342bf9c8b29b233' - '5d66bc651c073600841251fe61266eb0fff0327950e6989a422d0fcda89db7bc' - 'dd96df8637761c752cc1bc0e607491eac084bad2070fd3b02b8128b251e442d0' - '50af75edc61a48bcfdc43f632918351dd451af856f85c56e446fa6cb608db9be' - '20fc3e0dde8642927d5bb0d5bcb3be1524312acf0b0556d141553479cfb66c02' - 'd886d88262f2fce12a6854047870b7076a787f0fce678319e39b29d5dde258eb' - '3ed5551811b7ae39ac72d62e9ba8e37cd0d79a0a818aca2591274adcfa5969cc' - 'da803c42313eed5edc06ef3976a1dc9dbc1c397e768b1db67babcc27b1111ef1') + 'd7a8692d263db8627443b2d8c1ecd4d06364829d0e9f8a890e94f2a25d0a3421' + 'e3b74cd07dd62ee3eedfb590ca213adce7f9143ca2a4862cafebf735622128bc' + 'b70bf171595b5a3bb92ba490929fa5a6e476444cc3c245661e28f20ba39dc62a' + '7a900ef8aa8701fcb24f7bed71b852d1d359cfe5f7f4e8a9db509e1d62ea3c3d' + '48b69b2f1c5b17fde1843b8e53f55488fcac27baa0f6637db91ed3cc6c328508' + '773eb2acfe8d92f4b9cea7aef0873359737352553483714be07b63012ec8ba4d' + 'f0219905296688e1ec94b8f96054764caf7c00562e7ac2eb5893c03b2e324aae' + '482fcce244877679d63fd1068acdfe9d366e7c3f498924fe59f0e928ea596952' + 'cea442f2be7885835acac51de212777c5490e20df393b7e00d2757100bcfe45d' + 'e128e9a350135337412841457c3b78c4854958bea828b5d7d5e42c3eea6c94d4' + 'ff985a3332b7e2fdd4e725bd128cda9b1ee56d9c14fe5f7e8311c445564c42d2' + '0b6f1f21a5b69b1c2a0bc9fe1f32f45151f1bae9972f18917d75b7d09251355a' + 'e7595d5a39c6da2b1ea5f6ce1942eaede35a7f6c5856db869be7f49bc41fe86d' + '43a67f8ca8e69dc06a9c69b1dc1eb5d4301f4508287c42b3f6d36a1dc71b75b9' + 'ed5b96993d7fb83b6974d344df537ea59bd0cc82314182a6ae813dded45387fb' + '2e616795cf3fab562732eb05138d8382dc5d702990c9d92ad09b6b3a3f0c73fe' + '2dc7a0690039a04b08b07fc9330100b66854b68b2b4d1a85a72e3079e1fe61b8' + 'cacd00e442583cb57a7a0ca248ee3c4fbd3bda507f67bfa10310c59eec4061a1' + '5846914c053b7ee356679505f5b62360993bfb15cf0da5ec128b1039f7af3edf' + 'c1257f1b837efdea8c467b88081067cc3b8e356c8b3f44eee4f4db59380608ce' + '707393f05f86ea10041d31ff9d61760ce9369bcbf984999663483e451598ca0d' + '0f470c47ec52274b7d494ff92969af52a3974e49c7065376afc06f21cff39e77' + '660031e37fab05c0320aef1aa8a0695b7ad7ceb9618428f4b89074e76cd5b4cb' + '24fb9d5228673397ef95906e36cff233bde2ffa4d76c7ad595eb1f5e0b77cfb8' + '910a1d603b14190034342cefbba9f3033d1203fa4f676c4c3e29675fc6c249b7' + '97bdca96b8ec2dba4d8cd352efc72096a81d9af5b32abed7da99f2ea0ae679f4' + '10d5bbe2cf22e3946cc67a8b9255c328740d61f292942990ffcf7c113edf5b7d' + 'f0e0400623dc851dbfab041b25046d8ba670709475a869d8afb8169c83ace57e' + '78510bacb950a5791ceeccaa41feb5c09053bf685fdaba8eb4c3e260b0c57ca1' + '8dc22d30716cb406e443d725ce826d47e5a917484f88a2dbdd6e0bb98a984bad' + 'be1f111bc6d0589c89fea611b9a7b30393f564405e41d0403b628ee4204e72e6' + '7fc49a2ed9f7dd1b1c983219312bf571bcbc4b435d2965c61749ec63f96fbbc8' + 'a32ed2c27a4e3eb559db3a95e4e7bae1f51598b37c5a14598dce46d8ca19fe9f' + '6a256f33a0b2efb1799227d70df8595dc34249693bee4f4bdd0c9da305c241a2' + 'e5449c5269a5afb66b716f6d090fda62749ec7717d84bfbda0dfab5e7c1af7f7' + 'f21feabf91cada47ae535564d232321281a10e0f41409586bcd75e50a71066ec' + 'b37355ad80efd2efcc1841dba2622eda5d1394fee894a72490fd22511493decf' + 'd36ef43362b6018f541fcb09b81675c8475338b044f1a498ba3c34250b30c682' + 'd9a3575b7ece3402873cb08a715ea790ba2069de8e12b401cacdd311028ae1f0' + '6e4d03c494ab3d97905d56354e6c38365c8a881d4d96a8b3f2510f91c58cad2e' + '011474c4243c2329df60b8a6f48e1a8f31dcc835d09e9814a316cb13424b2b2d' + '1282e8bd498578a2e173f9050d943ab1b46e756cd383255613ed6c53c8174a3e' + '9b64fbfc1e7390934002b738ebc9b772617fc765732fc51718d6218b0ff07f43' + '697765a1ee4cd86e4ecab8ac9588bbe949e15be238f35f59af1eb87ec4bebf04' + 'f8fc5945970e06506041e0b141ad375397c409d824b4cbf8821237e100bb9f0e' + '6bc9e3949da3e6f72a488adcb55be1396141894d22b28d2b8275b31ff8f552f1' + '2673fc5e4fc529f034fae08798f10a056d512256ba5c6f2ffdfcf6ea83bfb28d' + '99f2609c7104a79ea5cb115d204ebdccdd62d831b8402f05e6462d379d52f2da' + '27d4ab4e421a621f12692c4c2292898faa1dc4cd03de7f3b469fc870d0966bdf' + '19563fcf14343996feae7ba2306e3b81e6433e6d7132a568c2efbda517dc183e' + '0f59d39cd46814960b3f0cb8cf343d91589ceb4db9f107cdcd99d18a34f791bf' + 'c4690c86853e9ae0872de07ed96a6b71e564ce5baa6d03f79524cd62226898ba' + 'bd67efbe342167fdcbb4438591487c6dd1c9ca46e9ad3fda4bf238638dd48f3a' + '6368e1d090b810ed49b3ebe2634f7703c54798028b01c67da022069652ab657f' + 'fc98e7d8d5f6c97efa2dc40133a70170a3df05aa497719ce8c3befa1fd6d68fc' + '51616ae863d2885f7ce669df80d1e388496935497d598308d26808446b9489d4' + '1878c3fe119d2007baea3a6759bc950fbaefe93fc372d3b92c6ed64b2a946859' + 'dd7a1dfb847f59cb104c30365ed1b4d661145a6bbbb2beaa02b36cf36122bd12' + '678218c48d874d5e308301343d8bad97cf6827e0fc0ca34d5ea1b0ac58beaeeb' + '529ce11312a84c63e5906d4008d08327ef591fbcedd935ddf56f93ac1b1b20db' + '5515a58cd0b691a1d0dee964d931279b8729cd59f3ee45b23f594f5d1df04240' + '6f6eb33c9c031b73c194f4996c2bd5b9398da096289d2eefe628529299ca70ce' + '2cf40947dec980d24583eb5ef57f9461848fdcb7e5fd6d534d670735a7bb4120' + '67b63e5333f7ae7ea04ce6663c4ddcfd0e2ea220e7a584b3963d242cc7a8529f' + '8ebcd3cca7db1e7c7cc3f41551fc83f2f8a2b13099da6b25ee30f884d7151f18' + '1d058eed9225d995bb7ee6d9a3aa6218dcbda86fac340cb9fb2cfe45da895eaa' + 'f8dff411870edda5723264b5036de51c3570b96c38a31f23b495b0eb74df25c0' + 'c9908b06b105741c350c04c61d85cb14971826e2c6b58272386b7ba86bd5a63a' + '1fcbb01397b921033ea5a70395d67dd7e143d7911cd03890c7780a23be15347d' + 'c98eabaf8ad597139f4ebedb99baa9d8197783ea0afbc069c91310f4d5524f6f' + '7628e4678c52354a052cc46737d99d404c0beaac9498209846b485e0c29cad52' + '464ec41a13bb5ddff649a9a4813fce151e1316f4c1c51986ad60235751e17d46' + '3e48f9ea89318840b0ebbaf6391463274b06a2d48f2294299a4359cec3be0a1b' + '34f36e0198c433a9fd54ee3e7b764bccf2d85b740e935e7bc6831277028c834b' + '0c7ec0d8f73f6068ddf9690f606bee09f0526d00f7c5bd228af01b761d53dda1' + 'd4ed63ff20ac403335b03e5b54bf180bfdd977380822f8d26452a84da114585b' + '68d98489e93122e1c5594a940dd64008eba76b33db395318ded2817b34ca8012' + '6137cd4bf89307079e89e1013347b3d87f9f98a58ed4deab8547f0e996e771ec' + '7a665dd51bd4220e26c3595699da7a74f77616f95f42e2dfcc962801b64700bb' + '29eeb5eb7ac50d0fdbb650c03baab11c0d49554977e73ac6950ea07ac7f6e71c' + '463490cfb5c2318dcf86806b88f01fab3c2be50f6c31e6d92ccb629ce1d4919a' + '1c5ca321aae5b19e6e3ab65aaaa20f1299b70c945a0f1b0fee44469432a8ce6b' + '9f8aa33583cfb8eb0fc3098b96a5257a392d982b26643539782b7877922c843e' + '6585c958190e613a81665c0b43670e2ace1645250e7238cf0a58d470f6416a19' + '6d854e679ab9f9e0f080e94648f68366d32a021b77f630820ae164bd9e348380' + 'a1f6c96ed3c3acc684bcc629121f428962b5e111a80d445479371ae6c85511a4' + '162ef60b8a2f7e7f348d8a559ded2a325ae8c81d58d6574885754e049ae5cb39' + 'ae9cf45b3edd150110cefe9a4f043e6226b459f339c7c719576e16f00d677e6c' + '6dc69a5ab79f59aac8e5930fc4ba0e914e0e65ca35b7a192fe4d1635bd9e9f43' + 'f29c6c77394b3fa7e6e28678873d6b6eca548ec608ff1cf5c6bbe9ebdb577f8d' + '137125c20dca51d5a54354237f0b79e88fe15fdf6dfd731422fd72556263dcd6' + '25fe4075b7b5280035f5304844e69189978d47b7b89e9d1ea7eeb26c452c1cc3' + 'eecd8b8c525531fd8aefb45bd5ae5a1cc97dec025f23b2ba9d17f04d66da8173' + 'a21ee4e5abda073457761c2b402967628ae12acbfe45fe3774ec9ab8524e0c60' + 'e64bb7b3a59d21bcb3746611e9b8ea468aa8b2b15039a86275ee8b69cf05b285' + '0cff484e6bcfca7607d35a32eb56a7d098b39a78268b1c57384cbe79124ffe11' + '716bf7a0f9a12d088be1e4ddd07f2a3861eb7a646dbf0ad1fea1be3187aa5049' + 'd2a6d2fc9408bc5b7fcbc52857c794147c67e82291ba551adfd94f3184bd03f9' + 'f458ec4d93120dc015302c67ecf8a3fb70bedf42803637805a739a43d187cda8' + '9380589f63f01e660eecd035b1742f740b3b4b0e6394fae5e9b27c2909ef36c1' + 'e7d418562df152cb220227432d87e5808675a859267a1238924af67acd073d9d' + '617db320c9f49e2f6f8d75f7dd9bec27c990cbffc2631192bc1c46c8dc3f77ee' + 'd563fbb8db8bbe94e19ab2a24c28f4b272690454175b9955f8e0f84fc08f8ffd' + 'fbf49d3894882e9472a8add1d2c34acb27158f7e56d54260f36092a6dadf5ecb' + '66e0ed6938917713280892a263b3158494f2d7a112ae9d742d94b47140091d9e' + 'b9b980ff76af72bdae112232b3d8d6e0150b879c970ec3ab9ac321c03891198d' + 'dfed225bdb5490b547ccd7f088342f32e5e2b28214c6a7490cba5c189bbf149b' + '5c25dd2777a874bf32523a3ab54e828dcfc7b244fb77f897a641ffb91d12b1b6' + '0289d22b1263c1138134f5b6d286a3a42bd450eefe297cbe0c62f76cfacaddd6' + '5ecee09e88112d5cdf53710b8dbd6c2f235f54030b7bd8df9c4344ba853730bc' + '0d2f1e4068a42f31f58b92fe273685225bdabbda121e57936e0c73c5c18a40e3' + '4a6161e32135462974add9714d0115711037af844b5a0bad35474d983392736f' + '240595758975b80c2a205ae4526055307e61f74e5ce1aa58cffaded88f41600a' + 'cba84306d2f318605e644bd2a0e4896b53746b9143af79ebfbc91a665af4b43e' + '69c6202ceb23bf912e99d776203c7f1c22ff4604e87bb819f78f5e6f9a28e2a9' + 'e4fa82d51fcf24bc83c325c2c520eece28267db26b8b701b46070362f9916400' + '861584c71533159d58936c40ab60b1fcfd071a4b568fa8a779374e1b7984e2dc' + '9ab05de50ba2458284ebedb4c85216a4f366c8aa40f39bfe6d47b24bb127ad51') diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD index 6b34cd70f..3f7ba7576 100644 --- a/libre/icedove/PKGBUILD +++ b/libre/icedove/PKGBUILD @@ -8,8 +8,8 @@ _oldname=thunderbird pkgname=icedove epoch=1 -pkgver=52.5.0 -pkgrel=4 +pkgver=52.5.2 +pkgrel=1 _brandingver=52.1 _brandingrel=1 arch=(i686 x86_64 armv7h) @@ -46,7 +46,7 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname libre-searchengines.patch no-neon.patch no-crmf.patch) -sha256sums=('7f169d1110db6d184a1be750a59734cbe639fb304bd76553aeaa1bde3bb7f779' +sha256sums=('7772e1865cd4cbaac82ea05374d0ae51f754f47c6160c9b83919da483d620ee5' '246418976524fbead5b99e6227f97322f8d4c45e0edf9ce75561ae8eccdefc65' 'SKIP' 'cafd1cf384791e8e3284f52370b2913a8b05935ecfd10d2a19c6dd5a8c219b62' diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 810199d29..1d04c3918 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -10,7 +10,7 @@ _pkgbase=iceweasel pkgbase=$_pkgbase-l10n epoch=1 -pkgver=57.0.2 +pkgver=57.0.4 pkgrel=1 arch=(any) @@ -168,98 +168,98 @@ _package() { sha256sums=('d319f07f17268240cdf0c5f996952f09fbfbdfb2905f9d7b1741a7a42b4d8085' '754ea5ea2fe184d3bc1b1bb60d4caf72cdaca5e4d8f16065b22b988b1ede9ad1' '81d1f98843f29a81c10a9a96655505c72ee34acee45225dcd307ae9a123e63d9' - 'e4997e2ec4ac9b164d0f1a0e69c539fcd62f4f3ad8781b62bc91161d87244ca6' - '049dbcbddd71bc640a192f0412660b49b9635fb3c95c69bc6bc39921efc858b6' - 'cd8551e2217b018ac4b77cf7ac556b0e3d337ada79faa05e8b433d82bfce2563' - '4ab6c8a349b84c80a60093dd24e12e32cd3674cefc95a7d7f4399b87c7e68f43' - 'b9bcf4ef2bc5d55a5861de8efa8451174a420e4032cafe9fe463c78fa029963b' - 'a812abe6c44bde6e39820bccc3c7448a658ef9d9d7d98639ad7fdf39229ce6ae' - 'ed972e2fc9c7aad3196b5db6c82812acd37d08bb83c1b9f276cb73f99cb10e44' - '5ff30769b04e5953c33cc9f64c66d8bbdc0ce8b0b1929910ffd82071964e138d' - '11984db8c70e3bd49a96c3e893c3681108bb9e9f698167c91f221799c5b26c23' - '9140e4b831f42d17d738515a104613b1632c6c39cd7165514e99dfdd561fddc3' - '7d6c277c61341ecd01d154a0c63e1d6d6d30139b22efa4dc050297194ef6ee54' - 'acda7accd57dd95b5a48ec7baf25b29cc6938027e5bfbe9dd4ce999a31e448c1' - '69accf3f165f7feabdc3d3d59ef19af4b01811a89dfc3cff89798f71bb1759cb' - 'b409e3f6d3359fbe1885bed346d04f856910704258be6235ac4b8d677ac87e8b' - 'fa9159287516e9c84f11fab742147c767c405a5ba51036cd8251af9f83dcc295' - 'ceae997c6945d2bbcda249433c72299d42e7798c19b7f2c71deebe77afc0ef33' - '1fd06e46a5cc6d4ae771fbc148b71e9e53e2a53396a44097bc9068714e94a805' - 'c8fe1d4d5fa996f43c4ee9206fcd0519725d55221ba53017c482f8dae8880b70' - '5bd6244175c8cd96a0938eec42aeb470bbe833d25c1f1745afbb9bb3e66eb814' - 'c9be692a527ac9934ca28bcbb6be3a1c1a7a6d5471cfe75809100c3941d55a37' - '2e1ee6612d7ed621aa5e43843de253b5ae3b31185e3d9d2607bb5518e27e864b' - '64c001b0a31985485269c870adf37f0652898f22774a1042030faf8a9af5f362' - '7c830511020b3c3d941d6b699b569a3a7a0897affe70ae4f55229af657b4696b' - 'd09067757c1d240253fd4a28c41955163677f2198b9ca8967120b876bb206109' - 'b9f4311f6aabccb3abb87198a56e34ad6560fb2802e227a557603b7dfe811cd6' - 'fc5fc1f2126c2c87757efcaaa90d4cd5e5d1ce05af4c0e74cca1d144589416e2' - '2138bc886d134a7a3c9511f25acf984e83f05b0940de4ccf1ed5c15b5388a2d1' - '880c74c8994f4353f7b5149b88795cb84b6b66f26ee3a5fe181bc3cffc48db9a' - '79cb2491f93e1e77710b7f946e46ad2dd1d2ea1d99353ac513159a5ea05edabf' - '321d33ef3bf6faffa2bc5f333ac247773742402a597017b07cc6ea02b6d0c564' - '55ebe6b49e65bd84c5d4a7dd54d98457979d9d58abfe7ebc861ed16bf1e23957' - '4adce2a2efc8d02fbeee08fcc4442ca9bacd2ee4efaac9ab5639cc39dd7e0441' - '527edbec7d942e34714f234509985738125cb751011ed781e17a8888a40e2b29' - 'e51f8f137b63cbac65bc8d1a63e301f128b58a502d090bd05838320829d28eb5' - 'e6c47c559b647b9e2e2ad7b7dadbd9c92680bfaa26a706181d7d15d6b3b80189' - '80c291b1e480765fdcf012c460c172297e25bb022290f72c3e742cf4a0113fb1' - '8f575e976a6b2580344957ae13809aaaff7f64f29722ff7e339c3535ca713346' - '5c78506787b4e207f2e5cfd9a387d566ee9d964b2e29d41c9c1500171b33d81e' - '24cc04f7de1401540069fe12231c69d53d72bf48b21ad0158a57a199e324a97c' - '0cb1ba780dbf7e71dad2182dadc3d157261e479d2eb9ac847a5eb93274af83b2' - 'bbb0c993585759536559ce2cca98827a5915dbe3880507a8681bc09a54e44901' - 'fafc4772fbb6b96857d3f42402da2a556c20a0f291b479ac66e0c53745d29abe' - '978e0c8cb2985aa8906f35bb49fb4e4e2bec3492bc9c7c5b0a66cdbd9acde794' - '2eb787c77113156ab23d0986c234c12142981f73486af8474d011f1d89d03e7e' - '6d5537e0b83586d2561030eb480c21f9560c764c5c9d53cff6a109ff0e4a0849' - '363848557e54c141f7aaa065ba9fc658217b85cac901e71877d912e176004d50' - 'c36719ef55557538fec0d7a011adda063494428f07495fc7cc3a592ec3c28aaa' - 'ecdd58c5c92133cc92e0c3cac9c2e3de06e4ab5520c031ad74a03813e3ed0fe4' - '900a1823028928d24247cf707f98cfa5226f04cf5045b7d50889f68a9c35f735' - '8723506b966f04413dd5b20ca7bbfdf82373637b9d791e4eecd36f6aa0028aac' - 'ed1f6920353721d64167b93b85bd2119c370553ef914aef1f18e2f01739cb0b9' - 'ebd1b1bbb217a1b93726b8fd720dd63680d28fa76b9fb55768e87f7b9565470f' - '47105e123349f68f071d748fb2a654fd2b8445dcb9bc1006a83401d759a5d71e' - '7504d2e8e224240aa1a2d0761fec7f36c6c6427a529021f5aa7f33f35185072d' - 'c5b950cd3fc7b1b2dcfea70508da8f8fbe327ab4ec662bf4ab8e9796482bd109' - '114e741a4ff2c75863ff217b4df778f4c2f4c3307bbeab6eacadcb9b0b2821fc' - '8d0a46effa9d4dea17ec8f32538494ef903dd6f2908fd7e4d12cf89b9f514dcf' - 'd6d97b8381806d315448eae8ac3071d57aae58a2f7ab89f419ae21430e71736e' - 'c1de5e657eaf33e1336162c06e9a643de44cae2083c6d8f7dfc026852aa2c33f' - 'a6720e6734307e659ca989b3131cbbc51ac3cee8f75b40da2748ee4b26ac8bb2' - '0548e9b8e574db76432a231fc9e6bb281328e22413bcaf73be79ac0d815cb4cc' - '9727349fce8a362e83acb24cf403dff55dbf788e77d367cb236db8453b3d1e7f' - 'aed732d507da43096c2666c7082394382b57d8f5db57f9469819c1c461ba1eff' - 'a6da2ad562c248b922e9329511d649a7ff30edafba512585ff9824a047fa9b5c' - '29278b6bb2f86c00b47bc1555bdf39901fbae933bfb8da332c6fb4d9bb98eb93' - '85b542b1df86fbaf5e72dcbdcdb1902cb4c9399bf9d8358864189748bc40be4f' - 'fcbdaca8ade333dcc6a9907d25826c96a3bdd38b738d767e8dd0e4d136cd0a04' - 'f11ebb89292b1f6ea4b23aa1ebc9d2cf06eca70f74e3716bdf212813fa27d1f8' - '62f6b27b921403b5eb66ed6cd756ae58158c576113fdab7e22c2e0d6addeee0d' - '51add79881216d6b0b6b6a0e542312077c90a2f4bfecde7cfab50c021922c255' - 'c50223c03c0a988592f6ff6faf988b0decd20ffcbf86a4094095795aae1a191b' - '3363080d6e6f3f64f0f65fd5dfbae135afb9fa7ac581dc11eb1f6b1d729c3419' - '122a54c218fd4f0968815a4bf5211952225194c1cdae6c87d5236f14775cfd08' - 'a287438f5494388161055e2cec97ed4656423431697a244cb35c77ef722655e9' - 'a99b89dbc7cd74f212edc93435ec28f8ec07cc09b815a07cd247eb5f9db51eef' - '481f65471392779bc115b78e9b743092e807ba623cfdb7fe1a5f0c6ef140c790' - 'b25dd55d5d046ef80f5dbabba18008a53074dfb5b10694c3a1ef0bfa2ed47768' - '0aa9b90d9ee33055fd45ce508906231efae349a7fe902dff42d8f52477d9d572' - '4e23b6888f767ce131b440679025cfa523cd29673985b32e4693233780ddc1fd' - '9a5bb0644c00fea4eaf1e0cc5491340769a011a64ad106b2fd0c6fbbffba73b6' - '94bdf395d5fc7650a2af468f011b937f8fdf60d5d3803985d557978af1f8310f' - '16f41d29b8afabb32e7e488c476fee2bc84bcf0e6fb348c1a4c6a8157f465cbd' - '333722711aa715f65cd79b98f9edc109d151706b71ccec052cad1c3f55530e0b' - 'b1547d3a366944f2f2eb2efe5bb2140d5be98590983bc9a5375bf92516835df2' - 'fb8ca50c06430e851aa7f27812e223f80ac46770ce243b8fbd0785b574d9f822' - '0cd211ae333511fb7047b0c9ff7643b1b34893cb6255139c8058ccb267c03a78' - 'fefbf5da1b82dc13057c322d1896834a44663369d849468acb1338fe8d2c0009' - '3f42f3473a001ad4f04d5c0adbccc9a1eb467dd478d13577ac508dbf29da392c' - '30bafef9fc22b8079e2ab3546a2589ad6899e9b5e45a6141d85419dbde0e86e9' - '2d3cc8579a83f5992e3b53f0f4ba1bf941400f075aab154c85c889069970cef7' - 'f72a755f23c77fbd7bde1f150d320ddf3516baf26131a795c3227f85a41d1b43' - '07718242af2d00df88cde15704e5af63149eafac507eaa903e9f094f7796be70' - 'e996e2042c168ec26fe8310343cb1d32fdebceecd633cdb403118bf679062526' - 'd66d88d278fc54ff0081f83c0b15a4b2f47308f2bcb340332f6cf13e85dba160' - '9b669d4dd297915657f2d8dca25aeb51d49e9138d6d6c542e82256dfc477d696') + '0db61e82a56775653e8863cf46e92d7791ad855b789c326ad58dfbbf996a3880' + '018e8ca7b2ac1ca55f53bded94cb979d0872986ee494864330b97457d9efd7e0' + '2a536acaa8efa972b4a74bd8a786607eee939f97ea6c5aa5773f7132f42638fa' + 'cba589fa5e88446edf0d051e80c02f1a06224ad0b8d66a2de81cde615b78f01d' + '758d4830417c3fff4cef797c12afac34d915e8940061e907ac68083f1c46c592' + 'fb8b1c0c67bacf1cadafb43ffc639038a32fc5318be0dd691f8929ee2bd2b01e' + '17f7ac16870d6ce48ca02d45ba9a35bc42b58e85f2e86767f211fb956d2a83c6' + 'b55f05cbb024c897a1f648cbc111a1802ad60b83531ebe3f9f5453606bed471c' + 'b715180f7c48239b8d3404f1cfc102c0142e22f2aa7ac19877177e7a7f08d46a' + 'da35dcf4bad2ec7484a4c9f0ddcb1424190e564e69801fbf2bbd94ee1d0c2a56' + '9093099dbb01f46e6b1aac94f401d1417985233dba072cfdbefecf7031756e81' + '198aead2f677fe5185edfc2abf3c83735e5b7f1cd19a2aaf7362b57003974eb4' + '6ba5d0950dc28aa070f32b2d613ce0913420ce2022004b1c189f253b2b17847a' + '6ef787d51d1bcd2426d3426ea57d0cdab244fc49b93f19226291cb6b7c06b30e' + '099d5847c14fdf22dc81c1bb581d136d292b01714d99de2cdadeac3c2988e561' + 'ec2f172874be86e1c3950998e26cc77535ca8121db63c96d34068c58c3179d99' + '71f431a351e93c74c10f569601bb32ec990ea2a16b6bfb5f724966d0d7520bc6' + '5a4a0a5aa93c19c4f5fb5aab3f83765ddfd2f993d1cb8278de1366f5626fc925' + '4370210b943ebbf8b814a6e04be9c7e99416c2ff4c54c31748f781f44309e36c' + '5170e4e0e160405dd3ed5515e35fe36dae70aec8f48102345619e5c75bd1488a' + '9d2e01e55e1fd7d39b8a0a923088334dc00dca0547fd5985aaeed6319cce5095' + 'ae4e8350e6a36cdeb8bfb31341bef5bba1eb48b6915b99a34a6cde2fd838651e' + '3afb8de6b06406aa92c2b7c353286823c06cdb45218af798278c04ab67d85032' + '92c5c01f2b5513d49aca2c453721026ac006cda7b1ed260083b8f101197dd9ea' + 'b71b76d3a61b243bcdb71e02ed3e1752adf35301d45a441c21faa770799ce196' + '0c9ffc8db2fba0359bf69b6bf82b3be15b939dc834bb021cfaef88646abc9e3e' + '3f3af7c94265797b7947a6ca5b3868eab036dc2562777ff9a9c65cfcda9a5648' + '04edd799bfeb4a7433a80320abafc7d0c1c7c24982e1d53976638e5f2ac243f9' + '7bfee1ac67c2a50fca910ecd21aa54592774aa49ce11f58ddc64de1ccbdcc5c6' + '37ac8824f08bfd6d931bb6d325226a970adcf4a8b3fb9ad651ef6d965f8784bd' + '7b6df791d0390b4cdbe92811c5bd5e374958ad242a3bbc7a49f1cbf963aa5b36' + '7be55f40579f970e2682472fbb66e8f182c14491f67127991684e45968fbf3ed' + 'f3321f6ecaad8d0171741fe91420492d09515b25cc9f7be764dc258b06dc7db7' + '71f29805ebe1f46242d4e01846880f42f310a42fbba22872014d8d45ceee29ea' + 'a959c6f196e6a26d0941a336cb6b1183a8e5af789380f249f7a2e75510bc2610' + 'f4e9632af6d1850a8079b12e2652de3af69fdcc2c9db06f79c94b3ef5d1de0c2' + '665ce3c813e280e821a1311c8ad3a7744583fbed821bb23240354163bed13ff1' + '20388643eececf3e1687b7deec855ff5ae094bf852c0d22c9bb805f344a7404b' + 'dc3bba2acaa91c3cbb9a137d4ba76ea321447f1a935de45c81e9a7ac9310e2c6' + '6138f2080bab839e83a709307f443b765daa8654a2bd40a8b93c1db9e94793bf' + '651fbcff0b9b94071695bcfc2517ef2a151235ebd609fe55cf7433771103e6de' + '004f5c836c007157851e70e27b9afe690b83ab6cc3358d5a406961fc504b62e7' + '2355ad6a0d3ed332068e619d2f159111b80327989c6a4ca7cb4eff87ff77f753' + 'aa836c086e743f90807db62eb66c911a8ed2d48e52b99b649c446832d399cd96' + '49ec24fff47910b9249037f72e14252284c51cd0e171259128ea7365bbe68844' + '606bfacd3bc3ffceb3b431378f66c49db6b6a37c5eedc84128dd00b15a8fb3d2' + 'de5d81269f2293eedb3146150e49a2b48a5729d1a09f092be4c66bf4712fe267' + '5c3af12deb175399c67878856850eb7a1794bb6836dd1f3b072489dd8b3a6e1d' + '7fcbefb0ef86f4416097042a20a9ff5ebb08cab09e8efeea1d446fc436bbeee8' + '6dae24cb5e0d562f6521d5ceea3f79beca5ad4f7800a6883cb32429ee02e4bec' + '8e861ab62866d82798722c433accbd94a7a20ca7701fa05ccc2458c7d2026f8e' + '162acea7cd9df51ff0481d90dc239682f8cf834ec37f51a714b9e38d4ffa338e' + '8c7f6ece7b746c37a407bbbb22c79961a9e0762e7aabc8f945390e1bec515ebc' + 'f003d5f0db4c94c793b0327f3ca5040d9a420cbcd03d6c717558c936c6aaa4a3' + '438f20f6ff1f24066c91679dcbb570ed814ddd3090cbba06e1d975d542916931' + '21e92623823811b62852a14a61985151d2a4dfa1c2d97592b63338eb63b354c2' + '9e26a3960988d1c79a60dfe1cbd9221f754f3e9cc54984f28660ea729012cc4b' + '6bb35ffb667d942c548086c82717eb29b6a9c18933346d0f47278e44fe68ef76' + '63b12574a6bbb97619f1aa0e0d585dbd57df3a2582989eaacd7520c1cbd13adc' + 'a15d7e0641a84b914257545ae422b24476bcc536378fe15626e750ebdbddfa95' + 'e990c82a2b92081fc064813db8d73da71ed0f9bc611a79e767a0d3a88928e9c0' + '8f15d51c621e877314c68e4f11559b57556a22ea74e18b40bdbad2c906b2d110' + 'ac1b73452a2818a80958de7122e9f653bc62de3408ac3207f60cf1ad6f033063' + 'fdc5bbf4e8b4ce6bb2039c57bd28a2737765a97995794a338e123e31e64d763d' + '64dbc7ccca7adaceb6b960ddad0d03b3b5cd220c691c79dceef5f89c0f3e6ba4' + '9dc539ef7641fb881f66d7b98b6bc0a76972d8e8734499ba6309d904436dc684' + 'efe347ea92a21c9e1f9acd34eb0e05f19ccafd62b10a21ffa09febcc7584e8ef' + '0d8ab0fdda99f63ab21b482b7351409715a2cd2f41cddf6bbe5b1b272da74bcd' + '223d3ef52c3820258b49df7f42d9d861ad56f756860778b0ffd01cb13c453f1b' + '0e72f2fcaacc58de0031c4f4410e5b5f2cc0eabe931a26f23e74407b63b27aaa' + '870ee04109bceda64f6097eb64d57dae741cae1b3f327515a6ecac6c87253974' + '0d91f5bdc4dfaa9fb6daa20f771148e38f2d9e4399bf30fe244030e276c9ac89' + '4b2d43c3b949a37cccf71b71b45080792e2885d834a4e276fa7df5cf6a74dcc6' + '2ef8b8664011c26508cb09b136c45d9c9a1900a2300e097a5f230ca814a79780' + '37e0a1fff509be32a6cc359eed53f56e06f207c8c2e85d4e1e6faede3bb3b4ac' + '9c5669d219007a5a09fc0b9f813edb63f152a85329698e534a18799dbc8e9b68' + '4a392e7dfa9cc7e28f3e9a0d4ce5de24f6531d12bca17254d86043c8172acc1a' + 'd124a90746df53a94b6dfd0f74b7a0e365ce8a36d8b5ff6b5022d557be801651' + 'beabdded23f975d25273b4179933d8bfe618cc49de46a356bbd8a8d8a0b632dc' + 'd0c419d071c43f139c0467f643a7619a333bfc28733b2c5c4df3bba1e1aa94bc' + 'f0b8b5450dcd145148ae5fa4f4c446a623014ddc0f8c8a69b7990db667d5c32d' + '2f08696a618b027f3b5b866abe42bba53c1f37d89b0b2948aa4c3f893795f537' + 'd1418c1a1de6b9958917d3ae288eb794a463139c947d2af7d8f758f37b8865ff' + '452278c7f1e5ee9f23d126de8f3659750ad5a8f5c87235fc089ffacf19348e53' + '642a0c33076fa02ddb624c5aaaa7f4892151e902585d6b6f72460db5923f1548' + '8e2fd00f5eb274f8dd8fb51101ddeccce2c755d85cb4054d682ae2c5981a48c9' + 'f50f501e4eecd612b4946d9db620009012b3ccef5bc7ba87b3bf47c92204068b' + '5706cc11ad164057b7122829d15d3fbed85a76fab1f6ac398191711084663e95' + '163417dd79a964730dfd1e5e673679d70d0537089934a8ef4c72ef305becb830' + '4782235ccb58b4910eb41d9e40e09e596cda1028cf250006d6baca96abc2231e' + 'a07005793b45fa437374f28007d2e2cd38a87c3c143932f33c9e015450fa7b2d' + '5579932fc28c8032a48a5a0bf79dc0c53e73455037e8e1263f7bb0601522b18a' + 'b311b001e941a9e4065037b77b846132482ad711de4f214a4bfe8e8619a77d49' + 'eb826002503363424f93a516623382b887b1a5fcee96ef0e610d9aed53c744cf' + 'e24b8dd7a5953bbbf0dcbadbd370d2153fb9050da02acd0709a6ea7b629dbd87') diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 9cf9339e9..a5ec282b6 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -6,7 +6,7 @@ pkgname=iceweasel-noscript -pkgver=10.1.6 +pkgver=10.1.6.2 pkgrel=1 arch=(any) @@ -21,7 +21,7 @@ groups=(iceweasel-addons) source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) noextract=("noscript-$pkgver.xpi") -sha256sums=('16c34ea0ec3eee05d303ba4fa2744d5cbe0a948325e84d41e5e8568f27a17207') +sha256sums=('657d8ebff32415adb1a2d72cd0f7db5dabe8a32900d7c2f911a840548d31d37b') prepare() { unzip -qqo "noscript-$pkgver.xpi" -d "noscript-$pkgver" diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 1ee04aebd..c96f61c0c 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -20,8 +20,8 @@ _oldname=firefox pkgname=iceweasel epoch=1 -pkgver=57.0.2 -pkgrel=2 +pkgver=57.0.4 +pkgrel=1 _brandingver=57.0 _brandingrel=1 _parabolarepo=https://repo.parabola.nu/other/iceweasel @@ -67,7 +67,7 @@ source=("https://ftp.mozilla.org/pub/$_oldname/releases/$pkgver/source/$_oldname mozilla-build-arm.patch wifi-disentangle.patch wifi-fix-interface.patch) -sha256sums=('cad021a13daf8fd2c951fab763e784c82aabef45e68a34c941fb64d62f1a5707' +sha256sums=('97cced69abfd5c57d968f0095631f86beff4f7b61883edd5a4f207e7f9c43b33' 'e93f2363d7b414d207250eb1c63d955681f158c8d5678ef3d2e9232cdb0382c7' 'SKIP' '71e20557568330c29553201a6009060feb65921b021fff8053ad9f7cb67670fa' diff --git a/libre/non-working/isdnutils-dfsg/PKGBUILD b/libre/isdnutils-dfsg/PKGBUILD index 1ff0b451a..1ff0b451a 100644 --- a/libre/non-working/isdnutils-dfsg/PKGBUILD +++ b/libre/isdnutils-dfsg/PKGBUILD diff --git a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch b/libre/isdnutils-dfsg/modern-autoconf.patch index f80f34f54..f80f34f54 100644 --- a/libre/non-working/isdnutils-dfsg/modern-autoconf.patch +++ b/libre/isdnutils-dfsg/modern-autoconf.patch diff --git a/libre/khotkeys/PKGBUILD b/libre/khotkeys/PKGBUILD index 30820fcde..f286a4b78 100644 --- a/libre/khotkeys/PKGBUILD +++ b/libre/khotkeys/PKGBUILD @@ -7,7 +7,7 @@ pkgname=khotkeys -pkgver=5.11.4 +pkgver=5.11.5 pkgrel=1.parabola1 arch=(i686 x86_64 armv7h) @@ -21,11 +21,12 @@ conflicts=(kdebase-workspace) groups=(plasma) source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig}) -sha256sums=('8601789ea3b796677c887e7c3c7a2f1d4053474797d8f4f6d7cf50f9d7a15f73' +sha256sums=('70d73eba6182574060277ee7ae5cf32626fe1e057861f199f92faee226963e14' 'SKIP') validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell '348C8651206633FD983A8FC4DEACEA00075E1D76' # KDE Neon - 'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson + 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson + '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com> prepare() { mkdir -p build diff --git a/libre/kinfocenter/PKGBUILD b/libre/kinfocenter/PKGBUILD index 8e66c3a07..bd7550d2d 100644 --- a/libre/kinfocenter/PKGBUILD +++ b/libre/kinfocenter/PKGBUILD @@ -7,7 +7,7 @@ pkgname=kinfocenter -pkgver=5.11.4 +pkgver=5.11.5 pkgrel=1.parabola1 arch=(i686 x86_64 armv7h) @@ -22,13 +22,14 @@ groups=(plasma) source=("https://download.kde.org/stable/plasma/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} parabola-logo.svg::https://wiki.parabola.nu/images/a/af/Parabolagnu%2Blinuxlibre-dark-scalable.svg kcm-about-distrorc) -sha256sums=('c4e1cc4fda2b7f7799c00cea1d4e5e03ad70e711776721167d0705e940dac339' +sha256sums=('2e36ac5817ca8fbba264ae2ba0061b97ae740690525160296ba823328989a77a' 'SKIP' '75136b90185242891cbeb993285f400bcc9c6c70fdccb0f5e50790acaf875b92' '9c874f9ee68dc1c46fab1255f28bdca892e664b35208220db77ab59e04617a96') validpgpkeys=('2D1D5B0588357787DE9EE225EC94D18F7F05997E' # Jonathan Riddell '348C8651206633FD983A8FC4DEACEA00075E1D76' # KDE Neon - 'D07BD8662C56CB291B316EB2F5675605C74E02CF') # David Edmundson + 'D07BD8662C56CB291B316EB2F5675605C74E02CF' # David Edmundson + '1FA881591C26B276D7A5518EEAAF29B42A678C20') # Marco Martin <notmart@gmail.com> prepare() { mkdir -p build diff --git a/libre/libffi-static/PKGBUILD b/libre/libffi-static/PKGBUILD new file mode 100644 index 000000000..14b5f5f6f --- /dev/null +++ b/libre/libffi-static/PKGBUILD @@ -0,0 +1,44 @@ +# Maintainer (Arch:libffi): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor (Arch:libffi): Stéphane Gaudreault <stephane@archlinux.org> +# Contributor (Arch:libffi): Jan de Groot <jgc@archlinux.org> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> + +_pkgname=libffi +pkgname=libffi-static +pkgver=3.2.1 +pkgrel=2.parabola1 +pkgdesc='Portable foreign function interface library' +pkgdesc+=' (static libraries)' +arch=('x86_64') +arch+=('i686' 'armv7h') +url='http://sourceware.org/libffi/' +license=('MIT') +depends=("libffi=$pkgver") +options=('staticlibs') +checkdepends=('dejagnu') +source=(ftp://sourceware.org/pub/libffi/libffi-$pkgver.tar.gz) +sha1sums=('280c265b789e041c02e5c97815793dfc283fb1e6') + +build() { + cd $_pkgname-$pkgver + ./configure --prefix=/usr --disable-static \ + --disable-shared --enable-static \ + --enable-pax_emutramp + make +} + +check() { + make -C $_pkgname-$pkgver check +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + rm -vr -- \ + "$pkgdir/usr/lib"/libffi-*/ \ + "$pkgdir/usr/lib/pkgconfig/" \ + "$pkgdir/usr/share/info/" \ + "$pkgdir/usr/share/man/" +} diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index e551f4abf..208e97a3e 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development" url="https://git.parabola.nu/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20170709.1 +pkgver=20180103 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -sha256sums=('1d74e007a33e46db11ecb14d7e501eabb3f6f4feb18d223329de9ce68cd70c91' +sha256sums=('802375c1549cacb51def8c3be8554d8381f9a6eac8f599fca886a670737fec0e' 'SKIP') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker @@ -89,14 +89,14 @@ package_libretools() { make # `librefetch` openssh # `librerelease` rsync # `librerelease` and `makechrootpkg.sh` - systemd # systemd-nspawn + 'systemd-tools>=234' # systemd-nspawn tokyocabinet # `toru` #namcap # Namcap is currently dissabled in libremakepkg :-( #subversion # `diff-unfree` # ignore because of xbs wget # `aur`, optdepend for librelib:`blacklist` ) optdepends=( - 'binfmt-qemu-static: To build ARM packages from x86' + 'qemu-user-static-binfmt: To build ARM packages from x86' ) cd "$srcdir/$pkgbase-$pkgver" diff --git a/libre/librsvg-stable/PKGBUILD b/libre/librsvg-stable/PKGBUILD deleted file mode 100644 index 3649f6c91..000000000 --- a/libre/librsvg-stable/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 258835 2016-02-03 13:30:55Z jgc $ -# Maintainer (Arch): Jan de Groot <jgc@archlinux.org> - -_pkgname=librsvg -pkgname=librsvg-stable -pkgver=2.40.10 -pkgrel=1 -epoch=2 -pkgdesc="A SVG viewing library (stable version)" -arch=(i686 x86_64 armv7h) -license=('LGPL') -depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gobject-introspection' 'vala' 'python2') -conflicts=($_pkgname) -provides=($_pkgname) -options=('!emptydirs') -url="https://live.gnome.org/LibRsvg" -install=librsvg.install -source=(https://download.gnome.org/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz) -sha256sums=('965c807438ce90b204e930ff80c92eba1606a2f6fd5ccfd09335c99896dd3479') - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr --disable-static --enable-vala - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/libre/librsvg-stable/librsvg.install b/libre/librsvg-stable/librsvg.install deleted file mode 100644 index 8852ebf28..000000000 --- a/libre/librsvg-stable/librsvg.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/libutil-linux-static/60-rfkill.rules b/libre/libutil-linux-static/60-rfkill.rules new file mode 100644 index 000000000..bc98a3bef --- /dev/null +++ b/libre/libutil-linux-static/60-rfkill.rules @@ -0,0 +1 @@ +KERNEL=="rfkill", GROUP="rfkill", MODE="0664" diff --git a/libre/libutil-linux-static/PKGBUILD b/libre/libutil-linux-static/PKGBUILD new file mode 100644 index 000000000..7162597b9 --- /dev/null +++ b/libre/libutil-linux-static/PKGBUILD @@ -0,0 +1,115 @@ +# $Id$ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Maintainer: Dave Reisner <dreisner@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +_pkgbase=util-linux +pkgname=libutil-linux-static +_pkgmajor=2.31 +pkgver=${_pkgmajor}.1 +pkgrel=2.parabola1 +pkgdesc="Miscellaneous system utilities for Linux" +url="https://www.kernel.org/pub/linux/utils/util-linux/" +arch=('i686' 'x86_64') +makedepends=('systemd' 'python' 'libcap-ng') +license=('GPL2') +options=('strip' 'debug') +validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak +source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$_pkgbase-$pkgver.tar."{xz,sign} + pam-{login,common,su} + 'util-linux.sysusers' + '60-rfkill.rules' + 'rfkill-unblock_.service' + 'rfkill-block_.service') +sha256sums=('1a51b16fa9cd51d26ef9ab52d2f1de12403b810fc8252bf7d478df91b3cddf11' + 'SKIP' + '993a3096c2b113e6800f2abbd5d4233ebf1a97eef423990d3187d665d3490b92' + 'fc6807842f92e9d3f792d6b64a0d5aad87995a279153ab228b1b2a64d9f32f20' + '51eac9c2a2f51ad3982bba35de9aac5510f1eeff432d2d63c6362e45d620afc0' + '10b0505351263a099163c0d928132706e501dd0a008dac2835b052167b14abe3' + '7423aaaa09fee7f47baa83df9ea6fef525ff9aec395c8cbd9fe848ceb2643f37' + '8ccec10a22523f6b9d55e0d6cbf91905a39881446710aa083e935e8073323376' + 'a22e0a037e702170c7d88460cc9c9c2ab1d3e5c54a6985cd4a164ea7beff1b36') + +build() { + cd "$_pkgbase-$pkgver" + + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --bindir=/usr/bin \ + --localstatedir=/run \ + --enable-fs-paths-extra=/usr/bin \ + --enable-raw \ + --enable-vipw \ + --enable-newgrp \ + --enable-chfn-chsh \ + --enable-write \ + --enable-mesg \ + --disable-shared --enable-static \ + --with-python=3 + + make +} + +package_util-linux() { + conflicts=('eject' 'zramctl' 'rfkill') + provides=('eject' 'zramctl' 'rfkill') + replaces=('zramctl' 'rfkill') + depends=('pam' 'shadow' 'coreutils' 'libsystemd' 'libcap-ng' 'libutil-linux') + optdepends=('python: python bindings to libmount') + groups=('base' 'base-devel') + backup=(etc/pam.d/chfn + etc/pam.d/chsh + etc/pam.d/login + etc/pam.d/su + etc/pam.d/su-l) + + cd "$_pkgbase-$pkgver" + + make DESTDIR="$pkgdir" install + + # setuid chfn and chsh + chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}} + + # install PAM files for login-utils + install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn" + install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh" + install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login" + install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su" + install -m644 "$srcdir/pam-su" "$pkgdir/etc/pam.d/su-l" + + # TODO(dreisner): offer this upstream? + sed -i '/ListenStream/ aRuntimeDirectory=uuidd' "$pkgdir/usr/lib/systemd/system/uuidd.socket" + + # adjust for usrmove + # TODO(dreisner): fix configure.ac upstream so that this isn't needed + cd "$pkgdir" + mv {,usr/}sbin/* usr/bin + rmdir sbin usr/sbin + + ### runtime libs are shipped as part of libutil-linux + rm "$pkgdir"/usr/lib/lib*.{a,so}* + + ### install systemd-sysusers + install -Dm644 "$srcdir/util-linux.sysusers" \ + "$pkgdir/usr/lib/sysusers.d/util-linux.conf" + + install -Dm644 "$srcdir/60-rfkill.rules" \ + "$pkgdir/usr/lib/udev/rules.d/60-rfkill.rules" + + install -Dm644 "$srcdir/rfkill-unblock_.service" \ + "$pkgdir/usr/lib/systemd/system/rfkill-unblock@.service" + install -Dm644 "$srcdir/rfkill-block_.service" \ + "$pkgdir/usr/lib/systemd/system/rfkill-block@.service" +} + +package() { + pkgdesc="util-linux runtime libraries" + pkgdes+=" (static libraries)" + provides=('libblkid.so' 'libfdisk.so' 'libmount.so' 'libsmartcols.so' 'libuuid.so') + provides=() + depends=("libutil-linux=$pkgver") + options=('staticlibs') + + make -C "$_pkgbase-$pkgver" DESTDIR="$pkgdir" install-usrlib_execLTLIBRARIES +} diff --git a/libre/libutil-linux-static/pam-common b/libre/libutil-linux-static/pam-common new file mode 100644 index 000000000..a7bf8a4a5 --- /dev/null +++ b/libre/libutil-linux-static/pam-common @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so +password required pam_permit.so diff --git a/libre/libutil-linux-static/pam-login b/libre/libutil-linux-static/pam-login new file mode 100644 index 000000000..1960d9497 --- /dev/null +++ b/libre/libutil-linux-static/pam-login @@ -0,0 +1,7 @@ +#%PAM-1.0 + +auth required pam_securetty.so +auth requisite pam_nologin.so +auth include system-local-login +account include system-local-login +session include system-local-login diff --git a/libre/libutil-linux-static/pam-su b/libre/libutil-linux-static/pam-su new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/libre/libutil-linux-static/pam-su @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/libre/libutil-linux-static/rfkill-block_.service b/libre/libutil-linux-static/rfkill-block_.service new file mode 100644 index 000000000..ede74d12d --- /dev/null +++ b/libre/libutil-linux-static/rfkill-block_.service @@ -0,0 +1,10 @@ +[Unit] +Description=RFKill-Block %I +After=rfkill-unblock@all.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/rfkill block %I + +[Install] +WantedBy=multi-user.target diff --git a/libre/libutil-linux-static/rfkill-unblock_.service b/libre/libutil-linux-static/rfkill-unblock_.service new file mode 100644 index 000000000..94ebf35af --- /dev/null +++ b/libre/libutil-linux-static/rfkill-unblock_.service @@ -0,0 +1,10 @@ +[Unit] +Description=RFKill-Unblock %I +After=rfkill-block@all.service + +[Service] +Type=oneshot +ExecStart=/usr/bin/rfkill unblock %I + +[Install] +WantedBy=multi-user.target diff --git a/libre/libutil-linux-static/util-linux.sysusers b/libre/libutil-linux-static/util-linux.sysusers new file mode 100644 index 000000000..de04d9f05 --- /dev/null +++ b/libre/libutil-linux-static/util-linux.sysusers @@ -0,0 +1,2 @@ +u uuidd 68 +g rfkill - - - diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fbe538cef..f396d625f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre-lts _pkgbasever=4.9-gnu -_pkgver=4.9.64-gnu +_pkgver=4.9.70-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -20,7 +20,7 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} pkgrel=1 -rcnrel=armv7-x5 +rcnrel=armv7-x6 arch=('i686' 'x86_64' 'armv7h') url="https://linux-libre.fsfla.org/" license=('GPL2') @@ -52,7 +52,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch') sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816' 'SKIP' - '9c06c47e76fd23bc6f79316d73b8440a64bcce97bb55431083ac5a8e71b7f70d2304921681212cfebef801d3f4b250a69251a123304123e4119fcc5aa5a637ae' + 'c2a80712602688c9ecf9597e3e8542d778ba92fef9021e766016b7620e49b9e8f09ca6ce39d2034d65e82dd2731e2bd7ce3711e348f5f7801ba662a2c6183969' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -60,15 +60,15 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4 'SKIP' '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' 'SKIP' - 'd28ce1294be54c930447c349f52bbc26ec0ee8c02cb6f3763ab23442f4830da60ea5a7863296742e87fa73a0013840b3a79543c18c54b8111d7ba69e92b639b4' - 'd1c9b5e41018f680703f67b113ce9cf2994c39291749a992410b81ba32360349516e62ccd1e240cddd20f68b356fffd81f7979efc5d5ce86b6e3ad0803bd9550' - '5af2e761601663ccd8ae993ba8e5012278474c164e16c84556d4719cdaac349a0a099d039fdf567d5500422e119e1ca4deedfec5eb59a6de55a25bdcce32cb89' + 'be3047b93f76cd299b807c51e8f691ff6f7424045a323c6e024f38b8bc69aa656ca149d2eaf7f9ef4a17cf0657fcbb36b9fbcdfde82aca9818dd49b94e34757a' + 'f2ad80d9c562c3d2028db33eeedc0eedf33d699ef8ac70b5d0b25bd6701293f195d991982e9de5f7952d520a75497327d1d45f8e9661617443b6aee02aa0dbca' + '9d9536e709dfa852397b10d78f1adbb9f09ff3c40441ab023f6343433ab96f2b427141ab7b6f3e39ae8cc43e0602ebbbccd95972cfb81f3ed60f6b3945dc20aa' 'd6faa67f3ef40052152254ae43fee031365d0b1524aa0718b659eb75afc21a3f79ea8d62d66ea311a800109bed545bc8f79e8752319cd378eef2cbd3a09aba22' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' 'd9d28e02e964704ea96645a5107f8b65cae5f4fb4f537e224e5e3d087fd296cb770c29ac76e0ce95d173bc420ea87fb8f187d616672a60a0cae618b0ef15b8c8' '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - '411f883ddf8e7a2b0b1dc784cbca0ef4194a20d20f6b95ec795fa53deea95a0d9c8ec58db626a77a3fef1a1dee1f11412d47505162c7d3bcd9d3c5f3cc365419' + 'a5c9a4ff44466407a0497e4f016512dafec774712526b54f128a246ff6cd251efbaf8cd999ac9b786a0ace6cd9d5f67104247039faaf26170ae67239dad39566' 'SKIP' '844084ad68a6c41f940a2f98d987fa8a2cf99a2f9e8ebdf1d6dcd62b6039f9e6c0669606964e9e7e813b94fdd890c20cc73366ee296c1d79099ee8b84c918b0d' '590ce7a3283109a37740b565d13e54cbc8f526de082c4cc8727e71e02a26e844d1b012cceff9ea2b85231dd5b9d80f10db1e2ea678ad81f400bebc5ac4bc7531' diff --git a/libre/linux-libre-lts/config.armv7h b/libre/linux-libre-lts/config.armv7h index 902da5f14..da1c48af2 100644 --- a/libre/linux-libre-lts/config.armv7h +++ b/libre/linux-libre-lts/config.armv7h @@ -961,6 +961,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y +CONFIG_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_TRIE_STATS=y diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 307e5cfd8..af023e476 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -853,6 +853,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y +CONFIG_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_TRIE_STATS=y diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index 05d521d32..8e84e2a60 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -862,6 +862,8 @@ CONFIG_XFRM_IPCOMP=m CONFIG_NET_KEY=m # CONFIG_NET_KEY_MIGRATE is not set CONFIG_INET=y +CONFIG_WIREGUARD=m +# CONFIG_WIREGUARD_DEBUG is not set CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_FIB_TRIE_STATS=y diff --git a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch new file mode 100644 index 000000000..64341b9b7 --- /dev/null +++ b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch @@ -0,0 +1,103 @@ +From fb89d912d5f7289d3a922c77b671e36e1c740f5e Mon Sep 17 00:00:00 2001 +Message-Id: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +From: Serge Hallyn <serge.hallyn@canonical.com> +Date: Fri, 31 May 2013 19:12:12 +0100 +Subject: [PATCH 1/7] add sysctl to disallow unprivileged CLONE_NEWUSER by + default + +Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> +[bwh: Remove unneeded binary sysctl bits] +Signed-off-by: Daniel Micay <danielmicay@gmail.com> +--- + kernel/fork.c | 15 +++++++++++++++ + kernel/sysctl.c | 12 ++++++++++++ + kernel/user_namespace.c | 3 +++ + 3 files changed, 30 insertions(+) + +diff --git a/kernel/fork.c b/kernel/fork.c +index 500ce64517d93e68..35f5860958b40e9b 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -102,6 +102,11 @@ + + #define CREATE_TRACE_POINTS + #include <trace/events/task.h> ++#ifdef CONFIG_USER_NS ++extern int unprivileged_userns_clone; ++#else ++#define unprivileged_userns_clone 0 ++#endif + + /* + * Minimum number of threads to boot the kernel +@@ -1554,6 +1559,10 @@ static __latent_entropy struct task_struct *copy_process( + if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS)) + return ERR_PTR(-EINVAL); + ++ if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) ++ if (!capable(CAP_SYS_ADMIN)) ++ return ERR_PTR(-EPERM); ++ + /* + * Thread groups must share signals as well, and detached threads + * can only be started up within the thread group. +@@ -2347,6 +2356,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) + if (unshare_flags & CLONE_NEWNS) + unshare_flags |= CLONE_FS; + ++ if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) { ++ err = -EPERM; ++ if (!capable(CAP_SYS_ADMIN)) ++ goto bad_unshare_out; ++ } ++ + err = check_unshare_flags(unshare_flags); + if (err) + goto bad_unshare_out; +diff --git a/kernel/sysctl.c b/kernel/sysctl.c +index 56aca862c4f584f5..e8402ba393c1915d 100644 +--- a/kernel/sysctl.c ++++ b/kernel/sysctl.c +@@ -105,6 +105,9 @@ extern int core_uses_pid; + extern char core_pattern[]; + extern unsigned int core_pipe_limit; + #endif ++#ifdef CONFIG_USER_NS ++extern int unprivileged_userns_clone; ++#endif + extern int pid_max; + extern int pid_max_min, pid_max_max; + extern int percpu_pagelist_fraction; +@@ -513,6 +516,15 @@ static struct ctl_table kern_table[] = { + .proc_handler = proc_dointvec, + }, + #endif ++#ifdef CONFIG_USER_NS ++ { ++ .procname = "unprivileged_userns_clone", ++ .data = &unprivileged_userns_clone, ++ .maxlen = sizeof(int), ++ .mode = 0644, ++ .proc_handler = proc_dointvec, ++ }, ++#endif + #ifdef CONFIG_PROC_SYSCTL + { + .procname = "tainted", +diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c +index c490f1e4313b998a..dd03bd39d7bf194d 100644 +--- a/kernel/user_namespace.c ++++ b/kernel/user_namespace.c +@@ -24,6 +24,9 @@ + #include <linux/projid.h> + #include <linux/fs_struct.h> + ++/* sysctl */ ++int unprivileged_userns_clone; ++ + static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); + +-- +2.15.1 + diff --git a/libre/linux-libre/0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch b/libre/linux-libre/0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch new file mode 100644 index 000000000..8c23c9a54 --- /dev/null +++ b/libre/linux-libre/0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch @@ -0,0 +1,75 @@ +From 8c6956686606b9c3661e74a410c8cb2fc276c5ee Mon Sep 17 00:00:00 2001 +Message-Id: <8c6956686606b9c3661e74a410c8cb2fc276c5ee.1514959852.git.jan.steffens@gmail.com> +In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +From: Benjamin Poirier <bpoirier@suse.com> +Date: Mon, 11 Dec 2017 16:26:40 +0900 +Subject: [PATCH 2/7] e1000e: Fix e1000_check_for_copper_link_ich8lan return + value. + +e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan() +are the two functions that may be assigned to mac.ops.check_for_link when +phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e: +Separate signaling for link check/link up") changed the meaning of the +return value of check_for_link for copper media but only adjusted the first +function. This patch adjusts the second function likewise. + +Reported-by: Christian Hesse <list@eworm.de> +Reported-by: Gabriel C <nix.or.die@gmail.com> +Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047 +Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up") +Tested-by: Christian Hesse <list@eworm.de> +Signed-off-by: Benjamin Poirier <bpoirier@suse.com> +--- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c +index d6d4ed7acf031172..31277d3bb7dc1241 100644 +--- a/drivers/net/ethernet/intel/e1000e/ich8lan.c ++++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c +@@ -1367,22 +1367,25 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force) + * Checks to see of the link status of the hardware has changed. If a + * change in link status has been detected, then we read the PHY registers + * to get the current speed/duplex if link exists. ++ * ++ * Returns a negative error code (-E1000_ERR_*) or 0 (link down) or 1 (link ++ * up). + **/ + static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) + { + struct e1000_mac_info *mac = &hw->mac; + s32 ret_val, tipg_reg = 0; + u16 emi_addr, emi_val = 0; + bool link; + u16 phy_reg; + + /* We only want to go out to the PHY registers to see if Auto-Neg + * has completed and/or if our link status has changed. The + * get_link_status flag is set upon receiving a Link Status + * Change or Rx Sequence Error interrupt. + */ + if (!mac->get_link_status) +- return 0; ++ return 1; + + /* First we want to see if the MII Status Register reports + * link. If so, then we want to get the current speed/duplex +@@ -1613,10 +1616,12 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw) + * different link partner. + */ + ret_val = e1000e_config_fc_after_link_up(hw); +- if (ret_val) ++ if (ret_val) { + e_dbg("Error configuring flow control\n"); ++ return ret_val; ++ } + +- return ret_val; ++ return 1; + } + + static s32 e1000_get_variants_ich8lan(struct e1000_adapter *adapter) +-- +2.15.1 + diff --git a/libre/linux-libre/0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch b/libre/linux-libre/0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch new file mode 100644 index 000000000..d7872e2a1 --- /dev/null +++ b/libre/linux-libre/0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch @@ -0,0 +1,57 @@ +From b81e273fb227373a2951c7256ab11a87d5333a9d Mon Sep 17 00:00:00 2001 +Message-Id: <b81e273fb227373a2951c7256ab11a87d5333a9d.1514959852.git.jan.steffens@gmail.com> +In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +From: Mohamed Ghannam <simo.ghannam@gmail.com> +Date: Tue, 5 Dec 2017 20:58:35 +0000 +Subject: [PATCH 3/7] dccp: CVE-2017-8824: use-after-free in DCCP code + +Whenever the sock object is in DCCP_CLOSED state, +dccp_disconnect() must free dccps_hc_tx_ccid and +dccps_hc_rx_ccid and set to NULL. + +Signed-off-by: Mohamed Ghannam <simo.ghannam@gmail.com> +Reviewed-by: Eric Dumazet <edumazet@google.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + net/dccp/proto.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/net/dccp/proto.c b/net/dccp/proto.c +index b68168fcc06aa198..9d43c1f4027408f3 100644 +--- a/net/dccp/proto.c ++++ b/net/dccp/proto.c +@@ -259,25 +259,30 @@ int dccp_disconnect(struct sock *sk, int flags) + { + struct inet_connection_sock *icsk = inet_csk(sk); + struct inet_sock *inet = inet_sk(sk); ++ struct dccp_sock *dp = dccp_sk(sk); + int err = 0; + const int old_state = sk->sk_state; + + if (old_state != DCCP_CLOSED) + dccp_set_state(sk, DCCP_CLOSED); + + /* + * This corresponds to the ABORT function of RFC793, sec. 3.8 + * TCP uses a RST segment, DCCP a Reset packet with Code 2, "Aborted". + */ + if (old_state == DCCP_LISTEN) { + inet_csk_listen_stop(sk); + } else if (dccp_need_reset(old_state)) { + dccp_send_reset(sk, DCCP_RESET_CODE_ABORTED); + sk->sk_err = ECONNRESET; + } else if (old_state == DCCP_REQUESTING) + sk->sk_err = ECONNRESET; + + dccp_clear_xmit_timers(sk); ++ ccid_hc_rx_delete(dp->dccps_hc_rx_ccid, sk); ++ ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk); ++ dp->dccps_hc_rx_ccid = NULL; ++ dp->dccps_hc_tx_ccid = NULL; + + __skb_queue_purge(&sk->sk_receive_queue); + __skb_queue_purge(&sk->sk_write_queue); +-- +2.15.1 + diff --git a/libre/linux-libre/0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch b/libre/linux-libre/0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch new file mode 100644 index 000000000..edd7b24a3 --- /dev/null +++ b/libre/linux-libre/0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch @@ -0,0 +1,49 @@ +From 3721d64246982f91a5bf863fc17ac60ff722e0c4 Mon Sep 17 00:00:00 2001 +Message-Id: <3721d64246982f91a5bf863fc17ac60ff722e0c4.1514959852.git.jan.steffens@gmail.com> +In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +From: Steffen Klassert <steffen.klassert@secunet.com> +Date: Fri, 22 Dec 2017 10:44:57 +0100 +Subject: [PATCH 5/7] xfrm: Fix stack-out-of-bounds read on socket policy + lookup. + +When we do tunnel or beet mode, we pass saddr and daddr from the +template to xfrm_state_find(), this is ok. On transport mode, +we pass the addresses from the flowi, assuming that the IP +addresses (and address family) don't change during transformation. +This assumption is wrong in the IPv4 mapped IPv6 case, packet +is IPv4 and template is IPv6. + +Fix this by catching address family missmatches of the policy +and the flow already before we do the lookup. + +Reported-by: syzbot <syzkaller@googlegroups.com> +Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com> +--- + net/xfrm/xfrm_policy.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c +index 6bc16bb61b5533ef..50c5f46b5cca942e 100644 +--- a/net/xfrm/xfrm_policy.c ++++ b/net/xfrm/xfrm_policy.c +@@ -1169,9 +1169,15 @@ static struct xfrm_policy *xfrm_sk_policy_lookup(const struct sock *sk, int dir, + again: + pol = rcu_dereference(sk->sk_policy[dir]); + if (pol != NULL) { +- bool match = xfrm_selector_match(&pol->selector, fl, family); ++ bool match; + int err = 0; + ++ if (pol->family != family) { ++ pol = NULL; ++ goto out; ++ } ++ ++ match = xfrm_selector_match(&pol->selector, fl, family); + if (match) { + if ((sk->sk_mark & pol->mark.m) != pol->mark.v) { + pol = NULL; +-- +2.15.1 + diff --git a/libre/linux-libre/0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch b/libre/linux-libre/0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch new file mode 100644 index 000000000..0a54ce129 --- /dev/null +++ b/libre/linux-libre/0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch @@ -0,0 +1,114 @@ +From a79cb4d4e540c72a601ca0494e914565c16e2893 Mon Sep 17 00:00:00 2001 +Message-Id: <a79cb4d4e540c72a601ca0494e914565c16e2893.1514959852.git.jan.steffens@gmail.com> +In-Reply-To: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +References: <fb89d912d5f7289d3a922c77b671e36e1c740f5e.1514959852.git.jan.steffens@gmail.com> +From: Tejun Heo <tj@kernel.org> +Date: Wed, 20 Dec 2017 07:09:19 -0800 +Subject: [PATCH 6/7] cgroup: fix css_task_iter crash on CSS_TASK_ITER_PROC + +While teaching css_task_iter to handle skipping over tasks which +aren't group leaders, bc2fb7ed089f ("cgroup: add @flags to +css_task_iter_start() and implement CSS_TASK_ITER_PROCS") introduced a +silly bug. + +CSS_TASK_ITER_PROCS is implemented by repeating +css_task_iter_advance() while the advanced cursor is pointing to a +non-leader thread. However, the cursor variable, @l, wasn't updated +when the iteration has to advance to the next css_set and the +following repetition would operate on the terminal @l from the +previous iteration which isn't pointing to a valid task leading to +oopses like the following or infinite looping. + + BUG: unable to handle kernel NULL pointer dereference at 0000000000000254 + IP: __task_pid_nr_ns+0xc7/0xf0 + PGD 0 P4D 0 + Oops: 0000 [#1] SMP + ... + CPU: 2 PID: 1 Comm: systemd Not tainted 4.14.4-200.fc26.x86_64 #1 + Hardware name: System manufacturer System Product Name/PRIME B350M-A, BIOS 3203 11/09/2017 + task: ffff88c4baee8000 task.stack: ffff96d5c3158000 + RIP: 0010:__task_pid_nr_ns+0xc7/0xf0 + RSP: 0018:ffff96d5c315bd50 EFLAGS: 00010206 + RAX: 0000000000000000 RBX: ffff88c4b68c6000 RCX: 0000000000000250 + RDX: ffffffffa5e47960 RSI: 0000000000000000 RDI: ffff88c490f6ab00 + RBP: ffff96d5c315bd50 R08: 0000000000001000 R09: 0000000000000005 + R10: ffff88c4be006b80 R11: ffff88c42f1b8004 R12: ffff96d5c315bf18 + R13: ffff88c42d7dd200 R14: ffff88c490f6a510 R15: ffff88c4b68c6000 + FS: 00007f9446f8ea00(0000) GS:ffff88c4be680000(0000) knlGS:0000000000000000 + CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 + CR2: 0000000000000254 CR3: 00000007f956f000 CR4: 00000000003406e0 + Call Trace: + cgroup_procs_show+0x19/0x30 + cgroup_seqfile_show+0x4c/0xb0 + kernfs_seq_show+0x21/0x30 + seq_read+0x2ec/0x3f0 + kernfs_fop_read+0x134/0x180 + __vfs_read+0x37/0x160 + ? security_file_permission+0x9b/0xc0 + vfs_read+0x8e/0x130 + SyS_read+0x55/0xc0 + entry_SYSCALL_64_fastpath+0x1a/0xa5 + RIP: 0033:0x7f94455f942d + RSP: 002b:00007ffe81ba2d00 EFLAGS: 00000293 ORIG_RAX: 0000000000000000 + RAX: ffffffffffffffda RBX: 00005574e2233f00 RCX: 00007f94455f942d + RDX: 0000000000001000 RSI: 00005574e2321a90 RDI: 000000000000002b + RBP: 0000000000000000 R08: 00005574e2321a90 R09: 00005574e231de60 + R10: 00007f94458c8b38 R11: 0000000000000293 R12: 00007f94458c8ae0 + R13: 00007ffe81ba3800 R14: 0000000000000000 R15: 00005574e2116560 + Code: 04 74 0e 89 f6 48 8d 04 76 48 8d 04 c5 f0 05 00 00 48 8b bf b8 05 00 00 48 01 c7 31 c0 48 8b 0f 48 85 c9 74 18 8b b2 30 08 00 00 <3b> 71 04 77 0d 48 c1 e6 05 48 01 f1 48 3b 51 38 74 09 5d c3 8b + RIP: __task_pid_nr_ns+0xc7/0xf0 RSP: ffff96d5c315bd50 + +Fix it by moving the initialization of the cursor below the repeat +label. While at it, rename it to @next for readability. + +Signed-off-by: Tejun Heo <tj@kernel.org> +Fixes: bc2fb7ed089f ("cgroup: add @flags to css_task_iter_start() and implement CSS_TASK_ITER_PROCS") +Cc: stable@vger.kernel.org # v4.14+ +Reported-by: Laura Abbott <labbott@redhat.com> +Reported-by: Bronek Kozicki <brok@incorrekt.com> +Reported-by: George Amanakis <gamanakis@gmail.com> +Signed-off-by: Tejun Heo <tj@kernel.org> +--- + kernel/cgroup/cgroup.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c +index 44857278eb8aa6a2..030e4286f14c715e 100644 +--- a/kernel/cgroup/cgroup.c ++++ b/kernel/cgroup/cgroup.c +@@ -4059,26 +4059,24 @@ static void css_task_iter_advance_css_set(struct css_task_iter *it) + + static void css_task_iter_advance(struct css_task_iter *it) + { +- struct list_head *l = it->task_pos; ++ struct list_head *next; + + lockdep_assert_held(&css_set_lock); +- WARN_ON_ONCE(!l); +- + repeat: + /* + * Advance iterator to find next entry. cset->tasks is consumed + * first and then ->mg_tasks. After ->mg_tasks, we move onto the + * next cset. + */ +- l = l->next; ++ next = it->task_pos->next; + +- if (l == it->tasks_head) +- l = it->mg_tasks_head->next; ++ if (next == it->tasks_head) ++ next = it->mg_tasks_head->next; + +- if (l == it->mg_tasks_head) ++ if (next == it->mg_tasks_head) + css_task_iter_advance_css_set(it); + else +- it->task_pos = l; ++ it->task_pos = next; + + /* if PROCS, skip over tasks which aren't group leaders */ + if ((it->flags & CSS_TASK_ITER_PROCS) && it->task_pos && +-- +2.15.1 + diff --git a/libre/linux-libre/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/libre/linux-libre/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch new file mode 100644 index 000000000..5d36d15ac --- /dev/null +++ b/libre/linux-libre/0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch @@ -0,0 +1,42 @@ +From cf45be4971bdd769c09e2a11db483510cd0bcc5f Mon Sep 17 00:00:00 2001 +Message-Id: <cf45be4971bdd769c09e2a11db483510cd0bcc5f.1515173964.git.jan.steffens@gmail.com> +In-Reply-To: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com> +References: <0b716bdb952b678d9bb5eb32198dbc82ec492df2.1515173964.git.jan.steffens@gmail.com> +From: Jim Bride <jim.bride@linux.intel.com> +Date: Mon, 6 Nov 2017 13:38:57 -0800 +Subject: [PATCH 6/6] drm/i915/edp: Only use the alternate fixed mode if it's + asked for + +In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for +eDP if available."), the patch allows for the use of an alternate fixed +mode if it is available, but the patch was not ensuring that the only +time the alternate mode is used is when it is specifically requested. +This patch adds an additional comparison to intel_edp_compare_alt_mode +to ensure that we only use the alternate mode if it is directly +requested. + +Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.") +Cc: David Weinehall <david.weinehall@linux.intel.com> +Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> +Signed-off-by: Jim Bride <jim.bride@linux.intel.com> +--- + drivers/gpu/drm/i915/intel_dp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c +index 09f274419eea1c74..838cee312e8e6978 100644 +--- a/drivers/gpu/drm/i915/intel_dp.c ++++ b/drivers/gpu/drm/i915/intel_dp.c +@@ -1632,7 +1632,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, + m1->vdisplay == m2->vdisplay && + m1->vsync_start == m2->vsync_start && + m1->vsync_end == m2->vsync_end && +- m1->vtotal == m2->vtotal); ++ m1->vtotal == m2->vtotal && ++ m1->vrefresh == m2->vrefresh); + return bres; + } + +-- +2.15.1 + diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 1004f2de9..65f997a8a 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ pkgbase=linux-libre # Build stock kernel #pkgbase=linux-libre-custom # Build kernel with a different name _pkgbasever=4.14-gnu -_pkgver=4.14.7-gnu +_pkgver=4.14.12-gnu _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname _replacesoldkernels=() # '%' gets replaced with _kernelname @@ -23,7 +23,7 @@ _srcname=linux-${_pkgbasever%-*} _archpkgver=${_pkgver%-*} pkgver=${_pkgver//-/_} pkgrel=1 -rcnrel=armv7-x2 +rcnrel=armv7-x4 arch=('i686' 'x86_64' 'armv7h') url="https://linux-libre.fsfla.org/" license=('GPL2') @@ -38,13 +38,10 @@ source=( "https://repo.parabola.nu/other/linux-libre/logos/logo_linux_vga16.ppm"{,.sig} # the main kernel config files 'config.i686' 'config.x86_64' 'config.armv7h' - # pacman hooks for initramfs regeneration - '60-linux.hook' - '90-linux.hook' + # pacman hooks for depmod and initramfs regeneration + '60-linux.hook' '90-linux.hook' # standard config files for mkinitcpio ramdisk 'linux.preset' - '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' - '0002-fix-Atmel-maXTouch-touchscreen-support.patch' # armv7h patches "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"{,.sig} '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' @@ -56,10 +53,19 @@ source=( '0007-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch' '0008-disable-USB3-port-on-ODROID-XU.patch' '0009-ARM-dove-enable-ethernet-on-D3Plug.patch' -) + # other patches + '0001-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch' + '0002-fix-Atmel-maXTouch-touchscreen-support.patch' + '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch' + '0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch' + '0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch' + '0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch' + '0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch' + '0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch' + ) sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e684147ebed91d1528d2685423dd784c5fca0f3650f874f2b93cfc6b7689b9a87f' 'SKIP' - '5c62bbc5d3bc5aa67eed8c4952e86263cc86bd9406cfe30a87ee4ff891b8aeb23e78df82d7cfefcdbedce17520b7fe3d515d930905ee2ceaf6c7462399670fb7' + '2e8abb699328db2b156890b6ab966ba0c8cefbf64c909d13290c92ca99419b5fb06a53d3d93ed83ed6bd28edb6eeba73bd996f3cb2bc150c3b8709b2e2bbea17' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -67,15 +73,13 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841 'SKIP' '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78' 'SKIP' - '6dac1e8ab08eea83dfb70d31c698002fe1f63530e046ecf2a8a7f708cbe9ac116a8ff532b27a75c92b978b53621bf76f9361b42cfed8bcbfdcad2cad145e7e6b' - '61407e3f5f3db60fc37e03f184b81b8a275a9795d3943bdeefd1a55efffe2fd178e162c3d2b40c446e25742468a3e9049001326ce62b7da62ee683c7c06b8215' - '873eba395fb0540b21760e17dc8442b2c04a159dcd597cd2574536f20195c7c38f35cbbaa1e4d47ed0ee440215adfb2f03f9602180175bf2cacdbfbdb3ad1cfe' + '702101a78169ad81532f416b44b74bf7723055169027489a1e95eea9909ed693f20fe3a595152f284cc0837ff09202231a82285c55c25db35447d15492f21aed' + 'c0cad633c02bfb3ac0dd3c3daaa044b808bf6f3cfbd1035c31d95dfca338d3ad0eae50f6d9c264f6e8eaa3b590d8b500401509f55f8198406c726f6727ce0b05' + '7ff4babbe27585e0576d0a66f03cf41bd7556f8047db36f5e1f8391f1c624466fb714a7cfd0d91ae608eb5a123dfb7ad315ee900d8a81c9a2b1b769f4eb356a4' '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a' '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44' '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf' - '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' - 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' - 'ee810f2a28e5e07be61a6f3593eb6e1829803aff51ed959caaca6c4f83b7dde477bacbbb0581bd2dbd5bed1591170cf94666efe04064b16cc1ce7adac0813be4' + '6a9a290f0fa71973f40a0335017b65bac0486fe719fa79d5cab9358d03c43613f796f5cfcf68bd89964fcb71e05dcead40516b28f78cd25ab9a841c05cbd5874' 'SKIP' '29c709ee6892a668c77945142ed9749cb8a3135575a4316f4a3cc85fbda41c09fdd65e32507b654c96aa438bd2aed08c09919bb162daee969643aafd053321c4' '5b35ef2c675aed00ddf82b8a96a486230fad78f05b5a69c95a57632d6c7f428f026439f3ced72cf54156ffd4fd563e68d4285ba6f42428c00b966257951039c3' @@ -85,7 +89,15 @@ sha512sums=('0d4b0b8ec1ffc39c59295adf56f6a2cccf77cad56d8a8bf8072624bbb52ba3e6841 '23f21fb05188479fb2238229a88d1d45f30052e3d7dcbbf99c5b9a763493eac122795431cf6932e85bd6e091380179b62e986782fafe7e8c2bd53940199b925e' '45a21f9dfec613c8f4dba284aaf80e307612440893536295a32ec805e11439272a0949921a22f12f67600df8415870aa27101b7e3d3869aea88ad3e1cb614086' '6c93bc1e8d580af288921e10c456bdbda1dcb6d6f08c111cddaf9a32b43c2df41b50136bc09aaac1da9c3cae667bba6e075d590dcc465107ae6e2c3dcf7da657' - 'f813d51834cedc23fabbb6060709a24f29969fea5aeb963fdeddb79723014ffc0c6d34be45eea8419d5087a5a9c561a42a113d667f03625283f2f2fc68196545') + 'f813d51834cedc23fabbb6060709a24f29969fea5aeb963fdeddb79723014ffc0c6d34be45eea8419d5087a5a9c561a42a113d667f03625283f2f2fc68196545' + '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' + 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' + '05f2c577450cfeae4b66a7d022a9dd0dab0dbf36e9738423efa8f45aaf0755b48a89f1f88b042946205e681458f76c5c5177c16869094839b7b234e0e2b27511' + 'fd9bdc818326fa36c9f1813d0d1821de5e325b646e1c307c197ad38bada7f298d35b4bc1bbf1c2854689f3ba71144879e799a1123037caccd6e3f64edfc22d54' + '814517d08c35cc886fe3382619d41107d6139a703c27186d0ce58e187eaf4e84891572e58246750ac8602555794ed6f74d946565b98860787a0aa617fb946dda' + 'e6605e923c967b5f8db619868b15ea5b0d4254c62cf12bb920f38659933d6ca25a643d3e044c4915a8309071461f5f14c55d0aa0329c113bce4780d4fa3afbb7' + '0dec1482efe6e5d762a3061f365e43191484f055b738112452b8ca39e162b935d99cf16b25c0b253d6b532fabc54bde2f5c09be91887156ed6ae06d1558f94b9' + 'fcc40dc86dd432be76854e3c51889db488de0f1029ecc227b92c4f58c62ba928f7dc3b9515ac3ca0a08d6a0a72ca4a1a754d47c4fb274fe89f09a2a336088e7a') validpgpkeys=( '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva '6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78' # David P. @@ -108,6 +120,7 @@ prepare() { if [ "${_pkgbasever}" != "${_pkgver}" ]; then patch -p1 -i ../patch-${_pkgbasever}-${_pkgver} fi + chmod +x tools/objtool/sync-check.sh # GNU patch doesn't support git-style file mode if [ "${CARCH}" = "armv7h" ]; then # RCN patch (CM3 firmware deblobbed and AUFS removed) @@ -132,8 +145,28 @@ prepare() { install -m644 -t drivers/video/logo \ "${srcdir}/logo_linux_"{clut224.ppm,vga16.ppm,mono.pbm} + # security patches + # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + + # disable USER_NS for non-root users by default + patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch + + # https://bugs.archlinux.org/task/56575 + patch -Np1 -i ../0002-e1000e-Fix-e1000_check_for_copper_link_ich8lan-retur.patch + + # https://nvd.nist.gov/vuln/detail/CVE-2017-8824 + patch -Np1 -i ../0003-dccp-CVE-2017-8824-use-after-free-in-DCCP-code.patch + + # https://bugs.archlinux.org/task/56605 + patch -Np1 -i ../0004-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch + + # https://bugs.archlinux.org/task/56846 + patch -Np1 -i ../0005-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch + + # https://bugs.archlinux.org/task/56711 + patch -Np1 -i ../0006-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch # maintain the TTY over USB disconnects # http://www.coreboot.org/EHCI_Gadget_Debug @@ -147,12 +180,12 @@ prepare() { cp -Tf ../config.${CARCH} .config if [ "${_kernelname}" != "" ]; then - sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config.${CARCH} - sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config.${CARCH} + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config + sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config fi - # set extraversion to pkgrel - sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + # append pkgrel to extraversion + sed -ri "s|^(EXTRAVERSION =.*\S).*|\1-${pkgrel}|" Makefile # don't run depmod on 'make install'. We'll do this ourselves in packaging sed -i '2iexit 0' scripts/depmod.sh @@ -210,7 +243,7 @@ _package() { fi # make room for external modules - local _extramodules="extramodules-${_basekernel}${_kernelname:--ARCH}" + local _extramodules="extramodules-${_basekernel}${_kernelname}" ln -s "../${_extramodules}" "${pkgdir}/usr/lib/modules/${_kernver}/extramodules" # add real version for building modules and running depmod from hook @@ -229,11 +262,20 @@ _package() { fi # sed expression for following substitutions + if [ "${CARCH}" = "armv7h" ]; then local _subst=" + s|/boot/vmlinuz-%PKGBASE%|${_kernver}|g s|%PKGBASE%|${pkgbase}|g s|%KERNVER%|${_kernver}|g s|%EXTRAMODULES%|${_extramodules}|g " + elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then + local _subst=" + s|%PKGBASE%|${pkgbase}|g + s|%KERNVER%|${_kernver}|g + s|%EXTRAMODULES%|${_extramodules}|g + " + fi # hack to allow specifying an initially nonexisting install file sed "${_subst}" "${startdir}/${install}" > "${startdir}/${install}.pkg" diff --git a/libre/linux-libre/config.armv7h b/libre/linux-libre/config.armv7h index 36583bcee..7c369dcac 100644 --- a/libre/linux-libre/config.armv7h +++ b/libre/linux-libre/config.armv7h @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.4-gnu-1 Kernel Configuration +# Linux/arm 4.14.12-gnu-1 Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -2174,6 +2174,7 @@ CONFIG_VEXPRESS_SYSCFG=y CONFIG_BONE_CAPEMGR=y # CONFIG_DEV_OVERLAYMGR is not set CONFIG_TIEQEP=m +# CONFIG_UDOO_ARD is not set # CONFIG_C2PORT is not set # @@ -5524,7 +5525,7 @@ CONFIG_FB_PM3=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_S3C is not set CONFIG_FB_SMSCUFX=m -CONFIG_FB_UDL=m +# CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set CONFIG_FB_XILINX=y CONFIG_FB_DA8XX=y @@ -8432,6 +8433,7 @@ CONFIG_SECURITY=y # CONFIG_SECURITY_WRITABLE_HOOKS is not set CONFIG_SECURITYFS=y CONFIG_SECURITY_NETWORK=y +CONFIG_PAGE_TABLE_ISOLATION=y # CONFIG_SECURITY_INFINIBAND is not set CONFIG_SECURITY_NETWORK_XFRM=y CONFIG_SECURITY_PATH=y diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 6e99febd0..207de9398 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.4-gnu Kernel Configuration +# Linux/x86 4.14.12-gnu Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5441,7 +5441,7 @@ CONFIG_FB_VT8623=m # CONFIG_FB_GEODE is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set -CONFIG_FB_UDL=m +# CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set @@ -8290,6 +8290,7 @@ CONFIG_SECURITY=y # CONFIG_SECURITY_WRITABLE_HOOKS is not set CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set +CONFIG_PAGE_TABLE_ISOLATION=y # CONFIG_SECURITY_INFINIBAND is not set CONFIG_SECURITY_PATH=y # CONFIG_INTEL_TXT is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index d58751021..0cdd17a02 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.4-gnu-1 Kernel Configuration +# Linux/x86 4.14.12-gnu-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -76,11 +76,8 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_FHANDLE=y # CONFIG_USELIB is not set -CONFIG_AUDIT=y +# CONFIG_AUDIT is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y # # IRQ subsystem @@ -1130,7 +1127,6 @@ CONFIG_NETFILTER_XT_SET=m # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_AUDIT=m CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m @@ -5300,7 +5296,7 @@ CONFIG_FB_VT8623=m # CONFIG_FB_CARMINE is not set # CONFIG_FB_SM501 is not set # CONFIG_FB_SMSCUFX is not set -CONFIG_FB_UDL=m +# CONFIG_FB_UDL is not set # CONFIG_FB_IBM_GXT4500 is not set CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m @@ -8058,9 +8054,9 @@ CONFIG_DEFAULT_IO_DELAY_TYPE=0 # CONFIG_DEBUG_NMI_SELFTEST is not set # CONFIG_X86_DEBUG_FPU is not set # CONFIG_PUNIT_ATOM_DEBUG is not set -# CONFIG_FRAME_POINTER_UNWINDER is not set -CONFIG_ORC_UNWINDER=y -# CONFIG_GUESS_UNWINDER is not set +CONFIG_UNWINDER_ORC=y +# CONFIG_UNWINDER_FRAME_POINTER is not set +# CONFIG_UNWINDER_GUESS is not set # # Security options @@ -8077,6 +8073,7 @@ CONFIG_SECURITY=y # CONFIG_SECURITY_WRITABLE_HOOKS is not set CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set +CONFIG_PAGE_TABLE_ISOLATION=y # CONFIG_SECURITY_INFINIBAND is not set # CONFIG_SECURITY_PATH is not set # CONFIG_INTEL_TXT is not set @@ -8092,7 +8089,6 @@ CONFIG_HARDENED_USERCOPY=y CONFIG_SECURITY_YAMA=y CONFIG_INTEGRITY=y # CONFIG_INTEGRITY_SIGNATURE is not set -CONFIG_INTEGRITY_AUDIT=y # CONFIG_IMA is not set # CONFIG_EVM is not set CONFIG_DEFAULT_SECURITY_DAC=y diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD index 838014786..b6e596889 100644 --- a/libre/mesa/PKGBUILD +++ b/libre/mesa/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=mesa pkgname=("${pkgbase}") -pkgver=17.3.0 +pkgver=17.3.1 pkgrel=2.parabola1 arch=('i686' 'x86_64' 'armv7h') makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' @@ -18,7 +18,7 @@ source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} LICENSE drirc 0002-glvnd-fix-gl-dot-pc.patch) -sha256sums=('29a0a3a6c39990d491a1a58ed5c692e596b3bfc6c01d0b45e0b787116c50c6d9' +sha256sums=('9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1' 'SKIP' '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' '2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2' @@ -61,7 +61,6 @@ build() { ./configure --prefix=/usr \ --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=${GALLIUM} \ --with-dri-drivers=${DRI} \ --with-platforms=x11,drm,wayland \ @@ -116,9 +115,9 @@ package_mesa() { install -m755 -d ${pkgdir}/usr/share/glvnd/egl_vendor.d cp -rv ${srcdir}/fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json ${pkgdir}/usr/share/glvnd/egl_vendor.d/ - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri + install -m755 -d ${pkgdir}/usr/lib/dri # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast - cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri + cp -av ${srcdir}/fakeinstall/usr/lib/dri/*_dri.so ${pkgdir}/usr/lib/dri cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib cp -rv ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib diff --git a/libre/midori-gtk2/PKGBUILD b/libre/midori-gtk2/PKGBUILD deleted file mode 100644 index a491bcc16..000000000 --- a/libre/midori-gtk2/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 139371 2015-09-06 21:13:29Z arodseth $ -# Maintainer (Arch): Alexander F Rødseth <xyproto@archlinux.org> -# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org> -# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com> -# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org> -# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Contributor (Arch): Andrew Gregory <andrew.gregory.8@gmail.com> -# Maintainer: André Silva <emulatorman@hyperbola.info> - -pkgname=midori-gtk2 -pkgver=0.5.11 -pkgrel=5.parabola1 -pkgdesc='Lightweight web browser (GTK2), without non-privacy search engines' -arch=('x86_64' 'i686' 'armv7h') -url='http://www.midori-browser.org/' -license=('LGPL2.1') -conflicts=('midori') -provides=('midori') -depends=('webkitgtk2' 'libxss' 'gcr' 'zeitgeist') -makedepends=('bzr' 'intltool' 'vala' 'cmake' 'ninja') -optdepends=('gst-plugins-base: HTML5 OGG videos support' - 'gst-plugins-good: HTML5 H264 and WebM videos support' - 'gst-libav: HTML5 H264 videos support' - 'aria2: download utility') -options=('!emptydirs') -# options=('!emptydirs' '!strip') # useful for debbuging see: https://labs.parabola.nu/issues/515 -source=("http://www.midori-browser.org/downloads/${pkgname/-gtk2}_${pkgver}_all_.tar.bz2") -sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d') - -prepare() { - cd "${pkgname/-gtk2}-$pkgver" - # remove non-privacy search engines - sed -i 's|Duck Duck Go|DuckDuckGo HTML| - s|duckduckgo[.]com|duckduckgo.com/html| - \|Yahoo|d - \|name=Yahoo|d - \|text=Yahoo Web Search|d - \|uri=http://search[.]yahoo[.]com/search?p=|d - \|token=y|d - \|Google|d - \|name=Google|d - \|text=Web Search|d - \|uri=http://www[.]google[.]com/search?q=%s|d - \|token=g|d - \|Localize text or URL|d - \|translate[.]google[.]com/?q=|d - ' config/search -} - -build() { - cd "${pkgname/-gtk2}-$pkgver" - - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja - ninja -} - -package() { - DESTDIR="$pkgdir" ninja -C "${pkgname/-gtk2}-$pkgver/build" install -} - -# getver: -u 2 midori-browser.org/download/source -# vim:set ts=2 sw=2 et: diff --git a/libre/opencv/PKGBUILD b/libre/opencv/PKGBUILD index 221542d5f..b1de0b31e 100644 --- a/libre/opencv/PKGBUILD +++ b/libre/opencv/PKGBUILD @@ -7,14 +7,14 @@ pkgbase=opencv pkgname=opencv -pkgver=3.3.1 -pkgrel=1.parabola1 +pkgver=3.4.0 +pkgrel=2.parabola1 pkgdesc="Free Computer Vision Library, without nonfree SIFT and SURF algorithms, nonfree Milky icons and lena images" arch=('i686' 'x86_64' 'armv7h') license=('BSD') url="http://opencv.org/" -depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext') -makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5') +depends=('intel-tbb' 'openexr' 'xine-lib' 'libdc1394' 'gtkglext' 'cblas' 'lapack' 'libgphoto2') +makedepends=('cmake' 'python-numpy' 'python2-numpy' 'mesa' 'eigen' 'hdf5' 'lapacke') optdepends=('opencv-samples' 'hdf5: support for HDF5 format' 'opencl-icd-loader: For coding with OpenCL' @@ -23,9 +23,9 @@ optdepends=('opencv-samples' mksource=("$pkgbase-$pkgver.zip::https://github.com/opencv/opencv/archive/$pkgver.zip" "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz") source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.zip") -mksha256sums=('e59412c7e0d398113b1e454d600fcdff54cd77100a84483ac0d82bbf52496932' - '6f3ce148dc6e147496f0dbec1c99e917e13bf138f5a8ccfc3765f5c2372bd331') -sha256sums=('9bf24efc68c82d211fdaff7ed9b007b1a49353d7e092658b51285d4a1d7f3b56') +mksha256sums=('ae8a9f468b7ee3822a62d20d356c69f2b32330a231e738ac2914f332766611b7' + '699ab3eee7922fbd3e8f98c68e6d16a1d453b20ef364e76172e56466dc9c16cd') +sha256sums=('624ac197cff564c4cae1cfdcc3a6a08e3b35511e9733c2552a9abd8621685fcd') _cmakeopts=('-D WITH_OPENCL=ON' '-D WITH_OPENGL=ON' @@ -40,6 +40,7 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D INSTALL_PYTHON_EXAMPLES=ON' '-D CMAKE_BUILD_TYPE=Release' '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_INSTALL_LIBDIR=lib' '-D CMAKE_SKIP_RPATH=ON' '-D WITH_IPP=OFF' #'-D INSTALL_CREATE_DISTRIB=ON' @@ -47,10 +48,8 @@ _cmakeopts=('-D WITH_OPENCL=ON' # SSE only available from Pentium 3 onwards (i686 is way older) # SSE only available x86 hardware and ARM uses NEON -[[ "$CARCH" = 'i686' || "$CARCH" = 'armv7h' ]] && \ - _cmakeopts+=('-D ENABLE_SSE=OFF' - '-D ENABLE_SSE2=OFF' - '-D ENABLE_SSE3=OFF') +[[ "$CARCH" = 'i686' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE2') +[[ "$CARCH" = 'x86_64' ]] && _cmakeopts+=('-D CPU_BASELINE_DISABLE=SSE3 -D CPU_BASELINE_REQUIRE=SSE2') mksource() { cd "$srcdir/opencv_contrib-$pkgver" @@ -78,10 +77,13 @@ build() { mkdir -p build cd build + # cmake's FindLAPACK doesn't add cblas to LAPACK_LIBRARIES, so we need to specify them manually cmake ${_cmakeopts[@]} \ -DOPENCV_EXTRA_MODULES_PATH="$srcdir/opencv_contrib-$pkgver/modules" \ + -DLAPACK_LIBRARIES="/usr/lib/liblapack.so;/usr/lib/libblas.so;/usr/lib/libcblas.so" \ + -DLAPACK_CBLAS_H="/usr/include/cblas.h" \ + -DLAPACK_LAPACKE_H="/usr/include/lapacke.h" \ ../$pkgname-$pkgver - make } @@ -89,7 +91,6 @@ package_opencv() { options=('staticlibs') cd build - make DESTDIR="$pkgdir" install # install license file diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD index b68a4bc7c..cbb4d097d 100644 --- a/libre/openttd/PKGBUILD +++ b/libre/openttd/PKGBUILD @@ -1,9 +1,10 @@ # $Id: PKGBUILD 184972 2016-08-03 10:06:19Z lcarlier $ # Maintainer (Arch): Vesa Kaihlavirta <vegai@iki.fi> -# Maintainer: André Silva <emulatorman@hyperbola.info> +# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=openttd -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=2.parabola1 pkgdesc='An engine for running Transport Tycoon Deluxe, without nonfree openttd-opensfx recommendation' arch=('i686' 'x86_64' 'armv7h') @@ -12,7 +13,7 @@ license=('GPL') depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo' 'hicolor-icon-theme' 'desktop-file-utils' 'xz') optdepends=('openttd-opengfx: free graphics') source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz") -sha256sums=('df9307f42a45ac57dff23fe5cfb9bdb2a3d676456e7c771de173de060c2a99e0') +sha256sums=('61190952a98d494d3fd62e395dd6c359609914d0ba8fe80eaeb585b7d62a1b36') build() { cd ${pkgname}-${pkgver} diff --git a/libre/pacman-mirrorlist/PKGBUILD b/libre/pacman-mirrorlist/PKGBUILD index 6c40b2f77..59fa1d7a3 100644 --- a/libre/pacman-mirrorlist/PKGBUILD +++ b/libre/pacman-mirrorlist/PKGBUILD @@ -12,7 +12,7 @@ license=('GPL') groups=('base' 'base-openrc') backup=(etc/pacman.d/mirrorlist) source=(mirrorlist-${pkgver}.txt::${url}) -sha512sums=('d666c20a5f07faecdfca2a02825c05d48e4315a4e57a0cbfc5ce2387c8259214129698342409100ce464818614b62873520e5867fa66b0dd90ab148bd61b62d4') +sha256sums=('09d331dac77621d587f67a97806d6f9fa341b11e5678ec76ce13cc29bcd0b566') conflicts=(pacman-mirrorlist-libre pacman-mirrorlist-parabola) replaces=(pacman-mirrorlist-libre pacman-mirrorlist-parabola) diff --git a/libre/parabola-hackers/PKGBUILD b/libre/parabola-hackers/PKGBUILD index be1c9d6f3..d54e639b1 100644 --- a/libre/parabola-hackers/PKGBUILD +++ b/libre/parabola-hackers/PKGBUILD @@ -2,7 +2,7 @@ pkgbase=parabola-hackers pkgname=(parabola-hackers parabola-hackers-nshd) -pkgver=20170908 +pkgver=20171221 pkgdesc='Programs for doing magic with hackers.git' url='https://git.parabola.nu/packages/parabola-hackers.git/' license=('GPL') @@ -11,7 +11,7 @@ pkgrel=1 arch=('x86_64' 'i686') makedepends=('go') source=("https://repo.parabola.nu/other/$pkgbase/$pkgbase-$pkgver.tar.gz"{,.sig}) -sha256sums=('3d074623fd570d0ee5cbe3662b9eb9d2095211314b5bc097a4d6855f0cddfa80' +sha256sums=('65e0641fda2b19760396cf4ef93464245f586b800bedecf984922dbb31381f68' 'SKIP') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index 8e460ec68..ea5c67bed 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Parabola automatic package builder <autobuilder@parabola.nu> +# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=parabola-keyring -pkgver=20171101 -_gitver=20fc3a89b540945552edb722a9f50c1add543a66 +pkgver=20180104 +_gitver=aa0809f06972a8370b5884e144b7d998455a3029 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -10,9 +11,10 @@ url='https://git.parabola.nu/hackers.git/' license=('GPL') install=$pkgname.install source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig}) -sha512sums=('e850e483486c7fcc261a203788a087d17f6908ae1a2ba723eaecdeed6d0b903acc04ef1904166e64b9d79eac84ae1a30229968f5726179581b9aa7f4c1e14f4a' +sha512sums=('775655309757cf1887a76e3e6e7079d751f65d0110097cf80cc02a490caad62e92f173a75f706067ade03781e139abf2a10b6fc64b7a4f04805a47f0bb52380b' 'SKIP') -validpgpkeys=('D3EAD7F9D076EB9AF650149DA170D6A0B669E21A') # Parabola automatic package builder <dev@lists.parabolagnulinux.org> +#validpgpkeys=('D3EAD7F9D076EB9AF650149DA170D6A0B669E21A') # Parabola automatic package builder <dev@lists.parabolagnulinux.org> +validpgpkeys=('1B8C5E87702444D3D825CC8086ED62396D5DBA58') # Omar Vega Ramos <ovruni@gnu.org.pe> mkdepends=('parabola-hackers') mksource=("hackers-${_gitver}::git://git.parabola.nu/hackers.git#commit=${_gitver}") diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD index 0b00891e4..0dcdc85ad 100644 --- a/libre/parabola-themes-slim/PKGBUILD +++ b/libre/parabola-themes-slim/PKGBUILD @@ -1,23 +1,24 @@ -# Maintainer (Arch): Mark J.R.P. <l1mpm4rk@gmail.com> -# Contributor (Arch): Mark J.R.P. <l1mpm4rk@gmail.com> +# Maintainer (Arch): Eric Bélanger <eric@archlinux.org> +# Contributor (Arch): Thayer Williams <thayer@archlinux.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -provides=("parabola-themes-slim=$pkgver") -replaces=('archlinux-themes-slim') -conflicts=('archlinux-themes-slim') pkgname=parabola-themes-slim pkgver=1.0 -pkgrel=1.1 -pkgdesc="a theme parabolero to the Slim login manager" +pkgrel=1.2 +pkgdesc="Parabola GNU/Linux-libre branded themes to the SLiM login manager" arch=('any') -url="https://parabolagnulinux.org/" -license=('CCPL') -optdepends=('slim: simple login manager' +url="https://parabola.nu/" +license=('CCPL:cc-by-sa') +optdepends=('slim: login manager providing theme support' 'ttf-liberation: to have a beautiful style of letter in the login') -source=(https://repo.parabola.nu/other/${pkgname}-${pkgver}.tar) -md5sums=(bf6bead07cbcca9aa562907230496ba1) +provides=("parabola-themes-slim=$pkgver") +replaces=('archlinux-themes-slim') +conflicts=('archlinux-themes-slim') +source=("https://repo.parabola.nu/other/multimedia/${pkgname}-${pkgver}.tar") +sha256sums=('53db48f8bc24a4540ce325545dfb32596ca509a1fef46cff58fdb6809eb1f224') package() { - cd $srcdir/$pkgname-$pkgver - mkdir -p $pkgdir/usr/share/slim/themes - cp -a Parabola-*/ $pkgdir/usr/share/slim/themes + cd "$pkgname-$pkgver" + install -d "$pkgdir"/usr/share/slim/themes + cp -a Parabola-*/ "$pkgdir"/usr/share/slim/themes } diff --git a/libre/pcre-static/PKGBUILD b/libre/pcre-static/PKGBUILD index a4ad3db15..34ca10f9a 100644 --- a/libre/pcre-static/PKGBUILD +++ b/libre/pcre-static/PKGBUILD @@ -1,19 +1,25 @@ -# Maintainer: Márcio Silva <coadde@hyperbola.info> -# based of pcre +# Maintainer (Arch:pcre): Sébastien "Seblu" Luttringer +# Contributor (Arch:pcre): Allan McRae <allan@archlinux.org> +# Contributor (Arch:pcre): Eric Belanger <eric@archlinux.org> +# Contributor (Arch:pcre): John Proctor <jproctor@prium.net> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: Márcio Silva <coadde@hyperbola.info> _pkgname=pcre pkgname=pcre-static -pkgver=8.39 -pkgrel=2 -pkgdesc='A library that implements Perl 5-style regular expressions (static libraries only)' -arch=('i686' 'x86_64' 'armv7h') +pkgver=8.41 +pkgrel=1.parabola1 +pkgdesc='A library that implements Perl 5-style regular expressions' +pkgdesc+=' (static libraries)' +arch=('x86_64') +arch+=('i686' 'armv7h') url='http://www.pcre.org/' -license=('BSD') -depends=('pcre') +license=('BSD3') +depends=("$_pkgname=$pkgver") options=('staticlibs') validpgpkeys=('45F68D54BBE23FB3039B46E59766E084FB0F43D8') # Philip Hazel -source=("ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/$_pkgname-$pkgver.tar.bz2"{,.sig}) -md5sums=('e3fca7650a0556a2647821679d81f585' +source=("https://ftp.pcre.org/pub/pcre/$_pkgname-$pkgver.tar.bz2"{,.sig}) +md5sums=('c160d22723b1670447341b08c58981c1' 'SKIP') prepare() { @@ -22,8 +28,8 @@ prepare() { local filename for filename in "${source[@]}"; do if [[ "$filename" =~ \.patch$ ]]; then - msg2 "Applying patch $filename" - patch -p1 -N -i "$srcdir/$filename" + msg2 "Applying patch ${filename##*/}" + patch -p1 -N -i "$srcdir/${filename##*/}" fi done : @@ -45,6 +51,7 @@ build() { check() { cd $_pkgname-$pkgver + if [[ $CARCH == armv7h ]]; then return 0; fi # qemu: Unsupported syscall: 229 make -j1 check } @@ -52,9 +59,18 @@ package() { cd $_pkgname-$pkgver make DESTDIR="$pkgdir" install + install -Dm644 LICENCE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # remove conflicting files - rm -vr ${pkgdir}/usr/{bin,include,lib/pkgconfig,share} - rm -v ${pkgdir}/usr/lib/lib*.so* + rm -vr -- \ + "$pkgdir"/usr/bin/ \ + "$pkgdir"/usr/include/ \ + "$pkgdir"/usr/lib/pkgconfig/ \ + "$pkgdir"/usr/share/doc/ \ + "$pkgdir"/usr/share/man/ + rm -v -- \ + "${pkgdir}"/usr/lib/lib*.so \ + "${pkgdir}"/usr/lib/lib*.so.* } # vim:set ts=2 sw=2 et: diff --git a/libre/pixman-static/PKGBUILD b/libre/pixman-static/PKGBUILD index 68c47ae50..3a9fa8268 100644 --- a/libre/pixman-static/PKGBUILD +++ b/libre/pixman-static/PKGBUILD @@ -1,15 +1,20 @@ -# Maintainer: Márcio Silva <coadde@hyperbola.info> -# based of pixman +# Maintainer (Arch:pixman): Jan de Groot <jgc@archlinux.org> +# Maintainer (Arch:pixman): Andreas Radke <andyrtr@archlinux.org> +# Contributor (Arch:pixman): Alexander Baldeck <alexander@archlinux.org> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: Márcio Silva <coadde@hyperbola.info> _pkgname=pixman pkgname=pixman-static pkgver=0.34.0 -pkgrel=1 -pkgdesc="The pixel-manipulation library for X and cairo (static libraries only)" -arch=(i686 x86_64 armv7h) +pkgrel=1.parabola1 +pkgdesc="The pixel-manipulation library for X and cairo" +pkgdes+=" (static libraries)" +arch=(x86_64) +arch+=(i686 armv7h) url="http://xorg.freedesktop.org" license=('custom') -depends=('pixman') +depends=("pixman=$pkgver") options=('staticlibs') source=(http://xorg.freedesktop.org/releases/individual/lib/${_pkgname}-${pkgver}.tar.bz2) sha1sums=('367698744e74d6d4f363041482965b9ea7fbe4a5') @@ -28,6 +33,8 @@ check() { package() { cd $_pkgname-$pkgver make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" # remove conflicting files rm -vr ${pkgdir}/usr/{include,lib/pkgconfig} diff --git a/libre/qemu-static/PKGBUILD b/libre/qemu-static/PKGBUILD deleted file mode 100644 index f281baa5f..000000000 --- a/libre/qemu-static/PKGBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# Maintainer: Márcio Silva <coadde@hyperbola.info> -# based of qemu - -pkgbase=qemu -pkgname=(qemu-static binfmt-qemu-static) -pkgver=2.8.0 -pkgrel=1 -arch=(i686 x86_64 armv7h) -license=(GPL2 LGPL2.1) -url="http://wiki.qemu.org/" -makedepends=(pixman-static glib2-static pcre-static python2) -source=("$url/download/${pkgbase}-${pkgver}.tar.bz2"{,.sig} - qemu-{extra,aarch64,arm,i386,mips,mips64,x86_64}-static.conf) -sha256sums=('dafd5d7f649907b6b617b822692f4c82e60cf29bc0fc58bc2036219b591e5e62' - 'SKIP' - '2e87f745595f779df820b32dddbba6af634918134c311ae634b88453dc0b7861' - 'e91ff2371250137cca405645c8a8d0647d5229f3c38e28c3c1ef0511747ab73d' - '40a6b6a330e7f624516232be85ac814a24464eeff1097e037f75ed4f16319e74' - 'c7374b6c643971af382e873fbb7c6f5e549bfdfeaad5a22d4a21d99918e779aa' - 'e36af2cc4238b953a0fabb5bf032dfbd584bbf8bb0836e71621006ec0fa170af' - '2f8eadb0adc7bcd67b21e898fbbc808300094a584e5e28f45024d8016110e066' - '6c69ddc9ce44827e55e54cf78a2632292a440b5c222e6e4e904d962a7af39ff2') -validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') - -prepare() { - mkdir build-static - mkdir -p extra-arch-static/usr/{bin,share/qemu} - - cd ${pkgbase}-${pkgver} - sed -i 's/vte-2\.90/vte-2.91/g' configure -} - -build() { - _build static \ - --audio-drv-list= \ - --disable-bluez \ - --disable-sdl \ - --disable-gtk \ - --disable-vte \ - --disable-opengl \ - --disable-virglrenderer \ - --disable-brlapi \ - --disable-docs \ - --disable-linux-aio \ - --disable-seccomp \ - --disable-spice \ - --disable-{rbd,glusterfs,libiscsi,curl} \ - --disable-system \ - --static \ - --disable-vnc \ - --disable-attr \ - --disable-blobs \ - --disable-vhost-net \ - --disable-bzip2 \ - --disable-libssh2 \ - --disable-gcrypt \ - --disable-nettle \ - --disable-curses \ - --disable-kvm \ - --disable-guest-agent -} - -_build() { - cd build-$1 - - # qemu vs. make 4 == bad - export ARFLAGS=rv - - # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740 - export CFLAGS+=" -fPIC" - - ../${pkgbase}-${pkgver}/configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/qemu \ - --python=/usr/bin/python2 \ - --smbd=/usr/bin/smbd \ - --disable-modules \ - --disable-jemalloc \ - "${@:2}" - - make -} - -_package() { - options=(!strip) - - make -C build-$1 DESTDIR="$pkgdir" install "${@:2}" - - cd "$pkgdir"/usr/bin - tidy_strip - - # remove extra arch - for _bin in qemu-*; do - [[ -f $_bin ]] || continue - - case ${_bin#qemu-} in - # tools - img|io|nbd) rm "$_bin"; continue ;; - esac - - mv "$_bin"{,-static} - done - - # remove conflicting files - rm -vr ../{lib,share} - rm -v ivshmem-{client,server} -} - -package_qemu-static() { - pkgdesc="QEMU for foreign architectures (static binaries only)" - replaces=(qemu-{static-arch-extra,arch-extra-static}) - conflicts=(qemu-{static-arch-extra,arch-extra-static}) - options=(!strip) - - _package static -} - -package_binfmt-qemu-static() { - pkgdesc='Register qemu-static interpreters for various binary formats' - depends=(qemu-static) - - install -dm755 "${pkgdir}"/usr/lib/binfmt.d - - if [[ $CARCH = x86_64 ]]; then - install -m644 "${srcdir}"/qemu-x86_64-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf - elif [[ $CARCH = i686 ]]; then - install -m644 "${srcdir}"/qemu-i386-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf - elif [[ $CARCH = armv7h ]]; then - install -m644 "${srcdir}"/qemu-arm-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf - elif [[ $CARCH = mips64el ]]; then - install -m644 "${srcdir}"/qemu-mips64-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-static.conf - fi - install -m644 "${srcdir}"/qemu-extra-static.conf "${pkgdir}"/usr/lib/binfmt.d/qemu-extra-static.conf -} diff --git a/libre/qemu-static/qemu-aarch64-static.conf b/libre/qemu-static/qemu-aarch64-static.conf deleted file mode 100644 index 3ddffa966..000000000 --- a/libre/qemu-static/qemu-aarch64-static.conf +++ /dev/null @@ -1,31 +0,0 @@ -# /etc/binfmt.d/qemu-static.conf -:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C -:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -#:i586:M::::/usr/bin/qemu-i386-static:C -#:i686:M::::/usr/bin/qemu-i386-static:C -:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C -:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C -:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C -:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C -:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C -:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C -:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C -#:x32:M::::/usr/bin/qemu-x86_64-static:C -#:x86_64:M::::/usr/bin/qemu-x86_64-static:C diff --git a/libre/qemu-static/qemu-arm-static.conf b/libre/qemu-static/qemu-arm-static.conf deleted file mode 100644 index a76f7fe4c..000000000 --- a/libre/qemu-static/qemu-arm-static.conf +++ /dev/null @@ -1,32 +0,0 @@ -# /etc/binfmt.d/qemu-static.conf -:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C -:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C -:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -#:i586:M::::/usr/bin/qemu-i386-static:C -#:i686:M::::/usr/bin/qemu-i386-static:C -:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C -:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C -:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C -:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C -:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C -:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C -:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C -#:x32:M::::/usr/bin/qemu-x86_64-static:C -#:x86_64:M::::/usr/bin/qemu-x86_64-static:C diff --git a/libre/qemu-static/qemu-extra-static.conf b/libre/qemu-static/qemu-extra-static.conf deleted file mode 100644 index ee321493b..000000000 --- a/libre/qemu-static/qemu-extra-static.conf +++ /dev/null @@ -1,40 +0,0 @@ -# /etc/binfmt.d/qemu-static-extra.conf -### obtained from qemu source code (git) ### -#:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C -#:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -#:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C -#:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C -#:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -#:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -#:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -#:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C -#:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C -#:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C -#:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C -#:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C -#:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C -#:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -#:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4-static:C -#:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb-static:C -#:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C - -### obtained from others sources ### -#:arm64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-aarch64-static:C -#:i586:M::::/usr/bin/qemu-i386-static:C -#:i686:M::::/usr/bin/qemu-i386-static:C -#:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -#:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -#:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -#:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -#:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -#:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -#:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -#:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -#:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -#:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -#:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C -#:x32:M::::/usr/bin/qemu-x86_64-static:C -#:x86_64:M::::/usr/bin/qemu-x86_64-static:C diff --git a/libre/qemu-static/qemu-i386-static.conf b/libre/qemu-static/qemu-i386-static.conf deleted file mode 100644 index 931cd83aa..000000000 --- a/libre/qemu-static/qemu-i386-static.conf +++ /dev/null @@ -1,30 +0,0 @@ -# /etc/binfmt.d/qemu-static.conf -:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C -:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C -:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C -:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C -:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C -:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C -:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C -:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C -:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C -:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C -:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C -#:x32:M::::/usr/bin/qemu-x86_64-static:C -#:x86_64:M::::/usr/bin/qemu-x86_64-static:C diff --git a/libre/qemu-static/qemu-mips-static.conf b/libre/qemu-static/qemu-mips-static.conf deleted file mode 100644 index 47594b5eb..000000000 --- a/libre/qemu-static/qemu-mips-static.conf +++ /dev/null @@ -1,32 +0,0 @@ -# /etc/binfmt.d/qemu-static.conf -:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C -:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C -:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C -:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C -:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -#:i586:M::::/usr/bin/qemu-i386-static:C -#:i686:M::::/usr/bin/qemu-i386-static:C -:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C -:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C -:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C -:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C -:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C -#:x32:M::::/usr/bin/qemu-x86_64-static:C -#:x86_64:M::::/usr/bin/qemu-x86_64-static:C diff --git a/libre/qemu-static/qemu-mips64-static.conf b/libre/qemu-static/qemu-mips64-static.conf deleted file mode 100644 index 3b255ce19..000000000 --- a/libre/qemu-static/qemu-mips64-static.conf +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/binfmt.d/qemu-static.conf -:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C -:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C -:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C -:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C -:i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -:i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-static:C -#:i586:M::::/usr/bin/qemu-i386-static:C -#:i686:M::::/usr/bin/qemu-i386-static:C -:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C -:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C -#:x32:M::::/usr/bin/qemu-x86_64-static:C -#:x86_64:M::::/usr/bin/qemu-x86_64-static:C diff --git a/libre/qemu-static/qemu-x86_64-static.conf b/libre/qemu-static/qemu-x86_64-static.conf deleted file mode 100644 index 7b89e2246..000000000 --- a/libre/qemu-static/qemu-x86_64-static.conf +++ /dev/null @@ -1,28 +0,0 @@ -# /etc/binfmt.d/qemu-static.conf -:aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64-static:C -:alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-static:C -:arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:C -:armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-static:C -:cris:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x4c\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-cris-static:C -:m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-static:C -:microblaze:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\xba\xab:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-microblaze-static:C -:microblazeel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xab\xba:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-microblazeel-static:C -:mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-static:C -:mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-static:C -:mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-static:C -:mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-static:C -:mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-static:C -:mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-static:C -#:or32:M::::/usr/bin/qemu-or32-static:C -:ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-static:C -:ppc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64-static:C -:ppc64abi32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc64abi32-static:C -:ppc64le:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x15\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-ppc64le-static:C -:s390x:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x16:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-s390x-static:C -:sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff\xff:/usr/bin/qemu-sh4-static:C -:sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfb\xff\xff:/usr/bin/qemu-sh4eb-static:C -:sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-static:C -:sparc32plus:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x12:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc32plus-static:C -:sparc64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2b:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc64-static:C -#:tilegx:M::::/usr/bin/qemu-tilegx-static:C -#:unicore32:M::::/usr/bin/qemu-unicore32-static:C diff --git a/libre/qemu-user-static/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch b/libre/qemu-user-static/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch new file mode 100644 index 000000000..bbc3840fe --- /dev/null +++ b/libre/qemu-user-static/0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch @@ -0,0 +1,81 @@ +From 0c5afb7a15b6bb0e3fe276e377ad3702427e85d1 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 27 Dec 2017 03:33:21 -0500 +Subject: [PATCH 01/10] linux-user: Use #if to only call validate_guest_space + for 32-bit ARM target + +Instead of defining a bogus validate_guest_space that always returns 1 on +targets other than 32-bit ARM, use #if blocks to only call it on 32-bit ARM +targets. This makes the "normal" flow control clearer. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 21 +++++++++------------ + 1 file changed, 9 insertions(+), 12 deletions(-) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 20f3d8c2c3..cac991159c 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -354,7 +354,6 @@ enum { + + /* The commpage only exists for 32 bit kernels */ + +-#define TARGET_HAS_VALIDATE_GUEST_SPACE + /* Return 1 if the proposed guest space is suitable for the guest. + * Return 0 if the proposed guest space isn't suitable, but another + * address space should be tried. +@@ -1823,15 +1822,6 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc, + return sp; + } + +-#ifndef TARGET_HAS_VALIDATE_GUEST_SPACE +-/* If the guest doesn't have a validation function just agree */ +-static int validate_guest_space(unsigned long guest_base, +- unsigned long guest_size) +-{ +- return 1; +-} +-#endif +- + unsigned long init_guest_space(unsigned long host_start, + unsigned long host_size, + unsigned long guest_start, +@@ -1845,11 +1835,12 @@ unsigned long init_guest_space(unsigned long host_start, + /* If just a starting address is given, then just verify that + * address. */ + if (host_start && !host_size) { ++#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + if (validate_guest_space(host_start, host_size) == 1) { +- return host_start; +- } else { + return (unsigned long)-1; + } ++#endif ++ return host_start; + } + + /* Setup the initial flags and start address. */ +@@ -1888,6 +1879,8 @@ unsigned long init_guest_space(unsigned long host_start, + + /* Check to see if the address is valid. */ + if (!host_start || real_start == current_start) { ++#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) ++ /* On 32-bit ARM, we need to also be able to map the commpage. */ + int valid = validate_guest_space(real_start - guest_start, + real_size); + if (valid == 1) { +@@ -1896,6 +1889,10 @@ unsigned long init_guest_space(unsigned long host_start, + return (unsigned long)-1; + } + /* valid == 0, so try again. */ ++#else ++ /* On other architectures, whatever we have here is fine. */ ++ break; ++#endif + } + + /* That address didn't work. Unmap and try a different one. +-- +2.15.1 + diff --git a/libre/qemu-user-static/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch b/libre/qemu-user-static/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch new file mode 100644 index 000000000..06e508219 --- /dev/null +++ b/libre/qemu-user-static/0002-linux-user-Rename-validate_guest_space-init_guest_co.patch @@ -0,0 +1,54 @@ +From b5b929b0423e5db333c9d5dfc104bb3598ff4182 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Thu, 28 Dec 2017 08:03:26 -0500 +Subject: [PATCH 02/10] linux-user: Rename validate_guest_space => + init_guest_commpage + +init_guest_commpage is a much more honest description of what the function +does. validate_guest_space not only suggests that the function has no +side-effects, but also introduces confusion as to why it is only needed on +32-bit ARM targets. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index cac991159c..453394239c 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -362,8 +362,8 @@ enum { + * The guest code may leave a page mapped and populate it if the + * address is suitable. + */ +-static int validate_guest_space(unsigned long guest_base, +- unsigned long guest_size) ++static int init_guest_commpage(unsigned long guest_base, ++ unsigned long guest_size) + { + unsigned long real_start, test_page_addr; + +@@ -1836,7 +1836,7 @@ unsigned long init_guest_space(unsigned long host_start, + * address. */ + if (host_start && !host_size) { + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) +- if (validate_guest_space(host_start, host_size) == 1) { ++ if (init_guest_commpage(host_start, host_size) != 1) { + return (unsigned long)-1; + } + #endif +@@ -1881,8 +1881,8 @@ unsigned long init_guest_space(unsigned long host_start, + if (!host_start || real_start == current_start) { + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* On 32-bit ARM, we need to also be able to map the commpage. */ +- int valid = validate_guest_space(real_start - guest_start, +- real_size); ++ int valid = init_guest_commpage(real_start - guest_start, ++ real_size); + if (valid == 1) { + break; + } else if (valid == -1) { +-- +2.15.1 + diff --git a/libre/qemu-user-static/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch b/libre/qemu-user-static/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch new file mode 100644 index 000000000..ea9eff138 --- /dev/null +++ b/libre/qemu-user-static/0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch @@ -0,0 +1,29 @@ +From c03d2cc51c5fa496f894b641c035b12e49fd637b Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 27 Dec 2017 14:40:39 -0500 +Subject: [PATCH 03/10] linux-user: init_guest_space: Clean up if we can't + initialize the commpage + +We'll just exit with an error anyway, so it doesn't really matter, but it +is cleaned up in all of the other places were we error out. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 453394239c..1a6b660b25 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1886,6 +1886,7 @@ unsigned long init_guest_space(unsigned long host_start, + if (valid == 1) { + break; + } else if (valid == -1) { ++ munmap((void *)real_start, host_size); + return (unsigned long)-1; + } + /* valid == 0, so try again. */ +-- +2.15.1 + diff --git a/libre/qemu-user-static/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch b/libre/qemu-user-static/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch new file mode 100644 index 000000000..7f9cfc7a8 --- /dev/null +++ b/libre/qemu-user-static/0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch @@ -0,0 +1,47 @@ +From bc26025ccc64a2a63fc58776c93e2e4392445abe Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 27 Dec 2017 19:44:00 -0500 +Subject: [PATCH 04/10] linux-user: init_guest_space: Correctly handle + guest_start in commpage initialization + +init_guest_commpage needs to check if the mapped space, which ends at +real_start+real_size overlaps with where it needs to put the commpage, +which is (assuming sane qemu_host_page_size) guest_base + 0xffff000, where +guest_base is real_start - guest_start. + + [guest_base][ 0xffff0000 ][commpage] + [guest_base][guest_start][real_size] [commpage] + [ real_start ][real_size] [commpage] + ^ + fail if this gap < 0 + +Since init_guest_commpage wants to do everything relative to guest_base +(rather than real_start), it obviously needs to be comparing 0xffff0000 +against guest_start+real_size, not just real_size. + +This bug has been present since 806d102141b99d4f1e55a97d68b7ea8c8ba3129f in +2012, but guest_start is usually 0, and prior to v2.11 real_size was +usually much smaller than 0xffff0000, so it was uncommon for it to have +made a difference. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 1a6b660b25..f41cecc3cb 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1882,7 +1882,7 @@ unsigned long init_guest_space(unsigned long host_start, + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* On 32-bit ARM, we need to also be able to map the commpage. */ + int valid = init_guest_commpage(real_start - guest_start, +- real_size); ++ real_size + guest_start); + if (valid == 1) { + break; + } else if (valid == -1) { +-- +2.15.1 + diff --git a/libre/qemu-user-static/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch b/libre/qemu-user-static/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch new file mode 100644 index 000000000..1570774ee --- /dev/null +++ b/libre/qemu-user-static/0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch @@ -0,0 +1,120 @@ +From b2432d1b415143a55083782712f11241f194c0ba Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 27 Dec 2017 20:05:52 -0500 +Subject: [PATCH 05/10] linux-user: init_guest_space: Clarify page alignment + logic + +There are 3 parts to this change: + - Add a comment showing the relative sizes and positions of the blocks of + memory + - introduce and use new aligned_{start,size} instead of adjusting + real_{start_size} + - When we clean up (on failure), munmap(real_start, real_size) instead of + munmap(aligned_start, aligned_size). It *shouldn't* make any + difference, but I will admit that this does mean we are making the + syscall with different values, so this isn't quite a no-op patch. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 43 +++++++++++++++++++++++++++++++++---------- + 1 file changed, 33 insertions(+), 10 deletions(-) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index f41cecc3cb..22f2632dfa 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1827,7 +1827,7 @@ unsigned long init_guest_space(unsigned long host_start, + unsigned long guest_start, + bool fixed) + { +- unsigned long current_start, real_start; ++ unsigned long current_start, aligned_start; + int flags; + + assert(host_start || host_size); +@@ -1853,7 +1853,8 @@ unsigned long init_guest_space(unsigned long host_start, + /* Otherwise, a non-zero size region of memory needs to be mapped + * and validated. */ + while (1) { +- unsigned long real_size = host_size; ++ unsigned long real_start, real_size, aligned_size; ++ aligned_size = real_size = host_size; + + /* Do not use mmap_find_vma here because that is limited to the + * guest address space. We are going to make the +@@ -1867,26 +1868,48 @@ unsigned long init_guest_space(unsigned long host_start, + + /* Ensure the address is properly aligned. */ + if (real_start & ~qemu_host_page_mask) { ++ /* Ideally, we adjust like ++ * ++ * pages: [ ][ ][ ][ ][ ] ++ * old: [ real ] ++ * [ aligned ] ++ * new: [ real ] ++ * [ aligned ] ++ * ++ * But if there is something else mapped right after it, ++ * then obviously it won't have room to grow, and the ++ * kernel will put the new larger real someplace else with ++ * unknown alignment (if we made it to here, then ++ * fixed=false). Which is why we grow real by a full page ++ * size, instead of by part of one; so that even if we get ++ * moved, we can still guarantee alignment. But this does ++ * mean that there is a padding of < 1 page both before ++ * and after the aligned range; the "after" could could ++ * cause problems for ARM emulation where it could butt in ++ * to where we need to put the commpage. ++ */ + munmap((void *)real_start, host_size); +- real_size = host_size + qemu_host_page_size; ++ real_size = aligned_size + qemu_host_page_size; + real_start = (unsigned long) + mmap((void *)real_start, real_size, PROT_NONE, flags, -1, 0); + if (real_start == (unsigned long)-1) { + return (unsigned long)-1; + } +- real_start = HOST_PAGE_ALIGN(real_start); ++ aligned_start = HOST_PAGE_ALIGN(real_start); ++ } else { ++ aligned_start = real_start; + } + + /* Check to see if the address is valid. */ +- if (!host_start || real_start == current_start) { ++ if (!host_start || aligned_start == current_start) { + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* On 32-bit ARM, we need to also be able to map the commpage. */ +- int valid = init_guest_commpage(real_start - guest_start, +- real_size + guest_start); ++ int valid = init_guest_commpage(aligned_start - guest_start, ++ aligned_size + guest_start); + if (valid == 1) { + break; + } else if (valid == -1) { +- munmap((void *)real_start, host_size); ++ munmap((void *)real_start, real_size); + return (unsigned long)-1; + } + /* valid == 0, so try again. */ +@@ -1905,7 +1928,7 @@ unsigned long init_guest_space(unsigned long host_start, + * address space randomization put a shared library somewhere + * inconvenient. + */ +- munmap((void *)real_start, host_size); ++ munmap((void *)real_start, real_size); + current_start += qemu_host_page_size; + if (host_start == current_start) { + /* Theoretically possible if host doesn't have any suitably +@@ -1917,7 +1940,7 @@ unsigned long init_guest_space(unsigned long host_start, + + qemu_log_mask(CPU_LOG_PAGE, "Reserved 0x%lx bytes of guest address space\n", host_size); + +- return real_start; ++ return aligned_start; + } + + static void probe_guest_base(const char *image_name, +-- +2.15.1 + diff --git a/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch b/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch new file mode 100644 index 000000000..4436b7817 --- /dev/null +++ b/libre/qemu-user-static/0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch @@ -0,0 +1,30 @@ +From ca873a81cc020df0ee0ec072a60678bb83dce9e2 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 27 Dec 2017 21:05:29 -0500 +Subject: [PATCH 06/10] linux-user: init_guest_commpage: Add a comment about + size check + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 22f2632dfa..b560f5d6fe 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -374,6 +374,11 @@ static int init_guest_commpage(unsigned long guest_base, + + /* If the commpage lies within the already allocated guest space, + * then there is no way we can allocate it. ++ * ++ * You may be thinking that that this check is redundant because ++ * we already validated the guest size against MAX_RESERVED_VA; ++ * but if qemu_host_page_mask is unusually large, then ++ * test_page_addr may be lower. + */ + if (test_page_addr >= guest_base + && test_page_addr < (guest_base + guest_size)) { +-- +2.15.1 + diff --git a/libre/qemu-user-static/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch b/libre/qemu-user-static/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch new file mode 100644 index 000000000..59be04cf9 --- /dev/null +++ b/libre/qemu-user-static/0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch @@ -0,0 +1,94 @@ +From dbbba45fa37da85ac213fbbe1f7eab3e1de74b41 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Wed, 27 Dec 2017 21:17:52 -0500 +Subject: [PATCH 07/10] linux-user: init_guest_space: Clean up control flow a + bit + +Instead of doing + + if (check1) { + if (check2) { + success; + } + } + + retry; + +Do a clearer + + if (!check1) { + goto try_again; + } + + if (!check2) { + goto try_again; + } + + success; + + try_again: + retry; + +Besides being clearer, this makes it easier to insert more checks that +need to trigger a retry on check failure, or rearrange them, or anything +like that. + +Because some indentation is changing, "ignore space change" may be useful +for viewing this patch. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 34 +++++++++++++++++++--------------- + 1 file changed, 19 insertions(+), 15 deletions(-) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index b560f5d6fe..5c0ad65611 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1906,24 +1906,28 @@ unsigned long init_guest_space(unsigned long host_start, + } + + /* Check to see if the address is valid. */ +- if (!host_start || aligned_start == current_start) { ++ if (host_start && aligned_start != current_start) { ++ goto try_again; ++ } ++ + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) +- /* On 32-bit ARM, we need to also be able to map the commpage. */ +- int valid = init_guest_commpage(aligned_start - guest_start, +- aligned_size + guest_start); +- if (valid == 1) { +- break; +- } else if (valid == -1) { +- munmap((void *)real_start, real_size); +- return (unsigned long)-1; +- } +- /* valid == 0, so try again. */ +-#else +- /* On other architectures, whatever we have here is fine. */ +- break; +-#endif ++ /* On 32-bit ARM, we need to also be able to map the commpage. */ ++ int valid = init_guest_commpage(aligned_start - guest_start, ++ aligned_size + guest_start); ++ if (valid == -1) { ++ munmap((void *)real_start, real_size); ++ return (unsigned long)-1; ++ } else if (valid == -1) { ++ goto try_again; + } ++#endif ++ ++ /* If nothing has said `return -1` or `goto try_again` yet, ++ * then the address we have is good. ++ */ ++ break; + ++ try_again: + /* That address didn't work. Unmap and try a different one. + * The address the host picked because is typically right at + * the top of the host address space and leaves the guest with +-- +2.15.1 + diff --git a/libre/qemu-user-static/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch b/libre/qemu-user-static/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch new file mode 100644 index 000000000..9f434e116 --- /dev/null +++ b/libre/qemu-user-static/0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch @@ -0,0 +1,50 @@ +From 8f38106de8d023be8b3b28955df3615637c65dd9 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Thu, 28 Dec 2017 06:42:12 -0500 +Subject: [PATCH 08/10] linux-user: init_guest_space: Don't try to align if + we'll reject it + +If the ensure-alignment code gets triggered, then the +"if (host_start && real_start != current_start)" check will always trigger, +so save 2 syscalls and put that check first. + +Note that we can't just switch to using MAP_FIXED for that check, because +then we couldn't differentiate between a failure because "there isn't +enough space" and "there isn't enough space *here*". + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 5c0ad65611..1b7583d659 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1871,6 +1871,11 @@ unsigned long init_guest_space(unsigned long host_start, + return (unsigned long)-1; + } + ++ /* Check to see if the address is valid. */ ++ if (host_start && real_start != current_start) { ++ goto try_again; ++ } ++ + /* Ensure the address is properly aligned. */ + if (real_start & ~qemu_host_page_mask) { + /* Ideally, we adjust like +@@ -1905,11 +1910,6 @@ unsigned long init_guest_space(unsigned long host_start, + aligned_start = real_start; + } + +- /* Check to see if the address is valid. */ +- if (host_start && aligned_start != current_start) { +- goto try_again; +- } +- + #if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* On 32-bit ARM, we need to also be able to map the commpage. */ + int valid = init_guest_commpage(aligned_start - guest_start, +-- +2.15.1 + diff --git a/libre/qemu-user-static/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch b/libre/qemu-user-static/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch new file mode 100644 index 000000000..e91fdefd8 --- /dev/null +++ b/libre/qemu-user-static/0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch @@ -0,0 +1,29 @@ +From 81033c66738a2e3b713c414e8e07e6ef8e59d8d7 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Thu, 28 Dec 2017 07:22:29 -0500 +Subject: [PATCH 09/10] linux-user: init_guest_space: Add a comment about + search strategy + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 1b7583d659..7736ea2c3a 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1936,6 +1936,10 @@ unsigned long init_guest_space(unsigned long host_start, + * happen often. Probably means we got unlucky and host + * address space randomization put a shared library somewhere + * inconvenient. ++ * ++ * This is probably a good strategy if host_start, but is ++ * probably a bad strategy if not, which means we got here ++ * because of trouble with ARM commpage setup. + */ + munmap((void *)real_start, real_size); + current_start += qemu_host_page_size; +-- +2.15.1 + diff --git a/libre/qemu-user-static/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch b/libre/qemu-user-static/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch new file mode 100644 index 000000000..587293564 --- /dev/null +++ b/libre/qemu-user-static/0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch @@ -0,0 +1,99 @@ +From f8ccd5e7353937e0a48ccd8bfbc07202dc85afac Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@parabola.nu> +Date: Thu, 28 Dec 2017 07:27:20 -0500 +Cc: paul@codesourcery.com +Subject: [PATCH 10/10] linux-user: init_guest_space: Try to make ARM + space+commpage continuous + +At a fixed distance after the usable memory that init_guest_space maps, for +32-bit ARM targets we also need to map a commpage. The normal +init_guest_space logic doesn't keep this in mind when searching for an +address range. + +If !host_start, then try to find a big continuous segment where we can put +both the usable memory and the commpage; we then munmap that segment and +set current_start to that address; and let the normal code mmap the usable +memory and the commpage separately. That is: if we don't have hint of +where to start looking for memory, come up with one that is better than +NULL. Depending on host_size and guest_start, there may or may not be a +gap between the usable memory and the commpage, so this is slightly more +restrictive than it needs to be; but it's only a hint, so that's OK. + +We only do that for !host start, because if host_start, then either: + - we got an address passed in with -B, in which case we don't want to + interfere with what the user said; + - or host_start is based off of the ELF image's loaddr. The check "if + (host_start && real_start != current_start)" suggests that we really + want lowest available address that is >= loaddr. I don't know why that + is, but I'm trusting that Paul Brook knew what he was doing when he + wrote the original version of that check in + c581deda322080e8beb88b2e468d4af54454e4b3 way back in 2010. + +Signed-off-by: Luke Shumaker <lukeshu@parabola.nu> +--- + linux-user/elfload.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 49 insertions(+) + +diff --git a/linux-user/elfload.c b/linux-user/elfload.c +index 7736ea2c3a..cd3a7d877d 100644 +--- a/linux-user/elfload.c ++++ b/linux-user/elfload.c +@@ -1857,6 +1857,55 @@ unsigned long init_guest_space(unsigned long host_start, + + /* Otherwise, a non-zero size region of memory needs to be mapped + * and validated. */ ++ ++#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) ++ /* On 32-bit ARM, we need to map not just the usable memory, but ++ * also the commpage. Try to find a suitable place by allocating ++ * a big chunk for all of it. If host_start, then the naive ++ * strategy probably does good enough. ++ */ ++ if (!host_start) { ++ unsigned long guest_full_size, host_full_size, real_start; ++ ++ guest_full_size = ++ (0xffff0f00 & qemu_host_page_mask) + qemu_host_page_size; ++ host_full_size = guest_full_size - guest_start; ++ real_start = (unsigned long) ++ mmap(NULL, host_full_size, PROT_NONE, flags, -1, 0); ++ if (real_start == (unsigned long)-1) { ++ if (host_size < host_full_size - qemu_host_page_size) { ++ /* We failed to map a continous segment, but we're ++ * allowed to have a gap between the usable memory and ++ * the commpage where other things can be mapped. ++ * This sparseness gives us more flexibility to find ++ * an address range. ++ */ ++ goto naive; ++ } ++ return (unsigned long)-1; ++ } ++ munmap((void *)real_start, host_full_size); ++ if (real_start & ~qemu_host_page_mask) { ++ /* The same thing again, but with an extra qemu_host_page_size ++ * so that we can shift around alignment. ++ */ ++ unsigned long real_size = host_full_size + qemu_host_page_size; ++ real_start = (unsigned long) ++ mmap(NULL, real_size, PROT_NONE, flags, -1, 0); ++ if (real_start == (unsigned long)-1) { ++ if (host_size < host_full_size - qemu_host_page_size) { ++ goto naive; ++ } ++ return (unsigned long)-1; ++ } ++ munmap((void *)real_start, real_size); ++ real_start = HOST_PAGE_ALIGN(real_start); ++ } ++ current_start = real_start; ++ } ++ naive: ++#endif ++ + while (1) { + unsigned long real_start, real_size, aligned_size; + aligned_size = real_size = host_size; +-- +2.15.1 + diff --git a/libre/qemu-user-static/PKGBUILD b/libre/qemu-user-static/PKGBUILD new file mode 100644 index 000000000..a3030470b --- /dev/null +++ b/libre/qemu-user-static/PKGBUILD @@ -0,0 +1,170 @@ +# Maintainer (Arch:qemu): Tobias Powalowski <tpowa@archlinux.org> +# Contributor (Arch:qemu): Sébastien "Seblu" Luttringer <seblu@seblu.net> +# Maintainer: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: Márcio Silva <coadde@hyperbola.info> + +_pkgbase=qemu +pkgname=(qemu-user-static qemu-user-static-binfmt) +pkgdesc="A generic and open source machine emulator and virtualizer" +pkgver=2.11.0 +pkgrel=3.parabola1 +arch=(x86_64) +arch+=(i686 armv7h) +license=(GPL2 LGPL2.1) +url="http://wiki.qemu.org/" +makedepends=(pixman-static glib2-static pcre-static python2) +source=("$url/download/${_pkgbase}-${pkgver}.tar.bz2"{,.sig} + 0001-linux-user-Use-if-to-only-call-validate_guest_space-.patch + 0002-linux-user-Rename-validate_guest_space-init_guest_co.patch + 0003-linux-user-init_guest_space-Clean-up-if-we-can-t-ini.patch + 0004-linux-user-init_guest_space-Correctly-handle-guest_s.patch + 0005-linux-user-init_guest_space-Clarify-page-alignment-l.patch + 0006-linux-user-init_guest_commpage-Add-a-comment-about-s.patch + 0007-linux-user-init_guest_space-Clean-up-control-flow-a-.patch + 0008-linux-user-init_guest_space-Don-t-try-to-align-if-we.patch + 0009-linux-user-init_guest_space-Add-a-comment-about-sear.patch + 0010-linux-user-init_guest_space-Try-to-make-ARM-space-co.patch + allow_elf64.patch) +sha256sums=('c4f034c7665a84a1c3be72c8da37f3c31ec063475699df062ab646d8b2e17fcb' + 'SKIP' + '9953a8debd9456adb4f5968817fa89da4d4542e44980a5533ccf86371d819845' + 'a977e9295daa14a9c73258cf16399eb5af66382217f8a4e69951ec044131a7ce' + 'dba2cfeb24841d45936091319957ee6f65e481da3c761791d410d3b8e6799998' + '75b3bda6752c4bf17488489f898767b6772b10ecc5d1f0a5bc1bd831e99a31e3' + '731895a8ed6f6d322bb60764b01cf09e0ea762d7d53fc01e91c2d2aecfdc8844' + '69b37040f52ef86b86c7c2952eb3f85f3c67d7adf289c43fdac8c71827c6e5b9' + '76f88850b0f52450eecb80029ffe16db6f418cec3b58231aca354cc20bbfb16a' + '76944d84990cc76e47c381849c683a346c5234bcebbe4c24334d0fd8368482db' + '7845867348fd380def28c7fe023e54cee8ff88cd6754aae3ab3472149cfbde51' + '1953e7cac58c23526d007d8559410e0042d4a7c1b8cbd5f4c0543f7f876436dd' + '13a6d9e678bdc9e1f051006cfd0555f5a80582368f54c8a1bb5a78ece3832ac4') +validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') + +case $CARCH in + i?86) _corearch=i386 ;; + x86_64) _corearch=x86_64 ;; +esac + +prepare() { + mkdir build-static + mkdir -p extra-arch-static/usr/{bin,share/qemu} + + cd ${_pkgbase}-${pkgver} + sed -i 's/vte-2\.90/vte-2.91/g' configure + + # https://bugs.launchpad.net/qemu/+bug/1740219 + # https://lists.nongnu.org/archive/html/qemu-devel/2017-12/msg05237.html + local patchfile + for patchfile in ../????-linux-user-*.patch; do + patch -p1 < "$patchfile" + done + + patch -p1 < ../allow_elf64.patch +} + +build() { + local flags=( + --static + --disable-system # disable building qemu-system-$CPU, we only want qemu-$CPU + --disable-guest-agent # disable building qemu-ga + --disable-tools # disable building the qemu-{io,nbd,img} tools + --disable-blobs # disable installing firmware files used by system + --disable-docs + --disable-modules # modules imply dynamic linking + + # jemalloc-static isn't packaged + --disable-jemalloc + + # These libraries are only used for system or tools, but even + # though that's disabled, libqemuutil.a still tries to link + # against them unless we specifically tell it not to (the linkage + # would be removed at the final linker's tree-shaking). + --disable-gcrypt + --disable-nettle + ) + _build static "${flags[@]}" \ + --audio-drv-list= \ + --disable-bluez \ + --disable-sdl \ + --disable-gtk \ + --disable-vte \ + --disable-opengl \ + --disable-virglrenderer +} + +_build() ( + cd build-$1 + + # qemu vs. make 4 == bad + export ARFLAGS=rv + + # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740 + export CFLAGS+=" -fPIC" + + ../${_pkgbase}-${pkgver}/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/qemu \ + --python=/usr/bin/python2 \ + --smbd=/usr/bin/smbd \ + --with-gtkabi=3.0 \ + --with-sdlabi=2.0 \ + --enable-modules \ + --enable-jemalloc \ + "${@:2}" + + make +) + +package_qemu-user-static() { + pkgdesc="QEMU user-mode emulation (static binaries)" + + provides=("qemu-static=$pkgver") + replaces=(qemu-static) + conflicts=(qemu-static) + + _package static + + rm -vr -- \ + "$pkgdir"/usr/lib/ \ + "$pkgdir"/usr/share/ + + local prog + for prog in "$pkgdir"/usr/bin/*; do + mv -nT -- "$prog" "${prog%-static}-static" + done +} + +_package() { + options=(!strip) + + make -C build-$1 DESTDIR="$pkgdir" install "${@:2}" + + cd "$pkgdir"/usr/bin + tidy_strip +} + +package_qemu-user-static-binfmt() { + pkgdesc="binfmt registration for QEMU user-mode emulation" + depends=("qemu-user-static=$pkgver") + + provides=("binfmt-qemu-static=$pkgver") + replaces=('binfmt-qemu-static') + conflicts=('binfmt-qemu-static') + + cd ${_pkgbase}-${pkgver} + + install -d "$pkgdir"/usr/lib/binfmt.d + + < scripts/qemu-binfmt-conf.sh \ + sed -e 's/^CHECK=.*/CHECK=qemu_check_systemd/' \ + -e 's/^BINFMT_SET=.*/BINFMT_SET=qemu_generate_systemd/' \ + | sh /dev/stdin \ + --qemu-path /usr/bin \ + --exportdir "$pkgdir"/usr/lib/binfmt.d \ + --credential yes + + # add the "-static" suffix + sed -i 's/:[^:]*$/-static&/' -- "$pkgdir"/usr/lib/binfmt.d/*.conf +} diff --git a/libre/qemu-user-static/allow_elf64.patch b/libre/qemu-user-static/allow_elf64.patch new file mode 100644 index 000000000..07f27a038 --- /dev/null +++ b/libre/qemu-user-static/allow_elf64.patch @@ -0,0 +1,27 @@ +commit 3c72765ec760a51f0e879dc792be82c93141e318 +Author: Anatol Pomozov <anatol.pomozov@gmail.com> +Date: Tue Jun 6 20:07:03 2017 -0700 + + Remove restriction that prevents bootimg elf64 images + + It is possible to create a 64 bit elf image that has valid multiboot header. + qemu should be able to boot such images. + + Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com> + +diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c +index 663f35a658..cf1b4f5fb3 100644 +--- a/hw/i386/multiboot.c ++++ b/hw/i386/multiboot.c +@@ -192,11 +192,6 @@ int load_multiboot(FWCfgState *fw_cfg, + int kernel_size; + fclose(f); + +- if (((struct elf64_hdr*)header)->e_machine == EM_X86_64) { +- fprintf(stderr, "Cannot load x86-64 image, give a 32bit one.\n"); +- exit(1); +- } +- + kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry, + &elf_low, &elf_high, 0, I386_ELF_MACHINE, + 0, 0); diff --git a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch index 5ee14d118..ff71a4f85 100644 --- a/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch +++ b/libre/systemd/0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch @@ -1,4 +1,4 @@ -From d817ea1a39a1e5ae78d776708585878dc39f6ec6 Mon Sep 17 00:00:00 2001 +From 878ad05e921e204d05fb3005a7c0999265d20cb0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:19:20 -0400 Subject: [PATCH 1/7] FSDG: man/: Refer to the operating system as GNU/Linux @@ -8,17 +8,26 @@ cases, "Linux" is (correctly) used to refer to just the kernel. In others, it is in a string for which code must also be adjusted; these instances are not included in this commit. --- - man/daemon.xml | 4 ++-- - man/sd-bus-errors.xml | 2 +- - man/sd_bus_error_add_map.xml | 2 +- - man/systemd.xml | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) + man/daemon.xml | 4 ++-- + man/journald.conf.xml | 2 +- + man/machinectl.xml | 2 +- + man/sd-bus-errors.xml | 2 +- + man/sd-login.xml | 2 +- + man/sd_bus_error_add_map.xml | 2 +- + man/sd_uid_get_state.xml | 2 +- + man/systemd-detect-virt.xml | 4 ++-- + man/systemd-machine-id-setup.xml | 2 +- + man/systemd-resolved.service.xml | 6 +++--- + man/systemd.exec.xml | 2 +- + man/systemd.socket.xml | 2 +- + man/systemd.xml | 6 +++--- + 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/man/daemon.xml b/man/daemon.xml -index 485c66225..a64974968 100644 +index 18337daad8..ab65f6f4d9 100644 --- a/man/daemon.xml +++ b/man/daemon.xml -@@ -168,7 +168,7 @@ +@@ -170,7 +170,7 @@ <refsect2> <title>New-Style Daemons</title> @@ -27,7 +36,7 @@ index 485c66225..a64974968 100644 new-style daemons. This makes it easier to supervise and control them at runtime and simplifies their implementation.</para> -@@ -309,7 +309,7 @@ +@@ -311,7 +311,7 @@ as detailed in the <ulink url="http://refspecs.linuxbase.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html">LSB Linux Standard Base Core Specification</ulink>. This method of @@ -36,11 +45,37 @@ index 485c66225..a64974968 100644 old-style and new-style systems. Among other issues, SysV init scripts have the disadvantage of involving shell scripts in the boot process. New-style init systems generally employ updated +diff --git a/man/journald.conf.xml b/man/journald.conf.xml +index 844228e324..58b21d424b 100644 +--- a/man/journald.conf.xml ++++ b/man/journald.conf.xml +@@ -132,7 +132,7 @@ + <term><varname>SplitMode=</varname></term> + + <listitem><para>Controls whether to split up journal files per user, either <literal>uid</literal> or +- <literal>none</literal>. Split journal files are primarily useful for access control: on UNIX/Linux access ++ <literal>none</literal>. Split journal files are primarily useful for access control: on GNU/Linux access + control is managed per file, and the journal daemon will assign users read access to their journal files. If + <literal>uid</literal>, all regular users will each get their own journal files, and system users will log to + the system journal. If <literal>none</literal>, journal files are not split up by user and all messages are +diff --git a/man/machinectl.xml b/man/machinectl.xml +index 43f4d127b8..908ee5649c 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -899,7 +899,7 @@ + <para>The <command>machinectl</command> tool operates on machines + and images whose names must be chosen following strict + rules. Machine names must be suitable for use as host names +- following a conservative subset of DNS and UNIX/Linux ++ following a conservative subset of DNS and GNU/Linux + semantics. Specifically, they must consist of one or more + non-empty label strings, separated by dots. No leading or trailing + dots are allowed. No sequences of multiple dots are allowed. The diff --git a/man/sd-bus-errors.xml b/man/sd-bus-errors.xml -index 055af7a68..d2b81f4e4 100644 +index a655ab1d97..b1f24381dd 100644 --- a/man/sd-bus-errors.xml +++ b/man/sd-bus-errors.xml -@@ -126,7 +126,7 @@ +@@ -128,7 +128,7 @@ <para>In addition to this list, in sd-bus, the special error namespace <literal>System.Error.</literal> is used to map @@ -49,11 +84,24 @@ index 055af7a68..d2b81f4e4 100644 project='man-pages'><refentrytitle>errno</refentrytitle><manvolnum>3</manvolnum></citerefentry>) to D-Bus errors and back. For example, the error <constant>EUCLEAN</constant> is mapped to +diff --git a/man/sd-login.xml b/man/sd-login.xml +index 148dd19cea..5b99d9e281 100644 +--- a/man/sd-login.xml ++++ b/man/sd-login.xml +@@ -270,7 +270,7 @@ + + <para> + <ulink url="https://www.freedesktop.org/wiki/Software/systemd/multiseat">Multi-Seat on Linux</ulink> +- for an introduction to multi-seat support on Linux and the background for this set of APIs. ++ for an introduction to multi-seat support on GNU/Linux and the background for this set of APIs. + </para> + </refsect1> + diff --git a/man/sd_bus_error_add_map.xml b/man/sd_bus_error_add_map.xml -index a1eda21ed..55402dfc2 100644 +index b79381fefd..072b31c7d3 100644 --- a/man/sd_bus_error_add_map.xml +++ b/man/sd_bus_error_add_map.xml -@@ -82,7 +82,7 @@ +@@ -84,7 +84,7 @@ <para>The <function>sd_bus_error_add_map()</function> call may be used to register additional mappings for converting D-Bus errors @@ -62,11 +110,113 @@ index a1eda21ed..55402dfc2 100644 defined with this call are consulted by calls such as <citerefentry><refentrytitle>sd_bus_error_set</refentrytitle><manvolnum>3</manvolnum></citerefentry> or +diff --git a/man/sd_uid_get_state.xml b/man/sd_uid_get_state.xml +index 1183d9079a..c8b62f7a43 100644 +--- a/man/sd_uid_get_state.xml ++++ b/man/sd_uid_get_state.xml +@@ -199,7 +199,7 @@ + <listitem><para>An input parameter was invalid (out of range, + or NULL, where that is not accepted). This is also returned if + the passed user ID is 0xFFFF or 0xFFFFFFFF, which are +- undefined on Linux.</para></listitem> ++ undefined on GNU/Linux.</para></listitem> + </varlistentry> + + <varlistentry> +diff --git a/man/systemd-detect-virt.xml b/man/systemd-detect-virt.xml +index 4426827e57..b59570ad2c 100644 +--- a/man/systemd-detect-virt.xml ++++ b/man/systemd-detect-virt.xml +@@ -156,12 +156,12 @@ + + <row> + <entry><varname>lxc</varname></entry> +- <entry>Linux container implementation by LXC</entry> ++ <entry>Container implementation by LXC</entry> + </row> + + <row> + <entry><varname>lxc-libvirt</varname></entry> +- <entry>Linux container implementation by libvirt</entry> ++ <entry>Container implementation by libvirt</entry> + </row> + + <row> +diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml +index 527cb7bff5..8c4a62ccee 100644 +--- a/man/systemd-machine-id-setup.xml ++++ b/man/systemd-machine-id-setup.xml +@@ -90,7 +90,7 @@ + and is different for every booted instance of the + VM.</para></listitem> + +- <listitem><para>Similarly, if run inside a Linux container ++ <listitem><para>Similarly, if run inside a container + environment and a UUID is configured for the container, this is + used to initialize the machine ID. For details, see the + documentation of the <ulink +diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml +index da6e8c4441..3a629b09ec 100644 +--- a/man/systemd-resolved.service.xml ++++ b/man/systemd-resolved.service.xml +@@ -73,7 +73,7 @@ + <citerefentry project='man-pages'><refentrytitle>getaddrinfo</refentrytitle><manvolnum>3</manvolnum></citerefentry> API as defined + by <ulink url="https://tools.ietf.org/html/rfc3493">RFC3493</ulink> and its related resolver functions, + including <citerefentry project='man-pages'><refentrytitle>gethostbyname</refentrytitle><manvolnum>3</manvolnum></citerefentry>. This +- API is widely supported, including beyond the Linux platform. In its current form it does not expose DNSSEC ++ API is widely supported, including beyond the GNU/Linux platform. In its current form it does not expose DNSSEC + validation status information however, and is synchronous only. This API is backed by the glibc Name Service + Switch (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the + glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry> +@@ -173,7 +173,7 @@ + + <itemizedlist> + <listitem><para><command>systemd-resolved</command> maintains the +- <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional Linux ++ <filename>/run/systemd/resolve/stub-resolv.conf</filename> file for compatibility with traditional GNU/Linux + programs. This file may be symlinked from <filename>/etc/resolv.conf</filename>. This file lists the 127.0.0.53 + DNS stub (see above) as the only DNS server. It also contains a list of search domains that are in use by + systemd-resolved. The list of search domains is always kept up-to-date. Note that +@@ -189,7 +189,7 @@ + <command>systemd-resolved</command>. This file does not contain any search domains.</para></listitem> + + <listitem><para><command>systemd-resolved</command> maintains the +- <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional Linux ++ <filename>/run/systemd/resolve/resolv.conf</filename> file for compatibility with traditional GNU/Linux + programs. This file may be symlinked from <filename>/etc/resolv.conf</filename> and is always kept up-to-date, + containing information about all known DNS servers. Note the file format's limitations: it does not know a + concept of per-interface DNS servers and hence only contains system-wide DNS server definitions. Note that +diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml +index 3d81e45732..c4a6ca4a07 100644 +--- a/man/systemd.exec.xml ++++ b/man/systemd.exec.xml +@@ -215,7 +215,7 @@ + which must be one of a-z, A-Z or <literal>_</literal> (i.e. numbers and <literal>-</literal> are not permitted + as first character). The user/group name must have at least one character, and at most 31. These restrictions + are enforced in order to avoid ambiguities and to ensure user/group names and unit files remain portable among +- Linux systems.</para> ++ GNU/Linux systems.</para> + + <para>When used in conjunction with <varname>DynamicUser=</varname> the user/group name specified is + dynamically allocated at the time the service is started, and released at the time the service is stopped — +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index a1943f65ab..a2b5ac0b59 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -302,7 +302,7 @@ + <listitem><para>Specifies a POSIX message queue name to listen + on. This expects a valid message queue name (i.e. beginning + with /). Behavior otherwise is very similar to the +- <varname>ListenFIFO=</varname> directive above. On Linux ++ <varname>ListenFIFO=</varname> directive above. On GNU/Linux + message queue descriptors are actually file descriptors and + can be inherited between processes.</para></listitem> + </varlistentry> diff --git a/man/systemd.xml b/man/systemd.xml -index e8178ca4b..ea7dad1ae 100644 +index 62ececb6e9..af464246ce 100644 --- a/man/systemd.xml +++ b/man/systemd.xml -@@ -64,7 +64,7 @@ +@@ -66,7 +66,7 @@ <refsect1> <title>Description</title> @@ -75,6 +225,19 @@ index e8178ca4b..ea7dad1ae 100644 systems. When run as first process on boot (as PID 1), it acts as init system that brings up and maintains userspace services.</para> +@@ -884,10 +884,10 @@ + <title>Kernel Command Line</title> + + <para>When run as system instance systemd parses a number of +- kernel command line arguments<footnote><para>If run inside a Linux ++ kernel command line arguments<footnote><para>If run inside a + container these arguments may be passed as command line arguments + to systemd itself, next to any of the command line options listed +- in the Options section above. If run outside of Linux containers, ++ in the Options section above. If run outside of a container, + these arguments are parsed from <filename>/proc/cmdline</filename> + instead.</para></footnote>:</para> + -- -2.13.2 +2.15.1 diff --git a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch index b9e94ee33..b44003e77 100644 --- a/libre/systemd/0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch +++ b/libre/systemd/0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch @@ -1,7 +1,7 @@ -From 10ccaa5d0fb340e61abc158238f939f4f7744396 Mon Sep 17 00:00:00 2001 +From 515c6b9cfdc8508225b07f602feaf9680020acbd Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:23:40 -0400 -Subject: [PATCH 2/7] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" +Subject: [PATCH 2/7] FSDG: os-release: Default PRETTY_NAME to "GNU/Linux" instead of "Linux" --- @@ -14,10 +14,10 @@ Subject: [PATCH 2/7] FSDG: os-release: Default to PRETTY_NAME "GNU/Linux" 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/man/kernel-install.xml b/man/kernel-install.xml -index 94b6b1110..2f42d49d9 100644 +index fa86a3aaa0..cc5ca2a2a9 100644 --- a/man/kernel-install.xml +++ b/man/kernel-install.xml -@@ -110,7 +110,7 @@ +@@ -112,7 +112,7 @@ <replaceable>PRETTY_NAME</replaceable> parameter specified in <filename>/etc/os-release</filename> or <filename>/usr/lib/os-release</filename> (if the former is @@ -27,10 +27,10 @@ index 94b6b1110..2f42d49d9 100644 the file <filename>initrd</filename> is found next to the <filename>linux</filename> file, the initrd will be added to diff --git a/man/os-release.xml b/man/os-release.xml -index 99bbb6100..27d18749d 100644 +index b0468c16a0..80d0d39bb9 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -210,7 +210,7 @@ +@@ -212,7 +212,7 @@ suitable for presentation to the user. May or may not contain a release code name or OS version of some kind, as suitable. If not set, defaults to @@ -40,10 +40,10 @@ index 99bbb6100..27d18749d 100644 Miracle)"</literal>.</para></listitem> </varlistentry> diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c -index ac0470b20..36b01500c 100644 +index d45c1dc496..686a951f09 100644 --- a/src/analyze/analyze.c +++ b/src/analyze/analyze.c -@@ -658,7 +658,7 @@ static int analyze_plot(sd_bus *bus) { +@@ -693,7 +693,7 @@ static int analyze_plot(sd_bus *bus) { svg("<rect class=\"background\" width=\"100%%\" height=\"100%%\" />\n"); svg("<text x=\"20\" y=\"50\">%s</text>", pretty_times); svg("<text x=\"20\" y=\"30\">%s %s (%s %s %s) %s %s</text>", @@ -53,10 +53,10 @@ index ac0470b20..36b01500c 100644 strempty(host->kernel_name), strempty(host->kernel_release), diff --git a/src/core/main.c b/src/core/main.c -index bcf9ea5f2..b66093827 100644 +index 2ad5073368..257ac31ca7 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1264,11 +1264,11 @@ static int status_welcome(void) { +@@ -1355,11 +1355,11 @@ static int status_welcome(void) { return status_printf(NULL, false, false, "\nWelcome to \x1B[%sm%s\x1B[0m!\n", isempty(ansi_color) ? "1" : ansi_color, @@ -71,10 +71,10 @@ index bcf9ea5f2..b66093827 100644 static int write_container_id(void) { diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index bc16290c7..f7574223a 100644 +index 207ddeb70f..46a20de469 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -97,7 +97,7 @@ static void print_welcome(void) { +@@ -101,7 +101,7 @@ static void print_welcome(void) { log_warning_errno(r, "Failed to read os-release file: %m"); printf("\nWelcome to your new installation of %s!\nPlease configure a few basic system settings:\n\n", @@ -84,10 +84,10 @@ index bc16290c7..f7574223a 100644 press_any_key(); diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install -index a0bca05c9..af9f0f9cc 100644 +index 305ea8f5c9..ae46dcc34d 100644 --- a/src/kernel-install/90-loaderentry.install +++ b/src/kernel-install/90-loaderentry.install -@@ -38,7 +38,7 @@ elif [[ -f /usr/lib/os-release ]]; then +@@ -36,7 +36,7 @@ elif [[ -f /usr/lib/os-release ]]; then fi if ! [[ $PRETTY_NAME ]]; then @@ -97,5 +97,5 @@ index a0bca05c9..af9f0f9cc 100644 declare -a BOOT_OPTIONS -- -2.13.2 +2.15.1 diff --git a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch index 40761d4ef..d9b3d9fe5 100644 --- a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch +++ b/libre/systemd/0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch @@ -1,7 +1,7 @@ -From d13b518038bfcdeae9c58bce183751f835cb18d4 Mon Sep 17 00:00:00 2001 +From 46ba10771dec899315255bef0aa420b0479b3f30 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:24:56 -0400 -Subject: [PATCH 3/7] FSDG: os-release: Default to NAME "GNU/Linux" instead of +Subject: [PATCH 3/7] FSDG: os-release: Default NAME to "GNU/Linux" instead of "Linux" --- @@ -10,10 +10,10 @@ Subject: [PATCH 3/7] FSDG: os-release: Default to NAME "GNU/Linux" instead of 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index 27d18749d..a88d16b17 100644 +index 80d0d39bb9..ad3891e719 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -121,7 +121,7 @@ +@@ -123,7 +123,7 @@ <listitem><para>A string identifying the operating system, without a version component, and suitable for presentation to the user. If not set, defaults to @@ -23,10 +23,10 @@ index 27d18749d..a88d16b17 100644 GNU/Linux"</literal>.</para></listitem> </varlistentry> diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c -index 9a1c5b76c..93e5f1ae7 100644 +index 82c70cfbe3..bd45b8e728 100644 --- a/src/journal-remote/journal-gatewayd.c +++ b/src/journal-remote/journal-gatewayd.c -@@ -805,7 +805,7 @@ static int request_handler_machine( +@@ -806,7 +806,7 @@ static int request_handler_machine( SD_ID128_FORMAT_VAL(mid), SD_ID128_FORMAT_VAL(bid), hostname_cleanup(hostname), @@ -36,5 +36,5 @@ index 9a1c5b76c..93e5f1ae7 100644 usage, cutoff_from, -- -2.13.2 +2.15.1 diff --git a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch index aadcc8a80..7e69a1c76 100644 --- a/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch +++ b/libre/systemd/0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch @@ -1,4 +1,4 @@ -From 97ace109bae3bd426f8578b7c606004be8234758 Mon Sep 17 00:00:00 2001 +From 2c010a68e43ce7d852d44940bdb5c291713f1751 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:28:30 -0400 Subject: [PATCH 4/7] FSDG: os-release: Default ID to "gnu-linux" instead of @@ -11,10 +11,10 @@ field, so this is just a man page change. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/os-release.xml b/man/os-release.xml -index a88d16b17..caf60f41a 100644 +index ad3891e719..81f294c7e4 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -145,7 +145,7 @@ +@@ -147,7 +147,7 @@ the operating system, excluding any version information and suitable for processing by scripts or usage in generated filenames. If not set, defaults to @@ -24,5 +24,5 @@ index a88d16b17..caf60f41a 100644 <literal>ID=debian</literal>.</para></listitem> </varlistentry> -- -2.13.2 +2.15.1 diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch index 475a368be..9cbd40515 100644 --- a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch +++ b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch @@ -1,4 +1,4 @@ -From b98fdc685b819dca6f6b3fd9ef49ff4b0ec645af Mon Sep 17 00:00:00 2001 +From 025279cf5c4ff229cd191439d424295a0de69d65 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:31:20 -0400 Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux" @@ -9,10 +9,10 @@ Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux" 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c -index 9db8b8f61..bcfe3d381 100644 +index 2dbf432df9..696bf4679e 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c -@@ -383,10 +383,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char +@@ -408,10 +408,10 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char static const char *fallback_hostname(void) { /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it to be @@ -26,5 +26,5 @@ index 9db8b8f61..bcfe3d381 100644 return FALLBACK_HOSTNAME; } -- -2.13.2 +2.15.1 diff --git a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch index 145e45d4b..d2bbda12c 100644 --- a/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch +++ b/libre/systemd/0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch @@ -1,18 +1,18 @@ -From 888c40a593c053c4af053fbe6ecd31c8c51f70c8 Mon Sep 17 00:00:00 2001 +From 6998da16c87712adea3e5b49a04aec180178d11a Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Wed, 25 May 2016 12:32:21 -0400 Subject: [PATCH 6/7] FSDG: man/: Use FSDG operating systems as examples --- man/os-release.xml | 49 +++++++++++++++++++++++++------------------------ - man/systemd-nspawn.xml | 34 ++++++++++++++++++---------------- - 2 files changed, 43 insertions(+), 40 deletions(-) + man/systemd-nspawn.xml | 48 ++++++++++++++++++++++++++---------------------- + 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/man/os-release.xml b/man/os-release.xml -index caf60f41a..2811f434c 100644 +index 81f294c7e4..973e19747d 100644 --- a/man/os-release.xml +++ b/man/os-release.xml -@@ -122,7 +122,7 @@ +@@ -124,7 +124,7 @@ without a version component, and suitable for presentation to the user. If not set, defaults to <literal>NAME=GNU/Linux</literal>. Example: @@ -21,7 +21,7 @@ index caf60f41a..2811f434c 100644 GNU/Linux"</literal>.</para></listitem> </varlistentry> -@@ -133,8 +133,8 @@ +@@ -135,8 +135,8 @@ version, excluding any OS name information, possibly including a release code name, and suitable for presentation to the user. This field is optional. Example: @@ -32,7 +32,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -146,8 +146,8 @@ +@@ -148,8 +148,8 @@ suitable for processing by scripts or usage in generated filenames. If not set, defaults to <literal>ID=gnu-linux</literal>. Example: @@ -43,7 +43,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -168,9 +168,9 @@ +@@ -170,9 +170,9 @@ should be listed in order of how closely the local operating system relates to the listed ones, starting with the closest. This field is optional. Example: for an operating system with @@ -55,7 +55,7 @@ index caf60f41a..2811f434c 100644 assignment of <literal>ID_LIKE=debian</literal> is appropriate.</para></listitem> </varlistentry> -@@ -199,8 +199,8 @@ +@@ -201,8 +201,8 @@ identifying the operating system version, excluding any OS name information or release code name, and suitable for processing by scripts or usage in generated filenames. This @@ -66,7 +66,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -211,8 +211,8 @@ +@@ -213,8 +213,8 @@ a release code name or OS version of some kind, as suitable. If not set, defaults to <literal>PRETTY_NAME="GNU/Linux"</literal>. Example: @@ -77,7 +77,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -235,7 +235,7 @@ +@@ -237,7 +237,7 @@ <ulink url="http://scap.nist.gov/specifications/cpe/">Common Platform Enumeration Specification</ulink> as proposed by the NIST. This field is optional. Example: @@ -86,7 +86,7 @@ index caf60f41a..2811f434c 100644 </para></listitem> </varlistentry> -@@ -270,8 +270,8 @@ +@@ -272,8 +272,8 @@ one URL shall be listed in each setting. If multiple resources need to be referenced, it is recommended to provide an online landing page linking all available resources. Examples: @@ -97,7 +97,7 @@ index caf60f41a..2811f434c 100644 </varlistentry> <varlistentry> -@@ -346,21 +346,22 @@ +@@ -348,21 +348,22 @@ recommended to prefix new fields with an OS specific name in order to avoid name clashes. Applications reading this file must ignore unknown fields. Example: @@ -131,23 +131,24 @@ index caf60f41a..2811f434c 100644 <refsect1> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml -index ae7082776..ef80d90ba 100644 +index 3dbdf376d3..01e6ca403a 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml -@@ -1048,10 +1048,11 @@ +@@ -1082,11 +1082,12 @@ <refsect1> <title>Examples</title> +<!-- TODO: This example needs switched to an FSDG OS; but I'm not sure of a good machinectl-compatible image to use. <example> - <title>Download a Fedora image and start a shell in it</title> + <title>Download a + <ulink url="https://getfedora.org">Fedora</ulink> image and start a shell in it</title> - <programlisting># machinectl pull-raw --verify=no \ + <programlisting># machinectl pull-raw -&2D;verify=no \ https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz # systemd-nspawn -M Fedora-Cloud-Base-25-1.3.x86_64.raw</programlisting> -@@ -1059,39 +1060,40 @@ +@@ -1094,31 +1095,32 @@ <citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry> and opens a shell in it.</para> </example> @@ -157,18 +158,24 @@ index ae7082776..ef80d90ba 100644 - <title>Build and boot a minimal Fedora distribution in a container</title> + <title>Build and boot a minimal BLAG distribution in a container</title> -- <programlisting># dnf -y --releasever=25 --installroot=/srv/mycontainer \ +- <programlisting># dnf -y --releasever=27 --installroot=/var/lib/machines/f27container \ - --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \ - systemd passwd dnf fedora-release vim-minimal -+ <programlisting># dnf -y --releasever=210k --installroot=/srv/mycontainer \ +-# systemd-nspawn -bD /var/lib/machines/f27container</programlisting> ++ <programlisting># dnf -y --releasever=140k --installroot=/var/lib/machines/blag140container \ + --disablerepo='*' --enablerepo=blag --enablerepo=updates install \ + systemd passwd dnf blag-release vim-minimal - # systemd-nspawn -bD /srv/mycontainer</programlisting> ++# systemd-nspawn -bD /var/lib/machines/blag140container</programlisting> - <para>This installs a minimal Fedora distribution into the +- directory <filename noindex='true'>/var/lib/machines/f27container</filename> + <para>This installs a minimal BLAG distribution into the - directory <filename noindex='true'>/srv/mycontainer/</filename> - and then boots an OS in a namespace container in it.</para> ++ directory <filename noindex='true'>/var/lib/machines/blag140container</filename> + and then boots an OS in a namespace container in it. Because the installation + is located underneath the standard <filename>/var/lib/machines/</filename> + directory, it is also possible to start the machine using +- <command>systemd-nspawn -M f27container</command>.</para> ++ <command>systemd-nspawn -M blag140container</command>.</para> </example> <example> @@ -185,11 +192,14 @@ index ae7082776..ef80d90ba 100644 + <para>This installs a minimal gNewSense unstable distribution into + the directory <filename>~/gnewsense-tree/</filename> and then spawns a shell in a namespace container in it.</para> - </example> + + <para><command>debootstrap</command> supports +@@ -1133,29 +1135,31 @@ <example> -- <title>Boot a minimal Arch Linux distribution in a container</title> -+ <title>Boot a minimal Parabola distribution in a container</title> + <title>Boot a minimal +- <ulink url="https://www.archlinux.org">Arch Linux</ulink> distribution in a container</title> ++ <ulink url="https://www.parabola.nu">Parabola GNU/Linux-libre</ulink> distribution in a container</title> - <programlisting># pacstrap -c -d ~/arch-tree/ base -# systemd-nspawn -bD ~/arch-tree/</programlisting> @@ -203,6 +213,27 @@ index ae7082776..ef80d90ba 100644 in a namespace container in it.</para> </example> ++<!-- TODO: This example needs switched to an FSDG OS + <example> + <title>Install the + <ulink url="https://software.opensuse.org/distributions/tumbleweed">OpenSUSE Tumbleweed</ulink> + rolling distribution</title> + +- <programlisting># zypper --root=/var/lib/machines/tumbleweed ar -c \ ++ <programlisting># zypper -&2Droot=/var/lib/machines/tumbleweed ar -c \ + https://download.opensuse.org/tumbleweed/repo/oss tumbleweed +-# zypper --root=/var/lib/machines/tumbleweed refresh +-# zypper --root=/var/lib/machines/tumbleweed install --no-recommends \ ++# zypper -&2Droot=/var/lib/machines/tumbleweed refresh ++# zypper -&2Droot=/var/lib/machines/tumbleweed install -&2Dno-recommends \ + systemd shadow zypper openSUSE-release vim + # systemd-nspawn -M tumbleweed passwd root + # systemd-nspawn -M tumbleweed -b</programlisting> + </example> ++--> + + <example> + <title>Boot into an ephemeral snapshot of the host system</title> -- -2.13.2 +2.15.1 diff --git a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch index 2ca860d87..8810889d8 100644 --- a/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch +++ b/libre/systemd/0007-FSDG-bootctl-Say-Systemd-Boot-Manager-instead-of-Lin.patch @@ -1,4 +1,4 @@ -From c2357a5265d49410d3aacef1ccacb9b0caf761a5 Mon Sep 17 00:00:00 2001 +From 502b6b516b9469307fd1ca9a1af2b6558a2ba0e6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker <lukeshu@parabola.nu> Date: Sat, 17 Dec 2016 00:56:43 -0500 Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of @@ -9,10 +9,10 @@ Subject: [PATCH 7/7] FSDG: bootctl: Say "Systemd Boot Manager" instead of 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c -index 155bf278b..297dcb535 100644 +index 59c1af73de..31b8b0fdab 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c -@@ -778,13 +778,13 @@ static int install_variables(const char *esp_path, +@@ -682,13 +682,13 @@ static int install_variables(const char *esp_path, "Failed to determine current boot order: %m"); if (first || r == 0) { @@ -29,5 +29,5 @@ index 155bf278b..297dcb535 100644 return insert_into_order(slot, first); -- -2.13.2 +2.15.1 diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index eec3dbbd4..58371fdbf 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -10,14 +10,14 @@ pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat') _libsystemd=('libsystemd-standalone' 'libudev' 'nss-systemd' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgname+=("${_libsystemd[@]}") # latest commit on stable branch -_commit='743b771c559c6101544f7358a42c8c519fe4b0db' +_commit='a1b2c92d8290c76a29ccd0887a92ac064e1bb5a1' # Bump this to latest major release for signed tag verification, # the commit count is handled by pkgver() function. -pkgver=235.38 -pkgrel=3 +pkgver=236.0 +pkgrel=2 pkgrel+=.parabola1 -arch=('i686' 'x86_64') -arch+=('armv7h') +arch=('x86_64') +arch+=('i686' 'armv7h') url="https://www.github.com/systemd/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' 'intltool' 'iptables' 'kmod' 'libcap' 'libidn' 'libgcrypt' @@ -27,7 +27,7 @@ makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' makedepends_i686=('gnu-efi-libs') makedepends_x86_64=('gnu-efi-libs') options=('strip') -validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4') # Lennart Poettering <lennart@poettering.net> +validpgpkeys=('63CDA1E5D3FC22B998D20DD6327F26951A015CC4') # Lennart Poettering <lennart@poettering.net> source=('git://github.com/systemd/systemd-stable.git' 'git://github.com/systemd/systemd.git' # pull in for tags, backports & reverts 'initcpio-hook-udev' @@ -42,8 +42,8 @@ source=('git://github.com/systemd/systemd-stable.git' 'systemd-tmpfiles.hook' 'systemd-update.hook' '0001-FSDG-man-Refer-to-the-operating-system-as-GNU-Linux.patch' - '0002-FSDG-os-release-Default-to-PRETTY_NAME-GNU-Linux-ins.patch' - '0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch' + '0002-FSDG-os-release-Default-PRETTY_NAME-to-GNU-Linux-ins.patch' + '0003-FSDG-os-release-Default-NAME-to-GNU-Linux-instead-of.patch' '0004-FSDG-os-release-Default-ID-to-gnu-linux-instead-of-l.patch' '0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch' '0006-FSDG-man-Use-FSDG-operating-systems-as-examples.patch' @@ -61,17 +61,17 @@ sha512sums=('SKIP' '7d49a948f5d58f662a7d81544254528257ef8c0a08ca560834f09a7cdf566161d2df4d419ebbc2983196cd45c9eeefcd0c4c2c554376916dce42e895262afc30' 'e521d92674597f82d589b83c378c50c92c881fdb84c436c8b26f7a3436a4c91a20585824a5563933f6868a3023b9ee2fdc7bd58e04bb47c25a0a36e296308fd3' '10190fba9f39a8f4b620a0829e0ba8ed63bb4dbeca712966011ee7807880d01ab2abff1a80baafeb6674db70526a473fe585db8190e864f318fc4d6068552618' - 'e85c5564348253e1bc49d943f0456c38ebef0c50a5a7782ea6ebb1f45bd624a69430d79693fe1223b0adace9f07c167b84133a003a09a8b61ae48d1b70610277' - '0ad718e9441798a4479600ffce364c2f0e582fd0ccf7762dde90f99755dee4569bcee8299ea2ccbf3a010966c8d48c59fcd0b1f93c9b8a479332c2c128fc2b2a' - '03ec8cfde36a0a7413993118707e32b0d8b693d366da8cb22a6e71e1c10178d1df05b2e2d1d5a2a298d49af005f3cdf80bfd8d40959d3e53310491b6ada39fed' - '9c13df718d4db2592c50c348c7b6340bbd7dd6ee6951da0f2bbd9c1878e0f034b975dfa9b28081b57e76f91c49f0bbcce314d0baaf1c5916dcff11e98d426372' - 'b45c4e40f626a02951a852ea4cd2304f00a172dc64b5c38a97f5c68e4a89ceb4f4164cc9221533c4a5c52662e0b9629a82c521514bfcc21f0c11ce517643c2c1' - 'f5c4cbeecac8f9d8f009deb4ac1d0b797210bcd1a91fcc6bf8ec110320ad6ceb8fd2a28b184ca037d73078d09a22f224ad3fc46f4bbf972432cce23263b2e1dc' - 'e276fd1aedd7718333324fa9d99493fe99d951f446e3b590a99e2cc9562a0bd0e29693907997cb52096c39168c5be62ded3feedf93bacd3c9659d58775b6ca8d') + '107d2e36544aa8ef1c6e86339fbc811acb6e1d15eb0edca9f463bdd1b0e91fa8d85cf8c9e70eeaf4196e2f942e30310b672859191f3093c4806546ae30140fb9' + '7445f9802cc194e27238cc89954c1035b0bf0c32b2702a7cbf463f701c4f87a416d7f3f75cc3eb9abe276ac7e49d377451c3727523544568420e348d47c1ef4c' + '7b969dc665281eb43871cf399398ddc25a16f533919dfbf721e2a2eb922cde6936c42400083ef39d5cc873a0b2bf749897c9bb1aaa38624315b8e5810f82efca' + 'fbcc54a62b6f3f7ec1dfad8317160c3057f145e542a423a2fd6b5c141012929aeb977491afe35b16c4903b5fd0d1469f3d87d1c8a036b4d6b623ac7dbe682ff5' + '4e86eac4132d5bd712061d09c14141d91e6bfd2f3879a1fc4a92a15fa77d01552de5c9ebae4a67be2b2a54223a53f2538ba03d4fa0c96ecd1e62a4e8cf341fd1' + 'f443f25f788eb0bf3199a60f8765db1e60f596ec9939c14f7670ed51b97756ec6f0488a619e3f0f750111f3a82f9d5dbfac601138e7822d9e2a39219a57522a4' + '6a16666f18b7075a68733376f4b1fe34dd2aa29eaf43e693a98e303b9c5202317636816cb4a914d5141801026d1693dd4de2f79e0950aa777e8de6e4879cd9d0') _backports=( - # Fix typo in statx macro (#7180) (FS#56289) - '8e6a7a8b2be409d356bcaface00f6d44390c07ff' + # cryptsetup-generator: Don't mistake NULL input as OOM (#7688) + 'aff0b1fa7bf2ca60fd5ffdf7ea25184d576cf61d' ) _reverts=( @@ -214,6 +214,7 @@ package_systemd() { depends=('acl' 'bash' 'cryptsetup' 'dbus' 'iptables' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'libsystemd' 'libidn' 'lz4' 'pam' 'libelf' 'libseccomp' 'util-linux' 'xz') + depends_i686=('cryptsetup=1.7.5') provides=("systemd-tools=$pkgver" "udev=$pkgver") replaces=('systemd-tools' 'udev') conflicts=('systemd-tools' 'udev') @@ -257,7 +258,10 @@ package_systemd() { install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - # ensure proper permissions for /var/log/journal. This is only to placate + # ensure proper permissions for /var/log/journal + # The permissions are stored with named group by tar, so this works with + # users and groups populated by systemd-sysusers. This is only to prevent a + # warning from pacman as permissions are set by systemd-tmpfiles anyway. chown root:systemd-journal "$pkgdir/var/log/journal" chmod 2755 "$pkgdir/var/log/journal" diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD index 16c0eb8b2..53c16eb28 100644 --- a/libre/tp_smapi/PKGBUILD +++ b/libre/tp_smapi/PKGBUILD @@ -14,8 +14,8 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then - _basekernel=4.13 - _archrel=31 + _basekernel=4.14 + _archrel=45 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=4.9 @@ -46,7 +46,6 @@ if [[ ${_kernelname} != "" ]]; then provides=("${_pkgname}") fi -install='kmod.install' source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/evgeni/${_pkgname}/archive/${__pkgname}/${pkgver}.tar.gz") sha256sums=('cd28bf6ee21b2c27b88d947cb0bfcb19648c7daa5d350115403dbcad05849381') @@ -71,9 +70,4 @@ package() { # load module on startup install -dm 755 "${pkgdir}/usr/lib/modules-load.d" echo ${_pkgname} > "${pkgdir}/usr/lib/modules-load.d/${_pkgname}${_kernelname}.conf" - - # Set the correct extramodules directory for install - cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" - true && install=${install}.pkg - sed -i "s/^_EXTRAMODULES=.*/_EXTRAMODULES="${_extramodules}"/" "${startdir}/${install}" } diff --git a/libre/tp_smapi/kmod.install b/libre/tp_smapi/kmod.install deleted file mode 100644 index 40caa464f..000000000 --- a/libre/tp_smapi/kmod.install +++ /dev/null @@ -1,14 +0,0 @@ -_EXTRAMODULES= - -post_install() { - echo ">>> Updating module dependencies. Please wait ..." - depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1 -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/uboot-grub/PKGBUILD b/libre/uboot-grub/PKGBUILD index d680f6f67..5965d13f6 100644 --- a/libre/uboot-grub/PKGBUILD +++ b/libre/uboot-grub/PKGBUILD @@ -5,6 +5,7 @@ pkgbase=uboot-grub pkgname=('uboot-grub-am335x_evm') pkgver=2015.07 pkgrel=1 +arch=(armv7h) url='http://www.denx.de/wiki/U-Boot/' license=('GPL2') makedepends=('bc') diff --git a/libre/uboot-tools/PKGBUILD b/libre/uboot-tools/PKGBUILD deleted file mode 100644 index 8ce453e11..000000000 --- a/libre/uboot-tools/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 137412 2015-07-25 19:38:49Z anatolik $ -# Maintainer (Arch): Anatol Pomozov -# Contributor (Arch): Michael Lass <bevan@bi-co.net> -# Contributor (Arch): Philipp Schrader <philipp.schrader+arch@gmail.com> - -pkgname=uboot-tools -pkgver=2015.07 -pkgrel=1 -pkgdesc='U-Boot bootloader utility tools' -arch=(i686 x86_64 armv7h) -url='http://www.denx.de/wiki/U-Boot/WebHome' -license=(GPL) -depends=(glibc openssl) -source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2) -sha1sums=('1e4e8df0ab7cfc2ee4ff6bf44c1b2085544d36f0') - -build() { - cd u-boot-$pkgver - make defconfig - make tools-all -} - -package() { - install -m 755 -d "$pkgdir"/usr/bin - install -m 755 -t "$pkgdir"/usr/bin/ u-boot-$pkgver/tools/{mk{,env}image,env/fw_printenv,img2srec,dumpimage,netconsole,jtagconsole,ncb} - ln -s fw_printenv "$pkgdir"/usr/bin/fw_setenv - install -m 644 -D u-boot-$pkgver/doc/mkimage.1 "$pkgdir"/usr/share/man/man1/mkimage.1 -} diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD index 82c8038d6..4efe21005 100644 --- a/libre/vhba-module/PKGBUILD +++ b/libre/vhba-module/PKGBUILD @@ -9,8 +9,8 @@ _kernelname= if [[ ${_kernelname} == "" ]]; then - _basekernel=4.13 - _archrel=16 + _basekernel=4.14 + _archrel=31 _parabolarel=1 elif [[ ${_kernelname} == -lts ]]; then _basekernel=4.9 @@ -52,13 +52,15 @@ _package() { depends=("linux-libre${_kernelname}>=${_basekernel}" "linux-libre${_kernelname}<${_toohigh}") replaces=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}") conflicts=("${pkgbase}-libre${_kernelname}" "${pkgbase}-parabola${_kernelname}") - install='kmod.install' cd "${pkgbase}-${pkgver}" # Actually install install -Dt "$pkgdir/usr/lib/modules/$_extramodules" -m644 vhba.ko install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules + echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf" + + find "$pkgdir" -name '*.ko' -exec gzip -n {} + } if [[ ${_kernelname} == "" ]]; then @@ -70,6 +72,7 @@ if [[ ${_kernelname} == "" ]]; then cd $pkgbase-$pkgver install -Dt "$pkgdir/usr/src/$pkgbase-$pkgver" -m644 Makefile vhba.c ../dkms.conf install -Dt "$pkgdir/usr/lib/udev/rules.d" -m644 ../60-vhba.rules + echo 'g cdemu - -' | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/cdemu.conf" } pkgname=("${pkgbase}${_kernelname}" "${pkgbase}${_kernelname}-dkms") diff --git a/libre/vhba-module/kmod.install b/libre/vhba-module/kmod.install deleted file mode 100644 index 2c7652580..000000000 --- a/libre/vhba-module/kmod.install +++ /dev/null @@ -1,15 +0,0 @@ - -post_install() { - post_upgrade $1 0 - getent group cdemu &>/dev/null || groupadd -r cdemu -} - -post_upgrade() { - _EXTRAMODULES=extramodules-4.11 - depmod "$(cat /usr/lib/modules/$_EXTRAMODULES/version)" >/dev/null 2>&1 -} - -post_remove() { - post_upgrade $1 0 - groupdel cdemu -} diff --git a/libre/vim-colorsamplerpack/PKGBUILD b/libre/vim-colorsamplerpack/PKGBUILD index 490bc246e..41667e3d6 100644 --- a/libre/vim-colorsamplerpack/PKGBUILD +++ b/libre/vim-colorsamplerpack/PKGBUILD @@ -1,12 +1,13 @@ # $Id: PKGBUILD 189356 2016-09-15 20:21:37Z svenstaro $ # Contributor (Arch): Aaron Griffin <aaron@archlinux.org> # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> -# Maintainer: André Silva <emulatorman@hyperbola.info> +# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=vim-colorsamplerpack-libre pkgname=vim-colorsamplerpack pkgver=2012.10.28 -pkgrel=4.parabola1 +pkgrel=4.parabola2 _scriptid=18915 pkgdesc="Different colorschemes for vim, without nonfree colorschemes" arch=('any') diff --git a/libre/vim/PKGBUILD b/libre/vim/PKGBUILD index 175b164fc..3694d3d61 100644 --- a/libre/vim/PKGBUILD +++ b/libre/vim/PKGBUILD @@ -13,18 +13,19 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') -pkgver=8.0.1176 +pkgver=8.0.1415 _versiondir=80 pkgrel=1.parabola1 url='http://www.vim.org' arch=('i686' 'x86_64' 'armv7h') license=('custom:vim') -makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua' 'gawk' 'tcl') +makedepends=('glibc' 'libgcrypt' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'gtk3' 'lua' + 'gawk' 'tcl' 'pcre' 'zlib' 'libffi') source=(vim-${pkgver}.tar.gz::https://github.com/vim/vim/archive/v${pkgver}.tar.gz vimrc parabola.vim vimdoc.hook) -sha256sums=('1485524d747b2046b9e1ea3bfcf80148e6a9a65e29d972d23cf88152ad9dcca2' +sha256sums=('6db5d55c45f70db167a2c2be81c6e47833ea59c754f45839c9b4996934055610' '6c22ef5791004dc3a1151400a3ce6aec35f660237aed734bcde0a8a16882cbc0' '2d0cae071444b5b07015c4692c47661214788d47b3aade9ffccdf703784517d0' '7095cafac21df7aa42749d6864d1c0549fe65771d8edda3102c931c60782b6b9') @@ -141,7 +142,8 @@ package_vim-runtime() { package_vim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl') + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'acl' 'glibc' 'libgcrypt' 'pcre' + 'zlib' 'libffi') optdepends=('python2: Python 2 language support' 'python: Python 3 language support' 'ruby: Ruby language support' @@ -179,7 +181,8 @@ package_vim() { package_gvim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor (with advanced features, such as a GUI)' - depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3') + depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm' 'libxt' 'gtk3' 'glibc' 'libgcrypt' 'pcre' + 'zlib' 'libffi') optdepends=('python2: Python 2 language support' 'python: Python 3 language support' 'ruby: Ruby language support' diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index 7879c61d0..fa1cfbef0 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -4,8 +4,8 @@ pkgname=your-freedom pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free." license=('GPL3') url="https://git.parabola.nu/blacklist.git" -pkgver=20171219 -_gitver=86f06b9727d83b97993aa7862b5b6471b39ad933 +pkgver=20180104 +_gitver=d57698fc89599f7a115ed5f10c42aff1c363429f pkgrel=1 arch=('any') @@ -14,7 +14,7 @@ install=${pkgname}.install makedepends=(librelib) source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver}) -sha512sums=('0c3d77cf54515036f98e30e8c4f4f4e34bc40c9d32e1d7ebb89f468246e21ee141852f72f2a59260ddc257ec3daea4accfce9d4702454e941b8ef20db1c825b6') +sha512sums=('7c88b2b977ac8d6637d6a4384bc267df4721aecd1eebc100c060a29181af7c4e022e51366711002a313040c35048eacc0d1a8699308fa734a90f178153ca77ce') package() { cd "$srcdir" |