diff --git a/src/android-emulator/PKGBUILD b/src/android-emulator/PKGBUILD index 56fb000..75116cc 100644 --- a/src/android-emulator/PKGBUILD +++ b/src/android-emulator/PKGBUILD @@ -1,22 +1,19 @@ # Maintainer: Zhang Hai pkgname=android-emulator -pkgver=27.2.9 +pkgver=28.0.23 pkgrel=1 pkgdesc='Google Android Emulator' -arch=('i686' 'x86_64') +arch=('x86_64') url='https://developer.android.com/studio/releases/emulator.html' license=('custom') -depends_i686=('gcc-libs' 'libpulse' 'libx11' 'libxcb' 'libxdamage' - 'libxext' 'libxfixes' 'ncurses5-compat-libs' 'zlib') -depends_x86_64=('lib32-gcc-libs' 'lib32-glibc' 'libpulse' 'libx11' - 'libxcb' 'libxdamage' 'libxext' 'libxfixes' - 'ncurses5-compat-libs' 'zlib') +depends=('libpulse' 'libx11' 'libxcb' 'libxdamage' 'libxext' + 'libxfixes' 'ncurses5-compat-libs' 'zlib') install="${pkgname}.install" -source=('https://dl.google.com/android/repository/emulator-linux-4773671.zip' +source=('https://dl.google.com/android/repository/emulator-linux-5264690.zip' "${pkgname}.sh" "${pkgname}.csh") -sha1sums=('2a4d424c0c8a2ac94fea68732f90c7668e5682f6' +sha1sums=('48c1cda2bdf3095d9d9d5c010fbfb3d6d673e3ea' '4537a7ce30bedf87cedafc2020822219ad58310d' '2fb371b5774b67143f0610dfbec4963a4e2f11cc') @@ -25,12 +22,6 @@ package() { install -Dm755 "${pkgname}.sh" "${pkgdir}/etc/profile.d/${pkgname}.sh" install -Dm755 "${pkgname}.csh" "${pkgdir}/etc/profile.d/${pkgname}.csh" - rm -rf emulator/lib{,64}/libstdc++ - - if [[ "${CARCH}" = i686 ]]; then - rm -rf emulator/lib64/ - fi - install -d "${pkgdir}/opt/android-sdk/" cp -a emulator "${pkgdir}/opt/android-sdk/" diff --git a/src/atheme/PKGBUILD b/src/atheme/PKGBUILD index 8c0ba93..50a66f7 100644 --- a/src/atheme/PKGBUILD +++ b/src/atheme/PKGBUILD @@ -10,7 +10,8 @@ _cracklib=default _ldap=no pkgname=atheme -pkgver=7.2.9 +pkgver=7.2.10_r2 +_pkgver="7.2.10-r2" pkgrel=1 pkgdesc="IRC services" arch=("i686" "x86_64") @@ -31,15 +32,18 @@ backup=( 'etc/atheme/atheme.motd' ) install=atheme.install -source=("https://github.com/atheme/atheme/releases/download/v${pkgver}/atheme-${pkgver}.tar.bz2" +source=("https://github.com/atheme/atheme/releases/download/v${_pkgver}/atheme-v${_pkgver}.tar.xz" "atheme.service" ) -sha256sums=('a87a046aa73fc4a97a11d41cc08c60b835135ba20bb173ca888b40e0d6b54b27' +sha256sums=('cceceb285283509c9f6dcb20eeb9b816db373a81b55fe49bc11a774b501d687d' 'ee9ad7658434451184872c21c7fd38196d22d1dfb6b1f37bcfaf8c363d50296f') -build() { - cd "atheme-$pkgver" +pkgver() { + echo "$_pkgver" >&2 + echo "$_pkgver" | tr - _ +} +build() { _configure="./configure --prefix=/usr --enable-fhs-paths" _configure+=" --sysconfdir=/etc/atheme --localstatedir=/var" @@ -53,10 +57,6 @@ build() { [[ $_large_network = yes ]] && _configure+=" --enable-large-net" [[ $_contrib = yes ]] && _configure+=" --enable-contrib" - [[ $_pcre = yes ]] && _configure+=" --with-pcre" - [[ $_pcre = no ]] && _configure+=" --without-pcre" - - [[ $_pcre = yes ]] && _configure+=" --with-pcre" [[ $_pcre = no ]] && _configure+=" --without-pcre" @@ -65,7 +65,6 @@ build() { } package() { - cd "atheme-$pkgver" make DESTDIR="$pkgdir/" install install -Dm0644 "$srcdir/atheme.service" "$pkgdir/usr/lib/systemd/system/atheme.service" diff --git a/src/aurutils/PKGBUILD b/src/aurutils/PKGBUILD index af78c2b..26355f6 100644 --- a/src/aurutils/PKGBUILD +++ b/src/aurutils/PKGBUILD @@ -1,49 +1,29 @@ -# Maintainer: Alad Wenter +# Maintainer: Alad Wenter +# Co-Maintainer: Cedric Girard pkgname=aurutils -pkgver=1.5.3 -pkgrel=10 +pkgver=2.3.1 +pkgrel=1 pkgdesc='helper tools for the arch user repository' -arch=('any') url='https://github.com/AladW/aurutils' +arch=('any') license=('custom:ISC') -depends=('pacman>=5' 'git' 'jq' 'pacutils>=0.4') -makedepends=('git') -optdepends=('devtools: systemd-nspawn support' +source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") + #"$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc") +install=$pkgname.install +depends=('git' 'jq' 'expac' 'diffstat' 'pacutils' 'parallel' 'wget') +optdepends=('bash-completion: bash completion' + 'devtools: aur-chroot' 'vifm: build file interaction' - 'aria2: threaded downloads' - 'parallel: threaded downloads' - 'expac: aursift script' - 'repose: repo-add alternative') -_backports=('0001-aurbuild-backport-fix-for-236.patch' - '0002-aursync-make-L-optional-281.patch' - '0003-aurbuild-update-default-options.patch' - '0004-aurfetch-specify-git-work-tree-git-dir-274.patch' - '0005-specify-absolute-paths-for-GIT_DIR-GIT_WORK_TREE.patch' - '0006-aurfetch-aursearch-use-aria2-no-conf.patch' - '0007-aurchain-do-not-sort-results-when-appending.patch') -source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz" - "$pkgname-$pkgver.tar.gz.asc::$url/releases/download/$pkgver/$pkgver.tar.gz.asc" - "${_backports[@]}") -sha256sums=('a09088a460e352179dbf799d915e866af47aa280474a9c943f8e6885490734c5' - 'SKIP' - '8bf1fe675284a8e91aa37bdbf035c0158f910446fdd10d21a705e89ff711c883' - '75326f1f932b545754eb05ef62ad637874367d276ee584ff9544f0c0178e39b8' - 'bb03ef84bd3e7b28af9d2a829a61869c4845bdce65c897d267e691091033fe8a' - '40efaedd46cb98e0af0faf8cd61dc36eaa2638cf429d280beaf5c37f09a4369b' - '2fc7599245c53cad4b3b404a9ecf0ef122cf6be66d18a156e83ebfd1923b5359' - '8f4c9ea372827db3a4d4aa8e67e4fd962384197fc1684ba50e4f739d2917402f' - '1cb14e6605e38a1bc127d7ea576a02dfbc2d3c0e009597980fe4040a65b347f2') -# Alad Wenter -validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A') + 'xdelta3: generate delta files') +sha256sums=('2e8c7656c620c1c8ded07e20cc9e9cb37d7a4bb234c9f5bd166a2e3887d3db65') +validpgpkeys=('DBE7D3DD8C81D58D0A13D0E76BC26A17B9B7018A') # Alad Wenter -prepare() { +build() { cd "$pkgname-$pkgver" - for p in "${_backports[@]}"; do - patch -p1 < "$srcdir/$p" - done + make } package() { cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" PREFIX="/usr" install + make DESTDIR="$pkgdir" install } diff --git a/src/binfmt-support/PKGBUILD b/src/binfmt-support/PKGBUILD index 1328732..f235332 100644 --- a/src/binfmt-support/PKGBUILD +++ b/src/binfmt-support/PKGBUILD @@ -1,26 +1,42 @@ +# Maintainer: Antoine Viallon pkgname=binfmt-support -pkgver=2.1.8 -pkgrel=1 -pkgdesc="register interpreters for various binary formats" -arch=(i686 x86_64) -url="http://packages.debian.org/en/sid/binfmt-support" +pkgver=2.2.0 +_pkgver=2.2.0 # For use with RC releases, to replace the - with _ +pkgrel=2 +pkgdesc="Arbitraty executable file format kernel extension" +arch=('i686' 'x86_64') +url="https://git.savannah.gnu.org/cgit/binfmt-support.git/" license=('GPL') -depends=('libpipeline') -makedepends=() -source=(ftp://ftp.de.debian.org/debian/pool/main/b/binfmt-support/binfmt-support_$pkgver.orig.tar.gz - binfmt-support.service) -sha256sums=('ebad04db8444d2275d042b5074fa3e160bcf3e2c23ee9b660e75f5acd73618a2' - 'efba2300b9f0c8c5c14696d2b25836d91edaaad8d30c64ed7d3eab0163b2553e') +depends=('autoconf' 'automake') +makedepends=('make' 'gcc' 'git' 'libpipeline') +source=("https://git.savannah.gnu.org/cgit/binfmt-support.git/snapshot/$pkgname-$_pkgver.tar.gz") +sha512sums=('b35238fa96f7e3201f7c9a70172ecd2c6b0be66e4735ff96c17ae2167f670a67c856d0fc1b0d50bf3c14f4a35c5e9927a848814791ea9be928dff82426cb0da4') + +prepare() { + echo -e '\033[0;31mWARNING : \033[1;33mThis package is deprecated, please use systemd-binfmt instead.\033[0m' + read -p "Do you really want to install it anyway ? " yn + case $yn in + [Nn]* ) exit;; + esac + set -e + cd "${srcdir}/$pkgname-$_pkgver" + ./bootstrap +} build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --libexecdir=/usr/lib --sbindir=/usr/bin --localstatedir=/var + + cd "${srcdir}/$pkgname-$_pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --disable-upstart make } package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install - install -dm0755 $pkgdir/var/lib/binfmts - install -Dm755 $srcdir/binfmt-support.service $pkgdir/usr/lib/systemd/system/binfmt-support.service + #install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" # Couldn't find any License ! } + diff --git a/src/bluez-utils-compat/PKGBUILD b/src/bluez-utils-compat/PKGBUILD index a850275..b2ea612 100644 --- a/src/bluez-utils-compat/PKGBUILD +++ b/src/bluez-utils-compat/PKGBUILD @@ -7,7 +7,7 @@ pkgname='bluez-utils-compat' _pkgbase='bluez' pkgver=5.50 -pkgrel=2 +pkgrel=3 url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el' 'armv6h' 'armv7h' 'arm' 'aarch64') license=('GPL2') diff --git a/src/ccextractor/PKGBUILD b/src/ccextractor/PKGBUILD index 41b7b73..45818d5 100644 --- a/src/ccextractor/PKGBUILD +++ b/src/ccextractor/PKGBUILD @@ -7,7 +7,7 @@ # https://github.com/cacack/pkgbuilds/tree/master/ccextractor pkgname=ccextractor -pkgver=0.86 +pkgver=0.87 pkgrel=1 pkgdesc="A fast closed captions extractor for MPEG files." arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ depends=('gcc-libs' 'tesseract') source=( https://github.com/CCExtractor/ccextractor/archive/v$pkgver.tar.gz ) -sha512sums=('50a501650f1b60ab54aba690ae211610975bd1894ae103d0a1e10b6348f93436c9fa974a16bff5c7b8ba4e011be1730aa890e3c96217b2a4b05384e598d850d0') +sha512sums=('adc421dadc844c5708bd8a15d07bca9cece8d381515a5a2f7ebaca1b95a128d083de6a6cfaa695a89dc3bcb81e0e457a959be072a9b1cd2c268a5138a93a0a11') build() { cd "$srcdir/$pkgname-$pkgver/linux" diff --git a/src/chocolate-doom/PKGBUILD b/src/chocolate-doom/PKGBUILD index 20e811d..36a5321 100644 --- a/src/chocolate-doom/PKGBUILD +++ b/src/chocolate-doom/PKGBUILD @@ -4,13 +4,13 @@ pkgname=(chocolate-{doom,heretic,hexen,strife,common}) pkgbase=${pkgname[0]} pkgdesc="Historically-accurate Doom, Heretic, Hexen, and Strife ports." pkgver=3.0.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.chocolate-doom.org/" license=('GPL2') depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net') makedepends=('python') -source=(http://chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc} +source=(https://www.chocolate-doom.org/downloads/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.asc} 0001_fix-bash-completion.patch) sha512sums=('41f235c0d84ef21070636ad0610e97898dfd366fae7f9244bd2aebf8974db98dcf55f70bcab2f93589b9bf31dd421db32e8af88e0f8e0a655d2b9f1d4ead2afd' 'SKIP' diff --git a/src/clean-chroot-manager/PKGBUILD b/src/clean-chroot-manager/PKGBUILD index 45cae9b..7ea72e0 100644 --- a/src/clean-chroot-manager/PKGBUILD +++ b/src/clean-chroot-manager/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: graysky pkgname=clean-chroot-manager -pkgver=2.90 +pkgver=2.93 pkgrel=1 pkgdesc='Wrapper scripts for managing clean chroots.' arch=('any') @@ -11,7 +11,7 @@ depends=('devtools>=20180528-1' 'rsync') conflicts=('clean_chroot_manager') replaces=('clean_chroot_manager') source=("$pkgname-$pkgver.tar.gz::https://github.com/graysky2/clean-chroot-manager/archive/v$pkgver.tar.gz") -sha256sums=('bf1a8adffcfd435937bda8c0757348c40af4dfe99758ae22e0748829adaf4499') +sha256sums=('e78cf1c1a411d10dc9aae117e2fbd12cfcc4437cd39427c4a5c887ce6fa3ad8c') install=ccm.install build() { diff --git a/src/clean-chroot-manager/ccm.install b/src/clean-chroot-manager/ccm.install index bfe9621..1f83234 100644 --- a/src/clean-chroot-manager/ccm.install +++ b/src/clean-chroot-manager/ccm.install @@ -2,7 +2,7 @@ ## arg 2: the old package version post_upgrade() { - for test in 2.87-1 2.81-1 2.73-1 2.72-1 2.55-1 2.17-1 2.22-1 2.69-1; do + for test in 2.92-1 2.87-1 2.81-1 2.73-1 2.72-1 2.55-1 2.17-1 2.22-1 2.69-1; do if [ "$(vercmp $2 $test)" -lt 1 ]; then echo echo '--> Please check ~/.config/clean-chroot-manager.conf against the' diff --git a/src/cloog/PKGBUILD b/src/cloog/PKGBUILD index d618912..ac3f4d6 100644 --- a/src/cloog/PKGBUILD +++ b/src/cloog/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Allan McRae pkgname=cloog -pkgver=0.19.0 +pkgver=0.20.0 pkgrel=1 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64' 'armv7h') @@ -11,7 +11,7 @@ license=('GPL') depends=('osl' 'isl') makedepends=('texlive-core' 'texlive-bin') source=(https://github.com/periscop/cloog/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz) -sha512sums=('a0646f31e7a2c1809c51b812f58dc3f733f3a7c4cdf84fa5fee4ed7a372b7bf649561c7eceb7bfc754f1aca519ec0fc3718e08775e7eb072a238ce341edda10a') +sha512sums=('d00cbefd348b45d9d482320a088f7ae736440046b99469cbdfbb177a38dcef182c3305f0a567a1f5699c23b7108db6fd5ad6dfbc071d63ccca1d6bfc1b198565') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,6 +23,7 @@ check() { cd "${srcdir}/${pkgname}-${pkgver}" # There are certain race conditions on running the tests, so we restrict # it to one job (one CPU core). + make -j1 check } diff --git a/src/coturn/PKGBUILD b/src/coturn/PKGBUILD index 8d201fe..71c7c8e 100644 --- a/src/coturn/PKGBUILD +++ b/src/coturn/PKGBUILD @@ -4,7 +4,7 @@ pkgname=coturn _portname=turnserver -pkgver=4.5.0.7 +pkgver=4.5.0.8 pkgrel=1 pkgdesc="Free open source implementation of TURN and STUN Server" arch=('i686' 'x86_64' 'armv7h') @@ -17,7 +17,7 @@ install="$_portname.install" backup=("etc/turnserver.conf") source=(http://$_portname.open-sys.org/downloads/v$pkgver/$_portname-$pkgver.tar.gz $_portname.service $_portname.tmpfiles.d) -sha256sums=('86248c541a1184eb388c54d4178cffbf16ef53504fbb60106e575194f078b221' +sha256sums=('94a9e67ac7d92c913b5bd8cb6b70ee6e9aa0e9e7cc3c984fc2d8cf381c6edf87' '319030c1916d353bfc3375626cc7f60d6eeca762fe4fce354f010212902c49dc' 'fe7ed64dc6844aabdfa00b76134b22d69d9097bd3f77120d704d0ee08c036c21') diff --git a/src/coturn/turnserver.install b/src/coturn/turnserver.install index 4d4aab1..5af408d 100644 --- a/src/coturn/turnserver.install +++ b/src/coturn/turnserver.install @@ -1,13 +1,13 @@ post_install() { id turnserver &>/dev/null || \ - useradd -r -g daemon -M -s /usr/bin/false turnserver + useradd -r -g daemon -d / -s /usr/bin/nologin turnserver install -dm 755 "/var/log/turnserver" chown -R turnserver:daemon /var/log/turnserver systemd-tmpfiles --create turnserver.conf - + echo "start server by issuing \"systemctl start turnserver.service\" or calling \"turnserver\"" } diff --git a/src/crispy-doom/PKGBUILD b/src/crispy-doom/PKGBUILD index 782e750..38bf4a0 100644 --- a/src/crispy-doom/PKGBUILD +++ b/src/crispy-doom/PKGBUILD @@ -2,19 +2,19 @@ pkgname=crispy-doom pkgdesc="Vanilla-compatible enhanced Doom engine" -pkgver=5.4 +pkgver=5.5 pkgrel=1 arch=('i686' 'x86_64') url="http://fabiangreffrath.github.io/crispy-doom" license=('GPL2') -depends=('libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net') +depends=('hicolor-icon-theme' 'libpng' 'libsamplerate' 'sdl2_mixer' 'sdl2_net') makedepends=('python') optdepends=('freedm: Free deathmatch game' 'freedoom1: Free Ultimate Doom-compatible game' 'freedoom2: Free Doom II/Final Doom-compatible game') install=crispy-doom.install source=(https://github.com/fabiangreffrath/$pkgname/archive/$pkgname-$pkgver.tar.gz) -sha512sums=('aa3dedfc5517e5347a9b0b25b2926f58a9bf470ec9879e61d67be3acbd3051cece4a3eb74d7fea2b5c373e808b50f86f82add3da25ec0f1111a52ed5662f1e5f') +sha512sums=('723c7fb15a4a7586506658889a9c309ca3a43bc1c078ce3cd72b976eeffef5f3c138fb6c2a8e2b40151ce5564f1a75e9c28d87bf6ea2c6be034ee73b7d5d3b44') prepare() { # GitHub's generated archive prefix kind of sucks. diff --git a/src/dino-git/PKGBUILD b/src/dino-git/PKGBUILD index eefb590..bab2240 100644 --- a/src/dino-git/PKGBUILD +++ b/src/dino-git/PKGBUILD @@ -2,13 +2,13 @@ # Contributor: svalo pkgname=dino-git -pkgver=r279.9e93a77 +pkgver=r370.38b5320 pkgrel=1 pkgdesc="Simple and modern Jabber/XMPP client written in vala" arch=('i686' 'x86_64' 'aarch64') url="https://github.com/dino/dino" license=('GPL3') -depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite') +depends=('glib2>=2.38' 'glib-networking' 'gtk3>=3.22' 'gpgme' 'libgee>=0.10' 'libgcrypt' 'libsoup' 'sqlite' 'qrencode') makedepends=('git' 'cmake' 'vala>=0.34' 'ninja') optdepends=('libcanberra: audio notification support') provides=("${pkgname%-git}") diff --git a/src/displaylink/PKGBUILD b/src/displaylink/PKGBUILD index 89aca2d..c83b15b 100644 --- a/src/displaylink/PKGBUILD +++ b/src/displaylink/PKGBUILD @@ -1,8 +1,9 @@ -# Maintainer: PlusMinus +# Maintainer: rHermes +# Contributor: PlusMinus # Contributor: rhabbachi pkgname=displaylink -pkgver=4.2.29 +pkgver=4.4.24 pkgrel=1 pkgdesc="Linux driver for DL-6xxx, DL-5xxx, DL-41xx and DL-3x00" arch=('i686' 'x86_64') @@ -12,18 +13,18 @@ depends=('evdi>=1.5.0' 'libusb>=1.0.0') makedepends=('grep' 'gawk' 'wget') install= changelog="release-note.txt" -source=(displaylink-driver-$pkgver.zip::http://www.displaylink.com/downloads/file?id=1123 +source=(displaylink-driver-$pkgver.zip::https://www.displaylink.com/downloads/file?id=1261 udev.sh 99-displaylink.rules displaylink.service displaylink-sleep.sh) -md5sums=('ab920bea23a265516e3d0097992c62f3' +md5sums=('f18b8e6fe8f2baf9c0288afddfd771a1' 'd5de775e41af06edbd8073adc490139d' '20495d81c7d2540910ef86dc437b7fac' 'c141a15e973481c7d961f8e135627ca4' '7cbd9ab2ac79ba66e8297689c6e5483e') -DLAGENTS=('http::/usr/bin/wget -O %o --post-data=fileId=1123&accept_submit=Accept %u') +DLAGENTS=('https::/usr/bin/wget -O %o --post-data=fileId=1261&accept_submit=Accept %u') # Update with > updpkgsums diff --git a/src/emulationstation-autoscraper/PKGBUILD b/src/emulationstation-autoscraper/PKGBUILD index 45a3ea0..fb81c32 100644 --- a/src/emulationstation-autoscraper/PKGBUILD +++ b/src/emulationstation-autoscraper/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Oliver Jaksch pkgname=emulationstation-autoscraper -pkgver=1.4.5 +pkgver=1.4.6 pkgrel=1 pkgdesc="An auto-scraper for EmulationStation written in Go using hashes" arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h') @@ -9,24 +9,26 @@ url="https://github.com/sselph/scraper" license=('custom') makedepends=('git' 'go') -source=("https://github.com/sselph/scraper/archive/v${pkgver}.tar.gz") -sha256sums=('5e7496b7634126f5be81fdd88a20fe108f40d4a8a0089b2d07ae82ea2cea812c') +source=($pkgname-$pkgver.tar.gz::https://github.com/sselph/scraper/archive/v${pkgver}.tar.gz) +sha256sums=('898d13a94f630bcb2e78b144fb06c106a6f29a316ab1d63f9b702719cf98e0cd') scraperdir="scraper-${pkgver}" build() { - cd "${srcdir}/${scraperdir}" - echo $arch + # echo $arch # for later use on different arches + mkdir -p "github.com/sselph" + ln -s "${srcdir}/${scraperdir}" "${srcdir}/github.com/sselph/scraper" + GOPATH="$(pwd)" && export GOPATH=$(echo ${GOPATH%src}) echo $(go build github.com/sselph/scraper) } package() { - cd "${srcdir}/${scraperdir}" + cd "${srcdir}" strip "scraper" - install -Dm755 "${srcdir}/${scraperdir}/scraper" "${pkgdir}/usr/bin/${pkgname}" + install -Dm755 "${srcdir}/scraper" "${pkgdir}/usr/bin/${pkgname}" install -Dm644 "${srcdir}/${scraperdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" - for LIC in $(find vendor/github.com -name LICENSE); do + for LIC in $(find "${srcdir}/${scraperdir}/vendor/github.com" -name LICENSE); do PKGNAME="$(echo ${LIC} | awk -F "/" '{print $(NF-1)}')" - install -Dm644 "${srcdir}/${scraperdir}/${LIC}" "${pkgdir}/usr/share/licenses/${pkgname}/license.${PKGNAME}" + install -Dm644 "${LIC}" "${pkgdir}/usr/share/licenses/${pkgname}/license.${PKGNAME}" done } diff --git a/src/emulationstation-git/PKGBUILD b/src/emulationstation-git/PKGBUILD index 59f3644..19338ed 100644 --- a/src/emulationstation-git/PKGBUILD +++ b/src/emulationstation-git/PKGBUILD @@ -5,34 +5,31 @@ pkgname=emulationstation-git _gitname=EmulationStation pkgrel=1 -pkgver=1314.dc541e5 +epoch=1 +pkgver=2.4.1.r392.gb7bec0eb pkgdesc="A graphical front-end for emulators with controller navigation. Developed for the Raspbery Pi, but runs on most Linux systems." arch=('i686' 'x86_64' 'armv6h' 'armv7h') url="https://github.com/RetroPie/EmulationStation" license=('MIT') -makedepends=('git' 'boost' 'freetype2' 'eigen' 'cmake' 'mesa' 'libsm') -depends=('alsa-lib' 'sdl2' 'boost-libs' 'freeimage' 'ttf-dejavu' 'glu' 'vlc') +makedepends=('git' 'boost' 'freetype2' 'eigen' 'cmake' 'mesa' 'libsm' 'rapidjson') +depends=('alsa-lib' 'sdl2' 'boost-libs' 'freeimage' 'ttf-dejavu' 'glu' 'vlc' 'libcec') if [ "$CARCH" = "armv6h" ]; then depends+=('raspberrypi-firmware') else depends+=('libgl') fi -source=('git://github.com/RetroPie/EmulationStation.git' - 'git://github.com/zeux/pugixml.git') -md5sums=('SKIP' - 'SKIP') +source=('git://github.com/RetroPie/EmulationStation.git') +md5sums=('SKIP') provides=('emulationstation') pkgver() { cd $srcdir/$_gitname - printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } prepare() { cd "$srcdir/$_gitname" - git submodule init - git config submodule.external/pugixml.url $srcdir/pugixml - git submodule update + git submodule update --init } build() { diff --git a/src/evdi/PKGBUILD b/src/evdi/PKGBUILD index 009c66a..baa2d77 100644 --- a/src/evdi/PKGBUILD +++ b/src/evdi/PKGBUILD @@ -1,7 +1,8 @@ -# Maintainer: PlusMinus +# Maintainer: mwawrzyniak +# Contributor: PlusMinus pkgname=evdi -pkgver=1.5.0.2 +pkgver=1.6.0 pkgrel=1 pkgdesc="A Linux® kernel module that enables management of multiple screens." arch=('i686' 'x86_64') @@ -18,12 +19,25 @@ backup=() options=() install=$pkgname.install changelog=$pkgname.Changelog -source=($pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz) +source=($pkgname-$pkgver-$pkgrel.tar.gz::https://github.com/DisplayLink/evdi/archive/v$pkgver.tar.gz + relro.patch) noextract=() -md5sums=('19c7dc3829b2ff84826007e7b4a3c961') +md5sums=('e59f2372e5aa5719da9995f09725c3c7' + '05e64dd295a66c030139d0c8f6f7013b') + +prepare() { + cd "$pkgname-$pkgver" + local src + for src in "${source[@]}"; do + src="${src%%::*}" + src="${src##*/}" + [[ $src = *.patch ]] || continue + patch -Np1 < "../$src" + done +} build() { -# We only need to build the library in this step, dmks will build the module +# We only need to build the library in this step, dkms will build the module cd "$pkgname-$pkgver/library" make diff --git a/src/evdi/evdi.Changelog b/src/evdi/evdi.Changelog index edcde07..af909e8 100644 --- a/src/evdi/evdi.Changelog +++ b/src/evdi/evdi.Changelog @@ -1,3 +1,18 @@ +v1.6.0 +EVDI driver used in DisplayLink Ubuntu Software v5.1 +- shift towards 'atomic modesetting' +- add support for 4.19 and 4.20 kernels +- drop support for kernels older than 4.2 + +v1.5.1-2 +- Removed FBINFO_CAN_FORCE_OUTPUT (breaks 4.20 / apparently never worked right) + (https://github.com/torvalds/linux/commit/04cfcc7ab358e331b32cabde1e853a125f3f8735#diff-43768cc89c01c730cb119634b42dfa81) +- Also added dynamic patching ability (borrowed from "linux" PKGBUILD) +- Fixed namcap relro warning + +v1.5.1 +EVDI driver used in DisplayLink Ubuntu Software v4.4 + v1.5.0.2 Re-release v1.5.0-r2 as v1.5.0.2 for Chrome OS only. diff --git a/src/factorio-demo/PKGBUILD b/src/factorio-demo/PKGBUILD index 4c24140..ba62774 100644 --- a/src/factorio-demo/PKGBUILD +++ b/src/factorio-demo/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Sebastien Duthil pkgname=factorio-demo -pkgver=0.15.36 +pkgver=0.16.51 pkgrel=1 pkgdesc="A 2D game about building and maintaining factories." arch=('x86_64') @@ -12,25 +12,26 @@ depends=('libxcursor' 'alsa-lib' 'libxrandr' 'libxinerama' 'mesa') conflicts=('factorio' 'factorio-headless' 'factorio-experimental') makedepends=('xz') source=(factorio.desktop - LICENSE) -source_x86_64=(factorio_demo_x64_${pkgver}.tar.xz::http://www.factorio.com/get-download/${pkgver}/demo/linux64) + LICENSE + factorio_demo_x64_${pkgver}.tar.xz::http://www.factorio.com/get-download/${pkgver}/demo/linux64 +) sha256sums=('c3bbe51c3c35641d6064ff0f8470294f8a317f0413bb149f6bd47461b03804bf' - '67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21') -sha256sums_x86_64=('fcff6735880094ef3690c5c6a70261ec93c44c508cad2050f487f2a3e7438a29') + '67ec2f88afff5d7e0ca5fd3301b5d98655269c161a394368fa0ec49fbc0c0e21' + 'ca58a5cb40f7e8b3b741bc8f9ab9d587ca0cda930d6799fd45cd9f91d00fc67d') # no modifications needed, the executable looks for: # - data in /usr/share/factorio # - config in ~/.factorio package() { - cd "$srcdir/factorio" + cd "${srcdir}/factorio" install -d "${pkgdir}/usr/bin" install -d "${pkgdir}/usr/share/applications" install -d "${pkgdir}/usr/share/factorio" install -d "${pkgdir}/usr/share/licenses/factorio-demo" - install -m755 bin/*/factorio "${pkgdir}/usr/bin/factorio" + install -m755 "bin/x64/factorio" "${pkgdir}/usr/bin/factorio" cp -r data/* "${pkgdir}/usr/share/factorio" install -m644 "${srcdir}/factorio.desktop" "${pkgdir}/usr/share/applications/factorio.desktop" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/factorio-demo/LICENSE" diff --git a/src/filebot/PKGBUILD b/src/filebot/PKGBUILD index be1f98c..9bdb3ef 100644 --- a/src/filebot/PKGBUILD +++ b/src/filebot/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Roman Vasilev <2rvasilev@live.ru> # Maintainer: max.bra # Contributor: nadolph # Contributor: dcelasun @@ -6,78 +7,68 @@ # Contributor: Nathan Owe pkgname=filebot -pkgver=4.8.4 +pkgver=4.8.5 pkgrel=1 -_jnaver=4.5.2 -_fixedcommit=b9572f4501ba9d5af9d445a792fa902274f37679 -pkgdesc="The ultimate tool to rename TV/anime shows, download subtitles, and validate checksums." +pkgdesc="The ultimate TV and Movie Renamer" arch=('i686' 'x86_64' 'aarch64' 'armv7l' 'armv7h') -url="https://github.com/filebot/filebot" -license=('GPL') +url="https://www.filebot.net/" +license=('Commercial') install=$pkgname.install -depends=('java-runtime>=9' 'fontconfig' 'chromaprint') -makedepends=('unzip' 'apache-ivy' 'jdk>=9' 'git') +install=() +depends=('java-openjfx' 'jre8-openjdk' 'fontconfig' 'chromaprint') +makedepends=() +provides=('filebot') +conflicts=('filebot47' 'filebot-git') [[ $CARCH == "i686" ]] && _intarch=i686 -[[ $CARCH == "x86_64" ]] && _intarch=x86_64 +[[ $CARCH == "x86_64" ]] && _intarch=amd64 [[ $CARCH == "armv7l" ]] && _intarch=armv7l [[ $CARCH == "armv7h" ]] && _intarch=armv7l +[[ $CARCH == "aarch64" ]] && _intarch=armv8 -source=("${pkgname}::git+https://github.com/filebot/filebot.git" - #https://github.com/java-native-access/jna/archive/$_jnaver.tar.gz - $pkgname-arch.sh $pkgname.svg $pkgname.desktop) +source=(#"https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-portable.tar.xz" + "https://get.filebot.net/filebot/FileBot_${pkgver}/FileBot_${pkgver}-aur.tar.xz" + $pkgname-arch.sh + #$pkgname.svg + #$pkgname.desktop + ) -md5sums=('SKIP' - 'fa7b8d4b811f5d9e0d27cffbb20dc0ee' - '04f46be047049448dba3f0de29fe192d' - 'f37edd0bba7570904d28ab1681c7a7f3') +md5sums=('91827d5a16358316c475e58ee86b552e' + '7c1128f94fcd9f4e29225a12eac83704') -optdepends=('libzen: Support for additional subtitle search engines (Sublight)' - 'libmediainfo: Episode naming / Sublight usage' +optdepends=('libzen: Required by libmediainfo' + 'libmediainfo: Read media info such as video codec, resolution or duration' 'java-p7zip-binding: Extract archives' - 'gvfs: gvfs backends') - -#noextract=($(for i in ${source[@]}; do basename $i; done)) + 'gvfs: Drag-n-Drop from GVFS remote filesystems') prepare() { - cd "$srcdir/$pkgname/" - git checkout $_fixedcommit - sed -i -E 's/release="([^"]*)"/target="\1" source="\1"/' build.xml - sed -i -E 's/-portable.tar.xz/-portable.tar.gz/' build.xml - sed -i -E 's/jre.version: 10/jre.version: 9/' app.properties - sed -i -E 's/jvm.version: 10/jvm.version: 9/' app.properties - sed -i -E 's/tar.compression: xz/tar.compression: gzip/' app.properties -cat <> app.properties -url.data: https://app.filebot.net/data - -apikey.fanart.tv: 780b986b22c35e6f7a134a2f392c2deb -apikey.thetvdb: 694FAD89942D3827 -apikey.themoviedb: 66308fb6e3fd850dde4c7d21df2e8306 -apikey.omdb: 49d311ec -apikey.acoustid: 0B3qZnQc -apikey.anidb: filebot -apikey.opensubtitles: FileBot -EOT - #cd "$srcdir/jna-$_jnaver/lib/native/" - #unzip linux-$_intarch.jar 2>&1 >/dev/null + cd "$srcdir" } build() { - export JAVA_HOME=/usr/lib/jvm/java-10-jdk - cd $pkgname - ant resolve - ant jar - ant tar - cd dist - mkdir portable - tar -xf FileBot_$pkgver-portable.tar.gz -C ./portable + cd $srcdir } package() { - install -Dm644 $pkgname/dist/portable/lib/Linux-$_intarch/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so" - cp -dpr --no-preserve=ownership $pkgname/dist/portable/jar/* "$pkgdir/usr/share/java/$pkgname/" - + mkdir -p $pkgdir/usr/share/java/$pkgname/ + install -Dm755 $pkgname-arch.sh "$pkgdir/usr/bin/$pkgname" - install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg" - install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" + + cd "$srcdir/usr/share" + + install -Dm644 $pkgname/lib/$CARCH/libjnidispatch.so "$pkgdir/usr/share/java/$pkgname/libjnidispatch.so" + cp -dpr --no-preserve=ownership $pkgname/jar/* "$pkgdir/usr/share/java/$pkgname/" + + cp -dpr --no-preserve=ownership icons/* "$pkgdir/usr/share/icons/" + + #install -Dm644 $pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg" + #install -Dm644 icons/hicolor/scalable/apps/$pkgname.svg "$pkgdir/usr/share/pixmaps/$pkgname.svg" + + #install -Dm644 applications/*.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" + mkdir -p $pkgdir/usr/share/applications/ + cp -dpr --no-preserve=ownership applications/* "$pkgdir/usr/share/applications/" + + mkdir -p $pkgdir/usr/share/mime/packages/ + cp -dpr --no-preserve=ownership mime/* "$pkgdir/usr/share/mime/" + } diff --git a/src/filebot/filebot-arch.sh b/src/filebot/filebot-arch.sh index cbf8ac3..b66e502 100644 --- a/src/filebot/filebot-arch.sh +++ b/src/filebot/filebot-arch.sh @@ -5,7 +5,6 @@ export LANG="en_US.UTF-8" export LC_ALL="en_US.UTF-8" APP_ROOT=/usr/share/java/filebot -cd $APP_ROOT # add APP_ROOT to LD_LIBRARY_PATH if [ ! -z "$LD_LIBRARY_PATH" ]; then @@ -20,5 +19,5 @@ EXTRACTOR="ApacheVFS" # use Apache Commons VFS2 with junrar plugin # EXTRACTOR="SevenZipNativeBindings" # use the lib7-Zip-JBinding.so native library # start filebot -java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@" +/usr/lib/jvm/java-8-openjdk/bin/java -Dunixfs=false -DuseGVFS=false -DuseExtendedFileAttributes=true -DuseCreationDate=false -Djava.net.useSystemProxies=false -Dapplication.deployment=AUR -Dfile.encoding="UTF-8" -Dsun.jnu.encoding="UTF-8" -Djna.nosys=false -Djna.nounpack=true -Dnet.filebot.Archive.extractor="$EXTRACTOR" -Dnet.filebot.AcoustID.fpcalc="fpcalc" -Dapplication.dir=$HOME/.config/filebot -Djava.io.tmpdir=/tmp/filebot -Dapplication.update=skip -Djna.library.path=/usr/share/java/filebot $JAVA_OPTS -cp /usr/share/java/filebot/filebot.jar net.filebot.Main "$@" diff --git a/src/filebot/filebot.install b/src/filebot/filebot.install index f08802d..0260d16 100644 --- a/src/filebot/filebot.install +++ b/src/filebot/filebot.install @@ -1,6 +1,8 @@ post_install() { echo -e "\e[1;33m==>\e[0m if you use OpenJDK as Java VM you \e[1;31mmust\e[0m also install OpenJFX" echo -e "\e[1;33m==>\e[0m \e[1;36mhttps://wiki.archlinux.org/index.php/Java#OpenJFX\e[0m" +echo "" +echo -e "\e[1;33m==>\e[0m \e[1;31mfilebot --license license.file\e[0m will activate your license.file } post_upgrade() { diff --git a/src/gajim-plugin-omemo/PKGBUILD b/src/gajim-plugin-omemo/PKGBUILD index 15e6c6e..39e96c2 100644 --- a/src/gajim-plugin-omemo/PKGBUILD +++ b/src/gajim-plugin-omemo/PKGBUILD @@ -2,17 +2,17 @@ pkgname=gajim-plugin-omemo _pkgname=omemo -pkgver=2.5.13 +pkgver=2.6.27 pkgrel=1 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.0.0" "python-qrcode" "python-setuptools" "python-cryptography" "python-axolotl") +depends=("gajim>=1.0.99" "gajim<=1.1.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=('f5a22f2d7ee6c8b5c8e49df6bcbba05f8dfebff2c764470fa8c80c0ccf667f964fd33d5f4541cc1f6d5d4058c74ac9398b1e0c4ec10d37f3d40eb08d922180d9') +sha512sums=('886319c373bb6435626bd36103221c375cd419d7a39970c36f4a5950aff565a17c4d050fa147e3f50d4987371885a559f0fbdecad4f85e1b87a3f049c49f9078') package() { cd ${srcdir}/${_pkgname} @@ -21,8 +21,8 @@ package() { rm -r CHANGELOG COPYING # Install the plugin - install -d ${pkgdir}/usr/lib/python3.6/site-packages/gajim/data/plugins/${_pkgname} - cp -r * ${pkgdir}/usr/lib/python3.6/site-packages/gajim/data/plugins/${_pkgname}/ + install -d ${pkgdir}/usr/lib/python3.7/site-packages/gajim/data/plugins/${_pkgname} + cp -r * ${pkgdir}/usr/lib/python3.7/site-packages/gajim/data/plugins/${_pkgname}/ } # vim:set ts=2 sw=2 et: diff --git a/src/hivex/PKGBUILD b/src/hivex/PKGBUILD index 7800296..49111e5 100644 --- a/src/hivex/PKGBUILD +++ b/src/hivex/PKGBUILD @@ -3,7 +3,7 @@ pkgname=hivex pkgver=1.3.15 -pkgrel=2 +pkgrel=3 pkgdesc="System for extracting the contents of Windows Registry." arch=("i686" "x86_64") url="http://libguestfs.org" diff --git a/src/inspircd/PKGBUILD b/src/inspircd/PKGBUILD index e49273b..aabfb3b 100644 --- a/src/inspircd/PKGBUILD +++ b/src/inspircd/PKGBUILD @@ -20,7 +20,7 @@ source=("https://github.com/inspircd/inspircd/archive/v$pkgver.tar.gz" "https://raw.githubusercontent.com/inspircd/inspircd-extras/master/2.0/m_rehashsslsignal.cpp" 'inspircd.service') sha512sums=('56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd' -'a5f2a01bbc3e3ba0d5979d5146818edc3c6cfe975f1cdd84b7bb8ceb6ea734d2b3e1cfa8a41551b3ef622df508baddcc0c6f6fe79239026eed6c23cc9e31984f' +'a5f2a01bbc3e3ba0d5979d5146818edc3c6cfe975f1cdd84b7bb8ceb6ea734d2b3e1cfa8a41551b3ef622df508baddcc0c6f6fe79239026eed6c23cc9e31984f' '5a16a7c237693ffc6a108358f339b6aa2451fb16430561848ae869f890199b38fab6a13640bcc35cf1d07e32d7e5fff405d88668ee05ddaffc2ef61cb42ee832') build() { diff --git a/src/intellij-idea-ultimate-edition/PKGBUILD b/src/intellij-idea-ultimate-edition/PKGBUILD index 1e3610b..dc0d6e8 100644 --- a/src/intellij-idea-ultimate-edition/PKGBUILD +++ b/src/intellij-idea-ultimate-edition/PKGBUILD @@ -2,8 +2,8 @@ pkgbase=intellij-idea-ultimate-edition pkgname=(intellij-idea-ultimate-edition intellij-idea-ultimate-edition-jre) -pkgver=2018.3.4 -_buildver=183.5429.30 +pkgver=2018.3.5 +_buildver=183.5912.21 pkgrel=1 arch=('any') pkgdesc="An intelligent IDE for Java, Groovy and other programming languages with advanced refactoring features intensely focused on developer productivity." @@ -12,7 +12,7 @@ license=('Commercial') options=(!strip) source=("https://download.jetbrains.com/idea/ideaIU-$pkgver.tar.gz" "jetbrains-idea.desktop") -sha256sums=('3866349090ea295c0ac4f1b77d20c74d8c9647e73e5ad541c61b3dfbfc4ab5f3' +sha256sums=('b696da5c3521638f83891191f3bd9063d30d0b7ea81ad0bf9500f2b41840d078' '83af2ba8f9f14275a6684e79d6d4bd9b48cd852c047dacfc81324588fa2ff92b') prepare() { @@ -20,7 +20,7 @@ prepare() { mv idea-IU-$_buildver/jre64 "$srcdir"/jre64 } -package_intellij-idea-ultimate-edition() { +package() { backup=("opt/$pkgname/bin/idea.vmoptions" "opt/${pkgname}/bin/idea64.vmoptions" "opt/${pkgname}/bin/idea.properties") depends=('giflib' 'libxtst') optdepends=('intellij-idea-ultimate-edition-jre: JetBrains custom JRE (Recommended)' 'java-environment: Required if intellij-idea-ultimate-edition-jre is not installed') @@ -41,10 +41,4 @@ package_intellij-idea-ultimate-edition() { sed -i 's|lcd|on|' "$pkgdir"/opt/$pkgname/bin/*.vmoptions } -package_intellij-idea-ultimate-edition-jre() { - arch=('x86_64') - install -d -m 755 "$pkgdir"/opt/$pkgbase - mv "$srcdir"/jre64 "$pkgdir"/opt/$pkgbase -} - # vim:set ts=2 sw=2 et: diff --git a/src/isl/PKGBUILD b/src/isl/PKGBUILD index cf9c346..141b4f8 100644 --- a/src/isl/PKGBUILD +++ b/src/isl/PKGBUILD @@ -4,31 +4,28 @@ pkgname=isl pkgver=0.20 -pkgrel=4 +pkgrel=5 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64') url="http://isl.gforge.inria.fr/" -makedepends=('git') depends=('gmp') license=('MIT') conflicts=('isl-git' 'isl14' 'isl15' 'isl16' 'isl17') -source=("isl::git+http://repo.or.cz/isl.git#tag=isl-${pkgver}") -sha256sums=('SKIP') - +source=("http://isl.gforge.inria.fr/isl-${pkgver}.tar.gz") +sha256sums=('cf4ec18538df940ad5d5760af1246825cc58dd295241ab41d3f3962b24f55199') build() { - cd ${srcdir}/${pkgname} - ./autogen.sh + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd ${srcdir}/${pkgname} + cd ${srcdir}/${pkgname}-${pkgver} make check } package() { - cd ${srcdir}/${pkgname} + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="$pkgdir" install diff --git a/src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt b/src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt deleted file mode 100644 index 053a766..0000000 --- a/src/jdk-devel/LICENSE-Early-Adopter-Development-Agreement.txt +++ /dev/null @@ -1,95 +0,0 @@ -Oracle Technology Network Early Adopter Development License Agreement - -EXPORT CONTROLS -Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology. You agree that such export control laws govern Your use of the Oracle Technology (including technical data) and any services deliverables provided under this agreement, and You agree to comply with all such export laws and regulations (including “deemed export” and “deemed re-export” regulations). You agree that no data, information, program and/or materials resulting from services (or direct product thereof) will be exported, directly or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology. - -Accordingly, You confirm: - --You will not download, provide, make available or otherwise export or re-export the Oracle Technology, directly or indirectly, to countries prohibited by applicable laws and regulations nor to citizens, nationals or residents of those countries. - --You are not listed on the United States Department of Treasury lists of Specially Designated Nationals and Blocked Persons, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are You listed on the United States Department of Commerce Table of Denial Orders. - -- You will not download or otherwise export or re-export the Oracle Technology, directly or indirectly, to persons on the above mentioned lists. - -- You will not use the Oracle Technology for, and will not allow the Oracle Technology to be used for, any purposes prohibited by applicable law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction. - -Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose of distributing it to customers. Oracle products are available to employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination. - -Note: You are bound by the Oracle Technology Network ("OTN") Early Adopter Development License Agreement (“OTN License Agreement”) terms. The OTN License Agreement terms also apply to all updates You receive under Your Technology Track subscription. - -The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate). - -PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE. - -Oracle Technology Network Early Adopter Development License Agreement - -"Oracle,” We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which You are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. “Supplemental Programs” refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively “Oracle Technology”. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. “Oracle Confidential Information” includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other party’s lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle Confidential Information in confidence. You agree not to make Oracle’s Confidential Information available in any form to any unauthorized third parties. You agree to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by Your employees or agents in violation of the provisions of this Agreement. - -This agreement is governed by California law, except for that body of laws related to the conflict of laws. You agree to submit to the exclusive jurisdiction of, and venue in, the courts located in San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this agreement or the Oracle Technology. - -In order to use the Oracle Technology, You must first agree to the license terms below by selecting the "Accept License Agreement" (or the equivalent) button below. If You do not or cannot agree to these license terms, You are not permitted to access, download or use the Oracle Technology. - -License Rights -We grant You a revocable, nonexclusive, nontransferable, royalty-free and limited right to (a) use one (1) copy of the binary portions of the Programs and any Supplemental Programs for the sole purpose of internal non-production and non-commercial evaluation and testing of the Programs, including, developing no more than a single prototype of each of Your applications; and (b) if provided by Us at our sole discretion, view the source code portions of the Programs internally for the purposes of evaluation and testing only (collectively, “Authorized Use”). - -All rights not expressly granted above are hereby reserved. If You want to use the Oracle Technology for any purpose other than as permitted under this agreement, including but not limited to distribution of the Oracle Technology or the application You develop or any use of the Oracle Technology or the application You develop for Your internal business purposes (other than the Authorized Use), You must obtain a valid Oracle license permitting such use. - -You acknowledge that (1) the Programs are not generally available and may have defects, security vulnerabilities, or other deficiencies that may not and/or cannot be corrected by Us and are subject to change at Our sole discretion; and (2) We may not produce a production release version of the Programs and any development efforts undertaken by You are at Your own risk. We may audit Your use of the Oracle Technology. - -The Oracle Technology will either be hosted by Oracle or provided to You. In the event that the Oracle Technology are provided to You in a hosted environment, Oracle may provide certain passwords and/or other access information to enable You to access the Oracle Technology. These passwords and/or access information shall be and are Oracle Confidential Information under the terms of this agreement and shall be used solely for the purpose of accessing the Oracle Technology for the evaluation and testing purposes described above. Any hosted instance of the Oracle Technology is provided as is and without warranty. Oracle makes no assurances that any data loaded into the hosted instance will be secured or that such data will remain confidential. Further, Oracle, at its discretion, (a) may access, monitor, and/or review Your activity and data in the hosted instance, and (b) may delete Your files within the hosted instance. Accordingly, Oracle advises You not to place any personal information or other production data into the hosted instance. You agree to take all reasonable steps to prevent improper or unauthorized access to or use of the Oracle Technology. - -Collection of Information -The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html . - -Ownership and Restrictions -We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees or agents in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes. - -The license grant set forth above is subject to the following additional specific agreements and covenants: - -(i) You shall not use the Oracle Technology for training, commercial time-sharing or service bureau use; - -(ii) You agree that it will not make copies of the Oracle Technology except for backup purposes; - -(iii) You agree not to cause or permit the disassembly, reverse compilation, or reverse engineering of the Oracle Technology, except as otherwise specified by law; and - -(iv) You shall not remove any product identification, copyright notices, or other notices or proprietary restrictions from the Oracle Technology. - -Feedback -”Feedback” shall mean any input provided to Us, in any manner, regarding Oracle’s products, documentation and/or services, including changes or suggested changes to Oracle’s current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. You shall not be identified with Feedback if Oracle provides it to a third party. - -Export -You agree to comply fully with export laws and regulations of the United States and any other applicable export laws ("Export Laws") to assure that neither the Software, Confidential Information nor any direct product thereof are: (1) exported, directly or indirectly, in violation of this Agreement or Export Laws; or (2) used for any purposes prohibited by the Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology. - -Disclaimer of Warranty and Exclusive Remedies -THE ORACLE TECHNOLOGY IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, ACCURACY, TIMELINESS OR NONINFRINGEMENT. - -IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000). - -Additional Trial Programs -We may include additional trial programs with the Programs licensed under this agreement which You download or access in the hosted environment. You will have 30 days from the delivery date or hosted environment access date to evaluate these additional trial programs. Any use of these trial programs after the 30 day trial period requires You to obtain the applicable license. Any additional trial programs are provided "as is" and We do not provide technical support or any warranties for these programs. - -No Technical Support -Our technical support organization will not provide technical support, phone support, or updates to You for the Oracle Technology licensed under this agreement. - -End of Agreement -This agreement, and Your right to use the Programs, will be terminated: (i) automatically upon the general commercial availability of the Programs, or six months from the date You download the Programs, whichever is first to occur, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control; (ii) by You, by ceasing to use and destroying all copies of the Oracle Technology in Your possession or control; or, (iii) by Us if You fail to comply with any of the terms of this agreement, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control. - -Relationship Between the Parties -The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software. - -Third-Party Technology -The Oracle Technology may be distributed to You with third party technology or derivatives of third party technology (“Third Party Technology”). Oracle may provide certain notices to You in Oracle Technology documentation, readmes or otherwise in connection with such Third Party Technology. - -Third Party Technology will be licensed to You either under the terms of this agreement, or, if specified in the Oracle Technology documentation, readme files or otherwise, under separate license terms (“Separate Terms”) and not under the terms of this agreement (“Separately Licensed Third Party Technology”). Your rights to use such Separately Licensed Third Party Technology under the Separate Terms are not restricted or modified in any way by this agreement. - -Entire Agreement -You agree that this agreement is the complete agreement for the Oracle Technology and licenses, and, except as may be expressly set forth in Exhibit A, this agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses. If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective. - -Last updated: 24 February 2015 - -Should You have any questions concerning this License Agreement, or if You desire to contact Oracle for any reason, please write: -Oracle America, Inc. -500 Oracle Parkway, -Redwood City, CA 94065 - -Oracle may contact You to ask if You had a satisfactory experience installing and using this software download and/or accessing and using the hosted environment. diff --git a/src/jdk-devel/LICENSE-Early-Adopter-Terms.txt b/src/jdk-devel/LICENSE-Early-Adopter-Terms.txt deleted file mode 100644 index 2c76bf8..0000000 --- a/src/jdk-devel/LICENSE-Early-Adopter-Terms.txt +++ /dev/null @@ -1,95 +0,0 @@ -Oracle Technology Network Early Adopter Development License Agreement - -EXPORT CONTROLS -Export laws and regulations of the United States and any other relevant local export laws and regulations apply to the Oracle Technology. You agree that such export control laws govern Your use of the Oracle Technology (including technical data) and any services deliverables provided under this agreement, and You agree to comply with all such export laws and regulations (including deemed export and deemed re-export regulations). You agree that no data, information, program and/or materials resulting from services (or direct product thereof) will be exported, directly or indirectly, in violation of these laws, or will be used for any purpose prohibited by these laws including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology. - -Accordingly, You confirm: - --You will not download, provide, make available or otherwise export or re-export the Oracle Technology, directly or indirectly, to countries prohibited by applicable laws and regulations nor to citizens, nationals or residents of those countries. - --You are not listed on the United States Department of Treasury lists of Specially Designated Nationals and Blocked Persons, Specially Designated Terrorists, and Specially Designated Narcotic Traffickers, nor are You listed on the United States Department of Commerce Table of Denial Orders. - -- You will not download or otherwise export or re-export the Oracle Technology, directly or indirectly, to persons on the above mentioned lists. - -- You will not use the Oracle Technology for, and will not allow the Oracle Technology to be used for, any purposes prohibited by applicable law, including, without limitation, for the development, design, manufacture or production of nuclear, chemical or biological weapons of mass destruction. - -Oracle Employees: Under no circumstances are Oracle Employees authorized to download software for the purpose of distributing it to customers. Oracle products are available to employees for internal use or demonstration purposes only. In keeping with Oracle's trade compliance obligations under U.S. and applicable multilateral law, failure to comply with this policy could result in disciplinary action up to and including termination. - -Note: You are bound by the Oracle Technology Network ("OTN") Early Adopter Development License Agreement (OTN License Agreement) terms. The OTN License Agreement terms also apply to all updates You receive under Your Technology Track subscription. - -The OTN License Agreement terms below supercede any shrinkwrap license on the OTN Technology Track software CDs and previous OTN License terms (including the Oracle Program License as modified by the OTN Program Use Certificate). - -PLEASE READ THE FOLLOWING LICENSE AGREEMENT TERMS AND CONDITIONS CAREFULLY BEFORE ACCESSING, DOWNLOADING, INSTALLING OR USING THE ORACLE TECHNOLOGY. THESE TERMS AND CONDITIONS CONSTITUTE A LEGAL AGREEMENT BETWEEN YOU AND ORACLE. - -Oracle Technology Network Early Adopter Development License Agreement - -"Oracle, We," "Us," and "Our" refers to Oracle America, Inc., for and on behalf of itself and its subsidiaries and affiliates under common control. "You" and "Your" refers to the individual or entity, for which You are an authorized representative with full authority to enter into this agreement on behalf of, that wishes to use the Programs. "Programs" refers to the pre-production version of the Oracle software product You wish to access and use or download and use, including program documentation, if any. Supplemental Programs refer to any supplemental Oracle production software as may be provided by Oracle for operation of the Programs. If included, Supplemental Programs are listed in Exhibit A to this Agreement. Programs and any Supplemental Programs are collectively Oracle Technology. "License" refers to Your right to use the Oracle Technology under the terms of this license agreement. Oracle Confidential Information includes the Software, any information related to the Software and Feedback. Oracle Confidential Information shall not include information which: (a) is or becomes a part of the public domain through no act or omission of the other party; or (b) was in the other partys lawful possession prior to the disclosure and had not been obtained by the other party either directly or indirectly from the disclosing party; or (c) is lawfully disclosed to the other party by a third party without restriction on disclosure; or (d) except for Feedback, is independently developed by You. You agree, both during the term of this Agreement and for a period of three years after termination of this Agreement and of all licenses granted hereunder, to hold Oracle Confidential Information in confidence. You agree not to make Oracles Confidential Information available in any form to any unauthorized third parties. You agree to take all reasonable steps to ensure that Confidential Information is not disclosed or distributed by Your employees or agents in violation of the provisions of this Agreement. - -This agreement is governed by California law, except for that body of laws related to the conflict of laws. You agree to submit to the exclusive jurisdiction of, and venue in, the courts located in San Francisco or Santa Clara counties in California in any dispute arising out of or relating to this agreement or the Oracle Technology. - -In order to use the Oracle Technology, You must first agree to the license terms below by selecting the "Accept License Agreement" (or the equivalent) button below. If You do not or cannot agree to these license terms, You are not permitted to access, download or use the Oracle Technology. - -License Rights -We grant You a revocable, nonexclusive, nontransferable, royalty-free and limited right to (a) use one (1) copy of the binary portions of the Programs and any Supplemental Programs for the sole purpose of internal non-production and non-commercial evaluation and testing of the Programs, including, developing no more than a single prototype of each of Your applications; and (b) if provided by Us at our sole discretion, view the source code portions of the Programs internally for the purposes of evaluation and testing only (collectively, Authorized Use). - -All rights not expressly granted above are hereby reserved. If You want to use the Oracle Technology for any purpose other than as permitted under this agreement, including but not limited to distribution of the Oracle Technology or the application You develop or any use of the Oracle Technology or the application You develop for Your internal business purposes (other than the Authorized Use), You must obtain a valid Oracle license permitting such use. - -You acknowledge that (1) the Programs are not generally available and may have defects, security vulnerabilities, or other deficiencies that may not and/or cannot be corrected by Us and are subject to change at Our sole discretion; and (2) We may not produce a production release version of the Programs and any development efforts undertaken by You are at Your own risk. We may audit Your use of the Oracle Technology. - -The Oracle Technology will either be hosted by Oracle or provided to You. In the event that the Oracle Technology are provided to You in a hosted environment, Oracle may provide certain passwords and/or other access information to enable You to access the Oracle Technology. These passwords and/or access information shall be and are Oracle Confidential Information under the terms of this agreement and shall be used solely for the purpose of accessing the Oracle Technology for the evaluation and testing purposes described above. Any hosted instance of the Oracle Technology is provided as is and without warranty. Oracle makes no assurances that any data loaded into the hosted instance will be secured or that such data will remain confidential. Further, Oracle, at its discretion, (a) may access, monitor, and/or review Your activity and data in the hosted instance, and (b) may delete Your files within the hosted instance. Accordingly, Oracle advises You not to place any personal information or other production data into the hosted instance. You agree to take all reasonable steps to prevent improper or unauthorized access to or use of the Oracle Technology. - -Collection of Information -The Oracle Technology may collect certain technical information regarding Your use of the Oracle Technology for the purpose of improving the functionality of the Oracle Technology. Except as set forth above with respect to Oracle-hosted instances of the Oracle Technology, Oracle will comply with its Privacy Policy in effect as data collection services are performed, which is available at http://www.oracle.com/us/legal/privacy/index.html . - -Ownership and Restrictions -We retain all ownership and intellectual property rights in the Oracle Technology. The Oracle Technology may be accessed from the hosted environment or if the Oracle Technology are provided to You, the Oracle Technology may be installed on one computer only, and used by Your employees or agents in the operating environment identified by Us. You may make one copy of the Oracle Technology for backup purposes. - -The license grant set forth above is subject to the following additional specific agreements and covenants: - -(i) You shall not use the Oracle Technology for training, commercial time-sharing or service bureau use; - -(ii) You agree that it will not make copies of the Oracle Technology except for backup purposes; - -(iii) You agree not to cause or permit the disassembly, reverse compilation, or reverse engineering of the Oracle Technology, except as otherwise specified by law; and - -(iv) You shall not remove any product identification, copyright notices, or other notices or proprietary restrictions from the Oracle Technology. - -Feedback -Feedback shall mean any input provided to Us, in any manner, regarding Oracles products, documentation and/or services, including changes or suggested changes to Oracles current or future products, documentation, and/or services, and benchmark test results. You grant to Oracle a worldwide, royalty-free, non-exclusive, perpetual, and irrevocable right to use Feedback for any purpose, including but not limited to, incorporation of such Feedback into the Software or other software products without compensation to You. Any Feedback shall be Oracle Confidential Information. You shall not be identified with Feedback if Oracle provides it to a third party. - -Export -You agree to comply fully with export laws and regulations of the United States and any other applicable export laws ("Export Laws") to assure that neither the Software, Confidential Information nor any direct product thereof are: (1) exported, directly or indirectly, in violation of this Agreement or Export Laws; or (2) used for any purposes prohibited by the Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation, or development of missile technology. - -Disclaimer of Warranty and Exclusive Remedies -THE ORACLE TECHNOLOGY IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A PARTICULAR PURPOSE, ACCURACY, TIMELINESS OR NONINFRINGEMENT. - -IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, INCIDENTAL, SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. OUR ENTIRE LIABILITY FOR DAMAGES HEREUNDER SHALL IN NO EVENT EXCEED ONE THOUSAND DOLLARS (U.S. $1,000). - -Additional Trial Programs -We may include additional trial programs with the Programs licensed under this agreement which You download or access in the hosted environment. You will have 30 days from the delivery date or hosted environment access date to evaluate these additional trial programs. Any use of these trial programs after the 30 day trial period requires You to obtain the applicable license. Any additional trial programs are provided "as is" and We do not provide technical support or any warranties for these programs. - -No Technical Support -Our technical support organization will not provide technical support, phone support, or updates to You for the Oracle Technology licensed under this agreement. - -End of Agreement -This agreement, and Your right to use the Programs, will be terminated: (i) automatically upon the general commercial availability of the Programs, or six months from the date You download the Programs, whichever is first to occur, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control; (ii) by You, by ceasing to use and destroying all copies of the Oracle Technology in Your possession or control; or, (iii) by Us if You fail to comply with any of the terms of this agreement, in which case You shall cease using and destroy all copies of the Oracle Technology in Your possession or control. - -Relationship Between the Parties -The relationship between You and Us is that of licensee/licensor. Neither party will represent that it has any authority to assume or create any obligation, express or implied, on behalf of the other party, nor to represent the other party as agent, employee, franchisee, or in any other capacity. Nothing in this agreement shall be construed to limit either party's right to independently develop or distribute software that is functionally similar to the other party's products, so long as proprietary information of the other party is not included in such software. - -Third-Party Technology -The Oracle Technology may be distributed to You with third party technology or derivatives of third party technology (Third Party Technology). Oracle may provide certain notices to You in Oracle Technology documentation, readmes or otherwise in connection with such Third Party Technology. - -Third Party Technology will be licensed to You either under the terms of this agreement, or, if specified in the Oracle Technology documentation, readme files or otherwise, under separate license terms (Separate Terms) and not under the terms of this agreement (Separately Licensed Third Party Technology). Your rights to use such Separately Licensed Third Party Technology under the Separate Terms are not restricted or modified in any way by this agreement. - -Entire Agreement -You agree that this agreement is the complete agreement for the Oracle Technology and licenses, and, except as may be expressly set forth in Exhibit A, this agreement supersedes all prior or contemporaneous agreements or representations, including any clickwrap, shrinkwrap or similar licenses. If any term of this agreement is found to be invalid or unenforceable, the remaining provisions will remain effective. - -Last updated: 24 February 2015 - -Should You have any questions concerning this License Agreement, or if You desire to contact Oracle for any reason, please write: -Oracle America, Inc. -500 Oracle Parkway, -Redwood City, CA 94065 - -Oracle may contact You to ask if You had a satisfactory experience installing and using this software download and/or accessing and using the hosted environment. \ No newline at end of file diff --git a/src/jdk-devel/PKGBUILD b/src/jdk-devel/PKGBUILD deleted file mode 100644 index 6398e42..0000000 --- a/src/jdk-devel/PKGBUILD +++ /dev/null @@ -1,109 +0,0 @@ -# Maintainer: Det - -_pkgname=jdk -pkgname=jdk-devel -_major=11 -_build=28 -_jname=${_pkgname}${_major} -pkgver=${_major}b${_build} -pkgrel=1 -pkgdesc="Oracle Java $_major Development Kit Snapshot" -arch=('x86_64') -url="http://jdk.java.net/$_major/" -license=('custom:Oracle') -depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils') -optdepends=('alsa-lib: for basic sound support' - 'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse' - 'gtk2: for Gtk+ look and feel (desktop)') -provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major" - "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major" - "java-openjfx=$_major" "$_jname") -conflicts=("$_jname") -_jvmdir=/usr/lib/jvm/java-$_major-$_pkgname -backup=("etc/java-$_jname/management/jmxremote.access" - "etc/java-$_jname/management/management.properties" - "etc/java-$_jname/security/java.policy" - "etc/java-$_jname/security/java.security" - "etc/java-$_jname/logging.properties" - "etc/java-$_jname/net.properties" - "etc/java-$_jname/sound.properties") -options=('!strip') # JDK debug-symbols -install=$pkgname.install -source=("https://download.java.net/java/early_access/jdk${_major}/${_build}/BCL/${_pkgname}-${_major}+${_build}_linux-x64_bin.tar.gz" - 'java.desktop' - 'jconsole.desktop' - 'java_16.png' - 'java_48.png' - 'LICENSE-Early-Adopter-Development-Agreement.txt') -sha256sums=('58e7d9d42e5251803773c7b28e67b1848d3fe152cc7f150078285e61856c741f' - 'ed7392cbad258da943d39e9a5fab1ee6ab6a287ac0c20172805d5dbfc5accedb' - 'e8544f5384d541c16973543ace0f812e2dea657eed551a70baebb1a0cd9f3771' - 'd27fec1d74f7a3081c3d175ed184d15383666dc7f02cc0f7126f11549879c6ed' - '7cf8ca096e6d6e425b3434446b0835537d0fc7fe64b3ccba7a55f7bd86c7e176' - '36d48f14c16f0dcc98a8ce2301fd2a111701e6f59a7da08b0e51fdb3e2f9ca89') - -package() { - cd $_pkgname-$_major - - msg2 "Creating directory structure..." - install -d "$pkgdir"/etc/.java/.systemPrefs - install -d "$pkgdir"/usr/lib/jvm/java-$_major-$_pkgname/bin - install -d "$pkgdir"/usr/lib/mozilla/plugins - install -d "$pkgdir"/usr/share/licenses/java$_major-$_pkgname - - msg2 "Moving contents..." - mv * "$pkgdir"/$_jvmdir - - # Cd to the new playground - cd "$pkgdir"/$_jvmdir - - msg2 "Fixing directory structure..." - # Create a placeholder 'jre' link - ln -s . jre - - # Move + suffix .desktops - for i in $(printf -- '%s\n' "${source[@]}" | grep desktop | cut -d "." -f1); do - install -Dm644 "$srcdir"/$i.desktop "$pkgdir"/usr/share/applications/$i-$_jname.desktop - done - - # Move + suffix icons - for i in 16 48; do - install -Dm644 "$srcdir"/java_$i.png "$pkgdir"/usr/share/icons/hicolor/${i}x$i/apps/java-$_jname.png - done - - # Write versions to .desktops + .install - sed -i "s//$_major/" "$pkgdir"/usr/share/applications/* "$startdir"/$pkgname.install - - # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc - for sub_path in $(find conf/ -type f); do - # New location - new_etc_path="/etc/java-$_jname/${sub_path/conf\/}" - - # Move & link - install -Dm644 "$sub_path" "$pkgdir/$new_etc_path" - ln -sf "$new_etc_path" "$sub_path" - done - - # Link NPAPI plugin - ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so - - # Replace JKS keystore with 'ca-certificates-java' - ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts - - # Move & link licenses - mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/ - install -m644 "$srcdir"/LICENSE-Early-Adopter-Development-Agreement.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/ - ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$pkgdir"/usr/share/licenses/$pkgname - - msg2 "Enabling copy+paste in unsigned applets..." - # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: - # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java - # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html - _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy) - sed "$_line a\\\\n \ - // (AUR) Allow unsigned applets to read system clipboard, see:\n \ - // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \ - // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \ - permission java.awt.AWTPermission \"accessClipboard\";" \ - -i "$pkgdir"/etc/java-$_jname/security/java.policy -} diff --git a/src/jdk-devel/java.desktop b/src/jdk-devel/java.desktop deleted file mode 100644 index 1e31598..0000000 --- a/src/jdk-devel/java.desktop +++ /dev/null @@ -1,25 +0,0 @@ -# -# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. -# Use is subject to license terms. -# -# Desktop entry for automatic execution of files identified as either the -# x-jar or x-java-archive (historical) mime type. -# -# Note: This file may be installed under both "control-center-2.0" and -# "applications". Depending upon the version of GNOME, the copy in -# "applications" may take precedence. -# -# One might be tempted to add "Java" to the Catergories, but the definition -# is "uses Swing/ATW" whhich may not be true. -# -[Desktop Entry] -Encoding=UTF-8 -Name=Java -Comment=Java Virtual Machine -Exec=/usr/lib/jvm/java--jdk/bin/java -jar -Icon=java-jdk -Terminal=false -Type=Application -NoDisplay=true -Categories=Applications; -MimeType=application/x-java-archive;application/x-jar; diff --git a/src/jdk-devel/java_16.png b/src/jdk-devel/java_16.png deleted file mode 100644 index 0456bab..0000000 Binary files a/src/jdk-devel/java_16.png and /dev/null differ diff --git a/src/jdk-devel/java_48.png b/src/jdk-devel/java_48.png deleted file mode 100644 index 9fa80e7..0000000 Binary files a/src/jdk-devel/java_48.png and /dev/null differ diff --git a/src/jdk-devel/jconsole-jdk9.desktop b/src/jdk-devel/jconsole-jdk9.desktop deleted file mode 100644 index b04ec08..0000000 --- a/src/jdk-devel/jconsole-jdk9.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-9-jdk/bin/jconsole -Icon=sun-java-jdk9 -Name=Java 9 Monitoring and Management Console -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk-devel/jconsole.desktop b/src/jdk-devel/jconsole.desktop deleted file mode 100644 index 4259ac4..0000000 --- a/src/jdk-devel/jconsole.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Java Monitoring and Management Console -Exec=/usr/lib/jvm/java--jdk/bin/jconsole -Icon=java-jdk -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk-devel/jdk-devel.install b/src/jdk-devel/jdk-devel.install deleted file mode 100644 index 6b327f5..0000000 --- a/src/jdk-devel/jdk-devel.install +++ /dev/null @@ -1,74 +0,0 @@ -VERSION='11' -THIS_JAVA='java-${VERSION}-jdk' -NAME='JDK Devel' - -all_off="$(tput sgr0)" -bold="${all_off}$(tput bold)" -blue="${bold}$(tput setaf 4)" -yellow="${bold}$(tput setaf 3)" - -note() { - printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n" -} - -note2() { - printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n" -} - -post_install() { - default=$(archlinux-java get) - case ${default} in - "") - archlinux-java set ${THIS_JAVA} - note "${NAME} ('${THIS_JAVA}') set as default Java environment." - ;; - ${THIS_JAVA}) - note "${NAME} ('${THIS_JAVA}') set as default Java environment." - ;; - *) - note "Default Java environment already set to '${default}'. - To use ${NAME} ('${THIS_JAVA}'), run: - # archlinux-java set ${THIS_JAVA} - For status, use: - $ archlinux-java status" - ;; - esac - - if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then - update-ca-trust - fi - - note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and - GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink - (/usr/lib/mozilla/plugins/libnpjp2-jdk${VERSION}.so). - - See: - - https://github.com/zealdocs/zeal/issues/802 - - https://bbs.archlinux.org/viewtopic.php?id=231222" -} - -post_upgrade() { - post_install -} - -pre_remove() { - default=$(archlinux-java get) - if [[ ${default} = ${THIS_JAVA} ]]; then - archlinux-java unset - fi -} - -post_remove() { - default=$(archlinux-java get) # reassign - if [[ ${default} ]]; then - note "Default Java environment is '${default}'." - else - archlinux-java fix - default=$(archlinux-java get) # re-reassign - if [[ ${default} ]]; then - note "Default Java environment left as '${default}'." - else - note "Java environment unset." - fi - fi -} diff --git a/src/jdk-devel/jmc-jdk9.desktop b/src/jdk-devel/jmc-jdk9.desktop deleted file mode 100644 index a3e5152..0000000 --- a/src/jdk-devel/jmc-jdk9.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-9-jdk/bin/jmc -Icon=sun-java-jdk9 -Name=Java 9 Mission Control -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk-devel/jvisualvm-jdk9.desktop b/src/jdk-devel/jvisualvm-jdk9.desktop deleted file mode 100644 index f45d4fc..0000000 --- a/src/jdk-devel/jvisualvm-jdk9.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-9-jdk/bin/jvisualvm -GenericName=Java Monitoring and Performance Monitoring Tool -Icon=sun-java-jdk9 -Name=Java 9 VisualVM -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk-devel/policytool-jdk9.desktop b/src/jdk-devel/policytool-jdk9.desktop deleted file mode 100644 index b94f49a..0000000 --- a/src/jdk-devel/policytool-jdk9.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-9-jdk/bin/policytool -Icon=sun-java-jdk9 -Name=Java 9 Policy Settings -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/src/jdk/PKGBUILD b/src/jdk/PKGBUILD deleted file mode 100644 index 7be0fee..0000000 --- a/src/jdk/PKGBUILD +++ /dev/null @@ -1,124 +0,0 @@ -# Maintainer: Det - -pkgname=jdk -pkgver=10.0.2 -_major=${pkgver/.*} -_build=13 -_hash=19aef61b38124481863b1413dce1855f -_jname=${pkgname}${_major} -pkgrel=1 -pkgdesc="Oracle Java Development Kit" -arch=('x86_64') -url="http://www.oracle.com/technetwork/java/javase/downloads/index.html" -license=('custom:Oracle') -depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils') -optdepends=('alsa-lib: for basic sound support' - 'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse' - 'gtk2: for Gtk+ look and feel (desktop)') -provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major" - "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major" - "java-openjfx=$_major" "$_jname") -conflicts=("$_jname") -_jvmdir=/usr/lib/jvm/java-$_major-$pkgname -backup=("etc/java-$_jname/management/jmxremote.access" - "etc/java-$_jname/management/management.properties" - "etc/java-$_jname/security/java.policy" - "etc/java-$_jname/security/java.security" - "etc/java-$_jname/security/javaws.policy" - "etc/java-$_jname/logging.properties" - "etc/java-$_jname/net.properties" - "etc/java-$_jname/sound.properties") -options=('!strip') # JDK debug-symbols -install=$pkgname.install -source=("http://download.oracle.com/otn-pub/java/jdk/${pkgver}+${_build}/${_hash}/${pkgname}-${pkgver}_linux-x64_bin.tar.gz" - "jconsole.desktop" - "jmc.desktop" - "policytool.desktop") -sha256sums=('6633c20d53c50c20835364d0f3e172e0cbbce78fff81867488f22a6298fa372b' - '3ea717825268a66837380c9ca2b076f02a3298d2df48c3450152fdaf1d0dbc6e' - '365b33b197e6be65ad746e5ed864428e45ae1e24dba53aa7d9c71de0644cf4e2' - '5dfde6ee531056571d9601d47fbb4a3e56062e4d611667a56ba7931ec7948b36') - -DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u') - -package() { - cd $pkgname-$pkgver - - msg2 "Creating directory structure..." - install -d "$pkgdir"/etc/.java/.systemPrefs - install -d "$pkgdir"/usr/lib/jvm/java-$_major-$pkgname/bin - install -d "$pkgdir"/usr/lib/mozilla/plugins - install -d "$pkgdir"/usr/share/licenses/java$_major-$pkgname - - msg2 "Removing redundancies..." - rm -r lib/desktop/icons/HighContrast - rm -r lib/desktop/icons/HighContrastInverse - rm -r lib/desktop/icons/LowContrast - rm lib/fontconfig.*.bfc - rm lib/fontconfig.*.properties.src - - msg2 "Moving contents..." - mv * "$pkgdir"/$_jvmdir - - # Cd to the new playground - cd "$pkgdir"/$_jvmdir - - msg2 "Fixing directory structure..." - # Create a placeholder 'jre' link - ln -s . jre - - # Fix bundled .desktops - sed -e "s|Exec=|Exec=$_jvmdir/bin/|" \ - -e "s|.png|-$_jname.png|" \ - -i lib/desktop/applications/* - - # Move .desktops + icons to /usr/share - mv lib/desktop/* "$pkgdir"/usr/share/ - install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ - - # Suffix .desktops + icon (sun-jcontrol.png -> sun-jcontrol-$_jname.png) - for i in $(find "$pkgdir"/usr/share/ -type f); do - rename -- "." "-$_jname." $i - done - - # Write versions to .desktops + .install - sed -i "s//$_major/" "$pkgdir"/usr/share/applications/* "$startdir"/$pkgname.install - - # Link missing icons - for i in $(find "$pkgdir"/usr/share/icons/ -name "sun-jcontrol-$_jname.png" -type f); do - ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/java}" - ln -s "sun-jcontrol-$_jname.png" "${i/jcontrol/javaws}" - done - - # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/conf -> /etc - for sub_path in $(find conf/ -type f); do - # New location - new_etc_path="/etc/java-$_jname/${sub_path/conf\/}" - - # Move & link - install -Dm644 "$sub_path" "$pkgdir/$new_etc_path" - ln -sf "$new_etc_path" "$sub_path" - done - - # Link NPAPI plugin - ln -sf $_jvmdir/lib/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so - - # Replace JKS keystore with 'ca-certificates-java' - ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts - - # Move & link licenses - mv legal/ "$pkgdir"/usr/share/licenses/java$_major-$pkgname/ - ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname - - msg2 "Enabling copy+paste in unsigned applets..." - # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: - # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java - # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html - _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy) - sed "$_line a\\\\n \ - // (AUR) Allow unsigned applets to read system clipboard, see:\n \ - // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \ - // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \ - permission java.awt.AWTPermission \"accessClipboard\";" \ - -i "$pkgdir"/etc/java-$_jname/security/java.policy -} diff --git a/src/jdk/jconsole-jdk8.desktop b/src/jdk/jconsole-jdk8.desktop deleted file mode 100644 index ee4f02b..0000000 --- a/src/jdk/jconsole-jdk8.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-8-jdk/bin/jconsole -Icon=sun-java-jdk8 -Name=Java Monitoring and Management Console -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk/jconsole.desktop b/src/jdk/jconsole.desktop deleted file mode 100644 index 310ce80..0000000 --- a/src/jdk/jconsole.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java--jdk/bin/jconsole -Icon=sun-java-jdk -Name=Java Monitoring and Management Console -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk/jdk.install b/src/jdk/jdk.install deleted file mode 100644 index 8c38f1a..0000000 --- a/src/jdk/jdk.install +++ /dev/null @@ -1,74 +0,0 @@ -VERSION='' -THIS_JAVA='java-${VERSION}-jdk' -NAME='JDK' - -all_off="$(tput sgr0)" -bold="${all_off}$(tput bold)" -blue="${bold}$(tput setaf 4)" -yellow="${bold}$(tput setaf 3)" - -note() { - printf "${blue}::${yellow} archlinux-java:${bold} $1${all_off}\n" -} - -note2() { - printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n" -} - -post_install() { - default=$(archlinux-java get) - case ${default} in - "") - archlinux-java set ${THIS_JAVA} - note "${NAME} ('${THIS_JAVA}') set as default Java environment." - ;; - ${THIS_JAVA}) - note "${NAME} ('${THIS_JAVA}') set as default Java environment." - ;; - *) - note "Default Java environment already set to '${default}'. - To use ${NAME} ('${THIS_JAVA}'), run: - # archlinux-java set ${THIS_JAVA} - For status, use: - $ archlinux-java status" - ;; - esac - - if [[ ! -f /etc/ssl/certs/java/cacerts ]]; then - update-ca-trust - fi - - note2 "Since Oracle Java 9, some Qt 5 applications (such as the reader apps Zeal and - GoldenDict) will crash due to the existance of the Java NPAPI plugin symlink - (/usr/lib/mozilla/plugins/libnpjp2-jdk${VERSION}.so). - - See: - - https://github.com/zealdocs/zeal/issues/802 - - https://bbs.archlinux.org/viewtopic.php?id=231222" -} - -post_upgrade() { - post_install -} - -pre_remove() { - default=$(archlinux-java get) - if [[ ${default} = ${THIS_JAVA} ]]; then - archlinux-java unset - fi -} - -post_remove() { - default=$(archlinux-java get) # reassign - if [[ ${default} ]]; then - note "Default Java environment is '${default}'." - else - archlinux-java fix - default=$(archlinux-java get) # re-reassign - if [[ ${default} ]]; then - note "Default Java environment left as '${default}'." - else - note "Java environment unset." - fi - fi -} diff --git a/src/jdk/jmc-jdk8.desktop b/src/jdk/jmc-jdk8.desktop deleted file mode 100644 index b28e16d..0000000 --- a/src/jdk/jmc-jdk8.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-8-jdk/bin/jmc -Icon=sun-java-jdk8 -Name=Java Mission Control -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk/jmc.desktop b/src/jdk/jmc.desktop deleted file mode 100644 index 9131629..0000000 --- a/src/jdk/jmc.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java--jdk/bin/jmc -Icon=sun-java-jdk -Name=Java Mission Control -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk/jvisualvm-jdk8.desktop b/src/jdk/jvisualvm-jdk8.desktop deleted file mode 100644 index 5b29481..0000000 --- a/src/jdk/jvisualvm-jdk8.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-8-jdk/bin/jvisualvm -GenericName=Java Monitoring and Performance Monitoring Tool -Icon=sun-java-jdk8 -Name=Java VisualVM -StartupNotify=true -Terminal=false -Type=Application -Categories=Development;Java; diff --git a/src/jdk/policytool-jdk8.desktop b/src/jdk/policytool-jdk8.desktop deleted file mode 100644 index 0b037ee..0000000 --- a/src/jdk/policytool-jdk8.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java-8-jdk/jre/bin/policytool -Icon=sun-java-jdk8 -Name=Java Policy Settings -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/src/jdk/policytool.desktop b/src/jdk/policytool.desktop deleted file mode 100644 index 355280c..0000000 --- a/src/jdk/policytool.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Exec=/usr/lib/jvm/java--jdk/bin/policytool -Icon=sun-java-jdk -Name=Java Policy Settings -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/src/jdk6/PKGBUILD b/src/jdk6/PKGBUILD index a27f140..7d7aae2 100755 --- a/src/jdk6/PKGBUILD +++ b/src/jdk6/PKGBUILD @@ -8,7 +8,7 @@ _major=6 _minor=45 _build=b06 pkgver=${_major}u${_minor} -pkgrel=6 +pkgrel=7 pkgdesc="Oracle Java $_major Development Kit (public release - end of support)" arch=('i686' 'x86_64') url=https://www.java.com/en/download/faq/java_6.xml @@ -163,7 +163,7 @@ package() { ln -sf /usr/share/licenses/java$_major-$pkgname/ "$pkgdir"/usr/share/licenses/$pkgname # Java Cryptography Extension (JCE) Unlimited Strength files - rename -- ".jar" "-limited.jar" jre/lib/security/* + rename -- ".jar" "-limited.jar" jre/lib/security/*.jar install -Dm644 "$srcdir"/jce/* jre/lib/security/ # Do the move diff --git a/src/jdk8/PKGBUILD b/src/jdk8/PKGBUILD index 71030ea..d4fc0e5 100644 --- a/src/jdk8/PKGBUILD +++ b/src/jdk8/PKGBUILD @@ -1,157 +1,178 @@ -# Maintainer: Det +# Maintainer: Chris Severance aur.severach AatT spamgourmet.com +# Contributor: Det -_pkgname=jdk -pkgname=jdk8 -_major=8 -_minor=181 -_build=b13 -_hash=96a7b8442fe848ef90c96a2fad6ed6d1 -pkgver=${_major}u${_minor} -pkgrel=1 -pkgdesc="Oracle Java $_major Development Kit" +set -u +_pkgname='jdk' +_major='8' +pkgname="${_pkgname}${_major}" +_minor='202'; _build='b08'; _hash='1961070e4c9b4e26a04e7f5a083f551e' +pkgver="${_major}u${_minor}" +pkgrel='1' +pkgdesc="Oracle Java ${_major} Development Kit" arch=('x86_64') -url="http://www.oracle.com/technetwork/java/javase/downloads/index.html" +url='http://www.oracle.com/technetwork/java/javase/downloads/index.html' license=('custom:Oracle') -depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-environment-common' 'java-runtime-common' 'nss' 'xdg-utils') +depends=('ca-certificates-java' 'hicolor-icon-theme' 'java-runtime-common' 'nss' 'xdg-utils') +depends+=('java-environment-common') optdepends=('alsa-lib: for basic sound support' 'eclipse-java: to use "Oracle Java Mission Control" plugins in Eclipse' 'gtk2: for Gtk+ look and feel (desktop)') -provides=("java-runtime=$_major" "java-runtime-headless=$_major" "java-web-start=$_major" "java-environment=$_major" - "java-runtime-jre=$_major" "java-runtime-headless-jre=$_major" "java-web-start-jre=$_major" "java-environment-jdk=$_major" - "java-openjfx=$_major") +provides=("java-runtime=${_major}" "java-runtime-headless=${_major}" "java-web-start=${_major}" + "java-runtime-jre=${_major}" "java-runtime-headless-jre=${_major}" "java-web-start-jre=${_major}" + "java-openjfx=${_major}") +provides+=("java-environment-jdk=${_major}" "java-environment=${_major}") # Variables -DLAGENTS=('http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -b oraclelicense=a -o %o %u') -_jname=${_pkgname}${_major} -_jvmdir=/usr/lib/jvm/java-$_major-$_pkgname +DLAGENTS=("${DLAGENTS[@]//curl -/curl -b 'oraclelicense=a' -}") +_jname="${_pkgname}${_major}" +_jvmdir="/usr/lib/jvm/java-${_major}-${_pkgname}" -backup=("etc/java-$_jname/amd64/jvm.cfg" - "etc/java-$_jname/images/cursors/cursors.properties" - "etc/java-$_jname/management/jmxremote.access" - "etc/java-$_jname/management/management.properties" - "etc/java-$_jname/security/java.policy" - "etc/java-$_jname/security/java.security" - "etc/java-$_jname/security/javaws.policy" - "etc/java-$_jname/content-types.properties" - "etc/java-$_jname/flavormap.properties" - "etc/java-$_jname/fontconfig.properties.src" - "etc/java-$_jname/logging.properties" - "etc/java-$_jname/net.properties" - "etc/java-$_jname/psfont.properties.ja" - "etc/java-$_jname/psfontj2d.properties" - "etc/java-$_jname/sound.properties") +backup=("etc/java-${_jname}/amd64/jvm.cfg" + "etc/java-${_jname}/images/cursors/cursors.properties" + "etc/java-${_jname}/management/jmxremote.access" + "etc/java-${_jname}/management/management.properties" + "etc/java-${_jname}/security/java.policy" + "etc/java-${_jname}/security/java.security" + "etc/java-${_jname}/security/javaws.policy" + "etc/java-${_jname}/content-types.properties" + "etc/java-${_jname}/flavormap.properties" + "etc/java-${_jname}/fontconfig.properties.src" + "etc/java-${_jname}/logging.properties" + "etc/java-${_jname}/net.properties" + "etc/java-${_jname}/psfont.properties.ja" + "etc/java-${_jname}/psfontj2d.properties" + "etc/java-${_jname}/sound.properties") options=('!strip') # JDK debug-symbols -install=$pkgname.install -source=("http://download.oracle.com/otn-pub/java/jdk/$pkgver-$_build/$_hash/$_pkgname-$pkgver-linux-x64.tar.gz" - "http://download.oracle.com/otn-pub/java/jce/$_major/jce_policy-$_major.zip" - "jconsole-$_jname.desktop" - "jmc-$_jname.desktop" - "jvisualvm-$_jname.desktop" - "policytool-$_jname.desktop") -md5sums=('ef599e322eee42f6769991dd3e3b1a31' - 'b3c7031bc65c28c2340302065e7d00d3' +install="${pkgname}.install" +source=( + "https://download.oracle.com/otn-pub/java/jce/${_major}/jce_policy-${_major}.zip" + "https://download.oracle.com/otn-pub/java/jdk/${pkgver}-${_build}/${_hash}/${_pkgname}-${pkgver}-linux-x64.tar.gz" + "jconsole-${_jname}.desktop" + "jmc-${_jname}.desktop" + "jvisualvm-${_jname}.desktop" + "policytool-${_jname}.desktop" +) +md5sums=('b3c7031bc65c28c2340302065e7d00d3' + '0029351f7a946f6c05b582100c7d45b7' '8a66f50efdc867ffd6a27168bc93b210' '1cbde70639abd98db4bace284dbf2bc4' 'f0b39865361437f3778ecbe6ffbc0a06' '89704501aff8efe859c31968d8d168e6') +sha256sums=('f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59' + '9a5c32411a6a06e22b69c495b7975034409fa1652d03aeb8eb5b6f59fd4594e0' + '65282603bd0804d162f3f7da47bc7f3c91373e87504297d6a6fd6f2f8a1ec4ee' + '8f865b52946a9ab98556c56306c7e70ae7aa432b4d005c70df0bba9d2c3111b1' + '144e6651fcea08d95f3148d3a8ad17deb93fec4dd9236d37d27d7c648230b870' + '635433e9c78ff58af65c316232ac9907d289a324428923788ea0f82ae7f8083b') ## Alternative mirror, if your local one is throttled: -#source[0]=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/$_pkgname-$pkgver-linux-x64.gz") +#source[0]=("http://ftp.wsisiz.edu.pl/pub/pc/pozyteczne%20oprogramowanie/java/${_pkgname}-${pkgver}-linux-x64.gz") package() { - cd ${_pkgname}1.${_major}.0_${_minor} + set -u + cd "${_pkgname}1.${_major}.0_${_minor}" - msg2 "Creating directory structure..." - install -d "$pkgdir"/etc/.java/.systemPrefs - install -d "$pkgdir"/usr/lib/jvm/java-$_major-$_pkgname/bin - install -d "$pkgdir"/usr/lib/mozilla/plugins - install -d "$pkgdir"/usr/share/licenses/java$_major-$_pkgname + set +u; msg2 'Creating directory structure...'; set -u + install -d "${pkgdir}/etc/.java/.systemPrefs" + install -d "${pkgdir}/usr/lib/jvm/java-${_major}-${_pkgname}/bin" + install -d "${pkgdir}/usr/lib/mozilla/plugins" + install -d "${pkgdir}/usr/share/licenses/java${_major}-${_pkgname}" - msg2 "Removing redundancies..." - rm -r jre/lib/desktop/icons/HighContrast/ - rm -r jre/lib/desktop/icons/HighContrastInverse/ - rm -r jre/lib/desktop/icons/LowContrast/ - rm jre/lib/fontconfig.*.bfc - rm jre/lib/fontconfig.*.properties.src - rm -r jre/plugin/ - rm jre/*.txt - rm jre/COPYRIGHT - rm jre/LICENSE - rm jre/README - rm man/ja + set +u; msg2 'Removing redundancies...'; set -u + pushd 'jre' > /dev/null + rm -r 'lib/desktop/icons/HighContrast/' + rm -r 'lib/desktop/icons/HighContrastInverse/' + rm -r 'lib/desktop/icons/LowContrast/' + rm lib/fontconfig.*.bfc + rm lib/fontconfig.*.properties.src + rm *.txt + rm 'COPYRIGHT' + rm 'LICENSE' + rm 'README' + rm -r 'plugin/' + popd > /dev/null + rm 'man/ja' - msg2 "Moving contents..." - mv * "$pkgdir"/$_jvmdir + set +u; msg2 'Moving contents...'; set -u + mv * "${pkgdir}/${_jvmdir}" - # Cd to the new playground - cd "$pkgdir"/$_jvmdir + # Cd to the new playground + cd "${pkgdir}/${_jvmdir}" - msg2 "Fixing directory structure..." - # Replace duplicate binaries in bin/ with links to jre/bin/ - for i in $(ls jre/bin/); do - ln -sf "$_jvmdir/jre/bin/$i" "bin/$i" - done + set +u; msg2 'Fixing directory structure...'; set -u + # Replace duplicate binaries in bin/ with links to jre/bin/ + local _i + for _i in jre/bin/*; do + ln -sf "${_jvmdir}/jre/bin/${_i##*/}" "bin/${_i##*/}" + done - # Suffix .desktops + icons (sun-java.png -> sun-java-$_jname.png) - for i in $(find jre/lib/desktop/ -type f); do - rename -- "." "-$_jname." $i - done + # Suffix .desktops + icons (sun-java.png -> sun-java-${_jname}.png) + local _i + for _i in $(find 'jre/lib/desktop/' -type 'f'); do + rename -- '.' "-${_jname}." "${_i}" + done - # Fix .desktop paths - sed -e "s|Exec=|Exec=$_jvmdir/jre/bin/|" \ - -e "s|.png|-$_jname.png|" \ - -i jre/lib/desktop/applications/* + # Fix .desktop paths + sed -e "s|Exec=|Exec=${_jvmdir}/jre/bin/|" \ + -e "s|.png|-${_jname}.png|" \ + -i 'jre/lib/desktop/applications'/* - # Move .desktops + icons to /usr/share - mv jre/lib/desktop/* "$pkgdir"/usr/share/ - install -m644 "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ + # Move .desktops + icons to /usr/share + mv 'jre/lib/desktop'/* "${pkgdir}/usr/share/" + install -m644 "${srcdir}"/*.desktop "${pkgdir}/usr/share/applications/" - # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-$_jname/jre/lib -> /etc - for new_etc_path in ${backup[@]}; do - # Old location - old_usr_path="jre/lib/${new_etc_path#*$_jname/}" + # Move confs to /etc and link back to /usr: /usr/lib/jvm/java-${_jname}/jre/lib -> /etc + local _new_etc_path + for _new_etc_path in "${backup[@]}"; do + # Old location + local _old_usr_path="jre/lib/${_new_etc_path#*${_jname}/}" - # Move - install -Dm644 "$old_usr_path" "$pkgdir/$new_etc_path" - ln -sf "/$new_etc_path" "$old_usr_path" - done + # Move + install -Dm644 "${_old_usr_path}" "${pkgdir}/${_new_etc_path}" + ln -sf "/${_new_etc_path}" "${_old_usr_path}" + done - # Link NPAPI plugin - ln -sf $_jvmdir/jre/lib/amd64/libnpjp2.so "$pkgdir"/usr/lib/mozilla/plugins/libnpjp2-$_jname.so + # Link NPAPI plugin + ln -s "${_jvmdir}/jre/lib/amd64/libnpjp2.so" "${pkgdir}/usr/lib/mozilla/plugins/libnpjp2-${_jname}.so" - # Replace JKS keystore with 'ca-certificates-java' - ln -sf /etc/ssl/certs/java/cacerts jre/lib/security/cacerts + # Replace JKS keystore with 'ca-certificates-java' + ln -sf '/etc/ssl/certs/java/cacerts' 'jre/lib/security/cacerts' - # Suffix man pages - for i in $(find man/ -type f); do - mv "$i" "${i/.1}-$_jname.1" - done + # Suffix man pages + for _i in $(find 'man/' -type 'f'); do + rename -- '.1' "-${_jname}.1" "${_i}" + done - # Move man pages - mv man/ja_JP.UTF-8/ man/ja - mv man/ "$pkgdir"/usr/share + # Move man pages + mv 'man/ja_JP.UTF-8/' 'man/ja' + mv 'man/' "${pkgdir}/usr/share" - # Move/link licenses - mv COPYRIGHT LICENSE *.txt "$pkgdir"/usr/share/licenses/java$_major-$_pkgname/ - ln -sf /usr/share/licenses/java$_major-$_pkgname/ "$pkgdir"/usr/share/licenses/$pkgname + # Move/link licenses + mv 'COPYRIGHT' 'LICENSE' *.txt "${pkgdir}/usr/share/licenses/java${_major}-${_pkgname}/" + ln -s "/usr/share/licenses/java${_major}-${_pkgname}/" "${pkgdir}/usr/share/licenses/${pkgname}" - msg2 "Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files..." - # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for - # things like 256-bit AES. Enabled by default in OpenJDK: - # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html - # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html - install -m644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/*.jar jre/lib/security/ - install -Dm644 "$srcdir"/UnlimitedJCEPolicyJDK$_major/README.txt \ - "$pkgdir"/usr/share/doc/$_pkgname/README_-_Java_JCE_Unlimited_Strength.txt + set +u; msg2 'Installing Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files...'; set -u + # Replace default "strong", but limited, cryptography to get an "unlimited strength" one for + # things like 256-bit AES. Enabled by default in OpenJDK: + # - http://suhothayan.blogspot.com/2012/05/how-to-install-java-cryptography.html + # - http://www.eyrie.org/~eagle/notes/debian/jce-policy.html + install -m644 "${srcdir}/UnlimitedJCEPolicyJDK${_major}"/*.jar 'jre/lib/security/' + install -Dm644 "${srcdir}/UnlimitedJCEPolicyJDK${_major}/README.txt" \ + "${pkgdir}/usr/share/doc/${_pkgname}/README_-_Java_JCE_Unlimited_Strength.txt" - msg2 "Enabling copy+paste in unsigned applets..." - # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: - # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java - # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html - _line=$(awk '/permission/{a=NR}; END{print a}' "$pkgdir"/etc/java-$_jname/security/java.policy) - sed "$_line a\\\\n \ - // (AUR) Allow unsigned applets to read system clipboard, see:\n \ - // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java\n \ - // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html\n \ - permission java.awt.AWTPermission \"accessClipboard\";" \ - -i "$pkgdir"/etc/java-$_jname/security/java.policy + set +u; msg2 'Enabling copy+paste in unsigned applets...'; set -u + # Copy/paste from system clipboard to unsigned Java applets has been disabled since 6u24: + # - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java + # - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html + local _text='\ + // (AUR) Allow unsigned applets to read system clipboard, see: + // - https://blogs.oracle.com/kyle/entry/copy_and_paste_in_java + // - http://slightlyrandombrokenthoughts.blogspot.com/2011/03/oracle-java-applet-clipboard-injection.html + permission java.awt.AWTPermission "accessClipboard";' + local _lf=$'\n' + _text="${_text//${_lf}/\\n}" + local _line + _line="$(awk '/permission/{a=NR}; END{print a}' "${pkgdir}/etc/java-${_jname}/security/java.policy")" + sed -e "${_line} a ${_text}" -i "${pkgdir}/etc/java-${_jname}/security/java.policy" + set +u } +set +u diff --git a/src/kiwiirc/PKGBUILD b/src/kiwiirc/PKGBUILD index afdde94..e679c19 100644 --- a/src/kiwiirc/PKGBUILD +++ b/src/kiwiirc/PKGBUILD @@ -1,56 +1,36 @@ -# Maintainer: Jack Allnutt +# Maintainer: Jingbei Li +# Contributor: Jack Allnutt pkgname=kiwiirc -pkgver=0.9.4 +pkgver=1.1.0.r2044.g4c979963 pkgrel=1 pkgdesc="A hand-crafted web-based IRC client that you can enjoy" arch=('any') url="https://kiwiirc.com/" -license=('AGPL3') -depends=('nodejs>=4.0.0', 'npm') -makedepends=('git') -options=('emptydirs' '!strip') +license=('APACHE') +makedepends=('git' 'yarn') install='kiwiirc.install' -backup=('etc/kiwiirc/config.js') -source=(https://github.com/prawnsalad/KiwiIRC/archive/v$pkgver.tar.gz - 'kiwi.patch' - 'kiwiirc.service' - 'kiwiirc.conf.sysusers' - 'kiwiirc.conf.tmpfiles') -md5sums=('1a06e33088ca6ed89f857f7687470761' - '14a75cab7c10f2dd17856ab5a99d3bfc' - 'bcb28ddb7f0bcc3be830b8045969eb2c' - '593da856bcf9036bc51380b74d9df394' - '803080337de27be8921edd76f15c763c') +source=(git+https://github.com/kiwiirc/kiwiirc) +md5sums=('SKIP') + +pkgver () { + cd "${pkgname}" + ( + set -o pipefail + git describe --long 2>/dev/null | sed -e 's/\([^-]*-g\)/r\1/;s/-/./g' -e 's/^v//'|| + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) +} build() { - cp kiwiirc.service "$srcdir/KiwiIRC-$pkgver/" - cp kiwiirc.conf.sysusers "$srcdir/KiwiIRC-$pkgver/" - cp kiwiirc.conf.tmpfiles "$srcdir/KiwiIRC-$pkgver/" - cd "$srcdir/KiwiIRC-$pkgver" - git apply --whitespace=fix ../kiwi.patch - npm -q install - npm -q dedupe + cd "$srcdir/$pkgname" + yarn install + yarn run build } package() { - cd "$srcdir" - install -D -m644 KiwiIRC-$pkgver/config.example.js $pkgdir/etc/kiwiirc/config.js - install -D -m755 KiwiIRC-$pkgver/kiwi $pkgdir/usr/bin/kiwi - install -D -m644 KiwiIRC-$pkgver/kiwiirc.service $pkgdir/usr/lib/systemd/system/kiwiirc.service - install -D -m644 KiwiIRC-$pkgver/man/kiwiirc.1 $pkgdir/usr/share/man/man1/kiwi.1 - install -D -m644 KiwiIRC-$pkgver/package.json $pkgdir/usr/share/kiwiirc/package.json - install -D -m644 KiwiIRC-$pkgver/README.md $pkgdir/usr/share/kiwiirc/README.md - install -D -m644 KiwiIRC-$pkgver/kiwiirc.conf.sysusers $pkgdir/usr/lib/sysusers.d/kiwiirc.conf - install -D -m644 KiwiIRC-$pkgver/kiwiirc.conf.tmpfiles $pkgdir/usr/lib/tmpfiles.d/kiwiirc.conf + cd "$srcdir/$pkgname" - install -d -m755 $pkgdir/usr/lib/kiwiirc/server_modules - install -d -m755 $pkgdir/var/lib/kiwiirc - install -d -m644 $pkgdir/var/log/kiwiirc - install -d -m755 $pkgdir/usr/share/kiwiirc/server - install -d -m755 $pkgdir/usr/share/kiwiirc/node_modules - - cp -dr --preserve=mode KiwiIRC-$pkgver/client/* $pkgdir/var/lib/kiwiirc - cp -dr --preserve=mode KiwiIRC-$pkgver/node_modules $pkgdir/usr/share/kiwiirc/ - cp -dr --preserve=mode KiwiIRC-$pkgver/server $pkgdir/usr/share/kiwiirc - cp -dr --preserve=mode KiwiIRC-$pkgver/server_modules $pkgdir/usr/lib/kiwiirc + mkdir -p $pkgdir/usr/share/webapps/ + cp -r dist $pkgdir/usr/share/webapps/kiwiirc + sed 's/welcome/personal/' -i $pkgdir/usr/share/webapps/kiwiirc/static/config.json } diff --git a/src/kiwiirc/kiwiirc.install b/src/kiwiirc/kiwiirc.install index d929bbf..f9db2bb 100644 --- a/src/kiwiirc/kiwiirc.install +++ b/src/kiwiirc/kiwiirc.install @@ -1,26 +1,7 @@ post_install() { - systemd-sysusers - systemd-tmpfiles --create /usr/lib/tmpfiles.d/kiwiirc.conf - - chown -R kiwiirc:kiwiirc /etc/kiwiirc - chown -R kiwiirc:kiwiirc /usr/lib/kiwiirc - chown -R kiwiirc:kiwiirc /usr/share/kiwiirc - chown -R kiwiirc:kiwiirc /var/lib/kiwiirc - - setcap CAP_NET_BIND_SERVICE=+pe /usr/bin/node - - sudo -u kiwiirc kiwi build -} + echo Please see https://wiki.archlinux.org/index.php/KiwiIRC and set up the web server to use KiwiIRC! +} post_upgrade() { post_install } - -pre_remove() { - systemctl disable kiwiirc.service - systemd-tmpfiles --remove /usr/lib/tmpfiles.d/kiwiirc.conf -} - -post_remove() { - rm -rf /var/lib/kiwiirc/ -} diff --git a/src/lgogdownloader/PKGBUILD b/src/lgogdownloader/PKGBUILD index 78b4e43..03ff6f1 100755 --- a/src/lgogdownloader/PKGBUILD +++ b/src/lgogdownloader/PKGBUILD @@ -2,11 +2,11 @@ pkgname=lgogdownloader pkgver=3.4 -pkgrel=1 +pkgrel=3 pkgdesc="An open source downloader for GOG.com games, uses the GOG.com API" url="https://sites.google.com/site/gogdownloader/" arch=('x86_64') -license=(WTFPL) +license=('WTFPL') depends=('boost' 'jsoncpp' 'liboauth' 'rhash' 'tinyxml2' 'htmlcxx' 'curl') makedepends=('help2man' 'cmake') source=("http://sites.google.com/site/gogdownloader/$pkgname-$pkgver.tar.gz") diff --git a/src/libgcj17-bin/PKGBUILD b/src/libgcj17-bin/PKGBUILD old mode 100755 new mode 100644 index 5a0262f..581b467 --- a/src/libgcj17-bin/PKGBUILD +++ b/src/libgcj17-bin/PKGBUILD @@ -4,7 +4,8 @@ # Contributor: Roberto Calabrese pkgname=libgcj17-bin -pkgver=6.4.0_13 +epoch=1 +pkgver=6.3.0_18+deb9u1 pkgrel=1 pkgdesc="Dynamically load and interpret java class files. Built from binary \ executables available in Debian repositories." @@ -16,8 +17,8 @@ depends=(zlib) source_i686=(http://ftp.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_i386.deb) source_x86_64=(http://ftp.debian.org/debian/pool/main/g/gcc-6/${pkgname%-*}_${pkgver%_*}-${pkgver##*_}_amd64.deb) -sha1sums_i686=('949796af87b86f808b20818fde45b8a735fcad5a') -sha1sums_x86_64=('2841f49b2f785d38367973b71ccd1907e1dc6c88') +sha1sums_i686=('59e179c197637aae5dcaa0f83de4094a7e1f5396') +sha1sums_x86_64=('57125c15fd5b1a42bfa2b5d2da8378d7e51c1ecc') prepare() { tar xf data.tar.* diff --git a/src/libguestfs/PKGBUILD b/src/libguestfs/PKGBUILD index 8554601..69cd50d 100644 --- a/src/libguestfs/PKGBUILD +++ b/src/libguestfs/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer: Nikos Skalkotos pkgname=libguestfs -pkgver=1.38.2 +pkgver=1.38.6 pkgver_short=${pkgver%.*} pkgrel=1 pkgdesc="Access and modify virtual machine disk image" @@ -63,7 +63,7 @@ provides=("guestfish=${pkgver}") options=() source=("http://libguestfs.org/download/${pkgver_short}-stable/${pkgname}-${pkgver}.tar.gz" "update-libguestfs-appliance") -sha512sums=('1e9ed5d07baa25cab4ccc0c12c9f4c90ef35ff760814d672975952d098cd84b3e81c70cfe65a9c6c34de84725f29861bfe08ed72c9f9eb03f19313bdaacf2d05' +sha512sums=('20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1' '436f85c20e5c596738fcadd08089ddf5923e3b51ab05fe0a80d0fea7f0f5a7b797aece70f05e7d0f68387632a4b816d688890e0e06af4c834ae000f0d4ad5aff') check() { diff --git a/src/libspotify/PKGBUILD b/src/libspotify/PKGBUILD deleted file mode 100644 index 8fdc84b..0000000 --- a/src/libspotify/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# Maintainer: buckket -# Contributor: FadeMind -# Contributor: Richard Weber -# Contributor: Benjamin Hedrich -# Contributor: Thomas Jost -# Contributor: Tomas Strand - -### NOTICE -### libspotify is EOL, sources are taken from https://mopidy.github.io/libspotify-archive/ -### Checksums have not changed. -### -### SPOTIFY DEVS STATEMENT -### -### Please note that we have removed the LibSpotify binaries from our website in an effort to phase out the usage of this deprecated library. -### LibSpotify has been considered deprecated since 2015 and will be shut down in 2017, so we want to ensure that all developers’ efforts and -### attention are focused on newer and better APIs that we actively support and maintain. These APIs include the Web API, iOS and Android SDKs, -### and upcoming embedded libraries for Windows, Mac OS X and Linux. More information regarding upcoming libraries will be provided in the coming months. -### -### -### Source: https://is.gd/z6waBx -### -### - -pkgname=libspotify -pkgver=12.1.51 -pkgrel=6 -pkgdesc="C API package allowing third-party developers to write applications that utilize the Spotify music streaming service" -arch=("i686" "x86_64") -url="https://developer.spotify.com/technologies/libspotify/" -license=('custom') -depends=('glibc') - -if [ "$CARCH" == "x86_64" ]; then - SPOTIFY_ARCH="x86_64" - source_x86_64=("https://mopidy.github.io/libspotify-archive/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release.tar.gz") - md5sums_x86_64=('83efddcc195d6ff12b24c97c767a5e45') - sha256sums_x86_64=('43a14e0732ba6ae30078fac105d0e2998d04d5f5c396a4968386bc4e22491058') -fi - -if [ "$CARCH" == "i686" ]; then - SPOTIFY_ARCH="i686" - source_i686=("https://mopidy.github.io/libspotify-archive/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release.tar.gz") - md5sums_i686=('04735b890da0b1fc7f1f14e68a5293de') - sha256sums_i686=('941ab4ba10bcd6ec4e96127afd095a39e11bc955de0882734c97e4f588b155ae') -fi - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release" - - # Don't do stupid things from a Makefile - msg2 "Patching Makefile..." - sed -i 's/ldconfig//' Makefile -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-Linux-${SPOTIFY_ARCH}-release" - - make prefix="$pkgdir/usr" install - - # Install documentation - cp -R share "$pkgdir"/usr/share - mkdir -p "$pkgdir"/usr/share/man - mv "$pkgdir"/usr/share/man3 "$pkgdir"/usr/share/man/man3 - - # Correct pkgconfig file - sed -e s:PKG_PREFIX:/usr:g \ - < lib/pkgconfig/libspotify.pc \ - > "$pkgdir"/usr/lib/pkgconfig/libspotify.pc - - # Custom license - install -Dm644 LICENSE licenses.xhtml "$pkgdir"/usr/share/doc/libspotify - mkdir -p "$pkgdir"/usr/share/licenses/libspotify - ln -s ../../doc/libspotify/LICENSE "$pkgdir"/usr/share/licenses/libspotify/LICENSE -} diff --git a/src/luaunbound/PKGBUILD b/src/luaunbound/PKGBUILD index 0aff0e7..8af45ab 100644 --- a/src/luaunbound/PKGBUILD +++ b/src/luaunbound/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: fordprefect # Contributor: jhass pkgname=luaunbound -pkgver=2017.11.15 -_version=5bd8a2f84124 -pkgrel=3 +pkgver=0.2_1 +_pkgver=0.2-1 +epoch=1 +pkgrel=1 pkgdesc="drop-in replacement for Prosodys internal DNS library with a binding to libunbound" url="https://www.zash.se/luaunbound.html" arch=('i686' 'x86_64') @@ -12,24 +13,22 @@ depends=("unbound") makedepends=("mercurial" "unbound" "lua" "libxslt" "ccache") optdepends=("luajit: jit for lua") install=luaunbound.install -source=("${pkgname}::hg+https://code.zash.se/luaunbound" "use_cc.patch") +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LuaDist2/luaunbound/archive/${_pkgver}.tar.gz" "use_cc.patch") sha512sums=('SKIP' '6b11dfe9f5de743f101463fb3fb2144fe3aff75e7e19036f67d0e0b8adc8c36db73cf73d0aba483d651f8f5b2773093adc27e788354b165314c777e8de45bf28') prepare() { - cd "$srcdir/$pkgname" - # fixed commit - hg checkout $_version + cd "$srcdir/$pkgname-$_pkgver" patch -p1 < "$srcdir/use_cc.patch" } build() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$_pkgver" make all } package() { - cd "$srcdir/$pkgname" + cd "$srcdir/$pkgname-$_pkgver" install -Dm644 use_unbound.lua "$pkgdir/etc/prosody/use_unbound.lua" install -Dm755 lunbound.so "$pkgdir/usr/lib/prosody/util/lunbound.so" install -Dm644 README.markdown "$pkgdir/usr/share/doc/luaunbound/README" diff --git a/src/mellowplayer/PKGBUILD b/src/mellowplayer/PKGBUILD index 5852f54..f842316 100644 --- a/src/mellowplayer/PKGBUILD +++ b/src/mellowplayer/PKGBUILD @@ -2,38 +2,35 @@ # Maintainer: ZeroDot1 pkgname=mellowplayer _pkgname=MellowPlayer -pkgver=3.4.0 -pkgrel=4 +pkgver=3.5.2 +pkgrel=2 pkgdesc="Open source and cross-platform desktop application that runs web-based music streaming services in its own window and provides integration with your desktop." url='https://github.com/ColinDuquesnoy/MellowPlayer' license=('GPL') arch=('x86_64') depends=('qt5-base' 'qt5-webengine' 'qt5-svg' 'qt5-quickcontrols2' 'qt5-quickcontrols' 'qt5-translations' 'qt5-graphicaleffects' 'xdg-utils' 'libnotify' 'libevent') -makedepends=('qt5-tools' 'qbs' 'mesa') +makedepends=('qt5-tools' 'cmake' 'mesa') optdepends=( 'qt5-webengine-widevine: DRM needed for Spotify' 'pepper-flash: needed for Tidal and Deezer') -source=("https://github.com/ColinDuquesnoy/MellowPlayer/archive/${pkgver}.tar.gz" +source=("https://gitlab.com/ColinDuquesnoy/MellowPlayer/-/archive/${pkgver}/MellowPlayer-${pkgver}.tar.gz" "widevine-path.patch") -md5sums=('60aac9e1f5f32d699920e44e2f3af790' +md5sums=('604a33c9f3608ee7403675969c1de902' '67f8c5c6af4b770a4017a5ca9f137b90') prepare() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/widevine-path.patch" "${srcdir}/${_pkgname}-${pkgver}/src/main/share/applications/mellowplayer.desktop" - - qbs-setup-toolchains --detect - qbs-setup-qt $(which qmake) qt5 - qbs-config defaultProfile qt5 + cd $srcdir/MellowPlayer-${pkgver} + patch -Np1 -i "${srcdir}/widevine-path.patch" "$srcdir/MellowPlayer-${pkgver}/src/main/share/applications/mellowplayer.desktop" } build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - qbs build config:release + cd $srcdir/MellowPlayer-${pkgver} + export MAKEFLAGS="-j$(nproc)" + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib . + make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - qbs install --install-root "${pkgdir}/usr" config:release + cd $srcdir/MellowPlayer-${pkgver} + make DESTDIR=${pkgdir} install } - diff --git a/src/memtest86-efi/PKGBUILD b/src/memtest86-efi/PKGBUILD index b55a822..28b125c 100644 --- a/src/memtest86-efi/PKGBUILD +++ b/src/memtest86-efi/PKGBUILD @@ -2,10 +2,11 @@ _pkgbasename=memtest86 pkgname=$_pkgbasename-efi -pkgver=7.5.1001 -pkgrel=1 +pkgver=8.1 +#_build=1000 +pkgrel=4 pkgdesc="A free, thorough, stand alone memory test as an EFI application" -arch=('i686' 'x86_64') +arch=('any') url="http://www.memtest86.com" license=('GPL2' 'custom:PassMark') makedepends=('p7zip') @@ -13,42 +14,38 @@ optdepends=('efibootmgr: to add a new EFI boot entry' 'grub: to add MemTest86 entry in GRUB2 menu') backup=(etc/$pkgname/$pkgname.conf) install=$pkgname.install -source=("https://www.passmark.com/ftp/$_pkgbasename-usb-$pkgver.tar.gz" +source=(#"https://www.passmark.com/ftp/$_pkgbasename-usb-$pkgver.$_build.zip" + "$pkgname-$pkgver.zip::https://www.memtest86.com/downloads/$_pkgbasename-usb.zip" "memtest86-efi" "memtest86-efi.conf" - "grub.conf" - "systemd-boot.conf" "memtest86-efi-update.hook" "memtest86-efi-remove.hook") -sha512sums=('10232a1c3a589407e06257f7fff14a28b524d3998bc712317d25081e3e67f87549bf36cb9e79f50ee9676e32b050d38bbfa74d2f536899d358bcd05edea3b97a' - '001151346736fc901dac0f5f2b07557b049f2e2cf2a7de0aae7019e7fde126e4e6cf291328dea920d5af45b21b08366b6465b8a8aa453f7af0fd760ced3952aa' +sha512sums=('1b4dad3afe4bdf1e7d57ce52815ab8ab7646487272485723e99af1b9d6da79807d0aafea549f5906b320d346ab4f27d9c47734681ffad6fa1e6c50375ab94ff0' + '9e4919d3a1d2435c3feed718b422be7206ec639268d79aee2ac419e9665d134829f507506da33903da547f73d22e0833335118cbe04cda0c5bbfc7e64aa3bd51' '947df5f141bdb00a007a796c74f862d6ca41f74b4e5b28d1a444b4b8e538114e7f404f54420508639a77e554c2477ad324570ada0462c9fd7b058ed51e0ea8d8' - 'df883042a5bad262e74b69e2ca0cd8c9c21a4e4eb5132aed0041a07050b5ab7f280e94681ffe106e6de547d00b621fd2a019cf5b669e00876a32e637687395f8' - '1ece1ca18d53a19eff8341cce0c6099ac6b8d27ebad176c9a85714a7cac24cef7dfa2b462d8a0160dc8eb71f21aca1ee2469ebdf095083dcd77fa0b0f90f1812' '6952376b601b84da5fba14a7a5316d37b6083bae20f68f5b90b22d2728a19bf6d1fb367cf1adecfb82bf03e339b7dbf91f6d23f0d59731f89cf45240f16d5614' '1fe55a642e36005f5b7b58e5fb245e8029bb1a19b5f30d8ddba6bbf5a4b96c1bba35be0dfacee478034b8367fdde62d34a934dcd787f4c6702889615bac9f78a') prepare() { msg2 "Extract ISO..." 7z x -y "$srcdir/memtest86-usb.img" > /dev/null - 7z x -y "$srcdir/EFI System Partition.img" -oc:"$srcdir/$pkgname-$pkgver" > /dev/null + 7z x -y "$srcdir/EFI System Partition.img" -oc:"$srcdir/$pkgname-$pkgver" > /dev/null } package() { cd "$srcdir/$pkgname-$pkgver" msg2 "Move MemTest86 stuff in share directory..." - [[ "$CARCH" == "i686" ]] && install -Dvm755 "EFI/BOOT/BOOTIA32.efi" "$pkgdir/usr/share/$pkgname/bootia32.efi" - [[ "$CARCH" == "x86_64" ]] && install -Dvm755 "EFI/BOOT/BOOTX64.efi" "$pkgdir/usr/share/$pkgname/bootx64.efi" - install -Dvm644 "EFI/BOOT/mt86.png" "$pkgdir/usr/share/$pkgname/mt86.png" - install -Dvm644 "EFI/BOOT/unifont.bin" "$pkgdir/usr/share/$pkgname/unifont.bin" - install -Dvm644 "license.rtf" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf" + install -Dvm755 "EFI/BOOT/BOOTIA32.efi" "$pkgdir/usr/share/$pkgname/bootia32.efi" + install -Dvm755 "EFI/BOOT/BOOTX64.efi" "$pkgdir/usr/share/$pkgname/bootx64.efi" + install -Dvm644 "EFI/BOOT/blacklist.cfg" "$pkgdir/usr/share/$pkgname/blacklist.cfg" + install -Dvm644 "EFI/BOOT/mt86.png" "$pkgdir/usr/share/$pkgname/mt86.png" + install -Dvm644 "EFI/BOOT/unifont.bin" "$pkgdir/usr/share/$pkgname/unifont.bin" + install -Dvm644 "license.rtf" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rtf" msg2 "Install AUR provided script..." install -Dvm755 "$srcdir/memtest86-efi" "$pkgdir/usr/bin/memtest86-efi" install -Dvm644 "$srcdir/memtest86-efi.conf" "$pkgdir/etc/memtest86-efi/memtest86-efi.conf" - install -Dvm644 "$srcdir/grub.conf" "$pkgdir/etc/memtest86-efi/grub.conf" - install -Dvm644 "$srcdir/systemd-boot.conf" "$pkgdir/etc/memtest86-efi/systemd-boot.conf" msg2 "Install Pacman hooks..." install -Dvm644 "$srcdir/memtest86-efi-update.hook" "$pkgdir/usr/share/libalpm/hooks/memtest86-efi-update.hook" diff --git a/src/memtest86-efi/memtest86-efi b/src/memtest86-efi/memtest86-efi index 7889ce3..996e0ab 100644 --- a/src/memtest86-efi/memtest86-efi +++ b/src/memtest86-efi/memtest86-efi @@ -8,6 +8,7 @@ PRGNAME=$(basename $0) CONFDIR="/etc/memtest86-efi" CONFFILE="$CONFDIR/memtest86-efi.conf" source "$CONFFILE" || exit 127 +shopt -s extglob [[ "$(uname -m)" == "i686" ]] && ARCH="ia32" [[ "$(uname -m)" == "x86_64" ]] && ARCH="x64" @@ -30,13 +31,40 @@ checkcommand() { } _common_install() { - efidir="$esp/EFI/memtest86" - efifile="$efidir/memtest$ARCH.efi" + efidir="$1" + efifile="$2" - echo -e "MemTest86 will be installed in ${CB}$efidir/${CR}." + echo -e "MemTest86 is installed into ${CB}$efidir/${CR} directory." mkdir -pv "$efidir" - cp -v "$MEMTEST86_PATH/"* "$efidir/" # Move files in memtest ESP directory - mv -v "$efidir/boot$ARCH.efi" "$efifile" # Rename .efi file + cp -v "$MEMTEST86_PATH/"!(*.efi) "$efidir/" # Move files in memtest ESP directory + cp -v "$MEMTEST86_PATH/boot$ARCH.efi" "$efidir/$efifile" # Copy and rename .efi file +} + +_write_grub_cfg() { + uuid="$1" + + cat > "/etc/grub.d/86_memtest" < "$systemdbootdir/memtest86-efi.conf" < /dev/stderr exit 2 fi - _common_install + _common_install "$esp/EFI/memtest86" "memtest$ARCH.efi" echo -e "\nAdd a new configuration file for GRUB..." - /bin/install -Dvm755 "$CONFDIR/grub.conf" "/etc/grub.d/86_memtest" uuid=$(blkid $partition -s UUID -o value) - sed -i "s|@UUID@|$uuid|g" "/etc/grub.d/86_memtest" - sed -i "s|@ARCH@|$ARCH|g" "/etc/grub.d/86_memtest" + _write_grub_cfg "$uuid" grub-mkconfig -o "/boot/grub/grub.cfg" ;; 4) # Install MemTest86 in $esp/EFI/memtest86/ & add a file for systemd-boot - _common_install + checkcommand bootctl + _common_install "$esp/EFI/memtest86" "memtest$ARCH.efi" echo -e "\nAdd a new configuration file for systemd-boot..." systemdbootdir="$esp/loader/entries" mkdir -pv "$systemdbootdir" - /bin/install -Dvm644 "$CONFDIR/systemd-boot.conf" "$systemdbootdir/memtest86-efi.conf" - sed -i "s|@ARCH@|$ARCH|g" "$systemdbootdir/memtest86-efi.conf" + _write_systemd_boot_cfg "$systemdbootdir" + bootctl --path="$esp" update ;; *) # Do nothing and quit @@ -147,15 +171,11 @@ update() { case $choice in 1) # Update files in $esp/ - echo -e "MemTest86 will be updated in ${CB}$esp/${CR}." - cp -fv "$MEMTEST86_PATH/"* "$esp/" - mv -fv "$esp/boot$ARCH.efi" "$esp/shell$ARCH.efi" + _common_install "$esp" "shell$ARCH.efi" ;; 2|3|4) # Update files in $esp/EFI/memtest86/ - echo -e "MemTest86 will be updated in ${CB}$esp/EFI/memtest86/${CR}." - cp -fv "$MEMTEST86_PATH/"* "$esp/EFI/memtest86/" - mv -fv "$esp/EFI/memtest86/boot$ARCH.efi" "$esp/EFI/memtest86/memtest$ARCH.efi" + _common_install "$esp/EFI/memtest86" "memtest$ARCH.efi" ;; esac @@ -171,7 +191,7 @@ remove() { case $choice in 1) # Remove files in $esp/ echo -e "MemTest86 will be removed from ${CB}$esp/${CR}." - rm -v "$esp/mt86.png" "$esp/shell$ARCH.efi" + rm -v "$esp/shell$ARCH.efi" "$esp/blacklist.cfg" "$esp/mt86.png" "$esp/unifont.bin" [[ -f "$esp/shell$ARCH.efi.bak" ]] && mv -v "$esp/shell$ARCH.efi.bak" "$esp/shell$ARCH.efi" ;; @@ -248,6 +268,11 @@ about() { echo -e "$PRGNAME is a script which helps you to easily use MemTest86 with your UEFI, as an EFI application." } +if [[ -z $ARCH ]]; then + echo -e "${CE} Unsupported ARCH: $(uname -m). Aborted.${CR}" > /dev/stderr + exit -1 +fi + case "$1" in -i|--install) warn; checkuid; install; exit 0;; -u|--update) checkuid; update; exit 0;; diff --git a/src/mingw-w64-binutils/PKGBUILD b/src/mingw-w64-binutils/PKGBUILD index 83272cf..b025394 100644 --- a/src/mingw-w64-binutils/PKGBUILD +++ b/src/mingw-w64-binutils/PKGBUILD @@ -4,7 +4,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-binutils -pkgver=2.31.1 +pkgver=2.32 pkgrel=1 pkgdesc="Cross binutils for the MinGW-w64 cross-compiler" arch=('x86_64') @@ -15,7 +15,7 @@ depends=('zlib') options=('!libtool' '!emptydirs') validpgpkeys=('3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) source=("https://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"{,.sig}) -sha256sums=('e88f8d36bd0a75d3765a4ad088d819e35f8d7ac6288049780e2fefcad18dde88' +sha256sums=('9b0d97b3d30df184d302bced12f976aa1e5fbf4b0be696cdebc6cca30411a46e' 'SKIP') prepare() { diff --git a/src/mingw-w64-crt/PKGBUILD b/src/mingw-w64-crt/PKGBUILD index e37e991..4044512 100644 --- a/src/mingw-w64-crt/PKGBUILD +++ b/src/mingw-w64-crt/PKGBUILD @@ -4,8 +4,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-crt -pkgver=5.0.4 -_pkgver=${pkgver/rc/-rc} +pkgver=6.0.0 pkgrel=1 pkgdesc='MinGW-w64 CRT for Windows' arch=('any') @@ -15,12 +14,12 @@ groups=('mingw-w64-toolchain' 'mingw-w64') makedepends=('mingw-w64-gcc-base' 'mingw-w64-binutils' 'mingw-w64-headers') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740') -source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig}) -sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803' +source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2{,.sig}) +sha256sums=('805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0' 'SKIP') prepare() { - cd "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-crt + cd "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-crt } build() { @@ -33,7 +32,7 @@ build() { _crt_configure_args="--disable-lib32 --enable-lib64" fi mkdir -p "$srcdir"/crt-${_target} && cd "$srcdir"/crt-${_target} - "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-crt/configure --prefix=/usr/${_target} \ + "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-crt/configure --prefix=/usr/${_target} \ --host=${_target} --enable-wildcard \ ${_crt_configure_args} make diff --git a/src/mingw-w64-gcc/PKGBUILD b/src/mingw-w64-gcc/PKGBUILD index bfb71c6..366a041 100644 --- a/src/mingw-w64-gcc/PKGBUILD +++ b/src/mingw-w64-gcc/PKGBUILD @@ -4,9 +4,9 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-gcc -pkgver=8.2.0 -_islver=0.19 -pkgrel=1 +pkgver=8.3.0 +_islver=0.20 +pkgrel=2 pkgdesc="Cross GCC for the MinGW-w64 cross-compiler" arch=('x86_64') url="http://gcc.gnu.org" @@ -16,7 +16,6 @@ depends=('zlib' 'libmpc' 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w64-winpthreads' 'mingw-w64-headers') makedepends=("gcc-ada") -#checkdepends=('dejagnu') # Windows executables could run on Arch through bin_mft and Wine optdepends=() provides=('mingw-w64-gcc-base') replaces=() @@ -24,19 +23,24 @@ backup=() options=('!strip' 'staticlibs' '!emptydirs' '!buildflags') #source=(https://sources.archlinux.org/other/gcc/gcc-${pkgver/+/-}.tar.xz{,.sig} source=(https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz{,.sig} - "http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2") + "http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2" bz86593.patch) validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org 13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com 33C235A34C46AA3FFB293709A328C3A2C3C45C06) # Jakub Jelinek -sha256sums=('196c3c04ba2613f893283977e6011b2345d1cd1af9abeac58e916b1aab3e0080' +sha256sums=('64baadfe6cc0f4947a84cb12d7f0dfaf45bb58b7e92461639596c21e02d97d2c' 'SKIP' - 'd59726f34f7852a081fbd3defd1ab2136f174110fc2e0c8d10bb122173fa9ed8') + 'b587e083eb65a8b394e833dea1744f21af3f0e413a448c17536b5549ae42a4c2' SKIP) prepare() { ln -sf gcc-${pkgver/+/-} gcc - cd "$srcdir"/gcc + cd gcc + # link isl for in-tree builds ln -sf ../isl-${_islver} isl + + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86593 + rm -f gcc/testsuite/g++.dg/pr86593.C + patch -p1 -i "$srcdir/bz86593.patch" } build() { @@ -51,7 +55,7 @@ build() { --with-system-zlib --enable-cloog-backend=isl \ --enable-lto --disable-dw2-exceptions --enable-libgomp \ --disable-multilib --enable-checking=release - make all + make done } @@ -70,6 +74,5 @@ package() { strip "$pkgdir"/usr/bin/* # remove unnecessary files rm -r "$pkgdir"/usr/share - rm -f "$pkgdir"/usr/lib/libcc1.so* - rm -f "$pkgdir"/usr/lib/libcc1.a + rm "$pkgdir"/usr/lib/libcc1.* } diff --git a/src/mingw-w64-headers/PKGBUILD b/src/mingw-w64-headers/PKGBUILD index c8b5098..37bf580 100644 --- a/src/mingw-w64-headers/PKGBUILD +++ b/src/mingw-w64-headers/PKGBUILD @@ -4,9 +4,8 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname='mingw-w64-headers' -pkgver=5.0.4 -_pkgver=${pkgver/rc/-rc} -pkgrel=2 +pkgver=6.0.0 +pkgrel=1 pkgdesc="MinGW-w64 headers for Windows" arch=('any') url="http://mingw-w64.sourceforge.net" @@ -14,19 +13,19 @@ license=('custom') groups=('mingw-w64-toolchain' 'mingw-w64') options=('!strip' '!libtool' '!emptydirs') validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740') -source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig}) -sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803' +source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2{,.sig}) +sha256sums=('805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0' 'SKIP') prepare() { - cd "$srcdir"/mingw-w64-v${_pkgver} + cd "$srcdir"/mingw-w64-v${pkgver} } build() { for _target in ${_targets}; do msg "Configuring ${_target} headers" mkdir -p "$srcdir"/headers-${_target} && cd "$srcdir"/headers-${_target} - "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/configure --prefix=/usr/${_target} --enable-sdk=all --enable-secure-api --host=${_target} + "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/configure --prefix=/usr/${_target} --enable-sdk=all --enable-secure-api --host=${_target} done } @@ -41,9 +40,9 @@ package() { done msg "Installing MinGW-w64 licenses" - install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/COPYING.MinGW-w64/COPYING.MinGW-w64.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64.txt - install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64-runtime.txt - install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/ddk/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/ddk-readme.txt - install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/direct-x/COPYING.LIB "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-COPYING.LIB - install -Dm644 "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-headers/direct-x/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-readme.txt + install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/COPYING.MinGW-w64/COPYING.MinGW-w64.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64.txt + install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt "$pkgdir"/usr/share/licenses/${pkgname}/COPYING.MinGW-w64-runtime.txt + install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/ddk/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/ddk-readme.txt + install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/direct-x/COPYING.LIB "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-COPYING.LIB + install -Dm644 "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-headers/direct-x/readme.txt "$pkgdir"/usr/share/licenses/${pkgname}/direct-x-readme.txt } diff --git a/src/mingw-w64-winpthreads/PKGBUILD b/src/mingw-w64-winpthreads/PKGBUILD index 8246cd1..42f6ff8 100644 --- a/src/mingw-w64-winpthreads/PKGBUILD +++ b/src/mingw-w64-winpthreads/PKGBUILD @@ -4,8 +4,7 @@ _targets="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-winpthreads -pkgver=5.0.4 -_pkgver=${pkgver/rc/-rc} +pkgver=6.0.0 pkgrel=1 pkgdesc='MinGW-w64 winpthreads library' arch=('any') @@ -18,15 +17,15 @@ conflicts=('mingw-w64-headers-bootstrap') replaces=('mingw-w64-headers-bootstrap') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740') -source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${_pkgver}.tar.bz2{,.sig}) -sha256sums=('5527e1f6496841e2bb72f97a184fc79affdcd37972eaa9ebf7a5fd05c31ff803' +source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2{,.sig}) +sha256sums=('805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0' 'SKIP') build() { for _target in ${_targets}; do msg "Building ${_target} winpthreads..." mkdir -p "$srcdir"/winpthreads-build-${_target} && cd "$srcdir"/winpthreads-build-${_target} - "$srcdir"/mingw-w64-v${_pkgver}/mingw-w64-libraries/winpthreads/configure --prefix=/usr/${_target} \ + "$srcdir"/mingw-w64-v${pkgver}/mingw-w64-libraries/winpthreads/configure --prefix=/usr/${_target} \ --host=${_target} --enable-static --enable-shared make done diff --git a/src/movim-git/PKGBUILD b/src/movim-git/PKGBUILD index 35be86a..da0e13a 100644 --- a/src/movim-git/PKGBUILD +++ b/src/movim-git/PKGBUILD @@ -3,7 +3,7 @@ _pkgbase='movim' pkgname=movim-git -pkgver=r7026.f44bc2c9 +pkgver=r7308.8a32ba694 pkgrel=1 pkgdesc="Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol." arch=('any') @@ -11,17 +11,21 @@ url='https://movim.eu' license=('AGPL3') provides=('movim') conflicts=('movim') -depends=('php-gd' 'php-imagick' 'php-zmq') +depends=('php-gd' 'php-imagick') optdepends=('postgresql: to use the postgresql database backend' 'php-pgsql: php bindings for postgresql' + 'php-sqlite: php bindings for sqlite' 'mariadb: to use the mysql database backend' + 'sqlite3: to use the sqlite database backend' 'nginx: reverse proxy' 'apache: reverse proxy' 'php-fpm: PHP FactCGI process manager') makedepends=('git' 'composer') source=("$_pkgbase::git+https://github.com/movim/movim" movim.env - movim.service) + movim.service + sysuser.conf + tmpfiles.conf) install=movim.install backup=("etc/webapps/$_pkgbase/db.inc.php" "etc/default/movim") @@ -40,17 +44,16 @@ build() { package() { cd "$srcdir/$_pkgbase" + # Systemd files + install -m755 -d "$pkgdir/etc/default" + install -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase" + install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service" + install -Dm644 "$srcdir/sysuser.conf" "$pkgdir/usr/lib/sysusers.d/movim.conf" + install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/movim.conf" + install -m755 -d "$pkgdir/usr/share/webapps/$_pkgbase" - # Cache - install -m750 -d "$pkgdir/var/cache/webapps/$_pkgbase/cache"\ - "$pkgdir/var/cache/webapps/$_pkgbase/users" - chown -R root:http "$pkgdir/var/cache/webapps/$_pkgbase" - chmod -R u+rwX,g+rwX,o-rwx "$pkgdir/var/cache/webapps/$_pkgbase" - # XXX: Symlinks created post_upgrade. Waiting for upstream to fix - # https://github.com/movim/movim/issues/509. - - cp -r app database lib locales src themes vendor \ + cp -r app database lib locales src theme vendor \ "$pkgdir/usr/share/webapps/$_pkgbase" install -Dm644 VERSION CHANGELOG.md INSTALL.md README.md index.php \ linker.php phinx.php "$pkgdir/usr/share/webapps/$_pkgbase" @@ -58,22 +61,11 @@ package() { # Configuration file install -m750 -d "$pkgdir/etc/webapps/$_pkgbase" - install -Dm750 config/db.example.inc.php "$pkgdir/etc/webapps/$_pkgbase/db.inc.php" - chown -R root:http "$pkgdir/etc/webapps/$_pkgbase" - chmod -R u+rwX,g+rwX,o-rwx "$pkgdir/etc/webapps/$_pkgbase" - ln -s "/etc/webapps/$_pkgbase" "$pkgdir/usr/share/webapps/$_pkgbase/config" - - # Log files - install -m770 -d "$pkgdir/var/log/webapps/$_pkgbase" - chown -R root:http "$pkgdir/var/log/webapps/$_pkgbase" - ln -s "/var/log/webapps/$_pkgbase" "$pkgdir/usr/share/webapps/$_pkgbase/log" - - # Systemd unit file - install -m755 -d "$pkgdir/etc/default" - install -g http -Dm640 "$srcdir/movim.env" "$pkgdir/etc/default/$_pkgbase" - install -Dm644 "$srcdir/movim.service" "$pkgdir/usr/lib/systemd/system/movim.service" + install -Dm640 config/db.example.inc.php "$pkgdir/etc/webapps/$_pkgbase/db.inc.php" } sha256sums=('SKIP' '5dfff91dd4a54f3d3713530e204370a96d37898b670a61123d8cad42f92da306' - 'b348b86ccfe56b104ada9134672bf77054b148b2a2eb9f704be429905fc3d834') + '813d580300ee5bb7f1f9603db2404f5af67fd02f49017708d4adb919d4422045' + 'c8b569f1eafb97d8d03bbaabb9b4d6ed3415f922a05a52bd865942676368f4c5' + 'e3cd2ceb71f4ef4689028313188def52aa19859e35aa8abcaa200495cd187935') diff --git a/src/movim-git/movim.service b/src/movim-git/movim.service index c3c4f5e..3bf012a 100644 --- a/src/movim-git/movim.service +++ b/src/movim-git/movim.service @@ -3,7 +3,7 @@ Description=Movim Daemon After=network.target [Service] -Group=http +User=movim WorkingDirectory=/usr/share/webapps/movim EnvironmentFile=/etc/default/movim ExecStartPre=/usr/bin/php vendor/bin/phinx migrate diff --git a/src/nextcloud-app-keeweb/PKGBUILD b/src/nextcloud-app-keeweb/PKGBUILD index ec321a2..f618e99 100755 --- a/src/nextcloud-app-keeweb/PKGBUILD +++ b/src/nextcloud-app-keeweb/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Jonas Heinrich pkgname=nextcloud-app-keeweb -pkgver=0.4.0 -pkgrel=2 +pkgver=0.5.0 +pkgrel=1 pkgdesc="Open Keepass stores inside Nextcloud" arch=('any') url="https://github.com/jhass/nextcloud-keeweb" @@ -12,12 +12,7 @@ depends=('nextcloud') makedepends=() options=('!strip') source=("https://github.com/jhass/nextcloud-keeweb/releases/download/v${pkgver}/keeweb-${pkgver}.tar.gz") -sha512sums=("827e214622cf08b0af07a91a3764c47486333da2328883f3e4af6758316a8cb63341428ea8d2ff3f02bc86da3408ac5e21e653984d5b6455756963d9a26716bc") - -prepare() { - cd "${srcdir}/keeweb" - sed -i 's/max-version="12"/max-version="13"/g' "appinfo/info.xml" -} +sha512sums=("a19ae97b26c01696e009236e98e757d85936eb1cd252175a796f04ddc90cbe7f90154f2bbdbb929ecddd9612a032630cef1046866d03380cfa2bd3e40fadfd94") package() { install -d "${pkgdir}/usr/share/webapps/nextcloud/apps" diff --git a/src/nextcloud-app-passman/PKGBUILD b/src/nextcloud-app-passman/PKGBUILD index e0073f2..2c79c37 100644 --- a/src/nextcloud-app-passman/PKGBUILD +++ b/src/nextcloud-app-passman/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Jonas Heinrich pkgname=nextcloud-app-passman -pkgver=2.1.4 +pkgver=2.2.1 pkgrel=1 pkgdesc="Passman is a full featured password manager" arch=('any') @@ -12,7 +12,7 @@ depends=('nextcloud') makedepends=() options=('!strip') source=("nextcloud-app-passman-${pkgver}.tar.gz::https://releases.passman.cc/passman_${pkgver}.tar.gz") -sha512sums=("1c82dc87f357d6b22bc641558e934edb55c4766e779c05df77357c20e7916591ddbd654ab0779303433c20cb42339c2c56a6e47527f8aa2e9f15ee972d31c4ce") +sha512sums=("75e61910bf11cbc632da04cf107230f6c94a15965663e3660717e8eb98c211c08cceaecea92d7a0bc3d3b2979216791188d56be334761dc696638cbcead0eb8e") package() { install -d "${pkgdir}/usr/share/webapps/nextcloud/apps" diff --git a/src/ocserv/PKGBUILD b/src/ocserv/PKGBUILD index 88f9995..2f7c9e9 100644 --- a/src/ocserv/PKGBUILD +++ b/src/ocserv/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Brian Bidulock pkgname=ocserv -pkgver=0.12.0 +pkgver=0.12.2 pkgrel=1 pkgdesc="OpenConnect VPN Server" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ depends=('autogen' 'libpcl' 'http-parser' 'libnl' 'libsystemd' 'protobuf-c' 'tal makedepends=('freeradius' 'gperf' 'tcp-wrappers') backup=('etc/ocserv.config' 'etc/ocserv-passwd') source=("$pkgname-$pkgver.tar.gz::https://gitlab.com/ocserv/ocserv/repository/archive.tar.gz?ref=ocserv_${pkgver//./_}") -sha256sums=('4dba49ba482db06edcf317d64ba4a959ffd0dc62920975868e9a30c84dac00b6') +sha256sums=('3ebcad5855691c302d46957c035f3c01d0c8e2d275cfca78abbb37fdaf91c204') prepare() { cd ${pkgname}-${pkgname}_* @@ -30,3 +30,4 @@ package() { install -Dm0600 doc/sample.passwd "$pkgdir/etc/ocserv-passwd" install -Dm0644 doc/systemd/standalone/ocserv.service "$pkgdir/usr/lib/systemd/system/ocserv.service" } +sha256sums=('da318005266de07d257daf407d087446d993c9035d4ca00156f65c3bae1ec851') diff --git a/src/openconnect-git/PKGBUILD b/src/openconnect-git/PKGBUILD index 2ce569a..bedbece 100644 --- a/src/openconnect-git/PKGBUILD +++ b/src/openconnect-git/PKGBUILD @@ -2,7 +2,7 @@ pkgname=openconnect-git _pkgname=openconnect -pkgver=7.08.r127.g89778776 +pkgver=7.08.r127.g8977877 pkgrel=1 pkgdesc="Open client for Cisco AnyConnect VPN" arch=('i686' 'x86_64') @@ -14,7 +14,8 @@ makedepends=('intltool' 'python2' 'git') options=('!emptydirs') provides=($_pkgname) conflicts=($_pkgname) -source=("$pkgname::git+https://gitlab.com/openconnect/$_pkgname.git/") +source=("$pkgname::git+https://gitlab.com/ocserv/$_pkgname.git/") +source=("$pkgname::git://git.infradead.org/users/dwmw2/$_pkgname.git") md5sums=('SKIP') pkgver() { @@ -27,7 +28,8 @@ build() { ./autogen.sh PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sbindir=/usr/bin \ - --disable-static + --disable-static \ + --without-gnutls make V=0 } diff --git a/src/pacaur/PKGBUILD b/src/pacaur/PKGBUILD index ac8c41b..67953d8 100644 --- a/src/pacaur/PKGBUILD +++ b/src/pacaur/PKGBUILD @@ -1,23 +1,21 @@ -pkgname=pacaur -pkgver=4.7.90 +pkgname='pacaur' +pkgver=4.8.4 pkgrel=1 -pkgdesc="An AUR helper that minimizes user interaction" +pkgdesc='An AUR helper that minimizes user interaction' arch=('any') -url="https://github.com/rmarquis/pacaur" +url="https://github.com/E5ten/${pkgname}" license=('ISC') -depends=('cower' 'expac' 'sudo' 'git') +depends=('auracle-git' 'expac' 'sudo' 'git' 'jq') makedepends=('perl') -backup=('etc/xdg/pacaur/config') -source=("$pkgname-$pkgver.tar.gz::https://github.com/rmarquis/$pkgname/archive/$pkgver.tar.gz") -md5sums=('237a716ddfe3eab43a0f7958be646d09') +backup=("etc/xdg/${pkgname}/config") +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/E5ten/${pkgname}/archive/${pkgver}.tar.gz") +sha256sums=('0b5da346d54b893896a032b4b61475d1579c996978fe882e84432ebe6ceacfa2') build() { - cd "$pkgname-$pkgver" - make + make -C "${srcdir}/${pkgname}-${pkgver}" --no-print-directory } package() { - cd "$pkgname-$pkgver" - make install DESTDIR=$pkgdir PREFIX=/usr + make -C "${srcdir}/${pkgname}-${pkgver}" --no-print-directory DESTDIR="${pkgdir}" PREFIX='/usr' install } diff --git a/src/panda3d/PKGBUILD b/src/panda3d/PKGBUILD index 61cefd8..2a86271 100755 --- a/src/panda3d/PKGBUILD +++ b/src/panda3d/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Tucos pkgname=panda3d -pkgver=1.9.4 -pkgrel=2 +pkgver=1.10.1 +pkgrel=1 pkgdesc="A 3D game engine with Python bindings. SDK package. Optional dependencies you want to support need to be installed before panda3d." url="http://www.panda3d.org" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('desktop-file-utils' 'shared-mime-info' 'xorg-server' 'libgl' 'openssl' 'libjpeg' 'libpng' 'libtiff' 'freetype2' 'gtk2' 'openal' 'libxrandr' 'libxcursor' 'libxxf86dga') -makedepends=('python2' 'bison' 'cmake') +makedepends=('python' 'bison' 'cmake' 'flex') # NOTICE: please read http://www.panda3d.org/manual/index.php/Dependencies for # more information. Optdepends you want your package to support, need to be @@ -27,8 +27,7 @@ optdepends=(# Pretty much required 'xorg-server: X11 support' 'libgl: OpenGL support for X11' # Recommended - 'python2: python2 bindings' - 'python: Experimental python 3 bindings' + 'python: Python 3 bindings' 'openssl: Provides some networking and encryption support' 'ffmpeg: Required to load and play video textures' 'libjpeg: Required to read and write jpeg images' @@ -41,18 +40,22 @@ optdepends=(# Pretty much required 'openal: OpenAL audio' 'zlib: Compression support' 'libxxf86dga: Relative mouse mode' + 'libvorbis: Used to load .ogg files encoded with Vorbis.' + 'openexp: OpenEXR image format support' # Optional + 'assimp: Open Asset Import' + 'opus: Read .opus audio files' 'bullet: Support for the physics engine' 'eigen: Optimised linear algebra library' 'fmodex: FMod audio' 'libxcursor: Custom cursor icons' 'libxrandr: Resolution switching' - 'librocket: Librocket GUI support' + #'librocket: Librocket GUI support' 'libsquish: DXT support (AUR)' 'artoolkit: library for augmented reality (AUR)' 'opencv: alternative to ffmpeg for video texture support' 'fcollada: used for dae2egg and for loading dae files directly into Panda (unavailable)' - 'vrpn: support for virtual reality trackers (unavailable)' + 'vrpn-git: support for virtual reality trackers.' # ARM stuff, not really applicable, stated for completeness # NOTE: if you have libgles, you _must_ install libegl for this package to compile 'libgles: OpenGL ES support' @@ -60,16 +63,16 @@ optdepends=(# Pretty much required ) install='panda3d.install' -source=("$url/download/panda3d-$pkgver/panda3d-$pkgver.tar.gz" +source=("https://github.com/panda3d/panda3d/archive/v$pkgver.tar.gz" 'panda3d.install') JOBS=$(nproc) build() { cd "$srcdir/panda3d-$pkgver" - LD_LIBRARY_PATH=/usr/lib/openssl-1.0-compat/ + #LD_LIBRARY_PATH=/usr/lib/openssl-1.0-compat/ # disable broken extensions - python2 makepanda/makepanda.py --everything --no-opencv --no-opencv --no-maya2012 --no-fmodex --no-gles --no-gles2 --no-openssl ${PANDAFLAGS} --threads ${BUILD_THREADS:-$JOBS} + python makepanda/makepanda.py --everything --no-opencv --no-opencv --no-maya2012 --no-fmodex --no-gles --no-gles2 --no-openssl --no-egl ${PANDAFLAGS} --threads ${BUILD_THREADS:-$JOBS} } package() { @@ -78,5 +81,5 @@ package() { install -D -m644 "$srcdir/panda3d-$pkgver/doc/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -md5sums=('7490512af90e003228fb8fb5e89a2371' +md5sums=('a8e438d4a13ac8c81b80d288326617b3' '057269173f3c1987953302519bc744fa') diff --git a/src/pdftk-bin/PKGBUILD b/src/pdftk-bin/PKGBUILD old mode 100755 new mode 100644 diff --git a/src/perl-file-libmagic/PKGBUILD b/src/perl-file-libmagic/PKGBUILD index e99eef6..7f387a4 100644 --- a/src/perl-file-libmagic/PKGBUILD +++ b/src/perl-file-libmagic/PKGBUILD @@ -1,17 +1,17 @@ # Maintainer: Ganymede < ganymede _AT_ analogon _DOT_ eu> pkgname=perl-file-libmagic -pkgver=1.15 -pkgrel=5 +pkgver=1.16 +pkgrel=1 pkgdesc="Determine MIME types of data or files using libmagic" arch=('any') -url="http://search.cpan.org/~drolsky/File-LibMagic" +url="https://metacpan.org/release/File-LibMagic" license=('GPL' 'PerlArtistic') depends=('perl' 'file') makedepends=('perl-test-fatal') options=('!emptydirs') -source=(http://search.cpan.org/CPAN/authors/id/D/DR/DROLSKY/File-LibMagic-$pkgver.tar.gz) -sha256sums=('2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84') +source=(https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/File-LibMagic-$pkgver.tar.gz) +sha256sums=('c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60') build() { cd "$srcdir/File-LibMagic-$pkgver" diff --git a/src/perl-sys-virt/PKGBUILD b/src/perl-sys-virt/PKGBUILD index 7c655cb..53bd40f 100644 --- a/src/perl-sys-virt/PKGBUILD +++ b/src/perl-sys-virt/PKGBUILD @@ -6,7 +6,7 @@ _perlmod="sys-virt" _cpanname='Sys-Virt' pkgname=perl-${_perlmod} pkgver=3.0.0 -pkgrel=3 +pkgrel=5 pkgdesc="Represent and manage a libvirt hypervisor connection" arch=('i686' 'x86_64') url="http://search.cpan.org/dist/Sys-Virt/" diff --git a/src/php-imagick/PKGBUILD b/src/php-imagick/PKGBUILD index 73bc5e9..e557c9b 100644 --- a/src/php-imagick/PKGBUILD +++ b/src/php-imagick/PKGBUILD @@ -3,7 +3,7 @@ pkgname=php-imagick _extname=imagick pkgver=3.4.3 -pkgrel=3 +pkgrel=5 pkgdesc="PHP extension for IMagick" arch=('i686' 'x86_64' 'armv7h') url="https://pecl.php.net/package/${_extname}" diff --git a/src/pi-hole-ftl/PKGBUILD b/src/pi-hole-ftl/PKGBUILD index 1513f82..f8376d0 100644 --- a/src/pi-hole-ftl/PKGBUILD +++ b/src/pi-hole-ftl/PKGBUILD @@ -1,53 +1,37 @@ # Maintainer: max.bra +# Maintainer: graysky pkgname=pi-hole-ftl _pkgname=FTL -pkgver=3.0 -pkgrel=2 +_servicename=pihole-FTL +pkgver=4.2.3 +pkgrel=1 arch=('i686' 'x86_64' 'arm' 'armv6h' 'armv7h' 'aarch64') pkgdesc="The Pi-hole FTL engine" url="https://github.com/pi-hole/FTL" license=('EUPL-1.1') -depends=() +depends=('nettle' 'gmp') makedepends=('sqlite') +conflicts=('dnsmasq') +provides=('dnsmasq') install=$pkgname.install -backup=('etc/pihole/pihole-FTL.conf') +backup=('etc/pihole/pihole-FTL.conf' 'etc/pihole/pihole-FTL.db') source=("https://github.com/pi-hole/FTL/archive/v$pkgver.tar.gz" - "$pkgname.tmpfile" - "$pkgname.service" - "$pkgname.conf" - "$pkgname.sysuser" - ) -md5sums=('45fd33e4498b2ab9403d96e1251abb8c' - 'ca844c23699ba64777571253bc7ccb21' - '0f65203b2585fb83e02826091d220386' - '2d6ae93eea48a09ce5bc5bf62e081dd4' - '68e78907dc2a0c89421d02377e76d353') + "https://raw.githubusercontent.com/max72bra/pi-hole-ftl-archlinux-customization/master/arch-ftl-$pkgver.patch" + "$pkgname.tmpfile" + "$pkgname.service" + "$pkgname.db" + "$pkgname.conf") +md5sums=('c77c455a423db6963ab0860cb3f256d6' + 'a1dffe02d7749ed94c0c2b088db36446' + '5faa64558cc0a5888923fcf77c299fa7' + 'f3e42ec6f04180c6d6972998bf172a41' + '0495c002b7d5dce303d451e4cd2fede5' + '40b1c4174198eacd7d12eb9b356aced0') prepare() { - _ssc="/tmp/sedcontrol" - cd "$srcdir"/"$_pkgname"-"$pkgver" - - # git descriptions setup - sed -i "s|^GIT_BRANCH := .*$|GIT_BRANCH := master|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: git descriptions setup 1" && return 1 ; fi - sed -i "s|^GIT_VERSION := .*$|GIT_VERSION := v$pkgver|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: git descriptions setup 2" && return 1 ; fi - sed -i "s|^GIT_DATE := .*$|GIT_DATE := $(date -I)|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: git descriptions setup 3" && return 1 ; fi - sed -i "s|^GIT_TAG := .*$|GIT_TAG := v$pkgver|w $_ssc" "$srcdir"/$_pkgname-$pkgver/Makefile - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: git descriptions setup 4" && return 1 ; fi - - # setting up logs paths - sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up logs paths 1" && return 1 ; fi - sed -i "s|/var/run/pihole-FTL|/run/pihole-ftl/pihole-FTL|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up logs paths 2" && return 1 ; fi - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up logs paths 3" && return 1 ; fi - sed -i "s|/var/run/pihole/|/run/pihole-ftl/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/memory.c - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up logs paths 4" && return 1 ; fi + patch -Np1 -i ../arch-ftl-$pkgver.patch } build() { @@ -60,12 +44,12 @@ package() { install -Dm755 "$_pkgname"-$pkgver/pihole-FTL "${pkgdir}"/usr/bin/pihole-FTL install -Dm644 "$pkgname.tmpfile" "$pkgdir"/usr/lib/tmpfiles.d/$pkgname.conf - install -Dm644 "$pkgname.sysuser" "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf install -dm755 "$pkgdir"/etc/pihole install -Dm644 "$pkgname.conf" "$pkgdir"/etc/pihole/pihole-FTL.conf + install -Dm644 "$pkgname.db" "$pkgdir"/etc/pihole/pihole-FTL.db - install -Dm644 "$pkgname.service" "$pkgdir"/usr/lib/systemd/system/$pkgname.service + install -Dm644 "$pkgname.service" "$pkgdir"/usr/lib/systemd/system/$_servicename.service install -dm755 "$pkgdir/usr/lib/systemd/system/multi-user.target.wants" - ln -s ../$pkgname.service "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/$pkgname.service" + ln -s ../$_servicename.service "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/$_servicename.service" } diff --git a/src/pi-hole-ftl/pi-hole-ftl.conf b/src/pi-hole-ftl/pi-hole-ftl.conf index 8ca077a..41c77bc 100644 --- a/src/pi-hole-ftl/pi-hole-ftl.conf +++ b/src/pi-hole-ftl/pi-hole-ftl.conf @@ -1,9 +1,84 @@ -SOCKET_LISTENING=localonly -TIMEFRAME=rolling24h -QUERY_DISPLAY=yes -AAAA_QUERY_ANALYSIS=yes -MAXDBDAYS=365 -RESOLVE_IPV6=yes -RESOLVE_IPV4=yes -DBINTERVAL=1.0 -DBFILE=/etc/pihole/pihole-FTL.db \ No newline at end of file +### This file contains parameters for FTL behavior. +### At install, all parameters are commented out. The user can select desired options. +### Options shown are the default configuration. No modification is needed for most +### installations. +### Visit https://docs.pi-hole.net/ftldns/configfile/ for more detailed parameter explanations + +## Socket Listening +## Listen only for local socket connections or permit all connections +## Options: localonly, all +#SOCKET_LISTENING=localonly + +## Query Display +## Display all queries? Set to no to hide query display +## Options: yes, no +#QUERY_DISPLAY=yes + +## AAA Query Analysis +## Allow FTL to analyze AAAA queries from pihole.log? +## Options: yes, no +#AAAA_QUERY_ANALYSIS=yes + +## Resolve IPv6 +## Should FTL try to resolve IPv6 addresses to host names? +## Options: yes, no +#RESOLVE_IPV6=yes + +## Resolve IPv4 +## Should FTL try to resolve IPv4 addresses to host names? +## Options: yes, no +#RESOLVE_IPV4=yes + +## Max Database Days +## How long should queries be stored in the database -days-? +## Setting this to 0 disables the database +## See: https://docs.pi-hole.net/ftldns/database/ +## Options: number of days +#MAXDBDAYS=365 + +## Database Interval +## How often do we store queries in FTL's database -minutes-? +## See: https://docs.pi-hole.net/ftldns/database/ +## Options: number of minutes +#DBINTERVAL=1.0 + +## Database File +## Specify path and filename of FTL's SQLite3 long-term database. +## Setting this to DBFILE= disables the database altogether +## See: https://docs.pi-hole.net/ftldns/database/ +## Option: path to db file +#DBFILE=/etc/pihole/pihole-FTL.db + +## Max Log Age +## Up to how many hours of queries should be imported from the database and logs -hours-? +## Maximum is 744 -31 days- +## Options: number of days +#MAXLOGAGE=24.0 + +## FTL Port +## On which port should FTL be listening? +## Options: tcp port +#FTLPORT=4711 + +## Privacy Level +## Which privacy level is used? +## See: https://docs.pi-hole.net/ftldns/privacylevels/ +## Options: 0, 1, 2, 3 +#PRIVACYLEVEL=0 + +## Ignore Localhost +## Should FTL ignore queries coming from the local machine? +## Options: yes, no +#IGNORE_LOCALHOST=no + +## Blocking Mode +## How should FTL reply to blocked queries? +## See: https://docs.pi-hole.net/ftldns/blockingmode/ +## Options: NULL, IP-NODATA-AAAA, IP, NXDOMAIN +#BLOCKINGMODE=NULL + +## Regex Debug Mode +## Controls if FTLDNS should print extended details about regex matching into pihole-FTL.log. +## See: https://docs.pi-hole.net/ftldns/regex/overview/ +## Options: true, false +#REGEX_DEBUGMODE=false diff --git a/src/pi-hole-ftl/pi-hole-ftl.install b/src/pi-hole-ftl/pi-hole-ftl.install index 8f66406..133aa7f 100644 --- a/src/pi-hole-ftl/pi-hole-ftl.install +++ b/src/pi-hole-ftl/pi-hole-ftl.install @@ -1,6 +1,9 @@ post_install() { + # ftl DB permissions + [ -e /etc/pihole/pihole-FTL.db ] && chown nobody.nobody /etc/pihole /etc/pihole/pihole-FTL.db + echo -e "\e[1;33m==>\e[0m Possible configurations in \e[1;31m/etc/pihole/pihole-FTL.conf\e[0m file" - echo -e "\e[1;33m==>\e[0m Please read the instructions on the project page: \e[1;36mhttps://github.com/pi-hole/FTL#ftls-config-file\e[0m" + echo -e "\e[1;33m==>\e[0m Please read the instructions on the project page: \e[1;36mhttps://docs.pi-hole.net/ftldns/configfile/\e[0m" } post_upgrade() { @@ -8,5 +11,5 @@ post_upgrade() { } post_remove() { - userdel -f pihole + id -u pihole > /dev/null 2>&1 && userdel -f pihole } diff --git a/src/pi-hole-ftl/pi-hole-ftl.service b/src/pi-hole-ftl/pi-hole-ftl.service index 3d252f4..0832ef9 100644 --- a/src/pi-hole-ftl/pi-hole-ftl.service +++ b/src/pi-hole-ftl/pi-hole-ftl.service @@ -1,9 +1,7 @@ [Unit] -Description=Pi-hole FTL engine +Description=Pi-hole FTLDNS engine [Service] -User=pihole -Group=pihole PIDFile=/run/pihole-ftl/pihole-FTL.pid ExecStart=/usr/bin/pihole-FTL no-daemon Restart=on-failure diff --git a/src/pi-hole-ftl/pi-hole-ftl.tmpfile b/src/pi-hole-ftl/pi-hole-ftl.tmpfile index dee8851..276250c 100644 --- a/src/pi-hole-ftl/pi-hole-ftl.tmpfile +++ b/src/pi-hole-ftl/pi-hole-ftl.tmpfile @@ -1,5 +1,5 @@ -d /run/log/pihole-ftl 0755 pihole pihole - - -f /run/log/pihole-ftl/pihole-FTL.log 0644 pihole pihole - - -d /run/pihole-ftl 0755 pihole pihole - - -f /run/pihole-ftl/pihole-FTL.pid 0644 pihole pihole - - -f /run/pihole-ftl/pihole-FTL.port 0644 pihole pihole - - +d /run/log/pihole-ftl 0755 nobody nobody - - +f /run/log/pihole-ftl/pihole-FTL.log 0644 nobody nobody - - +d /run/pihole-ftl 0755 nobody nobody - - +f /run/pihole-ftl/pihole-FTL.pid 0644 nobody nobody - - +f /run/pihole-ftl/pihole-FTL.port 0644 nobody nobody - - diff --git a/src/pi-hole-server/PKGBUILD b/src/pi-hole-server/PKGBUILD index 4bebef8..d981e4a 100644 --- a/src/pi-hole-server/PKGBUILD +++ b/src/pi-hole-server/PKGBUILD @@ -3,15 +3,15 @@ pkgname=pi-hole-server _pkgname=pi-hole -pkgver=3.3.1 +pkgver=4.2.2 pkgrel=1 _wwwpkgname=AdminLTE -_wwwpkgver=3.3 +_wwwpkgver=4.2 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' arch=('any') license=('EUPL-1.1') url="https://github.com/pi-hole/pi-hole" -depends=('dnsmasq' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'pi-hole-ftl') +depends=('pi-hole-ftl' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'bind-tools') optdepends=( 'lighttpd: a secure, fast, compliant and very flexible web-server' 'php-cgi: CGI and FCGI SAPI for PHP needed only for lighttpd' @@ -20,241 +20,48 @@ optdepends=( ) conflicts=('pi-hole-standalone') install=$pkgname.install -backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt' -'etc/dnsmasq.d/01-pihole.conf') +backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt' 'etc/pihole/regex.list' +'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list' 'etc/dnsmasq.conf') source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz - admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz - dnsmasq.main - dnsmasq.include - lighttpd.pi-hole.conf - nginx.pi-hole.conf - $_pkgname.tmpfile - $_pkgname-gravity.service - $_pkgname-gravity.timer - $_pkgname-logtruncate.service - $_pkgname-logtruncate.timer - mimic_setupVars.conf.sh - version.patch - piholeDebug.sh - ) + admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz + "https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-$pkgver.patch" + "https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-$pkgver.patch" + dnsmasq.include + lighttpd.pi-hole.conf + nginx.pi-hole.conf + $_pkgname.tmpfile + $_pkgname-gravity.service + $_pkgname-gravity.timer + $_pkgname-logtruncate.service + $_pkgname-logtruncate.timer + mimic_setupVars.conf.sh + version.patch + piholeDebug.sh +) -md5sums=('ea4f64bdf88620f59a1b01c19253e4e3' - '23368537fa576480e45f625b5e1a7cd7' - '3f1aeea43af0b192edb36b9e5484ff87' - 'ad008fac3c7351aa0d5205079b3dfb18' - 'a3518f54241ef2e67c17c7b144cb6a93' +md5sums=('deebe32fd4867b289687689e0f377d72' + '36f3125e753c0e6f37496b26309501da' + 'fc9f91dee70d0e73a14a63ecd3743ec1' + 'e93d67128df08b0ed66893f3fbf5ed68' + '4d9038588164bb9130c8ca11653f83f3' + '971cc2859672341d77f8deba702fb7f7' 'b63fcf29c29796023a2677bcf2b369a7' - '990b8abd0bfbba23a7ce82c59f2e3d64' + '9bc23c314397a0f59978cfe246140cda' '047f13d4ac97877f724f87b002aaee63' 'd42a864f88299998f8233c0bc0dd093d' '20c5b0c6b4e23e55b25ab6c28dda709d' '291d3c95e445fe65caf40c3605efd186' 'c227ffa88ddebc34cb715b73640cd845' - '93fe5e50cf3fcb08b24cf29b0cace85b' + '4e65ef5a25a9a7358cba24450dbed7cc' 'd7b69ae51db0e8ac8e27f20a234eed85') prepare() { - _ssc="/tmp/sedcontrol" - - # the return of service management - sed -i "s|service dnsmasq \${svcOption}|systemctl \${svcOption} dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: the return of service management" && return 1 ; fi - - # setting up and securing pihole wrapper script - #sed -n "/debugFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - #if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 1" && return 1 ; fi - #sed -i '/debugFunc() {/,+16d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/updatePiholeFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 2" && return 1 ; fi - sed -i '/updatePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/reconfigurePiholeFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 3" && return 1 ; fi - sed -i '/reconfigurePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/uninstallFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 4" && return 1 ; fi - sed -i '/uninstallFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/piholeCheckoutFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 5" && return 1 ; fi - sed -i '/piholeCheckoutFunc() {/,+20d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/tricorderFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 6" && return 1 ; fi - sed -i '/tricorderFunc() {/,+29d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/\"\-[r,up]/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 7" && return 1 ; fi - sed -i '/\"\-[r,up]/d' "$srcdir"/$_pkgname-$pkgver/pihole - - #sed -n "/^ \-d/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - #if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 8" && return 1 ; fi - #sed -i '/^ \-d/,+2d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/^ \-up/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 9" && return 1 ; fi - sed -i '/^ \-up/d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/^ \-r/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 10" && return 1 ; fi - sed -i '/^ \-r/d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/uninstall/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 11" && return 1 ; fi - sed -i '/uninstall/d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -i "s|^ checkout.*$|\";|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 12" && return 1 ; fi - - sed -n "/checkout/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 13" && return 1 ; fi - sed -i '/checkout/d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/tricorder/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 14" && return 1 ; fi - sed -i '/tricorder/d' "$srcdir"/$_pkgname-$pkgver/pihole - -# ----------------- - - # setup gravity.sh - sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setup gravity.sh 1" && return 1 ; fi - sed -i "s|/etc/\.|/etc/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setup gravity.sh 2" && return 1 ; fi - -# ----------------- - - # setting up and securing webpage.sh script - sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/webpage.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing webpage.sh script 1" && return 1 ; fi - -# ----------------- - - # change log location to pihole script - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to pihole script" && return 1 ; fi - -# ----------------- - - # change log location to piholeLogFlush.sh - sed -n "/\/var\/log\/pihole.log/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to piholeLogFlush.sh" && return 1 ; fi - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|g" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh - -# ----------------- - - # change log and bin location to logrotate - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 1" && return 1 ; fi - sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 2" && return 1 ; fi - sed -i "s|/usr/sbin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 3" && return 1 ; fi - -# ----------------- - - # change FTL port file location to chronometer.sh - sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change FTL port file location to chronometer.sh" && return 1 ; fi - -# ----------------- - - # no debug for us, right now - sed -n "/\-\- Generate debug log \-\-/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: no debug for us, right now 1" && return 1 ; fi - sed -i '/\-\- Generate debug log \-\-/,+5d' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php - -# ----------------- - - # change log location in admin php interface - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/data.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 1" && return 1 ; fi - - sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/FTL.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 2" && return 1 ; fi - sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 3" && return 1 ; fi - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 4" && return 1 ; fi - -# ----------------- - - # since we don't directly install from git... -# sed -n "/\$core_branch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php -# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 1" && return 1 ; fi -# sed -i 's/\$core_branch =.*$/\$core_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php -# sed -n "/\$web_branch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php -# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 2" && return 1 ; fi -# sed -i 's/\$web_branch =.*$/\$web_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - - sed -n "/\$core_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 3" && return 1 ; fi - sed -i 's/\$core_current =.*$/\$core_current = "'"$pkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - sed -n "/\$web_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 4" && return 1 ; fi - sed -i 's/\$web_current =.*$/\$web_current = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - sed -n "/\$FTL_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 4" && return 1 ; fi - sed -i 's/\$FTL_current =.*$/\$FTL_current = exec("pihole-FTL version");/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - -# sed -n "/\$core_commit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php -# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 5" && return 1 ; fi -# sed -i 's/\$core_commit =.*$/\$core_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php -# sed -n "/\$web_commit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php -# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 6" && return 1 ; fi -# sed -i 's/\$web_commit =.*$/\$web_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - - sed -i "s|/var/www/html/admin/|/srv/http/pihole/admin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 7" && return 1 ; fi - cd "$srcdir"/"$_pkgname"-"$pkgver" + patch -Np1 -i "$srcdir"/arch-server-core-$pkgver.patch patch -p1 -i "$srcdir"/version.patch - cd "$srcdir" - - sed -n "/{{corever}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 13" && return 1 ; fi - sed -i "s/{{corever}}/$pkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - sed -n "/{{webver}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 14" && return 1 ; fi - sed -i "s/{{webver}}/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - -# ----------------- - - # web admin footer update setup - sed -i "s|https:\/\/github.com\/pi-hole\/pi-hole\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 1" && return 1 ; fi - sed -i "s|https:\/\/github.com\/pi-hole\/AdminLTE\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 2" && return 1 ; fi - sed -i "s|https:\/\/github.com\/pi-hole\/FTL\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 3" && return 1 ; fi - -# ----------------- - - # sudo pihole full path (php-fpm compatibility) - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/api.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 1" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 2" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/queryads.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 3" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/savesettings.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 4" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/sub.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 5" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/add.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 6" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/gravity.sh.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 7" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/loginpage.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 8" && return 1 ; fi - -# ----------------- - - # pi-hole sudoers file is now populated by install script - echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/pihole.sudo + cd "$srcdir"/"$_wwwpkgname"-"$_wwwpkgver" + patch -Np1 -i "$srcdir"/arch-server-admin-$pkgver.patch } package() { @@ -269,12 +76,17 @@ package() { install -Dm755 $_pkgname-$pkgver/advanced/Scripts/list.sh "$pkgdir"/opt/pihole/list.sh install -Dm755 $_pkgname-$pkgver/advanced/Scripts/webpage.sh "$pkgdir"/opt/pihole/webpage.sh install -Dm755 $_pkgname-$pkgver/advanced/Scripts/COL_TABLE "$pkgdir"/opt/pihole/COL_TABLE + install -Dm755 $_pkgname-$pkgver/advanced/Scripts/wildcard_regex_converter.sh "$pkgdir"/opt/pihole/wildcard_regex_converter.sh + install -Dm755 $_pkgname-$pkgver/advanced/Scripts/query.sh "$pkgdir"/opt/pihole/query.sh install -Dm755 piholeDebug.sh "$pkgdir"/opt/pihole/piholeDebug.sh install -Dm755 mimic_setupVars.conf.sh "$pkgdir"/opt/pihole/mimic_setupVars.conf.sh install -dm750 "$pkgdir"/etc/sudoers.d - install -Dm440 $_pkgname-$pkgver/advanced/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole + install -Dm440 $_pkgname-$pkgver/advanced/Templates/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole + install -Dm644 $_pkgname-$pkgver/advanced/dnsmasq.conf.original "$pkgdir"/etc/dnsmasq.conf +# install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf + install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf install -Dm644 pi-hole.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/pi-hole.conf @@ -288,13 +100,12 @@ package() { install -dm755 "$pkgdir"/etc/pihole install -dm755 "$pkgdir"/usr/share/pihole/configs - install -Dm644 $_pkgname-$pkgver/adlists.default "$pkgdir"/etc/pihole/adlists.default - install -Dm644 $_pkgname-$pkgver/advanced/logrotate "$pkgdir"/etc/pihole/logrotate + install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list + install -Dm644 $_pkgname-$pkgver/advanced/Templates/logrotate "$pkgdir"/etc/pihole/logrotate install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt + install -Dm644 /dev/null "$pkgdir"/etc/pihole/regex.list - install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf - install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf install -Dm644 lighttpd.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/lighttpd.example.conf install -Dm644 nginx.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/nginx.example.conf diff --git a/src/pi-hole-server/dnsmasq.include b/src/pi-hole-server/dnsmasq.include index 8956919..7bc2d6a 100644 --- a/src/pi-hole-server/dnsmasq.include +++ b/src/pi-hole-server/dnsmasq.include @@ -28,7 +28,11 @@ localise-queries bogus-priv no-resolv cache-size=10000 -log-queries=extra +log-queries log-facility=/run/log/pihole/pihole.log -local-ttl=300 +local-ttl=2 log-async +# If a DHCP client claims that its name is "wpad", ignore that. +# This fixes a security hole. see CERT Vulnerability VU#598349 +dhcp-name-match=set:wpad-ignore,wpad +dhcp-ignore-names=tag:wpad-ignore diff --git a/src/pi-hole-server/lighttpd.pi-hole.conf b/src/pi-hole-server/lighttpd.pi-hole.conf index 5bb2a29..a0213b4 100644 --- a/src/pi-hole-server/lighttpd.pi-hole.conf +++ b/src/pi-hole-server/lighttpd.pi-hole.conf @@ -86,4 +86,4 @@ $HTTP["url"] =~ "^/admin/\.(.*)" { } # Add user chosen options held in external file -include_shell "cat external.conf 2>/dev/null" +#include_shell "cat external.conf 2>/dev/null" diff --git a/src/pi-hole-server/mimic_setupVars.conf.sh b/src/pi-hole-server/mimic_setupVars.conf.sh old mode 100755 new mode 100644 diff --git a/src/pi-hole-server/pi-hole-server.install b/src/pi-hole-server/pi-hole-server.install index 124dadc..bca05c3 100644 --- a/src/pi-hole-server/pi-hole-server.install +++ b/src/pi-hole-server/pi-hole-server.install @@ -5,8 +5,12 @@ warning() { post_install() { echo -e "\e[1;33m==>\e[0m Read setup instructions at \e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m" echo -e "\e[1;33m==>\e[0m Generating initial block list, please wait...\e[0m" + + # permissions chown -R http:http /srv/http/pihole - chown pihole:pihole /etc/pihole + chown nobody:nobody /etc/pihole + chown http:root /etc/pihole/regex.list + /opt/pihole/mimic_setupVars.conf.sh # update lists on first run @@ -22,8 +26,9 @@ post_upgrade() { [ -e /etc/pihole/hosts ] && rm /etc/pihole/hosts [ -e /etc/pihole/.useIPv6 ] && rm /etc/pihole/.useIPv6 - # update owner of existing dir - chown pihole:pihole /etc/pihole + # update owner of existing dir and file + chown nobody:nobody /etc/pihole + chown http:root /etc/pihole/regex.list # warning diff --git a/src/pi-hole-server/pi-hole.tmpfile b/src/pi-hole-server/pi-hole.tmpfile index b4aca5e..6f25c4b 100644 --- a/src/pi-hole-server/pi-hole.tmpfile +++ b/src/pi-hole-server/pi-hole.tmpfile @@ -1,3 +1,3 @@ d /run/pihole 0755 http root - - -d /run/log/pihole 0755 dnsmasq root - - -f /run/log/pihole/pihole.log 0644 dnsmasq root - - +d /run/log/pihole 0755 nobody root - - +f /run/log/pihole/pihole.log 0644 nobody root - - diff --git a/src/pi-hole-server/version.patch b/src/pi-hole-server/version.patch index 0c0eb70..4c703e7 100644 --- a/src/pi-hole-server/version.patch +++ b/src/pi-hole-server/version.patch @@ -1,72 +1,49 @@ -diff -ur pi-hole-3.1/advanced/Scripts/version.sh pi-hole-3.1.a/advanced/Scripts/version.sh ---- pi-hole-3.1/advanced/Scripts/version.sh 2017-06-20 23:17:41.000000000 +0200 -+++ pi-hole-3.1.a/advanced/Scripts/version.sh 2017-06-22 13:52:36.293206505 +0200 -@@ -20,63 +20,21 @@ - return 0 - fi +--- pi-hole-4.0.a/advanced/Scripts/version.sh 2018-08-05 19:40:22.000000000 +0200 ++++ pi-hole-4.0/advanced/Scripts/version.sh 2018-08-24 15:28:44.141363877 +0200 +@@ -20,42 +20,16 @@ + return 0 + fi -- # Get the tagged version of the local repository -- local directory="${1}" -- local version +- # Get the tagged version of the local repository +- local directory="${1}" +- local version - -- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } -- version=$(git describe --tags --always || echo "$DEFAULT") -- if [[ "${version}" =~ ^v ]]; then -- echo "${version}" -- elif [[ "${version}" == "${DEFAULT}" ]]; then -- echo "ERROR" -- return 1 -+ if [[ "$1" == "pi-hole" ]]; then -+ echo "{{corever}}" - else -- echo "Untagged" -+ echo "{{webver}}" - fi - return 0 +- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } +- version=$(git describe --tags --always || echo "$DEFAULT") +- if [[ "${version}" =~ ^v ]]; then +- echo "${version}" +- elif [[ "${version}" == "${DEFAULT}" ]]; then +- echo "ERROR" +- return 1 ++ if [[ "$1" == "pi-hole" ]]; then ++ echo "4.2.1" + else +- echo "Untagged" ++ echo "4.2.1" + fi + return 0 } getLocalHash() { -- # Local FTL hash does not exist on filesystem -- if [[ "$1" == "FTL" ]]; then -- echo "N/A" -- return 0 -- fi -- -- # Get the short hash of the local repository -- local directory="${1}" -- local hash +- # Local FTL hash does not exist on filesystem +- if [[ "$1" == "FTL" ]]; then +- echo "N/A" +- return 0 +- fi - -- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } -- hash=$(git rev-parse --short HEAD || echo "$DEFAULT") -- if [[ "${hash}" == "${DEFAULT}" ]]; then -- echo "ERROR" -- return 1 -- else -- echo "${hash}" -- fi -+ echo "N/A" - return 0 - } - - getRemoteHash(){ -- # Remote FTL hash is not applicable -- if [[ "$1" == "FTL" ]]; then -- echo "N/A" -- return 0 -- fi -- -- local daemon="${1}" -- local branch="${2}" -- -- hash=$(git ls-remote --heads "https://github.com/pi-hole/${daemon}" | \ -- awk -v bra="$branch" '$0~bra {print substr($0,0,8);exit}') -- if [[ -n "$hash" ]]; then -- echo "$hash" -- else -- echo "ERROR" -- return 1 -- fi -+ echo "N/A" - return 0 +- # Get the short hash of the local repository +- local directory="${1}" +- local hash +- +- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } +- hash=$(git rev-parse --short HEAD || echo "$DEFAULT") +- if [[ "${hash}" == "${DEFAULT}" ]]; then +- echo "ERROR" +- return 1 +- else +- echo "${hash}" +- fi ++ echo "N/A" + return 0 } diff --git a/src/prosody-hg-stable/PKGBUILD b/src/prosody-hg-stable/PKGBUILD index 6def97a..ea8313a 100644 --- a/src/prosody-hg-stable/PKGBUILD +++ b/src/prosody-hg-stable/PKGBUILD @@ -8,7 +8,7 @@ pkgname=prosody-hg-stable pkgrel=1 -pkgver=0.10.r7587+.37b796cc366a+ +pkgver=0.10.r7564+.9e565d0b1771+ pkgver() { cd "$srcdir/prosody-hg" printf "0.10.r%s.%s" "$(hg identify -n)" "$(hg identify -i)" diff --git a/src/python-configshell-fb/PKGBUILD b/src/python-configshell-fb/PKGBUILD index 1672b68..308c25d 100644 --- a/src/python-configshell-fb/PKGBUILD +++ b/src/python-configshell-fb/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Dewender arch at JonnyJD dot net pkgname=('python-configshell-fb' 'python2-configshell-fb') _pkgname=configshell-fb -pkgver=1.1.fb23 +pkgver=1.1.fb25 pkgrel=1 pkgdesc="python framework for building simple CLI applications (free branch)" arch=('any') @@ -10,7 +10,7 @@ license=('Apache') options=() makedepends=('python-setuptools' 'python2-setuptools') source=(https://github.com/open-iscsi/configshell-fb/archive/v${pkgver}.tar.gz) -sha512sums=('71e2a30f3a484fb416ca8bda22c49c27a3abb8c826dc5ab06d5fe73dc0e0ccb3960934176164a9e37770b2b9ec6906ac1c922f418ef452e9f025fbb906517df1') +sha512sums=('7f0af5014600d148326b4692a84fcc388d3ea175a79566a5e3b1ede89d9dbc90be5f4b1481e69dd5654e88578b3732441a822e4d89cd0504d0ad3221d3a2f027') package_python-configshell-fb() { depends=('python-pyparsing' 'python-urwid') diff --git a/src/python-pycares/PKGBUILD b/src/python-pycares/PKGBUILD index 0f08766..d2dfa32 100644 --- a/src/python-pycares/PKGBUILD +++ b/src/python-pycares/PKGBUILD @@ -1,13 +1,14 @@ pkgname=python-pycares _pkgname=pycares pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A python interface for c-ares" arch=('i686' 'x86_64') url="https://github.com/saghul/pycares" license=('MIT') depends=('python') makedepends=('python-setuptools') + source=("https://github.com/saghul/$_pkgname/archive/$_pkgname-${pkgver}.tar.gz") sha512sums=('d9a910b529d3b070b1685f6d89458404f22a5aa7002b01c1772f3eff548e9764826454c41bb69bf2f5b663df39cd1fb71b599b5f1ea88e197218e02942af67c7') diff --git a/src/python-pydns/PKGBUILD b/src/python-pydns/PKGBUILD index 8691154..1bc21ac 100644 --- a/src/python-pydns/PKGBUILD +++ b/src/python-pydns/PKGBUILD @@ -9,7 +9,6 @@ arch=('any') url="https://launchpad.net/py3dns" license=('Python') depends=('python') -makedepends=('python-setuptools') source=("https://launchpad.net/${_realname}/trunk/${pkgver}/+download/${_realname}-${pkgver}.tar.gz") md5sums=('683ec2f5243b34f7127cfd0bfc9259c6') diff --git a/src/python-rtslib-fb/PKGBUILD b/src/python-rtslib-fb/PKGBUILD index 9ab45f5..3c4d5b2 100644 --- a/src/python-rtslib-fb/PKGBUILD +++ b/src/python-rtslib-fb/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Johannes Dewender arch at JonnyJD dot net pkgname=('python-rtslib-fb' 'python2-rtslib-fb') _pkgname=rtslib-fb -pkgver=2.1.fb63 +pkgver=2.1.fb69 pkgrel=1 pkgdesc="free branch version of the LIO target API" arch=('any') @@ -11,11 +11,10 @@ makedepends=('python-setuptools' 'python2-setuptools' 'python-pyudev' 'python2-p backup=() options=() install= -source=(https://github.com/agrover/rtslib-fb/archive/v${pkgver}.tar.gz target.service) -sha512sums=('faf5732299def9f5eb9147f930e8b48c9e9a26a918b41aa60f06a1f079e6e0453eb3c2d19136b244ef2349c23d31b7fa15cb4a0b6302ffbcd878033a45a11d1a' +source=(https://github.com/open-iscsi/rtslib-fb/archive/v${pkgver}.tar.gz target.service) +sha512sums=('552e660eb8aa26ac44f1ac089143a39e10106c1859db863c63ad5469e8ab0b0cdd0fba8f6fc30633cfd321ec0d72f6063ea0e8944aaa228de118400380b5418b' '3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5') - prepare() { cd "$srcdir/$_pkgname-$pkgver" } diff --git a/src/python-slixmpp/PKGBUILD b/src/python-slixmpp/PKGBUILD index 34ed18c..4813bca 100644 --- a/src/python-slixmpp/PKGBUILD +++ b/src/python-slixmpp/PKGBUILD @@ -2,25 +2,25 @@ pkgname=python-slixmpp _pkgbase=slixmpp -pkgver=1.4.0 -pkgrel=1 +pkgver=1.4.2 +pkgrel=2 pkgdesc="An XMPP library written for Python 3.4 (SleekXMPP asyncio fork)" arch=('i686' 'x86_64' 'armv7h' 'aarch64') url="https://dev.louiz.org/projects/slixmpp" license=('MIT') -depends=('python' 'python-aiodns' 'libidn' 'python-pyasn1' 'python-pyasn1-modules') +depends=('python' 'python-aiodns' 'libidn' 'python-pyasn1' 'python-pyasn1-modules' 'python-aiohttp') makedepends=('git' 'cython') options=(!emptydirs) -source=("https://dev.louiz.org/attachments/download/127/$_pkgbase-$pkgver.tar.gz") -sha512sums=('26d7459d2348c50db86bba4f3aae24d22003e0fe2b1e679c7725d480be9185b6f6d95dd94ed46d7b26b5a4b253fe6fc4d735dc56c02f9bc766cefa8f7ab8d198') +source=("https://lab.louiz.org/poezio/${_pkgbase}/-/archive/slix-${pkgver}/${_pkgbase}-slix-${pkgver}.tar.gz") +sha512sums=('4220305e2f3d038071732da2e05641d54a0515b2f2ecdc2ed5aaf8c3ca287e9f521be369d9102c57c6891b605a16525d4805f5ab6699ff9f8b5844d4df457169') build() { - cd $_pkgbase-$pkgver + cd $_pkgbase-slix-$pkgver python setup.py build } package() { - cd $_pkgbase-$pkgver + cd $_pkgbase-slix-$pkgver python setup.py install --skip-build --root="$pkgdir/" --optimize=1 } diff --git a/src/python-spotify/PKGBUILD b/src/python-spotify/PKGBUILD deleted file mode 100644 index dc900b6..0000000 --- a/src/python-spotify/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: buckket - -pkgname=("python-spotify" "python2-spotify") -_pkgname=pyspotify -pkgver=2.0.5 -pkgrel=4 -pkgdesc="A Python wrapper for libspotify." -arch=("i686" "x86_64") -license=("APACHE") -url="http://pyspotify.mopidy.com/" -makedepends=("python-setuptools" "python2-setuptools" "libspotify" "python-cffi") -conflicts=("python2-pyspotify" "pyspotify") -source=("https://pypi.python.org/packages/source/p/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") -sha256sums=('fbd41c58d62232b0cabb7a9e38d45f36ac221699c006899bdb6be74c04602678') - -prepare() { - cp -r ${_pkgname}-${pkgver} "python-spotify-${pkgver}" - cp -r ${_pkgname}-${pkgver} "python2-spotify-${pkgver}" -} - -build_python-spotify() { - cd ${pkgname}-${pkgver} - python setup.py build -} - -build_python2-spotify() { - cd ${pkgname}-${pkgver} - python2 setup.py build -} - -package_python-spotify() { - depends=("libspotify" "python-cffi") - cd ${pkgname}-${pkgver} - python setup.py install --root="${pkgdir}" --optimize=1 -} - -package_python2-spotify() { - depends=("libspotify" "python2-cffi") - cd ${pkgname}-${pkgver} - python2 setup.py install --root="${pkgdir}" --optimize=1 -} - diff --git a/src/python2-axolotl-curve25519-git/PKGBUILD b/src/python2-axolotl-curve25519-git/PKGBUILD index 5423d86..cf6af48 100644 --- a/src/python2-axolotl-curve25519-git/PKGBUILD +++ b/src/python2-axolotl-curve25519-git/PKGBUILD @@ -3,7 +3,7 @@ pkgname='python2-axolotl-curve25519-git' _pkgname='python-axolotl-curve25519' -pkgver=0.4.1.2.r0.g293f9cd +pkgver=r14.e4a9c4d pkgrel=1 pkgdesc="Python wrapper for curve25519 library" url="https://github.com/tgalal/${_pkgname}" diff --git a/src/python2-axolotl-git/PKGBUILD b/src/python2-axolotl-git/PKGBUILD index 514d7ca..948fff2 100644 --- a/src/python2-axolotl-git/PKGBUILD +++ b/src/python2-axolotl-git/PKGBUILD @@ -3,7 +3,7 @@ pkgname='python2-axolotl-git' _pkgname='python-axolotl' -pkgver=0.1.42.r0.g0c681af +pkgver=0.1.39.r0.g37c5c55 pkgrel=1 pkgdesc="Python port of libaxolotl" url="https://github.com/tgalal/python-axolotl" diff --git a/src/python2-dulwich/PKGBUILD b/src/python2-dulwich/PKGBUILD index a27ef26..7f90606 100644 --- a/src/python2-dulwich/PKGBUILD +++ b/src/python2-dulwich/PKGBUILD @@ -1,28 +1,21 @@ # Maintainer: Timothée Ravier -pkgname=(python2-dulwich python-dulwich) -pkgver=0.19.2 -pkgrel=2 +pkgname=(python2-dulwich) +pkgver=0.19.11 +pkgrel=1 pkgdesc='Pure-Python implementation of the Git file formats and protocols' arch=('any') url='https://www.dulwich.io/' license=('GPL2') depends=() -makedepends=('python2' 'python') +makedepends=('python2') options=(!emptydirs) source=("https://github.com/jelmer/dulwich/archive/dulwich-${pkgver}.tar.gz") -md5sums=('279c9b467aeafdf397d3a51b1d2364c7') +md5sums=('9d6b91f14e73f55d5fd69b0fe850bb2d') build() { cd "dulwich-dulwich-${pkgver}" python2 setup.py build - python setup.py build -} - -package_python-dulwich() { - depends=('python') - cd "dulwich-dulwich-${pkgver}" - python setup.py install --root="$pkgdir/" --skip-build --optimize=1 } package_python2-dulwich() { diff --git a/src/python2-spotipy/PKGBUILD b/src/python2-spotipy/PKGBUILD deleted file mode 100644 index 0d7cf31..0000000 --- a/src/python2-spotipy/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -pkgname=python2-spotipy -_pkgname=spotipy -pkgver=2.4.4 -pkgrel=1 -pkgdesc='Simple client for the Spotify Web API' -arch=('any') -url="https://github.com/plamere/spotipy" -license=('MIT') -depends=('python2' 'python2-requests>=1.0') -makedepends=('python2' 'python2-setuptools') -source=("https://pypi.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") - -md5sums=('e9b895c8351d440af49470f9f3f9f4f4') - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - - install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/src/qemu-user-static/PKGBUILD b/src/qemu-user-static/PKGBUILD index 19cf3a1..8be0933 100644 --- a/src/qemu-user-static/PKGBUILD +++ b/src/qemu-user-static/PKGBUILD @@ -1,33 +1,95 @@ -# Maintainer: Sergio Tridente -# Contributor: Steven Noonan +# Maintainer: Stefan Agner pkgname=qemu-user-static -pkgver=2.12 -pkgrel=4 -pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation, statically linked." -arch=('i686' 'x86_64') -license=('GPL2' 'LGPL2.1') -url="http://wiki.qemu.org/Index.html" +pkgdesc="Statically linked binaries of Qemu with user emulation. Useful for containers/chroot environment with binfmt." +pkgver=3.1.0 +pkgrel=1 +arch=(x86_64) +license=(GPL2 LGPL2.1) +url="http://wiki.qemu.org/" depends=() -optdepends=('binfmt-qemu-static: to allow handling foreign ELF binaries and executing them via qemu') -conflicts=() -_arch=amd64 -[ "$CARCH" = 'i686' ] && _arch=i386 -_debsrc=${pkgname}_${pkgver}+dfsg-3_${_arch}.deb -source=(http://ftp.debian.org/debian/pool/main/q/qemu/${_debsrc}) -sha1sums=('ac8defaa5b8624bc0585877f6272e23be921a70a') -[ "$CARCH" = 'i686' ] && sha1sums=('b67bd47793047ddcbd79822bdaf297d0f3e99384') +makedepends=(python2 glib2-static pcre-static) +source=(https://download.qemu.org/qemu-$pkgver.tar.xz{,.sig}) +sha512sums=('7e8dae823937cfac2f0c60406bd3bdcb89df40313dab2a4bed327d5198f7fcc68ac8b31e44692caa09299cc71256ee0b8c17e4f49f78ada8043d424f5daf82fe' + 'SKIP') +validpgpkeys=('CEACC9E15534EBABB82D3FA03353C9CEF108B584') + +case $CARCH in + i?86) _corearch=i386 ;; + x86_64) _corearch=x86_64 ;; +esac prepare() { - cd "$srcdir" - ar p ${_debsrc} data.tar.xz | bsdtar xf - + mkdir build-user-static + + cd qemu-${pkgver} + sed -i 's/vte-2\.90/vte-2.91/g' configure } +build() ( + cd build-user-static + + ../qemu-${pkgver}/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/qemu \ + --enable-linux-user \ + --disable-debug-info \ + --disable-bsd-user \ + --disable-werror \ + --disable-system \ + --disable-tools \ + --disable-docs \ + --disable-gtk \ + --disable-gnutls \ + --disable-nettle \ + --disable-gcrypt \ + --disable-glusterfs \ + --disable-libnfs \ + --disable-libiscsi \ + --disable-vnc \ + --disable-kvm \ + --disable-libssh2 \ + --disable-libxml2 \ + --disable-vde \ + --disable-sdl \ + --disable-opengl \ + --disable-xen \ + --disable-kvm \ + --disable-fdt \ + --disable-vhost-net \ + --disable-vhost-crypto \ + --disable-vhost-user \ + --disable-vhost-vsock \ + --disable-vhost-scsi \ + --disable-tpm \ + --disable-qom-cast-debug \ + --disable-capstone \ + --static + + make ARFLAGS="rc" +) + package() { - cd "$pkgdir" - mkdir -p "$pkgdir"/usr/bin/ - mkdir -p "$pkgdir"/usr/share/man/ + provides=(qemu-user-static) + options=(!strip) - cp "$srcdir"/usr/bin/* "$pkgdir"/usr/bin/ - cp "$srcdir"/usr/share/man/man1 "$pkgdir"/usr/share/man/ -r + make -C build-user-static DESTDIR="$pkgdir" install "${@:2}" + + # remove conflicting /var/run directory + cd "$pkgdir" + rm -r var + + # Remove BIOS files etc... + rm -r usr/share + + # Rename static qemu binaries + cd "${pkgdir}/usr/bin/" + tidy_strip + ls -1 | while read f; do + mv "$f" "$f-static" + done } + +# vim:set ts=2 sw=2 et: diff --git a/src/redis-desktop-manager/PKGBUILD b/src/redis-desktop-manager/PKGBUILD index 0b2938d..43f580f 100644 --- a/src/redis-desktop-manager/PKGBUILD +++ b/src/redis-desktop-manager/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Vyacheslav Konovalov pkgname=redis-desktop-manager -_pkgver=0.9.4 +_pkgver=0.9.9 pkgver=${_pkgver/-/_} pkgrel=1 pkgdesc='Open source cross-platform Redis Desktop Manager based on Qt 5' @@ -21,7 +21,7 @@ depends=( 'libssh2') makedepends=('git' 'gcc' 'python2') conflicts=('redis-desktop-manager-bin') -source=("rdm::git://github.com/uglide/RedisDesktopManager.git#commit=388a9fc0ba8285890de45f9c4cb559cd61a9bd1a" +source=("rdm::git://github.com/uglide/RedisDesktopManager.git#tag=${_pkgver}" 'rdm.sh' 'rdm.desktop') sha256sums=('SKIP' diff --git a/src/runescape-launcher/PKGBUILD b/src/runescape-launcher/PKGBUILD index 62cfe02..f43b4fe 100644 --- a/src/runescape-launcher/PKGBUILD +++ b/src/runescape-launcher/PKGBUILD @@ -4,7 +4,7 @@ pkgname=runescape-launcher pkgver=2.2.4 -pkgrel=3 +pkgrel=4 pkgdesc="RuneScape Game Client (NXT)" arch=(x86_64) license=(custom) @@ -26,7 +26,7 @@ source_x86_64=("${pkgname}_${pkgver}_amd64.deb::https://content.runescape.com/do "${pkgname}_${pkgver}_Packages::https://content.runescape.com/downloads/ubuntu/dists/trusty/non-free/binary-amd64/Packages") sha256sums=('SKIP' 'SKIP' - 'd20151c9111a77e753954638eb60f1b4ec0d2c86e173041dcd95bb7b309d5b12') + 'SKIP') sha256sums_x86_64=('SKIP' 'SKIP') validpgpkeys=("AAC9264309E4D717441DB9527373B12CE03BEB4B") diff --git a/src/runescape-launcher/wrapper.sh b/src/runescape-launcher/wrapper.sh index 37c6054..be93eb7 100644 --- a/src/runescape-launcher/wrapper.sh +++ b/src/runescape-launcher/wrapper.sh @@ -1,3 +1,9 @@ #!/bin/sh + +# 2018-07-21: Recent builds almost always have crackling audio. +# Bypassing PulseAudio's automatic latency adjustment and specifying an explicit target latency helps... most of the time. If it doesn't work, restart once or twice. +# Number chosen by fair dice roll. (30 is too low to work at all; 500 introduces noticeable latency.) +[ "$PULSE_LATENCY_MSEC" ] || export PULSE_LATENCY_MSEC="60" + export LD_PRELOAD="/usr/lib/libcurl.so.3" exec /usr/bin/runescape-launcher.real "$@" diff --git a/src/searx-py3/PKGBUILD b/src/searx-py3/PKGBUILD index 48ab626..325c710 100644 --- a/src/searx-py3/PKGBUILD +++ b/src/searx-py3/PKGBUILD @@ -2,8 +2,8 @@ pkgname=searx-py3 _pkgname=searx -pkgver=0.14.0 -pkgrel=3 +pkgver=0.15.0 +pkgrel=1 pkgdesc="A privacy-respecting, hackable metasearch engine (python3 based)" arch=('any') url="https://asciimoo.github.io/searx/" @@ -26,7 +26,7 @@ backup=('etc/searx/settings.yml') source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip" 'searx.sysusers' 'searx.service') -sha512sums=('97478d0dd61201510542d6574e7d59f43159fc30608257b8d31200567591e6fc0c1a41a6614e74e29988e4f76d0eae276688e060a6fe7d021fa29e23bbc80b76' +sha512sums=('29b233897b4938b3262b01f7f32a0ff69481ed8934f9e0391571d7da261e4494a5e77f64b683292b5150cc50bb8ba74355c2edc526dd348b2fbd11600cb0592e' '0f4e134ffb7d36807a0591b92e10d2d74a790aeba50d90dc6bdff634353a1e9ed48c572dcf724483daa9eceb5505dc9b79a1b5a8c28a228b300a01b1eafcdc9f' '64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e') diff --git a/src/searx/PKGBUILD b/src/searx/PKGBUILD index 9fb6d55..edd2927 100644 --- a/src/searx/PKGBUILD +++ b/src/searx/PKGBUILD @@ -3,7 +3,7 @@ # Jean Lucas and Reventlov pkgname=searx -pkgver=0.14.0 +pkgver=0.15.0 pkgrel=1 pkgdesc="A privacy-respecting, hackable metasearch engine" arch=('any') @@ -23,12 +23,11 @@ depends=( 'python2-certifi' 'python2-pysocks') conflicts=('searx-git') backup=('etc/searx/settings.yml') -install=searx.install source=("https://github.com/asciimoo/searx/archive/v$pkgver.zip" - 'searx.install' + 'searx.sysusers' 'searx.service') -sha512sums=('97478d0dd61201510542d6574e7d59f43159fc30608257b8d31200567591e6fc0c1a41a6614e74e29988e4f76d0eae276688e060a6fe7d021fa29e23bbc80b76' - 'daf98a69d87dc78ea645a02146d67b0a2903b3b219edadf2e3c987c20d0751ac147b72fe185c74bfe3e0b154ed8ee4b9b503e7ca922548fad52157aada05803c' +sha512sums=('29b233897b4938b3262b01f7f32a0ff69481ed8934f9e0391571d7da261e4494a5e77f64b683292b5150cc50bb8ba74355c2edc526dd348b2fbd11600cb0592e' + 'ec79f46f1e387234a0ae40c3b98c21b4ad16fc75153e3ea25f49a9b98c4f1cf62679686ae8c55273658b4bcbf74a083ce86adbdd25aa1705763fa3743aeff568' '64ab805f7e0089d9b638c2972687ba60331304b3d63bfff138ce8b7903d999f40854067c384cafbc6c635afc335bd084b758cbb7c5cac397d97ed1f31e67ac6e') @@ -50,4 +49,5 @@ package() { ln -s /etc/searx/settings.yml $pkgdir/usr/lib/python2.7/site-packages/searx/settings.yml install -Dm0644 ../searx.service $pkgdir/usr/lib/systemd/system/searx.service + install -Dm644 "${srcdir}/searx.sysusers" "${pkgdir}/usr/lib/sysusers.d/searx.conf" } diff --git a/src/solaar-git/PKGBUILD b/src/solaar-git/PKGBUILD index 6982ce8..c968560 100644 --- a/src/solaar-git/PKGBUILD +++ b/src/solaar-git/PKGBUILD @@ -1,37 +1,42 @@ -# Maintainer: Maxime Poulin +# Contributor: David Runge # Contributor: Arnaud Taffanel -# Contributor: Victor Häggqvist -pkgname=solaar-git -pkgver=r985.b852903 -pkgrel=1 -pkgdesc="Linux devices manager for the Logitech Unifying Receiver." -arch=('any') -url="http://pwr.github.io/Solaar/" -license=('GPL2') +# Contributor: Victor Häggqvist -depends=('python' 'python-pyudev' 'python-gobject' 'pygtk' 'python-six') -optdepends=('libappindicator-gtk3') -makedepends=('git') -provides=('solaar') -conflicts=('solaar') -install='solaar.install' -source=('git+https://github.com/pwr/Solaar.git' 'solaar.install') -md5sums=('SKIP' '4057d7179fe2ae9718b8aac4607a2c47') +_name=Solaar +pkgname=solaar-git +pkgver=0.9.2.r247.gb852903 +pkgrel=1 +pkgdesc="Device manager for Logitech's Unifying receiver peripherals" +url="https://pwr.github.com/Solaar/" +license=('GPL2') +arch=('any') +provides=("solaar") +conflicts=("solaar") +depends=('gtk3' 'libnotify' 'python-dbus' 'python-gobject' 'python-pyudev') +source=("${pkgname}::git+https://github.com/pwr/Solaar.git") +sha512sums=('SKIP') pkgver() { - cd "$srcdir/Solaar" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "${pkgname}" + git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +} + +build() { + cd "${pkgname}" + python setup.py build } package() { - cd "$srcdir/Solaar" - python3 setup.py install --root="$pkgdir/" --optimize=1 - install -D -m0644 rules.d/42-logitech-unify-permissions.rules \ - "$pkgdir/etc/udev/rules.d/42-logitech-unify-permissions.rules" + cd "${pkgname}" + python setup.py install --skip-build \ + --optimize=1 \ + --prefix=/usr \ + --root="${pkgdir}/" + # udev + install -vDm 644 rules.d/42-logitech-unify-permissions.rules \ + "${pkgdir}/usr/lib/udev/rules.d/42-logitech-unify-permissions.rules" + # docs + install -vDm 644 {ChangeLog,README.md} \ + -t "${pkgdir}/usr/share/doc/${pkgname}/" } - -post_install() { - xdg-icon-resource forceupdate - update-desktop-database -q -} - +# vim:set ts=2 sw=2 et: diff --git a/src/sonarr/PKGBUILD b/src/sonarr/PKGBUILD index a145b71..d152231 100644 --- a/src/sonarr/PKGBUILD +++ b/src/sonarr/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Daniel Egeberg # Contributor: Justin Dray pkgname="sonarr" -pkgver="2.0.0.5228" -pkgrel=2 +pkgver="2.0.0.5301" +pkgrel=1 pkgdesc="PVR for newsgroup users" arch=(any) url="https://sonarr.tv" @@ -20,7 +20,7 @@ source=("https://update.sonarr.tv/v2/master/mono/NzbDrone.master.${pkgver}.mono. "sonarr.service" "sonarr.sysusers") noextract=() -sha512sums=('3281e5a487dce61e0bc7c5c83381465615941a7ccd49a3b593e1ff62d9ce83ae19addd1b08a83ecef5c6be613fe1fa52e5217ff19fddcd03f0f00a955f041e9e' +sha512sums=('bb33e87203ab1dbf5d3a118e4ebcb02e7cf0256253d1b52cd9e46331be6232c1473515b9ff38dde040e25fa9619e61b655f1a99038b362158f3d7e659b51d164' '84efa2eebd9afe6b74203aefdc3fdbd4088ecfad17dbe929396f1ffc639743b615a9b75566a0b45d6b7925bd5675368015047c6d65c1421ffe8712728f350695' '591c76551f511198afa71b98bd5c1e3a800af4c24f8be3065148a0dccce85dcb2cdbad03e55efb66441f900df3b97043ea6bd1574cc0653808b8ab0e54abd999' '35af6024f61003c83e1b35bc5658bd8dbce65cadb6f06e6415de20f4c25ab4c4f107224c27668810f99c4a00bfd24175176c35a4b660243935aef872a39ebce7') diff --git a/src/spotify-ripper/PKGBUILD b/src/spotify-ripper/PKGBUILD deleted file mode 100644 index 7ccd365..0000000 --- a/src/spotify-ripper/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: XavierCLL - -pkgname=spotify-ripper -pkgver=2.11 -pkgrel=5 -pkgdesc='Command-line ripper for Spotify, with a workaround for playlist emptying' -arch=('any') -url="https://github.com/wolfmanx/spotify-ripper/tree/pr-collect" -license=('MIT') -depends=('python2' 'python2-spotify' 'mutagen' 'python2-colorama' 'python2-requests' - 'python2-schedule' 'python2-spotipy' 'lame') -optdepends=('flac: Rip songs to lossless FLAC encoding' 'opus-tools: Rip songs to Opus encoding' - 'vorbis-tools: Rip songs to Ogg Vorbis encoding' 'faac: Rip songs to AAC format with FreeAAC' - 'libav-git-no-libs: Rip songs to Apple Lossless format' 'fdkaac: Rip songs to MP4/M4A format with Fraunhofer FDK AAC codec') -makedepends=('python2-setuptools') -source=("https://github.com/wolfmanx/spotify-ripper/archive/pr-collect.zip" - "setup.py" "requirements.txt") -md5sums=('SKIP' - 'c80e4dc2d35501cc87ef75deb954a3c0' - '433ec722cffccd32c7e31807262f1128') - -package() { - cd $pkgname-* - - # fix imports - cp ../setup.py . - cp ../requirements.txt . - - python2 setup.py install --root="$pkgdir" -} diff --git a/src/spotify-ripper/requirements.txt b/src/spotify-ripper/requirements.txt deleted file mode 100644 index 6204e4d..0000000 --- a/src/spotify-ripper/requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ -pyspotify -colorama -mutagen -requests -schedule diff --git a/src/spotify-ripper/setup.py b/src/spotify-ripper/setup.py deleted file mode 100644 index 5a174a1..0000000 --- a/src/spotify-ripper/setup.py +++ /dev/null @@ -1,74 +0,0 @@ -#!/usr/bin/env python -# coding=utf-8 - -from setuptools import setup, find_packages -import os - - -def create_default_dir(): - default_dir = os.path.normpath(os.path.realpath( - (os.path.join(os.path.expanduser("~"), ".spotify-ripper")))) - if not os.path.exists(default_dir): - print("Creating default settings directory: " + - default_dir) - os.makedirs(default_dir.encode("utf-8")) - - -def _read(fn): - path = os.path.join(os.path.dirname(__file__), fn) - return open(path).read() - -setup( - name='spotify-ripper', - version='2.11', - packages=find_packages(exclude=["tests"]), - #scripts=['spotify_ripper/main.py'], - include_package_data=True, - zip_safe=False, - - # Executable - entry_points={ - 'console_scripts': [ - 'spotify-ripper = spotify_ripper.main:main', - ], - }, - - # Additional data - package_data={ - '': ['README.rst', 'LICENCE'] - }, - - # Requirements - install_requires=[ - 'pyspotify', - 'colorama', - 'mutagen', - 'requests', - 'schedule', - 'spotipy' - ], - - # Metadata - author='James Newell, SolidHal', - author_email='james.newell@gmail.com', - description='a small ripper for Spotify that rips Spotify URIs ' - 'to audio files', - license='MIT', - keywords="spotify ripper mp3 ogg vorbis flac opus acc mp4 m4a", - url='https://github.com/SolidHal/spotify-ripper', - download_url='https://github.com/SolidHal/spotify-ripper/archive/2.11.tar.gz', - classifiers=[ - 'Topic :: Multimedia :: Sound/Audio', - 'Topic :: Multimedia :: Sound/Audio :: Capture/Recording', - 'License :: OSI Approved :: MIT License', - 'Environment :: Console', - "Intended Audience :: Developers", - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - ], - #long_description=_read('README.rst'), -) - -create_default_dir() diff --git a/src/spotify/.gitignore b/src/spotify/.gitignore deleted file mode 100644 index 7861b8d..0000000 --- a/src/spotify/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -pkg/ -src/ -*.deb -*.pkg.tar* diff --git a/src/spotify/LICENSE b/src/spotify/LICENSE deleted file mode 100644 index 3dbb4c4..0000000 --- a/src/spotify/LICENSE +++ /dev/null @@ -1,349 +0,0 @@ -Spotify Terms and Conditions of Use - -Effective as of 1 November 2016 - -1 Introduction -2 Changes to the Agreements -3 Enjoying Spotify -4 Rights we grant you -5 Third Party Applications -6 User-Generated Content -7 Rights you grant us -8 User guidelines -9 Infringement and reporting User Content -10 Service limitations and modifications -11 Brand Accounts -12 Spotify Support Community -13 Customer support -14 Export control -15 Payments, cancellations, and cooling off -16 Term and termination -17 Warranty and disclaimer -18 Limitation -19 Third party rights -20 Entire agreement -21 Severability and waiver -22 Assignment -23 Indemnification -24 Choice of law, mandatory arbitration and venue -25 Contact us - -Hello, and welcome to our Terms and Conditions of Use. This is important and affects your legal rights, so please read them and our Privacy Policy and other terms referenced in this document carefully. We hope you’re sitting comfortably and listening to some great music. Here we go… - -1 Introduction - -Thanks for choosing Spotify ("Spotify", "we", "us", "our"). By signing up or otherwise using the Spotify service, websites, and software applications (together, the "Spotify Service" or "Service"), or accessing any content or material that is made available by Spotify through the Service (the "Content") you are entering into a binding contract with the Spotify entity indicated at the bottom of this document. The Spotify Service also includes the Spotify Support Community as further described in the Spotify Support Community section. - -The Spotify Service includes social and interactive features. Use of the Spotify Service relies on several technical requirements. - -Your agreement with us includes these Terms and Conditions of Use ("Terms") and our Privacy Policy. (The Terms, Privacy Policy, and any additional terms that you agree to, as discussed in the Entire Agreement section, are referred to together as the "Agreements".) If you wish to review the terms of the Agreements, the effective version of the Agreements can be found on Spotify’s website. You acknowledge that you have read and understood the Agreements, accept these Agreements, and agree to be bound by them. If you don’t agree with (or cannot comply with) the Agreements, then you may not use the Spotify Service or consume any Content. - -Please read the Agreements carefully. They cover important information about Spotify Services provided to you and any charges, taxes, and fees we bill you. The Agreements include information about future changes to the Agreements, export controls, automatic renewals, limitations of liability, privacy information, a class action waiver, and resolution of disputes by arbitration instead of in court. - -Any information that you provided during sign-up can be corrected during the sign-up process by returning to the previous screens and correcting erroneous information. - -In order to use the Spotify Service and access the Content, you need to (1) be 18 or older, or be 13 or older and have your parent or guardian’s consent to the Agreements (except as set forth in the chart below), (2) have the power to enter a binding contract with us and not be barred from doing so under any applicable laws, and (3) be resident in a country where the Service is available. You also promise that any registration information that you submit to Spotify is true, accurate, and complete, and you agree to keep it that way at all times. - -If you are a resident of one of the following countries, reference this chart for your country-specific age restrictions: - -Country Age Requirements -Chile, Ecuador, Paraguay, Peru Must be 18 or older, or be 15 or older and have parent or guardian consent. -Brazil Must be 18 or older, or be 16 or older and have parent or guardian consent. -Nicaragua, Taiwan Must be 20 or older, or be 13 or older and have parent or guardian consent. -Bulgaria, Hungary, Germany Must be 18 or older, or be 14 or older and have parent or guardian consent. -Italy Must be 13 or older to use Free Service. To register for a Paid Subscription, you must be 18 or older, or be 13 or older and have parent or guardian consent (your parents/guardians will enter into contract on behalf of you). -Malaysia Must be 18 or older, or if 13 to 18, parent or guardian consent is required, and guardian enters into agreement. -Lithuania Must be 13 or older to use Service. For Paid Subscriptions, you must be 18 or older, or be 14 or older with parent or guardian consent. If you are 13 to 18, guardian enters into agreement. -Canada Must be 13 or older to use Service. For Paid Subscriptions, you must be age of majority in your province or territory of residence, or 13 or older with parent or guardian consent. -Spain Must be 14 or older to use Free Service. To register for a Paid Subscription, you must be 18 or older, or be 14 or older and have parent or guardian consent (your parents/guardians will enter into contract on behalf of you). -2 Changes to the Agreements - -Occasionally we may, in our discretion, make changes to the Agreements. When we make material changes to the Agreements, we’ll provide you with prominent notice as appropriate under the circumstances, e.g., by displaying a prominent notice within the Service or by sending you an email. In some cases, we will notify you in advance, and your continued use of the Service after the changes have been made will constitute your acceptance of the changes. Please therefore make sure you read any such notice carefully. If you do not wish to continue using the Service under the new version of the Agreements, you may terminate the Agreements by contacting us through the Customer Service contact form. - -3 Enjoying Spotify - -Here’s some information about all the ways you can enjoy Spotify. - -3.1 Our Services & Paid Subscriptions - -Spotify provides streaming services offering a selection of music and other content. Certain Spotify services are provided to you free-of-charge. Other Spotify services require payment before you can access them. The Spotify services that may be accessed after payment are currently referred to as the "Premium Service" and the "Unlimited Service" (together, the "Paid Subscriptions"). The Spotify service that does not require payment is currently referred to as the "Free Service". You can learn more about our services by visiting our website. - -The Unlimited Service may not be available to all users. We will explain which services are available to you when you are signing up for the services. If you cancel your subscription to the Unlimited Service, or if your subscription to the Unlimited Service is interrupted (for example, if you change your payment details), you may not be able to re-subscribe for the Unlimited Service. Note that the Unlimited Service may be discontinued in the future, in which case you will no longer be charged for the Service. - -If you reside in Turkey, your access to the Free Service may be limited to a fixed amount of listening hours per month. - -3.2 Codes and other pre-paid offers - -If you have purchased or received a code, gift card, pre-paid offer or other offer provided or sold by or on behalf of Spotify for access to a Paid Subscription ("Code"), separate terms and conditions presented to you along with the Code may also apply to your access to the Service and you agree to comply with any such terms and conditions. - -3.3 Trials - -From time to time, we or others on our behalf may offer trials of Paid Subscriptions for a specified period without payment or at a reduced rate (a "Trial"). Spotify reserves the right, in its absolute discretion, to determine your eligibility for a Trial, and, subject to applicable laws, to withdraw or to modify a Trial at any time without prior notice and with no liability, to the greatest extent permitted under the law. - -For some Trials, we’ll require you to provide your payment details to start the Trial. AT THE END OF SUCH TRIALS, WE MAY AUTOMATICALLY START TO CHARGE YOU FOR THE APPLICABLE PAID SUBSCRIPTION ON THE FIRST DAY FOLLOWING THE END OF THE TRIAL, ON A RECURRING MONTHLY BASIS. BY PROVIDING YOUR PAYMENT DETAILS IN CONJUNCTION WITH THE TRIAL, YOU AGREE TO THIS CHARGE USING SUCH PAYMENT DETAILS. IF YOU DO NOT WANT THIS CHARGE, YOU MUST CANCEL THE APPLICABLE PAID SUBSCRIPTION THROUGH YOUR SPOTIFY ACCOUNT’S SUBSCRIPTION PAGE OR TERMINATE YOUR SPOTIFY ACCOUNT BEFORE THE END OF THE TRIAL. IF YOU DO NOT WANT TO CONTINUE TO BE CHARGED ON A RECURRING MONTHLY BASIS, YOU MUST CANCEL THE APPLICABLE PAID SUBSCRIPTION THROUGH YOUR SPOTIFY ACCOUNT’S SUBSCRIPTION PAGE OR TERMINATE YOUR SPOTIFY ACCOUNT BEFORE THE END OF THE RECURRING MONTHLY PERIOD. PAID SUBSCRIPTIONS CANNOT BE TERMINATED BEFORE THE END OF THE PERIOD FOR WHICH YOU HAVE ALREADY PAID, AND EXCEPT AS EXPRESSLY PROVIDED IN THESE TERMS, SPOTIFY WILL NOT REFUND ANY FEES THAT YOU HAVE ALREADY PAID. THE LIMITATION SECTION SETS FORTH ADDITIONAL TERMS REGARDING CANCELLATION OF YOUR PAID SUBSCRIPTION. - -4 Rights we grant you - -The Spotify Service and the Content are the property of Spotify or Spotify's licensors. We grant you a limited, non-exclusive, revocable licence to make use of the Spotify Service, and a limited, non-exclusive, revocable licence to make personal, non-commercial, entertainment use of the Content (the "Licence"). This Licence shall remain in effect until and unless terminated by you or Spotify. You promise and agree that you are using the Content for your own personal, non-commercial, entertainment use and that you will not redistribute or transfer the Spotify Service or the Content. - -The Spotify software applications and the Content are licensed, not sold, to you, and Spotify and its licensors retain ownership of all copies of the Spotify software applications and Content even after installation on your personal computers, mobile handsets, tablets, and/or other relevant devices ("Devices"). - -All Spotify trademarks, service marks, trade names, logos, domain names, and any other features of the Spotify brand ("Spotify Brand Features") are the sole property of Spotify or its licensors. The Agreements do not grant you any rights to use any Spotify Brand Features whether for commercial or non-commercial use. - -You agree to abide by our User guidelines and not to use the Spotify Service, the Content, or any part thereof in any manner not expressly permitted by the Agreements. Except for the rights expressly granted to you in these Agreements, Spotify grants no right, title, or interest to you in the Spotify Service or Content. - -Third party software (for example, open source software libraries) included in the Spotify Service are licensed to you either under the Agreements or under the relevant third party software library’s licence terms as published in the help or settings section of our desktop and mobile client and/or on our website. - -5 Third Party Applications - -The Spotify Service is integrated with third party applications, websites, and services ("Third Party Applications") to make available content, products, and/or services to you. These Third Party Applications may have their own terms and conditions of use and privacy policies and your use of these Third Party Applications will be governed by and subject to such terms and conditions and privacy policies. You understand and agree that Spotify does not endorse and is not responsible or liable for the behavior, features, or content of any Third Party Application or for any transaction you may enter into with the provider of any such Third Party Applications. - -6 User-Generated Content - -Spotify users may post, upload, and/or contribute ("post") content to the Service (which may include, for example, pictures, text, messages, information, playlist compilations, and/or other types of content) ("User Content"). For the avoidance of doubt, "User Content" includes any such content posted to the Spotify Support Community as well as any other part of the Spotify Service. - -You promise that, with respect to any User Content you post on Spotify, (1) you have the right to post such User Content, and (2) such User Content, or its use by Spotify as contemplated by the Agreements, does not violate the Agreements, applicable law, or the intellectual property (including without limitation copyright), publicity, personality, or other rights of others or imply any affiliation with or endorsement of you or your User Content by Spotify or any artist, band, label, entity or individual without express written consent from such individual or entity. - -Spotify may, but has no obligation to, monitor, review, or edit User Content. In all cases, Spotify reserves the right to remove or disable access to any User Content for any or no reason, including but not limited to, User Content that, in Spotify’s sole discretion, violates the Agreements. Spotify may take these actions without prior notification to you or any third party. Removal or disabling of access to User Content shall be at our sole discretion, and we do not promise to remove or disable access to any specific User Content. - -You are solely responsible for all User Content that you post. Spotify is not responsible for User Content nor does it endorse any opinion contained in any User Content. YOU AGREE THAT IF ANYONE BRINGS A CLAIM AGAINST SPOTIFY RELATED TO USER CONTENT THAT YOU POST, THEN, TO THE EXTENT PERMISSIBLE UNDER LOCAL LAW, YOU WILL INDEMNIFY AND HOLD SPOTIFY HARMLESS FROM AND AGAINST ALL DAMAGES, LOSSES, AND EXPENSES OF ANY KIND (INCLUDING REASONABLE ATTORNEY FEES AND COSTS) ARISING OUT OF SUCH CLAIM. - -7 Rights you grant us - -In consideration for the rights granted to you under the Agreements, you grant us the right (1) to allow the Spotify Service to use the processor, bandwidth, and storage hardware on your Device in order to facilitate the operation of the Service, (2) to provide advertising and other information to you, and (3) to allow our business partners to do the same. In any part of the Spotify Service, the Content you view, including its selection and placement, may be influenced by commercial considerations, including agreements with third parties. Some Content licensed or provided to Spotify (e.g. podcasts) may contain advertising as part of the Content. In such cases, Spotify will make such Content available to you unmodified. - -If you provide feedback, ideas or suggestions to Spotify in connection with the Spotify Service or Content ("Feedback"), you acknowledge that the Feedback is not confidential and you authorize Spotify to use that Feedback without restriction and without payment to you. Feedback is considered a type of User Content. - -You grant Spotify a non-exclusive, transferable, sub-licensable, royalty-free, perpetual (or, in jurisdictions where this is not permitted, for a term equal to the duration of the Agreements plus twenty (20) years), irrevocable, fully paid, worldwide licence to use, reproduce, make available to the public (e.g. perform or display), publish, translate, modify, create derivative works from, and distribute any of your User Content in connection with the Service through any medium, whether alone or in combination with other content or materials, in any manner and by any means, method or technology, whether now known or hereafter created. Aside from the rights specifically granted herein, you retain ownership of all rights, including intellectual property rights, in the User Content. Where applicable and permitted under applicable law, you also agree to waive any "moral rights" (or the equivalent under applicable law) such as your right to be identified as the author of any User Content, including Feedback, and your right to object to derogatory treatment of such User Content. - -8 User guidelines - -Spotify respects intellectual property rights and expects you to do the same. We’ve established a few ground rules for you to follow when using the Service, to make sure Spotify stays enjoyable for everyone. Please follow these rules and encourage other users to do the same. - -The following is not permitted for any reason whatsoever: - -copying, redistributing, reproducing, "ripping", recording, transferring, performing or displaying to the public, broadcasting, or making available to the public any part of the Spotify Service or the Content, or otherwise making any use of the Spotify Service or the Content which is not expressly permitted under the Agreements or applicable law or which otherwise infringes the intellectual property rights (such as copyright) in the Spotify Service or the Content or any part of it; -using the Spotify Service to import or copy any local files you do not have the legal right to import or copy in this way; -transferring copies of cached Content from an authorized Device to any other Device via any means; -reverse-engineering, decompiling, disassembling, modifying, or creating derivative works based on the Spotify Service, Content or any part thereof unless permitted by applicable law; -circumventing any technology used by Spotify, its licensors, or any third party to protect the Content or the Service; -selling, renting, sublicensing or leasing of any part of the Spotify Service or the Content; -circumventing any territorial restrictions applied by Spotify or it licensors; -artificially increasing play count or otherwise manipulating the Services by using a script or other automated process; -removing or altering any copyright, trademark, or other intellectual property notices contained on or provided through the Spotify Service (including for the purpose of disguising or changing any indications of the ownership or source of any Content); -providing your password to any other person or using any other person’s username and password; -"crawling" the Spotify Service or otherwise using any automated means (including bots, scrapers, and spiders) to collect information from Spotify; or -selling a user account or playlist, or otherwise accepting any compensation, financial or otherwise, to influence the name of an account or playlist or the content included on an account or playlist. -Please respect Spotify, the owners of the Content, and other users of the Spotify Service. Don’t engage in any activity, post any User Content, or register and/or use a username, which is or includes material that: - -is offensive, abusive, defamatory, pornographic, threatening, or obscene; -is illegal, or intended to promote or commit an illegal act of any kind, including but not limited to violations of intellectual property rights, privacy rights, or proprietary rights of Spotify or a third party; -includes your password or purposely includes any other user’s password or purposely includes personal data of third parties or is intended to solicit such personal data; -includes malicious content such as malware, Trojan horses, or viruses, or otherwise interferes with any user’s access to the Service; -is intended to or does harass or bully other users; -impersonates or misrepresents your affiliation with another user, person, or entity, or is otherwise fraudulent, false, deceptive, or misleading; -uses automated means to artificially promote content; -involves the transmission of unsolicited mass mailings or other forms of spam ("spam"), junk mail, chain letters, or similar, including through the Spotify inbox; -involves commercial or sales activities, such as advertising, promotions, contests, sweepstakes, or pyramid schemes, that are not expressly authorized by Spotify; -links to, references, or otherwise promotes commercial products or services, except as expressly authorized by Spotify; -interferes with or in any way disrupts the Spotify Service, tampers with, breaches, or attempts to probe, scan, or test for vulnerabilities in the Service or Spotify’s computer systems, network, usage rules, or any of Spotify’s security components, authentication measures or any other protection measures applicable to the Service, the Content or any part thereof; or -conflicts with the Agreements, as determined by Spotify. -You acknowledge and agree that posting any such User Content may result in immediate termination or suspension of your Spotify account. You also agree that Spotify may also reclaim your username for any reason. - -Please be thoughtful about how you use the Spotify Service and what you share. The Spotify Service includes social and interactive features, including the ability to post User Content, share content, and make certain information about you public. Remember that shared or publicly available information may be used and re-shared by other users on Spotify or across the web, so please use Spotify carefully and be mindful of your account settings. Spotify has no responsibility for your choices to post material on the Service. - -Your password protects your user account, and you are solely responsible for keeping your password confidential and secure. You understand that you are responsible for all use of your username and password on the Service. If your username or password is lost or stolen, or if you believe there has been unauthorized access to your account by third parties, please notify us immediately and change your password as soon as possible. - -9 Infringement and reporting User Content - -Spotify respects the rights of intellectual property owners. If you believe that any Content infringes your intellectual property rights or other rights, see Spotify’s copyright policy. If Spotify is notified by a copyright holder that any Content infringes a copyright, Spotify may in its absolute discretion take actions without prior notification to the provider of that Content. If the provider believes that the content is not infringing, the provider may submit a counter-notification to Spotify with a request to restore the removed content. - -If you believe that any Content does not comply with the User guidelines, please fill out our notice form. - -10 Service limitations and modifications - -Spotify will make reasonable efforts to keep the Spotify Service operational. However, certain technical difficulties or maintenance may, from time to time, result in temporary interruptions. To the extent permissible under applicable law, Spotify reserves the right, periodically and at any time, to modify or discontinue, temporarily or permanently, functions and features of the Spotify Service, with or without notice, all without liability to you, except where prohibited by law, for any interruption, modification, or discontinuation of the Spotify Service or any function or feature thereof. Notwithstanding the foregoing, if you have prepaid fees for Paid Subscriptions that Spotify permanently discontinues prior to the end of the Pre-Paid Period (defined in the Payments, cancellations, and cooling off section), Spotify will refund you the prepaid fees for the Pre-Paid Period after such discontinuation. You understand, agree, and accept that Spotify has no obligation to maintain, support, upgrade, or update the Service, or to provide all or any specific content through the Service. This section will be enforced to the extent permissible by applicable law. Spotify and/or the owners of any Content may, from time to time, remove any such Content without notice to the extent permitted by applicable law. - -11 Brand Accounts - -If you establish a Spotify account on behalf of a company, organization, entity, or brand (a "Brand", and such account a "Brand Account"), the terms "you" and "your", as used throughout the Agreements, apply to both you and the Brand, as applicable. - -If you open a Brand Account, you represent and warrant that you are authorized to grant all permissions and licences provided in the Agreements and to bind the Brand to the Agreements. - -11.1 Following - -The Brand may only follow users who first follow the Brand; and the Brand may not take any action that implies an endorsement or relationship between the Brand and the followed user, unless the Brand has independently obtained the rights to imply such an endorsement. Upon Spotify’s request, in its sole discretion, a Brand must cease following a user. - -11.2 Listening - -The Brand may not stream media. - -11.3 Messaging - -The Brand may only send messages to users who first send messages to the Brand. - -11.4 Brand Playlists and Sharing - -The Brand may not create or share any Spotify playlists, whether within the Spotify Service or elsewhere, that imply an endorsement or relationship between the Brand and any artist or any other party, unless the Brand has independently obtained the rights to imply such an endorsement. Brands may wish to consult Spotify’s Brand Playlist Guidelines. - -12 Spotify Support Community - -The Spotify Support Community is a place for discussions and exchange of information, tips, and other materials related to the Spotify Service. In order to use the Spotify Support Community, you must (1) have an existing Spotify account; and (2) authenticate your Spotify account for use on the Support Community (a "Spotify Support Account"). Instructions for creating a Spotify Support Account can be found on the Community registration page. In addition to the Agreements, you also agree to adhere to the Spotify Support Community Guidelines that you will be presented with upon registration (the "Support Community Guidelines") when using the Spotify Support Community. If you do not agree to the Agreements or the Support Community Guidelines, you may not use the Spotify Support Community. - -12.1 Spotify Support Accounts - -By creating a Spotify Support Account, you confirm that any registration information that you submit to Spotify is true, accurate, and complete and that you will update such information in order to keep it current. It is strictly prohibited to include information in your profile that suggests that you are a Spotify employee or moderator or to otherwise pose as such an employee or moderator when using the Spotify Support Community. You also acknowledge and agree that Spotify may remove or reclaim your username at any time if Spotify in its absolute discretion considers such action appropriate. - -12.2 No official support - -No User Content or other content posted by Spotify employees, moderators and/or representatives on the Spotify Support Community should be construed as official support provided by Spotify. For details regarding official support, see the section Customer Support. Any content provided or made available to you on the Spotify Support Community by Spotify employees, moderators, and/or representatives is provided on an "as is" basis without warranties of any kind. - -You acknowledge that opinions expressed in User Content on the Spotify Support Community are those of contributors of such User Content only and do not reflect the opinions or policies of Spotify or any of its officers, shareholders, employees, agents, directors, subsidiaries, affiliates, suppliers, or licensors. - -12.3 Reward Program - -The Spotify Support Community features a reward system whereby Spotify, in its sole discretion, may reward users based on the amount of "Kudos" received or quality of responses by a user. You agree to only give Kudos to other users (and not to yourself) and only when deserved, and to refrain from any attempts to manipulate the reward system, e.g., by creating multiple accounts or artificial responses. You acknowledge that Spotify’s decision in respect of any reward shall be final and binding. - -13 Customer support - -For customer support with account-related and payment-related questions ("Customer Support Queries"), please submit a ticket to our customer service department using the Customer Service contact form on the About Us section of our website. We will use reasonable endeavours to respond to all Customer Support Queries within a reasonable time frame but we make no guarantees or warranties of any kind that any Customer Support Queries will be responded to within any particular time frame and/or that we will be able to satisfactorily answer any such queries. - -14 Export control - -Spotify’s products may be subject to U.S. export and re-export control laws and regulations or similar laws applicable in other jurisdictions, including the Export Administration Regulations ("EAR") maintained by the U.S. Department of Commerce, trade and economic sanctions maintained by the Treasury Department’s Office of Foreign Assets Control ("OFAC"), and the International Traffic in Arms Regulations ("ITAR") maintained by the Department of State. You warrant that you are (1) not located in Cuba, Iran, North Korea, Sudan, or Syria; and (2) are not a denied party as specified in the regulations listed above. - -You agree to comply with all applicable export and reexport control laws and regulations, including the EAR, trade and economic sanctions maintained by OFAC, and the ITAR. Specifically, you agree that you shall not – directly or indirectly – sell, export, reexport, transfer, divert, or otherwise dispose of any products, software, or technology (including products derived from or based on such technology) received from Spotify under the Agreements to any destination, entity, or person prohibited by any applicable laws or regulations of the United States or any other jurisdiction without obtaining prior authorization from the competent government authorities as required by those laws and regulations. This export control clause shall survive termination or cancellation of the Agreements. - -15 Payments, cancellations, and cooling off - -Paid Subscriptions can be purchased directly from Spotify or through a third party, such as a telephone company, either by (1) paying a monthly subscription fee; or (2) pre-payment giving you access to the Spotify Service for a specific time period ("Pre-Paid Period"). If you have purchased a Paid Subscription using a Code, your Paid Subscription will automatically terminate at the end of the Pre-Paid Period, or when there is an insufficient pre-paid balance to pay for the Service. - -When you register for a Paid Subscription, Trial, or Code online, you consent to get access to Spotify Premium immediately. If you reside outside the United States and register for a Paid Subscription or Code online, you may change your mind for any or no reason and receive a full refund of all monies paid within fourteen (14) days starting from the day you sign-up for the relevant service (the "Cooling-off Period"). Refunds will not, however, be provided if you have accessed Spotify at any time during the Cooling-off Period. - -Unless your Paid Subscription has been purchased as a Pre-Paid Period, your payment to Spotify will automatically renew at the end of the subscription period, unless you cancel your Paid Subscription through your subscription page before the end of the current subscription period. The cancellation will take effect the day after the last day of the current subscription period, and you will be downgraded to the Free Service. However, if you cancel your payment or Paid Subscription and/or terminate any of the Agreements (1) after you have accessed Spotify during the Cooling-off Period, or (2) after the Cooling-off Period is over (where applicable), or (3) before the end of the current subscription period, we will not refund any subscription fees already paid to us. The refund method will depend upon the payment method. - -If you wish to receive a full refund of all monies paid before the Cooling-off Period is over, you must contact Customer Support. - -If you have purchased your Paid Subscription through a third party, your subscription is also subject to the terms of your agreement with that third party (in addition to these Terms). To cancel your subscription, you must cancel directly with that third party. - -Spotify may change the price for the Paid Subscriptions, Pre-Paid Period (for periods not yet paid for), or Codes from time to time, and will communicate any price changes to you in advance and, if applicable, how to accept those changes. Price changes for Paid Subscriptions will take effect at the start of the next subscription period following the date of the price change. As permitted by local law, you accept the new price by continuing to use the Spotify Service after the price change takes effect. If you do not agree with the price changes, you have the right to reject the change by unsubscribing from the Spotify Service prior to the price change going into effect. Please therefore make sure you read any such notification of price changes carefully. - -16 Term and termination - -The Agreements will continue to apply to you until terminated by either you or Spotify. However, you acknowledge and agree that the perpetual licence granted by you in relation to User Content, including Feedback, is irrevocable and will therefore continue after expiry or termination of any of the Agreements for any reason. Spotify may terminate the Agreements or suspend your access to the Spotify Service at any time, including in the event of your actual or suspected unauthorised use of the Spotify Service and/or Content, or non-compliance with the Agreements. If you or Spotify terminate the Agreements, or if Spotify suspends your access to the Spotify Service, you agree that Spotify shall have no liability or responsibility to you and Spotify will not refund any amounts that you have already paid, to the fullest extent permitted under applicable law. To learn how to terminate your Spotify account, please contact us through the Customer Service contact form which is available on our About Us page. This section will be enforced to the extent permissible by applicable law. You may terminate the Agreements at any time. - -Sections 6, 7, 8, 10, 14, 16, 17, 18, 19, 20, 21, 22, 23, and 24 herein, as well as any other sections of the Agreements that, either explicitly or by their nature, must remain in effect even after termination of the Agreements, shall survive termination. - -17 Warranty and disclaimer - -WE ENDEAVOUR TO PROVIDE THE BEST SERVICE WE CAN, BUT YOU UNDERSTAND AND AGREE THAT THE SPOTIFY SERVICE IS PROVIDED "AS IS" AND "AS AVAILABLE", WITHOUT EXPRESS OR IMPLIED WARRANTY OR CONDITION OF ANY KIND. YOU USE THE SPOTIFY SERVICE AT YOUR OWN RISK. TO THE FULLEST EXTENT PERMITTED BY APPLICABLE LAW, SPOTIFY AND ALL OWNERS OF THE CONTENT MAKE NO REPRESENTATIONS AND DISCLAIM ANY WARRANTIES OR CONDITIONS OF SATISFACTORY QUALITY, MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. NEITHER SPOTIFY NOR ANY OWNER OF CONTENT WARRANTS THAT THE SPOTIFY SERVICE IS FREE OF MALWARE OR OTHER HARMFUL COMPONENTS. IN ADDITION, SPOTIFY MAKES NO REPRESENTATION NOR DOES IT WARRANT, ENDORSE, GUARANTEE, OR ASSUME RESPONSIBILITY FOR ANY THIRD PARTY APPLICATIONS (OR THE CONTENT THEREOF), USER CONTENT, OR ANY OTHER PRODUCT OR SERVICE ADVERTISED OR OFFERED BY A THIRD PARTY ON OR THROUGH THE SPOTIFY SERVICE OR ANY HYPERLINKED WEBSITE, OR FEATURED IN ANY BANNER OR OTHER ADVERTISING. YOU UNDERSTAND AND AGREE THAT SPOTIFY IS NOT RESPONSIBLE OR LIABLE FOR ANY TRANSACTION BETWEEN YOU AND THIRD PARTY PROVIDERS OF THIRD PARTY APPLICATIONS OR PRODUCTS OR SERVICES ADVERTISED ON OR THROUGH THE SPOTIFY SERVICE. AS WITH ANY PURCHASE OF A PRODUCT OR SERVICE THROUGH ANY MEDIUM OR IN ANY ENVIRONMENT, YOU SHOULD USE YOUR JUDGMENT AND EXERCISE CAUTION WHERE APPROPRIATE. NO ADVICE OR INFORMATION WHETHER ORAL OR IN WRITING OBTAINED BY YOU FROM SPOTIFY SHALL CREATE ANY WARRANTY ON BEHALF OF SPOTIFY IN THIS REGARD. SOME ASPECTS OF THIS SECTION MAY NOT APPLY IN SOME JURISDICTIONS IF PROHIBITED BY APPLICABLE LAW. - -THIS DOES NOT AFFECT YOUR STATUTORY RIGHTS AS A CONSUMER. - -18 Limitation - -YOU AGREE THAT, TO THE EXTENT PERMITTED BY APPLICABLE LAW, YOUR SOLE AND EXCLUSIVE REMEDY FOR ANY PROBLEMS OR DISSATISFACTION WITH THE SPOTIFY SERVICE IS TO UNINSTALL ANY SPOTIFY SOFTWARE AND TO STOP USING THE SPOTIFY SERVICE. WHILE SPOTIFY ACCEPTS NO RESPONSIBILITY FOR THIRD PARTY APPLICATIONS OR THE CONTENT THEREOF, AND WHILE YOUR RELATIONSHIP WITH SUCH THIRD PARTY APPLICATIONS MAY BE GOVERNED BY SEPARATE AGREEMENTS WITH SUCH THIRD PARTIES, TO THE EXTENT PERMITTED BY APPLICABLE LAW, YOUR SOLE AND EXCLUSIVE REMEDY, AS WITH RESPECT TO SPOTIFY, FOR ANY PROBLEMS OR DISSATISFACTION WITH THIRD PARTY APPLICATIONS OR THE CONTENT THEREOF, IS TO UNINSTALL AND/OR STOP USING ANY SUCH THIRD PARTY APPLICATIONS. - -TO THE FULLEST EXTENT PERMITTED BY LAW, IN NO EVENT WILL SPOTIFY, ITS OFFICERS, SHAREHOLDERS, EMPLOYEES, AGENTS, DIRECTORS, SUBSIDIARIES, AFFILIATES, SUCCESSORS, ASSIGNS, SUPPLIERS, OR LICENSORS BE LIABLE FOR (1) ANY INDIRECT, SPECIAL, INCIDENTAL, PUNITIVE, EXEMPLARY, OR CONSEQUENTIAL DAMAGES; (2) ANY LOSS OF USE, DATA, BUSINESS, OR PROFITS (WHETHER DIRECT OR INDIRECT), IN ALL CASES ARISING OUT OF THE USE OR INABILITY TO USE THE SPOTIFY SERVICE, THIRD PARTY APPLICATIONS, OR THIRD PARTY APPLICATION CONTENT, REGARDLESS OF LEGAL THEORY, WITHOUT REGARD TO WHETHER SPOTIFY HAS BEEN WARNED OF THE POSSIBILITY OF THOSE DAMAGES, AND EVEN IF A REMEDY FAILS OF ITS ESSENTIAL PURPOSE; OR (3) AGGREGATE LIABILITY FOR ALL CLAIMS RELATING TO THE SPOTIFY SERVICE, THIRD PARTY APPLICATIONS, OR THIRD PARTY APPLICATION CONTENT MORE THAN THE AMOUNTS PAID BY YOU TO SPOTIFY DURING THE PRIOR TWELVE MONTHS IN QUESTION, TO THE EXTENT PERMISSIBLE BY APPLICABLE LAW. - -Nothing in the Agreements removes or limits Spotify’s liability for fraud, fraudulent misrepresentation, death or personal injury caused by its negligence, and, if required by applicable law, gross negligence. Some aspects of this section may not apply in some jurisdictions if prohibited by applicable law. - -19 Third party rights - -You acknowledge and agree that the owners of the Content and certain distributors (such as app store providers) are intended beneficiaries of the Agreements and have the right to enforce the Agreements directly against you. Other than as set out in this section, the Agreements are not intended to grant rights to anyone except you and Spotify, and in no event shall the Agreements create any third party beneficiary rights. Furthermore, the rights to terminate, rescind, or agree to any variation, waiver, or settlement of the Agreements are not subject to the consent of any other person. - -If you have downloaded the App from the Apple, Inc. ("Apple") App Store or if you are using the App on an iOS device, you acknowledge that you have read, understood, and agree to the following notice regarding Apple. This Agreement is between you and Spotify only, not with Apple, and Apple is not responsible for the Service and the content thereof. Apple has no obligation whatsoever to furnish any maintenance and support services with respect to the Service. In the event of any failure of the Service to conform to any applicable warranty, then you may notify Apple and Apple will refund any applicable purchase price for the App to you; and, to the maximum extent permitted by applicable law, Apple has no other warranty obligation whatsoever with respect to the Service. Apple is not responsible for addressing any claims by you or any third party relating to the Service or your possession and/or use of the Service, including, but not limited to: (1) product liability claims; (2) any claim that the Service fails to conform to any applicable legal or regulatory requirement; and (3) claims arising under consumer protection or similar legislation. Apple is not responsible for the investigation, defense, settlement and discharge of any third party claim that the Service and/or your possession and use of the App infringe that third party’s intellectual property rights. You agree to comply with any applicable third party terms, when using the Service. Apple, and Apple’s subsidiaries, are third party beneficiaries of this Agreement, and upon your acceptance of this Agreement, Apple will have the right (and will be deemed to have accepted the right) to enforce this Agreement against you as a third party beneficiary of this Agreement. You hereby represent and warrant that (1) you are not located in a country that is subject to a U.S. Government embargo, or that has been designated by the U.S. Government as a "terrorist supporting" country; and (2) you are not listed on any U.S. Government list of prohibited or restricted parties. - -20 Entire agreement - -Other than as stated in this section or as explicitly agreed upon in writing between you and Spotify, the Agreements constitute all the terms and conditions agreed upon between you and Spotify and supersede any prior agreements in relation to the subject matter of these Agreements, whether written or oral. - -Please note, however, that other aspects of your use of the Spotify Service may be governed by additional agreements. That could include, for example, access to the Spotify Service as a result of a gift card or free or discounted Trials. When you are presented with an offer for such aspects of your use, you will be presented with any related additional agreement, and you may have an opportunity to agree to additional terms. Some of those additional terms are listed on Spotify’s website. To the extent that there is any irreconcilable conflict between any additional terms and these Terms, the additional terms shall prevail. - -21 Severability and waiver - -Unless as otherwise stated in the Agreements, should any provision of the Agreements be held invalid or unenforceable for any reason or to any extent, such invalidity or enforceability shall not in any manner affect or render invalid or unenforceable the remaining provisions of the Agreements, and the application of that provision shall be enforced to the extent permitted by law. - -Any failure by Spotify or any third party beneficiary to enforce the Agreements or any provision thereof shall not waive Spotify’s or the applicable third party beneficiary’s right to do so. - -22 Assignment - -Spotify may assign the Agreements or any part of them, and Spotify may delegate any of its obligations under the Agreements. You may not assign the Agreements or any part of them, nor transfer or sub-license your rights under the Agreements, to any third party. - -23 Indemnification - -To the fullest extent permitted by applicable law, you agree to indemnify and hold Spotify harmless from and against all damages, losses, and expenses of any kind (including reasonable attorney fees and costs) arising out of: (1) your breach of this Agreement; (2) any User Content; (3) any activity in which you engage on or through the Spotify Service; and (4) your violation of any law or the rights of a third party. - -24 Choice of law, mandatory arbitration and venue - -24.1 Governing Law / Jurisdiction - -Unless otherwise required by a mandatory law of a member state of the European Union or any other jurisdiction, the Agreements (and any non-contractual disputes/claims arising out of or in connection with them) are subject to the laws of the state or country listed below, without regard to choice or conflicts of law principles. - -Further, you and Spotify agree to the jurisdiction of the courts listed below to resolve any dispute, claim, or controversy that arises in connection with the Agreements (and any non-contractual disputes/claims arising out of or in connection with them). (In some cases, that jurisdiction will be "exclusive", meaning that no other countries’ courts can preside over the matter; have jurisdiction; in other cases, the jurisdiction is "non-exclusive", meaning that other countries’ courts may have jurisdiction as well. This is indicated in the chart as well.) - -Country Choice of Law Jurisdiction -Poland, Italy Laws of Sweden Exclusive; Courts of Local Country -Turkey Laws of Sweden Non-exclusive; Courts and other tribunals in the Republic of Turkey -Brazil Laws of Brazil Exclusive; State and Federal Courts of São Paulo, State of São Paulo, Brazil -Canada Laws of the Province of Ontario Exclusive; Courts of Ontario, Canada -United States, Argentina, Bolivia, Chile, Colombia, Costa Rica, Dominican Republic, Ecuador, El Salvador, Guatemala, Honduras, Nicaragua, Panama, Paraguay, Peru, Uruguay State of California, United States Exclusive; State and Federal Courts of San Francisco County, CA or New York, NY -Estonia, Hong Kong, Latvia, Lithuania Laws of Sweden Non-exclusive; Courts of Sweden -Spain Laws of Spain Exclusive; Courts of the consumer’s current domicile in Spain. -All remaining countries Laws of Sweden Exclusive; Courts of Sweden -Spotify does not accept any codes of conduct as mandatory in connection with the services provided under these Agreements. - -24.2 CLASS ACTION WAIVER - -WHERE PERMITTED UNDER THE APPLICABLE LAW, YOU AND SPOTIFY AGREE THAT EACH MAY BRING CLAIMS AGAINST THE OTHER ONLY IN YOUR OR ITS INDIVIDUAL CAPACITY AND NOT AS A PLAINTIFF OR CLASS MEMBER IN ANY PURPORTED CLASS OR REPRESENTATIVE ACTION. Unless both you and Spotify agree, no arbitrator or judge may consolidate more than one person’s claims or otherwise preside over any form of a representative or class proceeding. - -24.3 ARBITRATION - -If you are located in, are based in, have offices in, or do business in a jurisdiction in which this Section 24.3. is enforceable, the following mandatory arbitration provisions apply to you: - -24.3.1 Dispute resolution and arbitration - -You and Spotify agree that any dispute, claim, or controversy between you and Spotify arising in connection with or relating in any way to these Agreements or to your relationship with Spotify as a user of the Service (whether based in contract, tort, statute, fraud, misrepresentation, or any other legal theory, and whether the claims arise during or after the termination of the Agreements) will be determined by mandatory binding individual arbitration. Arbitration is more informal than a lawsuit in court. THERE IS NO JUDGE OR JURY IN ARBITRATION, AND COURT REVIEW OF AN ARBITRATION AWARD IS LIMITED. There may be more limited discovery than in court. The arbitrator must follow this agreement and can award the same damages and relief as a court (including attorney fees), except that the arbitrator may not award declaratory or injunctive relief benefiting anyone but the parties to the arbitration. This arbitration provision will survive termination of the Agreements. - -24.3.2 Exceptions - -Notwithstanding clause (24.3.1) above, you and Spotify both agree that nothing herein will be deemed to waive, preclude, or otherwise limit either of our rights, at any time, to (1) bring an individual action in small claims court, (2) pursue enforcement actions through applicable federal, state, or local agencies where such actions are available, (3) seek injunctive relief in a court of law, or (4) to file suit in a court of law to address intellectual property infringement claims. - -24.3.3 Arbitration rules - -Either you or we may start arbitration proceedings. Any arbitration between you and Spotify will be finally settled under the Rules of Arbitration of the International Chamber of Commerce (the "ICC") then in force (the "ICC Rules") by one or more arbitrators appointed in accordance with the ICC Rules, as modified by these Agreements, and will be administered by the International Court of Arbitration of the ICC. - -Any arbitration will be conducted in the English language and unless otherwise required by a mandatory law of a member state of the European Union or any other jurisdiction, the law to be applied in any arbitration shall be the law of the State of California, United States, without regard to choice or conflicts of law principles. - -24.3.4 Time for filing - -Any arbitration must be commenced by filing a demand for arbitration within ONE (1) YEAR after the date the party asserting the claim first knows or reasonably should know of the act, omission, or default giving rise to the claim; and there shall be no right to any remedy for any claim not asserted within that time period. If applicable law prohibits a one-year limitation period for asserting claims, any claim must be asserted within the shortest time period permitted by applicable law. - -24.3.5 Notice; Process - -A party who intends to seek arbitration must first send a written notice of the dispute to the other, by certified mail or Federal Express (signature required), or in the event that we do not have a physical address on file for you, by electronic mail ("Notice"). Spotify's address for Notice is: Spotify, Attn: General Counsel, 45 W. 18th Street, 7th Floor, New York, New York 10011, USA. The Notice must (1) describe the nature and basis of the claim or dispute; and (2) set forth the specific relief sought ("Demand"). We agree to use good faith efforts to resolve the claim directly, but if we do not reach an agreement to do so within 30 days after the Notice is received, you or Spotify may commence an arbitration proceeding. During the arbitration, the amount of any settlement offer made by you or Spotify shall not be disclosed to the arbitrator until after the arbitrator makes a final decision and award, if any. In the event our dispute is finally resolved through arbitration in your favor, Spotify shall pay you (1) the amount awarded by the arbitrator, if any, (2) the last written settlement amount offered by Spotify in settlement of the dispute prior to the arbitrator’s award; or (3) $1,000.00, whichever is greater. All documents and information disclosed in the course of the arbitration shall be kept strictly confidential by the recipient and shall not be used by the recipient for any purpose other than for purposes of the arbitration or the enforcement of arbitrator’s decision and award and shall not be disclosed except in confidence to persons who have a need to know for such purposes or as required by applicable law. Except as required to enforce the arbitrator’s decision and award, neither you nor Spotify shall make any public announcement or public comment or originate any publicity concerning the arbitration, including, but not limited to, the fact that the parties are in dispute, the existence of the arbitration, or any decision or award of the arbitrator. - -24.3.6 Modifications - -In the event that Spotify makes any future change to this arbitration provision (other than a change to Spotify's address for Notice), you may reject any such change by sending us written notice within 30 days of the change to Spotify's address for Notice, in which case your account with Spotify shall be immediately terminated and this arbitration provision, as in effect immediately prior to the amendments you reject, shall survive. - -24.3.7 Enforceability - -If the class action waiver at Section 24.2 is found to be unenforceable in arbitration or if any part of this Section 24.3 is found to be invalid or unenforceable, then the entirety of this Section 24.3 shall be null and void and, in such case, the parties agree that the exclusive jurisdiction and venue described in Section 24.1 shall govern any action arising out of or related to the Agreements. - -25 Contact us - -If you have any questions concerning the Spotify Service or the Agreements, please contact Spotify customer service by visiting the About Us section of our website. - -If you are a California resident, you may have the Agreements mailed to you electronically by sending a letter to Spotify, Attn: General Counsel, 45 West 18th Street, 7th Floor, New York, New York 10011, USA with your email address and a request for the Agreements. In addition, under California Civil Code Section 1789.3, you may contact the Complaint Assistance Unit of the Division of Consumer Services of the California Department of Consumer Affairs in writing at 1625 N. Market Blvd., Suite S-202, Sacramento, California 95834, or by telephone at 1-800-952-5210 in order to resolve a complaint regarding the service or to receive further information regarding use of the service. - -Thank you for reading our Terms. We hope you enjoy Spotify! - -Contracting entity: - -Spotify AB -Birger Jarlsgatan 61, 113 56 Stockholm -Sweden -SE556703748501 - -(C) Spotify AB. diff --git a/src/spotify/PKGBUILD b/src/spotify/PKGBUILD deleted file mode 100644 index 0eb5058..0000000 --- a/src/spotify/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: Ashley Whetter <(firstname) @ awhetter.co.uk> -# Contributor: Eothred - -pkgname=spotify -pkgver=1.0.94.262 -_i386_pkgver=1.0.72.117 -_anotherpkgver=.g3d5c231c -_i386_anotherpkgver=.g6bd7cc73 -_amd64_pkgrel=9 -_i386_pkgrel=35 -pkgrel=1 -pkgdesc="A proprietary music streaming service" -arch=('x86_64' 'i686') -license=('custom:"Copyright (c) 2006-2010 Spotify Ltd"') -url="http://www.spotify.com" -options=('!strip') - -source=('spotify_x86_64' -'spotify_i686' -'spotify.protocol' -'LICENSE') -sha256sums=('2a9f88dd80a542e0e9cfeea0b823d7cec54b67b42b402c5efee09d333a1820de' - '989920e9360cadc1a8103b8c04acf0c87cb7911eb9a09dddb0cf4708d6249d34' - 'af54f3b90cac46fa100b3f919a9225d10d847617d24aa9af3d832e7689f482c3' - '4e8bea31ca27e16cac9c9dcd8f6ec27e1f82b45de86d6fee7a1e77e23f884b92') -sha256sums_x86_64=('92803d614da2fd4802f801d85da9cf786f34216bbfa6085d5791c3e8350b4f44') -sha256sums_i686=('f5ac29e8374901ce7401825d13471c03bcf6ec8106f8c210c710b0a8d7b22ca9') - -source_x86_64=("http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${pkgver}${_anotherpkgver}-${_amd64_pkgrel}_amd64.deb") - -source_i686=("http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${_i386_pkgver}${_i386_anotherpkgver}-${_i386_pkgrel}_i386.deb") - -depends=("alsa-lib>=1.0.14" "gconf" "gtk2" "glib2" "nss" "libsystemd" "libxtst" "libx11" "libxss" "openssl-1.0" "desktop-file-utils" "rtmpdump") -depends_x86_64=('libcurl-gnutls') -depends_i686=('libcurl-compat') -optdepends=('ffmpeg-compat-54: Adds support for playback of local files' -'zenity: Adds support for importing local files' -'libnotify: Desktop notifications' -) - -package() { - cd "${srcdir}" - - tar -xzf data.tar.gz -C "${pkgdir}" - - install -D "${pkgdir}"/usr/share/spotify/spotify.desktop "${pkgdir}"/usr/share/applications/spotify.desktop - install -D "${pkgdir}"/usr/share/spotify/icons/spotify-linux-512.png "${pkgdir}"/usr/share/pixmaps/spotify-client.png - - for size in 22 24 32 48 64 128 256 512; do - install -D "${pkgdir}/usr/share/spotify/icons/spotify-linux-$size.png" \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/spotify.png" - done - - chmod -R go-w "${pkgdir}"/usr - - # Bin Script - rm "${pkgdir}"/usr/bin/spotify - install -Dm755 "${srcdir}/spotify_${CARCH}" "${pkgdir}/usr/bin/spotify" - - # Copy protocol file for KDE - install -Dm644 "${srcdir}/spotify.protocol" "${pkgdir}/usr/share/kservices5/spotify.protocol" - - # License - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/src/spotify/spotify.protocol b/src/spotify/spotify.protocol deleted file mode 100755 index 423a5fc..0000000 --- a/src/spotify/spotify.protocol +++ /dev/null @@ -1,11 +0,0 @@ -[Protocol] -exec=/usr/bin/spotify -uri "%u" -protocol=spotify -input=none -output=none -helper=true -listing=false -reading=false -writing=false -makedir=false -deleting=false diff --git a/src/spotify/spotify_i686 b/src/spotify/spotify_i686 deleted file mode 100644 index 66466e2..0000000 --- a/src/spotify/spotify_i686 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -export LD_PRELOAD=libcurl.so.3 -/usr/share/spotify/spotify "$@" diff --git a/src/spotify/spotify_x86_64 b/src/spotify/spotify_x86_64 deleted file mode 100644 index 8b67afb..0000000 --- a/src/spotify/spotify_x86_64 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/share/spotify/spotify "$@" diff --git a/src/srb2-data/PKGBUILD b/src/srb2-data/PKGBUILD index 0295be4..39d6765 100644 --- a/src/srb2-data/PKGBUILD +++ b/src/srb2-data/PKGBUILD @@ -2,15 +2,15 @@ # Contributor: DeedleFake pkgname=srb2-data -pkgver=2.1.14 +pkgver=2.1.23 pkgrel=1 pkgdesc="Data files for Sonic Robo Blast 2" arch=('any') license=('GPL') url='http://www.srb2.org' optdepends=('srb2: "Sonic Robo Blast 2" game') -source=("http://rosenthalcastle.org/srb2/SRB2-v${pkgver//./}-Installer.exe") -sha256sums=('f345e02a9877452b92b49903a4cc2e473a1eabe3c3c00c2704b42239a292a5f3') +source=("https://github.com/STJr/SRB2/releases/download/SRB2_release_$pkgver/SRB2-v${pkgver//./}-Installer.exe") +sha256sums=('f01fbcad4ec819ea3dbedead4fc1b729baa305675b576192404be81b74a30c12') package() { install -d "$pkgdir"/usr/share/games/SRB2 diff --git a/src/srb2/PKGBUILD b/src/srb2/PKGBUILD index cc5a515..3cacbf0 100644 --- a/src/srb2/PKGBUILD +++ b/src/srb2/PKGBUILD @@ -2,23 +2,23 @@ # Contributor: DeedleFake pkgname=srb2 -pkgver=2.1.20 -_dataver=2.1.14 -_patchver=2.1.15 +pkgver=2.1.23 +_dataver=2.1.23 +_patchver=2.1.23 pkgrel=1 pkgdesc='A 3D Sonic fan game based off of Doom Legacy (aka "Sonic Robo Blast 2")' arch=('i686' 'x86_64') license=('GPL') url='http://www.srb2.org' -depends=('sdl2_mixer' 'libpng' 'libgme' "srb2-data=$_dataver") +depends=('sdl2_mixer' 'libpng' 'libgme' "srb2-data>=$_dataver") makedepends=('mesa' 'glu') makedepends_i686=('nasm') source=("https://github.com/STJr/SRB2/archive/SRB2_release_$pkgver.zip" - "http://rosenthalcastle.org/srb2/SRB2-v${_patchver//./}-patch.zip" + "https://github.com/STJr/SRB2/releases/download/SRB2_release_$pkgver/SRB2-v${_patchver//./}-patch.zip" "srb2.desktop" "srb2-opengl.desktop") -sha256sums=('a4018bc29be0a52e4df1a92df9ae04e275a792227a9d6ee6a174099ad15e0db4' - '89e25aaa793f3b56f0bde04b964bd239f21bb81f9ef5df34717e6afc31ee34d1' +sha256sums=('f3f50363251c652dbcf6a778361a5140e57783c3b0c4a1c62b528db07e1b1421' + 'e5e3ecb5c2734dd8fea6ff5fe6531d1b3b0092dcb2dff1ee85c7c97a6cbb9f01' 'ac9fa63f29ad9413797da8c6f0a4f76fa6f4dd0710d1e84a457a8c42cf6df4f9' 'f696bab390d2b1028bf2f5c5d4d838c0981dc211cec4c4a8f349b7ec0580e701') @@ -45,7 +45,7 @@ package() { install -Dm755 SRB2-SRB2_release_$pkgver/bin/Linux$IS64BIT/Release/lsdl2srb2 \ "$pkgdir"/usr/bin/srb2 - # data patch 2.1.14 → 2.1.15, no changes for 2.1.16-2.1.20 + # data patch 2.1.15 → 2.1.23 install -Dm644 patch.dta "$pkgdir"/usr/share/games/SRB2/patch.dta # icon + .desktop diff --git a/src/targetcli-fb/PKGBUILD b/src/targetcli-fb/PKGBUILD index dc80aef..25c34cc 100644 --- a/src/targetcli-fb/PKGBUILD +++ b/src/targetcli-fb/PKGBUILD @@ -1,6 +1,6 @@ # Contributor: Johannes Dewender arch at JonnyJD dot net pkgname=targetcli-fb -pkgver=2.1.fb47 +pkgver=2.1.fb49 pkgrel=1 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)" arch=('any') @@ -8,7 +8,7 @@ url="https://github.com/open-iscsi/targetcli-fb" license=('Apache') groups=() depends=('python-rtslib-fb>=2.1.fb52' 'python-configshell-fb>=1.1.fb17' - 'python-dbus') + 'python-dbus' 'python-gobject') makedepends=('python-setuptools') optdepends=('python-ethtool') provides=('targetcli') @@ -16,7 +16,7 @@ backup=() options=() install= source=(https://github.com/open-iscsi/targetcli-fb/archive/v${pkgver}.tar.gz) -sha512sums=('1b0ed2730cce7d4ec9b0b9d7d4d5cfe6836dae16824859730d8ef5f61ad31ca4a5a25abd2a54af93ae7611715918683538dadfa885a80b4591cc23a60b44d08d') +sha512sums=('05fb6f638f808bf09089bdd110592b3ed3be49fc70cc1a71680de7bff40dc88425e69e9a99fdfcab712646cf131f78071edae46f214fdfee4b7090f47933c93a') build() { diff --git a/src/truecraft-git/PKGBUILD b/src/truecraft-git/PKGBUILD index 51432cf..1313c69 100644 --- a/src/truecraft-git/PKGBUILD +++ b/src/truecraft-git/PKGBUILD @@ -2,7 +2,7 @@ _pkgname=truecraft pkgname=truecraft-git -pkgver=r817.91b1f5f +pkgver=r818.cd0ed36 pkgrel=1 epoch=1 pkgdesc="A completely clean-room implementation of Minecraft beta 1.7.3 (circa September 2011)." @@ -12,7 +12,7 @@ license=('MIT') depends=('mono>=4.0' 'desktop-file-utils' 'gtk2' 'webkitgtk2' 'gtk-sharp-2' 'sdl_mixer') makedepends=('git' 'nuget') source=("${_pkgname}"::"git://github.com/SirCmpwn/TrueCraft.git" - "${_pkgname}.svg"::'https://raw.githubusercontent.com/SirCmpwn/truecraft.io/master/_static/truecraft_earth.svg') + "${_pkgname}.svg"::'https://truecraft.io/static/truecraft_earth.svg') provides=('truecraft') conflicts=('truecraft') md5sums=('SKIP' diff --git a/src/visual-studio-code-bin/PKGBUILD b/src/visual-studio-code-bin/PKGBUILD index e3860ab..ba036f7 100644 --- a/src/visual-studio-code-bin/PKGBUILD +++ b/src/visual-studio-code-bin/PKGBUILD @@ -2,26 +2,29 @@ pkgname=visual-studio-code-bin _pkgname=visual-studio-code -pkgver=1.27.1 -pkgrel=2 -pkgdesc="Visual Studio Code: Editor for building and debugging modern web and cloud applications (official binary version)" +pkgver=1.31.1 +pkgrel=1 +pkgdesc="Visual Studio Code (vscode): Editor for building and debugging modern web and cloud applications (official binary version)" arch=('x86_64' 'i686') url="https://code.visualstudio.com/" license=('custom: commercial') provides=('code') conflicts=('code') -depends=(fontconfig libxtst gtk3 python cairo alsa-lib nss gcc-libs libnotify libxss gconf 'glibc>=2.28-4') -optdepends=('gvfs: Needed for move to trash functionality' 'libdbusmenu-glib: Needed for KDE global menu') +depends=(fontconfig libxtst gtk3 python cairo alsa-lib nss gcc-libs libnotify libxss 'glibc>=2.28-4' lsof) +optdepends=('gvfs: Needed for move to trash functionality' + 'libdbusmenu-glib: Needed for KDE global menu') source_x86_64=(code_x64_${pkgver}.tar.gz::https://vscode-update.azurewebsites.net/${pkgver}/linux-x64/stable - ${_pkgname}.desktop + ${_pkgname}.desktop ${_pkgname}-url-handler.desktop ) source_i686=(code_ia32_${pkgver}.tar.gz::https://vscode-update.azurewebsites.net/${pkgver}/linux-ia32/stable - ${_pkgname}.desktop + ${_pkgname}.desktop ${_pkgname}-url-handler.desktop ) -sha256sums_x86_64=('733b6041431620f2e1caee639a2df3cc6eee418a2c370440909d243055c7f623' - '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212') -sha256sums_i686=('59dec2498c312ceb2185fdca6811c138c0f770cbeb6f3fe16fcf6ae15a4b3213' - '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212') +sha256sums_x86_64=('154a316eb6785c126e2fccd80a5c76291321ca2d6945e7a2a13f2e262be89bde' + '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212' + '727adaf263801462744c65bc0fad1b64ab31b3c96ed1a11e5b61bffbd5d71bc7') +sha256sums_i686=('0e3248d4307db94ae9e0643cd86822f3f798c3cd2af89e63f29a02d259e86b12' + '488592034dd5f979083bbd80788d33e253bb3ac3e52d50faee80e715a924a212' + '727adaf263801462744c65bc0fad1b64ab31b3c96ed1a11e5b61bffbd5d71bc7') package() { _pkg=VSCode-linux-x64 if [ "${CARCH}" = "i686" ]; then @@ -37,6 +40,7 @@ package() { install -m644 "${srcdir}/${_pkg}/resources/app/LICENSE.txt" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE" install -m644 "${srcdir}/${_pkg}/resources/app/resources/linux/code.png" "${pkgdir}/usr/share/icons/${_pkgname}.png" install -m644 "${srcdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" + install -m644 "${srcdir}/${_pkgname}-url-handler.desktop" "${pkgdir}/usr/share/applications/${_pkgname}-url-handler.desktop" cp -r "${srcdir}/${_pkg}/"* "${pkgdir}/opt/${_pkgname}" -R ln -s /opt/${_pkgname}/bin/code "${pkgdir}"/usr/bin/code diff --git a/src/wallabag/PKGBUILD b/src/wallabag/PKGBUILD index 42f41fb..a601b6f 100644 --- a/src/wallabag/PKGBUILD +++ b/src/wallabag/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Philipp Schmitt (philippschmittco) pkgname=wallabag -pkgver=2.3.3 +pkgver=2.3.6 pkgrel=1 pkgdesc='Self hostable application for saving web pages' arch=('any') @@ -22,7 +22,7 @@ optdepends=( install="$pkgname.install" options=(!strip) source=("https://static.wallabag.org/releases/wallabag-release-${pkgver}.tar.gz") -sha256sums=('eff21708f49f5d3d28dc51a34a5de63e551c1062ea3b7fd3c59d58fca26a058b') +sha256sums=('018384e901a1ede2c8e3989726076d3c6f50757e6ba7e5bbbb454f92f2f00d54') backup=("etc/webapps/${pkgname}/parameters.yml" "usr/share/webapps/${pkgname}/parameters.yml" "var/lib/${pkgname}/data/db/wallabag.sqlite" diff --git a/src/wallabag/wallabag.install b/src/wallabag/wallabag.install index 3c068a1..3895243 100644 --- a/src/wallabag/wallabag.install +++ b/src/wallabag/wallabag.install @@ -3,17 +3,17 @@ post_install() { echo "" echo "==> Installed in : /usr/share/webapps/wallabag" echo "" - echo "==> Config is at /etc/webapps/wallabag/config/parameters.yml" + echo "==> Config is at /etc/webapps/wallabag/parameters.yml" echo "" echo -n "Change the configuration to fit to your current setup, and then " echo "init wallabag by launching:" echo "php /usr/share/webapps/wallabag/bin/console wallabag:install --env=prod" echo "" echo -n "To setup your webserver and enable the needed php extensions, " - echo "please read: http://doc.wallabag.org/en/master/user/installation.html" + echo "please read: https://doc.wallabag.org/en/master/user/installation.html" echo "" echo -n "If you upgraded from 2.0.x or 2.1.x, you might need to check " - echo "the upgrade guide: http://doc.wallabag.org/en/master/user/upgrade.html" + echo "the upgrade guide: https://doc.wallabag.org/en/master/user/upgrade.html" } diff --git a/src/webkitgtk/PKGBUILD b/src/webkitgtk/PKGBUILD index e657066..0be314d 100644 --- a/src/webkitgtk/PKGBUILD +++ b/src/webkitgtk/PKGBUILD @@ -1,96 +1,78 @@ -# $Id: PKGBUILD 294869 2017-04-27 03:06:45Z foutrelis $ +# Maintainer: Fredy García +# Contributor: Chih-Hsuan Yen +# Contributor: foutrelis # Contributor: Andreas Radke -pkgbase=webkitgtk -pkgname=(webkitgtk webkitgtk2) +pkgname=webkitgtk pkgver=2.4.11 -pkgrel=12 -pkgdesc="Legacy Web content engine" -arch=(i686 x86_64 armv7h) -url="https://webkitgtk.org/" -license=(custom) -depends=(libxt libxslt sqlite libsoup 'enchant>=2.2' libgl geoclue2 gst-plugins-base-libs - libsecret libwebp harfbuzz-icu 'icu>=61') -makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby) -optdepends=('gst-plugins-base: free media decoding' - 'gst-plugins-good: media decoding' - 'gst-libav: nonfree media decoding') -options=(!emptydirs) -install=webkitgtk.install -source=(https://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz - webkitgtk-2.4.9-abs.patch - icu59.patch - enchant-2.x.patch - pkgconfig-enchant-2.patch) -sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7' - 'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70' - 'a1118b3c9317806438c1e2f46f17e15556aae34665f739ca72b94b10b16ae422' - '8db282f3b7f0e21ff51121c2579466c3194475a20d35c4fbd0e53f35b5639919' - 'df8284004f25d189184aab1009df696c915212e0e439a555dbd0dbec06111e2e') +pkgrel=16 +epoch=3 +pkgdesc="Legacy Web content engine for GTK+ 3" +arch=("armv7h" "i686" "x86_64") +url="https://${pkgname}.org/" +license=("custom") +depends=("enchant>=2.2" "geoclue2" "gst-plugins-base-libs" "gtk3" "harfbuzz-icu" "libgl" "libsecret" "libwebp" "libxslt" "libxt") +optdepends=("gst-libav: nonfree media decoding" + "gst-plugins-base: free media decoding" + "gst-plugins-good: media decoding" + "gtk2: Netscape plugin support") +makedepends=("gobject-introspection" "gperf" "gtk2" "gtk3" "mesa" "python2" "ruby") +provides=("${pkgname}3=${pkgver}" "libwebkit3=${pkgver}") +conflicts=("${pkgname}3" "libwebkit3") +replaces=("${pkgname}3" "libwebkit3") +options=("!emptydirs") +install="${pkgname}.install" +source=("https://${pkgname}.org/releases/${pkgname}-${pkgver}.tar.xz" + "${pkgname}-2.4.9-abs.patch" + "enchant-2.x.patch" + "icu59.patch" + "pkgconfig-enchant-2.patch") +sha256sums=("588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7" + "e40f1e08665e1646ebc490141678f26c9c4a2792207fdf7c05978547eae9f61c" + "7e37e059f071aaef93e387675de1a0c6a3dcf61ef67a3221a078caca69e22079" + "4e94e35b036f8a87a64e02d747d4103c0553dfe637fda372785c2b95211445ca" + "a1e2f24b28273746b2fbaecef42495f6314c76b16a446c22dc123e6a3afb58c8") prepare() { - mkdir build-gtk{,2} path - ln -s /usr/bin/python2 path/python + mkdir -p "${srcdir}/build-gtk" "${srcdir}/path" + ln -rTsf "/usr/bin/python2" "${srcdir}/path/python" - cd $pkgbase-$pkgver - patch -Np1 -i ../webkitgtk-2.4.9-abs.patch - patch -Np1 -i ../icu59.patch - patch -Np1 -i ../enchant-2.x.patch + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/${pkgname}-2.4.9-abs.patch" + patch -Np1 -i "${srcdir}/enchant-2.x.patch" + patch -Np1 -i "${srcdir}/icu59.patch" # https://www.archlinux.org/todo/enchant-221-rebuild/ - patch -Np1 -i ../pkgconfig-enchant-2.patch + patch -Np1 -i "${srcdir}/pkgconfig-enchant-2.patch" + + # Needed as autotools-related files are patched + autoreconf -ifv } -_build() ( - _ver="$1"; shift - cd build-${_ver} +build() ( + cd "${srcdir}/build-gtk" - PATH="$srcdir/path:$PATH" + PATH="${srcdir}/path:${PATH}" CXXFLAGS+=" -fno-delete-null-pointer-checks" CFLAGS+=" -fno-delete-null-pointer-checks" - CFLAGS+=" -Wno-expansion-to-defined" - CXXFLAGS+=" -Wno-expansion-to-defined" + CFLAGS+=" -Wno-expansion-to-defined -Wno-class-memaccess" + CXXFLAGS+=" -Wno-expansion-to-defined -Wno-class-memaccess" - ../$pkgbase-$pkgver/configure --prefix=/usr \ - --libexecdir=/usr/lib/webkit${_ver} \ + "${srcdir}/${pkgname}-${pkgver}/configure" \ + --prefix=/usr \ + --libexecdir=/usr/lib/${pkgname} \ --enable-introspection \ --disable-webkit2 \ - --disable-gtk-doc \ - "$@" + --disable-gtk-doc # https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + sed -i "s/ -shared / -Wl,-O1,--as-needed\0/g" "${srcdir}/build-gtk/libtool" make all stamp-po ) -build() { - _build gtk - _build gtk2 --with-gtk=2.0 -} - -package_webkitgtk() { - pkgdesc+=" for GTK+ 3" - depends+=(gtk3) - optdepends+=('gtk2: Netscape plugin support') - provides=("webkitgtk3=${pkgver}" "libwebkit3=${pkgver}") - conflicts=(webkitgtk3 libwebkit3) - replaces=(webkitgtk3 libwebkit3) - - make -C build-gtk -j1 DESTDIR="$pkgdir" install - install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ - "$pkgdir/usr/share/licenses/webkitgtk/LICENSE" -} - -package_webkitgtk2() { - pkgdesc+=" for GTK+ 2" - depends+=(gtk2) - provides=("libwebkit=${pkgver}") - conflicts=(libwebkit) - replaces=(libwebkit) - - make -C build-gtk2 -j1 DESTDIR="$pkgdir" install - install -Dm644 $pkgbase-$pkgver/Source/WebKit/LICENSE \ - "$pkgdir/usr/share/licenses/webkitgtk2/LICENSE" +package() { + make -C "${srcdir}/build-gtk" DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/${pkgname}-${pkgver}/Source/WebKit/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/src/webkitgtk/enchant-2.x.patch b/src/webkitgtk/enchant-2.x.patch index 9e31a89..2015d87 100644 --- a/src/webkitgtk/enchant-2.x.patch +++ b/src/webkitgtk/enchant-2.x.patch @@ -1,6 +1,8 @@ ---- webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp.orig 2017-12-06 14:59:40.768262788 -0500 -+++ webkitgtk-2.4.9/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp 2017-12-06 15:03:10.000000000 -0500 -@@ -128,7 +128,7 @@ +diff --git a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp +index d2d2c6f..905ca5b 100644 +--- a/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp ++++ b/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp +@@ -128,7 +128,7 @@ Vector TextCheckerEnchant::getGuessesForWord(const String& word) for (i = 0; i < numberOfSuggestions; i++) guesses.append(String::fromUTF8(suggestions[i])); diff --git a/src/webkitgtk/icu59.patch b/src/webkitgtk/icu59.patch index 05cf5eb..68806e5 100644 --- a/src/webkitgtk/icu59.patch +++ b/src/webkitgtk/icu59.patch @@ -1,5 +1,7 @@ ---- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100 -+++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200 +diff --git a/Source/JavaScriptCore/API/JSStringRef.h b/Source/JavaScriptCore/API/JSStringRef.h +index aded736..30a6b73 100644 +--- a/Source/JavaScriptCore/API/JSStringRef.h ++++ b/Source/JavaScriptCore/API/JSStringRef.h @@ -32,6 +32,7 @@ #include #endif @@ -8,14 +10,19 @@ #ifdef __cplusplus extern "C" { -@@ -46,4 +47,4 @@ +@@ -43,7 +44,7 @@ extern "C" { + @typedef JSChar + @abstract A Unicode character. + */ - typedef unsigned short JSChar; + typedef char16_t JSChar; #else typedef wchar_t JSChar; #endif ---- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100 -+++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200 +diff --git a/Source/WebKit2/Shared/API/c/WKString.h b/Source/WebKit2/Shared/API/c/WKString.h +index dd5b877..2df4a3b 100644 +--- a/Source/WebKit2/Shared/API/c/WKString.h ++++ b/Source/WebKit2/Shared/API/c/WKString.h @@ -28,6 +28,7 @@ #include @@ -24,7 +31,7 @@ #ifndef __cplusplus #include -@@ -39,7 +40,7 @@ +@@ -39,7 +40,7 @@ extern "C" { #if !defined(WIN32) && !defined(_WIN32) \ && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ diff --git a/src/webkitgtk/pkgconfig-enchant-2.patch b/src/webkitgtk/pkgconfig-enchant-2.patch index f315f66..865c40b 100644 --- a/src/webkitgtk/pkgconfig-enchant-2.patch +++ b/src/webkitgtk/pkgconfig-enchant-2.patch @@ -1,6 +1,8 @@ ---- webkitgtk-2.4.11/Source/autotools/FindDependencies.m4.orig 2018-01-19 23:47:23.866875328 +0800 -+++ webkitgtk-2.4.11/Source/autotools/FindDependencies.m4 2018-01-19 23:47:34.543576202 +0800 -@@ -154,7 +154,7 @@ +diff --git a/Source/autotools/FindDependencies.m4 b/Source/autotools/FindDependencies.m4 +index 60ee32d..cf1019f 100644 +--- a/Source/autotools/FindDependencies.m4 ++++ b/Source/autotools/FindDependencies.m4 +@@ -154,7 +154,7 @@ AC_SUBST(PANGO_CFLAGS) AC_SUBST(PANGO_LIBS) if test "$enable_spellcheck" = "yes"; then diff --git a/src/webkitgtk/webkitgtk-2.4.9-abs.patch b/src/webkitgtk/webkitgtk-2.4.9-abs.patch index 9a1c5f9..eaae9a4 100644 --- a/src/webkitgtk/webkitgtk-2.4.9-abs.patch +++ b/src/webkitgtk/webkitgtk-2.4.9-abs.patch @@ -1,7 +1,8 @@ -diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp ---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600 -+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700 -@@ -85,8 +85,8 @@ +diff --git a/Source/WebCore/platform/gtk/GtkClickCounter.cpp b/Source/WebCore/platform/gtk/GtkClickCounter.cpp +index baa8917..7db658c 100644 +--- a/Source/WebCore/platform/gtk/GtkClickCounter.cpp ++++ b/Source/WebCore/platform/gtk/GtkClickCounter.cpp +@@ -85,8 +85,8 @@ int GtkClickCounter::clickCountForGdkButtonEvent(GtkWidget* widget, GdkEventButt guint32 eventTime = getEventTime(event); if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) @@ -12,10 +13,11 @@ diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp w && (eventTime - m_previousClickTime < static_cast(doubleClickTime)) && (buttonEvent->button == m_previousClickButton))) m_currentClickCount++; -diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp ---- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600 -+++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700 -@@ -659,7 +659,7 @@ +diff --git a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp +index 30d7d13..2563be6 100644 +--- a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp ++++ b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp +@@ -659,7 +659,7 @@ String localizedMediaTimeDescription(float time) if (!std::isfinite(time)) return String::fromUTF8(_("indefinite time"));