diff options
Diffstat (limited to 'pcr')
741 files changed, 8337 insertions, 8385 deletions
diff --git a/pcr/3proxy/PKGBUILD b/pcr/3proxy/PKGBUILD index 3a71342de..4057fe817 100644 --- a/pcr/3proxy/PKGBUILD +++ b/pcr/3proxy/PKGBUILD @@ -1,6 +1,7 @@ -# Contributor (AUR): d0wn +# Contributor: d0wn # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - no changes. diff --git a/pcr/64tass/PKGBUILD b/pcr/64tass/PKGBUILD new file mode 100644 index 000000000..7bbbef32d --- /dev/null +++ b/pcr/64tass/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: bill-auger <bill-auger@programmer.net> + + +pkgname=64tass +pkgver=1.59.3120 +pkgrel=1 +pkgdesc="cross (turbo) assembler targeting MOS 65xx micro processors (6502, 65C02, R65C02, W65C02, 65CE02, 65816, DTV, 65EL02, 4510)" + +url=https://tass64.sourceforge.net/ +arch=('armv7h' 'i686' 'x86_64') +license=('GPL2') + +source=(https://sourceforge.net/projects/tass64/files/source/${pkgname}-${pkgver}-src.zip) +sha256sums=('a89a7b79ad234c6ea51a1c9d6c472d0f3827d01b2501b3f30cd0af9541423eef') + + +build() +{ + cd "${srcdir}"/${pkgname}-${pkgver}-src + + make +} + +package() +{ + cd "${srcdir}"/${pkgname}-${pkgver}-src + + make prefix=/usr DESTDIR="${pkgdir}" install +} diff --git a/pcr/9mount/PKGBUILD b/pcr/9mount/PKGBUILD index 3de06c084..601cc04e4 100644 --- a/pcr/9mount/PKGBUILD +++ b/pcr/9mount/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Fazlul Shahriar <fshahriar@gmail.com> +# Maintainer (aur): Fazlul Shahriar <fshahriar@gmail.com> pkgname=9mount pkgver=1.3 diff --git a/pcr/abootimg/PKGBUILD b/pcr/abootimg/PKGBUILD new file mode 100644 index 000000000..475abbe8d --- /dev/null +++ b/pcr/abootimg/PKGBUILD @@ -0,0 +1,47 @@ +# Contributor: Bailey Fox <bfox200012@gmail.com> +# Contributor: ajs124 < aur AT ajs124 DOT de > +# Contributor: Benoit Favre <benoit.favre@gmail.com> +# Contributor: Thomas Hebb <tommyhebb@gmail.com> +# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=abootimg +pkgver=0.6 +pkgrel=1 +pkgdesc="A tool to read/write/update old android boot images" +arch=('i686' 'x86_64' 'arm' 'armv7h') +url="https://github.com/ggrandou/abootimg" +license=('GPL') +depends=('util-linux' 'cpio') +makedepends=('git') +provides=('abootimg') +source=("http://http.debian.net/debian/pool/main/a/abootimg/abootimg_${pkgver}.orig.tar.gz" + "http://http.debian.net/debian/pool/main/a/abootimg/abootimg_${pkgver}-1.diff.gz" + 'no-initrd.patch') +sha512sums=('b96be8abe9bccfb7694c1d8f30b3a5dcc0e411b73fc78eb15f1488207032aa4737286be776b78e41bc14216e8d78ec768bbb2f91f0fe53192f08df8b6497d28f' + '66884cf42c7c2121065cec6e974f3c6d301e058231b910db8e4816ed5274d7e6eb6045d1649b059c468e6760b16046ae7ef58756c810967e47e6214e0fc0612f' + 'SKIP') + +prepare() { + cd "${srcdir}/abootimg-${pkgver}" + patch -p0 --binary < ../no-initrd.patch + patch -p1 --binary < ../abootimg_0.6-1.diff +} + +build() { + cd "${srcdir}/abootimg-${pkgver}" + + make + gzip -f debian/abootimg.1 +} + +package() { + cd "${srcdir}/abootimg-${pkgver}" + + install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}/usr/share/man/man1/" + install abootimg -t "${pkgdir}/usr/bin" + install pack-initrd "${pkgdir}/usr/bin/abootimg-pack-initrd" + install unpack-initrd "${pkgdir}/usr/bin/abootimg-unpack-initrd" + install debian/abootimg.1.gz -t "${pkgdir}/usr/share/man/man1/" +} diff --git a/pcr/abootimg/no-initrd.patch b/pcr/abootimg/no-initrd.patch new file mode 100644 index 000000000..a523845fb --- /dev/null +++ b/pcr/abootimg/no-initrd.patch @@ -0,0 +1,35 @@ +This patch incorporates a patch made by John Stultz <https://github.com/johnstultz-work> to allow abootimg to +work with newer Android aboots that do not include an initrd +--- abootimg.c 2019-03-12 03:16:42.335616885 -0500 ++++ abootimg.c.1 2019-03-12 03:18:01.550892862 -0500 +@@ -163,7 +163,7 @@ + "\n" + " bootimg has to be valid Android Boot Image, or the update will abort.\n" + "\n" +- " abootimg --create <bootimg> [-c \"param=value\"] [-f <bootimg.cfg>] -k <kernel> -r <ramdisk> [-s <secondstage>]\n" ++ " abootimg --create <bootimg> [-c \"param=value\"] [-f <bootimg.cfg>] -k <kernel> [-r <ramdisk>] [-s <secondstage>]\n" + "\n" + " create a new image from scratch.\n" + " if the boot image file is a block device, sanity check will be performed to avoid overwriting a existing\n" +@@ -291,7 +291,11 @@ + + if (!(img->header.ramdisk_size)) { + fprintf(stderr, "%s: ramdisk size is null\n", img->fname); +- return 1; ++ /* ++ * On newer AOSP devices, system can be used as rootfs, ++ * resulting in no initrd being used. Thus this case should ++ * not be fatal. ++ */ + } + + unsigned page_size = img->header.page_size; +@@ -932,7 +936,7 @@ + break; + + case create: +- if (!bootimg->kernel_fname || !bootimg->ramdisk_fname) { ++ if (!bootimg->kernel_fname) { + print_usage(); + break; + } diff --git a/pcr/adplug/PKGBUILD b/pcr/adplug/PKGBUILD index 69159133a..0beffee79 100644 --- a/pcr/adplug/PKGBUILD +++ b/pcr/adplug/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org> +# Maintainer (aur): Mikael Eriksson <mikael_eriksson@miffe.org> pkgname=adplug pkgver=2.2.1 diff --git a/pcr/aflplusplus/PKGBUILD b/pcr/aflplusplus/PKGBUILD new file mode 100644 index 000000000..a52edc50f --- /dev/null +++ b/pcr/aflplusplus/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer (aur): GI Jack <GI_Jack@hackermail.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# - Added armv7h and i686 architectures +# - Added workaround for -fvar-tracking-assignments being in the +# default /etc/makepkg.conf +# - Added depends=('lld' 'llvm') to be able to build llvm-lto + +pkgname=aflplusplus +pkgver=4.00c +pkgrel=6 +pkgdesc="afl++ is afl with community patches, AFLfast power schedules, qemu 3.1 upgrade + laf-intel support, MOpt mutators, InsTrim instrumentation, unicorn_mode and a lot more!" +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/AFLplusplus/AFLplusplus" +license=('Apache') +provides=('afl') +conflicts=('afl') +depends=('clang' 'lld') +makedepends=('llvm' 'python') +optdepends=('qemu: use QEMU with afl') +source=("https://github.com/AFLplusplus/AFLplusplus/archive/${pkgver}.tar.gz") +sha256sums=('f427294ed674e37d34a1b756a2190de17937e046ef21abb3ae37bba018a760f1') + +# The Arch Linux wiki page on clang[1] has the following: +# "If you are building with debug, also remove +# -fvar-tracking-assignments from DEBUG_CFLAGS and DEBUG_CXXFLAGS as +# Clang does not support it." +# [1]https://wiki.archlinux.org/title/Clang +# And -fvar-tracking-assignments is by default in /etc/makepkg.conf +# +# And without that fix we have the following compilation error: +# clang-13: error: unknown argument: '-fvar-tracking-assignments' +# [...] +# [-] Compiling afl-cc failed. You seem not to have a working compiler. +# [...] +# ==> ERROR: A failure occurred in build(). +# +DEBUG_CFLAGS="$(echo ${DEBUG_CFLAGS} | sed 's/-fvar-tracking-assignments//')" +DEBUG_CXXFLAGS="$(echo ${DEBUG_CXXFLAGS} | sed 's/-fvar-tracking-assignments//')" + +export DEBUG_CFLAGS +export DEBUG_CXXFLAGS + +prepare() { + cd "AFLplusplus-${pkgver}" + make clean +} + +build() { + cd "AFLplusplus-${pkgver}" + make PREFIX="/usr" +} + +package() { + cd "AFLplusplus-${pkgver}" + make install PREFIX="/usr" DESTDIR="${pkgdir}" +} + diff --git a/pcr/agent-transfer/PKGBUILD b/pcr/agent-transfer/PKGBUILD index ac60154e1..24d6563df 100644 --- a/pcr/agent-transfer/PKGBUILD +++ b/pcr/agent-transfer/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): svalo <valo@eigenlab.org> +# Maintainer (aur): svalo <valo@eigenlab.org> # parabola changes and rationale: # no changes. diff --git a/pcr/ahcpd/PKGBUILD b/pcr/ahcpd/PKGBUILD index 4c1281202..973fe42bb 100644 --- a/pcr/ahcpd/PKGBUILD +++ b/pcr/ahcpd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Yann Lopez <arch at lonewulf dot net> +# Maintainer (arch): Yann Lopez <arch at lonewulf dot net> pkgname=ahcpd pkgver=0.53 pkgrel=2 diff --git a/pcr/alarm-clock-applet/PKGBUILD b/pcr/alarm-clock-applet/PKGBUILD index b7d308238..8dfa9eb0c 100644 --- a/pcr/alarm-clock-applet/PKGBUILD +++ b/pcr/alarm-clock-applet/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Tobias Frilling <tobias@frilling-online.de> -# Contributor (Arch): Ekenbrand <jesu dot critos at gmail> -# Contributor (Arch): Alessandro Nakamuta <alessandro dot ufms at gmail dot com> +# Maintainer (arch): Tobias Frilling <tobias@frilling-online.de> +# Contributor: Ekenbrand <jesu dot critos at gmail> +# Contributor: Alessandro Nakamuta <alessandro dot ufms at gmail dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=alarm-clock-applet diff --git a/pcr/alpm_octopi_utils/PKGBUILD b/pcr/alpm_octopi_utils/PKGBUILD index 61f571a5b..473741bed 100644 --- a/pcr/alpm_octopi_utils/PKGBUILD +++ b/pcr/alpm_octopi_utils/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): MatMoul <matmoul@gmail.com> +# Maintainer (aur): MatMoul <matmoul@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=alpm_octopi_utils diff --git a/pcr/ambiance-radiance-colors-suite/PKGBUILD b/pcr/ambiance-radiance-colors-suite/PKGBUILD index 9a6d2b3f9..81015b3ca 100644 --- a/pcr/ambiance-radiance-colors-suite/PKGBUILD +++ b/pcr/ambiance-radiance-colors-suite/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): ThePilot <afuturepilotis at gmail dot com> -# Contributor (Arch): Padfoot <padfoot at exemail dot com dot au> -# Contributor (Arch): Louis Tim Larsen <louis(a)louis.dk> +# Maintainer (arch): ThePilot <afuturepilotis at gmail dot com> +# Contributor: Padfoot <padfoot at exemail dot com dot au> +# Contributor: Louis Tim Larsen <louis(a)louis.dk> # Maintainer: Márcio Silva <coadde@hyperbola.info> pkgname='ambiance-radiance-colors-suite' diff --git a/pcr/android-tools/PKGBUILD b/pcr/android-tools/PKGBUILD new file mode 100644 index 000000000..6f3dd1b1d --- /dev/null +++ b/pcr/android-tools/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Anatol Pomozov +# Contributor: 謝致邦 <Yeking@Red54.com> +# Contributor: Alucryd <alucryd at gmail dot com> + +pkgname=android-tools +pkgver=31.0.3 +_tag=${pkgver}p1 # https://github.com/nmeum/android-tools sometimes carries extra patch version on top of the upstream versioning +pkgrel=3 +pkgdesc='Android platform tools' +arch=('armv7h') +url='http://tools.android.com/' +license=(Apache MIT) +depends=(libusb protobuf brotli zstd android-udev) +makedepends=(pcre2 gtest cmake go ninja git) +source=(https://github.com/nmeum/android-tools/releases/download/$_tag/android-tools-$_tag.tar.xz) +sha256sums=('0ef69f919d58a2bdff2083d2e83a9ef38df079ec82651b2544e9e48086df5ab8') + +build() { + cd android-tools-$_tag + + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -G Ninja -S . -B build +} + +package() { + cd android-tools-$_tag + + DESTDIR="${pkgdir}" ninja -C build install +} diff --git a/pcr/angrysearch/PKGBUILD b/pcr/angrysearch/PKGBUILD index 5d5996f7f..d7dfe1871 100644 --- a/pcr/angrysearch/PKGBUILD +++ b/pcr/angrysearch/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): DoTheEvolution <DoTheEvo@gmail.com> +# Maintainer (aur): DoTheEvolution <DoTheEvo@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/antimicro/PKGBUILD b/pcr/antimicro/PKGBUILD deleted file mode 100644 index 5a63c555c..000000000 --- a/pcr/antimicro/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer (Arch): grimi <grimi at poczta dot fm> -# Maintainer (Arch): Thomas Nordenmark <t.nordenmark@gmail.com> -# Developer (Arch): Travis Nickles <nickles.travis@gmail.com> - -pkgname=antimicro -pkgver=2.23 -pkgrel=1 -pkgdesc="Graphical program used to map keyboard keys and mouse controls to gamepad buttons" -arch=('i686' 'x86_64') -url="https://github.com/AntiMicro/antimicro" -license=('GPL3') -depends=('libxkbcommon-x11' 'libxtst' 'qt5-base' 'sdl2' 'shared-mime-info' 'desktop-file-utils') -makedepends=('cmake' 'gettext' 'itstool' 'qt5-tools') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/AntiMicro/${pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('cd58b5a9771d35fc937306a3452e8776ef754bb5a4fa44aeedb735d8366a38b318c1bf14f105bf8003e4264c35f129224becdade32d2a7b61067ec5a705a1e7e') - - - -build() { - cd ${pkgname}-${pkgver} - - mkdir -p build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_SDL_2=ON -DWITH_XTEST=ON \ - -DWITH_UINPUT=ON -DAPPDATA=ON .. - make -} - -package() { - cd ${pkgname}-${pkgver}/build - - make DESTDIR="${pkgdir}" install -} - diff --git a/pcr/antimicrox/PKGBUILD b/pcr/antimicrox/PKGBUILD new file mode 100644 index 000000000..4084843a5 --- /dev/null +++ b/pcr/antimicrox/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer (aur): Fredy García <frealgagu at gmail dot com> +# Contributor: grimi <grimi at poczta dot fm> +# Contributor: Thomas Nordenmark <t.nordenmark@gmail.com> +# Contributor: Travis Nickles <nickles.travis@gmail.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=antimicrox +pkgver=3.3.4 +pkgrel=1 +pkgdesc="Graphical program used to map keyboard buttons and mouse controls to a gamepad" +arch=("aarch64" "arm" "armv6h" "armv7h" "i686" "x86_64") +url="https://github.com/AntiMicroX/${pkgname/x}X" +license=("GPL3") +depends=("hicolor-icon-theme" "libxtst" "qt5-base" "sdl2") +makedepends=("cmake" "extra-cmake-modules" "gettext" "itstool" "qt5-tools") +provides=("${pkgname/x}") +conflicts=("${pkgname/x}") +replaces=("${pkgname/x}") +_versionpart=-updated-SDL +source=("${pkgname}-${pkgver}${_versionpart}.tar.gz::https://github.com/AntiMicroX/${pkgname/x/X}/archive/${pkgver}${_versionpart}.tar.gz") +sha256sums=("4819d80e814e8315b49af3f89034b4428ab796e2e9cfc0dcbd0da96e387a5a5b") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}${_versionpart}" + + cmake . \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DUSE_SDL_2=ON \ + -DAPPDATA=ON \ + -DWITH_UINPUT=ON \ + -DWITH_X11=ON \ + -DWITH_XTEST=ON + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}${_versionpart}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/anubis/PKGBUILD b/pcr/anubis/PKGBUILD index 8674da32f..30e379ac4 100644 --- a/pcr/anubis/PKGBUILD +++ b/pcr/anubis/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar> -# Contributor (Arch): Nathan Owe <ndowens04 at gmail> +# Contributor: Nathan Owe <ndowens04 at gmail> pkgname=anubis pkgver=4.2 pkgrel=1 diff --git a/pcr/anyremote/PKGBUILD b/pcr/anyremote/PKGBUILD index a2a246dee..4d0549dd8 100644 --- a/pcr/anyremote/PKGBUILD +++ b/pcr/anyremote/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: Andrea Fagiani <andfagiani_at_gmail_dot_com> # Contributor: hb <hb.at.spamers.dot.net> # Contributor: Lisa Denia <eiffel56@gmail.com> diff --git a/pcr/apenwarr-redo/PKGBUILD b/pcr/apenwarr-redo/PKGBUILD index 4dcc648a3..78024d090 100644 --- a/pcr/apenwarr-redo/PKGBUILD +++ b/pcr/apenwarr-redo/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR:redo-git): Tim Diels <timdiels.m@gmail.com> +# Maintainer (aur:redo-git): Tim Diels <timdiels.m@gmail.com> pkgname='apenwarr-redo' pkgdesc="Avery Pennarun's implmentation of the redo build system" diff --git a/pcr/apertium-eng-spa-git/PKGBUILD b/pcr/apertium-eng-spa-git/PKGBUILD index fae0e1ecb..d33d529ef 100644 --- a/pcr/apertium-eng-spa-git/PKGBUILD +++ b/pcr/apertium-eng-spa-git/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> -# Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org> _commit=27d1ba848361684ba074e018d65b0282c4c84163 diff --git a/pcr/apertium-lex-tools/PKGBUILD b/pcr/apertium-lex-tools/PKGBUILD index be6b9defb..d788328ff 100644 --- a/pcr/apertium-lex-tools/PKGBUILD +++ b/pcr/apertium-lex-tools/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> -# Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org> pkgname=apertium-lex-tools pkgver=0.2.1 diff --git a/pcr/apertium-viewer/PKGBUILD b/pcr/apertium-viewer/PKGBUILD index 9d2153cda..1fc818e3f 100644 --- a/pcr/apertium-viewer/PKGBUILD +++ b/pcr/apertium-viewer/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): ValHue <vhuelamo at gmail dot com> +# Maintainer (aur): ValHue <vhuelamo at gmail dot com> # https://github.com/ValHue/AUR-PKGBUILDs # parabola changes and rationale: diff --git a/pcr/apertium/PKGBUILD b/pcr/apertium/PKGBUILD index f2f8bd661..426a0c22c 100644 --- a/pcr/apertium/PKGBUILD +++ b/pcr/apertium/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> -# Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org> pkgname=apertium pkgver=3.5.2 diff --git a/pcr/apiguardian/PKGBUILD b/pcr/apiguardian/PKGBUILD new file mode 100644 index 000000000..e005bf9ea --- /dev/null +++ b/pcr/apiguardian/PKGBUILD @@ -0,0 +1,52 @@ +# Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# This program is free software: you can redistribute it and/or modify +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=apiguardian +pkgver=1.1.2 +pkgrel=4 +pkgdesc='Java library that provides the `@API` annotation' +arch=('any') +url='https://apiguardian-team.github.io/apiguardian/docs/current/api/' +license=('Apache') +depends=('java-environment' 'java-runtime') +makedepends=('jh') +source=("https://github.com/${pkgname}-team/${pkgname}/archive/refs/tags/r${pkgver}.tar.gz") +sha512sums=('7c56ee15e0aba07e95b6f2fe7cedd98e449e774958eb63b2467066c381e1e82ad67c982c2885e18154c62e55fda80a1c2e0f689253afe449db9f7e7563122db6') + +build() { + cd "${srcdir}/${pkgname}-r${pkgver}" + + mkdir -p build/classes + mkdir -p build/javadoc + + javac -d "build/classes" -encoding UTF-8 \ + "src/main/java/org/${pkgname}/api/API.java" + + javadoc -d build/javadoc/ \ + -sourcepath src/main/java/ \ + -encoding UTF-8 \ + org.apiguardian.api + + jar -cvf "${pkgname}.jar" -C build/classes . +} + +package() { + cd "${srcdir}/${pkgname}-r${pkgver}" + + # Install license file + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" + + # Install documentation + install -d "${pkgdir}/usr/share/doc/${pkgname}" + cp -r build/javadoc "${pkgdir}/usr/share/doc/${pkgname}" + + # Install Maven artifacts + export DESTDIR=${pkgdir} + jh mvn-install "org.apiguardian.api" "${pkgname}" ${pkgver} \ + build.gradle.kts "${pkgname}.jar" "${pkgname}.jar" + + ln -s "/usr/share/java/${pkgname}.jar" \ + "$pkgdir/usr/share/java/${pkgname}-${pkgver}.jar" +} diff --git a/pcr/apulse/PKGBUILD b/pcr/apulse/PKGBUILD new file mode 100644 index 000000000..5b3abe196 --- /dev/null +++ b/pcr/apulse/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer (aur): Christian Hesse <arch@eworm.de> +# Contributor: speps <speps at aur dot archlinux dot org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=apulse +pkgver=0.1.13 +pkgrel=1 +pkgdesc='PulseAudio emulation for ALSA' +arch=('i686' 'x86_64') +arch+=('armv7h') +url='https://github.com/i-rinat/apulse' +license=('custom:MIT') +license+=('LGPL2.1') # pulseaudio headers +depends=('alsa-lib' 'glib2') +makedepends=('cmake') +install=apulse.install +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/v${pkgver}.tar.gz" + 'asoundrc.sample') +sha256sums=('9234ec4e10e408b9c01d5f4ea768ad1fc15494217c932db2c435202a9c7b5efd' + 'e851197ec9ebff528154210751cd6d5c426abfc2b1aa34343580407b1ea789a4') + +prepare() { + cd apulse-${pkgver} + + mkdir -p build +} + +build() { + cd apulse-${pkgver}/build + + cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ + -Wno-dev \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd apulse-${pkgver}/build + + make DESTDIR="${pkgdir}/" install + + # sample asoundrc + install -Dm644 ../../${source[1]} \ + "${pkgdir}/usr/share/${pkgname}/${source[1]}" + + # license + install -Dm644 ../LICENSE.MIT \ + "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/pcr/apulse/apulse.install b/pcr/apulse/apulse.install new file mode 100644 index 000000000..ffc1cafd7 --- /dev/null +++ b/pcr/apulse/apulse.install @@ -0,0 +1,13 @@ +post_install() { + cat << EOF + +For using PulseAudio emulation (ex. in skype): + +1. create a proper .asoundrc + $ cp /usr/share/apulse/asoundrc.sample ~/.asoundrc + +2. run apulse <program-name> [parameters] + $ apulse skype + +EOF +} diff --git a/pcr/apulse/asoundrc.sample b/pcr/apulse/asoundrc.sample new file mode 100644 index 000000000..b529dc7c1 --- /dev/null +++ b/pcr/apulse/asoundrc.sample @@ -0,0 +1,15 @@ +pcm.!default { + type plug + slave.pcm "asymed" +} + + +pcm.asymed { + type asym + playback.pcm { + @func getenv + vars [ ALSAPCM ] + default "dmix" + } + capture.pcm "dsnoop" +} diff --git a/pcr/arno-iptables-firewall/PKGBUILD b/pcr/arno-iptables-firewall/PKGBUILD index 9d154c132..be59b99d1 100644 --- a/pcr/arno-iptables-firewall/PKGBUILD +++ b/pcr/arno-iptables-firewall/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor (AUR): Arto Puranen <purcher@gmail.com> -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Arto Puranen <purcher@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/arora/PKGBUILD b/pcr/arora/PKGBUILD index 34c00dc5e..7213dc07e 100644 --- a/pcr/arora/PKGBUILD +++ b/pcr/arora/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $ -# Maintainer (AUR): Gaetan Bisson <bisson@archlinux.org> -# Contributor (AUR): Pierre Schmitz <pierre@archlinux.de> -# Contributor (AUR): Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer (aur): Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/art/PKGBUILD b/pcr/art/PKGBUILD index 31e5eb12b..ebe3bee4e 100644 --- a/pcr/art/PKGBUILD +++ b/pcr/art/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net> +# Maintainer (aur): Stefan Majewsky <majewsky@gmx.net> # Maintainer: Luke Shumaker <lukeshu@parabola.nu> pkgname='art' diff --git a/pcr/assh/PKGBUILD b/pcr/assh/PKGBUILD index c62dba8c4..8cca9ed79 100644 --- a/pcr/assh/PKGBUILD +++ b/pcr/assh/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Bartek Piotrowski <barthalion@gmail.com> diff --git a/pcr/asterisk/PKGBUILD b/pcr/asterisk/PKGBUILD index 12d4a793b..ac6cbfcbb 100644 --- a/pcr/asterisk/PKGBUILD +++ b/pcr/asterisk/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer (AUR): Maxim Kurnosenko <asusx2@mail.ru> -# Contributor (AUR): Caleb Maclennan <caleb@alerque.com> -# Contributor (AUR): Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributor (AUR): Alessio Biancalana <dottorblaster@gmail.com> -# Contributor (AUR): Maik Broemme <mbroemme@libmpq.org> -# Contributor (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Contributor: Caleb Maclennan <caleb@alerque.com> +# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributor: Alessio Biancalana <dottorblaster@gmail.com> +# Contributor: Maik Broemme <mbroemme@libmpq.org> +# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # parabola changes and rationale: # - added pjproject as explicit dependency diff --git a/pcr/awf-git/PKGBUILD b/pcr/awf-git/PKGBUILD index 0de7886fb..07bf0cef4 100644 --- a/pcr/awf-git/PKGBUILD +++ b/pcr/awf-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Valère Monseur <valere dot monseur@ymail dot com> +# Maintainer (aur): Valère Monseur <valere dot monseur@ymail dot com> # parabola changes and rationale: # - added install file for icon cache and desktop database maintenance diff --git a/pcr/bamf2/PKGBUILD b/pcr/bamf2/PKGBUILD index dde900e7d..cc1cf0436 100644 --- a/pcr/bamf2/PKGBUILD +++ b/pcr/bamf2/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Ivan de Jesús Pompa García <ivan.pompa@gmx.com> -# Contributors (Arch): niQo ??? +# Maintainer (arch): Ivan de Jesús Pompa García <ivan.pompa@gmx.com> +# Contributor: niQo ??? pkgname=bamf2 _dname=bamf diff --git a/pcr/barnyard2/PKGBUILD b/pcr/barnyard2/PKGBUILD index 15fd5655a..ff8837c2c 100644 --- a/pcr/barnyard2/PKGBUILD +++ b/pcr/barnyard2/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: Commiebstrd<spenserreinhardt@gmail.com> -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=barnyard2 pkgver=2 diff --git a/pcr/base91/PKGBUILD b/pcr/base91/PKGBUILD index 424f638e7..b3be2c657 100644 --- a/pcr/base91/PKGBUILD +++ b/pcr/base91/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Contributor (Arch): Christian Hesse <mail@eworm.de> -# Contributor (Arch): Christoph Zeiler <rabyteNOSPAM _at_ gmx.d0t.net> -# Contributor (Arch): Nathan Owe <ndowens04+AUR at gmail.com> -# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Christoph Zeiler <rabyteNOSPAM _at_ gmx.d0t.net> +# Contributor: Nathan Owe <ndowens04+AUR at gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=base91 pkgver=0.6.0 diff --git a/pcr/bashmount/PKGBUILD b/pcr/bashmount/PKGBUILD index f99b31de8..013524b0e 100644 --- a/pcr/bashmount/PKGBUILD +++ b/pcr/bashmount/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Bill Sun <cap.sensitive at gmail dot com> +# Maintainer (aur): Bill Sun <cap.sensitive at gmail dot com> # Contributer (AUR): Jamie Nguyen <jamie at tomoyolinux dot co dot uk> -# Maintainer : Parabola Aurélien DESBRIERES <aurelien@hackers.camp> +# Maintainer: Aurélien DESBRIERES <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/bbb-gadgets/PKGBUILD b/pcr/bbb-gadgets/PKGBUILD index d591abe76..0532847a4 100644 --- a/pcr/bbb-gadgets/PKGBUILD +++ b/pcr/bbb-gadgets/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> -# Contributor (AUR3): Brice Waegeneire <brice.wge@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> +# Contributor: Brice Waegeneire <brice.wge@gmail.com> pkgname=bbb-gadgets pkgver=20130905 diff --git a/pcr/bbswitch-lts/PKGBUILD b/pcr/bbswitch-lts/PKGBUILD index 5ff915a6a..89a1b5de0 100644 --- a/pcr/bbswitch-lts/PKGBUILD +++ b/pcr/bbswitch-lts/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): e5ten <e5ten.arch@gmail.com> -# Contributor (AUR): Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor (AUR): M0Rf30 -# Contributor (AUR): Samsagax <samsagax@gmail.com> -# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> -# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer (aur): e5ten <e5ten.arch@gmail.com> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: M0Rf30 +# Contributor: Samsagax <samsagax@gmail.com> +# Contributor: André Silva <emulatorman@hyperbola.info> +# Contributor: Márcio Silva <coadde@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _basekernel=5.4.78 diff --git a/pcr/beast2/PKGBUILD b/pcr/beast2/PKGBUILD index 80c8e05d8..222e2e349 100644 --- a/pcr/beast2/PKGBUILD +++ b/pcr/beast2/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Christian Krause ("wookietreiber") <christian.krause@mailbox.org> -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer (aur): Christian Krause ("wookietreiber") <christian.krause@mailbox.org> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/beecrypt/PKGBUILD b/pcr/beecrypt/PKGBUILD index b9b82eaa6..13a6d63f6 100644 --- a/pcr/beecrypt/PKGBUILD +++ b/pcr/beecrypt/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=beecrypt pkgver=4.2.1 diff --git a/pcr/belcard/PKGBUILD b/pcr/belcard/PKGBUILD deleted file mode 100644 index beb711260..000000000 --- a/pcr/belcard/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=belcard -pkgver=4.4.0 -pkgrel=1 -pkgdesc='A library for working with vCards' -arch=(x86_64 i686) -url='http://www.linphone.org/' -license=(GPL) -depends=(belr gcc-libs) -makedepends=(cmake) -source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('7283334681eb83b7461446dd3aa21ab97450b7a47a06c5fc1fd24bd9987e0996') - -build() { - mkdir -p build - cd build - - cmake -DCMAKE_PREFIX_PATH=/usr/lib \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_STATIC=NO \ - "../$pkgname-$pkgver" - make -} - -package() { - make -C build DESTDIR="$pkgdir" install -} diff --git a/pcr/belle-sip/PKGBUILD b/pcr/belle-sip/PKGBUILD deleted file mode 100644 index fea5cc948..000000000 --- a/pcr/belle-sip/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=belle-sip -pkgver=4.4.9 -pkgrel=1 -pkgdesc='A modern library implementing SIP (RFC3261) transport, transaction and dialog layers' -arch=(x86_64 i686) -url='http://linphone.org/' -license=(GPL) -depends=(avahi bctoolbox) -makedepends=(cmake) -options=('!emptydirs') -source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('5b6272fee2683d64acfff3667fbaecdaee32ae3b26270d71307831c6859c7c9f') - -build() { - cd "$pkgname-$pkgver" - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_STATIC=NO \ - -DENABLE_MDNS=YES \ - -DENABLE_STRICT=YES \ - -DENABLE_TESTS=NO . - make -} - -package() { - make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install -} diff --git a/pcr/belr/PKGBUILD b/pcr/belr/PKGBUILD deleted file mode 100644 index 169507f4d..000000000 --- a/pcr/belr/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=belr -pkgver=4.4.0 -pkgrel=1 -pkgdesc='A library for working with vCards' -arch=(x86_64 i686) -url='http://www.linphone.org/' -license=(GPL) -depends=(bctoolbox) -makedepends=(cmake) -source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('0b6ab6d3c4d0eb07036e21d2a7e03d949230cc89fd70730d79e28292f02ff101') - -build() { - mkdir -p build - cd build - - cmake -DCMAKE_PREFIX_PATH="/usr" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DENABLE_STATIC=NO \ - -DENABLE_TOOLS=NO \ - -DCMAKE_SKIP_INSTALL_RPATH=ON "../$pkgname-$pkgver" - make -} - -package() { - make -C build DESTDIR="$pkgdir" install -} diff --git a/pcr/bison++/PKGBUILD b/pcr/bison++/PKGBUILD index 0aa6157d3..a47135cae 100644 --- a/pcr/bison++/PKGBUILD +++ b/pcr/bison++/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Antonio Garcia-Dominguez <antonio.garciadominguez@uca.es> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Antonio Garcia-Dominguez <antonio.garciadominguez@uca.es> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=bison++ pkgver=1.21.11 diff --git a/pcr/bitlbee-libpurple/PKGBUILD b/pcr/bitlbee-libpurple/PKGBUILD index e96679881..782b510d6 100644 --- a/pcr/bitlbee-libpurple/PKGBUILD +++ b/pcr/bitlbee-libpurple/PKGBUILD @@ -1,12 +1,12 @@ -# Contributor (Arch): Fernando Jiménez Solano (fjim) <fjim@sdfeu.org> -# Contributor (Arch): FUBAR <mrfubar@gmail.com> -# Contributor (Arch): simo <simo@archlinux.org> -# Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org> -# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org> -# Contributor (Arch): Dave Reisner <dreisner@archlinux.org> -# Maintainer (Arch): dx <dx@dxzone.com.ar> +# Contributor: Fernando Jiménez Solano (fjim) <fjim@sdfeu.org> +# Contributor: FUBAR <mrfubar@gmail.com> +# Contributor: simo <simo@archlinux.org> +# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Dave Reisner <dreisner@archlinux.org> +# Maintainer (arch): dx <dx@dxzone.com.ar> # Maintainer: Márcio Silva <coadde@hyperbola.info> pkgname=bitlbee-libpurple diff --git a/pcr/blender-ogre-exporter/PKGBUILD b/pcr/blender-ogre-exporter/PKGBUILD index ce2de87b3..5d2596022 100644 --- a/pcr/blender-ogre-exporter/PKGBUILD +++ b/pcr/blender-ogre-exporter/PKGBUILD @@ -1,5 +1,6 @@ -# Contributor (AUR): giacomogiorgianni@gmail.com +# Contributor: giacomogiorgianni@gmail.com # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - adapted from blender26-ogre-exporter diff --git a/pcr/boost-65-compat/PKGBUILD b/pcr/boost-65-compat/PKGBUILD index 40e7ba4ac..14e38c908 100644 --- a/pcr/boost-65-compat/PKGBUILD +++ b/pcr/boost-65-compat/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Dmitry Kharitonov <darksab0r at gmail com> -# Contributor (AUR): Marcin Kornat <rarvolt+aur@gmail.com> -# Contributor (AUR): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Maintainer (aur): Dmitry Kharitonov <darksab0r at gmail com> +# Contributor: Marcin Kornat <rarvolt+aur@gmail.com> +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # parabola changes and rationale: # no changes. diff --git a/pcr/boswars/PKGBUILD b/pcr/boswars/PKGBUILD index b78a98f75..64b205594 100644 --- a/pcr/boswars/PKGBUILD +++ b/pcr/boswars/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG -# Contributor (AUR): Diogo Leal <estranho@diogoleal.com> -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG +# Contributor: Diogo Leal <estranho@diogoleal.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/breeze-plymouth/PKGBUILD b/pcr/breeze-plymouth/PKGBUILD index c2eef1659..bb4820c36 100644 --- a/pcr/breeze-plymouth/PKGBUILD +++ b/pcr/breeze-plymouth/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer (AUR): Jameson Pugh <imntreal@gmail.com> +# Maintainer (aur): Jameson Pugh <imntreal@gmail.com> pkgname=breeze-plymouth pkgver=5.12.4 diff --git a/pcr/brutalchess/PKGBUILD b/pcr/brutalchess/PKGBUILD index eb6d344b9..f3dc057de 100644 --- a/pcr/brutalchess/PKGBUILD +++ b/pcr/brutalchess/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor (Arch) : boenki <boenki at gmx dot de> -# Contributor (Arch) : Arkham <arkham at archlinux dot us> -# Contributor (Arch) : Rick Rein <jeebusroxors@gmail.com> -# Contributor (Arch) : Stefano Esposito <ragnarok@email.it> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: boenki <boenki at gmx dot de> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Rick Rein <jeebusroxors@gmail.com> +# Contributor: Stefano Esposito <ragnarok@email.it> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=brutalchess pkgver=0.5.2 diff --git a/pcr/byaccj/PKGBUILD b/pcr/byaccj/PKGBUILD index 676050ec3..8fc56934c 100644 --- a/pcr/byaccj/PKGBUILD +++ b/pcr/byaccj/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Cristian Baldi crisbal <bld.cris.96@gmail.com> +# Maintainer (aur): Cristian Baldi crisbal <bld.cris.96@gmail.com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=byaccj diff --git a/pcr/c-algorithms/PKGBUILD b/pcr/c-algorithms/PKGBUILD index 1f991351b..e5642f3d7 100644 --- a/pcr/c-algorithms/PKGBUILD +++ b/pcr/c-algorithms/PKGBUILD @@ -1,6 +1,6 @@ # $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Contributor : Sebastien Binet <binet@farnsworth> -# Maintainer : Aurélien DESBRIERES <aurelien@hackers.camp> +# Contributor: Sebastien Binet <binet@farnsworth> +# Maintainer: Aurélien DESBRIERES <aurelien@hackers.camp> pkgname=c-algorithms pkgver=1.2.0 pkgrel=2.1 diff --git a/pcr/c-icap/PKGBUILD b/pcr/c-icap/PKGBUILD index 52814f2fd..75cb5b489 100644 --- a/pcr/c-icap/PKGBUILD +++ b/pcr/c-icap/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Amish <contact at via dot aur> +# Maintainer (aur): Amish <contact at via dot aur> # parabola changes and rationale: # no changes. diff --git a/pcr/cadabra/PKGBUILD b/pcr/cadabra/PKGBUILD index 73fe0d443..5f1546e8e 100644 --- a/pcr/cadabra/PKGBUILD +++ b/pcr/cadabra/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Arch): Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org> +# Contributor: Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org> # Maintainer: André Silva <emulatorman@hyperbola.info> pkgbase=cadabra diff --git a/pcr/cairo-compmgr/PKGBUILD b/pcr/cairo-compmgr/PKGBUILD index 92e2f77bd..3d6ec5b0e 100644 --- a/pcr/cairo-compmgr/PKGBUILD +++ b/pcr/cairo-compmgr/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer (Arch): Cedric Girard <girard.cedric@gmail.com> -# Contributor (Arch): Florian Pritz <flo@xinu.at> -# Contributor (Arch): Adam Hani Schakaki (krzd) <krzd@krzd.net> -# Contributor (Arch): Det <nimetonmaili at gmail a-dot com> -# Contributor (Arch): catalyst <catalyst@xaker.ru> -# Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor (Arch): jackobw -# Contributor (Arch): Gianni Vialetto <g dot vialetto at gmail dot com> +# Maintainer (arch): Cedric Girard <girard.cedric@gmail.com> +# Contributor: Florian Pritz <flo@xinu.at> +# Contributor: Adam Hani Schakaki (krzd) <krzd@krzd.net> +# Contributor: Det <nimetonmaili at gmail a-dot com> +# Contributor: catalyst <catalyst@xaker.ru> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: jackobw +# Contributor: Gianni Vialetto <g dot vialetto at gmail dot com> pkgname=cairo-compmgr pkgver=0.3.1 diff --git a/pcr/california/PKGBUILD b/pcr/california/PKGBUILD index 4079b166f..dfca55d48 100644 --- a/pcr/california/PKGBUILD +++ b/pcr/california/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Martin Poehlmann <mpdeimos@outlook.com> -# Contributor (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Maintainer (arch): Martin Poehlmann <mpdeimos@outlook.com> +# Contributor: André Silva <emulatorman@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=california diff --git a/pcr/cardpeek/PKGBUILD b/pcr/cardpeek/PKGBUILD index 92adec133..160ce5450 100644 --- a/pcr/cardpeek/PKGBUILD +++ b/pcr/cardpeek/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer(AUR): lemust83 <lemust83420@gmail.com> -# Contributor(AUR): Pierre-Olivier Vauboin <povauboin@gmail.com> +# Contributor: Pierre-Olivier Vauboin <povauboin@gmail.com> # parabola changes and rationale: # - Added armv7h, patch sent upstream, not reviewed yet diff --git a/pcr/cc65/PKGBUILD b/pcr/cc65/PKGBUILD index a9787c859..2c4a1d845 100644 --- a/pcr/cc65/PKGBUILD +++ b/pcr/cc65/PKGBUILD @@ -1,31 +1,38 @@ -# Maintainer (AUR): Mike Swanson <mikeonthecomputer@gmail.com> +# Maintainer (aur): Mike Swanson <mikeonthecomputer@gmail.com> +# Maintainer: bill-auger <bill-auger@programmer.net> + # parabola changes and rationale: -# correct used license +# - correct license + pkgname=cc65 -pkgver=2.16 +pkgver=2.19 pkgrel=1 pkgdesc='C compiler for 6502 family microprocessors' -makedepends=('linuxdoc-tools') -arch=('i686' 'x86_64' 'armv7h') -license=('zlib') +arch=('i686' 'x86_64') +arch+=('armv7h') +license=('custom:zlib') url='https://cc65.github.io/cc65/' -source=(https://github.com/cc65/cc65/archive/V${pkgver}.tar.gz cc65.sh) -sha512sums=('89c61bd2655a466d619cf40f31f65d10e7cead24c04f548c969a79e0a946db239a4fee925708b0621dbdadf4ab1bdb67719c709edd8b989a218f7dc2270862f9' - 'b6304fd3c14955ee14eb1d041f78c933fbd07760cf560f1c9018c0020c466fb754660404d3c59e903668a07c38001eac273a15a883f1fc0eec126cc9b40733b0') +# makedepends=(linuxdoc-tools) # 2.19 make doc is broken +source=(https://github.com/cc65/cc65/archive/V${pkgver}.tar.gz) +source+=(cc65.sh) +b2sums=('c1c845417e38113c99a9ec8fbff1b90e292798582ac2b394e40419eff3eea62d838ea52165188516efc6157ef02aa7fc23c5a6510fd40d1012ad2b5231d78097') +b2sums+=('0ac1d3611d08871e9075e22c38da9f03a310d719e1526c2dc6b76a3dbb9980f52690008f1737c38d7a1ffdebb79428da4d3fa4d53f766536fa8300884d2f63ec') build() { cd "$pkgname-$pkgver" - make - make doc + make PREFIX=/usr +# make doc # 2.19 make doc is broken } package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" prefix=/usr install - install -Dm644 "../cc65.sh" "$pkgdir/etc/profile.d/cc65.sh" + make DESTDIR="$pkgdir" PREFIX=/usr install install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/license" + + # set 'CC65_HOME' environment variable (compiler search paths) + install -Dm644 "../cc65.sh" "${pkgdir}"/etc/profile.d/cc65.sh } diff --git a/pcr/cc65/cc65.sh b/pcr/cc65/cc65.sh index f4ba9490f..6013d386f 100644 --- a/pcr/cc65/cc65.sh +++ b/pcr/cc65/cc65.sh @@ -1 +1,2 @@ -export CC65_HOME=/usr/lib/cc65 +export CC65_HOME=/usr/share/cc65/ + diff --git a/pcr/ccextractor/PKGBUILD b/pcr/ccextractor/PKGBUILD index fc272c032..9e771edcc 100644 --- a/pcr/ccextractor/PKGBUILD +++ b/pcr/ccextractor/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Nicolas Perrin <booloki@lokizone.net> +# Maintainer: Nicolas Perrin <booloki@lokizone.net> # Contributor: Chris Clonch <chris at theclonchs dot com> # Contributor: Nathan Owe <ndowens04 at gmail> # Contributor: Chris Allison <daemon@cca.me.uk> diff --git a/pcr/cdw/PKGBUILD b/pcr/cdw/PKGBUILD index d3d6243b1..5ba9f2167 100644 --- a/pcr/cdw/PKGBUILD +++ b/pcr/cdw/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: kfgz <kfgz at interia pl> # Contributor: Joey Mazzarelli <mazzarelli at gmail dot com> diff --git a/pcr/cedet-git/PKGBUILD b/pcr/cedet-git/PKGBUILD index 19206524a..58fed1064 100644 --- a/pcr/cedet-git/PKGBUILD +++ b/pcr/cedet-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (Arch): Jed Brown <jed@59A2.org> +# Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Jed Brown <jed@59A2.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=cedet-git diff --git a/pcr/cglib/PKGBUILD b/pcr/cglib/PKGBUILD deleted file mode 100644 index e003662ae..000000000 --- a/pcr/cglib/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -pkgname=cglib -pkgver=3.1 -pkgrel=1 -pkgdesc="Code generation library for Java" -arch=('any') -url="https://github.com/cglib/cglib" -license=('APACHE') -depends=('java-runtime') -makedepends=('apache-ant' 'java-asm' 'java-jarjar' 'jh') -source=("https://github.com/${pkgname}/${pkgname}/archive/RELEASE_${pkgver//./_}.tar.gz" - "https://repo1.maven.org/maven2/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.pom" - "https://repo1.maven.org/maven2/${pkgname}/${pkgname}-nodep/${pkgver}/${pkgname}-nodep-${pkgver}.pom" - "cglib-jarjar.patch") -md5sums=('6886df33b07c65e23b6a8aed9ae01ae4' - 'cdcb12866a7e341e89ad7c3bf9c19b71' - '41cbb7bc608af67c661ebbd1ac936e23' - '09f089fc00ad12f8df31d35533444152') - -prepare() { - cd "${srcdir}/${pkgname}-RELEASE_${pkgver//./_}" - find . -name \*.jar -delete - patch -Np1 -i "${srcdir}/cglib-jarjar.patch" -} - -build() { - cd "${srcdir}/${pkgname}-RELEASE_${pkgver//./_}" - ant jar javadoc \ - -lib "/usr/share/java/asm-4.jar" \ - -lib "/usr/share/java/asm-util-4.jar" \ - -lib "/usr/share/java/jarjar.jar" -} - -package() { - cd "${srcdir}/${pkgname}-RELEASE_${pkgver//./_}" - - # Install license file - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - - # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "docs" "${pkgdir}/usr/share/doc/${pkgname}" - - # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install ${pkgname} ${pkgname} ${pkgver} \ - "${srcdir}/${pkgname}-${pkgver}.pom" \ - "${srcdir}/${pkgname}-RELEASE_${pkgver//./_}/dist/${pkgname}-${pkgver}.jar" \ - "${pkgname}.jar" - jh mvn-install ${pkgname} "${pkgname}-nodep" ${pkgver} \ - "${srcdir}/${pkgname}-nodep-${pkgver}.pom" \ - "${srcdir}/${pkgname}-RELEASE_${pkgver//./_}/dist/${pkgname}-nodep-${pkgver}.jar" \ - "${pkgname}-nodep.jar" - - ln -s "/usr/share/java/${pkgname}.jar" \ - "${pkgdir}/usr/share/java/${pkgname}-${pkgver}.jar" - ln -s "/usr/share/java/${pkgname}-nodep.jar" \ - "${pkgdir}/usr/share/java/${pkgname}-nodep-${pkgver}.jar" -} diff --git a/pcr/cglib/cglib-jarjar.patch b/pcr/cglib/cglib-jarjar.patch deleted file mode 100644 index 7feee1043..000000000 --- a/pcr/cglib/cglib-jarjar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cglib-RELEASE_3_1.orig/build.xml 2013-12-07 11:08:18.000000000 -0500 -+++ cglib-RELEASE_3_1/build.xml 2015-09-15 05:59:33.863523848 -0500 -@@ -127,7 +127,7 @@ - <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpathref="compile.classpath"/> - <jarjar basedir="${build.home}/classes" jarfile="${dist.home}/${component.name}-nodep-${component.version}.jar" > - <zipfileset dir="lib" includes="asm*.txt"/> -- <zipfileset src="lib/asm-4.2.jar" excludes="META-INF"/> -+ <zipfileset src="/usr/share/java/asm-all-4.jar" excludes="META-INF"/> - <rule pattern="org.objectweb.asm.**" result="net.sf.cglib.asm.@1"/> - <include name="**/*"/> - <exclude name="samples/**"/> diff --git a/pcr/check-pacman-mtree/PKGBUILD b/pcr/check-pacman-mtree/PKGBUILD index e3198bb7d..e7a8925b6 100644 --- a/pcr/check-pacman-mtree/PKGBUILD +++ b/pcr/check-pacman-mtree/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Maintainer (AUR): https://aur.archlinux.org/account/999cgm +# Maintainer (aur): https://aur.archlinux.org/account/999cgm # Contributor: Freemor <freemor@freemor.ca> pkgname=check-pacman-mtree diff --git a/pcr/checkpolicy/PKGBUILD b/pcr/checkpolicy/PKGBUILD index 3137e55c2..0e93dff78 100644 --- a/pcr/checkpolicy/PKGBUILD +++ b/pcr/checkpolicy/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) -# Contributor (AUR): Timothée Ravier <tim@siosm.fr> -# Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Contributor: Timothée Ravier <tim@siosm.fr> +# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) +# Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) # parabola changes and rationale: # - Added armv7h diff --git a/pcr/cherokee/PKGBUILD b/pcr/cherokee/PKGBUILD index 6a79d2aa0..503e389a0 100644 --- a/pcr/cherokee/PKGBUILD +++ b/pcr/cherokee/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com -# Contributor (AUR): vorbote -# Contributor (AUR): Fernando Jiménez Solano <fjim@sdfeu.org> -# Contributor (AUR): Evangelos Foutras <evangelos@foutrelis.com> -# Contributor (AUR): Link Dupont <link@subpop.net> -# Contributor (AUR): Pierre Bourdin <pierre@pi3rrot.net> +# Maintainer (aur): Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: vorbote +# Contributor: Fernando Jiménez Solano <fjim@sdfeu.org> +# Contributor: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Link Dupont <link@subpop.net> +# Contributor: Pierre Bourdin <pierre@pi3rrot.net> # parabola changes and rationale: # - removed superfluous 'set -u' diff --git a/pcr/chm2pdf/PKGBUILD b/pcr/chm2pdf/PKGBUILD index 4a293046c..5a67f1aea 100644 --- a/pcr/chm2pdf/PKGBUILD +++ b/pcr/chm2pdf/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): Giovanni Santini <giovannisantini93@yahoo.it> -# Contributor (AUR): Ognjen Vidovic <ognjen.vidovic at gmail dot com> -# Contributor (AUR): Mariusz Libera <mariusz.libera@gmail.com> -# Contributor (AUR): fes0 -# Contributor (AUR): Rodrigo Coacci <rcoacci@gmail.com> -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Giovanni Santini <giovannisantini93@yahoo.it> +# Contributor: Ognjen Vidovic <ognjen.vidovic at gmail dot com> +# Contributor: Mariusz Libera <mariusz.libera@gmail.com> +# Contributor: fes0 +# Contributor: Rodrigo Coacci <rcoacci@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/chroot-nspawn/0001-Create-mount-points-if-mountpoint-exit-code-is-diffe.patch b/pcr/chroot-nspawn/0001-Create-mount-points-if-mountpoint-exit-code-is-diffe.patch new file mode 100644 index 000000000..12da0f2c1 --- /dev/null +++ b/pcr/chroot-nspawn/0001-Create-mount-points-if-mountpoint-exit-code-is-diffe.patch @@ -0,0 +1,167 @@ +From 319ac79c47f191e8c0aa2db4ea0eb248b8011bf3 Mon Sep 17 00:00:00 2001 +From: David P <megver83@parabola.nu> +Date: Fri, 2 Jul 2021 22:51:20 -0400 +Subject: [PATCH] Create mount points if mountpoint exit code is different to + zero + +This is better than checking if the exit code equals to 1, as mountpoint will +exit with code 32 if the directory exists but it's not a mount point. + +Plus, in the manpage says: +EXIT STATUS + Zero if the directory or file is a mountpoint, non-zero if not. + +Signed-off-by: David P <megver83@parabola.nu> +--- + chroot-nspawn | 50 +++++++++++++++++++++++++------------------------- + 1 file changed, 25 insertions(+), 25 deletions(-) + +diff --git a/chroot-nspawn b/chroot-nspawn +index 2e1fd8b..d4bc896 100755 +--- a/chroot-nspawn ++++ b/chroot-nspawn +@@ -1126,7 +1126,7 @@ unset _SET_PRIVATE_NETWORK + + # Mount a fake "/" file system + mountpoint -q $_SET_DIRECTORY +-[ $? = 1 ] && mount -B $_SET_DIRECTORY $_SET_DIRECTORY ++[ $? != 0 ] && mount -B $_SET_DIRECTORY $_SET_DIRECTORY + mount --make-slave $_SET_DIRECTORY + + # Bind directories +@@ -1156,24 +1156,24 @@ unshare -Cfimpu $_UNSHARE_NETWORK --mount-proc --setgroups allow -- chroot $_SET + + # Mount "/dev", "/proc", "/run", "/sys" and "/tmp" file systems + mountpoint -q /dev +- [ $? = 1 ] && mount -t tmpfs tmpfs \ ++ [ $? != 0 ] && mount -t tmpfs tmpfs \ + -o rw,nosuid,mode=755 \ + /dev + mountpoint -q /proc +- [ $? = 1 ] && mount -t proc proc \ ++ [ $? != 0 ] && mount -t proc proc \ + -o rw,nosuid,nodev,noexec,relatime \ + /proc + mountpoint -q /run +- [ $? = 1 ] && mount -t tmpfs tmpfs \ ++ [ $? != 0 ] && mount -t tmpfs tmpfs \ + -o rw,nosuid,nodev,mode=755 \ + /run + mountpoint -q /sys +- [ $? = 1 ] && mount -t sysfs sysfs \ ++ [ $? != 0 ] && mount -t sysfs sysfs \ + -o ro,nosuid,nodev,noexec,relatime \ + /sys + + mountpoint -q /tmp +- [ $? = 1 ] && mount -t tmpfs tmpfs \ ++ [ $? != 0 ] && mount -t tmpfs tmpfs \ + -o rw \ + /tmp + +@@ -1225,43 +1225,43 @@ unshare -Cfimpu $_UNSHARE_NETWORK --mount-proc --setgroups allow -- chroot $_SET + + # Mount needed file systems + # mountpoint -q /dev/console +-# [ $? = 1 ] && mount -t devpts devpts \ ++# [ $? != 0 ] && mount -t devpts devpts \ + # -o rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=000 \ + # /dev/console + mountpoint -q /dev/pts +- [ $? = 1 ] && mount -t devpts devpts \ ++ [ $? != 0 ] && mount -t devpts devpts \ + -o rw,nosuid,noexec,relatime,gid=5,mode=620,ptmxmode=666 \ + /dev/pts + mountpoint -q /dev/shm +- [ $? = 1 ] && mount -t tmpfs tmpfs \ ++ [ $? != 0 ] && mount -t tmpfs tmpfs \ + -o rw,nosuid,nodev \ + /dev/shm + # mountpoint -q /proc/kmsg +-# [ $? = 1 ] && mount -t tmpfs tmpfs \ ++# [ $? != 0 ] && mount -t tmpfs tmpfs \ + # -o rw,nosuid,nodev,mode=755 \ + # /proc/kmsg + # mountpoint -q /proc/sys +-# [ $? = 1 ] && mount -t proc proc \ ++# [ $? != 0 ] && mount -t proc proc \ + # -o ro,nosuid,nodev,noexec,relatime \ + # /proc/sys + # mountpoint -q /proc/sys/kernel/random/boot_id +-# [ $? = 1 ] && mount -t tmpfs tmpfs \ ++# [ $? != 0 ] && mount -t tmpfs tmpfs \ + # -o ro,nosuid,nodev,mode=755 \ + # /proc/sys/kernel/random/boot_id + # mountpoint -q /proc/sys/kernel/random/boot_id +-# [ $? = 1 ] && mount -t tmpfs tmpfs \ ++# [ $? != 0 ] && mount -t tmpfs tmpfs \ + # -o rw,nosuid,nodev,mode=755 \ + # /proc/sys/kernel/random/boot_id + # mountpoint -q /proc/sysrq-trigger +-# [ $? = 1 ] && mount -t proc proc \ ++# [ $? != 0 ] && mount -t proc proc \ + # -o ro,nosuid,nodev,noexec,relatime \ + # /proc/sysrq-trigger + mountpoint -q /run/systemd/nspawn/incoming +- [ $? = 1 ] && mount -t tmpfs tmpfs \ ++ [ $? != 0 ] && mount -t tmpfs tmpfs \ + -o ro,relatime,mode=755 \ + /run/systemd/nspawn/incoming + mountpoint -q /sys/fs/cgroup +- [ $? = 1 ] && mount -t tmpfs tmpfs \ ++ [ $? != 0 ] && mount -t tmpfs tmpfs \ + -o rw,nosuid,nodev,noexec,mode=755 \ + /sys/fs/cgroup + +@@ -1299,39 +1299,39 @@ unshare -Cfimpu $_UNSHARE_NETWORK --mount-proc --setgroups allow -- chroot $_SET + -o remount,ro \ + /sys/fs/cgroup + mountpoint -q /sys/fs/cgroup/blkio +- [ $? = 1 ] && mount -t cgroup cgroup \ ++ [ $? != 0 ] && mount -t cgroup cgroup \ + -o ro,nosuid,nodev,noexec,relatime,blkio \ + /sys/fs/cgroup/blkio + # mountpoint -q /sys/fs/cgroup/cpu,cpuacct +-# [ $? = 1 ] && mount -t cgroup cgroup \ ++# [ $? != 0 ] && mount -t cgroup cgroup \ + # -o ro,nosuid,nodev,noexec,relatime,cpu,cpuacct \ + # /sys/fs/cgroup/cpu,cpuacct + mountpoint -q /sys/fs/cgroup/cpuset +- [ $? = 1 ] && mount -t cgroup cgroup \ ++ [ $? != 0 ] && mount -t cgroup cgroup \ + -o ro,nosuid,nodev,noexec,relatime,cpuset \ + /sys/fs/cgroup/cpuset + mountpoint -q /sys/fs/cgroup/devices +- [ $? = 1 ] && mount -t cgroup cgroup \ ++ [ $? != 0 ] && mount -t cgroup cgroup \ + -o ro,nosuid,nodev,noexec,relatime,devices \ + /sys/fs/cgroup/devices + mountpoint -q /sys/fs/cgroup/freezer +- [ $? = 1 ] && mount -t cgroup cgroup \ ++ [ $? != 0 ] && mount -t cgroup cgroup \ + -o ro,nosuid,nodev,noexec,relatime,freezer \ + /sys/fs/cgroup/freezer + mountpoint -q /sys/fs/cgroup/memory +- [ $? = 1 ] && mount -t cgroup cgroup \ ++ [ $? != 0 ] && mount -t cgroup cgroup \ + -o ro,nosuid,nodev,noexec,relatime,memory \ + /sys/fs/cgroup/memory + # mountpoint -q /sys/fs/cgroup/net_cls,net_prio +-# [ $? = 1 ] && mount -t cgroup cgroup \ ++# [ $? != 0 ] && mount -t cgroup cgroup \ + # -o ro,nosuid,nodev,noexec,relatime,net_cls,net_prio \ + # /sys/fs/cgroup/net_cls,net_prio + mountpoint -q /sys/fs/cgroup/pids +- [ $? = 1 ] && mount -t cgroup cgroup \ ++ [ $? != 0 ] && mount -t cgroup cgroup \ + -o ro,nosuid,nodev,noexec,relatime,pids \ + /sys/fs/cgroup/pids + # mountpoint -q /sys/fs/cgroup/systemd +-# [ $? = 1 ] && mount -t cgroup cgroup \ ++# [ $? != 0 ] && mount -t cgroup cgroup \ + # -o rw,nosuid,nodev,noexec,relatime,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd \ + # /sys/fs/cgroup/systemd + +-- +2.32.0 + diff --git a/pcr/chroot-nspawn/PKGBUILD b/pcr/chroot-nspawn/PKGBUILD index 249a53327..546222135 100644 --- a/pcr/chroot-nspawn/PKGBUILD +++ b/pcr/chroot-nspawn/PKGBUILD @@ -1,27 +1,34 @@ -# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> -# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info> +# Maintainer (hyperbola): Márcio Silva <coadde@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: David P. <megver83@parabola.nu> -_pkgname=systemd-nspawn pkgname=chroot-nspawn pkgver=0.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A $_pkgname wrapper for chroot" arch=(any) url="https://git.hyperbola.info:50100/software/$pkgname.git" license=(GPL3) -#conflicts=(systemd) -source=("https://repo.hyperbola.info:50000/sources/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +source=("https://repo.hyperbola.info:50000/sources/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} + 0001-Create-mount-points-if-mountpoint-exit-code-is-diffe.patch) sha512sums=('155ee3418056e883d28f2e2dfd4165a78d147fc94b31ea287cf032e1b3ff6a5212fb4ddeeacfb69dc4e69f9c25c321693429f5814e65005ae4b6fd50d3c5f08a' - 'SKIP') + 'SKIP' + 'f5746d8e5e317dc5084137158ab620a0caad15204a359f7626ee9c0ab9610b3c91eae64cddea8124932cc2d215792f8eec7bf14041942b3dfbc9a56477315e6f') validpgpkeys=('684D54A189305A9CC95446D36B888913DDB59515') # Márcio Silva +prepare() { + cd $pkgname-$pkgver + + # https://issues.hyperbola.info/index.php?do=details&task_id=1567 + patch -Np1 -i ../0001-Create-mount-points-if-mountpoint-exit-code-is-diffe.patch +} + package() { cd $pkgname-$pkgver install -d -m755 $pkgdir/usr/bin install -m755 $pkgname $pkgdir/usr/bin/$pkgname -# ln -s $pkgname $pkgdir/usr/bin/$_pkgname install -d -m755 "$pkgdir"/usr/share/licenses/$pkgname install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname diff --git a/pcr/cinclude2dot/PKGBUILD b/pcr/cinclude2dot/PKGBUILD index 94dcf3b27..9d1e0a943 100644 --- a/pcr/cinclude2dot/PKGBUILD +++ b/pcr/cinclude2dot/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Yuexuan Gu <lastavengers@outlook.com> +# Maintainer (aur): Yuexuan Gu <lastavengers@outlook.com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # parabola changes and rationale: diff --git a/pcr/cl-ppcre/PKGBUILD b/pcr/cl-ppcre/PKGBUILD index 884fc826d..1dc50f354 100644 --- a/pcr/cl-ppcre/PKGBUILD +++ b/pcr/cl-ppcre/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Aaron France <aaron.l.france@gmail.com> -# Contributor (Arch): veox <cy at wre dot ath dot cx> -# Contributor (Arch): joyfulgirl <joyfulgirl (at) archlinux.us> -# Contributor (Arch): Jonathan Friedman <jonf@gojon.com> -# Contributor (Arch): Aaron France <aaron.l.france@gmail.com> +# Maintainer (arch): Aaron France <aaron.l.france@gmail.com> +# Contributor: veox <cy at wre dot ath dot cx> +# Contributor: joyfulgirl <joyfulgirl (at) archlinux.us> +# Contributor: Jonathan Friedman <jonf@gojon.com> +# Contributor: Aaron France <aaron.l.france@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=cl-ppcre pkgver=2.0.11 diff --git a/pcr/clearlooks-colors-gtk-theme/PKGBUILD b/pcr/clearlooks-colors-gtk-theme/PKGBUILD index 2f9f12d54..d43e086f4 100644 --- a/pcr/clearlooks-colors-gtk-theme/PKGBUILD +++ b/pcr/clearlooks-colors-gtk-theme/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Travis Lyons <travis.lyons@gmail.com> +# Maintainer (arch): Travis Lyons <travis.lyons@gmail.com> pkgname=clearlooks-colors-gtk-theme pkgver=2.0 diff --git a/pcr/coccinella/PKGBUILD b/pcr/coccinella/PKGBUILD index 83a9ad23f..a90ba0b62 100644 --- a/pcr/coccinella/PKGBUILD +++ b/pcr/coccinella/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): SpepS <dreamspepser at yahoo dot it> +# Maintainer (arch): SpepS <dreamspepser at yahoo dot it> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index a4a492ed6..63db50e8a 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Zachary Koesters <zkoesters@utdallas.edu> +# Maintainer (aur): Zachary Koesters <zkoesters@utdallas.edu> # parabola changes and rationale: # - corrected used license diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index 2d9adc3f3..f71abdc96 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Bernhard Landauer <oberon@manjaro.org> -# Contributor (Arch): Matthias Maennich <arch@maennich.net> +# Maintainer (arch): Bernhard Landauer <oberon@manjaro.org> +# Contributor: Matthias Maennich <arch@maennich.net> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Luke Shumaker <lukeshu@parabola.nu> diff --git a/pcr/compiz/PKGBUILD b/pcr/compiz/PKGBUILD index 57ef590d9..c2255ac54 100644 --- a/pcr/compiz/PKGBUILD +++ b/pcr/compiz/PKGBUILD @@ -1,56 +1,61 @@ -# Maintainer (Arch): Charles Bos <charlesbos1 AT gmail> -# Contributor (Arch): Rob McCathie <archaur at rmcc dot com dot au -# Contributor (Arch): /dev/rs0 <rs0@secretco.de.com> -# Contributor (Arch): Iven Hsu <ivenvd AT gmail> -# Contributor (Arch): Nathan Hulse <nat.hulse@gmail.com> +# Maintainer (aur): Robert Brzozowski <robson75@linux.pl> +# Maintainer (aur): Charles Bos <charlesbos1 AT gmail> +# Contributor: Rob McCathie <archaur at rmcc dot com dot au +# Contributor: /dev/rs0 <rs0@secretco.de.com> +# Contributor: Iven Hsu <ivenvd AT gmail> +# Contributor: Nathan Hulse <nat.hulse@gmail.com> pkgname=compiz -pkgver=0.9.13.0 -pkgrel=2 +pkgver=0.9.14.2 +pkgrel=1 pkgdesc="Composite manager for Aiglx and Xgl, with plugins and CCSM" arch=('i686' 'x86_64') +arch+=('armv7h') url="https://launchpad.net/compiz" license=('GPL' 'LGPL' 'MIT') -depends=('boost' 'xorg-server' 'libxcomposite' 'startup-notification' 'librsvg' 'dbus' 'mesa' 'libxslt' 'fuse' 'glibmm' 'libxrender' 'libwnck3' 'pygtk' 'desktop-file-utils' 'pyrex' 'protobuf' 'metacity' 'glu' 'libsm' 'dconf') -makedepends=('cmake' 'intltool') +depends=('boost-libs' 'xorg-server' 'fuse2' 'glibmm' 'libwnck3' 'python-gobject' 'python-cairo' 'protobuf' 'metacity' 'glu') +makedepends=('boost' 'cmake' 'intltool' 'cython') optdepends=( 'xorg-xprop: grab various window properties for use in window matching rules' ) -conflicts=('compiz-core') -source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2" +conflicts=('compiz-core' 'compiz-gtk' 'compiz-bcop' 'ccsm' 'compiz-fusion-plugins-main' 'compiz-fusion-plugins-extra' 'compiz-fusion-plugins-experimental' 'compizconfig-python' 'libcompizconfig' 'simple-ccsm') +provides=("compiz-core=${pkgver}" "compiz-bcop=${pkgver}" "ccsm=${pkgver}" "compiz-plugins-main=${pkgver}" "compiz-plugins-extra=${pkgver}" "compizconfig-python=${pkgver}" "libcompizconfig=${pkgver}") +source=("https://launchpad.net/${pkgname}/${pkgver:0:6}/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz" "focus-prevention-disable.patch" "gtk-extents.patch" - "trailfocus-fix.patch") -sha256sums=('f08eb54d578be559e3e723f3fe4291a56f5c96b2fdfb9c9e74ebb6596a1ca702' + "reverse-unity-config.patch" + "screenshot-launch-fix.patch" + "no-compile-gschemas.patch") +sha256sums=('cfa061e93b032275ff9e7041f582a8f6d5ae271cf8a89e6bc74e3d3635999d3c' 'f4897590b0f677ba34767a29822f8f922a750daf66e8adf47be89f7c2550cf4b' '16ddb6311ce42d958505e21ca28faae5deeddce02cb558d55e648380274ba4d9' - '01e94ac52cd39eb5462a8505c7df61c7b14b05159de64f8700dfadb524bdb2ce') + '6ec9c04540ca1649c687d9ab2c8311caea7075831e2cffe719ec7958c9ebab7b' + '89ee91a8ea6b1424ef76661ea9a2db43412366aacddc12d24a7adf5e04bfbc61' + '4ab3277da201314b3f65e30128bc30704ddee584fdbbfc8d0d83c7e0de91fa9a') prepare() { cd "${pkgname}-${pkgver}" - # Fix decorator start command - sed -i 's/exec \\"${COMPIZ_BIN_PATH}compiz-decorator\\"/exec \/usr\/bin\/compiz-decorator/g' plugins/decor/decor.xml.in + # Reverse Unity specific configuration patches + patch -p1 -i "${srcdir}/reverse-unity-config.patch" # Set focus prevention level to off which means that new windows will always get focus - patch -Np1 -i "${srcdir}/focus-prevention-disable.patch" - - # Use Python 2 - find -type f \( -name 'CMakeLists.txt' -or -name '*.cmake' \) -exec sed -e 's/COMMAND python/COMMAND python2/g' -i {} \; - find compizconfig/ccsm -type f -exec sed -e 's|^#!.*python|#!/usr/bin/env python2|g' -i {} \; + patch -p1 -i "${srcdir}/focus-prevention-disable.patch" # Fix incorrect extents for GTK+ tooltips, csd etc - patch -Np1 -i "${srcdir}/gtk-extents.patch" + patch -p1 -i "${srcdir}/gtk-extents.patch" + + # Fix application launching for the screenshot plugin + patch -p1 -i "${srcdir}/screenshot-launch-fix.patch" + + # Don't try to compile gschemas during make install + patch -p1 -i "${srcdir}/no-compile-gschemas.patch" - # Fix ambiguous function call in trailfocus plugin - patch -Np1 -i "${srcdir}/trailfocus-fix.patch" } build() { cd "${pkgname}-${pkgver}" - export PYTHON="/usr/bin/python2" - mkdir build; cd build cmake .. \ @@ -65,7 +70,7 @@ build() { -DBUILD_KDE4=Off \ -DCOMPIZ_BUILD_TESTING=Off \ -DCOMPIZ_WERROR=Off \ - -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp" \ + -DCOMPIZ_DEFAULT_PLUGINS="composite,opengl,decor,resize,place,move,compiztoolbox,staticswitcher,regex,animation,wall,ccp" make } @@ -89,4 +94,8 @@ package() { install -dm755 "${pkgdir}/usr/share/glib-2.0/schemas/" install -m644 generated/glib-2.0/schemas/*.gschema.xml "${pkgdir}/usr/share/glib-2.0/schemas/" fi + + # Install licenses + install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/${pkgname}-${pkgver}"/{COPYING,COPYING.GPL,COPYING.LGPL,COPYING.MIT} "${pkgdir}/usr/share/licenses/${pkgname}" } diff --git a/pcr/compiz/no-compile-gschemas.patch b/pcr/compiz/no-compile-gschemas.patch new file mode 100644 index 000000000..05627a858 --- /dev/null +++ b/pcr/compiz/no-compile-gschemas.patch @@ -0,0 +1,19 @@ +diff -Nur original/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake modified/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake +--- original/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2019-02-16 12:44:41.000000000 +0000 ++++ modified/cmake/recompile_gsettings_schemas_in_dir_user_env.cmake 2019-02-16 23:36:58.589706824 +0000 +@@ -15,9 +15,9 @@ + + find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas) + +-if (GLIB_COMPILE_SCHEMAS) +- +- message ("-- Recompiling GSettings schemas in ${SCHEMADIR}") +- execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR}) +- +-endif (GLIB_COMPILE_SCHEMAS) ++#if (GLIB_COMPILE_SCHEMAS) ++# ++# message ("-- Recompiling GSettings schemas in ${SCHEMADIR}") ++# execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR}) ++# ++#endif (GLIB_COMPILE_SCHEMAS) diff --git a/pcr/compiz/reverse-unity-config.patch b/pcr/compiz/reverse-unity-config.patch new file mode 100644 index 000000000..6828481af --- /dev/null +++ b/pcr/compiz/reverse-unity-config.patch @@ -0,0 +1,871 @@ +diff -Nur original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml +--- original/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-16 12:44:41.000000000 +0000 ++++ modified/compizconfig/integration/gnome/gsettings/org.compiz.integrated.gschema.xml 2019-02-17 14:11:58.762747647 +0000 +@@ -10,9 +10,6 @@ + <key type="s" name="command-screenshot"> + <default>"gnome-screenshot"</default> + </key> +- <key type="as" name="run-command-21"> +- <default>["<Control><Alt>Delete"]</default> +- </key> + <key type="as" name="run-command-12"> + <default>["Disabled"]</default> + </key> +@@ -49,9 +46,6 @@ + <key type="as" name="run-command-1"> + <default>["Disabled"]</default> + </key> +- <key type="s" name="command-21"> +- <default>"/usr/bin/gnome-system-monitor -p"</default> +- </key> + <key type="s" name="command-12"> + <default>""</default> + </key> +diff -Nur original/metadata/core.xml.in modified/metadata/core.xml.in +--- original/metadata/core.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/metadata/core.xml.in 2019-02-17 14:11:58.762747647 +0000 +@@ -144,7 +144,7 @@ + <option name="focus_prevention_match" type="match"> + <_short>Focus Prevention Windows</_short> + <_long>Focus prevention windows</_long> +- <default>!(class=Polkit-gnome-authentication-agent-1)</default> ++ <default>any</default> + </option> + </group> + <group> +@@ -179,7 +179,7 @@ + <option name="minimize_window_key" type="key"> + <_short>Minimize Window</_short> + <_long>Minimize active window</_long> +- <default><Control><Alt>KP_0</default> ++ <default><Alt>F9</default> + </option> + <option name="minimize_window_button" type="button"> + <_short>Minimize Window</_short> +@@ -188,16 +188,16 @@ + <option name="maximize_window_key" type="key"> + <_short>Maximize Window</_short> + <_long>Maximize active window</_long> +- <default><Control><Super>Up</default> ++ <default><Alt>F10</default> + </option> + <option name="unmaximize_window_key" type="key"> + <_short>Unmaximize Window</_short> + <_long>Unmaximize active window</_long> ++ <default><Alt>F5</default> + </option> + <option name="unmaximize_or_minimize_window_key" type="key"> + <_short>Unmaximize or Minimize Window</_short> + <_long>Unmaximize or minimize active window</_long> +- <default><Control><Super>Down</default> + </option> + <option name="maximize_window_horizontally_key" type="key"> + <_short>Maximize Window Horizontally</_short> +@@ -220,6 +220,7 @@ + <option name="show_desktop_key" type="key"> + <_short>Show Desktop</_short> + <_long>Hide all windows and focus desktop</_long> ++ <default><Control><Alt>d</default> + </option> + <option name="show_desktop_edge" type="edge"> + <_short>Show Desktop</_short> +@@ -229,7 +230,6 @@ + <option name="toggle_window_maximized_key" type="key"> + <_short>Toggle Window Maximized</_short> + <_long>Toggle active window maximized</_long> +- <default><Control><Alt>KP_5</default> + </option> + <option name="toggle_window_maximized_button" type="button"> + <_short>Toggle Window Maximized</_short> +@@ -254,7 +254,7 @@ + <option name="hsize" type="int"> + <_short>Horizontal Virtual Size</_short> + <_long>Screen size multiplier for horizontal virtual size</_long> +- <default>1</default> ++ <default>4</default> + <min>1</min> + <max>32</max> + </option> +diff -Nur original/plugins/animation/animation.xml.in modified/plugins/animation/animation.xml.in +--- original/plugins/animation/animation.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/animation/animation.xml.in 2019-02-17 14:11:58.766082647 +0000 +@@ -36,7 +36,7 @@ + <extensible/> + <sort start="2"/> + <default> +- <value>animation:Glide 2</value> ++ <value>animation:Zoom</value> + <value>animation:Fade</value> + <value>animation:Fade</value> + </default> +@@ -48,9 +48,9 @@ + <min>50</min> + <max>4000</max> + <default> +- <value>120</value> +- <value>80</value> +- <value>80</value> ++ <value>200</value> ++ <value>150</value> ++ <value>150</value> + </default> + </option> + <option name="open_matches" type="list"> +@@ -58,8 +58,8 @@ + <_long>The windows that will be animated.</_long> + <type>match</type> + <default> +- <value>((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver)</value> +- <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value> ++ <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value> ++ <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value> + <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> + </default> + </option> +@@ -102,7 +102,7 @@ + <extensible/> + <sort start="2"/> + <default> +- <value>animation:Glide 2</value> ++ <value>animation:Zoom</value> + <value>animation:Fade</value> + <value>animation:Fade</value> + </default> +@@ -114,9 +114,9 @@ + <min>50</min> + <max>4000</max> + <default> +- <value>120</value> +- <value>80</value> +- <value>50</value> ++ <value>200</value> ++ <value>150</value> ++ <value>150</value> + </default> + </option> + <option name="close_matches" type="list"> +@@ -124,8 +124,8 @@ + <_long>The windows that will be animated.</_long> + <type>match</type> + <default> +- <value>((type=Normal | Unknown) | name=sun-awt-X11-XFramePeer | name=sun-awt-X11-XDialogPeer) & !(role=toolTipTip | role=qtooltip_label) & !(type=Normal & override_redirect=1) & !(name=gnome-screensaver) & !(name=gnome-screenshot)</value> +- <value>((type=Menu | PopupMenu | DropdownMenu | Combo | Dialog | ModalDialog | Normal) & !(class=\\.exe$))</value> ++ <value>(type=Normal | Dialog | ModalDialog | Unknown) & !(name=gnome-screensaver)</value> ++ <value>(type=Menu | PopupMenu | DropdownMenu | Combo)</value> + <value>(type=Tooltip | Notification | Utility) & !(name=compiz) & !(title=notify-osd)</value> + </default> + </option> +@@ -168,7 +168,7 @@ + <extensible/> + <sort start="2"/> + <default> +- <value>animation:Zoom</value> ++ <value>animation:Magic Lamp</value> + </default> + </option> + <option name="minimize_durations" type="list"> +@@ -178,7 +178,7 @@ + <min>50</min> + <max>4000</max> + <default> +- <value>220</value> ++ <value>300</value> + </default> + </option> + <option name="minimize_matches" type="list"> +@@ -341,7 +341,7 @@ + <extensible/> + <sort start="1"/> + <default> +- <value>animation:Fade</value> ++ <value>animation:None</value> + </default> + </option> + <option name="focus_durations" type="list"> +@@ -351,7 +351,7 @@ + <min>50</min> + <max>4000</max> + <default> +- <value>150</value> ++ <value>300</value> + </default> + </option> + <option name="focus_matches" type="list"> +@@ -385,7 +385,7 @@ + <option name="time_step" type="int"> + <_short>Animation Time Step</_short> + <_long>The amount of time in milliseconds between each render of the animation. The higher the number, the jerkier the movements become.</_long> +- <default>16</default> ++ <default>10</default> + <min>1</min> + <max>400</max> + </option> +@@ -473,7 +473,7 @@ + <option name="glide2_away_position" type="float"> + <_short>Away Position</_short> + <_long>Closeness of window to camera at the end of the animation (1.0: Close to camera, -2.0: Away from camera).</_long> +- <default>-0.1</default> ++ <default>-0.4</default> + <min>-2</min> + <max>1</max> + <precision>0.05</precision> +@@ -481,7 +481,7 @@ + <option name="glide2_away_angle" type="float"> + <_short>Away Angle</_short> + <_long>Angle of window at the end of the animation.</_long> +- <default>0</default> ++ <default>-45</default> + <min>-540</min> + <max>540</max> + <precision>5</precision> +@@ -686,7 +686,7 @@ + <option name="zoom_springiness" type="float"> + <_short>Springiness</_short> + <_long>How spring-like the Zoom animation should be.</_long> +- <default>0.08</default> ++ <default>0.0</default> + <min>0</min> + <max>1</max> + <precision>0.01</precision> +diff -Nur original/plugins/commands/commands.xml.in modified/plugins/commands/commands.xml.in +--- original/plugins/commands/commands.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/commands/commands.xml.in 2019-02-17 14:11:58.766082647 +0000 +@@ -117,7 +117,7 @@ + <option name="command20" type="string"> + <_short>Command line 20</_short> + <_long>Command line to be executed in shell when run_command20 is invoked</_long> +- <default>/usr/bin/gnome-system-monitor -p</default> ++ <default></default> + </option> + </group> + <group> +@@ -205,7 +205,6 @@ + <option name="run_command20_key" type="key"> + <_short>Run command 20</_short> + <_long>A keybinding that when invoked, will run the shell command identified by command20</_long> +- <default><Control><Alt>Delete</default> + </option> + </group> + <group> +diff -Nur original/plugins/decor/decor.xml.in modified/plugins/decor/decor.xml.in +--- original/plugins/decor/decor.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/decor/decor.xml.in 2019-02-17 14:13:24.345517674 +0000 +@@ -31,7 +31,7 @@ + <option name="active_shadow_opacity" type="float"> + <_short>Shadow Opacity</_short> + <_long>Drop shadow opacity</_long> +- <default>0.8</default> ++ <default>0.5</default> + <min>0.01</min> + <max>6.0</max> + <precision>0.01</precision> +@@ -66,7 +66,7 @@ + <option name="inactive_shadow_radius" type="float"> + <_short>Shadow Radius</_short> + <_long>Drop shadow radius</_long> +- <default>5.0</default> ++ <default>8.0</default> + <min>0.1</min> + <max>13.0</max> + <precision>0.1</precision> +@@ -74,7 +74,7 @@ + <option name="inactive_shadow_opacity" type="float"> + <_short>Shadow Opacity</_short> + <_long>Drop shadow opacity</_long> +- <default>0.4</default> ++ <default>0.5</default> + <min>0.01</min> + <max>6.0</max> + <precision>0.01</precision> +@@ -101,7 +101,7 @@ + <option name="command" type="string"> + <_short>Command</_short> + <_long>Decorator command line that is executed if no decorator is already running.</_long> +- <default>gtk-window-decorator</default> ++ <default>exec /usr/bin/compiz-decorator</default> + </option> + <option name="mipmap" type="bool"> + <_short>Mipmap</_short> +diff -Nur original/plugins/expo/expo.xml.in modified/plugins/expo/expo.xml.in +--- original/plugins/expo/expo.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/expo/expo.xml.in 2019-02-17 14:11:58.766082647 +0000 +@@ -17,7 +17,6 @@ + <plugin>wobbly</plugin> + <plugin>animation</plugin> + <plugin>wallpaper</plugin> +- <plugin>imgpng</plugin> + </relation> + </deps> + <options> +@@ -26,7 +25,7 @@ + <option name="expo_key" type="key"> + <_short>Expo Key</_short> + <_long>Initiate or terminate Expo mode with this keyboard shortcut.</_long> +- <default><Super>s</default> ++ <default><Super>e</default> + </option> + <option name="expo_button" type="button"> + <_short>Expo Button</_short> +@@ -37,6 +36,7 @@ + <_short>Expo Corner/Edge</_short> + <_long>Initiate or terminate Expo mode by moving the pointer to this corner or edge of your screen(s).</_long> + <default> ++ <edge name="TopLeft"/> + </default> + </option> + <option name="double_click_time" type="int"> +@@ -80,7 +80,7 @@ + <option name="zoom_time" type="float"> + <_short>Animation Duration</_short> + <_long>Duration of the selected animation (in seconds).</_long> +- <default>0.3</default> ++ <default>0.5</default> + <min>0.1</min> + <max>5.0</max> + <precision>0.1</precision> +@@ -146,12 +146,12 @@ + <option name="x_offset" type="int"> + <_short>X Offset</_short> + <_long>Horizontal offset (in pixels).</_long> +- <default>64</default> ++ <default>0</default> + </option> + <option name="y_offset" type="int"> + <_short>Y Offset</_short> + <_long>Vertical offset (in pixels).</_long> +- <default>24</default> ++ <default>0</default> + </option> + <option name="y_bottom_offset" type="int"> + <_short>Y Bottom Offset</_short> +@@ -170,7 +170,7 @@ + <option name="vp_distance" type="float"> + <_short>Viewport Distance</_short> + <_long>The distance between viewports in Expo mode.</_long> +- <default>0.2</default> ++ <default>0.10</default> + <min>0.0</min> + <max>1.0</max> + <precision>0.01</precision> +@@ -198,7 +198,7 @@ + <_long>How the Expo wall should be displayed, if multiple output devices are used.</_long> + <min>0</min> + <max>1</max> +- <default>1</default> ++ <default>0</default> + <desc> + <value>0</value> + <_name>One big wall</_name> +@@ -213,7 +213,7 @@ + <option name="vp_brightness" type="float"> + <_short>Brightness</_short> + <_long>The brightness of unfocused viewports (in percent).</_long> +- <default>40.0</default> ++ <default>75.0</default> + <min>0.0</min> + <max>100.0</max> + <precision>0.1</precision> +@@ -233,7 +233,7 @@ + <red>0xfbfb</red> + <green>0x8b8b</green> + <blue>0x0</blue> +- <alpha>0xffff</alpha> ++ <alpha>0x0</alpha> + </default> + </option> + </subgroup> +@@ -242,7 +242,7 @@ + <option name="reflection" type="bool"> + <_short>Reflection</_short> + <_long>Render a realtime reflection of the viewports on the ground.</_long> +- <default>false</default> ++ <default>true</default> + </option> + <option name="ground_color1" type="color"> + <_short>Ground Color (near)</_short> +diff -Nur original/plugins/ezoom/ezoom.xml.in modified/plugins/ezoom/ezoom.xml.in +--- original/plugins/ezoom/ezoom.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/ezoom/ezoom.xml.in 2019-02-17 14:11:58.766082647 +0000 +@@ -30,7 +30,7 @@ + <option type="button" name="zoom_in_button"> + <_short>Zoom In Button</_short> + <_long>Mouse button shortcut to invoke zooming in.</_long> +- <default></default> ++ <default><Super>Button4</default> + </option> + <option type="key" name="zoom_in_key"> + <_short>Zoom In Key</_short> +@@ -39,7 +39,7 @@ + <option type="button" name="zoom_out_button"> + <_short>Zoom Out Button</_short> + <_long>Mouse button shortcut to invoke zooming out.</_long> +- <default></default> ++ <default><Super>Button5</default> + </option> + <option type="key" name="zoom_out_key"> + <_short>Zoom Out Key</_short> +@@ -48,7 +48,7 @@ + <option type="button" name="zoom_box_button"> + <_short>Invoke Zoom Box Button</_short> + <_long>Define a rectangle area and zoom into it.</_long> +- <default></default> ++ <default><Super>Button2</default> + </option> + <option name="zoom_box_outline_color" type="color"> + <_short>Zoom Box Outline Color</_short> +@@ -346,7 +346,7 @@ + <option type="key" name="fit_to_window_key"> + <_short>Fit zoomed area to window</_short> + <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long> +- <default></default> ++ <default><Super>r</default> + </option> + </subgroup> + </group> +diff -Nur original/plugins/fade/fade.xml.in modified/plugins/fade/fade.xml.in +--- original/plugins/fade/fade.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/fade/fade.xml.in 2019-02-17 14:11:58.772752647 +0000 +@@ -10,7 +10,6 @@ + </requirement> + <relation type="after"> + <plugin>decor</plugin> +- <plugin>staticswitcher</plugin> + </relation> + <relation type="before"> + <plugin>cube</plugin> +@@ -51,7 +50,7 @@ + <option name="window_match" type="match"> + <_short>Fade windows</_short> + <_long>Windows that should be fading</_long> +- <default>any & !(title=notify-osd)</default> ++ <default>any</default> + </option> + <option name="visual_bell" type="bell"> + <_short>Visual Bell</_short> +diff -Nur original/plugins/gnomecompat/gnomecompat.xml.in modified/plugins/gnomecompat/gnomecompat.xml.in +--- original/plugins/gnomecompat/gnomecompat.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/gnomecompat/gnomecompat.xml.in 2019-02-17 14:11:58.772752647 +0000 +@@ -57,7 +57,6 @@ + <option name="run_command_terminal_key" type="key"> + <_short>Open a terminal</_short> + <_long>Open a terminal</_long> +- <default><Control><Alt>T</default> + </option> + </group> + </options> +diff -Nur original/plugins/grid/grid.xml.in modified/plugins/grid/grid.xml.in +--- original/plugins/grid/grid.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/grid/grid.xml.in 2019-02-17 14:11:58.779422647 +0000 +@@ -68,12 +68,12 @@ + <option name="put_maximize_key" type="key"> + <_short>Maximize Key</_short> + <_long>Maximize window.</_long> +- <default><Control><Super>Up</default> ++ <default><Control><Alt>KP_0</default> + </option> + <option name="put_restore_key" type="key"> + <_short>Restore</_short> + <_long>Restore window to it's original size. Note: Use the same shortcut you are using to unmaximize a window to be able to restore grid-maximized windows.</_long> +- <default><Control><Super>Down</default> ++ <default><Alt>F5</default> + </option> + <option name="left_maximize" type="key"> + <_short>Left Maximize</_short> +diff -Nur original/plugins/resize/resize.xml.in modified/plugins/resize/resize.xml.in +--- original/plugins/resize/resize.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/resize/resize.xml.in 2019-02-17 14:11:58.779422647 +0000 +@@ -56,7 +56,7 @@ + <option name="maximize_vertically" type="bool"> + <short>Maximize Vertically if screen edge hit</short> + <long>Maximizes the window vertically if the top or bottom screen edge is hit while resizing</long> +- <default>true</default> ++ <default>false</default> + </option> + <option name="increase_border_contrast" type="bool"> + <_short>Use a double-border in 'Rectangle' and 'Outline' modes</_short> +@@ -72,9 +72,9 @@ + <_short>Border Color</_short> + <_long>Border color used for outline and rectangle resize modes</_long> + <default> +- <red>0xfbfb</red> +- <green>0x8b8b</green> +- <blue>0x0</blue> ++ <red>0x2f2f</red> ++ <green>0x2f2f</green> ++ <blue>0x4f4f</blue> + <alpha>0x9f9f</alpha> + </default> + </option> +@@ -82,10 +82,10 @@ + <_short>Fill Color</_short> + <_long>Fill color used for rectangle resize mode</_long> + <default> +- <red>0xfbfb</red> +- <green>0x8b8b</green> +- <blue>0x0</blue> +- <alpha>0x1919</alpha> ++ <red>0x2f2f</red> ++ <green>0x2f2f</green> ++ <blue>0x4f4f</blue> ++ <alpha>0x4f4f</alpha> + </default> + </option> + <option name="disable_blend" type="bool"> +diff -Nur original/plugins/scale/scale.xml.in modified/plugins/scale/scale.xml.in +--- original/plugins/scale/scale.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/scale/scale.xml.in 2019-02-17 14:11:58.779422647 +0000 +@@ -21,7 +21,7 @@ + <option name="spacing" type="int"> + <_short>Spacing</_short> + <_long>Space between windows</_long> +- <default>20</default> ++ <default>10</default> + <min>0</min> + <max>250</max> + </option> +@@ -46,7 +46,7 @@ + <option name="speed" type="float"> + <_short>Speed</_short> + <_long>Scale speed</_long> +- <default>5.0</default> ++ <default>1.5</default> + <min>0.1</min> + <max>50</max> + <precision>0.1</precision> +@@ -54,7 +54,7 @@ + <option name="timestep" type="float"> + <_short>Timestep</_short> + <_long>Scale timestep</_long> +- <default>0.1</default> ++ <default>1.2</default> + <min>0.1</min> + <max>50</max> + <precision>0.1</precision> +@@ -67,7 +67,7 @@ + <option name="opacity" type="int"> + <_short>Opacity</_short> + <_long>Amount of opacity in percent</_long> +- <default>100</default> ++ <default>75</default> + <min>0</min> + <max>100</max> + </option> +@@ -76,7 +76,7 @@ + <_long>Overlay an icon on windows once they are scaled</_long> + <min>0</min> + <max>2</max> +- <default>0</default> ++ <default>1</default> + <desc> + <value>0</value> + <_name>None</_name> +@@ -129,7 +129,7 @@ + <_long>Selects where windows are scaled if multiple output devices are used.</_long> + <min>0</min> + <max>1</max> +- <default>1</default> ++ <default>0</default> + <desc> + <value>0</value> + <_name>On current output device</_name> +@@ -150,7 +150,7 @@ + <option name="key_bindings_toggle" type="bool"> + <_short>Key Bindings Toggle Scale Mode</_short> + <_long>Key bindings toggle scale mode instead of enabling it when pressed and disabling it when released.</_long> +- <default>true</default> ++ <default>false</default> + </option> + <option name="button_bindings_toggle" type="bool"> + <_short>Button Bindings Toggle Scale Mode</_short> +@@ -160,12 +160,15 @@ + <option name="initiate_edge" type="edge"> + <_short>Initiate Window Picker</_short> + <_long>Layout and start transforming windows</_long> ++ <default> ++ <edge name="TopRight"/> ++ </default> + <allowed edgednd="true"/> + </option> + <option name="initiate_key" type="key"> + <_short>Initiate Window Picker</_short> + <_long>Layout and start transforming windows</_long> +- <default><Super>w</default> ++ <default><Shift><Alt>Up</default> + </option> + <option name="initiate_button" type="button"> + <_short>Initiate Window Picker</_short> +@@ -183,7 +186,6 @@ + <option name="initiate_all_key" type="key"> + <_short>Initiate Window Picker For All Windows</_short> + <_long>Layout and start transforming all windows</_long> +- <default><Super><Shift>w</default> + </option> + <option name="initiate_group_edge" type="edge"> + <_short>Initiate Window Picker For Window Group</_short> +diff -Nur original/plugins/staticswitcher/staticswitcher.xml.in modified/plugins/staticswitcher/staticswitcher.xml.in +--- original/plugins/staticswitcher/staticswitcher.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/staticswitcher/staticswitcher.xml.in 2019-02-17 14:11:58.782757647 +0000 +@@ -11,6 +11,7 @@ + <relation type="after"> + <plugin>composite</plugin> + <plugin>opengl</plugin> ++ <plugin>fade</plugin> + <plugin>compiztoolbox</plugin> + <plugin>decor</plugin> + </relation> +@@ -139,12 +140,12 @@ + <option name="auto_change_vp" type="bool"> + <_short>Auto Change Viewport</_short> + <_long>Change to the viewport of the selected window while switching</_long> +- <default>true</default> ++ <default>false</default> + </option> + <option name="popup_delay" type="float"> + <_short>Popup Window Delay</_short> + <_long>Time (in s) the popup window should be delayed before appearing</_long> +- <default>0.2</default> ++ <default>0.0</default> + <min>0.0</min> + <max>2.0</max> + <precision>0.05</precision> +@@ -152,7 +153,7 @@ + <option name="mouse_select" type="bool"> + <_short>Allow Mouse Selection</_short> + <_long>Allow selection of windows from the switcher window with the mouse</_long> +- <default>true</default> ++ <default>false</default> + </option> + </group> + <group> +@@ -160,14 +161,14 @@ + <option name="saturation" type="int"> + <_short>Saturation</_short> + <_long>Amount of saturation in percent</_long> +- <default>100</default> ++ <default>50</default> + <min>0</min> + <max>100</max> + </option> + <option name="brightness" type="int"> + <_short>Brightness</_short> + <_long>Amount of brightness in percent</_long> +- <default>100</default> ++ <default>50</default> + <min>0</min> + <max>100</max> + </option> +@@ -191,7 +192,7 @@ + <option name="mipmap" type="bool"> + <_short>Mipmap</_short> + <_long>Generate mipmaps when possible for higher quality scaling</_long> +- <default>false</default> ++ <default>true</default> + </option> + <option name="row_align" type="int"> + <_short>Row Alignment</_short> +@@ -220,7 +221,7 @@ + <option name="bring_to_front" type="bool"> + <_short>Bring To Front</_short> + <_long>Bring selected window to front</_long> +- <default>false</default> ++ <default>true</default> + </option> + <_short>Selected Window Highlight</_short> + <option name="highlight_mode" type="int"> +@@ -228,7 +229,7 @@ + <_long>Mode for highlighting the currently selected window</_long> + <min>0</min> + <max>2</max> +- <default>0</default> ++ <default>1</default> + <desc> + <value>0</value> + <_name>None</_name> +diff -Nur original/plugins/vpswitch/vpswitch.xml.in modified/plugins/vpswitch/vpswitch.xml.in +--- original/plugins/vpswitch/vpswitch.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/vpswitch/vpswitch.xml.in 2019-02-17 14:11:58.782757647 +0000 +@@ -95,11 +95,13 @@ + <option name="next_button" type="button"> + <_short>Move Next</_short> + <_long>Move to the next viewport</_long> ++ <default>Button5</default> + <internal/> + </option> + <option name="prev_button" type="button"> + <_short>Move Prev</_short> + <_long>Move to the previous viewport</_long> ++ <default>Button4</default> + <internal/> + </option> + <option name="initiate_button" type="button"> +diff -Nur original/plugins/wall/wall.xml.in modified/plugins/wall/wall.xml.in +--- original/plugins/wall/wall.xml.in 2019-02-16 12:44:41.000000000 +0000 ++++ modified/plugins/wall/wall.xml.in 2019-02-17 14:11:58.782757647 +0000 +@@ -30,12 +30,12 @@ + <option name="miniscreen" type="bool"> + <_short>Show Live Viewport Previews</_short> + <_long>Show live viewport previews in switcher window</_long> +- <default>true</default> ++ <default>false</default> + </option> + <option name="preview_timeout" type="float"> + <_short>Switch Target Preview Visibility Time</_short> + <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long> +- <default>0.2</default> ++ <default>0.4</default> + <min>0.0</min> + <max>2.0</max> + <precision>0.05</precision> +@@ -43,7 +43,7 @@ + <option name="preview_scale" type="int"> + <_short>Preview Scale</_short> + <_long>Size of the preview in %</_long> +- <default>130</default> ++ <default>100</default> + <min>0</min> + <max>400</max> + </option> +@@ -57,7 +57,7 @@ + <option name="border_width" type="int"> + <_short>Border Width</_short> + <_long>Width of the border between the previews</_long> +- <default>7</default> ++ <default>10</default> + <min>0</min> + <max>30</max> + </option> +@@ -65,10 +65,10 @@ + <_short>Outline Color</_short> + <_long>Outline color of the switcher window.</_long> + <default> +- <red>0xffff</red> +- <green>0xffff</green> +- <blue>0xffff</blue> +- <alpha>0x3232</alpha> ++ <red>0x3333</red> ++ <green>0x3333</green> ++ <blue>0x3333</blue> ++ <alpha>0xd998</alpha> + </default> + </option> + <subgroup> +@@ -78,30 +78,30 @@ + <_short>Base Color</_short> + <_long>First color for the background gradient of the switcher window.</_long> + <default> +- <red>0x0000</red> +- <green>0x0000</green> +- <blue>0x0000</blue> +- <alpha>0x6464</alpha> ++ <red>0xcccc</red> ++ <green>0xcccc</green> ++ <blue>0xe665</blue> ++ <alpha>0xd998</alpha> + </default> + </option> + <option name="background_gradient_highlight_color" type="color"> + <_short>Highlight Color</_short> + <_long>Second color for the background gradient of the switcher window.</_long> + <default> +- <red>0x0000</red> +- <green>0x0000</green> +- <blue>0x0000</blue> +- <alpha>0x6464</alpha> ++ <red>0xf332</red> ++ <green>0xf332</green> ++ <blue>0xffff</blue> ++ <alpha>0xd998</alpha> + </default> + </option> + <option name="background_gradient_shadow_color" type="color"> + <_short>Shadow Color</_short> + <_long>Third color for the background gradient of the switcher window.</_long> + <default> +- <red>0x0000</red> +- <green>0x0000</green> +- <blue>0x0000</blue> +- <alpha>0x6464</alpha> ++ <red>0xf332</red> ++ <green>0xf332</green> ++ <blue>0xffff</blue> ++ <alpha>0xd998</alpha> + </default> + </option> + </subgroup> +@@ -112,20 +112,20 @@ + <_short>Base Color</_short> + <_long>First color for the thumb gradient of the switcher window.</_long> + <default> +- <red>0x5555</red> +- <green>0x5555</green> +- <blue>0x5555</blue> +- <alpha>0x3232</alpha> ++ <red>0x3333</red> ++ <green>0x3333</green> ++ <blue>0x3333</blue> ++ <alpha>0x5999</alpha> + </default> + </option> + <option name="thumb_gradient_highlight_color" type="color"> + <_short>Highlight Color</_short> + <_long>Second color for the thumb gradient of the switcher window.</_long> + <default> +- <red>0x5555</red> +- <green>0x5555</green> +- <blue>0x5555</blue> +- <alpha>0x3232</alpha> ++ <red>0x3fff</red> ++ <green>0x3fff</green> ++ <blue>0x3fff</blue> ++ <alpha>0x3fff</alpha> + </default> + </option> + </subgroup> +@@ -139,7 +139,7 @@ + <red>0xffff</red> + <green>0xffff</green> + <blue>0xffff</blue> +- <alpha>0xffff</alpha> ++ <alpha>0xf332</alpha> + </default> + </option> + <option name="thumb_highlight_gradient_shadow_color" type="color"> +@@ -149,7 +149,7 @@ + <red>0xdfff</red> + <green>0xdfff</green> + <blue>0xdfff</blue> +- <alpha>0xffff</alpha> ++ <alpha>0xa665</alpha> + </default> + </option> + </subgroup> +@@ -201,7 +201,7 @@ + <option name="auto_switch_vp_and_window" type="bool"> + <_short>Auto Switch Vp And Window</_short> + <_long>Auto switch the viewport and move window when Alt-Tab to window that is more than half contained in another viewport</_long> +- <default>false</default> ++ <default>true</default> + </option> + </group> + <group> +@@ -356,7 +356,7 @@ + <option name="edgeflip_move" type="bool"> + <_short>Edge Flip Move</_short> + <_long>Flip viewport when moving a window to a screen edge</_long> +- <default>false</default> ++ <default>true</default> + </option> + <option name="edgeflip_dnd" type="bool"> + <_short>Edge Flip DnD</_short> +diff -Nur original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp +--- original/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-16 12:44:41.000000000 +0000 ++++ modified/tests/system/xorg-gtest/tests/compiz_xorg_gtest_ewmh.cpp 2019-02-17 14:11:58.782757647 +0000 +@@ -46,7 +46,7 @@ + + namespace + { +-unsigned int DEFAULT_VIEWPORT_WIDTH = 1; ++unsigned int DEFAULT_VIEWPORT_WIDTH = 4; + unsigned int DEFAULT_VIEWPORT_HEIGHT = 1; + + bool Advance (Display *d, bool r) diff --git a/pcr/compiz/screenshot-launch-fix.patch b/pcr/compiz/screenshot-launch-fix.patch new file mode 100644 index 000000000..8192961bb --- /dev/null +++ b/pcr/compiz/screenshot-launch-fix.patch @@ -0,0 +1,15 @@ +diff -rupN compiz/plugins/screenshot/src/screenshot.cpp compiz.new/plugins/screenshot/src/screenshot.cpp
+--- compiz/plugins/screenshot/src/screenshot.cpp 2014-09-01 00:21:45.807271000 -0400
++++ compiz.new/plugins/screenshot/src/screenshot.cpp 2014-09-01 00:52:30.634288167 -0400
+@@ -434,10 +434,10 @@ namespace
+ compLogMessage ("screenshot", CompLogLevelWarn, "glReadPixels failed");
+ }
+
+- if (!success)
++ if (success)
+ success =
+ launchApplicationAndTakeScreenshot (alternativeApplication,
+- directory);
++ path);
+
+ return success;
\ No newline at end of file diff --git a/pcr/compiz/trailfocus-fix.patch b/pcr/compiz/trailfocus-fix.patch deleted file mode 100644 index 2300e57a1..000000000 --- a/pcr/compiz/trailfocus-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur original/plugins/trailfocus/src/trailfocus.cpp modified/plugins/trailfocus/src/trailfocus.cpp ---- original/plugins/trailfocus/src/trailfocus.cpp 2015-08-20 14:01:09.000000000 +0100 -+++ modified/plugins/trailfocus/src/trailfocus.cpp 2016-05-08 13:57:35.867366143 +0100 -@@ -195,7 +195,7 @@ - } - else - { -- distance = abs (cur->activeNum () - best->activeNum ()); -+ distance = abs ((int)(cur->activeNum () - best->activeNum ())); - if (distance < bestDist) - { - best = cur; diff --git a/pcr/conky-lua/PKGBUILD b/pcr/conky-lua/PKGBUILD index cf5bde288..0c0f63177 100644 --- a/pcr/conky-lua/PKGBUILD +++ b/pcr/conky-lua/PKGBUILD @@ -1,10 +1,10 @@ -# Contributor (Arch): Renato Garcia <fgarcia.renato@gmail.com> -# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> -# Contributor (Arch): James Rayner <james@archlinux.org> -# Contributor (Arch): Partha Chowdhury <kira.laucas@gmail.com> -# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> -# Contributor : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Renato Garcia <fgarcia.renato@gmail.com> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> +# Contributor: Partha Chowdhury <kira.laucas@gmail.com> +# Contributor: Gaetan Bisson <bisson@archlinux.org> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> +# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=conky-lua _pkgname=conky diff --git a/pcr/connman-ui-git/PKGBUILD b/pcr/connman-ui-git/PKGBUILD index 79148b563..cc2cf8a0e 100644 --- a/pcr/connman-ui-git/PKGBUILD +++ b/pcr/connman-ui-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Bertrand Bonnefoy-Claudet <bertrandbc@gmail.com> -# Contributor (Arch): Timothy Lee <timothy.ty.lee@gmail.com> +# Maintainer (arch): Bertrand Bonnefoy-Claudet <bertrandbc@gmail.com> +# Contributor: Timothy Lee <timothy.ty.lee@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=connman-ui-git diff --git a/pcr/cpptest/PKGBUILD b/pcr/cpptest/PKGBUILD index a82e2d457..a0ee0a688 100644 --- a/pcr/cpptest/PKGBUILD +++ b/pcr/cpptest/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> -# Contributor (aur): Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> +# Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar> pkgname=cpptest pkgver=1.1.2 pkgrel=2 diff --git a/pcr/cpuminer/PKGBUILD b/pcr/cpuminer/PKGBUILD index 3863c53ae..908d42476 100644 --- a/pcr/cpuminer/PKGBUILD +++ b/pcr/cpuminer/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): gee -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: gee +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=cpuminer pkgver=2.4 diff --git a/pcr/cronic/PKGBUILD b/pcr/cronic/PKGBUILD index f204bfd6a..1945984be 100644 --- a/pcr/cronic/PKGBUILD +++ b/pcr/cronic/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Tom Hacohen <tom@stosb.com> +# Maintainer (aur): Tom Hacohen <tom@stosb.com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # parabola changes and rationale: diff --git a/pcr/crosstool-ng/PKGBUILD b/pcr/crosstool-ng/PKGBUILD index 261cf1a37..4440d5a70 100644 --- a/pcr/crosstool-ng/PKGBUILD +++ b/pcr/crosstool-ng/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Contributor (Arch): jwwolf <jwwolf+arch@gmail.com> -# Contributor (Arch): Bernhard Walle <bernhard@bwalle.de> +# Maintainer (arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor: jwwolf <jwwolf+arch@gmail.com> +# Contributor: Bernhard Walle <bernhard@bwalle.de> # Maintainer: fauno <fauno@kiwwwi.com.ar> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> diff --git a/pcr/csound-blue/PKGBUILD b/pcr/csound-blue/PKGBUILD index d4735b437..5ba6f0329 100644 --- a/pcr/csound-blue/PKGBUILD +++ b/pcr/csound-blue/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Ainola -# Contributor (AUR): Arch Linux Pro Audio -# Contributor (AUR): SpepS -# Contributor (AUR): Bernardo Barros +# Contributor: Arch Linux Pro Audio +# Contributor: SpepS +# Contributor: Bernardo Barros # parabola changes and rationale: # no changes. diff --git a/pcr/ctpp2/PKGBUILD b/pcr/ctpp2/PKGBUILD index 213a811a2..ea75e227d 100644 --- a/pcr/ctpp2/PKGBUILD +++ b/pcr/ctpp2/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Daichi Shinozaki <dsdseg@gmail.com> -# Contributor (Arch): Valentin V. Bartenev <ne@vbart.ru> http://vbart.info/ +# Maintainer (arch): Daichi Shinozaki <dsdseg@gmail.com> +# Contributor: Valentin V. Bartenev <ne@vbart.ru> http://vbart.info/ pkgname=ctpp2 pkgver=2.8.3 diff --git a/pcr/cw/PKGBUILD b/pcr/cw/PKGBUILD index 82573f68d..7daa7d380 100644 --- a/pcr/cw/PKGBUILD +++ b/pcr/cw/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): William Díaz <wdiaz[at]archlinux[dot]us> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: William Díaz <wdiaz[at]archlinux[dot]us> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=cw pkgver=1.0.16 diff --git a/pcr/cwiid/PKGBUILD b/pcr/cwiid/PKGBUILD index b49ba13aa..e1e88542a 100644 --- a/pcr/cwiid/PKGBUILD +++ b/pcr/cwiid/PKGBUILD @@ -1,9 +1,9 @@ # $Id: PKGBUILD 271927 2017-12-02 20:55:03Z dvzrv $ -# Maintainer (AUR): David Runge <dave@sleepmap.de> -# Contributor (AUR): speps <speps at aur dot archlinux dot org> -# Contributor (AUR): Ray Rashif <schiv@archlinux.org> -# Contributor (AUR): Wieland Hoffmann <the_mineo@web.de> -# Contributor (AUR): Birger Moellering <bmoellering@googlemail.com> +# Maintainer (aur): David Runge <dave@sleepmap.de> +# Contributor: speps <speps at aur dot archlinux dot org> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: Wieland Hoffmann <the_mineo@web.de> +# Contributor: Birger Moellering <bmoellering@googlemail.com> # 2018/01/03: <dropped from community; upstream dead, unneeded> # 2012/06/05: <added into community as supercollider dependency> # 2012/03/21: <dropped from community; broken + see bug #28344> diff --git a/pcr/czmq/PKGBUILD b/pcr/czmq/PKGBUILD index a9fa5a92b..e299486ca 100644 --- a/pcr/czmq/PKGBUILD +++ b/pcr/czmq/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Aleksey Filippov <sarum9in@gmail.com> -# Contributor (Arch): Friedrich Weber <fred@reichbier.de> +# Contributor: Aleksey Filippov <sarum9in@gmail.com> +# Contributor: Friedrich Weber <fred@reichbier.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=czmq pkgver=3.0.2 diff --git a/pcr/darcsver/PKGBUILD b/pcr/darcsver/PKGBUILD index c18acb5fc..9123dd867 100644 --- a/pcr/darcsver/PKGBUILD +++ b/pcr/darcsver/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Andreas B. Wagner <AndreasBWagner@pointfree.net> -# Maintainer (AUR): Nicolas Pouillard <nicolas.pouillard@gmail.com> -# Contributor (AUR): Peter Simons <simons@cryp.to> +# Maintainer (aur): Andreas B. Wagner <AndreasBWagner@pointfree.net> +# Maintainer (aur): Nicolas Pouillard <nicolas.pouillard@gmail.com> +# Contributor: Peter Simons <simons@cryp.to> # parabola changes and rationale: # - adding license to package diff --git a/pcr/dbus-elogind/PKGBUILD b/pcr/dbus-elogind/PKGBUILD deleted file mode 100644 index c4802f534..000000000 --- a/pcr/dbus-elogind/PKGBUILD +++ /dev/null @@ -1,84 +0,0 @@ -# Maintainer (Artix): artoo <artoo@manjaro.org> -# Contributor (Arch): Jan de Groot <jgc@archlinux.org> -# Contributor (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor (Arch): Tom Gundersen <teg@jklm.no> -# Contributor (Arch): Link Dupont <link@subpop.net> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=dbus-elogind -_pkgname=${pkgname/-elogind} -pkgver=1.12.6 -pkgrel=1 -pkgdesc="Freedesktop.org message bus system" -url="https://wiki.freedesktop.org/www/Software/dbus/" -arch=(i686 x86_64 armv7h) -license=(GPL custom) -provides=('libdbus' "dbus=$pkgver" "dbus-x11=$pkgver") -conflicts=('libdbus' 'dbus' 'dbus-x11') -depends=('libx11' 'expat' 'libelogind') -makedepends=(elogind xmlto docbook-xsl python yelp-tools doxygen git autoconf-archive graphviz) -optdepends=('dbus-openrc: dbus initscript') -_commit=a723baa2bc7e91fc9b1926cda1ce53e9301de4d8 # tags/dbus-1.12.6^0 -source=("git+https://anongit.freedesktop.org/git/dbus/dbus#commit=$_commit" - 'dbus.sysusers' - 'dbus-enable-elogind.patch') -sha256sums=('SKIP' - '9bc34a20595df8869d43a8d9af74cbded999c9a004ec12ff8ce07d58d81018d8' - 'faffcaa5b295f49fcedeed2c9ece5298949096be3062fd99a4bf1a6ac3ad1ea0') -validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90' # Simon McVittie <simon.mcvittie@collabora.co.uk> - '3C8672A0F49637FE064AC30F52A43A1E4B77B059') # Simon McVittie <simon.mcvittie@collabora.co.uk> - -pkgver() { - cd $_pkgname - git describe --tags | sed 's/^dbus-//;s/-/+/g' -} - -prepare() { - cd $_pkgname - - # Reduce docs size - printf '%s\n' >>Doxyfile.in \ - HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes - - patch -Np1 -i ${srcdir}/dbus-enable-elogind.patch - - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd $_pkgname - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \ - --with-system-pid-file=/run/dbus/pid \ - --with-system-socket=/run/dbus/system_bus_socket \ - --with-console-auth-dir=/run/console/ \ - --enable-inotify --disable-static \ - --disable-verbose-mode --disable-asserts \ - --without-systemdsystemunitdir \ - --disable-systemd --disable-user-session \ - --enable-elogind --enable-x11-autolaunch - make - -} - -check() { - cd $_pkgname - make check # will fail with libremakepkg if building without -N -} - -package() { - cd $_pkgname - - make DESTDIR="$pkgdir" install - - rm -r "$pkgdir/var/run" - - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING" - - # We have a pre-assigned uid (81) - install -Dm644 "$srcdir/dbus.sysusers" "$pkgdir/usr/lib/sysusers.d/dbus.conf" - - # Remove docs - rm -r "$pkgdir/usr/share/doc" -} diff --git a/pcr/dbus-elogind/dbus-enable-elogind.patch b/pcr/dbus-elogind/dbus-enable-elogind.patch deleted file mode 100644 index 5cb5d649c..000000000 --- a/pcr/dbus-elogind/dbus-enable-elogind.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- a/dbus/dbus-userdb-util.c 2015-09-30 16:48:40.000000000 +0200 -+++ b/dbus/dbus-userdb-util.c 2016-11-03 11:09:42.550520587 +0100 -@@ -32,6 +32,9 @@ - #if HAVE_SYSTEMD - #include <systemd/sd-login.h> - #endif -+#if HAVE_ELOGIND -+#include <elogind/sd-login.h> -+#endif - - /** - * @addtogroup DBusInternalsUtils -@@ -54,7 +57,7 @@ - const DBusUserInfo *info; - dbus_bool_t result = FALSE; - --#ifdef HAVE_SYSTEMD -+#if defined(HAVE_SYSTEMD) || defined(HAVE_ELOGIND) - /* check if we have logind */ - if (access ("/run/systemd/seats/", F_OK) >= 0) - { ---- a/configure.ac 2016-11-03 11:13:58.286528265 +0100 -+++ b/configure.ac 2016-11-03 11:22:11.210543063 +0100 -@@ -185,6 +185,7 @@ - AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto) - AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto) - AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto) -+AC_ARG_ENABLE(elogind, AS_HELP_STRING([--enable-elogind],[build with elogind user seat support]),enable_elogind=$enableval,enable_elogind=auto) - AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto) - - AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) -@@ -1184,6 +1185,24 @@ - - AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes) - -+dnl elogind detection -+if test x$enable_elogind = xno ; then -+ have_elogind=no; -+else -+ PKG_CHECK_MODULES([ELOGIND], -+ [libelogind >= 209], -+ [have_elogind=yes], -+ [have_elogind=no]) -+fi -+ -+if test x$have_elogind = xyes; then -+ AC_DEFINE(HAVE_ELOGIND,1,[Have elogind]) -+fi -+ -+if test x$enable_elogind = xyes -a x$have_elogind != xyes ; then -+ AC_MSG_ERROR([Explicitly requested elogind support, but libelogind not found]) -+fi -+ - dnl systemd detection - if test x$enable_systemd = xno ; then - have_systemd=no; -@@ -1290,7 +1309,7 @@ - fi - - #### Set up final flags --LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS" -+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS $ELOGIND_LIBS" - AC_SUBST([LIBDBUS_LIBS]) - - ### X11 detection -@@ -1949,6 +1968,7 @@ - Building AppArmor support: ${have_apparmor} - Building inotify support: ${have_inotify} - Building kqueue support: ${have_kqueue} -+ Building elogind support: ${have_elogind} - Building systemd support: ${have_systemd} - Building X11 code: ${have_x11} - Building Doxygen docs: ${enable_doxygen_docs} diff --git a/pcr/dbus-elogind/dbus.sysusers b/pcr/dbus-elogind/dbus.sysusers deleted file mode 100644 index f509703d0..000000000 --- a/pcr/dbus-elogind/dbus.sysusers +++ /dev/null @@ -1 +0,0 @@ -u dbus 81 "System Message Bus" diff --git a/pcr/debuerreotype/PKGBUILD b/pcr/debuerreotype/PKGBUILD new file mode 100644 index 000000000..b89511393 --- /dev/null +++ b/pcr/debuerreotype/PKGBUILD @@ -0,0 +1,32 @@ +# Copyright (C) 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# This program is free software: you can redistribute it and/or modify +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=debuerreotype +pkgver=0.15 +pkgrel=1 +pkgdesc="Create reproducible rootfs with debootstrap" +arch=('any') +url='https://github.com/debuerreotype/debuerreotype' +license=('expat') +depends=('debootstrap' + 'util-linux') # for unshare +source=("https://github.com/debuerreotype/debuerreotype/archive/refs/tags/0.15.tar.gz") +sha512sums=('4708df711bd091af8865588c6578d68d4a1e2fae07fc1515a1b2951e059c3cd8c40417c1c66cddd67c1298d3f2ce691c1d166cc875294a919424ff20e1a7e64f') + +package(){ + cd "${pkgname}-${pkgver}" + + install -d "${pkgdir}/usr/bin/" + for script in scripts/* scripts/.*.sh scripts/.*clude* ; do + echo $script + install -m755 ${script} -t "${pkgdir}/usr/bin/" + done + + install -d "${pkgdir}/usr/share/doc/${pkgname}/" + install README.md -t "${pkgdir}/usr/share/doc/${pkgname}/" + + install -d "${pkgdir}/usr/share/licenses/${pkgname}/" + install LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/pcr/deutex/PKGBUILD b/pcr/deutex/PKGBUILD index 93bab97a2..2edeadc09 100644 --- a/pcr/deutex/PKGBUILD +++ b/pcr/deutex/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Mike Swanson <mikeonthecomputer@gmail.com> +# Maintainer (arch): Mike Swanson <mikeonthecomputer@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=deutex diff --git a/pcr/devmem/PKGBUILD b/pcr/devmem/PKGBUILD index 46fed6236..254fe54d8 100644 --- a/pcr/devmem/PKGBUILD +++ b/pcr/devmem/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch) : Brice Waegeneire < brice dot wge at gmail dot com > -# Contributor (Arch) : Alexander Lam <lambchop468 *AT* gmail.com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Brice Waegeneire < brice dot wge at gmail dot com > +# Contributor: Alexander Lam <lambchop468 *AT* gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # - no longer maintained by Arch / AUR diff --git a/pcr/dianara/PKGBUILD b/pcr/dianara/PKGBUILD index bcb7ab7e7..511cd873f 100644 --- a/pcr/dianara/PKGBUILD +++ b/pcr/dianara/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Icaro Perseo <icaroperseo[at]protonmail[dot]com> -# Contributor (Arch): Eugenio M. Vigo <emvigo@gmail.com> -# Contributor (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer (arch): Icaro Perseo <icaroperseo[at]protonmail[dot]com> +# Contributor: Eugenio M. Vigo <emvigo@gmail.com> +# Contributor: speps <speps at aur dot archlinux dot org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=dianara diff --git a/pcr/disarchive/PKGBUILD b/pcr/disarchive/PKGBUILD new file mode 100644 index 000000000..e3aaa350c --- /dev/null +++ b/pcr/disarchive/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=disarchive +pkgver=0.5.0 +pkgrel=1 +pkgdesc='Disassembler of software archives for long-term preservation' +arch=('x86_64' 'i686' 'armv7h') +url='https://ngyro.com/software/disarchive.html' +license=('GPL3') +depends=('guile' 'guile-gcrypt' 'guile-lzma' 'gzip' 'tar' 'xz' 'zlib') +checkdepends=('guile-quickcheck') +source=("https://files.ngyro.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('020b7bbf91d3a5ab245ee62631d183448a256aa087529c1dfc27db6427bd529b') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/discosrv/PKGBUILD b/pcr/discosrv/PKGBUILD index 13b169a8b..72cceedd9 100644 --- a/pcr/discosrv/PKGBUILD +++ b/pcr/discosrv/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : fauno <fauno@parabola.nu> +# Maintainer: fauno <fauno@parabola.nu> _pkgname=discosrv pkgname=${_pkgname}-git diff --git a/pcr/django-social-auth/PKGBUILD b/pcr/django-social-auth/PKGBUILD index 9b3195826..5d200ecb0 100644 --- a/pcr/django-social-auth/PKGBUILD +++ b/pcr/django-social-auth/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Benjamin A. Shelton <zancarius at gmail _ com> +# Maintainer (aur): Benjamin A. Shelton <zancarius at gmail _ com> # Source (AUR): https://github.com/zancarius/archlinux-pkgbuilds -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # - corrected license diff --git a/pcr/docker-registry/PKGBUILD b/pcr/docker-registry/PKGBUILD new file mode 100644 index 000000000..df9a92cc1 --- /dev/null +++ b/pcr/docker-registry/PKGBUILD @@ -0,0 +1,59 @@ +# Copyright (C) 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# This program is free software: you can redistribute it and/or modify +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=docker-registry +pkgver=2.8.1 +pkgrel=2 +pkgdesc="Docker registry server and associated tools" +arch=('armv7h' 'i686' 'x86_64') +url='https://github.com/docker/distribution.git' +license=('Apache') +makedepends=('go') +source=("https://github.com/distribution/distribution/archive/refs/tags/v${pkgver}.tar.gz") +sha512sums=('b9c8525051458ff4bf4592ca3ddba83c4325e88c6812ddb28c1567e331c1571f112e3b646ca970f0fe420f3b1d61d00f7151450d7b9948a08733606255731266') + +prepare(){ + mkdir -p src/github.com/docker + + mv "distribution-${pkgver}" src/github.com/docker/distribution + + cd src/github.com/docker/distribution + + sed "s/^VERSION=\$(.*)/VERSION=${pkgver}/" -i Makefile + sed "s/^REVISION=\$(.*)/REVISION=${pkgrel}/" -i Makefile +} + +build(){ + export GOPATH="$GOPATH:${PWD}" + cd src/github.com/docker/distribution + + make binaries +} + +package(){ + cd src/github.com/docker/distribution + + install -d "${pkgdir}/usr/bin/" + binaries="digest registry registry-api-descriptor-template" + for binary in ${binaries} ; do + install -m 755 "bin/${binary}" -t "${pkgdir}/usr/bin/" + done + + install -d "${pkgdir}/usr/share/doc/${pkgname}/" + files="BUILDING.md CONTRIBUTING.md LICENSE MAINTAINERS README.md ROADMAP.md" + for file in ${files} ; do + install -m 644 "${file}" -t "${pkgdir}/usr/share/doc/${pkgname}/" + done + + cp -r docs "${pkgdir}/usr/share/doc/${pkgname}/" + + install -d "${pkgdir}/usr/share/doc/${pkgname}/registry-example-configs" + files="config-cache.yml config-example.yml config-dev.yml" + for file in ${files} ; do + install -m 644 \ + "cmd/registry/${file}" \ + -t "${pkgdir}/usr/share/doc/${pkgname}/registry-example-configs" + done +} diff --git a/pcr/dolphin-root/PKGBUILD b/pcr/dolphin-root/PKGBUILD index 53b5e24a3..3859ba90e 100644 --- a/pcr/dolphin-root/PKGBUILD +++ b/pcr/dolphin-root/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer (Arch): Antonio Rojas <arojas@archlinux,org> -# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> +# Maintainer (arch): Antonio Rojas <arojas@archlinux,org> +# Maintainer (arch): Felix Yan <felixonmars@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> diff --git a/pcr/dosfstools/PKGBUILD b/pcr/dosfstools/PKGBUILD new file mode 100644 index 000000000..c669929fe --- /dev/null +++ b/pcr/dosfstools/PKGBUILD @@ -0,0 +1,36 @@ +# Committer(Arch): Judd Vinet <jvinet@zeroflux.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> +# +# On armv7h the dosfstools is been missing from the official Parabola +# repository for months. Since it was supposed to be fixed fast and it +# has not been it's better to at least have something to not prevent +# people from (re)installing parabola or installing packages that +# depend on dosfstools. + +pkgname=dosfstools +pkgver=4.2 +pkgrel=2 +pkgdesc="DOS filesystem utilities" +arch=('armv7h') +depends=('glibc') +source=(https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz{,.sig} +) +url="https://github.com/dosfstools/dosfstools" +license=('GPL3') +validpgpkeys=('25714AECDBFDACEE1CE95FE77F6022516E869F64') # Andreas Bombe +md5sums=('49c8e457327dc61efab5b115a27b087a' + 'SKIP') + + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib \ + --sbindir=/usr/bin --mandir=/usr/share/man \ + --docdir=/usr/share/doc/dosfstools --enable-compat-symlinks + make +} + +package () { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/pcr/doxymacs/PKGBUILD b/pcr/doxymacs/PKGBUILD index cc4dd39cb..2de301e59 100644 --- a/pcr/doxymacs/PKGBUILD +++ b/pcr/doxymacs/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Limao Luo <luolimao+AUR@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Limao Luo <luolimao+AUR@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=doxymacs pkgver=1.8.0 diff --git a/pcr/dratmenu/PKGBUILD b/pcr/dratmenu/PKGBUILD index aef16cdf4..5ef9a52d2 100644 --- a/pcr/dratmenu/PKGBUILD +++ b/pcr/dratmenu/PKGBUILD @@ -1,5 +1,5 @@ # $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $ -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: ivoarch <ivkuzev@gmail.com> pkgname=dratmenu diff --git a/pcr/dreamchess-git/PKGBUILD b/pcr/dreamchess-git/PKGBUILD deleted file mode 100644 index 4b2124cd6..000000000 --- a/pcr/dreamchess-git/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer (AUR): Samuel Walladge <samuel at swalladge dot id dot au> - -pkgname=dreamchess-git -_pkgname=dreamchess -pkgver=398.cb63a0a -pkgrel=1 -pkgdesc="DreamChess - OpenGL Chess Game" -arch=('i686' 'x86_64') -url="https://github.com/dreamchess/dreamchess" -license=('GPL3') - -depends=(mxml sdl2_mixer sdl2_image glew hicolor-icon-theme) -makedepends=(git cmake) - -source=('git://github.com/dreamchess/dreamchess.git') -md5sums=('SKIP') - -pkgver() { - cd "${srcdir}/dreamchess" - echo "$(git rev-list --count HEAD).$(git log --pretty=format:'%h' -n 1)" -} - -build() { - cd "${srcdir}/${_pkgname}"/cmake - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make -} - -package() { - cd "${srcdir}/${_pkgname}"/cmake - make DESTDIR="${pkgdir}" install -} diff --git a/pcr/dreamchess/PKGBUILD b/pcr/dreamchess/PKGBUILD new file mode 100644 index 000000000..6843f344c --- /dev/null +++ b/pcr/dreamchess/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer (aur): Nikos Toutountzoglou <nikos.toutou@gmail.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + + +pkgname=dreamchess +pkgver=0.3.0 +pkgrel=1 +pkgdesc="OpenGL Chess Game" +arch=('i686' 'x86_64') +arch+=('armv7h') +url="https://github.com/dreamchess/dreamchess" +license=('GPL3') +depends=('sdl2' 'sdl2_image' 'sdl2_mixer' 'expat' 'glew') +makedepends=('flex' 'bison' 'cmake') +source=($pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz) +sha256sums=('b070a34acf69ed92e523902683d104abb295d78b6f37663f4668e929b9e90470') + +build() { + cd "$pkgname-$pkgver/cmake" + cmake -DCMAKE_INSTALL_PREFIX=/usr .. + make +} + +package() { + cd "$pkgname-$pkgver/cmake" + make DESTDIR="$pkgdir/" install +} diff --git a/pcr/drm_info/PKGBUILD b/pcr/drm_info/PKGBUILD index fe5ec3ed4..bd678445b 100644 --- a/pcr/drm_info/PKGBUILD +++ b/pcr/drm_info/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): emersion <contact emersion fr> -# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer (aur): emersion <contact emersion fr> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - Added armv7h and i686 support diff --git a/pcr/dsh/PKGBUILD b/pcr/dsh/PKGBUILD index c9be56b8c..957e77de3 100644 --- a/pcr/dsh/PKGBUILD +++ b/pcr/dsh/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Arch): SkiltZ <skiltz@free.fr> +# Contributor: SkiltZ <skiltz@free.fr> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=dsh pkgver=0.25.9 diff --git a/pcr/dunst-next/PKGBUILD b/pcr/dunst-next/PKGBUILD index 808522364..d399cc69f 100644 --- a/pcr/dunst-next/PKGBUILD +++ b/pcr/dunst-next/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (Arch:dunst): Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor (Arch:dunst): feuri +# Maintainer (arch:dunst): Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: feuri _pkgname=dunst _pkgver=1.2.0 diff --git a/pcr/econnman/PKGBUILD b/pcr/econnman/PKGBUILD index b42449b1c..1d89f352e 100644 --- a/pcr/econnman/PKGBUILD +++ b/pcr/econnman/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Doug Newgard <scimmia22 at outlook dot com> +# Maintainer (aur): Doug Newgard <scimmia22 at outlook dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/egypt/PKGBUILD b/pcr/egypt/PKGBUILD index 1d7f576b7..e04ff322e 100644 --- a/pcr/egypt/PKGBUILD +++ b/pcr/egypt/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Baptiste Jonglez <baptiste--aur at jonglez dot org> -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Baptiste Jonglez <baptiste--aur at jonglez dot org> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/eid-mw/PKGBUILD b/pcr/eid-mw/PKGBUILD index 24e265ee7..12da29960 100644 --- a/pcr/eid-mw/PKGBUILD +++ b/pcr/eid-mw/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Emil Vanherp <emil DOT vanherp @ hot mail DOT com> -# Contributor (Arch): Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad> -# Contributor (Arch): Xavier D. <magicrhesus@ouranos.be> -# Contributor (Arch): Valere Monseur <valere.monseur@ymail.com> +# Maintainer (arch): Emil Vanherp <emil DOT vanherp @ hot mail DOT com> +# Contributor: Alad Wenter <https://wiki.archlinux.org/index.php/Special:EmailUser/Alad> +# Contributor: Xavier D. <magicrhesus@ouranos.be> +# Contributor: Valere Monseur <valere.monseur@ymail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=eid-mw diff --git a/pcr/elogind/PKGBUILD b/pcr/elogind/PKGBUILD index 9ae5b38d1..174e18b61 100644 --- a/pcr/elogind/PKGBUILD +++ b/pcr/elogind/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> +# Maintainer (artix): artoo <artoo@cromnix.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Maintainer: David P. <megver83@parabola.nu> # Contributor: Luke Shumaker <lukeshu@parabola.nu> diff --git a/pcr/emacs-auto-complete/PKGBUILD b/pcr/emacs-auto-complete/PKGBUILD index 9d6fb3087..276c0be89 100644 --- a/pcr/emacs-auto-complete/PKGBUILD +++ b/pcr/emacs-auto-complete/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Alex Whitt <alex.joseph.whitt@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer (aur): Alex Whitt <alex.joseph.whitt@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # - added replaces for previous pkgname auto-complete (2018-02-01) diff --git a/pcr/emacs-color-theme/PKGBUILD b/pcr/emacs-color-theme/PKGBUILD index 7aab71d12..85ed831bb 100644 --- a/pcr/emacs-color-theme/PKGBUILD +++ b/pcr/emacs-color-theme/PKGBUILD @@ -1,8 +1,6 @@ -# $Id: PKGBUILD 59903 2011-12-02 11:18:13Z andrea $ -# Maintainer (AUR: -# Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (AUR): Cesar Romero <cesar.romero@gmail.com> -# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Cesar Romero <cesar.romero@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # no changes. diff --git a/pcr/emacs-dash/PKGBUILD b/pcr/emacs-dash/PKGBUILD index 7cd35e4d4..9f8baa0d3 100644 --- a/pcr/emacs-dash/PKGBUILD +++ b/pcr/emacs-dash/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (AUR): ebiadsu +# Contributor: ebiadsu # Previous Maintainer (AUR): holos -# Contributor (AUR): Sebastien Duthil <duthils@free.fr> -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Sebastien Duthil <duthils@free.fr> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> # parabola changes and rationale: # no changes. diff --git a/pcr/emacs-elib/PKGBUILD b/pcr/emacs-elib/PKGBUILD index 970a040b0..ccd467a6d 100644 --- a/pcr/emacs-elib/PKGBUILD +++ b/pcr/emacs-elib/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): J. Bromley <jbromley@gmail.com> -# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: J. Bromley <jbromley@gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # - upstream pkgbuild is gone, but we keep maintaining this. diff --git a/pcr/emacs-ess/PKGBUILD b/pcr/emacs-ess/PKGBUILD index eb17caecc..3a364ee08 100644 --- a/pcr/emacs-ess/PKGBUILD +++ b/pcr/emacs-ess/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Stefan Husmann <Stefan-Husmann@t-online.de> +# Maintainer (arch): Stefan Husmann <Stefan-Husmann@t-online.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=emacs-ess pkgver=16.04 diff --git a/pcr/emacs-fuzzy/PKGBUILD b/pcr/emacs-fuzzy/PKGBUILD index eff83bbdd..e7a53be7f 100644 --- a/pcr/emacs-fuzzy/PKGBUILD +++ b/pcr/emacs-fuzzy/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Alex Whitt <alex.joseph.whitt@gmail.com> +# Maintainer (aur): Alex Whitt <alex.joseph.whitt@gmail.com> # parabola changes and rationale: # no changes diff --git a/pcr/emacs-jabber/PKGBUILD b/pcr/emacs-jabber/PKGBUILD index 8e856ba1e..0c6d2e4c3 100644 --- a/pcr/emacs-jabber/PKGBUILD +++ b/pcr/emacs-jabber/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Maintainer: Parabola Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/emacs-js2-mode/PKGBUILD b/pcr/emacs-js2-mode/PKGBUILD index 5e4a234dd..3f90b7ac2 100644 --- a/pcr/emacs-js2-mode/PKGBUILD +++ b/pcr/emacs-js2-mode/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Hauke Wesselmann <hauke@h-dawg.de> -# Contributor (Arch): xgdgsc <xgdgsc at gmail dot com> -# Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Hauke Wesselmann <hauke@h-dawg.de> +# Contributor: xgdgsc <xgdgsc at gmail dot com> +# Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=emacs-js2-mode diff --git a/pcr/emacs-lucid/PKGBUILD b/pcr/emacs-lucid/PKGBUILD index 9a087bbf8..c177a0ae4 100644 --- a/pcr/emacs-lucid/PKGBUILD +++ b/pcr/emacs-lucid/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (Arch:emacs): Juergen Hoetzel <juergen@archlinux.org> -# Contributor (Arch:emacs): Renchi Raju <renchi@green.tam.uiuc.edu> +# Maintainer (arch:emacs): Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> _pkgname=emacs pkgname=emacs-lucid diff --git a/pcr/emacs-magit/PKGBUILD b/pcr/emacs-magit/PKGBUILD index 8dcf0785c..b90de91eb 100644 --- a/pcr/emacs-magit/PKGBUILD +++ b/pcr/emacs-magit/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Esben Haabendal <esben@haabendal.dk> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer (aur): Esben Haabendal <esben@haabendal.dk> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # - added replaces for previous pkgname 'emacs-magit-git' (2018-02-02) diff --git a/pcr/emacs-newlisp-mode-git/PKGBUILD b/pcr/emacs-newlisp-mode-git/PKGBUILD index 01be9fb85..b094a1073 100644 --- a/pcr/emacs-newlisp-mode-git/PKGBUILD +++ b/pcr/emacs-newlisp-mode-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer (arch): Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/emacs-org-mode/PKGBUILD b/pcr/emacs-org-mode/PKGBUILD index 717a174f7..95c26123a 100644 --- a/pcr/emacs-org-mode/PKGBUILD +++ b/pcr/emacs-org-mode/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Davor Balder <dbalder@ozemail.com.au> -# Contributor (AUR): Jiyunatori <tori_LEAVETHISOUT_@0xc29.net> -# Contributor (AUR): mdev -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer (aur): Davor Balder <dbalder@ozemail.com.au> +# Contributor: Jiyunatori <tori_LEAVETHISOUT_@0xc29.net> +# Contributor: mdev +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/emacs-popup-el/PKGBUILD b/pcr/emacs-popup-el/PKGBUILD index 5d50f5800..62680a4b3 100644 --- a/pcr/emacs-popup-el/PKGBUILD +++ b/pcr/emacs-popup-el/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): yuki-san <yuki.from.akita@gmail.com> +# Maintainer (aur): yuki-san <yuki.from.akita@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/emacs-tuareg-mode/PKGBUILD b/pcr/emacs-tuareg-mode/PKGBUILD index 71d4af892..dd797d1bf 100644 --- a/pcr/emacs-tuareg-mode/PKGBUILD +++ b/pcr/emacs-tuareg-mode/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Limao Luo <luolimao+AUR@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Limao Luo <luolimao+AUR@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # - upstream pkgbuild is gone but we keep maintaining this. diff --git a/pcr/emacs-with-editor-git/PKGBUILD b/pcr/emacs-with-editor-git/PKGBUILD index 01aad15e5..4bf544938 100644 --- a/pcr/emacs-with-editor-git/PKGBUILD +++ b/pcr/emacs-with-editor-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Esben Haabendal <esben@haabendal.dk> +# Maintainer (aur): Esben Haabendal <esben@haabendal.dk> # parabola changes and rationale: # - added missing makedepends: git diff --git a/pcr/emhacks/PKGBUILD b/pcr/emhacks/PKGBUILD index e4df353d9..d90030831 100644 --- a/pcr/emhacks/PKGBUILD +++ b/pcr/emhacks/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Junmin Huang <junmin(dot)h(at)gmail(dot)com> -# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Junmin Huang <junmin(dot)h(at)gmail(dot)com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # upstream pkgbuild is gone, but we keep maintaining this diff --git a/pcr/endless-sky/PKGBUILD b/pcr/endless-sky/PKGBUILD deleted file mode 100644 index 191e7bda8..000000000 --- a/pcr/endless-sky/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer (AUR): George Rawlinson <george@rawlinson.net.nz> -# Contributor (AUR): Max Zhao <alcasa dot mz at gmail dot com> -# Contributor (AUR): Leonard König <leonard.r.koenig at googlemail dot com> - -# parabola changes and rationale: -# no changes. - -pkgname=endless-sky -pkgver=0.9.12 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://endless-sky.github.io/" -depends=(openal libpng glew hicolor-icon-theme libjpeg-turbo sdl2 libmad) -makedepends=(scons) -optdepends=('endless-sky-high-dpi: high resolution graphics assets' - 'endless-sky-editor: map editor') -license=('GPL3' 'CCPL' 'custom:public domain') -pkgdesc="A space exploration and combat game similar to Escape Velocity" -source=("$pkgname-$pkgver.tar.gz::https://github.com/endless-sky/endless-sky/archive/v${pkgver}.tar.gz") -sha512sums=('694d3c6f50f80e8b4ff79580fa9510fde26a846dd227736af96a3eda7810d68b2ae051a72c0e02fe88eae9d839e48933614aa172a9bed6653e03ad30feaddc05') - -build() { - cd $pkgname-$pkgver - # remove -jnproc for reproducible builds - scons -j "$(nproc)" -} - - -package() { - cd $pkgname-$pkgver - - # Install executable - install -Dm755 -t "${pkgdir}/usr/bin" endless-sky - - # resources - install -Dm644 credits.txt "${pkgdir}/usr/share/games/${pkgname}/credits.txt" - install -Dm644 keys.txt "${pkgdir}/usr/share/games/${pkgname}/keys.txt" - cp -rf data images sounds "${pkgdir}/usr/share/games/${pkgname}/" - - # .desktop - install -Dm644 -t "${pkgdir}/usr/share/applications" endless-sky.desktop - - # icons - for res in 16 22 24 32 48 128 256 512; do - install -Dm644 \ - "${srcdir}/${pkgname}-${pkgver}/icons/icon_${res}x${res}.png" \ - "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/${pkgname}.png" - done - - # manpage - install -Dm644 -t "${pkgdir}/usr/share/man/man6" endless-sky.6 - - # copyright - install -Dm644 copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/eterm/PKGBUILD b/pcr/eterm/PKGBUILD index 3e2a2f5d7..8b3d06197 100644 --- a/pcr/eterm/PKGBUILD +++ b/pcr/eterm/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> -# Contributor (Arch): Adam 'battlemidget' Stokes <adam.stokes@gmail.com> -# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Brad Fanella <bradfanella@archlinux.us> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=eterm pkgver=0.9.6 diff --git a/pcr/eudev/PKGBUILD b/pcr/eudev/PKGBUILD index 9c9fe6ed1..a735a460d 100644 --- a/pcr/eudev/PKGBUILD +++ b/pcr/eudev/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Artix): artoo <artoo@manjaro.org> -# Contributor (Arch): Alexey D. <lq07829icatm@rambler.ru> -# Contributor (Arch): Ivailo Monev <xakepa10@gmail.com> +# Maintainer (artix): artoo <artoo@manjaro.org> +# Contributor: Alexey D. <lq07829icatm@rambler.ru> +# Contributor: Ivailo Monev <xakepa10@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _udev_ver=220 diff --git a/pcr/evolution-mapi/PKGBUILD b/pcr/evolution-mapi/PKGBUILD index b6bde7e60..3b8b6753f 100644 --- a/pcr/evolution-mapi/PKGBUILD +++ b/pcr/evolution-mapi/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Heenry78 <henry78@gmx.at> -# Contributor (Arch): ngoonee <ngoonee.talk@gmail.com> -# Contributor (Arch): Marco A Rojas <marquicus@gmail.com> +# Maintainer (arch): Heenry78 <henry78@gmx.at> +# Contributor: ngoonee <ngoonee.talk@gmail.com> +# Contributor: Marco A Rojas <marquicus@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=evolution-mapi pkgver=3.16.2 diff --git a/pcr/evrouter/PKGBUILD b/pcr/evrouter/PKGBUILD index 7ca133f45..34bf2cf42 100644 --- a/pcr/evrouter/PKGBUILD +++ b/pcr/evrouter/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: Jonathan Liu <net147@gmail.com> -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=evrouter pkgver=0.4 diff --git a/pcr/extremetuxracer/PKGBUILD b/pcr/extremetuxracer/PKGBUILD index b2a4b1e55..de2851161 100644 --- a/pcr/extremetuxracer/PKGBUILD +++ b/pcr/extremetuxracer/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org> -# Contributor (Arch): Eric Belanger <eric.archlinux.org> -# Contributor (Arch): Fabio Scotoni <CCuleX.gmail.com> -# Contributor (Arch): Alexander Rødseth <rodseth@gmail.com> +# Maintainer (arch): Ronald van Haren <ronald.archlinux.org> +# Contributor: Eric Belanger <eric.archlinux.org> +# Contributor: Fabio Scotoni <CCuleX.gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/fair-coin/PKGBUILD b/pcr/fair-coin/PKGBUILD index 4aaea0309..034020d78 100644 --- a/pcr/fair-coin/PKGBUILD +++ b/pcr/fair-coin/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Eugenio M. Vigo <emvigo@gmail.com> +# Maintainer (arch): Eugenio M. Vigo <emvigo@gmail.com> # Co-mantainer (Arch): Rubén Fdes. Moreira <ruben.fdesmoreira@openmailbox.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> diff --git a/pcr/fcode-utils/PKGBUILD b/pcr/fcode-utils/PKGBUILD new file mode 100644 index 000000000..3d0f34468 --- /dev/null +++ b/pcr/fcode-utils/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer (aur): Jean Lucas <jean@4ray.co> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# - Updated to version 1.0.3 +# - Added armv7h support + +pkgname=fcode-utils +pkgver=1.0.3 +pkgrel=1 +pkgdesc="Utilities to process FCODE, OpenFirmware's byte code" +arch=(armv7h i686 x86_64) +url=https://www.openfirmware.info/FCODE_suite +license=(GPL2) +depends=(glibc) +provides=(romheaders) +conflicts=(fcode-utils-git) +source=(https://github.com/openbios/fcode-utils/archive/v$pkgver.tar.gz) +sha512sums=('7f64d3ac5c10184efc0993a748a5dcbf9aa0b71dee059c9b97b3656e61cdd7ed9395e830435eab5878ece80df001cf9420065b1611e8bb011274e26aad20f3f0') + +build() { + cd $pkgname-$pkgver + make +} + +package() { + cd $pkgname-$pkgver + install -D detok/detok romheaders/romheaders toke/toke -t "$pkgdir"/usr/bin + install -Dm 644 README -t "$pkgdir"/usr/share/doc/fcode-utils + install -Dm 644 COPYING "$pkgdir"/usr/share/licenses/fcode-utils/LICENSE +} diff --git a/pcr/ffingerd/PKGBUILD b/pcr/ffingerd/PKGBUILD index 9cca47110..ca11d4ec8 100644 --- a/pcr/ffingerd/PKGBUILD +++ b/pcr/ffingerd/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=ffingerd pkgver=1.28 pkgrel=5 diff --git a/pcr/filemq/PKGBUILD b/pcr/filemq/PKGBUILD index a45894158..d12a16377 100644 --- a/pcr/filemq/PKGBUILD +++ b/pcr/filemq/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=filemq pkgver=v1.0a.r180.g8940f34 pkgrel=1 diff --git a/pcr/firefox-pwa/PKGBUILD b/pcr/firefox-pwa/PKGBUILD new file mode 100644 index 000000000..7af3fb5fe --- /dev/null +++ b/pcr/firefox-pwa/PKGBUILD @@ -0,0 +1,76 @@ +# Maintainer: filips <projects at filips dot si> +# Maintainer: Peter Cai <peter at typeblog dot net> +# Contributor: TheFool <rn6l05d28@relay.firefox.com> + +# This file is automatically updated/generated on every package release +# Any changes made directly to the AUR repository will be overwritten +# Please contribute changes to the main GitHub repository instead +# See: https://github.com/filips123/PWAsForFirefox/blob/main/native/packages/aur/firefox-pwa/PKGBUILD + +_pkgname="PWAsForFirefox" +pkgname="firefox-pwa" +pkgdesc="A tool to install, manage and use Progressive Web Apps (PWAs) in Mozilla Firefox (native component)" +pkgver="2.11.1" +pkgrel=1 +url="https://pwasforfirefox.filips.si/" +arch=("x86_64" "i686") +license=("MPL2") + +makedepends=("rust" "cargo") +#optdepends=("firefox: Support for browser extension") +install=package.install + +source=("$pkgname-$pkgver.tar.gz::https://github.com/filips123/PWAsForFirefox/archive/refs/tags/v$pkgver.tar.gz") +sha256sums=('a65b30224e02e9348177308ad6bcebf37d388ed88fe5cc3d49765435850caa2d') +b2sums=('a7b6cd7c9b3c3206e617a6adbb0ea0dea6887ab0e9c519e391c97f2becb043f647cc68898ed6202f326fdf110816208c00c9f74d30795f452dcec8d1cd561933') + +prepare() { + cd $srcdir/$_pkgname-$pkgver/native/ + + # Set the correct version in source files + sed -i "s/version = \"0.0.0\"/version = \"$pkgver\"/g" Cargo.toml + sed -i "s/DISTRIBUTION_VERSION = '0.0.0'/DISTRIBUTION_VERSION = '$pkgver'/g" userchrome/profile/chrome/pwa/chrome.jsm + + # We don't use libexec on Arch + sed -i "s@/usr/libexec/firefoxpwa-connector@/usr/lib/firefoxpwa/firefoxpwa-connector@g" manifests/linux.json +} + +build() { + cd $srcdir/$_pkgname-$pkgver/native/ + RUSTUP_TOOLCHAIN=stable cargo build --release +} + +check() { + cd $srcdir/$_pkgname-$pkgver/native/ + [ "$(./target/release/firefoxpwa --version)" == "firefoxpwa $pkgver" ] +} + +package() { + cd $srcdir/$_pkgname-$pkgver/native/ + + # Executables + install -Dm755 target/release/firefoxpwa $pkgdir/usr/bin/firefoxpwa + install -Dm755 target/release/firefoxpwa-connector $pkgdir/usr/lib/firefoxpwa/firefoxpwa-connector + + # Manifest + install -Dm644 manifests/linux.json $pkgdir/usr/lib/mozilla/native-messaging-hosts/firefoxpwa.json + + # Completions + install -Dm755 target/release/completions/firefoxpwa.bash $pkgdir/usr/share/bash-completion/completions/firefoxpwa + install -Dm755 target/release/completions/firefoxpwa.fish $pkgdir/usr/share/fish/vendor_completions.d/firefoxpwa.fish + install -Dm755 target/release/completions/_firefoxpwa $pkgdir/usr/share/zsh/vendor-completions/_firefoxpwa + + # UserChrome + mkdir -p $pkgdir/usr/share/firefoxpwa/userchrome/ + cp -r userchrome/* $pkgdir/usr/share/firefoxpwa/userchrome/ + + # Documentation + install -Dm644 ../README.md $pkgdir/usr/share/doc/firefoxpwa/README.md + install -Dm644 ../native/README.md $pkgdir/usr/share/doc/firefoxpwa/README-NATIVE.md + install -Dm644 ../extension/README.md $pkgdir/usr/share/doc/firefoxpwa/README-EXTENSION.md + install -Dm644 packages/deb/copyright $pkgdir/usr/share/doc/firefoxpwa/copyright + + # AppStream Metadata + install -Dm644 packages/appstream/si.filips.FirefoxPWA.metainfo.xml $pkgdir/usr/share/metainfo/si.filips.FirefoxPWA.metainfo.xml + install -Dm644 packages/appstream/si.filips.FirefoxPWA.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/si.filips.FirefoxPWA.svg +} diff --git a/pcr/firefox-pwa/package.install b/pcr/firefox-pwa/package.install new file mode 100644 index 000000000..b32c802c5 --- /dev/null +++ b/pcr/firefox-pwa/package.install @@ -0,0 +1,5 @@ +post_install() { + echo "You have successfully installed the native part of the PWAsForFirefox project" + echo "You should also install the Firefox extension if you haven't already" + echo "Download: https://addons.mozilla.org/firefox/addon/pwas-for-firefox/" +} diff --git a/pcr/flashbench-git/PKGBUILD b/pcr/flashbench-git/PKGBUILD index 489962b05..4d3f96b75 100644 --- a/pcr/flashbench-git/PKGBUILD +++ b/pcr/flashbench-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): lestb <tkhdlstfl dot l plus aur at gmail dot com> -# Contributor (Arch): Marti Raudsepp <marti@juffo.org> +# Maintainer (arch): lestb <tkhdlstfl dot l plus aur at gmail dot com> +# Contributor: Marti Raudsepp <marti@juffo.org> pkgname=flashbench-git pkgver=r62.2e30b19 diff --git a/pcr/flashprog/PKGBUILD b/pcr/flashprog/PKGBUILD new file mode 100644 index 000000000..8c270fd11 --- /dev/null +++ b/pcr/flashprog/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer (aur): Nico Huber <nico.h@gmx.de> +# Maintainer: Wael Karram <wael AT waelk.tech> + + +# Parabola Changes and Rationale +# 1) Clarified license version (GPLv2 only). +# 2) Dropped unsupported architectures. +# 3) removed support for incompatible 'libgpiod' + + +pkgname="flashprog" +pkgdesc="utility which can be used to detect, read, erase, or write BIOS chips (DIP, PLCC, SPI)" +pkgver=1.0.1 +pkgrel=1 +url="https://flashprog.org/" +license=('GPL2') +source=(http://flashprog.org/releases/flashprog-v1.0.1.tar.bz2{,.asc}) +validpgpkeys=('2853079C9C66AB7E82C64966A5C163B7E557CAEB') +sha256sums=('888863dfc254a9dd7c00dfdac8a31a74879c31db5c16375fb3f216347c03cc71' + 'SKIP') +depends=('pciutils' 'libusb' 'libftdi' 'libjaylink' 'libgpiod') +depends=( ${depends[*]/libgpiod/} ) # libgpiod >=2.0 is incompatible +optdepends=("dmidecode: for SMBIOS/DMI table decoder support") +arch=('riscv64' 'aarch64' 'armv6h' 'armv7h' 'i686' 'x86_64') +arch=( ${arch[*]/armv6h/} ) + + +build() { + cd "${srcdir}/${pkgname}-v${pkgver}" + make CONFIG_LINUX_GPIO_SPI=no +} + +package() { + cd "${srcdir}/${pkgname}-v${pkgver}" + install -d "${pkgdir}/usr/bin" + install -d "${pkgdir}/usr/man/man8" + install -m 0755 flashprog "${pkgdir}/usr/bin/" + install -m 0644 flashprog.8 "${pkgdir}/usr/man/man8/" + + # armv7h fails to build 'ich_descriptors_tool' + [[ "${CARCH}" == armv7h ]] || + install -m 0755 util/ich_descriptors_tool/ich_descriptors_tool "${pkgdir}/usr/bin/" +} diff --git a/pcr/flpsed/PKGBUILD b/pcr/flpsed/PKGBUILD index 6f3fc013a..c1319a9a2 100644 --- a/pcr/flpsed/PKGBUILD +++ b/pcr/flpsed/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR): Pekman <pekman@openmailbox.org> -# Contributor (AUR): Ivy Foster <joyfulgirl (at) archlinux.us> -# Contributor (AUR): Giorgio Lando <patroclo7@gmail.com> +# Maintainer (aur): Pekman <pekman@openmailbox.org> +# Contributor: Ivy Foster <joyfulgirl (at) archlinux.us> +# Contributor: Giorgio Lando <patroclo7@gmail.com> pkgname=flpsed pkgver=0.7.3 diff --git a/pcr/fomu-verilog-blink/PKGBUILD b/pcr/fomu-verilog-blink/PKGBUILD index 6cf533682..68f36c6a5 100644 --- a/pcr/fomu-verilog-blink/PKGBUILD +++ b/pcr/fomu-verilog-blink/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2021 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=fomu-verilog-blink pkgver=0.1 diff --git a/pcr/font-manager/PKGBUILD b/pcr/font-manager/PKGBUILD index 9538c30c5..07eba634b 100644 --- a/pcr/font-manager/PKGBUILD +++ b/pcr/font-manager/PKGBUILD @@ -1,9 +1,9 @@ # Author (AUR): Dies <JerryCasiano(at)gmail(dot)com> -# Maintainer (AUR): Joeny Ang <ang(dot)joeny(at)gmail(dot)com> -# Contributor (AUR): Guan 'kuno' Qing <neokuno(at)gmail(dot)com> -# Contributor (AUR): Guten Ye <ywzhaifei(at)gmail(dot)com> -# Contributor (AUR): i_magnific0 <i_magnific0(at)yahoo(dot)com> -# Contributor (AUR): Pavlo <pavlofreemen(at)gmail(dot)com> +# Maintainer (aur): Joeny Ang <ang(dot)joeny(at)gmail(dot)com> +# Contributor: Guan 'kuno' Qing <neokuno(at)gmail(dot)com> +# Contributor: Guten Ye <ywzhaifei(at)gmail(dot)com> +# Contributor: i_magnific0 <i_magnific0(at)yahoo(dot)com> +# Contributor: Pavlo <pavlofreemen(at)gmail(dot)com> # Contributor: Esteban Carnevale <alfplayer@mailoo.org> # parabola changes and rationale: diff --git a/pcr/fonts-meta/PKGBUILD b/pcr/fonts-meta/PKGBUILD index bd18251f8..41c1b16b3 100644 --- a/pcr/fonts-meta/PKGBUILD +++ b/pcr/fonts-meta/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: David P. <megver83@parabola.nu> pkgname=fonts-meta -pkgver=20200817 # date +%Y%m%d +pkgver=20220428 # date +%Y%m%d pkgrel=1 pkgdesc='Metapackage that installs all available fonts' arch=(any) @@ -24,6 +24,7 @@ depends=( gentium-plus-font gnu-free-fonts gsfonts + hex-unifont inter-font noto-fonts-cjk noto-fonts-emoji @@ -43,10 +44,12 @@ depends=( otf-league-gothic otf-overpass otf-stix + otf-unifont + pcf-unifont powerline-fonts + psf-unifont tamsyn-font terminus-font - terminus-font-otb tex-gyre-fonts ttf-anonymous-pro ttf-arphic-ukai @@ -92,6 +95,7 @@ depends=( ttf-sarasa-gothic ttf-sazanami ttf-tibetan-machine + ttf-unifont woff2-fira-code woff-fira-code wqy-bitmapfont diff --git a/pcr/fonts-meta/fonts-meta.install b/pcr/fonts-meta/fonts-meta.install index b5c401b2b..701f5919f 100644 --- a/pcr/fonts-meta/fonts-meta.install +++ b/pcr/fonts-meta/fonts-meta.install @@ -1,7 +1,8 @@ pre_install() { cat <<EOM If you noted that a font package was not installed after you got ttf-fonts-meta, - please report it to mailto:dev@lists.parabola.nu + please report it on the Parabola bug tracker https://labs.parabola.nu/projects/packages/issues/new + or send email to mailto:dev@lists.parabola.nu EOM } diff --git a/pcr/fpdns/PKGBUILD b/pcr/fpdns/PKGBUILD index b143e8ce6..a51f6645a 100644 --- a/pcr/fpdns/PKGBUILD +++ b/pcr/fpdns/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: David P. <megver83@parabola.nu> -# Contributor (Arch): Ermak <ermak@email.it> +# Contributor: Ermak <ermak@email.it> # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname='fpdns' diff --git a/pcr/frame/PKGBUILD b/pcr/frame/PKGBUILD index ed641568b..1a19ee065 100644 --- a/pcr/frame/PKGBUILD +++ b/pcr/frame/PKGBUILD @@ -1,4 +1,5 @@ -# Contributor (AUR): Nicolas Quiénot < niQo at aur > +# Contributor: Nicolas Quiénot < niQo at aur > +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # no changes. diff --git a/pcr/freecolor/PKGBUILD b/pcr/freecolor/PKGBUILD index 3a6b63c5e..c4262c5c4 100644 --- a/pcr/freecolor/PKGBUILD +++ b/pcr/freecolor/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Mariusz Libera <mariusz.libera@gmail.com> -# Contributor (Arch): Vinzenz Vietzke <vinz@archlinux.us> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Mariusz Libera <mariusz.libera@gmail.com> +# Contributor: Vinzenz Vietzke <vinz@archlinux.us> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=freecolor pkgver=0.8.8 pkgrel=3 diff --git a/pcr/freedoom/PKGBUILD b/pcr/freedoom/PKGBUILD index 2ddcfda2f..da0a033e0 100644 --- a/pcr/freedoom/PKGBUILD +++ b/pcr/freedoom/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Mike Swanson <mikeonthecomputer@gmail.com> -# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Maintainer (aur): Mike Swanson <mikeonthecomputer@gmail.com> +# Contributor: André Silva <emulatorman@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=(freedoom freedm) diff --git a/pcr/freefilesync/PKGBUILD b/pcr/freefilesync/PKGBUILD index 1fdd489ce..8ef33d9d5 100644 --- a/pcr/freefilesync/PKGBUILD +++ b/pcr/freefilesync/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (aur): chenxing <cxcxcxcx AT gmail DOT com> -# Contributor (aur): Michael Burkhard <Michael DOT Burkhard AT web DOT de> -# Contributor (aur): alexmo82 <25396682 AT live DOT it> -# Contributor (aur): Simon Brulhart <simon@brulhart.me> +# Contributor: chenxing <cxcxcxcx AT gmail DOT com> +# Contributor: Michael Burkhard <Michael DOT Burkhard AT web DOT de> +# Contributor: alexmo82 <25396682 AT live DOT it> +# Contributor: Simon Brulhart <simon@brulhart.me> # Maintainer (aur): jooch <jooch AT gmx DOT com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: bill-auger <bill-auger@programmer.net> diff --git a/pcr/freeipmi/PKGBUILD b/pcr/freeipmi/PKGBUILD index ffdd8713a..b4d5720a0 100644 --- a/pcr/freeipmi/PKGBUILD +++ b/pcr/freeipmi/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Phillip Smith <pkgbuild@phs.id.au> +# Maintainer (arch): Phillip Smith <pkgbuild@phs.id.au> # http://github.com/fukawi2/aur-packages -# Contributor (Arch): Nathan Owe <ndowens04 at gmail> +# Contributor: Nathan Owe <ndowens04 at gmail> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> ### I AM ONLY THE PACKAGER, NOT THE DEVELOPER diff --git a/pcr/freenet/PKGBUILD b/pcr/freenet/PKGBUILD index aaeb859de..8508d08dd 100644 --- a/pcr/freenet/PKGBUILD +++ b/pcr/freenet/PKGBUILD @@ -1,8 +1,6 @@ -# Maintainer (AUR): skydrome <skydrome at@at i2pmail do.t org> -# Contributors (AUR): - -# parabola changes and rationale: -# no changes. +# Maintainer (aur): skydrome <skydrome at@at proton mail dot com> +# Contributor: Thynix +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> _fred=#tag=build01478 _contrib=#tag=v50 diff --git a/pcr/freeradius-client/PKGBUILD b/pcr/freeradius-client/PKGBUILD index 6a243ac20..b7cc633ed 100644 --- a/pcr/freeradius-client/PKGBUILD +++ b/pcr/freeradius-client/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Brian Bidulock <bidulock@openss7.org> -# Contributor (AUR): Kalidarn +# Maintainer (aur): Brian Bidulock <bidulock@openss7.org> +# Contributor: Kalidarn pkgname=freeradius-client pkgver=1.1.7 diff --git a/pcr/freetuxtv/PKGBUILD b/pcr/freetuxtv/PKGBUILD index 67f933612..99e62cad0 100644 --- a/pcr/freetuxtv/PKGBUILD +++ b/pcr/freetuxtv/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Bernard Baeyens (berbae) <berbae52 at sfr dot fr> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Bernard Baeyens (berbae) <berbae52 at sfr dot fr> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=freetuxtv pkgver=0.6.6 pkgrel=2 diff --git a/pcr/frescobaldi/PKGBUILD b/pcr/frescobaldi/PKGBUILD index c53a8b9cf..6bf4322d5 100644 --- a/pcr/frescobaldi/PKGBUILD +++ b/pcr/frescobaldi/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (AUR): David Virgilio <drvirgilio@gmail.com> -# Contributor (AUR): David Zaragoza <david@zaragoza.com.ve> -# Contributor (AUR): Clément Démoulins <clement@archivel.fr> -# Maintainer (AUR): Raphaël Doursenaud <rdoursenaud@free.fr> +# Contributor: David Virgilio <drvirgilio@gmail.com> +# Contributor: David Zaragoza <david@zaragoza.com.ve> +# Contributor: Clément Démoulins <clement@archivel.fr> +# Maintainer (aur): Raphaël Doursenaud <rdoursenaud@free.fr> pkgname=frescobaldi pkgver=3.1.2 diff --git a/pcr/fso-unbootimg/PKGBUILD b/pcr/fso-unbootimg/PKGBUILD index b5acc6732..0b9a61b08 100644 --- a/pcr/fso-unbootimg/PKGBUILD +++ b/pcr/fso-unbootimg/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=fso-unbootimg pkgver=0.1.2 diff --git a/pcr/fwsnort/PKGBUILD b/pcr/fwsnort/PKGBUILD index b16f586e9..f0c98fe1e 100644 --- a/pcr/fwsnort/PKGBUILD +++ b/pcr/fwsnort/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Colin Shea <colin@evaryont.me> -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Colin Shea <colin@evaryont.me> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/gajim-plugin-omemo/PKGBUILD b/pcr/gajim-plugin-omemo/PKGBUILD deleted file mode 100644 index a25501859..000000000 --- a/pcr/gajim-plugin-omemo/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer (AUR): Bjoern Franke <bjo+aur at schafweide.org> -# Contributor (AUR): Tommaso Sardelli <lacapannadelloziotom AT gmail DOT com> - -# Maintainer: David P. <megver83@parabola.nu> -# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> - -# parabola changes and rationale: -# no changes. - -pkgname=gajim-plugin-omemo -_pkgname=omemo -pkgver=2.7.13 -pkgrel=1 -_pythonversion=3.9 -pkgdesc='Gajim plugin for OMEMO Multi-End Message and Object Encryption.' -arch=(any) -url='https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin' -license=('GPL') -depends=('gajim>=1.2.91' 'gajim<=1.3.90' 'python-qrcode' 'python-setuptools' 'python-cryptography' 'python-axolotl') -provides=('gajim-plugin-omemo') -conflicts=('gajim-plugin-omemo-git') -source=("https://ftp.gajim.org/plugins_releases/${_pkgname}_${pkgver}.zip") -sha512sums=('33f7d1132ed9e218e17c8288ad2586b1a9c6d547db93b5b9bb97abcb8df2541bba35d9cc3fcef74d13b35353636cb4ef652805d69eda878d361b029e62fd9ee2') - -package() { - cd "${srcdir}/${_pkgname}" - - # Remove unnecessary files - rm -r CHANGELOG COPYING - - # Install the plugin - install -d "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}" - cp -r * "${pkgdir}/usr/lib/python${_pythonversion}/site-packages/gajim/data/plugins/${_pkgname}/" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/gconf-gtk2/PKGBUILD b/pcr/gconf-gtk2/PKGBUILD index 8615e9eda..98f39254a 100644 --- a/pcr/gconf-gtk2/PKGBUILD +++ b/pcr/gconf-gtk2/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: bill-auger <bill-auger@programmer.net> -# Maintainer (AUR): Brian Bidulock <bidulock@openss7.org> -# Contributor (AUR): Jan de Groot <jan@archlinux.org> +# Maintainer (aur): Brian Bidulock <bidulock@openss7.org> +# Contributor: Jan de Groot <jan@archlinux.org> pkgname=gconf-gtk2 diff --git a/pcr/gconfmm/PKGBUILD b/pcr/gconfmm/PKGBUILD index 257afebab..493612183 100644 --- a/pcr/gconfmm/PKGBUILD +++ b/pcr/gconfmm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: bill-auger <bill-auger@programmer.net> -# Maintainer (AUR): Andrew Sun <adsun701 at gmail dot com> -# Contributor (AUR): Jan de Groot <jgc@archlinux.org> -# Contributor (AUR): Kritoke <typeolinux@yahoo.com> +# Maintainer (aur): Andrew Sun <adsun701 at gmail dot com> +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Kritoke <typeolinux@yahoo.com> pkgbase=gconfmm diff --git a/pcr/geis/PKGBUILD b/pcr/geis/PKGBUILD index e757906ca..906488f2a 100644 --- a/pcr/geis/PKGBUILD +++ b/pcr/geis/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Nicolas Quiénot <niQo @ AUR > -# Contributor (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to> +# Maintainer (aur): Nicolas Quiénot <niQo @ AUR > +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> # parabola changes and rationale: # no changes. diff --git a/pcr/gentoo-functions/PKGBUILD b/pcr/gentoo-functions/PKGBUILD deleted file mode 100644 index 7ae9d92f0..000000000 --- a/pcr/gentoo-functions/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): williamh <williamh@gentoo.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -# Contributor: Luke Shumaker <lukeshu@parabola.nu> - -# Gentoo's ebuild file: -# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild -pkgname=gentoo-functions -pkgver=0.12 -pkgrel=1 -pkgdesc="Base functions for Gentoo systems" -arch=('i686' 'x86_64' 'armv7h') -url="https://github.com/gentoo/$pkgname" -license=('GPL2') -source=("$pkgname-$pkgver.tar.gz::https://github.com/gentoo/${pkgname}/archive/${pkgver}.tar.gz") -sha256sums=('4a6ddb1d8be7b52aae68761fb26546663b6b0e74b155df263cddfbfa72373965') - -_makeargs=( - ROOTPREFIX=/usr - ROOTSBINDIR=/usr/bin -) - -build(){ - cd "$srcdir/$pkgname-$pkgver" - make "${_makeargs[@]}" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" "${_makeargs[@]}" install -} diff --git a/pcr/gigolo/PKGBUILD b/pcr/gigolo/PKGBUILD index 7db436696..9d78fef91 100644 --- a/pcr/gigolo/PKGBUILD +++ b/pcr/gigolo/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jan Misiak <fijam [at] archlinux.us> -# Maintainer: +# Maintainer: pkgname=gigolo pkgver=0.4.2 diff --git a/pcr/gimp-plugin-resynthesizer-git/PKGBUILD b/pcr/gimp-plugin-resynthesizer-git/PKGBUILD index 0de110ebc..156dc7866 100644 --- a/pcr/gimp-plugin-resynthesizer-git/PKGBUILD +++ b/pcr/gimp-plugin-resynthesizer-git/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Lex Black (autumn-wind at web.de) -# Contributor (Arch): andre.vmatos -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Lex Black (autumn-wind at web.de) +# Contributor: andre.vmatos +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _pkgname=resynthesizer pkgname=gimp-plugin-$_pkgname-git diff --git a/pcr/gimp-plugin-saveforweb/PKGBUILD b/pcr/gimp-plugin-saveforweb/PKGBUILD index 70a2b47fc..1c5764dc8 100644 --- a/pcr/gimp-plugin-saveforweb/PKGBUILD +++ b/pcr/gimp-plugin-saveforweb/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Cesar Alcalde <lambda512_at_gmail.com> -# Contributor (Arch): ValHue <vhuelamo_at_gmail_dot_com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Cesar Alcalde <lambda512_at_gmail.com> +# Contributor: ValHue <vhuelamo_at_gmail_dot_com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gimp-plugin-saveforweb pkgver=0.29.3 diff --git a/pcr/gimpfx-foundry/PKGBUILD b/pcr/gimpfx-foundry/PKGBUILD index e41c89e9b..3dbd3537c 100644 --- a/pcr/gimpfx-foundry/PKGBUILD +++ b/pcr/gimpfx-foundry/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Vitaliy Berdinskikh <skipper13@root.ua> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Vitaliy Berdinskikh <skipper13@root.ua> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: # - upstream pkgbuild is gone, but we keep maintaining this. diff --git a/pcr/ginn/PKGBUILD b/pcr/ginn/PKGBUILD index 2fcad0d50..9775b6798 100644 --- a/pcr/ginn/PKGBUILD +++ b/pcr/ginn/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Nicolas Quiénot <niQo @ aur> +# Maintainer (arch): Nicolas Quiénot <niQo @ aur> pkgname=ginn pkgver=0.2.6 diff --git a/pcr/gitflow-avh/PKGBUILD b/pcr/gitflow-avh/PKGBUILD index 9de87cc52..d5649c4d6 100644 --- a/pcr/gitflow-avh/PKGBUILD +++ b/pcr/gitflow-avh/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Stefan Tatschner <stefan@sevenbyte.org> +# Maintainer (arch): Stefan Tatschner <stefan@sevenbyte.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gitflow-avh diff --git a/pcr/glogg/PKGBUILD b/pcr/glogg/PKGBUILD index 9d23446e3..28df47b2c 100644 --- a/pcr/glogg/PKGBUILD +++ b/pcr/glogg/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer (arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: speps <speps at aur dot archlinux dot org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=glogg pkgver=1.1.3 diff --git a/pcr/gmid/PKGBUILD b/pcr/gmid/PKGBUILD new file mode 100644 index 000000000..dcf2c6bee --- /dev/null +++ b/pcr/gmid/PKGBUILD @@ -0,0 +1,190 @@ +# Maintainer (aur): Andrea Feletto <andrea at andreafeletto.com> +# Maintainer: Wael Karram <wael at waelk.tech> +# Contributor: bill-auger <bill-auger at programmer.net> + + +# parabola changes and rationale: +# - delete unlicensed files +# - add openrc service files +# - pin to strongly-coupled dependency versions + + +pkgname=gmid +pkgver=2.0.1 +pkgrel=1 +pkgdesc='Fast Gemini server written with security in mind.' +arch=('x86_64') +arch+=('i686' 'armv7h') +url='https://gmid.omarpolo.com' +license=('custom:ISC') +install=${pkgname}.install +backup=(etc/conf.d/${pkgname} + etc/${pkgname}.conf) +depends=('libretls' 'libbsd') +source=( + "https://ftp.omarpolo.com/$pkgname-$pkgver.tar.gz" + #"gmid.service" # parabola mksource over-ride + #"gmid.conf" # parabola mksource over-ride +) +sha256sums=('e009e3684906d469fc99d29e5622b73f2eb569a6c93c920f48663aa8df8731e6') + +# parabola mksource over-rides +mksource=( ${source[*]} ) +mksha256sums=( ${sha256sums[*]} ) +source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-${pkgver}.parabola.tar.gz{,.sig} + gmid.service + gmid.sysusers + gmid.confd + gmid.initd + gmid.conf + index.gmi) +sha256sums=('4513e6c4909334626b7af64142b7bf0012e1bc52fd3138c103d0024ca801e9db' + 'SKIP' + '946de0766343225068a0e3f38cb39a4a93ef312525dd775226b938cd08706b94' + '4d943727a57dbf5f246963c0f90ccc54919cc2296538457e6b16f29f7580d9d6' + 'eddbe93741d01077426bc0239db42815c75a0da5191b4e6528df60ae3e0e5bb3' + 'f396c7db961c45ddb8e48acf42708b3faf9df2a3eaa56f30d9e64d4de0971e88' + '7acf491fee5f2693b30666b1f2c6eb0a4db33e9ef3154e1cbfb62186c6fa7be6' + '361cd4ef2b47437b0f5729d56d0ef88851e56812ab88546c82cda0092fe86139') +validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger + + +# NOTE: The files removed in mksource() are not always present. +# They tend to disappear and re-appear. +_MKSOURCE_ERR_FMT="ERROR: %s - mksource() was not applied or needs re-working - sources may contain non-free files" +_NONFREE_FILES=( contrib ) +_PREV_NONFREE_FILES=( site ) + + +_version_constraint() # (dep_pkgname [precision]) +{ + Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } + + + local dep_pkgname=$1 + declare -i req_precision=$2 + local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) + local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) + local def_precision=$(( n_dots + 1 )) + local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) + local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) + local pkgver_rx='[0-9A-Za-z_]+' + pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, + # but some pkgver have it (eg: 5.15.10+kde+r130) + local subver_rx='\.'${pkgver_rx} + local pkgrel_rx='[0-9]+' + local garbage_rx='[^0-9].*' + local capture_rx=${pkgver_rx} + for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; + local version pkgrel has_dot_char version_min version_max constraint_string + declare -i subver subver_inc pkgrel_inc + + if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] + then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision + #unused=${BASH_REMATCH[2]} # discarded pkgver segments + pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed + has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) + subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric + version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) + subver_inc=$(( subver + 1 )) + pkgrel_inc=$(( pkgrel + 1 )) + version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ + echo ${version} ) + version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ + ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ + echo ${subver_inc} ) + constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" + + Log "Applied version constraint: '${constraint_string}'" + else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" + exit 1 + fi + + unset -f Log + + echo -n "${constraint_string}" +} + + +mksource() { + cd "$srcdir/$pkgname-$pkgver" + + # Remove unlicensed files + local nonfree_file + local err_msgs=() + for nonfree_file in "${_NONFREE_FILES[@]}" + do + if [[ ! -e ${nonfree_file} ]] + then + err_msgs+=( "nonfree_file: '${nonfree_file}' does not exist" ) + elif ! rm -r ${nonfree_file} + then + err_msgs+=( "cannot delete nonfree_file: '${nonfree_file}'" ) + fi + done + for nonfree_file in "${_PREV_NONFREE_FILES[@]}" + do + if [[ -e ${nonfree_file} ]] + then + err_msgs+=( "previous nonfree_file: '${nonfree_file}' re-appeared" ) + fi + done + + # display error report + if (( ${#err_msgs} )) + then printf "${_MKSOURCE_ERR_FMT}" "${err_msgs[@]}" + return 1 + fi +} + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # verify mksource treatment + local nonfree_file + local err_msgs=() + for nonfree_file in "${_NONFREE_FILES[@]}" + do + if [[ -d ${nonfree_file} ]] + then + err_msgs+=( "nonfree_file: '${nonfree_file}' found - deleting" ) + rm -rf ${nonfree_file} + fi + done + + # display error report + if (( ${#err_msgs} )) + then + printf "${_MKSOURCE_ERR_FMT/ERROR:\ /WARNING:\ }" "${err_msgs[@]}" + fi +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + MANDIR='usr/share/man/' ./configure --prefix='usr/' + make +} + +package() { + # pin to strongly-coupled dependency versions + depends=( ${depends[*]/libretls/} $(_version_constraint libretls) ) + + cd "$srcdir" + + # Install the config and service files. + install -Dm644 gmid.service -t "$pkgdir/usr/lib/systemd/system" + install -Dm644 gmid.sysusers -t "$pkgdir/usr/lib/sysusers.d" + install -Dm644 gmid.confd "$pkgdir/etc/conf.d/gmid" + install -Dm755 gmid.initd "$pkgdir/etc/init.d/gmid" + install -Dm644 gmid.conf "$pkgdir/etc/gmid.conf" + + # Install the program files. + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # Install the documentation files. + install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname" + install -Dm644 README.md -t "$pkgdir/usr/share/doc/$pkgname" + install -Dm644 ../index.gmi "$pkgdir/usr/share/doc/$pkgname/index.gmi" +} diff --git a/pcr/gmid/gmid.conf b/pcr/gmid/gmid.conf new file mode 100644 index 000000000..24fe70971 --- /dev/null +++ b/pcr/gmid/gmid.conf @@ -0,0 +1,7 @@ +user "gmid" + +server "localhost" { + cert "/etc/ssl/certs/gmid.pem" + key "/etc/ssl/private/gmid.key" + root "/srv/gemini/" +} diff --git a/pcr/gmid/gmid.confd b/pcr/gmid/gmid.confd new file mode 100644 index 000000000..c58748f61 --- /dev/null +++ b/pcr/gmid/gmid.confd @@ -0,0 +1 @@ +GMID_USER='gmid' diff --git a/pcr/gmid/gmid.initd b/pcr/gmid/gmid.initd new file mode 100644 index 000000000..42f7eb947 --- /dev/null +++ b/pcr/gmid/gmid.initd @@ -0,0 +1,24 @@ +#!/usr/bin/openrc-run + +name="gmid" +description="gmid Gemini daemon" + + +depend() { + need net + after logger +} + +start() { + ebegin "Starting gmid" + start-stop-daemon --start --background --user ${GMID_USER} --name gmid \ + --make-pidfile --pidfile /run/gmid.pid \ + --exec /usr/bin/gmid -- -f -c /etc/gmid.conf + eend $? +} + +stop() { + ebegin "Stopping gmid" + start-stop-daemon --stop --pidfile /run/gmid.pid --user ${GMID_USER} + eend $? +} diff --git a/pcr/gmid/gmid.install b/pcr/gmid/gmid.install new file mode 100644 index 000000000..39c649be7 --- /dev/null +++ b/pcr/gmid/gmid.install @@ -0,0 +1,4 @@ +post_install() { + echo " ==> 'gmid' requires manual configuration and an SSL cert" + echo " see: https://wiki.parabola.nu/Gmid" +} diff --git a/pcr/gmid/gmid.service b/pcr/gmid/gmid.service new file mode 100644 index 000000000..bba037bf5 --- /dev/null +++ b/pcr/gmid/gmid.service @@ -0,0 +1,27 @@ +[Unit] +Description=gmid Gemini daemon +Documentation=man:gg(1) man:gmid(1) +After=network-online.target syslog.target +Wants=network-online.target + +[Service] +Type=simple +User=gmid +Group=nobody +ExecStart=/usr/bin/gmid -f -c /etc/gmid.conf +ExecStop=/bin/kill -TERM $MAINPID +ExecReload=/bin/kill -HUP $MAINPID +Restart=on-failure +RestartSec=10 +StandardOutput=journal +StandardError=inherit +SyslogIdentifier=gmid +ProtectSystem=strict +ProtectHome=true +ProtectKernelTunables=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectControlGroups=true + +[Install] +WantedBy=multi-user.target diff --git a/pcr/gmid/gmid.sysusers b/pcr/gmid/gmid.sysusers new file mode 100644 index 000000000..fb0a75827 --- /dev/null +++ b/pcr/gmid/gmid.sysusers @@ -0,0 +1 @@ +u gmid - "gmid Gemini server" - -
\ No newline at end of file diff --git a/pcr/gmid/index.gmi b/pcr/gmid/index.gmi new file mode 100644 index 000000000..c642a65c0 --- /dev/null +++ b/pcr/gmid/index.gmi @@ -0,0 +1,10 @@ +# Gemini sample index page + +Welcome to my gemini site! + +## Links + +=> gemini://gemini.circumlunar.space/docs/gemtext.gmi "gemtext" Markdown primer +=> gemini://gemini.parabola.nu Parabola GNU/Linux-libre (gemini interface) +=> gopher://gopher.parabola.nu Parabola GNU/Linux-libre (gopher interface) +=> https://www.parabola.nu Parabola GNU/Linux-libre (www interface) diff --git a/pcr/gmlive/PKGBUILD b/pcr/gmlive/PKGBUILD index 4c0f92e05..db7217a39 100644 --- a/pcr/gmlive/PKGBUILD +++ b/pcr/gmlive/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: corvolino <corvolino@archlinux.com.br> pkgname=gmlive diff --git a/pcr/gmqcc-git/PKGBUILD b/pcr/gmqcc-git/PKGBUILD index 2e36a5a1e..e56c65168 100644 --- a/pcr/gmqcc-git/PKGBUILD +++ b/pcr/gmqcc-git/PKGBUILD @@ -1,4 +1,5 @@ -# Contributor (Arch): matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org> +# Contributor: matthiaskrgr <matthiaskrgr _strange_curverd_character_ freedroid D0T org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=gmqcc-git pkgver=20130214 diff --git a/pcr/gmusicbrowser/PKGBUILD b/pcr/gmusicbrowser/PKGBUILD index ca9f7db14..9925b239c 100644 --- a/pcr/gmusicbrowser/PKGBUILD +++ b/pcr/gmusicbrowser/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Freemor <freemor@freemor.ca> -# Contributor (AUR): Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix -# Contributor (AUR): Spike29 <leguen.yannick@gmail.com> -# Contributor (AUR): jsteel <mail at jsteel dot org> -# Contributor (AUR): Corrado Primier <bardo@aur.archlinux.org> +# Contributor: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix +# Contributor: Spike29 <leguen.yannick@gmail.com> +# Contributor: jsteel <mail at jsteel dot org> +# Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=gmusicbrowser pkgver=1.1.16 diff --git a/pcr/gnoduino/PKGBUILD b/pcr/gnoduino/PKGBUILD index 3d719723f..16cd52d81 100644 --- a/pcr/gnoduino/PKGBUILD +++ b/pcr/gnoduino/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer (arch): speps <speps at aur dot archlinux dot org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gnoduino diff --git a/pcr/gnome-colors-icon-theme-extras/PKGBUILD b/pcr/gnome-colors-icon-theme-extras/PKGBUILD index a8f5df947..f66286516 100644 --- a/pcr/gnome-colors-icon-theme-extras/PKGBUILD +++ b/pcr/gnome-colors-icon-theme-extras/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Christian Hesse <arch@eworm.de> -# Contributor (Arch): mattia.b89 <mattia DOT b89 AT gmail DOT com> -# Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor (Arch): Shae Smittle <starfall87@gmail.com> +# Maintainer (arch): Christian Hesse <arch@eworm.de> +# Contributor: mattia.b89 <mattia DOT b89 AT gmail DOT com> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: Shae Smittle <starfall87@gmail.com> pkgname=gnome-colors-icon-theme-extras pkgver=5.5.1 diff --git a/pcr/gnome-colors-icon-theme/PKGBUILD b/pcr/gnome-colors-icon-theme/PKGBUILD index e3e481437..a0cbdae52 100644 --- a/pcr/gnome-colors-icon-theme/PKGBUILD +++ b/pcr/gnome-colors-icon-theme/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (Arch): Christian Hesse <arch@eworm.de> -# Contributor (Arch): BlackICE <manfredi at gmail.com> -# Contributor (Arch): jsteel <jsteel at aur.archlinux.org> -# Contributor (Arch): Arkham <arkham at archlinux dot us> -# Contributor (Arch): Artyom Smirnov <smirnoffjr@gmail.com> -# Contributor (Arch): Marius <marius at matamare dot ro> +# Maintainer (arch): Christian Hesse <arch@eworm.de> +# Contributor: BlackICE <manfredi at gmail.com> +# Contributor: jsteel <jsteel at aur.archlinux.org> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Artyom Smirnov <smirnoffjr@gmail.com> +# Contributor: Marius <marius at matamare dot ro> pkgname=gnome-colors-icon-theme pkgver=5.5.1 diff --git a/pcr/gnome-colors-revival/PKGBUILD b/pcr/gnome-colors-revival/PKGBUILD index 55b56becf..99e25dbd2 100644 --- a/pcr/gnome-colors-revival/PKGBUILD +++ b/pcr/gnome-colors-revival/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): polyzen <polycitizen@gmail.com> -# Contributor (AUR): Lauri Niskanen <ape@ape3000.com> -# Contributor (AUR): Arkham <arkham at archlinux dot us> -# Contributor (AUR): Artyom Smirnov <smirnoffjr@gmail.com> +# Maintainer (aur): polyzen <polycitizen@gmail.com> +# Contributor: Lauri Niskanen <ape@ape3000.com> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Artyom Smirnov <smirnoffjr@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/gnome-rdp/PKGBUILD b/pcr/gnome-rdp/PKGBUILD index a9e0f1312..06c6166ee 100644 --- a/pcr/gnome-rdp/PKGBUILD +++ b/pcr/gnome-rdp/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): Wayne Hartmann (DH4) <wayne@bitstorm.pw> -# Contributor (AUR): György Balló <ballogy@freestart.hu> -# Contributor (AUR): Hyperair <hyperair@gmail.com> -# Contributor (AUR): kumico <norrian@gmail.com> -# Contributor (AUR): adamruss <mail@russ.co.il> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer (aur): Wayne Hartmann (DH4) <wayne@bitstorm.pw> +# Contributor: György Balló <ballogy@freestart.hu> +# Contributor: Hyperair <hyperair@gmail.com> +# Contributor: kumico <norrian@gmail.com> +# Contributor: adamruss <mail@russ.co.il> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # no changes. diff --git a/pcr/gnome-shell-pomodoro/PKGBUILD b/pcr/gnome-shell-pomodoro/PKGBUILD index 036149f35..7fbb5a06d 100644 --- a/pcr/gnome-shell-pomodoro/PKGBUILD +++ b/pcr/gnome-shell-pomodoro/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Marcin Wieczorek <marcin@marcin.co> -# Contributor (AUR): Andrejs Mivreņiks <gim at fastmail dot fm> -# Contributor (AUR): Janne Haapsaari <haaja@iki.fi> -# Contributor (AUR): maus25 <mirko378@gmail.com> +# Maintainer (aur): Marcin Wieczorek <marcin@marcin.co> +# Contributor: Andrejs Mivreņiks <gim at fastmail dot fm> +# Contributor: Janne Haapsaari <haaja@iki.fi> +# Contributor: maus25 <mirko378@gmail.com> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD index 511e32468..3651c3da0 100644 --- a/pcr/gnuhealth/PKGBUILD +++ b/pcr/gnuhealth/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: André Silva <emulatorman@hyperbola.info> # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe> -# Contributor (Arch): SpepS <dreamspepser at yahoo dot it> -# Contributor (Arch): Ander <anderraso@gmail.com> +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Contributor: Ander <anderraso@gmail.com> pkgname=gnuhealth pkgver=3.0.7 diff --git a/pcr/gnuit/PKGBUILD b/pcr/gnuit/PKGBUILD index fbbd71330..eed0beec3 100644 --- a/pcr/gnuit/PKGBUILD +++ b/pcr/gnuit/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): James Reed <supplantr at archlinux dot info> -# Contributor (Arch): Leslie P. Polzer <polzer at stardawn dot org> -# Maintainer : Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.io> +# Contributor: James Reed <supplantr at archlinux dot info> +# Contributor: Leslie P. Polzer <polzer at stardawn dot org> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=gnuit pkgver=4.9.5 diff --git a/pcr/gnupg1/PKGBUILD b/pcr/gnupg1/PKGBUILD index a622e8e53..03f815071 100644 --- a/pcr/gnupg1/PKGBUILD +++ b/pcr/gnupg1/PKGBUILD @@ -1,6 +1,7 @@ # $Id: PKGBUILD 148992 2012-02-05 12:21:23Z andyrtr $ -# Contributor (AUR): Andreas Radke <andyrtr at archlinux.org> +# Contributor: Andreas Radke <andyrtr at archlinux.org> # Committer (AUR): Judd Vinet <jvinet@zeroflux.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - ignoring test suite failures diff --git a/pcr/gnuradio-osmosdr-xtrx/PKGBUILD b/pcr/gnuradio-osmosdr-xtrx/PKGBUILD index bcc797552..938d1c785 100644 --- a/pcr/gnuradio-osmosdr-xtrx/PKGBUILD +++ b/pcr/gnuradio-osmosdr-xtrx/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Kyle Keen <keenerd@gmail.com?> -# Contributor (Arch): Dominik Heidler <dheidler@gmail.com> +# Maintainer (arch): Kyle Keen <keenerd@gmail.com?> +# Contributor: Dominik Heidler <dheidler@gmail.com> # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> pkgname=gnuradio-osmosdr-xtrx _pkgname=gr-osmosdr diff --git a/pcr/gnustep-back/PKGBUILD b/pcr/gnustep-back/PKGBUILD index f2c1397ec..7f3229487 100644 --- a/pcr/gnustep-back/PKGBUILD +++ b/pcr/gnustep-back/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $ -# Maintainer (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer (AUR): Vesa Kaihlavirta <vegai@iki.fi> -# Contributor (AUR): Sebastian Sareyko <public@nooms.de> +# Maintainer (aur): <mumei AT airmail DOT cc> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> +# Maintainer: bill-auger <bill-auger@programmer.net> + + +# build order: (gnustep-base) <- gnustep-gui <- gnustep-back <- gnustep-netclasses -# parabola changes and rationale: -# no changes. pkgname=gnustep-back -pkgver=0.26.2 +pkgver=0.30.0 pkgrel=1 pkgdesc="The GNUstep GUI Backend" -arch=('x86_64' 'i686' 'armv7h') -url="http://www.gnustep.org/" +arch=(armv7h i686 x86_64) +url=http://www.gnustep.org/ license=('LGPL') depends=(libgl libxmu gcc-libs freetype2 cairo) -makedepends=('gnustep-make' 'gnustep-base' 'gnustep-gui' 'libffi' 'gcc-objc') -conflicts=('gnustep-back-svn') +depends+=(libgnustep-gui.so) +makedepends=('gnustep-make' 'gnustep-base' 'gnustep-gui>=0.30.0' 'libffi' 'gcc-objc') +makedepends=( ${makedepends[*]/gnustep-base/} ) # this is a run-time dependency (also deps of gnustep-gui) +makedepends=( ${makedepends[*]/gnustep-gui*/} ) # this is a run-time dependency groups=('gnustep-core') -source=(https://github.com/gnustep/libs-back/releases/download/back-${pkgver//./_}/gnustep-back-$pkgver.tar.gz) -#{,.sig}) # Upstream Signature wasn't correctly created -sha256sums=('1807306b47f3cdb9f30743b5706d0e618621459ddf6347fad8c838867ed23322') -# 'SKIP') -#validpgpkeys=('83AAE47CE829A4146EF83420CA868D4C99149679') +source=(https://github.com/gnustep/libs-back/releases/download/back-${pkgver//./_}/$pkgname-$pkgver.tar.gz{,.sig}) +sha256sums=('60177d44beebd0216be4aa7eea6cf009cf9ff844bc35f0eacd622bf710372cff' + 'SKIP') +validpgpkeys=('83AAE47CE829A4146EF83420CA868D4C99149679') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/pcr/gnustep-gui/PKGBUILD b/pcr/gnustep-gui/PKGBUILD index bdccf2257..21a05663c 100644 --- a/pcr/gnustep-gui/PKGBUILD +++ b/pcr/gnustep-gui/PKGBUILD @@ -1,33 +1,100 @@ -# $Id$ -# Maintainer (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer (AUR): Vesa Kaihlavirta <vegai@iki.fi> -# Contributor (AUR): Sebastian Sareyko <public@nooms.de> +# Maintainer (aur): <mumei AT airmail DOT cc> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Vesa Kaihlavirta <vegai@iki.fi> +# Contributor: Sebastian Sareyko <public@nooms.de> +# Maintainer: bill-auger <bill-auger@programmer.net> + + +# build order: (gnustep-base) <- gnustep-gui <- gnustep-back <- gnustep-netclasses -# parabola changes and rationale: -# no changes. pkgname=gnustep-gui -pkgver=0.26.2 +pkgver=0.30.0 pkgrel=1 pkgdesc="The GNUstep GUI class library" -arch=('x86_64' 'i686' 'armv7h') -url="http://www.gnustep.org/" +arch=(armv7h i686 x86_64) +url=http://www.gnustep.org/ license=('LGPL') -depends=('aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao') -makedepends=('gcc-objc' 'gnustep-base' 'gnustep-make') -conflicts=('gnustep-gui-svn') +depends=( + 'gcc-libs' + 'libjpeg' + 'libpng' + 'libtiff' +) +makedepends=( + 'gcc-objc' + 'gnustep-base' + 'gnustep-make' +) +makedepends=( ${makedepends[*]/gnustep-base/} ) # this is a run-time dependency +optdepends=( + 'aspell' + 'audiofile' + 'flite1: required for speech synthesis' + 'giflib' + 'libao' + 'libcups' + 'libsndfile' +) +provides=('libgnustep-gui.so') groups=('gnustep-core') options=('!makeflags') -source=(https://github.com/gnustep/libs-gui/releases/download/gui-${pkgver//./_}/gnustep-gui-${pkgver}.tar.gz) -#{,.sig}) # Upstream Signature wasn't correctly created -sha256sums=('09ab2ac10f4bf98f1254c6c525c752d1f7b13bf0e6cd95530452c504fae7b4db') -# 'SKIP') -#validpgpkeys=('83AAE47CE829A4146EF83420CA868D4C99149679') +source=(https://github.com/gnustep/libs-gui/releases/download/gui-${pkgver//./_}/$pkgname-$pkgver.tar.gz{,.sig}) +sha256sums=('469dcaa54ed05b2520a704c30c0761a75b3ade8428e2e64645fb7b38a15c3cc3' + 'SKIP') +validpgpkeys=('83AAE47CE829A4146EF83420CA868D4C99149679') -prepare() { - cd "$srcdir"/$pkgname-$pkgver + +_version_constraint() # (dep_pkgname [precision]) +{ + Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } + + + local dep_pkgname=$1 + declare -i req_precision=$2 + local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) + local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) + local def_precision=$(( n_dots + 1 )) + local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) + local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) + local pkgver_rx='[0-9A-Za-z_]+' + pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, + # but some pkgver have it (eg: 5.15.10+kde+r130) + local subver_rx='\.'${pkgver_rx} + local pkgrel_rx='[0-9]+' + local garbage_rx='[^0-9].*' + local capture_rx=${pkgver_rx} + for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; + local version pkgrel has_dot_char version_min version_max constraint_string + declare -i subver subver_inc pkgrel_inc + + if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] + then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision + #unused=${BASH_REMATCH[2]} # discarded pkgver segments + pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed + has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) + subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric + version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) + subver_inc=$(( subver + 1 )) + pkgrel_inc=$(( pkgrel + 1 )) + version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ + echo ${version} ) + version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ + ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ + echo ${subver_inc} ) + constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" + + Log "Applied version constraint: '${constraint_string}'" + else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" + exit 1 + fi + + unset -f Log + + echo -n "${constraint_string}" } + build() { cd "$srcdir"/$pkgname-$pkgver . /usr/share/GNUstep/Makefiles/GNUstep.sh @@ -36,6 +103,9 @@ build() { } package() { + # pin to strongly-coupled dependency versions + depends+=( $(_version_constraint gnustep-base 2) ) + cd "$srcdir"/$pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/pcr/gnustep-netclasses/PKGBUILD b/pcr/gnustep-netclasses/PKGBUILD new file mode 100644 index 000000000..031bf4ecc --- /dev/null +++ b/pcr/gnustep-netclasses/PKGBUILD @@ -0,0 +1,38 @@ +# Copyright 2023 bill-auger <bill-auger@programmer.net> +# SPDX-License-Identifier: CC0-1.0 +# Maintainer: bill-auger <bill-auger@programmer.net> + + +# build order: (gnustep-base) <- gnustep-gui <- gnustep-back <- gnustep-netclasses + + +pkgname=gnustep-netclasses +_upstream_name=netclasses +pkgrel=1 +pkgver=1.1.0 +pkgdesc="Networking framework for GNUstep" +arch=(armv7h i686 x86_64) +url=http://gap.nongnu.org/talksoup/index.html +license=(GPL2) +depends=(gnustep-back) +makedepends=(gcc-objc gnustep-make) +source=(http://savannah.nongnu.org/download/gap/${_upstream_name}-${pkgver}.tar.gz) +sha256sums=(d7d783c5b85abb289ef2fbb4bbf709eacb631e6ddf5a78e26fa45b94fb717f40) + + +build() +{ + cd ${_upstream_name}-${pkgver} + + export GNUSTEP_MAKEFILES=$(gnustep-config --variable=GNUSTEP_MAKEFILES) + + ./configure + make +} + +package() +{ + cd ${_upstream_name}-${pkgver} + + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/gophernicus/PKGBUILD b/pcr/gophernicus/PKGBUILD new file mode 100644 index 000000000..d01c74125 --- /dev/null +++ b/pcr/gophernicus/PKGBUILD @@ -0,0 +1,65 @@ +# Maintainer: botplus <oneofvalts@sdf.org> +# Contributor: bill-auger <bill-auger@programmer.net> + + +pkgname=gophernicus +pkgver=3.1.1 +pkgrel=2 +pkgdesc="Modern, full-featured (and hopefully) secure gopher daemon" +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/gophernicus/gophernicus" +license=('BSD2') + +backup=(etc/xinetd.d/gophernicus + srv/gopher/gophermap) +install=${pkgname}.install + +depends=('libwrap' 'xinetd') +optdepends=("xinetd-openrc: openrc init-script") +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/gophernicus/gophernicus/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz + xinetd-respect-custom-server-root.patch + remove-DESTDIR-from-initscripts.patch + fix-make-log-typo.patch + preserve-existing-gophermap.patch) + +b2sums=('74610071fab7ee6defc7e128c92f8775d00c42e6b3e806993d9468676e904388bd54cb101f25dad0e281e67090cfdcaf21728eab7821fa1cbd9ea09201d93acb' + 'da46d9010d3b7485aa092c3557c707473ac465451f7e09d32e52409bdefba0633900f198cb8aadc8a05e55274b70ef72cfc2bda4fe22b254c738aa078b0f8280' + '575bf3480b79c5381f2d08c029e96ebb7eee224e19effe294b95feb1f11f8536a53c12b4850df1263b609a776de350acb0cc17783547b841a631aa7643b3f468' + '56fedcb3d687b935a4d6d254f511b7fc9c2171190ec4eb00724fab82c93c424c2c373a8881818daba55bee9a381213b45c9a79fde13419a5f817a7bfd065f60c' + 'd6bc23c85168e235430eaf3c70edb62c2ee729c891aab15492b637d43fa752310a7f67cc9c194b3d174d46a6ce8a692bb685178874b8ea01086b12a4746f6fb4') + + +prepare() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + # allow server root under /srv/ with xinetd + patch -Np1 < "${srcdir}"/xinetd-respect-custom-server-root.patch + + # remove DESTDIR path from installed init scripts + patch -Np1 < "${srcdir}"/remove-DESTDIR-from-initscripts.patch + + # fix typo in make log (does not affect the binary package) + patch -Np1 < "${srcdir}"/fix-make-log-typo.patch + + # fix think-o in ./configure (does not affect the binary package) + patch -Np1 < "${srcdir}"/preserve-existing-gophermap.patch +} + +build() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --listener=xinetd \ + --gopherroot=/srv/gopher + make +} + +package() +{ + cd "${srcdir}"/${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/gophernicus/fix-make-log-typo.patch b/pcr/gophernicus/fix-make-log-typo.patch new file mode 100644 index 000000000..4cf75dd40 --- /dev/null +++ b/pcr/gophernicus/fix-make-log-typo.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.in b/Makefile.in +index 3ab1bd1..5468d92 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -109,7 +109,7 @@ install-msg-xinetd: + echo "accessed." + echo "On systemd distributions:" + echo " systemctl restart xinetd" +- echo "You can configure arguments, including the hostname, in $(INETD)." ++ echo "You can configure arguments, including the hostname, in $(XINETD)." + echo + + install-msg-systemd: diff --git a/pcr/gophernicus/gophernicus.install b/pcr/gophernicus/gophernicus.install new file mode 100644 index 000000000..ad4be4589 --- /dev/null +++ b/pcr/gophernicus/gophernicus.install @@ -0,0 +1,11 @@ +post_install() { + echo "==> to start the gophernicus service:" + echo " systemd:" + echo " # systemctl start xinetd.service" + echo " openrc:" + echo " # rc-service xinetd start" + echo "==> configuration is:" + echo " /etc/xinetd.d/gophernicus" + echo "==> server root is:" + echo " /srv/gopher" +} diff --git a/pcr/gophernicus/preserve-existing-gophermap.patch b/pcr/gophernicus/preserve-existing-gophermap.patch new file mode 100644 index 000000000..544339113 --- /dev/null +++ b/pcr/gophernicus/preserve-existing-gophermap.patch @@ -0,0 +1,15 @@ +diff --git a/configure b/configure +index d54dc29..067affe 100755 +--- a/configure ++++ b/configure +@@ -280,9 +280,9 @@ printf "\\n" + # Don't replace an existing root + printf "checking for existing gopher root... " + if [ -d "${GOPHERROOT}" ] || [ -f "${GOPHERROOT}/gophermap" ]; then +- INSTALL_ROOT="install-root" + printf "yes" + else ++ INSTALL_ROOT="install-root" + printf "no" + fi + printf "\\n" diff --git a/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch new file mode 100644 index 000000000..96eec6d12 --- /dev/null +++ b/pcr/gophernicus/remove-DESTDIR-from-initscripts.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile.in b/Makefile.in +index 5468d92..d047c7a 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -145,15 +145,15 @@ install-root: + $(INSTALL) -m 644 $(MAP).sample $(DESTDIR)$(ROOT)/gophermap + + install-inetd-update: install-root +- update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" ++ update-inetd --add "$$(sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in)" + update-inetd --enable gopher + + install-inetd-manual: install-root +- sed -e "s:@BINARY_PATH@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) ++ sed -e "s:@BINARY_PATH@:$(SBINDIR)/$(BINARY):g" -e "s/@OPTIONS@/$(INETOPT)/g" init/inetlin.in >> $(DESTDIR)$(INETD) + + install-xinetd: install-root + $(INSTALL) -d -m 755 $(DESTDIR)/etc/xinetd.d +- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd ++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME).xinetd + $(INSTALL) -m 644 -T init/$(NAME).xinetd $(DESTDIR)$(XINETD) + + install-osx: install-root +@@ -172,7 +172,7 @@ install-systemd: install-root + $(INSTALL) -m 644 -T init/$(NAME).env $(DESTDIR)$(DEFAULT)/$(NAME) + $(INSTALL) -d -m 755 $(DESTDIR)$(SYSTEMD) + $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME).socket +- sed -i -e "s:@BINARY@:$(DESTDIR)$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service ++ sed -i -e "s:@BINARY@:$(SBINDIR)/$(BINARY):g" init/$(NAME)\@.service + $(INSTALL) -m 644 -t $(DESTDIR)$(SYSTEMD) init/$(NAME)\@.service + + uninstall: @UNINSTALL_INETD_UPDATE@ @UNINSTALL_INETD_MANUAL@ @UNINSTALL_XINETD@ @UNINSTALL_OSX@ @UNINSTALL_SYSTEMD@ diff --git a/pcr/gophernicus/xinetd-respect-custom-server-root.patch b/pcr/gophernicus/xinetd-respect-custom-server-root.patch new file mode 100644 index 000000000..b0106639b --- /dev/null +++ b/pcr/gophernicus/xinetd-respect-custom-server-root.patch @@ -0,0 +1,34 @@ +diff --git a/configure b/configure +index 067affe..c78a9f6 100755 +--- a/configure ++++ b/configure +@@ -340,12 +340,14 @@ sed -i -e "s:@XINETD_CONF@:${XINETD_CONF}:" Makefile + + printf "done\\n" + +-# Also sub in $HOSTNAME to the various init systems (whether or not we really +-# use them, its just easier) ++# Also sub in $GOPHERROOT and $HOSTNAME to the various init systems ++# (whether or not we really use them, its just easier) + for f in gophernicus.env haiku_snippet org.gophernicus.server.plist \ + gophernicus.xinetd; do + printf "creating init/${f}... " +- sed -e "s:@HOSTNAME@:${HOSTNAME}:" "init/${f}.in" > "init/${f}" ++ cp init/${f}{.in,} ++ sed -i -e "s:@GOPHERROOT@:${GOPHERROOT}:" init/${f} ++ sed -i -e "s:@HOSTNAME@:${HOSTNAME}:" init/${f} + printf "done\\n" + done + +diff --git a/init/gophernicus.xinetd.in b/init/gophernicus.xinetd.in +index 4f2c921..a052375 100644 +--- a/init/gophernicus.xinetd.in ++++ b/init/gophernicus.xinetd.in +@@ -6,6 +6,6 @@ service gopher + wait = no + user = nobody + server = @BINARY@ +- server_args = -r/var/gopher -h@HOSTNAME@ ++ server_args = -r@GOPHERROOT@ -h@HOSTNAME@ + disable = no + } diff --git a/pcr/gpaint/PKGBUILD b/pcr/gpaint/PKGBUILD index 26fa57d8c..bfd6531f9 100644 --- a/pcr/gpaint/PKGBUILD +++ b/pcr/gpaint/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org> -# Contributor (Arch): Alexander Rødseth <rodseth@gmail.com> -# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Arch): Allan McRae <allan@archlinux.org> -# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (Arch): Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Maintainer (arch): Brian Bidulock <bidulock@openss7.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Aaditya Bagga <aaditya_gnulinux@zoho.com> pkgname=gpaint pkgver=0.3.3 diff --git a/pcr/gqrx-xtrx/PKGBUILD b/pcr/gqrx-xtrx/PKGBUILD index 27a6bf9c4..6f951266f 100644 --- a/pcr/gqrx-xtrx/PKGBUILD +++ b/pcr/gqrx-xtrx/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Kyle Keen <keenerd@gmail.com> -# Contributor (Arch): Dominik Heidler <dheidler@gmail.com> +# Maintainer (arch): Kyle Keen <keenerd@gmail.com> +# Contributor: Dominik Heidler <dheidler@gmail.com> # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> _pkgname=gqrx diff --git a/pcr/gradio/PKGBUILD b/pcr/gradio/PKGBUILD index 545c7638e..bdaed8099 100644 --- a/pcr/gradio/PKGBUILD +++ b/pcr/gradio/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): ELmoussaoui Bilal <bil.elmoussaoui@gmail.com> -# Maintainer (AUR): Julien Nicoulaud <julien dot nicoulaud at gmail dot com> +# Maintainer (aur): ELmoussaoui Bilal <bil.elmoussaoui@gmail.com> +# Maintainer (aur): Julien Nicoulaud <julien dot nicoulaud at gmail dot com> # Maintainer: Freemor <freemor@freemor.ca> pkgname=gradio diff --git a/pcr/grail/PKGBUILD b/pcr/grail/PKGBUILD index e05381704..5c0b1c84a 100644 --- a/pcr/grail/PKGBUILD +++ b/pcr/grail/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Nicolas Quiénot <niQo @ aur> -# Contributor (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to> -# Contributor (AUR): thn81 <root@scrat> +# Maintainer (aur): Nicolas Quiénot <niQo @ aur> +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> +# Contributor: thn81 <root@scrat> # parabola changes and rationale: # no changes. diff --git a/pcr/grass/PKGBUILD b/pcr/grass/PKGBUILD index e0c0452d7..f7ba6387f 100644 --- a/pcr/grass/PKGBUILD +++ b/pcr/grass/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info> -# Contributor (Arch): Maciej Sieczka <msieczka at sieczka dot org> +# Maintainer (arch): Doug Newgard <scimmia at archlinux dot info> +# Contributor: Maciej Sieczka <msieczka at sieczka dot org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=grass diff --git a/pcr/gringo/PKGBUILD b/pcr/gringo/PKGBUILD index 3f184b95e..abd1a017a 100644 --- a/pcr/gringo/PKGBUILD +++ b/pcr/gringo/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Vincent Bernardoff <vb@luminar.eu.org> +# Maintainer (arch): Vincent Bernardoff <vb@luminar.eu.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gringo diff --git a/pcr/gtg/PKGBUILD b/pcr/gtg/PKGBUILD index 0a6282945..669d83581 100644 --- a/pcr/gtg/PKGBUILD +++ b/pcr/gtg/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Roy Zhang <pudh4418 at gmail [dot} com> -# Contributor (Arch): Алексей Гультяев <hokum83 at gmail {dot] com> +# Maintainer (arch): Roy Zhang <pudh4418 at gmail [dot} com> +# Contributor: Алексей Гультяев <hokum83 at gmail {dot] com> pkgname=gtg pkgver=0.3.1 diff --git a/pcr/gtk-engine-equinox/PKGBUILD b/pcr/gtk-engine-equinox/PKGBUILD index 2b2f32d4f..edd9a7619 100644 --- a/pcr/gtk-engine-equinox/PKGBUILD +++ b/pcr/gtk-engine-equinox/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (AUR): SpepS <dreamspepser at yahoo dot it> -# Contributor (AUR): Frikilinux <frikilinux at frikilinux.com.ar> +# Contributor: Frikilinux <frikilinux at frikilinux.com.ar> # parabola changes and rationale: # - fixed source url diff --git a/pcr/gtk-theme-numix/PKGBUILD b/pcr/gtk-theme-numix/PKGBUILD index 09978b3f0..34dd09fd8 100644 --- a/pcr/gtk-theme-numix/PKGBUILD +++ b/pcr/gtk-theme-numix/PKGBUILD @@ -1,5 +1,6 @@ # Mantainer: Diego -# Contributor (Arch): Aleessio Sergi +# Contributor: Aleessio Sergi +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # upstream pkgbuild is gone, but we keep maintaining this. diff --git a/pcr/gtkhtml4/PKGBUILD b/pcr/gtkhtml4/PKGBUILD index 5c0dab54e..1347f52e0 100644 --- a/pcr/gtkhtml4/PKGBUILD +++ b/pcr/gtkhtml4/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Maintainer: Freemor <freemor@freemor.ca diff --git a/pcr/gtkmm-utils/PKGBUILD b/pcr/gtkmm-utils/PKGBUILD index 84ec12708..a79b627c4 100644 --- a/pcr/gtkmm-utils/PKGBUILD +++ b/pcr/gtkmm-utils/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): TDY <tdy@gmx.com> -# Contributor (Arch): Michele Vascellari <michele.vascellari@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: TDY <tdy@gmx.com> +# Contributor: Michele Vascellari <michele.vascellari@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=gtkmm-utils pkgver=0.4.1 diff --git a/pcr/guile-avahi/PKGBUILD b/pcr/guile-avahi/PKGBUILD new file mode 100644 index 000000000..6d79f60b5 --- /dev/null +++ b/pcr/guile-avahi/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-avahi +pkgver=0.4.1 +pkgrel=1 +pkgdesc='Avahi bindings for GNU Guile' +arch=('x86_64' 'i686' 'armv7h') +url='https://www.nongnu.org/guile-avahi' +license=('LGPL3') +depends=('guile' 'avahi' 'gmp') +source=("https://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('db9de9e19df728b40d23c0381caa9f8eda2b175fa7f69f153be8f3f078044ca5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-guilemoduledir=/usr/share/guile/site/3.0 \ + --disable-rpath + make +} + +check(){ + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/guile-bytestructures/PKGBUILD b/pcr/guile-bytestructures/PKGBUILD new file mode 100644 index 000000000..1547baaec --- /dev/null +++ b/pcr/guile-bytestructures/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer (aur): Jelle van der Waa <jelle@archlinux.org> +# Contributor (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# - Add armv7h and i686 architectures support. + +pkgname=guile-bytestructures +_pkgname=bytestructures +pkgver=1.0.10 +pkgrel=1 +pkgdesc='Structured access library to bytevector contents for Guile' +arch=('armv7h' 'i686' 'x86_64') +url="https://github.com/TaylanUB/scheme-bytestructures" +license=('GPL3') +depends=('guile') +makedepends=('git') +source=("https://github.com/TaylanUB/scheme-${_pkgname}/releases/download/v${pkgver}/${_pkgname}-${pkgver}.tar.gz") +sha256sums=('bb8a78c1e570f90e344368196844ee0f143682b3d4c6ab69d6de0fa0d7b7c20d') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-gcrypt/PKGBUILD b/pcr/guile-gcrypt/PKGBUILD index 742de1d68..26917c85b 100644 --- a/pcr/guile-gcrypt/PKGBUILD +++ b/pcr/guile-gcrypt/PKGBUILD @@ -1,19 +1,20 @@ -# Maintainer (AUR): Ting-Wei Lan <lantw44@gmail.com> -# Contributor (AUR): Joe Hillenbrand <joehillen@gmail.com> +# Maintainer (aur): Ting-Wei Lan <lantw44@gmail.com> +# Contributor (aur): Joe Hillenbrand <joehillen@gmail.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # no changes. pkgname=guile-gcrypt -pkgver=0.2.1 +pkgver=0.4.0 pkgrel=1 pkgdesc='Guile bindings for libgcrypt' arch=('x86_64' 'i686' 'armv7h') url="https://notabug.org/cwebber/guile-gcrypt" license=('GPL3') depends=('guile' 'libgcrypt') -source=("https://notabug.org/cwebber/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('8de1bbf5e952e15cd6b03e26701fbfa0c2266d975212543a41c9aa3a01f741e2') +source=("${pkgname}-${pkgver}.tar.gz::https://notabug.org/cwebber/${pkgname}/archive/v${pkgver}.tar.gz") +sha256sums=('35f0681e01defab0aaa2a83227c0be836b0a1303dd1f7279497a76dd1255b17e') build() { cd "${srcdir}/${pkgname}" diff --git a/pcr/guile-git-lib/PKGBUILD b/pcr/guile-git-lib/PKGBUILD index fd5cb27d3..80b29bbcf 100644 --- a/pcr/guile-git-lib/PKGBUILD +++ b/pcr/guile-git-lib/PKGBUILD @@ -1,49 +1,56 @@ -# Maintainer (AUR): lantw44 (at) gmail (dot) com +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: -# - disabled tests due to faililng 'clone' test +# - disabled tests due to failing tests pkgname=guile-git-lib _pkgname=guile-git -pkgver=0.3.0 -pkgrel=1 +pkgver=0.5.2 +pkgrel=2 pkgdesc='Guile bindings for libgit2' arch=('x86_64' 'i686' 'armv7h') url="https://gitlab.com/guile-git/guile-git" license=('GPL3') -depends=('guile' 'guile-bytestructures' 'libgit2') +depends=('guile' 'guile-bytestructures' 'libgit2>=0.28.0') makedepends=('git') source=( - "https://gitlab.com/${_pkgname}/${_pkgname}/uploads/4c563d8e7e1ff84396abe8ca7011bcaf/${_pkgname}-${pkgver}.tar.gz" - "https://gitlab.com/guile-git/guile-git/-/raw/v${pkgver}/tests/.ssh/id_rsa_client" - "https://gitlab.com/guile-git/guile-git/-/raw/v${pkgver}/tests/.ssh/id_rsa_client.pub" - "https://gitlab.com/guile-git/guile-git/-/raw/v${pkgver}/tests/.ssh/id_rsa_server") + "${pkgname}-${pkgver}.tar.gz::https://gitlab.com/${_pkgname}/${_pkgname}/uploads/6450f3991aa524484038cdcea3fb248d/${_pkgname}-${pkgver}.tar.gz" + "${pkgname}-merge-31-fix-clone-tests.patch" + "${pkgname}-merge-32-libgit2-1.2.0.patch") sha256sums=( - '75ce437da024fa57d6a2a48ae4e05d48cb42d84f73a3d372baef5c68421bb130' - 'e58e37ec6d5916b46b785b9db5ae05498e5dc25b1beaa46eee227bf415fee952' - '8a3b18d1d725f69ab778e0badbc43746766b591a54f965ee2e57d82822775d43' - '0d49a22bd80c3d1d18061560eecb095c0056ade55fee2fb4c48c290254204641') + '949755a211ad6e905ecdebe66ca35bfaab638d985b9fadc928ad2538d8f5cc95' + '15633944c4177fe5f79b97124d3b2c35739ecbe4246305fc2f8271be95b6e3c9' + 'f353c23e2dae27a715d9dae04bfd269c9262e221082b959e0721e2c4471a7eeb') prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" - mkdir tests/.ssh - cp \ - "${srcdir}/$(basename "${source[1]}")" \ - "${srcdir}/$(basename "${source[2]}")" \ - "${srcdir}/$(basename "${source[3]}")" \ - tests/.ssh + local source_file + for source_file in "${source[@]}"; do + case "${source_file}" in + *.patch) + patch -p1 < "${srcdir}/${source_file}" + ;; + esac + done } build() { cd "${srcdir}/${_pkgname}-${pkgver}" + autoreconf -fi ./configure --prefix=/usr make } -# check() { -# cd "${srcdir}/${_pkgname}-${pkgver}" -# make check -# } +check() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + # FAIL: tests/clone.scm - clone-auth-ssh-credentials + # FAIL: tests/clone.scm - clone-auth-ssh-agent + # FAIL: tests/clone.scm - clone-and-fetch-auth-ssh-credentials + # FAIL: tests/clone.scm - clone + transfer-progress + # make check +} package() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/pcr/guile-git-lib/guile-git-lib-merge-31-fix-clone-tests.patch b/pcr/guile-git-lib/guile-git-lib-merge-31-fix-clone-tests.patch new file mode 100644 index 000000000..4a0b6efa8 --- /dev/null +++ b/pcr/guile-git-lib/guile-git-lib-merge-31-fix-clone-tests.patch @@ -0,0 +1,39 @@ +From 04edea32ea9393b6b8fa77db5f568aaf773cdffd Mon Sep 17 00:00:00 2001 +From: Will Frew <will.frew1@gmail.com> +Date: Sat, 2 Oct 2021 12:11:13 +0300 +Subject: [PATCH] Fixes git clone tests when running against openssh 8.8 + +OpenSSH 8.8 turns off the hostkey algorithm 'ssh-rsa' by default. +See: https://www.openssh.com/txt/release-8.8 + +Unfortunately, libssh2 (and therefore libgit2) do not yet support the +newer sha2-based ssh hostkey algorithms. +See upstream issue: https://github.com/libssh2/libssh2/issues/536 + +This explicitly re-enables ssh-rsa on the sshd that is spun up for +testing to ensure that libgit2 can handshake with it again. +--- + tests/ssh.scm.in | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/tests/ssh.scm.in b/tests/ssh.scm.in +index e6621ca..0311681 100644 +--- a/tests/ssh.scm.in ++++ b/tests/ssh.scm.in +@@ -61,6 +61,13 @@ AuthorizedKeysFile ~a + PidFile ~a + PermitUserEnvironment yes + ++# libssh2 and therefore libgit2 do not yet support ++# sha2-based rsa algorithms. ++# See upstream issue: ++# https://github.com/libssh2/libssh2/issues/536 ++HostkeyAlgorithms +ssh-rsa ++PubkeyAcceptedAlgorithms +ssh-rsa ++ + # Disable permission checks on auth files for the sake + # of isolated build environments. + StrictModes no~%" +-- +GitLab + diff --git a/pcr/guile-git-lib/guile-git-lib-merge-32-libgit2-1.2.0.patch b/pcr/guile-git-lib/guile-git-lib-merge-32-libgit2-1.2.0.patch new file mode 100644 index 000000000..d1ec23281 --- /dev/null +++ b/pcr/guile-git-lib/guile-git-lib-merge-32-libgit2-1.2.0.patch @@ -0,0 +1,100 @@ +From 278d23a18df6913bfe87c214d0e6dbeee6996f1d Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer <maxim.cournoyer@gmail.com> +Date: Mon, 22 Nov 2021 22:08:31 -0500 +Subject: [PATCH 1/3] structs: Adjust %remote-callbacks for libgit2 v1.2.0. + +Fixes <https://gitlab.com/guile-git/guile-git/-/issues/23>. + +* configure.ac (AC_CHECK_MEMBER) +<git_remote_callbacks.remote_ready>: New member check. +<git_remote_callbacks.resolve_url>: Streamline. +* git/config.scm.in (%have-remote-callbacks-remote-ready?): New variable. +* git/structs.scm (%remote-callbacks): Conditionally add the new +callback 'remote_ready' callback field. +--- + configure.ac | 18 ++++++++++++------ + git/configuration.scm.in | 6 ++++++ + git/structs.scm | 6 ++++++ + 3 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 107e6ca..20e9019 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2,6 +2,7 @@ dnl Guile-Git --- GNU Guile bindings of libgit2 + dnl Copyright © 2016-2018 Erik Edrosa <erik.edrosa@gmail.com> + dnl Copyright © 2017, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> + dnl Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ++dnl Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> + dnl + dnl This file is part of Guile-Git. + dnl +@@ -43,15 +44,20 @@ AS_IF([test "x$LIBGIT2_LIBDIR" = "x"], [ + ]) + AC_SUBST([LIBGIT2_LIBDIR]) + ++dnl Does the 'git_remote_callbacks' struct have a 'remote_ready' field? ++dnl It was added in 1.2.0, obsoleting 'resolve_url'. ++AC_CHECK_MEMBER([git_remote_callbacks.remote_ready], ++ [HAVE_REMOTE_CALLBACKS_REMOTE_READY="#true"], ++ [HAVE_REMOTE_CALLBACKS_REMOTE_READY="#false"], ++ [[#include <git2.h>]]) ++AC_SUBST([HAVE_REMOTE_CALLBACKS_REMOTE_READY]) ++ + dnl Does the 'git_remote_callbacks' struct have a 'resolve_url' field? + dnl It's missing in libgit2 0.28.5, added in 1.0. +-AC_CHECK_MEMBER([git_remote_callbacks.resolve_url], [], [], ++AC_CHECK_MEMBER([git_remote_callbacks.resolve_url], ++ [HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#true"], ++ [HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#false"], + [[#include <git2.h>]]) +-if test "x$ac_cv_member_git_remote_callbacks_resolve_url" = "xyes"; then +- HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#true" +-else +- HAVE_REMOTE_CALLBACKS_RESOLVE_URL="#false" +-fi + AC_SUBST([HAVE_REMOTE_CALLBACKS_RESOLVE_URL]) + + dnl Those binaries are required for ssh authentication tests. +diff --git a/git/configuration.scm.in b/git/configuration.scm.in +index c45f698..64c4360 100644 +--- a/git/configuration.scm.in ++++ b/git/configuration.scm.in +@@ -19,11 +19,17 @@ + + (define-module (git configuration) + #:export (%libgit2 ++ %have-remote-callbacks-remote-ready? + %have-remote-callbacks-resolve-url?)) + + (define %libgit2 + "@LIBGIT2_LIBDIR@/libgit2") + ++(define %have-remote-callbacks-remote-ready? ++ ;; True if the 'git_remote_callbacks' struct has a ++ ;; 'remote_ready' field. ++ @HAVE_REMOTE_CALLBACKS_REMOTE_READY@) ++ + (define %have-remote-callbacks-resolve-url? + ;; True if the 'git_remote_callbacks' struct has a 'resolve_url' field. + @HAVE_REMOTE_CALLBACKS_RESOLVE_URL@) +diff --git a/git/structs.scm b/git/structs.scm +index ca51728..be3d050 100644 +--- a/git/structs.scm ++++ b/git/structs.scm +@@ -637,6 +637,12 @@ type to 'specified for this to take effect." + (push-update-reference ,(bs:pointer uint8)) + (push-negotiation ,(bs:pointer uint8)) + (transport ,(bs:pointer uint8)) ++ ++ ;; Added in libgit2 1.2.0. ++ ,@(if %have-remote-callbacks-remote-ready? ++ `((remote-ready ,(bs:pointer uint8))) ++ '()) ++ + (payload ,(bs:pointer uint8)) + + ;; libgit2 1.0 added this field, which is missing from 0.28.5, +-- +GitLab + diff --git a/pcr/guile-gnutls/PKGBUILD b/pcr/guile-gnutls/PKGBUILD new file mode 100644 index 000000000..f37fd51a2 --- /dev/null +++ b/pcr/guile-gnutls/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-gnutls +pkgver=3.7.12 +pkgrel=1 +pkgdesc='Guile bindings for the GnuTLS library' +arch=('x86_64' 'i686' 'armv7h') +url='https://gitlab.com/gnutls/guile' +license=('LGPL') +depends=('guile' 'gnutls') +source=( + "https://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha256sums=( + '5d3af11573093de59f258415872e2c5b14cca9dd251a8b2ec1643d6e97fee336' + '3aa3bcdf69ff21d6f5e0ac9cfd820431edd04f0cb3d0f1a4db72bb33122a7e88') +validpgpkeys=('B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-srp-authentication + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-json/PKGBUILD b/pcr/guile-json/PKGBUILD index 1d3e45dfc..116c1aaf7 100644 --- a/pcr/guile-json/PKGBUILD +++ b/pcr/guile-json/PKGBUILD @@ -1,18 +1,22 @@ -# Maintainer (AUR): holos -# Contributor (AUR): tantalum +# Maintainer (aur): Ting-Wei Lan <lantw44 at gmail dot com> +# Contributor (aur): Thomas Koller-Cherek <tk120 at protonmail dot com> +# Contributor (aur): holos +# Contributor (aur): tantalum +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # no changes. pkgname=guile-json +pkgver=4.7.3 pkgrel=1 -pkgver=3.1.0 pkgdesc='JSON module for Guile' -url="https://github.com/aconchillo/guile-json" -arch=('any') -license=('LGPL') -source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") -sha256sums=('e303d0db3f34ac515b8f61db8ed35be8b6c5014d7ab4a5a8ef9b44723ed3d8f9') +arch=('x86_64' 'i686' 'armv7h') +url='https://savannah.nongnu.org/projects/guile-json' +license=('GPL3') +depends=('guile') +source=("https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('38ba048ed29d12f05b32c5b2fb7a51795c448b41e403a2b1b72ff0035817f388') build() { cd "$pkgname-$pkgver" @@ -20,6 +24,11 @@ build() { make } +check(){ + cd "$pkgname-$pkgver" + make check +} + package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/pcr/guile-json1/PKGBUILD b/pcr/guile-json1/PKGBUILD index 8852b5c39..a31f2d994 100644 --- a/pcr/guile-json1/PKGBUILD +++ b/pcr/guile-json1/PKGBUILD @@ -1,8 +1,8 @@ # Forked from guile-json 1.2.0 PKGBUILD -# Maintainer (AUR): lantw44 -# Contributor (AUR): holos -# Contributor (AUR): tantalum +# Maintainer (aur): lantw44 +# Contributor: holos +# Contributor: tantalum # parabola changes and rationale: # no changes. diff --git a/pcr/guile-json3/PKGBUILD b/pcr/guile-json3/PKGBUILD index 9ab1ba741..12d27c0d3 100644 --- a/pcr/guile-json3/PKGBUILD +++ b/pcr/guile-json3/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Ting-Wei Lan <lantw44 at gmail dot com> -# Contributor (AUR): Thomas Koller-Cherek <tk120 at protonmail dot com> -# Contributor (AUR): holos -# Contributor (AUR): tantalum +# Maintainer (aur): Ting-Wei Lan <lantw44 at gmail dot com> +# Contributor: Thomas Koller-Cherek <tk120 at protonmail dot com> +# Contributor: holos +# Contributor: tantalum # parabola changes and rationale: # no changes. diff --git a/pcr/guile-lib/PKGBUILD b/pcr/guile-lib/PKGBUILD new file mode 100644 index 000000000..eaa30ef0c --- /dev/null +++ b/pcr/guile-lib/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer (aur): Brian Bidulock <bidulock@openss7.org> +# Contributor (aur): tantalum <tantalum at online dot de> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# - Add armv7h support. + +pkgname=guile-lib +pkgver=0.2.7 +pkgrel=2 +pkgdesc='Repository of useful code written in Guile Scheme' +arch=('armv7h' 'i686' 'x86_64') +license=('GPL3' 'LGPL3') +depends=('guile') +url="http://www.nongnu.org/guile-lib/" +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz") +sha512sums=('d27d1398f81172e4488c5ac5c2d076baeeeaa12fa19d83a87faf0767c255b79f8eb24438950da3865e797299be90f7dc1dcc964076d53df9cab5925a61ad0d1f') +build(){ + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + rm -f "${pkgdir}/usr/share/info/dir" +} diff --git a/pcr/guile-lzlib/PKGBUILD b/pcr/guile-lzlib/PKGBUILD new file mode 100644 index 000000000..20595647c --- /dev/null +++ b/pcr/guile-lzlib/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-lzlib +pkgver=0.0.2 +pkgrel=1 +pkgdesc='Guile bindings for lzlib' +arch=('x86_64' 'i686' 'armv7h') +url='https://notabug.org/guile-lzlib/guile-lzlib' +license=('GPL3') +depends=('guile' 'lzlib') +source=("${pkgname}-${pkgver}.tar.gz::https://notabug.org/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz") +sha256sums=('8623db77d447e7b9ffbfcbc288390e706a6b1a89b1171daed60874cfec7e4f87') + +build() { + cd "${srcdir}/${pkgname}" + autoreconf -fi + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}" + make check +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-lzma/PKGBUILD b/pcr/guile-lzma/PKGBUILD new file mode 100644 index 000000000..4961cb5c4 --- /dev/null +++ b/pcr/guile-lzma/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-lzma +pkgver=0.1.1 +pkgrel=1 +pkgdesc='Guile bindings for liblzma' +arch=('x86_64' 'i686' 'armv7h') +url='https://ngyro.com/software/guile-lzma.html' +license=('GPL3') +depends=('guile' 'guile-bytestructures' 'xz') +source=("https://files.ngyro.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('2b866896d672ed4d39008f4b5336750d7897560a06678365f5c5a72bd2fcce5e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-quickcheck/PKGBUILD b/pcr/guile-quickcheck/PKGBUILD new file mode 100644 index 000000000..ba5567bfd --- /dev/null +++ b/pcr/guile-quickcheck/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-quickcheck +pkgver=0.1.0 +pkgrel=1 +pkgdesc='Randomized property-based testing for Guile' +arch=('x86_64' 'i686' 'armv7h') +url='https://ngyro.com/software/guile-quickcheck.html' +license=('GPL3') +depends=('guile') +source=("https://files.ngyro.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('cb99ac5be99b43b61eb9c452d953543e890e2a83fc83acac289d94316888bc0e') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-semver/PKGBUILD b/pcr/guile-semver/PKGBUILD new file mode 100644 index 000000000..0b40fd3f5 --- /dev/null +++ b/pcr/guile-semver/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-semver +pkgver=0.1.1 +pkgrel=1 +pkgdesc='Guile library for Semantic Versioning' +arch=('x86_64' 'i686' 'armv7h') +url='https://ngyro.com/software/guile-semver.html' +license=('GPL3') +depends=('guile') +source=("https://files.ngyro.com/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha256sums=('4f790919375feb204a8ea2eda92a291d9bb4de4c8eb1c6776784589a86253781') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-sqlite3/PKGBUILD b/pcr/guile-sqlite3/PKGBUILD index 364b8ba49..0a9e739ad 100644 --- a/pcr/guile-sqlite3/PKGBUILD +++ b/pcr/guile-sqlite3/PKGBUILD @@ -1,16 +1,19 @@ -# Maintainer (AUR): lantw44 (at) gmail (dot) com -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. pkgname=guile-sqlite3 -pkgver=0.1.0 +pkgver=0.1.3 pkgrel=1 pkgdesc='Guile bindings for the SQLite3 database engine' arch=('x86_64' 'i686' 'armv7h') -url="https://notabug.org/civodul/guile-sqlite3" +url="https://notabug.org/guile-sqlite3/guile-sqlite3" license=('LGPL3') depends=('guile' 'sqlite3') -source=("https://notabug.org/civodul/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9') +source=("${pkgname}-${pkgver}.tar.gz::https://notabug.org/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz") +sha256sums=('158cb82958c6329319f911412999ea125980f327f54185bf0dad271d6f8f45c2') build() { cd "${srcdir}/${pkgname}" diff --git a/pcr/guile-ssh/PKGBUILD b/pcr/guile-ssh/PKGBUILD index 06c09d4a6..6ca29944c 100644 --- a/pcr/guile-ssh/PKGBUILD +++ b/pcr/guile-ssh/PKGBUILD @@ -1,12 +1,12 @@ -# Maintainer (AUR): lantw44 (at) gmail (dot) com +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # no changes. pkgname=guile-ssh -pkgver=0.11.3 -pkgrel=5 -pkgrel+=.par1 +pkgver=0.16.3 +pkgrel=1 pkgdesc='SSH module for Guile based on libssh' arch=('x86_64' 'i686' 'armv7h') url="https://github.com/artyom-poptsov/guile-ssh" @@ -15,17 +15,9 @@ depends=( 'guile>=2.0.9' 'libssh>=0.7.3') source=( - "https://github.com/artyom-poptsov/guile-ssh/archive/v${pkgver}.tar.gz" - 'guile-ssh-0.11.3-fix-segfault.patch' - 'guile-ssh-0.11.3-libssh-0.8-name.patch' - 'guile-ssh-0.11.3-libssh-0.8-tests.patch' - 'guile-ssh-0.11.3-libssh-0.9-ecdsa.patch') + "${pkgname}-${pkgver}.tar.gz::https://github.com/artyom-poptsov/guile-ssh/archive/v${pkgver}.tar.gz") sha256sums=( - '1373bf6f30ba9b4404c044fb00c0509cbd851606264803faccbf881b1efb52bc' - 'f3284d61b7166be9809e37c7ced323d45255479e51f68f46f0499d9a3056b535' - '4a0ab224a08afc832ce82dc055f23c36c56f7e63f4f2b1814571a3c930d9cae6' - '5594153165cade97481c50284aade32153801232c65a958abd3e25a2eb237841' - 'df4d3955601bc540df02c4418bc4b36b15971077c3162e328b9dfa989bc0b84b') + '96c235a630fc53120881e5af325c7720b5bb19c6a7eab818ace1f3d0b7669d56') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -46,11 +38,6 @@ build() { make } -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/pcr/guile-ssh/guile-ssh-0.11.3-fix-segfault.patch b/pcr/guile-ssh/guile-ssh-0.11.3-fix-segfault.patch deleted file mode 100644 index 787dc04c9..000000000 --- a/pcr/guile-ssh/guile-ssh-0.11.3-fix-segfault.patch +++ /dev/null @@ -1,104 +0,0 @@ -From c468d9c2dc343446757360857a295736359b3024 Mon Sep 17 00:00:00 2001 -From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com> -Date: Tue, 7 Aug 2018 07:55:00 +0300 -Subject: [PATCH] libguile-ssh/channel-type.c (ptob_close): Bugfix: fix a - segfault - -'ptob_close' would always get a segfault when it tried to free a closed -channel. This patch fixes that by adding a check if a channel is already -closed. - -Reported by Michael Bowcutt <mbowcutt@case.edu> in - <https://github.com/artyom-poptsov/guile-ssh/issues/8> - and Njagi Mwaniki in a personal email. - -* libguile-ssh/channel-type.c (ptob_close): Check if a channel is already - closed before trying to close and free it. Improve logging. -* libguile-ssh/log.c (_gssh_log_debug, _gssh_log_debug1): New procedures -* libguile-ssh/log.h: Likewise. ---- - libguile-ssh/channel-type.c | 10 +++++++++- - libguile-ssh/log.c | 21 +++++++++++++++++++++ - libguile-ssh/log.h | 3 +++ - 3 files changed, 33 insertions(+), 1 deletion(-) - -diff --git a/libguile-ssh/channel-type.c b/libguile-ssh/channel-type.c -index ffcca64..4b0b9ae 100644 ---- a/libguile-ssh/channel-type.c -+++ b/libguile-ssh/channel-type.c -@@ -29,6 +29,7 @@ - #include "channel-type.h" - #include "error.h" - #include "common.h" -+#include "log.h" - - - /* The channel port type. Guile 2.2 introduced a new port API, so we have a -@@ -223,10 +224,17 @@ ptob_close (SCM channel) - ptob_flush (channel); - #endif - -- if (ch) -+ if (ch && ssh_channel_is_open (ch->ssh_channel)) - { -+ _gssh_log_debug ("ptob_close", "closing and freeing the channel...", -+ channel); - ssh_channel_close (ch->ssh_channel); - ssh_channel_free (ch->ssh_channel); -+ _gssh_log_debug1 ("ptob_close", "closing and freeing the channel... done"); -+ } -+ else -+ { -+ _gssh_log_debug1 ("ptob_close", "the channel is already freeed."); - } - - SCM_SETSTREAM (channel, NULL); -diff --git a/libguile-ssh/log.c b/libguile-ssh/log.c -index 6588749..e0e3027 100644 ---- a/libguile-ssh/log.c -+++ b/libguile-ssh/log.c -@@ -270,6 +270,27 @@ _gssh_log_warning (const char* function_name, const char* msg, SCM args) - scm_dynwind_end (); - } - -+void -+_gssh_log_debug (const char* function_name, const char* msg, SCM args) -+{ -+ char *c_str; -+ scm_dynwind_begin (0); -+ -+ c_str = scm_to_locale_string (scm_object_to_string (args, SCM_UNDEFINED)); -+ scm_dynwind_free (c_str); -+ -+ _ssh_log (SSH_LOG_FUNCTIONS, function_name, "[GSSH DEBUG] %s: %s", -+ msg, c_str); -+ -+ scm_dynwind_end (); -+} -+ -+void -+_gssh_log_debug1 (const char* function_name, const char* msg) -+{ -+ _ssh_log (SSH_LOG_FUNCTIONS, function_name, "[GSSH DEBUG] %s", msg); -+} -+ - - /* Initialization */ - -diff --git a/libguile-ssh/log.h b/libguile-ssh/log.h -index dd1424b..c3fe866 100644 ---- a/libguile-ssh/log.h -+++ b/libguile-ssh/log.h -@@ -28,6 +28,9 @@ extern void _gssh_log_error (const char* function_name, const char* msg, - - extern void _gssh_log_warning (const char* function_name, const char* msg, - SCM args); -+extern void _gssh_log_debug (const char* function_name, const char* msg, -+ SCM args); -+extern void _gssh_log_debug1 (const char* function_name, const char* msg); - - extern void init_log_func (void); - --- -2.20.1 - diff --git a/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.8-name.patch b/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.8-name.patch deleted file mode 100644 index 0f3d58daa..000000000 --- a/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.8-name.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 01cafef0dd87b6afda41942070e73b55b45a5ed2 Mon Sep 17 00:00:00 2001 -From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com> -Date: Mon, 1 Oct 2018 05:11:27 +0300 -Subject: [PATCH] libguile-ssh: Fix building with libssh 0.8 - -The 'libguile-ssh' library would fail to build due to missing 'libssh_threads' -library that was removed libssh 0.8. This patch fixes that. - -Reported by lantw44 in -<https://github.com/artyom-poptsov/guile-ssh/issues/9> - -* configure.ac: Add check for libssh 0.8 -* libguile-ssh/Makefile.am: Don't use 'libssh_threads' library when building - with libssh 0.8+. -* NEWS: Update. ---- - NEWS | 17 +++++++++++++++++ - configure.ac | 7 +++++++ - libguile-ssh/Makefile.am | 7 ++++++- - 3 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index 84d455b..8c73d1b 100644 ---- a/NEWS -+++ b/NEWS -@@ -7,6 +7,23 @@ Copyright (C) Artyom V. Poptsov <poptsov.artyom@gmail.com> - are permitted in any medium without royalty provided the copyright - notice and this notice are preserved. - -+* Unreleased -+** Bugfixes -+*** Fix a segfault in 'libguile-ssh' -+ The library would always fail with segmentation fault error when an -+ application tried to free a closed channel. Now it should be fixed. -+ -+ Reported by Michael Bowcutt <mbowcutt@case.edu> in -+ <https://github.com/artyom-poptsov/guile-ssh/issues/8> -+ and Njagi Mwaniki in a personal email. -+*** Fix building with libssh 0.8 -+ The 'libguile-ssh' library would fail to build due to missing -+ 'libssh_threads' library that was removed libssh 0.8. Now 'libguile-ssh' -+ builds without 'libssh_threads' when using libssh 0.8+. -+ -+ Reported by lantw44 in -+ <https://github.com/artyom-poptsov/guile-ssh/issues/9> -+ - * Changes in version 0.11.3 (2018-03-27) - ** Bugfixes - *** 'node-run-server' now checks for errors -diff --git a/configure.ac b/configure.ac -index c818208..74271f7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,6 +64,13 @@ PKG_CHECK_MODULES([LIBSSH_0_7_3], [libssh >= 0.7.3], - Using a potentially vulnerable version of libssh - <https://www.libssh.org/2016/02/23/libssh-0-7-3-security-and-bugfix-release/>])]) - -+dnl Checking for libssh 0.8.x -+PKG_CHECK_MODULES([LIBSSH_0_8], [libssh >= 0.8.0], -+ [AC_DEFINE(HAVE_LIBSSH_0_8, 1, [Use libssh 0.8])], -+ [AC_DEFINE(HAVE_LIBSSH_0_8, 0, [Use libssh < 0.8])]) -+ -+AM_CONDITIONAL(HAVE_LIBSSH_0_8, $HAVE_LIBSSH_0_8) -+ - # ------------------------------------------------------------------------------- - - dnl These macros must be provided by guile.m4. -diff --git a/libguile-ssh/Makefile.am b/libguile-ssh/Makefile.am -index 1ffb6c0..523d77a 100644 ---- a/libguile-ssh/Makefile.am -+++ b/libguile-ssh/Makefile.am -@@ -44,7 +44,12 @@ BUILT_SOURCES = auth.x channel-func.x channel-type.x error.x \ - - libguile_ssh_la_CPPFLAGS = $(GUILE_CFLAGS) - --libguile_ssh_la_LDFLAGS = -module -no-undefined -lssh_threads -lssh \ -+SSH_LD_FLAGS = -lssh -+if ! HAVE_LIBSSH_0_8 -+SSH_LD_FLAGS += -lssh_threads -+endif -+ -+libguile_ssh_la_LDFLAGS = -module -no-undefined $(SSH_LD_FLAGS) \ - -version-info $(LIBGUILE_SSH_INTERFACE) $(GUILE_LDFLAGS) - - AM_CFLAGS = $(WARN_CFLAGS) --- -2.20.1 - diff --git a/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.8-tests.patch b/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.8-tests.patch deleted file mode 100644 index 8b1b65259..000000000 --- a/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.8-tests.patch +++ /dev/null @@ -1,26 +0,0 @@ -From dac7ae6f3347056f46d664f6104cf6425ae25394 Mon Sep 17 00:00:00 2001 -From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com> -Date: Wed, 2 Jan 2019 11:47:50 +0300 -Subject: [PATCH] tests/server.scm ("server-set!, valid values"): Add fix for - libssh 0.8 - ---- - tests/server.scm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/server.scm b/tests/server.scm -index 7a37a96..c7f8b6c 100644 ---- a/tests/server.scm -+++ b/tests/server.scm -@@ -52,7 +52,7 @@ - (topdir (getenv "abs_top_srcdir")) - (options `((bindaddr "127.0.0.1") - (bindport 22) -- ,(if (= %libssh-minor-version 7) -+ ,(if (>= %libssh-minor-version 7) - (list 'hostkey %rsakey %dsakey) - '(hostkey "ssh-rsa" "ssh-dss")) - (rsakey ,%rsakey) --- -2.20.1 - diff --git a/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch b/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch deleted file mode 100644 index 1817c8b7f..000000000 --- a/pcr/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 104d797096e966e91f777959d7cc5d8831c1a942 Mon Sep 17 00:00:00 2001 -From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com> -Date: Sun, 15 Sep 2019 21:03:07 +0300 -Subject: [PATCH] key-type.c: Add new ECDSA key types from libssh 0.9 - -The Guile-SSH key procedures would fail when libssh 0.9 + openssl is used on -ECDSA keys because it was missing support of new ECDSA key subtypes. This -change fixes the library and the tests. - -* libguile-ssh/key-type.c: Add new ECDSA key types from libssh 0.9 -* tests/key.scm: Update tests. -* configure.ac: Check for libssh 0.9 ---- - configure.ac | 8 ++++++-- - libguile-ssh/key-type.c | 12 +++++++++++- - tests/key.scm | 13 +++++++++---- - 3 files changed, 26 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 74271f7..99d35af 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,7 +69,11 @@ PKG_CHECK_MODULES([LIBSSH_0_8], [libssh >= 0.8.0], - [AC_DEFINE(HAVE_LIBSSH_0_8, 1, [Use libssh 0.8])], - [AC_DEFINE(HAVE_LIBSSH_0_8, 0, [Use libssh < 0.8])]) - --AM_CONDITIONAL(HAVE_LIBSSH_0_8, $HAVE_LIBSSH_0_8) -+PKG_CHECK_MODULES([LIBSSH_0_9], [libssh >= 0.9.0], -+ [AC_DEFINE(HAVE_LIBSSH_0_9, 1, [Use libssh 0.9])], -+ [AC_DEFINE(HAVE_LIBSSH_0_9, 0, [Use libssh < 0.9])]) -+ -+AM_CONDITIONAL(HAVE_LIBSSH_0_8, $HAVE_LIBSSH_0_8) - - # ------------------------------------------------------------------------------- - -diff --git a/libguile-ssh/key-type.c b/libguile-ssh/key-type.c -index ab67ecd..12617ce 100644 ---- a/libguile-ssh/key-type.c -+++ b/libguile-ssh/key-type.c -@@ -42,7 +42,17 @@ static const struct symbol_mapping key_types[] = { - { "dss", SSH_KEYTYPE_DSS }, - { "rsa", SSH_KEYTYPE_RSA }, - { "rsa1", SSH_KEYTYPE_RSA1 }, -- { "ecdsa", SSH_KEYTYPE_ECDSA }, -+ { "ecdsa", SSH_KEYTYPE_ECDSA }, /* Deprecated in libssh 0.9 */ -+ -+#ifdef HAVE_LIBSSH_0_9 -+ { "ecdsa-p256", SSH_KEYTYPE_ECDSA_P256 }, -+ { "ecdsa-p384", SSH_KEYTYPE_ECDSA_P384 }, -+ { "ecdsa-p521", SSH_KEYTYPE_ECDSA_P521 }, -+ { "ecdsa-p256-cert01", SSH_KEYTYPE_ECDSA_P256_CERT01 }, -+ { "ecdsa-p384-cert01", SSH_KEYTYPE_ECDSA_P384_CERT01 }, -+ { "ecdsa-p521-cert01", SSH_KEYTYPE_ECDSA_P521_CERT01 }, -+#endif -+ - { "ed25519", SSH_KEYTYPE_ED25519 }, - { "unknown", SSH_KEYTYPE_UNKNOWN }, - { NULL, -1 } -diff --git a/tests/key.scm b/tests/key.scm -index c4394b1..be31378 100644 ---- a/tests/key.scm -+++ b/tests/key.scm -@@ -89,9 +89,11 @@ - - (test-assert-with-log "get-key-type" - (and (eq? 'rsa (get-key-type *rsa-key*)) -- (eq? 'dss (get-key-type *dsa-key*)) -+ (eq? 'dss (get-key-type *dsa-key*)) ;)) - (when-openssl -- (eq? 'ecdsa (get-key-type *ecdsa-key*))))) -+ (or (eq? 'ecdsa-p256 (get-key-type *ecdsa-key*)) -+ ;; For libssh versions prior to 0.9 -+ (eq? 'ecdsa (get-key-type *ecdsa-key*)))))) - - - (test-assert-with-log "private-key-to-file" -@@ -138,7 +140,9 @@ - - (when-openssl - (test-equal "string->public-key, ECDSA" -- (public-key->string (string->public-key %ecdsakey-pub-string 'ecdsa)) -+ (if (string=? (cadr (string-split (get-libssh-version) #\.)) "9") -+ (public-key->string (string->public-key %ecdsakey-pub-string 'ecdsa-p256)) -+ (public-key->string (string->public-key %ecdsakey-pub-string 'ecdsa))) - %ecdsakey-pub-string)) - - (test-assert-with-log "string->public-key, RSA, gc test" -@@ -162,7 +166,8 @@ - (when-openssl - (let ((key (make-keypair 'ecdsa 256))) - (and (key? key) -- (eq? (get-key-type key) 'ecdsa)))))) -+ (or (eq? (get-key-type key) 'ecdsa) ; libssh < 0.9 -+ (eq? (get-key-type key) 'ecdsa-p256))))))) - - ;;; - diff --git a/pcr/guile-zlib/PKGBUILD b/pcr/guile-zlib/PKGBUILD new file mode 100644 index 000000000..691dee34b --- /dev/null +++ b/pcr/guile-zlib/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-zlib +pkgver=0.1.0 +pkgrel=1 +pkgdesc='Guile bindings for zlib' +arch=('x86_64' 'i686' 'armv7h') +url='https://notabug.org/guile-zlib/guile-zlib' +license=('GPL3') +depends=('guile' 'zlib') +source=("${pkgname}-${pkgver}.tar.gz::https://notabug.org/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz") +sha256sums=('25c726b570a06d21bc6fd7ec6093f377c749ce2efdd1d1516ac1b595f3f94ee9') + +build() { + cd "${srcdir}/${pkgname}" + autoreconf -fi + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}" + make check +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guile-zstd/PKGBUILD b/pcr/guile-zstd/PKGBUILD new file mode 100644 index 000000000..2f69737ea --- /dev/null +++ b/pcr/guile-zstd/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer (aur): lantw44 (at) gmail (dot) com +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# no changes. + +pkgname=guile-zstd +pkgver=0.1.1 +pkgrel=1 +pkgdesc='GNU Guile bindings to the zstd compression library' +arch=('x86_64' 'i686' 'armv7h') +url='https://notabug.org/guile-zstd/guile-zstd' +license=('GPL3') +depends=('guile' 'zstd') +source=("${pkgname}-${pkgver}.tar.gz::https://notabug.org/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz") +sha256sums=('6e57ef524f20cab79ca5fd62366c5435f71cf652f582fc1e7d62585e90d499c5') + +build() { + cd "${srcdir}/${pkgname}" + autoreconf -fi + ./configure --prefix=/usr + make +} + +check() { + cd "${srcdir}/${pkgname}" + make check +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/pcr/guix-installer/PKGBUILD b/pcr/guix-installer/PKGBUILD index fc75d509c..6cde44bda 100644 --- a/pcr/guix-installer/PKGBUILD +++ b/pcr/guix-installer/PKGBUILD @@ -1,10 +1,11 @@ -# Copyright (C) 2019 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Copyright (C) 2019-2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=guix-installer -pkgver=v1.3.0 +pkgver=1.4.0 +_pkgver=v${pkgver} pkgrel=1 pkgdesc="A command line installer for Guix" arch=(any) @@ -16,27 +17,28 @@ depends=('coreutils' 'grep' 'sed' 'shadow' + 'tar' 'wget' 'which' 'xz') -source=("https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh?h=${pkgver}" - "https://git.savannah.gnu.org/cgit/guix.git/plain/COPYING?h=${pkgver}") +source=("https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh?h=${_pkgver}" + "https://git.savannah.gnu.org/cgit/guix.git/plain/COPYING?h=${_pkgver}") -sha256sums=('bcdeaa757cd42d2c9de4791272737e9ee0d518398403955f113611f4a893380a' +sha256sums=('ca78fa55d34d2a442c0677dc703aa56ef775859e8d8f2f8725e7ac064fb5fecb' '8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903') -sha512sums=('7e006d77c20a802fd1a5bd95912a64fbce3c3ac3fc9db5a77367a46408454e42ef072ff4ace912e23196f5a9496e7b35859ade755050094e24fe2937b45baca5' +sha512sums=('5210d6f2f1a61bc178d6e7bc466d50bc902195a9c93f62a72710cc039270016828013d87744d3c99ed5939e1df8c9d3be703041a944bcc5ffb5cd65f4ca19f3c' '7633623b66b5e686bb94dd96a7cdb5a7e5ee00e87004fab416a5610d59c62badaf512a2e26e34e2455b7ed6b76690d2cd47464836d7d85d78b51d50f7e933d5c') prepare() { - mkdir -p "${pkgname}-${pkgver}" - cd "${pkgname}-${pkgver}" - cp "${srcdir}/guix-install.sh?h=${pkgver}" guix-install.sh - cp "${srcdir}/COPYING?h=${pkgver}" COPYING + mkdir -p "${pkgname}-${_pkgver}" + cd "${pkgname}-${_pkgver}" + cp "${srcdir}/guix-install.sh?h=${_pkgver}" guix-install.sh + cp "${srcdir}/COPYING?h=${_pkgver}" COPYING } package() { - cd "${pkgname}-${pkgver}" + cd "${pkgname}-${_pkgver}" install -d "${pkgdir}/usr/bin" install -m 755 guix-install.sh -t "${pkgdir}/usr/bin" diff --git a/pcr/guix/PKGBUILD b/pcr/guix/PKGBUILD index cf004247a..cf50ab92b 100644 --- a/pcr/guix/PKGBUILD +++ b/pcr/guix/PKGBUILD @@ -1,66 +1,85 @@ -# Maintainer (AUR): lantw44 (at) gmail (dot) com +# Maintainer (aur): lantw44 (at) gmail (dot) com # Modified from guix-git 20130119 PKGBUILD +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - Kept sysvinit service files as Parabola also supports OpenRC -# - Disabled tests. We have: -# FAIL: tests/build-utils.scm -# FAIL: tests/challenge.scm -# FAIL: tests/containers.scm -# -# The build also fails if you don't have enough RAM. Using -j2 with 4 GiB of -# RAM made it fail the following error: -# [ 69%] GUILEC gnu/packages/crates-io.go -# mmap(PROT_NONE) failed -# /bin/sh: line 7: 3174 Aborted (core dumped) \ -# XDG_CACHE_HOME=/nowhere host=i686-pc-linux-gnu srcdir="." \ -# ./pre-inst-env /usr/bin/guile -L "." -L "." --no-auto-compile -s \ -# "."/build-aux/compile-all.scm [lot of .scm] -# So to workaround that you can disable the -j by using: -# MAKEFLAGS="" ./build_x86_64.sh pcr/guix +# - Disable tests as they fail: +# | make check-TESTS check-local +# [...] +# | FAIL: tests/build-utils.scm +# [...] +# | FAIL: tests/challenge.scm +# [...] +# | FAIL: tests/containers.scm # In order to verify the PGP signature of the source archive, you may need to # use this command to download the needed public key: # gpg --recv-keys 3CE464558A84FDC69DB40CFB090B11993D9AEBB5 pkgname=guix -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A purely functional package manager for the GNU system" +pkgver=1.4.0 +pkgrel=1 +pkgdesc='A purely functional package manager for the GNU system' arch=('x86_64' 'i686' 'armv7h') -url="https://www.gnu.org/software/guix/" +url='https://guix.gnu.org' license=('GPL3') options=('!strip') makedepends=( + 'guile-ssh>=0.13.0' + 'guile-zstd' + 'guile-semver' + 'guile-lib' 'bash-completion' 'fish' - 'guile-json3' - 'guile-ssh>=0.10.2' 'help2man' 'po4a') depends=( - 'guile>=2.2.4' - 'guile-gcrypt' - 'guile-git-lib' - 'guile-sqlite3' + 'guile>=3.0.3' + 'guile-gcrypt>=0.1.0' + 'guile-gnutls' + 'guile-sqlite3>=0.1.0' + 'guile-zlib>=0.1.0' + 'guile-lzlib' + 'guile-avahi' + 'guile-git-lib>=0.5.0' + 'guile-json>=4.3.0' + 'guile-lzma' 'sqlite>=3.6.19' 'bzip2' + 'disarchive' 'gnutls' - 'libgcrypt' - 'lzlib' - 'zlib') + 'libgcrypt') optdepends=( 'bash-completion: to enable bash programmable completion' - 'guile-json3: to import packages from cpan, gem, pypi' - 'guile-ssh: to offload builds to other machines') + 'guile-ssh: to offload builds to other machines' + 'guile-zstd: to use and publish zstd substitutes' + 'guile-semver: to use the crate importer' + 'guile-lib: to use the go importer') source=( - "https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) + "https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + 'guix-1.4.0-tests-guix-home.patch' + 'guix-1.4.0-guile-3.0.9.patch') install="${pkgname}.install" sha256sums=( - '5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f' - '0416a733ba9b4410897d744a24388a43ba11bd8c427c7d08e649c8875119333d') + '43c769cbf632ef05449ac1fa48c1ba152c33494c6abc7e47137bba7b2149f8a4' + 'b30c7e63048c3fe4e72d6146f107e55e27d1ea1eb5bc7fd8818f20a1a32c8e10' + '930b94fae51eb84f8fd1ad5b6be373dc2a8c8887cf71d100d404159c079ddece' + 'c4b746b0e90981b5efde1fde093632899950d1724df9182bc9a45b4773be1f43') validpgpkeys=('3CE464558A84FDC69DB40CFB090B11993D9AEBB5') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + local source_file + for source_file in "${source[@]}"; do + case "${source_file}" in + *.patch) + patch -p1 < "${srcdir}/${source_file}" + ;; + esac + done +} + build() { local bash_completion_dir="$(pkg-config --variable=completionsdir bash-completion)" local fish_completion_dir="$(pkg-config --variable=completionsdir fish)" @@ -74,37 +93,40 @@ build() { make } -# check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# # Check whether the current working directory is too long -# local cwd_str="$(pwd)" -# local cwd_len="${#cwd_str}" -# # The test tests/gexp.scm fails when the path is longer than 29 bytes -# # because of the length limit on the shebang line. Since we have increased -# # the limit by 7 by renaming test-tmp to t with ac_cv_guix_test_root cache -# # variable, the limit we use here is 36 bytes. -# if [ "${cwd_len}" -gt 36 ]; then -# error "${cwd_str} is too long." -# error "The working directory cannot be longer than 36 bytes." -# false -# fi -# # Make sure we have a valid shell accepting -c option -# SHELL=/bin/sh make check -# } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + # # Check whether the current working directory is too long + # local cwd_str="$(pwd)" + # local cwd_len="${#cwd_str}" + # # The test tests/gexp.scm fails when the path is longer than 29 bytes + # # because of the length limit on the shebang line. Since we have increased + # # the limit by 7 by renaming test-tmp to t with ac_cv_guix_test_root cache + # # variable, the limit we use here is 36 bytes. + # if [ "${cwd_len}" -gt 36 ]; then + # error "${cwd_str} is too long." + # error "The working directory cannot be longer than 36 bytes." + # false + # fi + # # Make sure we have a valid shell accepting -c option. We cannot run tests + # # in parallel because it can cause permission denied error when copying + # # gnu/packages/bootstrap/i686-linux/bash. + # SHELL=/bin/sh make check -j1 +} package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # Remove unused upstart service files - rm -r "${pkgdir}/usr/lib/upstart" # Rename systemd service files provided by upstream because they are not # usable without previous guix installation local system_unit_dir="${pkgdir}/usr/lib/systemd/system" local guix_daemon_default="${system_unit_dir}/guix-daemon.service" local guix_daemon_upstream="${system_unit_dir}/guix-daemon-latest.service" + local guix_gc_default="${system_unit_dir}/guix-gc.service" + local guix_gc_upstream="${system_unit_dir}/guix-gc-latest.service" local guix_publish_default="${system_unit_dir}/guix-publish.service" local guix_publish_upstream="${system_unit_dir}/guix-publish-latest.service" mv "${guix_daemon_default}" "${guix_daemon_upstream}" + mv "${guix_gc_default}" "${guix_gc_upstream}" mv "${guix_publish_default}" "${guix_publish_upstream}" # Generate default systemd service files from upstream ones by fixing paths local guix_profile_root="/var/guix/profiles/per-user/root/current-guix" @@ -114,14 +136,21 @@ package() { > "${guix_daemon_default}" sed -e "s|^ExecStart=${guix_profile_root}/bin|ExecStart=/usr/bin|" \ -e "s|^Description=\(.*\)|Description=\1 (default)|" \ + -e "/^Environment=/d" "${guix_gc_upstream}" \ + > "${guix_gc_default}" + sed -e "s|^ExecStart=${guix_profile_root}/bin|ExecStart=/usr/bin|" \ + -e "s|^Description=\(.*\)|Description=\1 (default)|" \ -e "/^Environment=/d" "${guix_publish_upstream}" \ > "${guix_publish_default}" # Make sure the above sed commands really work ! cmp "${guix_daemon_default}" "${guix_daemon_upstream}" + ! cmp "${guix_gc_default}" "${guix_gc_upstream}" ! cmp "${guix_publish_default}" "${guix_publish_upstream}" # Edit the description of upstream systemd service files sed -i "s|^Description=\(.*\)|Description=\1 (upstream)|" \ - "${guix_daemon_upstream}" "${guix_publish_upstream}" + "${guix_daemon_upstream}" \ + "${guix_gc_upstream}" \ + "${guix_publish_upstream}" # The default makepkg strip option cannot be used here because binaries # installed in /usr/share must not be stripped. # To keep user-defined 'strip' and 'debug' options useful, we still @@ -132,6 +161,9 @@ package() { # put in eval. eval 'options=()' cd "${pkgdir}/usr/bin" - tidy_strip + # tidy_strip may exit with a non-zero return value even if all operations + # are successful. Therefore, we have to ignore its return value to prevent + # makepkg from reporting it as an error. + tidy_strip || true eval 'options=("!strip")' } diff --git a/pcr/guix/guix-1.4.0-guile-3.0.9.patch b/pcr/guix/guix-1.4.0-guile-3.0.9.patch new file mode 100644 index 000000000..83513ae6d --- /dev/null +++ b/pcr/guix/guix-1.4.0-guile-3.0.9.patch @@ -0,0 +1,52 @@ +From 8b2721de6af76780611fe9f86fa5d4cd062400d1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org> +Date: Wed, 25 Jan 2023 17:29:09 +0100 +Subject: [PATCH] packages: Adjust 'generate-package-cache' for Guile 3.0.9. + +* gnu/packages.scm (generate-package-cache): Adjust for Guile 3.0.9. +--- + gnu/packages.scm | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/gnu/packages.scm b/gnu/packages.scm +index 61345f75a9..80c22d1d7f 100644 +--- a/gnu/packages.scm ++++ b/gnu/packages.scm +@@ -1,5 +1,5 @@ + ;;; GNU Guix --- Functional package management for GNU +-;;; Copyright © 2012-2020, 2022 Ludovic Courtès <ludo@gnu.org> ++;;; Copyright © 2012-2020, 2022-2023 Ludovic Courtès <ludo@gnu.org> + ;;; Copyright © 2013 Mark H Weaver <mhw@netris.org> + ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> + ;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> +@@ -38,6 +38,7 @@ (define-module (gnu packages) + #:use-module (ice-9 vlist) + #:use-module (ice-9 match) + #:use-module (ice-9 binary-ports) ++ #:autoload (rnrs bytevectors) (bytevector?) + #:autoload (system base compile) (compile) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-26) +@@ -442,10 +443,15 @@ (define exp + (lambda (port) + ;; Store the cache as a '.go' file. This makes loading fast and reduces + ;; heap usage since some of the static data is directly mmapped. +- (put-bytevector port +- (compile `'(,@exp) +- #:to 'bytecode +- #:opts '(#:to-file? #t))))) ++ (match (compile `'(,@exp) ++ #:to 'bytecode ++ #:opts '(#:to-file? #t)) ++ ((? bytevector? bv) ++ (put-bytevector port bv)) ++ (proc ++ ;; In Guile 3.0.9, the linker can return a procedure instead of a ++ ;; bytevector. Adjust to that. ++ (proc port))))) + cache-file) + + +-- +2.40.0 + diff --git a/pcr/guix/guix-1.4.0-tests-guix-home.patch b/pcr/guix/guix-1.4.0-tests-guix-home.patch new file mode 100644 index 000000000..8dc3fb063 --- /dev/null +++ b/pcr/guix/guix-1.4.0-tests-guix-home.patch @@ -0,0 +1,14 @@ +diff --git a/tests/guix-home.sh b/tests/guix-home.sh +index 3151f66683..11b068ca43 100644 +--- a/tests/guix-home.sh ++++ b/tests/guix-home.sh +@@ -36,8 +36,8 @@ container_supported () + fi + } + +-NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')" + localstatedir="$(guile -c '(use-modules (guix config))(display %localstatedir)')" ++NIX_STORE_DIR="$(guile -c '(use-modules (guix config))(display %storedir)')" + GUIX_DAEMON_SOCKET="$localstatedir/guix/daemon-socket/socket" + export NIX_STORE_DIR GUIX_DAEMON_SOCKET + diff --git a/pcr/gworkspace/PKGBUILD b/pcr/gworkspace/PKGBUILD index 1191ae8c7..2a8e3fe59 100644 --- a/pcr/gworkspace/PKGBUILD +++ b/pcr/gworkspace/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): kusakata <shohei atmark kusakata period com> -# Contributor (AUR): jperry <sh.jperry@gmail.com> +# Maintainer (aur): kusakata <shohei atmark kusakata period com> +# Contributor: jperry <sh.jperry@gmail.com> # use versionpkg # parabola changes and rationale: diff --git a/pcr/gws/PKGBUILD b/pcr/gws/PKGBUILD index cd88cec82..5e490ee57 100644 --- a/pcr/gws/PKGBUILD +++ b/pcr/gws/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Fabien Dubosson <fabien.dubosson@gmail.com> +# Maintainer (aur): Fabien Dubosson <fabien.dubosson@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/gxmessage-gtk2/PKGBUILD b/pcr/gxmessage-gtk2/PKGBUILD index c2cf711e1..478ea67f6 100644 --- a/pcr/gxmessage-gtk2/PKGBUILD +++ b/pcr/gxmessage-gtk2/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org> -# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Geoffroy Carrier <geoffroy.carrier@koon.fr> -# Contributor (Arch): Jaroslav Lichtblau <tu@dragonlord.cz> +# Maintainer (arch): Brian Bidulock <bidulock@openss7.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Contributor: Jaroslav Lichtblau <tu@dragonlord.cz> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=gxmessage-gtk2 diff --git a/pcr/h-client/PKGBUILD b/pcr/h-client/PKGBUILD index 489aedb5c..f66b82363 100644 --- a/pcr/h-client/PKGBUILD +++ b/pcr/h-client/PKGBUILD @@ -1,9 +1,11 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Michał Masłowski <mtjm@mtjm.eu> +# Contributor: bill-auger <bill-auger@programmer.net> + pkgname=h-client pkgver=0.0a0.dev134 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A client for an h-source server (such as https://www.h-node.org/)" arch=('any') @@ -13,32 +15,41 @@ depends=('python2' 'python2-distribute' 'python2-pycurl' 'pygtk' 'pciutils' 'usb makedepends=('subversion') options=(!emptydirs) source=("svn+http://svn.savannah.nongnu.org/svn/${pkgname}/trunk/${pkgname}" - 'h-client-fix_test.patch') + 'fix_test.patch') sha256sums=('SKIP' - 'df842c88bb5bcf6a97db1e2ea813f7f968d9b2e8460a16a4359d62240eb44d1a') + 'f80a2a5971c091093c8ce4a8d963ace36383e7bd819b98c9c86846fb82db9e0d') + + +prepare() +{ + cd "${srcdir}"/${pkgname} -prepare() { - cd "$srcdir/${pkgname}" sed -i "s/dev/dev134/g" setup.cfg sed -i "s/tag_svn_revision = 1//g" setup.cfg sed -i "s/'h-node.org'/'https:\/\/h-node.org'/g" hclient/gtkclient.py - patch -Np1 -i "$srcdir/h-client-fix_test.patch" + + echo "applying fix_test.patch" + patch -Np1 -i "${srcdir}"/fix_test.patch } -build() { - cd "$srcdir/${pkgname}" +build() +{ + cd "${srcdir}"/${pkgname} + make } -check() { - cd "$srcdir/${pkgname}" +check() +{ + cd "${srcdir}"/${pkgname} + python2 setup.py test } -package() { - cd "$srcdir/${pkgname}" - python2 setup.py install --root="$pkgdir/" --optimize=1 - make DESTDIR="$pkgdir" prefix=/usr install-data -} +package() +{ + cd "${srcdir}"/${pkgname} -# vim:set ts=2 sw=2 et: + python2 setup.py install --root="${pkgdir}"/ --optimize=1 + make DESTDIR="${pkgdir}" prefix=/usr install-data +} diff --git a/pcr/h-client/h-client-fix_test.patch b/pcr/h-client/fix_test.patch index 930c7c35b..8ffbd50f9 100644 --- a/pcr/h-client/h-client-fix_test.patch +++ b/pcr/h-client/fix_test.patch @@ -29,13 +29,8 @@ pass # missing file, try other release files --- h-client.orig/tests_hclient/machine.py 2016-07-23 02:00:01.930436000 -0500 +++ h-client/tests_hclient/machine.py 2016-07-23 05:04:55.380405303 -0500 -@@ -34,10 +34,11 @@ - """Check that obtained kernel version looks like Linux version""" - from hclient.machine import KERNEL_VERSION - self.assertTrue(KERNEL_VERSION.startswith("2.6.") -- or KERNEL_VERSION.startswith("3.")) -+ or KERNEL_VERSION.startswith("3.") -+ or KERNEL_VERSION.startswith("4.")) +@@ -37,7 +37,7 @@ + self.assertTrue(re.match('^\d+\.\d+.*', KERNEL_VERSION)) -#: ``/etc/os-release`` from Parabola. diff --git a/pcr/h264enc/PKGBUILD b/pcr/h264enc/PKGBUILD index 5865d05dc..4ef9339a0 100644 --- a/pcr/h264enc/PKGBUILD +++ b/pcr/h264enc/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Jose Riha <jose1711 gmail com> -# Contributor (AUR): AlexanderR <rvacheva at nxt dot ru> -# Contributor (AUR): Markus Heuser <markus.heuser@web.de> -# Contributor (AUR): Stefan Clarke <fm0nk3y@yahoo.co.uk> -# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Jose Riha <jose1711 gmail com> +# Contributor: AlexanderR <rvacheva at nxt dot ru> +# Contributor: Markus Heuser <markus.heuser@web.de> +# Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/holo/PKGBUILD b/pcr/holo/PKGBUILD index f8c0c5c61..333dedfd5 100644 --- a/pcr/holo/PKGBUILD +++ b/pcr/holo/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Stefan Majewsky <majewsky@gmx.net> +# Maintainer (aur): Stefan Majewsky <majewsky@gmx.net> # Maintainer: Luke Shumaker <lukeshu@parabola.nu> # parabola changes and rationale: diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD index 6e1023497..3c852562a 100644 --- a/pcr/hunspell-pt-br/PKGBUILD +++ b/pcr/hunspell-pt-br/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Pedro Gabriel Drumond Pereira <pedrogabriel@dcc.ufmg.br> -# Contributor (AUR): Rafael D Martins <raziel_takato at hotmail dotcom> -# Contributor (AUR): Daniel Felipe Reis Apolinario <dapolinario at gmail dotcom> -# Contributor (AUR): Bernardo Barros <bernardobarros at gmail dotcom> -# Contributor (AUR): Robson R S Peixoto <robsonpeixoto at gmail dotcom> +# Maintainer (aur): Pedro Gabriel Drumond Pereira <pedrogabriel@dcc.ufmg.br> +# Contributor: Rafael D Martins <raziel_takato at hotmail dotcom> +# Contributor: Daniel Felipe Reis Apolinario <dapolinario at gmail dotcom> +# Contributor: Bernardo Barros <bernardobarros at gmail dotcom> +# Contributor: Robson R S Peixoto <robsonpeixoto at gmail dotcom> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/hyphen-pt-br/PKGBUILD b/pcr/hyphen-pt-br/PKGBUILD index 78dba85a9..726dbf59c 100644 --- a/pcr/hyphen-pt-br/PKGBUILD +++ b/pcr/hyphen-pt-br/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Robson R S Peixoto <robsonpeixoto@gmail.com> -# Maintainer (AUR): Davi da Silva Böger <dsboger@gmail.com> +# Contributor: Robson R S Peixoto <robsonpeixoto@gmail.com> +# Maintainer (aur): Davi da Silva Böger <dsboger@gmail.com> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/i2p/PKGBUILD b/pcr/i2p/PKGBUILD index 4d1490871..aa1f1b83f 100644 --- a/pcr/i2p/PKGBUILD +++ b/pcr/i2p/PKGBUILD @@ -1,19 +1,20 @@ -# Contributor (AUR): skydrome <skydrome@protonmail.com> -# Maintainer (AUR): skydrome <skydrome@protonmail.com> +# Contributor: skydrome <skydrome@protonmail.com> +# Maintainer (aur): skydrome <skydrome@protonmail.com> # Maintainer: Freemor <freemor@freemor.ca> +# Maintainer (aur): 6543 <6543 at obermui dot de> ('i2p-openrc' openrc init script) # uncomment if you do not want to build all language translations #export LG2=en pkgname=i2p -pkgver=0.9.50 +pkgver=1.8.0 pkgrel=1 pkgdesc="A distributed anonymous network" url="https://geti2p.net" license=('GPL2') arch=('any') -depends=('java-runtime' 'java-service-wrapper') -makedepends=('java-environment' 'ant') +depends=('java-runtime>=13' 'java-service-wrapper') +makedepends=('java-environment>=13' 'ant') #optdepends=('gtk2: for rrd graphs') conflicts=('i2p-bin' 'i2p-dev') backup=('opt/i2p/wrapper.config') @@ -24,21 +25,23 @@ options=(!strip) # https://geti2p.net/_static/zzz.key.asc validpgpkeys=('2D3D2D03910C6504C1210C65EE60C0C8EE7256A8') +_url="https://files.i2p-projekt.de/${pkgver}" #_url="https://download.i2p2.de/releases/${pkgver}" -_url="https://launchpad.net/i2p/trunk/${pkgver}/+download" +#_url="https://launchpad.net/i2p/trunk/${pkgver}/+download" source=("${_url}/i2psource_${pkgver}.tar.bz2"{,.sig} 'i2prouter.service' 'i2p.tmpfiles' 'wrapper.config' 'router.config' - 'i2prouter.bash' 'i2prouter.sh' + 'i2prouter.bash' 'i2prouter.sh' 'i2p.initd' ) -sha256sums=('66d32b3fd29fb5d68c1cbfdcf2ee74a671ebb359cdc697260291f12e441d94ff' +sha256sums=('525f2ad3267f130b81296b3dd24102fdcf2adf098d54272da4e1be4abd87df04' 'SKIP' '644b771ec7f5db3efab3206bf1f896566cdb00d410a54608fda85bdb4c2ad876' 'fc30dd32f48fe1c93bf36c8297ca48203a1479e4e221ebe62c57cf3c3c0347d3' - 'ba4bcb8d9aef307045d1d24385a456d096ea45f69d95a474467728ea140188ec' + 'e3a85d8992a09e8f57498b1eba0aef758ceffdb944d296528e8c5cec970becd9' '90f202e5b66d5a5b425522b409e71fb892d34c534e32ce2d6fe5284015cacf94' '7a19b9f90c8792460fd58e8b8aa435a065e34d29a942479850472510e9d3078a' - '8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5') + '8d39f080c7a2e49226db3a785f3e18583159ef2f95e1ab467fd9984c4e38c9f5' + 'b9e490398732d3d3b0f5f0233adcb55030cf217e4fc2d2bbfe7cf5577aeb87bf') prepare() { @@ -52,6 +55,7 @@ build() { ant -Dfile.encoding=UTF-8 \ -Djavac.compilerargs=-Xlint:-options \ -Dbuild.reproducible=true \ + -Djavac.version=13 \ preppkg-linux-only } @@ -93,4 +97,7 @@ package() { rm -r opt/i2p/{osid,postinstall.sh,runplain.sh,INSTALL-headless.txt,LICENSE.txt,licenses,man,lib/wrapper*} + # install an init script for openrc + # This should probably be moved into a split package + install -Dm755 "${srcdir}"/i2p.initd "${pkgdir}"/etc/init.d/i2p } diff --git a/pcr/i2p/i2p.initd b/pcr/i2p/i2p.initd new file mode 100644 index 000000000..47299e1b8 --- /dev/null +++ b/pcr/i2p/i2p.initd @@ -0,0 +1,44 @@ +#!/usr/bin/openrc-run +# Distributed under the terms of the GNU General Public License v3 + +user="${user:-i2p}" +group="${group:-i2p}" +pidfile="/run/i2p/$RC_SVCNAME.pid" +command="/usr/bin/java-service-wrapper" +command_args="/opt/i2p/wrapper.config wrapper.name=i2prouter wrapper.syslog.ident=i2prouter wrapper.daemonize=TRUE TZ=UTC" +command_background=1 +workdir=/opt/i2p + +depend() { + use net + need localmount +} + +start() { + ebegin "Start ${SVCNAME}" + + cd $workdir + export HOME=$workdir + su -s /bin/sh -c "$command $command_args" $user + + eend $? + return 0; +} + +stop() { + ebegin "Stopping ${SVCNAME}" + + /bin/kill -TERM $(cat $pidfile) + + eend $? + return 0; +} + +reload() { + ebegin "Reload ${SVCNAME}" + + /bin/kill -USR1 $(cat $pidfile) + + eend $? + return 0; +} diff --git a/pcr/i2p/wrapper.config b/pcr/i2p/wrapper.config index 1474aa02c..2bc2b8e9e 100644 --- a/pcr/i2p/wrapper.config +++ b/pcr/i2p/wrapper.config @@ -169,8 +169,15 @@ wrapper.filter.action.1=RESTART wrapper.filter.message.1=The JVM has run out of memory. #******************************************************************** -# Advanced Options +# Advanced Options - https://docs.oracle.com/en/java/javase/17/docs/specs/man/java.html #******************************************************************** -# Enable the Shenandoah Gargabe Collector -#wrapper.java.additional.100=-XX:+UnlockExperimentalVMOptions +# Enable the Shenandoah Garbage Collector #wrapper.java.additional.101=-XX:+UseShenandoahGC +#wrapper.java.additional.102=-XX:+DisableExplicitGC + +# Committing heap pages into memory helps to reduce latency hiccups +#wrapper.java.additional.103=-XX:+AlwaysPreTouch + +# Using large pages greatly improves performance on large heaps +# Recommended to set /sys/kernel/mm/transparent_hugepage/enabled and /sys/kernel/mm/transparent_hugepage/defrag to "madvise" +#wrapper.java.additional.104=XX:+UseTransparentHugePages diff --git a/pcr/i3-gnome/PKGBUILD b/pcr/i3-gnome/PKGBUILD index f4d1c385f..53a19813b 100644 --- a/pcr/i3-gnome/PKGBUILD +++ b/pcr/i3-gnome/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Jesús Castro <x51v4n@gmail.com> -# Contributors (AUR): @killajoe, @Snowmobil, @ThomasWeiser (GitHub) +# Maintainer (aur): Jesús Castro <x51v4n@gmail.com> +# Contributor: @killajoe, @Snowmobil, @ThomasWeiser (GitHub) # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/icedove-bin/PKGBUILD b/pcr/icedove-bin/PKGBUILD new file mode 100644 index 000000000..535238325 --- /dev/null +++ b/pcr/icedove-bin/PKGBUILD @@ -0,0 +1,138 @@ +# Maintainer: bill-auger <bill-auger@programmer.net> + + +# FIXME: https://labs.parabola.nu/issues/3115 +# Binary packages are generally not acceptable. +# Icedove has been unable to build for a long time though. +# libre/icedove still works; but is quite out-of-date. +# Ideally, let's fix libre/icedove and delete this package. + + +# NOTE: Trisquel packages are not signed; but the repo databases are. +# The database contains checksums of per-repo manifests; +# and the manifests contain checksums of the packaged files. +# The check() function verifies the signature of the database, +# then verifies the manifest against its checksum in the database, +# then verifies all package files against their checksums in the manifest. +# That is why the makepkg integrity checks are used only for the signing key. + + +pkgname=icedove-bin +pkgver=115.8.1 +pkgrel=trisquel21 +pkgdesc="Email, RSS and newsgroup client with integrated spam filter (Trisquel binaries)" +arch=(x86_64) +url=http://www.trisquel.info +# license=('MPL-2.0' 'GPL-2.0-only' 'LGPL-2.1-only') # TODO: +license=(MPL2 GPL2 LGPL2.1) +options=('!strip' '!emptydirs') + +# The 'depends' array is from the arch package. +# The Trisquel binaries do not not link to most of these system sodeps. +depends=( + glibc + gtk3 libgdk-3.so libgtk-3.so + mime-types + dbus # libdbus-1.so + dbus-glib + alsa-lib + nss + hunspell + sqlite + ttf-font + libvpx # libvpx.so + zlib + bzip2 # libbz2.so + botan2 + libwebp # libwebp.so libwebpdemux.so + libevent + libjpeg-turbo + libffi # libffi.so + nspr + gcc-libs + libx11 + libxrender + libxfixes + libxext + libxcomposite + libxdamage + pango libpango-1.0.so + cairo + gdk-pixbuf2 + freetype2 # libfreetype.so + fontconfig # libfontconfig.so + glib2 libglib-2.0.so + pixman # libpixman-1.so + gnupg + json-c + libcanberra + ffmpeg + icu # libicui18n.so libicuuc.so +) +optdepends=( + 'hunspell-en_us: Spell checking, American English' + 'libotr: OTR support for active one-to-one chats' + 'libnotify: Notification integration' +) + +_upstream_name=icedove +_deb_pkg=${_upstream_name}_${pkgver}+build1-0ubuntu0.22.04.1+11.0${pkgrel}_amd64.deb +source=(http://us.archive.trisquel.info/trisquel/dists/aramo-updates/Release{,.gpg} + http://us.archive.trisquel.info/trisquel/dists/aramo-updates/main/binary-amd64/Packages + http://us.archive.trisquel.info/trisquel/pool/main/t/thunderbird/${_deb_pkg} + trisquel-archive-signkey.gpg) +sha256sums=(SKIP SKIP SKIP SKIP a69f9e3c192d4805c37f2975c59339a5a048057cef3c9bf156d1663305f589ca) +validpgpkeys=('60364C9869F92450421F0C22B138CA450C05112F') # Trisquel GNU/Linux <trisquel-devel@trisquel.info> + + +build() +{ + mkdir pkg/ + + ar x ${_deb_pkg} + tar xf data.tar.zst --directory=pkg/ +} + +check() +{ + readonly MANIFEST_RX="^ [0-9a-f]{64} [0-9]+ main/binary-amd64/Packages$" + readonly PACKAGES_AWK="BEGIN { RS = \"Package:\" ; FS = \"\n\" } ( \$1 ~ /^ ${_upstream_name}$/ && \$3 ~ /${pkgver}.*${pkgrel}$/) { split(\$17 , a , \" \") ; split(\$18 , b , \" \") ; print a[2]\" \" b[2] }" + readonly PKGS_SIZE_ERR="Packages: filesize mismatch" + readonly PKGS_SUM_ERR="Packages: checksum mismatch" + readonly DEB_SIZE_ERR=".deb: filesize mismatch" + readonly DEB_SUM_ERR=".deb: checksum mismatch" + readonly SUMS_ERR="checksums: not found" + readonly FILES_SUM_ERR="files: checksum mismatch" + local sum n_bytes filepath + + # validate repo manifest + echo -e "\n== validating repo manifest ==" + gpg --import trisquel-archive-signkey.gpg + gpg --verify Release.gpg Release + read -r sum n_bytes _ < <(grep -E "${MANIFEST_RX}" Release | tail -n 1) + sum+=" Packages" + [[ "${n_bytes}" == "$(stat -c %s -L Packages)" ]] || ! echo "${PKGS_SIZE_ERR}" || return 1 + sha256sum --strict --check <(echo ${sum} ) || ! echo "${PKGS_SUM_ERR}" || return 1 + + # validate binary package + echo -e "\n== validating binary package ==" + read -r n_bytes sum < <(awk "${PACKAGES_AWK}" Packages) + sum+=" ${_deb_pkg}" + [[ "${n_bytes}" == "$(stat -c %s -L ${_deb_pkg})" ]] || ! echo "${DEB_SIZE_ERR}" || return 1 + sha256sum --strict --check <(echo ${sum}) || ! echo "${DEB_SUM_ERR}" || return 1 + + # validate binary package contents + echo -e "\n== validating binary package contents ==" + tar xf control.tar.zst ./md5sums + cat md5sums + (( $(stat -c %s -L md5sums) )) || ! echo "${SUMS_ERR}" || return 1 + while read sum filepath + do sum+=" pkg/${filepath}" + md5sum --strict --check <(echo ${sum}) || ! echo "${FILES_SUM_ERR}" || return 1 + done < md5sums +} + +package() +{ + cp -a pkg/* "${pkgdir}"/ +} diff --git a/pcr/icedove-bin/trisquel-archive-signkey.gpg b/pcr/icedove-bin/trisquel-archive-signkey.gpg new file mode 100644 index 000000000..54b2cabbb --- /dev/null +++ b/pcr/icedove-bin/trisquel-archive-signkey.gpg @@ -0,0 +1,113 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.10 (GNU/Linux) + +mQGiBEWqgWsRBACyvlHQxUA6RnHvXLZTowvkja5RlfVea0jZze1y4qjmjJ+FKluu +WKmLr68h0RQaGb6D9drhpDqcGyY/Hcvd4xe/Lbu7rZ2hXXW/7hPdWXLQe9sFnGFZ +B3L3xy+nMZdQ2HvnYuqLK7gm6SWO6aoV7X8w63hj0pC75TWYY2COJ4O86wCgw0xL +OORa0TC549VTbgRiAYq9yKsD/j2Y72cuQSfQlKDFb4AbknMCWdH+mUlEL2vcOP4l +vjTO+0ekMK9QLBeZQQrV8Kbi5r3lWhEZLxEdFMXMrics/Z2DIZ4oOL+zxTatvc2K +SVJoTjGyk8GxThdpa2WCRIe+Uf0Fm9gucuVkfUuk7W46SLyTYWFDRqa7IUtbnC+G +QUFnA/986wzmODkuyipMKvFnVd+4/9ubfUV9DZ76StVr9+nx+sOi2GtK3AiHggLG +yOw1Wnt1HIaopA7Y9olc7S6nnakMq6rpKA+MoFFSUmF18WfTs1ha9T+kTQ8JA00L +N/9GacaAEDQwKqPWWO9FnRUN46m43ukG6/0uDT3G3ItdRhzewrRSVHJpc3F1ZWwg +R05VL0xpbnV4IChUcmlzcXVlbCBHTlUvTGludXggc2lnbmluZyBrZXkpIDx0cmlz +cXVlbC1kZXZlbEB0cmlzcXVlbC5pbmZvPohgBBMRAgAgBQJKqFs1AhsDBgsJCAcD +AgQVAggDBBYCAwECHgECF4AACgkQtO+5842K6/GptQCgot6ILdUO7k7ZgSAPk4rX +dYboGsUAnjLTU+Gyqcpk4aGEH7LlEfcLG1GhuQINBEWqgXEQCACs5IoPtgOMBGHu +iz3Y48caxWNws6XZ2PedsX2GaPyuVTwraaW0pfrxT9pJgsR7NQOabQPUIdvMHAIK +gowrVWzol3EuF9yoY601Zntzk/HAfMLm6QFQBykIpbRXpf5ts4aHCZuHredoxb+y +bEvYbgCzEDIA+v8+2H8YvX1ji+fhFoXk0rbYRgUSoHsNsOR+xAvzYBpYtUeHtFua +I0Yn5A+7AaobzlPRNssOyi5YpPBWKgrnGUi8hZ4S1MxyzEd5IO1uZjX46hP17QSc +Bv5+iOVFBrsIb1jwVHcJ4RWRgCOwJgVXP6Bqurbp4iSX1H1FmEqTKNAeBGj0kCqZ +BuLI4Ke7AAMGB/9igeS4U77kpXvG7+NmNhjnZM9hCKoa4a8ND/YBaj4YElR0eXv9 +9ayXVf12mWIKBMRs4qr/6JnuT0EqB3YBcGt2sYFFE/7Oy9/ZmSD1lS9ib9C3LsPa +AgKSpL+2E/NtZtTjwQ77LCGYP7RMmGCSoLVwa2/KQNCFnWe+dfKR8A8ODHLsBK0U +mr8j3uPZBFudaK2VcnBKf74kkaa7hcFJo5nkjXDwQdletkUG0RxlF/6QkzA/gphd +MwRt8LYBs/8CWwJM73NiAB3+qEGJ0khiIct9MpZ/VCc4bKZ/w97qcwQ3zJMtvuCD +rKzMS+Kyea4Wpy+DaGlAs2ZSUHvG3mo41bnfiEkEGBECAAkFAkWqgXECGwwACgkQ +tO+5842K6/EoPACffP0BW9s0UyehOrXR0GhkcTEw5iYAoLjJ8WpzucaKz9w4Y1Sb +7E05kXhA +=zlqX +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFhxcQMBEADaT9jTxXNbmjx7kZdTK7JCFx2OAeSS0+XltJnGOPnd6Vj4W1u2 +QLReYD1rVVYA8kneT3VjvZpKO/Ho3TbQZ4E8hNDEwaVmKnTfrmptIzv44cHJexsZ +eTol74rac/pC/oXCHGINWLflfyQt8iB0dGSEPjtDXvYNFTwBYrQDI9apO5JVWvCB +qLaQdXU+MCsTaD5OZ4bJ2dQleI34UGea+NrrnAZP68d5hsLL+WTa65fhB3Bws8zc +1v+JhVJhLYNQOcTHRXU7ieUN2zy+JzbD/10XV64YZQseEkhXG8LMRvfbTDD/SigD +wKViVFkDa7NFfmpOE9kaF6Nh/XrWmMJjG49KtYUln/G2XCV4TpJrbrWW0OxGqki+ +HH/36N63CZR4lj0EENFQduikTq1LeyQBXQSccwH9FJEI/4Uz5uuVM+tviScmgWEC +YXo7PdCoUUJDiR6Uma4COAYOTHM/7C5wVofkH1mq5fSz6rbBNIDIoy/W6GrN41s0 +WOl+z9ZgNlY1qtvpwSDenY9WERLajUAJKVTAwI2mvIETo+q8b2J8iIlfI8KkW/+q +qt87BkFmo2Acgh9l0O1j/Ysp5p7OtCjz8uuO+WzbBo6RlXafx/9e6QoatbtwSBUp +4W3w2/VANRYtL5DyDCbcuwMk77r9jXp1913sTFlin4xIs840gcVahetA+QARAQAB +tDFUcmlzcXVlbCBHTlUvTGludXggPHRyaXNxdWVsLWRldmVsQHRyaXNxdWVsLmlu +Zm8+iQI2BBMBCgAhBQJYcXEDAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJ +ELE4ykUMBREv6NUP9jTl1CZKHqL3NmF2Df/ID+za7YO5IebxbzRC9vkjrWSuoMpw +xJ/U5pBCsz0bDewJXMx0XeSNgo/WAzWoPmh3PTUXKhLjlGS2DII96XXbMy2zi+3r ++apIY3wedYkC/BiK9w8pGXGGlTXTo9zitWZC2/yWC4I9W2818mMJPXpQjvkzqdwU +UlV54fpnqoMNsLFEa1w1ahDerdCTe0Azrr+3YrKaQ287MpkWwO/Cf/yYg0UhbDih +FFMZ4Wa9aywvxQ86khghOafLLkIHcakMBdVRodym00bGeAjeNHnMffDi3k8tfejk +g6iLVrZf21+KsVfV+PLX4QQsPCR/dlneKKCAEPh+awserncssizx2/ujhvTd7z3l +tXGG7UcQP7fYTBWNkU7+ddMOWp26hOsINt0NyxhiGT2ZPEy1vpZ1H80rlaMkiISH +Z56SCfcHGuEHlkDKdz7ZsS8gU+zqMAnNEDb6UrqZZbhJcR3N7DsTQC/okoF8egDM +nHD9pUdDakPungnt6j7eLA6Ogca58mbIvwsQ+Qn9Urcd0m30to6WCTlj4jKsrMy/ +QtbyVSc/G3PZXVqP8xWIpuZtu0eMx+NjCKWmOYvTgIjbjLp0z801Weexn9uva+1z +5nRy+00aOddoLhtXqNFxNS94gXvH3D6ZJ2ejADooEBiqk1M+KWFtOsW01QG5Ag0E +WHFxAwEQALAKjsSSREoYjswMG1/znBkoNz199DkKJ3DnOk5NulkZcAoHeQVLnv2M +/1qycG4ndoIkINdz37fKdFziEJd4cBSQ+3gNollaxM2x7KdF7M13Z4YgFgg40qxO +8id8CSLga2klnFU8aa5PtRPYd4XZ5azpxzCRF8u+1ojM+rLAO0hKLGDhBqjKFvG4 +ASeX14F1R2yiGvZU2lQKQu2ZIk9IqN7M0IsCEh1O8+GNd7lCTFyvAYK0ai0dg9Q5 +F6X2YvQVYDik7rOuP6D6oUmGXufi2vc0OxFX5dBHa4z7XR0BRzg9VtkUerHSbVPI +c+3mgG5+QmlD+3NKYqiTZvKOWQbgKD/Pg0E0hqw8IjSThmge8XQcTh6qhW8ww0Gz +ha6HN0At5kMGbQqsTARjfgjhJZdyjA09NGYu1KVKDrKMrN9le9tO05ztZeP3y5My +S9LaWDE6Flm0BBqkkrHDk+9ID/qDixe/3ZCppu3dJsCF8aaG+sIQjxlMAeXtKOLl +ZuQbPaVJbQXElwZo3Nz20N2RAZJLXycCev7EbC8Afpg6TYjlJyJX9uyKxDv+QORG +RJ5vFA4evNCmUrS0PpcodJxk5TMSuR9vRuvT1jVVMe18T1F74XRqTW6xizC7EEM8 +X5QLDuVMRErSUPfcNYLTGJAvPTQ/EgU5aK+H1qv1EEbXeMiuksdvABEBAAGJAh8E +GAEKAAkFAlhxcQMCGwwACgkQsTjKRQwFES/C0A//aT9JDbwF4JYgyxQuPuxb8G/e +9thHNBhPmGL7gpyGzUW3q/c6HHnFxT7YPA37fsN/JD9Mcdx2rRFhz0XVR6cfdQZy +299s2/aX4Tu4FbMnmM+Du5uFFgStJA7LjaacHn6MxEohUeZAL7LMYiUovbwnsaiP +0sPhLaMrOQkRL/9mEKJiNbn6r/xX4xegzYNqoNdDKbcARaAzm5AH03Mmbc7Ss+OZ +4v/7vlcUnyEZ2c4jazP7W+pGWIw9f3SqnIxuCeDrCD35IFsUrE27dbtaNpkKw9zF +lfaEC+6PAI7M78gg2RNvaurCJR5B7bENrobf0lxbYGLGFcOIqTXkbuWjjO3eI/5Q +rmnO8Uy41Zos03Gsa6QkQ4p6OtVN4hHLxXkirs31cIocPqiJ7Vi+OH8stMNukvVT +dgnuw4dbPEhDnrFREDNSuRtV+2Lxl4JLr7gQUQDZKEf8cYZUAdN69dcW48Ugdvgu +6cRDVWakfim6kvZiQ0vxGxGM02V3RdhhZqrwXXYUPyyWMW230IjYc9cYQ+3C/1K4 +MUUeMjKDMPQ/jlUiMjZeE+X0W/TaUj8uCOJ4M6+oYMqwUECPSFe9Of7VTKhB3+Ex +wGEtYWJUfhuYu8Tph2GZmud0vz4+ugpkliFVliGJfPPJ1EfgAAiUUvomoIXKsynV +McDbwCjFQn2iazszZsg= +=UAIm +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGNQMswBEACpaLnL36fWyve4zXHKrN7AjXl+g5cafQyei4j1saTLfQatdJed +ubvcscZ3yERB+R0+8xuH2UqvR0E57ohZZaTiwcUWJ3VemxCZhwKy+Xvt1ZUNxBrh +2qAJBcP0+UCskSfWb+QQ1twNIeQ8Raj+kRPGphlNmjYxF2CFOsw9c56Lz+jNyty9 +RC3Bg4l+Kcdhw23w5XBUXpHOyL6lsG317PWgEHUIQzNhXZfHL9GzwtTVQV8tVPyu +MOQIa7KDFXUEEnRN31mVLzfNHqKtTgFfP2LnSiD3LsBYsqJUtAnFGyORHgKhddRg +AKLrn1h0dEzkN+XsMaAWPrJg87ks7qXhhNz3SEI+t7dL4ozfUryRY9/8t/rXuQK+ +ffRO/63i8SaHdu1Sl8MgHsNZRFOlbYGPw73TpdJ3JvfmfPNrRcTzsU1arMML8GWs +q6/QYDTWVYBYXy0kEqJQmeb3yJRvnIdVfiAdu9fyDPY8FCTUTcsxKe88u2bgrIaY +pNdoNFXojIC9JvMUM5QakMeog+ocTrZFOyhRMKfq5KEV/IDvsx6BfQzpjvK27LgX +LcdlP9HUVb9ZkKUgMGV1trqSA7kKrkDtfw+BInReTeSEnr4jsAwwiG62kDmmA4mo +dFq1MsWTAJTvpeeK+86gYliZukt6076zPrszmDJIyJWwHCLFn1jVkn1tlQARAQAB +tFpUcmlzcXVlbCBHTlUvTGludXggQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBL +ZXkgKDExL2FyYW1vKSA8dHJpc3F1ZWwtZGV2ZWxAdHJpc3F1ZWwuaW5mbz6JAk4E +EwEKADgCGwMFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AWIQTSTdrJIm1bpenzvtP1 +2qr3StTJOAUCY1AzAgAKCRD12qr3StTJOIxbD/44B7Kv+26TBW6BIiUlp1iDsvoX +yHk9yau41g6HjJR53KrFID4uszN9B+Cl+R0PjywfgC9OSSTKOjJq4/yQE00JpuF+ +HtWieshZJs8QFKLD+mZQfRVCQweqj9HZS8AFH02LYkdsXiv4LZLaNljcHEPC3Y34 +61xcg3viATgHL1ZJIPGT/vk425jQkEv9wjCjIvKsMhoE9EcqDBft9jKBC6H8LQwZ +iIYYNf28WRIW/EbutPe+0B3YOuw3PT/o/x40ySLWIJARODxBCqJ0wEC4PI7lUiLg +DGV0cUUykZz7BXKaIZIj+3wViR5zDGqIWx5TwdW2MJpDi9ove8N/3HaAc6BwQQXH +acZohOBqf/BjTKXQufVzx1sMBxB+a5zp284uICX54y/mm9tPHWcOOtl+NYj5qk4A +qn+vh433kNW622qJ8tt72kbcfaRekBnCj/A10U46TyWgZgMc7XxCc5r8slJWlhYZ +bRgbWWvkyH1s0mzbkAyNwrNa0vafcxOxO9psc7LG4mLPBqLoKKPmYY5Vgu8fdlbb +OLLFVvNhuTSX2ugkPfAp/XeWucQPJv3een1C1AWNcufhKYm1DZkYTGBeT8cbsw3T +0JnpRad+Sm2VhLcQ8PHKHUUeklVqUMjyCHo32sydo+I1MjC3QWycolljno2un9HU +TNAXG/1k2DzsqFPFjw== +=LJyh +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pcr/icestorm-git/PKGBUILD b/pcr/icestorm-git/PKGBUILD index 4e06aed6e..f52ec9f05 100644 --- a/pcr/icestorm-git/PKGBUILD +++ b/pcr/icestorm-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Sebastian Bøe <sebastianbooe@gmail.com> +# Maintainer (aur): Sebastian Bøe <sebastianbooe@gmail.com> # parabola changes and rationale: # - Added armv7h and i686 architectures support # - Modified to use a fixed git revision diff --git a/pcr/icinga/PKGBUILD b/pcr/icinga/PKGBUILD index f114137e7..7eb07ba6e 100644 --- a/pcr/icinga/PKGBUILD +++ b/pcr/icinga/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Foppe Hemminga <foppe@hemminga.net> +# Maintainer (aur): Foppe Hemminga <foppe@hemminga.net> # Contributer (AUR): ralix <ralix@gmx.de> # Contributer (AUR): GutenYe <ywzhaifei@gmail.com> diff --git a/pcr/idjc/PKGBUILD b/pcr/idjc/PKGBUILD index cc18e8cbc..ac86e31b3 100644 --- a/pcr/idjc/PKGBUILD +++ b/pcr/idjc/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): M0Rf30 -# Contributor (Arch): Tobias Luther <tobias [at] tonstrom [dot] de> -# Contributor (Arch): GraveDigger -# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org> +# Maintainer (arch): M0Rf30 +# Contributor: Tobias Luther <tobias [at] tonstrom [dot] de> +# Contributor: GraveDigger +# Contributor: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=idjc diff --git a/pcr/ii/PKGBUILD b/pcr/ii/PKGBUILD index e471ca0ba..6cf24b0dd 100644 --- a/pcr/ii/PKGBUILD +++ b/pcr/ii/PKGBUILD @@ -1,7 +1,9 @@ -# Contributor (Arch): Evan Gates <evan.gates@gmail.com> -# Contributor (Arch): Dag Odenhall <dag.odenhall@gmail.com> -# Contributor (Arch): Chris Brannon <cmbrannon@cox.net> -# Contributor (Arch): William Giokas <1007380@gmail.com> +# Contributor: Evan Gates <evan.gates@gmail.com> +# Contributor: Dag Odenhall <dag.odenhall@gmail.com> +# Contributor: Chris Brannon <cmbrannon@cox.net> +# Contributor: William Giokas <1007380@gmail.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=ii pkgver=1.7 pkgrel=2 diff --git a/pcr/imule/PKGBUILD b/pcr/imule/PKGBUILD index 4ec2055ca..0726279ea 100644 --- a/pcr/imule/PKGBUILD +++ b/pcr/imule/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer (aur): Que Quotion <quequotion at gmail dot com> -# Contributor (aur): Black Dragon <blackdrg at i2pmail dot org> -# Contributor (aur): atterratio <atterratio at gmail dot com> +# Contributor: Black Dragon <blackdrg at i2pmail dot org> +# Contributor: atterratio <atterratio at gmail dot com> # NOTE: this PKGBUILD requires I2P to be running on the local machine diff --git a/pcr/imx_usb_loader-git/PKGBUILD b/pcr/imx_usb_loader-git/PKGBUILD index 7c4030596..4730d9fcf 100644 --- a/pcr/imx_usb_loader-git/PKGBUILD +++ b/pcr/imx_usb_loader-git/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> _pkgname=imx_usb_loader pkgname=${_pkgname}-git diff --git a/pcr/initify/PKGBUILD b/pcr/initify/PKGBUILD new file mode 100644 index 000000000..317208098 --- /dev/null +++ b/pcr/initify/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer (aur): TBK <aur at jjtc dot eu> +# Contributor: bill-auger <bill-auger@programmer.net> + + +pkgname=initify +_gitver=f9ccbb147924a2371a1ae5a925c1be6858cca5fa +pkgver=0.0.0.pre.${_gitver:0:7} +pkgrel=3 +pkgdesc="Convert systemd services to OpenRC init-scripts" +arch=(any) +url=https://github.com/goose121/initify/ +license=(custom:MIT) + +makedepends=(git) +depends=(perl) +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/goose121/${pkgname}/archive/${_gitver}.tar.gz) +source+=(trim_path_from_service_name.patch + validate_args.patch) + +sha256sums=('24709e6f243247a83826b662d6e8431eca223ef5aaccf75a09d5dbf7dde81539') +sha256sums+=('e105a8d8e7074050fa192ea139382c75a5cafda83275376dd6cd21779a80ca5d' + 'b82a63fda947af397f8d60ad4049d3aba279817360f4acaeb3e684278016a711') + + +prepare() +{ + cd "${srcdir}"/${pkgname}-${_gitver}/ + + # https://github.com/goose121/initify/issues/2 + echo "applying trim_path_from_service_name.patch" + patch -p1 < "${srcdir}"/trim_path_from_service_name.patch + + # https://github.com/goose121/initify/issues/2 + echo "applying validate_args.patch" + patch -p1 < "${srcdir}"/validate_args.patch +} + +package() +{ + cd "${srcdir}"/${pkgname}-${_gitver}/ + + install -Dm755 cronify.pl "${pkgdir}"/usr/bin/cronify + install -Dm755 initify.pl "${pkgdir}"/usr/bin/initify + install -Dm644 README.md "${pkgdir}"/usr/share/doc/${pkgname}/README.md + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/pcr/initify/trim_path_from_service_name.patch b/pcr/initify/trim_path_from_service_name.patch new file mode 100644 index 000000000..f1aef74bd --- /dev/null +++ b/pcr/initify/trim_path_from_service_name.patch @@ -0,0 +1,32 @@ +diff --git a/initify.pl b/initify.pl +index 7cec3d2..3d8b1bd 100755 +--- a/initify.pl ++++ b/initify.pl +@@ -14,7 +14,8 @@ my @cmds_start = (); + my @cmds_stop = (); + my $pidfile = ""; + my $desc = ""; +-(my $service=$ARGV[0])=~s/\.service//; ++(my $service = $ARGV[0]) =~ s/\.service//; ++(my $svc_name = $ARGV[0]) =~ s|(.*/)?([^/.]*)\.service|$2|; + + my %opt; + GetOptions(\%opt, +@@ -23,7 +24,7 @@ GetOptions(\%opt, + + pod2usage() if ($opt{help}); + +-$service = $opt{name} if (length $opt{name}); ++$svc_name = $opt{name} if (length $opt{name}); + + while(<>) { + #s/\s*|\s*$//g; # Trim whitespace +@@ -77,7 +78,7 @@ command=$cmd_path[0] + command_args="$cmd_argl[0]" + pidfile=$pidfile + +-name="$service" ++name="$svc_name" + description="$desc" + EOF + diff --git a/pcr/initify/validate_args.patch b/pcr/initify/validate_args.patch new file mode 100644 index 000000000..447478268 --- /dev/null +++ b/pcr/initify/validate_args.patch @@ -0,0 +1,39 @@ +diff --git a/initify.pl b/initify.pl +index 3d8b1bd..fbfbce8 100755 +--- a/initify.pl ++++ b/initify.pl +@@ -14,18 +14,31 @@ my @cmds_start = (); + my @cmds_stop = (); + my $pidfile = ""; + my $desc = ""; +-(my $service = $ARGV[0]) =~ s/\.service//; +-(my $svc_name = $ARGV[0]) =~ s|(.*/)?([^/.]*)\.service|$2|; + ++# parse CLI args + my %opt; + GetOptions(\%opt, + "name=s", + "help|?") || pod2usage(2); +- + pod2usage() if ($opt{help}); + ++# get systemd service source file, and target service name ++(my $service = $ARGV[0])=~s/\.service//; ++(my $svc_name = $ARGV[0])=~s|(.*/)?([^/.]*)\.service|$2|; + $svc_name = $opt{name} if (length $opt{name}); + ++# sanity checks ++my $USAGE = "Usage: initify [options] some-systemd.service"; ++unless ($ARGV[0] =~ /(.*\/)?([^\/.]*)\.service/) { ++ print "no *.service file specified - quitting\n$USAGE\n"; ++ exit; ++} ++unless (-e "$ARGV[0]") { ++ print "can not find *.service file: '$ARGV[0]' - quitting\n$USAGE\n"; ++ exit; ++} ++ ++# begin + while(<>) { + #s/\s*|\s*$//g; # Trim whitespace + if (m/^Type\s*=\s*(.*)/) { diff --git a/pcr/inspircd/PKGBUILD b/pcr/inspircd/PKGBUILD index 67c807774..ae1cbcbab 100644 --- a/pcr/inspircd/PKGBUILD +++ b/pcr/inspircd/PKGBUILD @@ -1,73 +1,94 @@ -# Maintainer (AUR): Maxime Poulin <maxpoulin64@gmail.com> -# Contributor (AUR): Damian Nowak <damian.nowak@atlashost.eu> -# Contributor (AUR): Kyle Fuller <inbox@kylefuller.co.uk> -# Contributor (AUR): jibi <jibi@paranoici.org> +# Maintainer (aur): Maxime Poulin <maxpoulin64@gmail.com> +# Maintainer (aur): Felix Golatofski <contact@xdfr.de> +# Contributor: Damian Nowak <damian.nowak@atlashost.eu> +# Contributor: Kyle Fuller <inbox@kylefuller.co.uk> +# Contributor: jibi <jibi@paranoici.org> +# Maintainer: Wael Karram <wael@waelk.tech> -# parabola changes and rationale: -# - fixed arch array -# - removed redundant conflicts and provides pkgname='inspircd' -pkgver='2.0.24' +pkgver='3.17.0' pkgrel='1' -pkgdesc='A stable, modern and lightweight IRC daemon' -arch=('x86_64' 'i686' 'armv7h') -url='http://www.inspircd.org/' +pkgdesc='InspIRCd is a modular Internet Relay Chat (IRC) server written in C++ for Linux, BSD, Windows and macOS systems.' +arch=('x86_64' 'aarch64') +arch+=('armv7h' 'i686') +url='https://www.inspircd.org/' license=('GPL2') +conflicts=('inspircd') +provides=('inspircd') depends=('perl') -makedepends=('pkg-config' 'libmariadbclient' 'sqlite3' 'libldap' 'geoip' - 'gnutls' 'openssl' 'libgcrypt') +makedepends=('libmariadbclient' 'sqlite3' 'libldap' 'geoip' 'libmaxminddb' + 'gnutls' 'openssl' 'libgcrypt' 'postgresql-client' + 're2' 'tre' 'mbedtls' 'pkg-config') optdepends=('gnutls: m_ssl_gnutls' - 'libgcrypt: m_ssl_gnutls' - 'openssl: m_ssl_openssl' - 'libmariadbclient: m_mysql' - 'pcre: m_regex_pcre' - 'sqlite3: m_sqlite3' - 'libldap: m_ldapoper and m_ldapauth' - 'geoip: m_geoip') + 'libgcrypt: m_ssl_gnutls' + 'openssl: m_ssl_openssl' + 'libmariadbclient: m_mysql' + 'postgresql-client: m_pgsql' + 'libmaxminddb: m_geo_maxmind' + 'pcre: m_regex_pcre' + 'sqlite3: m_sqlite3' + 'libldap: m_ldap' + 'geoip: m_geoip' + 're2: m_regex_re2' + 'tre: m_regex_tre' + 'mbedtls: m_ssl_mbedtls') install='inspircd.install' source=("https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz" - 'inspircd.service') -sha512sums=('766ed9b2786a36c6f3765405b5e02d831ea5ae1089c1b646ed0340b08147f9bb8d477ff94e16b0d9ed02dc109c6273f3772e1bed10bc45d1e9e9b409a37d2b6a' - '5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832') + "$pkgname.service" + "$pkgname.sysusers" + ) +sha256sums=('181de90130e11a26ec107fcb6b74005cbce3051b89b500347e416054e29c3166' + 'b59bbb46ed411ad4f39f04539ea3957f3d029c4a2f8994769eb775b17a804351' + 'cab41d386b4207e967b8fc5ab6859e20b342fd91c7e55a20eac856b8ab6cdf8c') + +prepare() { + cd "${srcdir}/inspircd-${pkgver}" + sed -i -e s/-lldap_r/-lldap/g src/modules/extra/m_ldap.cpp +} build() { - cd "${srcdir}/inspircd-${pkgver}" + cd "${srcdir}/inspircd-${pkgver}" - ./configure \ - --enable-extras=m_geoip.cpp \ - --enable-extras=m_ldapauth.cpp \ - --enable-extras=m_ldapoper.cpp \ + ./configure \ + --enable-extras=m_geo_maxmind.cpp \ + --enable-extras=m_ldap.cpp \ --enable-extras=m_mysql.cpp \ - --enable-extras=m_regex_pcre.cpp \ + --enable-extras=m_pgsql.cpp \ --enable-extras=m_regex_posix.cpp \ - --enable-extras=m_sqlite3.cpp + --enable-extras=m_regex_stdlib.cpp \ + --enable-extras=m_regex_re2.cpp \ + --enable-extras=m_regex_tre.cpp \ + --enable-extras=m_sqlite3.cpp \ + --enable-extras=m_ssl_gnutls.cpp \ + --enable-extras=m_ssl_openssl.cpp \ + --enable-extras=m_ssl_mbedtls.cpp \ + --enable-extras=m_sslrehashsignal.cpp - ./configure \ + ./configure \ --uid=0 \ + --gid=0 \ --prefix=/usr/lib/inspircd \ --binary-dir=/usr/bin \ --module-dir=/usr/lib/inspircd/modules \ --config-dir=/etc/inspircd \ --data-dir=/var/lib/inspircd \ --log-dir=/var/log/inspircd \ - --enable-gnutls \ - --enable-openssl \ - --enable-epoll - - make + --distribution-label=archlinux + make } package() { - install -Dm644 "${srcdir}"/inspircd.service "${pkgdir}"/usr/lib/systemd/system/inspircd.service - install -o141 -g141 -dm750 "${pkgdir}/var/log/inspircd" "${pkgdir}/var/lib/inspircd" + install -Dm644 "${srcdir}/$pkgname.service" "${pkgdir}"/usr/lib/systemd/system/inspircd.service + install -Dm644 "${srcdir}/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf" + install -dm750 "${pkgdir}/var/log/inspircd" "${pkgdir}/var/lib/inspircd" - cd "${srcdir}/inspircd-${pkgver}" - make DESTDIR="$pkgdir" install + cd "${srcdir}/inspircd-${pkgver}" + make DESTDIR="$pkgdir" install - mkdir -p "${pkgdir}"/usr/share/inspircd - mv "${pkgdir}"/etc/inspircd/examples "${pkgdir}"/usr/share/inspircd/examples + mkdir -p "${pkgdir}"/usr/share/inspircd + mv "${pkgdir}"/etc/inspircd/examples "${pkgdir}"/usr/share/inspircd/examples - rm -rf "${pkgdir}"/usr/lib/inspircd/logs - rm -rf "${pkgdir}"/usr/lib/inspircd/data + rm -rf "${pkgdir}"/usr/lib/inspircd/logs + rm -rf "${pkgdir}"/usr/lib/inspircd/data } diff --git a/pcr/inspircd/inspircd.install b/pcr/inspircd/inspircd.install index 997f72dcd..4cd15f22d 100644 --- a/pcr/inspircd/inspircd.install +++ b/pcr/inspircd/inspircd.install @@ -1,10 +1,6 @@ -create_user() { - getent group inspircd &>/dev/null || groupadd -r -g 141 inspircd >/dev/null - getent passwd inspircd &>/dev/null || useradd -r -u 141 -g inspircd -d /var/lib/inspircd -s /bin/false inspircd >/dev/null -} post_install() { - create_user + getent passwd inspircd &>/dev/null && userdel inspircd echo '==> You will need to create a config file for inspircd' echo '==> cp /usr/share/inspircd/examples/inspircd.conf.example /etc/inspircd/inspircd.conf' echo '==> You will need to change the pidfile. To do this you can insert the following into your config.' @@ -12,10 +8,6 @@ post_install() { echo '==> Remember to use absolute paths in your config directory and not relative paths like you would do with a user-based inspircd install.' } -post_upgrade() { - create_user -} - post_remove() { getent passwd inspircd &>/dev/null && userdel inspircd } diff --git a/pcr/inspircd/inspircd.sysusers b/pcr/inspircd/inspircd.sysusers new file mode 100644 index 000000000..bd1d66484 --- /dev/null +++ b/pcr/inspircd/inspircd.sysusers @@ -0,0 +1,2 @@ +g inspircd /var/lib/inspircd +u inspircd - "inspircd user" /var/lib/inspircd /bin/false diff --git a/pcr/ipmiutil/PKGBUILD b/pcr/ipmiutil/PKGBUILD index b2ce438c1..3e3ed09f5 100644 --- a/pcr/ipmiutil/PKGBUILD +++ b/pcr/ipmiutil/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor (Arch): Florian Dejonckheere <florian@floriandejonckheere.be> -# Contributor (Arch): goodmen <goodmenlinux@gmail.com> -# Contributor (Arch): Gergely Imreh <imrehgATgmailDOTcom> -# Contributors: champus, madeye, Ranguvar and ninja_pt -# Maintainer: Aurélien DESBRIÈRES <aurelien@cwb.IO> +# Contributor: Florian Dejonckheere <florian@floriandejonckheere.be> +# Contributor: goodmen <goodmenlinux@gmail.com> +# Contributor: Gergely Imreh <imrehgATgmailDOTcom> +# Contributor: champus, madeye, Ranguvar and ninja_pt +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=ipmiutil pkgver=3.1.3 diff --git a/pcr/ipycli-git/PKGBUILD b/pcr/ipycli-git/PKGBUILD index 021456df4..6bcd0d1a1 100644 --- a/pcr/ipycli-git/PKGBUILD +++ b/pcr/ipycli-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Francois Boulogne <fboulogne at april dot org> -# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Francois Boulogne <fboulogne at april dot org> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/italc/PKGBUILD b/pcr/italc/PKGBUILD index b58b5fb0b..e7b6371c7 100644 --- a/pcr/italc/PKGBUILD +++ b/pcr/italc/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): robertfoster -# Contributor (AUR): sirocco +# Maintainer (aur): robertfoster +# Contributor: sirocco # Contributor: Esteban Carnevale <alfplayer@mailoo.org> # parabola changes and rationale: diff --git a/pcr/jack-rack/PKGBUILD b/pcr/jack-rack/PKGBUILD index af5463cbb..2f6b230ce 100644 --- a/pcr/jack-rack/PKGBUILD +++ b/pcr/jack-rack/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org> -# Contributor (Arch): DonVla <donvla@users.sourceforge.net> -# Contributor (Arch): Patrick Leslie Polzer <leslie.polzer@gmx.net> -# Contributor (Arch): Berkus <berkus@madfire.net> -# Contributor (Arch): Daniele Paolella <danielepaolella@email.it> +# Maintainer (arch): Brian Bidulock <bidulock@openss7.org> +# Contributor: DonVla <donvla@users.sourceforge.net> +# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> +# Contributor: Berkus <berkus@madfire.net> +# Contributor: Daniele Paolella <danielepaolella@email.it> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=jack-rack pkgver=1.4.7 diff --git a/pcr/java-avalon-logkit/PKGBUILD b/pcr/java-avalon-logkit/PKGBUILD deleted file mode 100644 index 5c60a84b6..000000000 --- a/pcr/java-avalon-logkit/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_libname=avalon-logkit -pkgname=java-${_libname} -pkgver=2.1 -pkgrel=1 -pkgdesc="Lightweight and fast designed logging toolkit for Java" -arch=('any') -url="https://avalon.apache.org" -license=('APACHE') -depends=('java-runtime') -makedepends=('apache-ant' 'java-geronimo-jms' 'javamail' 'jh' 'junit' 'log4j-1.2' 'tomcat8') -source=("https://archive.apache.org/dist/excalibur/${_libname}/source/${_libname}-${pkgver}-src.tar.gz" - "https://repo.maven.apache.org/maven2/${_libname}/${_libname}/${pkgver}/${_libname}-${pkgver}.pom" - 'avalon-logkit-implement_abstract_methods.patch' - 'avalon-logkit-utf8_encoding.patch') -md5sums=('fee6f5f2db70c320aafbfb4cc32c1c43' - '830f9ba5ef4f0ceaa2601ca9c87d0fc6' - '3faff7e6ecc53c2caf26d707f7b223d2' - 'a2310f8d589262001983ceb3780ecf75') - -prepare() { - cd "${srcdir}/${_libname}-${pkgver}" - patch -Np1 -i ../avalon-logkit-utf8_encoding.patch - patch -Np1 -i ../avalon-logkit-implement_abstract_methods.patch -} - -build() { - cd "${srcdir}/${_libname}-${pkgver}" - - ant dist -Dnoget=true \ - -Dlibdir=/usr/share/java -} - -package() { - cd "${srcdir}/${_libname}-${pkgver}" - - # Install license file - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - - # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "dist/docs/api" "${pkgdir}/usr/share/doc/${pkgname}" - - # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install ${_libname} ${_libname} ${pkgver} \ - "${srcdir}/${_libname}-${pkgver}.pom" \ - "dist/${_libname}-${pkgver}.jar" \ - "${_libname}-${pkgver}.jar" - ln -s "/usr/share/java/${_libname}-${pkgver}.jar" \ - "${pkgdir}/usr/share/java/${_libname}.jar" -} diff --git a/pcr/java-avalon-logkit/avalon-logkit-implement_abstract_methods.patch b/pcr/java-avalon-logkit/avalon-logkit-implement_abstract_methods.patch deleted file mode 100644 index 27540b466..000000000 --- a/pcr/java-avalon-logkit/avalon-logkit-implement_abstract_methods.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- avalon-logkit-2.1.orig/src/java/org/apache/log/output/db/DefaultDataSource.java 2005-08-29 21:03:49.000000000 -0500 -+++ avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java 2015-12-18 17:50:14.339611623 -0500 -@@ -20,7 +20,9 @@ - import java.sql.Connection; - import java.sql.DriverManager; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import javax.sql.DataSource; -+import java.util.logging.Logger; - - /** - * A basic datasource that doesn't do any pooling but just wraps -@@ -111,4 +113,16 @@ - { - m_logWriter = logWriter; - } -+ -+ public boolean isWrapperFor(Class cls) { -+ return false; -+ } -+ -+ public Object unwrap(Class cls) throws SQLException { -+ throw new SQLException("Not a wrapper for " + cls); -+ } -+ -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not a supported feature"); -+ } - } diff --git a/pcr/java-avalon-logkit/avalon-logkit-utf8_encoding.patch b/pcr/java-avalon-logkit/avalon-logkit-utf8_encoding.patch deleted file mode 100644 index e6e041214..000000000 --- a/pcr/java-avalon-logkit/avalon-logkit-utf8_encoding.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- avalon-logkit-2.1.orig/build.xml 2005-08-29 21:03:48.000000000 -0500 -+++ avalon-logkit-2.1/build.xml 2015-12-18 18:01:13.362744309 -0500 -@@ -43,7 +43,7 @@ - <target name="compile" description="o Compile the code" depends="get-deps"> - <mkdir dir="${classesdir}"> - </mkdir> -- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> -+ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="UTF-8"> - <src> - <pathelement location="src/java"> - </pathelement> -@@ -208,7 +208,7 @@ - </property> - <property name="title" value="Avalon Logkit 2.1 API"> - </property> -- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.*"> -+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.*" encoding="UTF-8"> - <classpath> - <path refid="build.classpath"> - </path> diff --git a/pcr/java-service-wrapper/PKGBUILD b/pcr/java-service-wrapper/PKGBUILD index 2b52c3152..4989851b6 100644 --- a/pcr/java-service-wrapper/PKGBUILD +++ b/pcr/java-service-wrapper/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): skydrome <skydrome@i2pmail.org> -# Contributor (AUR): Artyom Olshevskiy <siasia@siasia> +# Maintainer (aur): skydrome <skydrome@i2pmail.org> +# Contributor: Artyom Olshevskiy <siasia@siasia> # parabola changes and rationale: # no changes. diff --git a/pcr/jbuilder/PKGBUILD b/pcr/jbuilder/PKGBUILD index 27fbbfd99..abae3da98 100644 --- a/pcr/jbuilder/PKGBUILD +++ b/pcr/jbuilder/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> # parabola changes and rationale: # - renamed tarball to avoid collisions diff --git a/pcr/jchroot-git/PKGBUILD b/pcr/jchroot-git/PKGBUILD index 28febf5e4..a795414a0 100644 --- a/pcr/jchroot-git/PKGBUILD +++ b/pcr/jchroot-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): aksr <aksr at t-com dot me> +# Maintainer (arch): aksr <aksr at t-com dot me> pkgname=jchroot-git pkgver=r36.17f549c pkgrel=1 diff --git a/pcr/jdee/PKGBUILD b/pcr/jdee/PKGBUILD index df77384fc..6cb63a37e 100644 --- a/pcr/jdee/PKGBUILD +++ b/pcr/jdee/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=jdee pkgver=2.4.1 diff --git a/pcr/jitsi/PKGBUILD b/pcr/jitsi/PKGBUILD index 2c07e2dc8..af8fa4660 100644 --- a/pcr/jitsi/PKGBUILD +++ b/pcr/jitsi/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributors (AUR): Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne +# Maintainer (aur): Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributor: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban, Xyne # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> diff --git a/pcr/jmtpfs/PKGBUILD b/pcr/jmtpfs/PKGBUILD index 0edc35287..afeed3af4 100644 --- a/pcr/jmtpfs/PKGBUILD +++ b/pcr/jmtpfs/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Philipp 'TamCore' B. <philipp [at] tamcore [dot] eu> +# Maintainer (arch): Philipp 'TamCore' B. <philipp [at] tamcore [dot] eu> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=jmtpfs pkgver=0.5 diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD index aeceecc36..581fd48f5 100644 --- a/pcr/kamailio/PKGBUILD +++ b/pcr/kamailio/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Josef Miegl <josef@miegl.cz> -# Contributor (AUR): Xavier Devlamynck <magicrhesus@ouranos.be> +# Maintainer (aur): Josef Miegl <josef@miegl.cz> +# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgbase=kamailio diff --git a/pcr/kate-root/0001-Defuse-root-block.patch b/pcr/kate-root/0001-Defuse-root-block.patch deleted file mode 100644 index 948718748..000000000 --- a/pcr/kate-root/0001-Defuse-root-block.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 435ed5853b9451ab8fdfff722545c57a8f154625 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Sat, 18 Feb 2017 13:49:14 +0100 -Subject: [PATCH] Defuse root block - -While the main point is correct as any application running in the same -X session (not sandboxed) can use kate's capability to open a console, -we allow (even encourage) running YaST on X11 as root. -That way it's only an impact on usability. ---- - kate/main.cpp | 3 +-- - kwrite/main.cpp | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -Index: kate-19.03.60git.20181224T024634~7203979fc/kate/main.cpp -=================================================================== ---- kate-19.03.60git.20181224T024634~7203979fc.orig/kate/main.cpp 2018-12-25 09:49:15.867478873 +0100 -+++ kate-19.03.60git.20181224T024634~7203979fc/kate/main.cpp 2018-12-25 09:49:19.231424088 +0100 -@@ -61,13 +61,8 @@ - #ifndef Q_OS_WIN - // Prohibit using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { -- if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { -- std::cout << "Executing Kate with sudo is not possible due to unfixable security vulnerabilities." << std::endl; -- return EXIT_FAILURE; -- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { -- std::cout << "Executing Kate with kdesu is not possible due to unfixable security vulnerabilities." << std::endl; -- return EXIT_FAILURE; -- } -+ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; -+ std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl; - } - #endif - /** -Index: kate-19.03.60git.20181224T024634~7203979fc/kwrite/main.cpp -=================================================================== ---- kate-19.03.60git.20181224T024634~7203979fc.orig/kwrite/main.cpp 2018-12-25 09:49:19.231424088 +0100 -+++ kate-19.03.60git.20181224T024634~7203979fc/kwrite/main.cpp 2018-12-25 09:50:32.302253532 +0100 -@@ -52,13 +52,8 @@ - #ifndef Q_OS_WIN - // Prohibit using sudo or kdesu (but allow using the root user directly) - if (getuid() == 0) { -- if (!qEnvironmentVariableIsEmpty("SUDO_USER")) { -- std::cout << "Executing KWrite with sudo is not possible due to unfixable security vulnerabilities." << std::endl; -- return EXIT_FAILURE; -- } else if (!qEnvironmentVariableIsEmpty("KDESU_USER")) { -- std::cout << "Executing KWrite with kdesu is not possible due to unfixable security vulnerabilities." << std::endl; -- return EXIT_FAILURE; -- } -+ std::cout << "THIS IS POTENTIALLY INSECURE!\nTo edit files as root please use:" << std::endl; -+ std::cout << "SUDO_EDITOR=kwrite sudoedit <file>" << std::endl; - } - #endif - /** diff --git a/pcr/kate-root/PKGBUILD b/pcr/kate-root/PKGBUILD deleted file mode 100644 index ef49aa6f8..000000000 --- a/pcr/kate-root/PKGBUILD +++ /dev/null @@ -1,70 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> -# Contributor: Felix Yan <felixonmars@archlinux.org> -# Contributor: Antonio Rojas <arojas@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgbase=kate-root -_pkgbase=${pkgbase%-root} -pkgname=(kwrite-root kate-root) -pkgver=19.04.2 -pkgrel=1 -arch=(armv7h i686 x86_64) -license=(GPL LGPL FDL) -makedepends=(extra-cmake-modules kdoctools plasma-framework knewstuff ktexteditor threadweaver kitemmodels kactivities) -source=("https://download.kde.org/stable/applications/$pkgver/src/$_pkgbase-$pkgver.tar.xz"{,.sig} - 0001-Defuse-root-block.patch) -sha512sums=('568af7df0588d65f386f482f944b44c7bacffeecf374fce4b4e276be8ca556cbf983c2df2e99a3900c15bd7dfaa0d71b6540c37b4c2773a5293b3e5cba1d3939' - 'SKIP' - '01f7fd779d2e2c87ccb78e1f6014b89687b87af33831eae74864c66ed52e18d2adbb9b2803574cd8a55f7feacd24c9b1afbf3cba5b7b45b2746a36d6072894df') -validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid@kde.org> - F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org> - -prepare() { - mkdir -p build - cd $srcdir/$_pkgbase-$pkgver - patch -p1 -i $srcdir/0001-Defuse-root-block.patch -} - -build() { - cd build - cmake ../$_pkgbase-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTING=OFF - make -} - -package_kwrite-root() { - pkgdesc="Text Editor, patched to be able to run as root" - url="https://www.kde.org/applications/utilities/kwrite/" - depends=(ktexteditor kactivities hicolor-icon-theme) - provides=(${pkgname%-root}) - conflicts=(${provides[@]}) - replaces=(${provides[@]}) - - cd build - make DESTDIR="$pkgdir" install - - find "$pkgdir" -type f -name '*kate*' -exec rm {} \; - rm -r "$pkgdir"/usr/lib/qt/plugins/ktexteditor \ - "$pkgdir"/usr/share/doc/HTML/*/{kate,katepart} \ - "$pkgdir"/usr/share/katexmltools \ - "$pkgdir"/usr/share/locale/*/LC_MESSAGES/{kterustcompletion,tabswitcherplugin,ktexteditorpreviewplugin}.mo \ - "$pkgdir"/usr/share/plasma/plasmoids -} - -package_kate-root() { - pkgdesc="Advanced Text Editor, patched to be able to run as root" - url="https://www.kde.org/applications/utilities/kate/" - depends=(knewstuff ktexteditor threadweaver kitemmodels kactivities hicolor-icon-theme) - provides=(${pkgname%-root}) - conflicts=(${provides[@]}) - replaces=(${provides[@]}) - optdepends=('konsole: open a terminal in Kate') - - cd build - make DESTDIR="$pkgdir" install - - find "$pkgdir" -type f -name '*kwrite*' -exec rm {} \; - rm -r "$pkgdir"/usr/share/doc/HTML/*/kwrite -} diff --git a/pcr/kodi-standalone-service/PKGBUILD b/pcr/kodi-standalone-service/PKGBUILD index f2823a3b3..f716f0f42 100644 --- a/pcr/kodi-standalone-service/PKGBUILD +++ b/pcr/kodi-standalone-service/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): graysky <graysky AT archlinux DOT us> +# Maintainer (aur): graysky <graysky AT archlinux DOT us> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/lagrange/PKGBUILD b/pcr/lagrange/PKGBUILD new file mode 100644 index 000000000..6de26b69b --- /dev/null +++ b/pcr/lagrange/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer (aur): Roshless <pkg@roshless.com> +# Maintainer: Iván Ávalos <avalos@disroot.org> +# Contributor: bill-auger <bill-auger@programmer.net> +# Contributor: Wael Karram <wael@waelk.tech> + + +pkgname=lagrange +pkgrel=1 +pkgver=1.17.6 +pkgdesc="Beautiful Gemini Client" +url="https://gmi.skyjake.fi/lagrange/" +arch=('x86_64' 'i686' 'aarch64' 'armv7h') +license=("BSD2") +source=("https://git.skyjake.fi/skyjake/$pkgname/releases/download/v$pkgver/lagrange-$pkgver.tar.gz") +sha256sums=('b9d0982617fec495565ac9c09fb788a0be207d6fdf2324edc390e5cac8b1523b') + +depends=( + "fribidi" + "harfbuzz" + "hicolor-icon-theme" + "libunistring" + "openssl" + "pcre" + "sdl2" +) +optdepends=("mpg123") +makedepends=("cmake" "zip") + +prepare() { + cd "$srcdir"/$pkgname-$pkgver + + # delete vendored libs - use system libs instead + rm -rf lib/fribidi/ + rm -rf lib/harfbuzz/ +} + +build() { + cmake -B build -S "$pkgname-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX='/usr' \ + -DENABLE_KERNING=OFF \ + -DTFDN_ENABLE_WARN_ERROR=OFF \ + -DENABLE_FRIBIDI_BUILD=OFF \ + -DENABLE_HARFBUZZ_MINIMAL=OFF \ + -Wno-dev + make -C build +} + +package() { + install -Dm644 $pkgname-$pkgver/LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd build + make DESTDIR="$pkgdir" install +} diff --git a/pcr/laptop-mode-tools/PKGBUILD b/pcr/laptop-mode-tools/PKGBUILD index 3339e02e1..0e838befd 100644 --- a/pcr/laptop-mode-tools/PKGBUILD +++ b/pcr/laptop-mode-tools/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> -# Contributor (Arch): Lev Lybin <lev.lybin@gmail.com> -# Contributor (Arch): Aaditya Bagga <aaditya_gnulinux@zoho.com> -# Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Arch): Eric Bélanger <eric@archlinux.org> +# Maintainer (arch): Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr> +# Contributor: Lev Lybin <lev.lybin@gmail.com> +# Contributor: Aaditya Bagga <aaditya_gnulinux@zoho.com> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Eric Bélanger <eric@archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=laptop-mode-tools diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD index 8ad17ad1f..1a973ace7 100644 --- a/pcr/lcmc/PKGBUILD +++ b/pcr/lcmc/PKGBUILD @@ -1,4 +1,5 @@ # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=lcmc pkgver=1.5.1 diff --git a/pcr/lcov/PKGBUILD b/pcr/lcov/PKGBUILD deleted file mode 100644 index d9a20b7a1..000000000 --- a/pcr/lcov/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Contributor (AUR): Jordi De Groof <jordi.degroof@gmail.com> -# Contributor (AUR): Andre Klitzing <aklitzing@gmail.com> - -pkgname=lcov -pkgver=1.13 -pkgrel=2 -pkgdesc="front-end for GCC's coverage testing tool gcov" -arch=('any') -url="http://ltp.sourceforge.net/coverage/lcov.php" -license=('GPL') -depends=('perl') -source=("http://downloads.sourceforge.net/ltp/$pkgname-$pkgver.tar.gz" - "handle-equals-signs.patch" - "fix-undef-behaviour.patch" - ) - -prepare() -{ - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i $srcdir/handle-equals-signs.patch - patch -p1 -i $srcdir/fix-undef-behaviour.patch -} - - -package() -{ - cd "$srcdir/$pkgname-$pkgver" - - make PREFIX="$pkgdir/usr" install -} - -sha256sums=('44972c878482cc06a05fe78eaa3645cbfcbad6634615c3309858b207965d8a23' - '54728aa4e244d3662c65ba91fb486dc1d5c64d9d55745ee334c4131109dc233c' - 'ceaf41f7cc9cea5a6fc4b0385ffef10d1ab8812acd2a5b16dcd8d7bca7120488') diff --git a/pcr/lcov/fix-undef-behaviour.patch b/pcr/lcov/fix-undef-behaviour.patch deleted file mode 100644 index 3621fc898..000000000 --- a/pcr/lcov/fix-undef-behaviour.patch +++ /dev/null @@ -1,37 +0,0 @@ -Author: Alastair McKinstry <mckinstry@debian.org> -Description: Fix for undefined behavior in perl5.20 -Origin: http://bugs.debian.org/761308 -Forwarded: no -Last-Updated: 2014-09-13 - -Index: lcov-1.12/bin/lcov -=================================================================== ---- lcov-1.12.orig/bin/lcov -+++ lcov-1.12/bin/lcov -@@ -224,7 +224,9 @@ Getopt::Long::Configure("default"); - # Remove spaces around rc options - my %new_opt_rc; - -- while (my ($key, $value) = each(%opt_rc)) { -+ my @keys = keys %opt_rc; -+ for my $key (@keys) { -+ my $value = $opt_rc{$key}; - $key =~ s/^\s+|\s+$//g; - $value =~ s/^\s+|\s+$//g; - -Index: lcov-1.12/bin/geninfo -=================================================================== ---- lcov-1.12.orig/bin/geninfo -+++ lcov-1.12/bin/geninfo -@@ -284,8 +284,9 @@ Getopt::Long::Configure("default"); - { - # Remove spaces around rc options - my %new_opt_rc; -- -- while (my ($key, $value) = each(%opt_rc)) { -+ my @keys = keys %opt_rc; -+ for my $key (@keys) { -+ my $value = $opt_rc{$key}; - $key =~ s/^\s+|\s+$//g; - $value =~ s/^\s+|\s+$//g; - diff --git a/pcr/lcov/handle-equals-signs.patch b/pcr/lcov/handle-equals-signs.patch deleted file mode 100644 index 8ab09985b..000000000 --- a/pcr/lcov/handle-equals-signs.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: Handle "=====" as another form of zero. - gcov prints "=====" instead of "######" when an unexecuted line is - "reachable only by exceptional paths such as C++ exception handlers." - This should be handled the same as "######" for our purposes. -Author: Zack Weinberg <zackw@panix.com> -Last-Update: 2013-02-01 - -Index: lcov-1.12/bin/geninfo -=================================================================== ---- lcov-1.12.orig/bin/geninfo -+++ lcov-1.12/bin/geninfo -@@ -1771,8 +1771,9 @@ sub read_gcov_file($) - $number = (split(" ",substr($_, 0, 16)))[0]; - - # Check for zero count which is indicated -- # by ###### -- if ($number eq "######") { $number = 0; } -+ # by ###### or ===== -+ if ($number eq "######" or -+ $number eq "=====") { $number = 0; } - - if ($exclude_line) { - # Register uninstrumented line instead diff --git a/pcr/league-gothic-font/PKGBUILD b/pcr/league-gothic-font/PKGBUILD index cc5764a15..6af51c541 100644 --- a/pcr/league-gothic-font/PKGBUILD +++ b/pcr/league-gothic-font/PKGBUILD @@ -1,8 +1,9 @@ -# Maintainer (AUR): Caleb Maclennan <caleb@alerque.com> -# Maintainer (AUR): LightDot <lightdot -a-t- g m a i l> -# Contributor (AUR): samæ <samæ at marvid dot fr> -# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer (aur): Caleb Maclennan <caleb@alerque.com> +# Maintainer (aur): LightDot <lightdot -a-t- g m a i l> +# Contributor: samæ <samæ at marvid dot fr> +# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # Contributor: bill-auger <bill-auger@programmer.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> _fnt_name=league-gothic pkgbase=$_fnt_name-font diff --git a/pcr/legit/PKGBUILD b/pcr/legit/PKGBUILD index 7e7baea82..20e0c8dbe 100644 --- a/pcr/legit/PKGBUILD +++ b/pcr/legit/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (AUR): Jan-Erik Rediger <badboy at archlinux dot us> -# Contributor (AUR): Khorne <khorne at khorne dot me> -# Maintainer (Parabola): Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Jan-Erik Rediger <badboy at archlinux dot us> +# Contributor: Khorne <khorne at khorne dot me> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=legit diff --git a/pcr/lg-downloader-git/PKGBUILD b/pcr/lg-downloader-git/PKGBUILD index 7dd707c94..3c8b1d5cf 100644 --- a/pcr/lg-downloader-git/PKGBUILD +++ b/pcr/lg-downloader-git/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=lg-downloader-git _pkgname=lg-downloader diff --git a/pcr/libaria2/PKGBUILD b/pcr/libaria2/PKGBUILD index 38ff30450..1da95d715 100644 --- a/pcr/libaria2/PKGBUILD +++ b/pcr/libaria2/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): hashworks <mail@hashworks.net> +# Maintainer (aur): hashworks <mail@hashworks.net> _pkgname=aria2 pkgname=libaria2 diff --git a/pcr/libast/PKGBUILD b/pcr/libast/PKGBUILD index d1e5adfff..72c611988 100644 --- a/pcr/libast/PKGBUILD +++ b/pcr/libast/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 40906 2011-03-01 14:45:04Z andrea $ -# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Arch): Adam 'battlemidget' Stokes <adam.stokes@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=libast pkgver=0.7 diff --git a/pcr/libbinio/PKGBUILD b/pcr/libbinio/PKGBUILD index 8fd2032b8..7dc77b97f 100644 --- a/pcr/libbinio/PKGBUILD +++ b/pcr/libbinio/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Mikael Eriksson <mikael_eriksson@miffe.org> +# Maintainer (arch): Mikael Eriksson <mikael_eriksson@miffe.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libbinio diff --git a/pcr/libcedrus-git/PKGBUILD b/pcr/libcedrus-git/PKGBUILD index aece47d07..5d9025a73 100644 --- a/pcr/libcedrus-git/PKGBUILD +++ b/pcr/libcedrus-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jens Kuske <jenskuske@gmail.com> +# Maintainer (aur): Jens Kuske <jenskuske@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/libcgroup/PKGBUILD b/pcr/libcgroup/PKGBUILD index 4fc5f3836..446087aa3 100644 --- a/pcr/libcgroup/PKGBUILD +++ b/pcr/libcgroup/PKGBUILD @@ -1,23 +1,29 @@ -# Maintainer (Arch): Christian Hesse <mail@eworm.de> -# Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer (aur): Christian Hesse <mail@eworm.de> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +# parabola changes and rationale: +# - Added armv7h pkgname=libcgroup -pkgver=0.41 +pkgver=2.0 pkgrel=2 pkgdesc='Library that abstracts the control group file system in Linux' -arch=('i686' 'x86_64') -url='http://libcg.sourceforge.net' +arch=('armv7h' 'i686' 'x86_64') +url='https://github.com/libcgroup/libcgroup' license=(LGPL) backup=('etc/cgconfig.conf' 'etc/cgrules.conf' 'etc/cgsnapshot_blacklist.conf') options=('!emptydirs' '!libtool') +optdepends=('pam: for pam_cgroup') install=libcgroup.install -source=("http://downloads.sourceforge.net/libcg/${pkgname}-${pkgver/rc/.rc}.tar.bz2" +source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.bz2"{,.asc} 'cgconfig.service' 'cgrules.service') -sha256sums=('e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51' +validpgpkeys=('47A68FCE37C7D7024FD65E11356CE62C2B524099') # Tom Hromatka <tom.hromatka@oracle.com> +sha256sums=('11a2fbf0e42f46089f406b8b0dca7fef04aec2f21600b70e402c5db3661305d7' + 'SKIP' '808fc354abf36d7b6673dad790be275309ac57a2606d1be3732b9b3aeb5885eb' '6b1340ff6717f55e5e57dacc72accc0bfaed7e50ef31439271b6ddc893cbf671') diff --git a/pcr/libdshconfig/PKGBUILD b/pcr/libdshconfig/PKGBUILD index 46a5dc2a6..b026a5e99 100644 --- a/pcr/libdshconfig/PKGBUILD +++ b/pcr/libdshconfig/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Arch): SkiltZ <skiltz@free.fr> +# Contributor: SkiltZ <skiltz@free.fr> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libdshconfig pkgver=0.20.9 diff --git a/pcr/libfann/PKGBUILD b/pcr/libfann/PKGBUILD index bbad5a564..fd5217b5a 100644 --- a/pcr/libfann/PKGBUILD +++ b/pcr/libfann/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (AUR): Oleksandr Natalenko aka post-factum <oleksandr@natalenko.name> +# Contributor: Oleksandr Natalenko aka post-factum <oleksandr@natalenko.name> # Contributor: fauno <fauno@parabola.nu> # Contrbutor: bill-auger <bill-auger@programmer.net> - +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=libfann _srcname=fann diff --git a/pcr/libgpiod/PKGBUILD b/pcr/libgpiod/PKGBUILD deleted file mode 100644 index 26444f7df..000000000 --- a/pcr/libgpiod/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer(Aur): Greg Erwin <first name last name 256 at gmail dot com> - -# parabola changes and rationale: -# no changes. - -pkgname=libgpiod -pkgver=1.6.2 -pkgrel=1 -pkgdesc="C library and tools for interacting with the linux GPIO character device" -url="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git" -arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') -license=('LGPL2.1') -depends=('linux-api-headers>=4.8' 'python') -makedepends=('autoconf-archive' 'help2man') -conflicts=('libgpiod-git') -source=("$url/snapshot/$pkgname-$pkgver.tar.gz") -sha256sums=('0a1fa46d21c925ea245f101f60cc8253ff46a7ccadc1d7b952c99bb6ffec15cd') - -build() { - cd "$pkgname-$pkgver" - ./autogen.sh \ - --prefix=/usr \ - --enable-tools=yes \ - --enable-bindings-cxx \ - --enable-bindings-python - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/pcr/liblas/PKGBUILD b/pcr/liblas/PKGBUILD index ede823f09..3b322edec 100644 --- a/pcr/liblas/PKGBUILD +++ b/pcr/liblas/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch) : Patryk Kowalczyk <patryk AT kowalczyk DOT WS> -# Contributor (Arch) : Maciej Sieczka <msieczka at sieczka dot org> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Patryk Kowalczyk <patryk AT kowalczyk DOT WS> +# Contributor: Maciej Sieczka <msieczka at sieczka dot org> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=liblas pkgver=1.8.0 diff --git a/pcr/liblinphone/PKGBUILD b/pcr/liblinphone/PKGBUILD deleted file mode 100644 index a287d1fd8..000000000 --- a/pcr/liblinphone/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=liblinphone -pkgver=4.4.11 -pkgrel=1 -pkgdesc='A high-level SIP library' -arch=(x86_64 i686) -url='http://www.linphone.org' -license=('GPL') -depends=(belcard belle-sip mediastreamer xerces-c lime) -makedepends=(cmake doxygen graphviz python-pystache python-sphinx xsd) -source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('cf4d83254edde9baaea9f46907830de4880f69e1fc670fba76e546134311dc25') - -build() { - cd "$pkgname-$pkgver" - CXXFLAGS+=" -Wno-deprecated -Wimplicit-fallthrough=0 -Wno-unused-function" - - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_STATIC=NO \ - -DENABLE_CXX_WRAPPER=YES \ - -DENABLE_DOC=NO \ - -DENABLE_LIME=YES \ - -DENABLE_UNIT_TESTS=NO \ - -DENABLE_STRICT=NO \ - -DCMAKE_INSTALL_RPATH=NO . - make -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - sed -i "${srcdir//\//\\/}\/$pkgname-$pkgver\/wrappers\/cpp\/include/d" \ - "$pkgdir/usr/share/LinphoneCxx/cmake/LinphoneCxxConfig.cmake" -} diff --git a/pcr/liblms7002m/PKGBUILD b/pcr/liblms7002m/PKGBUILD index 751a9ae3e..a8eba1620 100644 --- a/pcr/liblms7002m/PKGBUILD +++ b/pcr/liblms7002m/PKGBUILD @@ -1,5 +1,7 @@ # $id$ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=liblms7002m pkgver=r8.g91b5107 pkgrel=2 diff --git a/pcr/libosmocore/PKGBUILD b/pcr/libosmocore/PKGBUILD index 97d388b77..9d2f04848 100644 --- a/pcr/libosmocore/PKGBUILD +++ b/pcr/libosmocore/PKGBUILD @@ -1,12 +1,13 @@ -# Maintainer (AUR): Dominik Heidler <dominik@heidler.eu> +# Maintainer (aur): Matt Johnson <matt9j@cs.washington.edu> +# Contributor: Dominik Heidler <dominik@heidler.eu> # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # parabola changes and rationale: -# - No changes +# - Added libusb in makedepends, patch sent upstream, not reviewed yet pkgname=libosmocore -pkgver=1.3.0 -pkgrel=1 +pkgver=1.6.0 +pkgrel=2 pkgdesc="core libs for osmocom" arch=('armv7h' 'i686' 'x86_64') url="http://bb.osmocom.org/trac/wiki/libosmocore" @@ -14,7 +15,8 @@ license=('GPL') groups=() provides=() depends=('pcsclite' 'lksctp-tools' 'talloc' 'gnutls') -makedepends=('autoconf' 'automake' 'make' 'gcc' 'libtool' 'git' 'pkg-config') +optdepends=('libusb: libosmousb support') +makedepends=('autoconf' 'automake' 'make' 'gcc' 'libtool' 'git' 'pkg-config' 'libusb') source=("git://git.osmocom.org/libosmocore.git#tag=$pkgver") md5sums=('SKIP') diff --git a/pcr/libotr3/PKGBUILD b/pcr/libotr3/PKGBUILD deleted file mode 100644 index 99519bff4..000000000 --- a/pcr/libotr3/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org> -# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> -# Contributor (Arch): Bug <Bug2000@gmail.com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> - -pkgname=libotr3 -pkgver=3.2.1 -pkgrel=2 -pkgdesc='Off-the-Record Messaging Library and Toolkit (version 3.X)' -url='http://www.cypherpunks.ca/otr/' -license=('GPL' 'LGPL') -arch=('i686' 'x86_64') -depends=('libgcrypt') -source=("http://www.cypherpunks.ca/otr/libotr-${pkgver}.tar.gz" "libotr3-soname.patch") -sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394' - '08c85f20fa1a0c5e8935d9a3f00b1d4e37f1b2d1') - -build() { - cd "${srcdir}/libotr-${pkgver}" - patch -p1 -i "${srcdir}/libotr3-soname.patch" - ./configure --prefix=/usr --mandir=/usr/share/man \ - --program-transform-name='s/otr/otr3/' - make -} - -package() { - cd "${srcdir}/libotr-${pkgver}" - make DESTDIR="${pkgdir}" install - - for i in parse sesskeys mackey readforge modify remac; do - rm "${pkgdir}"/usr/share/man/man1/otr_$i.1 - ln -sf otr3_toolkit.1 "${pkgdir}"/usr/share/man/man1/otr3_$i.1 - done -} diff --git a/pcr/libotr3/libotr3-soname.patch b/pcr/libotr3/libotr3-soname.patch deleted file mode 100644 index aa9b58318..000000000 --- a/pcr/libotr3/libotr3-soname.patch +++ /dev/null @@ -1,695 +0,0 @@ -diff -Naur libotr-3.2.1.orig/configure libotr-3.2.1/configure ---- libotr-3.2.1.orig/configure 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/configure 2012-11-02 04:53:47.533538908 -0400 -@@ -791,7 +791,7 @@ - LDFLAGS - CFLAGS - CC --LIBOTR_LIBTOOL_VERSION -+LIBOTR3_LIBTOOL_VERSION - am__untar - am__tar - AMTAR -@@ -2674,7 +2674,7 @@ - - - # Define the identity of the package. -- PACKAGE=libotr -+ PACKAGE=libotr3 - VERSION=3.2.1 - - -@@ -2715,7 +2715,7 @@ - - - --LIBOTR_LIBTOOL_VERSION="4:1:2" -+LIBOTR3_LIBTOOL_VERSION="4:1:2" - - - -@@ -10461,7 +10461,7 @@ - - - --ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr.pc" -+ac_config_files="$ac_config_files Makefile src/Makefile toolkit/Makefile libotr3.pc" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -11434,7 +11434,7 @@ - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "toolkit/Makefile") CONFIG_FILES="$CONFIG_FILES toolkit/Makefile" ;; -- "libotr.pc") CONFIG_FILES="$CONFIG_FILES libotr.pc" ;; -+ "libotr3.pc") CONFIG_FILES="$CONFIG_FILES libotr3.pc" ;; - - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac -diff -Naur libotr-3.2.1.orig/libotr3.m4 libotr-3.2.1/libotr3.m4 ---- libotr-3.2.1.orig/libotr3.m4 1969-12-31 19:00:00.000000000 -0500 -+++ libotr-3.2.1/libotr3.m4 2012-11-02 04:53:59.983891029 -0400 -@@ -0,0 +1,134 @@ -+dnl -+dnl Off-the-Record Messaging library -+dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov -+dnl <otr@cypherpunks.ca> -+dnl -+dnl This library is free software; you can redistribute it and/or -+dnl modify it under the terms of version 2.1 of the GNU Lesser General -+dnl Public License as published by the Free Software Foundation. -+dnl -+dnl This library is distributed in the hope that it will be useful, -+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+dnl Lesser General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU Lesser General Public -+dnl License along with this library; if not, write to the Free Software -+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+dnl -+ -+dnl AM_PATH_LIBOTR3([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for libotr3, and define LIBOTR3_CFLAGS and LIBOTR3_LIBS as appropriate. -+dnl enables arguments --with-libotr3-prefix= -+dnl --with-libotr3-inc-prefix= -+dnl -+dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT -+dnl -+dnl Adapted from alsa.m4, originally by -+dnl Richard Boulton <richard-alsa@tartarus.org> -+dnl Christopher Lansdown <lansdoct@cs.alfred.edu> -+dnl Jaroslav Kysela <perex@suse.cz> -+ -+AC_DEFUN([AM_PATH_LIBOTR3], -+[dnl Save the original CFLAGS, LDFLAGS, and LIBS -+libotr3_save_CFLAGS="$CFLAGS" -+libotr3_save_LDFLAGS="$LDFLAGS" -+libotr3_save_LIBS="$LIBS" -+libotr3_found=yes -+ -+dnl -+dnl Get the cflags and libraries for libotr3 -+dnl -+AC_ARG_WITH(libotr3-prefix, -+[ --with-libotr3-prefix=PFX Prefix where libotr3 is installed(optional)], -+[libotr3_prefix="$withval"], [libotr3_prefix=""]) -+ -+AC_ARG_WITH(libotr3-inc-prefix, -+[ --with-libotr3-inc-prefix=PFX Prefix where libotr3 includes are (optional)], -+[libotr3_inc_prefix="$withval"], [libotr3_inc_prefix=""]) -+ -+dnl Add any special include directories -+AC_MSG_CHECKING(for libotr3 CFLAGS) -+if test "$libotr3_inc_prefix" != "" ; then -+ LIBOTR3_CFLAGS="$LIBOTR3_CFLAGS -I$libotr3_inc_prefix" -+ CFLAGS="$CFLAGS $LIBOTR3_CFLAGS" -+fi -+AC_MSG_RESULT($LIBOTR3_CFLAGS) -+ -+dnl add any special lib dirs -+AC_MSG_CHECKING(for libotr3 LIBS) -+if test "$libotr3_prefix" != "" ; then -+ LIBOTR3_LIBS="$LIBOTR3_LIBS -L$libotr3_prefix" -+ LDFLAGS="$LDFLAGS $LIBOTR3_LIBS" -+fi -+ -+dnl add the libotr3 library -+LIBOTR3_LIBS="$LIBOTR3_LIBS -lotr3" -+LIBS="$LIBOTR3_LIBS $LIBS" -+AC_MSG_RESULT($LIBOTR3_LIBS) -+ -+dnl Check for a working version of libotr3 that is of the right version. -+min_libotr3_version=ifelse([$1], ,3.0.0,$1) -+no_libotr3="" -+ libotr3_min_major_version=`echo $min_libotr3_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ libotr3_min_minor_version=`echo $min_libotr3_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ libotr3_min_sub_version=`echo $min_libotr3_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+AC_MSG_CHECKING(for libotr3 headers version $libotr3_min_major_version.x >= $min_libotr3_version) -+ -+AC_LANG_SAVE -+AC_LANG_C -+AC_TRY_COMPILE([ -+#include <stdlib.h> -+#include <libotr3/version.h> -+], [ -+# if(OTRL_VERSION_MAJOR != $libotr3_min_major_version) -+# error not present -+# else -+ -+# if(OTRL_VERSION_MINOR > $libotr3_min_minor_version) -+ exit(0); -+# else -+# if(OTRL_VERSION_MINOR < $libotr3_min_minor_version) -+# error not present -+# endif -+ -+# if(OTRL_VERSION_SUB < $libotr3_min_sub_version) -+# error not present -+# endif -+# endif -+# endif -+exit(0); -+], -+ [AC_MSG_RESULT(found.)], -+ [AC_MSG_RESULT(not present.) -+ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr3 not found.)]) -+ libotr3_found=no] -+) -+AC_LANG_RESTORE -+ -+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -+AC_CHECK_LIB([otr], [otrl_message_receiving],, -+ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr3 was found.)]) -+ libotr3_found=no], -+ $LIBGCRYPT_LIBS -+) -+ -+LDFLAGS="$libotr3_save_LDFLAGS" -+LIBS="$libotr3_save_LIBS" -+ -+if test "x$libotr3_found" = "xyes" ; then -+ ifelse([$2], , :, [$2]) -+else -+ LIBOTR3_CFLAGS="" -+ LIBOTR3_LIBS="" -+ ifelse([$3], , :, [$3]) -+fi -+ -+dnl That should be it. Now just export our symbols: -+AC_SUBST(LIBOTR3_CFLAGS) -+AC_SUBST(LIBOTR3_LIBS) -+]) -+ -diff -Naur libotr-3.2.1.orig/libotr3.pc.in libotr-3.2.1/libotr3.pc.in ---- libotr-3.2.1.orig/libotr3.pc.in 1969-12-31 19:00:00.000000000 -0500 -+++ libotr-3.2.1/libotr3.pc.in 2012-11-02 04:53:59.983891029 -0400 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: libotr3 -+Description: Off-the-Record Messaging Library -+Version: 3.1.0 -+URL: http://otr.cypherpunks.ca/ -+Libs: -L${libdir} -lotr3 -+Cflags: -I${includedir} -diff -Naur libotr-3.2.1.orig/libotr.m4 libotr-3.2.1/libotr.m4 ---- libotr-3.2.1.orig/libotr.m4 2012-11-02 04:53:36.606563083 -0400 -+++ libotr-3.2.1/libotr.m4 1969-12-31 19:00:00.000000000 -0500 -@@ -1,134 +0,0 @@ --dnl --dnl Off-the-Record Messaging library --dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov --dnl <otr@cypherpunks.ca> --dnl --dnl This library is free software; you can redistribute it and/or --dnl modify it under the terms of version 2.1 of the GNU Lesser General --dnl Public License as published by the Free Software Foundation. --dnl --dnl This library is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY; without even the implied warranty of --dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --dnl Lesser General Public License for more details. --dnl --dnl You should have received a copy of the GNU Lesser General Public --dnl License along with this library; if not, write to the Free Software --dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --dnl -- --dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) --dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. --dnl enables arguments --with-libotr-prefix= --dnl --with-libotr-inc-prefix= --dnl --dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT --dnl --dnl Adapted from alsa.m4, originally by --dnl Richard Boulton <richard-alsa@tartarus.org> --dnl Christopher Lansdown <lansdoct@cs.alfred.edu> --dnl Jaroslav Kysela <perex@suse.cz> -- --AC_DEFUN([AM_PATH_LIBOTR], --[dnl Save the original CFLAGS, LDFLAGS, and LIBS --libotr_save_CFLAGS="$CFLAGS" --libotr_save_LDFLAGS="$LDFLAGS" --libotr_save_LIBS="$LIBS" --libotr_found=yes -- --dnl --dnl Get the cflags and libraries for libotr --dnl --AC_ARG_WITH(libotr-prefix, --[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)], --[libotr_prefix="$withval"], [libotr_prefix=""]) -- --AC_ARG_WITH(libotr-inc-prefix, --[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)], --[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) -- --dnl Add any special include directories --AC_MSG_CHECKING(for libotr CFLAGS) --if test "$libotr_inc_prefix" != "" ; then -- LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" -- CFLAGS="$CFLAGS $LIBOTR_CFLAGS" --fi --AC_MSG_RESULT($LIBOTR_CFLAGS) -- --dnl add any special lib dirs --AC_MSG_CHECKING(for libotr LIBS) --if test "$libotr_prefix" != "" ; then -- LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" -- LDFLAGS="$LDFLAGS $LIBOTR_LIBS" --fi -- --dnl add the libotr library --LIBOTR_LIBS="$LIBOTR_LIBS -lotr" --LIBS="$LIBOTR_LIBS $LIBS" --AC_MSG_RESULT($LIBOTR_LIBS) -- --dnl Check for a working version of libotr that is of the right version. --min_libotr_version=ifelse([$1], ,3.0.0,$1) --no_libotr="" -- libotr_min_major_version=`echo $min_libotr_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- libotr_min_minor_version=`echo $min_libotr_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- libotr_min_sub_version=`echo $min_libotr_version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` --AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) -- --AC_LANG_SAVE --AC_LANG_C --AC_TRY_COMPILE([ --#include <stdlib.h> --#include <libotr/version.h> --], [ --# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) --# error not present --# else -- --# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) -- exit(0); --# else --# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) --# error not present --# endif -- --# if(OTRL_VERSION_SUB < $libotr_min_sub_version) --# error not present --# endif --# endif --# endif --exit(0); --], -- [AC_MSG_RESULT(found.)], -- [AC_MSG_RESULT(not present.) -- ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) -- libotr_found=no] --) --AC_LANG_RESTORE -- --dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. --AC_CHECK_LIB([otr], [otrl_message_receiving],, -- [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) -- libotr_found=no], -- $LIBGCRYPT_LIBS --) -- --LDFLAGS="$libotr_save_LDFLAGS" --LIBS="$libotr_save_LIBS" -- --if test "x$libotr_found" = "xyes" ; then -- ifelse([$2], , :, [$2]) --else -- LIBOTR_CFLAGS="" -- LIBOTR_LIBS="" -- ifelse([$3], , :, [$3]) --fi -- --dnl That should be it. Now just export our symbols: --AC_SUBST(LIBOTR_CFLAGS) --AC_SUBST(LIBOTR_LIBS) --]) -- -diff -Naur libotr-3.2.1.orig/libotr.m4.orig libotr-3.2.1/libotr.m4.orig ---- libotr-3.2.1.orig/libotr.m4.orig 1969-12-31 19:00:00.000000000 -0500 -+++ libotr-3.2.1/libotr.m4.orig 2012-08-14 08:15:56.000000000 -0400 -@@ -0,0 +1,134 @@ -+dnl -+dnl Off-the-Record Messaging library -+dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov -+dnl <otr@cypherpunks.ca> -+dnl -+dnl This library is free software; you can redistribute it and/or -+dnl modify it under the terms of version 2.1 of the GNU Lesser General -+dnl Public License as published by the Free Software Foundation. -+dnl -+dnl This library is distributed in the hope that it will be useful, -+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+dnl Lesser General Public License for more details. -+dnl -+dnl You should have received a copy of the GNU Lesser General Public -+dnl License along with this library; if not, write to the Free Software -+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+dnl -+ -+dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. -+dnl enables arguments --with-libotr-prefix= -+dnl --with-libotr-inc-prefix= -+dnl -+dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT -+dnl -+dnl Adapted from alsa.m4, originally by -+dnl Richard Boulton <richard-alsa@tartarus.org> -+dnl Christopher Lansdown <lansdoct@cs.alfred.edu> -+dnl Jaroslav Kysela <perex@suse.cz> -+ -+AC_DEFUN([AM_PATH_LIBOTR], -+[dnl Save the original CFLAGS, LDFLAGS, and LIBS -+libotr_save_CFLAGS="$CFLAGS" -+libotr_save_LDFLAGS="$LDFLAGS" -+libotr_save_LIBS="$LIBS" -+libotr_found=yes -+ -+dnl -+dnl Get the cflags and libraries for libotr -+dnl -+AC_ARG_WITH(libotr-prefix, -+[ --with-libotr-prefix=PFX Prefix where libotr is installed(optional)], -+[libotr_prefix="$withval"], [libotr_prefix=""]) -+ -+AC_ARG_WITH(libotr-inc-prefix, -+[ --with-libotr-inc-prefix=PFX Prefix where libotr includes are (optional)], -+[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) -+ -+dnl Add any special include directories -+AC_MSG_CHECKING(for libotr CFLAGS) -+if test "$libotr_inc_prefix" != "" ; then -+ LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" -+ CFLAGS="$CFLAGS $LIBOTR_CFLAGS" -+fi -+AC_MSG_RESULT($LIBOTR_CFLAGS) -+ -+dnl add any special lib dirs -+AC_MSG_CHECKING(for libotr LIBS) -+if test "$libotr_prefix" != "" ; then -+ LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" -+ LDFLAGS="$LDFLAGS $LIBOTR_LIBS" -+fi -+ -+dnl add the libotr library -+LIBOTR_LIBS="$LIBOTR_LIBS -lotr" -+LIBS="$LIBOTR_LIBS $LIBS" -+AC_MSG_RESULT($LIBOTR_LIBS) -+ -+dnl Check for a working version of libotr that is of the right version. -+min_libotr_version=ifelse([$1], ,3.0.0,$1) -+no_libotr="" -+ libotr_min_major_version=`echo $min_libotr_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ libotr_min_minor_version=`echo $min_libotr_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ libotr_min_sub_version=`echo $min_libotr_version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) -+ -+AC_LANG_SAVE -+AC_LANG_C -+AC_TRY_COMPILE([ -+#include <stdlib.h> -+#include <libotr/version.h> -+], [ -+# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) -+# error not present -+# else -+ -+# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) -+ exit(0); -+# else -+# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) -+# error not present -+# endif -+ -+# if(OTRL_VERSION_SUB < $libotr_min_sub_version) -+# error not present -+# endif -+# endif -+# endif -+exit(0); -+], -+ [AC_MSG_RESULT(found.)], -+ [AC_MSG_RESULT(not present.) -+ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) -+ libotr_found=no] -+) -+AC_LANG_RESTORE -+ -+dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. -+AC_CHECK_LIB([otr], [otrl_message_receiving],, -+ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) -+ libotr_found=no], -+ $LIBGCRYPT_LIBS -+) -+ -+LDFLAGS="$libotr_save_LDFLAGS" -+LIBS="$libotr_save_LIBS" -+ -+if test "x$libotr_found" = "xyes" ; then -+ ifelse([$2], , :, [$2]) -+else -+ LIBOTR_CFLAGS="" -+ LIBOTR_LIBS="" -+ ifelse([$3], , :, [$3]) -+fi -+ -+dnl That should be it. Now just export our symbols: -+AC_SUBST(LIBOTR_CFLAGS) -+AC_SUBST(LIBOTR_LIBS) -+]) -+ -diff -Naur libotr-3.2.1.orig/libotr.pc.in libotr-3.2.1/libotr.pc.in ---- libotr-3.2.1.orig/libotr.pc.in 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/libotr.pc.in 1969-12-31 19:00:00.000000000 -0500 -@@ -1,11 +0,0 @@ --prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -- --Name: libotr --Description: Off-the-Record Messaging Library --Version: 3.1.0 --URL: http://otr.cypherpunks.ca/ --Libs: -L${libdir} -lotr --Cflags: -I${includedir} -diff -Naur libotr-3.2.1.orig/Makefile.am libotr-3.2.1/Makefile.am ---- libotr-3.2.1.orig/Makefile.am 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/Makefile.am 2012-11-02 04:53:47.536872337 -0400 -@@ -1,9 +1,9 @@ - SUBDIRS = src toolkit - --EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in -+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in - - aclocaldir = $(datadir)/aclocal --aclocal_DATA = libotr.m4 -+aclocal_DATA = libotr3.m4 - - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = libotr.pc -+pkgconfig_DATA = libotr3.pc -diff -Naur libotr-3.2.1.orig/Makefile.in libotr-3.2.1/Makefile.in ---- libotr-3.2.1.orig/Makefile.in 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/Makefile.in 2012-11-02 04:53:47.536872337 -0400 -@@ -37,7 +37,7 @@ - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -- $(srcdir)/libotr.pc.in $(top_srcdir)/configure AUTHORS COPYING \ -+ $(srcdir)/libotr3.pc.in $(top_srcdir)/configure AUTHORS COPYING \ - COPYING.LIB ChangeLog INSTALL NEWS config.guess config.sub \ - depcomp install-sh ltmain.sh missing - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -48,7 +48,7 @@ - configure.lineno config.status.lineno - mkinstalldirs = $(install_sh) -d - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = libotr.pc -+CONFIG_CLEAN_FILES = libotr3.pc - CONFIG_CLEAN_VPATH_FILES = - SOURCES = - DIST_SOURCES = -@@ -162,7 +162,7 @@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ - LIBOBJS = @LIBOBJS@ --LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ -+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LIPO = @LIPO@ -@@ -243,11 +243,11 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - SUBDIRS = src toolkit --EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr.m4 libotr.pc.in -+EXTRA_DIST = Protocol-v2.html UPGRADING packaging libotr3.m4 libotr3.pc.in - aclocaldir = $(datadir)/aclocal --aclocal_DATA = libotr.m4 -+aclocal_DATA = libotr3.m4 - pkgconfigdir = $(libdir)/pkgconfig --pkgconfig_DATA = libotr.pc -+pkgconfig_DATA = libotr3.pc - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -@@ -303,7 +303,7 @@ - - distclean-hdr: - -rm -f config.h stamp-h1 --libotr.pc: $(top_builddir)/config.status $(srcdir)/libotr.pc.in -+libotr3.pc: $(top_builddir)/config.status $(srcdir)/libotr3.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - - mostlyclean-libtool: -diff -Naur libotr-3.2.1.orig/src/Makefile.am libotr-3.2.1/src/Makefile.am ---- libotr-3.2.1.orig/src/Makefile.am 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/src/Makefile.am 2012-11-02 04:53:47.536872337 -0400 -@@ -1,13 +1,13 @@ - INCLUDES = @LIBGCRYPT_CFLAGS@ - --lib_LTLIBRARIES = libotr.la -+lib_LTLIBRARIES = libotr3.la - --libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ -+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ - userstate.c tlv.c auth.c sm.c - --libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ -+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ - --otrincdir = $(includedir)/libotr -+otrincdir = $(includedir)/libotr3 - - otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \ - version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h -diff -Naur libotr-3.2.1.orig/src/Makefile.in libotr-3.2.1/src/Makefile.in ---- libotr-3.2.1.orig/src/Makefile.in 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/src/Makefile.in 2012-11-02 04:53:47.536872337 -0400 -@@ -69,13 +69,13 @@ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' - am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(otrincdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) --libotr_la_LIBADD = --am_libotr_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \ -+libotr3_la_LIBADD = -+am_libotr3_la_OBJECTS = privkey.lo context.lo proto.lo b64.lo dh.lo \ - mem.lo message.lo userstate.lo tlv.lo auth.lo sm.lo --libotr_la_OBJECTS = $(am_libotr_la_OBJECTS) --libotr_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+libotr3_la_OBJECTS = $(am_libotr3_la_OBJECTS) -+libotr3_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libotr_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(libotr3_la_LDFLAGS) $(LDFLAGS) -o $@ - DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -89,8 +89,8 @@ - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ --SOURCES = $(libotr_la_SOURCES) --DIST_SOURCES = $(libotr_la_SOURCES) -+SOURCES = $(libotr3_la_SOURCES) -+DIST_SOURCES = $(libotr3_la_SOURCES) - HEADERS = $(otrinc_HEADERS) - ETAGS = etags - CTAGS = ctags -@@ -130,7 +130,7 @@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ - LIBOBJS = @LIBOBJS@ --LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ -+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LIPO = @LIPO@ -@@ -211,12 +211,12 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - INCLUDES = @LIBGCRYPT_CFLAGS@ --lib_LTLIBRARIES = libotr.la --libotr_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ -+lib_LTLIBRARIES = libotr3.la -+libotr3_la_SOURCES = privkey.c context.c proto.c b64.c dh.c mem.c message.c \ - userstate.c tlv.c auth.c sm.c - --libotr_la_LDFLAGS = -version-info @LIBOTR_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ --otrincdir = $(includedir)/libotr -+libotr3_la_LDFLAGS = -version-info @LIBOTR3_LIBTOOL_VERSION@ @LIBS@ @LIBGCRYPT_LIBS@ -+otrincdir = $(includedir)/libotr3 - otrinc_HEADERS = b64.h context.h dh.h mem.h message.h privkey.h proto.h \ - version.h userstate.h tlv.h serial.h auth.h sm.h privkey-t.h - -@@ -285,8 +285,8 @@ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done --libotr.la: $(libotr_la_OBJECTS) $(libotr_la_DEPENDENCIES) -- $(libotr_la_LINK) -rpath $(libdir) $(libotr_la_OBJECTS) $(libotr_la_LIBADD) $(LIBS) -+libotr3.la: $(libotr3_la_OBJECTS) $(libotr3_la_DEPENDENCIES) -+ $(libotr3_la_LINK) -rpath $(libdir) $(libotr3_la_OBJECTS) $(libotr3_la_LIBADD) $(LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) -diff -Naur libotr-3.2.1.orig/toolkit/Makefile.am libotr-3.2.1/toolkit/Makefile.am ---- libotr-3.2.1.orig/toolkit/Makefile.am 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/toolkit/Makefile.am 2012-11-02 04:53:47.536872337 -0400 -@@ -6,7 +6,7 @@ - otr_modify otr_remac - - COMMON_S = parse.c sha1hmac.c --COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@ -+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@ - - otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S) - otr_parse_LDADD = $(COMMON_LD) -diff -Naur libotr-3.2.1.orig/toolkit/Makefile.in libotr-3.2.1/toolkit/Makefile.in ---- libotr-3.2.1.orig/toolkit/Makefile.in 2012-11-02 04:53:36.609896510 -0400 -+++ libotr-3.2.1/toolkit/Makefile.in 2012-11-02 04:53:47.536872337 -0400 -@@ -55,7 +55,7 @@ - am_otr_mackey_OBJECTS = otr_mackey.$(OBJEXT) sesskeys.$(OBJEXT) \ - $(am__objects_1) - otr_mackey_OBJECTS = $(am_otr_mackey_OBJECTS) --am__DEPENDENCIES_1 = ../src/libotr.la -+am__DEPENDENCIES_1 = ../src/libotr3.la - otr_mackey_DEPENDENCIES = $(am__DEPENDENCIES_1) - am_otr_modify_OBJECTS = otr_modify.$(OBJEXT) readotr.$(OBJEXT) \ - $(am__objects_1) -@@ -159,7 +159,7 @@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ - LIBOBJS = @LIBOBJS@ --LIBOTR_LIBTOOL_VERSION = @LIBOTR_LIBTOOL_VERSION@ -+LIBOTR3_LIBTOOL_VERSION = @LIBOTR3_LIBTOOL_VERSION@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LIPO = @LIPO@ -@@ -242,7 +242,7 @@ - INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ - noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h - COMMON_S = parse.c sha1hmac.c --COMMON_LD = ../src/libotr.la @LIBS@ @LIBGCRYPT_LIBS@ -+COMMON_LD = ../src/libotr3.la @LIBS@ @LIBGCRYPT_LIBS@ - otr_parse_SOURCES = otr_parse.c readotr.c $(COMMON_S) - otr_parse_LDADD = $(COMMON_LD) - otr_sesskeys_SOURCES = otr_sesskeys.c sesskeys.c $(COMMON_S) diff --git a/pcr/libowfat/PKGBUILD b/pcr/libowfat/PKGBUILD index b74e1049b..2268906e2 100644 --- a/pcr/libowfat/PKGBUILD +++ b/pcr/libowfat/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): gls < ghostlovescorebg at gmail dot com > -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: gls < ghostlovescorebg at gmail dot com > +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=libowfat pkgver=0.29 diff --git a/pcr/libreboot-utils/0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch b/pcr/libreboot-utils/0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch new file mode 100644 index 000000000..689994d01 --- /dev/null +++ b/pcr/libreboot-utils/0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch @@ -0,0 +1,88 @@ +From 2f61f3547e3e854cb1b1a7752e2a5e4d38e07f74 Mon Sep 17 00:00:00 2001 +From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +Date: Fri, 6 May 2022 03:25:42 +0200 +Subject: [PATCH] cbfstool: enable to disable -Werror in standalone builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +With GCC 11.2, on GNU/Linux i686, if we run the following commands: +$ cd util/cbfstool +$ make +the build fails with with the following error: + host/lib/extract_vmlinuz.c: In function ‘ExtractVmlinuz’: + host/lib/extract_vmlinuz.c:67:9: warning: + ‘memcpy’ specified bound between 2147483648 and 4294967295 + exceeds maximum object size 2147483647 [-Wstringop-overflow=] + 67 | memcpy(vmlinuz, kpart_data + vmlinuz_header_offset, + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 68 | vmlinuz_header_size); + | ~~~~~~~~~~~~~~~~~~~~ + +Enabling to build cbfstool (and its dependencies like vboot where the +above error comes from), we can enable users and distributions to +build cbfstool with the distribution toolchain. + +For that they would need to pass WERROR='' to make, like that: +$ cd util/cbfstool +$ make WERROR='' + +Since util/cbfstool/lz4/Makefile isn't used during the build of a +standalone cbfstool or a coreboot image, we can simply ignore the +-Werror that are inside. + +Change-Id: I24f59661d3fc218d1e4cd4c36006172ead08b18d +Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +--- +Description: This patch is needed to fix the cbfstool compilation on +32bit architectures. +Forwarded: https://review.coreboot.org/c/coreboot/+/64131 +Author: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +--- + util/cbfstool/Makefile | 2 ++ + util/cbfstool/Makefile.inc | 5 ++++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile +index 034aca26a6be..6fc8cdf1635c 100644 +--- a/util/cbfstool/Makefile ++++ b/util/cbfstool/Makefile +@@ -11,6 +11,8 @@ INSTALL ?= /usr/bin/env install + OBJCOPY ?= objcopy + override objutil := .. + ++WERROR ?= -Werror ++ + VBOOT_SOURCE ?= $(top)/3rdparty/vboot + VBOOT_HOST_BUILD ?= $(abspath $(objutil)/vboot_lib) + +diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc +index f3e6c75dced2..d35f734c8b16 100644 +--- a/util/cbfstool/Makefile.inc ++++ b/util/cbfstool/Makefile.inc +@@ -1,3 +1,5 @@ ++WERROR ?= -Werror ++ + compressionobj := + compressionobj += compress.o + # LZ4 +@@ -110,7 +112,7 @@ cse_serger_obj += common.o + cse_serger_obj += cse_helpers.o + cse_serger_obj += $(foreach var, $(bpdt_formats_obj), $(var)) + +-TOOLCFLAGS ?= -Werror -Wall -Wextra -Wshadow ++TOOLCFLAGS ?= $(WERROR) -Wall -Wextra -Wshadow + TOOLCFLAGS += -Wcast-qual -Wmissing-prototypes -Wredundant-decls -Wshadow + TOOLCFLAGS += -Wstrict-prototypes -Wwrite-strings + TOOLCFLAGS += -O2 +@@ -156,6 +158,7 @@ $(VBOOT_HOSTLIB): + PKG_CONFIG="true" \ + V=$(V) \ + DEBUG= \ ++ WERROR=$(WERROR) \ + hostlib + + $(objutil)/cbfstool/%.o: $(objutil)/cbfstool/%.c +-- +2.36.0 + diff --git a/pcr/libreboot-utils/PKGBUILD b/pcr/libreboot-utils/PKGBUILD new file mode 100644 index 000000000..04e987507 --- /dev/null +++ b/pcr/libreboot-utils/PKGBUILD @@ -0,0 +1,182 @@ +# Copyright (C) 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Copyright (C) 2022 Wael Karram <wael@waelk.tech> +# SPDX-License-Identifier: CC0-1.0 +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=libreboot-utils +pkgrel=2 +_upstream_ver=20220710 +pkgver=4.15.libreboot${_upstream_ver} +pkgdesc="Misc. Coreboot/Libreboot utils (bucts, cbfstool, ECtool, nvramtool, superiotool)" +url="https://libreboot.org/" +arch=('x86_64' 'i686' 'armv7h') +license=('GPL2') +makedepends=('pciutils' 'python' 'python-setuptools' 'flex') + +_mirror="https://mirrors.mit.edu/libreboot" # use a mirror per libreboot's request +source=("${_mirror}/stable/${_upstream_ver}/libreboot-${_upstream_ver}_src.tar.xz"{,.sig} + "0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch") +sha256sums=('92439034828aa66d52507c97d8260a7d0335abbeedb1a70e5e1466b92a903645' + 'e8afb35e6d9328baa5cee5325c60cb40467559596e93a7ae218883ece3484b8f' + 'SKIP') +sha512sums=('73fe77983d30997295747e365a363f6fc4897f469d9b24640fc6a7105f0ddb623890e797723077222212695dbbe9abb5186b04d75dad39f99cb62733f4b0de60' + 'aa4f35df0da8e93dda169034e906576db291ac2e6fe27b5c9693827ff99ecaa8c45b80892f0792505fb1d9c6d5190517a59309304f93c3e1f504ddacf95684c1' + 'SKIP') +validpgpkeys=('98CCDDF8E56047F475C044BDD0C62464FA8B4856') # Leah Rowe + +prepare() { + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/" + patch \ + -Np1 -i \ + "${srcdir}/0001-cbfstool-enable-to-disable-Werror-in-standalone-buil.patch" + + # Replace sbin with bin in the makefiles. + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/bucts/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/cbfstool/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/cbmem/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/ectool/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/intelmetool/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/inteltool/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/nvramtool/" + sed 's#/sbin#/bin#' -i Makefile + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/superiotool/" + sed 's#/sbin#/bin#' -i Makefile + + # Remove uneeded files. + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/" + rm -rf tests + rm -rf spd + rm -rf payloads + rm -rf Documentation +} + +build() { + # Build ich9deblob, ich9gen, demefactory, ich9show, etc + cd "$srcdir/libreboot-${_upstream_ver}_src" + make -C ich9utils + + # Get to the directory. + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/" + + # These tools uses port-mapped I/O which doesn't exist on armv7h, + # so they fails to compile when including sys/io.h. They also need + # port-mapped I/O to work so it's pointless to try to build them + # on armv7h. + if [ "${CARCH}" = "i686" -o "${CARCH}" = "x86_64" ] ; then + # Build bucts. + make -C bucts + + # Build ECtool. + make -C ectool + + # Build intelmetool. + make -C intelmetool + + # Build inteltool. + make -C inteltool + + # Build superiotool. + make -C superiotool + fi + + # Build bincfg. + make -C bincfg WERROR="" + + # Build cbfstool. + make -C cbfstool WERROR='' + + # Build cbmem. + make -C cbmem + + # Build ifdtool + make -C ifdtool + + # Build me_cleaner. + cd me_cleaner + python3 setup.py build + cd .. + + # Build nvramtool. + make -C nvramtool + + # Build spkmodem_recv. + make -C spkmodem_recv +} + +package() { + # Set directories up. + install -d "${pkgdir}"/usr/bin "${pkgdir}"/usr/share/man/man8 + + # Install ich9deblob, ich9gen, demefactory, ich9show, etc + cd "$srcdir/libreboot-${_upstream_ver}_src/ich9utils" + for binary in ich9deblob ich9gen demefactory ich9show ; do + install -Dm755 "${binary}" "${pkgdir}"/usr/bin/"${binary}" + done + + # Get to the directory. + cd "$srcdir/libreboot-${_upstream_ver}_src/coreboot/default/util/" + + # These tools uses port-mapped I/O which doesn't exist on armv7h, + # so they fails to compile when including sys/io.h. So we also need + # to skip their installation. + if [ "${CARCH}" = "i686" -o "${CARCH}" = "x86_64" ] ; then + # Install bucts. + install -Dm755 bucts/bucts "${pkgdir}"/usr/bin/bucts + + # Install ECtool. + make -C ectool install PREFIX="${pkgdir}"/usr + + # Install intelmetool. + make -C intelmetool install DESTDIR="${pkgdir}" PREFIX=/usr + + # Install inteltool. + make -C inteltool install DESTDIR="${pkgdir}" PREFIX=/usr + + # Install superiotool. + make -C superiotool install DESTDIR="${pkgdir}" PREFIX=/usr + fi + + # Install bincfg. + install -Dm755 bincfg/bincfg "${pkgdir}"/usr/bin/bincfg + + install -d "${pkgdir}"/usr/share/bincfg + for _file in ddr3_unregistered_spd_128.spec \ + ddr3_unregistered_spd_256.spec \ + ddr4_registered_spd_512.spec \ + ddr4_unbuffered_spd_512.spec \ + gbe-82579LM.set \ + gbe-82579LM.spec \ + gbe-ich9m.set \ + gbe-ich9m.spec \ + ifd-x200.set \ + ifd-x200.spec \ + it8718f-ec.spec ; do + install -Dm644 bincfg/"${_file}" "${pkgdir}"/usr/share/bincfg/"${_file}" + done + + # Install cbfstool. + make -C cbfstool install DESTDIR="${pkgdir}" PREFIX=/usr + + # Install cbmem. + make -C cbmem install DESTDIR="${pkgdir}" PREFIX=/usr + + # Install ifdtool. + make -C ifdtool install DESTDIR="${pkgdir}" PREFIX=/usr + + # Install me_cleaner. + cd me_cleaner + python3 setup.py install --root="$pkgdir/" --optimize=1 + cd .. + + # Install nvramtool. + make -C nvramtool install DESTDIR="${pkgdir}" PREFIX=/usr + + # Install spkmodem_recv. + make -C spkmodem_recv install PREFIX="${pkgdir}/usr" +} diff --git a/pcr/libselinux/PKGBUILD b/pcr/libselinux/PKGBUILD index afad0d74c..3f004daf7 100644 --- a/pcr/libselinux/PKGBUILD +++ b/pcr/libselinux/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) -# Contributor (AUR): Timothée Ravier <tim@siosm.fr> -# Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) -# Contributor (AUR): Zezadas +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Contributor: Timothée Ravier <tim@siosm.fr> +# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) +# Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) +# Contributor: Zezadas # Maintainer: Luke Shumaker <lukeshu@parabola.nu> # parabola changes and rationale: diff --git a/pcr/libsemanage/PKGBUILD b/pcr/libsemanage/PKGBUILD index 1626732bf..f7dcbb2b5 100644 --- a/pcr/libsemanage/PKGBUILD +++ b/pcr/libsemanage/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) -# Contributor (AUR): Timothée Ravier <tim@siosm.fr> -# Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Contributor: Timothée Ravier <tim@siosm.fr> +# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) +# Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) # parabola changes and rationale: # - Added armv7h diff --git a/pcr/libsepol/PKGBUILD b/pcr/libsepol/PKGBUILD index fd6732fec..b9d0852a5 100644 --- a/pcr/libsepol/PKGBUILD +++ b/pcr/libsepol/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) -# Contributor (AUR): Timothée Ravier <tim@siosm.fr> -# Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Contributor: Timothée Ravier <tim@siosm.fr> +# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) +# Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) # Maintainer: Luke Shumaker <lukeshu@parabola.nu> # parabola changes and rationale: diff --git a/pcr/libshout-idjc/PKGBUILD b/pcr/libshout-idjc/PKGBUILD index 84ece611c..cf30359bc 100644 --- a/pcr/libshout-idjc/PKGBUILD +++ b/pcr/libshout-idjc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): M0Rf30 +# Maintainer (arch): M0Rf30 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libshout-idjc diff --git a/pcr/libsquish-svn/PKGBUILD b/pcr/libsquish-svn/PKGBUILD index d4ba0100e..efc5f8294 100644 --- a/pcr/libsquish-svn/PKGBUILD +++ b/pcr/libsquish-svn/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Samuel Mesa <samuelmesa@linuxmail.org> -# Contributor (AUR): F0ruD<fzerorubigd{AT}gmail{DOT}com> +# Maintainer (aur): Samuel Mesa <samuelmesa@linuxmail.org> +# Contributor: F0ruD<fzerorubigd{AT}gmail{DOT}com> # Contributor: Jorge Araya Navarro <jorgean@lavabit.com> # parabola changes and rationale: diff --git a/pcr/libsrs_alt/PKGBUILD b/pcr/libsrs_alt/PKGBUILD index 0171bdec2..cdc56c231 100644 --- a/pcr/libsrs_alt/PKGBUILD +++ b/pcr/libsrs_alt/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR): Sergey Shatunov <me@prok.pw> +# Maintainer (aur): Sergey Shatunov <me@prok.pw> pkgname=libsrs_alt pkgver=1.0 diff --git a/pcr/libtorrent-extended/PKGBUILD b/pcr/libtorrent-extended/PKGBUILD index efd99031c..c2102cf5e 100644 --- a/pcr/libtorrent-extended/PKGBUILD +++ b/pcr/libtorrent-extended/PKGBUILD @@ -1,8 +1,8 @@ -# Contributor (Arch): Lucky <aur.archlinux.org [at] lucky.take0ver [dot] net> -# Contributor (Arch): Daenyth <Daenyth+Arch [at] gmail [dot] com> -# Contributor (Arch): Jeff Mickey <jeff@archlinux.org> -# Contributor (Arch): sh__ -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Lucky <aur.archlinux.org [at] lucky.take0ver [dot] net> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> +# Contributor: Jeff Mickey <jeff@archlinux.org> +# Contributor: sh__ +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libtorrent-extended _pkgname="libtorrent" diff --git a/pcr/libubox-lua-git/PKGBUILD b/pcr/libubox-lua-git/PKGBUILD index e724d66de..43d38536c 100644 --- a/pcr/libubox-lua-git/PKGBUILD +++ b/pcr/libubox-lua-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Luka Perkov <luka.perkov@sartura.hr> +# Maintainer (arch): Luka Perkov <luka.perkov@sartura.hr> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=libubox-lua-git diff --git a/pcr/libvdpau-sunxi-git/PKGBUILD b/pcr/libvdpau-sunxi-git/PKGBUILD index 83ff612fa..2d6239097 100644 --- a/pcr/libvdpau-sunxi-git/PKGBUILD +++ b/pcr/libvdpau-sunxi-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Jens Kuske <jenskuske@gmail.com> -# Contributor (AUR): smotocel69 <smotocel69@gmail.com> +# Maintainer (aur): Jens Kuske <jenskuske@gmail.com> +# Contributor: smotocel69 <smotocel69@gmail.com> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/libxtrx/PKGBUILD b/pcr/libxtrx/PKGBUILD index f71c0cb16..11d83a97d 100644 --- a/pcr/libxtrx/PKGBUILD +++ b/pcr/libxtrx/PKGBUILD @@ -1,5 +1,7 @@ # $id$ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=libxtrx pkgver=r49.g2443a10 pkgrel=3 diff --git a/pcr/libxtrxdsp/PKGBUILD b/pcr/libxtrxdsp/PKGBUILD index 52ff59bb1..d85c4ab54 100644 --- a/pcr/libxtrxdsp/PKGBUILD +++ b/pcr/libxtrxdsp/PKGBUILD @@ -1,5 +1,7 @@ # $Id$ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=libxtrxdsp pkgver=r7.g84c6f4c pkgrel=2 diff --git a/pcr/libxtrxll/PKGBUILD b/pcr/libxtrxll/PKGBUILD index 8633aa327..f839b1e5a 100644 --- a/pcr/libxtrxll/PKGBUILD +++ b/pcr/libxtrxll/PKGBUILD @@ -1,5 +1,7 @@ # $id$ # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=libxtrxll pkgver=r32.g9106b98 pkgrel=2 diff --git a/pcr/lie/PKGBUILD b/pcr/lie/PKGBUILD index 0b5c75768..d1a8a37e8 100644 --- a/pcr/lie/PKGBUILD +++ b/pcr/lie/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Arch): Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org> +# Contributor: Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org> # Maintainer: asm <asm@member.fsf.org> pkgname=lie diff --git a/pcr/lightspark/PKGBUILD b/pcr/lightspark/PKGBUILD index abadafaa3..4a91f6853 100644 --- a/pcr/lightspark/PKGBUILD +++ b/pcr/lightspark/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (Arch): Daniel Landau <daniel+aur@landau.fi> -# Contributor (Arch): sekret, mail=$(echo c2VrcmV0QHBvc3Rlby5zZQo= | base64 -d) -# Contributor (Arch): mmm -# Contributor (Arch): bslackr <brendan at vastactive dot com> -# Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > +# Maintainer (arch): Daniel Landau <daniel+aur@landau.fi> +# Contributor: sekret, mail=$(echo c2VrcmV0QHBvc3Rlby5zZQo= | base64 -d) +# Contributor: mmm +# Contributor: bslackr <brendan at vastactive dot com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: bill-auger <bill-auger@programmer.net> @@ -30,14 +30,53 @@ source+=(include-boostserialization.patch) sha256sums+=('669b021aebb1bd0f4f8f7c029b963c575eaf3cdee1de194144bc8c9b8b61d2e5') -_version_constraint() # (dep_pkgname) +_version_constraint() # (dep_pkgname [precision]) { - local dep_pkgname=$1 - local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1) - version=${version%-*} - local version_inc=${version%.*}.$(( ${version##*.} + 1 )) + Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } + - echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}" + local dep_pkgname=$1 + declare -i req_precision=$2 + local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) + local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) + local def_precision=$(( n_dots + 1 )) + local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) + local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) + local pkgver_rx='[0-9A-Za-z_]+' + pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, + # but some pkgver have it (eg: 5.15.10+kde+r130) + local subver_rx='\.'${pkgver_rx} + local pkgrel_rx='[0-9]+' + local garbage_rx='[^0-9].*' + local capture_rx=${pkgver_rx} + for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; + local version pkgrel has_dot_char version_min version_max constraint_string + declare -i subver subver_inc pkgrel_inc + + if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] + then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision + #unused=${BASH_REMATCH[2]} # discarded pkgver segments + pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed + has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) + subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric + version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) + subver_inc=$(( subver + 1 )) + pkgrel_inc=$(( pkgrel + 1 )) + version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ + echo ${version} ) + version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ + ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ + echo ${subver_inc} ) + constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" + + Log "Applied version constraint: '${constraint_string}'" + else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" + exit 1 + fi + + unset -f Log + + echo -n "${constraint_string}" } @@ -68,7 +107,8 @@ build() package() { - depends+=( $(_version_constraint 'boost-libs') ) + # pin to strongly-coupled dependency versions + depends=( ${depends[*]/boost-libs/} $(_version_constraint 'boost-libs') ) cd "${srcdir}"/${pkgname}-${pkgver}/build diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD index 63cbab3c7..d4981fd18 100644 --- a/pcr/lilo/PKGBUILD +++ b/pcr/lilo/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Connor Behan <connor.behan@gmail.com> -# Contributor (Arch): Eric Belanger <eric@archlinux.org> -# Contributor (Arch): judd <jvinet@zeroflux.org> +# Maintainer (arch): Connor Behan <connor.behan@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/lime/PKGBUILD b/pcr/lime/PKGBUILD deleted file mode 100644 index a1028da69..000000000 --- a/pcr/lime/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=lime -pkgver=4.4.0 -pkgrel=1 -pkgdesc='C++ library implementing Open Whisper System Signal protocol' -arch=(x86_64 i686) -url='http://www.linphone.org/' -license=('GPL') -depends=(bctoolbox soci boost) -makedepends=(cmake) -source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") -sha256sums=('7463294a419298d9765d6f8092216124bdd5876028e6af3419ac1b96800590e4') - -build() { - mkdir -p build - cd build - - cmake -DCMAKE_PREFIX_PATH=/usr \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DENABLE_STATIC=NO \ - -DENABLE_UNIT_TESTS=NO \ - "../$pkgname-$pkgver" - make -} - -package() { - make -C build DESTDIR="$pkgdir" install -} diff --git a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch b/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch deleted file mode 100644 index fe774a479..000000000 --- a/pcr/linphone-desktop/0001-do-not-build-linphone-sdk.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 08b8b1811a1ad079fa713d19a8cc6bf2dc782bb7 Mon Sep 17 00:00:00 2001 -From: David P <megver83@parabola.nu> -Date: Thu, 26 Nov 2020 15:56:30 -0300 -Subject: [PATCH 1/2] do not build linphone-sdk - -Signed-off-by: David P <megver83@parabola.nu> ---- - CMakeLists.txt | 61 +------------------ - .../cmake_builder/additional_steps.cmake | 9 --- - 2 files changed, 3 insertions(+), 67 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f7eb05f2..5921ee5b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -118,7 +118,6 @@ list(APPEND APP_OPTIONS "-DENABLE_RELATIVE_PREFIX=${ENABLE_RELATIVE_PREFIX}") - - list(APPEND APP_OPTIONS "-DLINPHONE_OUTPUT_DIR=${LINPHONE_OUTPUT_DIR}") - --include(ExternalProject) - set(PROJECT_BUILD_COMMAND "") - if(CMAKE_BUILD_PARALLEL_LEVEL) - list(APPEND APP_OPTIONS "-DCMAKE_BUILD_PARALLEL_LEVEL=${CMAKE_BUILD_PARALLEL_LEVEL}") -@@ -136,29 +135,8 @@ if(UNIX AND NOT APPLE) - set(CMAKE_INSTALL_RPATH "$ORIGIN:$ORIGIN/lib64:$ORIGIN/../lib64:$ORIGIN/lib:$ORIGIN/../lib:${LINPHONE_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}") - list(APPEND APP_OPTIONS "-DCMAKE_INSTALL_RPATH=${CMAKE_INSTALL_RPATH}") - endif() --ExternalProject_Add(sdk PREFIX "${CMAKE_BINARY_DIR}/sdk" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-sdk" -- INSTALL_DIR "${LINPHONE_OUTPUT_DIR}" -- STAMP_DIR "${SDK_BUILD_DIR}/stamp" -- BINARY_DIR "${SDK_BUILD_DIR}" -- STEP_TARGETS build -- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- #BUILD_ALWAYS NO #${DO_BUILD} --) --ExternalProject_Add_Step(sdk force_build -- COMMENT "Forcing build for 'desktop'" -- DEPENDEES configure -- DEPENDERS build -- ALWAYS 1 --) - include(FindPkgConfig) - --set(APP_DEPENDS sdk) -- -- - find_package(Qt5 5.12 COMPONENTS Core REQUIRED) - - if ( NOT Qt5_FOUND ) -@@ -173,39 +151,6 @@ find_package(Mediastreamer2 CONFIG QUIET) - find_package(ortp CONFIG QUIET) - - --if(NOT (LinphoneCxx_FOUND) OR NOT (Linphone_FOUND) OR NOT (bctoolbox_FOUND) OR NOT (belcard_FOUND) OR NOT (Mediastreamer2_FOUND) OR NOT (ortp_FOUND) OR FORCE_APP_EXTERNAL_PROJECTS) -- message("Projects are set as External projects. You can start building them by using for example : cmake --build . --target install") -- ExternalProject_Add(linphone-qt PREFIX "${CMAKE_BINARY_DIR}/linphone-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" -- DEPENDS ${APP_DEPENDS} -- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} -- INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step will not be done by external project" -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- # ${APP_OPTIONS} -- BUILD_ALWAYS ON -- ) -- install(CODE "message(STATUS Running install)") -- set(AUTO_REGENERATION auto_regeneration) -- add_custom_target(${AUTO_REGENERATION} ALL -- COMMAND ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR} -- DEPENDS linphone-qt) --else() -- message("Adding Linphone Desktop in an IDE-friendly state") -- set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -- add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -- add_dependencies(app-library ${APP_DEPENDS}) --endif() --ExternalProject_Add(linphone-qt-only PREFIX "${CMAKE_BINARY_DIR}/linphone-app" -- SOURCE_DIR "${CMAKE_SOURCE_DIR}/linphone-app" -- INSTALL_DIR "${APPLICATION_OUTPUT_DIR}" -- BINARY_DIR "${CMAKE_BINARY_DIR}/linphone-app" -- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config $<CONFIG> ${PROJECT_BUILD_COMMAND} --# INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "Install step is already done at build time." -- LIST_SEPARATOR | # Use the alternate list separator -- CMAKE_ARGS ${APP_OPTIONS} ${USER_ARGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH=${PREFIX_PATH} -- EXCLUDE_FROM_ALL ON -- BUILD_ALWAYS ON --) -+message("Adding Linphone Desktop in an IDE-friendly state") -+set(CMAKE_INSTALL_PREFIX "${APPLICATION_OUTPUT_DIR}") -+add_subdirectory(${CMAKE_SOURCE_DIR}/linphone-app) -diff --git a/linphone-app/cmake_builder/additional_steps.cmake b/linphone-app/cmake_builder/additional_steps.cmake -index 7f7fd573..a69a04e8 100644 ---- a/linphone-app/cmake_builder/additional_steps.cmake -+++ b/linphone-app/cmake_builder/additional_steps.cmake -@@ -54,14 +54,5 @@ if (ENABLE_PACKAGING) - linphone_builder_apply_flags() - linphone_builder_set_ep_directories(linphone_package) - linphone_builder_expand_external_project_vars() -- ExternalProject_Add(TARGET_linphone_package -- DEPENDS TARGET_linphone_builder -- TMP_DIR ${ep_tmp} -- BINARY_DIR ${ep_build} -- SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/linphone_package" -- DOWNLOAD_COMMAND "" -- CMAKE_GENERATOR ${CMAKE_GENERATOR} -- CMAKE_ARGS ${LINPHONE_BUILDER_EP_ARGS} -DCMAKE_INSTALL_PREFIX=${LINPHONE_BUILDER_WORK_DIR}/PACKAGE -DTOOLS_DIR=${CMAKE_BINARY_DIR}/programs -DLINPHONE_OUTPUT_DIR=${CMAKE_INSTALL_PREFIX} -DLINPHONE_DESKTOP_DIR=${CMAKE_CURRENT_LIST_DIR}/.. -DLINPHONE_SOURCE_DIR=${EP_linphone_SOURCE_DIR} ${ENABLE_VARIABLES} -DLINPHONE_BUILDER_SIGNING_IDENTITY=${LINPHONE_BUILDER_SIGNING_IDENTITY} -- ) - endif () - endif () --- -2.29.2 - diff --git a/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch b/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch deleted file mode 100644 index 547652d3a..000000000 --- a/pcr/linphone-desktop/0002-remove-bc_compute_full_version-usage.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 6fc23da651d54979e73776fcda38614e290d65dc Mon Sep 17 00:00:00 2001 -From: David P <megver83@parabola.nu> -Date: Fri, 23 Oct 2020 16:44:17 -0300 -Subject: [PATCH 2/2] remove bc_compute_full_version usage - ---- - linphone-app/CMakeLists.txt | 11 +---------- - linphone-app/build/CMakeLists.txt | 5 ----- - .../cmake_builder/linphone_package/CMakeLists.txt | 10 +--------- - 3 files changed, 2 insertions(+), 24 deletions(-) - -diff --git a/linphone-app/CMakeLists.txt b/linphone-app/CMakeLists.txt -index 3bc9420a..27b418ee 100644 ---- a/linphone-app/CMakeLists.txt -+++ b/linphone-app/CMakeLists.txt -@@ -21,17 +21,8 @@ - ################################################################################ - cmake_minimum_required(VERSION 3.1) - -+include(linphoneqt_version.cmake) - find_package(bctoolbox CONFIG) --set(FULL_VERSION ) --bc_compute_full_version(FULL_VERSION) --set(version_major ) --set(version_minor ) --set(version_patch ) --set(identifiers ) --set(metadata ) --bc_parse_full_version("${FULL_VERSION}" version_major version_minor version_patch identifiers metadata) -- --project(linphoneqt VERSION "${version_major}.${version_minor}.${version_patch}") - - if(ENABLE_BUILD_VERBOSE) - #message("CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}") -diff --git a/linphone-app/build/CMakeLists.txt b/linphone-app/build/CMakeLists.txt -index 8ef03faa..97d94bd6 100644 ---- a/linphone-app/build/CMakeLists.txt -+++ b/linphone-app/build/CMakeLists.txt -@@ -46,11 +46,6 @@ set(CPACK_SOURCE_IGNORE_FILES - "libmng.spec" - ) - --bc_compute_full_version(PROJECT_VERSION_BUILD) --if(PROJECT_VERSION_BUILD) -- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${PROJECT_VERSION_BUILD}") --endif() -- - message("-- Package file name is ${CPACK_PACKAGE_FILE_NAME}") - - set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME}) -diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -index baea03cf..08ffc1b5 100644 ---- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -+++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt -@@ -38,15 +38,7 @@ set(LINPHONE_QML_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../ui") - # ============================================================================== - # Build package version. - # ============================================================================== --bc_compute_full_version(APP_PROJECT_VERSION) --if (GIT_EXECUTABLE AND NOT(APP_PROJECT_VERSION)) -- execute_process( -- COMMAND ${GIT_EXECUTABLE} describe --always -- OUTPUT_VARIABLE APP_PROJECT_VERSION -- OUTPUT_STRIP_TRAILING_WHITESPACE -- WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../.." -- ) --elseif (NOT(APP_PROJECT_VERSION)) -+if (NOT(APP_PROJECT_VERSION)) - set(APP_PROJECT_VERSION "0.0.0") - endif () - string(REGEX REPLACE "([0-9.]+)-?.*" "\\1" LINPHONE_VERSION "${APP_PROJECT_VERSION}") --- -2.29.2 - diff --git a/pcr/linphone-desktop/PKGBUILD b/pcr/linphone-desktop/PKGBUILD deleted file mode 100644 index 413e4c104..000000000 --- a/pcr/linphone-desktop/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=linphone-desktop -pkgver=4.2.5 -pkgrel=1 -pkgdesc='A free VoIP and video softphone based on the SIP protocol' -arch=(x86_64 i686) -url='http://linphone.org' -license=(GPL) -depends=(qt5-quickcontrols qt5-quickcontrols2 qt5-graphicaleffects qt5-svg qt5-tools liblinphone) -makedepends=(cmake python-pystache doxygen nasm yasm python-six) -source=("https://gitlab.linphone.org/BC/public/$pkgname/-/archive/$pkgver/$pkgname-$pkgver.tar.gz" - 0001-do-not-build-linphone-sdk.patch - 0002-remove-bc_compute_full_version-usage.patch -) -sha512sums=('484a253f787b128176bdefab258355a59584a21381b8c8c69e1a312b8acfb6c512a3800abe3e9bcba4d5052fd0fde4e8368c5f74d90418609cc16188381694b1' - '1643fcaf4c033125b0cebd7e31a15c87baa62126bbecf12cc599f9ea1aa719ccb76a9d15849e0c7d5d1218445c0e3297771ed152930e14dadaaa87772a4c3ad7' - 'aea52c176474018b0bb05cb0ff370ec63aecbce66b3ed29e25a7be108239b91f33971317bdb3bef01730348cd98d17a2b6f24488854d34f7066371141f7d02f6') - -prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../0001-do-not-build-linphone-sdk.patch - patch -Np1 -i ../0002-remove-bc_compute_full_version-usage.patch - - # Fix building out-of-git - echo '#define LINPHONE_QT_GIT_VERSION "${PROJECT_VERSION}"' >> linphone-app/src/config.h.cmake - # Hardcode linphoneqt version - echo "project(linphoneqt VERSION $pkgver)" > linphone-app/linphoneqt_version.cmake -} - -build() { - mkdir -p build - cd build - - cmake "../$pkgname-$pkgver" - make - - sed -i '/linphone-sdk/d' linphone-app/cmake_builder/linphone_package/cmake_install.cmake - sed -i "s|$srcdir/build/OUTPUT|$pkgdir/usr|" cmake_install.cmake -} - -package() { - make -C build install - rm "$pkgdir/usr/bin/qt.conf" -} diff --git a/pcr/litecoin-qt/PKGBUILD b/pcr/litecoin-qt/PKGBUILD index 7943ce1b6..feab1141d 100644 --- a/pcr/litecoin-qt/PKGBUILD +++ b/pcr/litecoin-qt/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Loïc Guitaut <flink at belfalas.eu> -# Contributor (Arch): Nicolas Doualot <packages at slubman.info> +# Maintainer (arch): Loïc Guitaut <flink at belfalas.eu> +# Contributor: Nicolas Doualot <packages at slubman.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname='litecoin-qt' diff --git a/pcr/llvm37/PKGBUILD b/pcr/llvm37/PKGBUILD index ed9c83d26..bbab604e2 100644 --- a/pcr/llvm37/PKGBUILD +++ b/pcr/llvm37/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> -# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com> -# Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com> -# Contributor (Arch): Sebastian Nowicki <sebnow@gmail.com> -# Contributor (Arch): Devin Cofer <ranguvar{AT]archlinux[DOT}us> -# Contributor (Arch): Tobias Kieslich <tobias@justdreams.de> -# Contributor (Arch): Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> -# Contributor (Arch): Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor (Arch): Roberto Alsina <ralsina@kde.org> -# Contributor (Arch): Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -# Maintainer (ALARM): Kevin Mihelich <kevin@archlinuxarm.org> +# Maintainer (arch): Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Sebastian Nowicki <sebnow@gmail.com> +# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us> +# Contributor: Tobias Kieslich <tobias@justdreams.de> +# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> +# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> +# Contributor: Roberto Alsina <ralsina@kde.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> +# Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org> # - v5: disable compiler-rt, don't install in clang package # - v8: disable lldb, unsupported architecture # - this package only exists for GHC diff --git a/pcr/log4c/PKGBUILD b/pcr/log4c/PKGBUILD index 054bcc833..c2508219f 100644 --- a/pcr/log4c/PKGBUILD +++ b/pcr/log4c/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Arthur Țițeică arthur.titeica/gmail/com -# Contributor (Arch): rockerzz <rockerzz@gmail.com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Arthur Țițeică arthur.titeica/gmail/com +# Contributor: rockerzz <rockerzz@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=log4c pkgver=1.2.4 diff --git a/pcr/log4j-1.2/PKGBUILD b/pcr/log4j-1.2/PKGBUILD deleted file mode 100644 index d71f7346a..000000000 --- a/pcr/log4j-1.2/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_pkgname=log4j -pkgname=${_pkgname}-1.2 -pkgver=1.2.17 -pkgrel=1 -pkgdesc="Logging library for java" -arch=('any') -url="http://logging.apache.org/log4j/1.2/" -license=('APACHE') -depends=('java-runtime') -makedepends=('apache-ant' 'javamail' 'java-geronimo-jms' 'jh') -source=("https://archive.apache.org/dist/logging/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.gz" - "apache-log4j-remove_activation_framework.patch" - "apache-log4j-add_missing_classes.patch" - "apache-log4j-build_fix.patch") -md5sums=('8218714e41ee0c6509dcfeafa2e1f53f' - '4417d091786330e001dbaac991e17bfe' - '36450de9f2659c813b7edb8185545f4c' - 'f1a4cf990676af4726facad677ebe801') - -prepare() { - cd "${srcdir}/apache-${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/apache-log4j-remove_activation_framework.patch" - patch -Np1 -i "${srcdir}/apache-log4j-add_missing_classes.patch" - patch -Np1 -i "${srcdir}/apache-log4j-build_fix.patch" - rm -rv {contribs,site,tests} - rm -v $(find . -name \*.jar) -} - -build() { - cd "${srcdir}/apache-${_pkgname}-${pkgver}" - ant clean jar javadoc \ - -Djavamail.jar=/usr/share/java/javax.mail.jar \ - -Dgeronimo-jms.jar=/usr/share/java/geronimo-jms_1.1_spec.jar -} - -package() { - cd "${srcdir}/apache-${_pkgname}-${pkgver}" - - # Install license file - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" - - # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "docs/api" "${pkgdir}/usr/share/doc/${pkgname}" - cp -r "examples" "${pkgdir}/usr/share/doc/${pkgname}" - - # Install Maven artifacts - export DESTDIR=${pkgdir} - jh mvn-install ${_pkgname} ${_pkgname} ${pkgver} \ - "pom.xml" \ - "dist/lib/${_pkgname}-${pkgver}.jar" \ - "${_pkgname}-1.2.jar" - ln -s "/usr/share/java/${_pkgname}-1.2.jar" \ - "${pkgdir}/usr/share/java/${_pkgname}-${pkgver}.jar" -} diff --git a/pcr/log4j-1.2/apache-log4j-add_missing_classes.patch b/pcr/log4j-1.2/apache-log4j-add_missing_classes.patch deleted file mode 100644 index 215aabd3e..000000000 --- a/pcr/log4j-1.2/apache-log4j-add_missing_classes.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- apache-log4j-1.2.17.orig/build.xml 2012-05-06 06:00:28.000000000 -0500 -+++ apache-log4j-1.2.17/build.xml 2015-09-19 12:28:05.401524127 -0500 -@@ -430,7 +430,9 @@ - ${stem}/or/*.class, - ${stem}/or/sax/*.class, - ${stem}/or/jms/*.class, -- ${stem}/config/*.class" -+ ${stem}/config/*.class -+ ${stem}/pattern/*.class -+ ${stem}/rewrite/*.class" - excludes="**/UnitTest**"> - <manifest> - <section name="org/apache/log4j"> diff --git a/pcr/log4j-1.2/apache-log4j-build_fix.patch b/pcr/log4j-1.2/apache-log4j-build_fix.patch deleted file mode 100644 index b59472b47..000000000 --- a/pcr/log4j-1.2/apache-log4j-build_fix.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- apache-log4j-1.2.17.orig/build.xml 2012-05-06 06:00:28.000000000 -0500 -+++ apache-log4j-1.2.17/build.xml 2015-09-19 12:36:54.788784418 -0500 -@@ -167,12 +167,6 @@ - <and> - <available classname="javax.management.MBeanInfo" - classpath="${jmx.jar}"/> -- <available classname="com.sun.jdmk.comm.HtmlAdaptorServer"> -- <classpath> -- <pathelement location="${jmx.jar}"/> -- <pathelement location="${javaee-api.jar}"/> -- </classpath> -- </available> - </and> - </condition> - </target> -@@ -497,7 +491,6 @@ - protected="true" - author="true" - use="true" -- overview="${docs.dest}/overview.html" - doctitle="log4j version ${version}<br>API Specification" - windowtitle="Log4j Version ${version}" - header='<b>Log4j ${version}</b><!-- Licensed to the Apache Software Foundation (ASF) under one or more -@@ -517,8 +510,6 @@ - -->' - bottom="Copyright 2000-2007 Apache Software Foundation."> - -- <link href="http://java.sun.com/j2se/1.3/docs/api/"/> -- <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/> - <classpath refid="compile.classpath"/> - </javadoc> - diff --git a/pcr/log4j-1.2/apache-log4j-remove_activation_framework.patch b/pcr/log4j-1.2/apache-log4j-remove_activation_framework.patch deleted file mode 100644 index 662731cc8..000000000 --- a/pcr/log4j-1.2/apache-log4j-remove_activation_framework.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- apache-log4j-1.2.17.orig/build.xml 2012-05-06 06:00:28.000000000 -0500 -+++ apache-log4j-1.2.17/build.xml 2015-09-19 12:32:07.650680465 -0500 -@@ -118,7 +118,6 @@ - <path id="compile.classpath"> - <pathelement location="${build.home}/classes"/> - <pathelement location="${javamail.jar}"/> -- <pathelement location="${activation.jar}"/> - <pathelement location="${jaxp.jaxp.jar}"/> - <pathelement location="${jms.jar}"/> - <pathelement location="${jmx.jar}"/> ---- apache-log4j-1.2.17.orig/tests/build.xml 2012-05-06 06:00:11.000000000 -0500 -+++ apache-log4j-1.2.17/tests/build.xml 2015-09-19 12:32:58.297072814 -0500 -@@ -35,7 +35,6 @@ - <property name="checkstyle.version" value="4.1"/> - <property name="checkstyle.jar" location="${m2_repo}/checkstyle/checkstyle/${checkstyle.version}/checkstyle-${checkstyle.version}.jar"/> - <property name="javamail.jar" location="${m2_repo}/javax/mail/mail/1.4.3/mail-1.4.3.jar"/> -- <property name="activation.jar" location="${m2_repo}/javax/activation/activation/1.1/activation-1.1.jar"/> - <property name="junit.version" value="3.8.1"/> - <property name="junit.jar" location="${m2_repo}/junit/junit/${junit.version}/junit-${junit.version}.jar"/> - -@@ -70,7 +69,6 @@ - <pathelement location="${clover.jar}"/> - <pathelement location="${junit.jar}"/> - <pathelement location="${javamail.jar}"/> -- <pathelement location="${activation.jar}"/> - <pathelement path="${java.class.path}"/> - </path> - diff --git a/pcr/lttoolbox/PKGBUILD b/pcr/lttoolbox/PKGBUILD index 644b6c2b4..66427e2fc 100644 --- a/pcr/lttoolbox/PKGBUILD +++ b/pcr/lttoolbox/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> -# Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Contributor: Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org> pkgname=lttoolbox pkgver=3.5.0 diff --git a/pcr/lua-cyrussasl/PKGBUILD b/pcr/lua-cyrussasl/PKGBUILD index a837ae2e1..f7a72e81e 100644 --- a/pcr/lua-cyrussasl/PKGBUILD +++ b/pcr/lua-cyrussasl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Dwayne Bent <dbb.1@liqd.org> +# Maintainer (arch): Dwayne Bent <dbb.1@liqd.org> # parabola changes and rationale: # - upstream pkgbuild is gone, but we keep maintaining this. diff --git a/pcr/lua-ldap/PKGBUILD b/pcr/lua-ldap/PKGBUILD index ea65ba583..64650b185 100644 --- a/pcr/lua-ldap/PKGBUILD +++ b/pcr/lua-ldap/PKGBUILD @@ -1,3 +1,5 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=lua-ldap _pkgname=lualdap pkgver=1.1.0 diff --git a/pcr/lua51-sql-mysql/PKGBUILD b/pcr/lua51-sql-mysql/PKGBUILD index 229637cf3..e93f41e4c 100644 --- a/pcr/lua51-sql-mysql/PKGBUILD +++ b/pcr/lua51-sql-mysql/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ -# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Sébastien Luttringer <seblu@archlinux.org> -# Contributor (Arch): Anders Bergh <anders1@gmail.com> +# Maintainer (arch): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Anders Bergh <anders1@gmail.com> pkgname=lua51-sql-mysql pkgdesc='MySQL module for Lua 5.1' diff --git a/pcr/luadbi/PKGBUILD b/pcr/luadbi/PKGBUILD index e444a526e..67a695185 100644 --- a/pcr/luadbi/PKGBUILD +++ b/pcr/luadbi/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Aoibhinn di Tori <email@aoibh.in> -# Contributor (AUR): Lee T. Starnes <lstarnes1024@gmail.com> -# Maintainer (Parabola): fauno <fauno@parabola.nu> +# Maintainer (aur): Aoibhinn di Tori <email@aoibh.in> +# Contributor: Lee T. Starnes <lstarnes1024@gmail.com> +# Maintainer: fauno <fauno@parabola.nu> # parabola changes and rationale: # - removed empty fields diff --git a/pcr/lv2-c++-tools/PKGBUILD b/pcr/lv2-c++-tools/PKGBUILD index 36c08ae27..d8fb76994 100644 --- a/pcr/lv2-c++-tools/PKGBUILD +++ b/pcr/lv2-c++-tools/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): speps <speps at aur dot archlinux dot org> -# Contributor (Arch): Philipp Überbacher <murks at lavabit dot com> +# Maintainer (arch): speps <speps at aur dot archlinux dot org> +# Contributor: Philipp Überbacher <murks at lavabit dot com> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=lv2-c++-tools diff --git a/pcr/lzlib/PKGBUILD b/pcr/lzlib/PKGBUILD index 17835a800..7ee3c25b8 100644 --- a/pcr/lzlib/PKGBUILD +++ b/pcr/lzlib/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer(AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor(AUR): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=lzlib pkgver=1.11 diff --git a/pcr/mailcrypt/PKGBUILD b/pcr/mailcrypt/PKGBUILD index 9c7a86adf..0493746c9 100644 --- a/pcr/mailcrypt/PKGBUILD +++ b/pcr/mailcrypt/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/mailpile/PKGBUILD b/pcr/mailpile/PKGBUILD index 8665ddc40..d92e671fb 100644 --- a/pcr/mailpile/PKGBUILD +++ b/pcr/mailpile/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Maxim Andersson <thesilentboatman@gmail.com> +# Maintainer (aur): Maxim Andersson <thesilentboatman@gmail.com> # Based on the mailpile-git PKGBUILD -# Contributor (AUR): cornholio <vigo.the.unholy.carpathian@gmail.com> +# Contributor: cornholio <vigo.the.unholy.carpathian@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/maliit-framework/PKGBUILD b/pcr/maliit-framework/PKGBUILD index 6fffbec15..0b59f4afb 100644 --- a/pcr/maliit-framework/PKGBUILD +++ b/pcr/maliit-framework/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Jon Nordby <jononor@gmail.com> -# Maintainer (Arch): Jon Nordby <jononor@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> +# Maintainer (arch): Jon Nordby <jononor@gmail.com> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/maliit-plugins/PKGBUILD b/pcr/maliit-plugins/PKGBUILD index 915f737eb..79bcf328b 100644 --- a/pcr/maliit-plugins/PKGBUILD +++ b/pcr/maliit-plugins/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Jon Nordby <jononor@gmail.com> -# Maintainer (Arch): Jon Nordby <jononor@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> +# Maintainer (arch): Jon Nordby <jononor@gmail.com> # parabola changes and rationale: # - upstream pkgbuild is gone, but we keep maintaining this. diff --git a/pcr/mathics/PKGBUILD b/pcr/mathics/PKGBUILD index dc317f022..232537e2b 100644 --- a/pcr/mathics/PKGBUILD +++ b/pcr/mathics/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): Victor <v1c70rp@gmail.com> -# Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (AUR): sn6uv mathics@angusgriffith.com -# Contributor (AUR): Lex Black <autumn-wind at web dot de> -# Contributor (AUR): rnestler -# Contributor (AUR): mefistofeles +# Maintainer (aur): Victor <v1c70rp@gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: sn6uv mathics@angusgriffith.com +# Contributor: Lex Black <autumn-wind at web dot de> +# Contributor: rnestler +# Contributor: mefistofeles # parabola changes and rationale: # no changes. diff --git a/pcr/md5deep/PKGBUILD b/pcr/md5deep/PKGBUILD index 0649b1752..63c28593f 100755 --- a/pcr/md5deep/PKGBUILD +++ b/pcr/md5deep/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): billycongo <billycongo@gmail.com> -# Maintainer (Arch): dkaylor <dpkaylor@gmail.com> +# Contributor: billycongo <billycongo@gmail.com> +# Maintainer (arch): dkaylor <dpkaylor@gmail.com> # Maintainer: Esteban Carnevale <alfplayer@mailoo.org> pkgname=md5deep diff --git a/pcr/mediagoblin/PKGBUILD b/pcr/mediagoblin/PKGBUILD index 12dbac169..bbfbd2006 100644 --- a/pcr/mediagoblin/PKGBUILD +++ b/pcr/mediagoblin/PKGBUILD @@ -1,12 +1,9 @@ -# Maintainer (AUR): Immae <ismael.bouya@normalesup.org> +# Maintainer (aur): Immae <ismael.bouya@normalesup.org> # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> -_GIT_BUILD=true pkgname=mediagoblin -# HACK: bump parabola$n to avoid downgrades during _GIT to non-_GIT transitions -_pkgver=0.9.0+parabola1 -pkgver=0.9.0+parabola1+r12+g4752aa9f # automatic, use _pkgver or pkgver() +pkgver=0.11.0 pkgrel=1 pkgdesc='A free software media publishing platform (Git version)' url='https://mediagoblin.org' @@ -29,75 +26,74 @@ optdepends=('postgresql: to use the postgresql database backend' backup=('etc/webapps/mediagoblin/paste_local.ini' 'etc/webapps/mediagoblin/mediagoblin_local.ini') install=mediagoblin.install -makedepends=('git' 'automake') -if [ $_GIT_BUILD = true ]; then - source=("$pkgname-${_pkgver%%+parabola*}::git://git.savannah.gnu.org/$pkgname.git#branch=stable") - sha256sums=('SKIP') -else - source=("https://git.savannah.gnu.org/cgit/$pkgname.git/snapshot/${pkgname}-${_pkgver%%+parabola*}.tar.gz") - sha256sums=('a23490ed4d9dfa107ca4cd8483a063f0338e02a4783a176915d5521b7a55fb21') -fi -source+=('mediagoblin-paster.service' - 'mediagoblin-celeryd.service' - 'paste_local.ini' - 'mediagoblin_local.ini' - 'mediagoblin-tmpfiles.conf') -sha256sums+=('2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409' - 'f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a' - 'ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884' - '9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1' - 'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47') +makedepends=('autoconf2.13' 'automake') +source=(${pkgname}-${pkgver}::https://git.savannah.gnu.org/cgit/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.gz + 'mediagoblin-paster.service' + 'mediagoblin-celeryd.service' + 'paste_local.ini' + 'mediagoblin_local.ini' + 'mediagoblin-tmpfiles.conf' + 'ac.patch') +sha256sums=('b6ffaf09e7e0cab675127a445b8f5bf60977e0abcf5dc9cce0bb2ed44db3fbc7' + '2a02c90dcc8f69ac2a072044d3e4281347ed048c2610cb2e11295e4876cfb409' + 'f636d02f86d2dab5ecc901be5b0f7c42366500393f22dfdc7e354ca299fca65a' + 'ac914d60886d9bf53d3f40b8b00a60d46ada1cac9130210e045a4776d898e884' + '9adf338f5dbfb94ee7ae29433091b6991a1fa39a6135a8295f9f1cc1fde0edc1' + 'abb6c4c4e54d4372adfe67ab22371ad625505098311955e5ae8e34102b059d47' + '1c8dd28eeffee322c354b211170d690dbdd32b5007274b76e5c4da62efac272f') -pkgver() { - printf -- "%s" "$_pkgver" - [ $_GIT_BUILD != true ] && return - cd "$srcdir/$pkgname-${_pkgver%%+parabola*}" - git describe --long | - sed "s/^v${_pkgver%%+parabola*}// ; s/\([^-]*-g\)/r\1/ ; s/-/+/g" -} -prepare() { - cd "$srcdir/$pkgname-${_pkgver%%+parabola*}" - if [ $_GIT_BUILD = true ]; then - git submodule init - git submodule update - else - sed -i /^git/d bootstrap.sh - fi +prepare() +{ + cd "${srcdir}"/${pkgname}-${pkgver} +# sed -i 's/aclocal /aclocal-1.16 /' bootstrap.sh +# sed -i 's/autoreconf -fvi/autoreconf-2.13 -i --force/' bootstrap.sh + sed -i '/^git/d' bootstrap.sh + + sed -i '/dnl AC_CONFIG_MACRO_DIR([m4])/d' configure.ac + + echo "applying ac.patch" + autoconf + patch -Np1 < "${srcdir}"/ac.patch } -build() { - cd "$srcdir/$pkgname-${_pkgver%%+parabola*}" +build() +{ + cd "${srcdir}"/${pkgname}-${pkgver} +# autoupdate +# ./bootstrap.sh +# autoreconf -fvi - ./bootstrap.sh - ./configure --with-python3 - make || make +# ./configure + ./configure --without-virtualenv + make ./bin/easy_install flup } -package() { - cd "$srcdir/$pkgname-${_pkgver%%+parabola*}" +package() +{ + cd "${srcdir}"/${pkgname}-${pkgver} rm -rf .git .gitignore - install -dm755 "$pkgdir"/usr/share/webapps/mediagoblin/ - cp -a . "$pkgdir"/usr/share/webapps/mediagoblin + install -dm755 "${pkgdir}"/usr/share/webapps/mediagoblin/ + cp -a . "${pkgdir}"/usr/share/webapps/mediagoblin - cd "$pkgdir"/usr/share/webapps/mediagoblin + cd "${pkgdir}"/usr/share/webapps/mediagoblin find . -name '*.pyc' -delete find . -type f -exec sed -Ei \ - "s|$srcdir/$pkgname(-${_pkgver%%+parabola*})?|/usr/share/webapps/$pkgname|g" {} \; + "s|${srcdir}/${pkgname}(-${pkgver})?|/usr/share/webapps/${pkgname}|g" {} \; - install -dm755 "$pkgdir"/var/lib/mediagoblin - install -dm755 "$pkgdir"/etc/webapps/mediagoblin + install -dm755 "${pkgdir}"/var/lib/mediagoblin + install -dm755 "${pkgdir}"/etc/webapps/mediagoblin - install -Dm644 "$srcdir"/paste_local.ini "$pkgdir"/etc/webapps/mediagoblin/paste_local.ini - ln -s /etc/webapps/mediagoblin/paste_local.ini "$pkgdir"/usr/share/webapps/mediagoblin/paste_local.ini - install -Dm644 "$srcdir"/mediagoblin_local.ini "$pkgdir"/etc/webapps/mediagoblin/mediagoblin_local.ini - ln -s /etc/webapps/mediagoblin/mediagoblin_local.ini "$pkgdir"/usr/share/webapps/mediagoblin/mediagoblin_local.ini + install -Dm644 "$srcdir"/paste_local.ini "${pkgdir}"/etc/webapps/mediagoblin/paste_local.ini + ln -s /etc/webapps/mediagoblin/paste_local.ini "${pkgdir}"/usr/share/webapps/mediagoblin/paste_local.ini + install -Dm644 "$srcdir"/mediagoblin_local.ini "${pkgdir}"/etc/webapps/mediagoblin/mediagoblin_local.ini + ln -s /etc/webapps/mediagoblin/mediagoblin_local.ini "${pkgdir}"/usr/share/webapps/mediagoblin/mediagoblin_local.ini - ln -s /var/lib/mediagoblin/ "$pkgdir"/usr/share/webapps/mediagoblin/user_dev + ln -s /var/lib/mediagoblin/ "${pkgdir}"/usr/share/webapps/mediagoblin/user_dev - install -Dm644 "$srcdir"/mediagoblin-paster.service "$pkgdir"/usr/lib/systemd/system/mediagoblin-paster.service - install -Dm644 "$srcdir"/mediagoblin-celeryd.service "$pkgdir"/usr/lib/systemd/system/mediagoblin-celeryd.service - install -Dm644 "$srcdir"/mediagoblin-tmpfiles.conf "$pkgdir"/usr/lib/tmpfiles.d/mediagoblin.conf + install -Dm644 "$srcdir"/mediagoblin-paster.service "${pkgdir}"/usr/lib/systemd/system/mediagoblin-paster.service + install -Dm644 "$srcdir"/mediagoblin-celeryd.service "${pkgdir}"/usr/lib/systemd/system/mediagoblin-celeryd.service + install -Dm644 "$srcdir"/mediagoblin-tmpfiles.conf "${pkgdir}"/usr/lib/tmpfiles.d/mediagoblin.conf } diff --git a/pcr/mediatomb/PKGBUILD b/pcr/mediatomb/PKGBUILD index ecb25821a..701dd0d00 100644 --- a/pcr/mediatomb/PKGBUILD +++ b/pcr/mediatomb/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> -# Contributor (AUR): S Leduc <sebastien@sleduc.fr> -# Contributor (AUR): Martin Villagra <mvillagra0@gmail.com> -# Contributor (AUR): William Rea <sillywilly@gmail.com> -# Contributor (AUR): Nikhil Bysani <nikron@gmail.com> -# Contributor (AUR): Mika Hynnä <igheax@gmail.com> -# Contributor (AUR): Jonathan Conder <jonno.conder@gmail.com> -# Contributor (AUR): Peter Richard Lewis <plewis@aur.archlinux.org> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> +# Contributor: S Leduc <sebastien@sleduc.fr> +# Contributor: Martin Villagra <mvillagra0@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Nikhil Bysani <nikron@gmail.com> +# Contributor: Mika Hynnä <igheax@gmail.com> +# Contributor: Jonathan Conder <jonno.conder@gmail.com> +# Contributor: Peter Richard Lewis <plewis@aur.archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/mednaffe/PKGBUILD b/pcr/mednaffe/PKGBUILD index a01b07ee8..b646d8d62 100644 --- a/pcr/mednaffe/PKGBUILD +++ b/pcr/mednaffe/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Andreas Grapentin <andreas@grapentin.org> -# Maintainer (AUR): Vaporeon <vaporeon@vaporeon.io> +# Maintainer (aur): Vaporeon <vaporeon@vaporeon.io> # Contributor: Márcio Silva <coadde@hyperbola.info> -# Contributor (AUR): casa <sympho08@yandex.ru> +# Contributor: casa <sympho08@yandex.ru> pkgbase=mednaffe pkgname=('mednaffe' 'mednaffe-gtk2') diff --git a/pcr/memlockd/PKGBUILD b/pcr/memlockd/PKGBUILD index b3a1ff66f..f0324e756 100644 --- a/pcr/memlockd/PKGBUILD +++ b/pcr/memlockd/PKGBUILD @@ -1,28 +1,34 @@ +# Maintainer (aur): Giancarlo Razzolini <grazzolini@gmail.com> # Contributor: fauno <fauno@parabola.nu> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> +# Contributor: Wael Karram <wael@waelk.tech> + pkgname=memlockd -pkgver=1.1.1 +pkgver=1.3 pkgrel=1 pkgdesc="daemon that locks files into memory" arch=('i686' 'x86_64') -url="http://doc.coker.com.au/projects/memlockd/" +arch=('armv7h') +url="https://doc.coker.com.au/projects/memlockd/" license=('GPL3') depends=('glibc') -# main site doesn't announce 1.1.1 -source=(http://ftp.de.debian.org/debian/pool/main/${pkgname:0:1}/${pkgname}/${pkgname}_${pkgver}.tar.gz) -install=${pkgname}.install backup=(etc/memlockd.cfg) +install=memlockd.install +source=($pkgname-$pkgver.tar.gz::https://www.coker.com.au/$pkgname/$pkgname\_$pkgver.tar.gz +) +sha256sums=('048f7762b382f44d62242ef6d11f6adfcdf78181b08f8e1f9177bf774054cfa4') build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" install -d -m 750 "${pkgdir}/usr/lib/memlockd" "${pkgdir}/etc/memlockd.d" install -D -m 644 memlockd.8 "${pkgdir}/usr/share/man/man8/memlockd.8" install -D -m 755 memlockd "${pkgdir}/usr/bin/memlockd" install -D -m 640 memlockd.cfg "${pkgdir}/etc/memlockd.cfg" + cd debian install -D -m 644 memlockd.service "${pkgdir}/usr/lib/systemd/system/memlockd.service" } -sha512sums=('836530c7ec2ea0efbf408e53d2b4617d7154e9c7a2c88546848c2759febe9735b0c46e61ad144c37e64ab0126314bf7927bf49d373b7a8801bd899e2ab88de6c') diff --git a/pcr/mhonarc/PKGBUILD b/pcr/mhonarc/PKGBUILD index 1753b66f5..0e3780540 100644 --- a/pcr/mhonarc/PKGBUILD +++ b/pcr/mhonarc/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Chris Severance aur.severach AatT spamgourmet.com -# Contributor (AUR): Abhishek Dasgupta <abhidg@gmail.com> -# Contributor (AUR): Billy Congo <billycongo@gmail.com> -# Contributor (AUR): froggie <sullivanva@gmail.com> -# Contributor (AUR): Lukas Martini <hello@lutoma.org> +# Maintainer (aur): Chris Severance aur.severach AatT spamgourmet.com +# Contributor: Abhishek Dasgupta <abhidg@gmail.com> +# Contributor: Billy Congo <billycongo@gmail.com> +# Contributor: froggie <sullivanva@gmail.com> +# Contributor: Lukas Martini <hello@lutoma.org> # paraboal changes and rationale: # - removed superfluous set -u diff --git a/pcr/mimms/PKGBUILD b/pcr/mimms/PKGBUILD index b60f3ef72..1e5eb96ff 100644 --- a/pcr/mimms/PKGBUILD +++ b/pcr/mimms/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Maintainer (aur): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Alon Ivtsan <alonivtsan@lavabit.com> # parabola changes and rationale: diff --git a/pcr/mini18n-git/PKGBUILD b/pcr/mini18n-git/PKGBUILD index 3af0dfad8..4ed4d4cab 100644 --- a/pcr/mini18n-git/PKGBUILD +++ b/pcr/mini18n-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Gustavo alvarez <sl1pkn07@gmail.com> +# Maintainer (arch): Gustavo alvarez <sl1pkn07@gmail.com> pkgname=mini18n-git pkgver=20130213 diff --git a/pcr/minicomputer/PKGBUILD b/pcr/minicomputer/PKGBUILD index ff9bcf5dd..f344e0852 100644 --- a/pcr/minicomputer/PKGBUILD +++ b/pcr/minicomputer/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): speps <speps at aur dot archlinux dot org> -# Contributor (Arch): farid abdelnour <farid at archlinux-br.org> -# Contributor (Arch): DonVla <donvla@users.sourceforge.net> +# Maintainer (arch): speps <speps at aur dot archlinux dot org> +# Contributor: farid abdelnour <farid at archlinux-br.org> +# Contributor: DonVla <donvla@users.sourceforge.net> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=minicomputer diff --git a/pcr/minidjvu/PKGBUILD b/pcr/minidjvu/PKGBUILD index 1c1caee8e..8a289202b 100644 --- a/pcr/minidjvu/PKGBUILD +++ b/pcr/minidjvu/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Orivej Desh <masecretaire@gmx.fr> -# Maintainer (Arch): Orivej Desh <masecretaire@gmx.fr> +# Contributor: Orivej Desh <masecretaire@gmx.fr> +# Maintainer (arch): Orivej Desh <masecretaire@gmx.fr> pkgname=minidjvu pkgver=0.8 pkgrel=3 diff --git a/pcr/mkbootimg/PKGBUILD b/pcr/mkbootimg/PKGBUILD index 00ef110fd..65e51fd1a 100644 --- a/pcr/mkbootimg/PKGBUILD +++ b/pcr/mkbootimg/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: 謝致邦 <Yeking@Red54.com> # Contributor: Alucryd <alucryd at gmail dot com> -# Maintainer (AUR): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer (aur): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # parabola changes and rationale: # no changes. diff --git a/pcr/mkinitcpio-openswap/PKGBUILD b/pcr/mkinitcpio-openswap/PKGBUILD index ed985e1fd..f61a580c3 100644 --- a/pcr/mkinitcpio-openswap/PKGBUILD +++ b/pcr/mkinitcpio-openswap/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: David P. <megver83@parabola.nu> -# Maintainer (AUR): Jenya Sovetkin <e.sovetkin@gmail.com> +# Maintainer (aur): Jenya Sovetkin <e.sovetkin@gmail.com> # Contributor: Fabio Tea <https://aur.archlinux.org/account/f4bio> # NOTE: since the time that this package was taken from the AUR at verion 0.1.0, diff --git a/pcr/mkinitcpio-paralogo/PKGBUILD b/pcr/mkinitcpio-paralogo/PKGBUILD index f3d03f719..1eb0c9c7c 100644 --- a/pcr/mkinitcpio-paralogo/PKGBUILD +++ b/pcr/mkinitcpio-paralogo/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=mkinitcpio-paralogo pkgver=0.0.2 diff --git a/pcr/moblock/PKGBUILD b/pcr/moblock/PKGBUILD index e37cd31a1..fec32f4ed 100644 --- a/pcr/moblock/PKGBUILD +++ b/pcr/moblock/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Kevin Edmonds <edmondskevin@hotmail.com> -# Contributor (Arch): Filip Wojciechowski, filip at loka dot pl -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> +# Contributor: Filip Wojciechowski, filip at loka dot pl +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=moblock pkgver=0.9rc2 diff --git a/pcr/modglue/PKGBUILD b/pcr/modglue/PKGBUILD index dc370b8ab..3538f472c 100644 --- a/pcr/modglue/PKGBUILD +++ b/pcr/modglue/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Arch): Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org> +# Contributor: Dariusz 'quasi' Panchyrz <quasi@aur.archlinux.org> # Maintainer: André Silva <emulatorman@hyperbola.info> pkgname=modglue diff --git a/pcr/monkeysign/PKGBUILD b/pcr/monkeysign/PKGBUILD index f3e09852e..048a47cd4 100644 --- a/pcr/monkeysign/PKGBUILD +++ b/pcr/monkeysign/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): parazyd <parazyd AT dyne DOT org> +# Maintainer (aur): parazyd <parazyd AT dyne DOT org> # Contributor: fauno <fauno@kiwwwi.com.ar> # parabola changes and rationale: diff --git a/pcr/monkeysphere/PKGBUILD b/pcr/monkeysphere/PKGBUILD index 8b5157b67..137cf2756 100644 --- a/pcr/monkeysphere/PKGBUILD +++ b/pcr/monkeysphere/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): svalo <valo@eigenlab.org> -# Contributor (AUR): David Costa <david@zarel.net> -# Contributor (AUR): fauno <fauno@kiwwwi.com.ar> +# Maintainer (aur): svalo <valo@eigenlab.org> +# Contributor: David Costa <david@zarel.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> # Based on monkeysphere-git from -# Contributor (AUR): Olivier Mehani <shtrom-arch@ssji.net> +# Contributor: Olivier Mehani <shtrom-arch@ssji.net> # parabola changes and rationale: # no changes. diff --git a/pcr/mozilla-addon-sdk/PKGBUILD b/pcr/mozilla-addon-sdk/PKGBUILD index 979c357b3..c6b38fd10 100644 --- a/pcr/mozilla-addon-sdk/PKGBUILD +++ b/pcr/mozilla-addon-sdk/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Johannes Dewender <arch@JonnyJD.net> -# Contributor (AUR): trashstar +# Contributor: Johannes Dewender <arch@JonnyJD.net> +# Contributor: trashstar # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # parabola changes and rationale: diff --git a/pcr/mpdscribble/PKGBUILD b/pcr/mpdscribble/PKGBUILD index f4260327c..120a5c3fe 100644 --- a/pcr/mpdscribble/PKGBUILD +++ b/pcr/mpdscribble/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): jason ryan <jasonwryan@gmail.com> -# Contributor (AUR): Bartłomiej Piotrowski <nospam@bpiotrowwski.pl> -# Contributor (AUR): Thomas Dziedzic < gostrc at gmail > -# Contributor (AUR): evr <evanroman at gmail> -# Contributor (AUR): Luiz Ribeiro <luizribeiro@gmail.com> +# Maintainer (aur): jason ryan <jasonwryan@gmail.com> +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowwski.pl> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: evr <evanroman at gmail> +# Contributor: Luiz Ribeiro <luizribeiro@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/mrrescue/PKGBUILD b/pcr/mrrescue/PKGBUILD index 427ab22b7..4f05779b6 100644 --- a/pcr/mrrescue/PKGBUILD +++ b/pcr/mrrescue/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Ainola -# Contributors (Arch): Pio, carstene1ns, MCMic +# Maintainer (arch): Ainola +# Contributor: Pio, carstene1ns, MCMic pkgname=mrrescue pkgver=1.02e diff --git a/pcr/msdl/PKGBUILD b/pcr/msdl/PKGBUILD index 06443e105..974fbf877 100644 --- a/pcr/msdl/PKGBUILD +++ b/pcr/msdl/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Nathan Owe ndowens04 at gmail dot com -# Contributor (Arch): noonov <noonov@gmail.com> +# Contributor: Nathan Owe ndowens04 at gmail dot com +# Contributor: noonov <noonov@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=msdl diff --git a/pcr/multiwatch/PKGBUILD b/pcr/multiwatch/PKGBUILD index 0bf698bbc..a36d737af 100644 --- a/pcr/multiwatch/PKGBUILD +++ b/pcr/multiwatch/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Paul Dann <pdgiddie at gmail dot com> +# Maintainer (arch): Paul Dann <pdgiddie at gmail dot com> pkgname=multiwatch pkgver='1.0.0' pkgrel=1 diff --git a/pcr/mx44/PKGBUILD b/pcr/mx44/PKGBUILD index df3708f26..6b0c23126 100644 --- a/pcr/mx44/PKGBUILD +++ b/pcr/mx44/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): David Adler <david dot jo dot adler at gmail dot com> +# Maintainer (arch): David Adler <david dot jo dot adler at gmail dot com> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=mx44 _pkgname=Mx44 diff --git a/pcr/mycron-git/PKGBUILD b/pcr/mycron-git/PKGBUILD index 8c6fc3581..74326b9a3 100644 --- a/pcr/mycron-git/PKGBUILD +++ b/pcr/mycron-git/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (AUR): Dirk Sohler <spam@0x7be.de> -# Maintainer (AUR): Dirk Sohler <spam@0x7be.de> -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Dirk Sohler <spam@0x7be.de> +# Maintainer (aur): Dirk Sohler <spam@0x7be.de> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/naev/PKGBUILD b/pcr/naev/PKGBUILD index 210d0fa4f..2a2287a43 100644 --- a/pcr/naev/PKGBUILD +++ b/pcr/naev/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor (Arch): Johan Rehnberg <cleanrock@gmail.com> +# Maintainer (arch): Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Johan Rehnberg <cleanrock@gmail.com> # This package is in Parabola only for architectures that don't have xonotic in # their feed. Here is the status of xonotic in the various upstream # GNU/Linux distributions Parabola is based on: diff --git a/pcr/nagios-nrpe-plugin/PKGBUILD b/pcr/nagios-nrpe-plugin/PKGBUILD index 7ac0af99c..78ce4848d 100644 --- a/pcr/nagios-nrpe-plugin/PKGBUILD +++ b/pcr/nagios-nrpe-plugin/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (Arch): Mark Grimes <mgrimes at peculier dot com> +# Contributor: Mark Grimes <mgrimes at peculier dot com> # https://github.com/mvgrimes/aur-nagios-npre-plugin -# Contributor (Arch): Idares <idares@seznam.cz> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Contributor: Idares <idares@seznam.cz> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=nagios-nrpe-plugin pkgver=2.15 diff --git a/pcr/nagios-plugins/PKGBUILD b/pcr/nagios-plugins/PKGBUILD index a0d2cfd67..c29648963 100644 --- a/pcr/nagios-plugins/PKGBUILD +++ b/pcr/nagios-plugins/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Idares <idares@seznam.cz> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Contributor: Idares <idares@seznam.cz> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=nagios-plugins pkgver=2.0.3 diff --git a/pcr/nagios/PKGBUILD b/pcr/nagios/PKGBUILD index a889aceb7..2e3e97fc0 100644 --- a/pcr/nagios/PKGBUILD +++ b/pcr/nagios/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Idares <idares@seznam.cz> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Idares <idares@seznam.cz> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=nagios pkgver=4.0.8 diff --git a/pcr/ncdc/PKGBUILD b/pcr/ncdc/PKGBUILD index 200e8c007..5ae5c71af 100644 --- a/pcr/ncdc/PKGBUILD +++ b/pcr/ncdc/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Robert Holt <holt.r94 at gmail dot com> -# Contributor (AUR): Anton Larionov <diffident dot cat at gmail dot com> -# Contributor (AUR): Yorhel <projects@yorhel.nl> -# Contributor (AUR): archtux <antonio.arias99999@gmail.com> +# Maintainer (aur): Robert Holt <holt.r94 at gmail dot com> +# Contributor: Anton Larionov <diffident dot cat at gmail dot com> +# Contributor: Yorhel <projects@yorhel.nl> +# Contributor: archtux <antonio.arias99999@gmail.com> # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 # parabola changes and rationale: diff --git a/pcr/ncmatrix/PKGBUILD b/pcr/ncmatrix/PKGBUILD index 398d679e8..1ed2799ab 100644 --- a/pcr/ncmatrix/PKGBUILD +++ b/pcr/ncmatrix/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Aka <aka@worstofevils.net> -# Contributor (Arch): Erus <erus.iluvatar@gmail.com> -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Contributor: Aka <aka@worstofevils.net> +# Contributor: Erus <erus.iluvatar@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=ncmatrix pkgver=1.0 diff --git a/pcr/ndoutils/PKGBUILD b/pcr/ndoutils/PKGBUILD index 405f4b20f..a823c09d2 100644 --- a/pcr/ndoutils/PKGBUILD +++ b/pcr/ndoutils/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Muhkoenig -# Contributor (Arch): MisterG <mathieu.grzybek at gmail dot com> +# Maintainer (arch): Muhkoenig +# Contributor: MisterG <mathieu.grzybek at gmail dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=ndoutils diff --git a/pcr/neo6502/PKGBUILD b/pcr/neo6502/PKGBUILD new file mode 100644 index 000000000..91cc96cd9 --- /dev/null +++ b/pcr/neo6502/PKGBUILD @@ -0,0 +1,113 @@ +# Maintainer: bill-auger <bill-auger@programmer.net> + + +pkgbase=neo6502 +pkgname=(neo6502-docs neo6502-emulator neo6502-firmware) +_upstream_name=neo6502-firmware +pkgver=0.16.5 +_pico_sdk_ver=1.5.1 +_tinyusb_ver=0.16.0 +_picodvi_rev=a248d72b8cc95a08b43ef4307cd954eb801272b2 # no stable release available +_pico_fatfs_ver=1.0.8 +pkgrel=1 +pkgdesc="Emulator and firmware for the Neo6502 retro-computer" +arch=(x86_64) # armv7h i686 are both lacking some makedepends +license=(custom:MIT) +url=http://www.neo6502.com/ + +depends=() +makedepends=(64tass arm-none-eabi-gcc arm-none-eabi-newlib cmake + python-gitpython python-pillow sdl2 zip) +makedepends+=(pandoc texlive-latex texlive-latexextra texlive-latexrecommended) +source=(neo6502-firmware-${pkgver}.tar.gz::https://github.com/paulscottrobson/${_upstream_name}/archive/refs/tags/v${pkgver}.tar.gz + pico-sdk-${_pico_sdk_ver}.tar.gz::https://github.com/raspberrypi/pico-sdk/archive/refs/tags/${_pico_sdk_ver}.tar.gz + tinyusb-${_tinyusb_ver}.tar.gz::https://github.com/hathach/tinyusb/archive/refs/tags/${_tinyusb_ver}.tar.gz + PicoDVI-${_picodvi_rev}.tar.gz::https://github.com/Wren6991/PicoDVI/archive/${_picodvi_rev}.tar.gz + pico_fatfs-${_pico_fatfs_ver}.tar.gz::https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico/archive/refs/tags/v${_pico_fatfs_ver}.tar.gz) +source+=(separate_emulators.patch) +source+=(offline_build.patch) # includes dep_checks.patch +source+=(no_harmless_exit_fails.patch) +sha256sums=('efea50fc3355ed98e6faf20ed48a6ae5ac2012181cbfeabbf2efd476dcc61dbe' + '95f5e522be3919e36a47975ffd3b208c38880c14468bd489ac672cfe3cec803c' + '5b24ed6d7732d07bb25a2013b3ad65fdb8752da3e9faac6372ff0574b26a0447' + 'efd85ffe21335004f8ebfe6d07c2a6482c4dd96bc6f0132fa4adb21464845a88' + '68ffa9f157b94df969d3bc34f32acb4d4fdf2bdf5391952cf242fec20f53b0b8') +sha256sums+=(4b20bfc8c5098a8e9c3d2a9ba8f1be26a70026ae418f86526d90deeeb4f5a7b3) +sha256sums+=(5ebdea1d7dc5eb534b4fbecc1f70a193e6354506cffbfaf97829bdb494fff953) +sha256sums+=(e8d3d24dae1fdc502180f4f79f931689569c7ea08ed7f9dba5270af4ed28f24d) + + +prepare() +{ + cd "${srcdir}"/pico-sdk-${_pico_sdk_ver} + + # configure cross-compiler for pico firmware + sed -i 's|ARM_TOOLCHAIN_COMMON_FLAGS "|& -march=armv6-m -mtune=cortex-m0plus -fcf-protection=none -fstack-check=generic -fno-stack-clash-protection |' cmake/preload/toolchains/pico_arm_gcc.cmake + + + cd "${srcdir}"/${_upstream_name}-${pkgver} + + # avoid building the windows emulator + echo "applying separate_emulators.patch" + patch -Np1 < "${srcdir}"/separate_emulators.patch + + # avoid downloading sources at build-time + echo "applying offline_build.patch" + patch -Np1 < "${srcdir}"/offline_build.patch + + # prevent exit failure when sourcing cvimg.py + echo "applying no_harmless_exit_fails.patch" + patch -Np1 < "${srcdir}"/no_harmless_exit_fails.patch +} + +build() +{ + cd "${srcdir}"/${_upstream_name}-${pkgver} + + # avoid downloading sources at build-time + export PICO_SDK_FETCH_FROM_GIT=OFF + export PICO_SDK_PATH="${srcdir}"/pico-sdk-${_pico_sdk_ver} + export PICO_TINYUSB_PATH="${srcdir}"/tinyusb-${_tinyusb_ver} + export PICO_DVI_PATH="${srcdir}"/PicoDVI-${_picodvi_rev} + export PICO_FATFS_PATH="${srcdir}"/no-OS-FatFS-SD-SPI-RPi-Pico-${_pico_fatfs_ver} + + make firmware + make linux +} + +package_neo6502-docs() +{ + pkgdesc="Documentation for the Neo6502 retro-computer" + cd "${srcdir}"/${_upstream_name}-${pkgver} + + install -Dm644 documents/release/*.odt -t "${pkgdir}"/usr/share/doc/${pkgbase}/ + install -Dm644 documents/release/*.pdf -t "${pkgdir}"/usr/share/doc/${pkgbase}/ + install -Dm644 documents/*.pdf -t "${pkgdir}"/usr/share/doc/${pkgbase}/ + install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgbase}/ +} + +package_neo6502-emulator() +{ + pkgdesc="Emulator for the Neo6502 retro-computer" + optdepends=("neo6502-docs: Neo6502 documentation") + + cd "${srcdir}"/${_upstream_name}-${pkgver} + + install -Dm755 bin/neo "${pkgdir}"/usr/bin/neo + install -Dm644 bin/*.zip -t "${pkgdir}"/usr/share/${pkgbase}/utils/ + install -d "${pkgdir}"/usr/share/${pkgbase}/examples/ + cp -a examples/{assembly,basic,C} "${pkgdir}"/usr/share/${pkgbase}/examples/ + chmod -R 644 "${pkgdir}"/usr/share/${pkgbase}/examples/ + install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgbase}/ +} + +package_neo6502-firmware() +{ + pkgdesc="Firmware for the Neo6502 retro-computer" + optdepends=("neo6502-docs: Neo6502 documentation") + + cd "${srcdir}"/${_upstream_name}-${pkgver} + + install -Dm644 bin/*.bin -t "${pkgdir}"/usr/share/${pkgbase}/firmware/ + install -Dm644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgbase}/ +} diff --git a/pcr/neo6502/no_harmless_exit_fails.patch b/pcr/neo6502/no_harmless_exit_fails.patch new file mode 100644 index 000000000..c7971c76a --- /dev/null +++ b/pcr/neo6502/no_harmless_exit_fails.patch @@ -0,0 +1,13 @@ +diff --git a/basic/images/cvimg.py b/basic/images/cvimg.py +index e0eb1125..d82ce95f 100644 +--- a/basic/images/cvimg.py ++++ b/basic/images/cvimg.py +@@ -15,7 +15,7 @@ from gfxtext import * + if len(sys.argv) != 3: + print("python cvimg.zip <graphics file> <text file>") + print("python cvimg.zip <text file> <graphics file> ") +- sys.exit(1) ++ sys.exit(0) + + if sys.argv[1].endswith(".gfx"): + GraphicsConvert().toText(sys.argv[1],sys.argv[2]) diff --git a/pcr/neo6502/offline_build.patch b/pcr/neo6502/offline_build.patch new file mode 100644 index 000000000..64cb6dac5 --- /dev/null +++ b/pcr/neo6502/offline_build.patch @@ -0,0 +1,180 @@ +diff --git a/Makefile b/Makefile +index 31797203..6e3cc6bc 100644 +--- a/Makefile ++++ b/Makefile +@@ -22,7 +22,7 @@ endif + # + # *************************************************************************************** + +-all: ++all: firmware-deps emulator-deps-nix emulator-deps-win docs-deps + $(CMAKEDIR) bin + $(CMAKEDIR) release + $(MAKE) -B -C kernel release +@@ -39,7 +39,7 @@ all: + # + # *************************************************************************************** + +-firmware: ++firmware: firmware-deps + $(CMAKEDIR) bin + $(MAKE) -B -C kernel release + $(MAKE) -B -C basic release +@@ -52,7 +52,8 @@ firmware: + # + # *************************************************************************************** + +-windows: ++windows: firmware-deps emulator-deps-nix emulator-deps-win ++ @echo building windows emulator + $(CMAKEDIR) bin + $(MAKE) -B -C kernel + $(MAKE) -B -C basic release +@@ -60,7 +61,8 @@ windows: + $(MAKE) -B -C emulator ewindows + $(MAKE) -B -C examples release + +-linux: ++linux: firmware-deps emulator-deps-nix ++ @echo building nix emulator + $(CMAKEDIR) bin + $(MAKE) -B -C kernel + $(MAKE) -B -C basic release +@@ -73,6 +75,38 @@ macos: + make -B -C examples release + + ++# *************************************************************************************** ++# ++# Verify that dependencies are installed ++# ++# *************************************************************************************** ++ ++firmware-deps: ++ @echo checking for firmware dependencies: ++ @cmake --version ++ @g++ --version ++ @arm-none-eabi-g++ --version ++ @# NOTE: this is not accounting for 'arm-none-eabi-newlib' ++ ++emulator-deps-win: ++ @x86_64-w64-mingw32-g++ --version ++ ++emulator-deps-nix: ++ @echo checking for emulator dependencies: ++ @cmake --version ++ @64tass --version ++ @sdl2-config --version ++ @zip --version ++ @python3 --version ++ @python -c 'from importlib.metadata import version ; pkg="gitpython" ; print("python-%s: %s" % (pkg , version(pkg)))' ++ @python -c 'from importlib.metadata import version ; pkg="pillow" ; print("python-%s: %s" % (pkg , version(pkg)))' ++ ++docs-deps: ++ @pandoc --version ++ @pdflatex --version ++ @# NOTE: this is not accounting for the needed latex plugins ++ ++ + # *************************************************************************************** + # + # Clean everything +diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt +index a347acf4..f91da786 100644 +--- a/firmware/CMakeLists.txt ++++ b/firmware/CMakeLists.txt +@@ -3,19 +3,28 @@ cmake_minimum_required(VERSION 3.14) + set(CMAKE_C_STANDARD 11) + set(CMAKE_CXX_STANDARD 17) + +-set(PICO_SDK_FETCH_FROM_GIT on) ++ ++if(NOT DEFINED ENV{PICO_SDK_FETCH_FROM_GIT}) ++ set(PICO_SDK_FETCH_FROM_GIT on) ++ message("Defaulting PICO_SDK_FETCH_FROM_GIT") ++endif() + include(pico_sdk_import.cmake) + + project(firmware C CXX ASM) + + include(FetchContent) + +-FetchContent_Declare( +- tinyusb +- GIT_REPOSITORY https://github.com/hathach/tinyusb.git +- GIT_TAG 0.16.0 +-) +-FetchContent_MakeAvailable(tinyusb) ++# if((NOT DEFINED ENV{PICO_TINYUSB_FETCH_FROM_GIT}) OR ENV{PICO_TINYUSB_FETCH_FROM_GIT}) ++if(DEFINED ENV{PICO_TINYUSB_PATH}) ++ set(tinyusb_SOURCE_DIR $ENV{PICO_TINYUSB_PATH}) ++else() ++ FetchContent_Declare( ++ tinyusb ++ GIT_REPOSITORY https://github.com/hathach/tinyusb.git ++ GIT_TAG 0.16.0 ++ ) ++ FetchContent_MakeAvailable(tinyusb) ++endif() + set(PICO_TINYUSB_PATH ${tinyusb_SOURCE_DIR}) + + pico_sdk_init() +@@ -34,13 +43,17 @@ include_directories( + common/include + ) + +-FetchContent_Declare( +- PicoDVI +- GIT_REPOSITORY https://github.com/Wren6991/PicoDVI +- GIT_TAG a248d72b8cc95a08b43ef4307cd954eb801272b2 # just the latest on 11/12/2023 +-) +-FetchContent_MakeAvailable(PicoDVI) +- ++if(DEFINED ENV{PICO_DVI_PATH}) ++ set(picodvi_SOURCE_DIR $ENV{PICO_DVI_PATH}) ++ set(picodvi_BINARY_DIR "_deps/picodvi-build") ++else() ++ FetchContent_Declare( ++ PicoDVI ++ GIT_REPOSITORY https://github.com/Wren6991/PicoDVI ++ GIT_TAG a248d72b8cc95a08b43ef4307cd954eb801272b2 # just the latest on 11/12/2023 ++ ) ++ FetchContent_MakeAvailable(PicoDVI) ++endif() + add_subdirectory(${picodvi_SOURCE_DIR}/software/libdvi ${picodvi_BINARY_DIR}) + + add_library(fatfs INTERFACE) +@@ -54,4 +67,4 @@ target_include_directories(fatfs INTERFACE ${tinyusb_SOURCE_DIR}/lib/fatfs/sourc + add_subdirectory(sources) + + pico_enable_stdio_usb(firmware 0) +-pico_enable_stdio_uart(firmware 0) +\ No newline at end of file ++pico_enable_stdio_uart(firmware 0) +diff --git a/firmware/sources/CMakeLists.txt b/firmware/sources/CMakeLists.txt +index a767fc49..a3ea8fcd 100644 +--- a/firmware/sources/CMakeLists.txt ++++ b/firmware/sources/CMakeLists.txt +@@ -1,11 +1,16 @@ + add_executable(firmware) + +-FetchContent_Declare( +- no-OS-FatFS-SD-SPI-RPi-Pico +- GIT_REPOSITORY https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico.git +- GIT_TAG bbccc5d2deea09e128e2576ef35f72b473c5ba5f # just the latest on 30/01/2024 +-) +-FetchContent_MakeAvailable(no-OS-FatFS-SD-SPI-RPi-Pico) ++if (DEFINED ENV{PICO_FATFS_PATH}) ++ set(no-os-fatfs-sd-spi-rpi-pico_SOURCE_DIR $ENV{PICO_FATFS_PATH}) ++ set(no-os-fatfs-sd-spi-rpi-pico_BINARY_DIR "_deps/no-os-fatfs-sd-spi-rpi-pico-build") ++else() ++ FetchContent_Declare( ++ no-OS-FatFS-SD-SPI-RPi-Pico ++ GIT_REPOSITORY https://github.com/carlk3/no-OS-FatFS-SD-SPI-RPi-Pico.git ++ GIT_TAG bbccc5d2deea09e128e2576ef35f72b473c5ba5f # just the latest on 30/01/2024 ++ ) ++ FetchContent_MakeAvailable(no-OS-FatFS-SD-SPI-RPi-Pico) ++endif() + + pico_generate_pio_header(firmware ${CMAKE_CURRENT_LIST_DIR}/system/sm0_memory_emulation_with_clock.pio) + diff --git a/pcr/neo6502/separate_emulators.patch b/pcr/neo6502/separate_emulators.patch new file mode 100644 index 000000000..bd1b41bde --- /dev/null +++ b/pcr/neo6502/separate_emulators.patch @@ -0,0 +1,49 @@ +diff --git a/Makefile b/Makefile +index 4ab01f69..f99b0202 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,7 +35,20 @@ all: + + # *************************************************************************************** + # +-# Make windows & linux versions ++# Make firmware only ++# ++# *************************************************************************************** ++ ++firmware: ++ $(CMAKEDIR) bin ++ $(MAKE) -B -C kernel release ++ $(MAKE) -B -C basic release ++ $(MAKE) -B -C firmware release ++ ++ ++# *************************************************************************************** ++# ++# Make emulator only + # + # *************************************************************************************** + +@@ -45,6 +58,8 @@ windows: + $(MAKE) -B -C basic release + $(MAKE) -B -C emulator clean + $(MAKE) -B -C emulator ewindows ++ $(MAKE) -B -C examples release ++ $(MAKE) -B -C release documentation + + linux: + $(CMAKEDIR) bin +@@ -52,9 +67,13 @@ linux: + $(MAKE) -B -C basic release + $(MAKE) -B -C emulator clean + $(MAKE) -B -C emulator elinux ++ $(MAKE) -B -C examples release ++ $(MAKE) -B -C release documentation + + macos: + make -B -C emulator emacos ++ make -B -C examples release ++ $(MAKE) -B -C release documentation + + + # *************************************************************************************** diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index 6f4bafa34..520ff84fb 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Denis Yantarev <denis dot yantarev at gmail dot com> -# Contributor (Arch): SJ_UnderWater -# Contributor (Arch): Dominik Dingel <mail at wodar dot de> -# Contributor (Arch): William Udovich <nerdzrule7 at earthlink dot net> -# Contributor (Arch): Farhan Yousaf <farhany at xaviya dot com> +# Maintainer (arch): Denis Yantarev <denis dot yantarev at gmail dot com> +# Contributor: SJ_UnderWater +# Contributor: Dominik Dingel <mail at wodar dot de> +# Contributor: William Udovich <nerdzrule7 at earthlink dot net> +# Contributor: Farhan Yousaf <farhany at xaviya dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=netatalk diff --git a/pcr/netcat6/PKGBUILD b/pcr/netcat6/PKGBUILD index c39e0444d..dfcbfce0c 100644 --- a/pcr/netcat6/PKGBUILD +++ b/pcr/netcat6/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Aurelien Desbrieres <aurelien@hackers.camp> -# Maintainer (Arch): <kfgz at interia dot pl> -# Contributor (Arch): Elmo Todurov <todurov at gmail dot com> -# Contributor (Arch): henning mueller <henning at orgizm dot net> +# Contributor: Aurélien Desbrières <aurelien@hackers.camp> +# Contributor: <kfgz at interia dot pl> +# Contributor: Elmo Todurov <todurov at gmail dot com> +# Contributor: henning mueller <henning at orgizm dot net> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=netcat6 diff --git a/pcr/netifrc/PKGBUILD b/pcr/netifrc/PKGBUILD deleted file mode 100644 index dedb469eb..000000000 --- a/pcr/netifrc/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer (Manjaro): artoo <artoo@manjaro.org> -# Contributor (Manjaro): williamh <williamh@gentoo.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -# Contributor: Luke Shumaker <lukeshu@parabola.nu> - -# Gentoo's ebuild file: -# https://gitweb.gentoo.org/repo/gentoo.git/tree/net-misc/netifrc/netifrc-0.6.1.ebuild -pkgname=netifrc -pkgver=0.6.1 -pkgrel=1 -pkgdesc="Gentoo Network Interface Management Scripts" -arch=('any') -url="https://wiki.gentoo.org/wiki/Netifrc" -license=('BSD2') -groups=('base-openrc') -depends=('gentoo-functions' 'openrc>=0.15' 'udev-init-scripts') -conflicts=('udev<172' 'udev-init-scripts<27') -makedepends=('git') -backup=('etc/conf.d/net') -validpgpkeys=('A28BEDE08F1744E16037514806C4536755758000') # Jason A. Donenfeld <zx2c4@gentoo.org> -source=("git://anongit.gentoo.org/proj/${pkgname}.git?signed#tag=${pkgver}") -sha256sums=('SKIP') - -_makeargs=( - SYSCONFDIR=/etc - PREFIX=/usr - SBINDIR=/usr/bin - LIBEXECDIR="/usr/lib/${pkgname}" -) - -build(){ - cd "$srcdir/$pkgname" - make "${_makeargs[@]}" -} - -package() { - cd "$srcdir/$pkgname" - - make DESTDIR="$pkgdir" "${_makeargs[@]}" install - - install -Dm0644 doc/net.example "$pkgdir/etc/conf.d/net" - - install -d "$pkgdir/etc/runlevels/boot" - ln -sT "/etc/init.d/net.lo" "$pkgdir/etc/runlevels/boot/net.lo" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/pcr/networkmanager-elogind/PKGBUILD b/pcr/networkmanager-elogind/PKGBUILD deleted file mode 100644 index f85f4fabd..000000000 --- a/pcr/networkmanager-elogind/PKGBUILD +++ /dev/null @@ -1,173 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Maintainer: Jan de Groot <jgc@archlinxu.org> -# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor: Tor Krill <tor@krill.nu> -# Contributor: Will Rea <sillywilly@gmail.com> -# Contributor: Valentine Sinitsyn <e_val@inbox.ru> - -_pppver=2.4.7 - -pkgname=networkmanager-elogind -pkgver=1.10.6 -pkgrel=1 -pkgdesc="Network Management daemon" -arch=('i686' 'x86_64' 'armv7h') -license=('GPL2' 'LGPL2.1') -url="http://www.gnome.org/projects/NetworkManager/" -provides=('networkmanager') -conflicts=('networkmanager' 'networkmanager-consolekit') -replaces=('networkmanager-consolekit') -makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager - dbus-glib iproute2 nss polkit-elogind wpa_supplicant curl elogind libmm-glib - libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs - glib2-docs dhcpcd eudev-systemd) # modemmanager and libmbim depend on 'systemd' -checkdepends=('libx11' 'python-dbus') -depends=(libnm-glib iproute2 polkit-elogind wpa_supplicant libmm-glib libnewt libndp libteam curl - bluez-libs elogind) -optdepends=('dnsmasq: connection sharing' - 'bluez: Bluetooth support' - 'openresolv: resolvconf support' - 'ppp: dialup connection support' - 'rp-pppoe: ADSL support' - 'dhclient: External DHCP client' - 'modemmanager: cellular network support' - 'networkmanager-openrc: networkmanager initscript') -backup=('etc/NetworkManager/NetworkManager.conf') -_commit=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712 # tags/1.10.6^0 -source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit") -sha512sums=('SKIP') - -prepare() { - mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}} - - cd NetworkManager - git cherry-pick -n 4d1f090aedf05c0e2955d431638e311d1e18a52f - NOCONFIGURE=1 ./autogen.sh -} - -pkgver() { - cd NetworkManager - git describe | sed 's/-dev/dev/;s/-/+/g' -} - -build() { - cd NetworkManager - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - runstatedir=/run \ - --sbindir=/usr/bin \ - --libexecdir=/usr/lib \ - --disable-ifcfg-rh \ - --disable-ifcfg-suse \ - --disable-ifnet \ - --disable-ifupdown \ - --disable-lto \ - --disable-more-logging \ - --disable-more-warnings \ - --disable-static \ - --enable-bluez5-dun \ - --enable-concheck \ - --enable-config-plugin-ibft \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-json-validation \ - --enable-ld-gc \ - --enable-modify-system \ - --enable-polkit \ - --enable-polkit-agent \ - --enable-teamdctl \ - --enable-wifi \ - --with-config-dhcp-default=internal \ - --with-config-dns-rc-manager-default=symlink \ - --with-config-logging-backend-default=journal \ - --with-config-plugins-default=keyfile,ibft \ - --with-crypto=nss \ - --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ - --with-dhclient=/usr/bin/dhclient \ - --with-dhcpcd-supports-ipv6 \ - --with-dhcpcd=/usr/bin/dhcpcd \ - --with-dist-version="$pkgver-$pkgrel, Artix Linux" \ - --with-dnsmasq=/usr/bin/dnsmasq \ - --with-dnssec-trigger=/usr/lib/dnssec-trigger/dnssec-trigger-script \ - --with-hostname-persist=default \ - --with-iptables=/usr/bin/iptables \ - --with-kernel-firmware-dir=/usr/lib/firmware \ - --with-libnm-glib \ - --with-modem-manager-1 \ - --with-nmcli \ - --with-nmtui \ - --with-pppd-plugin-dir=/usr/lib/pppd/$_pppver \ - --with-pppd=/usr/bin/pppd \ - --with-resolvconf=/usr/bin/resolvconf \ - --with-session-tracking=elogind \ - --with-suspend-resume=elogind \ - --with-system-ca-path=/etc/ssl/certs \ - --without-systemd-journal \ - --without-systemd-logind \ - --with-systemdsystemunitdir=no \ - --with-udev-dir=/usr/lib/udev \ - --with-wext \ - --without-consolekit \ - --without-libaudit \ - --without-more-asserts \ - --without-netconfig \ - --without-ofono \ - --without-selinux - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd NetworkManager - make -k check || : -} - -package() { - cd NetworkManager - make DESTDIR="$pkgdir" install - - # packaged configuration - install -Dm644 /dev/stdin "$pkgdir/usr/lib/NetworkManager/conf.d/20-connectivity.conf" <<END -[connectivity] -uri=http://www.archlinux.org/check_network_status.txt -END - - # /etc/NetworkManager - install -d "$pkgdir"/etc/NetworkManager/{conf,dnsmasq}.d - install -dm700 "$pkgdir/etc/NetworkManager/system-connections" - install -m644 /dev/stdin "$pkgdir/etc/NetworkManager/NetworkManager.conf" <<END -# Configuration file for NetworkManager. -# See "man 5 NetworkManager.conf" for details. -END - - ### rm libnm - - cd ../libnm - rm -rv "$pkgdir"/usr/include/libnm - rm -rv "$pkgdir"/usr/lib/girepository-1.0/NM-* - rm -rv "$pkgdir"/usr/lib/libnm.* usr/lib - rm -rv "$pkgdir"/usr/lib/pkgconfig/libnm.pc - rm -rv "$pkgdir"/usr/share/gir-1.0/NM-* - rm -rv "$pkgdir"/usr/share/gtk-doc/html/libnm - rm -rv "$pkgdir"/usr/share/vala/vapi/libnm.* - - ### rm libnm-glib - - cd ../libnm-glib - rm -rv "$pkgdir"/usr/include/* - rm -rv "$pkgdir"/usr/lib/girepository-1.0/* - rm -rv "$pkgdir"/usr/lib/libnm-* - rm -rv "$pkgdir"/usr/lib/pkgconfig/* - rm -rv "$pkgdir"/usr/share/gir-1.0/* - rm -rv "$pkgdir"/usr/share/gtk-doc/html/libnm-* - rm -rv "$pkgdir"/usr/share/vala/vapi/* - - rmdir -p --ignore-fail-on-non-empty \ - "$pkgdir"/usr/include \ - "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} \ - "$pkgdir"/usr/share/{gir-1.0,vala/vapi} -} diff --git a/pcr/networkmanager-openswan/PKGBUILD b/pcr/networkmanager-openswan/PKGBUILD index e074d1c10..c8aa0dffb 100644 --- a/pcr/networkmanager-openswan/PKGBUILD +++ b/pcr/networkmanager-openswan/PKGBUILD @@ -1,4 +1,4 @@ -# Contributor (Arch): Marti Raudsepp <marti@juffo.org> +# Contributor: Marti Raudsepp <marti@juffo.org> # Maintainer: fauno <fauno@parabola.nu> pkgname=networkmanager-openswan diff --git a/pcr/nevow/PKGBUILD b/pcr/nevow/PKGBUILD index d00a770fc..e1a5bd63b 100644 --- a/pcr/nevow/PKGBUILD +++ b/pcr/nevow/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Nicolas Pouillard <nicolas.pouillard@gmail.com> +# Maintainer (aur): Nicolas Pouillard <nicolas.pouillard@gmail.com> # Contributor: Peter Simons <simons@cryp.to> # Maintainer: Freemor <freemor@freemor.ca> diff --git a/pcr/newtonator/PKGBUILD b/pcr/newtonator/PKGBUILD index 9fea50c41..81072943d 100644 --- a/pcr/newtonator/PKGBUILD +++ b/pcr/newtonator/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): speps <speps at aur dot archlinux dot org> +# Maintainer (arch): speps <speps at aur dot archlinux dot org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=newtonator diff --git a/pcr/nginx-passenger/PKGBUILD b/pcr/nginx-passenger/PKGBUILD index 7b7d7bc2f..9f0d5f59d 100644 --- a/pcr/nginx-passenger/PKGBUILD +++ b/pcr/nginx-passenger/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): Tom Richards <tom@tomrichards.net> -# Maintainer (Arch:nginx): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Maintainer (Arch:nginx): Sébastien Luttringer -# Contributor (Arch:nginx): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch:nginx): Miroslaw Szot <mss@czlug.icis.pcz.pl> -# Contributor (Arch:nginx): Daniel Micay <danielmicay@gmail.com> +# Maintainer (aur): Tom Richards <tom@tomrichards.net> +# Maintainer (arch:nginx): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Maintainer (arch:nginx): Sébastien Luttringer +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> +# Contributor: Daniel Micay <danielmicay@gmail.com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> _nginxver=1.12.1 diff --git a/pcr/nicotine/PKGBUILD b/pcr/nicotine/PKGBUILD index c167011fb..0a3ee06ac 100644 --- a/pcr/nicotine/PKGBUILD +++ b/pcr/nicotine/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Antonio Rojas <nqn1976 @ gmail.com> -# Contributor (Arch): Alexander Rødseth <rodseth@gmail.com> -# Contributor (Arch): Angel Velasquez <angvp@archlinux.org> -# Contributor (Arch): Hugo Doria <hugo@archlinux.org> -# Contributor (Arch): Andrew Wright <andreww@photism.org> +# Maintainer (arch): Antonio Rojas <nqn1976 @ gmail.com> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Hugo Doria <hugo@archlinux.org> +# Contributor: Andrew Wright <andreww@photism.org> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=nicotine diff --git a/pcr/ninja-open/PKGBUILD b/pcr/ninja-open/PKGBUILD index e60317478..830de05f7 100644 --- a/pcr/ninja-open/PKGBUILD +++ b/pcr/ninja-open/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): Aurelien Desbrieres <aurelien@hackers.camp> -# Contributor (Arch): Alexander Rdseth <rodseth@gmail.com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: Aurélien Desbrières <aurelien@hackers.camp> +# Contributor: Alexander Rdseth <rodseth@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=ninja-open pkgver=0.7 diff --git a/pcr/nitroshare/PKGBUILD b/pcr/nitroshare/PKGBUILD index f0dc552a4..9fc6ee26c 100644 --- a/pcr/nitroshare/PKGBUILD +++ b/pcr/nitroshare/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Sid Karunaratne <sid at karunaratne dot net> -# Contributor (AUR): Nathan Osman <nathan at quickmediasolutions dot com> -# Contributor (AUR): BlackEagle <ike.devolder@gmail.com> +# Maintainer (aur): Sid Karunaratne <sid at karunaratne dot net> +# Contributor: Nathan Osman <nathan at quickmediasolutions dot com> +# Contributor: BlackEagle <ike.devolder@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/nodejs-bower/PKGBUILD b/pcr/nodejs-bower/PKGBUILD index d5ce155ed..31fc272ac 100644 --- a/pcr/nodejs-bower/PKGBUILD +++ b/pcr/nodejs-bower/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - using a common nodejs packaging scheme diff --git a/pcr/nodejs-semver-utils/PKGBUILD b/pcr/nodejs-semver-utils/PKGBUILD index a37d3f8b7..e48050662 100644 --- a/pcr/nodejs-semver-utils/PKGBUILD +++ b/pcr/nodejs-semver-utils/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - using a common nodejs packaging scheme diff --git a/pcr/noip/PKGBUILD b/pcr/noip/PKGBUILD index bc5a851e8..6dbc7eabd 100644 --- a/pcr/noip/PKGBUILD +++ b/pcr/noip/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Runnytu < runnytu at gmail dot com > -# Contributor (Arch): Alexander Rødseth <rodseth@gmail.com> -# Contributor (Arch): Daenyth -# Contributor (Arch): Lyle Putnam <lcputnam@amerytel.net> +# Maintainer (arch): Runnytu < runnytu at gmail dot com > +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Daenyth +# Contributor: Lyle Putnam <lcputnam@amerytel.net> pkgname=noip pkgver=2.1.9 diff --git a/pcr/noisy-git/PKGBUILD b/pcr/noisy-git/PKGBUILD new file mode 100644 index 000000000..298c90da8 --- /dev/null +++ b/pcr/noisy-git/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer (aur): Łaurent ʘ❢Ŧ Ŧough <laurent dot fough at gmail dot com> + +# derived (very loosely) from 'noisy-py3-git' + +# parabola changes and rationale: +# * build for arch=any +# * build from source-ball instead of VCS +# upstream has no releases; but the script has not changed since 2018 +# * simplified sed commands +# * do not install GPL and other useless files +# * install README to docs/ + + +pkgname=noisy-git +pkgver=20180908 +pkgrel=1 +pkgdesc="Simple random DNS, HTTP/S internet traffic noise generator" +arch=(any) +url=https://github.com/1tayH/noisy +license=(GPL3) + +_gitver=c21e7682d5626d96d0f6ee56a5ed749078d34aac +depends=(python-requests) +source=(noisy-${pkgver}.zip::https://github.com/1tayH/noisy/archive/${_gitver}.zip) + +sha256sums=('1d23778579bb6c0d4ee2063bbc3bb8114426dc350a43b80a5cd086c7381031b9') + + +prepare() +{ + cd "${srcdir}"/noisy-${_gitver} + + sed -i 's|User=noisy|DynamicUser=yes|' examples/systemd/noisy.service + sed -i 's|/opt/noisy/noisy.py|/usr/bin/noisy.py|' examples/systemd/noisy.service + sed -i 's|/opt/noisy|/usr/share/noisy|g' examples/systemd/noisy.service + + # add missing shebang + sed -i '0,/.*/ s|\(.*\)|#!/usr/bin/env python\n\n\1|' noisy.py +} + +package() +{ + cd "${srcdir}"/noisy-${_gitver} + + install -Dm755 noisy.py "${pkgdir}"/usr/bin/noisy.py + install -Dm644 examples/systemd/noisy.service "${pkgdir}"/usr/lib/systemd/system/noisy.service + install -Dm644 README.md "${pkgdir}"/usr/share/doc/noisy/README.md + install -Dm644 config.json "${pkgdir}"/usr/share/noisy/config.json +} diff --git a/pcr/note/PKGBUILD b/pcr/note/PKGBUILD index f81249b36..e82ce2d5f 100644 --- a/pcr/note/PKGBUILD +++ b/pcr/note/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch) : David Pflug <Viaken@Gmail.com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: David Pflug <Viaken@Gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _author=TLINDEN _perlmod=note diff --git a/pcr/nouvegnomegray-icon-theme/PKGBUILD b/pcr/nouvegnomegray-icon-theme/PKGBUILD index 85ec1f5d1..6487bd194 100644 --- a/pcr/nouvegnomegray-icon-theme/PKGBUILD +++ b/pcr/nouvegnomegray-icon-theme/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): 3V0LU710N <db_eee at yahoo dot com> +# Maintainer (arch): 3V0LU710N <db_eee at yahoo dot com> pkgname=nouvegnomegray-icon-theme pkgver=20140821 diff --git a/pcr/obfs4proxy/PKGBUILD b/pcr/obfs4proxy/PKGBUILD new file mode 100644 index 000000000..063925ea1 --- /dev/null +++ b/pcr/obfs4proxy/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer (aur): mutantmonkey <aur@mutantmonkey.in> +# Contributor: shyokou <shyokou at gmail dot com> +# Contributor: FzerorubigD <Fzerorubigd {AT} GMail {DOT} com> + +# parabola changes and rationale: +# no changes. + +pkgname=obfs4proxy +pkgver=0.0.14 +pkgrel=1 +pkgdesc='The obfourscator - a pluggable transport proxy written in Go' +arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64') +url='https://gitlab.com/yawning/obfs4' +license=('BSD') +makedepends=('git' 'go') +optdepends=('tor: you need tor to use this package') +source=("https://gitlab.com/yawning/obfs4/-/archive/obfs4proxy-${pkgver}/obfs4-obfs4proxy-${pkgver}.tar.bz2") +sha512sums=('a720d45250140e3ba02b176d84fd80cca55304c09d5cebbd0fda45a3f5cfd7c2e8ffb6a2588a7b98a2ce03854969b0b1f949dca0405b16de29e90842861657c1') + +build() { + export GOPATH="$srcdir" + export CGO_CPPFLAGS="${CPPFLAGS}" + export CGO_CFLAGS="${CFLAGS}" + export CGO_CXXFLAGS="${CXXFLAGS}" + export CGO_LDFLAGS="${LDFLAGS}" + export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw" + + cd "${srcdir}/obfs4-obfs4proxy-${pkgver}" + GOPATH="${srcdir}/go" go build -o obfs4proxy/obfs4proxy ./obfs4proxy +} + +package() { + cd "${srcdir}/obfs4-obfs4proxy-${pkgver}" + install -Dm0755 obfs4proxy/obfs4proxy "${pkgdir}/usr/bin/obfs4proxy" + install -Dm0644 doc/obfs4proxy.1 "${pkgdir}/usr/share/man/man1/obfs4proxy.1" + install -Dm0644 ChangeLog "${pkgdir}/usr/share/doc/${pkgname}/ChangeLog" + install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +## vim:set ts=2 sw=2 et: diff --git a/pcr/obmenu-generator/PKGBUILD b/pcr/obmenu-generator/PKGBUILD index 7a511c39c..43c912416 100644 --- a/pcr/obmenu-generator/PKGBUILD +++ b/pcr/obmenu-generator/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Maintainer (Arch): Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> +# Maintainer (arch): Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> pkgname=obmenu-generator pkgver=0.85 diff --git a/pcr/ocaml-base/PKGBUILD b/pcr/ocaml-base/PKGBUILD index b8b5581cc..3e049ef96 100644 --- a/pcr/ocaml-base/PKGBUILD +++ b/pcr/ocaml-base/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-base pkgver=0.11.1 diff --git a/pcr/ocaml-camomile/PKGBUILD b/pcr/ocaml-camomile/PKGBUILD index ee776a930..416753e2c 100644 --- a/pcr/ocaml-camomile/PKGBUILD +++ b/pcr/ocaml-camomile/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): robertfoster -# Contributor (AUR): Marek Kubica <marek@xivilization.net> -# Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com> +# Maintainer (aur): robertfoster +# Contributor: Marek Kubica <marek@xivilization.net> +# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com> # Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=ocaml-camomile diff --git a/pcr/ocaml-curl/PKGBUILD b/pcr/ocaml-curl/PKGBUILD index 10854827b..9bc6393ee 100644 --- a/pcr/ocaml-curl/PKGBUILD +++ b/pcr/ocaml-curl/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (AUR) : Eric Bailey <nerflad@gmail.com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=ocaml-curl pkgver=0.8.2 diff --git a/pcr/ocaml-extlib/PKGBUILD b/pcr/ocaml-extlib/PKGBUILD index 76111009a..4aa580382 100644 --- a/pcr/ocaml-extlib/PKGBUILD +++ b/pcr/ocaml-extlib/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Yen Chi Hsuan < yan12125 at gmail dot com > -# Contributor (AUR): lesebas < sebdeligny at gmail dot com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Yen Chi Hsuan < yan12125 at gmail dot com > +# Contributor: lesebas < sebdeligny at gmail dot com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=ocaml-extlib pkgver=1.7.5 diff --git a/pcr/ocaml-lwt/PKGBUILD b/pcr/ocaml-lwt/PKGBUILD index 5c64a7018..b798fcebf 100644 --- a/pcr/ocaml-lwt/PKGBUILD +++ b/pcr/ocaml-lwt/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> -# Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com> -# Contributor (AUR): Sergei Lebedev <superbobry@gmail.com -# Contributor (AUR): serp <serp256 at gmail dot com> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> +# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com> +# Contributor: Sergei Lebedev <superbobry@gmail.com +# Contributor: serp <serp256 at gmail dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/ocaml-migrate-parsetree/PKGBUILD b/pcr/ocaml-migrate-parsetree/PKGBUILD index 6b151963e..bd1f5c7db 100644 --- a/pcr/ocaml-migrate-parsetree/PKGBUILD +++ b/pcr/ocaml-migrate-parsetree/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-migrate-parsetree pkgver=1.1.0 diff --git a/pcr/ocaml-ounit/PKGBUILD b/pcr/ocaml-ounit/PKGBUILD index 8f7f32d01..050e5a8f9 100644 --- a/pcr/ocaml-ounit/PKGBUILD +++ b/pcr/ocaml-ounit/PKGBUILD @@ -1,12 +1,12 @@ -# Maintainer (AUR): Eric Bailey <nerflad@gmail.com> -# Contributor (AUR): Marek Kubica <marek@xivilization.net> -# Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com> -# Contributor (AUR): Sergei Lebedev <superbobry@gmail.com> -# Contributor (AUR): Thomas S Hatch <thatch45 at gmail dot com> -# Contributor (AUR): Sebastian Wiesner <lunaryorn googlemail com> -# Contributor (AUR): Benjamin Andresen <benny(at)klapmuetz(dot)org> -# Contributor (AUR): Sylvester Johansson <syljo361(at)gmail(dot)org> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Eric Bailey <nerflad@gmail.com> +# Contributor: Marek Kubica <marek@xivilization.net> +# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com> +# Contributor: Sergei Lebedev <superbobry@gmail.com> +# Contributor: Thomas S Hatch <thatch45 at gmail dot com> +# Contributor: Sebastian Wiesner <lunaryorn googlemail com> +# Contributor: Benjamin Andresen <benny(at)klapmuetz(dot)org> +# Contributor: Sylvester Johansson <syljo361(at)gmail(dot)org> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=ocaml-ounit _pkgname=ounit diff --git a/pcr/ocaml-pcre/PKGBUILD b/pcr/ocaml-pcre/PKGBUILD index e44cdaa3c..d73ab4740 100644 --- a/pcr/ocaml-pcre/PKGBUILD +++ b/pcr/ocaml-pcre/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR: Jakob Gahde <j5lx@fmail.co.uk> -# Contributor (AUR): Leonard de Ruijter <leonard@aur.archlinux.org> -# Contributor (Arch): Serge Zirukin <ftrvxmtrx@gmail.com> -# Contributor (Arch): Sergei Lebedev <superbobry@gmail.com> -# Contributor (Arch): Magnus Therning <magnus@therning.org> -# Maintainer : Parabola GNU / Linux-libre <aurelien@cwb.io> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> +# Contributor: Leonard de Ruijter <leonard@aur.archlinux.org> +# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com> +# Contributor: Sergei Lebedev <superbobry@gmail.com> +# Contributor: Magnus Therning <magnus@therning.org> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # parabola changes and rationale: # no changes. diff --git a/pcr/ocaml-react/PKGBUILD b/pcr/ocaml-react/PKGBUILD index f58b34626..917209b6a 100644 --- a/pcr/ocaml-react/PKGBUILD +++ b/pcr/ocaml-react/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> -# Contributor (AUR): Serge Zirukin <ftrvxmtrx@gmail.com> -# Contributor (AUR): Sergei Lebedev <superbobry@gmail.com> -# Contributor (AUR): serp <serp 256 at gmail dot com> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> +# Contributor: Serge Zirukin <ftrvxmtrx@gmail.com> +# Contributor: Sergei Lebedev <superbobry@gmail.com> +# Contributor: serp <serp 256 at gmail dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/ocaml-sexplib0/PKGBUILD b/pcr/ocaml-sexplib0/PKGBUILD index d17fdfd22..7c675e9b3 100644 --- a/pcr/ocaml-sexplib0/PKGBUILD +++ b/pcr/ocaml-sexplib0/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> pkgname=ocaml-sexplib0 pkgver=0.11.0 diff --git a/pcr/ocaml-ssl/PKGBUILD b/pcr/ocaml-ssl/PKGBUILD index 60ffb4855..d150c9770 100644 --- a/pcr/ocaml-ssl/PKGBUILD +++ b/pcr/ocaml-ssl/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): robertfoster -# Contributor (AUR): Sigmund Vestergaard <sigmundv at gmail dot com> -# Contributor (AUR): Denis Wernert <denis@wernert.info> -# Contributor (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Maintainer (aur): robertfoster +# Contributor: Sigmund Vestergaard <sigmundv at gmail dot com> +# Contributor: Denis Wernert <denis@wernert.info> +# Contributor: Jakob Gahde <j5lx@fmail.co.uk> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/ocaml-xmlm/PKGBUILD b/pcr/ocaml-xmlm/PKGBUILD index f10414c57..a84d54f3a 100644 --- a/pcr/ocaml-xmlm/PKGBUILD +++ b/pcr/ocaml-xmlm/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer (AUR) : Jakob Gahde <j5lx@fmail.co.uk> -# Contributor (AUR) : Leonard de Ruijter <leonard@aur.archlinux.org> -# Contributor (AUR) : charlesthehawk -- yahoo -- com -# Contributor (AUR) : Gregory BELLIER <gregory.bellier -- gmail -- com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Leonard de Ruijter <leonard@aur.archlinux.org> +# Contributor: charlesthehawk -- yahoo -- com +# Contributor: Gregory BELLIER <gregory.bellier -- gmail -- com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=xmlm pkgname=ocaml-${_pkgname} diff --git a/pcr/ocp/PKGBUILD b/pcr/ocp/PKGBUILD index 59c38a052..a0a7f6cc1 100644 --- a/pcr/ocp/PKGBUILD +++ b/pcr/ocp/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org> -# Contributor (AUR): berkus [berkus_at_madfire_dot_net] +# Maintainer (aur): Mikael Eriksson <mikael_eriksson@miffe.org> +# Contributor: berkus [berkus_at_madfire_dot_net] pkgname=ocp pkgver=0.1.21 diff --git a/pcr/ocrodjvu/PKGBUILD b/pcr/ocrodjvu/PKGBUILD index c5c51941f..d2ccffc0f 100644 --- a/pcr/ocrodjvu/PKGBUILD +++ b/pcr/ocrodjvu/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Dmitry Kharitonov <darksab0r@gmail.com> -# Contributor (AUR): Francois Garillot <francois[@]garillot.net> -# Contributor (AUR): Malkov Fyodor aka krox: iksut@yandex.ru +# Maintainer (aur): Dmitry Kharitonov <darksab0r@gmail.com> +# Contributor: Francois Garillot <francois[@]garillot.net> +# Contributor: Malkov Fyodor aka krox: iksut@yandex.ru # parabola changes and rationale: # no changes. diff --git a/pcr/octave-communications/PKGBUILD b/pcr/octave-communications/PKGBUILD index 7fe453892..e0d0d69e8 100644 --- a/pcr/octave-communications/PKGBUILD +++ b/pcr/octave-communications/PKGBUILD @@ -1,5 +1,5 @@ # -# Maintainer (Arch): Clemens Buchacher <drizzd@aon.at> +# Maintainer (arch): Clemens Buchacher <drizzd@aon.at> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # You can use the newpkg script from diff --git a/pcr/octave-control/PKGBUILD b/pcr/octave-control/PKGBUILD index 4306d73b2..8c1fb1900 100644 --- a/pcr/octave-control/PKGBUILD +++ b/pcr/octave-control/PKGBUILD @@ -1,5 +1,5 @@ # -# Maintainer (Arch): Clemens Buchacher <drizzd@aon.at> +# Maintainer (arch): Clemens Buchacher <drizzd@aon.at> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # You can use the newpkg script from diff --git a/pcr/octave-general/PKGBUILD b/pcr/octave-general/PKGBUILD index 690981d14..14b9ce34c 100644 --- a/pcr/octave-general/PKGBUILD +++ b/pcr/octave-general/PKGBUILD @@ -1,5 +1,5 @@ # -# Maintainer (Arch): Clemens Buchacher <drizzd@aon.at> +# Maintainer (arch): Clemens Buchacher <drizzd@aon.at> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # You can use the newpkg script from diff --git a/pcr/octave-image/PKGBUILD b/pcr/octave-image/PKGBUILD index 379da8858..a000513fe 100644 --- a/pcr/octave-image/PKGBUILD +++ b/pcr/octave-image/PKGBUILD @@ -1,7 +1,7 @@ # -# Contributor (Arch): Philipp Brüschweiler <blei42 gmail com> -# Contributor (Arch): Ng Oon-Ee <ngoonee.talk@gmail.com> -# Maintainer (Arch): Clemens Buchacher <drizzd@aon.at> +# Contributor: Philipp Brüschweiler <blei42 gmail com> +# Contributor: Ng Oon-Ee <ngoonee.talk@gmail.com> +# Maintainer (arch): Clemens Buchacher <drizzd@aon.at> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # You can use the newpkg script from diff --git a/pcr/octave-signal/PKGBUILD b/pcr/octave-signal/PKGBUILD index 431d640ce..6e67885a6 100644 --- a/pcr/octave-signal/PKGBUILD +++ b/pcr/octave-signal/PKGBUILD @@ -1,5 +1,5 @@ # -# Maintainer (Arch): Clemens Buchacher <drizzd@aon.at> +# Maintainer (arch): Clemens Buchacher <drizzd@aon.at> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # # You can use the newpkg script from diff --git a/pcr/octopi/PKGBUILD b/pcr/octopi/PKGBUILD index 632650c63..067e1764f 100644 --- a/pcr/octopi/PKGBUILD +++ b/pcr/octopi/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> -# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer (hyperbola): André Silva <emulatorman@hyperbola.info> +# Contributor: Márcio Silva <coadde@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=octopi -pkgver=0.10.0 -pkgrel=2 -pkgrel+=.parabola3 +pkgver=0.12.0 +pkgrel=1 +pkgrel+=.parabola1 pkgdesc="A powerful Pacman frontend using Qt5 libs, without nonfree pacaur, pikaur, trizen and yay recommendation" arch=('x86_64') arch+=('i686' 'armv7h') @@ -21,7 +21,7 @@ conflicts=('octopi-cachecleaner' 'octopi-notifier' 'octopi-repoeditor' 'octopi-git' 'octopi-kde-git') source=("octopi-${pkgver}.tar.gz::https://github.com/aarnt/octopi/archive/v${pkgver}.tar.gz" 'octopi-repoeditor.desktop') -sha256sums=('7e4d484816fa0f1356e783a612ae54cbaf9627c5f848c19ed85d69ce288b0904' +sha256sums=('b679a3822d3060dfe5a4fd2ba68b50b4db6d7bf0e68197ca330ee9cb66e2b0c5' '131f16745df685430db55e54ede6da66aed9b02ca00d6d873a002b2a3e1c90ef') _subdirs=(helper repoeditor cachecleaner sudo notifier) @@ -59,8 +59,4 @@ package() { done install -D -m644 "$srcdir"/octopi-repoeditor.desktop "$pkgdir"/usr/share/applications/octopi-repoeditor.desktop - - #speedup files - install -D -m755 speedup/speedup-octopi.sh "$pkgdir"/usr/bin/speedup-octopi.sh - install -D -m644 speedup/octopi.service "$pkgdir"/usr/lib/systemd/system/octopi.service } diff --git a/pcr/odamex/PKGBUILD b/pcr/odamex/PKGBUILD index fa4a9e49e..38c754879 100644 --- a/pcr/odamex/PKGBUILD +++ b/pcr/odamex/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Mikael Eriksson <mikael_eriksson@miffe.org> -# Contributor (AUR): Pol Marcet Sardà <polmarcetsarda@gmail.com> -# Contributor (AUR): Thomas Dziedzic < gostrc at gmail > -# Contributor (AUR): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> -# Contributor (AUR): Curtis Smith <kman922002@gmail.com> +# Maintainer (aur): Mikael Eriksson <mikael_eriksson@miffe.org> +# Contributor: Pol Marcet Sardà <polmarcetsarda@gmail.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> +# Contributor: Curtis Smith <kman922002@gmail.com> pkgname=odamex pkgver=0.8.3 diff --git a/pcr/oggfwd/PKGBUILD b/pcr/oggfwd/PKGBUILD index 35c2af0ad..d029d0a64 100644 --- a/pcr/oggfwd/PKGBUILD +++ b/pcr/oggfwd/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): farid abdelnour < farid at atelier-labs.org> -# Contributor (Arch): Evan Purkhiser <evanpurkhiser@gmail.com> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: farid abdelnour < farid at atelier-labs.org> +# Contributor: Evan Purkhiser <evanpurkhiser@gmail.com> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=oggfwd pkgver=0.2 diff --git a/pcr/olsrd/PKGBUILD b/pcr/olsrd/PKGBUILD index c0ac8170e..143be34a6 100644 --- a/pcr/olsrd/PKGBUILD +++ b/pcr/olsrd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Nimrod Maclomair <nimrod4garoa at gmail dot com> +# Maintainer (aur): Nimrod Maclomair <nimrod4garoa at gmail dot com> # parabola changes and rationale: # - renamed tarball to avoid collisions diff --git a/pcr/omap-u-boot-utils-git/PKGBUILD b/pcr/omap-u-boot-utils-git/PKGBUILD index 964f4304c..3599a9b78 100644 --- a/pcr/omap-u-boot-utils-git/PKGBUILD +++ b/pcr/omap-u-boot-utils-git/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=omap-u-boot-utils-git _pkgname=omap-u-boot-utils diff --git a/pcr/omap-usb-boot/PKGBUILD b/pcr/omap-usb-boot/PKGBUILD index 482356ef6..27a8002e2 100644 --- a/pcr/omap-usb-boot/PKGBUILD +++ b/pcr/omap-usb-boot/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # Parabola changes and rationale: # no changes. diff --git a/pcr/onioncat/PKGBUILD b/pcr/onioncat/PKGBUILD index 735d2a6e1..61877456f 100644 --- a/pcr/onioncat/PKGBUILD +++ b/pcr/onioncat/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): revel <revelΘmuub·net> -# Contributor (AUR): jwwolf <jwwolf+arch@gmail.com> +# Maintainer (aur): revel <revelΘmuub·net> +# Contributor: jwwolf <jwwolf+arch@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/openchange/PKGBUILD b/pcr/openchange/PKGBUILD index ea84ecd57..df37db84a 100644 --- a/pcr/openchange/PKGBUILD +++ b/pcr/openchange/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Michael Hansen <zrax0111 gmail com> -# Maintainer (Arch): DJ Lucas <dj_AT_linuxfromscratch_DOT_org> -# Contributor (Arch): ngoonee <ngoonee.talk@gmail.com> -# Contributor (Arch): Adam Russell <adamlr6+arch@gmail.com> +# Maintainer (arch): Michael Hansen <zrax0111 gmail com> +# Maintainer (arch): DJ Lucas <dj_AT_linuxfromscratch_DOT_org> +# Contributor: ngoonee <ngoonee.talk@gmail.com> +# Contributor: Adam Russell <adamlr6+arch@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=openchange _codename=VULCAN diff --git a/pcr/opendnssec/PKGBUILD b/pcr/opendnssec/PKGBUILD index f2f1326de..0c174d431 100644 --- a/pcr/opendnssec/PKGBUILD +++ b/pcr/opendnssec/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com> +# Maintainer (arch): Javier Torres <javitonino [at] gmail [dot] com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=opendnssec diff --git a/pcr/openfoam/PKGBUILD b/pcr/openfoam/PKGBUILD index 65f07025a..b7eebfb3f 100644 --- a/pcr/openfoam/PKGBUILD +++ b/pcr/openfoam/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Jingbei Li <i@jingbei.li> -# Contributor (AUR): Xwang <xwaang1976@gmail.com> -# Contributor (AUR): George Eleftheriou <eleftg> -# Contributor (AUR): Andrew Fischer <andrew_at_apastron.co> +# Maintainer (aur): Jingbei Li <i@jingbei.li> +# Contributor: Xwang <xwaang1976@gmail.com> +# Contributor: George Eleftheriou <eleftg> +# Contributor: Andrew Fischer <andrew_at_apastron.co> # Contributor: bill-auger <bill-auger@programmer.net> # parabola changes and rationale: diff --git a/pcr/openrc-accessible/PKGBUILD b/pcr/openrc-accessible/PKGBUILD index 6df3cb93f..837b0dc6e 100644 --- a/pcr/openrc-accessible/PKGBUILD +++ b/pcr/openrc-accessible/PKGBUILD @@ -1,13 +1,8 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> +# Maintainer (artix): artoo <artoo@cromnix.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _url="https://raw.githubusercontent.com/gentoo/gentoo/master" -_sed_args=(-e 's|/var/run|/run|g') -prefix=true - -$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') - pkgbase=openrc-accessible pkgname=('brltty-openrc' 'espeakup-openrc') @@ -32,8 +27,6 @@ pkgver() { _inst_initd(){ install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 } _inst_confd(){ diff --git a/pcr/openrc-base/PKGBUILD b/pcr/openrc-base/PKGBUILD deleted file mode 100644 index 5cdf5c3cf..000000000 --- a/pcr/openrc-base/PKGBUILD +++ /dev/null @@ -1,274 +0,0 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -pkgver=20170927 -_commit=0783bd6eb14f40386abf1ca4c6b6ef30b68ae11b -_url="https://raw.githubusercontent.com/gentoo/gentoo/${_commit}" - -_sed_args=(-e 's|/var/run|/run|g') -prefix=true - -$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') - -pkgbase=openrc-base -pkgname=('cronie-openrc' - 'cryptsetup-openrc' - 'dbus-openrc' - 'device-mapper-openrc' - 'dhcpcd-openrc' - 'glibc-openrc' - 'inetutils-openrc' - 'lvm2-openrc' - 'mdadm-openrc' - 'nfs-utils-openrc' - 'quota-tools-openrc' - 'rpcbind-openrc' - 'syslog-ng-openrc') -pkgrel=3 -pkgdesc="OpenRC init scripts" -arch=('any') -url="https://github.com/artix-linux" -license=('GPL2') -groups=('base-openrc') -conflicts=('systemd-sysvcompat') -source=("cronie.initd::${_url}/sys-process/cronie/files/cronie-1.3-initd" - "dmcrypt.confd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.confd" - "dmcrypt.initd::${_url}/sys-fs/cryptsetup/files/1.6.7-dmcrypt.rc" - "dbus.initd::${_url}/sys-apps/dbus/files/dbus.initd-r1" - "device-mapper.confd::${_url}/sys-fs/lvm2/files/device-mapper.conf-1.02.22-r3" - "device-mapper.initd::${_url}/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2" - "dmeventd.initd::${_url}/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1" - "dhcpcd.initd::${_url}/net-misc/dhcpcd/files/dhcpcd.initd" - "nscd.initd::${_url}/sys-libs/glibc/files/nscd" - 'ftpd.confd' - 'ftpd.initd' - "lvm.confd::${_url}/sys-fs/lvm2/files/lvm.confd-2.02.28-r2" - "lvm.initd::${_url}/sys-fs/lvm2/files/lvm.rc-2.02.172" - "lvm-monitoring.initd::${_url}/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2" - "lvmetad.initd::${_url}/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3" -# "lvmlockd.initd::${_url}/sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1" - "mdadm.confd::${_url}/sys-fs/mdadm/files/mdadm.confd" - "mdadm.initd::${_url}/sys-fs/mdadm/files/mdadm.rc" - "mdraid.confd::${_url}/sys-fs/mdadm/files/mdraid.confd" - "mdraid.initd::${_url}/sys-fs/mdadm/files/mdraid.rc" - "nfs.confd::${_url}/net-fs/nfs-utils/files/nfs.confd" - "nfs.initd::${_url}/net-fs/nfs-utils/files/nfs.initd" - "nfsclient.confd::${_url}/net-fs/nfs-utils/files/nfsclient.confd" - "nfsclient.initd::${_url}/net-fs/nfs-utils/files/nfsclient.initd" - "rpc.idmapd.initd::${_url}/net-fs/nfs-utils/files/rpc.idmapd.initd" - "rpc.pipefs.initd::${_url}/net-fs/nfs-utils/files/rpc.pipefs.initd" - "rpc.gssd.initd::${_url}/net-fs/nfs-utils/files/rpc.gssd.initd" - "rpc.svcgssd.initd::${_url}/net-fs/nfs-utils/files/rpc.svcgssd.initd" - "rpc.statd.initd::${_url}/net-fs/nfs-utils/files/rpc.statd.initd" - "quota.confd::${_url}/sys-fs/quota/files/quota.confd" - "quota.initd::${_url}/sys-fs/quota/files/quota.rc7" - "rpc.rquotad.initd::${_url}/sys-fs/quota/files/rpc.rquotad.initd" -# "rpcbind.confd::${_url}/net-nds/rpcbind/files/rpcbind.confd" - "rpcbind.initd::${_url}/net-nds/rpcbind/files/rpcbind.initd" - "syslog-ng.confd::${_url}/app-admin/syslog-ng/files/3.7/syslog-ng.confd" - "syslog-ng.initd::${_url}/app-admin/syslog-ng/files/3.7/syslog-ng.rc6") -sha256sums=('8646ff964892eeb5f6c5da444a5ef5d898fb1f3a395c5b9fc85d32d8d56fc785' - '3d933a54abe62a547294b83208dbf5d7615d9c7f380d6504c91fff3620530803' - 'd04627e1a64e4d86e957b20ff6f478fb376833b7602098a708af9c070e30a980' - '00a1a8f254d4f40b6f98a2777809b9c45ad81c4aeb4c0592793dd839777990bd' - '57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22' - 'e8bfde63341f9e6136ee20a15ed9ea455e2259dbcaea756f8c3d0f710c1c2746' - '5edaaad292d4fd6b67fd5323636dd2e839be33ae16fbc7872dadb0499fcf22da' - '6bb9b8b0075e45e63e898ed043f3c5951dc3e95c1fa62d22cc6e0616c792ecd1' - '13391343bfc64379c696b4bfc1cfe8d7fbb2886f477265343fddf448d82deabf' - '59fe1aa68c43f4958afc397a0d6b35da263a20fcdb457005123a0d64cb1f7477' - '925c1531fd447792a4b2031473057c16bf6cf77486f11aa7f6e50d69f838e2d7' - '28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844' - '499fae740d7740895842e2a6db8736272ceacf2d4b6f57f00a8ff91b7993d1da' - '42847d8e6dabbcf2cc19846c6ad22cbab65e9a033c4add569b152504b16ab477' - 'e7f17004d505eae5d8a2fb336b22f1cdb20bb2ecf85a98daf2485bb4b0d4ff12' - 'ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79' - '5b859ba14b7a4a350c0a8afe6edb352e0db9920bdf1e05315ffbbfb92f201584' - 'b489ced10391d4295bb8ca29e128b0d4217c290f1b4e37b05f5a9275048d289d' - '31e7ba4174f38c05e939aa56fab8a43a3e371ba9e503e029887c99fed7a28331' - 'c652a4fe8a43dc68a818345db2b3acc560663b5b6c969324d4f23afb0fb96a94' - '247456e845e70badb44d9155b68e5f76d502361769e4332a9d1bd6345f85fbfa' - 'e8842fca856eae598fb8fe15ed8d3cef13e61851217be66b8cc4087af8cee8ad' - '56973f5c8196b4227114d94a1d3c8c95518be5a02c6b5dc97da243d0b6086843' - 'dc21ce6ba28f45eb450d5d0dbe7e5ea706b1547c8bece4ddb6836a5433427bd6' - '04102bff9b13d2e7c4e30603e7c98fe412d5f6c907a37dcea95f420f153c29ae' - '83c318a7502718a3e1693869297b95db1c32270b37d45b26b2bc151ec06f3c08' - '272905335a7c82034c6bac007bd4477aae21d8ce49e82355c48301db771ba77e' - '6f3d93442db0c17436547a16155e0d61dd5cd17f49fd3a642a9a5de833411d51' - '00d1dfb3b893db5d6a213a4edda622c7d64dcafa40b3019f15e070c164286632' - '2a4dc1f695a881d0715e6220dad54b3690d98bf26b618b0fe6cb4ab26823e047' - 'ef7eec0fd1921f786580169628c9cc7af82c73d0b2cf420fba0e87f8fd428651' - 'da992f87b5043e22dfd340b4a5440b76dce29cc14d3ef7b0ce586726fe4b220b' - 'b29325498ee3b1f3d63672efcd1e93f0745eecdb9f4bb05fed82a2f085399484' - '5c4ad3406fc885555883de0537614034de181d783bcb1e864bff6299ac6c1356') - - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_cronie-openrc() { - pkgdesc="OpenRC cronie init script" - depends=('openrc' 'cronie') - provides=('openrc-cron') - conflicts=('fcron' 'fcron-openrc' 'systemd-sysvcompat') - backup=('etc/init.d/cronie') - - _inst_initd 'cronie' - - sed -e 's|/usr/sbin|/usr/bin|g' -i ${pkgdir}/etc/init.d/cronie -} - -package_cryptsetup-openrc() { - pkgdesc="OpenRC cryptsetup init script" - depends=('device-mapper-openrc' 'cryptsetup') - backup=('etc/conf.d/dmcrypt') - - _inst_confd 'dmcrypt' - _inst_initd 'dmcrypt' - - sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dmcrypt" -} - -package_dbus-openrc() { - pkgdesc="OpenRC dbus init script" - depends=('openrc' 'dbus-elogind') - - _inst_initd 'dbus' - - sed -e 's|dbus.pid|dbus/pid|g' -i "${pkgdir}/etc/init.d/dbus" -} - -package_device-mapper-openrc() { - pkgdesc="OpenRC device-mapper init script" - depends=('device-mapper' 'eudev-openrc') - backup=('etc/conf.d/device-mapper') - - _inst_confd 'device-mapper' - _inst_initd 'device-mapper' - _inst_initd 'dmeventd' - - for f in ${pkgdir}/etc/init.d/*; do - sed -e 's|/sbin|/usr/bin|g' -i $f - done -} - -package_dhcpcd-openrc() { - pkgdesc="OpenRC dhcpcd init script" - depends=('openrc' 'dhcpcd') - - _inst_initd 'dhcpcd' - - sed -e 's|/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/dhcpcd" -} - -package_glibc-openrc() { - pkgdesc="OpenRC nscd init script" - depends=('openrc' 'glibc') - - _inst_initd 'nscd' - - sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/nscd" -} - -package_inetutils-openrc() { - pkgdesc="OpenRC ftpd init script" - depends=('openrc' 'inetutils') - backup=('etc/conf.d/ftpd') - - _inst_confd 'ftpd' - _inst_initd 'ftpd' -} - -package_lvm2-openrc() { - pkgdesc="OpenRC lvm2 init script" - depends=('device-mapper-openrc' 'lvm2') - backup=('etc/conf.d/lvm') - - _inst_confd 'lvm' - - for f in lvm lvm-monitoring lvmetad; do - _inst_initd "$f" - done - - for f in ${pkgdir}/etc/init.d/*; do - sed -e 's|/sbin|/usr/bin|g' -i $f - done - - sed -e 's|/proc/self/fd/0|vgs|g' -i ${pkgdir}/etc/init.d/lvm -} - -package_mdadm-openrc() { - pkgdesc="OpenRC mdadm init script" - depends=('openrc' 'mdadm') - backup=('etc/conf.d/mdadm') - - for f in mdadm mdraid;do - _inst_confd $f - _inst_initd $f - done -} - -package_nfs-utils-openrc() { - pkgdesc="OpenRC nfs-utils init script" - depends=('nfs-utils' 'rpcbind-openrc' 'device-mapper-openrc') - backup=('etc/conf.d/nfs' - 'etc/conf.d/nfsclient') - - for f in nfs nfsclient;do - _inst_confd $f - _inst_initd $f - done - - for f in rpc.gssd rpc.idmapd rpc.pipefs rpc.statd rpc.svcgssd;do - _inst_initd $f - done - - for f in ${pkgdir}/etc/init.d/*;do - sed -e 's|/usr/sbin|/usr/bin|g' -i $f - done -} - -package_quota-tools-openrc() { - pkgdesc="OpenRC quota-tools init script" - depends=('quota-tools' 'rpcbind-openrc') - backup=('etc/conf.d/quota') - - _inst_confd 'quota' - _inst_initd 'quota' - _inst_initd 'rpc.rquotad' - - for f in ${pkgdir}/etc/init.d/*;do - sed -e 's|/usr/sbin|/usr/bin|g' -i $f - done -} - -package_rpcbind-openrc() { - pkgdesc="OpenRC rpcbind init script" - depends=('openrc' 'rpcbind') -# backup=('etc/conf.d/rpcbind') - -# _inst_confd 'rpcbind' - _inst_initd 'rpcbind' - - sed -e 's|/sbin|/usr/bin|g' \ - -e 's|RPCBIND_OPTS|RPCBIND_ARGS|' \ - -i "${pkgdir}/etc/init.d/rpcbind" -} - -package_syslog-ng-openrc() { - pkgdesc="OpenRC syslog-ng init script" - depends=('openrc' 'syslog-ng') - backup=('etc/conf.d/syslog-ng') - - _inst_confd 'syslog-ng' - _inst_initd 'syslog-ng' - - sed -e 's|/usr/sbin|/usr/bin|g' -i "${pkgdir}/etc/init.d/syslog-ng" -} diff --git a/pcr/openrc-base/ftpd.confd b/pcr/openrc-base/ftpd.confd deleted file mode 100644 index df58eab46..000000000 --- a/pcr/openrc-base/ftpd.confd +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters to be passed to ftpd -# -FTPD_ARGS="-D" - -# Neeed for openrc newnet -#current openrc4arch packages are compiled with oldnet -#rc_need=\"!net\" diff --git a/pcr/openrc-base/ftpd.initd b/pcr/openrc-base/ftpd.initd deleted file mode 100644 index 41be2d5ce..000000000 --- a/pcr/openrc-base/ftpd.initd +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -FTPD_BINARY="/usr/bin/ftpd" -FTPD_PIDFILE="/run/ftpd.pid" - -depend() { - use logger dns - need net -} - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec "${FTPD_BINARY}" \ - --pidfile "${FTPD_PIDFILE}" \ - -- ${FTPD_ARGS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec "${FTPD_BINARY}" \ - --pidfile "${FTPD_PIDFILE}" --quiet - eend $? -} diff --git a/pcr/openrc-devel/PKGBUILD b/pcr/openrc-devel/PKGBUILD deleted file mode 100644 index 5abe43bc2..000000000 --- a/pcr/openrc-devel/PKGBUILD +++ /dev/null @@ -1,162 +0,0 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_url="https://raw.githubusercontent.com/gentoo/gentoo/master" - -_sed_args=(-e 's|/var/run|/run|g' -e 's|/usr/sbin|/usr/bin|g') -prefix=true - -$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') - -pkgbase=openrc-devel -pkgname=('distcc-openrc' - 'git-openrc' - 'jenkins-openrc' - 'mysql-openrc' - #'php-fpm-openrc' - 'postgresql-openrc' - 'subversion-openrc') -pkgver=20170927 -pkgrel=1 -pkgdesc="OpenRC init scripts" -arch=('any') -url="https://github.com/artix-linux" -license=('GPL2') -groups=('openrc-devel') -conflicts=('systemd-sysvcompat') -source=("distccd.confd::${_url}/sys-devel/distcc/files/3.2/conf" - "distccd.initd::${_url}/sys-devel/distcc/files/3.2/init" - "git-daemon.confd::${_url}/dev-vcs/git/files/git-daemon.confd" - "git-daemon.initd::${_url}/dev-vcs/git/files/git-daemon-r1.initd" - 'jenkins.initd' - "jenkins.logrotate" - "mysql.confd::${_url}/dev-db/mysql-init-scripts/files/conf.d-2.0" - "mysql.initd::${_url}/dev-db/mysql-init-scripts/files/init.d-2.0" - #"php-fpm.initd::${_url}/dev-lang/php/files/php-fpm-r4.init" - "postgresql.confd::${_url}/dev-db/postgresql/files/postgresql.confd" - "postgresql.initd::${_url}/dev-db/postgresql/files/postgresql.init-9.3" - "svnserve.confd::${_url}/dev-vcs/subversion/files/svnserve.confd" - "svnserve.initd::${_url}/dev-vcs/subversion/files/svnserve.initd3") -sha256sums=('253cfaa5b53fe4943a9db83e76ff6d6e8855665f69c2f7beca124af3ec63c88a' - '4af1591a0f95e45648f0c5a7ffc5e49be012f2f6e497235b3363e9e709dc627f' - '4703ba2372c661fb674a29fea7f64983f8b1b3136d971663509249655bca6e21' - 'c39eff8e0d0156f035b987521444476875852519ddfe6b36ea5c205d93a7f323' - '7ef50b386bef359224dffb964387f651aa02cd610c3f73d585fa3ae78e9becee' - '03dcaccbb0d398c2b600be0752ffc68d20c877b58a10026b7c59b0bd40c0e5bf' - 'b94756f2a5fe43893dea90fadbe47308e50fb4dbe2cbaa2676f34fa88181d8e7' - 'b6eb4576e654b1f4a8138df04408935a07fab69775e9663f736133c71bbb414b' - '57c1ad0b14e8458024c713dd8cc2390023b95c27ba4cbd637333b1020f11f398' - '120e872848eb13c949179b22f00a31bd043823ac75c547374225c6c3620a827d' - '45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97' - '3cba218e648f7722e6e5541deb9e8ca0f53188195e33b17ca19efb8a300651cb') - -pkgver() { - date +%Y%m%d -} - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_distcc-openrc() { - pkgdesc="OpenRC distcc init script" - depends=('distcc' 'openrc') - backup=('etc/conf.d/distccd') - - _inst_confd 'distccd' - _inst_initd 'distccd' - - sed -e 's|/var/run|/run|' -i ${pkgdir}/etc/conf.d/distccd -} - -package_git-openrc() { - pkgdesc="OpenRC git-daemon init script" - depends=('git' 'openrc') - backup=('etc/conf.d/git-daemon') - - _inst_confd 'git-daemon' - _inst_initd 'git-daemon' - - sed -e 's|/var/git|/srv/git|' -i "${pkgdir}/etc/conf.d/git-daemon" -} - -package_jenkins-openrc() { - pkgdesc="OpenRC jenkins init script" - depends=('jenkins' 'openrc') - - _inst_initd 'jenkins' - - install -Dm644 "${srcdir}/jenkins.logrotate" "${pkgdir}/etc/logrotate.d/jenkins" -} - -package_mysql-openrc() { - pkgdesc="OpenRC mysql init script" - depends=('mysql' 'openrc') - optdepends=('bind-openrc: bind initscript') - backup=('etc/conf.d/mysql') - install=mysql.install - - _inst_confd 'mysql' - _inst_initd 'mysql' - - sed -e 's|/sbin/mysqld|/bin/mysqld|g' -i "${pkgdir}/etc/init.d/mysql" -} - -# package_php-fpm-openrc() { -# pkgdesc="OpenRC php-fpm init script" -# depends=('php-fpm' 'openrc') -# optdepends=('apache-openrc: apache initscript' -# 'lighttp-openrc: lighttp initscript' -# 'nginx-openrc: nginx initscript') -# install=php-fpm.install -# -# _inst_initd 'php-fpm' -# -# sed -e 's|/lib/${PHPSLOT}||g' \ -# -e 's|/etc/php/fpm-${PHPSLOT}|/etc/php|' \ -# -e 's|/run/php-fpm-${PHPSLOT}|/run/php-fpm|' \ -# -e 's|PHPSLOT=${SVCNAME#php-fpm-}||' \ -# -e 's|^.*${PHPSLOT}.*||' \ -# -i "${pkgdir}/etc/init.d/php-fpm" -# } - -package_postgresql-openrc() { - pkgdesc="OpenRC postgresql init script" - depends=('postgresql' 'openrc') - backup=('etc/conf.d/postgresql') - install=postgresql.install - - _inst_confd 'postgresql' - _inst_initd 'postgresql' - - sed -e 's|/etc/postgresql-@SLOT@/|/var/lib/postgres/data/|' \ - -e 's|/var/lib/postgresql/@SLOT@/data|/var/lib/postgres/data|' \ - -i "${pkgdir}/etc/conf.d/postgresql" - - sed -e 's|/@LIBDIR@/postgresql-@SLOT@||g' \ - -e 's|/etc/conf.d/postgresql-@SLOT@|/etc/conf.d/postgresql|' \ - -i "${pkgdir}/etc/init.d/postgresql" -} - -package_subversion-openrc() { - pkgdesc="OpenRC svnserve init script" - depends=('subversion' 'openrc') - backup=('etc/conf.d/svnserve') - - _inst_confd 'svnserve' - _inst_initd 'svnserve' - - sed -e 's|/var/svn|/srv/svn|g' -i ${pkgdir}/etc/conf.d/svnserve - - sed -e 's|/var/svn|/srv/svn|g' \ - -e 's|-apache|-http|g' \ - -e 's|/run/svnserve.pid|/run/svnserve/svnserve.pid|g' \ - -e 's/--make-pidfile//' \ - -i "${pkgdir}/etc/init.d/svnserve" -} diff --git a/pcr/openrc-devel/jenkins.initd b/pcr/openrc-devel/jenkins.initd deleted file mode 100644 index de15a76c2..000000000 --- a/pcr/openrc-devel/jenkins.initd +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/openrc-run - - -JENKINS_PIDFILE=/run/jenkins.pid -ARGS="$JAVA_ARGS $JAVA_OPTS -jar $JENKINS_WAR $JENKINS_WEBROOT $JENKINS_PORT $JENKINS_AJPPORT $JENKINS_OPTS" - -depend() { - need net - use dns logger mysql postgresql -} - -checkconfig() { - if [ ! -n "$JENKINS_HOME" ] ; then - eerror "JENKINS_HOME not configured" - return 1 - fi - if [ ! -d "$JENKINS_HOME" ] ; then - checkpath -q -d -o jenkins:jenkins -m 0755 "$JENKINS_HOME" || return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --background \ - --make-pidfile --pidfile $JENKINS_PIDFILE \ - --user ${JENKINS_USER} \ - --exec "${JAVA}" -- ${ARGS} - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --pidfile $JENKINS_PIDFILE - eend $? -} diff --git a/pcr/openrc-devel/jenkins.logrotate b/pcr/openrc-devel/jenkins.logrotate deleted file mode 100644 index 6dd4f1d5d..000000000 --- a/pcr/openrc-devel/jenkins.logrotate +++ /dev/null @@ -1,17 +0,0 @@ -/var/log/jenkins/jenkins.log /var/log/jenkins/access_log { - compress - dateext - maxage 365 - rotate 99 - size=+4096k - notifempty - missingok - create 644 - postrotate - [ -r /etc/conf.d/jenkins ] && . /etc/conf.d/jenkins - if [ -s /run/jenkins.pid ]; then - JPID=$(cat /run/jenkins.pid) - test -n "$(find /proc/$JPID -maxdepth 0 -user ${RUN_AS:-jenkins} 2>/dev/null)" && kill -s ALRM $JPID || : - fi - endscript -} diff --git a/pcr/openrc-devel/mysql.install b/pcr/openrc-devel/mysql.install deleted file mode 100644 index f3c410ef9..000000000 --- a/pcr/openrc-devel/mysql.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - conf1='basedir = /usr' - conf2='pid-file = /run/mysqld/mysqld.pid' - conf3='user = mysql' - file="/etc/mysql/my.cnf" - echo " ==> $file requires $conf1" - echo " ==> $file requires $conf2" - echo " ==> $file requires $conf3" -} diff --git a/pcr/openrc-devel/postgresql.install b/pcr/openrc-devel/postgresql.install deleted file mode 100644 index 46084091f..000000000 --- a/pcr/openrc-devel/postgresql.install +++ /dev/null @@ -1,5 +0,0 @@ -post_install() { - local datadir="/var/lib/data" - echo " ==> requires datadir $datadir" - echo " ==> run as user postgres: 'initdb -D $datadir'" -} diff --git a/pcr/openrc-misc/PKGBUILD b/pcr/openrc-misc/PKGBUILD deleted file mode 100644 index 0e762917a..000000000 --- a/pcr/openrc-misc/PKGBUILD +++ /dev/null @@ -1,378 +0,0 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_url="https://raw.githubusercontent.com/gentoo/gentoo/master" - -_sed_args=(-e 's|/var/run|/run|g' -e 's|/usr/sbin|/usr/bin|g') -prefix=true - -$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') - -pkgbase=openrc-misc -pkgname=('at-openrc' - 'bitlbee-openrc' - 'clamav-openrc' - 'connman-openrc' - 'cpupower-openrc' - 'cups-openrc' - 'fcron-openrc' - 'fuse-openrc' - 'haveged-openrc' - 'hdparm-openrc' - 'laptop-mode-tools-openrc' - 'libvirt-openrc' - 'lirc-utils-openrc' - 'lm_sensors-openrc' - 'metalog-openrc' - 'mpd-openrc' - 'ntp-openrc' - 'salt-openrc' - 'sane-openrc' - 'thermald-openrc') -pkgver=20170927 -pkgrel=1 -pkgdesc="OpenRC init scripts" -arch=('any') -url="https://github.com/artix-linux" -license=('GPL2') -groups=('openrc-misc') -conflicts=('systemd-sysvcompat') -source=("atd.confd::${_url}/sys-process/at/files/atd.confd" - "atd.initd::${_url}/sys-process/at/files/atd.rc8" - "bitlbee.confd::${_url}/net-im/bitlbee/files/bitlbee.confd-r1" - "bitlbee.initd::${_url}/net-im/bitlbee/files/bitlbee.initd-r1" - "clamd.confd::${_url}/app-antivirus/clamav/files/clamd.conf-r1" - "clamd.initd::${_url}/app-antivirus/clamav/files/clamd.initd-r6" - "connman.confd::${_url}/net-misc/connman/files/connman.confd" - "connman.initd::${_url}/net-misc/connman/files/connman.initd2" - "cpupower.confd::${_url}/sys-power/cpupower/files/conf.d-r2" - "cpupower.initd::${_url}/sys-power/cpupower/files/init.d-r4" - "cupsd.initd::${_url}/net-print/cups/files/cupsd.init.d-r2" - "fcron.initd::${_url}/sys-process/fcron/files/fcron.init.4" - "fuse.initd::${_url}/sys-fs/fuse/files/fuse.init" - "haveged.confd::${_url}/sys-apps/haveged/files/haveged-conf.d" - "haveged.initd::${_url}/sys-apps/haveged/files/haveged-init.d.3" - "hdparm.confd::${_url}/sys-apps/hdparm/files/hdparm-conf.d.3" - "hdparm.initd::${_url}/sys-apps/hdparm/files/hdparm-init-8" - "laptop_mode.initd::${_url}/app-laptop/laptop-mode-tools/files/laptop_mode.init-1.4" - "libvirtd.confd::${_url}/app-emulation/libvirt/files/libvirtd.confd-r5" - "libvirtd.initd::${_url}/app-emulation/libvirt/files/libvirtd.init-r16" - "virtlockd.initd::${_url}/app-emulation/libvirt/files/virtlockd.init-r1" - "virtlogd.initd::${_url}/app-emulation/libvirt/files/virtlogd.init-r1" - "libvirt-guests.confd::${_url}/app-emulation/libvirt/files/libvirt-guests.confd" - "libvirt-guests.initd::${_url}/app-emulation/libvirt/files/libvirt-guests.init-r2" - "lircd.confd::${_url}/app-misc/lirc/files/lircd.conf.4" - "irexec.confd::${_url}/app-misc/lirc/files/irexec-confd" - "lircd.initd::${_url}/app-misc/lirc/files/lircd-0.8.6-r2" - "irexec.initd::${_url}/app-misc/lirc/files/irexec-initd-0.8.6-r2" - "lircmd.initd::${_url}/app-misc/lirc/files/lircmd" - #"sensord.confd::${_url}/sys-apps/lm_sensors/files/sensord-conf.d" - "sensord.initd::${_url}/sys-apps/lm_sensors/files/sensord-4-init.d" - "fancontrol.initd::${_url}/sys-apps/lm_sensors/files/fancontrol-init.d-2" - "lm_sensors.initd::${_url}/sys-apps/lm_sensors/files/lm_sensors-3-init.d" - "metalog.confd::${_url}/app-admin/metalog/files/metalog.confd" - "metalog.initd::${_url}/app-admin/metalog/files/metalog.initd" - "mpd.initd::${_url}/media-sound/mpd/files/mpd2.init" - "ntpd.confd::${_url}/net-misc/ntp/files/ntpd.confd" - "ntp-client.confd::${_url}/net-misc/ntp/files/ntp-client.confd" - "sntp.confd::${_url}/net-misc/ntp/files/sntp.confd" - "ntpd.initd::${_url}/net-misc/ntp/files/ntpd.rc-r1" - "ntp-client.initd::${_url}/net-misc/ntp/files/ntp-client.rc" - "sntp.initd::${_url}/net-misc/ntp/files/sntp.rc" - "salt-master.confd::${_url}/app-admin/salt/files/master-confd-1" - "salt-master.initd::${_url}/app-admin/salt/files/master-initd-4" - "salt-minion.confd::${_url}/app-admin/salt/files/minion-confd-1" - "salt-minion.initd::${_url}/app-admin/salt/files/minion-initd-4" - "salt-syncdic.confd::${_url}/app-admin/salt/files/syndic-confd-1" - "salt-syncdic.initd::${_url}/app-admin/salt/files/syndic-initd-4" - "salt-api.confd::${_url}/app-admin/salt/files/api-confd-1" - "salt-api.initd::${_url}/app-admin/salt/files/api-initd-4" - "saned.confd::${_url}/media-gfx/sane-backends/files/saned.confd" - "saned.initd::${_url}/media-gfx/sane-backends/files/saned.initd" - "thermald.initd") -sha256sums=('ece01506efa6d73d7cbe9bc1da6eb1afc4d63451ab1fccf5051178b6e937d68e' - '115f3be9cfd306251909ca7fc2dbc55ca71f6f38a3ebb62d9a428a9eddcd8ffb' - 'cab8b8cb8709f27a5fa9f1cfce4b58db24f5cd38b8e6badb91dac0809e6ca8de' - '4b8654dffd57243079223a1cc236edf5e47309515270fde2d18123e41cd3c29f' - '28ebd47810b0568fc7692218867d6804a1df70290681462f5555e230ca817732' - '7b502b8ca6672ee85d67e6c2e210118b05cee8170ebab4308df192f0f8064de3' - '767a160c1b3392f0a12d3908a937548a2f604a9a121e744c309ee6f478420b02' - '4c018df1b53b142a2e26c456b0bf6cc7039fb3851bc5f567e59654117930a78b' - '9ab6f022d2b2948660decf5e383984e6ddb9e9e5e6e2761c3031378ddd87e947' - 'c8c092fa80da7c312430389ae06ff7874d651d8e7b6c28236ee5c8d8d3557d9d' - '54b86ec2d7086004cde4e8b69aa49b7334718cad42a4426382f56269bb0f5a78' - 'e193623b14a421fba86f0f5f10d6ac95de02d27239b117050a1eeccabe08aa06' - '66ce65e2459fef26bb1711d706a23643a9af7a80e03ee6be836a377310b00682' - 'e796a353534e8ec36b84a29ab4cbd738ebd18098efca5ed8d92b267a99dc58f6' - '5ee06c49764ecc4aaa9a88a222ef7838dbc065d049279693a37bebd0431855de' - '37c95ff723fa578e9039613d09dbf790d99113a318c065422986c744519214e9' - '05b264cadc84984f773cd555af322b41fdb13da7cb2ca60d8a7d590ddf4d5e5f' - '6bb07bd94b50ad559c3cd23b57dbb928ff0449d356d973ba281baa232435d9c6' - '4f7fba7e64533868119c0f3355aa22932e163b208397323dc2cd96daadcc4079' - '1f875e12cc6ecb1b434bfea774893b84f6602072da0218b654d2ecf79cf2d36d' - '23ddea66fb2d85c17c382daa07abfabe7fa57d62406d2ca5df0c755f5dcc3834' - '1647c11779fd874bdc115234bae0f0f65278084541473d2825aa9864ad49f939' - 'd5f85bb8c1d2010347f23badc422e98046b97a0066254739b5829fce07837d63' - 'f78ced5ebe644522c6ce102b3f6bcf932686243a50629559f988548c570cad3a' - 'd36ff77fa193a065d25e373723e03f1a9471205151b82c73a6574cce4f095962' - 'c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79' - 'ec592af12a7b7bbe1be1b9a4ff72fcf1fda6cf0e4511120e5a85e2a4ef08b213' - '1eb5123f9876dff17367e78940a7442de6b5cae55e0eb4969f5985cc78261a03' - '47a9b3500c51c147ac64a8c0cc0dda3945522269e26c513399d89efbbb3c7098' - 'c95bdbce67efb57d60cf0b7248091e09d7f52c19eb13874944babe6bb84b12f1' - '3ce872b305dafa2957eb082239dedb57a880b1395bf9377e916143a04086cbcc' - '24026e19e7862b02fe5e6d0bb9998dd5420c30c64045bdfc94d7578b1cb822ea' - 'dd9d30a6c22dca6d072a9c63e1494d3d0a26709a5f045ce5985642933fe24efc' - '78e372a0c04c36e590a66d0750083fcb6302159eaae06a81c19a379e6115087e' - '6ca354f8b8c4b0e8595f7dbda1058fd471a6b538469ea10e7caf8e7f263f621a' - '40803821f498267f6567436eedc18201b5ae4b5390d6872fb15a94200c2ac06f' - 'c7dc517cdb5ee10e2a07ccea15ec47ba0b7aff8ac1469204c8d7faf71bcae2c5' - '97282007801cb9c0e3b431e2930dec3bb8ce8869f63f7e02d903846e96734684' - 'cdccb5f0009d1498be90a3f423158d7a3c603a1398f8993ae6fb828224a7cdaa' - '49f6634a258d4a91dc12c3b6bf9014b05a39cfe121ad52f826721ab791a28aa3' - 'd1ba585272e6158a942d536d508a2979a1ca17316d4b97766d78bad4e9a6a7b8' - '0be3575df8010523de6b37e98c417192e8ec481292ca9fb47c8d2211795e03a6' - '93044cc5fc344cd90d17cbb5cebee3c60ebf674e53c8b9efc6e758d53912d343' - '9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089' - '7064f21c734313e9d9d32b77eaecf3eeb6de714eff6dcafeb79c25303e675bf9' - '286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1' - 'ebe8d0fecde60b427d01022eb38a437be1ead33cd24d4afdb266ff922ab87850' - '286148f5391d42c04a62a13cc125fa2130b5821e50da913c5a20d3a913e5f2d1' - '86c1af171c7b13018f089fab6d045feabd72455f9453720ef36ae2011b9cb976' - '9f3f47a7af4d349a7c525455616139b5019d3b7d0290398ba8c50ab91a62d089' - 'e673f359ff7fbb012d9eb5d6c3db841668e3692b15b07faeb6352feb5cfbb2b1' - '197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9be5b964aa76' - '80e12e65ec5abf2e57da9fdf58e681845029ccab65206cd56a4bc06e2abefb0a' - '4bbb4e610d2d6bb22d83aa2980dca052a23b90fa6985c8245601b716dec986f4') - -pkgver() { - date +%Y%m%d -} - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_at-openrc() { - pkgdesc="OpenRC at init script" - depends=('openrc' 'at') - backup=('etc/conf.d/atd') - - _inst_confd 'atd' - _inst_initd 'atd' - - sed -e 's|/var/run|/run|g' \ - -i "${pkgdir}/etc/conf.d/atd" -} - -package_bitlbee-openrc() { - pkgdesc="OpenRC bitlbee init script" - depends=('openrc' 'bitlbee') - backup=('etc/conf.d/bitlbee') - - _inst_confd 'bitlbee' - _inst_initd 'bitlbee' - - sed -e 's|need logger net|need net\n use logger|' \ - -i "${pkgdir}/etc/init.d/bitlbee" -} - -package_clamav-openrc() { - pkgdesc="OpenRC clamav init script" - depends=('openrc' 'clamav') - backup=('etc/conf.d/clamd') - - _inst_confd 'clamd' - _inst_initd 'clamd' -} - -package_connman-openrc() { - pkgdesc="OpenRC connman init script" - depends=('openrc' 'connman') - backup=('etc/conf.d/connman') - - _inst_confd 'connman' - _inst_initd 'connman' -} - -package_cpupower-openrc() { - pkgdesc="OpenRC cpupower init script" - depends=('openrc' 'cpupower') - backup=('etc/conf.d/cpupower') - - _inst_confd 'cpupower' - _inst_initd 'cpupower' -} - -package_cups-openrc() { - pkgdesc="OpenRC cups init script" - depends=('cups' 'dbus-openrc') - optdepends=('avahi-openrc: avahi initscript') - - _inst_initd 'cupsd' - - sed -e 's|lp:lpadmin|daemon:sys|' \ - -e 's|@neededservices@|need dbus avahi-daemon|' \ - -i "${pkgdir}/etc/init.d/cupsd" -} - -package_fcron-openrc() { - pkgdesc="OpenRC fcron init script" - depends=('openrc' 'fcron') - groups=('openrc-misc') - provides=('openrc-cron') - conflicts=('cronie' 'cronie-openrc' 'systemd-sysvcompat') - - _inst_initd 'fcron' - - sed -e 's|/usr/libexec|/usr/bin|g' \ - -i "${pkgdir}/etc/init.d/fcron" -} - -package_fuse-openrc(){ - pkgdesc="OpenRC fuse init script" - depends=('openrc' 'fuse') - - _inst_initd 'fuse' -} - -package_haveged-openrc() { - pkgdesc="OpenRC haveged init script" - depends=('openrc' 'haveged') - backup=('etc/conf.d/haveged') - - _inst_confd 'haveged' - _inst_initd 'haveged' -} - -package_hdparm-openrc() { - pkgdesc="OpenRC hdparm init script" - depends=('openrc' 'hdparm') - backup=('etc/conf.d/hdparm') - - _inst_confd 'hdparm' - _inst_initd 'hdparm' -} - -package_laptop-mode-tools-openrc() { - pkgdesc="OpenRC laptop-mode init script" - depends=('openrc' 'laptop-mode-tools') - groups=('openrc-misc' 'openrc-mobile') - - _inst_initd 'laptop_mode' -} - -package_libvirt-openrc() { - pkgdesc="OpenRC libvirt init script" - depends=('openrc' 'libvirt') - backup=('etc/conf.d/libvirtd') - - _inst_confd 'libvirtd' - _inst_initd 'libvirtd' - _inst_initd 'virtlockd' - _inst_initd 'virtlogd' - - _inst_confd 'libvirt-guests' - _inst_initd 'libvirt-guests' - - sed -e "s/USE_FLAG_FIREWALLD/need firewalld/" \ - -e "s/USE_FLAG_AVAHI/use avahi-daemon/" \ - -e "s/USE_FLAG_ISCSI/use iscsid/" \ - -e "s/USE_FLAG_RBD/use ceph/" \ - -i "${pkgdir}/etc/init.d/libvirtd" -} - -package_lirc-utils-openrc() { - pkgdesc="OpenRC lirc-utils init script" - depends=('openrc' 'lirc-utils') - backup=('etc/conf.d/lircd' - 'etc/conf.d/irexec') - - for f in lircd irexec;do - _inst_confd $f - _inst_initd $f - done - - _inst_initd 'lircmd' -} - -package_lm_sensors-openrc() { - pkgdesc="OpenRC lm_sensors init script" - depends=('openrc' 'lm_sensors') - #backup=('etc/conf.d/sensord') - - _inst_initd 'sensord' - _inst_initd 'fancontrol' - _inst_initd 'lm_sensors' -} - -package_metalog-openrc() { - pkgdesc="OpenRC metalog init script" - depends=('openrc' 'metalog') - backup=('etc/conf.d/metalog') - - _inst_confd 'metalog' - _inst_initd 'metalog' -} - -package_mpd-openrc(){ - pkgdesc="OpenRC fuse init script" - depends=('openrc' 'mpd') - - _inst_initd 'mpd' -} - -package_ntp-openrc() { - pkgdesc="OpenRC ntp init script" - depends=('openrc' 'ntp') - optdepends=('bind-openrc: bind initscript') - provides=('openrc-timed') - conflicts=('openntpd' 'openntpd-openrc') - backup=('etc/conf.d/ntpd' - 'etc/conf.d/ntp-client' - 'etc/init.d/sntp') - - for f in ntpd ntp-client sntp;do - _inst_confd $f - _inst_initd $f - done -} - -package_salt-openrc() { - pkgdesc="OpenRC salt init scripts" - depends=('openrc' 'salt') - backup=('etc/conf.d/salt-master' - 'etc/conf.d/salt-minion' - 'etc/conf.d/salt-syncdic' - 'etc/conf.d/salt-api') - - for f in salt-master salt-minion salt-syncdic salt-api;do - _inst_confd $f - _inst_initd $f - done -} - -package_sane-openrc() { - pkgdesc="OpenRC sane init script" - depends=('openrc' 'sane') - backup=('etc/conf.d/saned') - - _inst_confd 'saned' - _inst_initd 'saned' - - sed -e 's|/run/saned/saned.pid|/run/saned.pid|' \ - -i ${pkgdir}/etc/init.d/saned -} - -package_thermald-openrc() { - pkgdesc="OpenRC thermald init script" - depends=('dbus-openrc' 'thermald') - - _inst_initd 'thermald' -} diff --git a/pcr/openrc-misc/thermald.initd b/pcr/openrc-misc/thermald.initd deleted file mode 100644 index 9c629974b..000000000 --- a/pcr/openrc-misc/thermald.initd +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/thermald" -command_args="--dbus-enable" -start_stop_daemon_args="--quiet" diff --git a/pcr/openrc-net/PKGBUILD b/pcr/openrc-net/PKGBUILD deleted file mode 100644 index 15f938653..000000000 --- a/pcr/openrc-net/PKGBUILD +++ /dev/null @@ -1,581 +0,0 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_apver=2.4.18-r1 -_aprel=20160303 - -_dev_url="http://dev.gentoo.org/~polynomial-c/dist/apache" -_url="https://raw.githubusercontent.com/gentoo/gentoo/master" - -_sed_args=(-e 's|/var/run|/run|g' -e 's|/usr/sbin|/usr/bin|g') -prefix=true - -$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') - -pkgbase=openrc-net -pkgname=('apache-openrc' - 'autofs-openrc' - 'bind-openrc' - 'cyrus-sasl-openrc' - 'dhcp-openrc' - 'dovecot-openrc' - 'exim-openrc' - 'hostapd-openrc' - 'krb5-openrc' - 'lighttpd-openrc' - 'nginx-openrc' - 'opendkim-openrc' - 'opendmarc-openrc' - 'openldap-openrc' - 'openntpd-openrc' - 'opensmtpd-openrc' - 'openssh-openrc' - 'openvpn-openrc' - 'polipo-openrc' - 'postfix-openrc' - 'privoxy-openrc' - 'rsync-openrc' - 'samba-openrc' - 'spamassassin-openrc' - 'squid-openrc' - 'syncthing-openrc' - 'tor-openrc' - 'transmission-openrc' - 'ufw-openrc' - 'unbound-openrc' - 'vnstat-openrc' - 'vsftpd-openrc' - 'wicd-openrc' - 'x2goserver-openrc' - 'xinetd-openrc') -pkgver=20190211 -pkgrel=1 -pkgdesc="OpenRC init scripts" -arch=('any') -url="https://github.com/artix-linux" -license=('GPL2') -groups=('openrc-net') -conflicts=('systemd-sysvcompat') -source=("${_dev_url}/gentoo-apache-${_apver}-${_aprel}.tar.bz2" - "autofs.initd::${_url}/net-fs/autofs/files/autofs5.initd" - "named.confd::${_url}/net-dns/bind/files/named.confd-r7" - "named.initd::${_url}/net-dns/bind/files/named.init-r13" - "saslauthd.initd::${_url}/dev-libs/cyrus-sasl/files/saslauthd2.rc7" - "dhcpd.confd::${_url}/net-misc/dhcp/files/dhcpd.conf2" - "dhcrelay.confd::${_url}/net-misc/dhcp/files/dhcrelay.conf" - "dhcrelay6.confd::${_url}/net-misc/dhcp/files/dhcrelay6.conf" - "dhcpd.initd::${_url}/net-misc/dhcp/files/dhcpd.init5" - "dhcrelay.initd::${_url}/net-misc/dhcp/files/dhcrelay.init3" - "dovecot.initd::${_url}/net-mail/dovecot/files/dovecot.init-r4" - "exim.confd::${_url}/mail-mta/exim/files/exim.confd" - "exim.initd::${_url}/mail-mta/exim/files/exim.rc10" - "hostapd.confd::${_url}/net-wireless/hostapd/files/hostapd-conf.d" - "hostapd.initd::${_url}/net-wireless/hostapd/files/hostapd-init.d" - "krb5kadmind.initd::${_url}/app-crypt/mit-krb5/files/mit-krb5kadmind.initd-r2" - "krb5kdc.initd::${_url}/app-crypt/mit-krb5/files/mit-krb5kdc.initd-r2" - "krb5kpropd.initd::${_url}/app-crypt/mit-krb5/files/mit-krb5kpropd.initd-r2" - "lighttpd.confd::${_url}/www-servers/lighttpd/files/lighttpd.confd" - "lighttpd.initd::${_url}/www-servers/lighttpd/files/lighttpd.initd" - "nginx.confd::${_url}/www-servers/nginx/files/nginx.confd" - "nginx.initd::${_url}/www-servers/nginx/files/nginx.initd-r4" - "slapd.confd::${_url}/net-nds/openldap/files/slapd-confd-2.4.28-r1" - "slapd.initd::${_url}/net-nds/openldap/files/slapd-initd-2.4.40-r2" - "ntpd.confd::${_url}/net-misc/openntpd/files/openntpd.conf.d-20080406-r6" - "ntpd.initd::${_url}/net-misc/openntpd/files/openntpd.init.d-20080406-r6" - "sshd.confd::${_url}/net-misc/openssh/files/sshd.confd" - "sshd.initd::${_url}/net-misc/openssh/files/sshd.rc6.4" - "opendkim.initd" - "opendmarc.confd" - "opendmarc.initd::${_url}/mail-filter/opendmarc/files/opendmarc.initd" - "openvpn.confd::${_url}/net-vpn/openvpn/files/openvpn-2.1.conf" - "openvpn.initd::${_url}/net-vpn/openvpn/files/openvpn-2.1.init" - "smtpd.initd::${_url}/mail-mta/opensmtpd/files/smtpd.initd" - "polipo.initd::${_url}/net-proxy/polipo/files/polipo.initd-5" - "postfix.initd::${_url}/mail-mta/postfix/files/postfix.rc6.2.7" - "privoxy.initd::${_url}/net-proxy/privoxy/files/privoxy.initd-3" - "rsyncd.confd::${_url}/net-misc/rsync/files/rsyncd.conf.d" - "rsyncd.initd::${_url}/net-misc/rsync/files/rsyncd.init.d-r1" - "smb.confd::${_url}/net-fs/samba/files/4.4/samba4.confd" - "smb.initd::${_url}/net-fs/samba/files/4.4/samba4.initd-r1" - "spamassassin.initd::${_url}/mail-filter/spamassassin/files/3.4.1-spamd.init-r3" - "spamassassin.confd::${_url}/mail-filter/spamassassin/files/3.4.1-spamd.conf-r1" - "squid.confd::${_url}/net-proxy/squid/files/squid.confd-r1" - "squid.initd::${_url}/net-proxy/squid/files/squid.initd-r4" - "syncthing.confd" - "syncthing.initd" - "tor.confd::${_url}/net-vpn/tor/files/tor.confd" - "tor.initd::${_url}/net-vpn/tor/files/tor.initd-r8" - "transmission-daemon.confd::${_url}/net-p2p/transmission/files/transmission-daemon.confd.4" - "transmission-daemon.initd::${_url}/net-p2p/transmission/files/transmission-daemon.initd.10" - "ufw.confd::${_url}/net-firewall/ufw/files/ufw.confd" - "ufw.initd::${_url}/net-firewall/ufw/files/ufw-2.initd" - "unbound.confd::${_url}/net-dns/unbound/files/unbound-r1.confd" - "unbound.initd::${_url}/net-dns/unbound/files/unbound-r1.initd" - "vnstatd.confd::${_url}/net-analyzer/vnstat/files/vnstatd.confd" - "vnstatd.initd::${_url}/net-analyzer/vnstat/files/vnstatd.initd-r1" - "${_url}/net-ftp/vsftpd/files/vsftpd-checkconfig.sh" - "vsftpd.initd::${_url}/net-ftp/vsftpd/files/vsftpd.init" - "wicd.initd" - "x2goserver.initd::${_url}/net-misc/x2goserver/files/x2goserver.init" - "xinetd.confd::${_url}/sys-apps/xinetd/files/xinetd.confd" - "xinetd.initd::${_url}/sys-apps/xinetd/files/xinetd.rc6") -sha512sums=('68f0c4de38ae05c45839fe692cbb7de641e331ca133b8aaaf69f3659dec15833cda95e6e074edb3a5b6b6d59b3fc5a4ee3589fff810707fe27417a25cd8a4c4d' - 'f8e1d38917b9c7048a4f6498fb987984306e15458eaf8cb73990a99d355d7f7ce3f1aa5450725283cbbc6f5c0e2f31048f1cd26eca7f136f1fe30a6dd8d31c43' - '68fa7c8963ac59349de3d05972c07aa0123b7bebbe0ba9604463ccfd1b377c2babe01eed4745cbe0f7d3831d1b47c2fa620f8092c67465fb771cae4932b0861a' - 'c675adec65796989dc8524d533868975d4e2c3b2ed5f09aa3cd92ec21b8dfb161582dd5afdf08ab78174873f3e1458e90c2d50958f0b5a303078540a675ec0c9' - '1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83' - '7b7a77b7826b475a4113ebeee54501ce417cc56e85754301a82a185d88b4713d198f615a366e63e0e2b0aef988c8137dcd1e18c4036d993378257079da17693d' - 'af94d679c5b7652a770d4acb96f5f12fd9dc99f4e8e26b10fab67514693f63392bc8033a6e5e6c1967d7004decc72b810462e1fe92c1d4808606e48086dea00b' - '40d3a6bdf8521bf5152cf31b961aea88b2fb0339433d0b6a6360a16c796298620b377bd079c0246e97bc9c0533ddb13bbb58cc5169d0ca598e3a51d1a607a9e9' - '0cf238f3e79ee5d1ba059331664fd092d025ecb8fdb3f1d428713d7cd81ad4efe10ad7ad4ef48146aa6c9763293c1641057a257480e58a639fc6cc20e623f4c1' - 'ab4c38c53bf21dccee252358f0ecece81829048a546f380cb1e3552804e412c38dac09805fb7f9520531d48d3d79b3dd228ffdba7203b89ac30a778a579ddbda' - '8fbc80bc0efa6b83685da19b6a5c2a2d2ca7e59be7f1f7352984fe30004175330e53f3db1c4c2471f1d7d5e088bef0b4dced97d29d32be8b50d000987b6eeb09' - 'cb5e4aa71d3f0b7945e9806064f6a3ab64cb894381654ead40c73a49ae2d1bbb3dc587919952a09b2c81b9fcf8784f73d59c12081cda96a5b7210442f5088998' - '5c7cee6139145983c62df8f5ef6c401d34d2eb7eae3146c28045129ba40868ca4d3d10d4b7056887cf4d4d8a83271592f7fa0a527663f727fa8694b621eb5624' - 'f07a6cd209eca351b8545017c5f025282c3fdea838ca3df49e362571ded43973281ce4ff83984b1299db15ea9b5c21a42cbda91432220af9146bf034e2265c30' - 'ab364383da45403d7734be20e7486937ad0a6be25a56eb1ec03d131243270a143189b699becf6e9e14d30b02bb5d93cddde55e51908801f2e6830de53791ccc8' - '3791af603380277a9d2632a01a86f96f68c9eb38a2c9574cca462fe9a01bef60f24785051d0215a8d71dd5022f1404e281929278e2bfd31603a0415dd9df6a98' - '42cbc315a4e28a78cd29ee6f9aa9401ac6185cc78d39528f0c498d6b04a8edba7b7efadaaeae52ac2c4f89faa846787da9aee645f9ef0bdb79cd6289454586a3' - '28b9d9bc9d132d8bd87d5fd9e74103d4772f26cba48d28ad53f40ade037a5ac91e07c01aa3180d50c3624673bf4e534f76689b03feb4888cdd9198755576b6a7' - 'dd722c15230df734d7151bcb9cfc66d6d54aac5dcdca5f50eb33979d3a2443ba3a9ef3d7cb35e6dbd3d39fce09da15ab0029b1399bf1b1e4f4ef20d40f70a416' - 'd5fc03ded923d2aeea19fefdf658ed793114867dd0b50be6836d767108c98fb7de56011f00ea63220c4b198cff45d98fdc8a649efae90673536e03f786219485' - '9023b33b6e03de4fa4df8459118a34a24a52ec167eb0aa1d220fd5ba8555aa454ca3451cad4eecc87a445b74cae5132fd717286aec3f1fea390eb96547e4ae85' - 'e641829466e54093ad01e9f6c57acd2f0505e489a32e67dfee9279d5da57b216052a92eb05eb0c9c122c12f8b7bf8274b520b6e02fda161cc03187ce7c0660f1' - '7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315' - '3945dc4cff9b20bddd2ac4f38d045f8caabb59368ab0b5e952d4194d06a1bdd9871546b84e9a54b692d2e3ca699aa065e5fa909a29ae80e102ed9635c94bcfd5' - '016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059' - 'eff7820dea7f79420ddc78fc744a34f6f5cedbf167d7ce98ed35d4ae0b1dab6cae026d5255a6cc428cdbc8f51784ed149c5ec8011ab72c31c65a5bfc6664b94f' - 'b9ae816af54a55e134a9307e376f05367b815f1b3fd545c2a2c312d18aedcf907f413e8bad8db980cdd9aad4011a72a79e1e94594f69500939a9cb46287f2f81' - 'fe58e950514743a72467233ff2f2a63112c50e5db843d61e141a5ca3dd8ef8f42a616cd9de7748ae582054c47c2cc38ce48b638e2d88be39c1387f77e79c83e1' - '756f48579e2913aa50a547ea7a0a534e0b0cfb4b3246f97a232360331e3dd2fe891effba4c7ac36c3f4b73867b3d75e4d58fd3c428249b73a67e54b54f5e2f0f' - '6d89d247bfbaee977be8e318ab93234b242780fd0a682f4ad0e825486cfa5e8ee0e41899ec142c921fc220f3f7ed0759e27502bcd373b869564ee438301e699e' - '00c9901cf5b460e20d8010d4aedfd7c338c76d1053f9ddcd9d4aa2c183345e3b810d0bee1207ff9a7ad988577192c52470ca62c67130a981fa67e393d5c70129' - '982ade883afbe2e656a9cbbe36c31c0e8b4f7bbbe5b63df9f7b834f02a9153032fb7445c85d3e91f62c68a7ddd13c3afbf420fb71cdd13d9c4b69f867bdd9f37' - '2d97a41b3998c196c440dcaf43ad8992eae27c5356c94b24f4cc4b20169350f3d6c8d65bb9c2517415ee15637fa60298d9cd8252ad9aa3eec6ae3a847ede0611' - 'e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37' - '9a1da0f1a156ce58ed25b20d4e06ac11c0a3040bc032a77c688a518dcb308c6f8ffe6bdeaa608d03fd1feead89ac5f04ce98853de88d32a1af0a79005a0c26bd' - '2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592' - '0bfd7ab2e42c4905f2542a4dbd93cf30d15a8808d527e6bcb6b14f75de226c94c0e0dea6ff69bbac37d3da605acfa2035e2d0e9fe0a41d7beb33cfea5ed2340b' - '8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3' - 'df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a' - 'd6a7ae560621407b7a5f94db6489d6a85c5056f4212a2a9a24210eaeb585caf4f15801282d1b8682962c0cf5642766fe09cc70c48fffafd1560de615154503af' - '982771fd7e1d260d8d4305eb18a3c15871f535b700d2b9554af24df62286e59ce6c5c76ef4ffee7a751fc01040eefaaabad71b2f67e3749ba1ee97a368b14d5a' - '2c968750da3252e8dcce4cebf105a26a9dbc471e39bda7d66180e0fbf930b11dd3a98337d7c387026375918b660768c637c2f2031d6624ce3237d9cc8cd88a02' - 'b2233d9330fa06d13dc8d222fa16198a1f81dcb9c87ca93961db54d9f2514cdabd824d0f25c0cca678495f271f48f601ee14363c2a2f833100facae307226beb' - '018418d0ef66c9ab5d67a8e68ed6f95c7a04ad2a8a073747f39d9db8e83cf72c685d388a727363788042e45d440a69651ec928ccdeed835915ebc8c676b43519' - 'd1edeeafef69730429c19e07b4b39ff388047042880c61907fb2e6d8a907011edb78a29faa265f8e07d2c3bb18d63d62dd384338729e2549995f7f2a0903783d' - 'ce83d729f8fce5fd3da0564f25b352d44d1f62e9a68e9315a04af377ebc36cbf92cf8ea0a55919f0b9f8f19c493c5ad59c976d0ff6b9f3652e587ef7240c0414' - '322cff79ad490767910fe8697ba86fafcc60f93e7b1739886c6167c9d5cf92467a6223da8c66b9f769419958fc6cd34354ae0eb81ad7d3e7d2fcf512b33d787f' - '9028ac41e3acdf4405095addb69537e87edecafaec840296ac27a5a8992fe132dc822e4e4abb8826f76460c438da2719dea17859690d03e17198a82086a3d660' - '4b690a721311a310131041ab962c571f1898f884f55fedf91b842e5190ce58399cccf59d34b4716d5dc15df4183f994d84c7c39f8458cb5f5da870ddc2db1730' - '47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736' - '30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4' - 'a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7' - 'f6cb7f6f7713d6f2c78c0b0254f385701f28b997931007997f0702af0dcd0d1b1bf08617dbb3abd21219c23a63ec3286e019896253ff7e9bdbb218a5bb17dd80' - 'a6baf20b9911734b69784c393c8f38a0bf41c9621ab9332761ecb8b5fdcebf18be7f30a5a77bf3755aa45222b2f27f810a762436c43b03dd74e6806e04d5a90f' - 'ec3520094a679fee962244364d8093b471e7edd5fce434c6d307854952f2ad9d2f041ce5fd5f23ece93a856d59a966daaf5abc114b7d1f3519b930b2e8f14f62' - 'd645817913d5b52e928561b3d6a0e869d8ae5db81b97af91c1ebfc6a8cd2df666c1653e6dc5f91c0a890033a89692f77eaf081c1cae5590446c69a70ea263946' - '6ad3a29a9a376e7dc19279f7effd643b7f55e66461925689c0a7bc43d3484d001d9c027b53e16b3b5b526f45fb0cc47d31f68b2d3137fbb9203e03e66795304f' - '541702557231c79413ae77cf26c28398fea3cb332375f8d22e0c0a45706b04db954d268addd76fecbb8b0ab3109f1009c18b0599394ed33c4a6fc8dc647d889e' - 'b367c412f2aebdfa90fae912467ebf227b39be04b45f686c5ea5f66df6addc81a2f130dd616dae932a55108337169e19ef53012f27127eb1970852ed5ea697c0' - '9c67f021239ce555d6c8fc5ae4e4885c5c74e5778e9dd33d4f079d61c601b603fad10865119dc3b17263330f6159a4f73a37260af88bb47f1b8a30457c4a17ee' - '4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c' - '03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2' - 'bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604') - - -pkgver() { - date +%Y%m%d -} - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_apache-openrc() { - pkgdesc="OpenRC apache init script" - depends=('openrc' 'apache') - backup=('etc/conf.d/httpd') - - install -Dm644 "${srcdir}/gentoo-apache-${_apver}/init/apache2.confd" "${pkgdir}/etc/conf.d/httpd" - install -Dm755 "${srcdir}/gentoo-apache-${_apver}/init/apache2.initd" "${pkgdir}/etc/init.d/httpd" - - sed -e 's|/usr/sbin/apache2|/usr/bin/apachectl|' \ - -e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \ - -e 's/! test -f/test -f/' \ - -e 's|/usr/lib/apache2|/usr/lib/httpd|' \ - -e 's|apache2.pid|httpd/httpd.pid|' \ - -e 's|apache2 >/dev/null|httpd >/dev/null|' \ - -e 's|/run/apache_ssl_mutex|/run/httpd|' \ - -i "${pkgdir}/etc/init.d/httpd" - - sed -e 's|/etc/apache2/httpd.conf|/etc/httpd/conf/httpd.conf|' \ - -e 's|/usr/lib/apache2|/usr/lib/httpd|' \ - -e 's|apache2.pid|httpd/httpd.pid|' \ - -e 's|apache2|httpd|g' \ - -i "${pkgdir}/etc/conf.d/httpd" -} - -package_autofs-openrc() { - pkgdesc="OpenRC autofs init script" - depends=('openrc' 'autofs') - - _inst_initd 'autofs' -} - -package_bind-openrc() { - pkgdesc="OpenRC bind init script" - depends=('openrc' 'bind') - backup=('etc/conf.d/named') - - _inst_confd 'named' - _inst_initd 'named' - - sed -e 's|/etc/bind/named.conf|/etc/named.conf|g' \ - -i "${pkgdir}/etc/init.d/named" -} - -package_cyrus-sasl-openrc() { - pkgdesc="OpenRC cyrus-sasl init script" - depends=('openrc' 'cyrus-sasl') - - _inst_initd 'saslauthd' -} - -package_dhcp-openrc() { - pkgdesc="OpenRC dhcp init script" - depends=('openrc' 'dhcp') - optdepends=('openldap-openrc: openldap initscript' - 'bind-openrc: bind initscript') - backup=('etc/conf.d/dhcpd' - 'etc/conf.d/dhcrelay' - 'etc/conf.d/dhcrelay6') - install=dhcp.install - - for f in dhcpd dhcrelay;do - _inst_confd $f - _inst_initd $f - done -# - _inst_confd 'dhcrelay6' -# _inst_initd 'dhcrelay6' - - install -Dm755 "${srcdir}/dhcrelay.initd" "${pkgdir}/etc/init.d/dhcrelay6" - - for f in ${pkgdir}/etc/init.d/*;do - sed -e 's|#@slapd@|ldap slapd|' \ - -i $f - done -} - -package_dovecot-openrc() { - pkgdesc="OpenRC dovecot init script" - depends=('openrc' 'dovecot') - - _inst_initd 'dovecot' -} - -package_exim-openrc() { - pkgdesc="OpenRC exim init script" - depends=('openrc' 'exim') - backup=('etc/conf.d/exim') - - _inst_initd 'exim' - _inst_confd 'exim' - - sed -e 's|/etc/exim|/etc/mail|g' -i "${pkgdir}/etc/init.d/exim" -} - -package_hostapd-openrc() { - pkgdesc="OpenRC hostapd init script" - depends=('openrc' 'hostapd') - backup=('etc/conf.d/hostapd') - - _inst_confd 'hostapd' - _inst_initd 'hostapd' -} - -package_krb5-openrc() { - pkgdesc="OpenRC krb5 init script" - depends=('openrc' 'krb5') - - for f in krb5kadmind krb5kdc krb5kpropd;do - _inst_initd $f - done - - for f in ${pkgdir}/etc/init.d/*;do - sed -e 's|mit-krb5kdc|krb5kdc|g' \ - -e 's|mit-krb5kadmind|krb5kadmind|g' \ - -i $f - done -} - -package_lighttpd-openrc() { - pkgdesc="OpenRC lighttpd init script" - depends=('openrc' 'lighttpd') - backup=('etc/conf.d/lighttpd') - install=lighttpd.install - - _inst_confd 'lighttpd' - _inst_initd 'lighttpd' - - sed -e 's/lighttpd:lighttpd/http:http/' \ - -i "${pkgdir}/etc/init.d/lighttpd" -} - -package_nginx-openrc() { - pkgdesc="OpenRC nginx init script" - depends=('openrc' 'nginx') - backup=('etc/conf.d/nginx') - - _inst_confd 'nginx' - _inst_initd 'nginx' - -} - -package_opendkim-openrc() { - pkgdesc="OpenRC opendkim init script" - depends=('openrc' 'opendkim') - - _inst_initd 'opendkim' - -} - -package_opendmarc-openrc() { - pkgdesc="OpenRC opendmarc init script" - depends=('openrc' 'opendmarc') - - _inst_confd 'opendmarc' - _inst_initd 'opendmarc' - -} - -package_openldap-openrc() { - pkgdesc="OpenRC openldap init script" - depends=('openrc' 'openldap') - backup=('etc/conf.d/slapd') - - _inst_confd 'slapd' - _inst_initd 'slapd' - - sed -e 's|/usr/lib/openldap/slapd|/usr/lib/slapd|g' \ - -i "${pkgdir}/etc/init.d/slapd" -} - -package_openntpd-openrc() { - pkgdesc="OpenRC openntpd init script" - depends=('openrc' 'openntpd') - groups=('openrc-net') - provides=('openrc-timed') - conflicts=('ntp' 'ntp-openrc' 'systemd-sysvcompat') - backup=('etc/conf.d/ntpd') - - _inst_confd 'ntpd' - _inst_initd 'ntpd' -} - -package_opensmtpd-openrc() { - pkgdesc="OpenRC opensmtpd init script" - depends=('openrc' 'opensmtpd') - - _inst_initd 'smtpd' -} - -package_openssh-openrc() { - pkgdesc="OpenRC openssh init script" - depends=('openrc' 'openssh') - optdepends=('bind-openrc: bind initscript') - backup=('etc/conf.d/sshd') - - _inst_confd 'sshd' - _inst_initd 'sshd' -} - -package_openvpn-openrc() { - pkgdesc="OpenRC openvpn init script" - depends=('openrc' 'openvpn') - backup=('etc/conf.d/openvpn') - - _inst_confd 'openvpn' - _inst_initd 'openvpn' -} - -package_polipo-openrc() { - pkgdesc="OpenRC polipo init script" - depends=('openrc' 'polipo') - - _inst_initd 'polipo' -} - -package_postfix-openrc() { - pkgdesc="OpenRC postfix init script" - depends=('openrc' 'postfix') - optdepends=('bind-openrc: bind initscript' - 'cyrus-sasl-openrc: cyrus-sasl initscript') - - _inst_initd 'postfix' -} - -package_privoxy-openrc() { - pkgdesc="OpenRC privoxy init script" - depends=('openrc' 'privoxy') - - _inst_initd 'privoxy' - - sed -e "${_shebang}" \ - -e "${_runpath}" \ - -i "${pkgdir}/etc/init.d/privoxy" -} - -package_rsync-openrc() { - pkgdesc="OpenRC rsync init script" - depends=('openrc' 'rsync') - backup=('etc/conf.d/rsyncd') - - _inst_confd 'rsyncd' - _inst_initd 'rsyncd' -} - -package_samba-openrc() { - pkgdesc="OpenRC samba init script" - depends=('openrc' 'samba') - backup=('etc/conf.d/smb') - - _inst_confd 'smb' - _inst_initd 'smb' - - sed -e 's/="samba"/="smb"/' \ - -i "${pkgdir}/etc/conf.d/smb" - - sed -e 's/##samba/##smb/' \ - -e 's|"samba"|"smb"|' \ - -i "${pkgdir}/etc/init.d/smb" -} - -package_spamassassin-openrc() { - pkgdesc="OpenRC spamassassin init script" - depends=('openrc' 'spamassassin') - backup=('etc/conf.d/spamassassin') - - _inst_confd 'spamassassin' - _inst_initd 'spamassassin' -} - -package_squid-openrc() { - pkgdesc="OpenRC squid init script" - depends=('openrc' 'squid') - optdepends=('bind-openrc: bind initscript') - backup=('etc/conf.d/squid') - - _inst_confd 'squid' - _inst_initd 'squid' - - sed -e 's|chown squid|chown proxy|' \ - -e 's|squid:squid|proxy:proxy|' \ - -i "${pkgdir}/etc/init.d/squid" -} - -package_syncthing-openrc() { - pkgdesc="OpenRC syncthing init script" - depends=('openrc' 'syncthing') - backup=('etc/conf.d/syncthing') - - _inst_confd 'syncthing' - _inst_initd 'syncthing' -} - -package_tor-openrc() { - pkgdesc="OpenRC tor init script" - depends=('openrc' 'tor') - backup=('etc/conf.d/tor') - install=tor.install - - _inst_confd 'tor' - _inst_initd 'tor' -} - -package_transmission-openrc() { - pkgdesc="OpenRC transmission init script" - depends=('openrc' 'transmission-cli') - backup=('etc/conf.d/transmission-daemon') - - _inst_confd 'transmission-daemon' - _inst_initd 'transmission-daemon' -} - -package_ufw-openrc() { - pkgdesc="OpenRC ufw init script" - depends=('openrc' 'ufw') - backup=('etc/conf.d/ufw') - - _inst_confd 'ufw' - _inst_initd 'ufw' - - sed -e 's|/usr/share/ufw/ufw-init-functions|/usr/lib/ufw/ufw-init-functions|g' \ - -i "${pkgdir}/etc/init.d/ufw" -} - -package_unbound-openrc() { - pkgdesc="OpenRC unbound init script" - depends=('openrc' 'unbound') - backup=('etc/conf.d/unbound') - - _inst_confd 'unbound' - _inst_initd 'unbound' -} - -package_vnstat-openrc() { - pkgdesc="OpenRC vnstat init script" - depends=('openrc' 'vnstat') - backup=('etc/conf.d/vnstatd') - - _inst_confd 'vnstatd' - _inst_initd 'vnstatd' -} - -package_vsftpd-openrc() { - pkgdesc="OpenRC vsftpd init script" - depends=('openrc' 'vsftpd') - optdepends=('bind-openrc: bind initscript') - - _inst_initd 'vsftpd' - - install -Dm755 "${srcdir}/vsftpd-checkconfig.sh" "${pkgdir}/usr/lib/vsftpd-checkconfig.sh" - - sed -e 's|/usr/libexec/|/usr/lib/|g' \ - -e 's|/etc/vsftpd/|/etc/|g' \ - -i "${pkgdir}/etc/init.d/vsftpd" - - sed -e 's|/etc/vsftpd/|/etc/|g' \ - -i "${pkgdir}/usr/lib/vsftpd-checkconfig.sh" -} - -package_wicd-openrc() { - pkgdesc="OpenRC wicd script" - depends=('openrc' 'wicd') - install=wicd.install - - _inst_initd 'wicd' -} - -package_x2goserver-openrc() { - pkgdesc="OpenRC x2goserver init script" - depends=('openrc' 'x2goserver') - - _inst_initd 'x2goserver' -} - -package_xinetd-openrc() { - pkgdesc="OpenRC xinetd init script" - depends=('openrc' 'xinetd') - backup=('etc/conf.d/xinetd') - - _inst_confd 'xinetd' - _inst_initd 'xinetd' -} diff --git a/pcr/openrc-net/dhcp.install b/pcr/openrc-net/dhcp.install deleted file mode 100644 index 906cd4e48..000000000 --- a/pcr/openrc-net/dhcp.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { -# _usr="dhcp" -# _grp="dhcp" -# echo " ==> requires $_usr user" -# echo " ==> requires $_grp group" -} diff --git a/pcr/openrc-net/lighttpd.install b/pcr/openrc-net/lighttpd.install deleted file mode 100644 index f01b5f13e..000000000 --- a/pcr/openrc-net/lighttpd.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { -# conf1='server.pid-file = "/run/lighttpd.pid"' -# conf2='server.bind = "localhost"' -# file="/etc/lighttpd/lighttpd.conf" -# echo " ==> $file requires $conf1" -# echo " ==> $file requires $conf2(or any binding interface)" -} diff --git a/pcr/openrc-net/opendkim.initd b/pcr/openrc-net/opendkim.initd deleted file mode 100644 index 0d075d166..000000000 --- a/pcr/openrc-net/opendkim.initd +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONFFILE=/etc/opendkim/${SVCNAME}.conf - -depend() { - use dns logger net - before mta -} - -check_cfg() { - - PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}") - local PIDDIR="${PIDFILE%/*}" - if [ ! -d "${PIDDIR}" ] ; then - checkpath -q -d -o opendkim:mail -m 0755 "${PIDDIR}" || return 1 - fi - if [ ! -f "${CONFFILE}" ] ; then - eerror "Configuration file ${CONFFILE} is missing" - return 1 - fi - if [ -z "${PIDFILE}" ] ; then - eerror "Configuration file needs PidFile setting - recommend adding 'PidFile /run/opendkim/${SVCNAME}.pid' to ${CONFFILE}" - return 1 - fi - - if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then - eerror "${SVCNAME} service cannot run with Background key set to yes!" - return 1 - fi -} - -start() { - check_cfg || return 1 - - # Remove stalled Unix socket if no other process is using it - local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}") - - if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then - rm "${UNIX_SOCKET}" - fi - - ebegin "Starting OpenDKIM" - start-stop-daemon --start --pidfile "${PIDFILE}" \ - --exec /usr/bin/opendkim -- -x "${CONFFILE}" - eend $? -} - -stop() { - check_cfg || return 1 - ebegin "Stopping OpenDKIM" - start-stop-daemon --stop --pidfile "${PIDFILE}" - eend $? -} diff --git a/pcr/openrc-net/opendmarc.confd b/pcr/openrc-net/opendmarc.confd deleted file mode 100644 index 20a9b04f5..000000000 --- a/pcr/openrc-net/opendmarc.confd +++ /dev/null @@ -1,3 +0,0 @@ -# user/group to run opendmarc daemon as -OPENDMARC_USER=opendmarc -OPENDMARC_GROUP=mail diff --git a/pcr/openrc-net/syncthing.confd b/pcr/openrc-net/syncthing.confd deleted file mode 100644 index 1580caea0..000000000 --- a/pcr/openrc-net/syncthing.confd +++ /dev/null @@ -1,3 +0,0 @@ -SYNCTHING_USER="syncthing" -SYNCTHING_ADDRESS="127.0.0.1:8080" -SYNCTHING_ARGS=""
\ No newline at end of file diff --git a/pcr/openrc-net/syncthing.initd b/pcr/openrc-net/syncthing.initd deleted file mode 100644 index 1e5f9c678..000000000 --- a/pcr/openrc-net/syncthing.initd +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -depend() { - need net -} - -start() { - ebegin "Starting syncthing" - start-stop-daemon --start --make-pidfile --pidfile /run/syncthing.pid \ - --background --user ${SYNCTHING_USER} --name syncthing \ - --exec /usr/bin/syncthing -- -gui-address=${SYNCTHING_ADDRESS} ${SYNCTHING_ARGS} - eend $? -} - -stop() { - ebegin "Stopping syncthing" - start-stop-daemon --stop --pidfile /run/syncthing.pid --user ${SYNCTHING_USER} - eend $? -} diff --git a/pcr/openrc-net/tor.install b/pcr/openrc-net/tor.install deleted file mode 100644 index c81a7dde0..000000000 --- a/pcr/openrc-net/tor.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - echo " ==> /etc/tor/torrc needs these adjustments:" - echo " User tor" - echo " PIDFile /run/tor/tor.pid" - echo " Log notice syslog" - echo " DataDirectory /var/lib/tor/data" -} diff --git a/pcr/openrc-net/wicd.initd b/pcr/openrc-net/wicd.initd deleted file mode 100644 index 70123946c..000000000 --- a/pcr/openrc-net/wicd.initd +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# opts="start stop restart" - -WICD_DAEMON=/usr/bin/wicd -WICD_PIDFILE=/run/wicd/wicd.pid - -depend() { - need dbus - after hald - provide net -} - -start() { - ebegin "Starting wicd daemon" - # fix Gentoo bug 296197 - #[ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf - "${WICD_DAEMON}" >/dev/null 2>&1 - eend $? -} - -stop() { - ebegin "Stopping wicd daemon and closing connections" - # can't use ssd because it needs the -k option - "${WICD_DAEMON}" -k >/dev/null 2>&1 - eend $? -} - -force_kill() { - ebegin "Stopping wicd daemon" - start-stop-daemon --stop --pidfile "${WICD_PIDFILE}" - eend $? -} - -restart() { - force_kill - #start - sve_start -} diff --git a/pcr/openrc-net/wicd.install b/pcr/openrc-net/wicd.install deleted file mode 100644 index 9d3ba18f3..000000000 --- a/pcr/openrc-net/wicd.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { -# echo "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:" -# echo "Remove all net.* initscripts (except for net.lo) from all runlevels" -# echo "Add these scripts to the RC_PLUGsvcS line in /etc/rc.conf" -# echo "(For example, rc_hotplug="!net.eth* !net.wlan*")" -} diff --git a/pcr/openrc-video/PKGBUILD b/pcr/openrc-video/PKGBUILD deleted file mode 100644 index 0566b3fc3..000000000 --- a/pcr/openrc-video/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer (Artix): artoo <artoo@cromnix.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -_url="https://raw.githubusercontent.com/gentoo/gentoo/master" - -_sed_args=(-e 's|/var/run|/run|g' -e 's|/usr/sbin|/usr/bin|g') -prefix=true - -$_prefix && _sed_args+=(-e 's|#!/sbin/openrc-run|#!/usr/bin/openrc-run|g') - -pkgbase=openrc-video -pkgname=('virtualgl-openrc') -pkgver=20170927 -pkgrel=1 -arch=('any') -url="https://github.com/artix-linux" -license=('GPL') -groups=('openrc-video') -source=("vgl.confd::${_url}/x11-misc/virtualgl/files/vgl.confd-r2" - "vgl.initd::${_url}/x11-misc/virtualgl/files/vgl.initd-r3" - "${_url}/x11-misc/virtualgl/files/vgl-helper.sh") -sha256sums=('5356391cec2e297f2fafa370f42be225ad4238ac61182b90720a3d914261a80f' - 'e59320152be7d3631e3bdcd10be412b2ca1bc7c1bcdb135cb19142114e6358f0' - '438c928840fbfb9274604296b8178e7f97b42a3428d115e1de6e609ea3146497') - -pkgver() { - date +%Y%m%d -} - -_inst_initd(){ - install -Dm755 ${srcdir}/$1.initd ${pkgdir}/etc/init.d/$1 - - sed ${_sed_args[@]} -i ${pkgdir}/etc/init.d/$1 -} - -_inst_confd(){ - install -Dm755 ${srcdir}/$1.confd ${pkgdir}/etc/conf.d/$1 -} - -package_virtualgl-openrc() { - pkgdesc="OpenRC virtualgl init script" - depends=('openrc' 'virtualgl') - install=virtualgl.install - backup=('etc/conf.d/vgl') - - _inst_confd 'vgl' - _inst_initd 'vgl' - - install -Dm755 "${srcdir}/vgl-helper.sh" "${pkgdir}"/usr/lib/vgl-helper.sh - install -dm750 "${pkgdir}"/var/lib/VirtualGL -} diff --git a/pcr/openrc-video/virtualgl.install b/pcr/openrc-video/virtualgl.install deleted file mode 100644 index 89648c3c2..000000000 --- a/pcr/openrc-video/virtualgl.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - chown root:video /var/lib/VirtualGL - chmod 0750 /var/lib/VirtualGL -} diff --git a/pcr/openssh-knock/PKGBUILD b/pcr/openssh-knock/PKGBUILD index ffa5a1aed..232a379bc 100644 --- a/pcr/openssh-knock/PKGBUILD +++ b/pcr/openssh-knock/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 291134 2017-03-20 21:48:15Z bisson $ -# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org> -# Contributor (Arch): Aaron Griffin <aaron@archlinux.org> -# Contributor (Arch): judd <jvinet@zeroflux.org> +# Maintainer (arch): Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> # Maintainer: André Silva <emulatorman@hyperbola.info> # Contributor: Márcio Silva <coadde@hyperbola.info> # Contributor: Julian Kirsch <kirschju@sec.in.tum.de> diff --git a/pcr/openswan/PKGBUILD b/pcr/openswan/PKGBUILD index d3a9a16d4..b4c8cbec2 100644 --- a/pcr/openswan/PKGBUILD +++ b/pcr/openswan/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Carsten Feuls <archlinux@carstenfeuls.de> -# Contributor (AUR): AXVill -# Contributor (AUR): dacoit <dacoit at tuta.io> -# Contributor (AUR): xjpvictor Huang <ke [AT] xjpvictor [DOT] info> -# Contributor (AUR): uuwe +# Maintainer (aur): Carsten Feuls <archlinux@carstenfeuls.de> +# Contributor: AXVill +# Contributor: dacoit <dacoit at tuta.io> +# Contributor: xjpvictor Huang <ke [AT] xjpvictor [DOT] info> +# Contributor: uuwe # parabola changes and rationale: # - removed "open source" term from pkgdesc diff --git a/pcr/opentracker-git/PKGBUILD b/pcr/opentracker-git/PKGBUILD index f5ef91aef..8f71dc8d7 100644 --- a/pcr/opentracker-git/PKGBUILD +++ b/pcr/opentracker-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): TheCreeper <loxoko@gmail.com> +# Maintainer (arch): TheCreeper <loxoko@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=opentracker-git diff --git a/pcr/otf-stix/PKGBUILD b/pcr/otf-stix/PKGBUILD index a8f973670..60522ea3f 100644 --- a/pcr/otf-stix/PKGBUILD +++ b/pcr/otf-stix/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # - added .install file to update font cache diff --git a/pcr/pacman-static/PKGBUILD b/pcr/pacman-static/PKGBUILD index a495afc13..30918cd1e 100644 --- a/pcr/pacman-static/PKGBUILD +++ b/pcr/pacman-static/PKGBUILD @@ -1,32 +1,38 @@ -# Maintainer (AUR): Eli Schwartz <eschwartz@archlinux.org> +# Maintainer (aur): Eli Schwartz <eschwartz@archlinux.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + # parabola changes and rationale: -# no changes. +# - add wip arches + pkgname=pacman-static -pkgver=5.2.2 -_cares_ver=1.17.1 -_nghttp2_ver=1.43.0 -_curlver=7.76.0 -_sslver=1.1.1k -_zlibver=1.2.11 -_xzver=5.2.5 +pkgver=6.0.2 +_cares_ver=1.18.1 +_nghttp2_ver=1.50.0 +_curlver=7.86.0 +_sslver=3.0.7 +_zlibver=1.2.13 +_xzver=5.2.7 _bzipver=1.0.8 -_zstdver=1.4.9 -_libarchive_ver=3.5.1 -_gpgerrorver=1.42 +_zstdver=1.5.2 +_libarchive_ver=3.6.1 +_gpgerrorver=1.46 _libassuanver=2.5.5 -_gpgmever=1.15.1 -pkgrel=4 +_gpgmever=1.18.0 +pkgrel=3 pkgdesc="Statically-compiled pacman (to fix or install systems without libc)" -arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') +arch=('i486' 'i686' 'pentium4' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') +arch+=('ppc64le' 'riscv64') +#arch=('aarch64' 'armv7h' 'i686' 'ppc64le' 'riscv64le' 'x86_64') # parabola arches url="https://www.archlinux.org/pacman/" license=('GPL') depends=('pacman') -makedepends=('musl' 'kernel-headers-musl') +makedepends=('meson' 'musl' 'kernel-headers-musl') +options=('!emptydirs') # pacman -source=("https://sources.archlinux.org/other/pacman/pacman-${pkgver}.tar.gz"{,.sig}) +source=("https://sources.archlinux.org/other/pacman/pacman-${pkgver}.tar.xz"{,.sig}) validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD' # Allan McRae <allan@archlinux.org> 'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org> # nghttp2 @@ -38,9 +44,11 @@ validpgpkeys+=('27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2') # Daniel Stenberg <da source+=("https://curl.haxx.se/download/curl-${_curlver}.tar.gz"{,.asc}) # openssl source+=("https://www.openssl.org/source/openssl-${_sslver}.tar.gz"{,.asc} - "ca-dir.patch") + "ca-dir.patch" + "openssl-3.0.7-no-atomic.patch") validpgpkeys+=('8657ABB260F056B1E5190839D9C4D26D0E604491' # Matt Caswell <matt@openssl.org> - '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C') # Richard Levitte <levitte@openssl.org> + '7953AC1FBC3DC8B3B292393ED5E9E43F7DF9EE8C' # Matt Caswell <matt@openssl.org> + 'A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C') # Tomá? Mráz <tm@t8m.info> # zlib source+=("https://zlib.net/zlib-${_zlibver}.tar.gz"{,.asc}) validpgpkeys+=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') # Mark Adler <madler@alumni.caltech.edu> @@ -51,68 +59,75 @@ validpgpkeys+=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin <lasse source+=("https://sourceware.org/pub/bzip2/bzip2-${_bzipver}.tar.gz"{,.sig}) validpgpkeys+=('EC3CFE88F6CA0788774F5C1D1AA44BE649DE760A') # Mark Wielaard <mark@klomp.org> # zstd -source+=("https://github.com/facebook/zstd/releases/download/v${_zstdver}/zstd-${_zstdver}.tar.zst") +source+=("https://github.com/facebook/zstd/releases/download/v${_zstdver}/zstd-${_zstdver}.tar.zst"{,.sig}) +validpgpkeys+=('4EF4AC63455FC9F4545D9B7DEF8FE99528B52FFD') # Zstandard Release Signing Key <signing@zstd.net> # libgpg-error source+=("https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${_gpgerrorver}.tar.bz2"{,.sig}) -validpgpkeys+=('6DAA6E64A76D2840571B4902528897B826403ADA' # "Werner Koch (dist signing 2020)" - '031EC2536E580D8EA286A9F22071B08A33BD3F06') # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org> +validpgpkeys+=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch + '031EC2536E580D8EA286A9F22071B08A33BD3F06' # NIIBE Yutaka (GnuPG Release Key) <gniibe@fsij.org> + '6DAA6E64A76D2840571B4902528897B826403ADA') # "Werner Koch (dist signing 2020)" # libassuan source+=("https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${_libassuanver}.tar.bz2"{,.sig}) # gpgme source+=("https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${_gpgmever}.tar.bz2"{,.sig}) +validpgpkeys+=('AC8E115BF73E2D8D47FA9908E98E9B2D19C6C8BD') # Niibe Yutaka (GnuPG Release Key) # libarchive -source+=("https://github.com/libarchive/libarchive/releases/download/${_libarchive_ver}/libarchive-${_libarchive_ver}.tar.xz"{,.asc}) +source+=("https://github.com/libarchive/libarchive/releases/download/v${_libarchive_ver}/libarchive-${_libarchive_ver}.tar.xz"{,.asc}) validpgpkeys+=('A5A45B12AD92D964B89EEE2DEC560C81CEC2276E') # Martin Matuska <mm@FreeBSD.org> -sha512sums=('1f9c569fb9cfe90afeeb7e3715bfa821ec4c57fdbbd7e09cd1e2519fad1a555b2f5378dedb2c2e551d2e92db92f1db9684969b472507f676c5bb932cdf436eda' +sha512sums=('9d76fb58c3a50e89a4b92b1f9e3bfdecca3f69e05022ea88fbd34f9df540c4fc688ad4f8b27e77eedb791aa682c27037abe65c789c6d9ee393bae5b620c3df13' 'SKIP' - 'eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39' - 'b11887bcc9274d368088e1a8b6aca62414f20675cf0bc58e948f54fa04c327c39dd23cefe7509eec6397db14b550a3f6b77f5c18b3d735b3eef48ce2da1dcd00' + 'c2f7f14972cb268a85966f2bd26ac515fa61d9cf6b6bcaa5cffc04f02a18abf116b15537eb4dfbdfa79e7b1472de7034dfdbce7a082cc5b23627d87e2939e529' + '1276ec0799916019f8c0af6b55a139701bd15e0ca4a00811d07963893978bc96c107b980f0fd49f81aa70bc8b3b8cd671195ba357c390772d4c2c5643c50c5a5' 'SKIP' - 'f074e9315739bb05fc194ef66b154912620df3ddec11c01ded8f2ecde08875006418a716919dafe5001256f912c07e5576072e1df9a683f91cd3bc8143c6f054' + 'b2d30b4d145a3621862a0f5e6378b5099ba92f4be6e92f4e070ec1299fc5eacba851bf993efd613b366fb81642f3f5cccb6e02adcd472dccc9c5e65c1a51812c' 'SKIP' - '73cd042d4056585e5a9dd7ab68e7c7310a3a4c783eafa07ab0b560e7462b924e4376436a6d38a155c687f6942a881cfc0c1b9394afcde1d8c46bf396e7d51121' + '6c2bcd1cd4b499e074e006150dda906980df505679d8e9d988ae93aa61ee6f8c23c0fa369e2edc1e1a743d7bec133044af11d5ed57633b631ae479feb59e3424' 'SKIP' - '3857c298663728a465b5f95a3ef44547efbfb420d755e9dde7f20aa3905171b400e1c126d8db5c2b916c733bbd0724d8753cad16c9baf7b12dcd225a3ee04a97' - '73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae' + 'b1873dbb7a49460b007255689102062756972de5cc2d38b12cc9f389b6be412da6797579b1acd3717a8cd2ee118fd9801b94e55f063d4328f050f0876a5eb53c' + 'b5887ea77417fae49b6cb1e9fa782d3021f268d5219701d87a092235964f73fa72a31428b630445517f56f2bb69dcbbb24119ef9dbf8b4e40a753369a9f9a16f' + '99f0e843f52290e6950cc328820c0f322a4d934a504f66c7caa76bd0cc17ece4bf0546424fc95135de85a2656fed5115abb835fd8d8a390d60ffaf946c8887ad' 'SKIP' - '7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce' + '06329fdbd1d897aa99dc96900c6246457288c586d02bb4869a92dd2f97973f95acb3a2fa9598a20613ea029f816836a8e3b65e36fec2b807b5e7553141429ab9' 'SKIP' '083f5e675d73f3233c7930ebe20425a533feedeaaa9d8cc86831312a6581cefbe6ed0d08d2fa89be81082f2a5abdabca8b3c080bf97218a1bd59dc118a30b9f3' 'SKIP' - 'e157cfcac64f5b86b4ddeefa7bfef1f721d3e74467459509794f43630e474976cae29f63a1aac73eca8f047d8b821a8265f8ceb646524fa66887def89629b69c' - 'f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4' + 'bf8183dcb42ac306c120836fdd03a13f3f41de72f697a928a7795008acc86e2533ce42f6b554bde7f1ca834f1a0282f8371585b9129ea88441f3f8dd49f1e923' + 'SKIP' + 'b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d' 'SKIP' '70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403' 'SKIP' - '1d75a848cce6389f7cb8896b57a28dfe1dc5a447bfb4f128b0994a43e04134343400a3be063e971f03dfd595474cfd558519741d5d56afb3e84853ad4f2a45c2' + 'c0cb0b337d017793a15dd477a7f5eaef24587fcda3d67676bf746bb342398d04792c51abe3c26ae496e799c769ce667d4196d91d86e8a690d02c6718c8f6b4ac' 'SKIP' - '04ad3e98e840fee19eb4c2652f29eccef1cffc071fd5c6a6feb358fea6048699281c7baacbb9ca8f823b1bfaaef6d4c87d9cf6a8b0c28aab53b75b2d259b2045' + '2e5a72edc468080c0e8f29e07d9c33826ffb246fa040ec42399bedeecf698b7555f69ffd15057ad79c0f50cd4926d43174599d99632b1b99ec6cd159c43a70b8' 'SKIP') -b2sums=('14896b3911f851f66b93443fe29eca9ffe21a73698ce7844a7924450c0399ce71d038843d8a4acedb029d5444cd1b409776d482edff5e58928e248068acb68dd' +b2sums=('648f62307e413cb352ed92e92df1ace510c1fc5e9ddd254baeef071e89cb7dae1786a95d29c5f69e8b03b1a8cfe3cd65671588dc362c8d3b281c092393aad54c' 'SKIP' - '0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc' - '31dac21ecae231e2a201dc1ba954c1a0663a06f93eb8e7e033ca3c6d385f53e07af0b04854739f1ee8a7f0693f67f620143e152ef092b49342c62279a0480905' + 'ae5d89a1f7287a3f2f2b9380ff5e9efb7f0646950d15ed281f268dafc65eb34ad7e34610333b4c98db8a657034ea462e7f1eda80ff2e94a918751dbb112c9a2a' + 'c03a572726c6bbb24a3e4773673d0c87f4833bb9582aed57a424eea8c965beb6e232f502b61922b124d37403d91ebfefe0db7373673fc22e0d752c4e5036eb07' 'SKIP' - '960b504ec084a75fa4ee8949b125198ea0da4bf62452d3861ee004ea6ab18ca6aa3ca572163004d3dd7b15b691eb132fb16f7ec8c400d7de6d8fac232a1a4e03' + '874805e4b100130ffa7196fb1ea7ab6ee38a00607194c7a6543a7cef904f08506811d6d7f95939985b0765f3a1789a3a3727c8429e050f47c373ca8ae4e6a8dc' 'SKIP' - 'e9bd90f17bc819c4960d07bbee04346e8a7adb87a764a09d033ef76f1d638c67b180c4f2beb84ec25fbff54ccc9c14c13b9b16a27cac231a5dd22b02635d5cec' + '141881071fa62f056c514e7c653a61c59cc45fe951ec094041e23fb5e619133b7ebbfe31cd8203969c9d8842b8cbc10ec58da67cc181761a11c1cfdd0869df9a' 'SKIP' - 'e2ff99e8236487f43171c771d0ee89137b73f3d0b2756bcb0d6525c810ffa9f5a3763c3744327fb47cef21eabfc50fff96632f4bbe2cd244206a99daffa0c25a' - '6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7' + '928c0cb15cca44bb7f194db9f95985f6c50aacd3e22fe2eb60ece26ed76469289f10d303c645a48407f3d6435ac66f25dd3c4cbc56fdc5dfd9ea2566feda9ff8' + 'c72172cf57389718b4722c3482ddaf9c2fc02aafe391c68edeb92d41fd6345a0a98f6fd63ddf01b33fe59a7a3f270ff1ccad432feba578b7b7e0170cd1dea7ef' + '73cd65f287d662a988287205b74e93d516d6a74e18555d0f1a2777557e73e81249b45341c687fe97e65406a7210f77b8914ed146bac517d3fcc4c9fcb16546d3' 'SKIP' - 'aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043' + '5363c5d0403e041c6d2e35b5d3321feeb8e63b8556496373c820975850b50e28e0da903446a49ba516fd9f40e0101dd39cfa9a9b8dd143c9849c84a715bb5d7b' 'SKIP' '22ab3acd84f4db8c3d6f59340c252faedfd4447cea00dafbd652e65b6cf8a20adf6835c22e58563004cfafdb15348c924996230b4b23cae42da5e25eeac4bdad' 'SKIP' - '01a5dedf211c8f136ed4d1a736a2de08329bfdd35b31c585c0a39c32c09c88f8eea9dff0cc646d7d40948b4837ad36a5380fb09cdbea1d05eccf7ffa403649ce' - 'eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8' + '513e4526a92bcb59416b3457d186a30e554f9e0cf21d7114eb3e9fbcbd9d662c8d95cf0b06237f6fe3f756862c63de0aa146d6a23cb4111c16e6459608d115f1' + 'SKIP' + '6748c463256b7d0a05fe89a63c5f3abda1975d861c35821248664f2f09cd2273ef619d12408b6107a99519939ca7214f492e705c29f52f7bbdc422237281c1ca' 'SKIP' '24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d' 'SKIP' - 'd3a6ccaa35360ed3fc79364dfcc3f2fdcb70e5e41ac72ef011373a39d5def9be9ce1be45843ab65a87630d3fc570d29db5f40b9a273aa8e281464c9d1d3477de' + 'a071b839eb75455378514f003920cd387320e9fae416e71151cf6ac1b4a058b58ed054450b79e3eeaf820ff5324ea14efa003612867477b7379a776942d62be6' 'SKIP' - '0be26a858bffc48bc3dea64e7ea16a703fd7dae1c37dd93e1acde291b6799e323461b3b0bb31c12f63e3429aa4be72d88636606d786978f8d56b94dd2dc144c7' + 'e7b79e97545dabeac164069e87adbd2081d3bd75c22f80b3797c6e487a477b3f6347b6fc14c76668eb69f2f2e5dcdd5a33a694e0a292ce426b8d0d93435218cf' 'SKIP') export LDFLAGS="$LDFLAGS -static" @@ -121,7 +136,7 @@ export CXX=musl-gcc # https://www.openwall.com/lists/musl/2014/11/05/3 # fstack-protector and musl do not get along but only on i686 -if [[ $CARCH = i686 ]]; then +if [[ $CARCH = i686 || $CARCH = pentium4 || $CARCH = i486 ]]; then # silly build systems have configure checks or buildtime programs that don't CFLAGS but do do CC export CC="musl-gcc -fno-stack-protector" export CXX="musl-gcc -fno-stack-protector" @@ -129,6 +144,10 @@ if [[ $CARCH = i686 ]]; then export CXXFLAGS="${CXXFLAGS/-fstack-protector-strong/}" fi +# to enable func64 interface in musl for 64-bit file system functions +export CFLAGS+=' -D_LARGEFILE64_SOURCE' +export CXXFLAGS+=' -D_LARGEFILE64_SOURCE' + # keep using xz-compressed packages, because one use of the package is to # recover on systems with broken zstd support in libarchive [[ $PKGEXT = .pkg.tar.zst ]] && PKGEXT=.pkg.tar.xz @@ -139,18 +158,29 @@ build() { # openssl cd "${srcdir}"/openssl-${_sslver} + patch -Np1 -i "${srcdir}/ca-dir.patch" case ${CARCH} in x86_64) openssltarget='linux-x86_64' optflags='enable-ec_nistp_64_gcc_128' ;; - i686) + pentium4) openssltarget='linux-elf' optflags='' ;; + i686) + openssltarget='linux-elf' + optflags='no-sse2' + ;; + i486) + openssltarget='linux-elf' + optflags='386 no-threads' + ;; arm|armv6h|armv7h) openssltarget='linux-armv4' optflags='' + # special patch to ommit -latomic when installing pkgconfig files + patch -Np1 -i "${srcdir}/openssl-3.0.7-no-atomic.patch" ;; aarch64) openssltarget='linux-aarch64' @@ -179,7 +209,7 @@ build() { # bzip2 cd "${srcdir}"/bzip2-${_bzipver} - sed -i "s|-O2|${CFLAGS}|g" Makefile + sed -i "s|-O2|${CFLAGS}|g;s|CC=gcc|CC=${CC}|g" Makefile make libbz2.a install -Dvm644 bzlib.h "${srcdir}"/temp/usr/include/ install -Dvm644 libbz2.a "${srcdir}"/temp/usr/lib/ @@ -236,7 +266,7 @@ build() { --disable-{dict,gopher,imap,imaps,ldap,ldaps,manual,pop3,pop3s,rtsp,scp,sftp,smb,smbs,smtp,smtps,telnet,tftp} \ --without-{brotli,libidn2,librtmp,libssh2} \ --disable-libcurl-option \ - --with-ssl \ + --with-openssl \ --enable-ares="${srcdir}"/temp/usr make -C lib make install-pkgconfigDATA @@ -248,7 +278,7 @@ build() { ./configure --prefix="${srcdir}"/temp/usr \ --disable-shared make -C src - make -C src install-{{,dist_}binSCRIPTS,libLTLIBRARIES,nodist_includeHEADERS,pkgconfigDATA} + make -C src install-{binSCRIPTS,libLTLIBRARIES,nodist_includeHEADERS,pkgconfigDATA} # libassuan cd "${srcdir}"/libassuan-${_libassuanver} @@ -268,27 +298,37 @@ build() { # ew libtool rm "${srcdir}"/temp/usr/lib/lib*.la - export PKG_CONFIG='pkg-config --static' # Finally, it's a pacman! - cd "${srcdir}"/pacman-${pkgver} - ./configure --prefix=/usr \ - --libdir=/usr/lib/pacman/lib \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --program-suffix=-static \ - --with-scriptlet-shell=/usr/bin/bash \ - --with-ldconfig=/usr/bin/ldconfig \ - --disable-shared \ - --disable-doc - make V=1 AM_LDFLAGS=-all-static + mkdir -p "${srcdir}"/pacman-${pkgver}/builddir + cd "${srcdir}"/pacman-${pkgver}/builddir + meson setup \ + --prefix=/usr \ + --includedir=lib/pacman/include \ + --libdir=lib/pacman/lib \ + --buildtype=plain \ + -Dbuildstatic=true \ + -Ddefault_library=static \ + -Ddoc=disabled \ + -Ddoxygen=disabled \ + -Dldconfig=/usr/bin/ldconfig \ + -Dscriptlet-shell=/usr/bin/bash \ + .. + ninja } package() { - cd "${srcdir}"/pacman-${pkgver} - make -C lib/libalpm DESTDIR="${pkgdir}" install-libLTLIBRARIES install-pkgconfigDATA - make -C src/util DESTDIR="${pkgdir}" install - make -C src/pacman DESTDIR="${pkgdir}" install-binPROGRAMS + cd "${srcdir}"/pacman-${pkgver}/builddir + DESTDIR="${pkgdir}" ninja install + + rm -rf "${pkgdir}"/usr/share "${pkgdir}"/etc + for exe in "${pkgdir}"/usr/bin/*; do + if [[ -f ${exe} && $(head -c4 "${exe}") = $'\x7fELF' ]]; then + mv "${exe}" "${exe}"-static + else + rm "${exe}" + fi + done cp -a "${srcdir}"/temp/usr/{bin,include,lib} "${pkgdir}"/usr/lib/pacman/ sed -i "s@${srcdir}/temp/usr@/usr/lib/pacman@g" \ diff --git a/pcr/pacman-static/ca-dir.patch b/pcr/pacman-static/ca-dir.patch index 1daba849b..9e5650d81 100644 --- a/pcr/pacman-static/ca-dir.patch +++ b/pcr/pacman-static/ca-dir.patch @@ -1,17 +1,19 @@ ---- apps/CA.pl.in 2016-09-26 11:46:04.000000000 +0200 -+++ apps/CA.pl.in 2016-11-01 16:02:16.709616823 +0100 -@@ -33,7 +33,7 @@ +diff -rauN openssl-3.0.7/apps/CA.pl.in openssl-3.0.7-patched/apps/CA.pl.in +--- openssl-3.0.7/apps/CA.pl.in 2022-11-01 15:14:36.000000000 +0100 ++++ openssl-3.0.7-patched/apps/CA.pl.in 2022-11-07 21:35:19.641418630 +0100 +@@ -29,7 +29,7 @@ my $PKCS12 = "$openssl pkcs12"; - # default openssl.cnf file has setup as per the following + # Default values for various configuration settings. -my $CATOP = "./demoCA"; +my $CATOP = "/etc/ssl"; my $CAKEY = "cakey.pem"; my $CAREQ = "careq.pem"; my $CACERT = "cacert.pem"; ---- apps/openssl.cnf 2016-09-26 11:46:04.000000000 +0200 -+++ apps/openssl.cnf 2016-11-01 16:02:48.378503427 +0100 -@@ -39,7 +39,7 @@ +diff -rauN openssl-3.0.7/apps/openssl.cnf openssl-3.0.7-patched/apps/openssl.cnf +--- openssl-3.0.7/apps/openssl.cnf 2022-11-01 15:14:36.000000000 +0100 ++++ openssl-3.0.7-patched/apps/openssl.cnf 2022-11-07 21:34:48.351281834 +0100 +@@ -79,7 +79,7 @@ #################################################################### [ CA_default ] @@ -20,7 +22,7 @@ certs = $dir/certs # Where the issued certs are kept crl_dir = $dir/crl # Where the issued crl are kept database = $dir/index.txt # database index file. -@@ -323,7 +323,7 @@ +@@ -309,7 +309,7 @@ [ tsa_config1 ] # These are used by the TSA reply generation only. diff --git a/pcr/pacman-static/openssl-3.0.7-no-atomic.patch b/pcr/pacman-static/openssl-3.0.7-no-atomic.patch new file mode 100644 index 000000000..a85cd0dfe --- /dev/null +++ b/pcr/pacman-static/openssl-3.0.7-no-atomic.patch @@ -0,0 +1,22 @@ +diff -rauN openssl-3.0.7/Configurations/10-main.conf openssl-3.0.7-no-atomic-patch/Configurations/10-main.conf +--- openssl-3.0.7/Configurations/10-main.conf 2022-11-01 14:14:36.000000000 +0000 ++++ openssl-3.0.7-no-atomic-patch/Configurations/10-main.conf 2022-11-18 11:10:30.699600180 +0000 +@@ -703,6 +703,9 @@ + inherit_from => [ "linux-generic32" ], + ex_libs => add(threads("-latomic")), + }, ++ "linux-not-latomic" => { ++ inherit_from => [ "linux-generic32" ] ++ }, + "linux-generic64" => { + inherit_from => [ "linux-generic32" ], + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR", +@@ -764,7 +767,7 @@ + # + # ./Configure linux-armv4 -march=armv6 -D__ARM_MAX_ARCH__=8 + # +- inherit_from => [ "linux-latomic" ], ++ inherit_from => [ "linux-not-latomic" ], + asm_arch => 'armv4', + perlasm_scheme => "linux32", + }, diff --git a/pcr/pacman2pacman/PKGBUILD b/pcr/pacman2pacman/PKGBUILD index 6489b3c47..21c1fa91b 100644 --- a/pcr/pacman2pacman/PKGBUILD +++ b/pcr/pacman2pacman/PKGBUILD @@ -1,4 +1,7 @@ -# Maintainer: Joseph Graham <joseph@xylon.me.uk> +# SPDX-License-Identifier: CC0-1.0 +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> +# Contributor: Joseph Graham <joseph@xylon.me.uk> + pkgname=pacman2pacman pkgver=20170705.1 @@ -20,7 +23,9 @@ _gitver='commit=b3e6461c5b9da4612fc87be5118b848fcc22e097' mksource=("$pkgname-$pkgver::git://git.parabola.nu/pacman2pacman.git/#$_gitver") mkmd5sums=('SKIP') -package() { + +package() +{ cd $pkgname-$pkgver mkdir -p "${pkgdir}/srv/pacman2pacman/torrents" diff --git a/pcr/pacman4console/PKGBUILD b/pcr/pacman4console/PKGBUILD index 5be795080..86d6ba125 100644 --- a/pcr/pacman4console/PKGBUILD +++ b/pcr/pacman4console/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Erus <erus.iluvatar@gmail.com> +# Maintainer (aur): Erus <erus.iluvatar@gmail.com> # Maintainer: David P. <megver83@parabola.nu> pkgname=pacman4console diff --git a/pcr/pactools/PKGBUILD b/pcr/pactools/PKGBUILD index c634763ed..36291d89f 100644 --- a/pcr/pactools/PKGBUILD +++ b/pcr/pactools/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Pierluigi <pierluigi88@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Pierluigi <pierluigi88@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=pactools pkgver=0.8.2 diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD index 1f9b76f98..8687c7dca 100644 --- a/pcr/par/PKGBUILD +++ b/pcr/par/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Ray Hogenson <rayhogenson@gmail.com> +# Maintainer (arch): Ray Hogenson <rayhogenson@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=par pkgver=1.52 diff --git a/pcr/parabolaiso-git/PKGBUILD b/pcr/parabolaiso-git/PKGBUILD deleted file mode 100644 index 7ae150318..000000000 --- a/pcr/parabolaiso-git/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer (Arch): David Runge <dvzrv@archlinux.org> -# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de> -# Contributor (Arch): Gerardo Exequiel Pozzi <djgera@archlinux.org> -# Maintainer: David P. <megver83@parabola.nu> -# Contributor: André Silva <emulatorman@hyperbola.info> - -pkgbase=parabolaiso-git -_pkgbase=parabolaiso -pkgname=(parabolaiso-git mkinitcpio-parabolaiso-git) -pkgver=v51.r1.c43fdf45 -pkgrel=1 -pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images' -arch=('any') -license=('GPL3') -url='https://git.parabola.nu/parabolaiso.git/' -makedepends=('git') -_commit=c43fdf4 -source=("git+https://git.parabola.nu/packages/parabolaiso.git#commit=${_commit}?signed") -sha256sums=('SKIP') -validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P. - -pkgver() { - cd "${_pkgbase}" - printf "%s" "$(git describe --long | sed 's/\([^-]*-\)g/r\1/;s/-/./g')" -} - -package_parabolaiso-git() { - depends=('arch-install-scripts' 'bash' 'dosfstools' 'e2fsprogs' 'libisoburn' - 'mtools' 'squashfs-tools') - optdepends=('edk2-ovmf: for emulating UEFI with run_parabolaiso' - 'qemu: for run_parabolaiso') - provides=("archiso-git=$pkgver" 'parabolaiso') - conflicts=('archiso-git' 'parabolaiso') - replaces=('archiso-git') - cd "${_pkgbase}" - make DESTDIR="${pkgdir}" install -} - -package_mkinitcpio-parabolaiso-git() { - pkgdesc='Mkinitcpio hooks and scripts for parabolaiso' - depends=('mkinitcpio') - provides=("mkinitcpio-archiso-git=$pkgver" 'mkinitcpio-parabolaiso') - conflicts=('mkinitcpio-archiso-git' 'mkinitcpio-parabolaiso') - replaces=('mkinitcpio-archiso-git') - cd "${_pkgbase}" - make DESTDIR="${pkgdir}" install-initcpio -} diff --git a/pcr/parcimonie-sh-git/PKGBUILD b/pcr/parcimonie-sh-git/PKGBUILD index 818d23eb7..f51a36301 100644 --- a/pcr/parcimonie-sh-git/PKGBUILD +++ b/pcr/parcimonie-sh-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Frederik Schwan <frederik dot schwan at linux dot com> -# Contributor (AUR): Etienne Perot <etienne at perot dot me> +# Maintainer (aur): Frederik Schwan <frederik dot schwan at linux dot com> +# Contributor: Etienne Perot <etienne at perot dot me> # parabola changes and rationale: # - renamed pgp-key to avoid collisions diff --git a/pcr/pciutils-staticlibs/PKGBUILD b/pcr/pciutils-staticlibs/PKGBUILD index 5b52f41e1..d64807d7a 100644 --- a/pcr/pciutils-staticlibs/PKGBUILD +++ b/pcr/pciutils-staticlibs/PKGBUILD @@ -1,28 +1,38 @@ -# $Id$ -# Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (Arch pcutils): Tobias Powalowski <tpowa@archlinux.org> +# Maintainer (arch): Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Luke Shumaker <lukeshu@parabola.nu> +# Contributor: bill-auger <bill-auger@programmer.net> + + pkgname=pciutils -pkgver=3.3.0 -pkgrel=1 +pkgver=3.7.0 +pkgrel=2 pkgdesc="PCI bus configuration space access library and tools" -arch=(i686 x86_64) +arch=(x86_64) +arch+=(i686) license=('GPL2') -#groups=('base') -url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids' 'kmod') +url="https://mj.ucw.cz/sw/pciutils/" +depends=('glibc' 'hwdata' 'kmod') +#makedepends=('git') # FIXME: declared, but unused upstream ('pciutils') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) -md5sums=('b73bca5b1c2fd20a17a19f5040411521') + https://mj.ucw.cz/download/linux/pci/${pkgname}-${pkgver}.tar.gz{,.sign}) + #git+https://github.com/pciutils/pciutils.git#tag=v$pkgver?signed) +validpgpkeys=( + '5558F9399CD7836850553C6EC28E7847ED70F82D' # Martin Mares <mj@ucw.cz> + ) + +md5sums=('51554c538b5a57b61123326e14ea28a1' + 'SKIP') options=(staticlibs) _pkgname=$pkgname pkgname+='-staticlibs' -pkgdesc+=" (build with options=(staticlibs))" +pkgdesc+=" (static libs)" provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") + build() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd $_pkgname-$pkgver make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man SBINDIR=/usr/bin lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean @@ -30,9 +40,11 @@ build() { } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd $_pkgname-$pkgver make SHARED=yes PREFIX=/usr SBINDIR=/usr/bin SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib + # this is now supplied by the 'hwdata' package + rm -rf "$pkgdir"/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} + + # install the static lib install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" - # this is now supplied by the hwids package - rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}} } diff --git a/pcr/pdsh/PKGBUILD b/pcr/pdsh/PKGBUILD index fb530ef71..817433247 100644 --- a/pcr/pdsh/PKGBUILD +++ b/pcr/pdsh/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): drrossum <d.r.vanrossum at gmx.de> -# Contributor (Arch): sh0 <mee@sh0.org> -# Maintainer : Aurélien Desbrières <aurelien@xload.io> +# Contributor: drrossum <d.r.vanrossum at gmx.de> +# Contributor: sh0 <mee@sh0.org> +# Maintainer: Aurélien Desbrières <aurelien@xload.io> pkgname=pdsh pkgver=2.33 diff --git a/pcr/pencil2d/PKGBUILD b/pcr/pencil2d/PKGBUILD index 8d76f59ec..7abae8751 100644 --- a/pcr/pencil2d/PKGBUILD +++ b/pcr/pencil2d/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> # Contributor: Márcio Silva <coadde@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/perl-bytes-random-secure/PKGBUILD b/pcr/perl-bytes-random-secure/PKGBUILD index a4d92d518..f9f5e4306 100644 --- a/pcr/perl-bytes-random-secure/PKGBUILD +++ b/pcr/perl-bytes-random-secure/PKGBUILD @@ -1,4 +1,6 @@ -# Contributor (AUR): Daniel Müllner <daniel@danifold.net> +# Contributor: Daniel Müllner <daniel@danifold.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + # repolint: reason=asdeps(pulledpork) pkgname=perl-bytes-random-secure diff --git a/pcr/perl-carp-always/PKGBUILD b/pcr/perl-carp-always/PKGBUILD index 073b5595f..eb416c446 100644 --- a/pcr/perl-carp-always/PKGBUILD +++ b/pcr/perl-carp-always/PKGBUILD @@ -1,5 +1,7 @@ -# Contributor (AUR): John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com> +# Contributor: John D Jones III <j[nospace]n[nospace]b[nospace]e[nospace]k[nospace]1972 -_AT_- the domain name google offers a mail service at ending in dot com> # Generator (AUR): CPANPLUS::Dist::Arch 1.27 +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + # parabola changes and rationale: # no changes. diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD index bf572eb99..c6027d123 100644 --- a/pcr/perl-crypt-dh/PKGBUILD +++ b/pcr/perl-crypt-dh/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer (Arch): Michael Witten +# Maintainer (arch): Michael Witten # # Derived from perl-crypt-blowfish: -# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (Arch): Charles Mauch <cmauch@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Charles Mauch <cmauch@gmail.com> # -# Contributor (Arch): Pedro Alejandro López-Valencia <palopezv@gmail.com> +# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com> # Contributor: Márcio Silva <coadde@hyperbola.info> pkgname=perl-crypt-dh diff --git a/pcr/perl-crypt-random-seed/PKGBUILD b/pcr/perl-crypt-random-seed/PKGBUILD index 4fd6aa2b0..34f4123f6 100644 --- a/pcr/perl-crypt-random-seed/PKGBUILD +++ b/pcr/perl-crypt-random-seed/PKGBUILD @@ -1,4 +1,5 @@ -# Contributor (AUR): Daniel Müllner <daniel@danifold.net> +# Contributor: Daniel Müllner <daniel@danifold.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # repolint: reason=asdeps(perl-bytes-random-secure) pkgname=perl-crypt-random-seed diff --git a/pcr/perl-crypt-random-tesha2/PKGBUILD b/pcr/perl-crypt-random-tesha2/PKGBUILD index 747eb9083..bbc432d6e 100644 --- a/pcr/perl-crypt-random-tesha2/PKGBUILD +++ b/pcr/perl-crypt-random-tesha2/PKGBUILD @@ -1,4 +1,5 @@ -# Contributor (AUR): Daniel Müllner <daniel@danifold.net> +# Contributor: Daniel Müllner <daniel@danifold.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # repolint: reason=asdeps(perl-crypt-random-seed) pkgname=perl-crypt-random-tesha2 diff --git a/pcr/perl-encode-eucjpascii/PKGBUILD b/pcr/perl-encode-eucjpascii/PKGBUILD index a655315b7..309bfa57f 100644 --- a/pcr/perl-encode-eucjpascii/PKGBUILD +++ b/pcr/perl-encode-eucjpascii/PKGBUILD @@ -1,5 +1,6 @@ -# Contributor (Arch): Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=perl-encode-eucjpascii pkgver=0.03 diff --git a/pcr/perl-encode-hanextra/PKGBUILD b/pcr/perl-encode-hanextra/PKGBUILD index 652330d86..c93c93890 100644 --- a/pcr/perl-encode-hanextra/PKGBUILD +++ b/pcr/perl-encode-hanextra/PKGBUILD @@ -1,5 +1,6 @@ -# Contributor (Arch): Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=perl-encode-hanextra pkgver=0.23 diff --git a/pcr/perl-encode-jis2k/PKGBUILD b/pcr/perl-encode-jis2k/PKGBUILD index c74e807ec..3d846f62d 100644 --- a/pcr/perl-encode-jis2k/PKGBUILD +++ b/pcr/perl-encode-jis2k/PKGBUILD @@ -1,6 +1,7 @@ -# Contributor (Arch): Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> +# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> # Contributor: Márcio Silva <coadde@hyperbola.info> # Contributor: André Silva <emulatorman@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=perl-encode-jis2k pkgver=0.03 diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD index ddc838f54..d1971ed65 100644 --- a/pcr/perl-geo-ipfree/PKGBUILD +++ b/pcr/perl-geo-ipfree/PKGBUILD @@ -1,4 +1,5 @@ # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> _author=bricas _perlmod=Geo-IPfree diff --git a/pcr/perl-iptables-chainmgr/PKGBUILD b/pcr/perl-iptables-chainmgr/PKGBUILD index 5b23b339f..0e5c68ff4 100644 --- a/pcr/perl-iptables-chainmgr/PKGBUILD +++ b/pcr/perl-iptables-chainmgr/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Weirch Sodora <sodora@gmail.com> -# Maintainer: Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Contributor: Weirch Sodora <sodora@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # Contributor: Márcio Silva <coadde@hyperbola.info> pkgname=perl-iptables-chainmgr diff --git a/pcr/perl-iptables-parse/PKGBUILD b/pcr/perl-iptables-parse/PKGBUILD index 76ae9347c..b568321cc 100644 --- a/pcr/perl-iptables-parse/PKGBUILD +++ b/pcr/perl-iptables-parse/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Weirch Sodora <sodora@gmail.com> -# Maintainer: Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Weirch Sodora <sodora@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> # Contributor: Márcio Silva <coadde@hyperbola.info> pkgname=perl-iptables-parse diff --git a/pcr/perl-latex-encode/PKGBUILD b/pcr/perl-latex-encode/PKGBUILD index 1dd943c3f..3e5bb9ff4 100644 --- a/pcr/perl-latex-encode/PKGBUILD +++ b/pcr/perl-latex-encode/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Moritz Bunkus <moritz@bunkus.org> +# Maintainer (aur): Moritz Bunkus <moritz@bunkus.org> # Contributor: Márcio Silva <coadde@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/perl-linux-desktopfiles/PKGBUILD b/pcr/perl-linux-desktopfiles/PKGBUILD index c0530f48e..dfad7bd08 100644 --- a/pcr/perl-linux-desktopfiles/PKGBUILD +++ b/pcr/perl-linux-desktopfiles/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> +# Maintainer (aur): Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> # Generator (AUR): CPANPLUS::Dist::Arch 1.32 # parabola changes and rationale: diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD index 8ddf64995..e3a7ae163 100644 --- a/pcr/perl-math-bigint-gmp/PKGBUILD +++ b/pcr/perl-math-bigint-gmp/PKGBUILD @@ -1,6 +1,7 @@ -# Contributor (AUR): Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> +# Contributor: Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> # Generator (AUR): CPANPLUS::Dist::Arch 1.32 # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # parabola changes and rationale: # no changes. diff --git a/pcr/perl-math-bigint/PKGBUILD b/pcr/perl-math-bigint/PKGBUILD index b1cca42b8..8444ba26e 100644 --- a/pcr/perl-math-bigint/PKGBUILD +++ b/pcr/perl-math-bigint/PKGBUILD @@ -1,4 +1,5 @@ -# Contributor (AUR): Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> +# Contributor: Trizen <echo dHJpemVueEBnbWFpbC5jb20K | base64 -d> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # Generator (AUR): CPANPLUS::Dist::Arch 1.32 # parabola changes and rationale: diff --git a/pcr/perl-mldbm/PKGBUILD b/pcr/perl-mldbm/PKGBUILD index f93fc81e6..cd00deca2 100644 --- a/pcr/perl-mldbm/PKGBUILD +++ b/pcr/perl-mldbm/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR): John D Jones III <jnbek1972@gmail.com> +# Maintainer (aur): John D Jones III <jnbek1972@gmail.com> # NB: This package is affected by a makepkg bug (in a non-critical # way). I'm choosing to just wait for makepkg to get fixed, rather diff --git a/pcr/perl-pod-latex/PKGBUILD b/pcr/perl-pod-latex/PKGBUILD index 812499fa0..99c1d6456 100644 --- a/pcr/perl-pod-latex/PKGBUILD +++ b/pcr/perl-pod-latex/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Moritz Bunkus <moritz@bunkus.org> +# Maintainer (aur): Moritz Bunkus <moritz@bunkus.org> # parabola changes and rationale: # no changes diff --git a/pcr/perl-readonly-xs/PKGBUILD b/pcr/perl-readonly-xs/PKGBUILD index 49fca8717..917e6d051 100644 --- a/pcr/perl-readonly-xs/PKGBUILD +++ b/pcr/perl-readonly-xs/PKGBUILD @@ -1,6 +1,7 @@ -# Contributor (Arch): John D Jones III <jnbek1972 -_AT_- g m a i l -_Dot_- com> +# Contributor: John D Jones III <jnbek1972 -_AT_- g m a i l -_Dot_- com> # Generator (Arch): CPANPLUS::Dist::Arch 1.28 # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname='perl-readonly-xs' pkgver='1.05' diff --git a/pcr/perl-rpc-xml/PKGBUILD b/pcr/perl-rpc-xml/PKGBUILD index f070360f4..831258850 100644 --- a/pcr/perl-rpc-xml/PKGBUILD +++ b/pcr/perl-rpc-xml/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): John D Jones III <jnbek1972 -_AT_- the domain name google offers a mail service at ending in dot com> -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: John D Jones III <jnbek1972 -_AT_- the domain name google offers a mail service at ending in dot com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: Márcio Silva <coadde@hyperbola.info> pkgname='perl-rpc-xml' diff --git a/pcr/perl-term-shellui/PKGBUILD b/pcr/perl-term-shellui/PKGBUILD index 534c3a08b..41c4dd82e 100644 --- a/pcr/perl-term-shellui/PKGBUILD +++ b/pcr/perl-term-shellui/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): François Charette <firmicus ατ gmx δοτ net> -# Maintainer (Arch): mutantmonkey <aur@mutantmonkey.in> +# Contributor: François Charette <firmicus ατ gmx δοτ net> +# Maintainer (arch): mutantmonkey <aur@mutantmonkey.in> pkgname=perl-term-shellui pkgver=0.92 diff --git a/pcr/perspectives-server/PKGBUILD b/pcr/perspectives-server/PKGBUILD index 9a93fffdb..8b6d715f5 100644 --- a/pcr/perspectives-server/PKGBUILD +++ b/pcr/perspectives-server/PKGBUILD @@ -1,6 +1,7 @@ -# Maintainer (upstream): Robert Štětka <robert dot stetka at gmail dot com> +# Contributor: Robert Štětka <robert dot stetka at gmail dot com> # Contributor: fauno <fauno@parabola.nu> -# Contrbutor: bill-auger <bill-auger@programmer.net> +# Contributor: bill-auger <bill-auger@programmer.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=perspectives-server diff --git a/pcr/petri-foo/PKGBUILD b/pcr/petri-foo/PKGBUILD index 981c76adb..f4b725728 100644 --- a/pcr/petri-foo/PKGBUILD +++ b/pcr/petri-foo/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): masutu <masutu dot arch at gmail dot com> +# Maintainer (arch): masutu <masutu dot arch at gmail dot com> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=petri-foo pkgver=0.1.87 diff --git a/pcr/pgl/PKGBUILD b/pcr/pgl/PKGBUILD index 42c84f593..8e5a35e94 100644 --- a/pcr/pgl/PKGBUILD +++ b/pcr/pgl/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Contributor (Arch): Gilrain <gilrain+libre.arch A_T castelmo DOT_ re> +# Contributor: Gilrain <gilrain+libre.arch A_T castelmo DOT_ re> pkgname=pgl pkgver=2.3.1 diff --git a/pcr/phantomjs/PKGBUILD b/pcr/phantomjs/PKGBUILD index 17319d7ad..0242013f4 100644 --- a/pcr/phantomjs/PKGBUILD +++ b/pcr/phantomjs/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer (AUR): Felix Golatofski <contact@xdfr.de> -# Contributor (AUR): Chih-Hsuan Yen <yan12125@gmail.com> -# Contributor (AUR): Felix Yan <felixonmars@archlinux.org> -# Contributor (AUR): grimsock <lord.grimsock at gmail dot com> -# Contributor (AUR): Dieter Plaetinck <dieter@plaetinck.be> -# Contributor (AUR): Vladimir Chizhov <jagoterr@gmail.com> -# Contributor (AUR): Henry Tang <henryykt@gmail.com> +# Maintainer (aur): Felix Golatofski <contact@xdfr.de> +# Contributor: Chih-Hsuan Yen <yan12125@gmail.com> +# Contributor: Felix Yan <felixonmars@archlinux.org> +# Contributor: grimsock <lord.grimsock at gmail dot com> +# Contributor: Dieter Plaetinck <dieter@plaetinck.be> +# Contributor: Vladimir Chizhov <jagoterr@gmail.com> +# Contributor: Henry Tang <henryykt@gmail.com> pkgname=phantomjs pkgver=2.1.1 diff --git a/pcr/phc-intel-dkms/PKGBUILD b/pcr/phc-intel-dkms/PKGBUILD new file mode 100644 index 000000000..ac6ff77ac --- /dev/null +++ b/pcr/phc-intel-dkms/PKGBUILD @@ -0,0 +1,65 @@ +# Contributor: adrien1018 <adrien.sf.wu[at]gmail[dot]com> +# Contributor: fs4000 <matthias_dienstbier[at]yahoo[dot]de> +# Contributor: trapanator <trap[at]trapanator[dot]com> +# Contributor: tomprogrammer <Thomas-Bahn[at]gmx[dot]net> +# Maintainer: Wael Karram <wael@waelk.tech> + + +# parabola changes and rationale: +# - use VCS tag instead of arbitrary commit +# - use upstream revision as $pkgver - upstream version is hyper-stable + + +pkgname=phc-intel-dkms +_upstream_name=phc-intel +_upstream_ver=0.3.2 +_upstream_rev=rev47 # use tag revNN (see https://gitlab.com/linux-phc/phc-intel/-/tags) +pkgver=$_upstream_ver.$_upstream_rev +pkgrel=1 +pkgdesc="Frequency driver for Intel CPUs with undervolting feature" +pkgdesc+=", (for Core/Core2 systems)" +url="https://gitlab.com/linux-phc/phc-intel" +arch=('i686' 'x86_64') # could be 'any'; but avoid publishing to non-x86 repos +license=('GPL') +depends=('dkms') +replaces=('phc-intel') +backup=('etc/default/phc-intel') +source=("https://gitlab.com/linux-phc/phc-intel/-/archive/$_upstream_rev/$_upstream_name-$_upstream_rev.tar.gz" + dkms.conf.in + phc-intel.default + phc-intel.sh + phc-intel.sleep + phc-intel.system-sleep) +sha256sums=('abacbe4b9c42e8e24b7cf6fc0b15d02109170ee80f4429af63489d616eb12992' + '2a5a6df46556687125f2082bff2f98c5941ebe98928c491458348c1174622e04' + 'ce08a5a4107be1d5723f1f169d515e67b6c77893f3994fc2d0d2ccf611307ed3' + 'b526f3e8e66f6495531f13f2e6867d3a07b2ec7a7c3b8aa061f22be1cd6e770f' + '569b85988cb38380fec85c25688b76abc24a46601aa8f58eb24eaebf863eebef' + '2e17c90d7bfae8f5070e46388e95d443188eaa7beb5ffdd418a0da090f2e7557') + + +prepare() +{ + # inject version into dkms.conf + sed "s|@VERSION@|$pkgver|" dkms.conf.in > dkms.conf + + cd $_upstream_name-$_upstream_rev + + # initialize upon load? + # TODO: what does this do? + sed -i 's|/sbin/modprobe phc-intel |&\&\& /usr/bin/phc-intel set |' phc-intel.modprobe +} + +package() +{ + umask 022 + install -Dm644 dkms.conf "$pkgdir/usr/src/phc-intel-$_upstream_ver/dkms.conf" + install -Dm644 phc-intel.default "$pkgdir/etc/default/phc-intel" + install -Dm755 phc-intel.sh "$pkgdir/usr/bin/phc-intel" + install -Dm755 phc-intel.sleep "$pkgdir/usr/lib/pm-utils/sleep.d/00phc-intel" + install -Dm755 phc-intel.system-sleep "$pkgdir/usr/lib/systemd/system-sleep/phc-intel" + + cd $_upstream_name-$_upstream_rev + install -Dm644 phc-intel.modprobe "$pkgdir/usr/lib/modprobe.d/phc-intel.conf" + cp -R inc Makefile "$pkgdir/usr/src/phc-intel-$_upstream_ver/" +} diff --git a/pcr/phc-intel-dkms/dkms.conf.in b/pcr/phc-intel-dkms/dkms.conf.in new file mode 100644 index 000000000..a97befb04 --- /dev/null +++ b/pcr/phc-intel-dkms/dkms.conf.in @@ -0,0 +1,7 @@ +PACKAGE_NAME="phc-intel" +PACKAGE_VERSION=@VERSION@ +AUTOINSTALL="yes" + +BUILT_MODULE_NAME[0]="phc-intel" +DEST_MODULE_LOCATION[0]="/extra" +MAKE[0]="make KERNELSRC=$kernel_source_dir" diff --git a/pcr/phc-intel-dkms/phc-intel.default b/pcr/phc-intel-dkms/phc-intel.default new file mode 100644 index 000000000..4e390e768 --- /dev/null +++ b/pcr/phc-intel-dkms/phc-intel.default @@ -0,0 +1,4 @@ +# configuration for phc-intel + +# voltage IDs to be set for all CPUs +VIDS="" diff --git a/pcr/phc-intel-dkms/phc-intel.install b/pcr/phc-intel-dkms/phc-intel.install new file mode 100644 index 000000000..fb69a8b4a --- /dev/null +++ b/pcr/phc-intel-dkms/phc-intel.install @@ -0,0 +1,32 @@ +post_install() { + cat <<-EOF + You can enter the desired voltage IDs in /etc/default/phc-intel. + Booting with nophc kernel parameter skips setting of VIDs in case of failure. + EOF +} + +pre_upgrade() { + if (( "$(vercmp $2 0.3.2.12.19-2)" < 0 )); then + cd usr/lib/modules/ + for i in *; do + if [ -f "$i/extramodules/phc-intel.ko" ]; then + rm -f "$i/extramodules/phc-intel.ko" + [ -d "$i/kernel" ] && depmod "$i" + elif [ -f "$i/phc-intel.ko" ]; then + rm -f "$i/phc-intel.ko" + rmdir -p --ignore-fail-on-non-empty "$i" + elif [ -f "$i/extra/phc-intel.ko" ]; then + rm -f "$i/extra/phc-intel.ko" + rmdir -p --ignore-fail-on-non-empty "$i/extra" + [ -d "$i/kernel" ] && depmod "$i" + fi + done + fi +} + +post_upgrade() { + if (( "$(vercmp $2 0.3.2.12.19-2)" < 0 )); then + rm -rf usr/src/phc-intel/ + echo '===> The kernel module gets automatically built by DKMS now.' + fi +} diff --git a/pcr/phc-intel-dkms/phc-intel.sh b/pcr/phc-intel-dkms/phc-intel.sh new file mode 100644 index 000000000..cce4bf96a --- /dev/null +++ b/pcr/phc-intel-dkms/phc-intel.sh @@ -0,0 +1,55 @@ +#!/bin/bash -e +shopt -s nullglob + +case "$1" in +start) + . /etc/default/phc-intel + if [ -z "$VIDS" ]; then + echo '=> Please edit /etc/default/phc-intel' + exit 1 + fi + echo ':: Setting PHC VIDs' + for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do + echo $VIDS > "$i" + done + ;; +stop) + echo ':: Resetting default PHC VIDs' + for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do + cp "${i%vids}default_vids" "$i" + done + ;; +status) + check_off () { + for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do + [ "$(< "$i")" = "$(< "${i%vids}default_vids")" ] || return; + done + } + check_on () { + for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do + [[ "$(< "$i")" =~ "$VIDS" ]] || return; + done + } + echo -n 'PHC status: ' + . /etc/default/phc-intel + if check_off; then + echo 'inactive' + elif check_on; then + echo 'active' + else + echo 'unknown' + fi + ;; +set) + . /etc/default/phc-intel + [ -z "$VIDS" ] && exit + for i in $(< /proc/cmdline); do + [ $i = nophc ] && exit + done + for i in /sys/devices/system/cpu/cpu*/cpufreq/phc_vids; do + echo $VIDS > "$i" + done + ;; +*) + echo "usage: $0 {start|stop|status|set}" +esac diff --git a/pcr/phc-intel-dkms/phc-intel.sleep b/pcr/phc-intel-dkms/phc-intel.sleep new file mode 100644 index 000000000..342b81acf --- /dev/null +++ b/pcr/phc-intel-dkms/phc-intel.sleep @@ -0,0 +1,7 @@ +#!/bin/bash + +case $1 in + resume|thaw) + . /usr/bin/phc-intel set + ;; +esac diff --git a/pcr/phc-intel-dkms/phc-intel.system-sleep b/pcr/phc-intel-dkms/phc-intel.system-sleep new file mode 100644 index 000000000..c76ea6aaf --- /dev/null +++ b/pcr/phc-intel-dkms/phc-intel.system-sleep @@ -0,0 +1,5 @@ +#!/bin/bash + +if [ "$1" = post ]; then + . /usr/bin/phc-intel set +fi diff --git a/pcr/pivaders-git/PKGBUILD b/pcr/pivaders-git/PKGBUILD index 0bee35d23..04561004f 100644 --- a/pcr/pivaders-git/PKGBUILD +++ b/pcr/pivaders-git/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch) : Arthur Zamarin <arthurzam@gmail.com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Arthur Zamarin <arthurzam@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=pivaders pkgname=pivaders-git diff --git a/pcr/pjproject/PKGBUILD b/pcr/pjproject/PKGBUILD index da00dc3e1..608c1df48 100644 --- a/pcr/pjproject/PKGBUILD +++ b/pcr/pjproject/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer (AUR): Caleb Maclennan <caleb@alerque.com> -# Contributor (AUR): Xavier Devlamynck <magicrhesus@ouranos.be> -# Contributor (AUR): Marti Raudsepp <marti@juffo.org> -# Contributor (AUR): Travis Hegner <travis.hegner@gmail.com> -# Contributor (Parabola): Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Contributor: Xavier Devlamynck <magicrhesus@ouranos.be> +# Contributor: Marti Raudsepp <marti@juffo.org> +# Contributor: Travis Hegner <travis.hegner@gmail.com> +# Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # parabola changes and rationale: # - don't autodetect x86 extensions at compile time (-march=native) diff --git a/pcr/ploticus/PKGBUILD b/pcr/ploticus/PKGBUILD index 4bb530d00..f6157045f 100644 --- a/pcr/ploticus/PKGBUILD +++ b/pcr/ploticus/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com -# Contributor (AUR): Kaiting Chen <kaitocracy@gmail.com> -# Contributor (AUR): Andreas Hauser <andy-aur@splashground.de> +# Maintainer (aur): Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: Andreas Hauser <andy-aur@splashground.de> # Patches are found on the News page. # http://ploticus.sourceforge.net/doc/news.html diff --git a/pcr/plymouth/PKGBUILD b/pcr/plymouth/PKGBUILD index 2e685256f..54e6ab07c 100644 --- a/pcr/plymouth/PKGBUILD +++ b/pcr/plymouth/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: David P. <megver83@parabola.nu> # Contributor: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR:plymouth-nosystemd): Chris Cromer <chris@cromer.cl> -# Maintainer (AUR:plymouth): Sebastian Lau <lauseb644@gmail.com> -# Contributor (AUR:plymouth): Damian01w <damian01w@gmail.com> -# Contributor (AUR:plymouth): Padfoot <padfoot@exemail.com.au> +# Maintainer (aur:plymouth-nosystemd): Chris Cromer <chris@cromer.cl> +# Maintainer (aur:plymouth): Sebastian Lau <lauseb644@gmail.com> +# Contributor: Damian01w <damian01w@gmail.com> +# Contributor: Padfoot <padfoot@exemail.com.au> pkgbase=plymouth pkgname=(plymouth plymouth-nosystemd) diff --git a/pcr/pmount/PKGBUILD b/pcr/pmount/PKGBUILD index 403e69435..82bb2c196 100644 --- a/pcr/pmount/PKGBUILD +++ b/pcr/pmount/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 80202 2012-11-17 15:45:28Z eric $ -# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org> +# Maintainer (arch): Tobias Powalowski <tpowa@archlinux.org> pkgname=pmount pkgver=0.9.23 diff --git a/pcr/policycoreutils/PKGBUILD b/pcr/policycoreutils/PKGBUILD index b9b6ecadb..1036e2e3f 100644 --- a/pcr/policycoreutils/PKGBUILD +++ b/pcr/policycoreutils/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) -# Contributor (AUR): Timothée Ravier <tim@siosm.fr> -# Contributor (AUR): Nicky726 (Nicky726 <at> gmail <dot> com) -# Contributor (AUR): Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) -# Contributor (AUR): angelux/xangelux (xangelux <at> gmail <dot> com) +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Contributor: Timothée Ravier <tim@siosm.fr> +# Contributor: Nicky726 (Nicky726 <at> gmail <dot> com) +# Contributor: Sergej Pupykin (pupykin <dot> s+arch <at> gmail <dot> com) +# Contributor: angelux/xangelux (xangelux <at> gmail <dot> com) # parabola changes and rationale: # - Added armv7h diff --git a/pcr/polkit-elogind/99-parabola.rules b/pcr/polkit-elogind/99-parabola.rules deleted file mode 100644 index 22c84181b..000000000 --- a/pcr/polkit-elogind/99-parabola.rules +++ /dev/null @@ -1,21 +0,0 @@ -polkit.addRule(function(action, subject) { - if (action.id.indexOf("org.freedesktop.udisks2.") == 0 && subject.isInGroup("storage")) { - return polkit.Result.YES; - } -}); - -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.login1.power-off" || - action.id == "org.freedesktop.login1.reboot" || - action.id == "org.freedesktop.login1.hibernate" || - action.id == "org.freedesktop.login1.suspend") { - return polkit.Result.YES; - } -}); - -polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.upower.hibernate" || - action.id == "org.freedesktop.upower.suspend") { - return polkit.Result.YES; - } -}); diff --git a/pcr/polkit-elogind/PKGBUILD b/pcr/polkit-elogind/PKGBUILD deleted file mode 100644 index e15f9a97e..000000000 --- a/pcr/polkit-elogind/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> - -pkgname=polkit-elogind -_pkgname=${pkgname/-elogind} -pkgver=0.114 -pkgrel=1.parabola1 -pkgdesc="Application development toolkit for controlling system-wide privileges, with libelogind support" -arch=(x86_64 i686 armv7h) -license=(LGPL) -provides=("$_pkgname=$pkgver") -url="https://www.freedesktop.org/wiki/Software/polkit/" -depends=(glib2 pam expat elogind js52) -makedepends=(intltool gtk-doc gobject-introspection git autoconf-archive) -conflicts=('polkit' 'polkit-consolekit') -replaces=('polkit-consolekit') -_commit=ed06baed179166389d536420a6fc532781d48178 # tags/0.114^0 -source=("git+https://anongit.freedesktop.org/git/polkit#commit=$_commit" - '99-parabola.rules' - 'elogind-configure-fix.patch') -sha256sums=('SKIP' - 'd28d6ecaf7682860e2b3768bb266bd94313546b7cd0ef3c2eace7b1576c47adb' - 'd90b2a95aa3e9e1ebf9369c038c144e04900e095c5405bc4ba4901c31bf3f59b') - -pkgver() { - cd $_pkgname - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd $_pkgname - git cherry-pick -n 373705b35e7f6c7dc83de5e0a3ce11ecd15d0409 - patch -Np 1 -i ${srcdir}/elogind-configure-fix.patch - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd $_pkgname - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --libexecdir=/usr/lib \ - --enable-libsystemd-login=no --disable-static \ - --enable-gtk-doc --with-os-type=redhat \ - --enable-libelogind=yes --with-systemdsystemunitdir=no - - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -check() { - cd $_pkgname - make -k check || : -} - -package() { - cd $_pkgname - make DESTDIR="$pkgdir" install - - install -d -o root -g 102 -m 750 "$pkgdir"/{etc,usr/share}/polkit-1/rules.d - - install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$_pkgname.conf" <<END -u polkitd 102 "PolicyKit daemon" -m polkitd proc -END - install -m0644 "${srcdir}"/99-parabola.rules "${pkgdir}"/etc/polkit-1/rules.d -} - -# vim: ts=2 sw=2 et: diff --git a/pcr/polkit-elogind/elogind-configure-fix.patch b/pcr/polkit-elogind/elogind-configure-fix.patch deleted file mode 100644 index 81db3becc..000000000 --- a/pcr/polkit-elogind/elogind-configure-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen <cogitri@exherbo.org> -Date: Wed, 11 Apr 2018 13:14:14 +0200 -Subject: [PATCH] configure: fix elogind support - -HAVE_LIBSYSTEMD is used to determine which source files to use. -We have to check if either have_libsystemd or have_libelogind is -true, as both of these need the source files which are used when -HAVE_LIBSYSTEMD is true. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 36df239..da47ecb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [ - - AC_SUBST(LIBSYSTEMD_CFLAGS) - AC_SUBST(LIBSYSTEMD_LIBS) --AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd]) -+AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd]) - - dnl --------------------------------------------------------------------------- - dnl - systemd unit / service files --- -2.17.0 diff --git a/pcr/portaudio-git/PKGBUILD b/pcr/portaudio-git/PKGBUILD index 20d706742..0b3294e06 100644 --- a/pcr/portaudio-git/PKGBUILD +++ b/pcr/portaudio-git/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): David Runge <dvzrv@archlinux.org> -# Contributor (Arch): Lukas Fleischer <lfleischer@archlinux.org> -# Contributor (Arch): Eric Belanger <eric@archlinux.org> -# Contributor (Arch): Darwin Bautista <djclue917@gmail.com> -# Contributor (Arch): Bob Finch <w9ya@qrparci.net> +# Maintainer (arch): David Runge <dvzrv@archlinux.org> +# Contributor: Lukas Fleischer <lfleischer@archlinux.org> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: Darwin Bautista <djclue917@gmail.com> +# Contributor: Bob Finch <w9ya@qrparci.net> # Maintainer: David P. <megver83@parabola.nu> _pkgname=portaudio diff --git a/pcr/postfix-policyd-spf-perl/PKGBUILD b/pcr/postfix-policyd-spf-perl/PKGBUILD new file mode 100644 index 000000000..17c422873 --- /dev/null +++ b/pcr/postfix-policyd-spf-perl/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: David P. <megver83@parabola.nu> +# Maintainer (AUR): Zach Callear <zach@callear.org> +# Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=postfix-policyd-spf-perl +pkgver=2.011 +pkgrel=1 +pkgdesc='Postfix SPF policy engine, written in Perl' +arch=(any) +url='https://launchpad.net/postfix-policyd-spf-perl/' +license=('GPL') +depends=('perl-mail-spf' 'perl-netaddr-ip' 'perl-sys-hostname-long') +source=("https://launchpad.net/postfix-policyd-spf-perl/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha512sums=('22fc00bf74912056a67e937a460ac1fd878f1cb1a3bfa7b19bc5f1e6bc1c36d815dcf8c945e818d242ed5e72a6295bb0e1569446e06b09aefb2842993b8016ba' + 'SKIP') +validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Scott Kitterman + +package() { + cd ${pkgname}-${pkgver} + + install -D ${pkgname} ${pkgdir}/usr/lib/postfix/${pkgname} +} diff --git a/pcr/postsrsd/PKGBUILD b/pcr/postsrsd/PKGBUILD index 3ed2b7095..166ede396 100644 --- a/pcr/postsrsd/PKGBUILD +++ b/pcr/postsrsd/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR:postsrsd-git): Radek Podgorny <radek@podgorny.cz> -# Maintainer (AUR:postsrsd-git): Thomas Haider <t.haider@deprecate.de> -# Maintainer (AUR:postsrsd): fordprefect <fordprefect@dukun.de> +# Maintainer (aur:postsrsd-git): Radek Podgorny <radek@podgorny.cz> +# Maintainer (aur:postsrsd-git): Thomas Haider <t.haider@deprecate.de> +# Maintainer (aur:postsrsd): fordprefect <fordprefect@dukun.de> pkgname=postsrsd pkgver=1.4 diff --git a/pcr/prboom-plus/PKGBUILD b/pcr/prboom-plus/PKGBUILD index c5f73e8eb..887e38617 100644 --- a/pcr/prboom-plus/PKGBUILD +++ b/pcr/prboom-plus/PKGBUILD @@ -1,38 +1,50 @@ -# Maintainer (AUR): Kingan <kingan201 at gmail dot com> -# Contributor (AUR): Frederic Bezies <fredbezies at gmail dot com> -# Contributor (AUR): Valsu [arch(at)hylia.de] - -# parabola changes and rationale: -# - use --disable-cpu-opt, otherwise it use -mach=native and the resulting -# binary is only meant to run on the machine that compiled it: this option -# generates SMID (SSE3, AVX, etc) instructions in a way that is impossible to -# disable it at runtime. So running it on a machine without the same extended -# instruction set generally result in illegal instructions. +# Maintainer (aur): Kingan <kingan201 at gmail dot com> +# Contributor: Frederic Bezies <fredbezies at gmail dot com> +# Contributor: Valsu [arch(at)hylia.de] pkgname=prboom-plus -pkgver=2.5.1.4 -pkgrel=2 +pkgver=2.6.2 +pkgrel=1 pkgdesc='An advanced, Vanilla-compatible Doom engine based on PrBoom' -url='http://prboom-plus.sourceforge.net/' -arch=('x86_64' 'i686') -arch+=('armv7h') +url='https://github.com/coelckers/prboom-plus' +arch=('x86_64') +arch+=('armv7h' 'i686') license=('GPL2') -depends=('fluidsynth' 'glu' 'libmad' 'portmidi' 'sdl_image' 'sdl_mixer' 'sdl_net') -conflicts=('prboom') -replaces=('prboom') -provides=('prboom') -source=("http://download.sourceforge.net/prboom-plus/prboom-plus-$pkgver.tar.gz") -sha256sums=('e0e2241d174839b107f1a42b191aa9895dc6749e477cbc850ad520fba2353b94') +depends=('sdl2') +optdepends=('dumb' + 'fluidsynth' + 'glu' + 'libmad' + 'libvorbis' + 'pcre' + 'portmidi' + 'sdl2_image' + 'sdl2_mixer' + 'sdl2_net') +makedepends=('cmake') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/coelckers/prboom-plus/archive/refs/tags/v$pkgver.tar.gz") +sha1sums=('363471156b15e3927227ff4406670fdcd9725a74') + +_rootdir="prboom-plus-${pkgver}/prboom2" +_builddir="${_rootdir}/cbuild" + +prepare() { + cd "${srcdir}" + sed -i -E 's/mktemp/mkstemp/g' $(find "${_rootdir}" -type f -name r_demo.c) +} build() { - cd "prboom-plus-$pkgver" + cd "${srcdir}" + + mkdir -p "${_builddir}" + cd "${_builddir}" - ./configure --prefix=/usr --without-dumb --disable-cpu-opt + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ../ make } package() { - cd "prboom-plus-$pkgver" + cd "${srcdir}/${_builddir}" - make DESTDIR="$pkgdir" gamesdir=/usr/bin install + make DESTDIR="${pkgdir}" gamesdir=/usr/bin install } diff --git a/pcr/proguard/PKGBUILD b/pcr/proguard/PKGBUILD deleted file mode 100644 index 2c9e56ec6..000000000 --- a/pcr/proguard/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer (AUR): Bleuzen <supgesu at gmail dot com> -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=proguard -_pkgver=6.0 -pkgver=$_pkgver.3 -pkgrel=1 -pkgdesc="Free Java class file shrinker, optimizer, obfuscator, and preverifier" -arch=(any) -url="http://proguard.sourceforge.net/" -license=('GPL2') -depends=('java-runtime') -source=(https://downloads.sourceforge.net/project/proguard/proguard/$_pkgver/proguard$pkgver.tar.gz) -sha256sums=('db175575313d11eb75a3ab68c079123d2787529b63c5cb434b1f653ececb3e48') - -package() { - cd "$srcdir/$pkgname$pkgver/lib" - - mkdir -p "$pkgdir"/usr/bin - mkdir -p "$pkgdir"/usr/share/proguard - install -D -m0644 proguardgui.jar proguard.jar retrace.jar "$pkgdir"/usr/share/proguard/ - - cat >"$pkgdir"/usr/bin/proguardgui <<EOF -#!/bin/sh -exec java -jar /usr/share/proguard/proguardgui.jar \$* -EOF - chmod 0755 "$pkgdir"/usr/bin/proguardgui - - cat >"$pkgdir"/usr/bin/proguard <<EOF -#!/bin/sh -exec java -jar /usr/share/proguard/proguard.jar \$* -EOF - chmod 0755 "$pkgdir"/usr/bin/proguard - - # FS#36268 - ln -s . "$pkgdir"/usr/share/proguard/lib -} diff --git a/pcr/proot/PKGBUILD b/pcr/proot/PKGBUILD index 3ce8aedca..c14a379c3 100644 --- a/pcr/proot/PKGBUILD +++ b/pcr/proot/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Nicolas Cornu <ncornu@aldebaran-robotics.com> -# Maintainer (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer (aur): Nicolas Cornu <ncornu@aldebaran-robotics.com> +# Contributor: Márcio Silva <coadde@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=proot diff --git a/pcr/prosody-modules-hg/PKGBUILD b/pcr/prosody-modules-hg/PKGBUILD new file mode 100644 index 000000000..eb59012ee --- /dev/null +++ b/pcr/prosody-modules-hg/PKGBUILD @@ -0,0 +1,102 @@ +# Copyright (C) 2022 Wael Karram <wael@waelk.tech> +# SPDX-License-Identifier: CC0-1.0 +# Maintainer: Wael Karram <wael@waelk.tech> + + +# NOTE: The prosody-modules repository does not version nor make releases; +# so we use a date, and pin it to 'prosody' releases for compatibility. + + +pkgname=prosody-modules-hg +pkgver=20231108 +_upstream_rev=5579 +_prosody_ver=0.12.4 +pkgrel=1 +pkgdesc="Prosody community modules, includes experimental ones." +arch=('any') +url="https://modules.prosody.im/" +license=('MIT') +depends=(prosody=1:${_prosody_ver}) +makedepends=('mercurial') +mksource=(${pkgname}-${pkgver}::hg+https://hg.prosody.im/prosody-modules/#revision=${_upstream_rev}) +source=(https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz{,.sig}) +mksha256sums=('SKIP') +sha256sums=('cdcb013ff825dccbdcb5a8ec43493549236b901c7608a7a560e717045d9cb330' 'SKIP') +validpgpkeys=('3954A7AB837D0EA9CFA9798925DB7D9B5A8D4B40') # bill-auger + + +mksource() { + cd "${srcdir}/${pkgname}-${pkgver}/" + # Clean up mercurial files. + rm -rf \.hg \.hgtags + + # Seems to download external dependencies, needs inspection. + rm -rf mod_admin_web + + # Unmaintained and shouldn't be used. + rm -rf mod_auth_external_insecure + + # Connects to AWS. + rm -rf mod_aws_profile + + # Depricated, might conflict with built-in module. + rm -rf mod_bookmarks + + # Requires modification to prosody core. + rm -rf mod_captcha_registrations + + # Unsafe and unmaintained. + rm -rf mod_compression_unsafe + + # Relies on conversejs' CDN, free software though. + rm -rf mod_conversejs + + # Seems abandoned. + rm -rf mod_couchdb + + # Deprecated. + rm -rf mod_easy_invite + + # Integrated into core prosody software. + rm -rf mod_graceful_shutdown + + # Seems to include unlicensed code. + rm -rf mod_pubsub_feeds + + # Relies on github network services. + rm -rf mod_pubsub_github + + # relies on twitter network services and API. + rm -rf mod_pubsub_twitter + + # Monkeysphere project seems to be defunct. + rm -rf mod_s2s_auth_monkeysphere + + # Relies on nonfree network services. + rm -rf mod_s2s_auth_posh + + # Relies on nonfree network services. + rm -rf mod_sentry + + # relies on nonfree network services. + rm -rf mod_slack_webhooks + + # Relies on nonfree network services. + rm -rf mod_sms_clickatel + + # Relies on nonfree network services. + rm -rf mod_sms_free + + # Relies on nonfree network services. + rm -rf mod_tweet_data + + # Relies on nonfree network services and unfinished/unmaintained. + rm -rf mod_twitter +} + +package() { + # Make sure that the modules path exists. + mkdir -p "${pkgdir}/usr/lib/prosody/modules/" + # Copy the modules. + cp -r "${srcdir}/${pkgname}-${pkgver}/" "${pkgdir}/usr/lib/prosody/modules/" +} diff --git a/pcr/psad/PKGBUILD b/pcr/psad/PKGBUILD index df1c85ff5..226ca815b 100644 --- a/pcr/psad/PKGBUILD +++ b/pcr/psad/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Artur Wojcik <xartii at gmail dot com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=psad pkgver=2.2.3 diff --git a/pcr/pspp/PKGBUILD b/pcr/pspp/PKGBUILD index 0c6e8f744..f6638ed52 100644 --- a/pcr/pspp/PKGBUILD +++ b/pcr/pspp/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Miguel Revilla <yo@miguelrevilla.com> -# Contributor (Arch): joyfulgirl <joyfulgirl (at) archlinux.us> +# Maintainer (arch): Miguel Revilla <yo@miguelrevilla.com> +# Contributor: joyfulgirl <joyfulgirl (at) archlinux.us> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=pspp pkgver=0.10.2 diff --git a/pcr/pulledpork/PKGBUILD b/pcr/pulledpork/PKGBUILD index c8c73f25c..d46c29341 100644 --- a/pcr/pulledpork/PKGBUILD +++ b/pcr/pulledpork/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Amish <contact at via dot aur> -# Contributor (AUR): Isaac C. Aronson <i@pingas.org> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer (aur): Amish <contact at via dot aur> +# Contributor: Isaac C. Aronson <i@pingas.org> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=pulledpork pkgver=0.7.3 diff --git a/pcr/pumpa/PKGBUILD b/pcr/pumpa/PKGBUILD index 382f981d0..46b0d1b2a 100644 --- a/pcr/pumpa/PKGBUILD +++ b/pcr/pumpa/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Eugenio M. Vigo <emvigo@gmail.com> -# Contributor (Arch): speps <speps dot aur dot archlinux dot org> +# Contributor: Eugenio M. Vigo <emvigo@gmail.com> +# Contributor: speps <speps dot aur dot archlinux dot org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=pumpa diff --git a/pcr/puzzlemoppet-git/PKGBUILD b/pcr/puzzlemoppet-git/PKGBUILD index df9d4bc13..7b6de385f 100644 --- a/pcr/puzzlemoppet-git/PKGBUILD +++ b/pcr/puzzlemoppet-git/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: bill-auger <bill-auger@programmer.net> -# Maintainer (AUR): MCMic <come.bernigaud@laposte.net> +# Maintainer (aur): MCMic <come.bernigaud@laposte.net> pkgname=puzzlemoppet-git @@ -18,16 +18,56 @@ source=(${pkgname}::git+https://bitbucket.org/Knitter/puzzlemoppet.git) md5sums=('SKIP') -_version_constraint() # (dep_pkgname) +_version_constraint() # (dep_pkgname [precision]) { - local dep_pkgname=$1 - local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1) - version=${version%-*} - local version_inc=${version%.*}.$(( ${version##*.} + 1 )) + Log() { [[ "${FUNCNAME[2]}" == package ]] && echo "$@" >&2 || : ; } + - echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}" + local dep_pkgname=$1 + declare -i req_precision=$2 + local full_version=$(pacman -S --print-format='%v' ${dep_pkgname} 2> /dev/null | tail -n 1) + local n_dots=$(tmp=${full_version%-*} ; tmp=${tmp//[^\.]} ; echo "${#tmp}" ;) + local def_precision=$(( n_dots + 1 )) + local is_prec_valid=$(( req_precision > 0 && req_precision <= def_precision )) + local precision=$((( is_prec_valid )) && echo ${req_precision} || echo ${def_precision}) + local pkgver_rx='[0-9A-Za-z_]+' + pkgver_rx=$(sed 's|\]|\+]|' <<<${pkgver_rx}) # according to the wiki, '+' is not allowed, + # but some pkgver have it (eg: 5.15.10+kde+r130) + local subver_rx='\.'${pkgver_rx} + local pkgrel_rx='[0-9]+' + local garbage_rx='[^0-9].*' + local capture_rx=${pkgver_rx} + for (( n_dots=1 ; n_dots < precision ; ++n_dots )) ; do capture_rx+=${subver_rx} ; done ; + local version pkgrel has_dot_char version_min version_max constraint_string + declare -i subver subver_inc pkgrel_inc + + if [[ "${full_version}" =~ ^(${capture_rx})(${subver_rx})*-(${pkgrel_rx}).*$ ]] + then version=${BASH_REMATCH[1]} # pkgver cut to the requested precision + #unused=${BASH_REMATCH[2]} # discarded pkgver segments + pkgrel=${BASH_REMATCH[3]} # pkgrel with non-numerics right-trimmed + has_dot_char=$([[ "${version}" =~ \. ]] ; echo $(( ! $? )) ; ) + subver=$(sed "s|${garbage_rx}||" <<<${version##*.}) # right-trim from any non-numeric + version=$( (( has_dot_char )) && echo ${version%.*}.${subver} || echo ${subver} ) + subver_inc=$(( subver + 1 )) + pkgrel_inc=$(( pkgrel + 1 )) + version_min=$( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel} || \ + echo ${version} ) + version_max=$( ( (( ! is_prec_valid )) && echo ${full_version%-*}-${pkgrel_inc} ) || \ + ( [[ "${version}" =~ \. ]] && echo ${version%.*}.${subver_inc} ) || \ + echo ${subver_inc} ) + constraint_string="${dep_pkgname}>=${version_min} ${dep_pkgname}<${version_max}" + + Log "Applied version constraint: '${constraint_string}'" + else Log "ERROR: in _version_constraint() parsing: dep_pkgname='${dep_pkgname}' full_version='${full_version}'" + exit 1 + fi + + unset -f Log + + echo -n "${constraint_string}" } + pkgver() { cd "${srcdir}/${pkgname}" @@ -52,9 +92,10 @@ build() package() { - cd "${srcdir}/${pkgname}/puzzlemoppet" + # pin to strongly-coupled dependency versions + depends=( ${depends[*]/ode/} $(_version_constraint 'ode') ) - depends+=( $(_version_constraint 'ode') ) + cd "${srcdir}/${pkgname}/puzzlemoppet" make install DESTDIR=$pkgdir } diff --git a/pcr/pybristol/PKGBUILD b/pcr/pybristol/PKGBUILD index 5fb6783a6..7db3ef646 100644 --- a/pcr/pybristol/PKGBUILD +++ b/pcr/pybristol/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): adorableGNU <adorablegnu@hushmail.com> +# Maintainer (arch): adorableGNU <adorablegnu@hushmail.com> pkgname=pybristol pkgver=1.0.33 pkgrel=1 diff --git a/pcr/pypolicyd-spf/PKGBUILD b/pcr/pypolicyd-spf/PKGBUILD index bc7d710b7..72d333af2 100644 --- a/pcr/pypolicyd-spf/PKGBUILD +++ b/pcr/pypolicyd-spf/PKGBUILD @@ -1,52 +1,43 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR:python-postfix-policyd-spf): Hao Zhang theivorytower [at] gmail [dot] com> -# Maintainer (AUR:python2-postfix-policyd-spf): Filip S. Adamsen <fsa [at] fsadev [dot] com> -# Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org> +# Maintainer (aur:python-postfix-policyd-spf): Hao Zhang theivorytower [at] gmail [dot] com> +# Maintainer (aur:python2-postfix-policyd-spf): Filip S. Adamsen <fsa [at] fsadev [dot] com> +# Contributor: Samed Beyribey <ras0ir@eventualis.org> pkgname=pypolicyd-spf pkgver=2.0.2 _pkgver=${pkgver%.*} -pkgrel=4 +pkgrel=5 pkgdesc="Python Postfix Sender Policy Framework (SPF) filter daemon" arch=('any') url="https://launchpad.net/${pkgname}/" license=('GPL') makedepends=('python-setuptools') -depends=('postfix' 'python-pyspf' 'python') +depends=('postfix' 'python-pyspf') optdepends=('python-authres: RFC 7001 Authentication-Results header support') options=(!emptydirs) backup=(etc/python-policyd-spf/policyd-spf.conf) -source=(https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc}) +source=("https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.asc}) md5sums=('cc50281cc13a8984de058ddc5ae8dcaf' 'SKIP') validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman - -_version_constraint() # (dep_pkgname) -{ - local dep_pkgname=$1 - local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1) - version=${version%-*} - local version_inc=${version%.*}.$(( ${version##*.} + 1 )) - - echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}" -} - - build() { - cd "$srcdir"/$pkgname-$pkgver - - python setup.py build || return 1 + cd "$pkgname-$pkgver" + # Don't use build a modern 'wheel' instead of 'egg' (and so don't + # use modern 'python-builder' and 'python-installer'). The way + # setup.py is written, the 'wheel' will be broken and won't + # correctly install files in '/etc'. + python setup.py build } package() { - depends+=( $(_version_constraint 'python') ) - - cd "$srcdir"/$pkgname-$pkgver + _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2) + depends+=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") - python setup.py install --root="$pkgdir/" --optimize=1 || return 1 - install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf || return 1 + cd "$pkgname-$pkgver" + python setup.py install --root="$pkgdir/" --optimize=1 + install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf } diff --git a/pcr/pyrenamer/PKGBUILD b/pcr/pyrenamer/PKGBUILD index f202afee7..191811a82 100644 --- a/pcr/pyrenamer/PKGBUILD +++ b/pcr/pyrenamer/PKGBUILD @@ -1,10 +1,10 @@ -# Contributor (Arch): boenki <boenki at gmx dot de> -# Contributor (Arch): Arkham <arkham at archlinux dot us> -# Contributor (Arch): Christoph Zeiler <rabyte*gmail> -# Contributor (Arch): Marcin Karpezo <sirmacik at gmail dot com> -# Contributor (Arch): Lucas Salies Brum <lucas at archlinux dot com dot br> -# Contributor (Arch): max.bra <max.bra at alice dot it> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Contributor: boenki <boenki at gmx dot de> +# Contributor: Arkham <arkham at archlinux dot us> +# Contributor: Christoph Zeiler <rabyte*gmail> +# Contributor: Marcin Karpezo <sirmacik at gmail dot com> +# Contributor: Lucas Salies Brum <lucas at archlinux dot com dot br> +# Contributor: max.bra <max.bra at alice dot it> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=pyrenamer pkgver=0.6.0 diff --git a/pcr/pysheng/PKGBUILD b/pcr/pysheng/PKGBUILD index 13b21901e..0c8b6d1b6 100644 --- a/pcr/pysheng/PKGBUILD +++ b/pcr/pysheng/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): mutlu_inek@yahoo.de -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: mutlu_inek@yahoo.de +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=pysheng pkgver=0.1 diff --git a/pcr/python-bundlewrap/PKGBUILD b/pcr/python-bundlewrap/PKGBUILD index 43cd5484a..b507f8522 100644 --- a/pcr/python-bundlewrap/PKGBUILD +++ b/pcr/python-bundlewrap/PKGBUILD @@ -1,12 +1,11 @@ # Copyright (C) 2019 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=python-bundlewrap _pkgname=bundlewrap -pkgver=4.3.0 +pkgver=4.7.0 pkgrel=1 pkgdesc="Agent-less configuration management" arch=('any') @@ -22,7 +21,7 @@ depends=('python-cryptography' 'python-tomlkit') options=(!emptydirs) source=("https://files.pythonhosted.org/packages/source/${_pkgname::1}/$_pkgname/$_pkgname-$pkgver.tar.gz") -sha512sums=('83cdfc182dd99698a8be8f31adde95c420951b76d3d9f0bd80afc894c2c2ed6f8ca74938f10b59e81aa8bcda6109d4e6066dcb36673353d3d3980614f66020e5') +sha512sums=('0b12c583bd37ad34e956b4c1c2eed7422acbdef6ed434bf3ce6c61e76ebad5adff78353195a01dadfc91a21bc6e23428200ed28a09a22ecd5729bf2243bfd828') build(){ cd "$srcdir/bundlewrap-$pkgver" diff --git a/pcr/python-django18/PKGBUILD b/pcr/python-django18/PKGBUILD index b3f501c8e..d29ae8751 100644 --- a/pcr/python-django18/PKGBUILD +++ b/pcr/python-django18/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Victor <v1c70rp@gmail.com> +# Maintainer (aur): Victor <v1c70rp@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/python-efl/PKGBUILD b/pcr/python-efl/PKGBUILD index ddc7b5fe3..631ef72a8 100644 --- a/pcr/python-efl/PKGBUILD +++ b/pcr/python-efl/PKGBUILD @@ -1,38 +1,37 @@ -# Maintainer (AUR): Doug Newgard <scimmia at archlinux dot info> +# Maintainer (aur): Doug Newgard <scimmia at archlinux dot info> # Mantainer (AUR): Lorenzo Ferrillo <lorenzofersteam at live dot it> +# Maintainer (aur): Philippe Bourjac <philippe dot bourjac at gmail dot com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # parabola changes and rationale: -# - created split package for both python2 and python3 # - fixed license array (does not contain any GPL3 licensed code) # - added missing makedepends: mesa libdrm -pkgbase=python-efl -pkgname=(python-efl python2-efl) -pkgver=1.20.0 -pkgrel=2 -arch=('i686' 'x86_64' 'armv7h') +_python=python +_pkgname=python-efl +pkgname=$_python-efl +pkgver=1.25.0 +pkgrel=1 +pkgdesc="${_python^} bindings for the Enlightenment Foundation Libraries" +arch=('i686' 'x86_64') +arch+=( 'armv7h') url="http://www.enlightenment.org" license=('LGPL3') -makedepends=("efl>=$pkgver" python-dbus python2-dbus mesa libdrm) -source=("http://download.enlightenment.org/rel/bindings/python/$pkgbase-$pkgver.tar.xz") -sha256sums=('70de0ee3fabe1e91da5aa0ca09dd908b62dbbeb5fce86ec194b8793967c30ea3') +depends=("efl>=$pkgver" "dbus-python") +makedepends=(mesa libdrm) +source=("http://download.enlightenment.org/rel/bindings/python/$_pkgname-$pkgver.tar.xz") +sha256sums=('99e06df773647acfb8e04786d6958bee5b8deae41d996ccaa68d7cca7b30612e') #sha256sums=('SKIP') +build() { + cd $_pkgname-$pkgver -package_python-efl() { - pkgdesc="Python bindings for the Enlightenment Foundation Libraries" - depends=("efl>=$pkgver" "python-dbus") - cd "$srcdir/$pkgbase-$pkgver" - rm -rf build - python setup.py install --root="$pkgdir" --optimize=1 - install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" AUTHORS README ChangeLog + $_python setup.py build } -package_python2-efl() { - pkgdesc="Python2 bindings for the Enlightenment Foundation Libraries" - depends=("efl>=$pkgver" "python2-dbus") - cd "$srcdir/$pkgbase-$pkgver" - rm -rf build - python2 setup.py install --root="$pkgdir" --optimize=1 +package() { + cd $_pkgname-$pkgver + + $_python setup.py install --root="$pkgdir" --optimize=1 + install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" AUTHORS README ChangeLog } diff --git a/pcr/python-gensim/PKGBUILD b/pcr/python-gensim/PKGBUILD index 593aa8bea..d66183331 100644 --- a/pcr/python-gensim/PKGBUILD +++ b/pcr/python-gensim/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Gordian Edenhofer <gordian.edenhofer@gmail.com> -# Contributor (AUR): Maarten van Gompel <proycon at anaproy dot nl> -# Contributor (AUR): Lex Black <autumn-wind at web dot de> -# Contributor (AUR): Dieter_be +# Maintainer (aur): Gordian Edenhofer <gordian.edenhofer@gmail.com> +# Contributor: Maarten van Gompel <proycon at anaproy dot nl> +# Contributor: Lex Black <autumn-wind at web dot de> +# Contributor: Dieter_be # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Luke Shumaker <lukeshu@lukeshu.com> diff --git a/pcr/python-humblewx/PKGBUILD b/pcr/python-humblewx/PKGBUILD index c98eac7ff..ed1528cb8 100644 --- a/pcr/python-humblewx/PKGBUILD +++ b/pcr/python-humblewx/PKGBUILD @@ -1,7 +1,7 @@ #Maintainer (AUR): Thibaud Kehler <thibaud.kehler at gmx dot net> pkgname='python-humblewx' _module='humblewx' -pkgver='0.2.1' +pkgver='0.2.2' pkgrel=1 pkgdesc="Library that simplifies creating user interfaces with wxPython." license=('GPL3') @@ -10,7 +10,7 @@ arch=('any') depends=('python') makedepends=('python-setuptools') source=("https://files.pythonhosted.org/packages/source/h/${_module}/${_module}-${pkgver}.tar.gz") -md5sums=('1d3b30936aecf7570565a73878ed7f73') +sha256sums=('b327e6c8ed4c278136e0d15f436275f4f07f42f062d023e5ea999e7401bf9177') build() { cd "${srcdir}/${_module}-${pkgver}" diff --git a/pcr/python-hypersocial/PKGBUILD b/pcr/python-hypersocial/PKGBUILD index d302cf459..f9a0c3723 100644 --- a/pcr/python-hypersocial/PKGBUILD +++ b/pcr/python-hypersocial/PKGBUILD @@ -3,25 +3,23 @@ _name=hypersocial pkgname=python-${_name} -pkgver=0.2.2.2 -pkgrel=1 +pkgver=0.2.3 +pkgrel=2 pkgdesc="Python program to post RSS to GNU Social & Pump.io (gnusrss and spigot fork)" arch=('any') -url="https://git.hyperbola.info:50100/services/hypersocial.git/" +url="https://gitlab.com/Megver83/hypersocial/" license=('GPL') depends=('python-feedparser' 'python-pycurl' 'sqlite' 'python-pypump' 'python-requests' 'python-argparse') makedepends=('python-setuptools') conflicts=('python-gnusrss') provides=('python-gnusrss') -source=("https://git.hyperbola.info:50100/services/${_name}.git/plain/releases/${_name}-${pkgver}.tar.gz"{,.sig}) -sha512sums=('87f41a72c77de2140759d8d626c09105ea81dde13c22bb1d9535d36e2f5170e43890903b06ec6469c00e24be7fd0972002383d90c036219577cc4d4e85fdd9aa' - 'SKIP') +source=("https://gitlab.com/Megver83/${_name}/-/archive/${pkgver}/${_name}-${pkgver}.tar.gz") +sha512sums=('73a2f2daeb77ecff590a9275b7b0d8d5e98be6c6443e00129e9595876e50a2236909757d182b8f59235fe8c6a2974f3143db7c9b4970d25e10920ca6c0048097') validpgpkeys=('6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78') # David P. package() { - cd "${srcdir}" + cd "${srcdir}/${_name}-${pkgver}" python setup.py install --root="${pkgdir}/" --optimize=1 install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } - diff --git a/pcr/python-libusb1/PKGBUILD b/pcr/python-libusb1/PKGBUILD index 3353446b0..a09055190 100644 --- a/pcr/python-libusb1/PKGBUILD +++ b/pcr/python-libusb1/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Aur): sehraf +# Maintainer (aur): sehraf # submitter (Aur): vorpalblade77@gmail.com pkgname=python-libusb1 _pkgname=libusb1 diff --git a/pcr/python-lirc/PKGBUILD b/pcr/python-lirc/PKGBUILD index 8759e7791..9b45b429f 100644 --- a/pcr/python-lirc/PKGBUILD +++ b/pcr/python-lirc/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR?): Eelco Cramer <eelco@servicelab.org> -# Maintainer: Parabola Aurélien Desbrières <aurelien@xload.io> +# Contributor: Eelco Cramer <eelco@servicelab.org> +# Maintainer: Aurélien Desbrières <aurelien@xload.io> # Contributor: Luke Shumaker <lukeshu@lukeshu.com> pkgname=python-lirc diff --git a/pcr/python-pefile/PKGBUILD b/pcr/python-pefile/PKGBUILD index fe642905e..b514ea3c3 100644 --- a/pcr/python-pefile/PKGBUILD +++ b/pcr/python-pefile/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Christian Rebischke <chris.rebischke[at]archlinux[dot]org> -# Contributor (AUR): Sonic-Y3k <sonic.y3k@googlemail.com> +# Maintainer (aur): Christian Rebischke <chris.rebischke[at]archlinux[dot]org> +# Contributor: Sonic-Y3k <sonic.y3k@googlemail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/python-polib/PKGBUILD b/pcr/python-polib/PKGBUILD index 500f6a45d..59957027d 100644 --- a/pcr/python-polib/PKGBUILD +++ b/pcr/python-polib/PKGBUILD @@ -1,4 +1,5 @@ # Contributor: Esteban V. Carnevale <alfplayer@mailoo.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgbase=python-polib pkgname=(python-polib python2-polib) diff --git a/pcr/python-poppler-qt5/PKGBUILD b/pcr/python-poppler-qt5/PKGBUILD index 7006ba00d..31fe0aa86 100644 --- a/pcr/python-poppler-qt5/PKGBUILD +++ b/pcr/python-poppler-qt5/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Caleb Maclennan <caleb@alerque.com> -# Contributor (AUR): Lucki <https://aur.archlinux.org/account/Lucki/> -# Contributor (AUR): Johan Reitan (venatux) <johan.reitan@gmail.com> +# Maintainer (aur): Caleb Maclennan <caleb@alerque.com> +# Contributor: Lucki <https://aur.archlinux.org/account/Lucki/> +# Contributor: Johan Reitan (venatux) <johan.reitan@gmail.com> # Contributer (AUR): Kenneth Lyons (ixjlyons) <ixjlyons@gmail.com> pkgname=python-poppler-qt5 diff --git a/pcr/python-py3dns/PKGBUILD b/pcr/python-py3dns/PKGBUILD index 0cd4be8e7..e688b8898 100644 --- a/pcr/python-py3dns/PKGBUILD +++ b/pcr/python-py3dns/PKGBUILD @@ -1,41 +1,56 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR:python-pydns): Sebastien Leduc <sebastien@sleduc.fr> -# Contributor (AUR:python-pydns): Samed Beyribey <ras0ir AT eventualis DOT org> +# Maintainer (aur:python-pydns): Sebastien Leduc <sebastien@sleduc.fr> +# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org> pkgname=python-py3dns -_pkgname=py3dns -pkgver=3.2.1 -pkgrel=2 +_pkgname=${pkgname#python-} +pkgver=4.0.0 +pkgrel=1 pkgdesc="A module for looking up DNS entries in Python applications" arch=('any') -url="https://launchpad.net/py3dns" -license=('custom:PSF') +url="https://launchpad.net/${_pkgname}" +license=('custom:PSF-like') -depends=('python') -makedepends=('python-setuptools') +makedepends=('python-build' 'python-installer' 'python-wheel' 'python-flit') source=("https://launchpad.net/${_pkgname}/trunk/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('35a441081a1acfa0cf78e7ccc2ff9449' +md5sums=('1dddc2621ced329a84a814eae1f92a39' 'SKIP') validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman - -_version_constraint() # (dep_pkgname) -{ - local dep_pkgname=$1 - local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1) - version=${version%-*} - local version_inc=${version%.*}.$(( ${version##*.} + 1 )) - - echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}" +build() { + cd "$_pkgname-$pkgver" + python -m build --wheel --no-isolation } +check() { + if ! getent hosts parabola.nu >/dev/null; then + # The tests require networking, which is disabled in libremakepkg + # (for good reason). But it's a bummer for these tests. + # https://labs.parabola.nu/issues/3565 + return + fi + + cd "$_pkgname-$pkgver" + for tstfile in ./test.py tests/*; do + echo "Running $tstfile..." + case "$tstfile" in + tests/test5.py) PYTHONPATH=. "$tstfile" parabola.nu;; + *) PYTHONPATH=. "$tstfile";; + esac + done +} package() { - depends+=( $(_version_constraint 'python') ) + _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2) + depends=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") - cd "$srcdir"/$_pkgname-$pkgver + cd "$_pkgname-$pkgver" + python -m installer --destdir="$pkgdir" dist/*.whl - python setup.py install --root="$pkgdir/" --optimize=1 - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Symlink license file + local site_packages=$(python -c "import site; print(site.getsitepackages()[0])") + install -d "$pkgdir/usr/share/licenses/$pkgname" + ln -s "$site_packages/${pkgname#python-}-$pkgver.dist-info/licenses/LICENSE" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/pcr/python-pypump/PKGBUILD b/pcr/python-pypump/PKGBUILD index 57cda9cfa..48e13155c 100644 --- a/pcr/python-pypump/PKGBUILD +++ b/pcr/python-pypump/PKGBUILD @@ -1,37 +1,33 @@ # Maintainer: David P. <megver83@hyperbola.info> +# parabola changes and rationale: +# - removed python2 split package because upstream dependencies are gone + pkgbase=python-pypump -pkgname=('python-pypump' 'python2-pypump') +pkgname=('python-pypump') pkgver=0.7 -pkgrel=1 +pkgrel=2 arch=('any') license=('GPL3') pkgdesc="Python pump.io library" url="https://github.com/xray7224/PyPump" -makedepends=('python-setuptools' 'python2-setuptools') -checkdepends=('python-dateutil' 'python2-dateutil' 'python-requests' 'python2-requests' 'python-requests-oauthlib' 'python2-requests-oauthlib') +makedepends=('python-setuptools') +checkdepends=('python-dateutil' 'python-requests' 'python-requests-oauthlib') source=("$pkgbase-$pkgver.tar.gz::https://github.com/xray7224/PyPump/archive/v$pkgver.tar.gz") sha512sums=('3906118f681dd886bd8e3d57a49f66a0bc4236fe526d8137905ea8f7fd9bc9fea61a5646ca6e6617095fab62ab3ce91f2ea7d2c5e150125f399048c2f8831e86') prepare() { mv PyPump-$pkgver pypump-$pkgver - cp -a pypump-$pkgver{,-py2} } build() { cd "$srcdir"/pypump-$pkgver python setup.py build - - cd "$srcdir"/pypump-$pkgver-py2 - python2 setup.py build } check() { cd "$srcdir"/pypump-$pkgver python setup.py test - - cd "$srcdir"/pypump-$pkgver-py2 - python setup.py test } package_python-pypump() { @@ -41,11 +37,3 @@ package_python-pypump() { python setup.py install --root="$pkgdir" --optimize=1 install -D -m644 COPYING "$pkgdir"/usr/share/licenses/python-pypump/LICENSE } - -package_python2-pypump() { - depends=('python2' 'python2-requests' 'python2-requests-oauthlib') - - cd pypump-$pkgver-py2 - python2 setup.py install --root="$pkgdir" --optimize=1 - install -D -m644 COPYING "$pkgdir"/usr/share/licenses/python2-pypump/LICENSE -} diff --git a/pcr/python-pyspf/PKGBUILD b/pcr/python-pyspf/PKGBUILD index fd1e4a65e..13376cc9a 100644 --- a/pcr/python-pyspf/PKGBUILD +++ b/pcr/python-pyspf/PKGBUILD @@ -1,44 +1,39 @@ # Maintainer: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR): Hao Zhang <hao at hao-zhang com> -# Contributor (AUR): Rich Li <rich at dranek com> -# Contributor (AUR): Samed Beyribey <ras0ir AT eventualis DOT org> +# Maintainer (aur): Hao Zhang <hao at hao-zhang com> +# Contributor: Rich Li <rich at dranek com> +# Contributor: Samed Beyribey <ras0ir AT eventualis DOT org> pkgname=python-pyspf +_pkgname=${pkgname#python-} pkgver=2.0.14 -pkgrel=2 +pkgrel=3 pkgdesc="Python implementation of the Sender Policy Framework (SPF) protocol" arch=('any') -url="https://pypi.python.org/pypi/pyspf" +url="https://pypi.python.org/pypi/${_pkgname}" license=('PSF') -makedepends=('python-setuptools') -depends=('python-py3dns' 'python') +makedepends=('python-build' 'python-installer' 'python-wheel' 'python-setuptools') +depends=('python-py3dns') +checkdepends=('python-yaml' 'python-authres') optdepends=('python-authres: Return RFC 5451 Authentication Results headers') -source=("https://files.pythonhosted.org/packages/d4/dc/5b3838ff90474e21fe0914920c53430f73402e07d6598ea228e61b74963e/pyspf-$pkgver.tar.gz") +source=("https://files.pythonhosted.org/packages/d4/dc/5b3838ff90474e21fe0914920c53430f73402e07d6598ea228e61b74963e/${_pkgname}-$pkgver.tar.gz") sha256sums=('57a7ef01bda090173aafb6af0106251686ed73f03db4e911fcd34c57fc347186') -_version_constraint() # (dep_pkgname) -{ - local dep_pkgname=$1 - local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1) - version=${version%-*} - local version_inc=${version%.*}.$(( ${version##*.} + 1 )) - - echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}" -} - - build() { - cd "$srcdir/pyspf-$pkgver" + cd "$_pkgname-$pkgver" + python -m build --wheel --no-isolation +} - python setup.py build +check() { + cd "$_pkgname-$pkgver/test" + PYTHONPATH=../build/lib python testspf.py } package() { - depends+=( $(_version_constraint 'python') ) - - cd "$srcdir/pyspf-$pkgver" + _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2) + depends+=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))") - python setup.py install --root="$pkgdir" --optimize=1 + cd "$_pkgname-$pkgver" + python -m installer --destdir="$pkgdir" dist/*.whl } diff --git a/pcr/python-pystache/PKGBUILD b/pcr/python-pystache/PKGBUILD deleted file mode 100644 index 7523900f5..000000000 --- a/pcr/python-pystache/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -pkgname=python-pystache -pkgver=0.5.4 -pkgrel=1 -pkgdesc='The mustache template engine written in python' -arch=(any) -url='http://github.com/defunkt/pystache' -license=(MIT) -depends=(python) -makedepends=(python-setuptools) -source=("https://github.com/defunkt/pystache/archive/v$pkgver.tar.gz") -sha256sums=('163f5b8fb45f6be3a5074a53a47e79ef51ec015ee43f3ec34b16be279147c96f') - -build() { - cd "pystache-$pkgver" - python setup.py build -} - -package() { - cd "pystache-$pkgver" - - python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/pcr/python-pyutil/PKGBUILD b/pcr/python-pyutil/PKGBUILD index 964c8fc4a..1912f8b56 100644 --- a/pcr/python-pyutil/PKGBUILD +++ b/pcr/python-pyutil/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # repolint: reason=asdeps _pkgname=pyutil diff --git a/pcr/python-pywikibot/PKGBUILD b/pcr/python-pywikibot/PKGBUILD index 5331d8089..9fbcf7daa 100644 --- a/pcr/python-pywikibot/PKGBUILD +++ b/pcr/python-pywikibot/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Simon Legner <Simon.Legner@gmail.com> +# Maintainer (aur): Simon Legner <Simon.Legner@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/python-redmine/PKGBUILD b/pcr/python-redmine/PKGBUILD index e0fbd9eba..4d729f491 100644 --- a/pcr/python-redmine/PKGBUILD +++ b/pcr/python-redmine/PKGBUILD @@ -1,18 +1,24 @@ # Maintainer(Aur): Konstantin Shalygin <k0ste@k0ste.ru> -# Contributor(Aur): Konstantin Shalygin <k0ste@k0ste.ru> -# Contributor(Aur): Sebastien Leduc <sebastien@sleduc.fr> +# Contributor: Konstantin Shalygin <k0ste@k0ste.ru> +# Contributor: Sebastien Leduc <sebastien@sleduc.fr> # parabola changes and rationale: -# - Bumped version to 2.3.0 -# Patch status: sent in Aur, waiting review: -# https://aur.archlinux.org/pkgbase/python-redmine/#news +# - Switched from any to ('armv7h' 'i686' 'x86_64') because +# at the time of writing, the python version is not the same +# on all the supported architectures: +# armv7h: Python 3.10.1 (main, Dec 26 2021, 17:22:10) [GCC 10.2.0] on linux +# i686: Python 3.9.9 (main, Nov 27 2021, 18:13:53) +# x86_64: Python 3.10.1 (main, Dec 18 2021, 23:53:45) [GCC 11.1.0] on linux +# - Added pkgrel+=.parabola1 to enable to rebuild the package +# if needed. pkgbase='python-redmine' pkgname=('python-redmine' 'python2-redmine') pkgver=2.3.0 pkgrel=1 +pkgrel+=.parabola2 pkgdesc="Python library for communicating with a Redmine project management application" -arch=("any") +arch=('armv7h' 'i686' 'x86_64') url="https://${pkgbase}.com/" makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') diff --git a/pcr/python-rosdistro/PKGBUILD b/pcr/python-rosdistro/PKGBUILD index b7d93e7e0..8af90bc9a 100644 --- a/pcr/python-rosdistro/PKGBUILD +++ b/pcr/python-rosdistro/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=rosdistro pkgname=(python-$_pkgname) diff --git a/pcr/python-rosinstall/PKGBUILD b/pcr/python-rosinstall/PKGBUILD index 96e3d08a3..d62b52869 100644 --- a/pcr/python-rosinstall/PKGBUILD +++ b/pcr/python-rosinstall/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=rosinstall pkgname=(python-$_pkgname) diff --git a/pcr/python-rospkg/PKGBUILD b/pcr/python-rospkg/PKGBUILD index b2dd7fb9d..507001c0d 100644 --- a/pcr/python-rospkg/PKGBUILD +++ b/pcr/python-rospkg/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> _pkgname=rospkg pkgname=(python{,2}-$_pkgname) diff --git a/pcr/python-vcstools/PKGBUILD b/pcr/python-vcstools/PKGBUILD index 6d1530354..f103930c3 100644 --- a/pcr/python-vcstools/PKGBUILD +++ b/pcr/python-vcstools/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch) : Georg Bremer <pkgbuild@dschoordsch.de> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Georg Bremer <pkgbuild@dschoordsch.de> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=vcstools pkgname=(python{,2}-$_pkgname) diff --git a/pcr/python-wsgiref/PKGBUILD b/pcr/python-wsgiref/PKGBUILD index 4a164c041..cad140a33 100644 --- a/pcr/python-wsgiref/PKGBUILD +++ b/pcr/python-wsgiref/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Parabola GNU / Linux-libre Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=wsgiref pkgname=(python{,2}-$_pkgname) diff --git a/pcr/python-wstool/PKGBUILD b/pcr/python-wstool/PKGBUILD index 72fa7732e..47afc3dba 100644 --- a/pcr/python-wstool/PKGBUILD +++ b/pcr/python-wstool/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Kartik Mohta <kartikmohta@gmail.com> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Kartik Mohta <kartikmohta@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> _pkgname=wstool pkgname=python-$_pkgname diff --git a/pcr/python-xbee/PKGBUILD b/pcr/python-xbee/PKGBUILD index 6cc73f517..735b68d64 100644 --- a/pcr/python-xbee/PKGBUILD +++ b/pcr/python-xbee/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): razer <razer[at]neuf[dot]fr> -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): razer <razer[at]neuf[dot]fr> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: Luke Shumaker <lukeshu@lukeshu.com> pkgname=python-xbee diff --git a/pcr/python-zbase32/PKGBUILD b/pcr/python-zbase32/PKGBUILD index c8189d9a3..9ee7a7d3d 100644 --- a/pcr/python-zbase32/PKGBUILD +++ b/pcr/python-zbase32/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> # repolint: reason=asdeps _pkgname=zbase32 diff --git a/pcr/python2-amqplib/PKGBUILD b/pcr/python2-amqplib/PKGBUILD index 744787ab9..e30c12971 100644 --- a/pcr/python2-amqplib/PKGBUILD +++ b/pcr/python2-amqplib/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Tevin Zhang <mail2tevin {at} gmail {dot} com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Contributor: Tevin Zhang <mail2tevin {at} gmail {dot} com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=python2-amqplib pkgver=1.0.2 diff --git a/pcr/python2-async/PKGBUILD b/pcr/python2-async/PKGBUILD index 2dfbc5319..11ba3650f 100644 --- a/pcr/python2-async/PKGBUILD +++ b/pcr/python2-async/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch) : Jon Bergli Heier <snakebite@jvnv.net> -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Contributor: Jon Bergli Heier <snakebite@jvnv.net> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=python2-async pkgver=0.6.2 diff --git a/pcr/python2-authres/PKGBUILD b/pcr/python2-authres/PKGBUILD index bb313d953..00127a75c 100644 --- a/pcr/python2-authres/PKGBUILD +++ b/pcr/python2-authres/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Thomas Haider <t.haider@deprecate.de> -# Contributor (AUR): Filip S. Adamsen <fsa [at] fsadev [dot] com> -# Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org> +# Maintainer (aur): Thomas Haider <t.haider@deprecate.de> +# Contributor: Filip S. Adamsen <fsa [at] fsadev [dot] com> +# Contributor: Samed Beyribey <ras0ir@eventualis.org> # parabola changes and rationale: # no changes. diff --git a/pcr/python2-caldav/PKGBUILD b/pcr/python2-caldav/PKGBUILD index 5e0ab2213..ecc6b4e28 100644 --- a/pcr/python2-caldav/PKGBUILD +++ b/pcr/python2-caldav/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Elena ``of Valhalla'' Grandi <elena.valhalla@gmail.com> +# Maintainer (arch): Elena ``of Valhalla'' Grandi <elena.valhalla@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=python2-caldav pkgver=0.4.0 diff --git a/pcr/python2-carrot/PKGBUILD b/pcr/python2-carrot/PKGBUILD index ebf4eec8b..c0068e7b9 100644 --- a/pcr/python2-carrot/PKGBUILD +++ b/pcr/python2-carrot/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (Arch): Lukas Linhart <bugs@almad.net> -# Contributor (Arch): Marco Elver <marco.elver AT gmail.com> -# Contributor (Arch): Jacob Melton <jmelton116@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Contributor: Lukas Linhart <bugs@almad.net> +# Contributor: Marco Elver <marco.elver AT gmail.com> +# Contributor: Jacob Melton <jmelton116@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=python2-carrot pkgver=0.10.7 diff --git a/pcr/python2-django-tagging/PKGBUILD b/pcr/python2-django-tagging/PKGBUILD index 65d1d6703..73f0b98e5 100644 --- a/pcr/python2-django-tagging/PKGBUILD +++ b/pcr/python2-django-tagging/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (AUR): Andrey Mivrenik <gim at fastmail dot fm> -# Contributor (AUR): Ryan Coyner <rcoyner@gmail.com> -# Contributor (AUR): James Pearson <james.m.pearson+arch@gmail.com> -# Maintainer : Aurélien Desbrières <aurelien@hackers.camp> +# Contributor: Andrey Mivrenik <gim at fastmail dot fm> +# Contributor: Ryan Coyner <rcoyner@gmail.com> +# Contributor: James Pearson <james.m.pearson+arch@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # - added replaces for previous pkgname 'django-tagging' (2018-02-01) diff --git a/pcr/python2-djvulibre/PKGBUILD b/pcr/python2-djvulibre/PKGBUILD index 3cdd73890..cbffb2443 100644 --- a/pcr/python2-djvulibre/PKGBUILD +++ b/pcr/python2-djvulibre/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Dmitry Kharitonov <darksab0r@gmail.com> -# Contributor (AUR): Francois Garillot <francois[@]garillot.net> -# Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail> -# Contributor (AUR): Malkov Fyodor aka krox <iksut@yandex.ru> +# Maintainer (aur): Dmitry Kharitonov <darksab0r@gmail.com> +# Contributor: Francois Garillot <francois[@]garillot.net> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Malkov Fyodor aka krox <iksut@yandex.ru> # parabola changes and rationale: # no changes. diff --git a/pcr/python2-dukpy/PKGBUILD b/pcr/python2-dukpy/PKGBUILD index b7916c824..9f8508f03 100644 --- a/pcr/python2-dukpy/PKGBUILD +++ b/pcr/python2-dukpy/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (arch): Jelle van der Waa <jelle@archlinux.org> -# Contributor (arch): Eli Schwartz <eschwartz93@gmail.com> +# Contributor: Jelle van der Waa <jelle@archlinux.org> +# Contributor: Eli Schwartz <eschwartz93@gmail.com> # Maintainer: bill-auger <bill-auger@programmer.net> diff --git a/pcr/python2-empy/PKGBUILD b/pcr/python2-empy/PKGBUILD index 184cfbd3f..67c17ef4d 100644 --- a/pcr/python2-empy/PKGBUILD +++ b/pcr/python2-empy/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (Arch): Benjamin Chretien <chretien at lirmm dot fr> -# Contributor (Arch): Andrew Conkling <andrewski@fr.st> -# Contributor (Arch): hauptmech <hauptmech@gmail.com> -# Maintainer : Parabola GNU / LInux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Benjamin Chretien <chretien at lirmm dot fr> +# Contributor: Andrew Conkling <andrewski@fr.st> +# Contributor: hauptmech <hauptmech@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=python2-empy realname=empy diff --git a/pcr/python2-flask-lesscss/PKGBUILD b/pcr/python2-flask-lesscss/PKGBUILD index f42217cf9..c4716b29c 100644 --- a/pcr/python2-flask-lesscss/PKGBUILD +++ b/pcr/python2-flask-lesscss/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname="python2-flask-lesscss" pkgver=0.9.1 diff --git a/pcr/python2-interruptingcow/PKGBUILD b/pcr/python2-interruptingcow/PKGBUILD index a8f16a8e7..44e593ffe 100644 --- a/pcr/python2-interruptingcow/PKGBUILD +++ b/pcr/python2-interruptingcow/PKGBUILD @@ -1,7 +1,8 @@ # Mantainer (Arch): Ivan Pulido <ijpulidos[AT]riseup.net> -# Contributor (Arch): Thomas Dziedzic < gostrc at gmail > -# Contributor (Arch): Paulo Matias <matias@archlinux-br·org> -# Contributor (Arch): Rafael G. Martins <rafael@rafaelmartins.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Paulo Matias <matias@archlinux-br·org> +# Contributor: Rafael G. Martins <rafael@rafaelmartins.com> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=python2-interruptingcow pkgver=0.6 diff --git a/pcr/python2-liblarch/PKGBUILD b/pcr/python2-liblarch/PKGBUILD index 97f5020ef..22449327a 100644 --- a/pcr/python2-liblarch/PKGBUILD +++ b/pcr/python2-liblarch/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Francois Boulogne <fboulogne at april dot org> +# Maintainer (arch): Francois Boulogne <fboulogne at april dot org> pkgname=python2-liblarch pkgver=2.1.0 diff --git a/pcr/python2-oauth2/PKGBUILD b/pcr/python2-oauth2/PKGBUILD index 39b174eaa..38b53df45 100644 --- a/pcr/python2-oauth2/PKGBUILD +++ b/pcr/python2-oauth2/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=python2-oauth2 pkgver=1.5.211 diff --git a/pcr/python2-paste-deploy/PKGBUILD b/pcr/python2-paste-deploy/PKGBUILD index 6474f3727..2c93342f9 100644 --- a/pcr/python2-paste-deploy/PKGBUILD +++ b/pcr/python2-paste-deploy/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (Arch): Limao Luo <luolimao+AUR@gmail.com> -# Contributor (Arch): David Campbell <davekong@archlinux.us> -# Contributor (Arch): Cilyan Olowen <gaknar@gmail.com> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Contributor: Limao Luo <luolimao+AUR@gmail.com> +# Contributor: David Campbell <davekong@archlinux.us> +# Contributor: Cilyan Olowen <gaknar@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> _pkgname=PasteDeploy pkgname=python2-paste-deploy diff --git a/pcr/python2-paste-script/PKGBUILD b/pcr/python2-paste-script/PKGBUILD index ad7aeafce..ab71b5988 100644 --- a/pcr/python2-paste-script/PKGBUILD +++ b/pcr/python2-paste-script/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Brad Pitcher <bradpitcher@gmail.com> -# Contributor (Arch): David Campbell <davekong@archlinux.us> -# Contributor (Arch): Cilyan Olowen <gaknar@gmail.com> +# Maintainer (arch): Brad Pitcher <bradpitcher@gmail.com> +# Contributor: David Campbell <davekong@archlinux.us> +# Contributor: Cilyan Olowen <gaknar@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=python2-paste-script diff --git a/pcr/python2-pkgtools/PKGBUILD b/pcr/python2-pkgtools/PKGBUILD index 43522d599..e7177d6a1 100644 --- a/pcr/python2-pkgtools/PKGBUILD +++ b/pcr/python2-pkgtools/PKGBUILD @@ -1,5 +1,5 @@ # $Id$ -# Maintainer (Arch): Fabien Devaux <fdev31 at gmail dot com> +# Maintainer (arch): Fabien Devaux <fdev31 at gmail dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=python2-pkgtools diff --git a/pcr/python2-potr/PKGBUILD b/pcr/python2-potr/PKGBUILD index 3d6e77032..586cbc751 100644 --- a/pcr/python2-potr/PKGBUILD +++ b/pcr/python2-potr/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Eliot Whalan <ewhal at pantsu dot cat>: +# Maintainer (aur): Eliot Whalan <ewhal at pantsu dot cat>: # Contrbutor (AUR): Michael Düll <mail@akurei.me> # Contributor: fauno <fauno@parabola.nu> # Contrbutor: bill-auger <bill-auger@programmer.net> diff --git a/pcr/python2-relatorio/PKGBUILD b/pcr/python2-relatorio/PKGBUILD index 115c1d572..493c6ad4e 100644 --- a/pcr/python2-relatorio/PKGBUILD +++ b/pcr/python2-relatorio/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (AUR): Richard PALO <richard.palo@free.fr> -# Contributor (AUR): Florian Walch <florian.walch@gmx.at> -# Maintainer (AUR): Robin Baumgartner <robin@baumgartners.ch> +# Contributor: Richard PALO <richard.palo@free.fr> +# Contributor: Florian Walch <florian.walch@gmx.at> +# Maintainer (aur): Robin Baumgartner <robin@baumgartners.ch> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/python2-stdnum/PKGBUILD b/pcr/python2-stdnum/PKGBUILD index c8453316e..6a760c566 100644 --- a/pcr/python2-stdnum/PKGBUILD +++ b/pcr/python2-stdnum/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Alex Merry <dev@randomguy3.me.uk> +# Maintainer (arch): Alex Merry <dev@randomguy3.me.uk> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=python2-stdnum diff --git a/pcr/pythonqt/PKGBUILD b/pcr/pythonqt/PKGBUILD index 210d99b09..724b1550b 100644 --- a/pcr/pythonqt/PKGBUILD +++ b/pcr/pythonqt/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Alfredo Ramos <alfredo dot ramos at yandex dot com> -# Contributor (AUR): Chris <christopher.r.mullins g-mail> -# Contributor (AUR): Ainola -# Contributor (AUR): speps +# Maintainer (aur): Alfredo Ramos <alfredo dot ramos at yandex dot com> +# Contributor: Chris <christopher.r.mullins g-mail> +# Contributor: Ainola +# Contributor: speps # Maintainer: David P. <megver83@parabola.nu> pkgname=pythonqt diff --git a/pcr/pyzenity/PKGBUILD b/pcr/pyzenity/PKGBUILD index f153a0b18..e5e476bd4 100644 --- a/pcr/pyzenity/PKGBUILD +++ b/pcr/pyzenity/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (Arch): lang2 <wenzhi.liang@gmail.com> -# Contributor (Arch): sylvain alborini <sylvain dot alborini at gmail dot com> -# Maintainer : Parabola Aurélien DESBRIÈRES <aurelien@replicant.io> +# Contributor: lang2 <wenzhi.liang@gmail.com> +# Contributor: sylvain alborini <sylvain dot alborini at gmail dot com> +# Maintainer: Aurélien Desbrières <aurelien@replicant.io> pkgname=pyzenity _pkg_name=PyZenity diff --git a/pcr/qdl/PKGBUILD b/pcr/qdl/PKGBUILD index fde797568..67d5d1a40 100644 --- a/pcr/qdl/PKGBUILD +++ b/pcr/qdl/PKGBUILD @@ -1,8 +1,7 @@ # Copyright (C) 2019 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=qdl pkgver=1.0 diff --git a/pcr/qt5-quick1/PKGBUILD b/pcr/qt5-quick1/PKGBUILD index f441abd3c..bc636eb1d 100644 --- a/pcr/qt5-quick1/PKGBUILD +++ b/pcr/qt5-quick1/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Zulu +# Maintainer (aur): Zulu # parabola changes and rationale: # no changes. diff --git a/pcr/qt5-webkit-og/PKGBUILD b/pcr/qt5-webkit-og/PKGBUILD index 01aece7b3..f63c0eac7 100644 --- a/pcr/qt5-webkit-og/PKGBUILD +++ b/pcr/qt5-webkit-og/PKGBUILD @@ -1,8 +1,8 @@ # $Id: PKGBUILD 240297 2015-06-03 10:22:03Z fyan $ -# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org> -# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> +# Maintainer (arch): Felix Yan <felixonmars@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Maintainer (ALARM): Kevin Mihelich <kevin@archlinuxarm.org> +# Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org> # - icu makedepend # - patch for soft-float armv5 # - patch for AArch64 support in qtwebkit diff --git a/pcr/qtoctave/PKGBUILD b/pcr/qtoctave/PKGBUILD index 4a91004ba..ddac4c728 100644 --- a/pcr/qtoctave/PKGBUILD +++ b/pcr/qtoctave/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Michael Schubert <mschu.dev at gmail> -# Contributor (AUR): Ronald van Haren <ronald.archlinux.org> -# Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer (aur): Michael Schubert <mschu.dev at gmail> +# Contributor: Ronald van Haren <ronald.archlinux.org> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=qtoctave diff --git a/pcr/qtqr/PKGBUILD b/pcr/qtqr/PKGBUILD deleted file mode 100644 index d3ff33cf9..000000000 --- a/pcr/qtqr/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> - -_python="python2" -_name="qr-tools" -_ubuntur="0~23~ubuntu16.10.1" -pkgname="qtqr" -pkgver="1.4" -pkgrel="1" -pkgdesc="A Graphical interface QR Code generator and decoder." -url="https://launchpad.net/qr-tools" -arch=('i686' 'x86_64') -license=('GPL3') -depends=("${_python}" "${_python}-qrtools" "${_python}-pyqt4") -provides=("${pkgname}") -source=("https://launchpad.net/~${_name}-developers/+archive/ubuntu/daily/+files/${pkgname}_${pkgver}-${_ubuntur}.tar.gz") -sha256sums=('b1d3ba45594ddacd96c2da906b8ed90a0f0f50cc0348b9d2435ff11c93eebae1') - -_qtqr_desktop="[Desktop Entry] -Name=QtQR -Comment=QtQR is a Qt based software that let's you generate QR Codes easily, scan an image file for QR Codes and decode them or use your webcam to scan a printed one. -Exec=qtqr -Icon=qtqr -Terminal=false -Type=Application -Categories=Graphics" - -build() { - cd "${pkgname}-${pkgver}" - echo -e "$_qtqr_desktop" | tee "${pkgname}.desktop" - sed -i 's/env python/env python2/' "${pkgname}.py" -} - -package() { - cd "${pkgname}-${pkgver}" - install -d ${pkgdir}/usr/bin - install -d ${pkgdir}/usr/share/${pkgname}/samples - install -d ${pkgdir}/usr/share/applications - install -d ${pkgdir}/usr/share/pixmaps - install -d ${pkgdir}/usr/share/qt4/translations - - install -m 755 qtqr.py ${pkgdir}/usr/bin/qtqr - install -m 644 samples/* ${pkgdir}/usr/share/${pkgname}/samples - install -m 644 qtqr.desktop ${pkgdir}/usr/share/applications - install -m 644 icon.png ${pkgdir}/usr/share/pixmaps/qtqr.png - install -m 644 *.qm ${pkgdir}/usr/share/qt4/translations - - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -# vim:set ts=4 sw=2 ft=sh et: diff --git a/pcr/qtwebkit/PKGBUILD b/pcr/qtwebkit/PKGBUILD index 7c631703b..621955b83 100644 --- a/pcr/qtwebkit/PKGBUILD +++ b/pcr/qtwebkit/PKGBUILD @@ -1,5 +1,5 @@ # $Id: PKGBUILD 252776 2015-12-06 12:09:40Z bpiotrowski $ -# Maintainer (AUR): Andrea Scarpino <andrea@archlinux.org> +# Maintainer (aur): Andrea Scarpino <andrea@archlinux.org> # parabola changes and rationale: # no changes. diff --git a/pcr/quack/PKGBUILD b/pcr/quack/PKGBUILD index 4be985b57..43f357f7c 100644 --- a/pcr/quack/PKGBUILD +++ b/pcr/quack/PKGBUILD @@ -1,6 +1,6 @@ -# Contributor (AUR): Geoffrey Teale <tealeg@member.fsf.org> -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Contributor: Geoffrey Teale <tealeg@member.fsf.org> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=quack pkgver=0.48 diff --git a/pcr/quackle/PKGBUILD b/pcr/quackle/PKGBUILD index ba272f571..641703770 100644 --- a/pcr/quackle/PKGBUILD +++ b/pcr/quackle/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Guillaume ALAUX <Guillaume at ALAUX dot net> +# Maintainer (aur): Guillaume ALAUX <Guillaume at ALAUX dot net> # parabola changes and rationale: # no changes. diff --git a/pcr/quaternion/PKGBUILD b/pcr/quaternion/PKGBUILD new file mode 100644 index 000000000..07febfb83 --- /dev/null +++ b/pcr/quaternion/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: bill-auger <bill-auger@programmer.net> + + +# NOTE: there is not much point in diffing this against the AUR package +# the AUR package is very convoluted, uses vendored libs, and builds from VCS; +# so i re-wrote it from scratch according to the upstream guide +# this recipe is nice and simple + + +pkgname=quaternion +pkgver=0.0.96 +pkgrel=1 +pkgdesc="Qt5 Matrix client, with IRC/hexchat-like GUI" +arch=(aarch64 armv7h i686 x86_64) +url=https://matrix.org/docs/projects/client/quaternion.html +license=(GPL3) + +depends=(libquotient qt5-multimedia qt5-quickcontrols2 qt5-tools) +makedepends=(cmake) +optdepends=(qtkeychain-qt5) + +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/quotient-im/${pkgname^}/archive/refs/tags/${pkgver}.tar.gz) +sha256sums=(39868fbae40c36ebcd1a955cb65e953c4a1b9b74e9c1b9e2c838a0ce77ce5ac0) + + +build() +{ + cd "${srcdir}"/${pkgname^}-${pkgver} ; mkdir build ; cd build ; + + cmake .. \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=ON \ + -DUSE_INTREE_LIBQMC=OFF \ + -DBUILD_WITH_QT6=OFF + cmake --build . --target all +} + +package() +{ + cd "${srcdir}"/${pkgname^}-${pkgver} + + DESTDIR="$pkgdir" cmake --install build +} diff --git a/pcr/qwt-qt4/PKGBUILD b/pcr/qwt-qt4/PKGBUILD index 7d97f8832..d10c22e51 100644 --- a/pcr/qwt-qt4/PKGBUILD +++ b/pcr/qwt-qt4/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info> -# Contributor (Arch): Ronald van Haren <ronald.archlinux.org> +# Maintainer (arch): Doug Newgard <scimmia at archlinux dot info> +# Contributor: Ronald van Haren <ronald.archlinux.org> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=qwt-qt4 diff --git a/pcr/qwtpolar-qt4/PKGBUILD b/pcr/qwtpolar-qt4/PKGBUILD index e0e61a898..bae232922 100644 --- a/pcr/qwtpolar-qt4/PKGBUILD +++ b/pcr/qwtpolar-qt4/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (Arch): Doug Newgard <scimmia at archlinux dot info> -# Contributor (Arch): SaultDon <sault.don gmail> -# Contributor (Arch): Gunther Schulz < mail at guntherschulz.de > -# Contributor (Arch): Kévin Guilloy <kevin at guilloy dot ath dot cx> +# Maintainer (arch): Doug Newgard <scimmia at archlinux dot info> +# Contributor: SaultDon <sault.don gmail> +# Contributor: Gunther Schulz < mail at guntherschulz.de > +# Contributor: Kévin Guilloy <kevin at guilloy dot ath dot cx> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=qwtpolar-qt4 diff --git a/pcr/rbenv/PKGBUILD b/pcr/rbenv/PKGBUILD index 1d8f5813e..d3c515916 100644 --- a/pcr/rbenv/PKGBUILD +++ b/pcr/rbenv/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Chris Down <chris@chrisdown.name> -# Contributor (AUR): Vladimir Chizhov <jagoterr@gmail.com> -# Contributor (AUR): Jochen Schalanda <jochen+aur (-AT-) schalanda.name> -# Contributor (AUR): Ichimonji10 <Ichimonji10@gmail.com> -# Maintainer : Aurélien Desbrières <aurelien@hackers.camp> +# Maintainer (aur): Chris Down <chris@chrisdown.name> +# Contributor: Vladimir Chizhov <jagoterr@gmail.com> +# Contributor: Jochen Schalanda <jochen+aur (-AT-) schalanda.name> +# Contributor: Ichimonji10 <Ichimonji10@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # no changes. diff --git a/pcr/realtimeconfigquickscan-git/PKGBUILD b/pcr/realtimeconfigquickscan-git/PKGBUILD index 092f8bee6..e617bec3d 100644 --- a/pcr/realtimeconfigquickscan-git/PKGBUILD +++ b/pcr/realtimeconfigquickscan-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): CrocoDuck <crocoduck dot oducks at gmail dot com> -# Contributor (AUR): Giancarlo Bianchi <giancarlobianchi76@gmail.com> +# Maintainer (aur): CrocoDuck <crocoduck dot oducks at gmail dot com> +# Contributor: Giancarlo Bianchi <giancarlobianchi76@gmail.com> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/recutils/PKGBUILD b/pcr/recutils/PKGBUILD index abe20b300..2be22da70 100644 --- a/pcr/recutils/PKGBUILD +++ b/pcr/recutils/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Stefan Haller <fgrsnau@gmail.com> +# Maintainer (aur): Stefan Haller <fgrsnau@gmail.com> # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> pkgname=recutils diff --git a/pcr/rencode/PKGBUILD b/pcr/rencode/PKGBUILD index f9a4ecf4b..f0841dde7 100644 --- a/pcr/rencode/PKGBUILD +++ b/pcr/rencode/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Bug <bug2000@gmail.com> -# Maintainer (AUR): Bug <bug2000@gmail.com> +# Contributor: Bug <bug2000@gmail.com> +# Maintainer (aur): Bug <bug2000@gmail.com> # parabola changes and rationale: # no changes diff --git a/pcr/rmilter/PKGBUILD b/pcr/rmilter/PKGBUILD index 72149e365..03b794522 100644 --- a/pcr/rmilter/PKGBUILD +++ b/pcr/rmilter/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (AUR): Oleksandr Natalenko <oleksandr@natalenko.name> +# Contributor: Oleksandr Natalenko <oleksandr@natalenko.name> # Contributor: fauno <fauno@parabola.nu> # Contrbutor: bill-auger <bill-auger@programmer.net> - +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=rmilter pkgver=1.10.0 diff --git a/pcr/rstudio-desktop/PKGBUILD b/pcr/rstudio-desktop/PKGBUILD index 3d50d59c5..ddd15c174 100644 --- a/pcr/rstudio-desktop/PKGBUILD +++ b/pcr/rstudio-desktop/PKGBUILD @@ -1,39 +1,38 @@ -# Contributor (AUR): Ben Ward <benjamin.ward@bathspa.org> -# Contributor (AUR): Alexsandr Pavlov <kidoz at mail dot ru> -# Maintainer (AUR): Philipp A. <flying-sheep@web.de> +# Contributor: Ben Ward <benjamin.ward@bathspa.org> +# Contributor: Alexsandr Pavlov <kidoz at mail dot ru> +# Maintainer (aur): Philipp A. <flying-sheep@web.de> + # parabola changes and rationale: -# - added .install file to update desktop database +# - use webkit rather than webengine + pkgname=rstudio-desktop -pkgver=1.1.419 -_gwtver=2.7.0 -_ginver=1.5 +pkgver=1.3.1093 _clangver=3.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="Open source and enterprise-ready professional software for the R community" -arch=(i686 x86_64 armv7h) +arch=(i686 x86_64) +arch+=(armv7h) url="http://www.rstudio.com/" license=(AGPL) depends=( - 'r>=2.11.1' 'boost-libs>=1.63' - pango shared-mime-info mathjax pandoc clang - qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webkit qt5-xmlpatterns + 'r>=3.0.1' 'boost-libs>=1.63' + pango shared-mime-info mathjax clang + 'qt5-base>=5.12.5' qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns ) -makedepends=('cmake>=2.8' 'boost>=1.63' java-environment apache-ant openssl pam) +depends=(${depends[*]/qt5-webengine/qt5-webkit}) +makedepends=('cmake>=3.4.3' 'boost>=1.69' 'java-environment=8' 'patchelf>=0.9' apache-ant openssl pam r-testthat) conflicts=(rstudio-desktop-bin rstudio-desktop-git rstudio-desktop-preview-bin) -install=rstudio.install source=( "rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/tarball/v$pkgver" - "https://s3.amazonaws.com/rstudio-buildtools/gin-$_ginver.zip" - "https://s3.amazonaws.com/rstudio-buildtools/gwt-$_gwtver.zip" 'https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip' + 'https://gist.githubusercontent.com/trap000d/22b11a58c064046478967e60b3394214/raw/8bd457515431ec8c139e8f07fd86b0d2cb420d5d/rstudio-aee4453_libboost175.diff' ) noextract=('core-dictionaries.zip' "gin-$_ginver.zip") -sha256sums=('597c373092ea3416da2e44fada07734e106b40f961784bf5d951641c18c29f3a' - 'f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94' - 'aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3' - '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494') +sha256sums=('6ea169a0d59f0c3eba408d74a2590f7bf9f1e6f911b266a02f6266bf4975cec9' + '4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494' + '77e3e1cfec3c3ffebc9151f62b80db2840db022c84359c7bf17e92c288ab4973') _pkgname=rstudio @@ -50,28 +49,21 @@ _check_version() { fi } -prepare() { - cd "$srcdir/$_pkgname-$_pkgname-"* - _check_version GIN_VER $_ginver 'dependencies/common/install-gwt' || exit 1 - _check_version GWT_SDK_VER $_gwtver 'dependencies/common/install-gwt' || exit 1 - unzip -o "$srcdir/gin-$_ginver.zip" -d "../gin-$_ginver" -} - build() { + if [[ $(archlinux-java get) != 'java-8'* ]]; then + echo 'You need to have Java 8 active when building this package.' >&2 + echo 'Please execute `sudo archlinux-java set java-8-openjdk`' >&2 + exit 1 + fi cd "$srcdir/$_pkgname-$_pkgname-"* - install -d src/gwt/lib/{gin/$_ginver,gwt/$_gwtver} - - cp -r "$srcdir/gin-$_ginver/"* "src/gwt/lib/gin/$_ginver" - cp -r "$srcdir/gwt-$_gwtver/"* "src/gwt/lib/gwt/$_gwtver" - ( cd 'dependencies/common' install -d dictionaries libclang/{3.5,builtin-headers} unzip -qfod 'dictionaries' "$srcdir/core-dictionaries.zip" - ln -sfT '/usr/share/mathjax' mathjax-26 + ln -sfT '/usr/share/mathjax' mathjax-27 ln -sfT '/usr/bin' pandoc ln -sfT '/usr/lib/libclang.so' libclang/3.5/libclang.so ln -sfT "/usr/lib/clang/$_clangver/include" libclang/builtin-headers/3.5 @@ -81,7 +73,25 @@ build() { bash 'install-packages' ) + # The previous comparison doesn’t seem to work with Boost_VERSION being 1.71.0 + sed -i 's/Boost_VERSION LESS 106900/Boost_VERSION VERSION_LESS 1.69.0/g' src/cpp/CMakeLists.txt + patch -p1 <'../rstudio-aee4453_libboost175.diff' + + # Prevent java error: “Could not lock User prefs. Lock file access denied.” + # Because gwt desperately needs to add a “firstLaunch” entry there… + export JAVA_TOOL_OPTIONS="-Djava.util.prefs.userRoot=$srcdir" + + # Set information for Cmake and build + local shortver="${pkgver%.*}" + export RSTUDIO_VERSION_MAJOR="${pkgver%%.*}" + export RSTUDIO_VERSION_MINOR="${shortver#*.}" + export RSTUDIO_VERSION_PATCH="${pkgver##*.}" + export GIT_COMMIT="${PWD##*-}" + export BUILD_ID="local" + export PACKAGE_OS="Arch Linux" cmake -DRSTUDIO_TARGET=Desktop \ + -Wno-dev \ + -DRSTUDIO_USE_SYSTEM_BOOST=Yes \ -DCMAKE_BUILD_TYPE=Release \ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \ -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio diff --git a/pcr/rstudio-desktop/boost-signals.patch b/pcr/rstudio-desktop/boost-signals.patch new file mode 100644 index 000000000..64e41e22c --- /dev/null +++ b/pcr/rstudio-desktop/boost-signals.patch @@ -0,0 +1,12 @@ +diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt +index 761003d..f8543e9 100644 +--- a/src/cpp/CMakeLists.txt ++++ b/src/cpp/CMakeLists.txt +@@ -157,7 +157,6 @@ list(APPEND BOOST_LIBS + iostreams + program_options + regex +- signals + system + thread + chrono diff --git a/pcr/rstudio-desktop/rstudio.install b/pcr/rstudio-desktop/rstudio.install deleted file mode 100644 index d0192c8c0..000000000 --- a/pcr/rstudio-desktop/rstudio.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install "$1" -} - -post_remove() { - post_install "$1" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/rtorrent-color/PKGBUILD b/pcr/rtorrent-color/PKGBUILD index 70ec13b87..a35e024b4 100644 --- a/pcr/rtorrent-color/PKGBUILD +++ b/pcr/rtorrent-color/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org> -# Maintainer (Arch): Jaroslav Lichtblau <svetlemodry@archlinux.org> -# Contributor (Arch): Daenyth <Daenyth [at] gmail [dot] com> -# Contributor (Arch): Jeff Mickey <jeff@archlinux.org> -# Contributor (Arch): sh__ +# Maintainer (arch): Gaetan Bisson <bisson@archlinux.org> +# Maintainer (arch): Jaroslav Lichtblau <svetlemodry@archlinux.org> +# Contributor: Daenyth <Daenyth [at] gmail [dot] com> +# Contributor: Jeff Mickey <jeff@archlinux.org> +# Contributor: sh__ # Based on rtorrent in [community] # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> diff --git a/pcr/ruby-asciidoctor/PKGBUILD b/pcr/ruby-asciidoctor/PKGBUILD deleted file mode 100644 index 40b42f71d..000000000 --- a/pcr/ruby-asciidoctor/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by gem2arch (https://github.com/anatol/gem2arch) -# Contributor (AUR): Nicolas Bigaouette <nbigaouette@chemcomp.com> -# Maintainer (AUR): Nick Østergaard <oe.nick at gmail dot com> - -_gemname=asciidoctor -pkgname=ruby-$_gemname -pkgver=1.5.8 -pkgdesc='An implementation of the AsciiDoc text processor and publishing toolchain in Ruby' -url='http://asciidoctor.org' -license=(MIT) - -pkgrel=1 -arch=(any) -depends=(ruby) -makedepends=(rubygems) -options=(!emptydirs) -source=($pkgname-$pkgver.tar.gz::https://github.com/asciidoctor/asciidoctor/archive/v$pkgver.tar.gz) -sha256sums=('bc225145feb7876bce5188aa3ef511fad49b141ec18e1bb60e69b33b0a100da0') - -build() { - cd "$srcdir/$_gemname-$pkgver" - - gem build $_gemname.gemspec -} - -package() { - cd "$srcdir/$_gemname-$pkgver" - - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \ - "$_gemname-$pkgver.gem" - - install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/LICENSE \ - "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} diff --git a/pcr/ruby-haml/PKGBUILD b/pcr/ruby-haml/PKGBUILD index 4f9014792..80174684f 100644 --- a/pcr/ruby-haml/PKGBUILD +++ b/pcr/ruby-haml/PKGBUILD @@ -1,6 +1,6 @@ # Generated by gem2arch (https://github.com/anatol/gem2arch) -# Maintainer (Arch): Aoibhinn di Tori <email@aoibh.in> -# Contributor (Arch): Artem Vorotnikov <artem@vorotnikov.me> +# Maintainer (arch): Aoibhinn di Tori <email@aoibh.in> +# Contributor: Artem Vorotnikov <artem@vorotnikov.me> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> _gemname=haml diff --git a/pcr/ruby-syntax/PKGBUILD b/pcr/ruby-syntax/PKGBUILD index ffa2242d2..f606bb246 100644 --- a/pcr/ruby-syntax/PKGBUILD +++ b/pcr/ruby-syntax/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainter: Aurelien Desbrieres <aurelien@cwb.io> +# Maintainter: Aurélien Desbrières <aurelien@cwb.io> # Contributor: Luke Shumaker <lukeshu@parabola.nu> -# Maintainer (AUR): Adam Lloyd <lloyda2@rpi.edu> +# Maintainer (aur): Adam Lloyd <lloyda2@rpi.edu> _gemname=syntax pkgname=ruby-$_gemname diff --git a/pcr/rush/PKGBUILD b/pcr/rush/PKGBUILD index d35292d36..e8f92948d 100644 --- a/pcr/rush/PKGBUILD +++ b/pcr/rush/PKGBUILD @@ -1,6 +1,7 @@ -# Maintainer (AUR): Chris Severance aur.severach aATt spamgourmet dott com -# Contributor (AUR): Brandon Invergo <brandon@invergo.net> -# Contributor (AUR): B3nny <benny@b3nny.net> +# Maintainer (aur): Chris Severance aur.severach aATt spamgourmet dott com +# Contributor: Brandon Invergo <brandon@invergo.net> +# Contributor: B3nny <benny@b3nny.net> +# Contributor: Wael Karram <wael@waelk.tech> # parabola changes and rationale: # - added .install file to update icon database @@ -8,37 +9,30 @@ set -u pkgname='rush' -pkgver='1.8' +pkgver='2.3' pkgrel='1' pkgdesc='GNU Restricted User Shell' arch=('i686' 'x86_64' 'armv7h') url='http://puszcza.gnu.org.ua/software/rush/' license=('GPL3') -makedepends=('patch') +#makedepends=('patch') backup=('etc/rush.rc') install='rush.install' _verwatch=("${url}download.html" "${pkgname}-\([0-9\.]\+\)\.tar.xz" 't') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'rush-1.7-glib-2.16-gets.patch' 'intprops.patch') -# md5 and sha1 are published by gnu -md5sums=('50d8bb3c0a502f2c1f5b374046ff78de' - 'dcd87b8bf9738796621030930384f97d' - 'a86f13da54caba8df99719153c72cdcf') -sha1sums=('e882f68d9004af608b7e5c430c367645aa3e3b75' - 'adb33d34f04846734ec3457517b46fb7a73efa6f' - '637d0a93c8e73e86e9a62f95296e1e110bd6a038') -sha256sums=('dd3b7bfb33570890086218aa049900a9b4d5a9e8d4878a1328e2aa88bb5793ee' +sha256sums=('8cae258247cd2623e856ea5e2c62cd7f09e9e3e043e6fc63bbd1abec3d3fdd93' '159dd2fc0fd4feec5d43cf7763a429b9c2da5c50597b157de9e5b376d9ff85a8' 'eb916fff92a4a33fff4951f1f219e8c9fb12f3a6c0dd462da30e451b26789a28') prepare() { set -u cd "${pkgname}-${pkgver}" - patch -Np1 -i "$srcdir"/intprops.patch - if [ "$(vercmp ${pkgver} '1.8')" -lt 0 ]; then - patch -p1 < "${srcdir}/rush-1.7-glib-2.16-gets.patch" - fi + #patch -Np1 -i "$srcdir"/intprops.patch + #if [ "$(vercmp ${pkgver} '1.8')" -lt 0 ]; then + # patch -p1 < "${srcdir}/rush-1.7-glib-2.16-gets.patch" + #fi sed -i -e 's:^\s*[^#]:#&:g' 'etc/rush.rc' ./configure --prefix='/usr' --sysconfdir='/etc' --localstatedir='/var' --sbindir='/usr/bin' set +u diff --git a/pcr/rxcpp/PKGBUILD b/pcr/rxcpp/PKGBUILD index 3409dba25..dc77c80b0 100644 --- a/pcr/rxcpp/PKGBUILD +++ b/pcr/rxcpp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Peter Majchrak <petoknm@gmail.com> +# Maintainer (aur): Peter Majchrak <petoknm@gmail.com> # repolint: reason=asdeps pkgname=rxcpp diff --git a/pcr/rxvt-unicode-pixbuf/PKGBUILD b/pcr/rxvt-unicode-pixbuf/PKGBUILD index 0ca183045..fbf021fa7 100644 --- a/pcr/rxvt-unicode-pixbuf/PKGBUILD +++ b/pcr/rxvt-unicode-pixbuf/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Jacob Steffler <jacobsteffler@gmail.com> -# Contributor (AUR): Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor (AUR): Angel Velasquez <angvp@archlinux.org> -# Contributor (AUR): tobias <tobias@archlinux.org> -# Contributor (AUR): dibblethewrecker dibblethewrecker.at.jiwe.dot.org +# Maintainer (aur): Jacob Steffler <jacobsteffler@gmail.com> +# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: tobias <tobias@archlinux.org> +# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # parabola changes and rationale: # no changes. diff --git a/pcr/sacd-extract/PKGBUILD b/pcr/sacd-extract/PKGBUILD index 84b98f450..2c8f8b4e3 100644 --- a/pcr/sacd-extract/PKGBUILD +++ b/pcr/sacd-extract/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): spider-mario <spidermario@free.fr> +# Maintainer (arch): spider-mario <spidermario@free.fr> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=sacd-extract pkgver=0.3.8 diff --git a/pcr/samhain/PKGBUILD b/pcr/samhain/PKGBUILD index 849c6afa3..782926a17 100644 --- a/pcr/samhain/PKGBUILD +++ b/pcr/samhain/PKGBUILD @@ -22,8 +22,8 @@ sha512sums=('aaa4c9e384715fffaa55d3d5838bf137f199bd7a8da2f2005e165ead03f82c401de # Hack to allow having samhain-$pkgver.tar.gz in source=(), # since it is inside samhain_signed-$pkgver.tar.gz -[ -e ${pkgbase}_signed-$pkgver.tar.gz ] || curl -fLC - --retry 3 --retry-delay 3 -O ${source[0]} -[[ -e samhain-$pkgver.tar.gz{,.asc} ]] || tar -zxf ${pkgbase}_signed-$pkgver.tar.gz && +[ -e ${pkgbase}_signed-$pkgver.tar.gz ] || curl -fLC - --retry 3 --retry-delay 3 --silent -O ${source[0]} +[[ -e samhain-$pkgver.tar.gz{,.asc} ]] || tar -zxf ${pkgbase}_signed-$pkgver.tar.gz &> /dev/null && source+=("samhain-$pkgver.tar.gz"{,.asc}) build() { diff --git a/pcr/scotch/PKGBUILD b/pcr/scotch/PKGBUILD index fa9a0ac29..d0c2b7d54 100644 --- a/pcr/scotch/PKGBUILD +++ b/pcr/scotch/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Samuel Williams <ioquatix> +# Maintainer (aur): Samuel Williams <ioquatix> pkgname=scotch pkgver=6.0.6 diff --git a/pcr/screen-message/PKGBUILD b/pcr/screen-message/PKGBUILD index 6abfcd877..859d95ce2 100644 --- a/pcr/screen-message/PKGBUILD +++ b/pcr/screen-message/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer (AUR): speps <speps at aur dot archlinux dot org> -# Contributor (AUR): Andrew LeCain dread@csh.rit.edu +# Contributor: Andrew LeCain dread@csh.rit.edu # parabola changes and rationale: # - added .install file to update desktop database diff --git a/pcr/searx/0003-Fix-deprecated-werkzeug-import.patch b/pcr/searx/0003-Fix-deprecated-werkzeug-import.patch deleted file mode 100644 index ca6e27cec..000000000 --- a/pcr/searx/0003-Fix-deprecated-werkzeug-import.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b8b13372c8fd3bfe978a1c724ab98b05348df054 Mon Sep 17 00:00:00 2001 -Message-Id: <b8b13372c8fd3bfe978a1c724ab98b05348df054.1581582658.git.git@rationality.eu> -In-Reply-To: <a818d3241df2cf010086f837a504b11983c3d55f.1581582658.git.git@rationality.eu> -References: <a818d3241df2cf010086f837a504b11983c3d55f.1581582658.git.git@rationality.eu> -From: Nicolas Gelot <nicolas.gelot@e.email> -Date: Thu, 6 Feb 2020 22:40:58 +0100 -Subject: [PATCH 3/6] Fix deprecated werkzeug import - -Close: #1830 -Signed-off-by: Nicolas Gelot <nicolas.gelot@e.email> ---- - requirements.txt | 2 +- - searx/webapp.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index 6e4df37a..ea4a5a7a 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,6 +1,6 @@ - certifi==2019.3.9 - babel==2.7.0 --flask-babel==0.12.2 -+flask-babel==1.0.0 - flask==1.0.2 - idna==2.8 - jinja2==2.10.1 -diff --git a/searx/webapp.py b/searx/webapp.py -index aadefe6b..5ed9f127 100644 ---- a/searx/webapp.py -+++ b/searx/webapp.py -@@ -47,7 +47,7 @@ except: - from html import escape - from datetime import datetime, timedelta - from time import time --from werkzeug.contrib.fixers import ProxyFix -+from werkzeug.middleware.proxy_fix import ProxyFix - from flask import ( - Flask, request, render_template, url_for, Response, make_response, - redirect, send_from_directory --- -2.25.0 - diff --git a/pcr/searx/PKGBUILD b/pcr/searx/PKGBUILD index f9b6fc859..e3593d399 100644 --- a/pcr/searx/PKGBUILD +++ b/pcr/searx/PKGBUILD @@ -1,19 +1,22 @@ -# Maintainer (AUR): Jake <aur@ja-ke.tech> +# Maintainer (aur): Jake <aur@ja-ke.tech> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + + # parabola changes and rationale: -# - Fixed license -# - Moved random secret key generation in the .install: having that in -# prepare() is not obtimal even for AUR, but it still works fine in many -# cases because users run the package on the machine that compiles it, so -# even if it ends up in the package, it's not a big issue, unless users share -# the package as they are not aware of this issue in the first place. +# libre: +# - Fixed license name in 'license' array +# privacy: +# - Moved random secret key generation into an .install hook +# technical: +# - Renamed upstream source-ball + pkgname=searx -pkgver=0.16.0 +pkgver=1.1.0 pkgrel=2 -pkgrel+=par1 pkgdesc="A privacy-respecting, hackable metasearch engine (python(3) based)" arch=('any') -url="https://asciimoo.github.io/searx/" +url="https://searx.github.io/searx/" license=('AGPL3') makedepends=('openssl') install="${pkgname}.install" @@ -21,34 +24,37 @@ depends=( 'uwsgi' 'uwsgi-plugin-python' 'python-certifi' - 'python-flask' - 'python-flask-babel' + 'python-flask-babel' # sub dep: flask, babel, jinja 'python-lxml' 'python-idna' 'python-pygments' - 'python-pyopenssl' - 'python-dateutil' + 'python-dateutil' 'python-yaml' 'python-requests' - 'python-pysocks') + 'python-pysocks' + 'python-langdetect') conflicts=('searx-git' ) replaces=('searx-py3') backup=('etc/searx/settings.yml' 'etc/uwsgi/searx.ini') -source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip" +source=(${pkgname}-${pkgver}.zip::https://github.com/searx/searx/archive/refs/tags/v1.1.0.zip + 'flask-babel-3.patch' 'searx.ini' - 'searx.sysusers' - '0003-Fix-deprecated-werkzeug-import.patch') -sha512sums=('3ae4e4c295830e65eefbd39ed9885b60a42a4d4db4d87c179ace76cf43f8c75d49f1363f019bedd135c0597191612e16592cacd159ae97a42a25dcc2fee9d00b' - '6e1e7771e747e2bcb9cbc3e5ec9735461b6d791c0c0412e06e7dd802c18625edd0916de32164bf780c18ef7b6a87f55ed1e917377b3adb2bf53c0344f34b49e8' - '6856e26451fe053d37c2ce4b9d5f3b35891dd8ec702c5256c02d04415124c57705abc497f12943948a85621bb0238d26c2c1f3a7bf42404a6ff1487c7655909e' - '064738f57b8bfbd937d56c592f7321140aab5f894e8ea457ae0d2d9407523f58471f4ba7424968f1d6db7fe51e4f8d360d1e997284eeb7b8528dbcf10f5f12dd') + 'searx.sysusers') +sha512sums=('ed92199913353ed246ff30c516402326e9eac0f439b4519d6500b516f9ef73e73d0b25d894c078fb9b65870f2b10a09777d1ae068d13c8e10c91ec14de450b1e' + '1db543553aa4989e1cb9fb449a1c4badfd5a1c8e39afc99b5f894557ba74b9293b64d02882919ce9f2e4c108a6cd3b7acb51043e98bc3bab40e69078fbe8813f' + '476a4297c51681a9a92c6db3933359cc5a8ec292e45b229d98608ef2906b80c173868a30df06c329204c6f9371736a5bb322239860199526fd559780b37a2d0a' + '6856e26451fe053d37c2ce4b9d5f3b35891dd8ec702c5256c02d04415124c57705abc497f12943948a85621bb0238d26c2c1f3a7bf42404a6ff1487c7655909e') prepare() { cd "$srcdir/$pkgname-$pkgver" - patch --forward --strip=1 --input="${srcdir}/0003-Fix-deprecated-werkzeug-import.patch" + + patch -Np1 < ../flask-babel-3.patch # Allow newer versions of the dependencies sed -i "s|==|>=|g" requirements.txt + + # Generate a random secret key + # parabola does this in the .install hook (privacy concern) } package() { diff --git a/pcr/searx/flask-babel-3.patch b/pcr/searx/flask-babel-3.patch new file mode 100644 index 000000000..a575a0e04 --- /dev/null +++ b/pcr/searx/flask-babel-3.patch @@ -0,0 +1,33 @@ +diff --git a/searx/webapp.py b/searx/webapp.py +index e37eaf73..96bac1c0 100755 +--- a/searx/webapp.py ++++ b/searx/webapp.py +@@ -141,7 +141,6 @@ if not werkzeug_reloader\ + or (werkzeug_reloader and os.environ.get("WERKZEUG_RUN_MAIN") == "true"): + search_initialize(enable_checker=True) + +-babel = Babel(app) + + rtl_locales = ['ar', 'arc', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'fa_IR', 'glk', 'he', + 'ku', 'mzn', 'pnb', 'ps', 'sd', 'ug', 'ur', 'yi'] +@@ -188,7 +187,6 @@ def _get_browser_or_settings_language(request, lang_list): + return settings['search']['default_lang'] or 'en' + + +-@babel.localeselector + def get_locale(): + if 'locale' in request.form\ + and request.form['locale'] in settings['locales']: +@@ -217,6 +215,12 @@ def get_locale(): + + return locale + ++babel = Babel() ++if hasattr(babel, "localeselector"): ++ babel.init_app(app) ++ babel.localeselector(get_locale) ++else: ++ babel.init_app(app, locale_selector=get_locale) + + # code-highlighter + @app.template_filter('code_highlighter') diff --git a/pcr/searx/searx.ini b/pcr/searx/searx.ini index 7681436a1..ee7d3c142 100644 --- a/pcr/searx/searx.ini +++ b/pcr/searx/searx.ini @@ -31,3 +31,6 @@ module = searx.webapp #virtualenv = /usr/local/searx/searx-ve/
#pythonpath = /usr/local/searx/
#chdir = /usr/local/searx/searx/
+
+# Cache: https://uwsgi-docs.readthedocs.io/en/latest/Caching.html
+cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1
diff --git a/pcr/secp256k1-git/PKGBUILD b/pcr/secp256k1-git/PKGBUILD deleted file mode 100644 index f747d7626..000000000 --- a/pcr/secp256k1-git/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@parabola.nu> - -_pkgname=secp256k1 -pkgname=${_pkgname}-git -pkgver=20171207 -_gitver=c77fc08597960d662eb0df9e4c670c31bdeb227e -pkgrel=1 -pkgdesc='Optimized C library for EC operations on curve secp256k1' -arch=(x86_64 i686 armv7h) -url=https://github.com/bitcoin-core/secp256k1/ -license=(MIT) -depends=(gmp) -provides=( - ${_pkgname} - lib${pkgname}=$pkgver - lib${_pkgname} - lib${_pkgname}.so -) -conflicts=("${provides[@]%=*}") -source=(${_pkgname}-${_gitver}::https://github.com/bitcoin-core/${_pkgname}/archive/${_gitver}.tar.gz) -sha256sums=('19a5d9015458d146cb1494259e4b00de3012ad2521091992e14e07bde711e41e') - -prepare() { - cd $_pkgname-$_gitver - ./autogen.sh -} - -build() { - cd $_pkgname-$_gitver - ./configure --prefix=/usr --disable-static - make -} - -check() { - cd $_pkgname-$_gitver - make check -} - -package() { - cd $_pkgname-$_gitver - make DESTDIR="$pkgdir" install - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/pcr/selinux-python/PKGBUILD b/pcr/selinux-python/PKGBUILD index 0489d5573..b396f0111 100644 --- a/pcr/selinux-python/PKGBUILD +++ b/pcr/selinux-python/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) # parabola changes and rationale: # - Added armv7h diff --git a/pcr/setools/PKGBUILD b/pcr/setools/PKGBUILD index 78531fa3e..a0ab149b8 100644 --- a/pcr/setools/PKGBUILD +++ b/pcr/setools/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) -# Contributor (AUR): Timothée Ravier <tim@siosm.fr> -# Contributor (AUR): Nicky726 <Nicky726 [at] gmail [dot] com> -# Contributor (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to> +# Maintainer (aur): Nicolas Iooss (nicolas <dot> iooss <at> m4x <dot> org) +# Contributor: Timothée Ravier <tim@siosm.fr> +# Contributor: Nicky726 <Nicky726 [at] gmail [dot] com> +# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to> # parabola changes and rationale: # - Added armv7h diff --git a/pcr/shogun/PKGBUILD b/pcr/shogun/PKGBUILD index e9fa7eb3e..a1a5db657 100644 --- a/pcr/shogun/PKGBUILD +++ b/pcr/shogun/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Christian Pfeiffer <xpipe at hotmail dot de> +# Maintainer (aur): Christian Pfeiffer <xpipe at hotmail dot de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=shogun pkgver=6.1.3 diff --git a/pcr/sic/PKGBUILD b/pcr/sic/PKGBUILD index 9e4c4eca7..72e8b7400 100644 --- a/pcr/sic/PKGBUILD +++ b/pcr/sic/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Will Alexander <archlinux dot org at willalexander dot me> +# Maintainer (aur): Will Alexander <archlinux dot org at willalexander dot me> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=sic diff --git a/pcr/simtrace/PKGBUILD b/pcr/simtrace/PKGBUILD index d51db16dc..9540f796a 100644 --- a/pcr/simtrace/PKGBUILD +++ b/pcr/simtrace/PKGBUILD @@ -1,24 +1,23 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -pkgname=simtrace2 -pkgver=0.7.0 -pkgrel=1 -pkgdesc="Traces the communication between phones and SIM cards with second generation simtrace hardware." +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + +pkgname=simtrace +pkgver=1.5 +pkgrel=2 +pkgdesc="Traces the communication between phones and SIM cards with first generation simtrace hardware." arch=('armv7h' 'i686' 'x86_64') -url="https://osmocom.org/projects/simtrace2" +url="https://osmocom.org/projects/simtrace/wiki/SIMtrace" license=('GPL2') # GPLv2-only according to the source files headers +replaces=('simtrace-git') depends=('libosmocore' 'libusb' 'lksctp-tools' 'talloc') -makedepends=('make' 'gcc' 'git' 'pkg-config') -source=("git://git.osmocom.org/simtrace2#tag=$pkgver") +makedepends=('git') +source=("git://git.osmocom.org/simtrace.git#tag=v$pkgver") sha512sums=('SKIP') build() { cd "$srcdir/$pkgname/host" - autoreconf -fi - ./configure make } diff --git a/pcr/simtrace2/PKGBUILD b/pcr/simtrace2/PKGBUILD index 46db91527..5a24eb1d6 100644 --- a/pcr/simtrace2/PKGBUILD +++ b/pcr/simtrace2/PKGBUILD @@ -1,17 +1,17 @@ # Copyright (C) 2020 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 License. +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> + pkgname=simtrace2 -pkgver=0.7.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="Traces the communication between phones and SIM cards with second generation simtrace hardware." arch=('armv7h' 'i686' 'x86_64') url="https://osmocom.org/projects/simtrace2" license=('GPL2') # GPLv2-only according to the source files headers depends=('libosmocore' 'libusb' 'lksctp-tools' 'talloc') -makedepends=('make' 'gcc' 'git' 'pkg-config') +makedepends=('git') source=("git://git.osmocom.org/simtrace2#tag=$pkgver") sha512sums=('SKIP') diff --git a/pcr/slf4j/LICENSE.txt b/pcr/slf4j/LICENSE.txt new file mode 100644 index 000000000..c8e72c2cd --- /dev/null +++ b/pcr/slf4j/LICENSE.txt @@ -0,0 +1,21 @@ + Copyright (c) 2004-2017 QOS.ch + All rights reserved. + + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/pcr/slf4j/PKGBUILD b/pcr/slf4j/PKGBUILD index 84f7fba21..57a4126a4 100644 --- a/pcr/slf4j/PKGBUILD +++ b/pcr/slf4j/PKGBUILD @@ -1,62 +1,191 @@ # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=slf4j -pkgver=1.7.21 +pkgver=1.7.36 pkgrel=1 pkgdesc="A successor to the log4j project." arch=('any') url='http://www.slf4j.org' license=('MIT') depends=('java-runtime') -makedepends=('java-commons-logging' 'java-environment' 'jh' 'log4j-1.2') +makedepends=('java-commons-logging' 'java-environment' 'jh' 'unzip') optdepends=('log4j') -source=("${url}/dist/${pkgname}-${pkgver}.tar.gz") -sha1sums=('0f383b6641c32799ffb5c2c36aae68647ad61856') +source=("https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${pkgver}/slf4j-api-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${pkgver}/slf4j-api-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/${pkgver}/slf4j-migrator-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-migrator/${pkgver}/slf4j-migrator-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/${pkgver}/slf4j-simple-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/${pkgver}/slf4j-simple-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/${pkgver}/jcl-over-slf4j-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/jcl-over-slf4j/${pkgver}/jcl-over-slf4j-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/${pkgver}/jul-to-slf4j-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/jul-to-slf4j/${pkgver}/jul-to-slf4j-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/${pkgver}/log4j-over-slf4j-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/${pkgver}/log4j-over-slf4j-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/${pkgver}/slf4j-jdk14-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/${pkgver}/slf4j-jdk14-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/${pkgver}/slf4j-nop-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-nop/${pkgver}/slf4j-nop-${pkgver}.pom"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/${pkgver}/slf4j-jcl-${pkgver}-sources.jar"{,.asc} + "https://repo1.maven.org/maven2/org/slf4j/slf4j-jcl/${pkgver}/slf4j-jcl-${pkgver}.pom"{,.asc} + # Copied from https://www.slf4j.org/license.html + "LICENSE.txt") -_artifacts=(slf4j-api slf4j-migrator slf4j-simple jcl-over-slf4j jul-to-slf4j log4j-over-slf4j slf4j-jdk14 slf4j-nop slf4j-jcl slf4j-log4j12) +noextract=("slf4j-api-${pkgver}-sources.jar" + "slf4j-migrator-${pkgver}-sources.jar" + "slf4j-simple-${pkgver}-sources.jar" + "jcl-over-slf4j-${pkgver}-sources.jar" + "jul-to-slf4j-${pkgver}-sources.jar" + "log4j-over-slf4j-${pkgver}-sources.jar" + "slf4j-jdk14-${pkgver}-sources.jar" + "slf4j-nop-${pkgver}-sources.jar" + "slf4j-jcl-${pkgver}-sources.jar") + +# Upstream has .sha1 files, so it's useful to keep sha1sums +sha1sums=('ae9c1aae0033af915cfa75d850eb9d880f21a701' + 'SKIP' + '749f6995b1d6591a417ca4fd19cdbddabae16fd1' + 'SKIP' + 'ea1910eab3ecca843b55b9de33b5e95103b1c3b9' + 'SKIP' + '7f3e3b48c26d8f78b31cf4ab2e096a5f3fc3573e' + 'SKIP' + 'e13ec88aa7dc78814f64ffe2b210ce621cd66dc3' + 'SKIP' + '258132a9e0443e66eea6c5d36141819c2655b299' + 'SKIP' + '91b21b162173dfc6bb676bc7f4865cdd268eac68' + 'SKIP' + 'edaeea6184d71fe7f3d67ced9013767f7ed1ffb3' + 'SKIP' + '86e5d1e467b4b30ece98254248e7e726e747ec58' + 'SKIP' + '8eb0035851ec6a29d944e909f589591a6e7fad10' + 'SKIP' + 'a715f0f390b52daade0ce2f1002b9efb50f5a0ca' + 'SKIP' + '4165399736490220a595d2b66aa3e9d669fc63b4' + 'SKIP' + '8b0a1af45145bb24d5bc0fad80fe6c629468bf22' + 'SKIP' + '5172863ace6f55c130ec0120547eb7cea87bae9c' + 'SKIP' + 'ed83b905b1c5d427a67bd03cff825207899711c3' + 'SKIP' + 'efb69a1beb752da294f06403dc4e20c9ea5056c1' + 'SKIP' + '319292554b0be94d7c0d63436f07ce438b7e2819' + 'SKIP' + '3452a113de05d30a19cc73bce78c86c2adee0911' + 'SKIP' + 'SKIP') +sha512sums=('abfb12160cd0c9e765e7ad291f3977b4ab24a30d3684bce072132031436ed3de1695008840bb57b7e2f37c170bdfbbe4c4aa7fabe12bb0aa74d14f08840548ab' + 'SKIP' + '22d22770b09854b13f601c39bdb4e8329c8a47f4399a567ab047c8ecf50e638949cda01913f01896cf6d76bb479fa4d7f8c6046274290ce8b1d014e580338768' + 'SKIP' + '59487701a46c9b713a72220c0240dc779ddca819d7278c592844a4da4b7276655fd63f84680bfab19b88a8cba4f60967df4a0b23b11551b54c0c049c21a7f1ba' + 'SKIP' + 'c46f508d914cca4268d8106035c93931e34ff2f26333ac10f69da0bea75c25cda1ea6e414575e4016508c68b6642cff33a7685f6af448b26be7b59e3653e013f' + 'SKIP' + 'e630dc7d24edf7fb752bccbdb4aac7ed6c2202ff85128156f42a0fd5c9acc79d83364b0c22ebf45014bb94ccd90f8993ad23af4e7294326cc805bc1b5d7eb41d' + 'SKIP' + '75b94f711c5f80a1f4e9076a3b2d40292bcd9cc776afe7eb120b5490871be126c2f293fc7d344f325f9853aa3f59f1a83aa439219cb18560905f6237630d6c1b' + 'SKIP' + 'e5bbeb2d471c49a1622340c21f27873eda2d6d92d6809d7ae880b5096744615a260fa8b76b3a811c2d7eaa982480d5d8e0646a399b897a14515653dcbc63ec79' + 'SKIP' + 'd112d334e3a6f40131f523bf49b933bb4b7baf6d9b83d207a0cb923e0ac349bc78ff42b5050bc810ad4d3581834c16f6b546717807c01531975b28c155911837' + 'SKIP' + '53db532bf1e13fb95480a89ea3ac2d6ef0359916f41b93eca026d53c0a18109ca105b2b17c28cfe539efc5a4b7b9917eb235f03d7aff9563ef49c636c59f3a48' + 'SKIP' + 'c02f87477fb11e025c7c5cdfccc1964947db32a3cb9bdbfa537475d4de9bb9440e351834c7a4d4dcd3efc595ce544c3473cf349d269b475bb5b27b42a28fc7b8' + 'SKIP' + 'c8217915649ae929ce7491a647c3ec11649385a98b23ff044215c709ee8defdd4eab52bd0b5ee58feae7974373658005d7a59f433408ad07b0b08cdcdbec50c6' + 'SKIP' + 'ed1ac97038be9f8fe757914b5ab34fe5250e402a036965ba0aed7015ec8eb517eebeda96f266b06dc8ec072d3227f8eeee3f266515cd0ae5bba2619825daef7f' + 'SKIP' + '17ce27278bee10c7f17a556ce4ab17f60992bfad30097c1f35929ca4c8341b5b11e9da93856f7e2d6e0f057dc194cc6ec85deeceeb621af89a219a284f01f989' + 'SKIP' + 'd6c8bc7d92b877b878b587bba76a04853a9bb7e0f22afa80827abda87f848b602921fc5b5db24104eeb8eb15a852f11bfaedec16bc61d13ea1cde5802e1ed967' + 'SKIP' + '2104f2510947ebdbfbfb3ba577b7c27333c4cab83179a63885a8b1c823eed6533a9e05ee58c81e1d1d337c9d02c8e822a0ded923c450e6bf507780fa428e54ee' + 'SKIP' + '915e0113bdad886223f2fbdd6c0608a04a8cc1d9aee66633a10704df8338d0918707d3a31722736ce00ad7d4e2b443e68df25414dfcf1474f3314814e1fc4474' + 'SKIP' + '539180c455df32c0b47d7a36be1ac02f0c35763718a3f6d82fb5de611bcc2d69e0479c969d2c28974e9a406346caa63a9713039f64d3305e28aa1ce97d5b329e' + 'SKIP' + 'c2217862028f904c99930074208afb907a04bc9472b4801a4da39cc41a83f5a683b8c01f988c638e43eade00575a98fc166557053d4845f2f7cfca0a426d8e7a' + 'SKIP' + 'SKIP') + +validpgpkeys=('475F3B8E59E6E63AA78067482C7B12F2A511E325') # Ceki Gulcu <ceki@qos.ch> + +# Keep slf4j-api first as we need to build its jar first to enable the +# other artifacts to build as they import things from the API. +_artifacts=(slf4j-api + jcl-over-slf4j + jul-to-slf4j + slf4j-jcl + slf4j-jdk14 + slf4j-migrator + slf4j-nop + slf4j-simple + log4j-over-slf4j) prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - rm -rv *.jar - rm -rv integration/lib/*.jar - mkdir -p {source,dist} + mkdir -p "${srcdir}/dist" + for artifact in ${_artifacts[@]}; do - mkdir -p build/${artifact}/classes - cp -rv "${artifact}/src" source + mkdir -p "${srcdir}/build/${artifact}/classes" + mkdir -p "${srcdir}/source/${artifact}/" + cd "${srcdir}/source/${artifact}/" + unzip "../../${artifact}-${pkgver}-sources.jar" done } build() { - cd "${srcdir}/${pkgname}-${pkgver}" - CLASSPATH="/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:dist/*" for artifact in ${_artifacts[@]}; do - javac -cp $CLASSPATH -d "build/${artifact}/classes" -encoding UTF-8 \ - $(find "${artifact}/src/main/java" -name \*.java) - jar -cvf "dist/${artifact}.jar" -C build/${artifact}/classes . - done + echo "==> Building ${artifact}" + cd "${srcdir}/source/${artifact}/" + + CLASSPATH="" + CLASSPATH="${CLASSPATH}:/usr/share/java/commons-logging.jar" + CLASSPATH="${CLASSPATH}:../../dist/slf4j-api.jar" - javadoc -classpath $CLASSPATH -d build/javadoc -encoding UTF-8 \ - -sourcepath source/src/main/java -subpackages org + javac -cp "${CLASSPATH}" -d "../../build/${artifact}/classes" \ + -encoding UTF-8 \ + $(find . -name \*.java) + + jar -cvf "../../dist/${artifact}.jar" -C "../../build/${artifact}/classes" . + + mkdir -p "../../dist/${artifact}/" + cp "../../${artifact}-${pkgver}.pom" "../../dist/${artifact}/pom.xml" + + # TODO: FIXME + # javadoc -classpath "${CLASSPATH}" -d ../../build/javadoc -encoding UTF-8 \ + # -sourcepath . org + done } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}" # Install license file install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt" + cd "${srcdir}/dist" + + # TODO: FIXME # Install documentation - install -d "${pkgdir}/usr/share/doc/${pkgname}" - cp -r build/javadoc "${pkgdir}/usr/share/doc/${pkgname}" + # install -d "${pkgdir}/usr/share/doc/${pkgname}" + # cp -r build/javadoc "${pkgdir}/usr/share/doc/${pkgname}" # Install Maven artifacts export DESTDIR=${pkgdir} - jh mvn-install "org.${pkgname}" "${pkgname}-parent" ${pkgver} pom.xml - for artifact in ${_artifacts[@]}; do + echo "==> Packaging ${artifact}" jh mvn-install "org.${pkgname}" ${artifact} ${pkgver} \ "${artifact}/pom.xml" \ - "dist/${artifact}.jar" \ + "${artifact}.jar" \ "${artifact}-${pkgver}.jar" ln -s "/usr/share/java/${artifact}-${pkgver}.jar" \ diff --git a/pcr/smalltalk/PKGBUILD b/pcr/smalltalk/PKGBUILD new file mode 100644 index 000000000..123c7cc06 --- /dev/null +++ b/pcr/smalltalk/PKGBUILD @@ -0,0 +1,68 @@ +# Maintainer: Alexander F. Rødseth <xyproto@archlinux.org> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> +# Contributor: mrshpot <mrshpot at gmail dot com> +# Contributor: Michael Fellinger <m.fellinger@gmail.com> + +pkgname=smalltalk +pkgver=3.2.91 +pkgrel=13 +pkgdesc='GNU Smalltalk interpreter and libraries' +url='https://www.gnu.org/software/smalltalk/' +license=(GPL LGPL) +arch=(x86_64) +arch+=(armv7h i686) +options=(!emptydirs staticlibs) +depends=(gmp libffi libltdl libsigsegv sdl) +makedepends=(freeglut gdbm git glew glu gmp mesa sqlite tk zip) +# Use latest commit where "make check" works. Found by using "git bisect". +_commit=edb6bad6950c787f4b4c7f8ac5f7047ac1e8b984 +source=("git+https://git.savannah.gnu.org/git/smalltalk.git#commit=$_commit") +b2sums=('SKIP') +optdepends=('sqlite: database in a file' + 'tk: for gst-blox') + +declare -ir RUN_TESTS=0 + + +prepare() { + cd $pkgname + [[ "${CARCH}" != i686 ]] || autoupdate + autoreconf -iv + sed 's/int yylineno = 1;//g' -i libgst/gen{bc,pr,vm}-scan.l + sed '/XML-Expat/d' -i tests/testsuite.at +} + +build() { + cd $pkgname + export CFLAGS="$CFLAGS -ffat-lto-objects -Wl,--allow-multiple-definition -w" + ./configure \ + --enable-gtk=no \ + --enable-libsdl=yes \ + --libexecdir=/usr/lib/smalltalk \ + --prefix=/usr \ + --with-imagedir=/var/lib/smalltalk \ + --with-readline \ + --with-system-libffi \ + --with-system-libsigsegv \ + --with-tk \ + --with-tcl \ + --with-x \ + --without-emacs + echo '#define USE_INTERP_RESULT 1' >> config.h + make -j1 +} + +check() { + (( ! RUN_TESTS )) || \ + make -C $pkgname check -j1 +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + # Fix manpage symlink + rm -f "$pkgdir/usr/share/man/man1/gst-reload.1" + ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1" + # Remove gst-browser, ref FS#76224 + rm -f "$pkgdir/usr/"{bin/gst-browser,share/man/man1/gst-browser.1} +} diff --git a/pcr/smartypants/PKGBUILD b/pcr/smartypants/PKGBUILD index d845b1f6b..ff36b4f28 100644 --- a/pcr/smartypants/PKGBUILD +++ b/pcr/smartypants/PKGBUILD @@ -1,4 +1,5 @@ # Contributor: Daniel Milewski <niitotantei@riseup.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=smartypants pkgver=1.5.1 diff --git a/pcr/snapraid/PKGBUILD b/pcr/snapraid/PKGBUILD index 5122c4bbc..749d07d6c 100644 --- a/pcr/snapraid/PKGBUILD +++ b/pcr/snapraid/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): John Williams <jwilliams4200 liamg reverse&remove moc> +# Maintainer (arch): John Williams <jwilliams4200 liamg reverse&remove moc> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=snapraid pkgver=10.0 diff --git a/pcr/soapyosmo-xtrx/PKGBUILD b/pcr/soapyosmo-xtrx/PKGBUILD index a458e317a..57c66174f 100644 --- a/pcr/soapyosmo-xtrx/PKGBUILD +++ b/pcr/soapyosmo-xtrx/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (ARCH): Filipe Laíns (FFY00) <lains@archlinux.org> +# Maintainer (arch): Filipe Laíns (FFY00) <lains@archlinux.org> # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> pkgname=soapyosmo-xtrx diff --git a/pcr/softhsm/PKGBUILD b/pcr/softhsm/PKGBUILD index 55428cbf4..c959ce1c0 100644 --- a/pcr/softhsm/PKGBUILD +++ b/pcr/softhsm/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Javier Torres <javitonino [at] gmail [dot] com> +# Maintainer (arch): Javier Torres <javitonino [at] gmail [dot] com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=softhsm diff --git a/pcr/sphinx/PKGBUILD b/pcr/sphinx/PKGBUILD index 677d4ede4..67ea1a45b 100644 --- a/pcr/sphinx/PKGBUILD +++ b/pcr/sphinx/PKGBUILD @@ -1,11 +1,11 @@ -# Maintainer (AUR): Isaac Aronson <i at linux dotcom> -# Contributor (AUR): Dan Serban -# Contributor (AUR): Jim Casteel -# Contributor (AUR): dryes <joswiseman@gmail> -# Contributor (AUR): Vishnevsky Roman <aka dot x0x01 at gmail dot com> -# Contributor (AUR): Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Contributor (AUR): Aldo Culquicondor <alculquicondor@gmail.com> -# Contributor (AUR): Florijan Hamzic <florijanh@gmail.com> +# Maintainer (aur): Isaac Aronson <i at linux dotcom> +# Contributor: Dan Serban +# Contributor: Jim Casteel +# Contributor: dryes <joswiseman@gmail> +# Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com> +# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> +# Contributor: Aldo Culquicondor <alculquicondor@gmail.com> +# Contributor: Florijan Hamzic <florijanh@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/steinberg-vst36/PKGBUILD b/pcr/steinberg-vst36/PKGBUILD index 6f1a85e9a..cee4acfe9 100644 --- a/pcr/steinberg-vst36/PKGBUILD +++ b/pcr/steinberg-vst36/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Albert Graef <aggraef@gmail.com> -# Contributor (AUR): Ray Rashif <schiv@archlinux.org> -# Contributor (AUR): rtfreedman (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com +# Maintainer (aur): Albert Graef <aggraef@gmail.com> +# Contributor: Ray Rashif <schiv@archlinux.org> +# Contributor: rtfreedman (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com # parabola changes and rationale: # no changes. diff --git a/pcr/stormlib/PKGBUILD b/pcr/stormlib/PKGBUILD index 26203566e..da4aaf1eb 100644 --- a/pcr/stormlib/PKGBUILD +++ b/pcr/stormlib/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Andreas Grapentin <andreas@grapentin.org> -# Maintainer (AUR): Jerome Leclanche <jerome@leclan.ch> +# Maintainer (aur): Jerome Leclanche <jerome@leclan.ch> _pkgname=StormLib pkgname=${_pkgname,,} diff --git a/pcr/straw-viewer/PKGBUILD b/pcr/straw-viewer/PKGBUILD index 50b4cb67a..4dc72dacb 100644 --- a/pcr/straw-viewer/PKGBUILD +++ b/pcr/straw-viewer/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Trizen <trizen@protonmail.com> +# Maintainer (aur): Trizen <trizen@protonmail.com> # Maintainer: David P. <megver83@parabola.nu> pkgname=straw-viewer diff --git a/pcr/supermodel/PKGBUILD b/pcr/supermodel/PKGBUILD index 458639c1b..948eaf4e4 100644 --- a/pcr/supermodel/PKGBUILD +++ b/pcr/supermodel/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Anton Shestakov <engored*ya.ru> +# Maintainer (arch): Anton Shestakov <engored*ya.ru> pkgname=supermodel pkgver=0.2a diff --git a/pcr/suricata/PKGBUILD b/pcr/suricata/PKGBUILD index 5eac1dce4..ee95f2a6e 100644 --- a/pcr/suricata/PKGBUILD +++ b/pcr/suricata/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Maintainer (aur): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: André Silva <emulatorman@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/sylpheed/PKGBUILD b/pcr/sylpheed/PKGBUILD new file mode 100644 index 000000000..ba7462744 --- /dev/null +++ b/pcr/sylpheed/PKGBUILD @@ -0,0 +1,77 @@ +# Contributor: David Runge <dave@sleepmap.de> +# Contributor: speps <speps at aur dot archlinux dot org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: dorphell <dorphell@archlinux.org> +# Contributor: Andreas Grapentin <andreas@grapentin.org> +# Contributor: André Silva <emulatorman@hyperbola.info> +# Contributor: Aditya Som <icarious@hacari.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> +# Contributor: bill-auger <bill-auger@programmer.net> + + +pkgname=sylpheed +pkgver=3.7.0_3.8.0beta1 +# _libnsl_ver=3 # WIP - pin to coupled dependency versions +pkgrel=1 +pkgdesc="Lightweight and user-friendly e-mail client" +arch=(armv7h i686 x86_64) +url=https://sylpheed.sraoss.jp/en/ +license=(GPL) +depends=(compface gpgme gtkspell libnsl) +# WIP - pin to coupled dependency versions +# depends=( ${depends[*]/libnsl/libnsl>=${_libnsl_ver}} ) # pin to coupled dependency versions +# depends+=( ${depends[*]/libnsl/libnsl.so} ) # pin to coupled dependency versions +depends+=( libnsl.so ) # pin to coupled dependency versions +makedepends=(openssl) +_BETA_RELEASE=1 +if (( ! _BETA_RELEASE )) +then # stable release versions like: N.N.N (eg: 3.7.0) + source=(https://sylpheed.sraoss.jp/${pkgname}/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2{,.asc}) + sha256sums=(eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04 SKIP) +else # beta release versions like: prevver-betaver (eg: 3.7.0-3.8.0beta1) + _beta_prev_ver=${pkgver/_*/} # eg: 3.7.0 + _beta_ver=${pkgver/*_/} # eg: 3.8.0beta1 + _beta_dir=$(sed 's|.*_\([0-9]\+\.[0-9]\+\)\.[0-9]\+beta[0-9]\+|\1beta|' <<<${pkgver}) # eg: 3.8beta + source=(https://sylpheed.sraoss.jp/${pkgname}/v${_beta_prev_ver%.*}/${pkgname}-${_beta_prev_ver}.tar.bz2{,.asc} # prev release + https://sylpheed.sraoss.jp/${pkgname}/v${_beta_dir}/${pkgname}-${pkgver/_/-}.patch.bz2{,.asc}) # beta patches + sha256sums=(eb23e6bda2c02095dfb0130668cf7c75d1f256904e3a7337815b4da5cb72eb04 SKIP + d7c23c1f765c6e815fdf2e8c318bfc8eee8590a75fd3c61569296da67fdf5c91 SKIP) +fi +validpgpkeys=(8CF3A5AC417ADE72B0AA4A835024337CC00C2E26) # Hiroyuki Yamamoto + + +prepare() { + (( ! _BETA_RELEASE )) && cd "${srcdir}"/${pkgname}-${pkgver} || + cd "${srcdir}"/${pkgname}-${_beta_prev_ver} + + # patch for enchant >= 2.1.3 + # https://www.archlinux.org/todo/enchant-221-rebuild/ + sed -i 's,enchant/,enchant-2/,g' src/compose.c + sed -i 's/ enchant/ enchant-2/g' configure +} + +build() +{ + (( ! _BETA_RELEASE )) && cd "${srcdir}"/${pkgname}-${pkgver} || + cd "${srcdir}"/${pkgname}-${_beta_prev_ver} + + ./configure --prefix=/usr \ + --enable-maintainer-mode \ + --enable-ldap + make + + # Build Attachment-Tool Plug-in + cd plugin/attachment_tool && make +} + +package() +{ + (( ! _BETA_RELEASE )) && cd "${srcdir}"/${pkgname}-${pkgver} || + cd "${srcdir}"/${pkgname}-${_beta_prev_ver} + + make DESTDIR="$pkgdir/" LDFLAGS+="/usr/lib/enchant-2" install + + # Install Attachment-Tool Plug-in + cd plugin/attachment_tool + make DESTDIR="$pkgdir/" install-plugin +} diff --git a/pcr/tahoe-lafs/PKGBUILD b/pcr/tahoe-lafs/PKGBUILD index 44ce29e43..80c94bd21 100644 --- a/pcr/tahoe-lafs/PKGBUILD +++ b/pcr/tahoe-lafs/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Skydrome <skydrome@i2pmail.org> -# Contributor (AUR): DaNiMoTh <jjdanimoth@gmail.com> -# Contributor (Arch): Peter Simons <simons@cryp.to> -# Contributor (Arch): Nicolas Pouillard <nicolas.pouillard@gmail.com> +# Contributor: DaNiMoTh <jjdanimoth@gmail.com> +# Contributor: Peter Simons <simons@cryp.to> +# Contributor: Nicolas Pouillard <nicolas.pouillard@gmail.com> # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 pkgname=tahoe-lafs diff --git a/pcr/talksoup/PKGBUILD b/pcr/talksoup/PKGBUILD new file mode 100644 index 000000000..9347eb1ec --- /dev/null +++ b/pcr/talksoup/PKGBUILD @@ -0,0 +1,41 @@ +# Copyright 2023 bill-auger <bill-auger@programmer.net> +# SPDX-License-Identifier: CC0-1.0 +# Maintainer: bill-auger <bill-auger@programmer.net> + + +pkgname=talksoup +_upstream_name=TalkSoup +pkgrel=1 +pkgver=1.1 +pkgdesc="IRC client for GNUstep" +arch=(armv7h i686 x86_64) +url=http://gap.nongnu.org/talksoup/index.html +license=(GPL2) +depends=(gnustep-netclasses) +makedepends=(gcc-objc gnustep-make) +source=(http://savannah.nongnu.org/download/gap/${_upstream_name}-${pkgver}.tar.gz) +sha256sums=(3a469c66ce3067a88603d6ebae6f63fbcfad55586dd5455179887f28e5a63ae7) + + +build() +{ + cd ${_upstream_name}-${pkgver} + + export GNUSTEP_MAKEFILES=$(gnustep-config --variable=GNUSTEP_MAKEFILES) + + make +} + +package() +{ + cd ${_upstream_name}-${pkgver} + + make DESTDIR="${pkgdir}" install + + cd "${pkgdir}"/usr/lib/GNUstep/Applications/${_upstream_name}.app/Resources/ + + # install.desktop file to the standard system location + install -d "${pkgdir}"/usr/share/applications + sed -i 's|^Categories=X-GNUstep;|&Network;Chat;IRCClient;|' ${_upstream_name}.desktop + mv ${_upstream_name}.desktop "${pkgdir}"/usr/share/applications/${pkgname}.desktop +} diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD index f9747fd8c..8aa6ef42b 100644 --- a/pcr/tanglet/PKGBUILD +++ b/pcr/tanglet/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Graeme Gott <graeme@gottcode.org> +# Maintainer (aur): Graeme Gott <graeme@gottcode.org> # Contributor: Alon Ivtsan <alonivtsan@lavabit.com> # parabola changes and rationale: diff --git a/pcr/tango-icon-theme/PKGBUILD b/pcr/tango-icon-theme/PKGBUILD index e8c0b6559..d7ccc6900 100644 --- a/pcr/tango-icon-theme/PKGBUILD +++ b/pcr/tango-icon-theme/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Steffen Weber <-boenki-gmx-de-> -# Contributor (Arch): Thayer Williams <thayer@archlinux.org> -# Contributor (Arch): James Rayner <james@archlinux.org> +# Maintainer (arch): Steffen Weber <-boenki-gmx-de-> +# Contributor: Thayer Williams <thayer@archlinux.org> +# Contributor: James Rayner <james@archlinux.org> # Maintainer: André Silva <emulatorman@hyperbola.info> pkgname=tango-icon-theme diff --git a/pcr/task-spooler/PKGBUILD b/pcr/task-spooler/PKGBUILD index 28b6e1087..c62829cd8 100644 --- a/pcr/task-spooler/PKGBUILD +++ b/pcr/task-spooler/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Andreas Grapentin <andreas@grapentin.org> -# Contributor (AUR): willemw <willemw12@gmail.com> -# Contributor (AUR): gnomeye <gnomeye at gmail dot com> +# Contributor: willemw <willemw12@gmail.com> +# Contributor: gnomeye <gnomeye at gmail dot com> _name=ts diff --git a/pcr/ted/PKGBUILD b/pcr/ted/PKGBUILD index cd2535b6b..34526b42b 100644 --- a/pcr/ted/PKGBUILD +++ b/pcr/ted/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): willemw <willemw12@gmail.com> -# Contributor (AUR): shirokuro <tod dot jackson at gmail dot com> -# Contributor (AUR): sergej -# Maintainer: Parabola Aurélien DESBRIÈRES <aurelien@xload.IO> +# Maintainer (aur): willemw <willemw12@gmail.com> +# Contributor: shirokuro <tod dot jackson at gmail dot com> +# Contributor: sergej +# Maintainer: Aurélien Desbrières <aurelien@xload.io> pkgname=ted pkgver=2.23 diff --git a/pcr/terminal-colors/PKGBUILD b/pcr/terminal-colors/PKGBUILD index cc032de71..485be4d7e 100644 --- a/pcr/terminal-colors/PKGBUILD +++ b/pcr/terminal-colors/PKGBUILD @@ -1,15 +1,16 @@ # Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: Wael Karram <wael@waelk.tech> pkgname=terminal-colors -pkgver=2.2 +pkgver=3.0.2 pkgrel=1 pkgdesc="An utility to test color capabilities of terminal" arch=('any') url="https://github.com/eikenb/$pkgname" license=('GPL3') depends=('python') -source=("$pkgname-$pkgver.tar.gz::https://github.com/eikenb/terminal-colors/archive/v2.2.tar.gz") -md5sums=('5b4ef9d2a613d757a704c2b53441a032') +source=("$pkgname-$pkgver.tar.gz::https://github.com/eikenb/terminal-colors/archive/v{$pkgver}.tar.gz") +sha256sums=('b59a2278d085d947322dc245920fcc4d9510ed3eee432787e95ca2a45480bfed') package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/terminal-screensaver/PKGBUILD b/pcr/terminal-screensaver/PKGBUILD index ae579c5c9..d7b49d0b9 100644 --- a/pcr/terminal-screensaver/PKGBUILD +++ b/pcr/terminal-screensaver/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Contributor: totoloco <totoloco at gmail dot com> pkgname=terminal-screensaver diff --git a/pcr/texlive-localmanager/PKGBUILD b/pcr/texlive-localmanager/PKGBUILD index 508c46453..5437c75f7 100644 --- a/pcr/texlive-localmanager/PKGBUILD +++ b/pcr/texlive-localmanager/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): XZS <d dot f dot fischer at web dot de> -# Contributor (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (AUR): Rémy Oudompheng <remy@archlinux.org> -# Contributor (AUR): Firmicus <francois . archlinux . org> +# Maintainer (aur): XZS <d dot f dot fischer at web dot de> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Rémy Oudompheng <remy@archlinux.org> +# Contributor: Firmicus <francois . archlinux . org> # Contrbutor: bill-auger <bill-auger@programmer.net> diff --git a/pcr/textext/PKGBUILD b/pcr/textext/PKGBUILD index 924ae1db3..5b261d03e 100644 --- a/pcr/textext/PKGBUILD +++ b/pcr/textext/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (AUR): Joel Schaerer <joel.schaerer@laposte.net> -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: Joel Schaerer <joel.schaerer@laposte.net> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> pkgname=textext _pkgname=TexText diff --git a/pcr/thinkfan/PKGBUILD b/pcr/thinkfan/PKGBUILD index 6a9f587e1..ee6346f39 100644 --- a/pcr/thinkfan/PKGBUILD +++ b/pcr/thinkfan/PKGBUILD @@ -1,22 +1,33 @@ -# Maintainer (Arch): nblock <nblock [/at\] archlinux DOT us> -# Contributor (Arch): Frederik Alkærsig (FALKER) <havnelisten AT gmail.com> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer (aur): Barry Smith <brrtsm at gmail.com> +# Contributor: nblock <nblock [/at\] archlinux DOT us> +# Contributor: Frederik Alkærsig (FALKER) <havnelisten AT gmail.com> +# Maintainer: Omar Vega Ramos <ovruni.gnu.org.pe> +# Contributor: Wael Karram <wael@waelk.tech> +# Contributor: bill-auger <bill-auger@programmer.net> + + +# parabola changes and rationale: +# - add sodep on 'yaml-cpp' + pkgname=thinkfan -pkgver=0.9.3 -pkgrel=1 +pkgver=1.3.1 +pkgrel=2 pkgdesc="A minimalist fan control program. Supports the sysfs hwmon interface and thinkpad_acpi" -url="http://thinkfan.sourceforge.net/" +url="https://github.com/vmatare/thinkfan" arch=('i686' 'x86_64') +arch+=('armv7h') makedepends=('cmake') -depends=('libatasmart') +depends=('libatasmart' 'yaml-cpp') +depends+=('libyaml-cpp.so') optdepends=('lm_sensors: hwmon support') +backup=('etc/systemd/system/thinkfan.service.d/override.conf') license=('GPL') -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz +source=("$pkgname-$pkgver.tar.gz::https://github.com/vmatare/$pkgname/archive/$pkgver.tar.gz" 'thinkfan.service' 'thinkpad_acpi.conf') -sha256sums=('b61c634996c450445d7e440bf41f7adcda86506063f832afa40d44e01061e45b' - '90f0270b4044a41315feb7bc1447ce4a0d5ee50178682e9a1d2a36b07c1a494f' +sha256sums=('9466c8c82b7c4333b280fa66445ab26185ffbb4aada6bcb4a164eed742f8d78c' + '625730e33fae251f3a1cc8259b222089fb45ada08e9cf5c816ea1cde6560e989' '28874576641b3cc1aa486e1bc9ed40eadfe8b13d6d3014016e31fedc5dc5195f') install=thinkfan.install @@ -30,13 +41,15 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -d -m755 "$pkgdir"/usr/{bin,lib/{modprobe.d,systemd/system},share/{doc/"$pkgname"/{,examples},man/man1}} + install -d -m755 "$pkgdir"/usr/{bin,lib/{modprobe.d,systemd/system},share/{doc/"$pkgname"/{,examples},man/man{1,5}}} + install -d -m755 "$pkgdir"/etc/systemd/system/thinkfan.service.d install -D -m755 "$pkgname" "$pkgdir"/usr/bin - install -D -m644 README NEWS "$pkgdir"/usr/share/doc/"$pkgname" install -D -m644 examples/* "$pkgdir"/usr/share/doc/"$pkgname"/examples - install -D -m644 src/"$pkgname".1 "$pkgdir"/usr/share/man/man1 - install -D -m644 ../"$pkgname".service "$pkgdir"/usr/lib/systemd/system - install -D -m644 ../thinkpad_acpi.conf "$pkgdir"/usr/lib/modprobe.d + install -D -m644 "$pkgname".1 "$pkgdir"/usr/share/man/man1 + install -D -m644 "$pkgname".conf.5 "$pkgdir"/usr/share/man/man5 + install -D -m644 "$srcdir/$pkgname".service rcscripts/systemd/thinkfan-{sleep,wakeup}.service "$pkgdir"/usr/lib/systemd/system + install -D -m644 rcscripts/systemd/override.conf "$pkgdir"/etc/systemd/system/thinkfan.service.d + install -D -m644 "$srcdir"/thinkpad_acpi.conf "$pkgdir"/usr/lib/modprobe.d } # vim:set ts=2 sw=2 noet: diff --git a/pcr/thinkfan/thinkfan.service b/pcr/thinkfan/thinkfan.service index 5618aed6f..d23218aad 100644 --- a/pcr/thinkfan/thinkfan.service +++ b/pcr/thinkfan/thinkfan.service @@ -5,9 +5,11 @@ After=lm_sensors.service [Service] Type=forking -ExecStart=/usr/bin/thinkfan -PIDFile=/var/run/thinkfan.pid -ExecReload=/usr/bin/kill -HUP $MAINPID +ExecStart=/usr/bin/thinkfan $THINKFAN_ARGS +PIDFile=/run/thinkfan.pid +ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target +Also=thinkfan-sleep.service +Also=thinkfan-wakeup.service
\ No newline at end of file diff --git a/pcr/timekpr/PKGBUILD b/pcr/timekpr/PKGBUILD index 64d19e6e5..855073965 100644 --- a/pcr/timekpr/PKGBUILD +++ b/pcr/timekpr/PKGBUILD @@ -1,4 +1,5 @@ -# Contributor (AUR): SanskritFritz (gmail) +# Contributor: SanskritFritz (gmail) +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=timekpr pkgver=0.3.2 diff --git a/pcr/timelineproject-hg/PKGBUILD b/pcr/timelineproject-hg/PKGBUILD index 0f07753ac..b33733083 100644 --- a/pcr/timelineproject-hg/PKGBUILD +++ b/pcr/timelineproject-hg/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Thibaud Kehler <thibaud.kehler at gmx dot net> +# Maintainer (aur): Thibaud Kehler <thibaud.kehler at gmx dot net> pkgname=timelineproject-hg pkgver=2.2.0.r6954 pkgrel=1 diff --git a/pcr/tintin/PKGBUILD b/pcr/tintin/PKGBUILD index ce3565cbf..77de2fa6b 100644 --- a/pcr/tintin/PKGBUILD +++ b/pcr/tintin/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Mike Sampson <mike at sambodata dot com> -# Contributor (AUR): Thomas Zervogiannis <tzervo@gmail.com> -# Contributor (AUR): Loui Chang <louipc dot ist at gmail company> -# Contributor (AUR): rabyte <rabyte__gmail> +# Maintainer (aur): Mike Sampson <mike at sambodata dot com> +# Contributor: Thomas Zervogiannis <tzervo@gmail.com> +# Contributor: Loui Chang <louipc dot ist at gmail company> +# Contributor: rabyte <rabyte__gmail> # Maintainer: Freemor <freemor@freemor.ca> pkgname=tintin diff --git a/pcr/tkpng/PKGBUILD b/pcr/tkpng/PKGBUILD index 15d5f0912..832549086 100644 --- a/pcr/tkpng/PKGBUILD +++ b/pcr/tkpng/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): SpepS <dreamspepser at yahoo dot it> +# Maintainer (aur): SpepS <dreamspepser at yahoo dot it> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=tkpng diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD index 4cdce0481..c85d71135 100644 --- a/pcr/tomb/PKGBUILD +++ b/pcr/tomb/PKGBUILD @@ -1,54 +1,56 @@ -# Maintainer (AUR): parazyd <parazyd@dyne.org> -# Contributor (AUR): nignux <nignux@freaknet.org> -# Contributor (AUR): fauno <fauno@parabola.nu> -# Contributor (AUR): BoySka +# Maintainer (aur): Alexandre Pujol <alexandre@pujol.io> +# Contributor: parazyd <parazyd@dyne.org> +# Contributor: nignux <nignux@freaknet.org> +# Contributor: fauno <fauno@parabola.nu> +# Contributor: BoySka # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgbase=tomb pkgname=(tomb tomb-kdf) -pkgver=2.5 +pkgver=2.9 pkgrel=2 pkgdesc="Crypto Undertaker, a simple tool to manage encrypted storage" arch=('i686' 'x86_64') +arch+=('armv7h') url="https://www.dyne.org/software/tomb/" license=('GPL3') install=${pkgname}.install source=( - https://files.dyne.org/${pkgname}/Tomb-${pkgver}.tar.gz - https://files.dyne.org/${pkgname}/Tomb-${pkgver}.tar.gz.sha - https://files.dyne.org/${pkgname}/Tomb-${pkgver}.tar.gz.asc + https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz + https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz.sha + https://files.dyne.org/tomb/releases/Tomb-${pkgver}.tar.gz.asc ) # The first hash comes from the .sha file -sha256sums=('8c03693cd4aa1fa7eccbad55dec02474750be7b75180b51f1085ab671bc58689' - 'f02373771751371b530776c03561ace67cd7c5655499d766282acc5e736173ba' - 'ca1087639a6eb9acb6bc7a0af4839a998034a4e8df2fbfdd02523f23e0779938') +sha256sums=('b3a23c6680815f7557a3c4bd73d2b2dbde870a62357fcbf9b33089afae75d68c' + '4f57af24b3b39ae1774ac0bca5af5dacf26465bbd55dc954001069fecce5f2a2' + 'SKIP') -# The public key is found at http://jaromil.dyne.org/contact -# gpg --recv-keys 0x73b35da54acb7d10 +# get from https://jaromil.dyne.org/jaromil.pub validpgpkeys=('6113D89CA825C5CEDD02C87273B35DA54ACB7D10') build() { - cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys + cd "${srcdir}/Tomb-${pkgver}/extras/kdf-keys" make } # The checks require root access #check() { -# cd ${srcdir}/${pkgname}-${pkgver} +# cd "${srcdir}/Tomb-${pkgver}" # make test #} package_tomb() { - depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'e2fsprogs') + depends=('cryptsetup' 'gnupg' 'sudo' 'zsh' 'e2fsprogs' 'inetutils') optdepends=( 'steghide: steganography' 'dcfldd: show nice progress during massive I/O' - 'wipe: secure file deletion' 'qrencode: for paper backups of keys' 'swish-e: file content indexer' + 'lsof: allows the operation slam' ) + # arch=('any') # librerelease fails to detect sub-packages with conflicting 'arch' cd "${srcdir}/Tomb-${pkgver}" make DESTDIR="${pkgdir}" PREFIX=/usr install diff --git a/pcr/tomoyo-tools/PKGBUILD b/pcr/tomoyo-tools/PKGBUILD index e429ba0d1..343269b1b 100644 --- a/pcr/tomoyo-tools/PKGBUILD +++ b/pcr/tomoyo-tools/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Steven Allen <steven@stebalien.com> -# Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor (AUR): Jamie Nguyen <jamie AT tomoyolinux.co.uk> +# Maintainer (aur): Steven Allen <steven@stebalien.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Jamie Nguyen <jamie AT tomoyolinux.co.uk> # parabola changes and rationale: # - removed from depends: linux-tomoyo diff --git a/pcr/tox-prpl/PKGBUILD b/pcr/tox-prpl/PKGBUILD index 88b093974..510142536 100644 --- a/pcr/tox-prpl/PKGBUILD +++ b/pcr/tox-prpl/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Christian Hesse <mail@eworm.de> +# Maintainer (aur): Christian Hesse <mail@eworm.de> # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> pkgname=tox-prpl diff --git a/pcr/triceratops-lv2/PKGBUILD b/pcr/triceratops-lv2/PKGBUILD index bb4ea81b8..de3916ef3 100644 --- a/pcr/triceratops-lv2/PKGBUILD +++ b/pcr/triceratops-lv2/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Christopher Arndt <aur -at- chrisarndt -dot- de> -# Contributor (AUR): speps <speps at aur dot archlinux dot org> +# Maintainer (aur): Christopher Arndt <aur -at- chrisarndt -dot- de> +# Contributor: speps <speps at aur dot archlinux dot org> # parabola changes and rationale: # no changes. diff --git a/pcr/trousers/PKGBUILD b/pcr/trousers/PKGBUILD index d46d173d4..cc8823242 100644 --- a/pcr/trousers/PKGBUILD +++ b/pcr/trousers/PKGBUILD @@ -1,10 +1,10 @@ -# Maintainer (AUR): mutantmonkey <aur@mutantmonkey.in> -# Contributor (AUR): Gerardo Exequiel Pozzi <djgera@archlinux.org> -# Contributor (AUR): Robert Buhren <robert@robertbuhren.de> -# Contributor (AUR): Gavin Lloyd <gavinhungry@gmail.com> -# Contributor (AUR): xav <xav at ethertricks dot net> -# Contributor (AUR): julian <pidanc_j at epita dot fr> -# Contributor (AUR): Silvio Knizek <killermoehre@gmx.net> +# Maintainer (aur): mutantmonkey <aur@mutantmonkey.in> +# Contributor: Gerardo Exequiel Pozzi <djgera@archlinux.org> +# Contributor: Robert Buhren <robert@robertbuhren.de> +# Contributor: Gavin Lloyd <gavinhungry@gmail.com> +# Contributor: xav <xav at ethertricks dot net> +# Contributor: julian <pidanc_j at epita dot fr> +# Contributor: Silvio Knizek <killermoehre@gmx.net> # parabola changes and rationale: # - removed "open source" term from pkgdesc diff --git a/pcr/tryton/PKGBUILD b/pcr/tryton/PKGBUILD index e70840dd7..20f194617 100644 --- a/pcr/tryton/PKGBUILD +++ b/pcr/tryton/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> -# Contributor (Arch): Florian Walch <florian.walch@gmx.at> +# Maintainer (arch): Robin Baumgartner <robin@baumgartners.ch> +# Contributor: Florian Walch <florian.walch@gmx.at> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=tryton pkgver=4.2.1 diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD index b777b5ae0..e9f2cab8c 100644 --- a/pcr/trytond/PKGBUILD +++ b/pcr/trytond/PKGBUILD @@ -1,5 +1,5 @@ -# Contributor (Arch): Florian Walch <florian.walch@gmx.at> -# Maintainer (Arch): Robin Baumgartner <robin@baumgartners.ch> +# Contributor: Florian Walch <florian.walch@gmx.at> +# Maintainer (arch): Robin Baumgartner <robin@baumgartners.ch> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=trytond pkgver=4.2.1 diff --git a/pcr/ttf-beteckna/PKGBUILD b/pcr/ttf-beteckna/PKGBUILD index 414b84bf0..176dd6c66 100644 --- a/pcr/ttf-beteckna/PKGBUILD +++ b/pcr/ttf-beteckna/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Aerion <emile@aerion.co.uk> -# Contributor (AUR): TDY <tdy@archlinux.info> +# Maintainer (aur): Aerion <emile@aerion.co.uk> +# Contributor: TDY <tdy@archlinux.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: bill-auger <bill-auger@programmer.net> diff --git a/pcr/ttf-comic-neue/PKGBUILD b/pcr/ttf-comic-neue/PKGBUILD index 754230291..4ea7ea122 100644 --- a/pcr/ttf-comic-neue/PKGBUILD +++ b/pcr/ttf-comic-neue/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Gatlin Johnson <gatlin@niltag.net> +# Maintainer (aur): Gatlin Johnson <gatlin@niltag.net> # parabola changes and rationale: # no changes. diff --git a/pcr/ttf-montserrat/PKGBUILD b/pcr/ttf-montserrat/PKGBUILD deleted file mode 100644 index 65a79a078..000000000 --- a/pcr/ttf-montserrat/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer (AUR): Caleb Maclennan <caleb@alerque.com> -# Contributor (AUR): scolobb <scolobb@colimite.fr> -# Contributor (AUR): EEva <eeva+aur@marvid.fr> -# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Contributor: Freemor <freemor@freemor.ca> - -pkgname=ttf-montserrat -pkgver=7.200 -pkgrel=4 -_fontname=Montserrat -pkgdesc='Geometric font in many weights with Cyrillic and extended Latin support (Regular, Alternates), original concept by Julieta Ulanovsky' -url="https://github.com/JulietaUla/${_fontname}" -arch=('any') -license=('custom:OFL') -source=("$pkgname-$pkgver.tar.gz::https://github.com/JulietaUla/${_fontname}/archive/v${pkgver}.tar.gz") -sha256sums=('340125df4700876c5adf4df98c885dbe9b96c8a6a0ee634a520934c77ee097dc') - -package() { - cd ${_fontname}-${pkgver} - - install -Dm644 OFL.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" - - dst=${pkgdir}/usr/share/fonts/TTF - mkdir -p ${dst} - find ./fonts/ttf -name '*.ttf' -execdir install -m644 {} ${dst}/{} \; -} diff --git a/pcr/ttf-montserrat/ttf.install b/pcr/ttf-montserrat/ttf.install deleted file mode 100644 index 1df944e73..000000000 --- a/pcr/ttf-montserrat/ttf.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - echo -n "Updating font cache... " - fc-cache -sf > /dev/null - mkfontscale usr/share/fonts/TTF - mkfontdir usr/share/fonts/TTF - echo "done." -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -}
\ No newline at end of file diff --git a/pcr/ttf-open-comic-font/PKGBUILD b/pcr/ttf-open-comic-font/PKGBUILD index 6c3162fc4..37ebad547 100644 --- a/pcr/ttf-open-comic-font/PKGBUILD +++ b/pcr/ttf-open-comic-font/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Márcio Silva <coadde@hyperbola.info> # Contributor: bill-auger <bill-auger@programmer.net> - +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=ttf-open-comic-font pkgver=0.03.2 diff --git a/pcr/tupi/PKGBUILD b/pcr/tupi/PKGBUILD index f42e7ae5a..c0218a9b7 100644 --- a/pcr/tupi/PKGBUILD +++ b/pcr/tupi/PKGBUILD @@ -1,7 +1,7 @@ -# Contributor (Arch): Ninez <triplesquarednine AT gmail DOT com> -# Contributor (Arch): N30N <archlinux@alunamation.com> -# Contributor (Arch): sekret (AUR) -# Maintainer (Arch): SanskritFritz (gmail) +# Contributor: Ninez <triplesquarednine AT gmail DOT com> +# Contributor: N30N <archlinux@alunamation.com> +# Contributor: sekret (AUR) +# Maintainer (arch): SanskritFritz (gmail) # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname="tupi" diff --git a/pcr/uboot-tools/PKGBUILD b/pcr/uboot-tools/PKGBUILD index 65fa2cfc8..d1a084f54 100644 --- a/pcr/uboot-tools/PKGBUILD +++ b/pcr/uboot-tools/PKGBUILD @@ -1,26 +1,31 @@ # $Id$ -# Maintainer (Arch): Anatol Pomozov -# Contributor (Arch): Michael Lass <bevan@bi-co.net> -# Contributor (Arch): Philipp Schrader <philipp.schrader+arch@gmail.com> +# Maintainer (arch): Anatol Pomozov +# Contributor: Michael Lass <bevan@bi-co.net> +# Contributor: Philipp Schrader <philipp.schrader+arch@gmail.com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> +# Parabola changes and rationale: +# - Change architecture to armv7h: uboot-tools is already available in +# Parabola i686 and x86_64 through Arch Linux and Arch Linux 32's +# community repositories + pkgname=uboot-tools -pkgver=2017.07 +pkgver=2021.04 pkgrel=1 pkgdesc='U-Boot bootloader utility tools' arch=(armv7h) -url='http://www.denx.de/wiki/U-Boot/WebHome' +url='https://www.denx.de/wiki/U-Boot/WebHome' license=(GPL) depends=(openssl) source=(ftp://ftp.denx.de/pub/u-boot/u-boot-$pkgver.tar.bz2{,.sig}) -validpgpkeys=('E872DB409C1A687EFBE8633687F9F635D31D7652') -sha256sums=('5374bfdc8acb9a38c025371b1ff20f45e7533668e84e685d0df5d9e7c0e4feff' - 'SKIP') +validpgpkeys=('1A3C7F70E08FAB1707809BBF147C39FF9634B72C') +sha1sums=('a69cf9cf8ddda0935b0bfed86e90fde1124f133d' + 'SKIP') build() { cd u-boot-$pkgver make defconfig - make tools-all + make tools-all KBUILD_HOSTLDFLAGS=${LDFLAGS} } package() { diff --git a/pcr/ucommon/PKGBUILD b/pcr/ucommon/PKGBUILD index f05abb83b..66a37ca8a 100644 --- a/pcr/ucommon/PKGBUILD +++ b/pcr/ucommon/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Timothy Redaelli <timothy.redaelli@gmail.com> -# Contributor (AUR): Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer (aur): Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # parabola changes and rationale: # no changes. diff --git a/pcr/ucsniff-ace/PKGBUILD b/pcr/ucsniff-ace/PKGBUILD index 9a8dec831..08363598c 100644 --- a/pcr/ucsniff-ace/PKGBUILD +++ b/pcr/ucsniff-ace/PKGBUILD @@ -1,4 +1,5 @@ # Contributor: Márcio Silva <coadde@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname='ucsniff-ace' pkgver='1.10' diff --git a/pcr/uefitool/PKGBUILD b/pcr/uefitool/PKGBUILD index 720b31e3c..5c234bad4 100644 --- a/pcr/uefitool/PKGBUILD +++ b/pcr/uefitool/PKGBUILD @@ -1,6 +1,7 @@ # Based on uefitool-git # Contributor: xsmile <sascha_r at gmx dot de> # Contributor: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=uefitool _pkgname=UEFITool diff --git a/pcr/ums/PKGBUILD b/pcr/ums/PKGBUILD index 7e17d6c2f..25b3913d7 100644 --- a/pcr/ums/PKGBUILD +++ b/pcr/ums/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Mitch <mitch at znation dot nl> -# Contributor (AUR): Red Squirrel <iam at redsquirrel87 dot com> -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Mitch <mitch at znation dot nl> +# Contributor: Red Squirrel <iam at redsquirrel87 dot com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # Based on PMS PKGBUILD pkgname=ums diff --git a/pcr/unifont/PKGBUILD b/pcr/unifont/PKGBUILD new file mode 100644 index 000000000..87de85462 --- /dev/null +++ b/pcr/unifont/PKGBUILD @@ -0,0 +1,176 @@ +# Maintainer: Wael Karram <wael@waelk.tech> +# Contributor: bill-auger <bill-auger@programmer.net> +# bdf-unifont: +# Maintainer (aur:bdf-unifont): Carlos Aznarán <caznaranl@uni.pe> +# Contributor: Antonio Rojas <arojas@archlinux.org> +# Contributor: Ronald van Haren <ronald.archlinux.org> +# hex-unifont: +# (no package, but is built from 'ttf-unifont' recipe) +# otf-unifont: +# Maintainer (aur:otf-unifont): Martin C. Doege <mdoege at compuserve dot com> +# Maintainer (aur:otf-unifont): txtsd <aur.archlinux@ihavea.quest> +# Contributor: nl6720 <nl6720@archlinux.org> +# Contributor: David McInnis <dave@dave3.xyz> +# Contributor: megadriver <megadriver at gmx dot com> +# pcf-unifont: +# Maintainer (aur:pcf-unifont): neeshy <neeshy@tfwno.gf> +# psf-unifont: +# Maintainer (aur:psf-unifont): neeshy <neeshy@tfwno.gf> +# ttf-unifont: +# Maintainer (aur:ttf-unifont): txtsd <aur.archlinux@ihavea.quest> +# Maintainer (aur:ttf-unifont): Martin C. Doege <mdoege at compuserve dot com> + + +# parabola changes and rationale: +# - install documentation +# - combination of several AUR packages + +# NOTE: This package should be built per-arch. +# The fonts are for 'any' arch; but 'unifont-utils' is arch-specific. +# In order to publish all of these packages, `librestage` must be run twice. +# The first run will stage the 'any' packages. +# In order to librestage the per-arch 'unifont-utils' and source packages, +# uncomment the commented arch=() array temporarily, and run librestage again. +# TODO: There is a WIP in librestage which adds a CLI option to specifiy arches. +# Once that is released, this note can be changed to suggest a single command +# eg: librestage -A '.*' + + +pkgname=('bdf-unifont' + 'hex-unifont' + 'otf-unifont' + 'pcf-unifont' + 'psf-unifont' +# 'ttf-unifont' # v15.1.04 fails to build + 'unifont-utils') +pkgbase=unifont +pkgver=15.1.05 +pkgrel=1 +pkgdesc="A free bitmap font with wide Unicode support (PCF, PSF and hex versions)" +arch=('any') +# arch=('armv7h' 'i686' 'x86_64') # for librestage (see NOTE above) +url="http://unifoundry.com/" +license=('GPL' 'custom:OFL') +source=("http://unifoundry.com/pub/unifont/unifont-$pkgver/unifont-$pkgver.tar.gz"{,.sig}) +sha256sums=('d275f55f4358750e0f86305b92e87b88eb330aa46c15f553d2edf047fb1c23fa' + 'SKIP') +validpgpkeys=('95D2E9AB8740D8046387FD151A09227B1F435A33') # Paul Hardy <unifoundry@unifoundry.com> + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + + local variation + for variation in bold italic bolditalic; do + "mk$variation" "unifont-$pkgver.bdf" | gzip -c >"unifont-$variation-$pkgver.bdf.gz" + done + + make +} + +package_bdf-unifont () { + pkgdesc="A free bitmap font with wide Unicode support (BDF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + gzip -d --force "unifont-$pkgver.bdf.gz" + install -Dm644 "unifont-$pkgver.bdf" "$pkgdir/usr/share/fonts/misc/unifont.bdf" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_hex-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (hex version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -Dm644 "unifont-$pkgver.hex" "$pkgdir/usr/share/unifont/unifont.hex" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_otf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (OTF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -d "$pkgdir/usr/share/fonts/Unifont/" + install -m644 "unifont-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont.otf" + install -m644 "unifont_jp-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.otf" + install -m644 "unifont_upper-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.otf" + install -m644 "unifont_csur-$pkgver.otf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.otf" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_pcf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (PCF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -Dm644 "unifont-$pkgver.pcf.gz" "$pkgdir/usr/share/fonts/misc/unifont.pcf.gz" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_psf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (PSF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -Dm644 "Unifont-APL8x16-$pkgver.psf.gz" "$pkgdir/usr/share/kbd/consolefonts/Unifont-APL8x16.psf.gz" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_ttf-unifont() { + pkgdesc="A free bitmap font with wide Unicode support (TTF version)" + + # Install the font. + cd "$srcdir/unifont-$pkgver/font/precompiled" + install -d "$pkgdir/usr/share/fonts/Unifont/" + install -m644 "unifont-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont.ttf" + install -m644 "unifont_jp-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_jp.ttf" + install -m644 "unifont_upper-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_Upper.ttf" + install -m644 "unifont_csur-$pkgver.ttf" "$pkgdir/usr/share/fonts/Unifont/Unifont_CSUR.ttf" + # Install the license. + cd "$srcdir/unifont-$pkgver" + install -Dm644 OFL-1.1.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Install the documentation. + install -Dm644 doc/unifont.pdf "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/unifont.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_unifont-utils() { + pkgdesc="A free bitmap font with wide Unicode support - utilities" + arch=('armv7h' 'i686' 'x86_64') + license=('GPL') + depends=('perl') + optdepends=( + 'perl-wx: for the unifont-viewer utility' + 'perl-gd: for the unihex2png and unipng2hex utilities' + ) + + cd "$srcdir/unifont-$pkgver" + make -C src install PREFIX="$pkgdir/usr" LOCALBINDIR=../bin + make -C man install PREFIX="$pkgdir/usr" COMPRESS=1 +} diff --git a/pcr/upp/PKGBUILD b/pcr/upp/PKGBUILD index 0b11ff46c..e01b4dec8 100644 --- a/pcr/upp/PKGBUILD +++ b/pcr/upp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jan Dolinar <dolik.rce@gmail.com> +# Maintainer (aur): Jan Dolinar <dolik.rce@gmail.com> pkgbase=upp pkgname=(upp theide umk) diff --git a/pcr/urxvtcd/PKGBUILD b/pcr/urxvtcd/PKGBUILD index 370f38704..fa5c15d3c 100644 --- a/pcr/urxvtcd/PKGBUILD +++ b/pcr/urxvtcd/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor (Arch): G_Syme <demichan(at)mail(dot)upb(dot)de> +# Maintainer (arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=urxvtcd pkgver=2 diff --git a/pcr/vassal/PKGBUILD b/pcr/vassal/PKGBUILD index 7a3675af2..bcf3e3346 100644 --- a/pcr/vassal/PKGBUILD +++ b/pcr/vassal/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): David Vilar <davvil@gmail.com> +# Maintainer (aur): David Vilar <davvil@gmail.com> # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 # parabola changes and rationale: diff --git a/pcr/video_entropyd/PKGBUILD b/pcr/video_entropyd/PKGBUILD index fb6dd831e..6e3ec7c7e 100644 --- a/pcr/video_entropyd/PKGBUILD +++ b/pcr/video_entropyd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Florian Schweikert <kelvan@logic.at> +# Maintainer (aur): Florian Schweikert <kelvan@logic.at> # Maintainer: fauno <fauno@parabola.nu> pkgname=video_entropyd pkgver=2.0 diff --git a/pcr/vim-autotag/PKGBUILD b/pcr/vim-autotag/PKGBUILD index 5782e1ddc..c8920aece 100644 --- a/pcr/vim-autotag/PKGBUILD +++ b/pcr/vim-autotag/PKGBUILD @@ -1,4 +1,5 @@ # Contributor: Daniel Milewski <niitotantei@riseup.net> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=vim-autotag pkgver=r23.b2847e1 diff --git a/pcr/vim-colors-solarized-git/PKGBUILD b/pcr/vim-colors-solarized-git/PKGBUILD index 3494be6e1..b26ab2b25 100644 --- a/pcr/vim-colors-solarized-git/PKGBUILD +++ b/pcr/vim-colors-solarized-git/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Mario Finelli <mario dot finelli at yahoo dot com> -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer (aur): Mario Finelli <mario dot finelli at yahoo dot com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=vim-colors-solarized-git pkgver=20110509 diff --git a/pcr/vim-colorschemes/PKGBUILD b/pcr/vim-colorschemes/PKGBUILD index 0bde09283..7cf6b83e8 100644 --- a/pcr/vim-colorschemes/PKGBUILD +++ b/pcr/vim-colorschemes/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): jsteel <mail at jsteel dot org> -# Contributor (AUR): nblock <nblock [/at\] archlinux DOT us> -# Contributor (AUR): William Díaz <wdiaz [at] archlinux [dot] us> -# Contributor (AUR): Wolfgang Frisch <xororand@frexx.de> -# Contributor (AUR): Leandro Inacio <carvalho.inacio@gmail.com> -# Maintainer : Aurelien Desbrieres <aurelien@hackers.camp> +# Maintainer (aur): jsteel <mail at jsteel dot org> +# Contributor: nblock <nblock [/at\] archlinux DOT us> +# Contributor: William Díaz <wdiaz [at] archlinux [dot] us> +# Contributor: Wolfgang Frisch <xororand@frexx.de> +# Contributor: Leandro Inacio <carvalho.inacio@gmail.com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=vim-colorschemes pkgver=20140623 diff --git a/pcr/vim-pathogen/PKGBUILD b/pcr/vim-pathogen/PKGBUILD index 3f8748e16..cbf42513d 100644 --- a/pcr/vim-pathogen/PKGBUILD +++ b/pcr/vim-pathogen/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): drrossum <d.r.vanrossum at gmx.de> -# Maintainer : Omar Vega Ramos <ovruni@gnu.org.pe> +# Maintainer (aur): drrossum <d.r.vanrossum at gmx.de> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=vim-pathogen pkgver=2.4 diff --git a/pcr/vimperator/PKGBUILD b/pcr/vimperator/PKGBUILD deleted file mode 100644 index 46555ef93..000000000 --- a/pcr/vimperator/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer (AUR): John Jenkins twodopeshaggy@gmail.com -# Contributor (AUR): Gustavo Dutra <mechamo@gustavodutra.com> -# Contributor: André Silva <emulatorman@hyperbola.info> - -# parabola changes and rationale: -# - split package for icecat and iceweasel - -pkgbase=vimperator -pkgname=('iceweasel-vimperator' 'icecat-vimperator') -license=("MIT") -pkgver=3.16.0 -pkgrel=1 -arch=('any') -url="http://vimperator.org/vimperator" -_extensionId="vimperator@mozdev.org" -_fileName=vimperator-$pkgver.xpi -source=(https://github.com/vimperator/vimperator-labs/releases/download/$pkgbase-$pkgver/$pkgbase-$pkgver.xpi) -md5sums=('e1a254894d0c39545e3a5f8fb2f1a8a3') -conflicts=('vimperator-hg' 'vimperator-git') - -package_iceweasel-vimperator() { - pkgdesc="Make iceweasel look and behave like Vim" - depends=('iceweasel') - cd $srcdir || return 1 - local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/$_extensionId - install -d $dstdir || return 1 - cp -R * $dstdir || return 1 - rm $dstdir/$_fileName -} - -package_icecat-vimperator() { - pkgdesc="Make icecat look and behave like Vim" - depends=('icecat') - cd $srcdir || return 1 - local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/$_extensionId - install -d $dstdir || return 1 - cp -R * $dstdir || return 1 - rm $dstdir/$_fileName -} diff --git a/pcr/vislcg3/PKGBUILD b/pcr/vislcg3/PKGBUILD index 85c5929db..916b0f9c6 100644 --- a/pcr/vislcg3/PKGBUILD +++ b/pcr/vislcg3/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Kevin Brubeck Unhammer <unhammer@fsfe.org> +# Maintainer (aur): Kevin Brubeck Unhammer <unhammer@fsfe.org> # Contributor: bill-auger <bill-auger@programmer.net> diff --git a/pcr/vundle-git/PKGBUILD b/pcr/vundle-git/PKGBUILD index 836ca3abf..14a60030c 100644 --- a/pcr/vundle-git/PKGBUILD +++ b/pcr/vundle-git/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor (AUR): Fat Cat <carlos dot manuel250 at gmail dot com> -# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Fat Cat <carlos dot manuel250 at gmail dot com> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> pkgname=vundle-git pkgver=0.10.2.605.fef1c2f diff --git a/pcr/vuurmuur/PKGBUILD b/pcr/vuurmuur/PKGBUILD index 87f277c05..0d4167527 100644 --- a/pcr/vuurmuur/PKGBUILD +++ b/pcr/vuurmuur/PKGBUILD @@ -1,9 +1,9 @@ -# Maintainer (AUR): Piotr Rogoża <rogoza dot piotr at gmail dot com> -# Contributor (AUR): skydrome <skydrome@i2pmail.org> -# Contributor (AUR): Valere Monseur <valere_monseur@hotmail.com> -# Contributor (AUR): Phillip Smith <fukawi2@NO-SPAM.gmail.com> -# Contributor (AUR): (asper, noob -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO> +# Maintainer (aur): Piotr Rogoża <rogoza dot piotr at gmail dot com> +# Contributor: skydrome <skydrome@i2pmail.org> +# Contributor: Valere Monseur <valere_monseur@hotmail.com> +# Contributor: Phillip Smith <fukawi2@NO-SPAM.gmail.com> +# Contributor: (asper, noob +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=vuurmuur _pkgname=Vuurmuur diff --git a/pcr/wallchange/PKGBUILD b/pcr/wallchange/PKGBUILD index af2b1234b..5af54e364 100644 --- a/pcr/wallchange/PKGBUILD +++ b/pcr/wallchange/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de> -# Contributor (AUR): ying <Jinoto Systems> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> +# Maintainer (aur): Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: ying <Jinoto Systems> +# Maintainer: Aurélien Desbrières <aurelien@cwb.io> pkgname=wallchange pkgver=1.2 diff --git a/pcr/whysynth/PKGBUILD b/pcr/whysynth/PKGBUILD index 5ac4dcf3c..726b7011e 100644 --- a/pcr/whysynth/PKGBUILD +++ b/pcr/whysynth/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Martin C. Doege <mdoege at compuserve dot com> -# Contributor (AUR): Sean Bolton <sean at smbolton dot com> +# Maintainer (aur): Martin C. Doege <mdoege at compuserve dot com> +# Contributor: Sean Bolton <sean at smbolton dot com> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=whysynth diff --git a/pcr/wikipediafs/PKGBUILD b/pcr/wikipediafs/PKGBUILD index 5ec1a629d..3b2a2bccf 100644 --- a/pcr/wikipediafs/PKGBUILD +++ b/pcr/wikipediafs/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): Antoine Lubineau <antoine@lubignon.info> +# Maintainer (arch): Antoine Lubineau <antoine@lubignon.info> pkgname=wikipediafs pkgver=0.4 diff --git a/pcr/wordwarvi/PKGBUILD b/pcr/wordwarvi/PKGBUILD index 8312d75a2..b985d7a7d 100644 --- a/pcr/wordwarvi/PKGBUILD +++ b/pcr/wordwarvi/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer (AUR): Steffen Weber <-boenki-gmx-de-> -# Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail> -# Contributor (AUR): Christopher Rogers <slaxemulator@gmail.com> -# Contributor (AUR): J. W. Birdsong <jwbirdsong AT gmail DOT com> +# Maintainer (aur): Steffen Weber <-boenki-gmx-de-> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Christopher Rogers <slaxemulator@gmail.com> +# Contributor: J. W. Birdsong <jwbirdsong AT gmail DOT com> # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 pkgname=wordwarvi diff --git a/pcr/xboxdrv/PKGBUILD b/pcr/xboxdrv/PKGBUILD index 459d69d66..449fcb23b 100644 --- a/pcr/xboxdrv/PKGBUILD +++ b/pcr/xboxdrv/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Levente Polyak <anthraxx[at]archlinux[dot]org> -# Contributor (AUR): Jack Mitchell <jack@embed.me.uk> -# Contributor (AUR): Kevin MacMartin <prurigro at gmail dot com> +# Maintainer (aur): Levente Polyak <anthraxx[at]archlinux[dot]org> +# Contributor: Jack Mitchell <jack@embed.me.uk> +# Contributor: Kevin MacMartin <prurigro at gmail dot com> # parabola changes and rationale: # no change. diff --git a/pcr/xen/21_linux_xen_multiboot_arch b/pcr/xen/21_linux_xen_multiboot_arch deleted file mode 100755 index 877bf2233..000000000 --- a/pcr/xen/21_linux_xen_multiboot_arch +++ /dev/null @@ -1,302 +0,0 @@ -#! /bin/sh -set -e - -# grub-mkconfig helper script. -# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. -# -# GRUB is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# GRUB is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GRUB. If not, see <http://www.gnu.org/licenses/>. - -prefix="/usr" -exec_prefix="/usr" -datarootdir="/usr/share" - -. "$pkgdatadir/grub-mkconfig_lib" - -export TEXTDOMAIN=grub -export TEXTDOMAINDIR="${datarootdir}/locale" - -CLASS="--class gnu-linux --class gnu --class os --class xen" - -if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=GNU/Linux-libre -else - OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre" - CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}" -fi - -# loop-AES arranges things so that /dev/loop/X can be our root device, but -# the initrds that Linux-libre uses don't like that. -case ${GRUB_DEVICE} in - /dev/loop/*|/dev/loop[0-9]) - GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` - ;; -esac - -# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter -# and mounting btrfs requires user space scanning, so force UUID in this case. -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ - || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} -else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -fi - -# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT. -if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then - GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX_XEN_REPLACE}" -fi -if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then - GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" -fi - -case x"$GRUB_FS" in - xbtrfs) - rootsubvol="`make_system_path_relative_to_its_root /`" - rootsubvol="${rootsubvol#/}" - if [ "x${rootsubvol}" != x ]; then - GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" - fi;; - xzfs) - rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` - bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`" - LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs}" - ;; -esac - -title_correction_code= - -linux_entry () -{ - os="$1" - version="$2" - xen_version="$3" - type="$4" - args="$5" - xen_args="$6" - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" - fi - if [ x$type != xsimple ] ; then - if [ x$type = xrecovery ] ; then - title="$(gettext_printf "%s, with Xen %s and Linux %s (recovery mode)" "${os}" "${xen_version}" "${version}")" - else - title="$(gettext_printf "%s, with Xen %s and Linux %s" "${os}" "${xen_version}" "${version}")" - fi - replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')" - if [ x"Xen ${xen_version}>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then - quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)" - title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;" - grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")" - fi - echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - else - title="$(gettext_printf "%s, with Xen hypervisor" "${os}")" - echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'xen-gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" - fi - if [ x$type != xrecovery ] ; then - save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" - fi - - if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" - fi - printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" - xmessage="$(gettext_printf "Loading Xen %s ..." ${xen_version})" - lmessage="$(gettext_printf "Loading Linux-libre %s ..." ${version})" - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$xmessage" | grub_quote)' - if [ "\$grub_platform" = "pc" -o "\$grub_platform" = "" ]; then - xen_rm_opts= - else - xen_rm_opts="no-real-mode edd=off" - fi - ${xen_loader} ${rel_xen_dirname}/${xen_basename} placeholder ${xen_args} \${xen_rm_opts} - echo '$(echo "$lmessage" | grub_quote)' - ${module_loader} ${rel_dirname}/${basename} placeholder root=${linux_root_device_thisversion} ro ${args} -EOF - if test -n "${initrd}" ; then - # TRANSLATORS: ramdisk isn't identifier. Should be translated. - message="$(gettext_printf "Loading initial ramdisk ...")" - sed "s/^/$submenu_indentation/" << EOF - echo '$(echo "$message" | grub_quote)' - ${module_loader} --nounzip ${rel_dirname}/${initrd} -EOF - fi - sed "s/^/$submenu_indentation/" << EOF -} -EOF -} - -linux_list= -for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do - if grub_file_is_not_garbage "$i"; then - basename=$(basename $i) - version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") - dirname=$(dirname $i) - config= - for j in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do - if test -e "${j}" ; then - config="${j}" - break - fi - done - if (grep -qx "CONFIG_XEN_DOM0=y" "${config}" 2> /dev/null || grep -qx "CONFIG_XEN_PRIVILEGED_GUEST=y" "${config}" 2> /dev/null || [ -z ${config} ]); then linux_list="$linux_list $i" ; fi - fi -done -if [ "x${linux_list}" = "x" ] ; then - exit 0 -fi - -file_is_not_sym () { - case "$1" in - */xen-syms-*) - return 1;; - *) - return 0;; - esac -} - -file_is_not_xen_config () { - case "$1" in - */xen*\.*config) - return 1;; - */xen*\.*cfg) - return 1;; - */xen*\.*efi) - return 1;; - *) - return 0;; - esac -} - - -xen_list= -for i in /boot/xen*; do - if grub_file_is_not_garbage "$i" && file_is_not_sym "$i" && file_is_not_xen_config "$i"; then xen_list="$xen_list $i" ; fi -done -prepare_boot_cache= -boot_device_id= - -title_correction_code= - -machine=`uname -m` - -case "$machine" in - i?86) GENKERNEL_ARCH="x86" ;; - mips|mips64) GENKERNEL_ARCH="mips" ;; - mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; - arm*) GENKERNEL_ARCH="arm" ;; - *) GENKERNEL_ARCH="$machine" ;; -esac - -# Extra indentation to add to menu entries in a submenu. We're not in a submenu -# yet, so it's empty. In a submenu it will be equal to '\t' (one tab). -submenu_indentation="" - -is_top_level=true - -while [ "x${xen_list}" != "x" ] ; do - list="${linux_list}" - current_xen=`version_find_latest $xen_list` - xen_basename=`basename ${current_xen}` - xen_dirname=`dirname ${current_xen}` - rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` - xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"` - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" - fi - if [ "x$is_top_level" != xtrue ]; then - echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" - fi - if ($grub_file --is-arm64-efi $current_xen); then - xen_loader="xen_hypervisor" - module_loader="xen_module" - else - if ($grub_file --is-x86-multiboot2 $current_xen); then - xen_loader="multiboot2" - module_loader="module2" - else - xen_loader="multiboot" - module_loader="module" - fi - fi - while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` - gettext_printf "Found linux-libre image: %s\n" "$linux" >&2 - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,vmlinuz-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - - initrd= - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ - "initrd-${version}" "initramfs-${version}.img" \ - "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" ; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break - fi - done - if test -n "${initrd}" ; then - gettext_printf "Found initrd image: %s\n" "${dirname}/${initrd}" >&2 - else - # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. - linux_root_device_thisversion=${GRUB_DEVICE} - fi - - if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then - linux_entry "${OS}" "${version}" "${xen_version}" simple \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" - - submenu_indentation="$grub_tab$grub_tab" - - if [ -z "$boot_device_id" ]; then - boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" - fi - # TRANSLATORS: %s is replaced with an OS name - echo "submenu '$(gettext_printf "Advanced options for %s (with Xen hypervisor)" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" - echo " submenu '$(gettext_printf "Xen hypervisor, version %s" "${xen_version}" | grub_quote)' \$menuentry_id_option 'xen-hypervisor-$xen_version-$boot_device_id' {" - is_top_level=false - fi - - linux_entry "${OS}" "${version}" "${xen_version}" advanced \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" "${GRUB_CMDLINE_XEN} ${GRUB_CMDLINE_XEN_DEFAULT}" - if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then - linux_entry "${OS}" "${version}" "${xen_version}" recovery \ - "single ${GRUB_CMDLINE_LINUX}" "${GRUB_CMDLINE_XEN}" - fi - - list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '` - done - if [ x"$is_top_level" != xtrue ]; then - echo ' }' - fi - xen_list=`echo $xen_list | tr ' ' '\n' | fgrep -vx "$current_xen" | tr '\n' ' '` -done - -# If at least one kernel was found, then we need to -# add a closing '}' for the submenu command. -if [ x"$is_top_level" != xtrue ]; then - echo '}' -fi - -echo "$title_correction_code" diff --git a/pcr/xen/ChangeLog b/pcr/xen/ChangeLog index ced200187..e028522ce 100644 --- a/pcr/xen/ChangeLog +++ b/pcr/xen/ChangeLog @@ -1,40 +1,325 @@ -2018-01-04 John Thomson - * 4.10.0-2 - XSA-253 x86: memory leak with MSR emulation - -2017-12-13 John Thomson - * 4.10.0-1 - Xen 4.10 release - -2017-12-04 John Thomson - * 4.10.0rc8 - Xen 4.10 release candidate 8 - -2017-12-01 John Thomson - * 4.10.0rc7 - Xen 4.10 release candidate 7 - -2017-11-23 John Thomson - * 4.10.0rc6 - Xen 4.10 release candidate 6 - -2017-11-18 John Thomson - * 4.10.0rc5 - Xen 4.10 release candidate 5 - grub multiboot2 config generator updated - -2017-11-13 John Thomson - * 4.10.0rc4 - Xen 4.10 release candidate 4 - -2017-11-02 John Thomson - * 4.10.0rc3 - Xen 4.10 release candidate 3 - -2017-10-23 John Thomson - * 4.10.0rc2 - Xen 4.10 release candidate 2 - -2017-10-18 John Thomson - * 4.10.0rc1 - Xen 4.10 release candidate 1 +2022-02-15 + * 4.16.0-3 + * forgot to wrap qemu subpackage in an if + +2022-02-06 + * 4.16.0-2 + * security patches + * qemu and stubdom now generate split packages + +2021-12-28 Sam Mulvey + * 4.16.0-1 + * simple bump + +2021-09-28 Sam Mulvey + * 4.15.1-1 + * no patches at all, compiles cleanly + +2021-09-09 Sam Mulvey + * 4.15.0-4 + * adds a PVH security patch + +2021-08-28 Sam Mulvey + * 4.15.0-3 + * EFI fixes + * continued GCC11 changes + * XSA: 379 380 382 383 + +2021-04-15 Sam Mulvey + * 4.15.0-1 + * stubdom build now defaults false + +2021-01-12 Sam Mulvey + * 4.14.1-1 + +2020-11-10 Sam Mulvey + * 4.14.0-4 + re-added XSA patch file handling + +2020-08-10 Sam Mulvey + * 4.14.0-1 + option to build own QEMU is added, and default + +2020-08-20 Sam Mulvey + * 4.13.1-4 + +2019-08-15 Maik Broemme + * 4.12.1-1 + Xen 4.12.1 + +2019-04-29 Maik Broemme + * 4.12.0-1 + Xen 4.12.0 + +2018-07-24 Maik Broemme + * 4.11.0-2 + Updated version in 'xen.install' file + +2018-07-12 Maik Broemme + * 4.11.0-1 + Xen 4.11.0 + +2018-05-15 Maik Broemme + * 4.10.1-3 + Apply XSA patches: 260 261 262 + +2018-05-15 Maik Broemme + * 4.10.1-2 + Fix compilation issue with gcc-8 + +2018-05-08 Maik Broemme + * 4.10.1-1 + Xen 4.10.1 + +2018-05-03 Maik Broemme + * 4.10.0-6 + Replace 'mingw-w64-binutils' with 'binutils' + +2018-05-03 Maik Broemme + * 4.10.0-5 + Fix missing path of '--with-system-ovmf' parameter + Fix compilation issue with glibc-2.27 + Apply XSA patches: 258 + +2018-04-11 Maik Broemme + * 4.10.0-4 + PKGBUILD cleanup + Update ipxe to latest version + Align dependencies between qemu-xen and qemu-xen-traditional + Remove no longer needed '-Werror' fixes + +2018-04-09 Maik Broemme + * 4.10.0-3 + Fix '(XEN) parameter "/boot/xen-4.10.0.gz" unknown!' issue + +2018-04-09 Maik Broemme + * 4.10.0-2 + Make dependencies independent from build system + Apply XSA patches: 253 254 255 256 + +2018-02-20 Maik Broemme + * 4.10.0-1 + Xen 4.10.0 + +2017-09-30 Janne Heß + * 4.9.0-2 + Add spice-glib dependency + Fix build with PIC + Apply XSA patches: 226 227 228 229 230 231 232 233 234 235 + +2017-07-20 Janne Heß + * 4.9.0 + Xen 4.9.0 + Completely patch out Werror + Remove all obsolete patches + +2017-05-06 Janne Heß + * 4.8.0-7 + Apply XSA patches: 213 214 + +2017-04-07 Janne Heß + * 4.8.0-6 + Remove last pieces of OVMF and SeaBIOS + Specify location of SeaBIOS + Apply XSA patch: 212 + +2017-03-28 Janne Heß + * 4.8.0-5 + Split out SeaBIOS and OVMF + Disable Werror + Apply XSA patch: 211 + +2017-03-09 Janne Heß + * 4.8.0-4 + Merge with xen-docs + Fix lzo dependency + Add mingw-w64-binutils as dependency + +2017-02-27 Janne Heß + * 4.8.0-3 + Apply XSA patches: 207 208 209 210 + +2017-01-12 Janne Heß + * 4.8.0-2 + Xen 4.8.0 + Update all downloaded packages + Remove all obsolete patches + Apply XSA patch: 203, 204 + +2016-09-18 John Thomson + * 4.7.0-3 + Apply XSA patch: 185, 186, 187 + +2016-09-03 John Thomson + * 4.7.0-2 + Apply XSA patch: 182, 183, 184 + +2016-06-24 John Thomson + * 4.7.0-1 + Xen 4.7.0 + +2016-06-11 John Thomson + * 4.6.1-7 + Apply XSA patch: 175, 178, 181 + +2016-05-23 John Thomson + * 4.6.1-6 + Apply XSA patch: 180 + +2016-05-19 John Thomson + * 4.6.1-5 + Apply XSA patch: 176 + +2016-05-12 John Thomson + * 4.6.1-4 + Apply XSA patch: 179 + Patches for GCC6 + +2016-04-19 John Thomson + * 4.6.1-3 + Apply XSA patch: 173 + +2016-03-31 John Thomson + * 4.6.1-2 + Apply XSA patch: 172 + +2016-02-19 John Thomson + * 4.6.1-1 + Xen source package updated to 4.6.1 + Apply XSA patch: 170 + +2016-02-19 John Thomson + * 4.5.2-1 + Xen source package updated to 4.5.2 + Build xen.efi with mingw-w64-binutils + Build ovmf + Apply XSA patches: 154, 156, 158 to 160, 162 to 168, and 170 + +2015-07-04 David Sutton <kantras - gmail.com> + * 4.5.1-1 + New major release from upstream + Added -fno-caller-saves CFLAG to PKGBUILD to work around GCC5 issues + Added in some compile fixes for GCC 5 + Disabled OVMF for now until patched for GCC 5 + +2015-05-13 David Sutton <kantras - gmail.com> + * 4.5.0-3 + Added Security patches + +2015-04-08 David Sutton <kantras - gmail.com> + * 4.5.0-2 + Updated PKGBUILD to use absolute instead of relative paths for install + Updated efi-xen.cfg with syntax fix + Added gnuttls-3.4.0 patch + Added security patches + +2015-03-01 David Sutton <kantras - gmail.com> + * 4.5.0-1 + New major release from upstream + Cleaned up old XSA patches + Removed old systemd support patches and realigned with the new upstream methods + +2014-10-26 David Sutton <kantras - gmail.com> + * 4.4.1-3 + Enabled OVMF support and added patches to fix compile + Enabled spice support and added patch to enable qemu support in qemu-xen + Added figlet as an make dependancy for the ascii art version number + Including an example xen.cfg package for people who will be using EFI + Additional cleanup (explictly disabling some unnecessary libraries) + +2014-10-12 David Sutton <kantras - gmail.com> + * 4.4.1-2: + Added XSA 104, 105, 106, 107 and 108 security patches + Added .config to resolve compile issues where /etc/sysconfig exists + +2014-09-04 David Sutton <kantras - gmail.com> + * 4.4.1-1: + New Upstream release + Cleared out unnecessary patches (security, gcc compile and pit) + +2014-06-22 David Sutton <kantras - gmail.com> + * 4.4.0-6: + Added additional patch to support XSA 100 on AMD platform + +2014-06-17 David Sutton <kantras - gmail.com> + * 4.4.0-5: + Added XSA 96 and 100 security patches + Added patch to explictly disable searching for bluez libs + Cleaned up PKGBUILD + +2014-05-17 David Sutton <kantras - gmail.com> + * 4.4.0-4: + Added patch to fix shutdown issues with pvh domains + +2014-05-01 David Sutton <kantras - gmail.com> + * 4.4.0-3: + Added XSA 92 Security patch + Added fix for compiling under GCC 4.9.0 (From Fedora Rawhide SRPM) + Added updates to 09_xen to closer match system 10_linux + +2014-03-11 David Sutton <kantras - gmail.com> + * 4.4.0-2: + Moved xen-syms file so 09_xen won't pick it up as a potential kernel. + Added XSA 89 Security patch + Minor PKGBUILD cleanup/changes + +2014-03-10 David Sutton <kantras - gmail.com> + * 4.4.0-1: + New upstream release + Cleaned up old unnecessary patches + +2014-02-19 David Sutton <kantras - gmail.com> + * 4.3.2-1: + New upstream release + Removed unnecessary security patches (since now integrated into source) + Attempts to pull down additional required source file to ensure not corrupted + Added missing dependancy libseccomp + +2013-11-25 David Sutton <kantras - gmail.com> + * 4.3.1-2: + Changed bluez dependancy from bluez4 to bluez + Added recent security patches + +2013-10-31 David Sutton <kantras - gmail.com> + * 4.3.1-1: + New upstream release + Removed unnecessary security patches (already merged) + Fixed BIOS Workaround patch to apply to the new source files + Fixed ATI Passthrough patch to apply to the new source files + Updated paths in all patches + +2013-09-29 David Sutton <kantras - gmail.com> + * 4.3.0-7: + Fixed optdepends in PKGBUILD + Added in a pre_remove function in xen.install to disable services + Minor text formating changes in xen.install + Added XSA 62,63,64 and 66 patches (Xen Security Advisories) + +2013-09-29 David Sutton <kantras - gmail.com> + * 4.3.0-6: + Fixed 09_xen so it can detect lts kernels + +2013-09-28 David Sutton <kantras - gmail.com> + * 4.3.0-5: + Fixed mount option in 09_xen from ro to rw + Added in dummy /etc/xen/grub.conf to control settings in 09_xen + Fix library sanitize so that it returns to the base directory + Move the syms file to /usr/share/xen so that it is out of the way of boot but still accessible + Added optional dependancy for openvswitch + +2013-08-13 David Sutton <kantras - gmail.com> + * 4.3.0-4 : + Added patch for qemu-xen to add a TOM register for PCI Hole mapping + Protected /etc/conf.d/xendomains from being overwritten + Included ATI Passthrough patch (not enabled by default, compile tested only) + +2013-07-23 David Sutton <kantras - gmail.com> + + * 4.3.0-3 : + added ChangeLog. + Cleaned up PKGBUILD to match Arch Package Standards + Fixed some path references - /var/run to /run + Removed some unnecessary empty directories + Updated xenconsoled and xenstored so they use /run for pid file + Updated auto-created /run directories to include xenstored + diff --git a/pcr/xen/PKGBUILD b/pcr/xen/PKGBUILD index 2e0dd94d8..ae6e2a6c6 100644 --- a/pcr/xen/PKGBUILD +++ b/pcr/xen/PKGBUILD @@ -1,497 +1,347 @@ -# current version adapted from https://gitlab.com/archlinux-packages-johnth/xen/tree/xen-4.10 - -# Maintainer (AUR): John Thomson <aur.xen at j0aur.mm.st> -# Contributor (Arch): David Sutton <kantras - gmail.com> -# Contributor (Arch): Shanmu Thiagaraja <sthiagaraja+AUR@prshanmu.com> -# Contributor (Arch): Limao Luo -# Contributor (Arch): Luceo -# Contributor (Arch): Revellion -# Contributor: André Silva <emulatorman@hyperbola.info> -# Contributor: Márcio Silva <coadde@hyperbola.info> -# Contributor: Isaac David <isacdaavid@at@isacdaavid@dot@info> - -#linux-4.7 EFI boot panic issue (patch linux) -#http://lkml.iu.edu/hypermail/linux/kernel/1608.2/03448.html - -_build_stubdom="${build_stubdom:-false}" -_system_seabios="${system_seabios:-false}" -_build_debug="${build_debug:-false}" -_build_livepatch="${build_livepatch:-false}" - -## use _build_stubdom=true to build xen with stubdom -## use _system_seabios=true to use system seabios -## this bios file is slightly different to the xen seabios -## /usr/share/qemu/bios-256k.bin uses CONFIG_ROM_SIZE=256, and newer seabios -## can force use this file through vm.cfg bios_path_override='/usr/share/qemu/bios-256k.bin' -## use _build_debug=true to compile Xen with debug options -## use _build_livepatch=true to compile Xen with livepatch support - -#_build_stubdom=true -#_system_seabios=true -#_build_debug=true -#_build_livepatch=true +# Maintainer (aur): Sam Mulvey (Refutationalist) <archlinux@sammulvey.com> +# Contributor: Filipe Laíns (FFY00) <lains@archlinux.org> +# Contributor: Chris Chapman (cman) <chris.chapman@aggiemail.usu.edu> + +# Build Options +_build_stubdom=${build_stubdom:-false} +_build_qemu=${build_qemu:-true} +_boot_dir=${boot_dir:-/boot} +_efi_dir=${efi_dir:-/boot} +_efi_mountpoint=${efi_mountpoint:-/boot} + +# Check http://xenbits.xen.org/xen-extfiles/ for updates +_gmp=4.3.2 +_grub=0.97 +_lwip=1.3.0 +_newlib=1.16.0 +_pciutils=2.2.9 +_polarssl=1.1.4 +_tpm_emulator=0.7.4 +_zlib=1.2.3 pkgbase=xen -pkgname=(xen{,-docs,-syms}) -_pkgname=xen -pkgver=4.10.0 -_pkgver=${pkgver/rc/-rc} -pkgrel=1 -pkgdesc='Virtual Machine Hypervisor & Tools (Parabola rebranded)' -arch=(x86_64 armv7h) -depends=( - bridge-utils - curl - gnutls - iproute2 - libaio - libcacard - libcap-ng - libiscsi - libnl - libpng - lzo - pciutils - python2 - sdl - spice - systemd - usbredir - yajl - # seabios ovmf qemu -) -[[ "$CARCH" == 'x86_64' ]] && depends+=( - lib32-glibc -) -[[ "$CARCH" == *'arm'* ]] && depends+=( - dtc-overlay -) -[[ "$_system_seabios" == true ]] && depends+=( - seabios -) -url='http://www.xenproject.org/' +pkgname=("xen" "xen-docs") +pkgver=4.16.0 +pkgrel=3 +pkgdesc='Type-1 or bare-metal hypervisor' +arch=('x86_64') +url='https://xenproject.org/' license=('GPL2') +options=(!buildflags) + makedepends=( - cmake - figlet - git - markdown - nasm - ocaml-findlib - spice-protocol - wget + 'zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf' + 'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls' + 'vde2' 'lzo' 'pciutils' 'sdl2' 'systemd-libs' + 'systemd' 'wget' 'pandoc' 'valgrind' 'git' 'bin86' 'dev86' 'bison' 'gettext' 'flex' 'pixman' 'ocaml' 'ocaml-findlib' 'fig2dev' +) # last line from namcap, these depends are the xen depends +_stubdom_makedepends=('cmake') +_qemu_makedepends=('ninja') + +_source=( + "https://downloads.xenproject.org/release/xen/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig} + "efi-xen.cfg" + "xen.conf" + "tmpfiles.conf" + "xen-ucode-extract.sh" + "xen-intel-ucode.hook" + "xen-amd-ucode.hook" ) -[[ "$CARCH" == 'x86_64' ]] && makedepends+=( - bin86 - dev86 - gcc-multilib - iasl + +validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') # Xen.org Xen tree code signing (signatures on the xen hypervisor and tools) <pgp@xen.org> + + +# Follow the Xen securite mailing lists, and if a patch is applicable to our package +# add the URL here. +# Better yet, add the patch to abslibre :) +_patches=( + "xsa393.patch" + "xsa394.patch" + "xsa395.patch" + ) -[[ "$CARCH" == 'i686' ]] && makedepends+=( - bin86 - dev86 - iasl + + +# Sources required for building stubdom +_stubdom_source=( + "http://xenbits.xen.org/xen-extfiles/gmp-$_gmp.tar.bz2" + "http://xenbits.xen.org/xen-extfiles/grub-$_grub.tar.gz" + "http://xenbits.xen.org/xen-extfiles/lwip-$_lwip.tar.gz" + "http://xenbits.xen.org/xen-extfiles/newlib-$_newlib.tar.gz" + "http://xenbits.xen.org/xen-extfiles/pciutils-$_pciutils.tar.bz2" + "http://xenbits.xen.org/xen-extfiles/polarssl-$_polarssl-gpl.tgz" + "http://xenbits.xen.org/xen-extfiles/tpm_emulator-$_tpm_emulator.tar.gz" + "http://xenbits.xen.org/xen-extfiles/zlib-$_zlib.tar.gz" ) -## For building Xen EFI boot file. -## mingw-w64-binutils only needed if -## binutils not built with --enable-targets=x86_64-pep -_binutils_efi=false - -if [[ "$CARCH" == 'x86_64' ]]; then - if which ld 2>&1 > /dev/null; then - _binutils_emulations="$(ld -V)" - if [[ "$_binutils_emulations" == *'i386pep'* ]]; then - _binutils_efi=true - msg '#ld has efi support' - else - makedepends+=( - mingw-w64-binutils - ) - msg '#ld does not have efi support, using mingw' - fi - else - true - fi -fi +# from cheap hack known as break_out_sums.sh +_sha512sums=( + "2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87" # xen-4.16.0.tar.gz + "SKIP" # xen-4.16.0.tar.gz.sig + "1bbcbcd9fb8344a207409ec9f0064a45b726416f043f902ca587f5e4fa58497a759be4ffd584fa32318e960aa478864cc05ec026c444e8d27ca8e3248bd67420" # efi-xen.cfg + "ccaa2ff82e4203b11e5dec9aeccac2e165721d8067e0094603ecaa7a70b78c9eb9e2287a32687883d26b6ceae6f8d2ad7636ddf949eb658637b3ceaa6999711b" # xen.conf + "53ba61587cc2e84044e935531ed161e22c36d9e90b43cab7b8e63bcc531deeefacca301b5dff39ce89210f06f1d1e4f4f5cf49d658ed5d9038c707e3c95c66ef" # tmpfiles.conf + "a9230ec6ef9636ac3f3e4b72b1747ee8c4648a8bf4bd8dc3650365e34f1f67474429dbdd24996907d277b0ff5f235574643e781cb3ff37da954e899ddadbe0d6" # xen-ucode-extract.sh + "7a832de9b35f4b77ee80d33310b23886f4d48d1d42c3d6ef6f8e2b428bec7332a285336864b61cfa01d9a14c2023674015beb7527bd5849b069f2be88e6500cd" # xen-intel-ucode.hook + "99921b94a29fa7988c7fb5c17da8e598e777c972d6cae8c8643c991e5ff911a25525345ea8913945313d5c49fecf9da8cc3b83d47ab03928341e917b304370a9" # xen-amd-ucode.hook +) -options=(!buildflags !strip) -changelog=ChangeLog -##SeaBIOS & OVMF tags are in src/xen-*/tools/Config.mk -##grep -rE '_(REVISION|VERSION|TAG)( \?| :){0,1}=' src/xen**/{Config.mk,stubdom/configure,tools/firmware/etherboot/Makefile} -_git_tag_seabios='#tag=rel-1.10.2' -_git_tag_ovmf='#tag=947f3737abf65fda63f3ffd97fddfa6986986868' -_git_tag_ipxe='356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d' +_patch_sums=( + "32efed25f988579be8266a6bc80ed7c09c408519c6b6c5264b7e032849e3accc7ddea19c5879c06d7e7b27308d06e114f6e3ca4f814d53b9be9d239fb09c71f1" # xsa393.patch + "a0afa766e492a4dc921cd5c4c43c9ecbe87f79c07986504c8626ab7f06736147bdfa4637ea4c4abf17b9f1df31056bbcbb6c51a52e244e57467564c8ea06a52e" # xsa394.patch + "0aafb55b88a7feefeb0162b2722efc8ad43edcdfc7926492e1d49945eafb8dda900f7da37b2d49fd4dbc2d0c9a068ad6e47674a6df108a58842275695ed73540" # xsa395.patch +) -if [[ "$_build_stubdom" == true ]]; then - if [[ "$CARCH" == *'arm'* ]]; then - echo '####Compile settings error:' - echo "#cannot build stubdom for $CARCH" - _build_stubdom=false - fi -fi -source=( - "https://downloads.xenproject.org/release/$_pkgname/$_pkgver/$_pkgname-$_pkgver.tar.gz"{,.sig} - "http://xenbits.xen.org/xen-extfiles/ipxe-git-$_git_tag_ipxe.tar.gz" +_stub_sums=( + "2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf" # gmp-4.3.2.tar.bz2 + "c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb" # grub-0.97.tar.gz + "1465b58279af1647f909450e394fe002ca165f0ff4a0254bfa9fe0e64316f50facdde2729d79a4e632565b4500cf4d6c74192ac0dd3bc9fe09129bbd67ba089d" # lwip-1.3.0.tar.gz + "40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3" # newlib-1.16.0.tar.gz + "2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5" # pciutils-2.2.9.tar.bz2 + "88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad" # polarssl-1.1.4-gpl.tgz + "4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35" # tpm_emulator-0.7.4.tar.gz + "021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e" # zlib-1.2.3.tar.gz +) - 'seabios'::"git://xenbits.xen.org/seabios.git$_git_tag_seabios" - 'ovmf'::"git://xenbits.xen.org/ovmf.git$_git_tag_ovmf" - ##HTTP access - #'seabios'::"git+http://xenbits.xen.org/git-http/seabios.git$_git_tag_seabios" +# Simplify things for makepkg +source=( "${_source[@]}" "${_patches[@]}" ) +sha512sums=( "${_sha512sums[@]}" "${_patch_sums[@]}" ) - ## Compile patches - ati-passthrough.patch - patch-ovmf-use-python2.patch +for file in "${_patches[@]}"; do + noextract+=( $(basename ${file}) ) +done - ## Files - xen.install - 21_linux_xen_multiboot_arch - efi-xen.cfg - "tmpfiles.d-$_pkgname.conf" - ## XSA patches - https://xenbits.xen.org/xsa/xsa253.patch -) -if [[ "$_build_stubdom" == true ]]; then - msg '#building with stubdom' - source+=( - http://xenbits.xen.org/xen-extfiles/lwip-1.3.0.tar.gz - http://xenbits.xen.org/xen-extfiles/zlib-1.2.3.tar.gz - http://xenbits.xen.org/xen-extfiles/newlib-1.16.0.tar.gz - http://xenbits.xen.org/xen-extfiles/pciutils-2.2.9.tar.bz2 - http://xenbits.xen.org/xen-extfiles/polarssl-1.1.4-gpl.tgz - http://xenbits.xen.org/xen-extfiles/grub-0.97.tar.gz - http://xenbits.xen.org/xen-extfiles/tpm_emulator-0.7.4.tar.gz - http://xenbits.xen.org/xen-extfiles/gmp-4.3.2.tar.bz2 - http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.0.tar.gz - ) -fi +# stubdom handling +if [ "${_build_stubdom}" == "true" ]; then + source=("${source[@]}" "${_stubdom_source[@]}") + sha512sums=("${sha512sums[@]}" "${_stub_sums[@]}") + # Add in automagic dependency in order to build vtpm and vtpmmgr stubdoms + makedepends=( "${makedepends[@]}" "${_stubdom_makedepends[@]}" ) -noextract=( - "ipxe-git-$_git_tag_ipxe.tar.gz" -) + for file in "${_stubdom_source[@]}"; do + noextract+=( $(basename ${file}) ) + done -if [[ "$_build_stubdom" == true ]]; then - noextract+=( - lwip-1.3.0.tar.gz - zlib-1.2.3.tar.gz - newlib-1.16.0.tar.gz - pciutils-2.2.9.tar.bz2 - polarssl-1.1.4-gpl.tgz - grub-0.97.tar.gz - tpm_emulator-0.7.4.tar.gz - gmp-4.3.2.tar.bz2 - ocaml-3.11.0.tar.gz - ) + _config_stubdom='--enable-stubdom' + + # make sure to build the stubdom package + pkgname+=("xen-stubdom") + +else + _config_stubdom='--disable-stubdom' fi -validpgpkeys=('23E3222C145F4475FA8060A783FE14C957E82BD9') -#gpg --keyserver pgp.mit.edu --recv-key 23E3222C145F4475FA8060A783FE14C957E82BD9 -sha256sums=('0262a7023f8b12bcacfb0b25e69b2a63291f944f7683d54d8f33d4b2ca556844' - 'SKIP' - '251e5516d7de470c434ae5c393aacca2b61fb24d93770592a4a20add60b785c4' - 'SKIP' - 'SKIP' - 'd93c2d5bcdf0c3e4c6e8efb357cb4b9d618209025361f5ccd9d03651a8acd7a3' - '5fb65130f96d1728368a09042e55f622c14117572030ce2141bff4ae150e4a01' - '55145ff9c1570257478842e4001b0dafe007d90f5b06db17231bc5bf20f3b23d' - '8101316cfdf4b59e9c39b7372d4240a4552971c0fa53a4719bbb7a22f5622f4e' - 'efb3c5713d556aa4890136ebf61502060cf90234fbd2e85701ad7a7ed2524fb1' - '40e0760810a49f925f2ae9f986940b40eba477dc6d3e83a78baaae096513b3cf' - 'bba1abb5e4368421de29385e37f8477bf3534d3ba3ff7e2aae9c9d3da53f1393') - - -if [[ "$_build_stubdom" == true ]]; then - sha256sums+=( - #stubdom bits - '772e4d550e07826665ed0528c071dd5404ef7dbe1825a38c8adbc2a00bca948f' - '1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e' - 'db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07' - 'f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24' - '2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6' - '4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b' - '4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459' - '936162c0312886c21581002b79932829aa048cfaf9937c6265aeaa14f1cd1775' - 'ecdd4f8473ab0dee5d3acb5c0a31a4c1dd6aa12179895cf1903dd0f455c43a4f' - - #stubdom patches - ) +if [ "${_build_qemu}" == "true" ]; then + _config_qemu="" + # qemu needs ninja to build as of 4.16.0 + makedepends=( "${makedepends[@]}" "${_qemu_makedepends[@]}" ) + pkgname+=("xen-qemu-builtin") +else + _config_qemu="--with-system-qemu=/usr/bin/qemu-system-x86_64" fi -_xen_kconfig_debug=$(cat <<EOF -CONFIG_DEBUG=y -CONFIG_CRASH_DEBUG=y -EOF -) -_xen_kconfig_livepatch=$(cat <<EOF -CONFIG_LIVEPATCH=y -EOF +_common_make_flags=( + "BOOT_DIR=${_boot_dir}" + "EFI_DIR=${_efi_dir}" + "EFI_MOUNTPOINT=${_efi_mountpoint}" + "XEN_VENDORVERSION=-${pkgrel}-arch" ) -_makevars=( - LANG=C - PYTHON=python2 -) +# TODO: Setup users, dirs, etc. prepare() { - cd "$_pkgname-$_pkgver/" - - ### Copy git sourced tools/firmware - # move seabios into place - mv --force "$srcdir/seabios" tools/firmware/seabios-dir-remote - # move ovmf into place - mv --force "$srcdir/ovmf" tools/firmware/ovmf-dir-remote - - ### Patching - - # XSA Patches - msg 'XSA patches' - # Security Patches - Base - patch -Np1 -i "$srcdir/xsa253.patch" - - # Security Patches - qemu-xen-traditional - cd 'tools/qemu-xen-traditional/' - cd '../../' - - # Security Patches - qemu-xen (upstream) - cd 'tools/qemu-xen/' - cd '../../' - - - # Compile Patches - msg 'Compile patches' - - # Build EFI binary with mingw - if [[ "$_binutils_efi" != true ]]; then - if $(stat /usr/x86_64-w64-mingw32/bin/ld >/dev/null 2>&1); then - sed -i.bak '/ EFI_LD/s/LD/LD_EFI/' xen/arch/x86/Makefile - sed -i.bak 's/LD/LD_EFI/' xen/arch/x86/efi/Makefile - sed -i.bak '/EFI_MOUNTPOINT .*/aLD_EFI ?= $(LD)' xen/Makefile - else - echo '#Not capable of building xen.efi. Need either:' - echo '#(preferred) binutils compiled with --enable-targets=x86_64-pep' - echo '#or install mingw-w64-binutils' - fi - fi - - # OVMF Compile support (Pulls from GIT repo, so patching to patch after pull request) - patch -Np1 -i "$srcdir/patch-ovmf-use-python2.patch" - #mkdir -p tools/firmware/ovmf-patches - #cp "$srcdir"/patch-inbuild-ovmf*.patch tools/firmware/ovmf-patches/ - - # Uncomment line below if you want to enable ATI Passthrough support (some reported successes, untested with 4.4) - #patch -Np1 -i "$srcdir/ati-passthrough.patch" - - ## Fix fixed rundir paths - ## grep -Rl '\/var\/run\/xen' * 2> /dev/null - _var_run_fixed_paths=( - tools/hotplug/Linux/locking.sh - tools/xenmon/xenbaked.c - tools/xenmon/xenmon.py - tools/pygrub/src/pygrub - ) - sed -i 's:/var/run:/run:' ${_var_run_fixed_paths[@]} - - ## Fix python version in shebang - msg 'Fix python shebang to python2' - _python_files=( $(grep -Rlse '^#!/usr/bin/.*python$' || : ) ) - sed -Ei 's|(^#!.*/usr/bin/(env ){0,1})python$|\1python2|' ${_python_files[@]} - - ## Fix systemd-modules-load.d/xen.conf - ## remove nonexistent modules - find tools -iname 'configure*' -exec sed -i -E -e ' - /^LINUX_BACKEND_MODULES="$/,/^"$/ { - #Address range where this variable is set - /"/b; #Do noting if the line contains " - /^xen-/!d; #Delete if does not start with xen - s/scsibk/scsiback/; #Change scsibk to scsiback - };' {} \; - - if [[ "$_build_stubdom" == true ]]; then - # Copy supporting tarballs into place - ln -s "$srcdir/lwip-1.3.0.tar.gz" stubdom/ - ln -s "$srcdir/zlib-1.2.3.tar.gz" stubdom/ - ln -s "$srcdir/newlib-1.16.0.tar.gz" stubdom/ - ln -s "$srcdir/pciutils-2.2.9.tar.bz2" stubdom/ - ln -s "$srcdir/polarssl-1.1.4-gpl.tgz" stubdom/ - ln -s "$srcdir/grub-0.97.tar.gz" stubdom/ - ln -s "$srcdir/tpm_emulator-0.7.4.tar.gz" stubdom/ - ln -s "$srcdir/gmp-4.3.2.tar.bz2" stubdom/ - ln -s "$srcdir/ocaml-3.11.0.tar.gz" stubdom/ - - ## Stubdom patches - cd 'extras/mini-os' - cd '../../' - - #vtpm - fi - - #etherboot - ln -s "$srcdir/ipxe-git-$_git_tag_ipxe.tar.gz" tools/firmware/etherboot/ipxe.tar.gz - #cp "$srcdir"/patch-inbuild-ipxe*.patch tools/firmware/etherboot/patches/ + + cd "${pkgbase}-${pkgver}" + + if [ "${_build_stubdom}" == "true" ]; then + + for file in "${_stubdom_source[@]}"; do + cp ../$(basename ${file}) stubdom/ + done + + fi + + + for patchurl in "${_patches[@]}"; do + patch=$(basename $patchurl) + echo "==> Applying security patch '${patch}'..." + patch -p1 < "../${patch}" + done + + # Fix Install Paths. + sed 's,/var/run,/run,g' -i tools/hotplug/Linux/locking.sh + sed 's,/var/run,/run,g' -i tools/misc/xenpvnetboot + sed 's,/var/run,/run,g' -i tools/xenmon/xenbaked.c + sed 's,/var/run,/run,g' -i tools/xenmon/xenmon.py + sed 's,/var/run,/run,g' -i tools/pygrub/src/pygrub } build() { - cd "$_pkgname-$_pkgver/" - export LD_EFI='/usr/x86_64-w64-mingw32/bin/ld' - ./autogen.sh - if [[ "$_build_stubdom" == true ]]; then - _config_stubdom=(--enable-stubdom) - _config_stubdom+=( - #--enable-ioemu-stubdom=no - #--enable-c-stubdom=no - #--enable-caml-stubdom=no - #--enable-pv-grub=no - #--enable-xenstore-stubdom=no - #--enable-vtpm-stubdom=no - #--enable-vtpmmgr-stubdom=no - ) - else - _config_stubdom=(--disable-stubdom) - fi - _config_seabios=() - if [[ "$_system_seabios" == true ]]; then - _config_seabios=(--with-system-seabios=/usr/share/qemu/bios-256k.bin) - fi - _config_xen_kconfig='' - _config_debug=() - if [[ "$_build_debug" == true ]]; then - _config_debug=(--enable-debug --enable-debug-tcg --enable-debug-info) - _config_xen_kconfig+="\n$_xen_kconfig_debug" - _makevars+=(debug=y CONFIG_DEBUG=y) - fi - if [[ "$_build_livepatch" == true ]]; then - _config_xen_kconfig+="\n$_xen_kconfig_livepatch" - fi - if [[ -n "$_config_xen_kconfig" ]]; then - cd xen - echo -e "$_config_xen_kconfig" > .config - make "${_makevars[@]}" olddefconfig V=1 - cd ../ - fi - ./configure PYTHON=/usr/bin/python2 --prefix=/usr --sbindir=/usr/bin --with-sysconfig-leaf-dir=conf.d --with-rundir=/run \ - --enable-systemd --enable-ovmf \ - "${_config_seabios[@]}" \ - "${_config_stubdom[@]}" \ - "${_config_debug[@]}" \ - --with-extra-qemuu-configure-args='--disable-bluez --disable-gtk --enable-spice --enable-usb-redir' - #--with-system-qemu --with-system-seabios --with-system-ovmf - #defaults --enable-qemu-traditional --enable-rombios \ - make "${_makevars[@]}" dist - if [[ "$_build_livepatch" == true ]]; then - make "${_makevars[@]}" build-tests - fi + cd "${pkgbase}-${pkgver}" + + if [ "${_build_stubdom}" == "true" ]; then + echo "NOTE: Xen build with stubdom support." + fi + + if [ "${_build_qemu}" == "true" ]; then + echo "NOTE: Xen build with integrated QEMU." + fi + + + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --libdir=/usr/lib \ + --with-rundir=/run \ + --enable-systemd \ + --disable-qemu-traditional \ + ${_config_stubdom} \ + ${_config_qemu} \ + --with-sysconfig-leaf-dir=conf.d \ + --with-system-ovmf=/usr/share/ovmf/x64/OVMF.fd \ + --with-system-seabios=/usr/share/qemu/bios-256k.bin + + make "${_common_make_flags[@]}" } package_xen() { - _makevars_package=("${_makevars[@]}" DESTDIR="$pkgdir") - optdepends=( - 'xen-docs: Official Xen documentation' - 'openvswitch: Optional advanced networking support' - 'urlgrabber: Required for xenpvnetboot' - ) - conflicts=(xen-{git,rc,igvtg,4.{8,9}} xenstore) - provides=(xenstore) - replaces=(xen-{git,rc,4.{8,9}}) - backup=( - etc/conf.d/xen{domains,commons} - "etc/$_pkgname/grub.conf" - "etc/$_pkgname/oxenstored.conf" - "etc/$_pkgname/xl.conf" - ) - install="$_pkgname.install" - - cd "$_pkgname-$_pkgver/" - - make "${_makevars_package[@]}" install-xen - make "${_makevars_package[@]}" install-tools - if [[ "$_build_stubdom" == true ]]; then - make "${_makevars_package[@]}" install-stubdom - fi - if [[ "$_build_livepatch" == true ]]; then - make "${_makevars_package[@]}" install-tests - fi - - cd "$pkgdir" - - # Install files from Parabola package - install -Dm644 "$srcdir/tmpfiles.d-$_pkgname.conf" "usr/lib/tmpfiles.d/$_pkgname.conf" - install -Dm755 "$srcdir/21_linux_xen_multiboot_arch" etc/grub.d/21_linux_xen_multiboot_arch - install -Dm644 "$srcdir/efi-xen.cfg" etc/xen/efi-xen.cfg - - mkdir -p var/log/xen/console - - # Sanitize library path (if lib64 exists) - if [[ -d usr/lib64 ]]; then - cd usr/ - mv lib64/* lib/ - rmdir lib64 - cd ../ - fi - - # If EFI binaries built, move to /boot - if [[ -f usr/lib/efi/xen.efi ]]; then - mv usr/lib/efi/*.efi boot/ - rmdir usr/lib/efi - fi - - # Remove syms - find usr/lib/debug -type f \( -name '*-syms*' -or -name '*\.map' \) -delete - rmdir --ignore-fail-on-non-empty usr/lib/debug - - # Remove hypervisor boot symlinks - rm -f boot/xen{,-4{,.8,.9}}{,.{gz,efi}} - - # Documentation cleanup ( see xen-docs package ) - #rm -rf usr/share/doc - #rm -rf usr/share/man - - # Remove tempdirs - rmdir run/xen{,stored} - rmdir run - - # Remove unnecessary qemu ELF support files - # qemuu - rm -f usr/share/qemu-xen/qemu/{palcode,openbios,s390}-* - rm -f usr/share/qemu-xen/qemu/u-boot.e500 - # qemut - if [[ "$CARCH" == *'x86'* ]]; then - rm -f usr/share/xen/qemu/openbios-* - fi - - # adhere to Static Library Packaging Guidelines - rm -rf usr/lib/*.a - - # Remove unneeded init.d files - rm -rf etc/init.d + pkgdesc='Type-1 or baremetal hypervisor' + + depends=( + 'zlib' 'python' 'ncurses' 'openssl' 'libx11' 'libuuid.so' 'yajl' 'libaio' 'glib2' 'pkgconf' + 'bridge-utils' 'iproute2' 'inetutils' 'acpica' 'lib32-glibc' 'gnutls' + 'vde2' 'lzo' 'pciutils' 'sdl2' + 'pixman' 'libseccomp' 'libpng' 'libjpeg-turbo' # inhereted depends because of build environment + ) + + optdepends=( + 'edk2-ovmf: UEFI support' + 'seabios: SeaBIOS payload support' + 'xen-docs: HTML documentation and man pages' + 'grub-xen-git: GRUB and pvgrub2 bootloader support' + 'linux-headers: extract bootable non-zstd kernel for recent kernels' + ) + + if [ "${_build_qemu}" == "false" ]; then + optdepends+=("qemu: HVM and PV support") + fi + + install="xen.install" + + + backup=( + "etc/conf.d/xencommons" + "etc/conf.d/xendomains" + "etc/xen/efi-xen.cfg" + "etc/xen/cpupool" + "etc/xen/xl.conf" + ) + + + cd "${pkgbase}-${pkgver}" + + make "${_common_make_flags[@]}" DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/var/run + + # Symlinks to prior installed versions are not The Arch Way, leave only the bare EFI binary + (cd "${pkgdir}/${_efi_dir}" && mv "$(realpath xen.efi)" xen.efi) + + [ -d "$pkgdir"/etc/xen/scripts ] && backup+=($(find "$pkgdir"/etc/xen/scripts/ -type f | sed "s|^$pkgdir/||g")) + + mkdir -p "${pkgdir}/var/log/xen/console" + + # Continued: Trim hypervisor symlinks. + (cd "${pkgdir}/${_boot_dir}" && mv "$(realpath xen.gz)" xen.gz) + + # Do all symlink removals after the directories have had the real + # binaries moved overtop any symlinks. Note that dependening on + # configuratation _efi_dir and _boot_dir may be the same directory, so + # don't clean any of them until they've all been processed. + find "${pkgdir}/${_efi_dir}" -type l -delete + find "${pkgdir}/${_boot_dir}" -type l -delete + + # Remove syms. + find "${pkgdir}/usr/lib/debug" -type f \( -name '*-syms*' -or -name '*\.map' \) -delete + rmdir "${pkgdir}/usr/lib/debug/usr/lib/xen/boot" + rmdir "${pkgdir}/usr/lib/debug/usr/lib/xen" + rmdir "${pkgdir}/usr/lib/debug/usr/lib" + rmdir "${pkgdir}/usr/lib/debug/usr" + rmdir "${pkgdir}/usr/lib/debug" + + # Remove SysVinit files. + rm -r "${pkgdir}/etc/init.d" + + # Install files for Arch Linux. + install -D -m 0644 "${srcdir}/efi-xen.cfg" "${pkgdir}/etc/xen/efi-xen.cfg" + install -D -m 0644 "${srcdir}/xen.conf" "${pkgdir}/usr/lib/modules-load.d/xen.conf" + install -D -m 0644 "${srcdir}/tmpfiles.conf" "${pkgdir}/usr/lib/tmpfiles.d/${pkgbase}.conf" + + # microcode hooks + mkdir -p "${pkgdir}/usr/share/libalpm/scripts" "${pkgdir}/usr/share/libalpm/hooks" + install -m755 "${srcdir}/xen-ucode-extract.sh" "${pkgdir}/usr/share/libalpm/scripts" + install -m644 "${srcdir}/xen-intel-ucode.hook" "${pkgdir}/usr/share/libalpm/hooks" + install -m644 "${srcdir}/xen-amd-ucode.hook" "${pkgdir}/usr/share/libalpm/hooks" + + # Remove documentation (included in separate xen-docs package). + rm -r "${pkgdir}/usr/share/doc" + rm -r "${pkgdir}/usr/share/man" + + # remove potential stubdom files + rm -r "${pkgdir}/usr/lib/xen/boot" + + # remove qemu + if [ "${_build_qemu}" == "true" ]; then + + rm -r "${pkgdir}/usr/share/qemu-xen" + rm -r \ + "${pkgdir}/usr/lib/xen/include/qemu-plugin.h" \ + "${pkgdir}/usr/lib/xen/bin/qemu-pr-helper" \ + "${pkgdir}/usr/lib/xen/bin/qemu-edid" \ + "${pkgdir}/usr/lib/xen/bin/elf2dmp" \ + "${pkgdir}/usr/lib/xen/bin/qemu-storage-daemon" \ + "${pkgdir}/usr/lib/xen/bin/qemu-nbd" \ + "${pkgdir}/usr/lib/xen/bin/qemu-io" \ + "${pkgdir}/usr/lib/xen/bin/qemu-img" \ + "${pkgdir}/usr/lib/xen/bin/qemu-system-i386" \ + "${pkgdir}/usr/lib/xen/libexec/virtiofsd" \ + "${pkgdir}/usr/lib/xen/libexec/qemu-bridge-helper" \ + "${pkgdir}/usr/lib/xen/libexec/virtfs-proxy-helper" + + fi + + } -package_xen-docs(){ - _makevars_package=("${_makevars[@]}" DESTDIR="$pkgdir") - pkgdesc='Xen virtual machine hypervisor documentation' - arch=('any') - depends=() - cd "$_pkgname-$_pkgver/" - make "${_makevars_package[@]}" install-docs +package_xen-docs() { + pkgdesc="Xen hypervisor documentation and man pages" + arch=("x86_64") # no reason to publish this package to 32-bit repos + cd "${pkgbase}-${pkgver}" + make "${_common_make_flags[@]}" DESTDIR="$pkgdir" install-docs } -package_xen-syms(){ - _makevars_package=("${_makevars[@]}" DESTDIR="$pkgdir") - pkgdesc='Xen virtual machine hypervisor debugging symbols' - arch=('any') - depends=() - _installdir="${pkgdir}/usr/lib/debug" - cd "$_pkgname-$_pkgver/" - install -d -m0755 "$_installdir" - for _path in $(find xen -type f \( -name '*-syms' -or -name '*\.map' \)); do - _file=$(basename "$_path") - _installfile=$(echo "$_file" | - sed "s/\([^.]*\)\(\.*\)/\1-${_pkgver}\2/" ) - install -D -m0644 -p "$_path" "$_installdir/$_installfile" - done + +package_xen-stubdom() { + pkgdesc="Xen hypervisor stubdom files" + arch=("x86_64") + depends=("xen") + + cd "${srcdir}/${pkgbase}-${pkgver}/stubdom" + make DESTDIR="${pkgdir}" install } + +package_xen-qemu-builtin() { + pkgdesc="Xen hypervisor QEMU components" + arch=("x86_64") + depends=("xen") + + cd "${srcdir}/${pkgbase}-${pkgver}/tools/qemu-xen-build" + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/xen/ati-passthrough.patch b/pcr/xen/ati-passthrough.patch deleted file mode 100644 index 7c20b1ecd..000000000 --- a/pcr/xen/ati-passthrough.patch +++ /dev/null @@ -1,415 +0,0 @@ ---- xen-4.3.1/tools/qemu-xen-traditional/hw/pass-through.c Thu Sep 6 11:05:30 2012 -+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pass-through.c Sat Nov 24 08:27:07 2012 -@@ -1438,9 +1438,17 @@ static void pt_ioport_map(PCIDevice *d, - if (e_phys != -1) - { - /* Create new mapping */ -- ret = xc_domain_ioport_mapping(xc_handle, domid, e_phys, -- assigned_device->bases[i].access.pio_base, e_size, -- DPCI_ADD_MAPPING); -+ if ( vga_skip_ioport_map(d) ) -+ { -+ assigned_device->bases[i].e_physbase = -1; -+ } -+ else -+ { -+ ret = xc_domain_ioport_mapping(xc_handle, domid, e_phys, -+ assigned_device->bases[i].access.pio_base, e_size, -+ DPCI_ADD_MAPPING); -+ } -+ - if ( ret != 0 ) - { - PT_LOG("Error: create new mapping failed!\n"); ---- xen-4.3.1/tools/qemu-xen-traditional/hw/pass-through.h Thu Sep 6 11:05:30 2012 -+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pass-through.h Sat Nov 24 08:27:07 2012 -@@ -419,6 +419,11 @@ int pt_pci_host_write(struct pci_dev *pc - void intel_pch_init(PCIBus *bus); - int register_vga_regions(struct pt_dev *real_device); - int unregister_vga_regions(struct pt_dev *real_device); -+int vga_skip_ioport_map(PCIDevice *d); -+int igd_register_vga_regions(struct pt_dev *real_device); -+int igd_unregister_vga_regions(struct pt_dev *real_device); -+int ati_register_vga_regions(struct pt_dev *real_device); -+int ati_unregister_vga_regions(struct pt_dev *real_device); - int setup_vga_pt(struct pt_dev *real_device); - PCIBus *intel_pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, - uint16_t did, const char *name, uint16_t revision); ---- xen-4.3.1/tools/qemu-xen-traditional/hw/pci.h Thu Sep 6 11:05:30 2012 -+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pci.h Sat Nov 24 08:27:07 2012 -@@ -54,6 +54,8 @@ extern target_phys_addr_t pci_mem_base; - - #define PCI_VENDOR_ID_CIRRUS 0x1013 - -+#define PCI_VENDOR_ID_ATI 0x1002 -+ - #define PCI_VENDOR_ID_IBM 0x1014 - #define PCI_DEVICE_ID_IBM_OPENPIC2 0xffff - ---- xen-4.3.1/tools/qemu-xen-traditional/hw/pt-graphics.c Thu Sep 6 11:05:30 2012 -+++ xen-4.3.1-new/tools/qemu-xen-traditional/hw/pt-graphics.c Sat Nov 24 08:28:10 2012 -@@ -13,6 +13,207 @@ - - extern int gfx_passthru; - extern int igd_passthru; -+/*********************************/ -+/* Code for ATI GFX Passthru */ -+/*********************************/ -+/* ATI VBIOS Working Mechanism -+ * -+ * Generally there are three memory resources (two MMIO and one PIO) -+ * associated with modern ATI gfx. VBIOS uses special tricks to figure out -+ * BARs, instead of using regular PCI config space read. -+ * -+ * (1) VBIOS relies on I/O port 0x3C3 to retrieve PIO BAR -+ * (2) VBIOS maintains a shadow copy of PCI configure space. It retries the -+ * MMIO BARs from this shadow copy via sending I/O requests to first two -+ * registers of PIO (MMINDEX and MMDATA). The workflow is like this: -+ * MMINDEX (register 0) is written with an index value, specifying the -+ * register VBIOS wanting to access. Then the shadowed data can be -+ * read/written from MMDATA (register 1). For two MMIO BARs, the index -+ * values are 0x4010 and 0x4014 respectively. -+ * -+ */ -+ -+#define ATI_BAR1_INDEX 0 //MMIO BAR1 -+#define ATI_BAR2_INDEX 1 //MMIO BAR2 -+#define ATI_BAR5_INDEX 4 //PIO BAR == BAR5 -+ -+#define ATI_BAR1_MMINDEX 0x4010 //data written to MMINDEX for MMIO BAR1 -+#define ATI_BAR2_MMINDEX 0x4014 //data written to MMINDEX FOR MMIO BAR2 -+ -+struct ati_gfx_info { -+ int initialized; /* initialized already? */ -+ -+ /* PIO */ -+ uint32_t host_pio_base; /* host base addr of PIO */ -+ uint32_t guest_pio_base; /* guest base addr of PIO */ -+ uint32_t pio_size; /* PIO size */ -+ -+ /* MMIO */ -+ uint32_t guest_mmio_base1; /* guest base addr of MMIO 1 */ -+ uint32_t guest_mmio_base2; /* guest base addr of MMIO 2 */ -+ -+ /* PIO MMINDEX access recording */ -+ uint32_t pre_mmindex_data; /* previous data written to MMINDEX */ -+}; -+ -+static struct ati_gfx_info gfx_info; -+ -+/* Convert guest PIO port to host PIO port */ -+static uint16_t gport_to_hport(uint16_t gport) -+{ -+ return (gport - gfx_info.guest_pio_base) + gfx_info.host_pio_base; -+} -+ -+/* Read host PIO port */ -+static uint32_t ati_hw_in(uint16_t hport) -+{ -+ unsigned val; -+ -+ //iopl(3); -+ asm volatile ("in %1,%0":"=a"(val):"Nd"(hport)); -+ //iopl(0); -+ -+ return val; -+} -+ -+/* Write data to host PIO */ -+static void ati_hw_out(uint16_t hport, uint32_t data) -+{ -+ //iopl(3); -+ asm volatile ("out %1, %0"::"Nd"(hport),"a"(data)); -+ //iopl(0); -+} -+ -+static uint32_t ati_io_regs_read(void *opaque, uint32_t addr) -+{ -+ uint32_t val; -+ -+ val = ati_hw_in(gport_to_hport(addr)); -+ -+ /* tweak the value if VBIOS is reading MMIO BAR1 and BAR2 */ -+ if ( addr == (gfx_info.guest_pio_base + 4) ) -+ { -+ switch ( gfx_info.pre_mmindex_data ) -+ { -+ case ATI_BAR1_MMINDEX: -+ val = gfx_info.guest_mmio_base1 | (val & 0x0000000f); -+ break; -+ case ATI_BAR2_MMINDEX: -+ val = gfx_info.guest_mmio_base2 | (val & 0x0000000f); -+ break; -+ default: -+ break; -+ } -+ } -+ -+ return val; -+} -+ -+static void ati_io_regs_write(void *opaque, uint32_t addr, uint32_t val) -+{ -+ ati_hw_out(gport_to_hport(addr), val); -+ -+ /* book keeping */ -+ if ( addr == gfx_info.guest_pio_base ) -+ gfx_info.pre_mmindex_data = val; -+} -+ -+static void ati_gfx_init(struct pt_dev *assigned) -+{ -+ PCIDevice *dev = (PCIDevice *)&assigned->dev; -+ -+ register_ioport_read(dev->io_regions[ATI_BAR5_INDEX].addr, -+ dev->io_regions[ATI_BAR5_INDEX].size, 4, ati_io_regs_read, assigned); -+ -+ register_ioport_write(dev->io_regions[ATI_BAR5_INDEX].addr, -+ dev->io_regions[ATI_BAR5_INDEX].size, 4, ati_io_regs_write, assigned); -+ -+ /* initialize IO registers */ -+ gfx_info.guest_pio_base = dev->io_regions[ATI_BAR5_INDEX].addr; -+ gfx_info.pio_size = dev->io_regions[ATI_BAR5_INDEX].size; -+ gfx_info.host_pio_base = assigned->bases[ATI_BAR5_INDEX].access.pio_base; -+ -+ gfx_info.guest_mmio_base1 = dev->io_regions[ATI_BAR1_INDEX].addr; -+ gfx_info.guest_mmio_base2 = dev->io_regions[ATI_BAR2_INDEX].addr; -+ gfx_info.initialized = 1; -+ -+ PT_LOG("guest_pio_bar = 0x%x, host_pio_bar = 0x%x, pio_size=0x%x " -+ "guest_mmio_bar1=0x%x, guest_mmio_bar2=0x%x\n", -+ gfx_info.guest_pio_base, gfx_info.host_pio_base, gfx_info.pio_size, -+ gfx_info.guest_mmio_base1, gfx_info.guest_mmio_base2); -+} -+ -+static uint32_t ati_legacy_io_read(void *opaque, uint32_t addr) -+{ -+ struct pt_dev *assigned_device = opaque; -+ PCIDevice *dev = (PCIDevice *)&assigned_device->dev; -+ uint32_t val = 0xFF; -+ -+ switch( addr ) -+ { -+ case 0x3c3: -+ val = dev->io_regions[ATI_BAR5_INDEX].addr >> 8; -+ /* Intercept GFX IO registers. This supposes to happen in -+ * ati_register_vga_regions(). But we cannot get guest phys IO BAR -+ * over there. */ -+ if ( !gfx_info.initialized ) -+ ati_gfx_init(assigned_device); -+ break; -+ default: -+ PT_LOG("ERROR: port 0x%x I/O read not handled\n", addr); -+ break; -+ } -+ -+ return val; -+} -+ -+static void ati_legacy_io_write(void *opaque, uint32_t addr, uint32_t val) -+{ -+ PT_LOG("ERROR: port 0x%x I/O write not handled\n", addr); -+} -+ -+int ati_register_vga_regions(struct pt_dev *real_device) -+{ -+ PCIDevice *dev = (PCIDevice *)&real_device->dev; -+ int ret = 0; -+ -+ /* We need to intercept VBIOS accesses to port 0x3C3, which returns -+ * device port I/O BAR. For the rest of legacy I/O ports, we allow direct -+ * accesses. -+ */ -+ ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0, -+ 0x3C0, 0x3, DPCI_ADD_MAPPING); -+ -+ ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C4, -+ 0x3C4, 0x1C, DPCI_ADD_MAPPING); -+ -+ register_ioport_read(0x3c3, 1, 1, ati_legacy_io_read, real_device); -+ register_ioport_write(0x3c3, 1, 1, ati_legacy_io_write, real_device); -+ -+ /* initialized on the first port 0x3C3 access in ati_gfx_init */ -+ gfx_info.initialized = 0; -+ -+ return ret; -+} -+ -+int ati_unregister_vga_regions(struct pt_dev *real_device) -+{ -+ int ret = 0; -+ -+ ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0, -+ 0x3C0, 0x3, DPCI_REMOVE_MAPPING); -+ -+ ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C4, -+ 0x3C4, 0x1C, DPCI_REMOVE_MAPPING); -+ -+ gfx_info.initialized = 0; -+ -+ return ret; -+} -+ -+/*********************************/ -+/* Code for Intel IGD Passthru */ -+/*********************************/ - - static uint32_t igd_guest_opregion = 0; - -@@ -176,6 +377,77 @@ read_default: - return pci_default_read_config(pci_dev, config_addr, len); - } - -+int igd_register_vga_regions(struct pt_dev *real_device) -+{ -+ u32 vendor_id, igd_opregion; -+ int ret = 0; -+ -+ /* legacy I/O ports 0x3C0 -- 0x3E0 */ -+ ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0, -+ 0x3C0, 0x20, DPCI_ADD_MAPPING); -+ -+ /* 1:1 map ASL Storage register value */ -+ vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2); -+ igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4); -+ if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_opregion ) -+ { -+ ret |= xc_domain_memory_mapping(xc_handle, domid, -+ igd_opregion >> XC_PAGE_SHIFT, -+ igd_opregion >> XC_PAGE_SHIFT, -+ 2, -+ DPCI_ADD_MAPPING); -+ PT_LOG("register_vga: igd_opregion = %x\n", igd_opregion); -+ } -+ -+ return ret; -+} -+ -+int igd_unregister_vga_regions(struct pt_dev *real_device) -+{ -+ u32 vendor_id, igd_opregion; -+ int ret = 0; -+ -+ ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0, -+ 0x3C0, 0x20, DPCI_REMOVE_MAPPING); -+ -+ vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2); -+ igd_opregion = pt_pci_host_read(real_device->pci_dev, PCI_INTEL_OPREGION, 4); -+ if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_opregion ) -+ { -+ ret |= xc_domain_memory_mapping(xc_handle, domid, -+ igd_opregion >> XC_PAGE_SHIFT, -+ igd_opregion >> XC_PAGE_SHIFT, -+ 2, -+ DPCI_REMOVE_MAPPING); -+ } -+ -+ return ret; -+} -+/*********************************/ -+/* Generic Code for GFX Passthru */ -+/*********************************/ -+/* This function decides whether I/O port map should be skipped */ -+int vga_skip_ioport_map(PCIDevice *d) -+{ -+ struct pt_dev *dev = (struct pt_dev *)d; -+ int skip = 0; -+ -+ if ( !gfx_passthru || dev->pci_dev->device_class != 0x0300 ) -+ return 0; -+ -+ switch( dev->pci_dev->vendor_id ) -+ { -+ case PCI_VENDOR_ID_ATI: -+ case PCI_VENDOR_ID_AMD: -+ skip = 1; -+ break; -+ default: -+ skip = 0; -+ break; -+ } -+ -+ return skip; -+} - /* - * register VGA resources for the domain with assigned gfx - */ -@@ -187,18 +459,33 @@ int register_vga_regions(struct pt_dev * - if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 ) - return ret; - -+ /* legacy I/O ports 0x3B0 - 0x3BC */ - ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3B0, - 0x3B0, 0xC, DPCI_ADD_MAPPING); - -- ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0, -- 0x3C0, 0x20, DPCI_ADD_MAPPING); -- -+ /* legacy video MMIO range 0xA0000 - 0xBFFFF */ - ret |= xc_domain_memory_mapping(xc_handle, domid, - 0xa0000 >> XC_PAGE_SHIFT, - 0xa0000 >> XC_PAGE_SHIFT, - 0x20, - DPCI_ADD_MAPPING); - -+ /* Other VGA regions are vendor specific */ -+ switch( real_device->pci_dev->vendor_id ) -+ { -+ case PCI_VENDOR_ID_INTEL: -+ ret = igd_register_vga_regions(real_device); -+ break; -+ case PCI_VENDOR_ID_ATI: -+ case PCI_VENDOR_ID_AMD: -+ ret = ati_register_vga_regions(real_device); -+ break; -+ default: -+ PT_LOG("gfx card wasn't supported by Xen passthru!\n"); -+ ret = 1; -+ break; -+ } -+ - if ( ret != 0 ) - PT_LOG("VGA region mapping failed\n"); - -@@ -216,26 +503,31 @@ int unregister_vga_regions(struct pt_dev - if ( !gfx_passthru || real_device->pci_dev->device_class != 0x0300 ) - return ret; - -+ /* legacy I/O ports 0x3B0 - 0x3BC */ - ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3B0, - 0x3B0, 0xC, DPCI_REMOVE_MAPPING); - -- ret |= xc_domain_ioport_mapping(xc_handle, domid, 0x3C0, -- 0x3C0, 0x20, DPCI_REMOVE_MAPPING); -- -+ /* legacy video MMIO range 0xA0000 - 0xBFFFF */ - ret |= xc_domain_memory_mapping(xc_handle, domid, - 0xa0000 >> XC_PAGE_SHIFT, - 0xa0000 >> XC_PAGE_SHIFT, - 20, - DPCI_REMOVE_MAPPING); - -- vendor_id = pt_pci_host_read(real_device->pci_dev, PCI_VENDOR_ID, 2); -- if ( (vendor_id == PCI_VENDOR_ID_INTEL) && igd_guest_opregion ) -+ /* Other VGA regions are vendor specific */ -+ switch( real_device->pci_dev->vendor_id ) - { -- ret |= xc_domain_memory_mapping(xc_handle, domid, -- igd_guest_opregion >> XC_PAGE_SHIFT, -- igd_guest_opregion >> XC_PAGE_SHIFT, -- 2, -- DPCI_REMOVE_MAPPING); -+ case PCI_VENDOR_ID_INTEL: -+ ret = igd_unregister_vga_regions(real_device); -+ break; -+ case PCI_VENDOR_ID_ATI: -+ case PCI_VENDOR_ID_AMD: -+ ret = ati_unregister_vga_regions(real_device); -+ break; -+ default: -+ PT_LOG("gfx card wasn't supported by Xen passthru!\n"); -+ ret = 1; -+ break; - } - - if ( ret != 0 ) diff --git a/pcr/xen/efi-xen.cfg b/pcr/xen/efi-xen.cfg index d9f61958a..16b0b5bd5 100644 --- a/pcr/xen/efi-xen.cfg +++ b/pcr/xen/efi-xen.cfg @@ -3,5 +3,6 @@ default=xen [xen] options=console=vga dom0_mem=1024M,max:1024M dom0_max_vcpus=4 loglvl=all noreboot -kernel=vmlinuz-linux-libre root=<Root Device> rw -ramdisk=initramfs-linux-libre.img +kernel=vmlinuz-linux root=<Root Device> rw +ramdisk=initramfs-linux.img +ucode=<extracted microcode file> diff --git a/pcr/xen/patch-ovmf-use-python2.patch b/pcr/xen/patch-ovmf-use-python2.patch deleted file mode 100644 index b52b9230c..000000000 --- a/pcr/xen/patch-ovmf-use-python2.patch +++ /dev/null @@ -1,22 +0,0 @@ -Subject: [PATCH] Fix ovmf, use python2 - ---- - tools/firmware/Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile -index b840c6a..a5a6802 100644 ---- a/tools/firmware/Makefile -+++ b/tools/firmware/Makefile -@@ -17,6 +17,8 @@ LD32BIT-$(CONFIG_FreeBSD) := LD32BIT_FLAG=-melf_i386_fbsd - - ovmf-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir -+ sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/BinWrappers/PosixLike"/* || true -+ sed 's|python |python2 |g' -i "ovmf-dir/BaseTools/Tests/GNUmakefile" - cp ovmf-makefile ovmf-dir/Makefile; - - seabios-dir: --- -2.13.0 - diff --git a/pcr/xen/tmpfiles.d-xen.conf b/pcr/xen/tmpfiles.conf index a55258b0f..a55258b0f 100644 --- a/pcr/xen/tmpfiles.d-xen.conf +++ b/pcr/xen/tmpfiles.conf diff --git a/pcr/xen/xen-amd-ucode.hook b/pcr/xen/xen-amd-ucode.hook new file mode 100644 index 000000000..8e56e98dc --- /dev/null +++ b/pcr/xen/xen-amd-ucode.hook @@ -0,0 +1,12 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = boot/amd-ucode.img + +[Action] +Description = Extracting AMD microcode for Xen EFI... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/xen-ucode-extract.sh + diff --git a/pcr/xen/xen-intel-ucode.hook b/pcr/xen/xen-intel-ucode.hook new file mode 100644 index 000000000..c7013ff5c --- /dev/null +++ b/pcr/xen/xen-intel-ucode.hook @@ -0,0 +1,12 @@ +[Trigger] +Type = Path +Operation = Install +Operation = Upgrade +Operation = Remove +Target = boot/intel-ucode.img + +[Action] +Description = Extracting Intel microcode for Xen EFI... +When = PostTransaction +Exec = /usr/share/libalpm/scripts/xen-ucode-extract.sh + diff --git a/pcr/xen/xen-ucode-extract.sh b/pcr/xen/xen-ucode-extract.sh new file mode 100644 index 000000000..7f8379d67 --- /dev/null +++ b/pcr/xen/xen-ucode-extract.sh @@ -0,0 +1,37 @@ +#!/bin/bash -e + + +do_firmware() { + + if [ "$1" == "intel" ]; then + UCODE_RD="/boot/intel-ucode.img" + XEN_EFI_UCODE="/boot/xen-efi-intel-ucode.bin" + UCODE_ORIG_BIN="kernel/x86/microcode/GenuineIntel.bin" + elif [ "$1" == "amd" ]; then + UCODE_RD="/boot/amd-ucode.img" + XEN_EFI_UCODE="/boot/xen-efi-amd-ucode.bin" + UCODE_ORIG_BIN="kernel/x86/microcode/AuthenticAMD.bin" + fi + + # remove old file + if [ -f $XEN_EFI_UCODE ]; then + rm $XEN_EFI_UCODE + fi + + # create new file + if [ -f $UCODE_RD ]; then + bsdtar -Oxf $UCODE_RD $UCODE_ORIG_BIN > $XEN_EFI_UCODE || exit 1 + fi + + +} + +if [ -f "/boot/intel-ucode.img" ]; then + do_firmware "intel" +fi + +if [ -f "/boot/amd-ucode.img" ]; then + do_firmware "amd" +fi + +exit 0 diff --git a/pcr/xen/xen.conf b/pcr/xen/xen.conf new file mode 100644 index 000000000..37a5b59f7 --- /dev/null +++ b/pcr/xen/xen.conf @@ -0,0 +1,19 @@ +xen-evtchn +xen-gntdev +xen-gntalloc +xen-blkback +xen-netback +xen-pciback +xen-acpi-processor +## xen-acpi-processor: This module may not work on all machines; try removing this first if it causes issues. + +## The following were included in xencommons, but were not inserted by systemd: +# evtchn +# gntdev +# netbk +# blkbk +# xen-scsibk +# usbbk +# pciback +# blktap2 +# blktap diff --git a/pcr/xen/xen.install b/pcr/xen/xen.install index 2c03573e7..2a053c9f7 100644 --- a/pcr/xen/xen.install +++ b/pcr/xen/xen.install @@ -1,140 +1,61 @@ -xen_boot() { - cat << __EOF__ -You are not running xen unless you boot xen. -Possible Xen boot paths: -EFI boot -> grubx64.efi -> multiboot2 -> [xen.gz, vmlinuz, ramdisk] -BIOS boot -> grub -> multiboot(2) -> [xen.gz, vmlinuz, ramdisk] - -EFI boot -> xen.efi - -########## -grub multiboot2 preparation: -Install grub: https://wiki.parabola.nu/index.php/GRUB - -At this time, some modifications are needed to 20_linux_xen. -These are included in this package as 21_linux_xen - -Set the values needed for your configuration in /etc/default/grub -Detailed here: https://www.gnu.org/software/grub/manual/html_node/Simple-configuration.html -Needed: -GRUB_CMDLINE_XEN -GRUB_CMDLINE_LINUX_XEN_REPLACE -These values are not required but can be used; they are appended to the previous values, then this is used for the non-recovery (default) entry: -GRUB_CMDLINE_XEN_DEFAULT -GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT - -run grub-mkconfig - -To boot xen as default: -suggested: inspect and use this config to boot with. Check if the xen entry works as expected -find the id of the xen entry and set this as DEFAULT in /etc/default/grub. -This may look something like: -GRUB_DEFAULT="xen-gnulinux-simple-a-unique-id-from-your-grub-goes-here" - -run grub-mkconfig - -########## -Direct EFI boot preperation: -Create a xen.cfg file in the same directory as xen.efi. -These need to be in ESP, or in a directory accessible from you EFI bootloader. -Put settings relevant to your system into xen.cfg -Detailed here: https://xenbits.xen.org/docs/4.9-testing/misc/efi.html -Needed: -kernel -ramdisk -Add the xen.efi file to your EFI bootloader (such as Refind). -And / or add the xen.efi file to you EFI boot options (efibootmgr). -__EOF__ -} - install_msg() { - cat << __EOF__ -===> IMPORTANT NOTICES: + cat << __EOF__ + Bunch of Xen Notes: https://wiki.archlinux.org/index.php/Xen -In order to complete the installation, and enable Xen, -at the very least you must: + If booting via efi, copy the example /etc/xen/efi-xen.cfg to /boot/xen.cfg + and edit the contents to match the settings you need. -1. Configure your bootloader to boot Xen: -__EOF__ - xen_boot - cat << __EOF__ -2. Issue the following commands to allow you to create and start VMs: + To make dom0 go: systemctl enable xen-qemu-dom0-disk-backend.service systemctl enable xen-init-dom0.service systemctl enable xenconsoled.service - Other optional services are: + Optional services are: systemctl enable xen-watchdog.service -3. If you want some domains to automatically start up/shutdown, run the following: + To start domains on boot: systemctl enable xendomains.service -For more information refer to the Wiki: - https://wiki.parabola.nu/index.php/Xen __EOF__ -} -upgrade_msg() { - cat << __EOF__ -Xen 4.9 -Release notes -http://wiki.xen.org/wiki/Xen_Project_4.9_Release_Notes -Feature list -http://wiki.xen.org/wiki/Xen_Project_4.9_Feature_List -__EOF__ -} -upgrade_msg_grub_multiboot2() { - cat << __EOF__ -########## -Xen 4.9 can now use grub>=2.02 multiboot2. -If you previously booted using xen.efi, you have an alternative. -If you previously relied on the packaged 09_xen for grub-mkconfig: -It is now removed. -You will need to do the following under grub multiboot2 preparation: -########## -__EOF__ - xen_boot } + post_install() { - install_msg - upgrade_msg - systemd-tmpfiles --create + install_msg + systemd-tmpfiles --create + /usr/share/libalpm/scripts/xen-ucode-extract.sh } post_upgrade() { - if [[ "$2" < 4.9.0 || "$2" == *'4.9.0rc'* ]]; then - upgrade_msg - fi - if [[ "$2" < 4.9.0 || "$2" == *'4.9.0rc'* ]]; then - upgrade_msg_grub_multiboot2 - fi - systemd-tmpfiles --create + systemd-tmpfiles --create + /usr/share/libalpm/scripts/xen-ucode-extract.sh } pre_remove() { - systemctl stop xendomains.service - systemctl stop xen-watchdog.service - systemctl stop xenconsoled.service - systemctl stop xen-init-dom0.service - systemctl stop xen-qemu-dom0-disk-backend.service - - systemctl disable xendomains.service - systemctl disable xen-watchdog.service - systemctl disable xenconsoled.service - systemctl disable xen-init-dom0.service - systemctl disable xen-qemu-dom0-disk-backend.service + systemctl stop xendomains.service + systemctl stop xen-watchdog.service + systemctl stop xenconsoled.service + systemctl stop xen-init-dom0.service + systemctl stop xen-qemu-dom0-disk-backend.service + + systemctl disable xendomains.service + systemctl disable xen-watchdog.service + systemctl disable xenconsoled.service + systemctl disable xen-init-dom0.service + systemctl disable xen-qemu-dom0-disk-backend.service + + echo "Be sure to check boot for auto-generated microcode files." } post_remove() { - cat << __EOF__ -===> IMPORTANT NOTICE: + cat << __EOF__ In order to finish removing Xen, you will need to modify -your bootloader configuration files to load your Linux-libre +your bootloader configuration files to load your Linux kernel instead of Xen kernel. __EOF__ } diff --git a/pcr/xen/xsa393.patch b/pcr/xen/xsa393.patch new file mode 100644 index 000000000..57af36bae --- /dev/null +++ b/pcr/xen/xsa393.patch @@ -0,0 +1,49 @@ +From 7ff58ab770157a03c92604155a0c745bcab834c2 Mon Sep 17 00:00:00 2001 +From: Julien Grall <jgrall@amazon.com> +Date: Tue, 14 Dec 2021 09:53:44 +0000 +Subject: [PATCH] xen/arm: p2m: Always clear the P2M entry when the mapping is + removed + +Commit 2148a125b73b ("xen/arm: Track page accessed between batch of +Set/Way operations") allowed an entry to be invalid from the CPU PoV +(lpae_is_valid()) but valid for Xen (p2m_is_valid()). This is useful +to track which page is accessed and only perform an action on them +(e.g. clean & invalidate the cache after a set/way instruction). + +Unfortunately, __p2m_set_entry() is only zeroing the P2M entry when +lpae_is_valid() returns true. This means the entry will not be zeroed +if the entry was valid from Xen PoV but invalid from the CPU PoV for +tracking purpose. + +As a consequence, this will allow a domain to continue to access the +page after it was removed. + +Resolve the issue by always zeroing the entry if it the LPAE bit is +set or the entry is about to be removed. + +This is CVE-2022-23033 / XSA-393. + +Reported-by: Dmytro Firsov <Dmytro_Firsov@epam.com> +Fixes: 2148a125b73b ("xen/arm: Track page accessed between batch of Set/Way operations") +Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> +Signed-off-by: Julien Grall <jgrall@amazon.com> +--- + xen/arch/arm/p2m.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c +index 8b20b430777e..fb71fa4c1c90 100644 +--- a/xen/arch/arm/p2m.c ++++ b/xen/arch/arm/p2m.c +@@ -1016,7 +1016,7 @@ static int __p2m_set_entry(struct p2m_domain *p2m, + * sequence when updating the translation table (D4.7.1 in ARM DDI + * 0487A.j). + */ +- if ( lpae_is_valid(orig_pte) ) ++ if ( lpae_is_valid(orig_pte) || removing_mapping ) + p2m_remove_pte(entry, p2m->clean_pte); + + if ( removing_mapping ) +-- +2.32.0 + diff --git a/pcr/xen/xsa394.patch b/pcr/xen/xsa394.patch new file mode 100644 index 000000000..1704c5b08 --- /dev/null +++ b/pcr/xen/xsa394.patch @@ -0,0 +1,63 @@ +From a8bdee7a30d0cd13341d2ca1753569b171daf5b8 Mon Sep 17 00:00:00 2001 +From: Julien Grall <jgrall@amazon.com> +Date: Fri, 19 Nov 2021 11:27:47 +0000 +Subject: [PATCH] xen/grant-table: Only decrement the refcounter when grant is + fully unmapped + +The grant unmapping hypercall (GNTTABOP_unmap_grant_ref) is not a +simple revert of the changes done by the grant mapping hypercall +(GNTTABOP_map_grant_ref). + +Instead, it is possible to partially (or even not) clear some flags. +This will leave the grant is mapped until a future call where all +the flags would be cleared. + +XSA-380 introduced a refcounting that is meant to only be dropped +when the grant is fully unmapped. Unfortunately, unmap_common() will +decrement the refcount for every successful call. + +A consequence is a domain would be able to underflow the refcount +and trigger a BUG(). + +Looking at the code, it is not clear to me why a domain would +want to partially clear some flags in the grant-table. But as +this is part of the ABI, it is better to not change the behavior +for now. + +Fix it by checking if the maptrack handle has been released before +decrementing the refcounting. + +This is CVE-2022-23034 / XSA-394. + +Fixes: 9781b51efde2 ("gnttab: replace mapkind()") +Signed-off-by: Julien Grall <jgrall@amazon.com> +Reviewed-by: Jan Beulich <jbeulich@suse.com> +--- + xen/common/grant_table.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c +index 0262f2c48af8..ed1e2fabcea6 100644 +--- a/xen/common/grant_table.c ++++ b/xen/common/grant_table.c +@@ -1488,8 +1488,15 @@ unmap_common( + if ( put_handle ) + put_maptrack_handle(lgt, op->handle); + +- /* See the respective comment in map_grant_ref(). */ +- if ( rc == GNTST_okay && ld != rd && gnttab_need_iommu_mapping(ld) ) ++ /* ++ * map_grant_ref() will only increment the refcount (and update the ++ * IOMMU) once per mapping. So we only want to decrement it once the ++ * maptrack handle has been put, alongside the further IOMMU update. ++ * ++ * For the second and third check, see the respective comment in ++ * map_grant_ref(). ++ */ ++ if ( put_handle && ld != rd && gnttab_need_iommu_mapping(ld) ) + { + void **slot; + union maptrack_node node; +-- +2.32.0 + diff --git a/pcr/xen/xsa395.patch b/pcr/xen/xsa395.patch new file mode 100644 index 000000000..13b731102 --- /dev/null +++ b/pcr/xen/xsa395.patch @@ -0,0 +1,42 @@ +From 4cc924c3e3a0d53306d08b04720c427d1c298ba8 Mon Sep 17 00:00:00 2001 +From: Julien Grall <jgrall@amazon.com> +Date: Wed, 5 Jan 2022 18:09:20 +0000 +Subject: [PATCH] passthrough/x86: stop pirq iteration immediately in case of + error + +pt_pirq_iterate() will iterate in batch over all the PIRQs. The outer +loop will bail out if 'rc' is non-zero but the inner loop will continue. + +This means 'rc' will get clobbered and we may miss any errors (such as +-ERESTART in the case of the callback pci_clean_dpci_irq()). + +This is CVE-2022-23035 / XSA-395. + +Fixes: c24536b636f2 ("replace d->nr_pirqs sized arrays with radix tree") +Fixes: f6dd295381f4 ("dpci: replace tasklet with softirq") +Signed-off-by: Julien Grall <jgrall@amazon.com> +Signed-off-by: Jan Beulich <jbeulich@suse.com> +Reviewed-by: Roger Pau Monné <roger.pau@citrix.com> +--- + xen/drivers/passthrough/x86/hvm.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/xen/drivers/passthrough/x86/hvm.c b/xen/drivers/passthrough/x86/hvm.c +index 351daafdc9bf..0b37cd145b60 100644 +--- a/xen/drivers/passthrough/x86/hvm.c ++++ b/xen/drivers/passthrough/x86/hvm.c +@@ -732,7 +732,11 @@ int pt_pirq_iterate(struct domain *d, + + pirq = pirqs[i]->pirq; + if ( (pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) ++ { + rc = cb(d, pirq_dpci, arg); ++ if ( rc ) ++ break; ++ } + } + } while ( !rc && ++pirq < d->nr_pirqs && n == ARRAY_SIZE(pirqs) ); + +-- +2.32.0 + diff --git a/pcr/xf86-video-armsoc-git/PKGBUILD b/pcr/xf86-video-armsoc-git/PKGBUILD index 71fe30daa..6551d309c 100644 --- a/pcr/xf86-video-armsoc-git/PKGBUILD +++ b/pcr/xf86-video-armsoc-git/PKGBUILD @@ -1,6 +1,6 @@ # ArmSoc (OMAP + Mali) FrameBuffer driver for Xorg from Linaro. -# Maintainer (Arch ARM): Kevin Mihelich <kevin@archlinuxarm.org> -# Contributor (Arch ARM): Erik Andersson <erik.h.andersson@gmail.com> +# Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org> +# Contributor: Erik Andersson <erik.h.andersson@gmail.com> # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> buildarch=4 diff --git a/pcr/xf86-video-fbturbo-git/PKGBUILD b/pcr/xf86-video-fbturbo-git/PKGBUILD index 3c96b298e..f2047203e 100644 --- a/pcr/xf86-video-fbturbo-git/PKGBUILD +++ b/pcr/xf86-video-fbturbo-git/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch ARM): smotocel69 +# Maintainer (archarm): smotocel69 # Contribuitor (Arch ARM): Georges Discry # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> diff --git a/pcr/xf86-video-omap/PKGBUILD b/pcr/xf86-video-omap/PKGBUILD index 61f5bd946..86af6a129 100644 --- a/pcr/xf86-video-omap/PKGBUILD +++ b/pcr/xf86-video-omap/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch ARM): Kevin Mihelich <kevin@archlinuxarm.org> -# Maintainer (Arch ARM): Mike Brown <mbrown@archlinuxarm.org> +# Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org> +# Maintainer (archarm): Mike Brown <mbrown@archlinuxarm.org> # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> # OMAP FrameBuffer driver for Xorg diff --git a/pcr/xf86-video-omapfb/PKGBUILD b/pcr/xf86-video-omapfb/PKGBUILD index f6701c2a1..a6240ff71 100644 --- a/pcr/xf86-video-omapfb/PKGBUILD +++ b/pcr/xf86-video-omapfb/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch ARM): Kevin Mihelich <kevin@archlinuxarm.org> +# Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org> # Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info> # OMAP FrameBuffer driver for Xorg diff --git a/pcr/xfce-theme-greybird/PKGBUILD b/pcr/xfce-theme-greybird/PKGBUILD index 445fef274..360f91649 100644 --- a/pcr/xfce-theme-greybird/PKGBUILD +++ b/pcr/xfce-theme-greybird/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): M.Reynolds <blackboxnetworkproject@gmail.com> -# Contributor (Arch): Bjoern Franke <bjo at nord-west.org> -# Contributor (Arch): flan_suse +# Maintainer (arch): M.Reynolds <blackboxnetworkproject@gmail.com> +# Contributor: Bjoern Franke <bjo at nord-west.org> +# Contributor: flan_suse # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=xfce-theme-greybird diff --git a/pcr/xfce-theme-manager/PKGBUILD b/pcr/xfce-theme-manager/PKGBUILD index 5c028fbb5..a98136a24 100644 --- a/pcr/xfce-theme-manager/PKGBUILD +++ b/pcr/xfce-theme-manager/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Mario Finelli <mario dot finelli at yahoo dot com> -# Contributor (AUR): Martin F. Schumann <mfs at mfs dot name> +# Maintainer (aur): Mario Finelli <mario dot finelli at yahoo dot com> +# Contributor: Martin F. Schumann <mfs at mfs dot name> # parabola changes and rationale: # no changes. diff --git a/pcr/xfce4-kbdleds-plugin/PKGBUILD b/pcr/xfce4-kbdleds-plugin/PKGBUILD index 5c87a16af..44ad136c2 100644 --- a/pcr/xfce4-kbdleds-plugin/PKGBUILD +++ b/pcr/xfce4-kbdleds-plugin/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Raphael Scholer <rscholer@gmx.de> -# Contributor (AUR): tomberry88 <tomberry@live.it> -# Contributor (AUR): Gour-Gadadhara Dasa <gour@atmarama.net> +# Maintainer (aur): Raphael Scholer <rscholer@gmx.de> +# Contributor: tomberry88 <tomberry@live.it> +# Contributor: Gour-Gadadhara Dasa <gour@atmarama.net> pkgname=xfce4-kbdleds-plugin pkgver=0.0.6 pkgrel=11 diff --git a/pcr/xinetd/PKGBUILD b/pcr/xinetd/PKGBUILD new file mode 100644 index 000000000..daab1e8ea --- /dev/null +++ b/pcr/xinetd/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer (aur): Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Judd <jvinet@zeroflux.org> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> +# Maintainer (artix): artoo <artoo@artixlinux.org> + + +pkgname=xinetd +pkgver=2.3.15.4 +pkgrel=2 +pkgdesc="A secure replacement for inetd" +arch=(armv7h i686 x86_64) +url="https://github.com/openSUSE/xinetd" +license=('custom:xinetd') +depends=('libtirpc') +optdepends=('perl: for xconv.pl script') +backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services') +source=("https://github.com/openSUSE/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" + xinetd.conf + servers + services + xinetd.service) +sha256sums=('2baa581010bc70361abdfa37f121e92aeb9c5ce67f9a71913cebd69359cc9654' + '389a043503b287a1d096444b7da90c5187388a886687129c125135090bc2c86e' + '707a89ec32822f6d146b6ed3d43a38fee909b33d973f6ab7e9742ca8bc9f55f6' + '7f709257b08cb19f0a7066d1de6996bfe7c8c510546d11106512a19a76ccf540' + 'fa9ffd5ecf71e2dbd6e8cf57eb040ff6ea349420707a7f3c7850974774f7a18d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc --without-libwrap + CFLAGS+=' -I/usr/include/tirpc' LDFLAGS+=' -ltirpc' make +} + +package() { + cd $pkgname-$pkgver + make prefix="$pkgdir/usr" sbindir="$pkgdir/usr/bin" sysconfdir="$pkgdir/etc" install + + install -Dm644 "$srcdir"/xinetd.conf "$pkgdir"/etc/xinetd.conf + install -Dm644 "$srcdir"/servers "$pkgdir"/etc/xinetd.d/servers + install -Dm644 "$srcdir"/services "$pkgdir"/etc/xinetd.d/services + + # install systemd files + install -Dm644 "$srcdir"/xinetd.service "$pkgdir"/usr/lib/systemd/system/xinetd.service + # install license + install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT +} diff --git a/pcr/xinetd/servers b/pcr/xinetd/servers new file mode 100644 index 000000000..f064c8d7a --- /dev/null +++ b/pcr/xinetd/servers @@ -0,0 +1,10 @@ +service servers +{ + type = INTERNAL UNLISTED + port = 9099 + socket_type = stream + protocol = tcp + wait = no + disable = yes + only_from = 127.0.0.1 +} diff --git a/pcr/xinetd/services b/pcr/xinetd/services new file mode 100644 index 000000000..4ea304c4f --- /dev/null +++ b/pcr/xinetd/services @@ -0,0 +1,10 @@ +service services +{ + type = INTERNAL UNLISTED + port = 9098 + socket_type = stream + protocol = tcp + wait = no + disable = yes + only_from = 127.0.0.1 +} diff --git a/pcr/xinetd/xinetd b/pcr/xinetd/xinetd new file mode 100644 index 000000000..4b8fa369a --- /dev/null +++ b/pcr/xinetd/xinetd @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/xinetd` +case "$1" in + start) + stat_busy "Starting xinetd" + [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid + if [ $? -gt 0 ]; then + stat_fail + else + echo $PID > /var/run/xinetd.pid + add_daemon xinetd + stat_done + fi + ;; + stop) + stat_busy "Stopping xinetd" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/xinetd.pid + rm_daemon xinetd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/pcr/xinetd/xinetd.conf b/pcr/xinetd/xinetd.conf new file mode 100644 index 000000000..b15d9f649 --- /dev/null +++ b/pcr/xinetd/xinetd.conf @@ -0,0 +1,14 @@ +# +# /etc/xinetd.conf +# + +defaults +{ + instances = 60 + log_type = SYSLOG authpriv + log_on_success = HOST PID + log_on_failure = HOST + cps = 25 30 +} + +includedir /etc/xinetd.d diff --git a/pcr/xinetd/xinetd.service b/pcr/xinetd/xinetd.service new file mode 100644 index 000000000..1c587e291 --- /dev/null +++ b/pcr/xinetd/xinetd.service @@ -0,0 +1,10 @@ +[Unit] +Description=A secure replacement for inetd +After=network.target + +[Service] +ExecStart=/usr/bin/xinetd -dontfork +ExecReload=/bin/kill -HUP $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/pcr/xml2rfc/PKGBUILD b/pcr/xml2rfc/PKGBUILD index 7579e4f57..e11aa3526 100644 --- a/pcr/xml2rfc/PKGBUILD +++ b/pcr/xml2rfc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Arch): milki <milki at rescomp dot berkeley dot edu> +# Maintainer (arch): milki <milki at rescomp dot berkeley dot edu> # Maintainer: André Silva <emulatorman@hyperbola.info> # Contributor: Luke Shumaker <lukeshu@lukeshu.com> diff --git a/pcr/xonotic-data/PKGBUILD b/pcr/xonotic-data/PKGBUILD index 2eb8a1cda..57f50de77 100644 --- a/pcr/xonotic-data/PKGBUILD +++ b/pcr/xonotic-data/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (Arch): Sven-Hendrik Haase <svenstaro@gmail.com> -# Contributor (Arch): Alexander Suhoverhov <cy at ngs dot ru> +# Maintainer (arch): Sven-Hendrik Haase <svenstaro@gmail.com> +# Contributor: Alexander Suhoverhov <cy at ngs dot ru> # This package is in Parabola only for architectures that don't have xonotic in # their feed. Here is the status of xonotic in the various upstream # GNU/Linux distributions Parabola is based on: diff --git a/pcr/xonotic/PKGBUILD b/pcr/xonotic/PKGBUILD index 5fd442c86..219a2aa11 100644 --- a/pcr/xonotic/PKGBUILD +++ b/pcr/xonotic/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (Arch): Sven-Hendrik Haase <svenstaro@gmail.com> -# Contributor (Arch): Alexander Suhoverhov <cy at ngs dot ru> -# Contributor (Arch): Jookia <166291@gmail.com> +# Maintainer (arch): Sven-Hendrik Haase <svenstaro@gmail.com> +# Contributor: Alexander Suhoverhov <cy at ngs dot ru> +# Contributor: Jookia <166291@gmail.com> # This package is in Parabola only for architectures that don't have xonotic in # their feed. Here is the status of xonotic in the various upstream # GNU/Linux distributions Parabola is based on: diff --git a/pcr/xrdp/PKGBUILD b/pcr/xrdp/PKGBUILD deleted file mode 100644 index 1da4186db..000000000 --- a/pcr/xrdp/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Maintainer (Arch): Brian Bidulock <bidulock@openss7.org> -# Contributo (Arch): Jianhui Z <jianhui@outlook.com> -# Contributo (Arch): Tau Tsao <realturner at gmail.com> -# Contributor (Arch): Tomasz Zok <tomasz.zok [at] gmail.com> -# Contributor (Arch): techryda <techryda at silentdome dot com> -# Contributor (Arch): Mathias R. <pu154r@overlinux.org> -# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> -pkgname=xrdp -pkgver=0.9.1 -pkgrel=5 -pkgdesc="An open source remote desktop protocol (RDP) server" -url="https://github.com/neutrinolabs/xrdp" -arch=('i686' 'x86_64' 'armv7h') -license=('Apache') -makedepends=('nasm') -depends=('tigervnc' 'libxrandr' 'lame' 'opus' 'fuse') -backup=('etc/xrdp/sesman.ini' 'etc/xrdp/xrdp.ini') -install="${pkgname}.install" -source=("https://github.com/neutrinolabs/xrdp/releases/download/v${pkgver}/xrdp-${pkgver}.tar.gz" - "arch-config.diff") -md5sums=('111a3a3b7ea01eb62b08c698ab8f8bff' - 'b41c3d596a582d00e83cd55c756e9ee4') - -prepare() { - cd "${pkgname}-${pkgver}" - patch -Np2 -b -z .orig <../arch-config.diff - ./bootstrap -} - -build() { - cd "${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --sbindir=/usr/bin \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-jpeg \ - --enable-tjpeg \ - --enable-fuse \ - --enable-opus \ - --enable-rfxcodec \ - --enable-mp3lame \ - --enable-pixman - make V=0 -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - rm -f "$pkgdir"/etc/xrdp/rsakeys.ini - install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING -} diff --git a/pcr/xrdp/arch-config.diff b/pcr/xrdp/arch-config.diff deleted file mode 100644 index d67e16e77..000000000 --- a/pcr/xrdp/arch-config.diff +++ /dev/null @@ -1,71 +0,0 @@ -diff -up src/xrdp-0.9.1/instfiles/xrdp.service.orig src/xrdp-0.9.1/instfiles/xrdp.service ---- src/xrdp-0.9.1/instfiles/xrdp.service.orig 2016-12-22 10:02:47.000000000 -0700 -+++ src/xrdp-0.9.1/instfiles/xrdp.service 2017-01-07 00:55:16.000000000 -0700 -@@ -6,10 +6,8 @@ After=syslog.target network.target xrdp- - [Service] - Type=forking - PIDFile=/var/run/xrdp.pid --EnvironmentFile=-/etc/sysconfig/xrdp --EnvironmentFile=-/etc/default/xrdp --ExecStart=/usr/sbin/xrdp $XRDP_OPTIONS --ExecStop=/usr/sbin/xrdp $XRDP_OPTIONS --kill -+ExecStart=/usr/bin/xrdp -+ExecStop=/usr/bin/xrdp --kill - - [Install] - WantedBy=multi-user.target -diff -up src/xrdp-0.9.1/instfiles/xrdp-sesman.service.orig src/xrdp-0.9.1/instfiles/xrdp-sesman.service ---- src/xrdp-0.9.1/instfiles/xrdp-sesman.service.orig 2016-12-22 10:02:47.000000000 -0700 -+++ src/xrdp-0.9.1/instfiles/xrdp-sesman.service 2017-01-07 00:55:54.000000000 -0700 -@@ -2,15 +2,13 @@ - Description=xrdp session manager - After=syslog.target network.target - StopWhenUnneeded=true --BindTo=xrdp.service -+BindsTo=xrdp.service - - [Service] - Type=forking - PIDFile=/var/run/xrdp-sesman.pid --EnvironmentFile=-/etc/sysconfig/xrdp --EnvironmentFile=-/etc/default/xrdp --ExecStart=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --ExecStop=/usr/sbin/xrdp-sesman $SESMAN_OPTIONS --kill -+ExecStart=/usr/bin/xrdp-sesman -+ExecStop=/usr/bin/xrdp-sesman --kill - - [Install] - WantedBy=multi-user.target -diff -up src/xrdp-0.9.1/instfiles/xrdp.sh.orig src/xrdp-0.9.1/instfiles/xrdp.sh ---- src/xrdp-0.9.1/instfiles/xrdp.sh.orig 2016-12-22 09:56:24.000000000 -0700 -+++ src/xrdp-0.9.1/instfiles/xrdp.sh 2017-01-07 00:55:16.000000000 -0700 -@@ -17,7 +17,7 @@ - # Description: starts xrdp - ### END INIT INFO - --SBINDIR=/usr/local/sbin -+SBINDIR=/usr/bin - LOG=/dev/null - CFGDIR=/etc/xrdp - -diff -up src/xrdp-0.9.1/sesman/startwm.sh.orig src/xrdp-0.9.1/sesman/startwm.sh ---- src/xrdp-0.9.1/sesman/startwm.sh.orig 2016-12-22 10:02:47.000000000 -0700 -+++ src/xrdp-0.9.1/sesman/startwm.sh 2017-01-07 00:55:16.000000000 -0700 -@@ -8,6 +8,17 @@ wm_start() - export LANG LANGUAGE - fi - -+ # arch user -+ if [ -r ~/.xinitrc ]; then -+ . ~/.xinitrc -+ exit 0 -+ fi -+ # arch -+ if [ -r /etc/X11/xinit/xinitrc ]; then -+ . /etc/X11/xinit/xinitrc -+ exit 0 -+ fi -+ - # debian - if [ -r /etc/X11/Xsession ]; then - . /etc/X11/Xsession diff --git a/pcr/xrdp/xrdp-sesman.service b/pcr/xrdp/xrdp-sesman.service deleted file mode 100644 index c33376ecc..000000000 --- a/pcr/xrdp/xrdp-sesman.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=xrdp session manager -After=syslog.target network.target -StopWhenUnneeded=true - -[Service] -Type=forking -PIDFile=/var/run/xrdp-sesman.pid -ExecStart=/usr/bin/xrdp-sesman -ExecStop=/usr/bin/xrdp-sesman --kill - -[Install] -WantedBy=multi-user.target - diff --git a/pcr/xrdp/xrdp.install b/pcr/xrdp/xrdp.install deleted file mode 100644 index e25056582..000000000 --- a/pcr/xrdp/xrdp.install +++ /dev/null @@ -1,15 +0,0 @@ -post_upgrade() { - if [ ! -e /etc/xrdp/rsakeys.ini ]; then - xrdp-keygen xrdp /etc/xrdp/rsakeys.ini - fi -} - -post_install() { - post_upgrade -} - -pre_remove() { - if [ -f /etc/xrdp/rsakeys.ini ]; then - rm /etc/xrdp/rsakeys.ini - fi -} diff --git a/pcr/xrdp/xrdp.service b/pcr/xrdp/xrdp.service deleted file mode 100644 index 269dff87b..000000000 --- a/pcr/xrdp/xrdp.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=xrdp daemon -Requires=xrdp-sesman.service -After=syslog.target network.target xrdp-sesman.service - -[Service] -Type=forking -PIDFile=/var/run/xrdp.pid -EnvironmentFile=/etc/xrdp/xrdp.ini -ExecStart=/usr/bin/xrdp $XRDP_OPTIONS -ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill - -[Install] -WantedBy=multi-user.target diff --git a/pcr/xsp/PKGBUILD b/pcr/xsp/PKGBUILD index face7e27e..eaba1bd36 100644 --- a/pcr/xsp/PKGBUILD +++ b/pcr/xsp/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 308160 2017-10-17 17:36:56Z jelle $ -# Maintainer (AUR): Daniel Isenmann <daniel@archlinux.org> -# Contributor (AUR): Tobias Kieslich <tobias@justdreams.de> +# Maintainer (aur): Daniel Isenmann <daniel@archlinux.org> +# Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # parabola changes and rationale: diff --git a/pcr/xsynth-dssi/PKGBUILD b/pcr/xsynth-dssi/PKGBUILD index 48f2167b3..3cdf05b4f 100644 --- a/pcr/xsynth-dssi/PKGBUILD +++ b/pcr/xsynth-dssi/PKGBUILD @@ -1,6 +1,6 @@ # $Id$ -# Maintainer (AUR): Sean Bolton musound at jps dot net -# Contributor (AUR): Thomas Karmann <thomas@karmann-paf.de> +# Maintainer (aur): Sean Bolton musound at jps dot net +# Contributor: Thomas Karmann <thomas@karmann-paf.de> # Maintainer: Guest One <theguestone at gmail dot com> pkgname=xsynth-dssi pkgver=0.9.4 diff --git a/pcr/xtables-addons/PKGBUILD b/pcr/xtables-addons/PKGBUILD index f5d4643fd..033c9bd6f 100644 --- a/pcr/xtables-addons/PKGBUILD +++ b/pcr/xtables-addons/PKGBUILD @@ -1,23 +1,33 @@ -# Maintainer (AUR): Shalygin Konstantin <k0ste@k0ste.ru> -# Contributor (AUR): Shalygin Konstantin <k0ste@k0ste.ru> -# Maintainer : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer (aur): Shalygin Konstantin <k0ste@k0ste.ru> +# Contributor: Shalygin Konstantin <k0ste@k0ste.ru> +# Contributor: Aurélien Desbrières <aurelien@hackers.camp> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname='xtables-addons' -pkgver='3.2' -pkgrel='3' +pkgver='3.24' +pkgrel='1' pkgdesc='Xtables-addons is a set of additional extensions for the Xtables packet filter that is present in the Linux kernel' -arch=('i686' 'x86_64') +arch=('armv7h' 'i686' 'x86_64') license=('GPL2') -url="https://${pkgname}.sourceforge.net/" +url="https://inai.de/projects/${pkgname}" depends=('iptables' 'glibc' 'linux') makedepends=('linux-api-headers' 'linux-headers' 'libtool' 'gcc' 'pkg-config') -source=("https://sourceforge.net/projects/${pkgname}/files/Xtables-addons//${pkgname}-${pkgver}.tar.xz") -sha256sums=('006f4e38bbf4b9a9069b90ca78c93b65800e9ebfd17332b713f1f80292420aaa') +source=("https://inai.de/files/${pkgname}/${pkgname}-${pkgver}.tar.xz") +sha256sums=('3e823f71720519ced31c4c7d2bfaf7120d9c01c59a0843dfcbe93c95c64d81c1') +depends=( ${depends[*]/iptables/} ) # 'base' +depends=( ${depends[*]/glibc/} ) # 'base' +makedepends=( ${makedepends[*]/gcc/} ) # 'base-devel' +makedepends=( ${makedepends[*]/libtool/} ) # 'base-devel' +makedepends=( ${makedepends[*]/pkg-config/} ) # 'base-devel' +_kernel=6.5.8 +_kernver=/usr/lib/modules/${_kernel}-*/ +depends=( ${depends[*]/linux/linux-libre=${_kernel}} ) +makedepends=( ${makedepends[*]/linux-headers/linux-libre-headers=${_kernel}} ) prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" - ./autogen.sh + autoreconf -fvi ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -27,7 +37,8 @@ prepare() { --mandir=/usr/share/man \ --docdir=/usr/share/doc \ --libexecdir=/usr/lib/iptables \ - --with-xtlibdir=/usr/lib/xtables + --with-xtlibdir=/usr/lib/xtables \ + --with-kbuild="${_kernver}build" } build() { @@ -36,10 +47,10 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install libtool --finish "${pkgdir}/usr/lib" mv -f "${pkgdir}"/lib/* "${pkgdir}/usr/lib" rmdir "${pkgdir}/lib" - rm "${pkgdir}"/usr/lib/modules/$(uname -r)/modules.* + rm -f ${pkgdir}${_kernver}modules.* } diff --git a/pcr/xteddy/PKGBUILD b/pcr/xteddy/PKGBUILD index dba1c42e2..84e4157e7 100644 --- a/pcr/xteddy/PKGBUILD +++ b/pcr/xteddy/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Gaetan Bisson <bisson@archlinux.org> +# Maintainer (aur): Gaetan Bisson <bisson@archlinux.org> # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 pkgname=xteddy diff --git a/pcr/xwinwrap/PKGBUILD b/pcr/xwinwrap/PKGBUILD index 8780ca009..3efa75cc2 100644 --- a/pcr/xwinwrap/PKGBUILD +++ b/pcr/xwinwrap/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g' -# Maintainer (AUR): Dany Martineau <dany.luc.martineau gmail.com> -# Contributor (AUR): Stefan Clarke <fm0nk3y@yahoo.co.uk> +# Maintainer (aur): chrisl echo archlinux@c2h0r1i2s4t5o6p7h8e9r-l3u4n1a.com|sed 's/[0-9]//g' +# Maintainer (aur): Dany Martineau <dany.luc.martineau gmail.com> +# Contributor: Stefan Clarke <fm0nk3y@yahoo.co.uk> # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 pkgname=xwinwrap diff --git a/pcr/yacy/PKGBUILD b/pcr/yacy/PKGBUILD index e37951ded..b122a558d 100644 --- a/pcr/yacy/PKGBUILD +++ b/pcr/yacy/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (Arch): Nissar Chababy <funilrys at outlook dot com> +# Maintainer (arch): Nissar Chababy <funilrys at outlook dot com> # Ex-Maintainer (Arch): Andreas B. Wagner <AndreasBWagner@pointfree.net> # Ex-Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com> -# Contributor (Arch): Dan Serban -# Contributor (Arch): Florian Richter <Florian_Richter@gmx.de> +# Contributor: Dan Serban +# Contributor: Florian Richter <Florian_Richter@gmx.de> pkgname=yacy pkgver=1.922 diff --git a/pcr/yafaray-blender-exporter/PKGBUILD b/pcr/yafaray-blender-exporter/PKGBUILD index e90151afa..9768e6016 100644 --- a/pcr/yafaray-blender-exporter/PKGBUILD +++ b/pcr/yafaray-blender-exporter/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (AUR): Jeremy Johnathan Rodent <narf@x201t> +# Maintainer (aur): Jeremy Johnathan Rodent <narf@x201t> # Contributor: Márcio Silva <coadde@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index 1e1a4ae70..7abd3b8be 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Jakob Gahde <j5lx@fmail.co.uk> -# Contributor (AUR): Thomas Ascher <thomas.ascher@gmx.at> +# Maintainer (aur): Jakob Gahde <j5lx@fmail.co.uk> +# Contributor: Thomas Ascher <thomas.ascher@gmx.at> # Contributor: Márcio Silva <coadde@hyperbola.info> # parabola changes and rationale: diff --git a/pcr/youtube-dl-gui/PKGBUILD b/pcr/youtube-dl-gui/PKGBUILD deleted file mode 100644 index ddbed9222..000000000 --- a/pcr/youtube-dl-gui/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> -# Contributor: willemw <willemw12@gmail.com> -# Contributor: B4SH-B00STER - -pkgname=youtube-dl-gui -pkgver=0.3.8.e9dff42 -pkgrel=1 -pkgdesc="A cross platform front-end GUI of the popular youtube-dl written in wxPython" -arch=('any') -url="https://github.com/MrS0m30n3/youtube-dl-gui" -license=('custom:UNLICENSE') -depends=('gtk-update-icon-cache' 'python2' 'wxpython') -optdepends=('ffmpeg: convert video files to audio-only files' - 'youtube-dl: alternative to the youtube-dl program file downloaded by youtube-dl-gui') -makedepends=('git') -conflicts=($pkgname-git) -install=$pkgname.install -source=($pkgname::git+$url.git - youtube-dl-gui.desktop) -md5sums=('SKIP' - '298421ed0a9e2c6475e0bb3f86d2d2a7') - -#pkgver() { -# cd $pkgname -# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -#} - -package() { - install -Dm644 youtube-dl-gui.desktop "$pkgdir/usr/share/applications/youtube-dl-gui.desktop" - - cd $pkgname - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - python2 setup.py install --root="$pkgdir" --optimize=1 - - # Patch: add "youtube-dl-gui.png" icon filenames - for dir in "$pkgdir"/usr/share/icons/hicolor/*/apps "$pkgdir/usr/share/pixmaps"; do - cd "$dir" - for icon in youtube-dl-gui_*.png; do - ln -s $icon youtube-dl-gui.png - done - done -} - diff --git a/pcr/youtube-dl-gui/UNLICENSE b/pcr/youtube-dl-gui/UNLICENSE deleted file mode 100644 index 68a49daad..000000000 --- a/pcr/youtube-dl-gui/UNLICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to <http://unlicense.org/> diff --git a/pcr/youtube-dl-gui/youtube-dl-gui.desktop b/pcr/youtube-dl-gui/youtube-dl-gui.desktop deleted file mode 100644 index 04cbdcb81..000000000 --- a/pcr/youtube-dl-gui/youtube-dl-gui.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Youtube-dl GUI -Exec=youtube-dl-gui -Icon=youtube-dl-gui -Categories=Network; -Comment=GUI for youtube-dl downloader diff --git a/pcr/youtube-dl-gui/youtube-dl-gui.install b/pcr/youtube-dl-gui/youtube-dl-gui.install deleted file mode 100644 index 5f3cb0109..000000000 --- a/pcr/youtube-dl-gui/youtube-dl-gui.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/pcr/youtube-dl-qt/PKGBUILD b/pcr/youtube-dl-qt/PKGBUILD deleted file mode 100644 index 47441f880..000000000 --- a/pcr/youtube-dl-qt/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: David P. <megver83@parabola.nu> -# Contributor: Robin de Rooij <rderooij685@gmail.com> - -pkgname=youtube-dl-qt -pkgver=82.g5e87881 -pkgrel=1 -pkgdesc="Qt frontend for youtube-dl" -arch=('x86_64' 'i686') -url="https://github.com/rrooij/youtube-dl-qt" -license=('GPL3') -depends=('qt5-base' 'youtube-dl' 'hicolor-icon-theme') -makedepends=('git' 'make') -optdepends=('ffmpeg: for some youtube-dl functionality') -conflicts=("$pkgname-git") -source=("$pkgname::git+$url.git") -md5sums=('SKIP') - -#pkgver() { -# cd "$srcdir/$_gitname" -# echo "$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)" -#} - -build() { - cd "$srcdir/$pkgname" - qmake -config release - make -} - -package() { - cd "$srcdir/$pkgname" - make INSTALL_ROOT="$pkgdir/" install -} diff --git a/pcr/zcfan/PKGBUILD b/pcr/zcfan/PKGBUILD new file mode 100644 index 000000000..71d5f72fc --- /dev/null +++ b/pcr/zcfan/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer (aur): Chris Down <chris@chrisdown.name> +# Maintainer: Wael Karram <wael@waelk.tech> + + +# parabola changes and rationale: +# - rename upstream source-ball + + +pkgname=zcfan +pkgver=1.3.0 +pkgrel=1 +pkgdesc='Zero-configuration fan control for ThinkPad' +url="https://github.com/cdown/zcfan" +license=('MIT') +arch=('i686' 'x86_64') # could be 'any'; but avoid publishing to non-x86 repos +depends=() +makedepends=() +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cdown/zcfan/archive/refs/tags/${pkgver}.tar.gz) +sha256sums=('2e9ac2b77a79ba0450ee5443b04b0c595d41b8a3ab51a49bdb7c7de20dfb68e9') + +build() { + cd -- "${srcdir?}/$pkgname-$pkgver" + make prefix="/usr" +} + +package() { + cd -- "${srcdir?}/$pkgname-$pkgver" + make prefix="/usr" DESTDIR="$pkgdir/" install +} diff --git a/pcr/zeroinstall-injector/PKGBUILD b/pcr/zeroinstall-injector/PKGBUILD index 9c25180a7..3dee11d63 100644 --- a/pcr/zeroinstall-injector/PKGBUILD +++ b/pcr/zeroinstall-injector/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer (AUR): Tatsuyuki Ishi <ishitatsuyuki at gmail> -# Contributor (AUR): Ben Darwin <bcdarwin at gmail> -# Contributor (AUR): speps <speps at aur dot archlinux dot org> -# Contributor (AUR): Anton Bazhenov <anton.bazhenov at gmail> -# Contributor (AUR): Lone_Wolf <lonewolf@xs4all.nl> +# Maintainer (aur): Tatsuyuki Ishi <ishitatsuyuki at gmail> +# Contributor: Ben Darwin <bcdarwin at gmail> +# Contributor: speps <speps at aur dot archlinux dot org> +# Contributor: Anton Bazhenov <anton.bazhenov at gmail> +# Contributor: Lone_Wolf <lonewolf@xs4all.nl> # parabola changes and rationale: # - added missing makedepends: ocamlbuild ocaml-findlib diff --git a/pcr/zeronet-git/PKGBUILD b/pcr/zeronet-git/PKGBUILD index f57dadc29..882bf34c8 100644 --- a/pcr/zeronet-git/PKGBUILD +++ b/pcr/zeronet-git/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697 -# Maintainer (AUR): redfish <redfish at galactica dot pw> -# Contributori (AUR): Lothar_m <lothar_m at riseup dot net> +# Maintainer (aur): redfish <redfish at galactica dot pw> +# Contributor: Lothar_m <lothar_m at riseup dot net> # Contributor: Freemor <freemor@freemor.ca> pkgname='zeronet-git' diff --git a/pcr/zfec/PKGBUILD b/pcr/zfec/PKGBUILD index b11962239..2c82339ea 100644 --- a/pcr/zfec/PKGBUILD +++ b/pcr/zfec/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer (AUR): Nicolas Pouillard <nicolas.pouillard@gmail.com> -# Contributor (AUR): Peter Simons <simons@cryp.to> +# Maintainer (aur): Nicolas Pouillard <nicolas.pouillard@gmail.com> +# Contributor: Peter Simons <simons@cryp.to> pkgname=zfec pkgver=1.5.3 pkgrel=1 diff --git a/pcr/zimlib/PKGBUILD b/pcr/zimlib/PKGBUILD index e1309f095..ca9a13231 100644 --- a/pcr/zimlib/PKGBUILD +++ b/pcr/zimlib/PKGBUILD @@ -1,5 +1,6 @@ -# Contributor (Arch): Yaron de Leeuw < me@jarondl.net > +# Contributor: Yaron de Leeuw < me@jarondl.net > # Contributor: André Silva <emulatorman@hyperbola.info> +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=zimlib pkgver=1.4 diff --git a/pcr/zramswap/PKGBUILD b/pcr/zramswap/PKGBUILD index db38ab084..80fb474b8 100644 --- a/pcr/zramswap/PKGBUILD +++ b/pcr/zramswap/PKGBUILD @@ -1,9 +1,10 @@ -# Contributor (Arch): ifaigios <ifaigios_at_gmail_dot_com> -# Contributor (Arch): Alyssa Hung <deciare@isisiew.org> -# Contributor (Arch): Matt Brennan -# Contributor (Arch): falconindy -# Contributor (Arch): adee -# Contributor (Arch): mystilleef +# Contributor: ifaigios <ifaigios_at_gmail_dot_com> +# Contributor: Alyssa Hung <deciare@isisiew.org> +# Contributor: Matt Brennan +# Contributor: falconindy +# Contributor: adee +# Contributor: mystilleef +# Maintainer: Parabola Hackers <dev@lists.parabola.nu> pkgname=zramswap pkgver=1.1 diff --git a/pcr/zulucrypt/PKGBUILD b/pcr/zulucrypt/PKGBUILD index 965736fa7..2a68a315b 100644 --- a/pcr/zulucrypt/PKGBUILD +++ b/pcr/zulucrypt/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer (AUR): Salan54 <salan at fremenil dot com> +# Maintainer (aur): Salan54 <salan at fremenil dot com> # Created: 2013-03-17 -# Maintainer (Parabola) : Aurélien DESBRIÈRES <aurelien@hackers.camp> +# Maintainer: Aurélien Desbrières <aurelien@hackers.camp> # parabola changes and rationale: # - added .install file to update desktop database |