From c05281ffd36f9089a84e3f672e5a1bce9b659679 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 22 Nov 2016 20:14:05 +0000 Subject: LinHES-config: mv_network.py: fix upgrade when not connected to network --- abs/core/LinHES-config/PKGBUILD | 4 ++-- abs/core/LinHES-config/mv_network.py | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index ed6cca9..eea1dfa 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.4.2 -pkgrel=1 +pkgrel=2 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -166,7 +166,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' 'b845de3e05c1734cce4b9ac5e8f1baaf' '02b4378b17bca6bebdcc2258a80dfc6b' '8b7dce4a3a0a281fa6656aa8781a648e' - '4b10fff21a0274f950f97f2b61e92463' + '3ef3f589f46d0b59603226fef325e611' '824e49d9b01fed295c704ab68908b464' 'fe5e31b833cc6707209e9d656b6eb53c' '336f08aed2e3c0b9fd09563933d54735' diff --git a/abs/core/LinHES-config/mv_network.py b/abs/core/LinHES-config/mv_network.py index a4ad0c9..559a226 100755 --- a/abs/core/LinHES-config/mv_network.py +++ b/abs/core/LinHES-config/mv_network.py @@ -53,17 +53,23 @@ def get_ip(ifname): logging.debug(" Found %s in all_interfaces", ifname) else: logging.critical("* Couldn't find %s in list", ifname) - ifname = all_if[0] + try: + ifname = all_if[0] + except: + ifname = ifname logging.critical("* Using %s for interface name", ifname) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - ip = socket.inet_ntoa(fcntl.ioctl( - s.fileno(), - 0x8915, # SIOCGIFADDR - struct.pack('256s', ifname[:15]) - )[20:24]) + try: + ip = socket.inet_ntoa(fcntl.ioctl( + s.fileno(), + 0x8915, # SIOCGIFADDR + struct.pack('256s', ifname[:15]) + )[20:24]) + except: + ip = "127.0.0.1" logging.debug(" get_ip ip address is %s", ip) return ip -- cgit v0.12 From 77e614df0cacf1935de0dd8f0c834b643aea5ccd Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 23 Nov 2016 13:07:43 +0000 Subject: mythtv and mythplugins: update to latest fixes --- abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash index ace800a..afe7d4f 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash @@ -1 +1 @@ -2131fb291c49fc62cf8ac0c1b26c89193d2436dc +bf571d2b07a286df5419c857517dd8789c49fe27 diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD index d161477..81c9bb1 100644 --- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.28 -pkgrel=25 +pkgrel=26 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD index 5fb2f90..8900202 100644 --- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.28 -pkgrel=25 +pkgrel=26 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From ef8611ed6b769602e7264a4455d7f18cec95b235 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 23 Nov 2016 16:36:44 +0000 Subject: mythinstall: rebuild for mythtv ABI change --- abs/core/mythinstall/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD index 45b963d..4c5b223 100644 --- a/abs/core/mythinstall/PKGBUILD +++ b/abs/core/mythinstall/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jams pkgname=mythinstall pkgver=8.4 -pkgrel=4 +pkgrel=5 pkgdesc="LinHES installer/systemconfig GUI." arch=('i686' 'x86_64') depends=('mythtv>=0.28') -- cgit v0.12 From 55e4254a334f68d02416baa99285d7afe5bba209 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 23 Nov 2016 16:38:44 +0000 Subject: which: update to 2.21 --- abs/core/which/PKGBUILD | 32 ++++++++++++++++++-------------- abs/core/which/which.install | 20 -------------------- 2 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 abs/core/which/which.install diff --git a/abs/core/which/PKGBUILD b/abs/core/which/PKGBUILD index 65495fe..3df51e9 100644 --- a/abs/core/which/PKGBUILD +++ b/abs/core/which/PKGBUILD @@ -1,27 +1,31 @@ -# $Id: PKGBUILD 142082 2011-11-04 23:36:20Z allan $ -# Maintainer: Allan McRae +# $Id$ +# Maintainer: Sébastien Luttringer +# Contributor: Allan McRae # Contributor: Andreas Radke pkgname=which -pkgver=2.20 -pkgrel=5 -pkgdesc="A utility to show the full path of commands" +pkgver=2.21 +pkgrel=2 +pkgdesc='A utility to show the full path of commands' arch=('i686' 'x86_64') -url="http://www.xs4all.nl/~carlo17/which" +url='https://savannah.gnu.org/projects/which/' license=('GPL3') -groups=('base') -depends=('glibc' 'sh') -install=which.install -source=(http://www.xs4all.nl/~carlo17/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('95be0501a466e515422cde4af46b2744') +groups=('base' 'base-devel') +depends=('glibc' 'bash') +# gpg key is using deprecated md5 algo, do not use +# check if a new one is issued in the next release +source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('097ff1a324ae02e0a3b0369f07a7544a') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/abs/core/which/which.install b/abs/core/which/which.install deleted file mode 100644 index 167e250..0000000 --- a/abs/core/which/which.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(which.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} -- cgit v0.12 From d438d076a7bf6b55097942b45f0fe2466e0cfef7 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 28 Nov 2016 22:45:34 +0000 Subject: LinHES-config: add systemd-coredump.conf to disable coredumps xconfig.sh: make sure Xres is set --- abs/core/LinHES-config/PKGBUILD | 9 +++- abs/core/LinHES-config/systemd-coredump.conf | 2 + abs/core/LinHES-config/xconfig.sh | 71 +++++++++++++++++----------- 3 files changed, 53 insertions(+), 29 deletions(-) create mode 100755 abs/core/LinHES-config/systemd-coredump.conf diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD index eea1dfa..a3096f0 100755 --- a/abs/core/LinHES-config/PKGBUILD +++ b/abs/core/LinHES-config/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-config pkgver=8.4.2 -pkgrel=2 +pkgrel=3 conflicts=(MythVantage-config MythVantage-config-dev LinHES-config-dev LinHes-config ) pkgdesc="Install and configure your system" depends=('bc' 'libstatgrab' 'mysql-python' 'expect' 'curl' 'dnsutils' 'parted' @@ -48,6 +48,7 @@ source=(mv_install.py 09_mythvantge_runit_grub mv_fileshare.py mv_locale.py systemconfig.py + systemd-coredump.conf pinkNoise_3s.wav myth_user_call.py mythvantage.cfg @@ -132,6 +133,9 @@ package() { #sysctrl conf install -o root -g root -D -m 0755 hdhr.conf $pkgdir/etc/sysctl.d/hdhr.conf + #systemd conf + install -o root -g root -D -m 0755 systemd-coredump.conf $pkgdir/etc/systemd/coredump.conf.d/coredump.conf + #modules blacklist files install -o root -g root -D -m 0755 blacklist_pcspkr.conf $pkgdir/etc/modprobe.d/blacklist_pcspkr.conf install -o root -g root -D -m 0755 blacklist_nouveau.conf $pkgdir/etc/modprobe.d/blacklist_nouveau.conf @@ -148,7 +152,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' '27e4fcacca9b9662dd782fbdc92fceea' '2a7f3b34e522acfd08283b86c8926aba' 'b596d2e3779a434435bc0f0277b1ba3e' - 'a751a88268029989f0067e2c9e75bf6e' + 'fe80b54657f456e5f3d55f4bd5f5f768' 'f0376c98a7986897406d393186c0365e' '157e73d0f90d7b306aba8f5921aeedd3' '1f58c0393a131f4a8f9a84b3fe08a7e4' @@ -177,6 +181,7 @@ md5sums=('97b810ddc35d1f441dbe8cdd6886e2af' '3cb673adb83b6afa52cffaa621b9d96b' '781f161a79c3188a31c8615b8258b241' '888a6c57f272d9fa3e77e216a421562b' + '6cb0aac63623a44463c4209862d2baa0' 'cdd5008ee77e67c1d51ad73a24612485' '2596460462cf6c889cf8f95485537b20' 'dc3c5270691a62600475705f4cb78b56' diff --git a/abs/core/LinHES-config/systemd-coredump.conf b/abs/core/LinHES-config/systemd-coredump.conf new file mode 100755 index 0000000..519f838 --- /dev/null +++ b/abs/core/LinHES-config/systemd-coredump.conf @@ -0,0 +1,2 @@ +[Coredump] +Storage=none diff --git a/abs/core/LinHES-config/xconfig.sh b/abs/core/LinHES-config/xconfig.sh index b5693b9..3f0a0d2 100755 --- a/abs/core/LinHES-config/xconfig.sh +++ b/abs/core/LinHES-config/xconfig.sh @@ -1,7 +1,13 @@ #!/bin/bash #set -x #SET DISPLAYRES to force Xres, ENV takes precendent over cmdline - +#SET VGACARDTYPE to force card type: + #VGACARDTYPE="intel" xconfig.sh + #VGACARDTYPE="nvidia" xconfig.sh + #VGACARDTYPE="nvidia-340xx" xconfig.sh + #VGACARDTYPE="nvidia-304xx" xconfig.sh + #VGACARDTYPE="VMware" xconfig.sh + #VGACARDTYPE="vesa" xconfig.sh LOGFILE=/tmp/xconfig.log for i in ati intel mga savage sis unichrome @@ -26,11 +32,11 @@ function Xvalues { VGAFORCED=0 if [ "x$VGACARDTYPE" = "x" ] then - CMDLINE=$(cat /proc/cmdline) + CMDLINE=$(cat /proc/cmdline) echo "$CMDLINE" | grep -q forceXvesa if [ $? = 0 ] then - echo "Forcing driver to vesa" + echo "Forcing driver to vesa from kernel cmdline" VGACARDTYPE=vesa Xcardtype=$VGACARDTYPE else @@ -49,7 +55,7 @@ function Xvalues { } function presetupX { - if [ "$XIgnoreConfig" = 1 ] + if [ "$XIgnoreConfig" = 1 ] then echo "Using User Supplied X" if [ -f "$MYTHHOME/templates/xorg.user" ] @@ -226,8 +232,8 @@ function intel_driver_install { } function set_res { - echo " Setting modeline to ${Xres}" - echo " Setting modeline to ${Xres}" >> $LOGFILE 2>&1 + echo "Setting resolution to ${Xres}" + echo "Setting resolution to ${Xres}" >> $LOGFILE 2>&1 cat > /etc/X11/xorg.conf.d/30-screen.conf <> $LOGFILE 2>&1 rm -f /etc/X11/xorg.conf.d/30-screen.conf fi ;; @@ -270,10 +273,12 @@ function setupX { echo "#!/bin/bash" > /etc/X11/autostart/vmware.sh echo "/usr/bin/vmware-user-suid-wrapper" >> /etc/X11/autostart/vmware.sh chmod 755 /etc/X11/autostart/vmware.sh - if [ ${Xres} != "Auto" ] + if [[ $Xres != "Auto" ]] then set_res else + echo "Setting resolution to ${Xres}" + echo "Setting resolution to ${Xres}" >> $LOGFILE 2>&1 rm -f /etc/X11/xorg.conf.d/30-screen.conf fi ;; @@ -281,25 +286,29 @@ function setupX { intel) intel_driver_install cp $TEMPLATES/xorg/xorg.intel /etc/X11/xorg.conf.d/20-automv.conf - if [ ${Xres} != "Auto" ] + if [[ $Xres != "Auto" ]] then set_res else + echo "Setting resolution to ${Xres}" + echo "Setting resolution to ${Xres}" >> $LOGFILE 2>&1 rm -f /etc/X11/xorg.conf.d/30-screen.conf fi ;; vesa|innotek|*) #leaving this as * and vesa for no real reason other then it's explicit to catch vesa - if [[ $VGACARDTYPE != "vesa" && $VGACARDTYPE != "innotek" ]] - then - echo "Unknown card type, using Vesa." - fi - vesa_driver_install - cp $TEMPLATES/xorg/xorg.vesa /etc/X11/xorg.conf.d/20-automv.conf - if [ ${Xres} != "Auto" ] + if [[ $VGACARDTYPE != "vesa" && $VGACARDTYPE != "innotek" ]] + then + echo "Unknown card type, using Vesa." + fi + vesa_driver_install + cp $TEMPLATES/xorg/xorg.vesa /etc/X11/xorg.conf.d/20-automv.conf + if [[ $Xres != "Auto" ]] then set_res else + echo "Setting resolution to ${Xres}" + echo "Setting resolution to ${Xres}" >> $LOGFILE 2>&1 rm -f /etc/X11/xorg.conf.d/30-screen.conf fi @@ -333,7 +342,7 @@ function pacman_wait { LINE=`grep -i xorg /etc/mythvantage.cfg|grep -q False` rc=$? -if [ $rc = 0 ] +if [ $rc = 0 ] then echo "** xorg configuration disabled in /etc/mythvantage.cfg" exit 1 @@ -345,16 +354,14 @@ then exit 1 fi - if [ -f /etc/systemconfig ] then . /etc/systemconfig else - #Xres="800x600" - Xres="Auto" - echo " Setting modeline to ${Xres}" - echo " Setting modeline to ${Xres}" >> $LOGFILE 2>&1 + echo " systemconfig not found." + echo " systemconfig not found." >> $LOGFILE 2>&1 fi + CMDLINE=$(cat /proc/cmdline) echo $CMDLINE | grep -q displayres if [ $? = 0 ] @@ -365,10 +372,20 @@ fi if [ ! x$DSR = x ] then Xres=$DSR + echo " Setting resolution to ${Xres} from kernel cmdline" + echo " Setting resolution to ${Xres} from kernel cmdline" >> $LOGFILE 2>&1 fi if [ ! x$DISPLAYRES = x ] then Xres=$DISPLAYRES + echo "Resolution forced to ${Xres}" + echo "Resolution forced to ${Xres}" >> $LOGFILE 2>&1 +fi +if [ x$Xres = x ] +then + Xres="Auto" + echo "Resolution not set. Setting to ${Xres}" + echo "Resolution not set. Setting to ${Xres}" >> $LOGFILE 2>&1 fi -- cgit v0.12 From 05f3899b8a13534d500bc0735c9a281896057ea2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 29 Nov 2016 13:32:27 +0000 Subject: mythtv & mythplugins: update to latest fixes --- abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 2 +- .../mythtv/fixQTvirtualkeyboard.patch.28 | 46 -- .../stable-0.28/mythtv/menu-xml/siriusmenu.xml | 419 --------------- .../stable-0.28/mythtv/menu-xml/siriusmenu.xml.del | 419 +++++++++++++++ .../mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml | 574 --------------------- .../stable-0.28/mythtv/menu-xml/xmmenu.xml.del | 574 +++++++++++++++++++++ 8 files changed, 996 insertions(+), 1042 deletions(-) delete mode 100644 abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 delete mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml.del delete mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml.del diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash index afe7d4f..3fb8d98 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash @@ -1 +1 @@ -bf571d2b07a286df5419c857517dd8789c49fe27 +e9d0543d64fc21072fb1a0199ac2e24334169461 diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD index 81c9bb1..63cb9c9 100644 --- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.28 -pkgrel=26 +pkgrel=27 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD index 8900202..b369178 100644 --- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.28 -pkgrel=26 +pkgrel=27 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') diff --git a/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 b/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 deleted file mode 100644 index bfaad97..0000000 --- a/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 +++ /dev/null @@ -1,46 +0,0 @@ ---- src/mythtv/libs/libmythui/mythmainwindow.cpp.orig 2016-03-15 17:30:19.608956780 +0000 -+++ src/mythtv/libs/libmythui/mythmainwindow.cpp 2016-03-15 17:37:17.368720092 +0000 -@@ -1458,6 +1458,7 @@ - #endif - if (currentWidget()) - { -+#ifdef Q_OS_MAC - // don't disable the current widget, instead we disable all its children - // on mac, disabling the current active widget entirely prevent keyboard to - // work on the newly opened widget. -@@ -1473,6 +1474,9 @@ - } - } - } -+#else -+ currentWidget()->setEnabled(false); -+#endif - #ifdef USE_OPENGL_QT5 - else - { -@@ -1506,8 +1510,6 @@ - if (!current) - { - current = this; -- // We're be to the main window, enable it just in case -- setEnabled(true); - #ifdef USE_OPENGL_QT5 - // Restore WA_PaintOnScreen, used by OpenGL GUI painter - setAttribute(Qt::WA_PaintOnScreen, d->m_bSavedPOS); -@@ -1515,6 +1517,7 @@ - QTimer::singleShot(2, d->paintwin, SLOT(update())); - #endif - } -+#ifdef Q_OS_MAC - else - { - QList list = current->findChildren(); -@@ -1529,6 +1532,8 @@ - } - } - current->raise(); -+#endif -+ current->setEnabled(true); - current->setFocus(); - current->setMouseTracking(true); - diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml deleted file mode 100644 index e317b36..0000000 --- a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml +++ /dev/null @@ -1,419 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml.del b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml.del new file mode 100644 index 0000000..e317b36 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml.del @@ -0,0 +1,419 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml deleted file mode 100644 index 6b26d11..0000000 --- a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml +++ /dev/null @@ -1,574 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml.del b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml.del new file mode 100644 index 0000000..6b26d11 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml.del @@ -0,0 +1,574 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12 From 50a4a0ce1f5128874f7354179b40926d72c4b923 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 29 Nov 2016 13:48:14 +0000 Subject: pam: update to 1.3.0 --- abs/core/pam/PKGBUILD | 18 ++++------ abs/core/pam/__changelog | 1 + abs/core/pam/pam-1.1.8-cve-2013-7041.patch | 52 --------------------------- abs/core/pam/pam-1.1.8-cve-2014-2583.patch | 56 ------------------------------ 4 files changed, 7 insertions(+), 120 deletions(-) create mode 100644 abs/core/pam/__changelog delete mode 100644 abs/core/pam/pam-1.1.8-cve-2013-7041.patch delete mode 100644 abs/core/pam/pam-1.1.8-cve-2014-2583.patch diff --git a/abs/core/pam/PKGBUILD b/abs/core/pam/PKGBUILD index 9290c1e..3279743 100644 --- a/abs/core/pam/PKGBUILD +++ b/abs/core/pam/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: judd pkgname=pam -pkgver=1.2.1 +pkgver=1.3.0 pkgrel=1 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespac source=(http://linux-pam.org/library/Linux-PAM-$pkgver.tar.bz2 https://sources.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2 pam_unix2-glibc216.patch) -md5sums=('9dc53067556d2dd567808fd509519dd6' +md5sums=('da4b2289b7cfb19583d54e9eaaef1c3a' 'da6a46e5f8cd3eaa7cbc4fc3a7e2b555' 'dac109f68e04a4df37575fda6001ea17') @@ -53,16 +53,6 @@ package() { cd $srcdir/pam_unix2-2.9.1 make DESTDIR=$pkgdir install - # add the realtime permissions for audio users - sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf - cat >>$pkgdir/etc/security/limits.conf <<_EOT -* - rtprio 0 -* - nice 0 -@audio - rtprio 65 -@audio - nice -10 -@audio - memlock 40000 -_EOT - # fix some missing symlinks from old pam for compatibility cd $pkgdir/usr/lib/security ln -s pam_unix.so pam_unix_acct.so @@ -75,4 +65,8 @@ _EOT # remove doc which is not used anymore # FS #40749 rm $pkgdir/usr/share/doc/Linux-PAM/sag-pam_userdb.html + + # disable coredumps + sed -i 's|# End of file||' $pkgdir/etc/security/limits.conf + echo "* hard core 0" >> $pkgdir/etc/security/limits.conf } diff --git a/abs/core/pam/__changelog b/abs/core/pam/__changelog new file mode 100644 index 0000000..5f2315e --- /dev/null +++ b/abs/core/pam/__changelog @@ -0,0 +1 @@ +PKGBUILD: disable coredumps in limits.conf diff --git a/abs/core/pam/pam-1.1.8-cve-2013-7041.patch b/abs/core/pam/pam-1.1.8-cve-2013-7041.patch deleted file mode 100644 index 96fa916..0000000 --- a/abs/core/pam/pam-1.1.8-cve-2013-7041.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 57a1e2b274d0a6376d92ada9926e5c5741e7da20 Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -Date: Fri, 24 Jan 2014 22:18:32 +0000 -Subject: [PATCH] pam_userdb: fix password hash comparison - -Starting with commit Linux-PAM-0-77-28-g0b3e583 that introduced hashed -passwords support in pam_userdb, hashes are compared case-insensitively. -This bug leads to accepting hashes for completely different passwords in -addition to those that should be accepted. - -Additionally, commit Linux-PAM-1_1_6-13-ge2a8187 that added support for -modern password hashes with different lengths and settings, did not -update the hash comparison accordingly, which leads to accepting -computed hashes longer than stored hashes when the latter is a prefix -of the former. - -* modules/pam_userdb/pam_userdb.c (user_lookup): Reject the computed -hash whose length differs from the stored hash length. -Compare computed and stored hashes case-sensitively. -Fixes CVE-2013-7041. - -Bug-Debian: http://bugs.debian.org/731368 ---- - modules/pam_userdb/pam_userdb.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c -index de8b5b1..ff040e6 100644 ---- a/modules/pam_userdb/pam_userdb.c -+++ b/modules/pam_userdb/pam_userdb.c -@@ -222,12 +222,15 @@ user_lookup (pam_handle_t *pamh, const char *database, const char *cryptmode, - } else { - cryptpw = crypt (pass, data.dptr); - -- if (cryptpw) { -- compare = strncasecmp (data.dptr, cryptpw, data.dsize); -+ if (cryptpw && strlen(cryptpw) == (size_t)data.dsize) { -+ compare = memcmp(data.dptr, cryptpw, data.dsize); - } else { - compare = -2; - if (ctrl & PAM_DEBUG_ARG) { -- pam_syslog(pamh, LOG_INFO, "crypt() returned NULL"); -+ if (cryptpw) -+ pam_syslog(pamh, LOG_INFO, "lengths of computed and stored hashes differ"); -+ else -+ pam_syslog(pamh, LOG_INFO, "crypt() returned NULL"); - } - }; - --- -1.8.3.1 - diff --git a/abs/core/pam/pam-1.1.8-cve-2014-2583.patch b/abs/core/pam/pam-1.1.8-cve-2014-2583.patch deleted file mode 100644 index f2aa2de..0000000 --- a/abs/core/pam/pam-1.1.8-cve-2014-2583.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9dcead87e6d7f66d34e7a56d11a30daca367dffb Mon Sep 17 00:00:00 2001 -From: "Dmitry V. Levin" -Date: Wed, 26 Mar 2014 22:17:23 +0000 -Subject: [PATCH] pam_timestamp: fix potential directory traversal issue - (ticket #27) - -pam_timestamp uses values of PAM_RUSER and PAM_TTY as components of -the timestamp pathname it creates, so extra care should be taken to -avoid potential directory traversal issues. - -* modules/pam_timestamp/pam_timestamp.c (check_tty): Treat -"." and ".." tty values as invalid. -(get_ruser): Treat "." and ".." ruser values, as well as any ruser -value containing '/', as invalid. - -Fixes CVE-2014-2583. - -Reported-by: Sebastian Krahmer ---- - modules/pam_timestamp/pam_timestamp.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/modules/pam_timestamp/pam_timestamp.c b/modules/pam_timestamp/pam_timestamp.c -index 5193733..b3f08b1 100644 ---- a/modules/pam_timestamp/pam_timestamp.c -+++ b/modules/pam_timestamp/pam_timestamp.c -@@ -158,7 +158,7 @@ check_tty(const char *tty) - tty = strrchr(tty, '/') + 1; - } - /* Make sure the tty wasn't actually a directory (no basename). */ -- if (strlen(tty) == 0) { -+ if (!strlen(tty) || !strcmp(tty, ".") || !strcmp(tty, "..")) { - return NULL; - } - return tty; -@@ -243,6 +243,17 @@ get_ruser(pam_handle_t *pamh, char *ruserbuf, size_t ruserbuflen) - if (pwd != NULL) { - ruser = pwd->pw_name; - } -+ } else { -+ /* -+ * This ruser is used by format_timestamp_name as a component -+ * of constructed timestamp pathname, so ".", "..", and '/' -+ * are disallowed to avoid potential path traversal issues. -+ */ -+ if (!strcmp(ruser, ".") || -+ !strcmp(ruser, "..") || -+ strchr(ruser, '/')) { -+ ruser = NULL; -+ } - } - if (ruser == NULL || strlen(ruser) >= ruserbuflen) { - *ruserbuf = '\0'; --- -1.8.3.1 - -- cgit v0.12 From 0b9e08ce04023f6668886da4f77e81bc69d8cb21 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 29 Nov 2016 14:06:37 +0000 Subject: linhes-theme: fix theme version --- abs/core/linhes-theme/PKGBUILD | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index b30b086..963232e 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=13 +pkgrel=14 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -80,19 +80,18 @@ package() { msg "Modifying yellows and blue to LinHES yellow and blue" #yellow - grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#d9d900/\#ebb81c/g" || return 0 + grep -lr '#d9d900' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#d9d900/\#ebb81c/g" #darkyellow - grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#CCCC29/\#ebb81c/g" || return 0 + grep -lr '#CCCC29' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#CCCC29/\#ebb81c/g" #blue - grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\#3a9ade/\#0072bc/g" || return 0 + grep -lr '#3a9ade' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\#3a9ade/\#0072bc/g" msg "Modifying fonts to Overlock" - grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs sed -i "s/\DejaVu Sans/\Overlock/g" + grep -lr 'DejaVu Sans' $pkgdir/$THEMEROOT/LinHES/ | xargs -r sed -i "s/\DejaVu Sans/\Overlock/g" msg "Updating themeinfo.xml version number" - IFS="." read -a array <<< "$pkgver" - sed -i "s/MAJ_VER/${array[0]}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml - sed -i "s/MIN_VER/${array[1]}${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml + sed -i "s/MAJ_VER/${pkgver//.}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml + sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' '196b4d6691e95b87a76a9ed8be31a3d9' -- cgit v0.12 From 1f1afd7c0580cf47a64a028608a259d360a02717 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 29 Nov 2016 22:13:42 +0000 Subject: nano: update to 2.7.1 --- abs/core/nano/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/nano/PKGBUILD b/abs/core/nano/PKGBUILD index b1fe973..190f2d4 100644 --- a/abs/core/nano/PKGBUILD +++ b/abs/core/nano/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Judd pkgname=nano -pkgver=2.7.0 +pkgver=2.7.1 pkgrel=1 pkgdesc="Pico editor clone with enhancements" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('base') depends=('ncurses' 'file' 'sh') backup=('etc/nanorc') source=(http://www.nano-editor.org/dist/v2.7/${pkgname}-${pkgver}.tar.gz{,.asc}) -md5sums=('0805c5b8c75d4fde053e4b1431270f91' +md5sums=('6d6aea789dd15171d8d05d2359c52f23' 'SKIP') validpgpkeys=('8DA6FE7BFA7A418AB3CB2354BCB356DF91009FA7' # "Chris Allegretta " 'A7F6A64A67DA09EF92782DD79DF4862AF1175C5B' # "Benno Schulenberg " -- cgit v0.12 From d2db1581d23f1f19ac72a0637de9c141f9370977 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 29 Nov 2016 22:15:26 +0000 Subject: less: update to 487 --- abs/core/less/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/less/PKGBUILD b/abs/core/less/PKGBUILD index 5a5c2a4..c833986 100644 --- a/abs/core/less/PKGBUILD +++ b/abs/core/less/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: judd pkgname=less -pkgver=481 -pkgrel=2 +pkgver=487 +pkgrel=1 pkgdesc='A terminal based program for viewing text files' license=('GPL3') arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('base') depends=('glibc' 'ncurses' 'pcre') validpgpkeys=('AE27252BD6846E7D6EAE1DD6F153A7C833235259') # Mark Nudelman source=("http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('50ef46065c65257141a7340123527767' +md5sums=('dcc8bf183a83b362d37fe9ef8df1fb60' 'SKIP') build() { -- cgit v0.12 From 4923b67da2fee78a66c5eb7687b696b1c86c96ce Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 30 Nov 2016 13:21:34 +0000 Subject: LinHES-system: checkXFSfrag.sh: fix percentage parsing --- abs/core/LinHES-system/PKGBUILD | 4 ++-- abs/core/LinHES-system/checkXFSfrag.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 7a02894..9cc6e8b 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.4 -pkgrel=16 +pkgrel=17 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -125,7 +125,7 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' 'bacc813b48bafcc6fe906e5969930501' 'dedd3fcb1abec6361f4060d8149c7d6d' '8b0298f70f97cc1dc2a58b9a73c64bd3' - 'b4bb70650893c811c854d446cfa6ca6a' + '85558db5864bc70676ef46acc4595f88' 'e30bf8ec8b9dcc2ceb7127375a91d8d1' 'e9f545c3bcf9c85b45496c281fc6a1b8' 'a94fe6d980f4b810f2e2ae5352084b39' diff --git a/abs/core/LinHES-system/checkXFSfrag.sh b/abs/core/LinHES-system/checkXFSfrag.sh index 709cdac..5fccece 100755 --- a/abs/core/LinHES-system/checkXFSfrag.sh +++ b/abs/core/LinHES-system/checkXFSfrag.sh @@ -42,11 +42,11 @@ do isSATA=`cat /sys/block/${device}/queue/rotational` if [[ $isSATA -eq 1 ]] then - percentage=`$xfsdb -c frag -r ${i}|cut -f 7 --delim=" "` + percentage=`$xfsdb -c frag -r ${i}|grep factor|cut -f 7 --delim=" "` percent2=`$e $percentage|cut -f 1 --delim=.` if [ "$percent2" -gt "$pctmax" ] then - $e "${i} is $percentage% fragmented. Running defragment on ${i}." + $e "${i} is $percentage fragmented. Running defragment on ${i}." # Only uncomment one of the following two lines. #$xfsfsr -v ${i} # Uncomment for verbose defrag. $ionice -c3 $xfsfsr ${i} # Uncomment for quiet defrag. -- cgit v0.12 From f6dd92b3cd34e192b1c1a343f8757e785ec9e0e4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 8 Dec 2016 19:35:52 +0000 Subject: linhes-theme: add image-ui.xml for new gallery --- abs/core/linhes-theme/PKGBUILD | 5 +- abs/core/linhes-theme/image-ui.xml | 632 +++++++++++++++++++++++++++++++++++++ 2 files changed, 635 insertions(+), 2 deletions(-) create mode 100644 abs/core/linhes-theme/image-ui.xml diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 963232e..10fe8e1 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=14 +pkgrel=15 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -15,7 +15,7 @@ patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' 'bubble_background.png' 'preview.png' 'blank_coverart.png' 'checkmark.png' 'error.png' 'gears.png' 'question.png' 'warning.png' - 'progdetails_page1.html' + 'progdetails_page1.html' 'image-ui.xml' 'LHLogo.png' 'LHLogoAndText.png') install=$pkgname.install @@ -114,5 +114,6 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' 'e8ac15e38b3dc99c9e889e439ba356de' 'e8cf0d3a55ba3be47deae55c05432141' '58834fbee0230c713802c61e635cbab0' + '84fe19ee18a13736534f084f45604809' 'b51ef0cbf8ed2d3a8c1a8257a89aceff' '09ad14842f828b7a8d24070ec8214fe5') diff --git a/abs/core/linhes-theme/image-ui.xml b/abs/core/linhes-theme/image-ui.xml new file mode 100644 index 0000000..3d2057b --- /dev/null +++ b/abs/core/linhes-theme/image-ui.xml @@ -0,0 +1,632 @@ + + + + + + + + + + 0,36,1280,40 + box + + + + 0,37,1280,2 + + + + 0,73,1280,2 + + + + 1215,697,50,20 + + + + + + + + + + + 15,80,100%-10,100%-30 + 0,15,100%,100%-10 + flowing + grid + fixed + allcenter + 0 + + 0,0,100%,100% + + 0,0,10%,16% + + 0,0,100%,100% + + + 1%,1%,99%,99% + + + + 4%,4%,96%,96% + yes + + + + + + + + + + + + + 0,0,100%,100% + + 0,0,100%,100% + + 30%,30%,55%,55% + images/folderclosed.png + yes + + + + + 0,0,100%,100% + + 0,0,100%,100% + images/image_gallery_no_image + 64 + + + + 0,0,50%,50% + + 0,0,100%,100% + images/no_preview_with_fanart.png + yes + + + + + + + + 0,0,100%,100% + + 0,0,100%,100% + + 30%,30%,55%,55% + images/mv_gallery_dir_up.png + yes + + + + + + 0,0,100%,100% + + + 0,0,100%,100% + + 0,0,100%,100% + box + + + + + + + 0,0,100%,100% + + 70%,5%,76%,26% + + 0,0,100%,100% + ellipse + + + + 4%,4%,96%,96% + images/checkmark.png + no + + + + + 3%,97%-22,97%,22 + roundbox + 4 + + + + + + -8,-8,10%+16,16%+16 + + 0,0,100%,100% + roundbox + + 8 + + + 0,0,100%,100% + roundbox + + + 8 + + + 8%,0,92%,4 + box + + + + + + + + + + 8%,100%-4,92%,4 + + + 0,8%,4,92% + box + + + + + + + + + + 100%-4,8%,4,92% + + + + 0,0,100%,100% + + 0,0,100%,100% + + 30%,30%,55%,55% + images/folderopen.png + yes + + + + + + + + + images/mv_gallery_dir_up_open.png + + + + + + + + + + + + + + + 1207,623 + + + images/lists_up_arrow.png + 80 + + + + + images/lists_up_arrow.png + 200 + + + + + 1227,623 + + + images/lists_down_arrow.png + 80 + + + + + images/lists_down_arrow.png + 200 + + + + + + + + + 7 + + + 0,0,12%,24% + + + -8,-8,12%+16,24%+16 + + + + + + + 10 + + + 0,0,16%,32% + + + -10,-12,16%+20,32%+20 + + + + + + + 0 + + + 0,0,25%,50% + + + -9,-9,25%+16,50%+10 + + + + + + + + + + 10,80,510,100%-30 + vertical + 0 + free + stack + items + center + 0,0,100%,100% + + + 0,0,100%,30 + + 0,0,100%,100% + + + box + + + + + + + + + 20,-15 + + + 0 + + + + + images/lists_up_arrow.png + 200 + + + + + 20,100%+10 + + + 0 + + + + + images/lists_down_arrow.png + 200 + + + + + + + + 0,0,100%,100% + + +
+ + +
+ + + +
+ + +
+ + + + 64,624,1152,60 + roundbox + + 8 + + + + 65,625,1150,58 + roundbox + + + 6 + + + + 66,626,1148,2 + box + + + + + + + + + + + 66,680,1148,2 + + + + 66,628,2,52 + box + + + + + + + + + + + 1212,628,2,52 + + + + + 90,650,1100,8 + horizontal + + + 0,0,100%,100% + images/osd/progressbar_background.png + + + 0,0,100%,100% + images/osd/progressbar_fill.png + + + + + + + + + + + + + + + + + + + + + + #000000 + 2 + + + + + 0,0,100%,100% + + + + + + 0,0,100%,100% + yes + + + + + + + + + + + + + + + + + 10,30,510,100%-30 + vertical + 1 + free + stack + items + center + 0,0,100%,100% + + + 0,0,100%,30 + + 0,0,100%,100% + + + + + 0,0,100%,64 + + 0,0,100%,100%-2 + box + + + 1,1,100%-2,100%-2 + + + + 0,0,2,100% + + + 100%-4,0,2,100% + + + + + + + 20,-15 + + + 0 + + + + + images/lists_up_arrow.png + 200 + + + + + 20,100%+10 + + + 0 + + + + + images/lists_down_arrow.png + 200 + + + + + + + + -- cgit v0.12 From 64d83324ddd639d0e2d0f4bace4ebccab2a5c2d3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 12 Dec 2016 18:40:01 +0000 Subject: google-chrome: update to 55.0.2883.75 --- abs/extra/google-chrome/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD index 959f80d..d3e765f 100644 --- a/abs/extra/google-chrome/PKGBUILD +++ b/abs/extra/google-chrome/PKGBUILD @@ -5,7 +5,7 @@ # or use: $ curl -s https://dl.google.com/linux/chrome/rpm/stable/x86_64/repodata/other.xml.gz | gzip -df | awk -F\" '/pkgid/{ sub(".*-","",$4); print $4": "$10 }' pkgname=google-chrome -pkgver=54.0.2840.90 +pkgver=55.0.2883.75 pkgrel=1 pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)" arch=('x86_64') @@ -49,13 +49,13 @@ package() { msg2 "Fixing permissions of documentation folder..." chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/ - msg2 "Removing unnecessities (e.g. Debian Cron job)..." + msg2 "Removing Debian Cron job and duplicate product logos..." rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/ rm "$pkgdir"/opt/google/chrome/product_logo_*.png msg2 "Rename google-chrome-stable to google-chrome..." mv "$pkgdir"/usr/bin/google-chrome-stable "$pkgdir"/usr/bin/google-chrome } -md5sums=('f65863914e5f83d5f88094af93c85021' +md5sums=('45b8ef99605e140ea46198175f8dd512' 'da54da9383ddffa44c5db45513239da2' '99fa93d5e7fb5d622cef0f9621f3ffa3') -- cgit v0.12 From 5a918608ab8dde9d09dc5e8aea08855bf5145049 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 13 Dec 2016 18:45:58 +0000 Subject: mythtv & mythplugins: update to latest fixes mythtv: disable subtitle cutdown in recording options --- abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 4 +++- .../disable_subtitle_cutdown_in_recording_options.patch | 12 ++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash index 3fb8d98..b5dbddb 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash @@ -1 +1 @@ -e9d0543d64fc21072fb1a0199ac2e24334169461 +2d6466f1aa08c29531f27edd61963d5180186a96 diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD index 63cb9c9..d79049b 100644 --- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.28 -pkgrel=27 +pkgrel=28 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD index b369178..19f3648 100644 --- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.28 -pkgrel=27 +pkgrel=28 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') @@ -27,6 +27,7 @@ patches=( 'autoskip_reduce_commskip_jumpback.patch' 'change_msg_types.patch' 'disable_mythnotification_tuner_failure.patch' + 'disable_subtitle_cutdown_in_recording_options.patch' 'tv.cpp_fix_caps.patch' 'add_categorytype_Program.pm.patch' 'searchMetatdataSelectedGrabber.patch' @@ -112,6 +113,7 @@ md5sums=('e30b482dcd5f3e71c6419fd753bab2b1' '0bf5e92c0609a7eda8f253bf2e032590' 'f8a56ac814722b110dc9859169b9bda9' '1cd668136deea20efb79cf3e6310effc' + '3420d15014274b5bf8083355af71304b' '62c42b1043ebf65959fa9eced9ca3ed8' 'fa836371ebeb3be5b9855be8dd016f82' '0f674b9cad031ba1e03aaf6b5ee1499f' diff --git a/abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch b/abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch new file mode 100644 index 0000000..ed958e0 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/disable_subtitle_cutdown_in_recording_options.patch @@ -0,0 +1,12 @@ +--- src/mythtv/programs/mythfrontend/playbackbox.cpp.orig 2016-12-12 20:49:50.224910076 +0000 ++++ src/mythtv/programs/mythfrontend/playbackbox.cpp 2016-12-12 20:50:40.898386010 +0000 +@@ -3289,9 +3289,6 @@ + if (!pginfo.GetSubtitle().isEmpty()) + { + extra = QString('\n') + pginfo.GetSubtitle(); +- int maxll = max(title.length(), 20); +- if (extra.length() > maxll) +- extra = extra.left(maxll - 3) + "..."; + } + + return QString("\n%1%2\n%3").arg(title).arg(extra).arg(timedate); -- cgit v0.12 From feec9c241bacf20688e872aeba57f11a976d46df Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 13 Dec 2016 21:17:43 +0000 Subject: linhes-theme: fix radio and other music changes --- abs/core/linhes-theme/LHLogo.png | Bin abs/core/linhes-theme/LHLogoAndText.png | Bin abs/core/linhes-theme/PKGBUILD | 22 +- abs/core/linhes-theme/base.xml.patch | 14 +- abs/core/linhes-theme/blank_coverart.png | Bin abs/core/linhes-theme/checkmark.png | Bin abs/core/linhes-theme/controls-ui.xml.patch | 11 + abs/core/linhes-theme/error.png | Bin abs/core/linhes-theme/gears.png | Bin abs/core/linhes-theme/music-base.xml.patch | 112 ++++++ abs/core/linhes-theme/music-ui.xml.patch | 256 +++++++++++++ abs/core/linhes-theme/preview.png | Bin abs/core/linhes-theme/question.png | Bin abs/core/linhes-theme/stream-ui.xml.patch | 568 ++++++++++++++++++++++++++++ abs/core/linhes-theme/tux_thoughts.png | Bin abs/core/linhes-theme/video-ui.xml.patch | 50 ++- abs/core/linhes-theme/warning.png | Bin 17 files changed, 1020 insertions(+), 13 deletions(-) mode change 100755 => 100644 abs/core/linhes-theme/LHLogo.png mode change 100755 => 100644 abs/core/linhes-theme/LHLogoAndText.png mode change 100755 => 100644 abs/core/linhes-theme/blank_coverart.png mode change 100755 => 100644 abs/core/linhes-theme/checkmark.png create mode 100644 abs/core/linhes-theme/controls-ui.xml.patch mode change 100755 => 100644 abs/core/linhes-theme/error.png mode change 100755 => 100644 abs/core/linhes-theme/gears.png create mode 100644 abs/core/linhes-theme/music-base.xml.patch create mode 100644 abs/core/linhes-theme/music-ui.xml.patch mode change 100755 => 100644 abs/core/linhes-theme/preview.png mode change 100755 => 100644 abs/core/linhes-theme/question.png create mode 100644 abs/core/linhes-theme/stream-ui.xml.patch mode change 100755 => 100644 abs/core/linhes-theme/tux_thoughts.png mode change 100755 => 100644 abs/core/linhes-theme/warning.png diff --git a/abs/core/linhes-theme/LHLogo.png b/abs/core/linhes-theme/LHLogo.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/LHLogoAndText.png b/abs/core/linhes-theme/LHLogoAndText.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 10fe8e1..21f4f02 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,15 +1,17 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=15 +pkgrel=16 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') url="http://linhes.org/" patches=('readme.txt.patch' 'osd.xml.patch' 'base.xml.patch' - 'menu-ui-vert.xml.patch' 'notification-ui.xml.patch' - 'schedule-ui.xml.patch' 'qtlook.txt.patch' - 'recordings-ui.xml.patch' 'video-ui.xml.patch') + 'controls-ui.xml.patch' 'menu-ui-vert.xml.patch' + 'music-base.xml.patch' 'music-ui.xml.patch' + 'notification-ui.xml.patch' 'qtlook.txt.patch' + 'recordings-ui.xml.patch' 'schedule-ui.xml.patch' + 'stream-ui.xml.patch' 'video-ui.xml.patch') #The LinHES theme is based on TintedGlass 4.56 by Harley Peters source=(`echo ${patches[@]:0}` 'themeinfo.xml' 'install-ui.xml' 'osd_subtitle.xml' @@ -70,8 +72,6 @@ package() { rsync -pL $srcdir/warning.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/preview.png $pkgdir/$THEMEROOT/LinHES/ - #tux_thoughts.png is the thought bubble for the menu descriptions - #rsync -pL $srcdir/tux_thoughts.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogo.png $pkgdir/$THEMEROOT/LinHES/images/ rsync -pL $srcdir/LHLogoAndText.png $pkgdir/$THEMEROOT/LinHES/images/ @@ -95,13 +95,17 @@ package() { } md5sums=('2dca856c2a4d1f959473512c94e43b60' '196b4d6691e95b87a76a9ed8be31a3d9' - 'f2b9c85519e80843294315a42870e582' + '4679c0ae9b20a0e0b1f8076c8ca9d0b4' + 'ed56a335f8523d288609a81c005cab3f' '43b1f213fd392fb07aac503e775e27bc' + '1839ffcf43f79bd1ea01e1157214b7ba' + '7c3f09b68984af25035662a7ebc1a297' '80bb72994eca59ca6dc9034ac185e7cc' - '22ff4044c8c29560451fb51dcbf4d44e' '9fe3371a8b964a7028126405cfaa330b' 'ca7efe27ec941e341a555451a48f42ed' - '0d62c91c3c1fe76a4549459741591312' + '22ff4044c8c29560451fb51dcbf4d44e' + '8312aff444945f80a76100696c81cb2e' + '5527190d8dd74e720b9160f851727390' '5a8fb2a5f0e657d52be6f0a6a006ce72' '35d77d91125e46728a30ab23d0903223' 'bfc32b9fa5dca3d46dd6f365ecb449b5' diff --git a/abs/core/linhes-theme/base.xml.patch b/abs/core/linhes-theme/base.xml.patch index f672114..83abca6 100644 --- a/abs/core/linhes-theme/base.xml.patch +++ b/abs/core/linhes-theme/base.xml.patch @@ -1,5 +1,5 @@ ---- base.xml.orig 2016-01-13 18:47:41.473066307 +0000 -+++ base.xml 2016-01-13 01:12:57.516392855 +0000 +--- base.xml.orig 2016-12-13 20:41:54.779274682 +0000 ++++ base.xml 2016-12-13 20:34:54.356551993 +0000 @@ -3,55 +3,55 @@ @@ -333,3 +333,13 @@ +@@ -1564,6 +1564,9 @@ + + 0,0,100%,100% + ++ + + images/lists_right_arrow.png + 0 diff --git a/abs/core/linhes-theme/blank_coverart.png b/abs/core/linhes-theme/blank_coverart.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/checkmark.png b/abs/core/linhes-theme/checkmark.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/controls-ui.xml.patch b/abs/core/linhes-theme/controls-ui.xml.patch new file mode 100644 index 0000000..6da0bcd --- /dev/null +++ b/abs/core/linhes-theme/controls-ui.xml.patch @@ -0,0 +1,11 @@ +--- controls-ui.xml.orig 2016-12-13 20:38:02.325765836 +0000 ++++ controls-ui.xml 2016-12-13 20:34:54.356551993 +0000 +@@ -73,7 +73,7 @@ + 0,0,1280,720 + + + + diff --git a/abs/core/linhes-theme/error.png b/abs/core/linhes-theme/error.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/gears.png b/abs/core/linhes-theme/gears.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/music-base.xml.patch b/abs/core/linhes-theme/music-base.xml.patch new file mode 100644 index 0000000..14eb785 --- /dev/null +++ b/abs/core/linhes-theme/music-base.xml.patch @@ -0,0 +1,112 @@ +--- music-base.xml.orig 2016-12-13 20:45:06.068067497 +0000 ++++ music-base.xml 2016-12-13 20:34:54.359884898 +0000 +@@ -360,7 +360,6 @@ + + +@@ -412,9 +411,12 @@ + + + +- +- 0,0,100%,100% +- ++ ++ 0,0,100%,100% ++ ++ + + + +@@ -504,7 +506,7 @@ + + + +@@ -514,7 +516,7 @@ + + + +@@ -574,7 +576,7 @@ + + + + +@@ -615,11 +617,11 @@ + baseevensmaller + allcenter + +- ++ + + 44,146 + +@@ -629,11 +631,11 @@ + + + +- 372,162 ++ 372,152 + + + + +@@ -718,7 +720,7 @@ + + + +@@ -739,17 +741,17 @@ + +- ++ + +- 372,90 ++ 372,79 + + + + diff --git a/abs/core/linhes-theme/music-ui.xml.patch b/abs/core/linhes-theme/music-ui.xml.patch new file mode 100644 index 0000000..762bae2 --- /dev/null +++ b/abs/core/linhes-theme/music-ui.xml.patch @@ -0,0 +1,256 @@ +--- music-ui.xml.orig 2016-12-13 20:47:17.067929339 +0000 ++++ music-ui.xml 2016-12-13 20:34:54.363217804 +0000 +@@ -6,7 +6,7 @@ + 0,0,1280,720 + + + + +@@ -41,7 +41,7 @@ + 28,44,1224,406 + yes + allcenter +- You haven't selected any tracks to play ++ Press MENU to add tracks to Current Playlist + + + +@@ -92,7 +92,7 @@ + + + + + +@@ -153,40 +153,45 @@ + + + + + +- + + + +- 219,40 ++ 229,40 + + +- + + +@@ -217,7 +222,7 @@ + 0,0,1280,720 + + + + +@@ -355,7 +360,7 @@ + 0,0,1280,720 + + + + +@@ -681,7 +686,7 @@ + 5,1,-5,-3 + bottom,hcenter + 5,5 +- baseextrasmall ++ baseextrasmallyellow + yes + + +@@ -1909,6 +1914,122 @@ + + + ++ ++ 0,0,1280,720 ++ ++ ++ ++ ++ ++ ++ 20,36,1240,453 ++ ++ ++ ++ 21,37,1238,451 ++ ++ ++ ++ 21,38,1238,2 ++ ++ ++ ++ 21,486,1238,2 ++ ++ ++ ++ 22,40,2,446 ++ ++ ++ ++ 1256,40,2,446 ++ ++ ++ ++ 1207,490,50,11 ++ ++ ++ ++ 28,44,1224,440 ++ -1,466 ++ 0,0,1224,440 ++ ++ ++ 0,0,100%,30 ++ ++ ++ ++ ++ 0,0,100%,100% ++ ++ ++ ++ ++ ++ 0,0,100%,100% ++ ++ ++ ++ ++ ++ 1186,448 ++ ++ ++ ++ 1206,448 ++ ++ ++ ++ ++ 339,153 ++ ++ ++ ++ 0,0,602,144 ++ ++ ++ 1,1,600,142 ++ ++ ++ 2,2,598,2 ++ ++ ++ 2,140,598,2 ++ ++ ++ 2,4,2,138 ++ ++ ++ 598,4,2,138 ++ ++ ++ 33,65 ++ images/busy/busy%1.png ++ 12 ++ ++ ++ ++ ++ ++ ++ ++ 0,506,1280,240 ++ ++ ++ ++ + + 0,0,1280,720 + +@@ -3492,7 +3613,7 @@ + + + +- ++ + 0,0,800,360 + + diff --git a/abs/core/linhes-theme/preview.png b/abs/core/linhes-theme/preview.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/question.png b/abs/core/linhes-theme/question.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/stream-ui.xml.patch b/abs/core/linhes-theme/stream-ui.xml.patch new file mode 100644 index 0000000..e555b2b --- /dev/null +++ b/abs/core/linhes-theme/stream-ui.xml.patch @@ -0,0 +1,568 @@ +--- stream-ui.xml.orig 2016-12-13 20:49:12.313146317 +0000 ++++ stream-ui.xml 2016-12-13 20:34:54.363217804 +0000 +@@ -41,7 +41,7 @@ + 28,40,1224,276 + yes + allcenter +- Press MENU to add some radio streams to play. ++ Press MENU to add radio streams to play + + + +@@ -90,21 +90,24 @@ + + + +- +- +- + + + 0,0,100%,64 ++ ++ 0,0,100%,100% ++ + + 15,3,58,58 + mm_icecast.png +@@ -144,23 +147,43 @@ + + + +- +- +- ++ + + + + 0,0,100%,100% + ++ ++ ++ ++ + + + +@@ -263,6 +286,18 @@ + + 0,0,100%,100% + ++ ++ ++ ++ + + + +@@ -332,12 +367,12 @@ + + + + + +@@ -359,22 +394,6 @@ + allcenter + + +- +- +- +- +- +- +- +- + + 57,163 + +@@ -384,11 +403,11 @@ + + + +- 372,180 ++ 372,170 + + + + +@@ -408,6 +427,7 @@ + + + 116,37,1048,506 ++ 116,37,1048,566 + + + +@@ -415,23 +435,25 @@ + + + +- 117,540,1046,2 ++ 117,600,1046,2 + + + +- 117,40,2,500 ++ 117,40,2,560 + + + +- 1161,40,2,500 ++ 1161,40,2,560 + + + + 116,547,1048,137 ++ 116,619,1048,65 + + + + 117,548,1046,2 ++ 117,620,1046,2 + + + +@@ -439,85 +461,137 @@ + + + +- 117,550,2,131 ++ 117,622,2,59 + + + +- 1161,550,2,131 +- +- +- +- 138,620,1004,2 ++ 1161,622,2,59 + + +- + +- +- 343,68,800,40 ++ ++ 269,54,370,40 + + +- +- +- + +- +- 343,204 ++ ++ 779,54 ++ ++ ++ ++ ++ ++ 269,109,880,40 + + +- ++ ++ 269,164 ++ ++ ++ ++ ++ 269,219 ++ ++ ++ ++ ++ 269,274 ++ ++ ++ ++ ++ 269,329 ++ + +- +- 343,271 ++ ++ ++ 269,384 + + +- + +- +- 343,338 ++ ++ 269,439 + + +- + +- +- 343,405 ++ ++ 269,494 + + +- + +- +- 343,472 ++ ++ 779,494 ++ ++ ++ ++ ++ 269,549 ++ ++ ++ ++ ++ 779,549 + + + + ++ ++ + + +@@ -553,14 +627,6 @@ + 1256,40,2,211 + + +- +- 37,53,247,185 +- roundbox +- +- +- 6 +- +- + + 20,265,1240,420 + +@@ -589,50 +655,65 @@ + 1207,685,50,10 + + +- +- 41,57,239,177 +- images/stream_search_image.png +- images/masks/stream_search_image_mask.png +- no +- +- +- + +- +- 470,64,376,40 ++ ++ 231,64,370,40 + + +- + +- +- 470,125 ++ ++ 771,64 ++ ++ ++ ++ ++ ++ 231,125 ++ ++ ++ ++ ++ ++ 771,125 + + +- + + +- 470,186,376,40 ++ 231,186,370,40 + + + ++ ++ + + + +@@ -650,16 +731,16 @@ + 15,1,28,28 + mythmusic/mm_icecast.png + +- +- ++ + + 1184,2 +@@ -681,18 +762,21 @@ + 15,4,56,56 + mythmusic/mm_icecast.png + +- +- ++ ++ + + 1184,19 +@@ -708,6 +792,20 @@ + + 0,0,100%,100% + ++ ++ ++ ++ + + + +@@ -718,7 +816,6 @@ + + + +- + + + diff --git a/abs/core/linhes-theme/tux_thoughts.png b/abs/core/linhes-theme/tux_thoughts.png old mode 100755 new mode 100644 diff --git a/abs/core/linhes-theme/video-ui.xml.patch b/abs/core/linhes-theme/video-ui.xml.patch index 0047776..5c84fcd 100644 --- a/abs/core/linhes-theme/video-ui.xml.patch +++ b/abs/core/linhes-theme/video-ui.xml.patch @@ -1,5 +1,5 @@ ---- video-ui.xml.orig 2016-11-16 20:12:36.859292023 +0000 -+++ video-ui.xml 2016-11-16 20:11:55.327978776 +0000 +--- video-ui.xml.orig 2016-12-13 20:43:30.600314830 +0000 ++++ video-ui.xml 2016-12-13 20:34:54.359884898 +0000 @@ -171,6 +171,7 @@ +@@ -358,38 +359,38 @@ + + + + + + + + + @@ -641,7 +642,7 @@ yes basesmall diff --git a/abs/core/linhes-theme/warning.png b/abs/core/linhes-theme/warning.png old mode 100755 new mode 100644 -- cgit v0.12 From 169be0152e538d76f5d11ffb9a57fe3fa670f9e3 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 14 Dec 2016 19:00:08 +0000 Subject: alsa-lib: update to 1.1.2 --- abs/core/alsa-lib/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/alsa-lib/PKGBUILD b/abs/core/alsa-lib/PKGBUILD index af325f4..24f8aaa 100644 --- a/abs/core/alsa-lib/PKGBUILD +++ b/abs/core/alsa-lib/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: judd pkgname=alsa-lib -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ optdepends=('python2: for python smixer plugin') makedepends=('python2') license=('GPL') source=(ftp://ftp.alsa-project.org/pub/lib/$pkgname-$pkgver.tar.bz2) -sha1sums=('09f7e9b2d88287e04a4bb0d56e0cbc9018e524ec') +sha1sums=('574a0ebd4d218c81f73a0abae79f0e3cc9a6e402') build() { cd "$srcdir/$pkgname-$pkgver" -- cgit v0.12 From 61c2bbbe094f9ceffd3ffbb66f57d283572fa6cf Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 14 Dec 2016 19:01:17 +0000 Subject: alsa-utils: update to 1.1.2 --- abs/core/alsa-utils/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/alsa-utils/PKGBUILD b/abs/core/alsa-utils/PKGBUILD index d12067b..1e450d0 100644 --- a/abs/core/alsa-utils/PKGBUILD +++ b/abs/core/alsa-utils/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: judd pkgname=alsa-utils -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=1 pkgdesc="An alternative implementation of Linux sound support" arch=('i686' 'x86_64') @@ -38,5 +38,5 @@ package() { # dir where to save ALSA state install -d ${pkgdir}/var/lib/alsa } -md5sums=('f8d00ad5fba757b4c3735d066cc288e2' +md5sums=('38ac7c781f80c41c02b4664d8cbafa87' '529216f6a46e61a546640e08ea7a0879') -- cgit v0.12 From 73d83d38ae62c60b22d72f241f02a916daaf1d6c Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 15 Dec 2016 20:27:34 +0000 Subject: autofs: update to 5.1.2 --- abs/extra/autofs/PKGBUILD | 31 +++++++++++++++++-------------- abs/extra/autofs/__changelog | 1 + 2 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 abs/extra/autofs/__changelog diff --git a/abs/extra/autofs/PKGBUILD b/abs/extra/autofs/PKGBUILD index 0618dae..ce58b2e 100644 --- a/abs/extra/autofs/PKGBUILD +++ b/abs/extra/autofs/PKGBUILD @@ -1,28 +1,34 @@ -# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $ -# Maintainer: Lukas Fleischer +# Maintainer: Lukas Fleischer # Contributor: Andrea Scarpino # Contributor: Dale Blount # Contributor: Manolis Tzanidakis pkgname=autofs -pkgver=5.0.8 +pkgver=5.1.2 pkgrel=1 pkgdesc='A kernel-based automounter for Linux.' arch=('i686' 'x86_64') -url='http://freshmeat.net/projects/autofs' +url='https://www.kernel.org/pub/linux/daemons/autofs/' license=('GPL2') depends=('libxml2') makedepends=('libldap' 'krb5' 'kmod') optdepends=('krb5: for LDAP support') -backup=('etc/default/autofs' - 'etc/autofs/auto.master' - 'etc/autofs/auto.misc') +backup=('etc/autofs/auto.master' + 'etc/autofs/auto.misc' + 'etc/autofs/auto.net' + 'etc/autofs/auto.smb' + 'etc/autofs/autofs.conf' + 'etc/autofs/autofs_ldap_auth.conf' + 'etc/default/autofs') options=(!makeflags) -source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz") -sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52') +source=("https://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar."{xz,sign}) +sha256sums=('88b7de39088aead983e02072a7b753d5ee52ce419c8913f7a3d4ff5521313f0c' + 'SKIP') +validpgpkeys=('CD0A6E3CBB6768800B0736A8E7677380F54FD8A9') # Ian Kent prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \ -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master } @@ -30,9 +36,8 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \ - --with-mapdir=/etc/autofs --without-hesiod \ - --enable-ignore-busy --with-systemd + ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin --with-mapdir=/etc/autofs \ + --without-hesiod --enable-ignore-busy --with-systemd make } @@ -43,5 +48,3 @@ package() { rm -r "$pkgdir/run" install -dm755 "$pkgdir/etc/autofs/auto.master.d" } - -# vim:set ts=2 sw=2 et: diff --git a/abs/extra/autofs/__changelog b/abs/extra/autofs/__changelog new file mode 100644 index 0000000..e37323f --- /dev/null +++ b/abs/extra/autofs/__changelog @@ -0,0 +1 @@ +PKGBUILD: remove sssd dep and opt dep -- cgit v0.12 From fca162ce703a757f1b23106065851b574428315f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 15 Dec 2016 20:42:36 +0000 Subject: runit-scripts: autofs: modprobe autofs4 isn't needed anymore --- abs/core/runit-scripts/PKGBUILD | 4 ++-- abs/core/runit-scripts/runitscripts/services/autofs/run | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 4fd9efd..f31881e 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,9 +1,9 @@ pkgname=runit-scripts pkgver=8.4 -pkgrel=2 +pkgrel=3 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" -license="BSD" +license=('BSD') depends=('glibc' 'util-linux' 'initscripts' 'runit' ) makedepends=('gcc' 'make' 'rsync') conflicts=() diff --git a/abs/core/runit-scripts/runitscripts/services/autofs/run b/abs/core/runit-scripts/runitscripts/services/autofs/run index d6659c4..c0800a2 100755 --- a/abs/core/runit-scripts/runitscripts/services/autofs/run +++ b/abs/core/runit-scripts/runitscripts/services/autofs/run @@ -4,10 +4,6 @@ exec 2>&1 . /etc/rc.conf . /etc/rc.d/functions -stat_runit "Starting autofs4 kernel module" && echo "" -set -e # barf if modprobe fails -/usr/bin/modprobe autofs4 - stat_runit "Starting autofs automount" && echo "" # source application-specific settings [ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs -- cgit v0.12 From 02c29713e636d105e63fe2286fdd673a57573eea Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 15 Dec 2016 20:53:53 +0000 Subject: util-linux: update to 2.29 --- .../0001-chrt-default-to-SCHED_RR-policy.patch | 39 ++++ ...rser-for-proc-pid-stat-which-is-including.patch | 79 ++++++++ .../0001-sfdisk-cleanup-dump-error-messages.patch | 44 ++++ ...t-be-silent-when-list-non-existing-device.patch | 70 +++++++ .../0001-sfdisk-support-empty-label-use-case.patch | 223 +++++++++++++++++++++ abs/core/util-linux/PKGBUILD | 39 +++- 6 files changed, 488 insertions(+), 6 deletions(-) create mode 100644 abs/core/util-linux/0001-chrt-default-to-SCHED_RR-policy.patch create mode 100644 abs/core/util-linux/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch create mode 100644 abs/core/util-linux/0001-sfdisk-cleanup-dump-error-messages.patch create mode 100644 abs/core/util-linux/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch create mode 100644 abs/core/util-linux/0001-sfdisk-support-empty-label-use-case.patch diff --git a/abs/core/util-linux/0001-chrt-default-to-SCHED_RR-policy.patch b/abs/core/util-linux/0001-chrt-default-to-SCHED_RR-policy.patch new file mode 100644 index 0000000..c442149 --- /dev/null +++ b/abs/core/util-linux/0001-chrt-default-to-SCHED_RR-policy.patch @@ -0,0 +1,39 @@ +From c7adc2f204f19167f781fa2ee739e0ca386fc4f5 Mon Sep 17 00:00:00 2001 +From: Andreas Henriksson +Date: Fri, 2 Dec 2016 15:10:18 +0100 +Subject: [PATCH] chrt: default to SCHED_RR policy + +This fixes a regression introduced in: + +commit 7a4ea5664edba98bff28adec3a9c3cfb5763a495 +"chrt: add control struct" + +Previously (and as documented in the manpage) the default policy +was SCHED_RR. Now it's implicitly SCHED_OTHER (0) as the value +is not initialized explicitly anymore. + +Test-command: chrt 90 echo hello + +Reported-by: Patrick Pelissier +Addresses: http://bugs.debian.org/846572 +Signed-off-by: Andreas Henriksson +--- + schedutils/chrt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/schedutils/chrt.c b/schedutils/chrt.c +index a861d9f..73d1ffa 100644 +--- a/schedutils/chrt.c ++++ b/schedutils/chrt.c +@@ -409,7 +409,7 @@ static void set_sched(struct chrt_ctl *ctl) + + int main(int argc, char **argv) + { +- struct chrt_ctl _ctl = { .pid = -1 }, *ctl = &_ctl; ++ struct chrt_ctl _ctl = { .pid = -1, .policy = SCHED_RR }, *ctl = &_ctl; + int c; + + static const struct option longopts[] = { +-- +2.10.2 + diff --git a/abs/core/util-linux/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch b/abs/core/util-linux/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch new file mode 100644 index 0000000..b13f189 --- /dev/null +++ b/abs/core/util-linux/0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch @@ -0,0 +1,79 @@ +From 3fcbd7978980dc1a29c626b701333e27599e506d Mon Sep 17 00:00:00 2001 +From: OGAWA Hirofumi +Date: Wed, 23 Nov 2016 14:13:34 +0900 +Subject: [PATCH] lsns: Fix parser for /proc//stat which is including + space in comm + +For example, child process of spamd has + + 32031 (spamd child) S 32026 32026 32026 0 -1 4210752 338 0 0 0 ... + +fscanf("%d %*s %c %d*[^\n]") in read_process() can't parse above as we +expected, because %s only skips non-whitespace. I.e. it parses like +following, + + 32031 (spamd child) S 32026 32026 32026 0 -1 4210752 338 0 0 0 ... + +---+ +----+ + + %d %*s %c + +and returns 2 (pid=32031, state=c). + +This fixes it by skipping task->comm part manually. + +Signed-off-by: OGAWA Hirofumi +--- + sys-utils/lsns.c | 30 ++++++++++++++++++++++++++---- + 1 file changed, 26 insertions(+), 4 deletions(-) + +diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c +index e4fd208..809737c 100644 +--- a/sys-utils/lsns.c ++++ b/sys-utils/lsns.c +@@ -217,6 +217,30 @@ static int get_ns_ino(int dir, const char *nsname, ino_t *ino) + return 0; + } + ++static int parse_proc_stat(FILE *fp, pid_t *pid, char *state, pid_t *ppid) ++{ ++ char *line = NULL, *p; ++ size_t len = 0; ++ int rc; ++ ++ if (getline(&line, &len, fp) < 0) { ++ rc = -errno; ++ goto error; ++ } ++ ++ p = strrchr(line, ')'); ++ if (p == NULL || ++ sscanf(line, "%d (", pid) != 1 || ++ sscanf(p, ") %c %d*[^\n]", state, ppid) != 2) { ++ rc = -EINVAL; ++ goto error; ++ } ++ rc = 0; ++ ++error: ++ free(line); ++ return rc; ++} + + static int read_process(struct lsns *ls, pid_t pid) + { +@@ -255,11 +279,9 @@ static int read_process(struct lsns *ls, pid_t pid) + rc = -errno; + goto done; + } +- rc = fscanf(f, "%d %*s %c %d*[^\n]", &p->pid, &p->state, &p->ppid); +- if (rc != 3) { +- rc = rc < 0 ? -errno : -EINVAL; ++ rc = parse_proc_stat(f, &p->pid, &p->state, &p->ppid); ++ if (rc < 0) + goto done; +- } + rc = 0; + + for (i = 0; i < ARRAY_SIZE(p->ns_ids); i++) { +-- +2.10.2 + diff --git a/abs/core/util-linux/0001-sfdisk-cleanup-dump-error-messages.patch b/abs/core/util-linux/0001-sfdisk-cleanup-dump-error-messages.patch new file mode 100644 index 0000000..918138c --- /dev/null +++ b/abs/core/util-linux/0001-sfdisk-cleanup-dump-error-messages.patch @@ -0,0 +1,44 @@ +From c49b765a6e9031642e2bb846e93dddc6827e4b28 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 30 Nov 2016 10:53:56 +0100 +Subject: [PATCH] sfdisk: cleanup --dump error messages + +old: + # truncate -s 1G empty && ./sfdisk --dump empty + sfdisk: failed to dump partition table: Success + +new: + # truncate -s 1G empty && ./sfdisk --dump empty + sfdisk: empty: does not contain a recognized partition table. + +Addresses: https://github.com/karelzak/util-linux/issues/375 +Signed-off-by: Karel Zak +--- + disk-utils/sfdisk.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index 0f69d65..10307ad 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -950,13 +950,16 @@ static int command_dump(struct sfdisk *sf, int argc, char **argv) + if (rc) + err(EXIT_FAILURE, _("cannot open %s"), devname); + ++ if (!fdisk_has_label(sf->cxt)) ++ errx(EXIT_FAILURE, _("%s: does not contain a recognized partition table"), devname); ++ + dp = fdisk_new_script(sf->cxt); + if (!dp) + err(EXIT_FAILURE, _("failed to allocate dump struct")); + + rc = fdisk_script_read_context(dp, NULL); + if (rc) +- err(EXIT_FAILURE, _("failed to dump partition table")); ++ errx(EXIT_FAILURE, _("%s: failed to dump partition table"), devname); + + if (sf->json) + fdisk_script_enable_json(dp, 1); +-- +2.10.2 + diff --git a/abs/core/util-linux/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch b/abs/core/util-linux/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch new file mode 100644 index 0000000..4b088bb --- /dev/null +++ b/abs/core/util-linux/0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch @@ -0,0 +1,70 @@ +From fed304837f60b626f6198663990e76e506f89063 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Tue, 29 Nov 2016 15:58:18 +0100 +Subject: [PATCH] sfdisk: don't be silent when list non-existing device + +Addresses: https://github.com/karelzak/util-linux/issues/376 +Signed-off-by: Karel Zak +--- + disk-utils/sfdisk.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index 52f2a6d..0f69d65 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -560,6 +560,7 @@ static int write_changes(struct sfdisk *sf) + */ + static int command_list_partitions(struct sfdisk *sf, int argc, char **argv) + { ++ int fail = 0; + fdisk_enable_listonly(sf->cxt, 1); + + if (argc) { +@@ -568,13 +569,14 @@ static int command_list_partitions(struct sfdisk *sf, int argc, char **argv) + for (i = 0; i < argc; i++) { + if (ct) + fputs("\n\n", stdout); +- if (print_device_pt(sf->cxt, argv[i], 0, sf->verify) == 0) +- ct++; ++ if (print_device_pt(sf->cxt, argv[i], 1, sf->verify) != 0) ++ fail++; ++ ct++; + } + } else + print_all_devices_pt(sf->cxt, sf->verify); + +- return 0; ++ return fail; + } + + /* +@@ -582,6 +584,7 @@ static int command_list_partitions(struct sfdisk *sf, int argc, char **argv) + */ + static int command_list_freespace(struct sfdisk *sf, int argc, char **argv) + { ++ int fail = 0; + fdisk_enable_listonly(sf->cxt, 1); + + if (argc) { +@@ -590,13 +593,14 @@ static int command_list_freespace(struct sfdisk *sf, int argc, char **argv) + for (i = 0; i < argc; i++) { + if (ct) + fputs("\n\n", stdout); +- if (print_device_freespace(sf->cxt, argv[i], 0) == 0) +- ct++; ++ if (print_device_freespace(sf->cxt, argv[i], 1) != 0) ++ fail++; ++ ct++; + } + } else + print_all_devices_freespace(sf->cxt); + +- return 0; ++ return fail; + } + + /* +-- +2.10.2 + diff --git a/abs/core/util-linux/0001-sfdisk-support-empty-label-use-case.patch b/abs/core/util-linux/0001-sfdisk-support-empty-label-use-case.patch new file mode 100644 index 0000000..29ab44d --- /dev/null +++ b/abs/core/util-linux/0001-sfdisk-support-empty-label-use-case.patch @@ -0,0 +1,223 @@ +From 35ca51182782193f555fbdcb06bb10766550d017 Mon Sep 17 00:00:00 2001 +From: Karel Zak +Date: Wed, 30 Nov 2016 12:43:10 +0100 +Subject: [PATCH] sfdisk: support empty label use-case + +By default sfdisk creates partition table when a first partition is +specified, otherwise the device is not modified. This force users to +create at least one partition. + +This commit allows to create empty label without partitions if "label: +" header line is specified by script. + +The commit also modifies "New situation:" output to list label name +and label identifier. + +Addresses: https://github.com/karelzak/util-linux/issues/374 +Signed-off-by: Karel Zak +--- + disk-utils/fdisk-list.c | 23 +++++++++++++++-------- + disk-utils/fdisk-list.h | 1 + + disk-utils/sfdisk.8 | 18 +++++++++++++++++- + disk-utils/sfdisk.c | 17 +++++++++++++++++ + libfdisk/src/libfdisk.h.in | 1 + + libfdisk/src/libfdisk.sym | 5 +++++ + libfdisk/src/script.c | 20 +++++++++++++++++++- + 7 files changed, 75 insertions(+), 10 deletions(-) + +diff --git a/disk-utils/fdisk-list.c b/disk-utils/fdisk-list.c +index e6b2033..c9560f4 100644 +--- a/disk-utils/fdisk-list.c ++++ b/disk-utils/fdisk-list.c +@@ -34,10 +34,23 @@ static int is_ide_cdrom_or_tape(char *device) + return ret; + } + ++void list_disk_identifier(struct fdisk_context *cxt) ++{ ++ struct fdisk_label *lb = fdisk_get_label(cxt, NULL); ++ char *id = NULL; ++ ++ if (fdisk_has_label(cxt)) ++ fdisk_info(cxt, _("Disklabel type: %s"), ++ fdisk_label_get_name(lb)); ++ ++ if (!fdisk_is_details(cxt) && fdisk_get_disklabel_id(cxt, &id) == 0 && id) { ++ fdisk_info(cxt, _("Disk identifier: %s"), id); ++ free(id); ++ } ++} + + void list_disk_geometry(struct fdisk_context *cxt) + { +- char *id = NULL; + struct fdisk_label *lb = fdisk_get_label(cxt, NULL); + uint64_t bytes = fdisk_get_nsectors(cxt) * fdisk_get_sector_size(cxt); + char *strsz = size_to_human_string(SIZE_SUFFIX_SPACE +@@ -71,14 +84,8 @@ void list_disk_geometry(struct fdisk_context *cxt) + if (fdisk_get_alignment_offset(cxt)) + fdisk_info(cxt, _("Alignment offset: %lu bytes"), + fdisk_get_alignment_offset(cxt)); +- if (fdisk_has_label(cxt)) +- fdisk_info(cxt, _("Disklabel type: %s"), +- fdisk_label_get_name(lb)); + +- if (!fdisk_is_details(cxt) && fdisk_get_disklabel_id(cxt, &id) == 0 && id) { +- fdisk_info(cxt, _("Disk identifier: %s"), id); +- free(id); +- } ++ list_disk_identifier(cxt); + } + + void list_disklabel(struct fdisk_context *cxt) +diff --git a/disk-utils/fdisk-list.h b/disk-utils/fdisk-list.h +index eddab92..4ed5c25 100644 +--- a/disk-utils/fdisk-list.h ++++ b/disk-utils/fdisk-list.h +@@ -2,6 +2,7 @@ + #define UTIL_LINUX_FDISK_LIST_H + + extern void list_disklabel(struct fdisk_context *cxt); ++extern void list_disk_identifier(struct fdisk_context *cxt); + extern void list_disk_geometry(struct fdisk_context *cxt); + extern void list_freespace(struct fdisk_context *cxt); + +diff --git a/disk-utils/sfdisk.8 b/disk-utils/sfdisk.8 +index fcde872..efe4a86 100644 +--- a/disk-utils/sfdisk.8 ++++ b/disk-utils/sfdisk.8 +@@ -212,7 +212,10 @@ Deprecated option. Only the sector unit is supported. + .BR \-X , " \-\-label " \fItype + Specify the disk label type (e.g. \fBdos\fR, \fBgpt\fR, ...). If this option + is not given, then \fBsfdisk\fR defaults to the existing label, but if there +-is no label on the device yet, then the type defaults to \fBdos\fR. ++is no label on the device yet, then the type defaults to \fBdos\fR. The default ++or the current label may be overwritten by the "label: " script header ++line. The option \fB\-\-label\fR does not force \fBsfdisk\fR to create empty ++disk label (see the \fBEMPTY DISK LABEL\fR section below). + .TP + .BR \-Y , " \-\-label\-nested " \fItype + Force editing of a nested disk label. The primary disk label has to exist already. +@@ -404,6 +407,19 @@ For backward compatibility the \fBId=\fR field has the same meaning. + .RE + .RE + ++.SH "EMPTY DISK LABEL" ++.B sfdisk ++does not create partition table without partitions by default. The lines with ++partitions are expected in the script by default. The empty partition table has ++to be explicitly requested by "label: " script header line without any ++partitions lines. For example: ++.RS ++.sp ++.B "echo 'label: gpt' | sfdisk /dev/sdb" ++.sp ++.RE ++creates empty GPT partition table. Note that the \fB\-\-append\fR disables this feature. ++ + .SH "BACKING UP THE PARTITION TABLE" + It is recommended to save the layout of your devices. + .B sfdisk +diff --git a/disk-utils/sfdisk.c b/disk-utils/sfdisk.c +index 10307ad..2d65974 100644 +--- a/disk-utils/sfdisk.c ++++ b/disk-utils/sfdisk.c +@@ -1766,8 +1766,25 @@ static int command_fdisk(struct sfdisk *sf, int argc, char **argv) + } + } while (1); + ++ /* create empty disk label if label, but no partition specified */ ++ if (rc == SFDISK_DONE_EOF && created == 0 ++ && fdisk_script_has_force_label(dp) == 1 ++ && fdisk_table_get_nents(tb) == 0 ++ && fdisk_script_get_header(dp, "label")) { ++ ++ int xrc = fdisk_apply_script_headers(sf->cxt, dp); ++ created = !xrc; ++ if (xrc) { ++ fdisk_warnx(sf->cxt, _( ++ "Failed to apply script headers, " ++ "disk label not created.")); ++ rc = SFDISK_DONE_ABORT; ++ } ++ } ++ + if (!sf->quiet && rc != SFDISK_DONE_ABORT) { + fdisk_info(sf->cxt, _("\nNew situation:")); ++ list_disk_identifier(sf->cxt); + list_disklabel(sf->cxt); + } + +diff --git a/libfdisk/src/libfdisk.h.in b/libfdisk/src/libfdisk.h.in +index 9154f5b..59cce19 100644 +--- a/libfdisk/src/libfdisk.h.in ++++ b/libfdisk/src/libfdisk.h.in +@@ -642,6 +642,7 @@ const char *fdisk_script_get_header(struct fdisk_script *dp, const char *name); + int fdisk_script_set_header(struct fdisk_script *dp, const char *name, const char *data); + struct fdisk_table *fdisk_script_get_table(struct fdisk_script *dp); + int fdisk_script_get_nlines(struct fdisk_script *dp); ++int fdisk_script_has_force_label(struct fdisk_script *dp); + + int fdisk_script_set_userdata(struct fdisk_script *dp, void *data); + void *fdisk_script_get_userdata(struct fdisk_script *dp); +diff --git a/libfdisk/src/libfdisk.sym b/libfdisk/src/libfdisk.sym +index 02cd7a8..d6d4ac5 100644 +--- a/libfdisk/src/libfdisk.sym ++++ b/libfdisk/src/libfdisk.sym +@@ -274,3 +274,8 @@ FDISK_2.29 { + fdisk_labelitem_is_number; + fdisk_gpt_set_npartitions; + } FDISK_2.28; ++ ++ ++FDISK_2.30 { ++ fdisk_script_has_force_label; ++} FDISK_2.29; +diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c +index ae7e99a..0d1f260 100644 +--- a/libfdisk/src/script.c ++++ b/libfdisk/src/script.c +@@ -36,7 +36,8 @@ struct fdisk_script { + size_t nlines; + struct fdisk_label *label; + +- unsigned int json : 1; /* JSON output */ ++ unsigned int json : 1, /* JSON output */ ++ force_label : 1; /* label: specified */ + }; + + +@@ -354,6 +355,22 @@ int fdisk_script_get_nlines(struct fdisk_script *dp) + } + + /** ++ * fdisk_script_has_force_label: ++ * @dp: script ++ * ++ * Note that fdisk_script_set_header(dp, "label", name) does not modify ++ * force_label status. The label has to be specified by script. ++ * ++ * Returns: true if "label: " has been parsed. ++ */ ++int fdisk_script_has_force_label(struct fdisk_script *dp) ++{ ++ assert(dp); ++ return dp->force_label; ++} ++ ++ ++/** + * fdisk_script_read_context: + * @dp: script + * @cxt: context +@@ -706,6 +723,7 @@ static int parse_line_header(struct fdisk_script *dp, char *s) + if (strcmp(name, "label") == 0) { + if (dp->cxt && !fdisk_get_label(dp->cxt, value)) + goto done; /* unknown label name */ ++ dp->force_label = 1; + } else if (strcmp(name, "unit") == 0) { + if (strcmp(value, "sectors") != 0) + goto done; /* only "sectors" supported */ +-- +2.10.2 + diff --git a/abs/core/util-linux/PKGBUILD b/abs/core/util-linux/PKGBUILD index 64faa1a..72df84c 100644 --- a/abs/core/util-linux/PKGBUILD +++ b/abs/core/util-linux/PKGBUILD @@ -5,7 +5,8 @@ pkgbase=util-linux pkgname=(util-linux libutil-linux) -pkgver=2.27.1 +_pkgmajor=2.29 +pkgver=${_pkgmajor} pkgrel=1 pkgdesc="Miscellaneous system utilities for Linux" url="https://www.kernel.org/pub/linux/utils/util-linux/" @@ -14,13 +15,33 @@ makedepends=('systemd' 'python2') license=('GPL2') options=('strip' 'debug') validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284') # Karel Zak -source=("https://www.kernel.org/pub/linux/utils/util-linux/v${pkgver%.?}/$pkgbase-$pkgver.tar."{xz,sign} - pam-{login,common,su}) -md5sums=('3cd2698d1363a2c64091c2dadc974647' +source=("https://www.kernel.org/pub/linux/utils/util-linux/v$_pkgmajor/$pkgbase-$pkgver.tar."{xz,sign} + pam-{login,common,su} + '0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch' + '0001-sfdisk-cleanup-dump-error-messages.patch' + '0001-sfdisk-support-empty-label-use-case.patch' + '0001-chrt-default-to-SCHED_RR-policy.patch' + '0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch') +md5sums=('07b6845f48a421ad5844aa9d58edb837' 'SKIP' '4368b3f98abd8a32662e094c54e7f9b1' 'a31374fef2cba0ca34dfc7078e2969e4' - 'fa85e5cce5d723275b14365ba71a8aad') + 'fa85e5cce5d723275b14365ba71a8aad' + '3fce7192ce1b3d97fdffd0226ed63a90' + '2f3c061865360170cacda948035fd02d' + '6d2e3915124938577f0ff18ef701c87f' + '168c1cb2cfe7d4eddfc6e3f3b19d3ced' + '68c2076a9a09564ba0c9776540a175fa') + +prepare() { + cd "$pkgbase-$pkgver" + + patch -Np1 <../0001-sfdisk-don-t-be-silent-when-list-non-existing-device.patch + patch -Np1 <../0001-sfdisk-cleanup-dump-error-messages.patch + patch -Np1 <../0001-sfdisk-support-empty-label-use-case.patch + patch -Np1 <../0001-chrt-default-to-SCHED_RR-policy.patch + patch -Np1 <../0001-lsns-Fix-parser-for-proc-pid-stat-which-is-including.patch +} build() { cd "$pkgbase-$pkgver" @@ -36,7 +57,7 @@ build() { --enable-chfn-chsh \ --enable-write \ --enable-mesg \ - --enable-libmount-force-mountinfo \ + --disable-tailf \ --with-python=2 make @@ -80,6 +101,12 @@ package_util-linux() { ### runtime libs are shipped as part of libutil-linux rm "$pkgdir"/usr/lib/lib*.{a,so}* + + ### tailf has been deprecated for a while. let's not include it anymore. + rm \ + "$pkgdir"/usr/bin/tailf \ + "$pkgdir"/usr/share/bash-completion/completions/tailf \ + "$pkgdir"/usr/share/man/man1/tailf.1 } package_libutil-linux() { -- cgit v0.12 From cc64db97df32f2824eab168a4062d47fac7ca330 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 15 Dec 2016 20:56:40 +0000 Subject: procps-ng: update to 3.3.12 --- abs/core/procps-ng/PKGBUILD | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/abs/core/procps-ng/PKGBUILD b/abs/core/procps-ng/PKGBUILD index ba2e3bd..a017867 100644 --- a/abs/core/procps-ng/PKGBUILD +++ b/abs/core/procps-ng/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Eric Bélanger pkgname=procps-ng -pkgver=3.3.11 -pkgrel=2 +pkgver=3.3.12 +pkgrel=1 pkgdesc='Utilities for monitoring your system and its processes' url='https://gitlab.com/procps-ng/procps' license=('GPL' 'LGPL') @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') makedepends=('systemd') depends=('ncurses' 'libsystemd') source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1bdca65547df9ed019bd83649b0f8b8eaa017e25') +sha1sums=('82c0745f150f1385ca01fe7d24f05f74e31c94c6') groups=('base') @@ -38,6 +38,9 @@ build() { --sbindir=/usr/bin \ --enable-watch8bit \ --with-systemd \ + --disable-kill \ + + # kill is provided by util-linux make } @@ -45,8 +48,4 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - # provided by util-linux - rm "${pkgdir}/usr/bin/kill" - rm "${pkgdir}/usr/share/man/man1/kill.1" } -- cgit v0.12 From 6515a8aaf08ac660b3551540b001963d323630ad Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Dec 2016 13:52:07 +0000 Subject: linux: update to 4.4.39 --- abs/core/linux/PKGBUILD | 4 ++-- abs/core/linux/linux.install.pkg | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/linux/PKGBUILD b/abs/core/linux/PKGBUILD index 1e7309b..5b8d3ae 100644 --- a/abs/core/linux/PKGBUILD +++ b/abs/core/linux/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-4.4 -pkgver=4.4.26 +pkgver=4.4.39 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -25,7 +25,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' 'SKIP' - '100bb46956585d418a6950bc898c5abc8206c3e34adfaf7ce4f6d14598918f72' + 'fc2b60d221aeaf3eafec4f36f299e4002be81da85117c3f59963fdcb6facb929' 'SKIP' 'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64' '756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a' diff --git a/abs/core/linux/linux.install.pkg b/abs/core/linux/linux.install.pkg index 50cb5b6..90e9fbb 100644 --- a/abs/core/linux/linux.install.pkg +++ b/abs/core/linux/linux.install.pkg @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=4.4.26-1-ARCH +KERNEL_VERSION=4.4.39-1-ARCH post_install () { # updating module dependencies -- cgit v0.12 From 981c601dff5b62a3b32005276efee8c4058f9c3e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Dec 2016 13:53:10 +0000 Subject: ceton_infinitv: rebuild for kernel --- abs/core/ceton_infinitv/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abs/core/ceton_infinitv/PKGBUILD b/abs/core/ceton_infinitv/PKGBUILD index 839883c..2caaa68 100755 --- a/abs/core/ceton_infinitv/PKGBUILD +++ b/abs/core/ceton_infinitv/PKGBUILD @@ -2,10 +2,10 @@ pkgname=ceton_infinitv #_kernver=`uname -r` -_kernver=4.4.26-1-ARCH +_kernver=4.4.39-1-ARCH _extramods="extramodules-4.4-ARCH" pkgver=2013.0326.2226 -pkgrel=17 +pkgrel=18 usb_pkgver=0.1.0 pci_pkgver=`echo $pkgver | tr . _` pkgdesc="Drivers for Ceton InfiniTV4 - pci/usb " -- cgit v0.12 From 6e241feedea5eb2b1d7b38248c343798d71ac903 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Dec 2016 14:37:49 +0000 Subject: libglvnd: update to 0.1.1.20161028 --- abs/extra/libglvnd/PKGBUILD | 25 +++++++++++++++++++------ abs/extra/libglvnd/__changelog | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 abs/extra/libglvnd/__changelog diff --git a/abs/extra/libglvnd/PKGBUILD b/abs/extra/libglvnd/PKGBUILD index e9753c8..12011ec 100644 --- a/abs/extra/libglvnd/PKGBUILD +++ b/abs/extra/libglvnd/PKGBUILD @@ -2,18 +2,31 @@ # Maintainer: Felix Yan pkgname=libglvnd -pkgver=0.1.1 +pkgver=0.1.1.20161028 +_commit=470fc824a38521a52707c6c0f59d827aa5e0f45a pkgrel=1 pkgdesc="The GL Vendor-Neutral Dispatch library" arch=('i686' 'x86_64') url="https://github.com/NVIDIA/libglvnd" license=('custom:BSD-like') depends=('libxext') -makedepends=('xorg-server-devel' 'git' 'python2') -source=("git+https://github.com/NVIDIA/libglvnd.git#tag=v$pkgver" - LICENSE) +makedepends=('libx11' 'glproto' 'git' 'python2') +#source=("git+https://github.com/NVIDIA/libglvnd.git#tag=v$pkgver" +source=("git+https://github.com/NVIDIA/libglvnd.git#commit=$_commit" + LICENSE + https://patch-diff.githubusercontent.com/raw/NVIDIA/libglvnd/pull/110.patch + https://patch-diff.githubusercontent.com/raw/NVIDIA/libglvnd/pull/97.patch) sha1sums=('SKIP' - 'c88e07f333fcf8dcdbef370b85372b4d88ad8a66') + 'c88e07f333fcf8dcdbef370b85372b4d88ad8a66' + '048e89dbdd0a6ca33441a6273208e4126d9828fc' + '48fac1b1248f1a6766ebae66432269c5147b5815') + +prepare() { + cd $pkgname + # FS#51527 + patch -p1 -i ../97.patch + patch -p1 -i ../110.patch +} build() { cd $pkgname @@ -29,7 +42,7 @@ package() { # For compatibility with older nvidia drivers for bumblebee # Symlinks to /usr/lib will be in nvidia-libgl mkdir "$pkgdir/usr/lib/nvidia" - for _lib in libGL.so libGLESv1_CM.so libGLESv2.so; do + for _lib in libGL.so libGLESv1_CM.so libGLESv2.so libEGL.so; do mv "$pkgdir"/usr/lib/$_lib* "$pkgdir"/usr/lib/nvidia/ done diff --git a/abs/extra/libglvnd/__changelog b/abs/extra/libglvnd/__changelog new file mode 100644 index 0000000..99dab7b --- /dev/null +++ b/abs/extra/libglvnd/__changelog @@ -0,0 +1 @@ +PKGBUILD: change python dep to python2 -- cgit v0.12 From 1ae249023ee8cbe86100aa1ba2de7ce97547bf7f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Dec 2016 15:16:38 +0000 Subject: nvidia, nvidia-utils, nvidia-settings: update to 375.26 --- abs/core/nvidia-utils/PKGBUILD | 22 ++++++++++++++-------- abs/core/nvidia/PKGBUILD | 10 +++++----- abs/extra/nvidia-settings/PKGBUILD | 16 ++++++++-------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index dde54ab..95be900 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=nvidia-utils pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia') -pkgver=370.28 +pkgver=375.26 pkgrel=2 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -13,8 +13,8 @@ license=('custom') options=('!strip') source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('7d3e1c691cd53852f422a93169268178') -md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75') +sha512sums_i686=('3bc859a95469a45f3c627018248d83e178d160385c3d17d9f890b0d142ecd1220fb21c442e4fe7755b831227a9c820736f447b162acd9699819c6e8145d6d841') +sha512sums_x86_64=('f52f6597daa1eaf4cbd934d785da6028ef23ecef98e14746143e3738504f8d65b73788abbcf9fd812317fc2c53cdf1c4d4839de57fafdea1930a08c6b21f1992') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -37,8 +37,9 @@ prepare() { package_opencl-nvidia() { pkgdesc="OpenCL implemention for NVIDIA" - depends=('libcl' 'zlib') + depends=('zlib') optdepends=('opencl-headers: headers necessary for OpenCL development') + provides=('opencl-driver') cd "${_pkg}" # OpenCL @@ -86,6 +87,7 @@ package_nvidia-utils() { optdepends=('nvidia-settings: configuration tool' 'xorg-server-devel: nvidia-xconfig' 'opencl-nvidia: OpenCL support') + provides=('vulkan-driver') install="${pkgname}.install" cd "${_pkg}" @@ -98,17 +100,21 @@ package_nvidia-utils() { install -D -m755 "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}" ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0" + # Wayland stuff + install -D -m755 "libnvidia-egl-wayland.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.${pkgver}" + ln -s "libnvidia-egl-wayland.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.0" + # OpenGL libraries - install -D -m755 "libEGL.so.1" "${pkgdir}/usr/lib/nvidia/libEGL.so.1" install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libEGL_nvidia.so.${pkgver}" install -D -m755 "libGLESv1_CM_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM_nvidia.so.${pkgver}" install -D -m755 "libGLESv2_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2_nvidia.so.${pkgver}" + install -D -m644 "10_nvidia.json" "${pkgdir}/usr/share/glvnd/egl_vendor.d/10_nvidia.json" # OpenGL core library install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" install -D -m755 "libnvidia-eglcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-eglcore.so.${pkgver}" install -D -m755 "libnvidia-glsi.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glsi.so.${pkgver}" - + # misc install -D -m755 "libnvidia-ifr.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ifr.so.${pkgver}" install -D -m755 "libnvidia-fbc.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-fbc.so.${pkgver}" @@ -176,9 +182,9 @@ package_nvidia-utils() { install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia/NVIDIA_Changelog" cp -r html "${pkgdir}/usr/share/doc/nvidia/" ln -s nvidia "${pkgdir}/usr/share/doc/nvidia-utils" - + # distro specific files must be installed in /usr/share/X11/xorg.conf.d install -D -m644 nvidia-drm-outputclass.conf "${pkgdir}/usr/share/X11/xorg.conf.d/nvidia-drm-outputclass.conf" - + create_links } diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index e9254ba..47329f3 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -5,9 +5,9 @@ pkgbase=nvidia pkgname=(nvidia nvidia-dkms) -pkgver=370.28 +pkgver=375.26 _extramodules=extramodules-4.4-ARCH -pkgrel=2 +pkgrel=1 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -16,13 +16,13 @@ license=('custom') options=('!strip') source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('7d3e1c691cd53852f422a93169268178') -md5sums_x86_64=('3bcd9a132e50a17b846869f1c57b9c75') +sha512sums_i686=('3bc859a95469a45f3c627018248d83e178d160385c3d17d9f890b0d142ecd1220fb21c442e4fe7755b831227a9c820736f447b162acd9699819c6e8145d6d841') +sha512sums_x86_64=('f52f6597daa1eaf4cbd934d785da6028ef23ecef98e14746143e3738504f8d65b73788abbcf9fd812317fc2c53cdf1c4d4839de57fafdea1930a08c6b21f1992') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" -prepare() { +prepare() { sh "${_pkg}.run" --extract-only cd "${_pkg}" diff --git a/abs/extra/nvidia-settings/PKGBUILD b/abs/extra/nvidia-settings/PKGBUILD index 28ee5c4..798993e 100644 --- a/abs/extra/nvidia-settings/PKGBUILD +++ b/abs/extra/nvidia-settings/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=nvidia-settings pkgname=('nvidia-settings' 'libxnvctrl') -pkgver=370.28 +pkgver=375.26 pkgrel=1 pkgdesc="Tool for configuring the NVIDIA graphics driver" arch=('i686' 'x86_64') @@ -11,20 +11,20 @@ url="https://github.com/NVIDIA/nvidia-settings" license=('GPL2') makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxext') options=('staticlibs') -source=("git+https://github.com/NVIDIA/nvidia-settings#tag=$pkgver" +source=(ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${pkgver}.tar.bz2 libxnvctrl_so.patch) -sha1sums=('SKIP' - '16619a01e92e565c79ad344be87ad11244ac1762') +sha512sums=('e575670ccf7e3ef0089ee6a969f107f6f43d742a60cc325c6d95efc4773f34a6e013fd2c4e38b5f90054e24146a05c2300c0cf6a9b7013b556bacc1402956f49' + 'ed4b609de9691fbb4421eea340399331e7a5c5f47b9de8eade40ca8f78ac39a6f76cc106928cd0d79825f248a3a0eb563a10f68b7b6991cf3e28db0dde2a0f8d') prepare() { export PREFIX=/usr export NV_USE_BUNDLED_LIBJANSSON=0 - cd ${pkgbase} + cd ${pkgbase}-${pkgver} patch -p1 < "${srcdir}/libxnvctrl_so.patch" } build() { - cd ${pkgbase} + cd ${pkgbase}-${pkgver} make make -C src/libXNVCtrl } @@ -32,7 +32,7 @@ build() { package_nvidia-settings() { depends=('jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidia-utils' 'libxnvctrl') - cd ${pkgbase} + cd ${pkgbase}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 doc/nvidia-settings.desktop "${pkgdir}/usr/share/applications/nvidia-settings.desktop" @@ -46,7 +46,7 @@ package_libxnvctrl() { depends=('libxext') pkgdesc='NVIDIA NV-CONTROL X extension' - cd ${pkgbase} + cd ${pkgbase}-${pkgver} install -Dm 644 doc/{NV-CONTROL-API.txt,FRAMELOCK.txt} -t "${pkgdir}/usr/share/doc/${pkgname}" install -Dm 644 samples/{Makefile,README,*.c,*.h,*.mk} -t "${pkgdir}/usr/share/doc/${pkgname}/samples" -- cgit v0.12 From d32536aeee5a4bf2e0370e3aa81b26d6dfb77bd2 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Dec 2016 15:34:20 +0000 Subject: nvidia-340xx, nvidia-340xx-utils: update to 340.101 --- abs/core/nvidia-340xx-utils/PKGBUILD | 14 +++++++------- abs/core/nvidia-340xx/PKGBUILD | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/abs/core/nvidia-340xx-utils/PKGBUILD b/abs/core/nvidia-340xx-utils/PKGBUILD index 9b12806..a2e858e 100644 --- a/abs/core/nvidia-340xx-utils/PKGBUILD +++ b/abs/core/nvidia-340xx-utils/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=nvidia-340xx-utils pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx') -pkgver=340.98 -pkgrel=2 +pkgver=340.101 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" license=('custom') @@ -14,9 +14,9 @@ options=('!strip') source=(nvidia-drm-outputclass.conf) source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha1sums=('4ca2fbb2389d0bcb7a2c6f614860522d9ddf58ab') -sha1sums_i686=('931773a3be7ab03ff787974b0760cd9ee1bd14e2') -sha1sums_x86_64=('a31ff95eae0ec47b89a9ba5475d17d44ff4ee2e0') +sha512sums=('06c649df3b02c6ccf5491fecd06f4c979656aaba2bb366e6197e96bb0eecd8d0a46245e69628d507ddc8c5fc6d5f1cac694f036bc45ba51f82a092ebd6097bf5') +sha512sums_i686=('5866f2b4e6e22863c54d9fc08c9c88c9c911df2396d0ceaca653ded04589ea3a9e4550ed58f4b182b0a42cfe205ef643fe43ea709478e5df5360a7f74fa87f41') +sha512sums_x86_64=('d5bea7315346e93a7cccd3d99900f4dad51dfa6e93382d4d61c314d0ab97dea063169b8d666d3a3373dea33b4322f945c3a18ed0fc3308e3f89af6f22f373abc') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" @@ -39,10 +39,10 @@ prepare() { package_opencl-nvidia-340xx() { pkgdesc="OpenCL implemention for NVIDIA" - depends=('libcl' 'zlib') + depends=('zlib') optdepends=('opencl-headers: headers necessary for OpenCL development') conflicts=('opencl-nvidia') - provides=('opencl-nvidia') + provides=('opencl-nvidia' 'opencl-driver') cd "${_pkg}" # OpenCL diff --git a/abs/core/nvidia-340xx/PKGBUILD b/abs/core/nvidia-340xx/PKGBUILD index 973737b..ab42426 100644 --- a/abs/core/nvidia-340xx/PKGBUILD +++ b/abs/core/nvidia-340xx/PKGBUILD @@ -4,9 +4,9 @@ pkgbase=nvidia-340xx pkgname=(nvidia-340xx nvidia-340xx-dkms) -pkgver=340.98 +pkgver=340.101 _extramodules=extramodules-4.4-ARCH -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.nvidia.com/" makedepends=("nvidia-340xx-libgl=${pkgver}" "nvidia-340xx-utils=${pkgver}" 'linux' 'linux-headers>=4.4' 'linux-headers<4.5') @@ -15,8 +15,8 @@ license=('custom') options=(!strip) source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -md5sums_i686=('3ccb023eec137cbee0d2035c288b6bbe') -md5sums_x86_64=('e8d1292d8d002a15e10ea349151fa8f2') +sha512sums_i686=('5866f2b4e6e22863c54d9fc08c9c88c9c911df2396d0ceaca653ded04589ea3a9e4550ed58f4b182b0a42cfe205ef643fe43ea709478e5df5360a7f74fa87f41') +sha512sums_x86_64=('d5bea7315346e93a7cccd3d99900f4dad51dfa6e93382d4d61c314d0ab97dea063169b8d666d3a3373dea33b4322f945c3a18ed0fc3308e3f89af6f22f373abc') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" -- cgit v0.12 From 9ee082298e5d024afc9335ee78bb1ca06f93ab6f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 16 Dec 2016 16:25:18 +0000 Subject: nvidia-304xx, nvidia-304xx-utils: update to 304.134 --- abs/core/nvidia-304xx-utils/PKGBUILD | 10 +++++----- abs/core/nvidia-304xx/PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/abs/core/nvidia-304xx-utils/PKGBUILD b/abs/core/nvidia-304xx-utils/PKGBUILD index 45a30f0..6c48a82 100644 --- a/abs/core/nvidia-304xx-utils/PKGBUILD +++ b/abs/core/nvidia-304xx-utils/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=nvidia-304xx-utils pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx') -pkgver=304.132 +pkgver=304.134 pkgrel=1 arch=('i686' 'x86_64') url="http://www.nvidia.com/" @@ -13,8 +13,8 @@ makedepends=('zlib') options=('!strip') source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") -sha512sums_i686=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f') -sha512sums_x86_64=('990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c') +sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c') +sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc') if [ "$CARCH" = "i686" ]; then _arch='x86' @@ -40,9 +40,9 @@ build() { package_opencl-nvidia-304xx() { pkgdesc="OpenCL implemention for NVIDIA, 304xx legacy branch" - depends=('libcl' 'zlib') + depends=('zlib') optdepends=('opencl-headers: headers necessary for OpenCL development') - provides=('opencl-nvidia') + provides=('opencl-nvidia' 'opencl-driver') conflicts=('opencl-nvidia') cd ${_pkg} diff --git a/abs/core/nvidia-304xx/PKGBUILD b/abs/core/nvidia-304xx/PKGBUILD index e2a8a6d..9456106 100644 --- a/abs/core/nvidia-304xx/PKGBUILD +++ b/abs/core/nvidia-304xx/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=nvidia-304xx pkgname=(nvidia-304xx nvidia-304xx-dkms) -pkgver=304.132 +pkgver=304.134 _extramodules=extramodules-4.4-ARCH pkgrel=1 arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ source=('disable-mtrr.patch') source_i686+=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run") source_x86_64+=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") sha512sums=('54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774') -sha512sums_i686=('70a6ed74a93ac2a1acec5eab5078dfe05fab66c6264d67f3238a6b28af7b39f7205e237214bac4ee5d2366e8c6a4a63dfc8dc113e9e977ee2387c5c8c63ccc8f') -sha512sums_x86_64=('990c79120536335f83ecd665140b2af8f778785a2cdc8afb06abbacba49e66d87f5af25fb4d6c64779cf898b61273d17cb0213516f497d1c0fbd63b7c5e85d8c') +sha512sums_i686=('e047c62b33b092225ead42134acd596e3ae43d9bb8324188308dd7d497f33e790e7366d7a1c5ef5de66f484219d99de4c6e6206d390122d3fab4d30397ab463c') +sha512sums_x86_64=('339efb8b47faaa16b984d84e43ef18d849a563c95298972c36616a22712740e3233c2cd7b0837d393a8f24a6ec5b501295cdc77adae12deccc993dfca48022fc') [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}" [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" -- cgit v0.12 From 51155ea9a13fa4262fb159967d34071294536b23 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Sun, 18 Dec 2016 00:22:06 +0000 Subject: linhes-theme: change some Music things --- abs/core/linhes-theme/PKGBUILD | 6 ++--- abs/core/linhes-theme/music-base.xml.patch | 11 +++++++- abs/core/linhes-theme/music-ui.xml.patch | 41 +++++++++++++++++++++++++----- 3 files changed, 47 insertions(+), 11 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 21f4f02..475c577 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=16 +pkgrel=17 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -98,8 +98,8 @@ md5sums=('2dca856c2a4d1f959473512c94e43b60' '4679c0ae9b20a0e0b1f8076c8ca9d0b4' 'ed56a335f8523d288609a81c005cab3f' '43b1f213fd392fb07aac503e775e27bc' - '1839ffcf43f79bd1ea01e1157214b7ba' - '7c3f09b68984af25035662a7ebc1a297' + 'a0ea2d3e386c0b483b31aa1a2703f9eb' + 'ee2b82b909570b21375aee945fb27eb8' '80bb72994eca59ca6dc9034ac185e7cc' '9fe3371a8b964a7028126405cfaa330b' 'ca7efe27ec941e341a555451a48f42ed' diff --git a/abs/core/linhes-theme/music-base.xml.patch b/abs/core/linhes-theme/music-base.xml.patch index 14eb785..7c8e3bf 100644 --- a/abs/core/linhes-theme/music-base.xml.patch +++ b/abs/core/linhes-theme/music-base.xml.patch @@ -1,5 +1,5 @@ --- music-base.xml.orig 2016-12-13 20:45:06.068067497 +0000 -+++ music-base.xml 2016-12-13 20:34:54.359884898 +0000 ++++ music-base.xml 2016-12-18 00:17:16.171607805 +0000 @@ -360,7 +360,6 @@ + @@ -504,7 +506,7 @@ diff --git a/abs/core/linhes-theme/music-ui.xml.patch b/abs/core/linhes-theme/music-ui.xml.patch index 762bae2..ccf4a31 100644 --- a/abs/core/linhes-theme/music-ui.xml.patch +++ b/abs/core/linhes-theme/music-ui.xml.patch @@ -1,5 +1,5 @@ --- music-ui.xml.orig 2016-12-13 20:47:17.067929339 +0000 -+++ music-ui.xml 2016-12-13 20:34:54.363217804 +0000 ++++ music-ui.xml 2016-12-18 00:19:45.189200063 +0000 @@ -6,7 +6,7 @@ 0,0,1280,720 @@ -36,12 +36,39 @@ right,vcenter +@@ -121,7 +121,7 @@ + + 0,0,100%,100% + - 219,40 -+ 229,40 ++ 193,40 - -@@ -355,7 +360,7 @@ +@@ -274,6 +279,7 @@ + 36,39,993,30 + basesmallyellow + left,vcenter ++ + + + +@@ -355,7 +361,7 @@ 0,0,1280,720 -@@ -681,7 +686,7 @@ +@@ -404,6 +410,7 @@ + 36,39,993,30 + basesmallyellow + left,vcenter ++ + + + +@@ -435,7 +442,7 @@ + + + 8,8,120,120 +- mythmusic/mm_nothumb.png ++ mythmusic/mm_category.png + + + 8,8 +@@ -443,73 +450,73 @@ + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + +@@ -580,7 +587,7 @@ + + + 8,8,120,120 +- mythmusic/mm_nothumb.png ++ mythmusic/mm_category.png + + + 8,8 +@@ -588,73 +595,73 @@ + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + + + +@@ -681,7 +688,7 @@ 5,1,-5,-3 bottom,hcenter 5,5 @@ -149,7 +355,113 @@ yes -@@ -1909,6 +1914,122 @@ +@@ -696,7 +703,7 @@ + + + 8,8,120,120 +- mythmusic/mm_nothumb.png ++ mythmusic/mm_category.png + 100 + + +@@ -705,84 +712,84 @@ + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + + + + 0,0,120,120 +- mythmusic/mm_category.png ++ mythmusic/mm_nothumb.png + 100 + + +@@ -1909,6 +1916,122 @@ @@ -272,7 +584,7 @@ 0,0,1280,720 -@@ -3492,7 +3613,7 @@ +@@ -3492,7 +3615,7 @@ diff --git a/abs/core/linhes-theme/recordings-ui.xml.patch b/abs/core/linhes-theme/recordings-ui.xml.patch index 4c8f8c1..77969dc 100644 --- a/abs/core/linhes-theme/recordings-ui.xml.patch +++ b/abs/core/linhes-theme/recordings-ui.xml.patch @@ -1,5 +1,5 @@ --- recordings-ui.xml.orig 2016-11-16 20:12:29.390254787 +0000 -+++ recordings-ui.xml 2016-11-16 20:12:03.436933524 +0000 ++++ recordings-ui.xml 2016-12-23 02:34:31.313887659 +0000 @@ -105,19 +105,11 @@ @@ -30,7 +30,7 @@ yes -@@ -232,11 +225,12 @@ +@@ -232,16 +225,16 @@ 0,0,898,64 +@@ -579,20 +572,20 @@ allcenter -@@ -606,57 +600,48 @@ +@@ -606,57 +599,48 @@ @@ -138,7 +145,7 @@ basesupersmallyellow allcenter -@@ -688,7 +673,7 @@ +@@ -688,7 +672,7 @@ + + +@@ -1564,6 +1568,9 @@ 0,0,100%,100% @@ -343,3 +423,91 @@ images/lists_right_arrow.png 0 +@@ -1664,6 +1671,7 @@ + + + + + +@@ -2186,7 +2194,7 @@ + + + +- 23,212,556,2 ++ 23,174,556,2 + + + +@@ -2202,18 +2210,18 @@ + + + +- 3,488,50,13 ++ 549,488,50,13 + + + + + +- 8,216,586,264 ++ 8,178,586,302 + + + 0,0,100%,34 +@@ -2244,10 +2252,10 @@ + + + +- 2,274 ++ 548,312 + + +- 22,274 ++ 568,312 + + + +@@ -2299,7 +2307,7 @@ + + + +- 3,488,50,13 ++ 761,488,50,13 + + + @@ -134,6 +134,7 @@ + -20,0,370,80 + + 0,0,100%,100%-2 ++ + box + @@ -142,9 +143,16 @@ + + 0,0,2,100% ++ ++ ++ ++ ++ ++ ++ + -+ -+ 100%-4,0,2,100% ++ ++ 100%-2,0,2,100% + -@@ -435,7 +442,7 @@ +@@ -435,7 +442,8 @@ 8,8,120,120 - mythmusic/mm_nothumb.png + mythmusic/mm_category.png ++ 100 8,8 -@@ -443,73 +450,73 @@ +@@ -443,73 +451,85 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -178,6 +180,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -185,6 +188,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -192,6 +196,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -199,6 +204,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -206,6 +212,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -213,6 +220,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -220,6 +228,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -227,6 +236,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -234,6 +244,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -241,6 +252,7 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 @@ -248,10 +260,46 @@ 0,0,120,120 - mythmusic/mm_category.png + mythmusic/mm_nothumb.png ++ 100 -@@ -580,7 +587,7 @@ +@@ -547,7 +567,7 @@ + 0,0,100%,100% + roundbox + +- ++ + 8 + + +@@ -555,9 +575,9 @@ + box + + +- +- +- ++ ++ ++ + + + +@@ -569,9 +589,9 @@ + box + + +- +- +- ++ ++ ++ + + + +@@ -580,7 +600,7 @@ 8,8,120,120 @@ -260,7 +308,7 @@ 8,8 -@@ -588,73 +595,73 @@ +@@ -588,73 +608,73 @@ 0,0,120,120 @@ -346,7 +394,7 @@ -@@ -681,7 +688,7 @@ +@@ -681,22 +701,50 @@ 5,1,-5,-3 bottom,hcenter 5,5 @@ -355,8 +403,51 @@ yes -@@ -696,7 +703,7 @@ - + +- +- +- 0,0,136,136 +- +- +- 8 +- +- ++ ++ ++ 0,0,100%,100% ++ roundbox ++ ++ ++ 8 ++ ++ ++ 8,2,120,4 ++ box ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 8,130,120,4 ++ ++ ++ 2,8,4,120 ++ box ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ 130,8,4,120 ++ 8,8,120,120 - mythmusic/mm_nothumb.png @@ -364,7 +455,7 @@ 100 -@@ -705,84 +712,84 @@ +@@ -705,94 +753,84 @@ 0,0,120,120 @@ -457,11 +548,29 @@ 0,0,120,120 - mythmusic/mm_category.png +- 100 +- +- +- +- +- 8,8 +- yes +- +- +- mythmusic/playlist_yes.png + mythmusic/mm_nothumb.png 100 -@@ -1909,6 +1916,122 @@ +@@ -813,7 +851,6 @@ + 5,5 + baseextrasmall + yes +- 100 + + + +@@ -1909,6 +1946,122 @@ @@ -584,7 +693,7 @@ 0,0,1280,720 -@@ -3492,7 +3615,7 @@ +@@ -3492,7 +3645,7 @@ diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index 3eabbfc..ba9983f 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ --- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000 -+++ osd.xml 2016-11-17 19:29:17.370920531 +0000 ++++ osd.xml 2017-01-12 03:57:35.384792671 +0000 @@ -7,13 +7,13 @@ 0,0,1280,720 @@ -274,17 +274,17 @@ - 90,658,1100,24 + + + @@ -457,21 +457,21 @@ vcenter - + - - -- ++ + + -+ + + +- +@@ -1922,7 +1948,7 @@ + + + + + 255 +@@ -1964,7 +1990,7 @@ + + + +- 2,274 ++ 548,274 + + + images/osd/lists_up_arrow.png +@@ -1978,7 +2004,7 @@ + + + +- 22,274 ++ 568,274 + + + images/osd/lists_down_arrow.png diff --git a/abs/core/linhes-theme/schedule-ui.xml.patch b/abs/core/linhes-theme/schedule-ui.xml.patch index 930c26f..0ed5ba4 100644 --- a/abs/core/linhes-theme/schedule-ui.xml.patch +++ b/abs/core/linhes-theme/schedule-ui.xml.patch @@ -1,5 +1,5 @@ ---- schedule-ui.xml.orig 2014-10-26 18:47:27.740659484 +0000 -+++ schedule-ui.xml 2014-10-26 18:45:31.642195458 +0000 +--- schedule-ui.xml.orig 2017-01-12 02:24:06.812272686 +0000 ++++ schedule-ui.xml 2017-01-12 02:24:53.802894035 +0000 @@ -126,7 +126,7 @@ #ff6600 no @@ -9,3 +9,42 @@ +@@ -1437,10 +1437,10 @@ + + + +- 0,350 ++ 550,350 + + +- 20,350 ++ 570,350 + + + +@@ -1544,10 +1544,10 @@ + + + +- 0,350 ++ 550,350 + + +- 20,350 ++ 570,350 + + + +@@ -3098,10 +3098,10 @@ + + + +- 0,350 ++ 550,350 + + +- 20,350 ++ 570,350 + + + diff --git a/abs/core/linhes-theme/status-ui.xml.patch b/abs/core/linhes-theme/status-ui.xml.patch new file mode 100644 index 0000000..9c26d77 --- /dev/null +++ b/abs/core/linhes-theme/status-ui.xml.patch @@ -0,0 +1,53 @@ +--- status-ui.xml.orig 2017-01-12 02:25:29.328323754 +0000 ++++ status-ui.xml 2017-01-12 02:19:35.527174739 +0000 +@@ -212,9 +212,9 @@ + + + + +@@ -230,7 +230,7 @@ + +@@ -241,16 +241,16 @@ + + + + + +- ++ + + + + +@@ -259,7 +259,7 @@ + + + + -- cgit v0.12 From 54b9348a69715bb57934b1fd569a5f07fb2aafe6 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Fri, 13 Jan 2017 19:11:58 +0000 Subject: linhes-theme: make osd popup changes --- abs/core/linhes-theme/PKGBUILD | 4 ++-- abs/core/linhes-theme/osd.xml.patch | 27 ++++++++++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/abs/core/linhes-theme/PKGBUILD b/abs/core/linhes-theme/PKGBUILD index 1cd5eac..5bbe836 100755 --- a/abs/core/linhes-theme/PKGBUILD +++ b/abs/core/linhes-theme/PKGBUILD @@ -1,6 +1,6 @@ pkgname=linhes-theme pkgver=8.4 -pkgrel=19 +pkgrel=20 pkgdesc="Default LinHES MythTV theme" arch=('i686' 'x86_64') license=('GPL2') @@ -94,7 +94,7 @@ package() { sed -i "s/MIN_VER/${pkgrel}/" $pkgdir/$THEMEROOT/LinHES/themeinfo.xml } md5sums=('2dca856c2a4d1f959473512c94e43b60' - 'ebb2410010c3fde87024bcc86c41dac8' + '3fc2c8838a9e331a2d19c114760a5acb' '66dd0365257d88b48ffeec00289e3b22' 'ed56a335f8523d288609a81c005cab3f' 'b90b745c72a057c78ebd0b6f2c5530b9' diff --git a/abs/core/linhes-theme/osd.xml.patch b/abs/core/linhes-theme/osd.xml.patch index ba9983f..a5629d4 100644 --- a/abs/core/linhes-theme/osd.xml.patch +++ b/abs/core/linhes-theme/osd.xml.patch @@ -1,5 +1,5 @@ --- osd.xml.orig 2016-11-16 18:00:59.736588734 +0000 -+++ osd.xml 2017-01-12 03:57:35.384792671 +0000 ++++ osd.xml 2017-01-13 18:57:07.721509072 +0000 @@ -7,13 +7,13 @@ 0,0,1280,720 @@ -751,7 +751,16 @@ -@@ -1822,15 +1848,15 @@ +@@ -1810,7 +1836,7 @@ + + + +- 362,328,556,2 ++ 362,290,556,2 + box + + +@@ -1822,21 +1848,21 @@ @@ -764,12 +773,20 @@ + + +- 347,332,586,264 ++ 347,294,586,302 + vertical + 4 + yes @@ -1922,7 +1948,7 @@ @@ -784,7 +801,7 @@ - 2,274 -+ 548,274 ++ 548,312 images/osd/lists_up_arrow.png @@ -793,7 +810,7 @@ - 22,274 -+ 568,274 ++ 568,312 images/osd/lists_down_arrow.png -- cgit v0.12 From 100e4bbc1be3cad1d6f5ae73083eecaf1bf6b4f4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 17 Jan 2017 20:09:59 +0000 Subject: mythtv, mythplugins, mythweb: update to latest fixes --- abs/core/mythtv/stable-0.28/git_src/git_hash | 2 +- abs/core/mythtv/stable-0.28/git_src/git_hash_web | 2 +- abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 2 +- abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 2 +- abs/core/mythtv/stable-0.28/mythweb/PKGBUILD | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash index 0a40700..7a99331 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash @@ -1 +1 @@ -3930f5d13a7e0a4b6328a1b3032374752dfacbe4 +5a7b3c8d418f52b02f971469e230fb016f1f0e16 diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash_web b/abs/core/mythtv/stable-0.28/git_src/git_hash_web index 98b5fa0..35248ef 100644 --- a/abs/core/mythtv/stable-0.28/git_src/git_hash_web +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash_web @@ -1 +1 @@ -3fa642f00da9529674ea93110396d036da1d43ff +7ed09ed8ed00e600a5336e571460f67034bdec6c diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD index 1229dec..e2baa8b 100644 --- a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('mytharchive' 'mythweather' 'mythzoneminder') pkgver=0.28 -pkgrel=30 +pkgrel=31 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD index 58cffd5..0b04f72 100644 --- a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.28 -pkgrel=30 +pkgrel=31 commit_hash=`cat ../git_src/git_hash` pkgdesc="A Homebrew PVR project $commit_hash" arch=('i686' 'x86_64') diff --git a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD index 785056e..62fbf57 100644 --- a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD +++ b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythweb pkgver=0.28 -pkgrel=8 +pkgrel=9 commit_hash=`cat ../git_src/git_hash_web` pkgdesc="Web interface for MythTV's backend, $commit_hash" arch=('i686' 'x86_64') -- cgit v0.12 From 69653dc3c0c007d56b8dcfd709f21e7a301d3a5a Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 19 Jan 2017 16:54:02 +0000 Subject: xymon: add inode exceptions to match disk exceptions change analysis.cfg to patch --- abs/core/xymon/PKGBUILD | 15 +- abs/core/xymon/analysis.cfg | 445 -------------------------------------- abs/core/xymon/analysis.cfg.patch | 112 ++++++++++ abs/core/xymon/xymon-server.rules | 3 +- 4 files changed, 123 insertions(+), 452 deletions(-) delete mode 100644 abs/core/xymon/analysis.cfg create mode 100644 abs/core/xymon/analysis.cfg.patch diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index 787ce61..c619eaa 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,9 +1,9 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') pkgver=4.3.17 -pkgrel=23 +pkgrel=24 pkgdesc="Xymon is a system for monitoring of hosts and networks" -license="GPL" +license=('GPL') arch=('i686' 'x86_64') url="http://www.xymon.com/" source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz" @@ -17,6 +17,7 @@ source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase- 'hbnotes.py' 'hobbit-myth-orphan.sh' 'analysis.cfg' + 'analysis.cfg.patch' 'hbfunc.py' 'be.png' 'tuner.png' 'tv.png' 'hobbit-mem-myth.sh' @@ -58,6 +59,7 @@ build() { MANROOT=/usr/share/man \ BARS=all \ USENEWHIST=y \ + USEXYMONPING=n \ PIXELCOUNT=960 \ INSTALLBINDIR=/home/xymon/server/bin \ INSTALLETCDIR=/home/xymon/etc \ @@ -88,7 +90,6 @@ package_xymonserver(){ install -D -m755 ${srcdir}/xymon-smart.sh ${pkgdir}/home/xymon/server/ext/xymon-smart.sh install -D -m755 ${srcdir}/log_list.sh ${pkgdir}/home/xymon/client/bin/log_list.sh - install -m755 analysis.cfg ${pkgdir}/home/xymon/etc/analysis.cfg cat alerts.cfg >> ${pkgdir}/home/xymon/etc/alerts.cfg install -m755 hobbit_notify.sh ${pkgdir}/home/xymon/server/bin/hobbit_notify.sh @@ -115,6 +116,7 @@ package_xymonserver(){ cd ${pkgdir}/home/xymon/etc patch -p0 < ${srcdir}/graphs.cfg.diff || return 1 patch -p0 < ${srcdir}/xymonserver.cfg.diff || return 1 + patch -p0 < ${srcdir}/analysis.cfg.patch || return 1 patch -p3 < ${srcdir}/client-local.cfg.patch || return 1 patch -p3 < ${srcdir}/hosts.cfg.patch || return 1 @@ -127,7 +129,7 @@ package_xymonserver(){ echo "orphan;The orphan column shows the status of the find_orphans.py script.;" >> $COLDOC #fix permissions - chmod 775 ${pkgdir}/data/srv/httpd/htdocs/ + chmod 755 ${pkgdir}/data/srv/httpd/htdocs/ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/notes/ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/ @@ -170,7 +172,8 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' 'b2f98ac0df013332deedc1efae0a270d' 'df77d1de72157d23a301a72288fbf7e5' '2a509d81ee1655130ce40bf970719e0a' - '166279c006c3ef7bf0c21537cf89fc83' + '4d594fba346b56e479d180162a0db44c' + '77fd7ab6ebbe72d14092ee53c5958f97' '80d9cfac86c6d96836e6f406e35e7cf5' 'd210c43fb9ee9ad6cd7648e0c2e0efea' '0c808fa12672289f86b0651545381308' @@ -188,6 +191,6 @@ md5sums=('d8d119a777e7b7204d1292fb27314312' '98e9242ae346f729b14cb195786571f2' '31ac5c1f6dcc9408b64c4107b325a9a6' 'c7178bbf384bbe86c318b60fef6faf10' - '2871c53627e9e125922118013a868a95' + 'e9dbff011e57861266d27dfdf465a4b3' 'cdfbca43dbae4ce0ca72dd002ec22af1' '606f535a49f32b35802ed9d46bd7d068') diff --git a/abs/core/xymon/analysis.cfg b/abs/core/xymon/analysis.cfg deleted file mode 100644 index 460d157..0000000 --- a/abs/core/xymon/analysis.cfg +++ /dev/null @@ -1,445 +0,0 @@ -# analysis.cfg - configuration file for clients reporting to Xymon -# -# This file is used by the xymond_client module, when it builds the -# cpu, disk, files, memory, msgs and procs status messages from the -# information reported by clients running on the monitored systems. -# -# This file must be installed on the Xymon server - client installations -# do not need this file. -# -# The file defines a series of rules: -# UP : Changes the "cpu" status when the system has rebooted recently, -# or when it has been running for too long. -# LOAD : Changes the "cpu" status according to the system load. -# CLOCK : Changes the "cpu" status if the client system clock is -# not synchronized with the clock of the Xymon server. -# DISK : Changes the "disk" status, depending on the amount of space -# used of filesystems. -# MEMPHYS: Changes the "memory" status, based on the percentage of real -# memory used. -# MEMACT : Changes the "memory" status, based on the percentage of "actual" -# memory used. Note: Not all systems report an "actual" value. -# MEMSWAP: Changes the "memory" status, based on the percentage of swap -# space used. -# PROC : Changes the "procs" status according to which processes were found -# in the "ps" listing from the client. -# LOG : Changes the "msgs" status according to entries in text-based logfiles. -# Note: The "client-local.cfg" file controls which logfiles the client will report. -# FILE : Changes the "files" status according to meta-data for files. -# Note: The "client-local.cfg" file controls which files the client will report. -# DIR : Changes the "files" status according to the size of a directory. -# Note: The "client-local.cfg" file controls which directories the client will report. -# PORT : Changes the "ports" status according to which tcp ports were found -# in the "netstat" listing from the client. -# DEFAULT: Set the default values that apply if no other rules match. -# -# All rules can be qualified so they apply only to certain hosts, or on certain -# times of the day (see below). -# -# Each type of rule takes a number of parameters: -# UP bootlimit toolonglimit -# The cpu status goes yellow if the system has been up for less than -# "bootlimit" time, or longer than "toolonglimit". The time is in -# minutes, or you can add h/d/w for hours/days/weeks - eg. "2h" for -# two hours, or "4w" for 4 weeks. -# Defaults: bootlimit=1h, toolonglimit=-1 (infinite). -# -# LOAD warnlevel paniclevel -# If the system load exceeds "warnlevel" or "paniclevel", the "cpu" -# status will go yellow or red, respectively. These are decimal -# numbers. -# Defaults: warnlevel=5.0, paniclevel=10.0 -# -# CLOCK maximum-offset -# If the system clock of the client differs from that of the Xymon -# server by more than "maximum-offset" seconds, then the CPU status -# column will go yellow. Note that the accuracy of this test is limited, -# since it is affected by the time it takes a client status report to -# go from the client to the Xymon server and be processed. You should -# therefore allow for a few seconds (5-10) of slack when you define -# your max. offset. -# It is not wise to use this test, unless your servers are synchronized -# to a common clock, e.g. through NTP. -# -# DISK filesystem warnlevel paniclevel -# DISK filesystem IGNORE -# If the utilization of "filesystem" is reported to exceed "warnlevel" -# or "paniclevel", the "disk" status will go yellow or red, respectively. -# "warnlevel" and "paniclevel" are either the percentage used, or the -# space available as reported by the local "df" command on the host. -# For the latter type of check, the "warnlevel" must be followed by the -# letter "U", e.g. "1024U". -# The special keyword "IGNORE" causes this filesystem to be ignored -# completely, i.e. it will not appear in the "disk" status column and -# it will not be tracked in a graph. This is useful for e.g. removable -# devices, backup-disks and similar hardware. -# "filesystem" is the mount-point where the filesystem is mounted, e.g. -# "/usr" or "/home". A filesystem-name that begins with "%" is interpreted -# as a Perl-compatible regular expression; e.g. "%^/oracle.*/" will match -# any filesystem whose mountpoint begins with "/oracle". -# Defaults: warnlevel=90%, paniclevel=95% -# -# MEMPHYS warnlevel paniclevel -# MEMACT warnlevel paniclevel -# MEMSWAP warnlevel paniclevel -# If the memory utilization exceeds the "warnlevel" or "paniclevel", the -# "memory" status will change to yellow or red, respectively. -# Note: The words "PHYS", "ACT" and "SWAP" are also recognized. -# Defaults: MEMPHYS warnlevel=100 paniclevel=101 (i.e. it will never go red) -# MEMSWAP warnlevel=50 paniclevel=80 -# MEMACT warnlevel=90 paniclevel=97 -# -# PROC processname minimumcount maximumcount color [TRACK=id] [TEXT=displaytext] -# The "ps" listing sent by the client will be scanned for how many -# processes containing "processname" are running, and this is then -# matched against the min/max settings defined here. If the running -# count is outside the thresholds, the color of the "procs" status -# changes to "color". -# To check for a process that must NOT be running: Set minimum and -# maximum to 0. -# -# "processname" can be a simple string, in which case this string must -# show up in the "ps" listing as a command. The scanner will find -# a ps-listing of e.g. "/usr/sbin/cron" if you only specify "processname" -# as "cron". -# "processname" can also be a Perl-compatiable regular expression, e.g. -# "%java.*inst[0123]" can be used to find entries in the ps-listing for -# "java -Xmx512m inst2" and "java -Xmx256 inst3". In that case, -# "processname" must begin with "%" followed by the reg.expression. -# If "processname" contains whitespace (blanks or TAB), you must enclose -# the full string in double quotes - including the "%" if you use regular -# expression matching. E.g. -# PROC "%xymond_channel --channel=data.*xymond_rrd" 1 1 yellow -# or -# PROC "java -DCLASSPATH=/opt/java/lib" 2 5 -# -# You can have multiple "PROC" entries for the same host, all of the -# checks are merged into the "procs" status and the most severe -# check defines the color of the status. -# -# The TRACK=id option causes the number of processes found to be recorded -# in an RRD file, with "id" as part of the filename. This graph will then -# appear on the "procs" page as well as on the "trends" page. Note that -# "id" must be unique among the processes tracked for each host. -# -# The TEXT=displaytext option affects how the process appears on the -# "procs" status page. By default, the process is listed with the -# "processname" as identification, but if this is a regular expression -# it may be a bit difficult to understand. You can then use e.g. -# "TEXT=Apache" to make these processes appear with the name "Apache" -# instead. -# -# Defaults: mincount=1, maxcount=-1 (unlimited), color="red". -# Note: No processes are checked by default. -# -# Example: Check that "cron" is running: -# PROC cron -# Example: Check that at least 5 "httpd" processes are running, but -# not more than 20: -# PROC httpd 5 20 -# -# LOG filename match-pattern [COLOR=color] [IGNORE=ignore-pattern] [TEXT=displaytext] -# In the "client-local.cfg" file, you can list any number of files -# that the client will collect log data from. These are sent to the -# Xymon server together with the other client data, and you can then -# choose how to analyze the log data with LOG entries. -# -# ************ IMPORTANT *************** -# To monitor a logfile, you *MUST* configure both client-local.cfg -# and analysis.cfg. If you configure only the client-local.cfg -# file, the client will collect the log data and you can view it in -# the "client data" display, but it will not affect the color of the -# "msgs" status. On the other hand, if you configure only the -# analysis.cfg file, then there will be no log data to inspect, -# and you will not see any updates of the "msgs" status either. -# -# "filename" is a filename or pattern. The set of files reported by -# the client is matched against "filename", and if they match then -# this LOG entry is processed against the data from a file. -# -# "match-pattern": The log data is matched against this pattern. If -# there is a match, this log file causes a status change to "color". -# -# "ignore-pattern": The log data that matched "match-pattern" is also -# matched against "ignore-pattern". If the data matches the "ignore-pattern", -# this line of data does not affect the status color. In other words, -# the "ignore-pattern" can be used to refine the strings which cause -# a match. -# Note: The "ignore-pattern" is optional. -# -# "color": The color which this match will trigger. -# Note: "color" is optional, if omitted then "red" will be used. -# -# Example: Go yellow if the text "WARNING" shows up in any logfile. -# LOG %.* WARNING COLOR=yellow -# -# Example: Go red if the text "I/O error" or "read error" appears. -# LOG %/var/(adm|log)/messages %(I/O|read).error COLOR=red -# -# FILE filename [color] [things to check] [TRACK] -# NB: The files you wish to monitor must be listed in a "file:..." -# entry in the client-local.cfg file, in order for the client to -# report any data about them. -# -# "filename" is a filename or pattern. The set of files reported by -# the client is matched against "filename", and if they match then -# this FILE entry is processed against the data from that file. -# -# [things to check] can be one or more of the following: -# - "NOEXIST" triggers a warning if the file exists. By default, -# a warning is triggered for files that have a FILE entry, but -# which do not exist. -# - "TYPE=type" where "type" is one of "file", "dir", "char", "block", -# "fifo", or "socket". Triggers warning if the file is not of the -# specified type. -# - "OWNERID=owner" and "GROUPID=group" triggers a warning if the owner -# or group does not match what is listed here. "owner" and "group" is -# specified either with the numeric uid/gid, or the user/group name. -# - "MODE=mode" triggers a warning if the file permissions are not -# as listed. "mode" is written in the standard octal notation, e.g. -# "644" for the rw-r--r-- permissions. -# - "SIZEmin.size" triggers a warning it the file -# size is greater than "max.size" or less than "min.size", respectively. -# You can append "K" (KB), "M" (MB), "G" (GB) or "T" (TB) to the size. -# If there is no such modifier, KB is assumed. -# E.g. to warn if a file grows larger than 1MB (1024 KB): "SIZE<1M". -# - "SIZE=size" triggers a warning it the file size is not what is listed. -# - "MTIME>min.mtime" and "MTIME86400". -# - "MTIME=timestamp" checks if a file was last modified at "timestamp". -# "timestamp" is a unix epoch time (seconds since midnight Jan 1 1970 UTC). -# - "CTIME>min.ctime", "CTIME0 MTIME<600 yellow -# -# Example: Check the timestamp, size and SHA-1 hash of the /bin/sh program: -# FILE /bin/sh MTIME=1128514608 SIZE=645140 SHA1=5bd81afecf0eb93849a2fd9df54e8bcbe3fefd72 -# -# DIR directory [color] [SIZEminsize] [TRACK] -# NB: The directories you wish to monitor must be listed in a "dir:..." -# entry in the client-local.cfg file, in order for the client to -# report any data about them. -# -# "directory" is a filename or pattern. The set of directories reported by -# the client is matched against "directory", and if they match then -# this DIR entry is processed against the data for that directory. -# -# "SIZEminsize" defines the size limits that the -# directory must stay within. If it goes outside these limits, a warning -# will trigger. Note the Xymon uses the raw number reported by the -# local "du" command on the client. This is commonly KB, but it may be -# disk blocks which are often 512 bytes. -# -# "TRACK" causes the size of this directory to be tracked in an RRD file, -# and shown on the graph on the "files" display. -# -# PORT [LOCAL=addr] [EXLOCAL=addr] [REMOTE=addr] [EXREMOTE=addr] [STATE=state] [EXSTATE=state] [MIN=mincount] [MAX=maxcount] [COLOR=color] [TRACK=id] [TEXT=displaytext] -# The "netstat" listing sent by the client will be scanned for how many -# sockets match the criteria listed. -# "addr" is a (partial) address specification in the format used on -# the output from netstat. This is typically "10.0.0.1:80" for the IP -# 10.0.0.1, port 80. Or "*:80" for any local address, port 80. -# NB: The Xymon clients normally report only the numeric data for -# IP-adresses and port-numbers, so you must specify the port -# number (e.g. "80") instead of the service name ("www"). -# "state" causes only the sockets in the specified state to be included; -# it is usually LISTEN or ESTABLISHED. -# The socket count is then matched against the min/max settings defined -# here. If the count is outside the thresholds, the color of the "ports" -# status changes to "color". -# To check for a socket that must NOT exist: Set minimum and -# maximum to 0. -# -# "addr" and "state" can be a simple strings, in which case these string must -# show up in the "netstat" at the appropriate column. -# "addr" and "state" can also be a Perl-compatiable regular expression, e.g. -# "LOCAL=%(:80|:443)" can be used to find entries in the netstat local port for -# both http (port 80) and https (port 443). In that case, portname or state must -# begin with "%" followed by the reg.expression. -# -# The TRACK=id option causes the number of sockets found to be recorded -# in an RRD file, with "id" as part of the filename. This graph will then -# appear on the "ports" page as well as on the "trends" page. Note that -# "id" must be unique among the ports tracked for each host. -# -# The TEXT=displaytext option affects how the port appears on the -# "ports" status page. By default, the port is listed with the -# local/remote/state rules as identification, but this may be somewhat -# difficult to understand. You can then use e.g. "TEXT=Secure Shell" to make -# these ports appear with the name "Secure Shell" instead. -# -# Defaults: state="LISTEN", mincount=1, maxcount=-1 (unlimited), color="red". -# Note: No ports are checked by default. -# -# Example: Check that there is someone listening on the https port: -# PORT "LOCAL=%([.:]443)$" state=LISTEN TEXT=https -# -# Example: Check that at least 5 "ssh" connections are established, but -# not more than 10; warn but do not error; graph the connection count: -# PORT "LOCAL=%([.:]22)$" state=ESTABLISHED min=5 max=20 color=yellow TRACK=ssh "TEXT=SSH logins" -# -# Example: Check that ONLY ports 22, 80 and 443 are open for incoming connections: -# PORT STATE=LISTEN LOCAL=%0.0.0.0[.:].* EXLOCAL=%[.:](22|80|443)$ MAX=0 "TEXT=Bad listeners" -# -# -# To apply rules to specific hosts, you can use the "HOST=", "EXHOST=", "PAGE=" -# "EXPAGE=", "CLASS=" or "EXCLASS=" qualifiers. (These act just as in the -# alerts.cfg file). -# -# Hostnames are either a comma-separated list of hostnames (from the hosts.cfg file), -# "*" to indicate "all hosts", or a Perl-compatible regular expression. -# E.g. "HOST=dns.foo.com,www.foo.com" identifies two specific hosts; -# "HOST=%www.*.foo.com EXHOST=www-test.foo.com" matches all hosts with a name -# beginning with "www", except the "www-test" host. -# "PAGE" and "EXPAGE" match the hostnames against the page on where they are -# located in the hosts.cfg file, via the hosts' page/subpage/subparent -# directives. This can be convenient to pick out all hosts on a specific page. -# -# Rules can be dependant on time-of-day, using the standard Xymon syntax -# (the hosts.cfg(5) about the NKTIME parameter). E.g. "TIME=W:0800:2200" -# applied to a rule will make this rule active only on week-days between -# 8AM and 10PM. -# -# You can also associate a GROUP id with a rule. The group-id is passed to -# the alert module, which can then use it to control who gets an alert when -# a failure occurs. E.g. the following associates the "httpd" process check -# with the "web" group, and the "sshd" check with the "admins" group: -# PROC httpd ?5 GROUP=web -# PROC sshd 1 GROUP=admins -# In the alerts.cfg file, you could then have rules like -# GROUP=web -# MAIL webmaster@foo.com -# GROUP=admins -# MAIL root@foo.com -# -# Qualifiers must be placed after each rule, e.g. -# LOAD 8.0 12.0 HOST=db.foo.com TIME=*:0800:1600 -# -# If you have multiple rules that you want to apply the same qualifiers to, -# you can write the qualifiers *only* on one line, followed by the rules. E.g. -# HOST=%db.*.foo.com TIME=W:0800:1600 -# LOAD 8.0 12.0 -# DISK /db 98 100 -# PROC mysqld 1 -# will apply the three rules to all of the "db" hosts on week-days between 8AM -# and 4PM. This can be combined with per-rule qualifiers, in which case the -# per-rule qualifier overrides the general qualifier; e.g. -# HOST=%.*.foo.com -# LOAD 7.0 12.0 HOST=bax.foo.com -# LOAD 3.0 8.0 -# will result in the load-limits being 7.0/12.0 for the "bax.foo.com" host, -# and 3.0/8.0 for all other foo.com hosts. -# -# The special DEFAULT section can modify the built-in defaults - this must -# be placed at the end of the file. - - -HOST=_MASTERBACKEND_ - PROC sshd 1 - PROC lighttpd - PROC xymond - PROC crond - PROC mysql - PROC mythbackend - PROC msg_daemon.py - DISK %^/cdrom.* IGNORE - DISK %^/mnt.* IGNORE - DISK %^/media.* IGNORE - DISK * 95 99 - PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http - PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi - PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh - -HOST=_MASTERFRONTEND_ - PROC mythfrontend 1 5 yellow - PROC sshd 1 - PROC lighttpd - PROC xymond - PROC crond - PROC mysql - PROC mythbackend - PROC msg_daemon.py - DISK %^/cdrom.* IGNORE - DISK %^/mnt.* IGNORE - DISK %^/media.* IGNORE - DISK * 95 99 - PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http - PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi - PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh - - - -HOST=_FRONTEND_ - PROC sshd 1 - PROC crond - PROC mythfrontend 1 5 yellow - PROC msg_daemon.py - PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh - -HOST=_SLAVEBACKEND_ - PROC sshd 1 - PROC crond - PROC mythbackend - DISK %^/cdrom.* IGNORE - DISK %^/mnt.* IGNORE - DISK %^/media.* IGNORE - DISK * 95 99 - PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh - -HOST=_SLAVEFRONTEND_ - PROC sshd 1 - PROC lighttpd - PROC hobbitd - PROC crond - PROC mythbackend - PROC mythfrontend 1 5 yellow - PROC msg_daemon.py - DISK %^/cdrom.* IGNORE - DISK %^/mnt.* IGNORE - DISK %^/media.* IGNORE - DISK * 95 99 - PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh - - -HOST=_STANDALONE_ - PROC mythfrontend 1 5 yellow - PROC sshd 1 - PROC lighttpd - PROC xymond - PROC crond - PROC mysql - PROC mythbackend - PROC msg_daemon.py - DISK %^/cdrom.* IGNORE - DISK %^/mnt.* IGNORE - DISK %^/media.* IGNORE - DISK * 95 99 - PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http - PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi - PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh - -DEFAULT - # These are the built-in defaults. - UP 1h - LOAD 5.0 10.0 - DISK %^/cdrom.* IGNORE - DISK %^/mnt.* IGNORE - DISK %^/media.* IGNORE - DISK * 99 100 - MEMPHYS 100 101 - MEMSWAP 50 80 - MEMACT 90 97 - diff --git a/abs/core/xymon/analysis.cfg.patch b/abs/core/xymon/analysis.cfg.patch new file mode 100644 index 0000000..3539ae3 --- /dev/null +++ b/abs/core/xymon/analysis.cfg.patch @@ -0,0 +1,112 @@ +--- analysis.cfg.orig 2017-01-18 19:50:46.758666909 +0000 ++++ analysis.cfg 2017-01-18 20:01:50.480263760 +0000 +@@ -353,12 +353,108 @@ + # to all hosts, add a new section with "HOSTS=*" + + ++HOST=_MASTERBACKEND_ ++ PROC sshd 1 ++ PROC lighttpd ++ PROC xymond ++ PROC crond ++ PROC mysql ++ PROC mythbackend ++ PROC msg_daemon.py ++ DISK %^/cdrom.* IGNORE ++ DISK %^/mnt.* IGNORE ++ DISK %^/media.* IGNORE ++ DISK * 95 99 ++ INODE %^/cdrom.* IGNORE ++ INODE %^/mnt.* IGNORE ++ INODE %^/media.* IGNORE ++ PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http ++ PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi ++ PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh ++ ++HOST=_MASTERFRONTEND_ ++ PROC mythfrontend 1 5 yellow ++ PROC sshd 1 ++ PROC lighttpd ++ PROC xymond ++ PROC crond ++ PROC mysql ++ PROC mythbackend ++ PROC msg_daemon.py ++ DISK %^/cdrom.* IGNORE ++ DISK %^/mnt.* IGNORE ++ DISK %^/media.* IGNORE ++ DISK * 95 99 ++ INODE %^/cdrom.* IGNORE ++ INODE %^/mnt.* IGNORE ++ INODE %^/media.* IGNORE ++ PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http ++ PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi ++ PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh ++ ++HOST=_FRONTEND_ ++ PROC sshd 1 ++ PROC crond ++ PROC mythfrontend 1 5 yellow ++ PROC msg_daemon.py ++ PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh ++ ++HOST=_SLAVEBACKEND_ ++ PROC sshd 1 ++ PROC crond ++ PROC mythbackend ++ DISK %^/cdrom.* IGNORE ++ DISK %^/mnt.* IGNORE ++ DISK %^/media.* IGNORE ++ DISK * 95 99 ++ INODE %^/cdrom.* IGNORE ++ INODE %^/mnt.* IGNORE ++ INODE %^/media.* IGNORE ++ PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh ++ ++HOST=_SLAVEFRONTEND_ ++ PROC sshd 1 ++ PROC lighttpd ++ PROC hobbitd ++ PROC crond ++ PROC mythbackend ++ PROC mythfrontend 1 5 yellow ++ PROC msg_daemon.py ++ DISK %^/cdrom.* IGNORE ++ DISK %^/mnt.* IGNORE ++ DISK %^/media.* IGNORE ++ DISK * 95 99 ++ INODE %^/cdrom.* IGNORE ++ INODE %^/mnt.* IGNORE ++ INODE %^/media.* IGNORE ++ PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh ++ ++HOST=_STANDALONE_ ++ PROC mythfrontend 1 5 yellow ++ PROC sshd 1 ++ PROC lighttpd ++ PROC xymond ++ PROC crond ++ PROC mysql ++ PROC mythbackend ++ PROC msg_daemon.py ++ DISK %^/cdrom.* IGNORE ++ DISK %^/mnt.* IGNORE ++ DISK %^/media.* IGNORE ++ DISK * 95 99 ++ INODE %^/cdrom.* IGNORE ++ INODE %^/mnt.* IGNORE ++ INODE %^/media.* IGNORE ++ PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http ++ PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi ++ PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh ++ + DEFAULT + # These are the built-in defaults. You should only modify these + # lines, not add new ones (no PROC, DISK, LOG ... lines). + UP 1h + LOAD 5.0 10.0 +- DISK * 90 95 ++ DISK * 95 99 + INODE * 70 90 + MEMPHYS 100 101 + MEMSWAP 50 80 diff --git a/abs/core/xymon/xymon-server.rules b/abs/core/xymon/xymon-server.rules index e4c515b..40b81af 100644 --- a/abs/core/xymon/xymon-server.rules +++ b/abs/core/xymon/xymon-server.rules @@ -1,7 +1,8 @@ #These rules are used by xymon-server nobody ALL = NOPASSWD:/usr/bin/certmaster-ca nobody ALL = NOPASSWD:/usr/bin/smartctl +nobody ALL = NOPASSWD:/usr/bin/fping http ALL = NOPASSWD:/usr/LH/bin/lh_system_backup_job http ALL = NOPASSWD:/usr/LH/bin/lh_system_restore_job -http ALL = NOPASSWD:/sbin/sv +http ALL = NOPASSWD:/usr/bin/sv -- cgit v0.12 From 1746d0620fa928d3a5d0270f03beff5f3cf44e41 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 19 Jan 2017 20:15:58 +0000 Subject: xymon: update to 4.3.28 --- abs/core/xymon/PKGBUILD | 104 +++++++++++++++------------ abs/core/xymon/xymon-server.gen_light_conf.d | 2 + abs/core/xymon/xymon-server.include | 4 ++ abs/core/xymon/xymon-server.install | 85 ++++++++++++++++++++++ abs/core/xymon/xymon.install | 81 --------------------- abs/core/xymon/xymonserver.cfg.diff | 22 +++--- 6 files changed, 161 insertions(+), 137 deletions(-) create mode 100644 abs/core/xymon/xymon-server.gen_light_conf.d create mode 100644 abs/core/xymon/xymon-server.include create mode 100644 abs/core/xymon/xymon-server.install delete mode 100755 abs/core/xymon/xymon.install diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD index c619eaa..e69afd4 100755 --- a/abs/core/xymon/PKGBUILD +++ b/abs/core/xymon/PKGBUILD @@ -1,43 +1,45 @@ pkgbase=xymon pkgname=('xymonserver' 'xymonclient') -pkgver=4.3.17 -pkgrel=24 +pkgver=4.3.28 +pkgrel=1 pkgdesc="Xymon is a system for monitoring of hosts and networks" license=('GPL') arch=('i686' 'x86_64') url="http://www.xymon.com/" source=("https://downloads.sourceforge.net/project/xymon/Xymon/$pkgver/$pkgbase-$pkgver.tar.gz" - 'hobbitadd.py' - 'xymon_ghost_check' - 'graphs.cfg.diff' - 'xymonserver.cfg.diff' - 'tasks.d.mv' - 'clientlaunch.cfg.patch' - 'hobbitstorage.py' - 'hbnotes.py' - 'hobbit-myth-orphan.sh' - 'analysis.cfg' + 'alerts.cfg' 'analysis.cfg.patch' - 'hbfunc.py' 'be.png' 'tuner.png' 'tv.png' - 'hobbit-mem-myth.sh' + 'clientlaunch.cfg.patch' + 'client-local.cfg.patch' + 'graphs.cfg.diff' + 'hbfunc.py' + 'hbnotes.py' 'hobbit_notify.sh' - 'login_notify.sh' - 'alerts.cfg' + 'hobbit-mem-myth.sh' + 'hobbit-myth-orphan.sh' 'hobbit_myth_data.py' + 'hobbitadd.py' + 'hobbitstorage.py' + 'hosts.cfg.patch' + 'log_list.sh' + 'led_themes.tar.gz' + 'login_notify.sh' + 'logrotate-server.xymon' + 'logrotate-client.xymon' + 'tasks.d.mv' + 'xymon_ghost_check' 'xymon-gputemp.sh' 'xymon-hddtemp.sh' 'xymon-smart.sh' - 'logrotate-server.xymon' - 'logrotate-client.xymon' - 'log_list.sh' - 'client-local.cfg.patch' - 'led_themes.tar.gz' + 'xymon-server.include' + 'xymon-server.gen_light_conf.d' + 'xymonserver.cfg.diff' 'xymon-server.rules' 'xymon-client.rules' - 'hosts.cfg.patch') + ) depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'smartmontools') -install=xymon.install +install=xymon-server.install build() { cd ${srcdir}/xymon-$pkgver @@ -128,9 +130,20 @@ package_xymonserver(){ echo "myth_mtc;The myth_mtc column shows the status of the MythTV maintenance script.;" >> $COLDOC echo "orphan;The orphan column shows the status of the find_orphans.py script.;" >> $COLDOC + #move cgiwrap to same partiton as hobbit-cgi and hobbit-seccgi + #because pacman is not able to install hardlinks accross partitions + mv ${pkgdir}/home/xymon/server/bin/cgiwrap ${pkgdir}/data/srv/httpd/htdocs/xymon/ + + #install conf files for lighttpd + mkdir -p ${pkgdir}/etc/lighttpd + install -D -m 644 ${srcdir}/xymon-server.include ${pkgdir}/etc/lighttpd/ + #gen_light_conf + install -D -m 744 ${srcdir}/xymon-server.gen_light_conf.d ${pkgdir}/etc/gen_light_conf.d/xymon-server.conf + #fix permissions chmod 755 ${pkgdir}/data/srv/httpd/htdocs/ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/ + chmod 755 ${pkgdir}/data/srv/httpd/htdocs/xymon/cgiwrap chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/notes/ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/gifs/ chmod 775 ${pkgdir}/data/srv/httpd/htdocs/xymon/snap/ @@ -162,35 +175,36 @@ package_xymonclient(){ cd - } -md5sums=('d8d119a777e7b7204d1292fb27314312' - 'a0fbb9cbeb3600a40943e6205790f22f' - 'c60b0d59bb39505ee3d62c6dd65429c5' - '92bd5e8279c688fd854d514443bc733c' - 'f0fca78520f434918bd1be717d165073' - 'a19c8c546dcd95049476bb19f9d4e3ae' - 'c9a31ea9ae131fb351db913e922c25aa' - 'b2f98ac0df013332deedc1efae0a270d' - 'df77d1de72157d23a301a72288fbf7e5' - '2a509d81ee1655130ce40bf970719e0a' - '4d594fba346b56e479d180162a0db44c' +md5sums=('14501ab2cfce9a332c1590543dfcbd0f' + '9af2ad60ac4c3cb653754618f603e311' '77fd7ab6ebbe72d14092ee53c5958f97' - '80d9cfac86c6d96836e6f406e35e7cf5' 'd210c43fb9ee9ad6cd7648e0c2e0efea' '0c808fa12672289f86b0651545381308' '0469d775db9fdd18ea95dd41937ada82' - '0757294eec13771f8e63da23cf066796' + 'c9a31ea9ae131fb351db913e922c25aa' + '31ac5c1f6dcc9408b64c4107b325a9a6' + '92bd5e8279c688fd854d514443bc733c' + '80d9cfac86c6d96836e6f406e35e7cf5' + 'df77d1de72157d23a301a72288fbf7e5' 'b1d5592fa92ef71303621964e84c2b9e' - '22d4c9065fd959efe82f121dcb511305' - '9af2ad60ac4c3cb653754618f603e311' + '0757294eec13771f8e63da23cf066796' + '2a509d81ee1655130ce40bf970719e0a' '313b11e7a22c3c08fb2afaadbfb46d87' + 'a0fbb9cbeb3600a40943e6205790f22f' + 'b2f98ac0df013332deedc1efae0a270d' + '606f535a49f32b35802ed9d46bd7d068' + '98e9242ae346f729b14cb195786571f2' + 'c7178bbf384bbe86c318b60fef6faf10' + '22d4c9065fd959efe82f121dcb511305' + 'b4e8641e97e6b689dbc634af785e6799' + 'e2844513e2c92e8b5084818f3b2a478d' + 'a19c8c546dcd95049476bb19f9d4e3ae' + 'c60b0d59bb39505ee3d62c6dd65429c5' '6452d891d88bb46d07bcf7790a523ad0' 'b49e7de696c1a0678ad198bab926266c' 'e071c387deac6b896b20db19903b7794' - 'b4e8641e97e6b689dbc634af785e6799' - 'e2844513e2c92e8b5084818f3b2a478d' - '98e9242ae346f729b14cb195786571f2' - '31ac5c1f6dcc9408b64c4107b325a9a6' - 'c7178bbf384bbe86c318b60fef6faf10' + '1a00c0b9b9b1a37f1513fa8489ce9d31' + '3d1f311f0142f41d763276302a7ce396' + 'c75c434ba9c39a914e7693004b580554' 'e9dbff011e57861266d27dfdf465a4b3' - 'cdfbca43dbae4ce0ca72dd002ec22af1' - '606f535a49f32b35802ed9d46bd7d068') + 'cdfbca43dbae4ce0ca72dd002ec22af1') diff --git a/abs/core/xymon/xymon-server.gen_light_conf.d b/abs/core/xymon/xymon-server.gen_light_conf.d new file mode 100644 index 0000000..6b558ce --- /dev/null +++ b/abs/core/xymon/xymon-server.gen_light_conf.d @@ -0,0 +1,2 @@ +include "/etc/lighttpd/xymon-server.include" + diff --git a/abs/core/xymon/xymon-server.include b/abs/core/xymon/xymon-server.include new file mode 100644 index 0000000..b3e15e0 --- /dev/null +++ b/abs/core/xymon/xymon-server.include @@ -0,0 +1,4 @@ +$HTTP["url"] =~ "^/xymon/hobbit-" { + cgi.assign = ( "" => "" ) + } + diff --git a/abs/core/xymon/xymon-server.install b/abs/core/xymon/xymon-server.install new file mode 100644 index 0000000..0eec8f1 --- /dev/null +++ b/abs/core/xymon/xymon-server.install @@ -0,0 +1,85 @@ +post_install() { + . /etc/systemconfig + if [ ! -f /home/xymon/server/ext/ignoreclient.py ] + then + echo "#this is a list of hosts to ignore" > /home/xymon/server/ext/ignoreclient.py + echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /home/xymon/server/ext/ignoreclient.py + fi + + if [ ! -f /data/srv/httpd/htdocs/failed_func_hosts ] + then + touch /data/srv/httpd/htdocs/failed_func_hosts + fi + chown nobody:nobody /data/srv/httpd/htdocs/failed_func_hosts + chmod 777 /data/srv/httpd/htdocs/failed_func_hosts + + sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg + sed -i -e "s/\# bbd/\# bbd func/" /home/xymon/server/etc/hosts.cfg + sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg + + #fix permissions + chown -R nobody:nobody /home/xymon + chown -R nobody:nobody /data/srv/httpd/htdocs/xymon + + chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap + chown -R nobody:http /data/srv/httpd/htdocs/xymon/rep + chmod -R 775 /data/srv/httpd/htdocs/xymon/rep + chmod -R 775 /data/srv/httpd/htdocs/xymon/snap + + chmod g+s /data/srv/httpd/htdocs/xymon/notes/ + setfacl -d -m g::rw /data/srv/httpd/htdocs/xymon/notes/ + setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/notes/ + + file="/data/srv/httpd/htdocs/xymon/gifs/network.png" + if [ -f $file ] + then + setfacl -m u:nobody:rw $file + fi + + setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/gifs/ + + chmod g+s /home/xymon/etc + setfacl -d -m g::rw /home/xymon/etc/ + setfacl -d -m u::rw /home/xymon/etc/ + setfacl -d -m u:nobody:rwx /home/xymon/etc/ + + file="/home/xymon/etc/mythdot" + if [ -f $file ] + then + setfacl -m u:nobody:rw $file + fi + + chown -R nobody /var/log/hobbit + + chown root /home/xymon/server/bin/xymonping + chmod +s /home/xymon/server/bin/xymonping + + #remove old mtc log files + rm -f /var/log/hobbit/mtc + rm -f /var/log/hobbit/mtc.1* + + echo "Generate lighttpd include..." + gen_light_include.py + echo "Forcing a re-read of lighttpd's configuration file..." + sv hup /service/lighttpd +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + rm -f /data/srv/httpd/htdocs/xymon/index.html + echo "Generate lighttpd include..." + gen_light_include.py + echo "Forcing a re-read of lighttpd's configuration file..." + sv hup /service/lighttpd +} + +pre_remove() { + /bin/true +} +op=$1 +shift +$op $* +# vim: ft=sh ts=2 diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install deleted file mode 100755 index 4461df4..0000000 --- a/abs/core/xymon/xymon.install +++ /dev/null @@ -1,81 +0,0 @@ -post_install() { - . /etc/systemconfig - if [ ! -f /home/xymon/server/ext/ignoreclient.py ] - then - echo "#this is a list of hosts to ignore" > /home/xymon/server/ext/ignoreclient.py - echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /home/xymon/server/ext/ignoreclient.py - fi - - if [ ! -f /data/srv/httpd/htdocs/failed_func_hosts ] - then - touch /data/srv/httpd/htdocs/failed_func_hosts - fi - chown nobody:nobody /data/srv/httpd/htdocs/failed_func_hosts - chmod 777 /data/srv/httpd/htdocs/failed_func_hosts - - - sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/hosts.cfg - sed -i -e "s/\# bbd/\# bbd func/" /home/xymon/server/etc/hosts.cfg - sed -i -e "s/localhost/$hostname/" /home/xymon/server/etc/xymonserver.cfg - - #fix permissions - chown -R nobody:nobody /home/xymon - chown -R nobody:nobody /data/srv/httpd/htdocs/xymon - - chown -R nobody:http /data/srv/httpd/htdocs/xymon/snap - chown -R nobody:http /data/srv/httpd/htdocs/xymon/rep - chmod -R 775 /data/srv/httpd/htdocs/xymon/rep - chmod -R 775 /data/srv/httpd/htdocs/xymon/snap - - chmod g+s /data/srv/httpd/htdocs/xymon/notes/ - setfacl -d -m g::rw /data/srv/httpd/htdocs/xymon/notes/ - setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/notes/ - - file="/data/srv/httpd/htdocs/xymon/gifs/network.png" - if [ -f $file ] - then - setfacl -m u:nobody:rw $file - fi - - - setfacl -d -m u:nobody:rwx /data/srv/httpd/htdocs/xymon/gifs/ - - chmod g+s /home/xymon/etc - setfacl -d -m g::rw /home/xymon/etc/ - setfacl -d -m u::rw /home/xymon/etc/ - setfacl -d -m u:nobody:rwx /home/xymon/etc/ - - file="/home/xymon/etc/mythdot" - if [ -f $file ] - then - setfacl -m u:nobody:rw $file - fi - - - chown -R nobody /var/log/hobbit - - chown root /home/xymon/server/bin/xymonping - chmod +s /home/xymon/server/bin/xymonping - - #remove old mtc log files - rm -f /var/log/hobbit/mtc - rm -f /var/log/hobbit/mtc.1* - - -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - rm -f /data/srv/httpd/htdocs/xymon/index.html -} - -pre_remove() { - /bin/true -} -op=$1 -shift -$op $* -# vim: ft=sh ts=2 diff --git a/abs/core/xymon/xymonserver.cfg.diff b/abs/core/xymon/xymonserver.cfg.diff index 48631dc..f017432 100755 --- a/abs/core/xymon/xymonserver.cfg.diff +++ b/abs/core/xymon/xymonserver.cfg.diff @@ -1,6 +1,6 @@ ---- xymonserver.cfg.orig 2015-03-04 21:28:58.618598840 +0000 -+++ xymonserver.cfg 2015-03-04 21:31:55.352569106 +0000 -@@ -145,6 +145,12 @@ +--- xymonserver.cfg.orig 2017-01-19 16:57:57.745304289 +0000 ++++ xymonserver.cfg 2017-01-19 17:02:08.323770694 +0000 +@@ -150,6 +150,12 @@ RRDHEIGHT="120" RRDWIDTH="576" # The RRD's contain 576 data points, so this is a good value @@ -13,19 +13,19 @@ # TEST2RRD defines the status- and data-messages you want to collect RRD data # about. You will normally not need to modify this, unless you have added a # script to pick up RRD data from custom tests (the xymond_rrd --extra-script -@@ -156,11 +162,13 @@ +@@ -169,11 +175,13 @@ # - # This is also used by the svcstatus.cgi script to determine if the detailed + # TEST2RRD and GRAPHS_* are used by the svcstatus.cgi script to determine if the detailed # status view of a test should include a graph. --TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,hddtemp=ncv,smart" +-TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" ++#TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" ++TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,if_load=devmon,temp=devmon,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage=ncv,memmbe=ncv,memmfe=ncv,gputemp=ncv,hddtemp=ncv,smart" # This defines which RRD files to include on the "trends" column webpage, # and the order in which they appear. --GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+#GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" -+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp,hddtemp" +-GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" ++#GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond" ++GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,deltalines,ops,stats,cifs,JVM,JMS,HitCache,Session,JDBCConn,ExecQueue,JTA,TblSpace,RollBack,MemReq,InvObj,snapmirr,snaplist,snapshot,devmon::1,if_load::1,temp,paging,mdc,mdchitpct,cics,dsa,getvis,maxuser,nparts,xymongen,xymonnet,xymonproxy,xymond,storage,memmbe,memmfe,gputemp,hddtemp" # These two settings can be used to restrict what filesystems are being # tracked (i.e. have their utilisation graphed) by Xymon. -- cgit v0.12 From d0b37ccccc013118824437c8afdf3c48dd4d6530 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 19 Jan 2017 21:41:00 +0000 Subject: lighttpd: update 1.4.45 --- abs/core/lighttpd/PKGBUILD | 27 ++++++--------------------- abs/core/lighttpd/lighttpd.conf | 18 ++++++++++-------- abs/core/lighttpd/lighttpd.install | 4 ++++ 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD index d389ecd..d7405ab 100644 --- a/abs/core/lighttpd/PKGBUILD +++ b/abs/core/lighttpd/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Pierre Schmitz pkgname=lighttpd -pkgver=1.4.39 +pkgver=1.4.45 pkgrel=1 pkgdesc='A secure, fast, compliant and very flexible web-server' license=('custom') @@ -15,8 +15,8 @@ optdepends=('libxml2: mod_webdav' \ 'libmysqlclient: mod_mysql_vhost' \ 'sqlite3: mod_webdav' \ 'gdbm: mod_trigger_b4_dl') -backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd' 'etc/lighttpd/auth-inc.conf' 'etc/lighttpd/conf.include' 'etc/lighttpd/html.include') -options=('!libtool' 'emptydirs') +backup=('etc/lighttpd/auth-inc.conf' 'etc/lighttpd/conf.include' 'etc/lighttpd/html.include') +options=('emptydirs') source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.gz" 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf' 'lighttpd.tmpfiles') @@ -58,28 +58,13 @@ package() { install -D -m644 ${srcdir}/ssl-inc.conf ${pkgdir}/etc/lighttpd/ssl-inc.conf install -D -m644 ${srcdir}/lighttpd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/lighttpd.conf - # set sane defaults - sed -e 's|/srv/www/htdocs/|/srv/http/|' \ - -e 's|/srv/www/|/srv/http/|' \ - -e 's|#server.username = "wwwrun"|server.username = "http"|' \ - -e 's|#server.groupname = "wwwrun"|server.groupname = "http"|' \ - -e 's|#server.pid-file = "/run/lighttpd.pid"|server.pid-file = "/run/lighttpd/lighttpd.pid"|' \ - -e 's|/usr/local/bin/php-cgi|/usr/bin/php-cgi|' \ - -e 's|"^/mythweb|"^/{1,2}mythweb|' \ - -e 's|# "mod_proxy",| "mod_proxy",|' \ - -e 's|# "mod_ssi",| "mod_ssi",|' \ - -e 's|#ssi.extension = ( ".shtml" )|ssi.extension = ( ".shtml" )|' \ - -i ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 - - /usr/bin/touch ${pkgdir}/etc/lighttpd/{conf,html}.include || return 1 - /bin/echo 'include "/etc/lighttpd/conf.include"' >> ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 - /bin/echo 'include "/etc/lighttpd/html.include"' >> ${pkgdir}/etc/lighttpd/lighttpd.conf || return 1 + /usr/bin/touch ${pkgdir}/etc/lighttpd/{conf,html}.include || return 1 install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING } -md5sums=('b49e133a4b321921331eba5a343872ab' +md5sums=('98b97852441fc6b1942dfa9cf5c0beba' '42d106b101d21ffd76ed9f3f1621e164' - '7945bd60801295010e9e2cac1dba78b7' + '1ff60252037689b0419e4c11af34b1ef' '62779511e3f1127c3cc9b94c49f99c29' 'ef64c496602b182a551416a8ba6b3d43' '1aeda5526e2cf1ca99d6e1571a6d9cf5') diff --git a/abs/core/lighttpd/lighttpd.conf b/abs/core/lighttpd/lighttpd.conf index 0d8becd..4d84dba 100644 --- a/abs/core/lighttpd/lighttpd.conf +++ b/abs/core/lighttpd/lighttpd.conf @@ -1,10 +1,8 @@ +####################################################################### # lighttpd configuration file # -# use it as a base for lighttpd 1.0.0 and above -# -# $Id: lighttpd.conf,v 1.7 2004/11/03 22:26:05 weigon Exp $ - -############ Options you really have to take care of #################### +# /etc/lighttpd/lighttpd.conf +####################################################################### ## modules to load # at least mod_access and mod_accesslog should be loaded @@ -28,7 +26,7 @@ server.modules = ( # "mod_userdir", "mod_cgi", # "mod_compress", -# "mod_ssi", + "mod_ssi", # "mod_usertrack", # "mod_expire", # "mod_secdownload", @@ -242,10 +240,11 @@ fastcgi.server = ( #### CGI module cgi.assign = ( ".pl" => "/usr/bin/perl", ".cgi" => "/usr/bin/perl", - ".sh" => "/bin/bash", + ".sh" => "/usr/bin/bash", ".py" => "/usr/bin/python2") -alias.url = ( "/unicorn" => "/data/srv/httpd/supercorn" ) + alias.url += ( "/cgi-bin" => "/data/srv/httpd/cgi-bin/") + $HTTP["url"] =~ "^/cgi-bin" { cgi.assign = ( "" => "" ) } @@ -267,3 +266,6 @@ $HTTP["url"] =~ "^/cgi-bin" { #include_shell "echo var.a=1" ## the above is same as: #var.a=1 + +include "/etc/lighttpd/conf.include" +include "/etc/lighttpd/html.include" diff --git a/abs/core/lighttpd/lighttpd.install b/abs/core/lighttpd/lighttpd.install index 1b0a4d7..3526b71 100755 --- a/abs/core/lighttpd/lighttpd.install +++ b/abs/core/lighttpd/lighttpd.install @@ -2,7 +2,11 @@ post_install() { if [[ ! -d run/lighttpd ]]; then usr/bin/systemd-tmpfiles --create lighttpd.conf fi + + echo "Generate lighttpd include..." gen_light_include.py + echo "Forcing a re-read of lighttpd's configuration file..." + /sbin/sv hup /service/lighttpd } post_upgrade() { -- cgit v0.12