diff options
263 files changed, 923 insertions, 6363 deletions
@@ -4,4 +4,3 @@ notice and this notice are preserved. This file is offered as-is, without any warranty. [GNU All Premissive License] - @@ -7,8 +7,3 @@ The file /watch executes the watch file in each directory. This lists all packages that has been updated upstream and each upstream that is not reachable. - -I run this automatically every half hour and my -RSS reader will notify me when there are packages -in need of update. - @@ -1,2 +0,0 @@ -More automation! -Add simple-scan-nocolord (cannot get the build to produces proper binaries) diff --git a/adjbacklight/PKGBUILD b/adjbacklight/PKGBUILD index cdefa12..d3a86e5 100644 --- a/adjbacklight/PKGBUILD +++ b/adjbacklight/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=adjbacklight -pkgver=8.2.1 -pkgrel=2 +pkgver=8.2.2 +pkgrel=1 pkgdesc="Convenient method for adjusting the backlight on your portable computer" arch=('x86_64' 'i686') url="https://codeberg.org/maandree/adjbacklight" license=('custom:ISC') source=(adjbacklight-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz) -sha256sums=(b1a33f0e7c67bc5275b839a511fff54ecd7a5fdb001108282dc4dcb9e365e4e9) +sha256sums=(7cfa3933222d1b6025cbcadc2385160601fabc5aaaab47406589ca12c2134644) build() { cd "${srcdir}/adjbacklight" diff --git a/alarm/PKGBUILD b/alarm/PKGBUILD index 06c01d3..8d16691 100644 --- a/alarm/PKGBUILD +++ b/alarm/PKGBUILD @@ -1,14 +1,14 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=alarm -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="Schedule an alarm for a program when starting it" url="https://codeberg.org/maandree/alarm" arch=(i686 x86_64) license=(custom:ISC) source=("alarm-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") -sha256sums=(6a52f07f7b269b6d082609a18abbe7735e262008142530d7ba7ddc647fd78935) +sha256sums=(005e3a1e4e453622c60a8a6287a981adafcfc13b3c95da95c2f2baa438ad5e53) build() { cd "${srcdir}/alarm" diff --git a/alsause/PKGBUILD b/alsause/PKGBUILD index e8fdc32..489a178 100644 --- a/alsause/PKGBUILD +++ b/alsause/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=alsause pkgver=1.0 diff --git a/applebloom/PKGBUILD b/applebloom/PKGBUILD new file mode 100644 index 0000000..6b4f3da --- /dev/null +++ b/applebloom/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=applebloom +pkgver=1396811847 +pkgrel=1 +pkgdesc="Apple Bloom the pony dictionary" +url="https://github.com/GNU-Pony/applebloom" +arch=(any) +license=(AGPL3) +depends=(bash coreutils) +makedepends=(make coreutils sed texinfo gzip) +install=applebloom.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(899e6cc9ccdb3143158e43b8f0bedcb3babdb89533ad575eb72e339f183cc7bc) + +_prefix=/usr + + +build() { + cd "${srcdir}/applebloom-${pkgver}" + make PREFIX="${_prefix}" PKGNAME="${pkgname}" DESTDIR="${pkgdir}" default +} + +package() { + cd "${srcdir}/applebloom-${pkgver}" + make PREFIX="${_prefix}" PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + _dir="${pkgdir}${_prefix}/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/AGPL3" "${_dir}/LICENSE" +} + diff --git a/applebloom/applebloom.install b/applebloom/applebloom.install new file mode 100644 index 0000000..0480eb1 --- /dev/null +++ b/applebloom/applebloom.install @@ -0,0 +1,20 @@ +_file="applebloom" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/blender-plugin-vectex/upload b/applebloom/upload index 1e7a8be..1e7a8be 120000 --- a/blender-plugin-vectex/upload +++ b/applebloom/upload diff --git a/argparser-bash/PKGBUILD b/argparser-bash/PKGBUILD index f3003b8..a2aa5dd 100644 --- a/argparser-bash/PKGBUILD +++ b/argparser-bash/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=argparser-bash pkgver=5.1 diff --git a/argparser-c/PKGBUILD b/argparser-c/PKGBUILD index 60cb0a8..40b5230 100644 --- a/argparser-c/PKGBUILD +++ b/argparser-c/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=argparser-c pkgver=5.1 diff --git a/argparser-doc/PKGBUILD b/argparser-doc/PKGBUILD index a95efbc..5ee7c76 100644 --- a/argparser-doc/PKGBUILD +++ b/argparser-doc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=argparser-doc pkgver=5.1 diff --git a/argparser-java/PKGBUILD b/argparser-java/PKGBUILD index e8bc9ec..0306904 100644 --- a/argparser-java/PKGBUILD +++ b/argparser-java/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=argparser-java pkgver=5.1 diff --git a/argparser-python/PKGBUILD b/argparser-python/PKGBUILD index 11967d2..07bef8d 100644 --- a/argparser-python/PKGBUILD +++ b/argparser-python/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=argparser-python pkgver=5.1 diff --git a/argparser/PKGBUILD b/argparser/PKGBUILD index 8d47ff2..bc1e4b6 100644 --- a/argparser/PKGBUILD +++ b/argparser/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=argparser pkgver=5.1 diff --git a/asroot-libpassphrase/PKGBUILD b/asroot-libpassphrase/PKGBUILD index 4d303ab..f8c6bbc 100644 --- a/asroot-libpassphrase/PKGBUILD +++ b/asroot-libpassphrase/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=asroot-libpassphrase -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 pkgdesc="A simpler alternative to sudo and doas, libpassphrase version" arch=('x86_64') @@ -11,7 +11,7 @@ makedepends=(sed) conflicts=(asroot) provides=(asroot) source=(asroot-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz) -sha256sums=(29fa6ed440f0c80e75174df4213c336f7dcd454d7f653ddc33f51f6343d4eec9) +sha256sums=(d67b91eabbe4bf72a6acf17cc1dbafb0d2cf44ddbf07eedf8bd1be53cc0d981f) prepare() { cd "${srcdir}/asroot" diff --git a/asroot/PKGBUILD b/asroot/PKGBUILD index 1c2093d..a006527 100644 --- a/asroot/PKGBUILD +++ b/asroot/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=asroot -pkgver=1.1.7 +pkgver=1.1.8 pkgrel=1 pkgdesc="A simpler alternative to sudo and doas" arch=('x86_64') url="https://codeberg.org/maandree/asroot" license=('custom:ISC') source=(asroot-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz) -sha256sums=(29fa6ed440f0c80e75174df4213c336f7dcd454d7f653ddc33f51f6343d4eec9) +sha256sums=(d67b91eabbe4bf72a6acf17cc1dbafb0d2cf44ddbf07eedf8bd1be53cc0d981f) build() { cd "${srcdir}/asroot" diff --git a/auto-auto-complete/PKGBUILD b/auto-auto-complete/PKGBUILD new file mode 100644 index 0000000..1941519 --- /dev/null +++ b/auto-auto-complete/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWUK).se> + +pkgname=auto-auto-complete +pkgver=7.2.1 +pkgrel=1 +pkgdesc='Autogenerate shell auto-completion scripts' +arch=('any') +url='https://codeberg.org/maandree/auto-auto-complete' +license=('GPL3') +depends=('python3') +makedepends=('make' 'sed' 'coreutils' 'python3' 'texinfo') +source=(${pkgname}-${pkgver}.tar.gz::${url}/archive/$pkgver.tar.gz) +sha256sums=(fc8ddf2354a016466ce80616308a601928a92f50155d0212ff07651c47387776) + + +build() { + cd "${srcdir}/${pkgname}" + make +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="$pkgdir" install +} + diff --git a/consolekit-git/upload b/auto-auto-complete/upload index 1e7a8be..1e7a8be 120000 --- a/consolekit-git/upload +++ b/auto-auto-complete/upload diff --git a/autohaltd/PKGBUILD b/autohaltd/PKGBUILD index 551f5d8..d947ae9 100644 --- a/autohaltd/PKGBUILD +++ b/autohaltd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=autohaltd pkgver=0.1 diff --git a/autopasswd/PKGBUILD b/autopasswd/PKGBUILD index d1faf65..51d694c 100644 --- a/autopasswd/PKGBUILD +++ b/autopasswd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=autopasswd pkgver=2 diff --git a/bash.d/PKGBUILD b/bash.d/PKGBUILD new file mode 100644 index 0000000..5110539 --- /dev/null +++ b/bash.d/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=bash.d +pkgver=1564076224 +pkgrel=1 +pkgdesc="Subscripts for GNU Bash shells" +url="https://github.com/GNU-Pony/bash.d" +arch=(any) +license=(GPL3) +depends=(bash coreutils) +optdepends=("libnotify: for alert.bash" + "sed: for palette.bash" + "git: for git branch in prompt.bash" + "acpi: for battery status in prompt.bash" + "featherweight: for featherweight status in prompt.bash") +makedepends=(make findutils grep coreutils) +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(4c22ee9708d56d437c768161e18fa464ef259807711c8aafe05e43540d59ba14) + +_prefix=/usr + + +package() { + cd "${srcdir}/bash.d-${pkgver}" + make PREFIX=/usr PKGNAME=bash.d DESTDIR="${pkgdir}" install + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/dash-pipe/upload b/bash.d/upload index 1e7a8be..1e7a8be 120000 --- a/dash-pipe/upload +++ b/bash.d/upload diff --git a/bfind/PKGBUILD b/bfind/PKGBUILD index d79f97a..8b8f728 100644 --- a/bfind/PKGBUILD +++ b/bfind/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=bfind pkgver=3.0.1 diff --git a/blender-plugin-vectex/64bit.patch b/blender-plugin-vectex/64bit.patch deleted file mode 100644 index 29fb433..0000000 --- a/blender-plugin-vectex/64bit.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile 2008-02-25 02:05:56.000000000 +0000 -+++ Makefile_modified 2008-05-09 21:00:18.000000000 +0100 -@@ -8,7 +8,7 @@ - expat: expat-1.95.8/.libs/libexpat.a - - expat-1.95.8/.libs/libexpat.a: -- cd expat-1.95.8; ./configure; make -+ cd expat-1.95.8; CFLAGS="$(CFLAGS) -fPIC" ./configure; make - - INC=-fPIC -shared -O -ansi -Iblender -Iagg-2.5/include -Iexpat-1.95.8/lib - # -DDEBUG ---- agg-2.5/src/Makefile 2006-10-09 05:07:22.000000000 +0100 -+++ agg-2.5/src/Makefile_modified 2008-05-09 21:01:16.000000000 +0100 -@@ -53,7 +53,7 @@ - rm -rf ctrl/SunWS_cache - - %.o: %.cpp -- $(CXX) -c $(CXXFLAGS) $*.cpp -o $@ -+ $(CXX) -fPIC -c $(CXXFLAGS) $*.cpp -o $@ - - %.o: %.c -- $(C) -c $(CXXFLAGS) $*.c -o $@ -+ $(C) -fPIC -c $(CXXFLAGS) $*.c -o $@ diff --git a/blender-plugin-vectex/PKGBUILD b/blender-plugin-vectex/PKGBUILD deleted file mode 100644 index c1f14cc..0000000 --- a/blender-plugin-vectex/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -pkgname=blender-plugin-vectex -pkgver=0.9 -pkgrel=3 -pkgdesc="Vectex is a SVG vector texture plugin for Blender" -url="http://code.google.com/p/vectex/" -license=("GPL") -arch=('i686' 'x86_64') -depends=('blender') -makedepends=() -source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/vectex/vectex-${pkgver}-fix.tar.bz2" '64bit.patch') -sha256sums=('6da59482f658f35fb676eb632d1653b6038d8b57ef3121c47e6446805fa15750' - '2e9f86abb9125ccc6d9f41f8751a7eefc32a1183b69bc7868ddb4c5c9820d11f') - -build() { - cd "$srcdir/vectex-$pkgver" - - if [ "${CARCH}" == "x86_64" ]; then - patch -p0 < $startdir/src/64bit.patch - fi - - msg "Starting build process." - MAKEFLAGS= make || return 1 -} - -package() { - cd "$srcdir/vectex-$pkgver" - install -D -m755 vectex.so "$pkgdir/usr/share/blender/plugins/texture/vectex.so" -} - diff --git a/blender-plugin-vectex/watch b/blender-plugin-vectex/watch deleted file mode 100755 index 7972b5c..0000000 --- a/blender-plugin-vectex/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://code.google.com/p/vectex/ >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep release < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'blender-plugin-vectex' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'blender-plugin-vectex (unfetchable)' -fi - diff --git a/blind/PKGBUILD b/blind/PKGBUILD index c8a6ca2..694996c 100644 --- a/blind/PKGBUILD +++ b/blind/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=blind pkgver=1.1 diff --git a/blue/PKGBUILD b/blue/PKGBUILD index f45599c..6bfd4bf 100644 --- a/blue/PKGBUILD +++ b/blue/PKGBUILD @@ -1,19 +1,19 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=blue -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Creates table of when the blue hour, the golden hour, or whatever you want occurs" arch=(any) -url="https://github.com/maandree/blue" +url="https://codeberg.org/maandree/blue" license=('custom:ISC') depends=(python3 solar-python) makedepends=() -source=($url/archive/$pkgver.tar.gz) -sha256sums=(1d41cf95ecadc6ca9997a89fe55668b1bf68f84b1b259df91987e6fe22c545e5) +source=(${pkgname}-${pkgver}.tar.gz::$url/archive/$pkgver.tar.gz) +sha256sums=(77aaf03d0374a0fff1e3290cc8492ef9f48ccf8517b411396a90f83ff1c162a9) package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir" install } diff --git a/bookshelf/PKGBUILD b/bookshelf/PKGBUILD index 59b1932..13a81ff 100644 --- a/bookshelf/PKGBUILD +++ b/bookshelf/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=bookshelf pkgver=1 diff --git a/bootcleanse/PKGBUILD b/bootcleanse/PKGBUILD index 383c64e..f97e199 100644 --- a/bootcleanse/PKGBUILD +++ b/bootcleanse/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=bootcleanse pkgver=2 diff --git a/bus/PKGBUILD b/bus/PKGBUILD index ac082f3..bb2a48b 100644 --- a/bus/PKGBUILD +++ b/bus/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=bus pkgver=3.1.10 diff --git a/cerberus-logging/PKGBUILD b/cerberus-logging/PKGBUILD new file mode 100644 index 0000000..7097693 --- /dev/null +++ b/cerberus-logging/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=cerberus-logging +pkgver=1428445270 +pkgrel=1 +pkgdesc="Log-in logging extension for cerberus" +url="https://github.com/GNU-Pony/cerberus-logging" +arch=(i686 x86_64) +license=(GPL3) +depends=(glibc coreutils sh) +optdepends=('audit: for logging with audit') +makedepends=(make coreutils gcc glibc audit texinfo) +install=cerberus-logging.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(fedb5423eef21f108f1a293c17e625a3e49be9b891737b65b1284b6817ef59f1) + +build() { + cd "${srcdir}/cerberus-logging-${pkgver}" + + LDFLAGS= make PKGNAME="${pkgname}" info btmp utmp lastlog syslog audit +} + +package() { + cd "${srcdir}/cerberus-logging-${pkgver}" + + make PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install-base install-info \ + install-btmp install-utmp install-lastlog install-syslog install-audit + + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/cerberus-logging/cerberus-logging.install b/cerberus-logging/cerberus-logging.install new file mode 100644 index 0000000..dd40e58 --- /dev/null +++ b/cerberus-logging/cerberus-logging.install @@ -0,0 +1,20 @@ +_file="cerberus-logging" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/dooble-common/upload b/cerberus-logging/upload index 1e7a8be..1e7a8be 120000 --- a/dooble-common/upload +++ b/cerberus-logging/upload diff --git a/cerberus-securetty/PKGBUILD b/cerberus-securetty/PKGBUILD new file mode 100644 index 0000000..3c1f63b --- /dev/null +++ b/cerberus-securetty/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=cerberus-securetty +pkgver=1428445363 +pkgrel=1 +pkgdesc="securetty support for cerberus" +url="https://github.com/GNU-Pony/cerberus-securetty" +arch=(i686 x86_64) +license=(GPL3) +depends=(grep coreutils sh) +makedepends=(make coreutils texinfo) +install=cerberus-securetty.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(b63ed4b5f60b1c9731a801da01f8b04484cd930c78a56a264096d60594642fc8) + +build() { + cd "${srcdir}/cerberus-securetty-${pkgver}" + + make PKGNAME="${pkgname}" +} + +package() { + cd "${srcdir}/cerberus-securetty-${pkgver}" + + make PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/cerberus-securetty/cerberus-securetty.install b/cerberus-securetty/cerberus-securetty.install new file mode 100644 index 0000000..590c85d --- /dev/null +++ b/cerberus-securetty/cerberus-securetty.install @@ -0,0 +1,20 @@ +_file="cerberus-securetty" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/dooble-qt4/upload b/cerberus-securetty/upload index 1e7a8be..1e7a8be 120000 --- a/dooble-qt4/upload +++ b/cerberus-securetty/upload diff --git a/cerberus/PKGBUILD b/cerberus/PKGBUILD new file mode 100644 index 0000000..5a1e7f7 --- /dev/null +++ b/cerberus/PKGBUILD @@ -0,0 +1,63 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=cerberus +pkgver=1598672167 +pkgrel=1 +pkgdesc="A compile-time configurable minimal login program that uses libpassphrase" +url="https://github.com/GNU-Pony/cerberus" +arch=(i686 x86_64) +license=(GPL3) +depends=(glibc 'libpassphrase>=1400850322' linux) +makedepends=(make coreutils gcc texinfo) # pam +install=cerberus.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(bb547c467a5735d048aa815e5466df4c8d6910b8f7b710fa18c77a86df0bb98c) + +# The dependency on `linux` can be removed if both `OWN_VCS` and `OWN_VCSA` is removed. +# The dependency on `pam` can removed if `auth` is change to not be `pam`. +# See `info cerberus configuring` for details on how to configure `cerberus`. +# Works on armv6h (tested on Raspberry Pi) unless `auth=pam`. + + +build() { + cd "${srcdir}/cerberus-${pkgver}" + + auth=crypt # can also be set to `crypt` or `none` # pam + cpp_defs=(OWN_VCS OWN_VCSA USE_TTY_GROUP) + path_user=/usr/local/bin:/usr/bin + path_root=/usr/local/sbin:/usr/local/bin:/usr/bin + + cpp_flags=() + for def in "${cpp_defs[@]}"; do + cpp_flags+=( -D"${def}" ) + done + cpp_flags="EXTRA_CPP_FLAGS=${cpp_flags[*]}" + + _conf=( AUTH="${auth}" PATH="${path_user}" PATH_ROOT="${path_root}" "${cpp_flags}" ) + + make clean + make PKGNAME="${pkgname}" INSTALL_BIN=/bin "${_conf[@]}" +} + +package() { + cd "${srcdir}/cerberus-${pkgver}" + + auth=crypt # can also be set to `crypt` or `none` # pam + cpp_defs=(OWN_VCS OWN_VCSA USE_TTY_GROUP) + path_user=/usr/local/bin:/usr/bin + path_root=/usr/local/sbin:/usr/local/bin:/usr/bin + + cpp_flags=() + for def in "${cpp_defs[@]}"; do + cpp_flags+=( -D"${def}" ) + done + cpp_flags="EXTRA_CPP_FLAGS=${cpp_flags[*]}" + + _conf=( AUTH="${auth}" PATH="${path_user}" PATH_ROOT="${path_root}" "${cpp_flags}" ) + + make PKGNAME="${pkgname}" INSTALL_BIN=/bin DESTDIR="${pkgdir}" "${_conf[@]}" install + + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/cerberus/cerberus.install b/cerberus/cerberus.install new file mode 100644 index 0000000..ee62b29 --- /dev/null +++ b/cerberus/cerberus.install @@ -0,0 +1,20 @@ +_file="cerberus" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/dooble/upload b/cerberus/upload index 1e7a8be..1e7a8be 120000 --- a/dooble/upload +++ b/cerberus/upload diff --git a/cg-tools/PKGBUILD b/cg-tools/PKGBUILD index 0d13ea9..e23b2ac 100644 --- a/cg-tools/PKGBUILD +++ b/cg-tools/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=cg-tools pkgver=1.4.1 diff --git a/cmdipc/PKGBUILD b/cmdipc/PKGBUILD index 6c7dfcd..7012793 100644 --- a/cmdipc/PKGBUILD +++ b/cmdipc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=cmdipc pkgver=1.3 diff --git a/colourpipe/PKGBUILD b/colourpipe/PKGBUILD index 45e39bd..648364a 100644 --- a/colourpipe/PKGBUILD +++ b/colourpipe/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=colourpipe pkgver=1.0.2 pkgrel=1 diff --git a/consolekit-git/.gitignore b/consolekit-git/.gitignore deleted file mode 100644 index c2e6534..0000000 --- a/consolekit-git/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ConsoleKit/ diff --git a/consolekit-git/PKGBUILD b/consolekit-git/PKGBUILD deleted file mode 100644 index e2dd483..0000000 --- a/consolekit-git/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Previous maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> -# Contributor: onestep_ua <onestep@ukr.net> - -pkgname=consolekit-git -pkgver=395.af75e10 -pkgrel=1 -epoch=1 -pkgdesc="A framework for defining and tracking users, login sessions, and seats" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/ConsoleKit" -license=('GPL') -depends=('polkit' 'zlib' 'libx11' 'dbus-glib') -makedepends=('git' 'pkgconfig' 'xmlto' 'docbook-xsl') -replaces=('consolekit') -provides=('consolekit') -conflicts=('consolekit') -options=(!libtool) -source=(git+git://anongit.freedesktop.org/ConsoleKit \ - pam-foreground-compat.ck consolekit.logrotate consolekit.tmpfiles.conf) -md5sums=('SKIP' - 'a8a4de71d9b0549b8143e5f6c2a36fc7' - '6fefa451d9fe2fc6d6269629d3529793' - '8c5a8059db515d40fae1379daf084094') - -pkgver() { - cd "$srcdir/ConsoleKit" - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) -} - -build() { - cd "$srcdir/ConsoleKit" - - ./autogen.sh --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/ConsoleKit \ - --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --enable-pam-module \ - --with-pam-module-dir=/usr/lib/security \ - --enable-docbook-docs \ - --enable-udev-acl - make -} - -package() { - cd "$srcdir/ConsoleKit" - make DESTDIR="$pkgdir" install - install -m755 "$srcdir/pam-foreground-compat.ck" "$pkgdir/usr/lib/ConsoleKit/run-session.d/" - - # install the logrotate config - install -D -m644 "$srcdir/consolekit.logrotate" "$pkgdir/etc/logrotate.d/consolekit" - - install -D -m644 "$srcdir/consolekit.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/consolekit.conf" - - rm -rf "$pkgdir/var/run" -} diff --git a/consolekit-git/consolekit.logrotate b/consolekit-git/consolekit.logrotate deleted file mode 100644 index 7c5346e..0000000 --- a/consolekit-git/consolekit.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -/var/log/ConsoleKit/history { - missingok - notifempty - delaycompress -} diff --git a/consolekit-git/consolekit.tmpfiles.conf b/consolekit-git/consolekit.tmpfiles.conf deleted file mode 100644 index 4ec1251..0000000 --- a/consolekit-git/consolekit.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/ConsoleKit 0755 - - - diff --git a/consolekit-git/pam-foreground-compat.ck b/consolekit-git/pam-foreground-compat.ck deleted file mode 100644 index 7f6b122..0000000 --- a/consolekit-git/pam-foreground-compat.ck +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -TAGDIR=/var/run/console - -[ -n "$CK_SESSION_USER_UID" ] || exit 1 - -TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`" - -if [ "$1" = "session_added" ]; then - mkdir -p "$TAGDIR" - echo "$CK_SESSION_ID" >> "$TAGFILE" -fi - -if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then - sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE" - [ -s "$TAGFILE" ] || rm -f "$TAGFILE" -fi diff --git a/consolekit-git/watch b/consolekit-git/watch deleted file mode 100755 index d57693b..0000000 --- a/consolekit-git/watch +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -wget 'http://cgit.freedesktop.org/ConsoleKit' -O - 2>/dev/null | grep -Po '\.tar.+>ConsoleKit-.+\.tar' | head -n 1 > release - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum release > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'consolekit-git' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'consolekit-git (unfetchable)' -fi - diff --git a/coopgammad/PKGBUILD b/coopgammad/PKGBUILD index 1fc821c..dfc0de5 100644 --- a/coopgammad/PKGBUILD +++ b/coopgammad/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=coopgammad pkgver=1.3.2 diff --git a/coreupdown/PKGBUILD b/coreupdown/PKGBUILD index 758111c..7878863 100644 --- a/coreupdown/PKGBUILD +++ b/coreupdown/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=coreupdown pkgver=1.1 diff --git a/correctpony/PKGBUILD b/correctpony/PKGBUILD index 740cb79..f601b24 100644 --- a/correctpony/PKGBUILD +++ b/correctpony/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=correctpony pkgver=2.1 diff --git a/crt-calibrator/PKGBUILD b/crt-calibrator/PKGBUILD new file mode 100644 index 0000000..7a8904a --- /dev/null +++ b/crt-calibrator/PKGBUILD @@ -0,0 +1,23 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=crt-calibrator +pkgver=1.3.4 +pkgrel=1 +pkgdesc="CRT monitor calibrator utility for Linux VT" +url="https://codeberg.org/maandree/crt-calibrator" +arch=(i686 x86_64) +license=('custom:ISC') +depends=(libdrm) +makedepends=(make coreutils gcc glibc libdrm) +source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") +sha256sums=(1ed1393be9740ed3e217700777c6b7742c291b64e61fe17aa83154c9b8c708cc) + +build() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" +} + +package() { + cd "${srcdir}/${pkgname}" + make DESTDIR="${pkgdir}" install +} diff --git a/emacs-find-recursive/upload b/crt-calibrator/upload index 1e7a8be..1e7a8be 120000 --- a/emacs-find-recursive/upload +++ b/crt-calibrator/upload diff --git a/dash-pipe/PKGBUILD b/dash-pipe/PKGBUILD deleted file mode 100644 index 0f2f640..0000000 --- a/dash-pipe/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=dashpipe -pkgver=1.0.3 -pkgrel=1 -pkgdesc="A utility for ponifying and deponifying text" -arch=('any') -url="http://github.com/DanielOaks/$pkgname/" -license=('MIT') -depends=('perl') -makedepends=('git') -source=("https://github.com/DanielOaks/dashpipe/archive/v${pkgver}.tar.gz") -sha256sums=('c8ed2242113bb5cd867ed934fe0f9745666c289711e70bb54a3c5903e04e3553') - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - diff --git a/dash-pipe/watch b/dash-pipe/watch deleted file mode 100755 index 2acc27b..0000000 --- a/dash-pipe/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f release ] && rm release - -wget 'https://github.com/DanielOaks/dashpipe/releases' -O release >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep -Po 'href="[^"]*\.tar\.gz"' < release | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'dashpipe' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'dashpipe (unfetchable)' -fi - diff --git a/dlu/PKGBUILD b/dlu/PKGBUILD index 34b8872..6a99b7b 100644 --- a/dlu/PKGBUILD +++ b/dlu/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=dlu pkgver=1.0.1 diff --git a/dooble-common/PKGBUILD b/dooble-common/PKGBUILD deleted file mode 100644 index 10bd5d1..0000000 --- a/dooble-common/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=dooble-common -pkgver=1.56c -pkgrel=1 -pkgdesc='Common files for package variants for Dooble' -url='http://dooble.sourceforge.net/' -arch=('any') -license=('custom:3-clause BSD') -depends=() -makedepends=('qt5-tools') -source=("dooble-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz?r=") -sha256sums=('03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a') - - -build() -{ - cd "$srcdir/dooble.d/Version 1.x/" - lupdate dooble.pro - lrelease dooble.pro -} - -package() -{ - cd "$srcdir/dooble.d/Version 1.x/" - - mkdir -p -- "${pkgdir}/usr/share/dooble/Translations" - mv Translations/*.qm -- "${pkgdir}/usr/share/dooble/Translations" - cd '../Version 2.x' - mv Icons Images Tab -- "${pkgdir}/usr/share/dooble" - cd - - - for s in 16x16 48x48 64x64; do - mkdir -p -- "${pkgdir}/usr/share/icons/hicolor/${s}" - ln -s "../../../dooble/Icons/${s}/dooble.png" -- "${pkgdir}/usr/share/icons/hicolor/${s}/dooble.png" - done -} - diff --git a/dooble-qt4/PKGBUILD b/dooble-qt4/PKGBUILD deleted file mode 100644 index a45c13f..0000000 --- a/dooble-qt4/PKGBUILD +++ /dev/null @@ -1,92 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=dooble-qt4 -pkgver=1.56c -pkgrel=2 -pkgdesc='A safe WebKit Web browser' -url='http://dooble.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('qtwebkit' 'libspoton>=2015.06.17' "dooble-common=${pkgver}") -makedepends=('qtwebkit' 'sed' 'coreutils') -source=("dooble-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz?r=") -sha256sums=('03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a') - -# Dependency (from ldd output) tree: -# qtwebkit -# qt4 -# openssl (via ca-certificates) -# libsm (via libxt via libxmu via xorg-xset via xdg-utils) -# libice -# libutil-linux (via util-linux) -# libjpeg (via libtiff) -# libxrender (via libxrandr) -# sqlite -# fontconfig -# expat -# glibc -# freetype2 -# bzip2 -# zlib -# sh -# libpng -# harfbuzz -# glib2 -# pcre -# libffi -# graphite -# gcc-libs -# gstreamer0.10-base -# gstreamer0.10 -# libxml2 -# xz -# orc -# mesa-libgl (as libgl) -# mesa -# libdrm -# libxxf86vm -# libxext -# libxdamage -# libxfixes -# libx11 -# libxcb -# libxdmcp -# libxau -# libxshmfence -# libsystemd (via systemd) -# libgcrypt -# libgpg-error - - -build() -{ - cd "$srcdir/dooble.d/Version 1.x/" - sed -i 's_-Werror__g' dooble.pro - qmake-qt4 -o Makefile dooble.pro - make distclean - qmake-qt4 -o Makefile dooble.pro - make -} - -package() -{ - cd "$srcdir/dooble.d/Version 1.x/" - install -Dm755 Dooble -- "${pkgdir}/usr/lib/${pkgname}/Dooble" - install -Dm755 dooble.sh -- "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 dooble.desktop -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - - msg "Editing files for the file system adaption" - - sed -i s_"/usr/local/dooble/"_"/usr/lib/${pkgname}/"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"/usr/local/dooble"_"/usr/share/dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"\./Dooble"_"../../lib/${pkgname}/Dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i /LD_LIBRARY_PATH/d -- "${pkgdir}/usr/bin/${pkgname}" - - sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g \ - -- "${pkgdir}/usr/lib/${pkgname}/Dooble" # The replacements's length must match the pattern's length - - sed -i s_'/usr/local/dooble/dooble.sh'_"/usr/bin/${pkgname}"_g \ - -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" -} - diff --git a/dooble/PKGBUILD b/dooble/PKGBUILD deleted file mode 100644 index 4286a4f..0000000 --- a/dooble/PKGBUILD +++ /dev/null @@ -1,90 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=dooble -pkgver=1.56c -pkgrel=2 -pkgdesc='A safe WebKit Web browser' -url='http://dooble.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'libspoton>=2015.06.17' "dooble-common=${pkgver}") -makedepends=('libpng' 'qt5-base' 'qt5-webkit' 'openssl' 'qt5-tools' 'sed' 'coreutils') -source=("dooble-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/dooble/Version%20${pkgver}/Dooble.d.tar.gz?r=") -sha256sums=('03b5bb0460aa8f4f731a47b70c571942a186fb0e7c4b74f546cef356be0afe6a') - -# Dependency (from ldd output) tree: -# libpng -# qt5-base -# icu -# gcc-libs -# libjpeg-turbo -# sqlite -# mesa-libgl -# mesa -# libdrm -# libxdamage -# libxxf86vm -# libxrender -# qt5-webkit -# libxcomposite -# libxfixes -# libx11 -# libxcb -# libxdmcp & libxau -# glibc -# libxext -# libxslt -# libgcrypt -# libgpg-error -# libxml2 -# xz -# zlib -# qt5-sensors & qt5-location -# qt5-declarative -# gstreamer0.10-base -# gstreamer0.10 -# glib2 -# libffi -# pcre -# orc -# openssl - - - -build() -{ - cd "$srcdir/dooble.d/Version 1.x/" - sed -i 's_-Werror__g' dooble.qt5.pro - sed -i 's_-lspoton_-lspoton -lQt5PrintSupport_g' dooble.qt5.pro - qmake-qt5 -o Makefile dooble.qt5.pro - make distclean - qmake-qt5 -o Makefile dooble.qt5.pro - sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtWidgets:' Makefile - sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtWebKitWidgets:' Makefile - sed -i '/^INCPATH/s:=:= -I/usr/include/qt/QtPrintSupport:' Makefile - sed -i '/#include/s:QtGui/\([^>]*\)QAction:\1:' Include/*.h - make -} - -package() -{ - cd "$srcdir/dooble.d/Version 1.x/" - install -Dm755 Dooble -- "${pkgdir}/usr/lib/${pkgname}/Dooble" - install -Dm755 dooble.sh -- "${pkgdir}/usr/bin/${pkgname}" - install -Dm644 dooble.desktop -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - - msg "Editing files for the file system adaption" - - sed -i s_"/usr/local/dooble/"_"/usr/lib/${pkgname}/"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"/usr/local/dooble"_"/usr/share/dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i s_"\./Dooble"_"../../lib/${pkgname}/Dooble"_g -- "${pkgdir}/usr/bin/${pkgname}" - sed -i /LD_LIBRARY_PATH/d -- "${pkgdir}/usr/bin/${pkgname}" - - sed -i s_'/usr/local/dooble/Lib\x00'_'/usr/lib\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'_g \ - -- "${pkgdir}/usr/lib/${pkgname}/Dooble" # The replacements's length must match the pattern's length - - sed -i s_'/usr/local/dooble/dooble.sh'_"/usr/bin/${pkgname}"_g \ - -- "${pkgdir}/usr/share/applications/${pkgname}.desktop" -} - diff --git a/dooble/notes b/dooble/notes deleted file mode 100644 index a19a1d8..0000000 --- a/dooble/notes +++ /dev/null @@ -1,11 +0,0 @@ -options=(!emptydir) ## or do: ls -1 /dev/shm | grep -v '^usr$' | xargs rm -r - -svn co https://dooble.svn.sourceforge.net/svnroot/dooble dooble -cd dooble/trunk/browser/ -sed -i 's_-Werror__g' dooble.pro -qmake-qt4 -o Makefile dooble.pro -make -make INSTALL_ROOT="$pkgdir" install - -make dependencies: qt4 svn - diff --git a/dooble/watch b/dooble/watch deleted file mode 100755 index 103c735..0000000 --- a/dooble/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://dooble.sourceforge.net/ -O index.html >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'Dooble [[:digit:]\.]\+' < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'dooble' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'dooble (unfetchable)' -fi - diff --git a/editasroot/PKGBUILD b/editasroot/PKGBUILD index 433fced..182ba26 100644 --- a/editasroot/PKGBUILD +++ b/editasroot/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=editasroot -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 pkgdesc="Edit a file that requires root access" arch=('x86_64') @@ -9,7 +9,7 @@ url="https://codeberg.org/maandree/editasroot" license=('custom:ISC') depends=(asroot) source=(editasroot-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz) -sha256sums=(5743a5f6796ce47d79a949aa3ef231da9ad71e47a4c1e5220cdd7ebb09547604) +sha256sums=(669513b4b86bf0a7a22d58c1f3acd2251fabde0c9897b1d95cf01da43c4a3052) build () { cd "${srcdir}/editasroot" diff --git a/emacs-find-recursive/PKGBUILD b/emacs-find-recursive/PKGBUILD deleted file mode 100644 index 934b89a..0000000 --- a/emacs-find-recursive/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Hauke Wesselmann <hauke@h-dawg.de> -pkgname=emacs-find-recursive -pkgver=20010326 -pkgrel=2 -pkgdesc="Emacs extension that lets you find files recursively in a directory" -arch=('any') -url="http://www.webweavertech.com/ovidiu/emacs/" -license=('GPL2') -depends=('emacs') -source=(http://www.webweavertech.com/ovidiu/emacs/find-recursive.txt) -md5sums=('468fcc4848e4adf54af4fdbe78581b95') - -package () -{ - cd $startdir/src/ - install -Dm644 $startdir/src/find-recursive.txt $startdir/pkg/usr/share/emacs/site-lisp/find-recursive.el -} diff --git a/emacs-find-recursive/watch b/emacs-find-recursive/watch deleted file mode 100755 index 5b7b121..0000000 --- a/emacs-find-recursive/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f find-recursive.el ] && rm find-recursive.el - -wget 'http://www.webweavertech.com/ovidiu/emacs/find-recursive.txt' -O find-recursive.el >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum find-recursive.el > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'emacs-find-recursive' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'emacs-find-recursive (unfetchable)' -fi - diff --git a/emacs-gtk2/PKGBUILD b/emacs-gtk2/PKGBUILD deleted file mode 100644 index 3105fa8..0000000 --- a/emacs-gtk2/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Official Arch Linux package repository [gtk3 version] maintainer: Juergen Hoetzel <juergen@archlinux.org> -# Official Arch Linux package repository [gtk3 version] contributor: Renchi Raju <renchi@green.tam.uiuc.edu> - -_pkgname=emacs -pkgname=$_pkgname-gtk2 -pkgver=24.5 -pkgrel=1 -pkgdesc="The extensible, customizable, self-documenting real-time display editor. GTK2 version" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/emacs/emacs.html" -license=('GPL3') -depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'libotf' 'm17n-lib' 'gtk2' 'hicolor-icon-theme' 'desktop-file-utils' 'alsa-lib' 'imagemagick>=6.8.4.7') -install=emacs-gtk2.install -source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.xz) -sha256sums=(dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e) -provides=('emacs') -conflicts=('emacs') - -build() { - cd "$srcdir"/emacs-$pkgver - export ac_cv_lib_gif_EGifPutExtensionLast=yes - ./configure --without-gif \ - --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --with-x-toolkit=gtk2 --with-xft \ - --without-gconf - make -} - -package() { - cd "$srcdir"/$_pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # fix file conflicts - mv "$pkgdir"/usr/bin/{ctags,ctags.emacs} || true - mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1} || true - rm "$pkgdir"/usr/share/info/info.info.gz || true - - # fix user/root permissions on usr/share files - find "$pkgdir"/usr/share/emacs/$pkgver -exec chown root:root {} \; - - # fix perms on /var/games - chmod 775 "$pkgdir"/var/games - chmod 775 "$pkgdir"/var/games/emacs - chmod 664 "$pkgdir"/var/games/emacs/* - chown -R root:games "$pkgdir"/var/games -} diff --git a/emacs-gtk2/emacs-24.3-giflib5.patch b/emacs-gtk2/emacs-24.3-giflib5.patch deleted file mode 100644 index b8571ab..0000000 --- a/emacs-gtk2/emacs-24.3-giflib5.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- src/image.c -+++ src/image.c 2013-05-21 15:49:41.945819346 +0000 -@@ -7192,7 +7192,11 @@ gif_load (struct frame *f, struct image - } - - /* Open the GIF file. */ -+#if GIFLIB_MAJOR < 5 - gif = fn_DGifOpenFileName (SSDATA (file)); -+#else -+ gif = fn_DGifOpenFileName (SSDATA (file), NULL); -+#endif - if (gif == NULL) - { - image_error ("Cannot open `%s'", file, Qnil); -@@ -7213,7 +7217,11 @@ gif_load (struct frame *f, struct image - memsrc.len = SBYTES (specified_data); - memsrc.index = 0; - -+#if GIFLIB_MAJOR < 5 - gif = fn_DGifOpen (&memsrc, gif_read_from_memory); -+#else -+ gif = fn_DGifOpen (&memsrc, gif_read_from_memory, NULL); -+#endif - if (!gif) - { - image_error ("Cannot open memory source `%s'", img->spec, Qnil); diff --git a/emacs-gtk2/emacs-gtk2.install b/emacs-gtk2/emacs-gtk2.install deleted file mode 100644 index 2ef379e..0000000 --- a/emacs-gtk2/emacs-gtk2.install +++ /dev/null @@ -1,33 +0,0 @@ -ICON_PATH=usr/share/icons/hicolor -INFO_DIR=usr/share/info - -INFO_FILES=(ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse -ede ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc ert eshell eudc flymake -forms gnus htmlfontify idlwave mairix-el message mh-e newsticker nxml-mode -org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail -speedbar srecode tramp url vip viper widget wisent woman) - - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} - update-desktop-database -q - - [[ -x usr/bin/install-info ]] || return 0 - for f in ${INFO_FILES[@]}; do - install-info --delete ${INFO_DIR}/$f.info.gz ${INFO_DIR}/dir 2> /dev/null - done -} diff --git a/emacs-gtk2/watch b/emacs-gtk2/watch deleted file mode 100755 index fe196c5..0000000 --- a/emacs-gtk2/watch +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -[ -f 'PKGBUILD?h=packages%2Femacs' ] && rm 'PKGBUILD?h=packages%2Femacs' -[ -f 'emacs.install?h=packages%2Femacs' ] && rm 'emacs.install?h=packages%2Femacs' - -wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/emacs' >/dev/null 2>/dev/null -wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/emacs.install?h=packages/emacs' >/dev/null 2>/dev/null - -mv 'PKGBUILD?h=packages%2Femacs' PKGBUILD.upstream.new -mv 'emacs.install?h=packages%2Femacs' emacs.install.upstream.new - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep ^pkg < PKGBUILD.upstream.new | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - diff PKGBUILD.upstream.{old,new} > PKGBUILD.upstream.diff - diff emacs.install.upstream.{old,new} > emacs.install.upstream.diff - mv PKGBUILD.upstream.{new,old} - mv emacs.install.upstream.{new,old} - echo 'emacs-gtk2' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'emacs-gtk2 (unfetchable)' -fi - diff --git a/exec-as/PKGBUILD b/exec-as/PKGBUILD index b8e22a1..489c9bd 100644 --- a/exec-as/PKGBUILD +++ b/exec-as/PKGBUILD @@ -1,13 +1,13 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=exec-as -pkgver=1.2.1.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="A command that lets you start another command with any argv[0]" arch=(i686 x86_64) url="https://codeberg.org/maandree/exec-as" license=('custom:ISC') source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=(7f216d13435ec37e984a8afc0494a3186c5543bf02e3cdbf6d28201528505b69) +sha256sums=(5371437630fff6c86ccea081b2d26107748cfeebceb67c8b0be5276e3887abfb) build() { cd "$srcdir/$pkgname" diff --git a/file2key-libpassphrase/PKGBUILD b/file2key-libpassphrase/PKGBUILD index 4927e6d..dc2691b 100644 --- a/file2key-libpassphrase/PKGBUILD +++ b/file2key-libpassphrase/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=file2key-libpassphrase pkgver=3.1.1 diff --git a/file2key/PKGBUILD b/file2key/PKGBUILD index 7e82a0e..ae6657f 100644 --- a/file2key/PKGBUILD +++ b/file2key/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=file2key pkgver=3.1.1 diff --git a/gates-of-tartaros/PKGBUILD b/gates-of-tartaros/PKGBUILD new file mode 100644 index 0000000..c751b85 --- /dev/null +++ b/gates-of-tartaros/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +# If want to minimise the memory usage exchange bash for dash + +pkgname=gates-of-tartaros +pkgver=1503081567 +pkgrel=1 +pkgdesc="Extensible minimal replacement for agetty with SSH support" +url="https://github.com/GNU-Pony/gates-of-tartaros" +arch=(any) +license=(GPL3) +depends=(util-linux bash coreutils) +optdepends=(openssh) +makedepends=(make sed coreutils texinfo) +install=gates-of-tartaros.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(01f73bbc02bf464c877b62e86fd04f766f3edd99ca20ab98dcd487fa0389bbe6) + + +build() { + cd "${srcdir}/gates-of-tartaros-${pkgver}" + make PKGNAME="${pkgname}" SBIN=/bin PREFIX=/usr SH=bash +} + +package() { + cd "${srcdir}/gates-of-tartaros-${pkgver}" + make PKGNAME="${pkgname}" SBIN=/bin PREFIX=/usr DESTDIR="${pkgdir}" install + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/gates-of-tartaros/gates-of-tartaros.install b/gates-of-tartaros/gates-of-tartaros.install new file mode 100644 index 0000000..9a1251a --- /dev/null +++ b/gates-of-tartaros/gates-of-tartaros.install @@ -0,0 +1,20 @@ +_file="gates-of-tartaros" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/emacs-gtk2/upload b/gates-of-tartaros/upload index 1e7a8be..1e7a8be 120000 --- a/emacs-gtk2/upload +++ b/gates-of-tartaros/upload diff --git a/gimp-plugin-image-reg/PKGBUILD b/gimp-plugin-image-reg/PKGBUILD deleted file mode 100644 index d51d8ba..0000000 --- a/gimp-plugin-image-reg/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -pkgname=gimp-plugin-image-reg -_srcname=gimp-image-reg -pkgver=0.5.5 -pkgrel=2 -pkgdesc="Image registration plugin for the GIMP" -arch=('i686' 'x86_64') -url="http://registry.gimp.org/node/24248" -license=('GPL3') -depends=('gimp') -makedepends=('intltool' 'gettext') -source=(http://downloads.sourceforge.net/${_srcname}/${_srcname}-${pkgver}.tar.gz) -md5sums=('405b87140880de18d695173ee6b08981') - -build() { - cd "$srcdir/${_srcname}-${pkgver}" - sed -i 's#^GIMP_PLUGIN_BINDIR=.*$#&\nGIMP_PLUGIN_BINDIR="/usr/lib/gimp/2.0/plug-ins"#' ./configure - LIBS='-lm' ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/${_srcname}-${pkgver}" - make DESTDIR="$pkgdir/" PLUGINDIR=/usr/lib/gimp/2.0 install -} - diff --git a/git-rediff/PKGBUILD b/git-rediff/PKGBUILD index cff9f98..5350cd2 100644 --- a/git-rediff/PKGBUILD +++ b/git-rediff/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=git-rediff pkgver=1.0.1 diff --git a/got-diminished/PKGBUILD b/got-diminished/PKGBUILD new file mode 100644 index 0000000..0adc171 --- /dev/null +++ b/got-diminished/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=got-diminished +pkgver=1396890724 +pkgrel=1 +pkgdesc="Extension for gates-of-tartaros to minimise memory usage after logging in" +url="https://github.com/GNU-Pony/got-diminished" +arch=(i686 x86_64 armv6h) +license=(GPL3) +depends=(glibc coreutils util-linux gates-of-tartaros) +optdepends=(openssh) +makedepends=(make sed coreutils gcc) +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(5d143931d9ec8cd2dbf9347aabb269ba2180ef4a961547ac31467091ec537be4) + + +build() { + cd "${srcdir}/got-diminished-${pkgver}" + make PKGNAME="${pkgname}" LIBEXEC=/bin +} + +package() { + cd "${srcdir}/got-diminished-${pkgver}" + make PKGNAME="${pkgname}" LIBEXEC=/bin DESTDIR="${pkgdir}" LICENSES=/usr/share/licenses install + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/gimp-plugin-image-reg/upload b/got-diminished/upload index 1e7a8be..1e7a8be 120000 --- a/gimp-plugin-image-reg/upload +++ b/got-diminished/upload diff --git a/gpp/PKGBUILD b/gpp/PKGBUILD index 343eae4..1409b96 100644 --- a/gpp/PKGBUILD +++ b/gpp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=general-preprocessor pkgver=2.1.3 diff --git a/gtk3-nobroadway-nowayland-nocolord/.gitignore b/gtk3-nobroadway-nowayland-nocolord/.gitignore deleted file mode 100644 index cd85985..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gtk+ diff --git a/gtk3-nobroadway-nowayland-nocolord/PKGBUILD b/gtk3-nobroadway-nowayland-nocolord/PKGBUILD deleted file mode 100644 index e7b0144..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the gtk3 package: Ionut Biru <ibiru@archlinux.org> -# Maintainer of the gtk3 package: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gtk3-nobroadway-nowayland-nocolord -pkgver=3.22.4 -pkgrel=1 -pkgdesc="GObject-based multi-platform GUI toolkit" -arch=(i686 x86_64) -url="http://www.gtk.org/" -depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf - libxcomposite libxdamage pango shared-mime-info at-spi2-atk libxkbcommon - adwaita-icon-theme json-glib librsvg gtk-update-icon-cache mesa) -makedepends=(gobject-introspection libcanberra gtk-doc git rest libcups) -optdepends=('libcanberra: gtk3-widget-factory demo' - 'gtk3-print-backends: printing') -install=gtk3.install -license=(LGPL) -conflicts=(gtk3) -provides=("gtk3=$pkgver") -_commit=4569bb372f838a9a68c9b134ef18865abe77001c # tags/3.22.4^0 -source=("git://git.gnome.org/gtk+#commit=$_commit" - settings.ini - gtk-query-immodules-3.0.hook) -sha256sums=('SKIP' - '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202' - 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845') - -pkgver() { - cd gtk+ - git describe --tags | sed 's/-/+/g' -} - -prepare() { - cd gtk+ - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd gtk+ - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-schemas-compile=no \ - --enable-x11-backend \ - --enable-broadway-backend=no \ - --enable-wayland-backend=no \ - --enable-mir-backend=no \ - --enable-colord=no \ - --enable-gtk-doc=no \ - --enable-gtk-doc-html=no \ - --enable-gtk-doc-pdf=no \ - --enable-man=no - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd gtk+ - make DESTDIR="$pkgdir" install - - install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini" - install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook" - - # split this out to use with gtk2 too - rm "$pkgdir/usr/bin/gtk-update-icon-cache" - - cd "$pkgdir" - for _f in usr/lib/*/*/printbackends/*; do - case $_f in - *-file.so|*-lpr.so) continue;; - esac - - mkdir -p "$srcdir/print-backends/${_f%/*}" - mv "$_f" "$srcdir/print-backends/$_f" - done -} - diff --git a/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook b/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook deleted file mode 100644 index c7703cf..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/gtk-query-immodules-3.0.hook +++ /dev/null @@ -1,11 +0,0 @@ -[Trigger] -Type = File -Operation = Install -Operation = Upgrade -Operation = Remove -Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so - -[Action] -Description = Probing GTK3 input method modules... -When = PostTransaction -Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache diff --git a/gtk3-nobroadway-nowayland-nocolord/gtk3.install b/gtk3-nobroadway-nowayland-nocolord/gtk3.install deleted file mode 100644 index f57b1bf..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/gtk3.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - /usr/bin/gtk-query-immodules-3.0 --update-cache - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -pre_remove() { - rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache -} - -post_remove() { - /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas - /usr/bin/gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/gtk3-nobroadway-nowayland-nocolord/settings.ini b/gtk3-nobroadway-nowayland-nocolord/settings.ini deleted file mode 100644 index 921d1dd..0000000 --- a/gtk3-nobroadway-nowayland-nocolord/settings.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Settings] -gtk-icon-theme-name = Adwaita -gtk-theme-name = Adwaita -gtk-font-name = Cantarell 11 diff --git a/gtk3-print-backends-nocolord/.gitignore b/gtk3-print-backends-nocolord/.gitignore deleted file mode 100644 index 81f5f55..0000000 --- a/gtk3-print-backends-nocolord/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -gtk+ -print-backends diff --git a/gtk3-print-backends-nocolord/PKGBUILD b/gtk3-print-backends-nocolord/PKGBUILD deleted file mode 100644 index c6ce272..0000000 --- a/gtk3-print-backends-nocolord/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the gtk3-print-backends package: Ionut Biru <ibiru@archlinux.org> -# Maintainer of the gtk3-print-backends package: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgname=gtk3-print-backends-nocolord -pkgver=3.22.4 -pkgrel=1 -pkgdesc="Print backends for GTK3" -arch=(i686 x86_64) -url="http://www.gtk.org/" -depends=(gtk3 rest libcups) -makedepends=(gobject-introspection libcanberra git rest libcups) -license=(LGPL) -_commit=4569bb372f838a9a68c9b134ef18865abe77001c # tags/3.22.4^0 -source=("git://git.gnome.org/gtk+#commit=$_commit") -sha256sums=('SKIP') - -pkgver() { - cd gtk+ - git describe --tags | sed 's/-/+/g' -} - -prepare() { - mkdir -p print-backends - cd gtk+ - NOCONFIGURE=1 ./autogen.sh -} - -build() { - cd gtk+ - - CXX=/bin/false ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-schemas-compile \ - --enable-x11-backend \ - --disable-broadway-backend \ - --disable-wayland-backend \ - --disable-gtk-doc \ - --disable-colord - - #https://bugzilla.gnome.org/show_bug.cgi?id=655517 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - - make -} - -package() { - cd gtk+ - make DESTDIR="$pkgdir" install - - # split this out to use with gtk2 too - rm "$pkgdir/usr/bin/gtk-update-icon-cache" - - cd "$pkgdir" - for _f in usr/lib/*/*/printbackends/*; do - case $_f in - *-file.so|*-lpr.so) continue;; - esac - - mkdir -p "$srcdir/print-backends/${_f%/*}" - mv "$_f" "$srcdir/print-backends/$_f" - done - - cd "$srcdir/" - rm -rf "$pkgdir"/* - mv print-backends/* "$pkgdir" -} diff --git a/javagnutar/PKGBUILD b/javagnutar/PKGBUILD deleted file mode 100644 index 4b9228a..0000000 --- a/javagnutar/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=javagnutar -pkgver=1.1.4 -pkgrel=1 -pkgdesc="Java library for GNU Tar archives" -arch=('any') -url="http://code.google.com/p/javagnutar/" -license=('Apache') -depends=('java-runtime>=1.5') -makedepends=('unzip' 'wget') - -_url="http://javagnutar.googlecode.com/files/javagnutar-1.1.4.zip" - -build() { - cd "$srcdir" - wget "$_url" - unzip javagnutar-1.1.4.zip -} - -package() { - cd "$srcdir/" - install -d "$pkgdir/usr/lib/" - install -m 755 activation.jar "$pkgdir/usr/lib/" - install -m 755 javagnutar.jar "$pkgdir/usr/lib/" -} diff --git a/javagnutar/watch b/javagnutar/watch deleted file mode 100755 index fe43565..0000000 --- a/javagnutar/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://code.google.com/p/javagnutar/ >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep \\.zip < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'javagnutar' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'javagnutar (unfetchable)' -fi - diff --git a/jlibgamma/PKGBUILD b/jlibgamma/PKGBUILD index 6ffea54..33c5824 100644 --- a/jlibgamma/PKGBUILD +++ b/jlibgamma/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=jlibgamma pkgver=1.0.3 diff --git a/key2root/PKGBUILD b/key2root/PKGBUILD index bd05b57..8d0ecc4 100644 --- a/key2root/PKGBUILD +++ b/key2root/PKGBUILD @@ -1,21 +1,21 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=key2root -pkgver=1.0 -pkgrel=2 +pkgver=1.0.1 +pkgrel=1 pkgdesc="Authenticate with keyfile and run a process as root" arch=('x86_64') -url="https://maandree.se/proj/key2root.html" +url="https://codeberg.org/maandree/key2root" license=('custom:ISC') depends=('libar2simplified>=1.1.2' libar2 libblake) -source=($pkgname-$pkgver.tar.gz::https://git.maandree.se/$pkgname/snapshot/$pkgname-$pkgver.tar.gz) -sha256sums=(c365a009daf784398a0d93b0875a263a078cbc8f417c9e262bd83bab57b0a19e) +source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) +sha256sums=(c67cd9e9396424b0774412d7620b743a8ecc0ba7c467babf8d7c9dea5150b0a4) build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir/" PREFIX=/usr } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir/" PREFIX=/usr install } diff --git a/krandom/PKGBUILD b/krandom/PKGBUILD index ff3a58d..a727896 100644 --- a/krandom/PKGBUILD +++ b/krandom/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=krandom pkgver=2.0.2 diff --git a/latex-fitch-uoo/.gitignore b/latex-fitch-uoo/.gitignore deleted file mode 100644 index dd1f40a..0000000 --- a/latex-fitch-uoo/.gitignore +++ /dev/null @@ -1 +0,0 @@ -fitch diff --git a/latex-fitch-uoo/PKGBUILD b/latex-fitch-uoo/PKGBUILD deleted file mode 100644 index 6a7b913..0000000 --- a/latex-fitch-uoo/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=latex-fitch-uoo -pkgver=0.5 -pkgrel=1 -pkgdesc="LaTeX macros for Fitch style natural deduction" -arch=('any') -url="https://www.mathstat.dal.ca/~selinger/fitch" -license=('GPL') -depends=('texlive-core') -install=fitch.install -source=('https://www.mathstat.dal.ca/~selinger/fitch/fitch-0.5.tgz') -sha256sums=('0d3173a63420eb5b9981b9c7db0bad0b24278272a666cc31e0c7af8a14ecc4af') - -package() { - cd "${srcdir}/fitch-${pkgver}" - install -Dm644 fitch.sty "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" - install -Dm644 fitchdoc.ps "${pkgdir}/usr/share/doc/latex-fitch-uoo.ps" - ## You can change .ps to .pdf if you prefer PDF over PostScript. -} - diff --git a/latex-fitch-uoo/fitch.install b/latex-fitch-uoo/fitch.install deleted file mode 100644 index e1c1d5e..0000000 --- a/latex-fitch-uoo/fitch.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} - -post_remove() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} diff --git a/latex-fitch-uoo/watch b/latex-fitch-uoo/watch deleted file mode 100755 index f9ce5ed..0000000 --- a/latex-fitch-uoo/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f fitch ] && rm fitch - -wget 'http://www.mathstat.dal.ca/~selinger/fitch' -O fitch >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum fitch > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'latex-fitch-uoo' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'latex-fitch-uoo (unfetchable)' -fi - diff --git a/latex-fitch/PKGBUILD b/latex-fitch/PKGBUILD deleted file mode 100644 index f8bd824..0000000 --- a/latex-fitch/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Lawrence Lee <valheru@facticius.net> - -pkgname=latex-fitch -pkgver=1.6 -pkgrel=2 -pkgdesc="A LaTeX package for Fitch-style proofs" -arch=('any') -url="http://folk.uio.no/johanw/FitchSty.html" -license=('GPL') -depends=('tetex') -install=fitch.install -#source=(http://folk.uio.no/johanw/fitch.sty) -source=(fitch.sty) -md5sums=('d62bdd0267c217d6017baef950b9205a') - -package() { - install -Dm644 "${srcdir}/fitch.sty" "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" -} diff --git a/latex-fitch/fitch b/latex-fitch/fitch deleted file mode 100644 index 963010e..0000000 --- a/latex-fitch/fitch +++ /dev/null @@ -1,112 +0,0 @@ -% $Id: fitch.sty,v 1.6 2003/06/28 16:53:00 johanw Exp $ - -% Macros for Fitch-style formal proofs -% Johan W. Klüwer, June 10, 2001 - - -\RequirePackage{mdwtab,latexsym,amsmath,amsfonts,ifthen} - - -% Line height in proofs -\newlength{\fitchlineht} -\setlength{\fitchlineht}{1.5\baselineskip} -% Horizontal indent between proof levels -\newlength{\fitchindent} -\setlength{\fitchindent}{1em} -% Indent to comment -\newlength{\fitchcomind} -\setlength{\fitchcomind}{2em} -% Line number width -\newlength{\fitchnumwd} -\setlength{\fitchnumwd}{1em} - -% Altered from mdwtab.sty: shorter vline, for start of subproof -\makeatletter -\newcommand\fvline[1][\arrayrulewidth]{\vrule\@height.5\fitchlineht\@width#1\relax} -\makeatother -% Ordinary vertical line -\newcommand{\fa}{\vline\hspace*{\fitchindent}} -% Vertical line, shorter: Use at start of (sub)proof -\newcommand{\fb}{\fvline\hspace*{\fitchindent}} -% Hypothesis -\newcommand{\fh}{\fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Hypothesis, with longer vert line: for >1 hypothesis -\newcommand{\fj}{\vline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Modal subproof: takes argument = operator -\newcommand{\fitchmodal}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}\fvline\hspace*{\fitchindent}} -\newcommand{\fn}{\fitchmodal{\Box}}% Box subproof -\newcommand{\fp}{\fitchmodal{\Diamond}}% Diamond subproof -% Modal subproof with hypothesis in first line (as in Fitch) -\newcommand{\fitchmodalh}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}% - \fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Rule: formula introduction marker. \fr with line, \fs without line -\newcommand{\fr}{% - \makebox[0pt][r]{${\rhd}$\,\,}\vline\hspace*{\fitchindent}} -\newcommand{\fs}{% - \makebox[0pt][r]{${\rhd}$\,\,}} -% Box around argument, like new variable in ql -\newcommand{\fw}[1]{\fbox{\footnotesize $#1$}} - -% -\newcounter{fitchcounter} -\setcounter{fitchcounter}{0} -%To avoid starting from 1, \setboolean{resetfitchcounter}{false} -\newboolean{resetfitchcounter} -\setboolean{resetfitchcounter}{true} -%To avoid increasing numbers, \setboolean{increasefitchcounter}{false} -\newboolean{increasefitchcounter} -\setboolean{increasefitchcounter}{true} -%\formatfitchcounter can be altered if need be, though only once per proof -\newcommand{\formatfitchcounter}[1]{\arabic{#1}} -%Typeset the counter -\newcommand{\fitchcounter}{% - \ifthenelse{\boolean{increasefitchcounter}}{\addtocounter{fitchcounter}{1}}{} - \formatfitchcounter{fitchcounter}} - -%A line with a special number -- a tag, e.g. \ftag{\vdots}{} -\newcommand{\ftag}[2]{\multicolumn{1}% - {!{\makebox[\fitchnumwd][r]{#1}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}}% - {#2}} - -\newenvironment{fitchnum}% -{\ifthenelse{\boolean{resetfitchcounter}}{\setcounter{fitchcounter}{0}}{} - \begin{tabular}{!{\makebox[\fitchnumwd][r]{\fitchcounter }\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitchunum}% -{\begin{tabular}{!{\makebox[\fitchnumwd][r]{}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitch}{\renewcommand{\arraystretch}{1.5} - \begin{fitchnum}}{\end{fitchnum}} -\newenvironment{fitch*}{\renewcommand{\arraystretch}{1.5} - \begin{fitchunum}}{\end{fitchunum}} - -% The following is useful for giving a numbered formula, then the proof. -\newenvironment{flem}[2]% -{\begin{eqnarray} - \label{#2}\\ - &\begin{fitch}}% - {\end{fitch}\notag\end{eqnarray}} - -%To write comment field for two consecutive lines, with brace -\newcommand{\ftwocom}[1]{% - \parbox[t]{3cm}{ - \raisebox{-.6\baselineskip}[\baselineskip][0pt]{% - $\left. - \begin{aligned} - \,\\ \, - \end{aligned} - \right\}$\quad #1} - }} diff --git a/latex-fitch/fitch.install b/latex-fitch/fitch.install deleted file mode 100644 index e1c1d5e..0000000 --- a/latex-fitch/fitch.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} - -post_remove() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} diff --git a/latex-fitch/source/PKGBUILD b/latex-fitch/source/PKGBUILD deleted file mode 100644 index 7275bee..0000000 --- a/latex-fitch/source/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Lawrence Lee <valheru@facticius.net> - -pkgname=latex-fitch -pkgver=1.6 -pkgrel=2 -pkgdesc="A LaTeX package for Fitch-style proofs" -arch=('any') -url="http://folk.uio.no/johanw/FitchSty.html" -license=('GPL') -depends=('tetex') -install=fitch.install -# source=(http://folk.uio.no/johanw/fitch.sty) -source=(fitch.sty) -md5sums=('d62bdd0267c217d6017baef950b9205a') - -package() { - install -Dm644 "${srcdir}/fitch.sty" "${pkgdir}/usr/share/texmf-dist/tex/latex/fitch" -} diff --git a/latex-fitch/source/fitch.install b/latex-fitch/source/fitch.install deleted file mode 100644 index e1c1d5e..0000000 --- a/latex-fitch/source/fitch.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} - -post_remove() { - echo " updating the filename database..." - texconfig-sys rehash - echo " done." -} diff --git a/latex-fitch/source/fitch.sty b/latex-fitch/source/fitch.sty deleted file mode 100644 index 963010e..0000000 --- a/latex-fitch/source/fitch.sty +++ /dev/null @@ -1,112 +0,0 @@ -% $Id: fitch.sty,v 1.6 2003/06/28 16:53:00 johanw Exp $ - -% Macros for Fitch-style formal proofs -% Johan W. Klüwer, June 10, 2001 - - -\RequirePackage{mdwtab,latexsym,amsmath,amsfonts,ifthen} - - -% Line height in proofs -\newlength{\fitchlineht} -\setlength{\fitchlineht}{1.5\baselineskip} -% Horizontal indent between proof levels -\newlength{\fitchindent} -\setlength{\fitchindent}{1em} -% Indent to comment -\newlength{\fitchcomind} -\setlength{\fitchcomind}{2em} -% Line number width -\newlength{\fitchnumwd} -\setlength{\fitchnumwd}{1em} - -% Altered from mdwtab.sty: shorter vline, for start of subproof -\makeatletter -\newcommand\fvline[1][\arrayrulewidth]{\vrule\@height.5\fitchlineht\@width#1\relax} -\makeatother -% Ordinary vertical line -\newcommand{\fa}{\vline\hspace*{\fitchindent}} -% Vertical line, shorter: Use at start of (sub)proof -\newcommand{\fb}{\fvline\hspace*{\fitchindent}} -% Hypothesis -\newcommand{\fh}{\fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Hypothesis, with longer vert line: for >1 hypothesis -\newcommand{\fj}{\vline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Modal subproof: takes argument = operator -\newcommand{\fitchmodal}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}\fvline\hspace*{\fitchindent}} -\newcommand{\fn}{\fitchmodal{\Box}}% Box subproof -\newcommand{\fp}{\fitchmodal{\Diamond}}% Diamond subproof -% Modal subproof with hypothesis in first line (as in Fitch) -\newcommand{\fitchmodalh}[1]{% - \makebox[0pt][r]{${}^{#1}$\,}% - \fvline% - \makebox[0pt][l]{{% - \raisebox{-1.4ex}[0pt][0pt]{\rule{1.5em}{\arrayrulewidth}}}}% - \hspace*{\fitchindent}} -% Rule: formula introduction marker. \fr with line, \fs without line -\newcommand{\fr}{% - \makebox[0pt][r]{${\rhd}$\,\,}\vline\hspace*{\fitchindent}} -\newcommand{\fs}{% - \makebox[0pt][r]{${\rhd}$\,\,}} -% Box around argument, like new variable in ql -\newcommand{\fw}[1]{\fbox{\footnotesize $#1$}} - -% -\newcounter{fitchcounter} -\setcounter{fitchcounter}{0} -%To avoid starting from 1, \setboolean{resetfitchcounter}{false} -\newboolean{resetfitchcounter} -\setboolean{resetfitchcounter}{true} -%To avoid increasing numbers, \setboolean{increasefitchcounter}{false} -\newboolean{increasefitchcounter} -\setboolean{increasefitchcounter}{true} -%\formatfitchcounter can be altered if need be, though only once per proof -\newcommand{\formatfitchcounter}[1]{\arabic{#1}} -%Typeset the counter -\newcommand{\fitchcounter}{% - \ifthenelse{\boolean{increasefitchcounter}}{\addtocounter{fitchcounter}{1}}{} - \formatfitchcounter{fitchcounter}} - -%A line with a special number -- a tag, e.g. \ftag{\vdots}{} -\newcommand{\ftag}[2]{\multicolumn{1}% - {!{\makebox[\fitchnumwd][r]{#1}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}}% - {#2}} - -\newenvironment{fitchnum}% -{\ifthenelse{\boolean{resetfitchcounter}}{\setcounter{fitchcounter}{0}}{} - \begin{tabular}{!{\makebox[\fitchnumwd][r]{\fitchcounter }\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitchunum}% -{\begin{tabular}{!{\makebox[\fitchnumwd][r]{}\hspace{\fitchindent}}Ml@{\hspace{\fitchcomind}}l}}% -{\end{tabular}} - -\newenvironment{fitch}{\renewcommand{\arraystretch}{1.5} - \begin{fitchnum}}{\end{fitchnum}} -\newenvironment{fitch*}{\renewcommand{\arraystretch}{1.5} - \begin{fitchunum}}{\end{fitchunum}} - -% The following is useful for giving a numbered formula, then the proof. -\newenvironment{flem}[2]% -{\begin{eqnarray} - \label{#2}\\ - &\begin{fitch}}% - {\end{fitch}\notag\end{eqnarray}} - -%To write comment field for two consecutive lines, with brace -\newcommand{\ftwocom}[1]{% - \parbox[t]{3cm}{ - \raisebox{-.6\baselineskip}[\baselineskip][0pt]{% - $\left. - \begin{aligned} - \,\\ \, - \end{aligned} - \right\}$\quad #1} - }} diff --git a/latex-fitch/watch b/latex-fitch/watch deleted file mode 100755 index 9c62075..0000000 --- a/latex-fitch/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f fitch.sty.new ] && rm fitch.sty.new - -wget 'http://folk.uio.no/johanw/fitch.sty' -O fitch.sty.new >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum fitch.sty.new > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'latex-fitch' '('"$(cat sum)"')' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'latex-fitch (unfetchable)' -fi - diff --git a/lib32-libjson/PKGBUILD b/lib32-libjson/PKGBUILD deleted file mode 100644 index d5d275a..0000000 --- a/lib32-libjson/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -_pkgbasename=libjson -pkgname=lib32-$_pkgbasename -pkgver='0.8' -pkgrel='1' -pkgdesc="Small C library and small codebase that packs an efficient parser and a configurable printer (32-bit version)" -arch=('x86_64') -url="https://projects.snarc.org/libjson/" -license=('LGPL') -depends=(lib32-glibc $_pkgbasename) -makedepends=(gcc-multilib) -options=(!libtool !makeflags) -source=("https://projects.snarc.org/libjson/download/libjson-${pkgver}.tar.gz") -sha256sums=('4f0e717a8edc6ede5c4d900d810165ca91f033b2863989daaeaf1b3fe5ea0ad6') - -build() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - sed -i s:/lib:/lib32:g Makefile - make CC="gcc -m32" CFLAGS:='-Wall -Os -fPIC' -} - -package() { - cd "${srcdir}/${_pkgbasename}-${pkgver}" - - make CC="gcc -m32" CFLAGS:='-Wall -Os -fPIC' DESTDIR="${pkgdir}" install - rm -r "${pkgdir}/usr/bin" - rm -r "${pkgdir}/usr/include" -} - diff --git a/libar2/PKGBUILD b/libar2/PKGBUILD index c90bff0..943a1c6 100644 --- a/libar2/PKGBUILD +++ b/libar2/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgbase=libar2 pkgname=($pkgbase $pkgbase-doc $pkgbase-musl) diff --git a/libar2simplified/PKGBUILD b/libar2simplified/PKGBUILD index 75b2b89..a95af3e 100644 --- a/libar2simplified/PKGBUILD +++ b/libar2simplified/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgbase=libar2simplified pkgname=($pkgbase $pkgbase-doc $pkgbase-musl) diff --git a/libblake/PKGBUILD b/libblake/PKGBUILD index 8083eda..950e3ff 100644 --- a/libblake/PKGBUILD +++ b/libblake/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgbase=libblake pkgname=($pkgbase $pkgbase-musl) diff --git a/libclut/PKGBUILD b/libclut/PKGBUILD index 2671ff6..e0ea788 100644 --- a/libclut/PKGBUILD +++ b/libclut/PKGBUILD @@ -1,25 +1,25 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libclut -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc="C library for manipulating colour lookup tables" arch=(i686 x86_64) -url="https://github.com/maandree/libclut" -license=('ISC') +url="https://codeberg.org/maandree/libclut" +license=('custom:ISC') depends=() makedepends=() source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(43b38b117dc73f241d32274b79487bd55428fe494e710d4ddb8df475ee7084cc) +sha256sums=(8fd115d9276864399a367a3a3716261fb2b08d9b235a38f020b04e1701fb549a) build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make PREFIX=/usr } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/libcolour/PKGBUILD b/libcolour/PKGBUILD index 866e104..0fe8fd8 100644 --- a/libcolour/PKGBUILD +++ b/libcolour/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libcolour pkgver=2.3 diff --git a/libcontacts/PKGBUILD b/libcontacts/PKGBUILD index abc248e..f6b1118 100644 --- a/libcontacts/PKGBUILD +++ b/libcontacts/PKGBUILD @@ -1,29 +1,29 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libcontacts -pkgver=1.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="A library for handling a simple, flexible contact list" arch=(x86_64) -url="https://github.com/maandree/libcontacts" +url="https://codeberg.org/maandree/libcontacts" license=('custom:ISC') depends=() checkdepends=() makedepends=() -source=(libcontacts-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(208696e963157ef48fe517a83904ff0e860d2a0c2be8455dd85be2b96bff71d0) +source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) +sha256sums=(44949f6b8e89176fb9a7c6910f0e6cb4aa8d00d8da03b6d172f78d9c86ed8a50) build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make PREFIX=/usr } check() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make check } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/libcoopgamma/PKGBUILD b/libcoopgamma/PKGBUILD index 54a0799..8d89e26 100644 --- a/libcoopgamma/PKGBUILD +++ b/libcoopgamma/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libcoopgamma pkgver=1.2.3 diff --git a/liberror-backtrace/PKGBUILD b/liberror-backtrace/PKGBUILD index cd94509..4805e82 100644 --- a/liberror-backtrace/PKGBUILD +++ b/liberror-backtrace/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=liberror-backtrace pkgver=1.0.0.1 diff --git a/liberror/PKGBUILD b/liberror/PKGBUILD index 9ec5877..c473073 100644 --- a/liberror/PKGBUILD +++ b/liberror/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=liberror pkgver=1.1.1 diff --git a/libgamma/PKGBUILD b/libgamma/PKGBUILD index d69d8dc..b7b2ca7 100644 --- a/libgamma/PKGBUILD +++ b/libgamma/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libgamma pkgver=0.7.4 diff --git a/libgammamm/PKGBUILD b/libgammamm/PKGBUILD index dfefe75..9bbc73a 100644 --- a/libgammamm/PKGBUILD +++ b/libgammamm/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libgammamm pkgver=1.0.4 diff --git a/libgksu-colormap-fix/PKGBUILD b/libgksu-colormap-fix/PKGBUILD deleted file mode 100644 index 7fb4ad6..0000000 --- a/libgksu-colormap-fix/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the libgksu package: Jan de Groot <jgc@archlinux.org> - -_pkgname=libgksu -pkgname=libgksu-colormap-fix -pkgver=2.0.12 -pkgrel=6 -pkgdesc="gksu authorization library (with libgksu-rgba-fix.diff patch)" -arch=(i686 x86_64) -url="http://www.nongnu.org/gksu/index.html" -license=(GPL) -depends=('gconf' 'gtk2' 'libgnome-keyring' 'libgtop' 'startup-notification') -makedepends=('intltool' 'gtk-doc') -options=('!emptydirs') -conflicts=(libgksu) -provides=("libgksu=$pkgver") -install=libgksu.install -source=(http://people.debian.org/~kov/gksu/${_pkgname}-${pkgver}.tar.gz - libgksu-2.0.0-fbsd.patch - libgksu-2.0.12-automake-1.11.2.patch - libgksu-2.0.12-fix-make-3.82.patch - libgksu-2.0.12-notests.patch - libgksu-2.0.12-revert-forkpty.patch - libgksu-2.0.7-libs.patch - libgksu-2.0.7-polinguas.patch - libgksu-rgba-fix.diff) -md5sums=('c7154c8806f791c10e7626ff123049d3' - '063a2b45d8e7cbba898d1db413242da0' - '2eeb34ad9b5bf29e8e2ebf8c8a5a28b6' - 'afeaf5caab03d793258d62d60a9bf0f0' - '4179d0487d6032e56b8a925010694c0a' - 'aebbe57e5286c654e27cf714cf3b704a' - '58d3a4a9d2ac741951720043ea3f7b5f' - '0b5c3d5d9b32cb3e65d9f0bfbcb11a76' - '7599049c7a3a2395d9bff4e31ea46385') - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/libgksu-2.0.0-fbsd.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.7-libs.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.7-polinguas.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.12-revert-forkpty.patch" - patch -Np0 -i "${srcdir}/libgksu-2.0.12-fix-make-3.82.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.12-notests.patch" - patch -Np1 -i "${srcdir}/libgksu-2.0.12-automake-1.11.2.patch" - - patch -Np0 -i "${srcdir}/libgksu-rgba-fix.diff" - - touch NEWS README - - intltoolize --force --copy --automake - autoreconf -fi - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static --disable-schemas-install - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - rm -f ${pkgdir}/usr/lib/*.a - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" --domain libgksu ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/libgksu-colormap-fix/libgksu-2.0.0-fbsd.patch b/libgksu-colormap-fix/libgksu-2.0.0-fbsd.patch deleted file mode 100644 index 5c007be..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.0-fbsd.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c ---- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400 -+++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500 -@@ -23,7 +23,12 @@ - #include <unistd.h> - #include <string.h> - #include <fcntl.h> -+#ifdef __FreeBSD__ -+#include <libutil.h> -+#include <termios.h> -+#else - #include <pty.h> -+#endif - #include <pwd.h> - #include <sys/types.h> - #include <sys/wait.h> -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am ---- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - - EXTRA_DIST = libgksu.ver -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in ---- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500 -@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config -- - gksu_run_helper_SOURCES = gksu-run-helper.c - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - EXTRA_DIST = libgksu.ver - all: all-am - -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am ---- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500 -@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in ---- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400 -+++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500 -@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` -+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` - all: all-am - - .SUFFIXES: diff --git a/libgksu-colormap-fix/libgksu-2.0.12-automake-1.11.2.patch b/libgksu-colormap-fix/libgksu-2.0.12-automake-1.11.2.patch deleted file mode 100644 index 0f22166..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-automake-1.11.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -Due to the following change, pkglib_PROGRAMS is invalid: - http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf - -https://savannah.nongnu.org/bugs/index.php?35241 -https://bugs.gentoo.org/show_bug.cgi?id=397411 - ---- - libgksu/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am -index 49362f9..3cb1090 100644 ---- a/libgksu/Makefile.am -+++ b/libgksu/Makefile.am -@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE} - pkgconfigdir = ${libdir}/pkgconfig - pkgconfig_DATA = libgksu2.pc - --pkglibdir = ${libdir}/${PACKAGE} --pkglib_PROGRAMS = gksu-run-helper -+gksulibdir = ${libdir}/${PACKAGE} -+gksulib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - diff --git a/libgksu-colormap-fix/libgksu-2.0.12-fix-make-3.82.patch b/libgksu-colormap-fix/libgksu-2.0.12-fix-make-3.82.patch deleted file mode 100644 index 0a7c5f1..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-fix-make-3.82.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500 -+++ Makefile.am 2010-08-22 16:11:55.289599110 -0500 -@@ -17,11 +17,11 @@ - - if GCONF_SCHEMAS_INSTALL - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -- for p in $(schemas_DATA) ; do \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -- done \ -- fi -+ if test -z "$(DESTDIR)" ; then \ -+ for p in $(schemas_DATA) ; do \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ -+ done \ -+ fi - else - install-data-local: - endif diff --git a/libgksu-colormap-fix/libgksu-2.0.12-notests.patch b/libgksu-colormap-fix/libgksu-2.0.12-notests.patch deleted file mode 100644 index 3787ef6..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-notests.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: libgksu-2.0.12/libgksu/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksu/Makefile.am -+++ libgksu-2.0.12/libgksu/Makefile.am -@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper - gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` - gksu_run_helper_SOURCES = gksu-run-helper.c - --noinst_PROGRAMS = test-gksu -+EXTRA_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c - test_gksu_LDADD = libgksu2.la - test_gksu_LDFLAGS = `pkg-config --libs glib-2.0` -Index: libgksu-2.0.12/libgksuui/Makefile.am -=================================================================== ---- libgksu-2.0.12.orig/libgksuui/Makefile.am -+++ libgksu-2.0.12/libgksuui/Makefile.am -@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - --noinst_PROGRAMS = test-gksuui -+EXTRA_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c - test_gksuui_LDADD = libgksuui1.0.la - test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0` diff --git a/libgksu-colormap-fix/libgksu-2.0.12-revert-forkpty.patch b/libgksu-colormap-fix/libgksu-2.0.12-revert-forkpty.patch deleted file mode 100644 index 2c3a8cc..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.12-revert-forkpty.patch +++ /dev/null @@ -1,359 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c ---- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400 -+++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500 -@@ -1,7 +1,6 @@ - /* - * Gksu -- a library providing access to su functionality - * Copyright (C) 2004-2009 Gustavo Noronha Silva -- * Portions Copyright (C) 2009 VMware, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -56,9 +55,6 @@ - static void - gksu_context_launch_complete (GksuContext *context); - --static void --read_line (int fd, gchar *buffer, int n); -- - GType - gksu_error_get_type (void) - { -@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context, - for (i = 0 ; cmd[i] != NULL ; i++) - g_free (cmd[i]); - g_free(cmd); -- -- _exit(1); - } - else if (pid == -1) - { -@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context, - /* drop the \n echoed on password entry if su did request - a password */ - if (password_needed) -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); -- read_line (fdpty, buf, 255); -+ read (fdpty, buf, 255); - if (context->debug) - fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf); - } -@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context, - { - int retval = 0; - -- /* Red Hat's su shows the full path to su in its error messages. */ -- if (!strncmp (buf, "su:", 3) || -- !strncmp (buf, "/bin/su:", 7)) -+ if (!strncmp (buf, "su", 2)) - { - gchar **strings; - -@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context, - } - - strings = g_strsplit (buf, ":", 2); -- -- /* Red Hat and Fedora use 'incorrect password'. */ -- if (strings[1] && -- (g_str_has_prefix(strings[1], " Authentication failure") || -- g_str_has_prefix(strings[1], " incorrect password"))) -+ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23)) - { - if (used_gnome_keyring) - g_set_error (error, gksu_quark, -@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context, - { - char **cmd; - char buffer[256] = {0}; -- char *child_stderr = NULL; -- /* This command is used to gain a token */ -- char *const verifycmd[] = -- { -- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL -- }; - int argcount = 8; - int i, j; - -@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context, - - pid_t pid; - int status; -- FILE *fdfile = NULL; -- int fdpty = -1; -+ FILE *infile, *outfile; -+ int parent_pipe[2]; /* For talking to the parent */ -+ int child_pipe[2]; /* For talking to the child */ - - context->sudo_mode = TRUE; - -@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context, - cmd[argcount] = g_strdup("-S"); - argcount++; - -- /* Make sudo noninteractive (we should already have a token) */ -- cmd[argcount] = g_strdup("-n"); -- argcount++; -- - /* Make sudo use next arg as prompt */ - cmd[argcount] = g_strdup("-p"); - argcount++; -@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]); - } - -- pid = forkpty(&fdpty, NULL, NULL, NULL); -- if (pid == 0) -+ if ((pipe(parent_pipe)) == -1) - { -- // Child -- setsid(); // make us session leader -- -- execv(verifycmd[0], verifycmd); -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -- _("Failed to exec new process: %s"), -+ if ((pipe(child_pipe)) == -1) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error creating pipe: %s"), - strerror(errno)); - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -- else if (pid == -1) -+ -+ pid = fork(); -+ if (pid == -1) - { - g_set_error (error, gksu_quark, GKSU_ERROR_FORK, - _("Failed to fork new process: %s"), -@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context, - sudo_reset_xauth (context, xauth, xauth_env); - return FALSE; - } -+ else if (pid == 0) -+ { -+ // Child -+ setsid(); // make us session leader -+ close(child_pipe[1]); -+ dup2(child_pipe[0], STDIN_FILENO); -+ dup2(parent_pipe[1], STDERR_FILENO); - -+ execv(cmd[0], cmd); -+ -+ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC, -+ _("Failed to exec new process: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - else - { - gint counter = 0; - gchar *cmdline = NULL; -- struct termios tio; - - // Parent -- fdfile = fdopen(fdpty, "w+"); -+ close(parent_pipe[1]); - -- /* make sure we notice that ECHO is turned off, if it gets -- turned off */ -- tcgetattr (fdpty, &tio); -- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++) -- { -- usleep (1000); -- tcgetattr (fdpty, &tio); -- } -+ infile = fdopen(parent_pipe[0], "r"); -+ if (!infile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } - -- fcntl (fdpty, F_SETFL, O_NONBLOCK); -+ outfile = fdopen(child_pipe[1], "w"); -+ if (!outfile) -+ { -+ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE, -+ _("Error opening pipe: %s"), -+ strerror(errno)); -+ sudo_reset_xauth (context, xauth, xauth_env); -+ return FALSE; -+ } -+ -+ /* -+ we are expecting to receive a GNOME_SUDO_PASS -+ if we don't there are two possibilities: an error -+ or a password is not needed -+ */ -+ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK); - - { /* no matter if we can read, since we're using - O_NONBLOCK; this is just to avoid the prompt -@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context, - struct timeval tv; - - FD_ZERO(&rfds); -- FD_SET(fdpty, &rfds); -+ FD_SET(parent_pipe[0], &rfds); - tv.tv_sec = 1; - tv.tv_usec = 0; - -- select (fdpty + 1, &rfds, NULL, NULL, &tv); -+ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv); - } - - /* Try hard to find the prompt; it may happen that we're -@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context, - if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0) - break; - -- read_line (fdpty, buffer, 256); -+ read_line (parent_pipe[0], buffer, 256); - - if (context->debug) - fprintf (stderr, "buffer: -%s-\n", buffer); -@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context, - - usleep (1000); - -- write (fdpty, password, strlen(password) + 1); -- write (fdpty, "\n", 1); -+ fprintf (outfile, "%s\n", password); -+ fclose (outfile); - - nullify_password (password); - -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ /* turn NONBLOCK off */ -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - /* ignore the first newline that comes right after sudo receives - the password */ -- fgets (buffer, 255, fdfile); -- /* this is the status we are interested in */ -- fgets (buffer, 255, fdfile); -+ fgets (buffer, 255, infile); -+ /* this is the status we are interessted in */ -+ fgets (buffer, 255, infile); - } - else - { -@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n"); - - /* turn NONBLOCK off, also if have no prompt */ -- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK); -+ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK); - - should_display = gconf_client_get_bool (context->gconf_client, - BASE_PATH "display-no-pass-info", NULL); -@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context, - fprintf (stderr, "%s", buffer); - } - -- if (g_str_has_prefix (buffer, "Sorry, try again.")) -+ if (!strcmp (buffer, "Sorry, try again.\n")) - g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS, - _("Wrong password.")); -+ else if (!strncmp (buffer, "Sorry, user ", 12)) -+ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -+ _("The underlying authorization mechanism (sudo) " -+ "does not allow you to run this program. Contact " -+ "the system administrator.")); - else - { - gchar *haystack = buffer; -@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- /* If we have an error, let's just stop sudo right there. */ -- if (error) -- close(fdpty); -- - cmdline = g_strdup("sudo"); - /* wait for the child process to end or become something other - than sudo */ -@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context, - if (context->sn_context) - gksu_context_launch_complete (context); - -+ while (read (parent_pipe[0], buffer, 255) > 0) -+ { -+ fprintf (stderr, "%s", buffer); -+ bzero(buffer, 256); -+ } -+ - /* if the process is still active waitpid() on it */ - if (pid_exited != pid) - waitpid(pid, &status, 0); - sudo_reset_xauth (context, xauth, xauth_env); - -- /* -- * Did token acquisition succeed? If so, spawn sudo in -- * non-interactive mode. It should either succeed or die -- * immediately if you're not allowed to run the command. -- */ -- if (WEXITSTATUS(status) == 0) -- { -- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL, -- NULL, &child_stderr, &status, -- error); -- } -- - if (exit_status) - { - if (WIFEXITED(status)) { -@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context, - - if (WEXITSTATUS(status)) - { -- if (g_str_has_prefix(child_stderr, "Sorry, user ")) -- { -- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED, -- _("The underlying authorization mechanism (sudo) " -- "does not allow you to run this program. Contact " -- "the system administrator.")); -- } - if(cmdline) - { - /* sudo already exec()ed something else, don't report -@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context, - if (!g_str_has_suffix (cmdline, "sudo")) - { - g_free (cmdline); -- g_free (child_stderr); - return FALSE; - } - g_free (cmdline); -@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context, - } - } - -- fprintf(stderr, child_stderr); -- g_free(child_stderr); -- - /* if error is set we have found an error condition */ -- return (error == NULL); -+ if (error) -+ return FALSE; -+ -+ return TRUE; - } - - /** diff --git a/libgksu-colormap-fix/libgksu-2.0.7-libs.patch b/libgksu-colormap-fix/libgksu-2.0.7-libs.patch deleted file mode 100644 index b9fb77f..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.7-libs.patch +++ /dev/null @@ -1,76 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25362 -# https://bugs.gentoo.org/show_bug.cgi?id=226837 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 22:15:30.000000000 +0100 -+++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100 -@@ -43,6 +43,9 @@ - PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0]) - PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0]) - -+PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0]) -+ - # Checks for library functions. - ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN" - -diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am ---- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100 -@@ -3,7 +3,7 @@ - AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\" - - bin_PROGRAMS = gksu-properties --gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS} -+gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS} - gksu_properties_SOURCES = gksu-properties.c - - gladedir = ${prefix}/share/${PACKAGE} -diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am ---- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100 -@@ -8,8 +8,8 @@ - # major -> breaks backward compatibility (changes to existing ABI) - # minor -> keeps compatibility (additions to the API) - # micro -> no change to the API/ABI --libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la --libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} -+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 - if USE_VERSION_SCRIPT - libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver - endif -@@ -24,12 +24,11 @@ - - pkglibdir = ${libdir}/${PACKAGE} - pkglib_PROGRAMS = gksu-run-helper --gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0` -+gksu_run_helper_LDADD = ${GLIB_LIBS} - gksu_run_helper_SOURCES = gksu-run-helper.c - - noinst_PROGRAMS = test-gksu - test_gksu_SOURCES = test-gksu.c --test_gksu_LDADD = libgksu2.la --test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksu_LDADD = libgksu2.la ${GLIB_LIBS} - - EXTRA_DIST = libgksu.ver -diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am ---- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100 -+++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100 -@@ -4,12 +4,13 @@ - - noinst_LTLIBRARIES = libgksuui1.0.la - libgksuui1_0_la_SOURCES = gksuui-dialog.c --libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0` -+libgksuui1_0_la_LDFLAGS = -Wl,-O1 -+libgksuui1_0_la_LIBADD = ${GTK_LIBS} - - noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h - includedir = ${prefix}/include/$(PACKAGE) - - noinst_PROGRAMS = test-gksuui - test_gksuui_SOURCES = test-gksuui.c --test_gksuui_LDADD = libgksuui1.0.la --test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0` -+test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS} -+ diff --git a/libgksu-colormap-fix/libgksu-2.0.7-polinguas.patch b/libgksu-colormap-fix/libgksu-2.0.7-polinguas.patch deleted file mode 100644 index e423af1..0000000 --- a/libgksu-colormap-fix/libgksu-2.0.7-polinguas.patch +++ /dev/null @@ -1,40 +0,0 @@ -# https://savannah.nongnu.org/bugs/?25360 -diff -Nura a/configure.ac b/configure.ac ---- a/configure.ac 2009-01-19 21:50:57.000000000 +0100 -+++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100 -@@ -50,7 +50,7 @@ - GETTEXT_PACKAGE=AC_PACKAGE_NAME - AC_SUBST(GETTEXT_PACKAGE) - --IT_PROG_INTLTOOL -+IT_PROG_INTLTOOL([0.35.5]) - AM_GLIB_GNU_GETTEXT - - ################################################## -diff -Nura a/po/LINGUAS b/po/LINGUAS ---- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100 -+++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100 -@@ -0,0 +1,23 @@ -+# please keep this list sorted alphabetically -+# http://live.gnome.org/GnomeGoals/PoLinguas -+# -+ca -+cs -+da -+de -+es -+eu -+fr -+hu -+it -+ko -+lt -+pl -+pt_BR -+ro -+ru -+sk -+sv -+nb -+nl -+zh_CN diff --git a/libgksu-colormap-fix/libgksu-rgba-fix.diff b/libgksu-colormap-fix/libgksu-rgba-fix.diff deleted file mode 100644 index 8ae52f1..0000000 --- a/libgksu-colormap-fix/libgksu-rgba-fix.diff +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file 'libgksu/libgksu.c' ---- libgksu/libgksu.c 2009-12-16 16:50:08 +0000 -+++ libgksu/libgksu.c 2009-12-16 17:27:57 +0000 -@@ -478,7 +478,7 @@ - attr.height = 4; - attr.wclass = GDK_INPUT_OUTPUT; - attr.visual = gdk_screen_get_system_visual (fadeout->screen); -- attr.colormap = gdk_screen_get_default_colormap (fadeout->screen); -+ attr.colormap = gdk_screen_get_system_colormap (fadeout->screen); - attr.override_redirect = TRUE; - attr_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_NOREDIR; - - diff --git a/libgksu-colormap-fix/libgksu.install b/libgksu-colormap-fix/libgksu.install deleted file mode 100644 index 89cf0cf..0000000 --- a/libgksu-colormap-fix/libgksu.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=libgksu - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --install ${pkgname} -} diff --git a/libgksu-colormap-fix/upload b/libgksu-colormap-fix/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/libgksu-colormap-fix/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/libhaiku/PKGBUILD b/libhaiku/PKGBUILD index 25865ef..22eacaa 100644 --- a/libhaiku/PKGBUILD +++ b/libhaiku/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libhaiku pkgver=2.0.1.1 diff --git a/libhashsum/PKGBUILD b/libhashsum/PKGBUILD index 5032203..f7bb692 100644 --- a/libhashsum/PKGBUILD +++ b/libhashsum/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libhashsum -pkgver=1.1 +pkgver=1.1.1 pkgrel=1 pkgdesc="Library for calculating the cryptographic hashes" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=(libsha1 libsha2 'libkeccak>=1.3' 'libblake>=3.0') checkdepends=() makedepends=() source=(libhashsum-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(449a05fc1d4e5b2de313f865dadd2612e76c2a188452e2323a7758cc20dcf1f7) +sha256sums=(fafef9b55d12ceba32d9343f573ae2e07e7b29a30383c2dbf36ab614d0a9069b) build() { cd "$srcdir/$pkgname" diff --git a/libkeccak-musl/PKGBUILD b/libkeccak-musl/PKGBUILD index e875d72..e47e6b0 100644 --- a/libkeccak-musl/PKGBUILD +++ b/libkeccak-musl/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libkeccak-musl _pkgname=libkeccak -pkgver=1.4 +pkgver=1.4.2 pkgrel=1 pkgdesc='Keccak-family hashing library (musl-version)' arch=('x86_64' 'i686') @@ -11,7 +11,7 @@ license=('custom:ISC') _compiler=gcc depends=('musl' "${_compiler}") source=("${_pkgname}-${pkgver}.tar.gz::${url}/archive/${pkgver}.tar.gz") -b2sums=('645ae0cb8bb8c8f512487eec876bc63bd8c2e2a5243e3ebe32aca2e4cc79a3271a18a8295d097f6a1e536444bcf1af6331507ccf814bab2ae838c005434ca84f') +b2sums=('619cd806261b3d764d54912a6a760f266422e371e7140a4446053e7f3bae19957539e15d027d71d2f63b9f7a994bd4606548a6402d6454f29e351b0e1a4c0d43') prepare() { cd ${_pkgname} diff --git a/libparser/PKGBUILD b/libparser/PKGBUILD index 312741f..28c52ee 100644 --- a/libparser/PKGBUILD +++ b/libparser/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libparser pkgver=1.1.2 diff --git a/libpassphrase/PKGBUILD b/libpassphrase/PKGBUILD new file mode 100644 index 0000000..9d8d0e8 --- /dev/null +++ b/libpassphrase/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=libpassphrase +pkgver=1449331105 +pkgrel=1 +pkgdesc="Personalisable library for TTY passphrase reading" +url="https://github.com/GNU-Pony/libpassphrase" +arch=(i686 x86_64 armv6h) +license=(GPL3) +depends=(glibc) +makedepends=(make coreutils gcc texinfo) +optdepends=('passcheck: for strength meter') +install=libpassphrase.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(76044a7af93dd6a956c6fb9a13af711a2c90b260420a2bf1b272d624deefafb7) + + +build() { + cd "${srcdir}/libpassphrase-${pkgver}" + + options=() + #options+=( PASSPHRASE_ECHO ) # Do not hide the passphrase + #options+=( PASSPHRASE_STAR ) # Use '*' for each character instead of no echo + options+=( PASSPHRASE_TEXT ) # Use '(empty)' and not '(not empty)' instead of no echo + #options+=( PASSPHRASE_REALLOC ) # Soften security by using `realloc` + options+=( PASSPHRASE_MOVE ) # Enable move of point + options+=( PASSPHRASE_INSERT ) # Enable insert mode + options+=( PASSPHRASE_OVERRIDE ) # Enable override mode + options+=( PASSPHRASE_DELETE ) # Enable reversed erase command + options+=( PASSPHRASE_CONTROL ) # Enable use of control key combinations + options+=( PASSPHRASE_DEDICATED ) # Enable use of dedicated keys + options+=( DEFAULT_INSERT ) # Use insert mode as default + options+=( PASSPHRASE_INVALID ) # Prevent duplication of non-initialised memory + options+=( PASSPHRASE_METER ) # Enable strength meter for new passphrases + ## see `info '(libpassphrase)' configuring` for details + + star_char="*" + text_empty="(empty)" + text_not_empty="(not empty)" + text_strength="Strength:" + + make PKGNAME="${pkgname}" OPTIONS="${options[*]}" \ + PASSPHRASE_STAR_CHAR="${star_char}" \ + PASSPHRASE_TEXT_EMPTY="${text_empty}" \ + PASSPHRASE_TEXT_NOT_EMPTY="${text_not_empty}" \ + PASSPHRASE_TEXT_STRENGTH="${text_strength}" + ## it is also possible to add PASSPHRASE_STRENGTH_LIMITS_HEADER +} + +package() { + cd "${srcdir}/libpassphrase-${pkgver}" + + make PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/libpassphrase/libpassphrase.install b/libpassphrase/libpassphrase.install new file mode 100644 index 0000000..f69bfba --- /dev/null +++ b/libpassphrase/libpassphrase.install @@ -0,0 +1,20 @@ +_file="libpassphrase" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/gtk3-nobroadway-nowayland-nocolord/upload b/libpassphrase/upload index 1e7a8be..1e7a8be 120000 --- a/gtk3-nobroadway-nowayland-nocolord/upload +++ b/libpassphrase/upload diff --git a/libred/PKGBUILD b/libred/PKGBUILD index c008cfd..508cf93 100644 --- a/libred/PKGBUILD +++ b/libred/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libred -pkgver=1.0.2.1 +pkgver=1.0.3 pkgrel=1 pkgdesc="Solar elevation and blackbody colour calculation library for C" arch=(i686 x86_64) @@ -10,7 +10,7 @@ license=('ISC') depends=() makedepends=(sed) source=(libred-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(d933e46a41e2c712f7d7c1bb06e17cc8d318160c1812a47c742ceb848f1a064b) +sha256sums=(3552bb05196a80c367f91b0edf8ef34ba53d95656f5d0898bec50c4952c0d29c) build() { diff --git a/libsha1/PKGBUILD b/libsha1/PKGBUILD index 25bd3ad..2128ce9 100644 --- a/libsha1/PKGBUILD +++ b/libsha1/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libsha1 -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="SHA-1 and SHA-0 hashing library" arch=(i686 x86_64) @@ -11,19 +11,26 @@ depends=() checkdepends=() makedepends=() source=(libsha1-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(b2fbe344efe7cd0f14ad0cdbab28847ac7b4c4c86bf83583e87fc028d7a06ea8) +sha256sums=(01b801bee3d89a3647f0b6302664852463b9f6d6be3afc0ef878d16c1ba6fef7) + +_config=config-portable.mk +if test "$(uname -m)" = x86_64; then + _config=config-x86.mk +elif test "$(uname -m)" = aarch64; then + _config=config-armv8.mk +fi build() { cd "$srcdir/$pkgname" - make PREFIX=/usr + make CONFIGFILE="${_config}" PREFIX=/usr } check() { cd "$srcdir/$pkgname" - make check + make CONFIGFILE="${_config}" check } package() { cd "$srcdir/$pkgname" - make PREFIX=/usr DESTDIR="$pkgdir" install + make CONFIGFILE="${_config}" PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/libsha2/PKGBUILD b/libsha2/PKGBUILD index 8c59b84..aeed01c 100644 --- a/libsha2/PKGBUILD +++ b/libsha2/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libsha2 -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="SHA-2-family hashing library" arch=(i686 x86_64) @@ -11,19 +11,26 @@ depends=() checkdepends=() makedepends=() source=(libsha2-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(66f5b5335f298d8bc5493d467264e02cd523b2325cf15066fcc3280f37f53340) +sha256sums=(14470efbb2987e4be57d0c69635f8dedba11eac7ccece5b1a4a41458c180b765) + +_config=config-portable.mk +if test "$(uname -m)" = x86_64; then + _config=config-x86.mk +elif test "$(uname -m)" = aarch64; then + _config=config-armv8.mk +fi build() { cd "$srcdir/$pkgname" - make PREFIX=/usr + make CONFIGFILE="${_config}" PREFIX=/usr } check() { cd "$srcdir/$pkgname" - make check + make CONFIGFILE="${_config}" CHECK_FLAGS=skip-huge check } package() { cd "$srcdir/$pkgname" - make PREFIX=/usr DESTDIR="$pkgdir" install + make CONFIGFILE="${_config}" PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/libsimple/PKGBUILD b/libsimple/PKGBUILD index 5dcc164..c953ad8 100644 --- a/libsimple/PKGBUILD +++ b/libsimple/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libsimple -pkgver=1.6 +pkgver=1.7 pkgrel=1 pkgdesc="A bunch of C functions that are useful when writing simple code" arch=(i686 x86_64) @@ -10,7 +10,7 @@ license=('ISC') depends=() makedepends=() source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha512sums=(86e7d021021473c317952fdb9c7afab410881c3365074499396703c3287367537c485d869e2f1c2dbddfbcc2cc6ab8443e8ec74c72f2406efd239ca5d02dea98) +sha512sums=(a9c3fe9fdf4d5691fc8ef96585a79e031ecf5255cbf6b5dc7eeb53bc7eda8d87553b2da0abf75dde3cbb6999db9dd046a55f03cead018470506b8de9c89238f1) build() { @@ -27,5 +27,5 @@ check() { package() { cd "$srcdir/$pkgname" - make install PREFIX=/usr DESTDIR="$pkgdir" + make PREFIX=/usr DESTDIR="$pkgdir" install } diff --git a/libspoton/PKGBUILD b/libspoton/PKGBUILD deleted file mode 100644 index 7b958c0..0000000 --- a/libspoton/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=libspoton -pkgver=2017.01.20 -pkgrel=1 -pkgdesc='Binding library for Spot-On' -url='http://spot-on.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('sqlite' 'libgcrypt>=1.5' 'libntru') -makedepends=('sqlite' 'libgcrypt>=1.5' 'make' 'gcc' 'coreutils') -source=("Spot-On-${pkgver}.zip::http://downloads.sourceforge.net/project/spot-on/Version%20${pkgver}/Spot-On-Src.d.zip?r=") -sha256sums=('45ff31d37092f653c0b94b4dc47b16f64c4b1327841bacfd8a4f624b63a6e04c') - - -build() { - cd "$srcdir/spot-on.d/libSpotOn" - make -} - -package () { - cd "$srcdir/spot-on.d/libSpotOn" - install -dm755 -- "$pkgdir/usr/lib" - install -m755 -- libspoton.so "$pkgdir/usr/lib/libspoton.so" - install -dm755 -- "$pkgdir/usr/include" - install -m755 -- libspoton.h "$pkgdir/usr/include/libspoton.h" -} - diff --git a/libspoton/upload b/libspoton/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/libspoton/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/libterminput/PKGBUILD b/libterminput/PKGBUILD index 914919f..0b7d8e7 100644 --- a/libterminput/PKGBUILD +++ b/libterminput/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=libterminput pkgver=1.0.3 diff --git a/makeenv/PKGBUILD b/makeenv/PKGBUILD index 79d1a40..f5c7f4d 100644 --- a/makeenv/PKGBUILD +++ b/makeenv/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=makeenv pkgver=1.0.1 diff --git a/median/PKGBUILD b/median/PKGBUILD index 43248e1..42b35eb 100644 --- a/median/PKGBUILD +++ b/median/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=median pkgver=2.0.1 diff --git a/mesa-nowayland/LICENSE b/mesa-nowayland/LICENSE deleted file mode 100644 index ae33d27..0000000 --- a/mesa-nowayland/LICENSE +++ /dev/null @@ -1,82 +0,0 @@ -Disclaimer - -Mesa is a 3-D graphics library with an API which is very similar to -that of OpenGL* -To the extent that Mesa utilizes the OpenGL command syntax or state -machine, it is being used with authorization from Silicon Graphics, -Inc.(SGI). However, the author does not possess an OpenGL license -from SGI, and makes no claim that Mesa is in any way a compatible -replacement for OpenGL or associated with SGI. Those who want a -licensed implementation of OpenGL should contact a licensed -vendor. - -Please do not refer to the library as MesaGL (for legal -reasons). It's just Mesa or The Mesa 3-D graphics -library - -* OpenGL is a trademark of Silicon Graphics Incorporated. - -License / Copyright Information - -The Mesa distribution consists of several components. Different copyrights -and licenses apply to different components. For example, GLUT is copyrighted -by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa -device drivers are copyrighted by their authors. See below for a list of -Mesa's main components and the license for each. - -The core Mesa library is licensed according to the terms of the MIT license. -This allows integration with the XFree86, Xorg and DRI projects. - -The default Mesa license is as follows: - -Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Attention, Contributors - -When contributing to the Mesa project you must agree to the licensing terms -of the component to which you're contributing. -The following section lists the primary components of the Mesa distribution -and their respective licenses. - - -Mesa Component Licenses - -Component Location Primary Author License ----------------------------------------------------------------------------- -Main Mesa code src/mesa/ Brian Paul Mesa (MIT) - -Device drivers src/mesa/drivers/* See drivers See drivers - -Ext headers include/GL/glext.h SGI SGI Free B - include/GL/glxext.h - -GLUT src/glut/ Mark Kilgard Mark's copyright - -Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL - -SGI GLU library src/glu/sgi/ SGI SGI Free B - -demo programs progs/demos/ various see source files - -X demos progs/xdemos/ Brian Paul see source files - -SGI demos progs/samples/ SGI SGI copyright - -RedBook demos progs/redbook/ SGI SGI copyright diff --git a/mesa-nowayland/PKGBUILD b/mesa-nowayland/PKGBUILD deleted file mode 100644 index 7f91ab7..0000000 --- a/mesa-nowayland/PKGBUILD +++ /dev/null @@ -1,108 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the mesa package: Jan de Groot <jgc@archlinux.org> -# Maintainer of the mesa package: Andreas Radke <andyrtr@archlinux.org> - -pkgname=mesa-nowayland -pkgver=13.0.1 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc="An open-source implementation of the OpenGL specification" -makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' - 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'elfutils' 'llvm' - 'systemd' 'libomxil-bellagio' 'libgcrypt' 'libclc' 'clang') -depends=('libdrm' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'elfutils' - 'libomxil-bellagio' 'libgcrypt' 'libtxc_dxtn' 'llvm-libs') -optdepends=('opengl-man-pages: for the OpenGL API man pages' - 'mesa-vdpau: for accelerated video playback' - 'libva-mesa-driver: for accelerated video playback') -conflicts=("mesa") -provides=("mesa=$pkgver" - 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') -conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') -replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') -url="http://mesa3d.sourceforge.net" -license=('custom') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz - LICENSE - remove-libpthread-stubs.patch) -sha256sums=('71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' - '75ab53ad44b95204c788a2988e97a5cb963bdbf6072a5466949a2afb79821c8f') - -prepare() { - cd ${srcdir}/mesa-${pkgver} - - # Now mesa checks for libpthread-stubs - so remove the check - patch -Np1 -i ../remove-libpthread-stubs.patch - - autoreconf -fiv -} - -build() { - cd ${srcdir}/mesa-${pkgver} - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \ - --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ - --with-egl-platforms=x11,drm \ - --with-vulkan-drivers=intel,radeon \ - --with-sha1=libgcrypt \ - --disable-xvmc \ - --enable-gallium-llvm \ - --enable-llvm-shared-libs \ - --enable-shared-glapi \ - --enable-egl \ - --enable-glx \ - --enable-glx-tls \ - --enable-gles1 \ - --enable-gles2 \ - --enable-gbm \ - --enable-dri \ - --enable-osmesa \ - --enable-texture-float \ - --enable-xa \ - --enable-vdpau \ - --enable-omx \ - --enable-nine \ - --enable-opencl \ - --enable-opencl-icd \ - --with-clang-libdir=/usr/lib - - make - - # fake installation - mkdir -p $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install -} - -package() { - install -m755 -d ${pkgdir}/etc - cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc - - install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri - # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast - cp -av ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri - - cp -rv ${srcdir}/fakeinstall/usr/lib/bellagio ${pkgdir}/usr/lib - cp -rv ${srcdir}/fakeinstall/usr/lib/d3d ${pkgdir}/usr/lib - cp -rv ${srcdir}/fakeinstall/usr/lib/lib{gbm,glapi}.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libOSMesa.so* ${pkgdir}/usr/lib/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libxatracker.so* ${pkgdir}/usr/lib/ - - cp -rv ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr - cp -rv ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/ - - # remove vulkan headers - rm -rf ${pkgdir}/usr/include/vulkan - - install -m755 -d ${pkgdir}/usr/lib/mesa - # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ? - cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/ - cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/ - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} diff --git a/mesa-nowayland/remove-libpthread-stubs.patch b/mesa-nowayland/remove-libpthread-stubs.patch deleted file mode 100644 index efe8aad..0000000 --- a/mesa-nowayland/remove-libpthread-stubs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 54416b4..8a708d3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -824,7 +824,7 @@ test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread" - - dnl pthread-stubs is mandatory on targets where it exists - case "$host_os" in --cygwin* ) -+cygwin* | linux* ) - pthread_stubs_possible="no" - ;; - * ) diff --git a/mesa-nowayland/upload b/mesa-nowayland/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/mesa-nowayland/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/metar/PKGBUILD b/metar/PKGBUILD index e64258f..25d02e0 100644 --- a/metar/PKGBUILD +++ b/metar/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=metar -pkgver=1.3.4 -pkgrel=2 +pkgver=1.3.5 +pkgrel=1 pkgdesc="Trivial, yet fully fledged, weather report" arch=(any) url="https://codeberg.org/maandree/metar" @@ -10,7 +10,7 @@ license=('custom:ISC') depends=(sh sed grep curl coreutils python3) makedepends=() source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=(2fb2f7bd17d3f42614681ad645e91caea55d7ed81024ab36a536dc2783419c70) +sha256sums=(4d56285a5d6c8d5a50f72fbb2387e09a0ee06361233d2e8b801f4b245e4490d4) build() { diff --git a/mongoclock/PKGBUILD b/mongoclock/PKGBUILD index 1415942..3d2c60f 100644 --- a/mongoclock/PKGBUILD +++ b/mongoclock/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=mongoclock pkgver=3.1.5 diff --git a/mongotimer/PKGBUILD b/mongotimer/PKGBUILD index bc46ba2..5772cca 100644 --- a/mongotimer/PKGBUILD +++ b/mongotimer/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=mongotimer pkgver=1.1.4 diff --git a/nafe/PKGBUILD b/nafe/PKGBUILD index 3efa9b1..ff24285 100644 --- a/nafe/PKGBUILD +++ b/nafe/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> # Previous maintainer: crshd <crshd@mail.com> pkgname=nafe diff --git a/newsd/0001-Fix-some-errors.patch b/newsd/0001-Fix-some-errors.patch deleted file mode 100644 index 6c29ef9..0000000 --- a/newsd/0001-Fix-some-errors.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 7ea16aa17813ea8fc4a43853804c2ebe99ebb1fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Thu, 19 Nov 2015 21:58:27 +0100 -Subject: [PATCH] Fix some errors -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Mattias Andrée <maandree@operamail.com> ---- - Makefile | 7 +++---- - Server.C | 6 +----- - everything.H | 1 + - newsd.conf.pod | 6 ++++++ - 4 files changed, 11 insertions(+), 9 deletions(-) - -diff --git a/Makefile b/Makefile -index 73f5d9f..1e2c1b0 100644 ---- a/Makefile -+++ b/Makefile -@@ -105,10 +105,9 @@ MANPAGES = newsd.man newsd.$(CAT8EXT) \ - $(POD2MAN) $< >$@ - .pod.0 .pod.1m .pod.5 .pod.8: - echo Formatting $@... -- $(RM) $@.roff -- $(POD2MAN) $< >$@.roff -- $(NROFF) -man $@.roff >$@ -- $(RM) $@.roff -+ $(POD2MAN) $< > $@ -+ sed -i 's/^\.TH NEWSD\.CONF.*$$/\.TH newsd.conf 5/' $@ -+ sed -i 's/^\.TH NEWSD.*$$/\.TH newsd 8/' $@ - .pod.z: - echo Formatting $@... - $(RM) $@ $@.roff $@.tmp $@.tmp.z -diff --git a/Server.C b/Server.C -index 58aff13..f61ce38 100644 ---- a/Server.C -+++ b/Server.C -@@ -964,11 +964,7 @@ int Server::Accept() - // fprintf(stderr, "Listening for connect requests on port %d\n", - // (int)port); - --#if defined(DARWIN) | defined(BSD) -- int length = sizeof(sin); --#else -- size_t length = sizeof(sin); --#endif -+ socklen_t length = sizeof(sin); - - msgsock = accept(sock, (struct sockaddr*)&sin, &length); - if (msgsock < 0) -diff --git a/everything.H b/everything.H -index afc861a..350fe47 100644 ---- a/everything.H -+++ b/everything.H -@@ -43,6 +43,7 @@ - #include <time.h> - #include <pwd.h> - #include <grp.h> -+#include <limits.h> - - using namespace std; - -diff --git a/newsd.conf.pod b/newsd.conf.pod -index 768d2f5..9f0f75f 100644 ---- a/newsd.conf.pod -+++ b/newsd.conf.pod -@@ -244,6 +244,8 @@ replies to be sent to the specifies address, typically a mail - gateway back to the newsgroup. If set to "-", no Reply-To header - will be sent. The default is "-". - -+=back -+ - =head1 .INFO FILES - - I<newsd> automatically creates and maintains little ".info" -@@ -256,6 +258,8 @@ a problem, in which case the daemon should not be running. - - =head1 SEE ALSO - -+=over -+ - =item newsd(8) -- erco's simple nntp news server - - =item RFC 977 -- NNTP Protocol -@@ -264,6 +268,8 @@ a problem, in which case the daemon should not be running. - - =item RFC 1036 -- Usenet news messages format - -+=back -+ - =head1 REPORTING BUGS - - Report bugs using the form at "http://www.easysw.com/~mike/newsd/". --- -2.6.2 - diff --git a/newsd/PKGBUILD b/newsd/PKGBUILD deleted file mode 100644 index 89d08be..0000000 --- a/newsd/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=newsd -pkgver=1.44 -pkgrel=1 -pkgdesc='Standalone local nntp server' -url='http://www.msweet.org/projects.php?Z4' -arch=('i686' 'x86_64') -license=('GPL2') -depends=(gcc-libs) -makedepends=(gcc-libs perl sed) -source=("http://www.msweet.org/files/project4/newsd-1.44-source.tar.gz" - 0001-Fix-some-errors.patch) -sha256sums=(e6d97cc347bc8f897cfa4c2f4aa80690fa7018efebc39555b1ab4aa19edee406 - 75d69ea858b55f60581e19ce18925b6a56da1f869aff8c0fcac9feb2c4924c58) - - - -build() -{ - cd "${srcdir}/newsd-${pkgver}" - ./configure --sbindir=/usr/bin - patch -Np1 -i ../0001-Fix-some-errors.patch - make -} - -package() -{ - cd "${srcdir}/newsd-${pkgver}" - make install DESTDIR="${pkgdir}" -} - diff --git a/newsd/upload b/newsd/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/newsd/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/newsd/watch b/newsd/watch deleted file mode 100755 index e70112c..0000000 --- a/newsd/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f 'release' ] && rm 'release' - -wget 'http://www.msweet.org/projects.php?Z4' -O release >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - < release grep -Poi '>newsd [^<>]* source archive<' | sed 1q | sed 's/ tar.[^ ]* / /g' | dd conv=lcase 2>/dev/null | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'newsd' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'newsd (unfetchable)' -fi - diff --git a/orphan-reaper/PKGBUILD b/orphan-reaper/PKGBUILD index afc1fba..15166d6 100644 --- a/orphan-reaper/PKGBUILD +++ b/orphan-reaper/PKGBUILD @@ -1,14 +1,15 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + pkgname=orphan-reaper -pkgver=2.3.3 +pkgver=2.3.4 pkgrel=1 pkgdesc="Place subreapers in your process tree to keep it structured" arch=(i686 x86_64) url="https://codeberg.org/maandree/orphan-reaper" license=('custom:ISC') -depends=('linux>=3.4') +depends=() source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(528179d8e4dcf1d5a5efd8eaa9e52c6c33b51481a108d6ba8583614cf02cdd9d) +sha256sums=(f5ce137699b02e01059f1e02f71f4a69caf02e54fb77f910066592a33e9c2550) build() { cd "$srcdir/$pkgname" diff --git a/pdeath/PKGBUILD b/pdeath/PKGBUILD index 111fc44..8c01ef6 100644 --- a/pdeath/PKGBUILD +++ b/pdeath/PKGBUILD @@ -1,15 +1,16 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + pkgname=pdeath -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="Run a command that is killed when its parent exits" arch=(i686 x86_64) url="https://codeberg.org/maandree/pdeath" license=('custom:ISC') -depends=('linux>=2.1.57') -makedepends=('linux>=2.1.57') +depends=() +makedepends=() source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(35b3e0e2497f564cb57bb8c44c38da5e25c7d4784f3893237ddec7c6ad384010) +sha256sums=(3dae3078a17b65a9a0b18f2170abe722697894513fc885ec9846c9abf0313302) build() { cd "$srcdir/$pkgname" diff --git a/pinkie-pie/PKGBUILD b/pinkie-pie/PKGBUILD index 9f7a648..75fd185 100644 --- a/pinkie-pie/PKGBUILD +++ b/pinkie-pie/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=pinkie-pie pkgver=1.1 diff --git a/pony.computer/PKGBUILD b/pony.computer/PKGBUILD new file mode 100644 index 0000000..3b28106 --- /dev/null +++ b/pony.computer/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=pony.computer +pkgver=1428445028 +pkgrel=1 +pkgdesc="Show computer information and a pony" +url="https://github.com/GNU-Pony/pony.computer" +arch=(any) +license=(GPL3) +depends=(sh ponysay coreutils python3) +optdepends=("linux: Additional system information can be provided with Linux kernel's procfs /proc" + "filesystem: Identification of distribution" + "lsb-release: Identification of distribution") +makedepends=(make coreutils sed texinfo) +install=pony.computer.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(997f8be119e36cbbdcafee2126ceccfac3e6551d839b78a93aba748f33d4469d) + +_prefix=/usr + + +build() { + cd "${srcdir}/pony.computer-${pkgver}" + make PREFIX="${_prefix}" PKGNAME="${pkgname}" DISTRO="Arch Linux" +} + +package() { + cd "${srcdir}/pony.computer-${pkgver}" + make PREFIX="${_prefix}" PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + _dir="${pkgdir}${_prefix}/share/licenses/${pkgname}" + mkdir -p -- "${_dir}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/pony.computer/pony.computer.install b/pony.computer/pony.computer.install new file mode 100644 index 0000000..2cb5cc3 --- /dev/null +++ b/pony.computer/pony.computer.install @@ -0,0 +1,20 @@ +_file="pony.computer" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/gtk3-print-backends-nocolord/upload b/pony.computer/upload index 1e7a8be..1e7a8be 120000 --- a/gtk3-print-backends-nocolord/upload +++ b/pony.computer/upload diff --git a/pony/.gitignore b/pony/.gitignore deleted file mode 100644 index 4139e4a..0000000 --- a/pony/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/pony diff --git a/pony/PKGBUILD b/pony/PKGBUILD deleted file mode 100644 index 91f232b..0000000 --- a/pony/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Previous maintainer: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=pony -pkgname=pony -pkgver=1.0 -pkgrel=3 -pkgdesc="Can I have a pony?" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('gmp') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O - runhaskell Setup build -} -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} -md5sums=('10ce264fbbe185a3f6290017c5ea58b2') diff --git a/pony/upload b/pony/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/pony/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/pony/watch b/pony/watch deleted file mode 100755 index 4668fdc..0000000 --- a/pony/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'pony' ] && rm 'pony' -wget http://hackage.haskell.org/package/pony -O - | grep -Po 'pony-[^>]*' > pony 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - md5sum < pony > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'pony' - fi - rm pony -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'pony (unfetchable)' -fi - diff --git a/ponyguests/PKGBUILD b/ponyguests/PKGBUILD new file mode 100644 index 0000000..682bdca --- /dev/null +++ b/ponyguests/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=ponyguests +pkgver=1428445099 +pkgrel=1 +pkgdesc="Login wrapper to enable guest accounts" +url="https://github.com/GNU-Pony/ponyguests" +arch=(i686 x86_64) +license=(GPL3) +depends=(sh coreutils grep sed bc shadow 'linux>=3.4' glibc) +makedepends=(make coreutils 'linux-api-headers>=3.4' glibc gcc sed texinfo) +install=ponyguests.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(95105124ca7e4839f62e61352cddf416fe6aad761dc9558bef775787d7d863ce) + +build() { + cd "${srcdir}/ponyguests-${pkgver}" + + make PKGNAME="${pkgname}" +} + +package() { + cd "${srcdir}/ponyguests-${pkgver}" + + make PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/ponyguests/ponyguests.install b/ponyguests/ponyguests.install new file mode 100644 index 0000000..e2a45d7 --- /dev/null +++ b/ponyguests/ponyguests.install @@ -0,0 +1,20 @@ +_file="ponyguests" + +infodir="usr/share/info" +file="${_file}.info" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/javagnutar/upload b/ponyguests/upload index 1e7a8be..1e7a8be 120000 --- a/javagnutar/upload +++ b/ponyguests/upload diff --git a/ponypipe/PKGBUILD b/ponypipe/PKGBUILD index e157e51..3033333 100644 --- a/ponypipe/PKGBUILD +++ b/ponypipe/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=ponypipe pkgver=1.2.4 pkgrel=1 diff --git a/port-trigger/PKGBUILD b/port-trigger/PKGBUILD deleted file mode 100644 index 2b6c6f6..0000000 --- a/port-trigger/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=port-trigger -pkgver=2 -pkgrel=1 -pkgdesc="Run programs when someone makes a connection to a specific port" -arch=('any') -url="https://github.com/maandree/port-trigger" -license=('GPL3') -depends=('java-runtime') -makedepends=('sed' 'java-environment' 'texinfo') -source=("${url}/archive/${pkgver}.tar.gz") -sha256sums=('57dbcee8065bc15c6d0cb6042c36f08b61256166e0b18e63283a167b02e7c083') - - -build() { - cd "${srcdir}/port-trigger-${pkgver}" - make DESTDIR="$pkgdir" -} - -package() { - cd "${srcdir}/port-trigger-${pkgver}" - make DESTDIR="$pkgdir" install -} - diff --git a/port-trigger/upload b/port-trigger/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/port-trigger/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/pylibcoopgamma/PKGBUILD b/pylibcoopgamma/PKGBUILD index 1dc97b0..b8ae3ba 100644 --- a/pylibcoopgamma/PKGBUILD +++ b/pylibcoopgamma/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=pylibcoopgamma pkgver=1.1.3.2 diff --git a/pylibgamma/PKGBUILD b/pylibgamma/PKGBUILD index 83b3a35..8796e9a 100644 --- a/pylibgamma/PKGBUILD +++ b/pylibgamma/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=pylibgamma pkgver=1.1.4 diff --git a/pytagomacs/PKGBUILD b/pytagomacs/PKGBUILD new file mode 100644 index 0000000..7b4f4bc --- /dev/null +++ b/pytagomacs/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=pytagomacs +pkgver=1443787175 +pkgrel=1 +pkgdesc="An Emacs like key–value editor library for Python" +url="https://github.com/GNU-Pony/pytagomacs" +arch=(any) +license=(GPL3) +depends=(python3 coreutils) +makedepends=(make coreutils python3) +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(e259f77bd3a34acfbe2d8327cf9655d31a511a2521caaf9c63f3f1e35bb981ac) + + +build() { + cd "${srcdir}/pytagomacs-${pkgver}" + make PREFIX=/usr +} + +package() { + cd "${srcdir}/pytagomacs-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install + + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/latex-fitch-uoo/upload b/pytagomacs/upload index 1e7a8be..1e7a8be 120000 --- a/latex-fitch-uoo/upload +++ b/pytagomacs/upload diff --git a/python-arg/PKGBUILD b/python-arg/PKGBUILD index 51b8482..b8b0c32 100644 --- a/python-arg/PKGBUILD +++ b/python-arg/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgbase=python-arg pkgname=(python-arg python2-arg) pkgver=1.0.1 diff --git a/python-bus/PKGBUILD b/python-bus/PKGBUILD index 35b7c00..14c5921 100644 --- a/python-bus/PKGBUILD +++ b/python-bus/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=python-bus pkgver=3.1.4 diff --git a/qtchess/PKGBUILD b/qtchess/PKGBUILD deleted file mode 100644 index d67c7cc..0000000 --- a/qtchess/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: kleintux <reg-archlinux AT klein DOT tuxli DOT ch> - -pkgname=qtchess -pkgver=2021.03.15 -pkgrel=2 -pkgdesc='Online chess game client written in Qt' -url='https://textbrowser.github.io/qtchess/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -# (license notice included in qtchess_main.cc) -depends=('qt5-base' 'libgl') -makedepends=('qt5-base' 'libgl' 'qt5-tools') -source=(qtchess-${pkgver}.tar.gz::"https://github.com/textbrowser/qtchess/archive/refs/tags/${pkgver}.tar.gz") -sha256sums=('b67e182beca7d203dd07b995a6d4cae752dc42ed76439694e1befe5d6bd5f2be') - - -prepare () { - cd "$srcdir/qtchess-${pkgver}" - sed '/-Werror/d' < qtchess.pro > qtchess.pro.fixed -} - -build () { - cd "$srcdir/qtchess-${pkgver}" - qmake-qt5 -o Makefile qtchess.pro.fixed - make -} - -package () { - cd "$srcdir/qtchess-${pkgver}" - mkdir -p -- "${pkgdir}/usr/bin/" - cp -- QtChess "${pkgdir}/usr/bin/qtchess" -} diff --git a/qtchess/upload b/qtchess/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/qtchess/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/qtchess/watch b/qtchess/watch deleted file mode 100755 index 05d5681..0000000 --- a/qtchess/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://qtchess.sourceforge.net/ >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'has been released' < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'dooble' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'dooble (unfetchable)' -fi - diff --git a/radharc/PKGBUILD b/radharc/PKGBUILD index 0757866..a32477c 100644 --- a/radharc/PKGBUILD +++ b/radharc/PKGBUILD @@ -1,24 +1,24 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=radharc -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc="Adjusts the color temperature of according to the sun's position" +pkgdesc="Adjusts the colour temperature of according to the Sun's position" arch=(i686 x86_64) -url="https://github.com/maandree/radharc" +url="https://codeberg.org/maandree/radharc" license=('ISC') depends=(libcoopgamma libred) makedepends=(libcoopgamma libclut libred) source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(248190dbad93f2da390f8e5633f0f6ca9672c8f50807388bd51efc36fb1cd3b7) +sha256sums=(c208f469293632cfceda52917b8a8beadb85e18141805f653ea998a8b75aff6a) build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir" } package() { - cd "$srcdir/$pkgname-$pkgver" - make install DESTDIR="$pkgdir" + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install } diff --git a/rc.local.d/PKGBUILD b/rc.local.d/PKGBUILD new file mode 100644 index 0000000..441c1c4 --- /dev/null +++ b/rc.local.d/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=rc.local.d +pkgver=1396841433 +pkgrel=1 +pkgdesc="Startup-system independent startup scripts" +url="https://github.com/GNU-Pony/rc.local.d" +arch=(any) +license=(GPL3) +depends=(bash) +optdepends=(linux findutils kbd ntp alsa-utils) +makedepends=(make coreutils general-preprocessor) +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(a74d39dd6e6825509112f9796e87b138ad1a810e6dd578bbacec1c47891e171e) + + +build() { + cd "${srcdir}/rc.local.d-${pkgver}" + make PKGNAME="${pkgname}" +} + +package() { + cd "${srcdir}/rc.local.d-${pkgver}" + make PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + _dir="${pkgdir}/usr/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/GPL3" "${_dir}/LICENSE" +} + diff --git a/latex-fitch/upload b/rc.local.d/upload index 1e7a8be..1e7a8be 120000 --- a/latex-fitch/upload +++ b/rc.local.d/upload diff --git a/read-quickly/PKGBUILD b/read-quickly/PKGBUILD index a66d0c5..2df1326 100644 --- a/read-quickly/PKGBUILD +++ b/read-quickly/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=read-quickly pkgver=2.0 diff --git a/rmixer/PKGBUILD b/rmixer/PKGBUILD index aba4b5c..28c7640 100644 --- a/rmixer/PKGBUILD +++ b/rmixer/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=rmixer pkgver=1.3.1 pkgrel=1 diff --git a/rotd/PKGBUILD b/rotd/PKGBUILD index 36d7459..f1334b4 100644 --- a/rotd/PKGBUILD +++ b/rotd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=rotd pkgver=1.2 diff --git a/rssyl/.gitignore b/rssyl/.gitignore deleted file mode 100644 index 98ecdaf..0000000 --- a/rssyl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/plugins.* diff --git a/rssyl/PKGBUILD b/rssyl/PKGBUILD deleted file mode 100644 index 1113c95..0000000 --- a/rssyl/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=rssyl -pkgver=0.34 -pkgrel=1 -pkgdesc="claws-mail plugin for RSS and Atom feeds" -arch=(i686 x86_64) -url="http://www.claws-mail.org/plugin.php?plugin=rssyl" -license=('GPL') -groups=(network) -depends=('claws-mail>=3.9.0' 'curl' 'libxml2') -source=("http://www.claws-mail.org/downloads/plugins/$pkgname-$pkgver.tar.gz") -md5sums=('49b45608e8d160b3625d3d50016ec2ca') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/rssyl/upload b/rssyl/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/rssyl/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/rssyl/watch b/rssyl/watch deleted file mode 100755 index caeb5e8..0000000 --- a/rssyl/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'plugins.php?branch=EXT' ] && rm 'plugins.php?branch=EXT' -wget 'http://www.claws-mail.org/plugins.php?branch=EXT' >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - head --lines=$(( $(grep -n RSSyl < 'plugins.php?branch=EXT' | cut -f 1 -d \:) + 30 )) < 'plugins.php?branch=EXT' | tail --lines=30 | grep nowrap | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'rssyl' - fi - rm 'plugins.php?branch=EXT' -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'rssyl (unfetchable)' -fi - diff --git a/sat/PKGBUILD b/sat/PKGBUILD index b54c258..34ab35a 100644 --- a/sat/PKGBUILD +++ b/sat/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=sat pkgver=1.1 diff --git a/scrotty/PKGBUILD b/scrotty/PKGBUILD index 7caf203..e070cc5 100644 --- a/scrotty/PKGBUILD +++ b/scrotty/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=scrotty pkgver=2.0 diff --git a/setpgrp/PKGBUILD b/setpgrp/PKGBUILD index 260d7e2..7ee86e0 100644 --- a/setpgrp/PKGBUILD +++ b/setpgrp/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=setpgrp pkgver=2.1.1 diff --git a/shadow-libpassphrase/0001-Use-libpassphrase-when-entering-passwords.patch b/shadow-libpassphrase/0001-Use-libpassphrase-when-entering-passwords.patch deleted file mode 100644 index 226f4b5..0000000 --- a/shadow-libpassphrase/0001-Use-libpassphrase-when-entering-passwords.patch +++ /dev/null @@ -1,460 +0,0 @@ -From d5074436f7d8f9666fe1e6aac6d732ea62d182c8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@member.fsf.org> -Date: Sat, 5 Dec 2015 21:09:45 +0100 -Subject: [PATCH 1/2] Use libpassphrase when entering passwords. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libpassphrase can be compiled so that it can display -the strength of the password, including telling the -user that she is using a common passphrase. - -As a bonus, libpassphrase can be configured to do -something else then just be slient without echoes. - -Signed-off-by: Mattias Andrée <maandree@member.fsf.org> ---- - ChangeLog | 10 ++++++++ - README | 1 + - lib/Makefile.am | 6 +++-- - lib/pwauth.c | 6 +++-- - lib/xgetpass.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/xgetpass.h | 35 ++++++++++++++++++++++++++++ - libmisc/pam_pass.c | 40 +++++++++++++++++++++++++++++++- - src/gpasswd.c | 6 +++-- - src/newgrp.c | 4 +++- - src/passwd.c | 8 ++++--- - src/sulogin.c | 6 +++-- - 11 files changed, 176 insertions(+), 13 deletions(-) - create mode 100644 lib/xgetpass.c - create mode 100644 lib/xgetpass.h - -diff --git a/ChangeLog b/ChangeLog -index 23cd5ae..bc43385 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,13 @@ -+2015-12-05 Mattias Andrée <maandree@member.fsf.org> -+ -+ * lib/xgetpass.c: Add ability to use libpassphrase>=1449331105 instead of getpass. -+ * libmisc/pam_pass.c: Use xgetpass instead of misc_conv when entering (not retyping) the new password. -+ * lib/pwauth.c: Replace getpass with xgetpass. -+ * src/gpasswd.c: Likewise. -+ * src/newgrp.c: Likewise. -+ * src/passwd.c: Likewise. -+ * src/sulogin.c: Likewise. -+ - 2014-05-09 Christian Perrier <bubulle@debian.org> - - * Include patches only included in Debian for 4.2 -diff --git a/README b/README -index e531de6..5c27142 100644 ---- a/README -+++ b/README -@@ -87,6 +87,7 @@ Leonard N. Zubkoff <lnz@dandelion.com> - Luca Berra <bluca@www.polimi.it> - Lukáš KuklÃnek <lkukline@redhat.com> - Lutz Schwalowsky <schwalow@mineralogie.uni-hamburg.de> -+Mattias Andrée <maandree@member.fsf.org> - Marc Ewing <marc@redhat.com> - Martin Bene <mb@sime.com> - Martin Mares <mj@gts.cz> -diff --git a/lib/Makefile.am b/lib/Makefile.am -index 6db86cd..3fa3817 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -5,7 +5,7 @@ DEFS = - - noinst_LTLIBRARIES = libshadow.la - --libshadow_la_LDFLAGS = -version-info 0:0:0 -+libshadow_la_LDFLAGS = -version-info 0:0:0 -lpassphrase - - libshadow_la_SOURCES = \ - commonio.c \ -@@ -53,7 +53,9 @@ libshadow_la_SOURCES = \ - shadowio.h \ - shadowmem.c \ - spawn.c \ -- utent.c -+ utent.c \ -+ xgetpass.c \ -+ xgetpass.h - - if WITH_TCB - libshadow_la_SOURCES += tcbfuncs.c tcbfuncs.h -diff --git a/lib/pwauth.c b/lib/pwauth.c -index 9e24fbf..6775465 100644 ---- a/lib/pwauth.c -+++ b/lib/pwauth.c -@@ -3,6 +3,7 @@ - * Copyright (c) 1996 - 2000, Marek MichaÅ‚kiewicz - * Copyright (c) 2003 - 2006, Tomasz KÅ‚oczko - * Copyright (c) 2008 - 2009, Nicolas François -+ * Copyright (c) 2015 , Mattias Andrée - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -45,6 +46,7 @@ - #include "defines.h" - #include "pwauth.h" - #include "getdef.h" -+#include "xgetpass.h" - #ifdef SKEY - #include <skey.h> - #endif -@@ -161,7 +163,7 @@ int pw_auth (const char *cipher, - #endif - - snprintf (prompt, sizeof prompt, cp, user); -- clear = getpass (prompt); -+ clear = xgetpass (prompt, 0); - if (NULL == clear) { - static char c[1]; - -@@ -194,7 +196,7 @@ int pw_auth (const char *cipher, - * -- AR 8/22/1999 - */ - if ((0 != retval) && ('\0' == input[0]) && use_skey) { -- clear = getpass (prompt); -+ clear = xgetpass (prompt, 0); - if (NULL == clear) { - static char c[1]; - -diff --git a/lib/xgetpass.c b/lib/xgetpass.c -new file mode 100644 -index 0000000..a44ffc0 ---- /dev/null -+++ b/lib/xgetpass.c -@@ -0,0 +1,67 @@ -+/* -+ * Copyright (c) 2015 , Mattias Andrée -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the copyright holders or contributors may not be used to -+ * endorse or promote products derived from this software without -+ * specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include <config.h> -+ -+#ident "$Id$" -+ -+#include <unistd.h> -+#include <passphrase.h> -+#include <fcntl.h> -+#include <errno.h> -+#include <stdio.h> -+ -+char *xgetpass (const char *prompt, int is_new) -+{ -+ int fd, saved_errno; -+ char *pass; -+ -+ fd = open ("/dev/tty", O_RDWR); -+ if (-1 == fd) { -+ return NULL; -+ } -+ -+ passphrase_disable_echo1 (fd); -+ fprintf (stderr, "%s", prompt); -+ fflush (stderr); -+ pass = passphrase_read2 (fd, is_new -+ ? PASSPHRASE_READ_NEW | -+ PASSPHRASE_READ_SCREEN_FREE -+ : PASSPHRASE_READ_EXISTING); -+ saved_errno = errno; -+ passphrase_reenable_echo1 (fd); -+ errno = saved_errno; -+ return pass; -+ -+ /* -+ return getpass (prompt); -+ (void) is_new; -+ */ -+} -+ -diff --git a/lib/xgetpass.h b/lib/xgetpass.h -new file mode 100644 -index 0000000..b1abbb0 ---- /dev/null -+++ b/lib/xgetpass.h -@@ -0,0 +1,35 @@ -+/* -+ * Copyright (c) 2015 , Mattias Andrée -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the copyright holders or contributors may not be used to -+ * endorse or promote products derived from this software without -+ * specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* -+ * $Id$ -+ */ -+ -+ -+char *xgetpass (const char *prompt, int is_new); -diff --git a/libmisc/pam_pass.c b/libmisc/pam_pass.c -index a89bb2c..93029ec 100644 ---- a/libmisc/pam_pass.c -+++ b/libmisc/pam_pass.c -@@ -2,6 +2,7 @@ - * Copyright (c) 1997 - 1999, Marek MichaÅ‚kiewicz - * Copyright (c) 2001 - 2005, Tomasz KÅ‚oczko - * Copyright (c) 2008 , Nicolas François -+ * Copyright (c) 2015 , Mattias Andrée - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -42,22 +43,59 @@ - #include <stdio.h> - #include <stdlib.h> - #include <unistd.h> -+#include <string.h> - #include <sys/types.h> - #include "defines.h" - #include "pam_defs.h" - #include "prototypes.h" -+#include "xgetpass.h" -+ -+static int xgetpass_conv (int num_msg, const struct pam_message **msg, -+ struct pam_response **resp, void *appdata_ptr) -+{ -+ struct pam_response *response; -+ static int first_enter = 0; -+ int current; -+ int saved_errno; -+ -+ if ((num_msg != 1) || (msg[0]->msg_style != PAM_PROMPT_ECHO_OFF)) -+ return conv.conv (num_msg, msg, resp, appdata_ptr); -+ -+ response = calloc((size_t)1, sizeof(struct pam_response)); -+ if (response == NULL) { -+ return PAM_CONV_ERR; -+ } -+ -+ current = strchr(msg[0]->msg, '(') != NULL; -+ first_enter ^= !current; -+ response->resp_retcode = 0; -+ response->resp = xgetpass (msg[0]->msg, first_enter & !current); -+ if (response->resp == NULL) { -+ saved_errno = errno; -+ free(response); -+ errno = saved_errno; -+ return PAM_CONV_ERR; -+ } -+ -+ *resp = response; -+ return PAM_SUCCESS; -+} -+ - - void do_pam_passwd (const char *user, bool silent, bool change_expired) - { - pam_handle_t *pamh = NULL; - int flags = 0, ret; -+ struct pam_conv conv_proper = conv; -+ -+ conv_proper.conv = xgetpass_conv; - - if (silent) - flags |= PAM_SILENT; - if (change_expired) - flags |= PAM_CHANGE_EXPIRED_AUTHTOK; - -- ret = pam_start ("passwd", user, &conv, &pamh); -+ ret = pam_start ("passwd", user, &conv_proper, &pamh); - if (ret != PAM_SUCCESS) { - fprintf (stderr, - _("passwd: pam_start() failed, error %d\n"), ret); -diff --git a/src/gpasswd.c b/src/gpasswd.c -index 8959a35..811a93d 100644 ---- a/src/gpasswd.c -+++ b/src/gpasswd.c -@@ -3,6 +3,7 @@ - * Copyright (c) 1996 - 2000, Marek MichaÅ‚kiewicz - * Copyright (c) 2001 - 2006, Tomasz KÅ‚oczko - * Copyright (c) 2007 - 2011, Nicolas François -+ * Copyright (c) 2015 , Mattias Andrée - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -46,6 +47,7 @@ - #include "groupio.h" - #include "nscd.h" - #include "prototypes.h" -+#include "xgetpass.h" - #ifdef SHADOWGRP - #include "sgroupio.h" - #endif -@@ -909,14 +911,14 @@ static void change_passwd (struct group *gr) - printf (_("Changing the password for group %s\n"), group); - - for (retries = 0; retries < RETRIES; retries++) { -- cp = getpass (_("New Password: ")); -+ cp = xgetpass (_("New Password: "), 1); - if (NULL == cp) { - exit (1); - } - - STRFCPY (pass, cp); - strzero (cp); -- cp = getpass (_("Re-enter new password: ")); -+ cp = xgetpass (_("Re-enter new password: "), 0); - if (NULL == cp) { - exit (1); - } -diff --git a/src/newgrp.c b/src/newgrp.c -index 49dd151..6ea3617 100644 ---- a/src/newgrp.c -+++ b/src/newgrp.c -@@ -3,6 +3,7 @@ - * Copyright (c) 1996 - 2000, Marek MichaÅ‚kiewicz - * Copyright (c) 2001 - 2006, Tomasz KÅ‚oczko - * Copyright (c) 2007 - 2008, Nicolas François -+ * Copyright (c) 2015 , Mattias Andrée - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -42,6 +43,7 @@ - #include "defines.h" - #include "getdef.h" - #include "prototypes.h" -+#include "xgetpass.h" - /*@-exitarg@*/ - #include "exitcodes.h" - -@@ -171,7 +173,7 @@ static void check_perms (const struct group *grp, - * get the password from her, and set the salt for - * the decryption from the group file. - */ -- cp = getpass (_("Password: ")); -+ cp = xgetpass (_("Password: "), 0); - if (NULL == cp) { - goto failure; - } -diff --git a/src/passwd.c b/src/passwd.c -index 3424f3b..c2cac67 100644 ---- a/src/passwd.c -+++ b/src/passwd.c -@@ -3,6 +3,7 @@ - * Copyright (c) 1996 - 2000, Marek MichaÅ‚kiewicz - * Copyright (c) 2001 - 2006, Tomasz KÅ‚oczko - * Copyright (c) 2007 - 2011, Nicolas François -+ * Copyright (c) 2015 , Mattias Andrée - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -55,6 +56,7 @@ - #include "pwauth.h" - #include "pwio.h" - #include "shadowio.h" -+#include "xgetpass.h" - - /* - * exit status values -@@ -237,7 +239,7 @@ static int new_password (const struct passwd *pw) - */ - - if (!amroot && ('\0' != crypt_passwd[0])) { -- clear = getpass (_("Old password: ")); -+ clear = xgetpass (_("Old password: "), 1); - if (NULL == clear) { - return -1; - } -@@ -312,7 +314,7 @@ static int new_password (const struct passwd *pw) - - warned = false; - for (i = getdef_num ("PASS_CHANGE_TRIES", 5); i > 0; i--) { -- cp = getpass (_("New password: ")); -+ cp = xgetpass (_("New password: "), 1); - if (NULL == cp) { - memzero (orig, sizeof orig); - return -1; -@@ -339,7 +341,7 @@ static int new_password (const struct passwd *pw) - warned = true; - continue; - } -- cp = getpass (_("Re-enter new password: ")); -+ cp = xgetpass (_("Re-enter new password: "), 0); - if (NULL == cp) { - memzero (orig, sizeof orig); - return -1; -diff --git a/src/sulogin.c b/src/sulogin.c -index ccbf2c5..1296856 100644 ---- a/src/sulogin.c -+++ b/src/sulogin.c -@@ -3,6 +3,7 @@ - * Copyright (c) 1996 - 2000, Marek MichaÅ‚kiewicz - * Copyright (c) 2002 - 2006, Tomasz KÅ‚oczko - * Copyright (c) 2007 - 2010, Nicolas François -+ * Copyright (c) 2015 , Mattias Andrée - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -43,6 +44,7 @@ - #include "getdef.h" - #include "prototypes.h" - #include "pwauth.h" -+#include "xgetpass.h" - /*@-exitarg@*/ - #include "exitcodes.h" - -@@ -202,10 +204,10 @@ static RETSIGTYPE catch_signals (unused int sig) - */ - - /* get a password for root */ -- cp = getpass (_( -+ cp = xgetpass (_( - "\n" - "Type control-d to proceed with normal startup,\n" --"(or give root password for system maintenance):")); -+"(or give root password for system maintenance): "), 0); - /* - * XXX - can't enter single user mode if root password is - * empty. I think this doesn't happen very often :-). But --- -2.6.3 - diff --git a/shadow-libpassphrase/0002-Make-libpassphrase-optional.patch b/shadow-libpassphrase/0002-Make-libpassphrase-optional.patch deleted file mode 100644 index 86c3e1f..0000000 --- a/shadow-libpassphrase/0002-Make-libpassphrase-optional.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 5b110e7aaac8d20559eba96f2a9d0dbae2b83dc9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@member.fsf.org> -Date: Mon, 7 Dec 2015 08:02:01 +0100 -Subject: [PATCH 2/2] Make libpassphrase optional -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Mattias Andrée <maandree@member.fsf.org> ---- - ChangeLog | 5 +++++ - configure.in | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - lib/xgetpass.c | 16 +++++++++------- - 3 files changed, 64 insertions(+), 7 deletions(-) - -diff --git a/ChangeLog b/ChangeLog -index bc43385..fd7389b 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+2015-12-07 Mattias Andrée <maandree@member.fsf.org> -+ -+ * lib/xgetpass.c: Make libpassphrase optional. -+ * configure.in: Likewise. -+ - 2015-12-05 Mattias Andrée <maandree@member.fsf.org> - - * lib/xgetpass.c: Add ability to use libpassphrase>=1449331105 instead of getpass. -diff --git a/configure.in b/configure.in -index a55f125..b752e18 100644 ---- a/configure.in -+++ b/configure.in -@@ -253,6 +253,9 @@ AC_ARG_WITH(audit, - AC_ARG_WITH(libpam, - [AC_HELP_STRING([--with-libpam], [use libpam for PAM support @<:@default=yes if found@:>@])], - [with_libpam=$withval], [with_libpam=maybe]) -+AC_ARG_WITH(libpassphrase, -+ [AC_HELP_STRING([--with-libpassphrase], [use libpassphrase support @<:@default=yes if found@:>@])], -+ [with_libpassphrase=$withval], [with_libpassphrase=maybe]) - AC_ARG_WITH(selinux, - [AC_HELP_STRING([--with-selinux], [use SELinux support @<:@default=yes if found@:>@])], - [with_selinux=$withval], [with_selinux=maybe]) -@@ -581,6 +584,52 @@ else - AC_MSG_RESULT(yes) - fi - -+AC_SUBST(LIBPASSPHRASE) -+if test "$with_libpassphrase" != "no"; then -+ dnl passphrase_read has always existed -+ AC_CHECK_LIB(passphrase, passphrase_read, -+ [passphrase_lib="yes"], [passphrase_lib="no"]) -+ if test "$passphrase_lib$with_libpassphrase" = "noyes" ; then -+ AC_MSG_ERROR(libpassphrase not found) -+ fi -+ -+ LIBPASSPHRASE="-lpassphrase" -+ passphrase_read2_function="no" -+ dnl passphrase_read2 was, along with other used functions, introduced in libpassphrase=1449331105 -+ -+ AC_CHECK_LIB(passphrase, passphrase_read2, -+ [passphrase_read2_function="yes"], []) -+ -+ if test "$passphrase_read2_function$with_libpassphrase" = "noyes" ; then -+ AC_MSG_ERROR(Only version 1449331105 and later of libpassphrase are supported) -+ fi -+ -+ passphrase_header_found=no -+ AC_CHECK_HEADERS(passphrase.h, -+ [ passphrase_header_found=yes ; break ], [], -+ [ #include <passphrase.h> ] ) -+ if test "$passphrase_header_found$with_libpassphrase" = "noyes" ; then -+ AC_MSG_ERROR(libpassphrase header not found) -+ fi -+ -+ if test "$passphrase_lib$passphrase_header_found$passphrase_read2_function" = "yesyesyes" ; then -+ with_libpassphrase="yes" -+ else -+ with_libpassphrase="no" -+ unset LIBPASSPHRASE -+ fi -+fi -+ -+if test "$with_libpassphrase" = "yes"; then -+ save_libs="$LIBS" -+ LIBS="$LIBS $LIBPASSPHRASE" -+ -+ AC_DEFINE(USE_LIBPASSPHRASE, 1, [Define to support libpassphrase]) -+ AM_CONDITIONAL(USE_LIBPASSPHRASE, [true]) -+else -+ AM_CONDITIONAL(USE_LIBPASSPHRASE, [false]) -+fi -+ - if test "$enable_acct_tools_setuid" != "no"; then - if test "$with_libpam" != "yes"; then - if test "$enable_acct_tools_setuid" = "yes"; then -@@ -670,6 +719,7 @@ echo - echo " auditing support: $with_audit" - echo " CrackLib support: $with_libcrack" - echo " PAM support: $with_libpam" -+echo " libpassphrase support: $with_libpassphrase" - if test "$with_libpam" = "yes"; then - echo " suid account management tools: $enable_acct_tools_setuid" - fi -diff --git a/lib/xgetpass.c b/lib/xgetpass.c -index a44ffc0..4efa33d 100644 ---- a/lib/xgetpass.c -+++ b/lib/xgetpass.c -@@ -32,13 +32,16 @@ - #ident "$Id$" - - #include <unistd.h> --#include <passphrase.h> --#include <fcntl.h> --#include <errno.h> --#include <stdio.h> -+#ifdef USE_LIBPASSPHRASE -+# include <passphrase.h> -+# include <fcntl.h> -+# include <errno.h> -+# include <stdio.h> -+#endif - - char *xgetpass (const char *prompt, int is_new) - { -+#ifdef USE_LIBPASSPHRASE - int fd, saved_errno; - char *pass; - -@@ -58,10 +61,9 @@ char *xgetpass (const char *prompt, int is_new) - passphrase_reenable_echo1 (fd); - errno = saved_errno; - return pass; -- -- /* -+#else - return getpass (prompt); - (void) is_new; -- */ -+#endif - } - --- -2.6.3 - diff --git a/shadow-libpassphrase/LICENSE b/shadow-libpassphrase/LICENSE deleted file mode 100644 index c5ab15a..0000000 --- a/shadow-libpassphrase/LICENSE +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 1990 - 1994, Julianne Frances Haugh - * Copyright (c) 1996 - 2000, Marek MichaÅ‚kiewicz - * Copyright (c) 2001 - 2006, Tomasz KÅ‚oczko - * Copyright (c) 2007 - 2009, Nicolas François - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the copyright holders or contributors may not be used to - * endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ diff --git a/shadow-libpassphrase/PKGBUILD b/shadow-libpassphrase/PKGBUILD deleted file mode 100644 index 5242709..0000000 --- a/shadow-libpassphrase/PKGBUILD +++ /dev/null @@ -1,163 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the shadow package: Dave Reisner <dreisner@archlinux.org> -# Maintainer of the shadow package: Aaron Griffin <aaron@archlinux.org> - -_pkgname=shadow -pkgname=shadow-libpassphrase -pkgver=4.2.1 -pkgrel=1 -pkgdesc="Patched version of shadow that uses libpassphrase and can indicate the strenght of your new password" -arch=('i686' 'x86_64') -url='https://github.com/maandree/shadow' -license=('BSD') -groups=('base') -depends=('bash' 'pam' 'acl' 'libpassphrase>=1449331105') -makedepends=('pam' 'acl' 'libpassphrase>=1449331105') -optdepends=('passcheck: for password strenght meter') -conflicts=(shadow) -provides=('shadow=4.2.1') -backup=(etc/login.defs - etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel} - etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod} - etc/pam.d/{chgpasswd,groupmems} - etc/default/useradd) -options=(strip) -install='shadow.install' -source=("http://pkg-shadow.alioth.debian.org/releases/$_pkgname-$pkgver.tar.xz" - '0001-Use-libpassphrase-when-entering-passwords.patch' - '0002-Make-libpassphrase-optional.patch' - LICENSE - chgpasswd - chpasswd - defaults.pam - login.defs - newusers - passwd - shadow.{timer,service} - useradd.defaults - xstrdup.patch - shadow-strncpy-usage.patch - lastlog.tmpfiles) -sha1sums=('0917cbadd4ce0c7c36670e5ecd37bbed92e6d82d' - 08ac0b8cbcfaa9dbab5caec52aeab702e7869a0c - 8d163eb290c2a41009abb9f0e1f84cacb9febb78 - '33a6cf1e44a1410e5c9726c89e5de68b78f5f922' - '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '0e56fed7fc93572c6bf0d8f3b099166558bb46f1' - 'bb3509087947d08bfb6e5d1b5c033856b9146ad9' - '12427b1ca92a9b85ca8202239f0d9f50198b818f' - '611be25d91c3f8f307c7fe2485d5f781e5dee75f' - 'a154a94b47a3d0c6c287253b98c0d10b861226d0' - 'e40fc20894e69a07fb0070b41f567d0c27133720' - '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19' - '6010fffeed1fc6673ad9875492e1193b1a847b53' - '21e12966a6befb25ec123b403cd9b5c492fe5b16' - 'f57ecde3f72b4738fad75c097d19cf46a412350f') - -prepare() { - cd "$_pkgname-$pkgver" - - patch -Np1 <"$srcdir/0001-Use-libpassphrase-when-entering-passwords.patch" - patch -Np1 <"$srcdir/0002-Make-libpassphrase-optional.patch" - - # need to offer these upstream - patch -Np1 <"$srcdir/xstrdup.patch" - patch -Np1 <"$srcdir/shadow-strncpy-usage.patch" - - # supress etc/pam.d/*, we provide our own - sed -i '/^SUBDIRS/s/pam\.d//' etc/Makefile.in -} - -build() { - cd "$_pkgname-$pkgver" - - libtoolize - aclocal - autoheader - autoconf - automake --add-missing - - ./configure \ - LIBS="-lcrypt" \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sbindir=/usr/bin \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --sysconfdir=/etc \ - --without-libpam \ - --with-group-name-max-length=32 \ - --without-selinux \ - --with-libpassphrase - - make -} - -package() { - cd "$_pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # license - install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE" - - # useradd defaults - install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd" - - # systemd timer - install -D -m644 "$srcdir/shadow.timer" "$pkgdir/usr/lib/systemd/system/shadow.timer" - install -D -m644 "$srcdir/shadow.service" $pkgdir/usr/lib/systemd/system/shadow.service - install -d -m755 "$pkgdir/usr/lib/systemd/system/multi-user.target.wants" - ln -s ../shadow.timer "$pkgdir/usr/lib/systemd/system/multi-user.target.wants/shadow.timer" - - # login.defs - install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs" - - # PAM config - custom - install -dm755 "$pkgdir/etc/pam.d" - install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers} - - # PAM config - from tarball - install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems" - - # we use the 'useradd' PAM file for other similar utilities - for file in chage groupadd groupdel groupmod shadow \ - useradd usermod userdel; do - install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file" - done - - # lastlog log file creation - install -Dm644 "$srcdir/lastlog.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/lastlog.conf" - - # Remove evil/broken tools - rm "$pkgdir"/usr/sbin/logoutd - - # Remove utilities provided by util-linux - rm \ - "$pkgdir"/usr/bin/{login,su,chsh,chfn,sg,nologin} \ - "$pkgdir"/usr/sbin/{vipw,vigr} - - # but we keep newgrp, as sg is really an alias to it - mv "$pkgdir"/usr/bin/{newgrp,sg} - - # ...and their many man pages - find "$pkgdir"/usr/share/man \ - '(' -name 'chsh.1' -o \ - -name 'chfn.1' -o \ - -name 'su.1' -o \ - -name 'logoutd.8' -o \ - -name 'login.1' -o \ - -name 'nologin.8' -o \ - -name 'vipw.8' -o \ - -name 'vigr.8' -o \ - -name 'newgrp.1' ')' \ - -delete - rmdir \ - "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \ - "$pkgdir"/usr/share/man/{fi,ko/man8} - - # move everything else to /usr/bin, because this isn't handled by ./configure - mv "$pkgdir"/usr/sbin/* "$pkgdir"/usr/bin - rmdir "$pkgdir/usr/sbin" -} diff --git a/shadow-libpassphrase/chgpasswd b/shadow-libpassphrase/chgpasswd deleted file mode 100644 index 8f49f5c..0000000 --- a/shadow-libpassphrase/chgpasswd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -account required pam_permit.so -password include system-auth diff --git a/shadow-libpassphrase/chpasswd b/shadow-libpassphrase/chpasswd deleted file mode 100644 index 5d44798..0000000 --- a/shadow-libpassphrase/chpasswd +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/shadow-libpassphrase/defaults.pam b/shadow-libpassphrase/defaults.pam deleted file mode 100644 index a7bf8a4..0000000 --- a/shadow-libpassphrase/defaults.pam +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_permit.so diff --git a/shadow-libpassphrase/lastlog.tmpfiles b/shadow-libpassphrase/lastlog.tmpfiles deleted file mode 100644 index 9c07b39..0000000 --- a/shadow-libpassphrase/lastlog.tmpfiles +++ /dev/null @@ -1 +0,0 @@ -f /var/log/lastlog 0644 root root diff --git a/shadow-libpassphrase/login.defs b/shadow-libpassphrase/login.defs deleted file mode 100644 index 5c88828..0000000 --- a/shadow-libpassphrase/login.defs +++ /dev/null @@ -1,208 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# QMAIL_DIR is for Qmail -# -#QMAIL_DIR Maildir -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/usr/bin -ENV_PATH PATH=/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 077 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 -# System accounts -SYS_UID_MIN 500 -SYS_UID_MAX 999 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 1000 -GID_MAX 60000 -# System accounts -SYS_GID_MIN 500 -SYS_GID_MAX 999 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 5 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - -# -# Controls display of the motd file. This is better handled by pam_motd.so -# so the declaration here is empty is suppress display by readers of this -# file. -# -MOTD_FILE - -# -# Hash shadow passwords with SHA512. -# -ENCRYPT_METHOD SHA512 diff --git a/shadow-libpassphrase/newusers b/shadow-libpassphrase/newusers deleted file mode 100644 index 5d44798..0000000 --- a/shadow-libpassphrase/newusers +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth required pam_unix.so -account required pam_unix.so -session required pam_unix.so -password required pam_unix.so sha512 shadow diff --git a/shadow-libpassphrase/passwd b/shadow-libpassphrase/passwd deleted file mode 100644 index ab56da4..0000000 --- a/shadow-libpassphrase/passwd +++ /dev/null @@ -1,4 +0,0 @@ -#%PAM-1.0 -#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3 -#password required pam_unix.so sha512 shadow use_authtok -password required pam_unix.so sha512 shadow nullok diff --git a/shadow-libpassphrase/shadow-strncpy-usage.patch b/shadow-libpassphrase/shadow-strncpy-usage.patch deleted file mode 100644 index 5aba8fa..0000000 --- a/shadow-libpassphrase/shadow-strncpy-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c ---- shadow-4.1.5/src/usermod.c.orig 2012-02-13 08:19:43.792146449 -0500 -+++ shadow-4.1.5/src/usermod.c 2012-02-13 08:21:19.375114500 -0500 -@@ -182,7 +182,7 @@ - struct tm *tp; - - if (date < 0) { -- strncpy (buf, "never", maxsize); -+ strncpy (buf, "never", maxsize - 1); - } else { - time_t t = (time_t) date; - tp = gmtime (&t); -diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c ---- shadow-4.1.5/src/login.c.orig 2012-02-13 08:19:50.951994454 -0500 -+++ shadow-4.1.5/src/login.c 2012-02-13 08:21:04.490430937 -0500 -@@ -752,7 +752,8 @@ - _("%s login: "), hostn); - } else { - strncpy (loginprompt, _("login: "), -- sizeof (loginprompt)); -+ sizeof (loginprompt) - 1); -+ loginprompt[sizeof (loginprompt) - 1] = '\0'; - } - - retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt); diff --git a/shadow-libpassphrase/shadow.install b/shadow-libpassphrase/shadow.install deleted file mode 100644 index 14384c3..0000000 --- a/shadow-libpassphrase/shadow.install +++ /dev/null @@ -1,9 +0,0 @@ -post_upgrade() { - grpck -r >/dev/null 2>&1 - if [ $? -eq 2 ]; then - printf '%s\n' \ - "==> Warning: /etc/group or /etc/gshadow are inconsistent." \ - " Run 'grpck' to correct this." - fi - return 0 -} diff --git a/shadow-libpassphrase/shadow.service b/shadow-libpassphrase/shadow.service deleted file mode 100644 index 5c1c845..0000000 --- a/shadow-libpassphrase/shadow.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Verify integrity of password and group files - -[Service] -Type=oneshot -ExecStart=/usr/bin/pwck -r -ExecStart=/usr/bin/grpck -r -Nice=19 -IOSchedulingClass=best-effort -IOSchedulingPriority=7 diff --git a/shadow-libpassphrase/shadow.timer b/shadow-libpassphrase/shadow.timer deleted file mode 100644 index 9cc6baa..0000000 --- a/shadow-libpassphrase/shadow.timer +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Daily verification of password and group files - -[Timer] -OnCalendar=daily -AccuracySec=12h -Persistent=true diff --git a/shadow-libpassphrase/upload b/shadow-libpassphrase/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/shadow-libpassphrase/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/shadow-libpassphrase/useradd.defaults b/shadow-libpassphrase/useradd.defaults deleted file mode 100644 index b800b17..0000000 --- a/shadow-libpassphrase/useradd.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# useradd defaults file for ArchLinux -# original changes by TomK -GROUP=100 -HOME=/home -INACTIVE=-1 -EXPIRE= -SHELL=/bin/bash -SKEL=/etc/skel -CREATE_MAIL_SPOOL=no diff --git a/shadow-libpassphrase/xstrdup.patch b/shadow-libpassphrase/xstrdup.patch deleted file mode 100644 index bce4342..0000000 --- a/shadow-libpassphrase/xstrdup.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500 -+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500 -@@ -61,5 +61,6 @@ - - char *xstrdup (const char *str) - { -+ if(str == NULL) return NULL; - return strcpy (xmalloc (strlen (str) + 1), str); - } diff --git a/simple-icon-theme/PKGBUILD b/simple-icon-theme/PKGBUILD index 460a482..c28b0e1 100644 --- a/simple-icon-theme/PKGBUILD +++ b/simple-icon-theme/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=simple-icon-theme pkgver=12 diff --git a/slack/PKGBUILD b/slack/PKGBUILD index 75aaf72..d63115c 100644 --- a/slack/PKGBUILD +++ b/slack/PKGBUILD @@ -1,14 +1,15 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + pkgname=slack -pkgver=3.0.2 +pkgver=3.0.3 pkgrel=1 pkgdesc="Control your timer slack" arch=(i686 x86_64) url="https://codeberg.org/maandree/slack" license=('custom:ISC') -depends=('linux>=2.6.28') +depends=() source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(1012498dd60dc6d43a4ceb21e9a32430f6a7d6545b702c04db2ce6bfd81daedd) +sha256sums=(8b62d03632250a584fbe5e21ed7cc0722547c4f74173f254bd6378a60cc7a211) build() { cd "$srcdir/$pkgname" diff --git a/sleep-until/PKGBUILD b/sleep-until/PKGBUILD index 10969dd..fcc564d 100644 --- a/sleep-until/PKGBUILD +++ b/sleep-until/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=sleep-until pkgver=2 diff --git a/sleeping-getty/PKGBUILD b/sleeping-getty/PKGBUILD index 2d73f33..3cf0fe6 100644 --- a/sleeping-getty/PKGBUILD +++ b/sleeping-getty/PKGBUILD @@ -1,7 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=sleeping-getty -pkgver=1.2 +pkgver=1.2.1 pkgrel=1 pkgdesc="Do not start a fullblown getty before it is necessary" arch=(i686 x86_64) @@ -10,7 +10,7 @@ license=('custom:ISC') depends=() makedepends=(linux-api-headers) source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=(0622e1f5de6b22be2463bef3e3e11cc360f79ccec77ff3034dfd1a3e2a7e78f2) +sha256sums=(e30f2c9b1c4681cc53cfda79866282fc8d5735406ec5df7f2cc00fe4f1ddb919) build() { cd "$srcdir/$pkgname" diff --git a/solar-python/PKGBUILD b/solar-python/PKGBUILD index e128634..1b89797 100644 --- a/solar-python/PKGBUILD +++ b/solar-python/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=solar-python pkgver=2.5.2 diff --git a/splashtool/PKGBUILD b/splashtool/PKGBUILD new file mode 100644 index 0000000..8b1514f --- /dev/null +++ b/splashtool/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + +pkgname=splashtool +pkgver=1428445153 +pkgrel=1 +pkgdesc="A simple tool for creating SYSLINUX splashes without fuss" +url="https://github.com/GNU-Pony/splashtool" +arch=(any) +license=(AGPL3) +depends=(gzip nafe kbd imagemagick bash awk grep sed coreutils glibc) +makedepends=(make coreutils sed glibc gcc texinfo) +install=splashtool.install +source=("${url}/archive/${pkgver}.tar.gz") +sha256sums=(a25957c5f20166f7590f9795e0736faf955bf5f583b3d7b299031259c68a36a9) + +_prefix=/usr + + +build() { + cd "${srcdir}/splashtool-${pkgver}" + make +} + +package() { + cd "${srcdir}/splashtool-${pkgver}" + make PREFIX="${_prefix}" PKGNAME="${pkgname}" DESTDIR="${pkgdir}" install + _dir="${pkgdir}${_prefix}/share/licenses/${pkgname}" + ln -sf -- "/usr/share/licenses/common/AGPL3" "${_dir}/LICENSE" +} + diff --git a/splashtool/splashtool.install b/splashtool/splashtool.install new file mode 100644 index 0000000..8bb5344 --- /dev/null +++ b/splashtool/splashtool.install @@ -0,0 +1,20 @@ +_file="splashtool" + +infodir="usr/share/info" +file="${_file}.info.gz" + + +post_install() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + +post_upgrade() { + post_install "$1" +} + +pre_remove() { + [[ -x "usr/bin/install-info" ]] || return 0 + install-info --delete -- "${infodir}/${file}" "${infodir}/dir" 2> /dev/null +} + diff --git a/lib32-libjson/upload b/splashtool/upload index 1e7a8be..1e7a8be 120000 --- a/lib32-libjson/upload +++ b/splashtool/upload diff --git a/spot-on/PKGBUILD b/spot-on/PKGBUILD deleted file mode 100644 index 482b09c..0000000 --- a/spot-on/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=spot-on -pkgver=2017.01.20 -pkgrel=1 -pkgdesc='An exploratory research project investigating a variety of communications protocols' -url='http://spot-on.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('qt5-base' 'geoip>=1.5.1' 'libgcrypt>=1.5' 'openssl>=0.9.8' 'lksctp-tools' 'qt5-multimedia' "libspoton=${pkgver}" 'libntru' 'qt5-declarative') -makedepends=('qt5-base' 'geoip>=1.5.1' 'libgcrypt>=1.5' 'openssl>=0.9.8' 'lksctp-tools' 'qt5-multimedia' 'qt5-tools' 'make' 'gcc' 'qt5-declarative') -source=("Spot-On-${pkgver}.zip::http://downloads.sourceforge.net/project/spot-on/Version%20${pkgver}/Spot-On-Src.d.zip?r=") -sha256sums=('45ff31d37092f653c0b94b4dc47b16f64c4b1327841bacfd8a4f624b63a6e04c') - - -build() { - cd "$srcdir/spot-on.d/branches/trunk" - qmake-qt5 -o Makefile spot-on.qt5.pro - make -} - -package () { - cd "$srcdir/spot-on.d/branches/trunk" - install -dm755 -- "$pkgdir/usr/lib/spot-on" - install -m755 -- Spot-On "$pkgdir/usr/lib/spot-on/Spot-On" - install -m755 -- Spot-On-Kernel "$pkgdir/usr/lib/spot-on/Spot-On-Kernel" - install -dm755 -- "$pkgdir/usr/bin" - ln -s ../lib/spot-on/Spot-On -- "$pkgdir/usr/bin/spot-on" -} - diff --git a/spot-on/upload b/spot-on/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/spot-on/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/spot-on/watch b/spot-on/watch deleted file mode 100755 index 20cdc6f..0000000 --- a/spot-on/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'index.html' ] && rm 'index.html' -wget http://spot-on.sourceforge.net/ >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'has been released' < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'dooble' - fi - rm index.html -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'dooble (unfetchable)' -fi - diff --git a/sshcd/PKGBUILD b/sshcd/PKGBUILD index 3e789f1..058a2d3 100644 --- a/sshcd/PKGBUILD +++ b/sshcd/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=sshcd pkgver=1.0.3 diff --git a/sshexec/PKGBUILD b/sshexec/PKGBUILD index bea64de..be3593f 100644 --- a/sshexec/PKGBUILD +++ b/sshexec/PKGBUILD @@ -1,6 +1,6 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=sshexec -pkgver=1.1 +pkgver=1.1.1 pkgrel=1 pkgdesc="SSH wrapper that makes it easy to run commands directly in the SSH command" arch=('x86_64') @@ -8,7 +8,7 @@ url="https://codeberg.org/maandree/sshexec" license=('custom:ISC') depends=(openssh) source=(sshexec-$pkgver.tar.gz::${url}/archive/${pkgver}.tar.gz) -sha256sums=(5d925d47ceaaaef41b497b316eb5577bab9803a249bc6a70b010d7368591a916) +sha256sums=(34719e1d13a3d7e1065283ba42be7e31befb4f074c1749c2a7e29c3e575147ae) build() { cd "${srcdir}/sshexec" diff --git a/sysvinit/PKGBUILD b/sysvinit/PKGBUILD deleted file mode 100644 index fecc2e6..0000000 --- a/sysvinit/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -pkgname=sysvinit -pkgver=2.90 -pkgrel=1 -pkgdesc='Linux System V Init' -url='http://savannah.nongnu.org/projects/sysvinit' -arch=('i686' 'x86_64' 'armv6h') -license=('GPL') -depends=('glibc' 'procps-ng>=3.3.9') -conflicts=('systemd-sysvcompat') - -source=("http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-${pkgver}.tar.xz") -sha256sums=('114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e') - - -build() -{ - cd "$srcdir/$pkgname-${pkgver}" - - # Patch for Arch's Linux filesystem hierarchy - if [ "$(grep 'execv("/sbin/mount", args);' < src/killall5.c | wc -l)" = 1 ]; then - sed -i 's:execv("/bin/mount", args);::' src/killall5.c - fi - sed -i 's|/bin:/sbin:/usr/bin:/usr/sbin|/usr/bin|' src/init.h src/shutdown.c - sed -i 's|/sbin:/usr/sbin:/bin:/usr/bin|/usr/bin|' src/init.h src/shutdown.c - sed -i 's|/bin:/usr/bin:/sbin:/usr/sbin|/usr/bin|' src/init.h src/shutdown.c - sed -i 's:/sbin/:/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} - sed -i 's:/bin/:/usr/bin/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} - sed -i 's:/usr/usr/:/usr/:g' contrib/notify-pam-dead.patch man/*.{1,5,8} src/*.{c,h} - - make DISTRO=archlinux -} - -package() -{ - cd "$srcdir/$pkgname-${pkgver}" - mkdir -p "$pkgdir/__temp__" - make DISTRO=archlinux ROOT="$pkgdir/__temp__" install - cd "$pkgdir/__temp__" - rm -r bin usr/bin usr/share/man/man*/{mesg,last,pidof}.* usr/share/man/man1 - find . | while read file; do - if [ -d "$file" ]; then - mkdir -p ".$file" - else - cp "$file" ".$file" - fi - done - cd .. - rm -r "__temp__" - mv "$pkgdir/sbin" "$pkgdir/usr/bin" -} - diff --git a/sysvinit/upload b/sysvinit/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/sysvinit/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/texlive-europecv/PKGBUILD b/texlive-europecv/PKGBUILD deleted file mode 100644 index c30f68b..0000000 --- a/texlive-europecv/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=texlive-europecv -pkgver=20140627 -pkgrel=1 -pkgdesc='Unofficial class for European curricula vitæ' -arch=('any') -url='http://www.ctan.org/tex-archive/macros/latex/contrib/europecv/' -license=('GPL') -depends=('texlive-latexextra') -source=("europecv-${pkgver}.zip"::"http://mirror.ctan.org/macros/latex/contrib/europecv.zip") -sha256sums=('8774724fa20744777d2ce7275024f5969b0cdd09684033949b833410c45112d5') - -package() { - install -d -- "$pkgdir"/usr/share/texmf/tex/latex - cp -r europecv -- "$pkgdir"/usr/share/texmf/tex/latex -} diff --git a/texlive-europecv/upload b/texlive-europecv/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/texlive-europecv/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/texlive-flashcards/PKGBUILD b/texlive-flashcards/PKGBUILD deleted file mode 100644 index ef49693..0000000 --- a/texlive-flashcards/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: tze <tze@datalove.me> - -pkgname=texlive-flashcards -pkgver=1.0.1 -pkgrel=2 -license=('GPL') -depends=('texlive-core') -pkgdesc="A class for typesetting flashcards." -url="https://ctan.org/pkg/flashcards" -arch=('any') -install=texlive-flashcards.install -source=(https://mirror.ctan.org/macros/latex/contrib/flashcards.zip) -sha256sums=('3a344b39e4d3f36152772458c85b32f294e18b13617ac79b18b49406ce73fc52') - -build () -{ - cd "${srcdir}/flashcards" - latex flashcards.ins -} - -package () -{ - cd "${srcdir}/flashcards" - mkdir -p -- "${pkgdir}/usr/share/texmf/tex/latex/flashcards" - - cp -- flashcards.cls "${pkgdir}/usr/share/texmf/tex/latex/flashcards" - cp -- *.cfg "${pkgdir}/usr/share/texmf/tex/latex/flashcards" - - install -D -- "${srcdir}/flashcards/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - diff --git a/texlive-flashcards/texlive-flashcards.install b/texlive-flashcards/texlive-flashcards.install deleted file mode 100644 index 996ec23..0000000 --- a/texlive-flashcards/texlive-flashcards.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - post_remove - echo "The file was installed in:" - kpsewhich flashcards.cls -} - -post_upgrade() { - post_install -} - -post_remove() { - echo "Upgrading package database..." - mktexlsr -} diff --git a/texlive-flashcards/upload b/texlive-flashcards/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/texlive-flashcards/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/texlive-flashcards/watch b/texlive-flashcards/watch deleted file mode 100755 index cd655ff..0000000 --- a/texlive-flashcards/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f flashcards ] && rm flashcards - -wget 'http://ctan.org/pkg/flashcards' -O flashcards >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'Ver­sion' < flashcards | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'texlive-flashcards' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'texlive-flashcards (unfetchable)' -fi - diff --git a/texman/PKGBUILD b/texman/PKGBUILD index 41393e9..3d71c60 100644 --- a/texman/PKGBUILD +++ b/texman/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=texman pkgver=1.1 diff --git a/timeprefix/PKGBUILD b/timeprefix/PKGBUILD index fcc9b40..7d13c11 100644 --- a/timeprefix/PKGBUILD +++ b/timeprefix/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=timeprefix pkgver=3.1 diff --git a/unstickpixels/PKGBUILD b/unstickpixels/PKGBUILD index 4aeae7d..9cadeb0 100644 --- a/unstickpixels/PKGBUILD +++ b/unstickpixels/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=unstickpixels pkgver=3.0.1 diff --git a/untex/PKGBUILD b/untex/PKGBUILD deleted file mode 100644 index 376a92a..0000000 --- a/untex/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: froggie <sullivanva@gmail.com> - -pkgname=untex -pkgver=1.3 -pkgrel=3 -pkgdesc="A tool for removing LaTeX commands from input" -arch=('i686' 'x86_64') -url="ftp://ftp.thp.uni-duisburg.de/pub/source/" -license=('GPL') -depends=('glibc') -source=(ftp://ftp.thp.uni-duisburg.de/pub/source/$pkgname-$pkgver.tar.gz) -md5sums=('909da862cdccea0f6987467be72f103a') - - -build() { - cd "$srcdir" - make -} - -package() { - cd "$srcdir" - install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname - install -Dm644 $pkgname.man "$pkgdir"/usr/share/man/man1/$pkgname.1 -} - diff --git a/untex/upload b/untex/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/untex/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/untex/watch b/untex/watch deleted file mode 100755 index 99e0009..0000000 --- a/untex/watch +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -[ -f index.html ] && rm index.html - -wget 'ftp://ftp.thp.uni-duisburg.de/pub/source/' -O index.html >/dev/null 2>/dev/null - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep -o '>untex-.*<' < index.html | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'untex' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'untex (unfetchable)' -fi - @@ -4,7 +4,18 @@ set -e cd "$(dirname "${0}")" -if test ! "${SKIP_BUILD}" = y; then +message= +skip_build=n + +for arg; do + if test "${arg}" = skip-build; then + skip_build=y + elif test "${arg::8}" = message=; then + message="${arg:8}" + fi +done + +if test ! "${skip_build}" = y; then makepkg --install --clean fi @@ -15,37 +26,37 @@ pkgrel="$(pkgrel=1 && . PKGBUILD && echo "${pkgrel}")" epoch="$(epoch=0 && . PKGBUILD && echo "${epoch}")" install="$(install="" && . PKGBUILD && echo "${install}")" -if [ ! -d .aur ]; then - newpkg=1 - git clone "ssh://aur@aur.archlinux.org/${pkgname}.git" .aur +if test ! -d .aur; then + newpkg=1 + git clone "ssh://aur@aur.archlinux.org/${pkgname}.git" .aur fi version="${pkgver}" -if [ ! "${epoch}" = 0 ]; then - version="${epoch}:${version}" +if test ! "${epoch}" = 0; then + version="${epoch}:${version}" fi -if [ ! "${pkgrel}" = 1 ]; then - version="${version}-${pkgrel}" +if test ! "${pkgrel}" = 1; then + version="${version}-${pkgrel}" fi cp PKGBUILD .aur -if [ ! "${install}" = "" ]; then - cp "${install}" .aur - cd .aur - git add "${install}" - cd .. +if test ! "${install}" = ""; then + cp "${install}" .aur + cd .aur + git add "${install}" + cd .. fi ( - . PKGBUILD - cd .aur - for file in "${source[@]}"; do - if [ -f ../"${file}" ]; then - cp ../"${file}" . - git add "${file}" - fi - done - cd .. + . PKGBUILD + cd .aur + for file in "${source[@]}"; do + if test -f ../"${file}"; then + cp ../"${file}" . + git add "${file}" + fi + done + cd .. ) cd .aur @@ -53,14 +64,25 @@ cd .aur mksrcinfo git add PKGBUILD .SRCINFO -if [ ${newpkg} = 1 ]; then - git commit -m "Initial import, version ${version}" - git push origin master -elif [ ! "${pkgrel}" = 1 ]; then - git commit -m "Update package release to ${version}" - git push +if test ${newpkg} = 1; then + if test -z "${message}"; then + git commit -m "Initial import, version ${version}" + else + git commit -m "${message}" + fi + git push origin master +elif test ! "${pkgrel}" = 1; then + if test -z "${message}"; then + git commit -m "Update package release to ${version}" + else + git commit -m "${message}" + fi + git push else - git commit -m "Update to ${version}" - git push + if test -z "${message}"; then + git commit -m "Update to ${version}" + else + git commit -m "${message}" + fi + git push fi - diff --git a/use/PKGBUILD b/use/PKGBUILD deleted file mode 100644 index a8958d0..0000000 --- a/use/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> - -pkgname=use -pkgver=1.12.1 -pkgrel=1 -pkgdesc='A utility to help casual user install multiple versions of a software package' -url='http://use.sourceforge.net/' -arch=('i686' 'x86_64') -license=('custom:3-clause BSD') -depends=('glibc') -makedepends=('gcc' 'glibc' 'make' 'coreutils' 'perl' 'sed') -source=("use-${pkgver}.tar.gz::https://downloads.sourceforge.net/project/use/Version%20${pkgver}/use.d.tar.gz") -sha256sums=('9efd990bd3e2cf40e74e56ecb7f849e5050e69aa24317633adbe2e1ce360efbe') - - -build() { - cd "$srcdir/use.d" - ./configure.pl <<EOF -/etc -/usr/bin -/usr/share/man/man1 -EOF - sed -i 's:\${INSTALL_:-- "\${DESTDIR}"&:g' Makefile.mk - make - sed -i 's:/usr/local/:/usr/:g' use.1 use.*sh - sed -i 's:/usr/share/use.table:/etc/use.table:g' use.1 -} - -package () { - cd "$srcdir/use.d" - mkdir -p -- "$pkgdir/etc" - mkdir -p -- "$pkgdir/usr/bin" - mkdir -p -- "$pkgdir/usr/share/man/man1" - make install DESTDIR="$pkgdir" -} - diff --git a/use/upload b/use/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/use/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/vtchs/PKGBUILD b/vtchs/PKGBUILD index 56b642c..6c11fa8 100644 --- a/vtchs/PKGBUILD +++ b/vtchs/PKGBUILD @@ -1,6 +1,7 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> + pkgname=vtchs -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="Listen for VT switches" arch=(i686 x86_64) @@ -9,7 +10,7 @@ license=('custom:ISC') depends=() makedepends=() source=($pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz) -sha256sums=(264d9fe27b9840b2f8029c5c6c39e3454024041bc0a6bdc7d5afb9ea1395b997) +sha256sums=(cbc2f73fbf991e8f467177999d92f954d7839839ee9c1c79e537f3919f1b83b7) build() { cd "$srcdir/$pkgname" diff --git a/xcman/PKGBUILD b/xcman/PKGBUILD index 8193b34..4159fc0 100644 --- a/xcman/PKGBUILD +++ b/xcman/PKGBUILD @@ -1,3 +1,4 @@ +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=xcman pkgver=1.1.1 pkgrel=1 diff --git a/xorg-server-hwcursor-gamma/.gitignore b/xorg-server-hwcursor-gamma/.gitignore deleted file mode 100644 index 903de3e..0000000 --- a/xorg-server-hwcursor-gamma/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -!/CVE-2013-6424.diff -!/xvfb-run.1 -!/revert-udev-changes.diff diff --git a/xorg-server-hwcursor-gamma/0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch b/xorg-server-hwcursor-gamma/0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch deleted file mode 100644 index 5eeb826..0000000 --- a/xorg-server-hwcursor-gamma/0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch +++ /dev/null @@ -1,55 +0,0 @@ -From e63b5656a6509ece2d5ffb1fb962911519163988 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Tue, 15 Apr 2014 02:45:25 +0200 -Subject: [PATCH 1/3] When an cursor is set, it is adjusted to use the gamma - ramps of the CRTC:s that it is loaded on. - -This could be improved to be done in -`crtc->funcs->load_cursor_argb` with more -accurate adjustments. But I was not able to -find where `crtc->funcs->load_cursor_argb` -is implement. - -Additionally, `xf86_reload_cursors` should be -called when the gamma settings changes. This -way the cursor's colours are adjusted to use -the gamma settings directly when the gamma -is modified rather than the next time its -image changes. ---- - hw/xfree86/modes/xf86Cursors.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c -index 2b0db34..3cb499f 100644 ---- a/hw/xfree86/modes/xf86Cursors.c -+++ b/hw/xfree86/modes/xf86Cursors.c -@@ -242,6 +242,12 @@ xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src) - } - else - bits = 0; -+ if (crtc->gamma_red && crtc->gamma_size == 256) { -+ bits = (bits & 0xFF000000) | -+ ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -+ (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -+ (crtc->gamma_blue[bits & 255] >> 8); -+ } - cursor_image[y * cursor_info->MaxWidth + x] = bits; - } - crtc->funcs->load_cursor_argb(crtc, cursor_image); -@@ -541,6 +547,12 @@ xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor) - bits = cursor_source[yin * source_width + xin]; - else - bits = 0; -+ if (crtc->gamma_red && crtc->gamma_size == 256) { -+ bits = (bits & 0xFF000000) | -+ ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -+ (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -+ (crtc->gamma_blue[bits & 255] >> 8); -+ } - cursor_image[y * image_width + x] = bits; - } - --- -1.9.2 - diff --git a/xorg-server-hwcursor-gamma/0002-Fix-for-full-and-semi-transparency-under-negative-im.patch b/xorg-server-hwcursor-gamma/0002-Fix-for-full-and-semi-transparency-under-negative-im.patch deleted file mode 100644 index 3a41a81..0000000 --- a/xorg-server-hwcursor-gamma/0002-Fix-for-full-and-semi-transparency-under-negative-im.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 7b34ab1dbeb4a1e29d7475af65f42e1cb6f60de8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Sat, 19 Apr 2014 19:36:05 +0200 -Subject: [PATCH 2/3] Fix for full and semi-transparency under negative image. - ---- - hw/xfree86/modes/xf86Cursors.c | 49 +++++++++++++++++++++++++++++++----------- - 1 file changed, 37 insertions(+), 12 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c -index 3cb499f..5afd740 100644 ---- a/hw/xfree86/modes/xf86Cursors.c -+++ b/hw/xfree86/modes/xf86Cursors.c -@@ -209,6 +209,41 @@ set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask) - } - - /* -+ * Remap a cursor pixel according to the gamma ramps -+ */ -+static CARD32 -+cursor_gamma_correct(xf86CrtcPtr crtc, CARD32 bits) -+{ -+ float alpha; -+ CARD32 old_red, new_red; -+ CARD32 old_green, new_green; -+ CARD32 old_blue, new_blue; -+ -+ if (!(crtc->gamma_red && crtc->gamma_size == 256)) -+ return bits; -+ -+ alpha = (float)((bits >> 24) & 255) / 255.f; -+ -+ old_red = (bits >> 16) & 255; -+ old_green = (bits >> 8) & 255; -+ old_blue = (bits >> 0) & 255; -+ -+ new_red = (crtc->gamma_red [old_red ]) >> 8; -+ new_green = (crtc->gamma_green[old_green]) >> 8; -+ new_blue = (crtc->gamma_blue [old_blue ]) >> 8; -+ -+ new_red = new_red * alpha + old_red * (1 - alpha); -+ new_green = new_green * alpha + old_green * (1 - alpha); -+ new_blue = new_blue * alpha + old_blue * (1 - alpha); -+ -+ new_red = new_red < 0 ? 0 : new_red > 255 ? 255 : new_red; -+ new_green = new_green < 0 ? 0 : new_green > 255 ? 255 : new_green; -+ new_blue = new_blue < 0 ? 0 : new_blue > 255 ? 255 : new_blue; -+ -+ return (bits & 0xFF000000) | (new_red << 16) | (new_green << 8) | (new_blue << 0); -+} -+ -+/* - * Load a two color cursor into a driver that supports only ARGB cursors - */ - static void -@@ -242,12 +277,7 @@ xf86_crtc_convert_cursor_to_argb(xf86CrtcPtr crtc, unsigned char *src) - } - else - bits = 0; -- if (crtc->gamma_red && crtc->gamma_size == 256) { -- bits = (bits & 0xFF000000) | -- ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -- (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -- (crtc->gamma_blue[bits & 255] >> 8); -- } -+ bits = cursor_gamma_correct(crtc, bits); - cursor_image[y * cursor_info->MaxWidth + x] = bits; - } - crtc->funcs->load_cursor_argb(crtc, cursor_image); -@@ -547,12 +577,7 @@ xf86_crtc_load_cursor_argb(xf86CrtcPtr crtc, CursorPtr cursor) - bits = cursor_source[yin * source_width + xin]; - else - bits = 0; -- if (crtc->gamma_red && crtc->gamma_size == 256) { -- bits = (bits & 0xFF000000) | -- ((crtc->gamma_red[(bits >> 16) & 255] >> 8) << 16) | -- (crtc->gamma_green[(bits >> 8) & 255] & 0xFF00) | -- (crtc->gamma_blue[bits & 255] >> 8); -- } -+ bits = cursor_gamma_correct(crtc, bits); - cursor_image[y * image_width + x] = bits; - } - --- -1.9.2 - diff --git a/xorg-server-hwcursor-gamma/0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch b/xorg-server-hwcursor-gamma/0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch deleted file mode 100644 index 35875ec..0000000 --- a/xorg-server-hwcursor-gamma/0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch +++ /dev/null @@ -1,54 +0,0 @@ -From b167a4d01048fc624fdf95faffa74099e5bd8efb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mattias=20Andr=C3=A9e?= <maandree@operamail.com> -Date: Mon, 21 Apr 2014 01:05:35 +0200 -Subject: [PATCH 3/3] Use Harms's suggest: do not use inline if. And fix - signness issue: CARD32 is unsigned, which results in that if a value because - less than zero it would be incorrectly corrected to be 255 rather than 0. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Mattias Andrée <maandree@operamail.com> ---- - hw/xfree86/modes/xf86Cursors.c | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Cursors.c b/hw/xfree86/modes/xf86Cursors.c -index 5afd740..b18b7e6 100644 ---- a/hw/xfree86/modes/xf86Cursors.c -+++ b/hw/xfree86/modes/xf86Cursors.c -@@ -214,10 +214,10 @@ set_bit(CARD8 *image, xf86CursorInfoPtr cursor_info, int x, int y, Bool mask) - static CARD32 - cursor_gamma_correct(xf86CrtcPtr crtc, CARD32 bits) - { -- float alpha; -- CARD32 old_red, new_red; -- CARD32 old_green, new_green; -- CARD32 old_blue, new_blue; -+ float alpha; -+ int32_t old_red, new_red; -+ int32_t old_green, new_green; -+ int32_t old_blue, new_blue; - - if (!(crtc->gamma_red && crtc->gamma_size == 256)) - return bits; -@@ -236,9 +236,13 @@ cursor_gamma_correct(xf86CrtcPtr crtc, CARD32 bits) - new_green = new_green * alpha + old_green * (1 - alpha); - new_blue = new_blue * alpha + old_blue * (1 - alpha); - -- new_red = new_red < 0 ? 0 : new_red > 255 ? 255 : new_red; -- new_green = new_green < 0 ? 0 : new_green > 255 ? 255 : new_green; -- new_blue = new_blue < 0 ? 0 : new_blue > 255 ? 255 : new_blue; -+ /* Make sure the floating point operations did not yeild invalid results. */ -+ if (new_red < 0x00) new_red = 0x00; -+ if (new_red > 0xFF) new_red = 0xFF; -+ if (new_green < 0x00) new_green = 0x00; -+ if (new_green > 0xFF) new_green = 0xFF; -+ if (new_blue < 0x00) new_blue = 0x00; -+ if (new_blue > 0xFF) new_blue = 0xFF; - - return (bits & 0xFF000000) | (new_red << 16) | (new_green << 8) | (new_blue << 0); - } --- -1.9.2 - diff --git a/xorg-server-hwcursor-gamma/PKGBUILD b/xorg-server-hwcursor-gamma/PKGBUILD deleted file mode 100644 index 84bd9f9..0000000 --- a/xorg-server-hwcursor-gamma/PKGBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the xorg-server package: AndyRTR <andyrtr@archlinux.org> -# Maintainer of the xorg-server package: Jan de Groot <jgc@archlinux.org> - -_pkgname=xorg-server -pkgname=xorg-server-hwcursor-gamma -epoch=2 -pkgver=1.19.6 -pkgrel=2 # 1.19.6+13+gd0d1a694f-1 in the xorg-server package -pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" -depends=(libepoxy libxdmcp libxfont2 libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-libinput) -provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=23' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' 'x-server') -conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') -replaces=('glamor-egl' 'xf86-video-modesetting') -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' - 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' - 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont2' 'renderproto' 'libpciaccess' 'libxv' - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' - 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' - 'libxshmfence' 'libunwind') -source=(https://xorg.freedesktop.org/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 - nvidia-add-modulepath-support.patch - xserver-autobind-hotplug.patch - xvfb-run - xvfb-run.1 - 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197' - '914a8d775b708f836ae3f0eeca553da3872727a2e4262190f4d5c01241cb14e8' - 'fcaf536e4fc307958923b58f2baf3d3102ad694efc28506f6f95a9e64483fa57' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' - 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' - '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') - -prepare() { - cd "${_pkgname}-${pkgver}" - - #msg2 'Apply hardware cursors gamma adjustments patches' - #patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - #patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - #patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch - - # merged upstream in trunk - msg2 'apply nvidia patch' - patch -Np1 -i ../nvidia-add-modulepath-support.patch - - # patch from Fedora, not yet merged - msg2 'apply fedora patch' - patch -Np1 -i ../xserver-autobind-hotplug.patch - - autoreconf -vfi -} - -build() { - # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf - # With them, module fail to load with undefined symbol. - # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845 - export CFLAGS="${CFLAGS/-fno-plt}" - export CXXFLAGS="${CXXFLAGS/-fno-plt}" - export LDFLAGS="${LDFLAGS/,-z,now}" - - cd "${_pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-libunwind \ - --enable-xorg \ - --enable-xephyr \ - --enable-glamor \ - --disable-xwayland \ - --enable-kdrive \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-config-udev \ - --disable-systemd-logind \ - --disable-suid-wrapper \ - --enable-install-setuid \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --libexecdir=/usr/lib/xorg-server \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts \ - --with-sha1=libgcrypt \ - --without-systemd-daemon - -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ - - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ - -i hw/Makefile -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # distro specific files must be installed in /usr/share/X11/xorg.conf.d - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - diff --git a/xorg-server-hwcursor-gamma/PKGBUILD.old b/xorg-server-hwcursor-gamma/PKGBUILD.old deleted file mode 100644 index c3bb4a9..0000000 --- a/xorg-server-hwcursor-gamma/PKGBUILD.old +++ /dev/null @@ -1,133 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Maintainer of the xorg-server package: AndyRTR <andyrtr@archlinux.org> -# Maintainer of the xorg-server package: Jan de Groot <jgc@archlinux.org> - -_pkgname=xorg-server -pkgname=xorg-server-hwcursor-gamma -pkgver=1.18.2 -pkgrel=1 # 4 in xorg-server -pkgdesc="Xorg X server with patch to apply gamma ramps on hardware cursors" -depends=(libepoxy libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common libxshmfence libgl xf86-input-evdev) -provides=("xorg-server=${pkgver}" 'X-ABI-VIDEODRV_VERSION=20' 'X-ABI-XINPUT_VERSION=22.1' 'X-ABI-EXTENSION_VERSION=9.0' 'x-server') -conflicts=('xorg-server' 'nvidia-utils<=331.20' 'glamor-egl' 'xf86-video-modesetting') -replaces=('glamor-egl' 'xf86-video-modesetting') -arch=('i686' 'x86_64') -license=('custom') -url="http://xorg.freedesktop.org" -makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' - 'inputproto' 'fontsproto' 'videoproto' 'presentproto' 'compositeproto' 'recordproto' 'scrnsaverproto' - 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' - 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' - 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt' 'libepoxy' - 'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto' - 'libxshmfence' 'libunwind') -source=(${url}/releases/individual/xserver/${_pkgname}-${pkgver}.tar.bz2 - xvfb-run - xvfb-run.1 - 0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch - 0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch - 0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch - 0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - 0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - 0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch) -sha256sums=('022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d' - 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' - '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' - '10c66c10f4f71930e2ac3f6e07881e228ca88542af449d2c69c7744ec87335df' - '72755a652e72144e3f28c8fa959b4a6df5def838db3cde5077a626e97baab591' - '70c84bf1f7cbc818692fb56f57c8b8ef2ea057bc05380b2f797ecba742b7ce31' - 'bea348631dedd66475d84ac2cfe0840f22a80a642b4680d73fead4749e47f055' - 'be9169b937b5d0b44f7f05d7c08aaa5f0c1092e128ce261d9cb350f09dfe1fb0' - '0a643ae83e03faee0f4db669a33c5b3c99edbba5c86cde2c83962ae536d31081') - -prepare() { - cd "${_pkgname}-${pkgver}" - - msg2 'Fix red tint in Firefox' - patch -Np1 -i ../0001-glamor-swizzle-RED-to-0-for-alpha-textures.patch - - msg2 'Fix flooding of Xorg log file' - patch -Np1 -i ../0001-Xext-vidmode-Reduce-verbosity-of-GetModeLine.patch - - msg2 'Fix FS#48549' - patch -Np1 -i ../0001-present-Only-requeue-for-next-MSC-after-flip-failure.patch - - msg2 'Apply hardware cursors gamma adjustments patches' - patch -Np1 -i ../0001-When-an-cursor-is-set-it-is-adjusted-to-use-the.patch - patch -Np1 -i ../0002-Fix-for-full-and-semi-transparency-under-negative-im.patch - patch -Np1 -i ../0003-Use-Harms-s-suggest-do-not-use-inline-if.-And-fix-si.patch -} - -build() { - cd "${_pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-ipv6 \ - --enable-dri \ - --enable-dmx \ - --enable-xvfb \ - --enable-xnest \ - --enable-composite \ - --enable-xcsecurity \ - --enable-libunwind \ - --enable-xorg \ - --enable-xephyr \ - --enable-glamor \ - --disable-xwayland \ - --enable-kdrive \ - --enable-kdrive-kbd \ - --enable-kdrive-mouse \ - --enable-config-udev \ - --disable-systemd-logind \ - --disable-suid-wrapper \ - --enable-install-setuid \ - --enable-record \ - --disable-xfbdev \ - --disable-xfake \ - --disable-static \ - --libexecdir=/usr/lib/xorg-server \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-xkb-path=/usr/share/X11/xkb \ - --with-xkb-output=/var/lib/xkb \ - --with-fontrootdir=/usr/share/fonts \ - --with-sha1=libgcrypt \ - --without-systemd-daemon - -# --without-dtrace \ -# --disable-linux-acpi --disable-linux-apm \ - - make - - # Disable subdirs for make install rule to make splitting easier - sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ - -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ - -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ - -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ - -e 's/^XWAYLAND_SUBDIRS =.*/XWAYLAND_SUBDIRS =/' \ - -i hw/Makefile -} - -package() { - cd "${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # distro specific files must be installed in /usr/share/X11/xorg.conf.d - install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d" - - # Needed for non-mesa drivers, libgl will restore it - mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ - "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" - - rm -rf "${pkgdir}/var" - - rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" - rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" - - install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" - ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" - - rm -rf "${pkgdir}/usr/lib/pkgconfig" - rm -rf "${pkgdir}/usr/include" - rm -rf "${pkgdir}/usr/share/aclocal" -} - diff --git a/xorg-server-hwcursor-gamma/nvidia-add-modulepath-support.patch b/xorg-server-hwcursor-gamma/nvidia-add-modulepath-support.patch deleted file mode 100644 index 584b91c..0000000 --- a/xorg-server-hwcursor-gamma/nvidia-add-modulepath-support.patch +++ /dev/null @@ -1,851 +0,0 @@ -From c17e544b271ced65483692103d39ed1188d4ca25 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Tue, 27 Sep 2016 14:30:10 +0200 -Subject: [PATCH xserver v2 5/7] xfree86: Remove redundant ServerIsNotSeat0 - check from xf86CallDriverProbe - -If foundScreen is TRUE, then all the code below the removed if -will not execute until we reach the return foundScreen; at the -end, so this entire if block is redundant. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Bus.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c -index 5b93940..27c6b1b 100644 ---- a/hw/xfree86/common/xf86Bus.c -+++ b/hw/xfree86/common/xf86Bus.c -@@ -82,8 +82,6 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only) - if (!xf86DoConfigure && drv->platformProbe != NULL) { - foundScreen = xf86platformProbeDev(drv); - } -- if (ServerIsNotSeat0() && foundScreen) -- return foundScreen; - #endif - - #ifdef XSERVER_LIBPCIACCESS --- -2.9.3 - -From 74bc0fff3a6ca233e56b3fb2971bca97b5a4f8b5 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Fri, 30 Sep 2016 11:59:04 +0200 -Subject: [PATCH xserver v2 6/7] xfree86: Make adding unclaimed devices as GPU - devices a separate step - -This is primarily a preparation patch for fixing the xserver exiting with -a "no screens found" error even though there are supported video cards, -due to the server not recognizing any card as the primary card. - -This also fixes the (mostly theoretical) case of a platformBus capable -driver adding a device as GPUscreen before a driver which only supports -the old PCI probe method gets a chance to claim it as a normal screen. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Bus.c | 4 ++++ - hw/xfree86/common/xf86platformBus.c | 15 +++++++++++++++ - hw/xfree86/common/xf86platformBus.h | 6 ++++++ - 3 files changed, 25 insertions(+) - -diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c -index 27c6b1b..a3a9898 100644 ---- a/hw/xfree86/common/xf86Bus.c -+++ b/hw/xfree86/common/xf86Bus.c -@@ -125,6 +125,10 @@ xf86BusConfig(void) - xf86CallDriverProbe(xf86DriverList[i], FALSE); - } - -+ for (i = 0; i < xf86NumDrivers; i++) { -+ xf86platformAddGPUDevices(xf86DriverList[i]); -+ } -+ - /* If nothing was detected, return now */ - if (xf86NumScreens == 0) { - xf86Msg(X_ERROR, "No devices detected.\n"); -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 39fb1dd..8dd0d5d 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -475,6 +475,21 @@ xf86platformProbeDev(DriverPtr drvp) - isGPUDevice(devList[i]) ? PLATFORM_PROBE_GPU_SCREEN : 0); - } - -+ return foundScreen; -+} -+ -+int -+xf86platformAddGPUDevices(DriverPtr drvp) -+{ -+ Bool foundScreen = FALSE; -+ GDevPtr *devList; -+ int j; -+ -+ if (!drvp->platformProbe) -+ return FALSE; -+ -+ xf86MatchDevice(drvp->driverName, &devList); -+ - /* if autoaddgpu devices is enabled then go find any unclaimed platform - * devices and add them as GPU screens */ - if (xf86Info.autoAddGPU) { -diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h -index a7335b9..0f5c0ef 100644 ---- a/hw/xfree86/common/xf86platformBus.h -+++ b/hw/xfree86/common/xf86platformBus.h -@@ -41,6 +41,7 @@ struct xf86_platform_device { - #ifdef XSERVER_PLATFORM_BUS - int xf86platformProbe(void); - int xf86platformProbeDev(DriverPtr drvp); -+int xf86platformAddGPUDevices(DriverPtr drvp); - - extern int xf86_num_platform_devices; - extern struct xf86_platform_device *xf86_platform_devices; -@@ -156,6 +157,11 @@ xf86PlatformMatchDriver(char *matches[], int nmatches); - - extern void xf86platformVTProbe(void); - extern void xf86platformPrimary(void); -+ -+#else -+ -+static inline int xf86platformAddGPUDevices(DriverPtr drvp) { return FALSE; } -+ - #endif - - #endif --- -2.9.3 - -From 02bcb6f189c4ad8b2e73ce99cfa3c10f0c244a88 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Fri, 30 Sep 2016 12:29:09 +0200 -Subject: [PATCH xserver v2 7/7] xfree86: Try harder to find atleast 1 non GPU - Screen - -If we did not find any non GPU Screens, try again ignoring the notion -of any video devices being the primary device. This fixes Xorg exiting -with a "no screens found" error when using virtio-vga in a -virtual-machine and when using a device driven by simpledrm. - -This is a somewhat ugly solution, but it is the best I can come up with -without major surgery to the bus and probe code. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86.h | 1 + - hw/xfree86/common/xf86Bus.c | 26 +++++++++++++++++++++++--- - hw/xfree86/common/xf86Globals.c | 1 + - hw/xfree86/common/xf86pciBus.c | 4 ++++ - hw/xfree86/common/xf86platformBus.c | 4 ++++ - 5 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h -index e54c811..f724688 100644 ---- a/hw/xfree86/common/xf86.h -+++ b/hw/xfree86/common/xf86.h -@@ -55,6 +55,7 @@ - extern _X_EXPORT int xf86DoConfigure; - extern _X_EXPORT int xf86DoShowOptions; - extern _X_EXPORT Bool xf86DoConfigurePass1; -+extern _X_EXPORT Bool xf86ProbeIgnorePrimary; - extern _X_EXPORT Bool xorgHWAccess; - - extern _X_EXPORT DevPrivateKeyRec xf86ScreenKeyRec; -diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c -index a3a9898..9836803 100644 ---- a/hw/xfree86/common/xf86Bus.c -+++ b/hw/xfree86/common/xf86Bus.c -@@ -117,14 +117,34 @@ xf86BusConfig(void) - int i, j; - - /* -- * Now call each of the Probe functions. Each successful probe will -- * result in an extra entry added to the xf86Screens[] list for each -- * instance of the hardware found. -+ * 3 step probe to (hopefully) ensure that we always find at least 1 -+ * (non GPU) screen: -+ * -+ * 1. Call each drivers probe function normally, -+ * Each successful probe will result in an extra entry added to the -+ * xf86Screens[] list for each instance of the hardware found. - */ - for (i = 0; i < xf86NumDrivers; i++) { - xf86CallDriverProbe(xf86DriverList[i], FALSE); - } - -+ /* -+ * 2. If no Screens were found, call each drivers probe function with -+ * ignorePrimary = TRUE, to ensure that we do actually get a -+ * Screen if there is atleast one supported video card. -+ */ -+ if (xf86NumScreens == 0) { -+ xf86ProbeIgnorePrimary = TRUE; -+ for (i = 0; i < xf86NumDrivers && xf86NumScreens == 0; i++) { -+ xf86CallDriverProbe(xf86DriverList[i], FALSE); -+ } -+ xf86ProbeIgnorePrimary = FALSE; -+ } -+ -+ /* -+ * 3. Call xf86platformAddGPUDevices() to add any additional video cards as -+ * GPUScreens (GPUScreens are only supported by platformBus drivers). -+ */ - for (i = 0; i < xf86NumDrivers; i++) { - xf86platformAddGPUDevices(xf86DriverList[i]); - } -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index 07cfabf..e962b75 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -152,6 +152,7 @@ XF86ConfigPtr xf86configptr = NULL; - Bool xf86Resetting = FALSE; - Bool xf86Initialising = FALSE; - Bool xf86DoConfigure = FALSE; -+Bool xf86ProbeIgnorePrimary = FALSE; - Bool xf86DoShowOptions = FALSE; - DriverPtr *xf86DriverList = NULL; - int xf86NumDrivers = 0; -diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c -index 8158c2b..9adfee5 100644 ---- a/hw/xfree86/common/xf86pciBus.c -+++ b/hw/xfree86/common/xf86pciBus.c -@@ -352,6 +352,10 @@ xf86ComparePciBusString(const char *busID, int bus, int device, int func) - Bool - xf86IsPrimaryPci(struct pci_device *pPci) - { -+ /* Add max. 1 screen for the IgnorePrimary fallback path */ -+ if (xf86ProbeIgnorePrimary && xf86NumScreens == 0) -+ return TRUE; -+ - if (primaryBus.type == BUS_PCI) - return pPci == primaryBus.id.pci; - #ifdef XSERVER_PLATFORM_BUS -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 8dd0d5d..063e81c 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -114,6 +114,10 @@ xf86_find_platform_device_by_devnum(int major, int minor) - static Bool - xf86IsPrimaryPlatform(struct xf86_platform_device *plat) - { -+ /* Add max. 1 screen for the IgnorePrimary fallback path */ -+ if (xf86ProbeIgnorePrimary && xf86NumScreens == 0) -+ return TRUE; -+ - if (primaryBus.type == BUS_PLATFORM) - return plat == primaryBus.id.plat; - #ifdef XSERVER_LIBPCIACCESS --- -2.9.3 - -From c57c1e53ea3d76ebba5b2a23b7260817d3e6b921 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:12 +0100 -Subject: [PATCH xserver 1/6] xfree86: Free devlist returned by xf86MatchDevice - -xf86MatchDevice returns a dynamically allocated list of GDevPtr-s, -free this when we're done with it. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 063e81c..16d934f 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -479,6 +479,8 @@ xf86platformProbeDev(DriverPtr drvp) - isGPUDevice(devList[i]) ? PLATFORM_PROBE_GPU_SCREEN : 0); - } - -+ free(devList); -+ - return foundScreen; - } - -@@ -505,6 +507,8 @@ xf86platformAddGPUDevices(DriverPtr drvp) - } - } - -+ free(devList); -+ - return foundScreen; - } - --- -2.9.3 - -From 08b84d72878e43401e99059c3c926dfa42a360c3 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:13 +0100 -Subject: [PATCH xserver 2/6] xfree86: Make OutputClassMatches take a - xf86_platform_device - -Make OutputClassMatches directly take a xf86_platform_device as argument, -rather then an index into xf86_platform_devices. This makes things -easier for callers which already have a xf86_platform_device pointer. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 16d934f..25a9040 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -214,9 +214,10 @@ MatchToken(const char *value, struct xorg_list *patterns, - } - - static Bool --OutputClassMatches(const XF86ConfOutputClassPtr oclass, int index) -+OutputClassMatches(const XF86ConfOutputClassPtr oclass, -+ struct xf86_platform_device *dev) - { -- char *driver = xf86_platform_odev_attributes(index)->driver; -+ char *driver = dev->attribs->driver; - - if (!MatchToken(driver, &oclass->match_driver, strcmp)) - return FALSE; -@@ -234,7 +235,7 @@ xf86OutputClassDriverList(int index, char *matches[], int nmatches) - return 0; - - for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -- if (OutputClassMatches(cl, index)) { -+ if (OutputClassMatches(cl, &xf86_platform_devices[index])) { - char *path = xf86_platform_odev_attributes(index)->path; - - xf86Msg(X_INFO, "Applying OutputClass \"%s\" to %s\n", --- -2.9.3 - -From 9cd3cc75269d9196898487b5712ee47b8291e077 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:14 +0100 -Subject: [PATCH xserver 3/6] xfree86: Add options support for OutputClass - Options - -Add support for setting options in OutputClass Sections and having these -applied to any matching output devices. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86Option.c | 5 ++++- - hw/xfree86/common/xf86platformBus.c | 42 +++++++++++++++++++++++++++++++++++++ - hw/xfree86/common/xf86platformBus.h | 2 ++ - hw/xfree86/man/xorg.conf.man | 10 +++++++++ - hw/xfree86/parser/OutputClass.c | 6 ++++++ - hw/xfree86/parser/xf86Parser.h | 1 + - 6 files changed, 65 insertions(+), 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c -index 0e8bc1f..929724d 100644 ---- a/hw/xfree86/common/xf86Option.c -+++ b/hw/xfree86/common/xf86Option.c -@@ -44,6 +44,7 @@ - #include "xf86Xinput.h" - #include "xf86Optrec.h" - #include "xf86Parser.h" -+#include "xf86platformBus.h" /* For OutputClass functions */ - #include "optionstr.h" - - static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, -@@ -64,7 +65,7 @@ static Bool ParseOptionValue(int scrnIndex, XF86OptionPtr options, - * - * The order of precedence for options is: - * -- * extraOpts, display, confScreen, monitor, device -+ * extraOpts, display, confScreen, monitor, device, outputClassOptions - */ - - void -@@ -79,6 +80,8 @@ xf86CollectOptions(ScrnInfoPtr pScrn, XF86OptionPtr extraOpts) - pScrn->options = NULL; - - for (i = pScrn->numEntities - 1; i >= 0; i--) { -+ xf86MergeOutputClassOptions(pScrn->entityList[i], &pScrn->options); -+ - device = xf86GetDevFromEntity(pScrn->entityList[i], - pScrn->entityInstanceList[i]); - if (device && device->options) { -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 25a9040..a698c6c 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -310,6 +310,48 @@ xf86platformProbe(void) - return 0; - } - -+void -+xf86MergeOutputClassOptions(int entityIndex, void **options) -+{ -+ const EntityPtr entity = xf86Entities[entityIndex]; -+ struct xf86_platform_device *dev = NULL; -+ XF86ConfOutputClassPtr cl; -+ XF86OptionPtr classopts; -+ int i = 0; -+ -+ switch (entity->bus.type) { -+ case BUS_PLATFORM: -+ dev = entity->bus.id.plat; -+ break; -+ case BUS_PCI: -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ if (MATCH_PCI_DEVICES(xf86_platform_devices[i].pdev, -+ entity->bus.id.pci)) { -+ dev = &xf86_platform_devices[i]; -+ break; -+ } -+ } -+ break; -+ default: -+ xf86Msg(X_DEBUG, "xf86MergeOutputClassOptions unsupported bus type %d\n", -+ entity->bus.type); -+ } -+ -+ if (!dev) -+ return; -+ -+ for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -+ if (!OutputClassMatches(cl, dev) || !cl->option_lst) -+ continue; -+ -+ xf86Msg(X_INFO, "Applying OutputClass \"%s\" options to %s\n", -+ cl->identifier, dev->attribs->path); -+ -+ classopts = xf86optionListDup(cl->option_lst); -+ *options = xf86optionListMerge(*options, classopts); -+ } -+} -+ - static int - xf86ClaimPlatformSlot(struct xf86_platform_device * d, DriverPtr drvp, - int chipset, GDevPtr dev, Bool active) -diff --git a/hw/xfree86/common/xf86platformBus.h b/hw/xfree86/common/xf86platformBus.h -index 0f5c0ef..70d9ec8 100644 ---- a/hw/xfree86/common/xf86platformBus.h -+++ b/hw/xfree86/common/xf86platformBus.h -@@ -42,6 +42,7 @@ struct xf86_platform_device { - int xf86platformProbe(void); - int xf86platformProbeDev(DriverPtr drvp); - int xf86platformAddGPUDevices(DriverPtr drvp); -+void xf86MergeOutputClassOptions(int entityIndex, void **options); - - extern int xf86_num_platform_devices; - extern struct xf86_platform_device *xf86_platform_devices; -@@ -161,6 +162,7 @@ extern void xf86platformPrimary(void); - #else - - static inline int xf86platformAddGPUDevices(DriverPtr drvp) { return FALSE; } -+static inline void xf86MergeOutputClassOptions(int index, void **options) {} - - #endif - -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 7d0c524..8928a53 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -1280,6 +1280,16 @@ For example: - Check the case-sensitive string - .RI \*q matchdriver \*q - against the kernel driver of the device. -+.PP -+When an output device has been matched to the -+.B OutputClass -+section, any -+.B Option -+entries are applied to the device. See the -+.B Device -+section below for a description of the remaining -+.B Option -+entries. - .SH "DEVICE SECTION" - The config file may have multiple - .B Device -diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c -index 8064e0c..f813ee6 100644 ---- a/hw/xfree86/parser/OutputClass.c -+++ b/hw/xfree86/parser/OutputClass.c -@@ -36,6 +36,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = { - {ENDSECTION, "endsection"}, - {IDENTIFIER, "identifier"}, - {DRIVER, "driver"}, -+ {OPTION, "option"}, - {MATCH_DRIVER, "matchdriver"}, - {-1, ""}, - }; -@@ -60,6 +61,8 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr) - free(group); - } - -+ xf86optionListFree(ptr->option_lst); -+ - prev = ptr; - ptr = ptr->list.next; - free(prev); -@@ -112,6 +115,9 @@ xf86parseOutputClassSection(void) - else - ptr->driver = xf86_lex_val.str; - break; -+ case OPTION: -+ ptr->option_lst = xf86parseOption(ptr->option_lst); -+ break; - case MATCH_DRIVER: - if (xf86getSubToken(&(ptr->comment)) != STRING) - Error(QUOTE_MSG, "MatchDriver"); -diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h -index 9c4b403..897edab 100644 ---- a/hw/xfree86/parser/xf86Parser.h -+++ b/hw/xfree86/parser/xf86Parser.h -@@ -338,6 +338,7 @@ typedef struct { - char *identifier; - char *driver; - struct xorg_list match_driver; -+ XF86OptionPtr option_lst; - char *comment; - } XF86ConfOutputClassRec, *XF86ConfOutputClassPtr; - --- -2.9.3 - -From ab1a65b7755d081b41188104b21f4d21eaa3187b Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:15 +0100 -Subject: [PATCH xserver 4/6] xfree86: xf86platformProbe: split finding - pci-info and setting primary GPU - -This is a preparation patch for allowing an OutputClass section to -override the default primary GPU device selection. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index a698c6c..39b3248 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -145,16 +145,9 @@ platform_find_pci_info(struct xf86_platform_device *pd, char *busid) - - iter = pci_slot_match_iterator_create(&devmatch); - info = pci_device_next(iter); -- if (info) { -+ if (info) - pd->pdev = info; -- pci_device_probe(info); -- if (pci_device_is_boot_vga(info)) { -- primaryBus.type = BUS_PLATFORM; -- primaryBus.id.plat = pd; -- } -- } - pci_iterator_destroy(iter); -- - } - - static Bool -@@ -307,6 +300,20 @@ xf86platformProbe(void) - platform_find_pci_info(&xf86_platform_devices[i], busid); - } - } -+ -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ struct xf86_platform_device *dev = &xf86_platform_devices[i]; -+ -+ if (!dev->pdev) -+ continue; -+ -+ pci_device_probe(dev->pdev); -+ if (pci_device_is_boot_vga(dev->pdev)) { -+ primaryBus.type = BUS_PLATFORM; -+ primaryBus.id.plat = dev; -+ } -+ } -+ - return 0; - } - --- -2.9.3 - -From d75ffcdbf8c1e3c8e0d46debcd533a9f2560f0a8 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:16 +0100 -Subject: [PATCH xserver 5/6] xfree86: Allow overriding primary GPU detection - from an OutputClass section - -Allow using: - -Option "PrimaryGPU" "yes" - -In an OutputClass section to override the default primary GPU device -selection which selects the GPU used as output by the firmware. - -If multiple output devices match an OutputClass section with -the PrimaryGPU option set, the first one enumerated becomes the -primary GPU. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 19 +++++++++++++++++++ - hw/xfree86/man/xorg.conf.man | 12 +++++++++++- - 2 files changed, 30 insertions(+), 1 deletion(-) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 39b3248..fc17d15 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -286,6 +286,7 @@ xf86platformProbe(void) - { - int i; - Bool pci = TRUE; -+ XF86ConfOutputClassPtr cl; - - config_odev_probe(xf86PlatformDeviceProbe); - -@@ -301,6 +302,24 @@ xf86platformProbe(void) - } - } - -+ /* First see if there is an OutputClass match marking a device as primary */ -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ struct xf86_platform_device *dev = &xf86_platform_devices[i]; -+ for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -+ if (!OutputClassMatches(cl, dev)) -+ continue; -+ -+ if (xf86CheckBoolOption(cl->option_lst, "PrimaryGPU", FALSE)) { -+ xf86Msg(X_CONFIG, "OutputClass \"%s\" setting %s as PrimaryGPU\n", -+ cl->identifier, dev->attribs->path); -+ primaryBus.type = BUS_PLATFORM; -+ primaryBus.id.plat = dev; -+ return 0; -+ } -+ } -+ } -+ -+ /* Then check for pci_device_is_boot_vga() */ - for (i = 0; i < xf86_num_platform_devices; i++) { - struct xf86_platform_device *dev = &xf86_platform_devices[i]; - -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 8928a53..79b71a8 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -1285,11 +1285,21 @@ When an output device has been matched to the - .B OutputClass - section, any - .B Option --entries are applied to the device. See the -+entries are applied to the device. One -+.B OutputClass -+specific -+.B Option -+is recognized. See the - .B Device - section below for a description of the remaining - .B Option - entries. -+.TP 7 -+.BI "Option \*qPrimaryGPU\*q \*q" boolean \*q -+This option specifies that the matched device should be treated as the -+primary GPU, replacing the selection of the GPU used as output by the -+firmware. If multiple output devices match an OutputClass section with -+the PrimaryGPU option set, the first one enumerated becomes the primary GPU. - .SH "DEVICE SECTION" - The config file may have multiple - .B Device --- -2.9.3 - -From b5dffbbac193aa640ffcfa0a431c21b862854e53 Mon Sep 17 00:00:00 2001 -From: Hans De Goede <hdegoede@redhat.com> -Date: Mon, 12 Dec 2016 17:03:17 +0100 -Subject: [PATCH xserver 6/6] xfree86: Add ModulePath support for OutputClass - config Sections - -Allow OutputClass config snippets to modify the module-path. - -Note that any specified ModulePaths will be pre-pended to the normal -ModulePath. The idea behind this is that any output hardware specific -modules should have preference over the normal modules. - -One use-case for this is the nvidia binary driver, this allows a -config snippet like this: - -Section "OutputClass" - MatchDriver "nvidia" - Modulepath "/usr/lib64/nvidia/modules" -EndSection - -To get the nvidia glx specific glx module loaded, but only when the -nvidia kernel driver is loaded. - -Together with the glvnd work done recently, this allows the nouveau -+ mesa and nvidia-binary userspace stacks to co-exist on the same -system without any ldconfig / xorg.conf tweaking and the xserver will -automatically do the right thing depending on which kernel driver -(nouveau or nvidia) is loaded. - -Reviewed-by: Adam Jackson <ajax@redhat.com> -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - hw/xfree86/common/xf86platformBus.c | 23 +++++++++++++++++++++++ - hw/xfree86/loader/loadmod.c | 1 + - hw/xfree86/man/xorg.conf.man | 16 ++++++++++++++++ - hw/xfree86/parser/OutputClass.c | 15 +++++++++++++++ - hw/xfree86/parser/xf86Parser.h | 1 + - 5 files changed, 56 insertions(+) - -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index fc17d15..0b5795f 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -40,6 +40,7 @@ - #include "hotplug.h" - #include "systemd-logind.h" - -+#include "loaderProcs.h" - #include "xf86.h" - #include "xf86_OSproc.h" - #include "xf86Priv.h" -@@ -287,6 +288,7 @@ xf86platformProbe(void) - int i; - Bool pci = TRUE; - XF86ConfOutputClassPtr cl; -+ char *old_path, *path = NULL; - - config_odev_probe(xf86PlatformDeviceProbe); - -@@ -300,8 +302,29 @@ xf86platformProbe(void) - if (pci && (strncmp(busid, "pci:", 4) == 0)) { - platform_find_pci_info(&xf86_platform_devices[i], busid); - } -+ -+ /* -+ * Deal with OutputClass ModulePath directives, these must be -+ * processed before we do any module loading. -+ */ -+ for (cl = xf86configptr->conf_outputclass_lst; cl; cl = cl->list.next) { -+ if (!OutputClassMatches(cl, &xf86_platform_devices[i])) -+ continue; -+ -+ if (cl->modulepath && xf86ModPathFrom != X_CMDLINE) { -+ old_path = path; -+ XNFasprintf(&path, "%s,%s", cl->modulepath, -+ path ? path : xf86ModulePath); -+ free(old_path); -+ xf86Msg(X_CONFIG, "OutputClass \"%s\" ModulePath extended to \"%s\"\n", -+ cl->identifier, path); -+ LoaderSetPath(path); -+ } -+ } - } - -+ free(path); -+ - /* First see if there is an OutputClass match marking a device as primary */ - for (i = 0; i < xf86_num_platform_devices; i++) { - struct xf86_platform_device *dev = &xf86_platform_devices[i]; -diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c -index 8bf6836..940f5fc 100644 ---- a/hw/xfree86/loader/loadmod.c -+++ b/hw/xfree86/loader/loadmod.c -@@ -184,6 +184,7 @@ LoaderSetPath(const char *path) - if (!path) - return; - -+ FreeStringList(defaultPathList); - defaultPathList = InitPathList(path); - } - -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 79b71a8..00ebf56 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -1300,6 +1300,22 @@ This option specifies that the matched device should be treated as the - primary GPU, replacing the selection of the GPU used as output by the - firmware. If multiple output devices match an OutputClass section with - the PrimaryGPU option set, the first one enumerated becomes the primary GPU. -+.PP -+A -+.B OutputClass -+Section may contain -+.B ModulePath -+entries. When an output device matches an -+.B OutputClass -+section, any -+.B ModulePath -+entries in that -+.B OutputClass -+are pre-pended to the search path for loadable Xorg server modules. See -+.B ModulePath -+in the -+.B Files -+section for more info. - .SH "DEVICE SECTION" - The config file may have multiple - .B Device -diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c -index f813ee6..01b348f 100644 ---- a/hw/xfree86/parser/OutputClass.c -+++ b/hw/xfree86/parser/OutputClass.c -@@ -36,6 +36,7 @@ static const xf86ConfigSymTabRec OutputClassTab[] = { - {ENDSECTION, "endsection"}, - {IDENTIFIER, "identifier"}, - {DRIVER, "driver"}, -+ {MODULEPATH, "modulepath"}, - {OPTION, "option"}, - {MATCH_DRIVER, "matchdriver"}, - {-1, ""}, -@@ -53,6 +54,7 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr) - TestFree(ptr->identifier); - TestFree(ptr->comment); - TestFree(ptr->driver); -+ TestFree(ptr->modulepath); - - xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, entry) { - xorg_list_del(&group->entry); -@@ -115,6 +117,19 @@ xf86parseOutputClassSection(void) - else - ptr->driver = xf86_lex_val.str; - break; -+ case MODULEPATH: -+ if (xf86getSubToken(&(ptr->comment)) != STRING) -+ Error(QUOTE_MSG, "ModulePath"); -+ if (ptr->modulepath) { -+ char *path; -+ XNFasprintf(&path, "%s,%s", ptr->modulepath, xf86_lex_val.str); -+ free(xf86_lex_val.str); -+ free(ptr->modulepath); -+ ptr->modulepath = path; -+ } else { -+ ptr->modulepath = xf86_lex_val.str; -+ } -+ break; - case OPTION: - ptr->option_lst = xf86parseOption(ptr->option_lst); - break; -diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h -index 897edab..e014048 100644 ---- a/hw/xfree86/parser/xf86Parser.h -+++ b/hw/xfree86/parser/xf86Parser.h -@@ -337,6 +337,7 @@ typedef struct { - GenericListRec list; - char *identifier; - char *driver; -+ char *modulepath; - struct xorg_list match_driver; - XF86OptionPtr option_lst; - char *comment; --- -2.9.3 - diff --git a/xorg-server-hwcursor-gamma/upload b/xorg-server-hwcursor-gamma/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/xorg-server-hwcursor-gamma/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/xorg-server-hwcursor-gamma/watch b/xorg-server-hwcursor-gamma/watch deleted file mode 100755 index ec1e783..0000000 --- a/xorg-server-hwcursor-gamma/watch +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -[ -f 'PKGBUILD?h=packages%2Fxorg-server' ] && rm 'PKGBUILD?h=packages%2Fxorg-server' - -wget 'https://projects.archlinux.org/svntogit/packages.git/plain/trunk/PKGBUILD?h=packages/xorg-server' >/dev/null 2>/dev/null - -mv 'PKGBUILD?h=packages%2Fxorg-server' PKGBUILD.upstream.new - -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep ^pkg < PKGBUILD.upstream.new | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - diff PKGBUILD.upstream.{old,new} > PKGBUILD.upstream.diff - mv PKGBUILD.upstream.{new,old} - echo 'xorg-server-hwcursor-gamma' - fi -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'xorg-server-hwcursor-gamma (unfetchable)' -fi - diff --git a/xorg-server-hwcursor-gamma/xserver-autobind-hotplug.patch b/xorg-server-hwcursor-gamma/xserver-autobind-hotplug.patch deleted file mode 100644 index 8025cbd..0000000 --- a/xorg-server-hwcursor-gamma/xserver-autobind-hotplug.patch +++ /dev/null @@ -1,302 +0,0 @@ -From 4471df41ea6e94834a2b10643ca7fcd69682d276 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Fri, 17 Aug 2012 09:49:24 +1000 -Subject: [PATCH xserver v3] autobind GPUs to the screen - -This is a modified version of a patch we've been carry-ing in Fedora and -RHEL for years now. This patch automatically adds secondary GPUs to the -master as output sink / offload source making e.g. the use of -slave-outputs just work, with requiring the user to manually run -"xrandr --setprovideroutputsource" before he can hookup an external -monitor to his hybrid graphics laptop. - -There is one problem with this patch, which is why it was not upstreamed -before. What to do when a secondary GPU gets detected really is a policy -decission (e.g. one may want to autobind PCI GPUs but not USB ones) and -as such should be under control of the Desktop Environment. - -Unconditionally adding autobinding support to the xserver will result -in races between the DE dealing with the hotplug of a secondary GPU -and the server itself dealing with it. - -However we've waited for years for any Desktop Environments to actually -start doing some sort of autoconfiguration of secondary GPUs and there -is still not a single DE dealing with this, so I believe that it is -time to upstream this now. - -To avoid potential future problems if any DEs get support for doing -secondary GPU configuration themselves, the new autobind functionality -is made optional. Since no DEs currently support doing this themselves it -is enabled by default. When DEs grow support for doing this themselves -they can disable the servers autobinding through the servers cmdline or a -xorg.conf snippet. - -Signed-off-by: Dave Airlie <airlied@gmail.com> -[hdegoede@redhat.com: Make configurable, fix with nvidia, submit upstream] -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- -Changes in v2: --Make the default enabled instead of installing a xorg.conf - snippet which enables it unconditionally -Changes in v3: --Handle GPUScreen autoconfig in randr/rrprovider.c, looking at - rrScrPriv->provider, rather then in hw/xfree86/modes/xf86Crtc.c - looking at xf86CrtcConfig->provider. This fixes the autoconfig not - working with the nvidia binary driver ---- - hw/xfree86/common/xf86Config.c | 19 +++++++++++++++++++ - hw/xfree86/common/xf86Globals.c | 2 ++ - hw/xfree86/common/xf86Init.c | 20 ++++++++++++++++++++ - hw/xfree86/common/xf86Priv.h | 1 + - hw/xfree86/common/xf86Privstr.h | 1 + - hw/xfree86/common/xf86platformBus.c | 4 ++++ - hw/xfree86/man/Xorg.man | 7 +++++++ - hw/xfree86/man/xorg.conf.man | 6 ++++++ - randr/randrstr.h | 3 +++ - randr/rrprovider.c | 22 ++++++++++++++++++++++ - 10 files changed, 85 insertions(+) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 21daf1a..df3ca50 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -719,6 +719,7 @@ typedef enum { - FLAG_DRI2, - FLAG_USE_SIGIO, - FLAG_AUTO_ADD_GPU, -+ FLAG_AUTO_BIND_GPU, - FLAG_MAX_CLIENTS, - FLAG_IGLX, - } FlagValues; -@@ -778,6 +779,8 @@ static OptionInfoRec FlagOptions[] = { - {0}, FALSE}, - {FLAG_AUTO_ADD_GPU, "AutoAddGPU", OPTV_BOOLEAN, - {0}, FALSE}, -+ {FLAG_AUTO_BIND_GPU, "AutoBindGPU", OPTV_BOOLEAN, -+ {0}, FALSE}, - {FLAG_MAX_CLIENTS, "MaxClients", OPTV_INTEGER, - {0}, FALSE }, - {FLAG_IGLX, "IndirectGLX", OPTV_BOOLEAN, -@@ -857,6 +860,22 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) - } - xf86Msg(from, "%sutomatically adding GPU devices\n", - xf86Info.autoAddGPU ? "A" : "Not a"); -+ -+ if (xf86AutoBindGPUDisabled) { -+ xf86Info.autoBindGPU = FALSE; -+ from = X_CMDLINE; -+ } -+ else if (xf86IsOptionSet(FlagOptions, FLAG_AUTO_BIND_GPU)) { -+ xf86GetOptValBool(FlagOptions, FLAG_AUTO_BIND_GPU, -+ &xf86Info.autoBindGPU); -+ from = X_CONFIG; -+ } -+ else { -+ from = X_DEFAULT; -+ } -+ xf86Msg(from, "%sutomatically binding GPU devices\n", -+ xf86Info.autoBindGPU ? "A" : "Not a"); -+ - /* - * Set things up based on the config file information. Some of these - * settings may be overridden later when the command line options are -diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c -index e962b75..0d1e31b 100644 ---- a/hw/xfree86/common/xf86Globals.c -+++ b/hw/xfree86/common/xf86Globals.c -@@ -136,6 +136,7 @@ xf86InfoRec xf86Info = { - #else - .autoAddGPU = FALSE, - #endif -+ .autoBindGPU = TRUE, - }; - - const char *xf86ConfigFile = NULL; -@@ -197,6 +198,7 @@ Bool xf86FlipPixels = FALSE; - Gamma xf86Gamma = { 0.0, 0.0, 0.0 }; - - Bool xf86AllowMouseOpenFail = FALSE; -+Bool xf86AutoBindGPUDisabled = FALSE; - - #ifdef XF86VIDMODE - Bool xf86VidModeDisabled = FALSE; -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index a544b65..b0cba3d 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -76,6 +76,7 @@ - #include "xf86DDC.h" - #include "xf86Xinput.h" - #include "xf86InPriv.h" -+#include "xf86Crtc.h" - #include "picturestr.h" - - #include "xf86Bus.h" -@@ -298,6 +299,19 @@ xf86PrivsElevated(void) - } - - static void -+xf86AutoConfigOutputDevices(void) -+{ -+ int i; -+ -+ if (!xf86Info.autoBindGPU) -+ return; -+ -+ for (i = 0; i < xf86NumGPUScreens; i++) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); -+} -+ -+static void - InstallSignalHandlers(void) - { - /* -@@ -871,6 +885,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) - for (i = 0; i < xf86NumGPUScreens; i++) - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); - -+ xf86AutoConfigOutputDevices(); -+ - xf86VGAarbiterWrapFunctions(); - if (sigio_blocked) - input_unlock(); -@@ -1389,6 +1405,10 @@ ddxProcessArgument(int argc, char **argv, int i) - xf86Info.iglxFrom = X_CMDLINE; - return 0; - } -+ if (!strcmp(argv[i], "-noautoBindGPU")) { -+ xf86AutoBindGPUDisabled = TRUE; -+ return 1; -+ } - - /* OS-specific processing */ - return xf86ProcessArgument(argc, argv, i); -diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h -index c1f8a18..9a3d0df 100644 ---- a/hw/xfree86/common/xf86Priv.h -+++ b/hw/xfree86/common/xf86Priv.h -@@ -46,6 +46,7 @@ - extern _X_EXPORT const char *xf86ConfigFile; - extern _X_EXPORT const char *xf86ConfigDir; - extern _X_EXPORT Bool xf86AllowMouseOpenFail; -+extern _X_EXPORT Bool xf86AutoBindGPUDisabled; - - #ifdef XF86VIDMODE - extern _X_EXPORT Bool xf86VidModeDisabled; -diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h -index c29b3cc..4c5f54b 100644 ---- a/hw/xfree86/common/xf86Privstr.h -+++ b/hw/xfree86/common/xf86Privstr.h -@@ -102,6 +102,7 @@ typedef struct { - MessageType dri2From; - - Bool autoAddGPU; -+ Bool autoBindGPU; - } xf86InfoRec, *xf86InfoPtr; - - #ifdef DPMSExtension -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index 063e81c..42789ca 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -48,6 +48,7 @@ - #include "Pci.h" - #include "xf86platformBus.h" - #include "xf86Config.h" -+#include "xf86Crtc.h" - - #include "randrstr.h" - int platformSlotClaimed; -@@ -579,6 +580,9 @@ xf86platformAddDevice(int index) - } - /* attach unbound to 0 protocol screen */ - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); -+ if (xf86Info.autoBindGPU) -+ RRProviderAutoConfigGpuScreen(xf86ScrnToScreen(xf86GPUScreens[i]), -+ xf86ScrnToScreen(xf86Screens[0])); - - RRResourcesChanged(xf86Screens[0]->pScreen); - RRTellChanged(xf86Screens[0]->pScreen); -diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man -index def9bfc..8df6b7d 100644 ---- a/hw/xfree86/man/Xorg.man -+++ b/hw/xfree86/man/Xorg.man -@@ -283,6 +283,13 @@ is a comma separated list of directories to search for - server modules. This option is only available when the server is run - as root (i.e, with real-uid 0). - .TP 8 -+.B \-noautoBindGPU -+Disable automatically setting secondary GPUs up as output sinks and offload -+sources. This is equivalent to setting the -+.B AutoBindGPU -+xorg.conf(__filemansuffix__) file option. To -+.B false. -+.TP 8 - .B \-nosilk - Disable Silken Mouse support. - .TP 8 -diff --git a/hw/xfree86/man/xorg.conf.man b/hw/xfree86/man/xorg.conf.man -index 7d0c524..3e596e4 100644 ---- a/hw/xfree86/man/xorg.conf.man -+++ b/hw/xfree86/man/xorg.conf.man -@@ -673,6 +673,12 @@ Enabled by default. - If this option is disabled, then no GPU devices will be added from the udev - backend. Enabled by default. (May need to be disabled to setup Xinerama). - .TP 7 -+.BI "Option \*qAutoBindGPU\*q \*q" boolean \*q -+If enabled then secondary GPUs will be automatically set up as output-sinks and -+offload-sources. Making e.g. laptop outputs connected only to the secondary -+GPU directly available for use without needing to run -+"xrandr --setprovideroutputsource". Enabled by default. -+.TP 7 - .BI "Option \*qLog\*q \*q" string \*q - This option controls whether the log is flushed and/or synced to disk after - each message. -diff --git a/randr/randrstr.h b/randr/randrstr.h -index 706e9a7..66999d5 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -976,6 +976,9 @@ RRProviderLookup(XID id, RRProviderPtr *provider_p); - extern _X_EXPORT void - RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider); - -+extern _X_EXPORT void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen); -+ - /* rrproviderproperty.c */ - - extern _X_EXPORT void -diff --git a/randr/rrprovider.c b/randr/rrprovider.c -index f9df67e..abc5685 100644 ---- a/randr/rrprovider.c -+++ b/randr/rrprovider.c -@@ -482,3 +482,25 @@ RRDeliverProviderEvent(ClientPtr client, WindowPtr pWin, RRProviderPtr provider) - - WriteEventsToClient(client, 1, (xEvent *) &pe); - } -+ -+void -+RRProviderAutoConfigGpuScreen(ScreenPtr pScreen, ScreenPtr masterScreen) -+{ -+ rrScrPrivPtr pScrPriv = rrGetScrPriv(pScreen); -+ rrScrPrivPtr masterPriv = rrGetScrPriv(masterScreen); -+ RRProviderPtr provider = pScrPriv->provider; -+ RRProviderPtr master_provider = masterPriv->provider; -+ -+ if (!provider || !master_provider) -+ return; -+ -+ if ((provider->capabilities & RR_Capability_SinkOutput) && -+ (master_provider->capabilities & RR_Capability_SourceOutput)) { -+ pScrPriv->rrProviderSetOutputSource(pScreen, provider, master_provider); -+ RRInitPrimeSyncProps(pScreen); -+ } -+ -+ if ((provider->capabilities & RR_Capability_SourceOffload) && -+ (master_provider->capabilities & RR_Capability_SinkOffload)) -+ pScrPriv->rrProviderSetOffloadSink(pScreen, provider, master_provider); -+} --- -2.9.3 - diff --git a/xorg-server-hwcursor-gamma/xvfb-run b/xorg-server-hwcursor-gamma/xvfb-run deleted file mode 100644 index 4c2f4e0..0000000 --- a/xorg-server-hwcursor-gamma/xvfb-run +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/sh - -# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ - -# This script starts an instance of Xvfb, the "fake" X server, runs a command -# with that server available, and kills the X server when done. The return -# value of the command becomes the return value of this script. -# -# If anyone is using this to build a Debian package, make sure the package -# Build-Depends on xvfb, xbase-clients, and xfonts-base. - -set -e - -PROGNAME=xvfb-run -SERVERNUM=99 -AUTHFILE= -ERRORFILE=/dev/null -STARTWAIT=3 -XVFBARGS="-screen 0 640x480x8" -LISTENTCP="-nolisten tcp" -XAUTHPROTO=. - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the event -# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the -# script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -# Display a message, wrapping lines at the terminal width. -message () { - echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} -} - -# Display an error message. -error () { - message "error: $*" >&2 -} - -# Display a usage message. -usage () { - if [ -n "$*" ]; then - message "usage error: $*" - fi - cat <<EOF -Usage: $PROGNAME [OPTION ...] COMMAND -Run COMMAND (usually an X client) in a virtual X server environment. -Options: --a --auto-servernum try to get a free server number, starting at - --server-num --e FILE --error-file=FILE file used to store xauth errors and Xvfb - output (default: $ERRORFILE) --f FILE --auth-file=FILE file used to store auth cookie - (default: ./.Xauthority) --h --help display this usage message and exit --n NUM --server-num=NUM server number to use (default: $SERVERNUM) --l --listen-tcp enable TCP port listening in the X server --p PROTO --xauth-protocol=PROTO X authority protocol name to use - (default: xauth command's default) --s ARGS --server-args=ARGS arguments (other than server number and - "-nolisten tcp") to pass to the Xvfb server - (default: "$XVFBARGS") --w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start - before running COMMAND (default: $STARTWAIT) -EOF -} - -# Find a free server number by looking at .X*-lock files in /tmp. -find_free_servernum() { - # Sadly, the "local" keyword is not POSIX. Leave the next line commented in - # the hope Debian Policy eventually changes to allow it in /bin/sh scripts - # anyway. - #local i - - i=$SERVERNUM - while [ -f /tmp/.X$i-lock ]; do - i=$(($i + 1)) - done - echo $i -} - -# Clean up files -clean_up() { - if [ -e "$AUTHFILE" ]; then - XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 - fi - if [ -n "$XVFB_RUN_TMPDIR" ]; then - if ! rm -r "$XVFB_RUN_TMPDIR"; then - error "problem while cleaning up temporary directory" - exit 5 - fi - fi -} - -# Parse the command line. -ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ - --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ - --name "$PROGNAME" -- "$@") -GETOPT_STATUS=$? - -if [ $GETOPT_STATUS -ne 0 ]; then - error "internal error; getopt exited with status $GETOPT_STATUS" - exit 6 -fi - -eval set -- "$ARGS" - -while :; do - case "$1" in - -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; - -e|--error-file) ERRORFILE="$2"; shift ;; - -f|--auth-file) AUTHFILE="$2"; shift ;; - -h|--help) SHOWHELP="yes" ;; - -n|--server-num) SERVERNUM="$2"; shift ;; - -l|--listen-tcp) LISTENTCP="" ;; - -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; - -s|--server-args) XVFBARGS="$2"; shift ;; - -w|--wait) STARTWAIT="$2"; shift ;; - --) shift; break ;; - *) error "internal error; getopt permitted \"$1\" unexpectedly" - exit 6 - ;; - esac - shift -done - -if [ "$SHOWHELP" ]; then - usage - exit 0 -fi - -if [ -z "$*" ]; then - usage "need a command to run" >&2 - exit 2 -fi - -if ! which xauth >/dev/null; then - error "xauth command not found" - exit 3 -fi - -# tidy up after ourselves -trap clean_up EXIT - -# If the user did not specify an X authorization file to use, set up a temporary -# directory to house one. -if [ -z "$AUTHFILE" ]; then - XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" - AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" -fi - -# Start Xvfb. -MCOOKIE=$(mcookie) -XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 -add :$SERVERNUM $XAUTHPROTO $MCOOKIE -EOF -XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ - 2>&1 & -XVFBPID=$! -sleep "$STARTWAIT" -if ! kill -0 $XVFBPID 2>/dev/null; then - echo "Xvfb failed to start" >&2 - exit 1 -fi - -# Start the command and save its exit status. -set +e -DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 -RETVAL=$? -set -e - -# Kill Xvfb now that the command has exited. -kill $XVFBPID - -# Return the executed command's exit status. -exit $RETVAL - -# vim:set ai et sts=4 sw=4 tw=80: diff --git a/xorg-server-hwcursor-gamma/xvfb-run.1 b/xorg-server-hwcursor-gamma/xvfb-run.1 deleted file mode 100644 index 137d3a1..0000000 --- a/xorg-server-hwcursor-gamma/xvfb-run.1 +++ /dev/null @@ -1,282 +0,0 @@ -.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ -.\" -.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. -.\" -.\" This is free software; you may redistribute it and/or modify -.\" it under the terms of the GNU General Public License as -.\" published by the Free Software Foundation; either version 2, -.\" or (at your option) any later version. -.\" -.\" This is distributed in the hope that it will be useful, but -.\" WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License with -.\" the Debian operating system, in /usr/share/common-licenses/GPL; if -.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, -.\" Suite 330, Boston, MA 02111-1307 USA -.\" -.\" We need the URL macro from groff's www macro package, but also want -.\" things to work all right for people who don't have it. So we define -.\" our own URL macro and let the www macro package override it if it's -.\" available. -.de URL -\\$2 \(laURL: \\$1 \(ra\\$3 -.. -.if \n[.g] .mso www.tmac -.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" -.SH NAME -xvfb\-run \- run specified X client or command in a virtual X server environment -.SH SYNOPSIS -.B xvfb\-run -[ -.I options -] -.I command -.SH DESCRIPTION -.B xvfb\-run -is a wrapper for the -.BR Xvfb (1x) -command which simplifies the task of running commands (typically an X -client, or a script containing a list of clients to be run) within a virtual -X server environment. -.PP -.B xvfb\-run -sets up an X authority file (or uses an existing user\-specified one), -writes a cookie to it (see -.BR xauth (1x)) -and then starts the -.B Xvfb -X server as a background process. -The process ID of -.B Xvfb -is stored for later use. -The specified -.I command -is then run using the X display corresponding to the -.B Xvfb -server -just started and the X authority file created earlier. -.PP -When the -.I command -exits, its status is saved, the -.B Xvfb -server is killed (using the process ID stored earlier), the X authority -cookie removed, and the authority file deleted (if the user did not specify -one to use). -.B xvfb\-run -then exits with the exit status of -.IR command . -.PP -.B xvfb\-run -requires the -.B xauth -command to function. -.SH OPTIONS -.TP -.B \-a\fR,\fB \-\-auto\-servernum -Try to get a free server number, starting at 99, or the argument to -.BR \-\-server\-num . -.TP -.BI \-e\ file \fR,\fB\ \-\-error\-file= file -Store output from -.B xauth -and -.B Xvfb -in -.IR file . -The default is -.IR /dev/null . -.TP -.BI \-f\ file \fR,\fB\ \-\-auth\-file= file -Store X authentication data in -.IR file . -By default, a temporary directory called -.IR xvfb\-run. PID -(where PID is the process ID of -.B xvfb\-run -itself) is created in the directory specified by the environment variable -.B TMPDIR -(or -.I /tmp -if that variable is null or unset), and the -.BR tempfile (1) -command is used to create a file in that temporary directory called -.IR Xauthority . -.TP -.B \-h\fR,\fB \-\-help -Display a usage message and exit. -.TP -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -Use -.I servernumber -as the server number (but see the -.B \-a\fR,\fB \-\-auto\-servernum -option above). -The default is 99. -.TP -.B \-l\fR,\fB \-\-listen\-tcp -Enable TCP port listening in the X server. -For security reasons (to avoid denial\-of\-service attacks or exploits), -TCP port listening is disabled by default. -.TP -.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname -Use -.I protocolname -as the X authority protocol to use. -The default is \(oq.\(cq, which -.B xauth -interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. -.TP -.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments -Pass -.I arguments -to the -.B Xvfb -server. -Be careful to quote any whitespace characters that may occur within -.I arguments -to prevent them from regarded as separators for -.BR xvfb\-run 's -own arguments. -Also, note that specification of \(oq\-nolisten tcp\(cq in -.I arguments -may override the function of -.BR xvfb\-run 's -own -.B \-l\fR,\fB \-\-listen\-tcp -option, and that specification of the server number (e.g., \(oq:1\(cq) may -be ignored because of the way the X server parses its argument list. -Use the -.B xvfb\-run -option -.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber -to achieve the latter function. -The default is \(oq\-screen 0 640x480x8\(cq. -.TP -.BI \-w\ delay \fR,\fB\ \-\-wait= delay -Wait -.I delay -seconds after launching -.B Xvfb -before attempting to start the specified command. -The default is 3. -.SH ENVIRONMENT -.TP -.B COLUMNS -indicates the width of the terminal device in character cells. -This value is used for formatting diagnostic messages. -If not set, the terminal is queried using -.BR stty (1) -to determine its width. -If that fails, a value of \(oq80\(cq is assumed. -.TP -.B TMPDIR -specifies the directory in which to place -.BR xvfb\-run 's -temporary directory for storage of the X authority file; only used if the -.B \-f -or -.B \-\-auth\-file -options are not specified. -.SH "OUTPUT FILES" -.PP -Unless the -.B \-f -or -.B \-\-auth\-file -options are specified, a temporary -directory and file within it are created (and deleted) to store the X -authority cookies used by the -.B Xvfb -server and client(s) run under it. -See -.BR tempfile (1). -If \-f or \-\-auth\-file are used, then the specified X authority file is -only written to, not created or deleted (though -.B xauth -creates an authority file itself if told to use use that does not already -exist). -.PP -An error file with a user\-specified name is also created if the -.B \-e -or -.B \-\-error\-file -options are specifed; see above. -.SH "EXIT STATUS" -.B xvfb\-run -uses its exit status as well as output to standard error to communicate -diagnostics. -The exit status of \(oq1\(cq is not used, and should be interpreted as failure -of the specified command. -.TP -0 -.B xvfb\-run -only uses this exit status if the -.B \-h\fR,\fB \-\-help -option is given. -In all other situations, this may be interpreted as success of the specified -command. -.TP -2 -No command to run was specified. -.TP -3 -The -.B xauth -command is not available. -.TP -4 -The temporary directory that was going to be used already exists; since -.B xvfb\-run -produces a uniquely named directory, this may indicate an attempt by another -process on the system to exploit a temporary file race condition. -.TP -5 -A problem was encountered while cleaning up the temporary directory. -.TP -6 -A problem was encountered while using -.BR getopt (1) -to parse the command\-line arguments. -.SH EXAMPLES -.TP -.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo -runs the -.BR xlogo (1x) -demonstration client inside the -.B Xvfb -X server on the first available server number greater than or equal to 1. -.TP -.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces -runs the -.BR ico (1x) -demonstration client (and passes it the -.B \-faces -argument) inside the -.B Xvfb -X server, configured with a root window of 1024 by 768 pixels and a color -depth of 24 bits. -.PP -Note that the demo X clients used in the above examples will not exit on -their own, so they will have to be killed before -.B xvfb\-run -will exit. -.SH BUGS -See -.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . -If you wish to report a bug in -.BR xvfb\-run , -please use the -.BR reportbug (1) -command. -.SH AUTHOR -.B xfvb\-run -was written by Branden Robinson and Jeff Licquia with sponsorship from -Progeny Linux Systems. -.SH "SEE ALSO" -.BR Xvfb (1x), -.BR xauth (1x) -.\" vim:set et tw=80: diff --git a/xpybar/PKGBUILD b/xpybar/PKGBUILD index f77563b..4a21580 100644 --- a/xpybar/PKGBUILD +++ b/xpybar/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=xpybar pkgver=1.20.2 diff --git a/xtest/PKGBUILD b/xtest/PKGBUILD index af015c3..01c8d58 100644 --- a/xtest/PKGBUILD +++ b/xtest/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@kth.se> +# Maintainer: Mattias Andrée <m@`base64 -d`(bWFhbmRyZWU).se> pkgname=xtest pkgver=2.1.2 pkgrel=1 diff --git a/xtux/.gitignore b/xtux/.gitignore deleted file mode 100644 index 027271b..0000000 --- a/xtux/.gitignore +++ /dev/null @@ -1 +0,0 @@ -files diff --git a/xtux/PKGBUILD b/xtux/PKGBUILD deleted file mode 100644 index ad04e53..0000000 --- a/xtux/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Maintainer: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org> -# Previous maintainer: Anton Bazhenov <anton.bazhenov at gmail> - -pkgname=xtux -pkgver=20030306 -pkgrel=1 -pkgdesc="A Gauntlet-style arcade game for X11 with multiplayer mode" -arch=('i686' 'x86_64') -url="http://xtux.sourceforge.net/" -license=('GPL') -depends=('libxpm') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz" - "${pkgname}.patch" - "${pkgname}.desktop") -md5sums=('6ca5d3b48c30411d1a64b4316d5cf6a9' - 'd04e19ea067837eda0f1ce066d9c8f3a' - '504541ae6fadcb6d56387aedda475979') - -build() { - cd "${srcdir}/${pkgname}" - patch -Np1 -i "../${pkgname}.patch" - make -} - -package() { - cd "${srcdir}/${pkgname}" - - # Install binaries - mkdir -p "${pkgdir}/usr/bin" - install -m755 "${pkgname}" tux_serv "${pkgdir}/usr/bin" - - # Install data files - mkdir -p "${pkgdir}/usr/share/${pkgname}" - cp -r data/* "${pkgdir}/usr/share/${pkgname}" - - # Install pixmap and .desktop file - install -Dm644 data/images/icon.xpm "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm" - install -Dm644 "../${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" - - # Install documentation - mkdir -p "${pkgdir}/usr/share/doc/${pkgname}" - install -m644 AUTHORS CHANGELOG README* "${pkgdir}/usr/share/doc/${pkgname}" -} diff --git a/xtux/upload b/xtux/upload deleted file mode 120000 index 1e7a8be..0000000 --- a/xtux/upload +++ /dev/null @@ -1 +0,0 @@ -../upload
\ No newline at end of file diff --git a/xtux/watch b/xtux/watch deleted file mode 100755 index ef4c624..0000000 --- a/xtux/watch +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -[ -f 'files' ] && rm 'files' -wget http://sourceforge.net/projects/xtux/files -O files >/dev/null 2>/dev/null -if [ $? = 0 ]; then - [ -f unfetchable ] && rm unfetchable - grep 'Download xtux-src-' < files | md5sum > new-sum - touch sum - if [ "$(cat sum)" = "$(cat new-sum)" ]; then - rm new-sum - else - mv new-sum sum - echo 'xtux' - fi - rm files -elif [ ! -f unfetchable ]; then - touch unfetchable - echo 'xtux (unfetchable)' -fi - diff --git a/xtux/xtux.desktop b/xtux/xtux.desktop deleted file mode 100644 index 4c5d17b..0000000 --- a/xtux/xtux.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=XTux -Comment=A Gauntlet-style arcade game for X11 with multiplayer mode -Exec=xtux -Icon=xtux.xpm -Terminal=false -Categories=Game;ActionGame; diff --git a/xtux/xtux.patch b/xtux/xtux.patch deleted file mode 100644 index 2ace5e9..0000000 --- a/xtux/xtux.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- xtux.orig/Makefile 2003-02-04 20:59:01.000000000 +0500 -+++ xtux/Makefile 2012-02-26 16:31:00.092498256 +0600 -@@ -5,7 +5,7 @@ - #============================================================# - - #Change this to where you want to put the data directory. --DATADIR = `pwd`/data -+DATADIR = /usr/share/xtux - #Eg you might want to put the data files here...... - #DATADIR = /usr/share/games/xtux - ---- xtux.orig/src/client/win.h 2003-03-05 20:20:04.000000000 +0500 -+++ xtux/src/client/win.h 2012-02-26 15:59:09.479154124 +0600 -@@ -11,9 +11,9 @@ - #define DEF_WIN_H 384 - - /* Font names */ --#define MED_FONT_18 "-adobe-helvetica-medium-r-*-*-18-*-*-*-*-*-*-*" --#define BOLD_FONT_14 "-*-helvetica-bold-r-*-*-14-*-*-*-*-*-iso8859-*" --#define BOLD_FONT_24 "-*-helvetica-bold-r-*-*-24-*-*-*-*-*-iso8859-*" -+#define MED_FONT_18 "-*-*-medium-r-*-*-18-*-*-*-*-*-*-*" -+#define BOLD_FONT_14 "-*-*-bold-r-*-*-14-*-*-*-*-*-iso8859-*" -+#define BOLD_FONT_24 "-*-*-bold-r-*-*-24-*-*-*-*-*-iso8859-*" - - typedef struct { - Display *d; ---- xtux.orig/src/client/menu.c 2003-03-05 19:54:17.000000000 +0500 -+++ xtux/src/client/menu.c 2012-02-26 19:52:47.701065955 +0600 -@@ -726,7 +726,7 @@ - for( i=0 ; i<3 ; i++ ) - close(i); /* Close STD-IN, -OUT, -ERR */ - -- system("./tux_serv -e"); -+ system("tux_serv -e"); - /* execlp( "./tux_serv", "-e" ); - perror("execlp"); */ - exit(-1); |