diff options
Diffstat (limited to 'abs/core')
19 files changed, 235 insertions, 22 deletions
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index c83c19a..348996b 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.5.2 -pkgrel=2 +pkgrel=3 arch=('x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -128,7 +128,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' 'dedd3fcb1abec6361f4060d8149c7d6d' '8b0298f70f97cc1dc2a58b9a73c64bd3' 'd2f1bec810a740885d9c0a2893186587' - 'e30bf8ec8b9dcc2ceb7127375a91d8d1' + 'c7b9435ae87d72f1179778c373dc43f9' 'a8bbc553cd784ebed2197b96b60addc8' 'a94fe6d980f4b810f2e2ae5352084b39' '0d1632ea63d8145c173c6aecf0b007f0' diff --git a/abs/core/LinHES-system/find_orphans.py b/abs/core/LinHES-system/find_orphans.py index b1d78de..3c6cc46 100644 --- a/abs/core/LinHES-system/find_orphans.py +++ b/abs/core/LinHES-system/find_orphans.py @@ -24,7 +24,7 @@ class File( str ): self.size = int(size) def pprint(self): name = u'%s: %s' % (self.host, os.path.join(self.path, self)) - print u' {0:<90}{1:>8}'.format(name, human_size(self.size)) + print u' {0:<90}{1:>8}'.format(name, human_size(self.size)).encode('utf-8') def delete(self): be = MythBE(self.host, db=DB) be.deleteFile(self, self.group) @@ -35,20 +35,20 @@ class MyRecorded( Recorded ): name = u'{0.hostname}: {0.title}'.format(self) if self.subtitle: name += u' - '+self.subtitle - print u' {0:<70}{1:>28}'.format(name,self.basename) + print u' {0:<70}{1:>28}'.format(name,self.basename).encode('utf-8') def printrecs(title, recs): print title for rec in sorted(recs, key=lambda x: x.title): rec.pprint() - print u'{0:>88}{1:>12}'.format('Count:',len(recs)) + print u'{0:>87}{1:>12}'.format('Count:',len(recs)).encode('utf-8') def printfiles(title, files): print title for f in sorted(files, key=lambda x: x.path): f.pprint() size = sum([f.size for f in files]) - print u'{0:>88}{1:>12}'.format('Total:',human_size(size)) + print u'{0:>87}{1:>12}'.format('Total:',human_size(size)).encode('utf-8') def populate(host=None): unfiltered = [] diff --git a/abs/core/mythtv/stable-29/git_src/git_hash b/abs/core/mythtv/stable-29/git_src/git_hash index 524ff49..3fed727 100644 --- a/abs/core/mythtv/stable-29/git_src/git_hash +++ b/abs/core/mythtv/stable-29/git_src/git_hash @@ -1 +1 @@ -e5fc66e822072037aeaf8c54c4292f17f65cef56 +951f1fe7ea0bd54a8bb5ef08f3b55feee5169340 diff --git a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD index 7dcae9e..69128c3 100644 --- a/abs/core/mythtv/stable-29/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=29.1 -pkgrel=9 +pkgrel=11 arch=('x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-29/mythtv/PKGBUILD b/abs/core/mythtv/stable-29/mythtv/PKGBUILD index a850229..1e3d14c 100644 --- a/abs/core/mythtv/stable-29/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=29.1 -pkgrel=9 +pkgrel=11 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('x86_64') @@ -138,7 +138,7 @@ md5sums=('fb5a87c52a31168a0c8fdde72f27cc45' '6add9c16bbb988067e82029327e567b2' 'b0b238320fa78a4928dce2cea7c85071' '8e4492d1777234a021f368bd6ee964ee' - 'f2cb8dc8c4bff42102563a9e80011e19' + 'e6f5c4f7ed0410fa07da6057d2631520' 'a1c7fb6a3bd11b7b21f2ea8327a843e1' 'd05eaf66c434a131c8efb4d87e99b402' '5f2bd4065b145b7b7ff09dfd6f08276c' diff --git a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch index 59024b7..2b57dc1 100644 --- a/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch +++ b/abs/core/mythtv/stable-29/mythtv/mythfrontend_en_us.ts_Title_Case.patch @@ -1,5 +1,5 @@ ---- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2018-05-23 18:35:11.221352872 +0000 -+++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-06-19 04:42:01.650264282 +0000 +--- src/mythtv/i18n/mythfrontend_en_us.ts.orig 2018-10-12 15:14:32.718932846 +0000 ++++ src/mythtv/i18n/mythfrontend_en_us.ts 2018-10-12 15:15:18.343034045 +0000 @@ -573,7 +573,7 @@ <message> <location filename="../libs/libmythtv/mpeg/dishdescriptors.cpp" line="400"/> @@ -23809,7 +23809,7 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2552"/> -@@ -30706,7 +31489,7 @@ +@@ -30706,19 +31489,19 @@ <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="2152"/> <source>Fetching details for %1</source> @@ -23818,7 +23818,12 @@ </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3557"/> -@@ -30718,7 +31501,7 @@ + <source>Are you sure you want to permanently delete: + %1</source> +- <translation>Are you sure you want to permanently delete: ++ <translation>Are you sure you want to delete: + %1</translation> + </message> <message> <location filename="../programs/mythfrontend/videodlg.cpp" line="3595"/> <source>Failed to delete file</source> diff --git a/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch b/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch new file mode 100644 index 0000000..f786d15 --- /dev/null +++ b/abs/core/mythtv/stable-29/mythweb/Channel.php_remove_small_icons.patch @@ -0,0 +1,14 @@ +diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php +index a4350283..be45b6ff 100644 +--- ./modules/tv/classes/Channel.php ++++ ./modules/tv/classes/Channel.php +@@ -113,6 +113,9 @@ class Channel extends MythBase { + foreach ($channel_data AS $key => $value) + $this->$key = $value; + $this->icon = 'data/tv_icons/'.basename($channel_data['icon']); ++ // Remove icons smaller than 100 bytes ++ if (file_exists($this->icon) && filesize($this->icon) < 100) ++ unlink($this->icon); + // Try to copy over any missing channel icons + if ($channel_data['icon'] && !file_exists($this->icon)) { + // Local file? diff --git a/abs/core/mythtv/stable-29/mythweb/PKGBUILD b/abs/core/mythtv/stable-29/mythweb/PKGBUILD index f83912e..7057f25 100644 --- a/abs/core/mythtv/stable-29/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-29/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=29 -pkgrel=5 +pkgrel=6 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('x86_64') @@ -10,7 +10,8 @@ depends=('lighttpd' "mythtv>=${pkgver}" 'php' 'supplemental-web') groups=('mythtv-extras') install=mythweb.install -patches=('video.css.patch') +patches=('video.css.patch' + 'Channel.php_remove_small_icons.patch') source=(`echo ${patches[@]:0}` 'mythweb.include' 'mythweb_gen_light.conf') @@ -54,5 +55,6 @@ package() { install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf } md5sums=('668a36e404c8254f56e7a7304e655332' + '333d145899a1b48a7648d933344ee9ed' '7645a6399434cbba35639713ac5d88e0' 'df190116b3aba35720fb6631885f973f') diff --git a/abs/core/python_modules/python-bottle/PKGBUILD b/abs/core/python_modules/python-bottle/PKGBUILD new file mode 100644 index 0000000..ffc7340 --- /dev/null +++ b/abs/core/python_modules/python-bottle/PKGBUILD @@ -0,0 +1,54 @@ +# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Contributor: Richard Murri <admin@richardmurri.com> +# Contributor: Farhad Shahbazi <farhad@enthusiasm.cc> +# Contributor: Felix Kaiser <felix.kaiser@fxkr.net> + +pkgbase=python-bottle +pkgname=("python-bottle" "python2-bottle") +pkgver=0.12.13 +pkgrel=2 +pkgdesc="A fast and simple micro-framework for small web-applications" +arch=(any) +url="http://bottlepy.org" +license=('MIT') +options=(!emptydirs) +makedepends=('python-setuptools' 'python2-setuptools' 'git') +checkdepends=('python-mako' 'python2-mako' 'python-jinja' 'python2-jinja' 'python-cherrypy' + 'python2-cherrypy' 'python-twisted' 'python2-twisted' 'python-tornado' + 'python2-tornado' 'python-paste' 'python2-paste' 'python-gevent' 'python2-gevent' + 'python-eventlet' 'python2-eventlet') +source=("git+https://github.com/defnull/bottle.git#tag=${pkgver}") +sha512sums=('SKIP') + +prepare() { + cp -a bottle{,-py2} + sed -i "1s/python/python2/" bottle-py2/bottle.py +} + +check() { + cd "$srcdir/"bottle + # https://github.com/bottlepy/bottle/issues/791 + python test/testall.py || warning 'Tests failed' + + cd "$srcdir/"bottle-py2 + python2 test/testall.py +} + +package_python-bottle() { + depends=('python') + + cd bottle + python setup.py install --root="$pkgdir" --optimize=1 + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +package_python2-bottle() { + depends=('python2') + + cd bottle-py2 + python2 setup.py install --root="$pkgdir" --optimize=1 + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE + + # deal with conflict with python-bottle's /usr/bin/bottle.py + mv "$pkgdir"/usr/bin/bottle.py{,2} +} diff --git a/abs/core/python_modules/python-ifaddr/PKGBUILD b/abs/core/python_modules/python-ifaddr/PKGBUILD new file mode 100644 index 0000000..4e06e8e --- /dev/null +++ b/abs/core/python_modules/python-ifaddr/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Jelle van der Waa <jelle@archlinux.org> + +_name=ifaddr +pkgname=python-ifaddr +pkgver=0.1.4 +pkgrel=1 +pkgdesc="Enumerates all IP addresses on all network adapters of the system" +arch=('any') +url="https://github.com/pydron/ifaddr" +license=('MIT') +depends=('python') +makedepends=('python-setuptools') +checkdepends=('python-nose') +source=(https://files.pythonhosted.org/packages/source/${_name::1}/${_name}/${_name}-${pkgver}.zip) +sha512sums=('5b080d8f328f7a974644e15929850ba93b9232cee545740d89e4d63e982e351287504befef365834bfb3f4c5f25dc99f4a4d76753405658ae197590e2ce94929') + +build() { + cd "${_name}-${pkgver}" + python3 setup.py build +} + +package() { + cd "${_name}-${pkgver}" + + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 +} + +check() { + cd "${_name}-${pkgver}" + nosetests ${_name}/test_ifaddr.py +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/python_modules/python-psutil/PKGBUILD b/abs/core/python_modules/python-psutil/PKGBUILD new file mode 100644 index 0000000..1d05b76 --- /dev/null +++ b/abs/core/python_modules/python-psutil/PKGBUILD @@ -0,0 +1,61 @@ +# Maintainer: Sébastien Luttringer + +pkgbase=python-psutil +pkgname=('python-psutil' 'python2-psutil') +pkgver=5.4.7 +pkgrel=1 +arch=('x86_64') +url='https://github.com/giampaolo/psutil' +license=('custom: BSD') +makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools') +checkdepends=('net-tools' 'procps-ng' 'python2-nose' 'python-nose') +source=("https://github.com/giampaolo/psutil/archive/release-$pkgver.tar.gz") +md5sums=('e8d6259eafe5925e7c522868aedd2caa') + +build() { + cd psutil-release-$pkgver + + msg python + python setup.py build --build-lib=build/python + + msg python2 + python2 setup.py build --build-lib=build/python2 + find build/python2 -type f -exec \ + sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; +} + +check() { + cd psutil-release-$pkgver + + msg python + export PYTHONPATH="$PWD/build/python" + cd psutil/tests/ + # FIXME: dynamic loading so + + + msg python2 + export PYTHONPATH="$PWD/build/python2" + #python2 psutil/tests/runner.py +} + +package_python-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python' + depends=('python') + + cd psutil-release-$pkgver + python setup.py build --build-lib=build/python \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +package_python2-psutil() { + pkgdesc='A cross-platform process and system utilities module for Python2' + depends=('python2') + + cd psutil-release-$pkgver + python2 setup.py build --build-lib=build/python2 \ + install --root="$pkgdir" --optimize=1 + install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/python_modules/python-zeroconf/PKGBUILD b/abs/core/python_modules/python-zeroconf/PKGBUILD new file mode 100644 index 0000000..1b2e286 --- /dev/null +++ b/abs/core/python_modules/python-zeroconf/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Jelle van der Waa <jelle@archlinux.org> +# Contributor: Maxim Andersson <thesilentboatman@gmail.com> + +pkgname=python-zeroconf +pkgver=0.21.3 +pkgrel=1 +pkgdesc="A pure python implementation of multicast DNS service discovery" +arch=('any') +url="https://github.com/jstasiak/python-zeroconf" +license=('LGPL') +depends=('python' 'python-netifaces' 'python-six' 'python-ifaddr') +makedepends=('python-setuptools') +checkdepends=('python-pytest') +source=("https://github.com/jstasiak/${pkgname}/archive/${pkgver}.tar.gz") +sha256sums=('8c3aaed98f950b56c6e1aa440b56e0d48af49565cb4d7830a82cb3b01088aad8') + +build() { + cd "${pkgbase}-${pkgver}" + python3 setup.py build +} + +package() { + cd "${pkgbase}-${pkgver}" + + python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 +} + +check() { + cd "${pkgbase}-${pkgver}" + py.test . +} + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 777d89f..11aee66 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=8.5 -pkgrel=2 +pkgrel=4 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license=('BSD') diff --git a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run index 9b25f0b..bc5a564 100755 --- a/abs/core/runit-scripts/runitscripts/services/bluetoothd/run +++ b/abs/core/runit-scripts/runitscripts/services/bluetoothd/run @@ -9,4 +9,4 @@ /usr/bin/svwaitup -s 15 /service/dbus || exit 1 stat_runit "Starting bluetooth" -exec /usr/bin/bluetoothctl +exec /usr/lib/bluetooth/bluetoothd diff --git a/abs/core/runit-scripts/runitscripts/services/transmissiond/run b/abs/core/runit-scripts/runitscripts/services/transmissiond/run new file mode 100644 index 0000000..20e115e --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/transmissiond/run @@ -0,0 +1,11 @@ +#!/bin/sh +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions +stat_runit "Starting transmission daemon" + +#touch /var/log/transmission.log +#chown mythtv:mythtv /var/log/transmission.log +#exec chpst -umythtv transmission-daemon -f --logfile /var/log/transmission.log +exec chpst -umythtv transmission-daemon -f diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD index 8bf61d1..a6286d8 100755 --- a/abs/core/system-templates/PKGBUILD +++ b/abs/core/system-templates/PKGBUILD @@ -1,6 +1,6 @@ pkgname=system-templates pkgver=8.5 -pkgrel=4 +pkgrel=5 conflicts=( ) pkgdesc="Templates used for system configuration" depends=() diff --git a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc index 3600132..8c4ffe0 100644 --- a/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc +++ b/abs/core/system-templates/templates/remotes/favorites/dvico/wol-lircrc @@ -6,7 +6,7 @@ end begin prog = irxevent button = stop - config = Key ctrl-shift-q CurrentWindow + config = Key ctrl-shift-w CurrentWindow end begin prog = irxevent diff --git a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb index 8a1f191..7acf7ac 100644 --- a/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb +++ b/abs/core/system-templates/templates/remotes/favorites/mce/wol-lircrc-mceusb @@ -6,7 +6,7 @@ end begin prog = irxevent button = Stop - config = Key ctrl-shift-q CurrentWindow + config = Key ctrl-shift-w CurrentWindow end begin prog = irxevent diff --git a/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc b/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc index 46c8eb2..bd3e26e 100644 --- a/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc +++ b/abs/core/system-templates/templates/remotes/favorites/streamzap/wol-lircrc @@ -2,7 +2,7 @@ begin prog = irxevent button = STOP - config = Key ctrl-shift-q CurrentWindow + config = Key ctrl-shift-w CurrentWindow end begin # Exit Chrome back to Myth |