From af45a8d8c845649ef9ede55cd0204462cad0ad82 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 22 May 2013 08:59:01 -0500
Subject: xymon client/server: fix logrotate, so it doesn't create files like
log.1.1.1.1.1.1.1..1.1.1.1.1 and use up all the inodes. server: fix
permissions on the snap reports
refs #921
---
abs/core/xymon/PKGBUILD | 11 +++++++----
abs/core/xymon/logrotate-client.xymon | 21 +++++++++++----------
abs/core/xymon/logrotate-server.xymon | 5 +++--
abs/core/xymon/xymon.install | 9 +++++++++
4 files changed, 30 insertions(+), 16 deletions(-)
mode change 100644 => 100755 abs/core/xymon/logrotate-client.xymon
mode change 100644 => 100755 abs/core/xymon/xymon.install
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index 8441779..a197b03 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=44
+pkgrel=46
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
@@ -74,7 +74,7 @@ package_xymonserver(){
install -D -m644 $startdir/src/logrotate-server.xymon $startdir/pkg/xymonserver/etc/logrotate.d/xymon-server
# fix env for mythtb bindingds
- echo "MYTHCONFDIR=/usr/share/mythtv" >> $startdir/pkg/xymonserver/home/xymon/etc/xymonserver.cfg
+ echo "MYTHCONFDIR=/usr/share/mythtv" >> $startdir/pkg/xymonserver/home/xymon/etc/xymonserver.cfg
#copy in replacment icon set
@@ -90,13 +90,16 @@ package_xymonserver(){
patch -p0 < $startdir/src/xymonserver.cfg.diff || return 1
patch -p3 < $startdir/src/client-local.cfg.patch || return 1
patch -p3 < $startdir/src/hosts.cfg.patch || return 1
-
+
#fix permissions
chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/
chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/
chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/notes/
chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/gifs/
+ chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/snap/
+ chmod 775 $startdir/pkg/xymonserver/data/srv/httpd/htdocs/xymon/rep/
chmod 750 $startdir/pkg/xymonserver/etc/sudoers.d
+
}
@@ -136,7 +139,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'622f400fd098cbc43c203e3210a6694e'
'84442377c6e914b65519076bda4e17a4'
'd7116dc59319b893e90a26e6beb83994'
- '67621b6c5a766ac03c5f407bdbdca810'
+ '0a63d66de7e74daef24899da0a4042ab'
'7ad4871af35f82c7824bb682b9325dba'
'98e9242ae346f729b14cb195786571f2'
'31ac5c1f6dcc9408b64c4107b325a9a6'
diff --git a/abs/core/xymon/logrotate-client.xymon b/abs/core/xymon/logrotate-client.xymon
old mode 100644
new mode 100755
index a312b64..0fadb2e
--- a/abs/core/xymon/logrotate-client.xymon
+++ b/abs/core/xymon/logrotate-client.xymon
@@ -1,14 +1,15 @@
/home/xymon/client/logs/* {
- missingok
- size 512K
- rotate 0
- compress
- postrotate
- if [ -f /service/xymon-client/run ]
- then
- sv hup xymon-client
- fi
+ missingok
+ notifempty
+ size 512k
+ rotate 2
+ compress
+ postrotate
+ if [ -f /service/xymon-client/run ]
+ then
+ sv hup xymon-client
+ fi
- endscript
+ endscript
}
diff --git a/abs/core/xymon/logrotate-server.xymon b/abs/core/xymon/logrotate-server.xymon
index 2267da8..cdbf339 100644
--- a/abs/core/xymon/logrotate-server.xymon
+++ b/abs/core/xymon/logrotate-server.xymon
@@ -1,7 +1,8 @@
/var/log/hobbit/* {
missingok
- size 512K
- rotate 0
+ notifempty
+ size 512k
+ rotate 2
compress
postrotate
if [ -f /service/xymon-server/run ]
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
old mode 100644
new mode 100755
index 3c9680b..90af45b
--- a/abs/core/xymon/xymon.install
+++ b/abs/core/xymon/xymon.install
@@ -17,9 +17,18 @@ post_install() {
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 /home/xymon
chown -R 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
+
chown -R nobody /var/log/hobbit
+
chown root /home/xymon/server/bin/xymonping
chmod +s /home/xymon/server/bin/xymonping
--
cgit v0.12
From 4258b111d9a6bfe0ca3a1f8d5f6d26afe5cea1ea Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 29 May 2013 17:02:03 -0500
Subject: system-templates: change receiver_usb.id to reference Twinham
instead of twinham-usb
refs # 903
---
abs/core/system-templates/PKGBUILD | 2 +-
abs/core/system-templates/templates/remotes/receiver_usb.id | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 9708ebf..9a20d2c 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=23
+pkgrel=24
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/remotes/receiver_usb.id b/abs/core/system-templates/templates/remotes/receiver_usb.id
index c47094e..f30428c 100644
--- a/abs/core/system-templates/templates/remotes/receiver_usb.id
+++ b/abs/core/system-templates/templates/remotes/receiver_usb.id
@@ -4,7 +4,7 @@
0e9c:0000|streamzap|"Streamzap Remote"|favorites
0fe9:9010|dvico| "DVICO Remote:"|favorites
0fe9:db98|Dvico-Dual-Digital4-rev2| "Dvico Dual Digital4 rev2 0fe9/db98"|other
-6253:0100|Twinhan_USB| "the VisionPlus is a Twinhan clone "|other
+6253:0100|Twinhan| "the VisionPlus is a Twinhan clone "|other
1509:9242|mce| "FIC eHome Infrared Transceiver 1509/9242"|favorites
1934:0602|mce| "Fintek eHome Infrared Transceiver 1934/0602"|favorites
147a:e015|mce| "Formosa eHome Infrared Transceiver 147a/e015"|favorites
--
cgit v0.12
From a602ca083fa8a28704e4cae0a2f69b34713d62a6 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 29 May 2013 17:03:00 -0500
Subject: mythinstall: Add the ermine logo, add back hauppauge as a valid
reciever selection.
refs # 920
---
abs/core/mythinstall/PKGBUILD | 15 ++++++++-------
abs/core/mythinstall/logo-1.png | Bin 5402 -> 5402 bytes
abs/core/mythinstall/logo-2.png | Bin 7932 -> 11883 bytes
abs/core/mythinstall/logo-3.png | Bin 40628 -> 7932 bytes
abs/core/mythinstall/logo-4.png | Bin 21032 -> 40628 bytes
abs/core/mythinstall/logo-5.png | Bin 4123 -> 21032 bytes
abs/core/mythinstall/logo-6.png | Bin 34843 -> 4123 bytes
abs/core/mythinstall/logo-7.png | Bin 0 -> 34843 bytes
abs/core/mythinstall/logo_src/ermine.png | Bin 0 -> 10251 bytes
9 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 abs/core/mythinstall/logo-7.png
create mode 100644 abs/core/mythinstall/logo_src/ermine.png
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 7a953a5..b95d720 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=76
+pkgrel=77
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.25')
@@ -30,9 +30,10 @@ build() {
}
md5sums=('39d6b7bd1ee305c5523a3cf66d4c2338'
- '137ba1bf74cc13feb1ca0038dc5ed5fc'
- '1d5064ac3c871f0aa895c95a71ba5c97'
- 'b4f9b52cdd2936e0a8dd4e3dd7cac344'
- '4e748680e67ff8bd0614fd5c63abda9c'
- '72fc7d8147c08336dd1064f9051f43ea'
- 'f6705520bc0a6655157cd14efdaac746')
+ '3291ad55fe6d7884fc732313f1cc2924'
+ '80c0326a253df275afbe875a8ec14a3c'
+ '46925d6fbcb7ec1fc51714d03ac6b72d'
+ '27ce7f89a83864dfc5abe23c61964c0c'
+ '2e85a1b9559557dade6e87daf2abb673'
+ '7f3045f740760c828e2e18293c2a4ab1'
+ '91393e9cca0e6168f772fb48c88d3829')
diff --git a/abs/core/mythinstall/logo-1.png b/abs/core/mythinstall/logo-1.png
index 5a4293c..a63adab 100644
Binary files a/abs/core/mythinstall/logo-1.png and b/abs/core/mythinstall/logo-1.png differ
diff --git a/abs/core/mythinstall/logo-2.png b/abs/core/mythinstall/logo-2.png
index cb6f152..2b6e9b7 100644
Binary files a/abs/core/mythinstall/logo-2.png and b/abs/core/mythinstall/logo-2.png differ
diff --git a/abs/core/mythinstall/logo-3.png b/abs/core/mythinstall/logo-3.png
index 0a59252..8fff988 100644
Binary files a/abs/core/mythinstall/logo-3.png and b/abs/core/mythinstall/logo-3.png differ
diff --git a/abs/core/mythinstall/logo-4.png b/abs/core/mythinstall/logo-4.png
index 6e70af7..81012a3 100644
Binary files a/abs/core/mythinstall/logo-4.png and b/abs/core/mythinstall/logo-4.png differ
diff --git a/abs/core/mythinstall/logo-5.png b/abs/core/mythinstall/logo-5.png
index 6f1ac44..8bd708d 100644
Binary files a/abs/core/mythinstall/logo-5.png and b/abs/core/mythinstall/logo-5.png differ
diff --git a/abs/core/mythinstall/logo-6.png b/abs/core/mythinstall/logo-6.png
index 4c60fe6..d370e2e 100644
Binary files a/abs/core/mythinstall/logo-6.png and b/abs/core/mythinstall/logo-6.png differ
diff --git a/abs/core/mythinstall/logo-7.png b/abs/core/mythinstall/logo-7.png
new file mode 100644
index 0000000..55a6cda
Binary files /dev/null and b/abs/core/mythinstall/logo-7.png differ
diff --git a/abs/core/mythinstall/logo_src/ermine.png b/abs/core/mythinstall/logo_src/ermine.png
new file mode 100644
index 0000000..792f7cc
Binary files /dev/null and b/abs/core/mythinstall/logo_src/ermine.png differ
--
cgit v0.12
From cede0522521576211ea48d871e54fc9225c59e95 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 29 May 2013 17:03:40 -0500
Subject: mythtv: change our library.xml.patch to not use the same verbage as
mythstream. Updated to latest fixes
---
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 7 ++++---
abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 3da2079..730bb71 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mythtv
pkgver=0.25
-pkgrel=25
+pkgrel=26
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -66,7 +66,9 @@ install='mythtv.install'
#http://code.mythtv.org/trac/ticket/10773 mythexpress
#http://code.mythtv.org/trac/ticket/10825 mythexpress
#http://code.mythtv.org/trac/ticket/11032 mythexpress
-patchs=('myth_settings.patch' 'MythBase.php.patch'
+#patchs=('myth_settings.patch' 'MythBase.php.patch'
+
+patchs=('myth_settings.patch'
'bonjour-correction.patch'
'0001-protect-metadata-loads-from-multiple-threads.patch'
'0004-restore-fe-netcontrol-play-resume-functionality.patch')
@@ -155,7 +157,6 @@ package() {
md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
'2babd4b8e146a7538d18dcd55695b0be'
'322f48528b350f0e6aebfff6eab4c4ee'
- '9ec33d6956464283636c1f9a781dd4fd'
'8e2a055bb3beae04c88a8e603e080422'
'67f7316c750fba17fa578d10840b9dbd'
'ae23e6a8cffbe335fa37bf59978bf7a2'
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch
index 8c36a62..8f80928 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/library.xml.patch
@@ -5,8 +5,8 @@
<button>
+ <type>STREAM</type>
-+ <text>Play Online Streams</text>
-+ <description></description>
++ <text>Online Content</text>
++ <description>Play content from online sources</description>
+ <action>MENU gen_is.xml</action>
+ </button>
+
--
cgit v0.12
From e9e438b24a8d5e8d3d73b15b9208b641ec7baf60 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 29 May 2013 17:04:26 -0500
Subject: mythtv/plugins/web : update fixes to latest fixes 5-29-13
---
abs/core/mythtv/stable-0.25/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.25/mythweb/PKGBUILD | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
index e29adf1..474b835 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash
@@ -1 +1 @@
-79a24c90efd3308895880cbad4a4e550986aedda
+ed3b7d10a63178bff5ce4134613ff86a85d73830
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index e5dea15..3228a58 100644
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.25
-pkgrel=17
+pkgrel=18
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
index 5e1c853..728b6dc 100644
--- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythweb
pkgver=0.25
-pkgrel=6
+pkgrel=7
commit_hash=`cat ../git_src/git_hash_web`
@@ -13,7 +13,8 @@ depends=('mythtv>=0.25' 'lighttpd' 'php' 'local-website')
groups=('mythtv-extras')
install=mythweb.install
#http://code.mythtv.org/trac/ticket/10504
-patches=(schedules.php.patch sorting.php.patch tv-schedules.php.patch)
+#patches=(schedules.php.patch sorting.php.patch tv-schedules.php.patch)
+patches=(schedules.php.patch tv-schedules.php.patch)
source=(`echo ${patches[@]:0}` mythweb.include mythweb_gen_light.conf)
DOCROOT=/data/srv/httpd/mythweb
@@ -69,7 +70,6 @@ build() {
}
md5sums=('392e570594859c026ac12194920246d8'
- '53cc59d6a8bf144027b25d5dcbfffc66'
'515e29fda503c199888a91553e1815a0'
'7645a6399434cbba35639713ac5d88e0'
'df190116b3aba35720fb6631885f973f')
--
cgit v0.12
From 6ef59e9232c170ff33166ac31858b72551ccc479 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 31 May 2013 17:06:06 -0500
Subject: LinHES-config: redo of partition, dropped pyparted and using parted
directly from the cmdline. This change also switches to using gpt only and
dropping the mbr. Partition layout remains the same p1 = / p2 = swap p3 =
null p4 = gpt boot p5 = home p6 = database p7 = remaining space
This also fixes using drives larger then 2TB and attempting to install with no swap partition.
refs #917
---
abs/core/LinHES-config/PKGBUILD | 4 +-
abs/core/LinHES-config/mv_install.py | 136 +++++++++++++++++++++++++++++------
2 files changed, 115 insertions(+), 25 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 449f456..3b083a2 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.0
-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'
@@ -133,7 +133,7 @@ build() {
install -o root -g root -D -m 0755 blacklist_pcspkr.conf $startdir/pkg/etc/modprobe.d/blacklist_pcspkr.conf
install -o root -g root -D -m 0755 blacklist_nouveau.conf $startdir/pkg/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('7cdc9bc678ab02a2d30444e20a3c71eb'
+md5sums=('70d0e964788d1d7bc622c20d7d8d8f5c'
'3f6855b7bb860a44f96a972c2e80f497'
'aaeb581275433649ff74e05da5e61a78'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 1128571..2712a60 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -259,7 +259,7 @@ def blank_table(diskdevice):
cmd = "parted %s --script -- mklabel msdos" %diskdevice
runcmd(cmd)
- logging.debug("parition table after:")
+ logging.debug("partition table after:")
cmd = "fdisk -l %s" %diskdevice
runcmd(cmd)
@@ -392,35 +392,128 @@ def set_active_parition(diskdevice):
logging.info(" Depending on your system this may not matter")
+#def partition_disk():
+ #global hostoptions
+ #logging.info("Partitioning")
+ #logging.debug("____start of partition_disk____")
+ #rootdisk = hostoptions["rootdisk"]
+ #datadisk = hostoptions["datadisk"]
+ #label = "root"
+ #partitions_removeall("/dev/"+rootdisk, label)
+ #label = "data"
+ #partitions_removeall("/dev/"+datadisk, label)
+ #hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0)
+ #set_active_parition("/dev/"+rootdisk)
+
+ #hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1)
+
+ ##create extended partition
+ #hostoptions["extended_partition"] = create_partitions("/dev/"+rootdisk, "all", "EXTENDED", 1)
+
+ ##create the logical in the extended
+ #hostoptions["home_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["homesize"], "LOGICAL", 1)
+ #hostoptions["sql_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["sqlsize"], "LOGICAL", 1)
+
+ #if datadisk != rootdisk:
+ #hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0)
+ #else:
+ #hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "LOGICAL", 1)
+
+ #logging.debug("sleeping for 5 seconds")
+ #time.sleep(5)
+
+
+#parted /dev/sda -a optimal --script mklabel gpt
+#parted /dev/sda -a optimal --script unit MB -- mkpart primary 1 500
+#parted /dev/sda -a optimal --script unit MB -- mkpart swap 501 600
+#parted /dev/sda -a optimal --script unit MB -- mkpart primary 601 601
+#parted /dev/sda -a optimal --script unit MB -- mkpart primary 601 601
+
+#parted /dev/sda -a optimal --script unit MB -- mkpart primary 604 700
+#parted /dev/sda -a optimal --script unit MB -- mkpart primary 700 800
+#parted /dev/sda -a optimal --script unit MB -- mkpart primary 800 -1
+
+def create_partitions_gpt(diskdevice, start,size,partition_type):
+ logging.debug("_____Create partitions gpt ______")
+ if size == "NO" or size == "no":
+ logging.info("Size is 0, skipping")
+ last_sector = start
+ elif size == "all" or size == "ALL":
+ logging.info("Size is all, using rest of disk")
+ last_sector = "-1"
+ else:
+ last_sector = start + int(size)
+
+ cmd = "parted %s -a optimal --script unit MB -- mkpart primary %s %s" %(diskdevice, start, last_sector)
+ runcmd(cmd)
+
+ newstart = last_sector
+ #print newstart
+ return newstart
+
+
+
+
+
+
def partition_disk():
global hostoptions
logging.info("Partitioning")
logging.debug("____start of partition_disk____")
- rootdisk = hostoptions["rootdisk"]
- datadisk = hostoptions["datadisk"]
+ rootdisk = "/dev/%s" %(hostoptions["rootdisk"])
+ datadisk = "/dev/%s" %(hostoptions["datadisk"])
label = "root"
- partitions_removeall("/dev/"+rootdisk, label)
+ partitions_removeall(rootdisk, label)
label = "data"
- partitions_removeall("/dev/"+datadisk, label)
- hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0)
- set_active_parition("/dev/"+rootdisk)
+ partitions_removeall(datadisk, label)
+ #create gpt table
+ cmd = "parted %s -a optimal --script mklabel gpt" %rootdisk
+ runcmd(cmd)
+ cmd = "parted %s -a optimal --script mklabel gpt" %datadisk
+ runcmd(cmd)
+
+ start_sector = 1
+ start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["rootsize"], "primary")
+ start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["swapsize"], "primary")
+ hostoptions["rootpartition"] = hostoptions["rootdisk"]+str(1)
+ hostoptions["swappartition"] = hostoptions["rootdisk"] + str(2)
+ hostoptions["home_partition"] = hostoptions["rootdisk"]+str(5)
+ hostoptions["sql_partition"] = hostoptions["rootdisk"]+str(6)
+ hostoptions["datapartition"] = hostoptions["datadisk"]+str(7)
+
+
+ #create 1 blank to match up with extended/logical layout from 8.0
+ start_sector = create_partitions_gpt(rootdisk, start_sector, "NO", "primary")
+
+ #create gtp boot
+ start_sector = start_sector + 1
+ start_sector = create_partitions_gpt(rootdisk, start_sector, 2 , "primary")
+ cmd = "parted %s set 4 bios_grub on" %rootdisk
+ runcmd(cmd)
+
+ #create home_partition
+ start_sector = start_sector + 1
+ start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["homesize"], "primary")
+
+ ##create mysql
+ start_sector = start_sector + 1
+ start_sector = create_partitions_gpt(rootdisk, start_sector, hostoptions["sqlsize"], "primary")
+
+ start_sector = start_sector + 1
+ #create data
+ if datadisk != rootdisk:
+ create_partitions_gpt(datadisk, 1, hostoptions["datasize"], "primary")
+ else:
+ create_partitions_gpt(datadisk, start_sector, hostoptions["datasize"], "primary")
+
+ logging.debug("sleeping for 5 seconds")
+ time.sleep(5)
+
- hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1)
- #create extended partition
- hostoptions["extended_partition"] = create_partitions("/dev/"+rootdisk, "all", "EXTENDED", 1)
- #create the logical in the extended
- hostoptions["home_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["homesize"], "LOGICAL", 1)
- hostoptions["sql_partition"] = create_partitions("/dev/"+rootdisk, hostoptions["sqlsize"], "LOGICAL", 1)
- if datadisk != rootdisk:
- hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0)
- else:
- hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "LOGICAL", 1)
- logging.debug("sleeping for 5 seconds")
- time.sleep(5)
def fscmd(fstype):
@@ -1530,7 +1623,7 @@ def full_install(hostoptions):
partition_disk()
else:
logging.debug(" Debug mode, skipping partitioning step")
-
+ #sys.exit(0)
# Format disk
statusmsg = "Preparing %s" %( hostoptions["rootdisk"])
update_status(statusmsg)
@@ -2163,9 +2256,6 @@ for line in config_file:
-
-
-
if __name__ == "__main__":
config_file = "mv_config"
data_config = __import__(config_file, globals(), locals(), [])
--
cgit v0.12
From 22aff21a70f6788ac33d126795702fc5e257c862 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 31 May 2013 17:08:57 -0500
Subject: LinHES-system: run mythwelcome-config.py on first configure.
refs # 914
---
abs/core/LinHES-system/LinHES-session | 7 +++++++
abs/core/LinHES-system/PKGBUILD | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 61405db..27ce2bd 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -243,8 +243,15 @@ function update_apple_trailers(){
fi
}
+function first_mythwelcome_config(){
+ echo "First configure: Running mythwelcome-config.py"
+ /usr/LH/bin/mythwelcome-config.py
+ }
+
+
function first_configure(){
+ first_mythwelcome_config
if [ ! x$STARTUP_STYLE = xlegacy ]
then
first_configure_mv
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index a049353..fd167c1 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
@@ -81,7 +81,7 @@ build() {
}
-md5sums=('08abf577578dd805bab7cd9eba90965a'
+md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'de32a1c50101265dd7f6ca5037f7a26a'
'a875ee97f86e46f34a741c2bc455f894'
'76b2637cac0452b3acdbeeb4e8a5474b'
--
cgit v0.12
From d068c8d3408181d65f458563438b38560b71c9e8 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Fri, 31 May 2013 19:40:17 -0500
Subject: LinHES-config: fix a nasty bug where some of the system settings
didn't get transferred on install.
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_install.py | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 3b083a2..131efd9 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=3
+pkgrel=4
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'
@@ -133,7 +133,7 @@ build() {
install -o root -g root -D -m 0755 blacklist_pcspkr.conf $startdir/pkg/etc/modprobe.d/blacklist_pcspkr.conf
install -o root -g root -D -m 0755 blacklist_nouveau.conf $startdir/pkg/etc/modprobe.d/blacklist_nouveau.conf
}
-md5sums=('70d0e964788d1d7bc622c20d7d8d8f5c'
+md5sums=('c832059cd635359d39a2ac3166ff463c'
'3f6855b7bb860a44f96a972c2e80f497'
'aaeb581275433649ff74e05da5e61a78'
'2596460462cf6c889cf8f95485537b20'
diff --git a/abs/core/LinHES-config/mv_install.py b/abs/core/LinHES-config/mv_install.py
index 2712a60..57b784b 100755
--- a/abs/core/LinHES-config/mv_install.py
+++ b/abs/core/LinHES-config/mv_install.py
@@ -1559,6 +1559,9 @@ def restore_default_settings():
cmd = "%s/bin/myth_settings_wrapper.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME)
runcmd(cmd)
SE = os.environ["TEMPLATES"]+"/settings/syssettings/"
+ #this is needed because the settings dir is no longer part of the templates pkg
+ cmd="mkdir -p %s" %(data_config.MOUNTPOINT+SE)
+ runcmd(cmd)
cp_and_log(SE, data_config.MOUNTPOINT+SE)
cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
copy_updates()
--
cgit v0.12
From cc663d6f0e4f3ef5fc7e13007d6ba5c6792bbb4b Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 4 Jun 2013 14:46:45 -0500
Subject: xbmc: Fix xml to call the shell script for xbmc instead of xbmc
directly refs #908 closes #908
---
abs/extra/xbmc/PKGBUILD | 4 ++--
abs/extra/xbmc/xbmc_lib.conf | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index ecd7fb9..874e0d5 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -9,7 +9,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=11.0
-pkgrel=9
+pkgrel=10
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -109,4 +109,4 @@ package() {
md5sums=('9e8a26ee25173c7268abea7f1d82d428'
'5aa2e21a1f9fea60a2e5bb345e5aefd0'
'e48a3d87984669ef206e902bc8290ff9'
- '6c4ab6c8a5ef748786c7602bb2a9ef99')
+ '8c5cd1b5e7660a49ccd2f99967180a82')
diff --git a/abs/extra/xbmc/xbmc_lib.conf b/abs/extra/xbmc/xbmc_lib.conf
index df88abb..2dbb10f 100644
--- a/abs/extra/xbmc/xbmc_lib.conf
+++ b/abs/extra/xbmc/xbmc_lib.conf
@@ -2,7 +2,7 @@
<button>
<type>MENU_XBMC</type>
<text>Launch XBMC</text>
- <action>EXEC /usr/bin/xbmc</action>
+ <action>EXEC /usr/LH/bin/xbmc.sh</action>
</button>
<!--#XBMC-->
--
cgit v0.12
From a1b54c58e054ad7adf1c4b609dc978f558dad3af Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 4 Jun 2013 14:50:23 -0500
Subject: system-templates: Fixed firefly lirc mapping. config files provided
by RacerX Also add xbmc.xml for xbmc lirc mapping.
refs #908
closes #908
---
abs/core/system-templates/PKGBUILD | 2 +-
.../ATI/snapstream_firefly_all/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_all/xbmc.xml | 38 ++
.../ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_ch1/xbmc.xml | 38 ++
.../ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_ch2/xbmc.xml | 38 ++
.../ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_ch3/xbmc.xml | 38 ++
.../ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_ch4/xbmc.xml | 38 ++
.../ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_ch5/xbmc.xml | 38 ++
.../ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt | 655 +++++++--------------
.../remotes/ATI/snapstream_firefly_ch6/xbmc.xml | 38 ++
15 files changed, 1716 insertions(+), 3137 deletions(-)
mode change 100644 => 100755 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml
create mode 100644 abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml
diff --git a/abs/core/system-templates/PKGBUILD b/abs/core/system-templates/PKGBUILD
index 9a20d2c..0c1dbeb 100755
--- a/abs/core/system-templates/PKGBUILD
+++ b/abs/core/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=2.0
-pkgrel=24
+pkgrel=25
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
old mode 100644
new mode 100755
index e918011..064e72d
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_all/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt
index e918011..064e72d 100644
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch1/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt
index e918011..064e72d 100644
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch2/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt
index e918011..064e72d 100644
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch3/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt
index e918011..064e72d 100644
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch4/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt
index e918011..064e72d 100644
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch5/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt
index e918011..064e72d 100644
--- a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/lircrc-snapstrm.txt
@@ -5,586 +5,345 @@
#
# Modified from Jarod Wilson's which came from Jeff Campbell's
# By Brad Templeton
+# Modified to use the Firefly's Unique Buttons by Ryan Schmitz
+# Updated by RacerX for Linhes 8.0
-
-# Here we have the jump point commands. They only work if you have
-# defined function keys for these jump points. For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
+ # Remote Numbers 0-9
begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
+ prog = mythtv
+ button = 0
+ repeat = 3
+ config = 0
end
begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
+ prog = mythtv
+ button = 1
+ repeat = 3
+ config = 1
end
-# Not yet defined
begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 2
+ repeat = 3
+ config = 2
end
-# Given another function for now, I don't use mythgallery
begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
+ prog = mythtv
+ button = 3
+ repeat = 3
+ config = 3
end
begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
+ prog = mythtv
+ button = 4
+ repeat = 3
+ config = 4
end
-# I stuck the "todo" list on here as Myth has no radio function
begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
+ prog = mythtv
+ button = 5
+ repeat = 3
+ config = 5
end
begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = 6
+ repeat = 3
+ config = 6
end
begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = 7
+ repeat = 3
+ config = 7
end
begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
+ prog = mythtv
+ button = 8
+ repeat = 3
+ config = 8
end
begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
+ prog = mythtv
+ button = 9
+ repeat = 3
+ config = 9
end
-# Channel Up
+ # Escape/Back/Exit
begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
+ prog = mythtv
+ button = BACK
+ config = Esc
end
-# Channel Down
+ # OK/Select
begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
+ prog = mythtv
+ button = ENT
+ config = pace
end
-# OK/Select
+ # Volumn Up
begin
-prog = mythtv
-button = Ok
-config = Space
+ prog = mythtv
+ button = VOL+
+ repeat = 3
+ config = F11
end
-# Play
+ # Volumn Down
begin
-prog = mythtv
-button = Play
-config = Return
+ prog = mythtv
+ button = VOL-
+ repeat = 3
+ config = F10
end
-# Stop
+ # Mute
begin
-prog = mythtv
-button = Stop
-config = I
+ prog = mythtv
+ button = MUTE
+ repeat = 3
+ config = |
end
-# Escape/Exit/Back
+ # Firefly
begin
-prog = mythtv
-button = BACK
-config = Esc
+ prog = mythtv
+ button = FIREFLY
+ repeat = 3
+ config = F8
end
-# Power Off/Exit
+ # Channel Up
begin
-prog = mythtv
-button = POWER
-config = Esc
+ prog = mythtv
+ button = CH+
+ repeat = 3
+ config = Up
end
-
-# Pause
+ # Channel Down
begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
+ prog = mythtv
+ button = CH-
+ repeat = 3
+ config = Down
end
-# Mute
+ # Info
begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
+ prog = mythtv
+ button = INFO
+ repeat = 3
+ config = I
end
-# Fast forward (30 sec default)
+ # change tuners
begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
+ prog = mythtv
+ button = OPTION
+ repeat = 3
+ config = Y
end
-# Rewind (10 sec default)
+ # Up
begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
+ prog = mythtv
+ button = UP
+ repeat = 3
+ config = Up
end
-# Skip forward (10 min default)
+ # Left
begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
+ prog = mythtv
+ button = LEFT
+ repeat = 3
+ config = Left
end
-# Skip backward (10 min default)
+ # Down
begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
+ prog = mythtv
+ button = DOWN
+ repeat = 3
+ config = Down
end
-# Record
+ # Right
begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
+ prog = mythtv
+ button = RIGHT
+ repeat = 3
+ config = Right
end
-# Delete
+ # Ok/Select
begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
+ prog = mythtv
+ button = OK
+ config = space
end
-# Decrease play speed
+ # Menu
begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
+ prog = mythtv
+ button = MENU
+ repeat = 3
+ config = M
end
-# Display EPG while in live TV,
-# View selected show while in EPG
+ # Escape/Exit/Back
begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
+ prog = mythtv
+ button = EXIT
+ config = Esc
end
-# Scroll up
+ # Record
begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
+ prog = mythtv
+ button = REC
+ repeat = 3
+ config = R
end
-# Scroll down
+ # Play
begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
+ prog = mythtv
+ button = PLAY
+ config = Return
end
-# Bring up OSD info
+ # Stop
begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
+ prog = mythtv
+ button = STOP
+ config = Esc
end
-# Change display aspect ratio
+ # Rewind
begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
+ prog = mythtv
+ button = FWD
+ repeat = 3
+ config = PgDown
end
-# double speed watch
+ # Fast Forward
begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
+ prog = mythtv
+ button = REW
+ repeat = 3
+ config = PgUp
end
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
+ # Skip Backward
begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
+ prog = mythtv
+ button = PREV
+ repeat = 3
+ config = home
end
-# Numbers 0-9
-
+ # Skip Forward
begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
+ prog = mythtv
+ button = NEXT
+ repeat = 3
+ config = End
end
+ # Pause
begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
+ prog = mythtv
+ button = Pause
+ repeat = 3
+ config = P
end
+ # Delete
begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
+ prog = mythtv
+ button = A
+ repeat = 3
+ config = D
end
+ # Decrease Playback Speed
begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
+ prog = mythtv
+ button = B
+ repeat = 3
+ config = J
end
+ # Double Playback Speed
begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
+ prog = mythtv
+ button = C
+ repeat = 3
+ config = J
end
+ # Time Stretch
begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
+ prog = mythtv
+ button = D
+ repeat = 3
+ config = Y
end
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
+ ### Jump Points need to match config in mythweb keybindings
+ # Myth Music
begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
+ prog = mythtv
+ button = Music
+ repeat = 3
+ config = F4
end
+ # Live TV
begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
+ prog = mythtv
+ button = TV
+ repeat = 3
+ config = F5
end
+ # Myth Video Gallery
begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
+ prog = mythtv
+ button = VIDEO
+ repeat = 3
+ config = F2
end
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
+ # Myth Image Gallery
begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
+ prog = mythtv
+ button = PHOTOS
+ repeat = 3
+ config = F
end
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-# Quit
begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
+ prog = irexec
+ button = HELP
+ config = env DISPLAY=:0 xdotool key alt+h
+ flags = quit
end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml
new file mode 100644
index 0000000..64dc7df
--- /dev/null
+++ b/abs/core/system-templates/templates/remotes/ATI/snapstream_firefly_ch6/xbmc.xml
@@ -0,0 +1,38 @@
+<lircmap>
+<remote device="Snapstream_Firefly">
+ <pause>PAUSE</pause>
+ <stop>STOP</stop>
+ <forward>FWD</forward>
+ <reverse>REW</reverse>
+ <left>LEFT</left>
+ <right>RIGHT</right>
+ <up>UP</up>
+ <down>DOWN</down>
+ <select>OK</select>
+ <pageplus>CH+</pageplus>
+ <pageminus>CH-</pageminus>
+ <back>EXIT</back>
+ <menu>MENU</menu>
+ <title>PLAY</title>
+ <info>INFO</info>
+ <skipplus>NEXT</skipplus>
+ <skipminus>PREV</skipminus>
+ <display>MAXI</display>
+ <start>FIREFLY</start>
+ <record>REC</record>
+ <volumeplus>VOL+</volumeplus>
+ <volumeminus>VOL-</volumeminus>
+ <mute>MUTE</mute>
+ <power>CLOSE</power>
+ <one>1</one>
+ <two>2</two>
+ <three>3</three>
+ <four>4</four>
+ <five>5</five>
+ <six>6</six>
+ <seven>7</seven>
+ <eight>8</eight>
+ <nine>9</nine>
+ <zero>0</zero>
+</remote>
+</lircmap>
--
cgit v0.12
From c9041c8753b14ad9616c8dc3deb0e0426d94fd5f Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Tue, 4 Jun 2013 14:51:22 -0500
Subject: LinHES-config: mv_ir.py add support for custom xbmc lirc mapping.
If a remote definition has a xbmc.xml file it will be symlinked for xbmc
usage.
refs #910
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/mv_ir.py | 42 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 131efd9..9f1584c 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=4
+pkgrel=5
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'
@@ -159,7 +159,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'c0549457750c4f8e8038d904a0f3012a'
'3d1e3c7315881a109fb089a540d2262c'
'b845de3e05c1734cce4b9ac5e8f1baaf'
- 'f9b38f3d8e6d25b7c67b4c33cdee58db'
+ '31ad5416bf2ab1909338a16035941127'
'8b7dce4a3a0a281fa6656aa8781a648e'
'f7f2dc11d1ba454cd25eeaa133104b62'
'824e49d9b01fed295c704ab68908b464'
diff --git a/abs/core/LinHES-config/mv_ir.py b/abs/core/LinHES-config/mv_ir.py
index d77f64f..f481fa4 100755
--- a/abs/core/LinHES-config/mv_ir.py
+++ b/abs/core/LinHES-config/mv_ir.py
@@ -136,6 +136,48 @@ def setup_ir_remote(Remotetype,templates,mythhome,HostBlasterType,remotebucket):
cmd = "cp %s /etc/remote.run" %filename
mv_common.runcmd(cmd)
+ #if remote has a special xbmc file, use it.
+ xbmcfile= remote_path + "/xbmc.xml"
+ userxmbcfile = mythhome+"/.xbmc/userdata/Lircmap.xml"
+
+ if os.path.exists(xbmcfile):
+ logging.debug(" XBMC lirc file present")
+ logging.info(" Setting up lirc for xbmc")
+ if not os.path.exists(mythhome+"/.xbmc/userdata"):
+ logging.debug(" Creating %s/.xbmc",mythhome)
+ try:
+ os.mkdir(mythhome+"/.xbmc")
+ except:
+ logging.debug(" Couldn't create .xbmc/ ")
+ try:
+ os.mkdir(mythhome+"/.xbmc/userdata/")
+ except:
+ logging.debug(" Couldn't create .xbmc/userdata ")
+
+ try:
+ cmd = ''' chown -R mythtv %s/.xbmc''' %mythhome
+ mv_common.runcmd(cmd)
+ cmd = ''' chgrp -R mythtv %s/.xbmc/userdata''' %mythhome
+ mv_common.runcmd(cmd)
+ except:
+ logging.debug(" Couldn't change permissions for .xbmc")
+ pass
+ try:
+ cmd = ''' rm -f %s''' %(userxmbcfile)
+ mv_common.runcmd(cmd)
+ logging.debug(" Creating symlink for xmbc lircrc")
+ os.symlink(xbmcfile, mythhome+"/.xbmc/userdata/Lircmap.xml")
+ except:
+ pass
+ else:
+ logging.debug(" XBMC lirc file %s not present" %xbmcfile)
+
+
+
+
+
+
+
#remote has it's own modprobe.d/conf filename
cmd = "rm -f /etc/modprobe.d/mv_ir.conf"
mv_common.runcmd(cmd)
--
cgit v0.12
From 5d810f391b2071415598c8d29dd96d4c1c38ae1d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 2 Jul 2013 09:37:18 -0500
Subject: linhes-scripts: add gnu-netcat as dep for idle.sh
---
abs/core/linhes-scripts/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index c325101..147a035 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=50
+pkgrel=51
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
depends=('xosd' 'cpulimit' 'screen' 'mencoder' 'tablet-encode' 'mplayer'
- 'normalize' 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell')
+ 'normalize' 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell' 'gnu-netcat')
url="http://linhes.org/"
install="linhes-scripts.install"
source=(
--
cgit v0.12
From 15b6550904441123df9a7b0608545e61b5f31acb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 2 Jul 2013 10:43:32 -0500
Subject: LinHES-system: misc_upcoming_recordings.pl: suppress a warning.
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/misc_upcoming_recordings.pl | 10 ++++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index fd167c1..8588f3a 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
@@ -116,7 +116,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'06a628469051237943b7c874f2e29b8a'
'54ebcc024db2e0ebe8121305d8926767'
'45f46d1f9193c8dde18e56369ec29a1e'
- 'a8edbe7bc37e9932e8749d9f5f89c16f'
+ '145b1da6ce501b3ce38ea415a576bf2d'
'116b0f62ed4e8dd6e437930deeb6e49e'
'17f678d37187be0f12d67f64e40429c6'
'bacc813b48bafcc6fe906e5969930501'
diff --git a/abs/core/LinHES-system/misc_upcoming_recordings.pl b/abs/core/LinHES-system/misc_upcoming_recordings.pl
index 377c2dc..26ec1b4 100755
--- a/abs/core/LinHES-system/misc_upcoming_recordings.pl
+++ b/abs/core/LinHES-system/misc_upcoming_recordings.pl
@@ -305,7 +305,10 @@ EOF
sub status_print {
my $count = shift;
my $text = $show->format_name($status_text_format, ' ', ' ', 1, 0 ,1);
- $text =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g;
+ {
+ no warnings 'uninitialized';
+ $text =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g;
+ }
my $value = $show->format_name($status_value_format, ' ', ' ',
1, 0 ,1);
$value =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g;
@@ -320,7 +323,10 @@ EOF
sub text_print {
my $count = shift;
my $text = $show->format_name($text_format, ' ', ' ', 1, 0 ,1);
- $text =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g;
+ {
+ no warnings 'uninitialized';
+ $text =~ s/%rs/$MythTV::RecStatus_Types{$show->{'recstatus'}}/g;
+ }
$text =~ s/\\r/\r/g;
$text =~ s/\\n/\n/g;
print("$heading") if ($count == 0);
--
cgit v0.12
From a08b2f33727ae551dc79610cabb7ddeecd5da4b7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 2 Jul 2013 12:24:55 -0500
Subject: dvb-firmware: enable xc5000 no_poweroff. close #918
---
abs/core/dvb-firmware/PKGBUILD | 4 ++--
abs/core/dvb-firmware/xc5000.conf | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/dvb-firmware/PKGBUILD b/abs/core/dvb-firmware/PKGBUILD
index 512422f..b03deac 100644
--- a/abs/core/dvb-firmware/PKGBUILD
+++ b/abs/core/dvb-firmware/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=dvb-firmware
pkgver=1
-pkgrel=18
+pkgrel=19
pkgdesc="Firmware for DVB cards"
replaces=('hd3000firmware')
arch=('i586' 'i686' 'x86_64')
@@ -18,4 +18,4 @@ build() {
install -D -m644 "${srcdir}/xc5000.conf" "${pkgdir}/etc/modprobe.d/"
}
md5sums=('d2ba68a1e49adbb71431295fc96cda60'
- '08c7619f37757f0d6191866701212575')
+ '08529c85be55836394d1047b85b869a3')
diff --git a/abs/core/dvb-firmware/xc5000.conf b/abs/core/dvb-firmware/xc5000.conf
index 93b3ab4..4124136 100644
--- a/abs/core/dvb-firmware/xc5000.conf
+++ b/abs/core/dvb-firmware/xc5000.conf
@@ -3,4 +3,4 @@
#
# When v4l-dvb is installed no_poweroff=1 is no longer needed.
#
-#options xc5000 no_poweroff=1
+options xc5000 no_poweroff=1
--
cgit v0.12
From dcd746607b150957324b79678c0e00cc2b970cfc Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 17 Jul 2013 11:05:39 -0500
Subject: supplemental-web: change docs to update new location of
ignoreclient.py closes #927
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/docs.html | 20 ++++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 824b7bd..2a4a3df 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/docs.html b/abs/core/supplemental-web/contents/docs.html
index 21ba2dd..9afebb8 100644
--- a/abs/core/supplemental-web/contents/docs.html
+++ b/abs/core/supplemental-web/contents/docs.html
@@ -23,22 +23,22 @@ Starting and stopping services.
<div id="navcontainer">
<ul id="navlist">
- <li>sv {stop,start,restart} frontend. This will start/stop the entire X proccess that runs mythfrontend</li>
- <li>sv {stop,start,restart} mysql</li>
- <li>sv {stop,start,restart} mythbackend</li>
- <li>sv {stop,start,restart} lircd</li>
+ <li>sv {stop,start,restart} frontend. This will start/stop the entire X proccess that runs mythfrontend</li>
+ <li>sv {stop,start,restart} mysql</li>
+ <li>sv {stop,start,restart} mythbackend</li>
+ <li>sv {stop,start,restart} remotes</li>
</ul>
<br>
</div>
<div id="navcontainer">
- Other Random notes
+ Other Random notes
<br>
<ul id="navlist">
- <li>To keep a host from showing up in the network map, add it to:
- /data/srv/hobbit/server/ext/ignoreclient.py
- </li>
- <li>remove "func" from bb-hosts to stop hobbit from running a func check on it </li>
- <li>if /tmp/nomfe is present then mythfrontend will not restart </li>
+ <li>To keep a host from showing up in the network map, add it to:
+ /home/xymon/server/ext/ignoreclient.py
+ </li>
+ <li>remove "func" from bb-hosts to stop hobbit from running a func check on it </li>
+ <li>if /tmp/nomfe is present then mythfrontend will not restart </li>
<li>adding pkg names to /etc/pkgname.blacklist will stop MythVantage from autoinstalling a package.</li>
</div>
--
cgit v0.12
From 74c3042ba53de6dc3f75988de1add0a9a4df894c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 17 Jul 2013 11:06:25 -0500
Subject: libdvdcss: update to 1.2.13
---
abs/extra/libdvdcss/PKGBUILD | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/extra/libdvdcss/PKGBUILD b/abs/extra/libdvdcss/PKGBUILD
index c6b1807..9e8edc9 100644
--- a/abs/extra/libdvdcss/PKGBUILD
+++ b/abs/extra/libdvdcss/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160018 2012-05-28 02:15:20Z eric $
+# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: arjan <arjan@archlinux.org>
# Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
pkgname=libdvdcss
-pkgver=1.2.12
+pkgver=1.2.13
pkgrel=1
pkgdesc="A portable abstraction library for DVD decryption"
url="http://www.videolan.org/libdvdcss"
arch=('i686' 'x86_64')
license=('GPL')
depends=('glibc')
-options=('!libtool')
+options=('!libtool' '!docs' '!emptydirs')
source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2218a193900e3203aa10dc24cdf54275')
+sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,5 +23,5 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="${pkgdir}" install
}
--
cgit v0.12
From 882870048573238516441e3cd6999fbfb0875462 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 17 Jul 2013 11:07:08 -0500
Subject: ntfs-3g_ntfsprogs: add ntfs-3gprogs to repo. This is needed for
people that have external windows drives and want to access data
---
abs/extra/ntfs-3g_ntfsprogs/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 abs/extra/ntfs-3g_ntfsprogs/PKGBUILD
diff --git a/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD b/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD
new file mode 100644
index 0000000..116ab72
--- /dev/null
+++ b/abs/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: Thomas B�chler <thomas.archlinux.org>
+
+pkgbase=ntfs-3g_ntfsprogs
+pkgname=ntfs-3g
+pkgver=2013.1.13
+pkgrel=3
+pkgdesc="NTFS filesystem utilities"
+arch=('i686' 'x86_64')
+url="http://www.tuxera.com/community/ntfs-3g-download/"
+license=('GPL2')
+depends=('util-linux' 'fuse')
+conflicts=('ntfsprogs')
+provides=('ntfsprogs')
+replaces=('ntfsprogs')
+options=('!libtool')
+source=(http://tuxera.com/opensource/$pkgbase-$pkgver.tgz)
+sha1sums=('8c12b7644d90ae9fb8d0aca0d7ebd5f8fac2c818')
+
+prepare() {
+ cd $pkgbase-$pkgver
+ sed -i 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' {ntfsprogs,src}/Makefile.in
+}
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr \
+ --with-fuse=external --disable-static \
+ --enable-posix-acls --disable-ldconfig \
+ --mandir=/usr/share/man --sbin=/usr/bin
+ make
+}
+
+package_ntfs-3g() {
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+ ln -s /usr/bin/ntfs-3g "$pkgdir/usr/bin/mount.ntfs"
+}
--
cgit v0.12
From 86e356d2313e2419823056d798affc105b045136 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 26 Jul 2013 22:36:47 -0500
Subject: xymon: Make logrotate wildcard more restrictive so multiple .1 files
aren't created. refs #913.
Change the name of the mtc log to mtc.log. Remove the old mtc log and mtc.1 files.
---
abs/core/xymon/PKGBUILD | 10 +++++-----
abs/core/xymon/logrotate-client.xymon | 2 +-
abs/core/xymon/logrotate-server.xymon | 2 +-
abs/core/xymon/tasks.d.mv | 2 +-
abs/core/xymon/xymon.install | 5 +++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index a197b03..a0540d3 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,14 +1,14 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=46
+pkgrel=47
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
url="http://www.xymon.com/"
-source=(http://voxel.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
+source=(http://hivelocity.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
depends=(rrdtool fping pcre python2 graphviz 'linhes-scripts>=7-24')
@@ -125,7 +125,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'c60b0d59bb39505ee3d62c6dd65429c5'
'a45dd4cdb84817bcf3e51b25cc713799'
'034658a1084510ecbbb0dc166c0401eb'
- '2d88e59ab17114030da514ba3f0a5b64'
+ '758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
'fc24435b97254f0954233319ba09689b'
@@ -139,8 +139,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'622f400fd098cbc43c203e3210a6694e'
'84442377c6e914b65519076bda4e17a4'
'd7116dc59319b893e90a26e6beb83994'
- '0a63d66de7e74daef24899da0a4042ab'
- '7ad4871af35f82c7824bb682b9325dba'
+ 'b4e8641e97e6b689dbc634af785e6799'
+ 'e2844513e2c92e8b5084818f3b2a478d'
'98e9242ae346f729b14cb195786571f2'
'31ac5c1f6dcc9408b64c4107b325a9a6'
'c7178bbf384bbe86c318b60fef6faf10'
diff --git a/abs/core/xymon/logrotate-client.xymon b/abs/core/xymon/logrotate-client.xymon
index 0fadb2e..ba48a0f 100755
--- a/abs/core/xymon/logrotate-client.xymon
+++ b/abs/core/xymon/logrotate-client.xymon
@@ -1,4 +1,4 @@
-/home/xymon/client/logs/* {
+/home/xymon/client/logs/*.log {
missingok
notifempty
size 512k
diff --git a/abs/core/xymon/logrotate-server.xymon b/abs/core/xymon/logrotate-server.xymon
index cdbf339..a231470 100644
--- a/abs/core/xymon/logrotate-server.xymon
+++ b/abs/core/xymon/logrotate-server.xymon
@@ -1,4 +1,4 @@
-/var/log/hobbit/* {
+/var/log/hobbit/*.log /var/log/hobbit/*.pid {
missingok
notifempty
size 512k
diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv
index e113f37..5ea7841 100644
--- a/abs/core/xymon/tasks.d.mv
+++ b/abs/core/xymon/tasks.d.mv
@@ -30,7 +30,7 @@
[mtc]
ENVFILE /home/xymon/server/etc/xymonserver.cfg
CMD /home/xymon/server/ext/hobbit_myth_data.py
- LOGFILE $BBSERVERLOGS/mtc
+ LOGFILE $BBSERVERLOGS/mtc.log
INTERVAL 5m
[ghost]
ENVFILE /home/xymon/server/etc/xymonserver.cfg
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
index 90af45b..62feb36 100755
--- a/abs/core/xymon/xymon.install
+++ b/abs/core/xymon/xymon.install
@@ -32,8 +32,9 @@ post_install() {
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*
}
--
cgit v0.12
From cc00e686aa7e6b0aa9f07593571f01df0e998a2a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 8 Aug 2013 14:02:23 -0500
Subject: xymon: hbnotes.py: fix typo
---
abs/core/xymon/PKGBUILD | 4 ++--
abs/core/xymon/hbnotes.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index a0540d3..a8e2c4b 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=47
+pkgrel=48
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
@@ -128,7 +128,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
- 'fc24435b97254f0954233319ba09689b'
+ 'c31bcb503a227ed5ff7b218581793bfc'
'0f70e76a164f648f0a4a01110137cb20'
'f6921f0413215ae174e81306be80d37f'
'80d9cfac86c6d96836e6f406e35e7cf5'
diff --git a/abs/core/xymon/hbnotes.py b/abs/core/xymon/hbnotes.py
index be34dc6..d643044 100644
--- a/abs/core/xymon/hbnotes.py
+++ b/abs/core/xymon/hbnotes.py
@@ -219,7 +219,7 @@ def createdropdown(currenthostype):
<input name="param2" type="radio" value="Optimize" />Optimize database<br />
'''
if currenthostype == "Master_backend":
- dropdown+='<input name="param2" type="radio" value="ShutdownAll" />Shutdown All Systems (expect MBE)<br /> \n'
+ dropdown+='<input name="param2" type="radio" value="ShutdownAll" />Shutdown All Systems (except master backend)<br /> \n'
#dropdown+='''<input name="param2" type="radio" value="UpdateAll" />Update All Systems </> <select name="param5">
#<option value="Myth_only">Myth only</option>
#<option value="All"> Full System</option>
--
cgit v0.12
From 0dece954c5408214dcfb22934c84eb6d14360a77 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 8 Aug 2013 16:07:28 -0500
Subject: supplemental-web: Move menu frame to be on the side.
Many other changes to make appearance more consistant. closes #904
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/alt_index.html | 2 +-
abs/core/supplemental-web/contents/calllog.shtml | 11 ++----
abs/core/supplemental-web/contents/cardmap.shtml | 9 +++--
abs/core/supplemental-web/contents/count.py | 16 ++++++--
abs/core/supplemental-web/contents/docs.html | 45 +++++++++++-----------
abs/core/supplemental-web/contents/exports.shtml | 18 ++++-----
abs/core/supplemental-web/contents/frame.css | 10 +++--
abs/core/supplemental-web/contents/header.html | 46 ++++++++++++++---------
abs/core/supplemental-web/contents/links.html | 16 ++++----
abs/core/supplemental-web/contents/skeleton.css | 14 ++++---
11 files changed, 105 insertions(+), 84 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 2a4a3df..d259255 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/alt_index.html
index e6a89b4..93ab1a0 100644
--- a/abs/core/supplemental-web/contents/alt_index.html
+++ b/abs/core/supplemental-web/contents/alt_index.html
@@ -2,7 +2,7 @@
<html>
<head><title>LinHES: The Linux Home Entertainment System</title>
</head>
- <frameset rows="230, 80%" frameborder="no" border="3" bordercolor="#000000">
+ <frameset cols="230, 100%" frameborder="no" border="0" bordercolor="#000000">
<frame src="header.html" scrolling=no name="menuframe" />
<frame src="home.shtml" name="content" />
<noframes>
diff --git a/abs/core/supplemental-web/contents/calllog.shtml b/abs/core/supplemental-web/contents/calllog.shtml
index 5eb5783..5b64dc3 100644
--- a/abs/core/supplemental-web/contents/calllog.shtml
+++ b/abs/core/supplemental-web/contents/calllog.shtml
@@ -4,16 +4,13 @@
</head>
<body>
-<p> Phone Call Log </p>
-
-<!--<div id="mainContainer">
- <div id="header"><p></p></div>
- <div id="content">
- <p>Phone Call Log</p>-->
+ <div id="header">
+ <h1>Phone Call Log</h1>
+ <br>
+ </div>
<!--#exec cmd="/data/srv/httpd/htdocs/calllog.py" -->
-
</br>
</br>
diff --git a/abs/core/supplemental-web/contents/cardmap.shtml b/abs/core/supplemental-web/contents/cardmap.shtml
index 89013c0..a5688dd 100755
--- a/abs/core/supplemental-web/contents/cardmap.shtml
+++ b/abs/core/supplemental-web/contents/cardmap.shtml
@@ -3,9 +3,12 @@
<style type="text/css">@import "/frame.css";</style>
</head>
<body>
- <h1> List of detected cards and static device path. </h1>
- <br>
- <!--#exec cmd=" MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/list_cardmap.py" -->
+ <div id="header">
+ <h1>Tuners</h1>
+ <h2>Detected Cards and Static Device Paths</h2>
+ <br>
+ </div>
+ <!--#exec cmd=" MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/list_cardmap.py" -->
</body>
</html>
diff --git a/abs/core/supplemental-web/contents/count.py b/abs/core/supplemental-web/contents/count.py
index 2889af1..9f3530f 100644
--- a/abs/core/supplemental-web/contents/count.py
+++ b/abs/core/supplemental-web/contents/count.py
@@ -8,6 +8,11 @@ import socket
def main(argv):
+ #get LinHES version
+ verfile = open('/etc/LinHES-release', 'r')
+ verLH = verfile.read()
+ verfile.close()
+
grandtotal=0
grandtotal_current=0
db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
@@ -39,17 +44,20 @@ def main(argv):
days_current = hours_current / 24.0
print '<div id="header">'
-
+ print "<h3>Welcome to</h3>"
+ print "<h1>" , verLH , "</h1>"
+ print "<h3>on " , socket.gethostname() , "</h3>"
+ print "</br>"
print "<table>"
print " <tr>"
- print " <td> Currently there are " , len(result_current) , " recorded programs. With a viewing time of %.2f days or %.2f hours. </td>" %(days_current,hours_current)
+ print " <td>Currently there are " , len(result_current) , " recorded programs, with a viewing time of %.2f days or %.2f hours.</td>" %(days_current,hours_current)
print " </tr>"
print "</table>"
print "</br> "
print "<table>"
print " <tr>"
- print " <td> Overall there have been " , len(result) , "shows recorded. With viewing time of %.2f days or %.2f hours </td>"%(days,hours)
+ print " <td>Overall there have been " , len(result) , "shows recorded, with a viewing time of %.2f days or %.2f hours.</td>"%(days,hours)
print " </tr>"
print "</table>"
print '</div>'
@@ -69,7 +77,7 @@ def main(argv):
# print "%40s %26s %10s" %(row[0],row[2],row[1])
print "</table>"
print "</div>"
-#Top categorys
+#Top categories
print '<div id="column"></div>'
print '<table class="sample">'
diff --git a/abs/core/supplemental-web/contents/docs.html b/abs/core/supplemental-web/contents/docs.html
index 9afebb8..dc3a936 100644
--- a/abs/core/supplemental-web/contents/docs.html
+++ b/abs/core/supplemental-web/contents/docs.html
@@ -4,53 +4,54 @@
</head>
<body>
-Package Management
-</br>
+<div id="header">
+<h1>Documentation</h1>
+<br>
+</div>
+<h3>Package Management</h3>
<div id="navcontainer">
<ul id="navlist">
- <li>pacman -Sy to refresh pkg database</li>
- <li>pacman -Ss $keyword to search pkg database</li>
- <li>pacman -Su to update all install packages</li>
- <li>pacman -S $pkg to update one pkg</li>
- <li>pacman -h for a list of pacman operations .</li>
- <li>pacman -S --help for a full list of options associated with the -S command.</li>
+ <li>pacman -Sy = to refresh pkg database</li>
+ <li>pacman -Ss $keyword = to search pkg database</li>
+ <li>pacman -Su = to update all install packages</li>
+ <li>pacman -S $pkg = to update one pkg</li>
+ <li>pacman -h = for a list of pacman operations</li>
+ <li>pacman -S --help = for a full list of options associated with the -S command</li>
</ul>
</div>
<br>
-Starting and stopping services.
-<br>
+<h3>Starting and Stopping Services</h3>
<div id="navcontainer">
<ul id="navlist">
- <li>sv {stop,start,restart} frontend. This will start/stop the entire X proccess that runs mythfrontend</li>
+ <li>sv {stop,start,restart} frontend = This will start/stop the entire X proccess that runs mythfrontend</li>
<li>sv {stop,start,restart} mysql</li>
<li>sv {stop,start,restart} mythbackend</li>
<li>sv {stop,start,restart} remotes</li>
</ul>
<br>
</div>
+
+<h3>Other Notes</h3>
<div id="navcontainer">
- Other Random notes
-<br>
<ul id="navlist">
<li>To keep a host from showing up in the network map, add it to:
/home/xymon/server/ext/ignoreclient.py
</li>
+ <li>To stop xymon from running a check on a function remove "func" from bb-hosts</li>
<li>remove "func" from bb-hosts to stop hobbit from running a func check on it </li>
- <li>if /tmp/nomfe is present then mythfrontend will not restart </li>
-
- <li>adding pkg names to /etc/pkgname.blacklist will stop MythVantage from autoinstalling a package.</li>
+ <li>If /tmp/nomfe is present then mythfrontend will not restart</li>
+ <li>Adding pkg names to /etc/pkgname.blacklist will stop MythVantage from auto installing a package</li>
</div>
<br>
-<div id="navcontainer">
- Menu Navigation
-<br>
+<h3>MythFrontend Menu Navigation</h3>
+<div id="navcontainer">
<ul id="navlist">
- <li> <A HREF="images/classic-menugraph.png">Classic menu</A> </li>
- <li> <A HREF="images/menu_diagram_color.png">Standard menu</A> </li>
- <li> <A HREF="images/dvr_menugraph.png">DVR menu</A> </li>
+ <li> <A HREF="images/classic-menugraph.png">Classic Menu</A> </li>
+ <li> <A HREF="images/menu_diagram_color.png">Standard Menu</A> </li>
+ <li> <A HREF="images/dvr_menugraph.png">DVR Menu</A> </li>
</body>
</html>
diff --git a/abs/core/supplemental-web/contents/exports.shtml b/abs/core/supplemental-web/contents/exports.shtml
index 9a26dc9..7aaba33 100755
--- a/abs/core/supplemental-web/contents/exports.shtml
+++ b/abs/core/supplemental-web/contents/exports.shtml
@@ -5,16 +5,14 @@
<body>
<div id="mainContainer">
-<!-- <div id="header"><p></p></div>
- <div id="content">
- <p></p>-->
-
- <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" -->
-
-
-</br>
-</br>
-
+ <div id="header">
+ <h1>File Shares</h1>
+ <br>
+ </div>
+ <div id="content">
+ <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" -->
+ </div>
+</div>
</body>
</html>
diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css
index 42877dd..94e1747 100644
--- a/abs/core/supplemental-web/contents/frame.css
+++ b/abs/core/supplemental-web/contents/frame.css
@@ -5,7 +5,8 @@
border: 0;
}
body {
- background: url("page_background.jpg") repeat-y #9FA9B3;
+/* background: url("page_background.jpg") repeat-y #9FA9B3; */
+ background-color: #191c26;
//background-color: #ebb81c;
//background-image: -webkit-gradient(linear, left top, left bottom, from(#ebb81c), to(#0072bc)); /* Saf4+, Chrome */
@@ -44,10 +45,11 @@ body {
width: 770px;
margin: 0 auto; /* We are going to center this design */
text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */
+ display: inline-block;
}
#header {
- background: #000;
color: #fff;
+ text-align: center;
}
#content {
float: left; /* Our content is going to be left aligned */
@@ -82,7 +84,7 @@ body {
clear: both; /* We have to clear our floats */
width: 760px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
margin: 0 auto; /* We need to center the footer also */
- background: black;
+/* background: black; */
color: gold;
text-align: center;
font-size: 10px;
@@ -191,7 +193,7 @@ a:link
# background-color: #FDB14F;
text-decoration: underline ;
- margin-left:10px;
+# margin-left:10px;
}
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index f84b4c8..608059c 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -6,25 +6,26 @@
<script type="text/javascript">
function r()
{
- current_hostname=parent.location.hostname
- top.frames["content"].location.href = ( "http://" + current_hostname + ":6544" ) ;
-
+ current_hostname=parent.location.hostname
+ top.frames["content"].location.href = ( "http://" + current_hostname + ":6544" ) ;
}
function express()
{
current_hostname=parent.location.hostname
top.frames["content"].location.href = ( "http://" + current_hostname + ":6565" ) ;
-
- }
+}
function remyth()
{
current_hostname=parent.location.hostname
top.frames["content"].location.href = ( "http://" + current_hostname + ":8088" ) ;
+}
- }
-
+function beStatus()
+{
+ document.getElementById('modify-me').href = "http://" + window.location.hostname + ":6544";
+}
</script>
</head>
@@ -32,7 +33,7 @@ function remyth()
<BODY BGCOLOR=#ebb81c>
<div id='header'></div>
-<img id='header_img' src="linhes_header.png" alt="Alt Text" title="Image Title"/>
+<img id='header_img' src="linhes_header.png" alt="LinHES" title="LinHES"/>
<base target="content" />
<ul id="nav">
@@ -40,16 +41,18 @@ function remyth()
<li><a href="xymon" >System »</a>
<ul>
- <li><a href="/cardmap.shtml" >List static dev nodes for tuners </a></li>
- <li><a href="/exports.shtml" >List file shares </a></li>
- <li><a href="/xymon" >System Health</a></li>
- <li><a href="/logs/">System Logs</a></li>
+ <li><a href="/xymon" >Health</a></li>
+ <li><a href="/logs/" >Logs</a></li>
+ <li><a href="/exports.shtml" >File Shares</a></li>
+ <li><a href="/cardmap.shtml" >Tuners</a></li>
</ul>
</li>
-<li><a href="mythweb/">Utilities »</a>
+<li><a href="mythweb/">MythTV »</a>
<ul>
<li><a href="mythweb/">MythWeb</a></li>
+<!-- <li><a onClick=r() >MythBackend Status</a></li> -->
+ <li><body onload="beStatus()"><a id="modify-me">MythBackend Status</a></body></li>
<li><a href="mythexport/setup.cgi">MythExport</a></li>
<li><a href="mythexpress.html">MythExpress</a></li>
<li><a href="remyth.html" >ReMyth</a></li>
@@ -58,17 +61,24 @@ function remyth()
<li><a href="/calllog.shtml">Surveillance »</a>
<ul>
- <li><a href="/calllog.shtml">Phone Call Log</a></li>
+ <li><a href="/calllog.shtml">Call Log</a></li>
<li><a href="/zm">ZoneMinder</a></li>
</ul>
</li>
-
<li><a href="docs.html" >Documentation</a></li>
-<li><a onClick=r() >Myth Backend Status</a></li>
-
-<li><a href="links.html" >Links</a></li>
+<li><a href="links.html" >Links »</a>
+ <ul>
+ <li><a href="http://linhes.org/wiki" >LinHES Wiki</a></li>
+ <li><a href="http://forums.linhes.org" >LinHES Forums</a></li>
+ <li><a href="http://linhes.org/projects/linhes/issues" >LinHES Bug Tracker </a></li>
+ <li><a href="http://linhes.org/projects/linhes/wiki/Official_and_3rd_party_add-ons" >LinHES Add-Ons</a></li>
+ <li><a href="http://www.mythtv.org" >MythTV</a></li>
+ <li><a href="http://smolt.mythtv.org" >MythTV Smolt Server</a></li>
+ <li><a href="http://www.schedulesdirect.org" >Schedules Direct</a></li>
+ </ul>
+</li>
</body>
</html>
diff --git a/abs/core/supplemental-web/contents/links.html b/abs/core/supplemental-web/contents/links.html
index e14141a..65b5231 100644
--- a/abs/core/supplemental-web/contents/links.html
+++ b/abs/core/supplemental-web/contents/links.html
@@ -4,19 +4,19 @@
</head>
<body>
-Other Links
+<h1>Links</h1>
</br>
<div id="navcontainer">
<ul id="navlist">
<!-- <li><a href="/mvpmc.shtml" >Media MVP setup</a> (dhcp server must be enabled) </li> -->
- <li><a href="http://www.linhes.org" >linhes.org </a>Bugtracker</li>
- <li><a href="http://linhes.org/wiki" >Wiki </a></li>
- <li><a href="http://forums.linhes.org" >Online User Forums</a></li>
- <li><a href="http://linhes.org/projects/linhes/wiki/Official_and_3rd_party_add-ons" > Official & 3rd party addons</a></li>
- <li><a href="http://www.mythtv.org" >mythtv.org</a></li>
- <li><a href="http://smolt.mythtv.org" >mythtv smolt server</a></li>
- <li><a href="http://www.schedulesdirect.org" >Schedules Direct guide data for North America</a></li>
+ <li><a href="http://linhes.org/wiki" >LinHES Wiki</a></li>
+ <li><a href="http://forums.linhes.org" >LinHES Forums</a></li>
+ <li><a href="http://linhes.org/projects/linhes/issues" >LinHES Bug Tracker </a></li>
+ <li><a href="http://linhes.org/projects/linhes/wiki/Official_and_3rd_party_add-ons" >LinHES Add-Ons</a></li>
+ <li><a href="http://www.mythtv.org" >MythTV</a></li>
+ <li><a href="http://smolt.mythtv.org" >MythTV Smolt Server</a></li>
+ <li><a href="http://www.schedulesdirect.org" >Schedules Direct</a></li>
diff --git a/abs/core/supplemental-web/contents/skeleton.css b/abs/core/supplemental-web/contents/skeleton.css
index b13aa20..1f84e7e 100644
--- a/abs/core/supplemental-web/contents/skeleton.css
+++ b/abs/core/supplemental-web/contents/skeleton.css
@@ -7,7 +7,7 @@ Copyright (c) 2005-2007 Stu Nicholls. All rights reserved.
This stylesheet and the associated (x)html may be modified in any
way to fit your requirements.
=================================================================== */
-#header_img {margin:5px auto;display:block;}
+#header_img {margin:5px auto;display:block;width:100%}
#nav,
#nav ul {padding:0 0 5px 0; margin:0; list-style:none;
@@ -18,9 +18,11 @@ way to fit your requirements.
border-width:1px 2px 2px 1px; background:#fff;
position:relative; z-index:200;}
-#nav {height:30px; padding:0;background-color:#0072bc;}
+#nav {height:auto; width:calc(100% - 2px);
+ padding:0; background-color:#0072bc;
+ display: inline-block;}
-#nav li {float:left;}
+#nav li {float:left; width:100%;}
#nav li li {float:none; background:#fff;}
/* a hack for IE5.x and IE6 */
* html #nav li li {float:left;}
@@ -31,11 +33,11 @@ way to fit your requirements.
#nav li a {display:block; float:left;
color:#FFFFFF; margin:0 25px 0 10px;
height:25px; line-height:25px;
- text-decoration:none; white-space:nowrap;
+ text-decoration:none; white-space:normal;
}
/*item in white box*/
-#nav li li a {height:20px; line-height:20px; float:none;
+#nav li li a {height:auto; line-height:20px; float:none;
background-color:#0072bc;
margin:0 0 0 0;
border:1px solid #000;
@@ -47,7 +49,7 @@ way to fit your requirements.
#nav li:hover {position:relative; z-index:300; }
/*white box*/
-#nav li:hover ul {left:0; bottom:21px; top:auto; background-color:#0072bc; color:}
+#nav li:hover ul {left:4em; top:0px; right:-10px; background-color:#0072bc;}
/* another hack for IE5.5 and IE6 */
* html #nav li:hover ul {left:10px;}
--
cgit v0.12
From 2ec1704c040f403652fef5479b66b0069b8c2f1c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 9 Aug 2013 17:52:36 -0500
Subject: supplemental-web: more tweaks to the menu and home pages
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/alt_index.html | 2 +-
abs/core/supplemental-web/contents/count.py | 2 +-
abs/core/supplemental-web/contents/frame.css | 57 +++++++++++++----------
abs/core/supplemental-web/contents/header.html | 19 ++++----
abs/core/supplemental-web/contents/home.shtml | 26 ++++++-----
abs/core/supplemental-web/contents/skeleton.css | 4 +-
7 files changed, 60 insertions(+), 52 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index d259255..cb36569 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/alt_index.html
index 93ab1a0..7a0f3d2 100644
--- a/abs/core/supplemental-web/contents/alt_index.html
+++ b/abs/core/supplemental-web/contents/alt_index.html
@@ -2,7 +2,7 @@
<html>
<head><title>LinHES: The Linux Home Entertainment System</title>
</head>
- <frameset cols="230, 100%" frameborder="no" border="0" bordercolor="#000000">
+ <frameset cols="205, 100%" frameborder="no" border="0" bordercolor="#000000">
<frame src="header.html" scrolling=no name="menuframe" />
<frame src="home.shtml" name="content" />
<noframes>
diff --git a/abs/core/supplemental-web/contents/count.py b/abs/core/supplemental-web/contents/count.py
index 9f3530f..76d18e8 100644
--- a/abs/core/supplemental-web/contents/count.py
+++ b/abs/core/supplemental-web/contents/count.py
@@ -79,7 +79,7 @@ def main(argv):
print "</div>"
#Top categories
- print '<div id="column"></div>'
+ print '<div id="column">'
print '<table class="sample">'
print "Top 20 Categories"
cursor.execute("select category,count(category) as numtitle from oldrecorded where oldrecorded.recstatus = -3 group by category having (COUNT(category) > 0 ) order by (COUNT(category)) DESC limit 20; " )
diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css
index 94e1747..df3c69c 100644
--- a/abs/core/supplemental-web/contents/frame.css
+++ b/abs/core/supplemental-web/contents/frame.css
@@ -1,8 +1,8 @@
* /* Our "universal rule" */
{
- padding: 0;
- margin: 0;
- border: 0;
+ padding: 0px;
+ margin: 0px;
+ border: 0px;
}
body {
/* background: url("page_background.jpg") repeat-y #9FA9B3; */
@@ -24,10 +24,9 @@ body {
//-moz-background-size: 1000px 10000px, 500px, 500px;
//-webkit-background-size: 1000px 10000px, 500px 500px;
- margin: 10;
- margin-left:40px;
- padding: 10;
- border: 10;
+ margin: 10px;
+ padding: 10px;
+ border: 10px;
min-width: 770px;
font-family: Arial, Tahoma, Helvetica, sans-serif;
font-size: 11px;
@@ -35,17 +34,13 @@ body {
text-align: center;
font-size: 18px;
font-family: tahoma, verdana, geneva, arial, helvetica, sans-serif;
-
-
}
-
-
#mainContainer {
width: 770px;
- margin: 0 auto; /* We are going to center this design */
+ margin: 0px auto 20px auto;
text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */
- display: inline-block;
+ display: block;
}
#header {
color: #fff;
@@ -53,15 +48,16 @@ body {
}
#content {
float: left; /* Our content is going to be left aligned */
- width: 320px; /* And it's going to have a 500px width */
+ width: 320px; /* And it's going to have a 320px width */
/*background: #D9D9D9;*/
margin-left:60px;
}
#column {
float: right; /* Our column is going to be right aligned */
- width: 320px; /* Our total width - content width is 260px */
+ width: 320px; /* And it's going to have a 320px width */
/*background: #8A8AE6;*/
+ margin-right:60px;
}
#resultbox {
@@ -79,20 +75,33 @@ body {
}
+#netContainer {
+ width: 770px;
+ margin: 0px auto 0px auto;
+ display: block;
+}
+
+img.center {
+ display: block;
+ padding-top: 10px;
+ padding-bottom: 10px;
+ margin-left: auto;
+ margin-right: auto;
+ max-width: 100%;
+}
#footer {
clear: both; /* We have to clear our floats */
- width: 760px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
- margin: 0 auto; /* We need to center the footer also */
-/* background: black; */
+ width: 770px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
+ margin: 0px auto; /* We need to center the footer also */
color: gold;
- text-align: center;
- font-size: 10px;
+ text-align: center;
+ font-size: 10px;
}
#navlist {
- margin-left: 50;
- padding-left: 0;
+ margin-left: 50px;
+ padding-left: 0px;
list-style-type: square;
text-align: left;
}
@@ -104,7 +113,7 @@ body {
{
color: #fff;
# background-color: #FDB14F;
- text-decoration: underline ;
+ text-decoration: underline;
}
@@ -191,7 +200,7 @@ a:link
{
color: #fff;
# background-color: #FDB14F;
- text-decoration: underline ;
+ text-decoration: underline;
# margin-left:10px;
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index 608059c..ce27d52 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -30,7 +30,7 @@ function beStatus()
</script>
</head>
-<BODY BGCOLOR=#ebb81c>
+<BODY BGCOLOR=#ebb81c onload="beStatus()">
<div id='header'></div>
<img id='header_img' src="linhes_header.png" alt="LinHES" title="LinHES"/>
@@ -39,6 +39,10 @@ function beStatus()
<ul id="nav">
<li><a href="home.shtml" TARGET="content" id="current">Home</a></li>
+<li><a href="mythweb/">MythWeb</a></li>
+
+<li><a id="modify-me">MythBackend Status</a></li>
+
<li><a href="xymon" >System »</a>
<ul>
<li><a href="/xymon" >Health</a></li>
@@ -48,21 +52,14 @@ function beStatus()
</ul>
</li>
-<li><a href="mythweb/">MythTV »</a>
+<li><a href="calllog.shtml">Utilities »</a>
<ul>
- <li><a href="mythweb/">MythWeb</a></li>
<!-- <li><a onClick=r() >MythBackend Status</a></li> -->
- <li><body onload="beStatus()"><a id="modify-me">MythBackend Status</a></body></li>
+ <li><a href="calllog.shtml">Call Log</a></li>
<li><a href="mythexport/setup.cgi">MythExport</a></li>
<li><a href="mythexpress.html">MythExpress</a></li>
<li><a href="remyth.html" >ReMyth</a></li>
- </ul>
-</li>
-
-<li><a href="/calllog.shtml">Surveillance »</a>
- <ul>
- <li><a href="/calllog.shtml">Call Log</a></li>
- <li><a href="/zm">ZoneMinder</a></li>
+ <li><a href="zm">ZoneMinder</a></li>
</ul>
</li>
diff --git a/abs/core/supplemental-web/contents/home.shtml b/abs/core/supplemental-web/contents/home.shtml
index 18d66e2..a2c817e 100644
--- a/abs/core/supplemental-web/contents/home.shtml
+++ b/abs/core/supplemental-web/contents/home.shtml
@@ -1,15 +1,17 @@
<html>
-<head>
-<style type="text/css">@import "frame.css";</style>
-</head>
-
-<body>
- <div id="mainContainer">
- <!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
- </br>
- <img src="/xymon/gifs/network.png" >
- </br> </br>
- <div id="footer"><p>Thank you for choosing LinHES</p></div>
-</body>
+ <head>
+ <style type="text/css">@import "frame.css";</style>
+ </head>
+ <body>
+ <div id="mainContainer">
+ <!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
+ </div>
+ <div id="netContainer">
+ <img src="/xymon/gifs/network.png" class="center">
+ </div>
+ <div id="footer">
+ <p>Thank you for choosing LinHES</p>
+ </div>
+ </body>
</html>
diff --git a/abs/core/supplemental-web/contents/skeleton.css b/abs/core/supplemental-web/contents/skeleton.css
index 1f84e7e..6a6b107 100644
--- a/abs/core/supplemental-web/contents/skeleton.css
+++ b/abs/core/supplemental-web/contents/skeleton.css
@@ -11,7 +11,7 @@ way to fit your requirements.
#nav,
#nav ul {padding:0 0 5px 0; margin:0; list-style:none;
- /*font: 14px verdana, sans-serif;*/
+ font: 14px helvetica, sans-serif;
/*font: 14px verdana, sans-serif;*/
border:1px solid #000;
border-color:#ace #79b #68a #bde;
@@ -32,7 +32,7 @@ way to fit your requirements.
#nav li a {display:block; float:left;
color:#FFFFFF; margin:0 25px 0 10px;
- height:25px; line-height:25px;
+ height:auto; line-height:25px;
text-decoration:none; white-space:normal;
}
--
cgit v0.12
From 56be7b97b04efdfc99fdec91b72262003b28050e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 12 Aug 2013 14:19:15 -0500
Subject: supplemental-web: css changes to fix some layout issues
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/frame.css | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index cb36569..4e1845d 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css
index df3c69c..9d5e7d3 100644
--- a/abs/core/supplemental-web/contents/frame.css
+++ b/abs/core/supplemental-web/contents/frame.css
@@ -37,8 +37,9 @@ body {
}
#mainContainer {
+ clear: both;
width: 770px;
- margin: 0px auto 20px auto;
+ margin: 10px auto;
text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */
display: block;
}
@@ -76,8 +77,9 @@ body {
}
#netContainer {
+ clear: both;
width: 770px;
- margin: 0px auto 0px auto;
+ margin: 10px auto;
display: block;
}
--
cgit v0.12
From ca30de57458ef2ab90b919281b36e32847ced75e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 Aug 2013 15:02:44 -0500
Subject: lighttpd: upgrade to 1.4.32; add proxy for shellinaboxd
---
abs/core/lighttpd/PKGBUILD | 10 +++++-----
abs/core/lighttpd/__changelog | 3 +++
abs/core/lighttpd/lighttpd.conf | 12 +++++++++++-
3 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD
index a936235..35f8c04 100644
--- a/abs/core/lighttpd/PKGBUILD
+++ b/abs/core/lighttpd/PKGBUILD
@@ -2,8 +2,8 @@
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=lighttpd
-pkgver=1.4.28
-pkgrel=7
+pkgver=1.4.32
+pkgrel=1
pkgdesc='A secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=(etc/lighttpd/lighttpd.conf etc/logrotate.d/lighttpd etc/lighttpd/auth-in
options=('!libtool' 'emptydirs')
source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" \
'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf')
-#install='lighttpd.install'
+install='lighttpd.install'
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -76,9 +76,9 @@ package() {
install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
}
-md5sums=('586eb535d31ac299652495b058dd87c4'
+md5sums=('8e2d4ae8e918d4de1aeb9842584d170b'
'bd690eee0d9e51857448770a151023b0'
'e17a29ebcdac82a853389c3df468c980'
- '8c1b42c878461f1529433c35d691f519'
+ 'f5e553759e0731bb54e60b1dac6e0a2a'
'62779511e3f1127c3cc9b94c49f99c29'
'ef64c496602b182a551416a8ba6b3d43')
diff --git a/abs/core/lighttpd/__changelog b/abs/core/lighttpd/__changelog
index 3c412af..ade9636 100644
--- a/abs/core/lighttpd/__changelog
+++ b/abs/core/lighttpd/__changelog
@@ -28,3 +28,6 @@ added bash and python to cgi list
".sh" => "/bin/bash",
".py" => "/usr/bin/python")
+# 8/13/2013
+upgrade to 1.4.32
+add proxy for shellinaboxd
diff --git a/abs/core/lighttpd/lighttpd.conf b/abs/core/lighttpd/lighttpd.conf
index 3fff75c..22180cc 100644
--- a/abs/core/lighttpd/lighttpd.conf
+++ b/abs/core/lighttpd/lighttpd.conf
@@ -152,7 +152,7 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
#server.bind = "127.0.0.1"
## error-handler for status 404
-server.error-handler-404 = "/404.html"
+server.error-handler-404 = "/index.html"
## to help the rc.scripts
server.pid-file = "/var/run/lighttpd/lighttpd.pid"
@@ -216,6 +216,16 @@ server.groupname = "http"
# )
# )
+#proxy for shellinaboxd
+proxy.server = ( "/shell/" =>
+ ( "localhost" =>
+ (
+ "host" => "127.0.0.1",
+ "port" => 4200
+ )
+ )
+)
+
#### fastcgi module
## read fastcgi.txt for more info
## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
--
cgit v0.12
From eff28c03b7a81e9ee37cfd6dd9284deefd1b5622 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 Aug 2013 16:43:46 -0500
Subject: runit-scripts: add service for shellinaboxd
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/shellinaboxd/run | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
create mode 100755 abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 1f1b02f..fdbdab1 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.0
-pkgrel=1
+pkgrel=2
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
new file mode 100755
index 0000000..bfc6018
--- /dev/null
+++ b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec 2>&1
+export TERM=linux
+. /etc/rc.conf
+. /etc/rc.d/functions
+stat_runit "Starting shellinabox"
+
+
+exec su - mythtv -c "shellinaboxd -c /etc/lighttpd/"
--
cgit v0.12
From 7c242e44e6422be3d4cfffaaaa18cb78634762cb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 13 Aug 2013 17:31:04 -0500
Subject: shellinabox: initial inclusion
---
abs/extra/shellinabox/PKGBUILD | 40 ++++++++++++++++++++++++++++++
abs/extra/shellinabox/__changelog | 4 +++
abs/extra/shellinabox/shellinaboxd.conf.d | 5 ++++
abs/extra/shellinabox/shellinaboxd.install | 17 +++++++++++++
abs/extra/shellinabox/shellinaboxd.rc.d | 38 ++++++++++++++++++++++++++++
abs/extra/shellinabox/shellinaboxd.service | 17 +++++++++++++
6 files changed, 121 insertions(+)
create mode 100644 abs/extra/shellinabox/PKGBUILD
create mode 100644 abs/extra/shellinabox/__changelog
create mode 100644 abs/extra/shellinabox/shellinaboxd.conf.d
create mode 100644 abs/extra/shellinabox/shellinaboxd.install
create mode 100644 abs/extra/shellinabox/shellinaboxd.rc.d
create mode 100644 abs/extra/shellinabox/shellinaboxd.service
diff --git a/abs/extra/shellinabox/PKGBUILD b/abs/extra/shellinabox/PKGBUILD
new file mode 100644
index 0000000..6032aff
--- /dev/null
+++ b/abs/extra/shellinabox/PKGBUILD
@@ -0,0 +1,40 @@
+# Contributor: Brian Moore <archlinux@cptl.org>
+pkgname=shellinabox
+pkgver=2.14
+pkgrel=3
+pkgdesc="A web-based ssh client."
+arch=('i686' 'x86_64')
+url="http://shellinabox.com/"
+license=('GPL2')
+depends=('runit-scripts>=8.0-2')
+optdepends=('openssh: SSL support')
+makedepends=(openssh)
+install=shellinaboxd.install
+backup=('etc/conf.d/shellinaboxd')
+source=("http://shellinabox.googlecode.com/files/$pkgname-$pkgver.tar.gz" "shellinaboxd.rc.d" "shellinaboxd.conf.d" "shellinaboxd.service")
+md5sums=('6c63b52edcebc56ee73a108e7211d174'
+ 'feea22575089cc7eb4925b1daff88b8c'
+ '77e487f36da2abe51251500f4a1e024f'
+ 'be649866d06ba497d88bb14f3e58f862')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" configure
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+
+ make
+}
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR=$pkgdir install || return 1
+
+ install -Dm755 $srcdir/shellinaboxd.rc.d $pkgdir/etc/rc.d/shellinaboxd
+ install -D -m644 $srcdir/shellinaboxd.service $pkgdir/usr/lib/systemd/system/shellinaboxd.service
+ install -Dm644 $srcdir/shellinaboxd.conf.d $pkgdir/etc/conf.d/shellinaboxd
+ install -dm700 -o nobody $pkgdir/var/lib/shellinabox
+}
diff --git a/abs/extra/shellinabox/__changelog b/abs/extra/shellinabox/__changelog
new file mode 100644
index 0000000..edbcbff
--- /dev/null
+++ b/abs/extra/shellinabox/__changelog
@@ -0,0 +1,4 @@
+#8/13/2013
+initial inclusion from AUR v2.14-3
+add dep of runit-scripts to PKGBUILD
+add shellinaboxd.install
diff --git a/abs/extra/shellinabox/shellinaboxd.conf.d b/abs/extra/shellinabox/shellinaboxd.conf.d
new file mode 100644
index 0000000..646bab7
--- /dev/null
+++ b/abs/extra/shellinabox/shellinaboxd.conf.d
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to shellinaboxd
+#
+SHELLINABOXD_ARGS="-t -b"
+
diff --git a/abs/extra/shellinabox/shellinaboxd.install b/abs/extra/shellinabox/shellinaboxd.install
new file mode 100644
index 0000000..466ba3c
--- /dev/null
+++ b/abs/extra/shellinabox/shellinaboxd.install
@@ -0,0 +1,17 @@
+post_install() {
+ echo "Create link to linhes.pem..."
+ ln -s /etc/lighttpd/linhes.pem /etc/lighttpd/certificate.pem
+ echo "Start runit service for shellinaboxd..."
+ add_service.sh shellinaboxd
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ echo "Remove link to linhes.pem..."
+ rm /etc/lighttpd/certificate.pem
+ echo "Remove runit service for shellinaboxd..."
+ remove_service.sh shellinaboxd
+}
diff --git a/abs/extra/shellinabox/shellinaboxd.rc.d b/abs/extra/shellinabox/shellinaboxd.rc.d
new file mode 100644
index 0000000..3399945
--- /dev/null
+++ b/abs/extra/shellinabox/shellinaboxd.rc.d
@@ -0,0 +1,38 @@
+#!/bin/bash
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+SHELLINABOXD_ARGS=
+[ -f /etc/conf.d/shellinaboxd ] && . /etc/conf.d/shellinaboxd
+
+PID=`pidof -o %PPID /usr/bin/shellinaboxd`
+case "$1" in
+ start)
+ stat_busy "Starting SHELLINABOXD"
+ [ -z "$PID" ] && /usr/bin/shellinaboxd ${SHELLINABOXD_ARGS}
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon shellinaboxd
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping SHELLINABOXD"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon shellinboxd
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
diff --git a/abs/extra/shellinabox/shellinaboxd.service b/abs/extra/shellinabox/shellinaboxd.service
new file mode 100644
index 0000000..d92065b
--- /dev/null
+++ b/abs/extra/shellinabox/shellinaboxd.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Serve a login-terminal over http on port 4200.
+Required=sshd.service
+After=sshd.service
+
+[Service]
+User=root
+Type=forking
+EnvironmentFile=/etc/conf.d/shellinaboxd
+ExecStart=/usr/bin/shellinaboxd $SHELLINABOXD_ARGS
+ExecReload=/bin/kill -HUP $MAINPID
+KillMode=process
+Restart=on-abort
+
+[Install]
+WantedBy=multi-user.target
+
--
cgit v0.12
From c3cf667476326127e9f71bd7ec7fb4af5eb7def8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 Aug 2013 08:55:07 -0500
Subject: lighttpd: move proxy for shellinabox from lighttpd.conf to
shellinabox pkg
---
abs/core/lighttpd/PKGBUILD | 6 +++---
abs/core/lighttpd/__changelog | 3 +++
abs/core/lighttpd/lighttpd.conf | 10 ----------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/abs/core/lighttpd/PKGBUILD b/abs/core/lighttpd/PKGBUILD
index 35f8c04..5a4cb34 100644
--- a/abs/core/lighttpd/PKGBUILD
+++ b/abs/core/lighttpd/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=lighttpd
pkgver=1.4.32
-pkgrel=1
+pkgrel=2
pkgdesc='A secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ backup=(etc/lighttpd/lighttpd.conf etc/logrotate.d/lighttpd etc/lighttpd/auth-in
options=('!libtool' 'emptydirs')
source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.bz2" \
'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'auth-inc.conf' 'ssl-inc.conf')
-install='lighttpd.install'
+#install='lighttpd.install'
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -79,6 +79,6 @@ package() {
md5sums=('8e2d4ae8e918d4de1aeb9842584d170b'
'bd690eee0d9e51857448770a151023b0'
'e17a29ebcdac82a853389c3df468c980'
- 'f5e553759e0731bb54e60b1dac6e0a2a'
+ '7945bd60801295010e9e2cac1dba78b7'
'62779511e3f1127c3cc9b94c49f99c29'
'ef64c496602b182a551416a8ba6b3d43')
diff --git a/abs/core/lighttpd/__changelog b/abs/core/lighttpd/__changelog
index ade9636..84a588c 100644
--- a/abs/core/lighttpd/__changelog
+++ b/abs/core/lighttpd/__changelog
@@ -31,3 +31,6 @@ added bash and python to cgi list
# 8/13/2013
upgrade to 1.4.32
add proxy for shellinaboxd
+
+# 8/14/2013
+move proxy to shellinabox pkg
diff --git a/abs/core/lighttpd/lighttpd.conf b/abs/core/lighttpd/lighttpd.conf
index 22180cc..0d8becd 100644
--- a/abs/core/lighttpd/lighttpd.conf
+++ b/abs/core/lighttpd/lighttpd.conf
@@ -216,16 +216,6 @@ server.groupname = "http"
# )
# )
-#proxy for shellinaboxd
-proxy.server = ( "/shell/" =>
- ( "localhost" =>
- (
- "host" => "127.0.0.1",
- "port" => 4200
- )
- )
-)
-
#### fastcgi module
## read fastcgi.txt for more info
## for PHP don't forget to set cgi.fix_pathinfo = 1 in the php.ini
--
cgit v0.12
From cecb9fe3e3777a82a005a196011b516609641b44 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 Aug 2013 11:33:01 -0500
Subject: shellinabox: add lighttpd conf
---
abs/extra/shellinabox/PKGBUILD | 21 +++++++++++++++------
abs/extra/shellinabox/__changelog | 4 ++++
abs/extra/shellinabox/shellinaboxd.gen_light_conf.d | 1 +
abs/extra/shellinabox/shellinaboxd.include | 10 ++++++++++
abs/extra/shellinabox/shellinaboxd.install | 7 +++++++
5 files changed, 37 insertions(+), 6 deletions(-)
create mode 100644 abs/extra/shellinabox/shellinaboxd.gen_light_conf.d
create mode 100644 abs/extra/shellinabox/shellinaboxd.include
diff --git a/abs/extra/shellinabox/PKGBUILD b/abs/extra/shellinabox/PKGBUILD
index 6032aff..680de85 100644
--- a/abs/extra/shellinabox/PKGBUILD
+++ b/abs/extra/shellinabox/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Brian Moore <archlinux@cptl.org>
pkgname=shellinabox
pkgver=2.14
-pkgrel=3
+pkgrel=4
pkgdesc="A web-based ssh client."
arch=('i686' 'x86_64')
url="http://shellinabox.com/"
@@ -11,11 +11,8 @@ optdepends=('openssh: SSL support')
makedepends=(openssh)
install=shellinaboxd.install
backup=('etc/conf.d/shellinaboxd')
-source=("http://shellinabox.googlecode.com/files/$pkgname-$pkgver.tar.gz" "shellinaboxd.rc.d" "shellinaboxd.conf.d" "shellinaboxd.service")
-md5sums=('6c63b52edcebc56ee73a108e7211d174'
- 'feea22575089cc7eb4925b1daff88b8c'
- '77e487f36da2abe51251500f4a1e024f'
- 'be649866d06ba497d88bb14f3e58f862')
+source=("http://shellinabox.googlecode.com/files/$pkgname-$pkgver.tar.gz" "shellinaboxd.rc.d" "shellinaboxd.conf.d" "shellinaboxd.service"
+ "shellinaboxd.include" "shellinaboxd.gen_light_conf.d")
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -37,4 +34,16 @@ package() {
install -D -m644 $srcdir/shellinaboxd.service $pkgdir/usr/lib/systemd/system/shellinaboxd.service
install -Dm644 $srcdir/shellinaboxd.conf.d $pkgdir/etc/conf.d/shellinaboxd
install -dm700 -o nobody $pkgdir/var/lib/shellinabox
+
+ #install conf files for lighttpd
+ mkdir -p ${pkgdir}/etc/lighttpd
+ install -D -m 644 ${srcdir}/shellinaboxd.include ${pkgdir}/etc/lighttpd/
+ #gen_light_conf
+ install -D -m 744 ${srcdir}/shellinaboxd.gen_light_conf.d ${pkgdir}/etc/gen_light_conf.d/shellinaboxd.conf
}
+md5sums=('6c63b52edcebc56ee73a108e7211d174'
+ 'feea22575089cc7eb4925b1daff88b8c'
+ '77e487f36da2abe51251500f4a1e024f'
+ 'be649866d06ba497d88bb14f3e58f862'
+ '06b131e47522d8028aa245c1b8884e00'
+ 'aadd1edf4110aca2d16d806791e90019')
diff --git a/abs/extra/shellinabox/__changelog b/abs/extra/shellinabox/__changelog
index edbcbff..efedcc7 100644
--- a/abs/extra/shellinabox/__changelog
+++ b/abs/extra/shellinabox/__changelog
@@ -2,3 +2,7 @@
initial inclusion from AUR v2.14-3
add dep of runit-scripts to PKGBUILD
add shellinaboxd.install
+
+# 8/14/2013
+add proxy config to PKGBUILD & .install
+add shellinaboxd.include and shellinaboxd.gen_light_conf.d
diff --git a/abs/extra/shellinabox/shellinaboxd.gen_light_conf.d b/abs/extra/shellinabox/shellinaboxd.gen_light_conf.d
new file mode 100644
index 0000000..5512216
--- /dev/null
+++ b/abs/extra/shellinabox/shellinaboxd.gen_light_conf.d
@@ -0,0 +1 @@
+include "/etc/lighttpd/shellinaboxd.include"
diff --git a/abs/extra/shellinabox/shellinaboxd.include b/abs/extra/shellinabox/shellinaboxd.include
new file mode 100644
index 0000000..c4c11bd
--- /dev/null
+++ b/abs/extra/shellinabox/shellinaboxd.include
@@ -0,0 +1,10 @@
+#proxy for shellinaboxd
+proxy.server = ( "/shell/" =>
+ ( "localhost" =>
+ (
+ "host" => "127.0.0.1",
+ "port" => 4200
+ )
+ )
+)
+
diff --git a/abs/extra/shellinabox/shellinaboxd.install b/abs/extra/shellinabox/shellinaboxd.install
index 466ba3c..1fb3a79 100644
--- a/abs/extra/shellinabox/shellinaboxd.install
+++ b/abs/extra/shellinabox/shellinaboxd.install
@@ -1,8 +1,11 @@
post_install() {
+ echo "Generate lighttpd include..."
+ gen_light_include.py
echo "Create link to linhes.pem..."
ln -s /etc/lighttpd/linhes.pem /etc/lighttpd/certificate.pem
echo "Start runit service for shellinaboxd..."
add_service.sh shellinaboxd
+ /sbin/sv restart shellinaboxd
}
post_upgrade() {
@@ -10,6 +13,10 @@ post_upgrade() {
}
post_remove() {
+ echo "Generate lighttpd include..."
+ gen_light_include.py
+ echo "Forcing a re-read of lighttpd's configuration file..."
+ /sbin/sv hup /service/lighttpd
echo "Remove link to linhes.pem..."
rm /etc/lighttpd/certificate.pem
echo "Remove runit service for shellinaboxd..."
--
cgit v0.12
From 6541c7cc4c865a086ef895119c4ef1b0ed8d1272 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 Aug 2013 11:52:23 -0500
Subject: tig: add back for R8
---
abs/extra/community/tig/PKGBUILD | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
create mode 100644 abs/extra/community/tig/PKGBUILD
diff --git a/abs/extra/community/tig/PKGBUILD b/abs/extra/community/tig/PKGBUILD
new file mode 100644
index 0000000..ccba8c3
--- /dev/null
+++ b/abs/extra/community/tig/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Loui Chang <louipc dot ist at gmail company>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# Contributor: Nathan Jones <nathanj@insightbb.com>
+
+pkgname=tig
+pkgver=1.2
+pkgrel=1
+pkgdesc='Text-mode interface for Git.'
+depends=('git' 'ncurses')
+url='http://jonas.nitro.dk/tig/'
+license=('GPL')
+arch=('i686' 'x86_64')
+source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('9821525564aa3f4aa51ad2b6c11b3a91')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install install-doc-man
+ install -Dm0644 contrib/tigrc "$pkgdir/etc/tigrc.sample"
+ install -Dm0644 contrib/tig-completion.bash "$pkgdir/usr/share/bash-completion/completions/tig"
+}
--
cgit v0.12
From 79d1a8112c1c10fb769dd325e6ae93f154cdd557 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 Aug 2013 13:50:20 -0500
Subject: supplemental-web: add Terminal link to shellinabox
more layout fixes for Tuners and File Shares
---
abs/core/supplemental-web/PKGBUILD | 7 ++----
abs/core/supplemental-web/contents/cardmap.shtml | 11 +++++----
abs/core/supplemental-web/contents/exports.shtml | 26 +++++++++-------------
abs/core/supplemental-web/contents/frame.css | 8 ++++---
abs/core/supplemental-web/contents/header.html | 1 +
abs/core/supplemental-web/contents/list_cardmap.py | 1 +
abs/core/supplemental-web/contents/list_exports.py | 23 ++++++++++---------
7 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index 4e1845d..fa46e23 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
@@ -30,7 +30,7 @@ build(){
package_supplemental-web() {
pkgdesc="supplemental-web package for master backend"
- depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50')
+ depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50' 'shellinabox')
install=supplemental-web.install
cd $startdir/src
@@ -71,9 +71,6 @@ package_supplemental-web-slave() {
}
-
-
-
md5sums=('a2497205c92ad5b3aa565574afbf7f80'
'3d8c7b430c1319d706ca420825918d2a'
'26598fd1dfaf5d36d7b1f9620da5543c'
diff --git a/abs/core/supplemental-web/contents/cardmap.shtml b/abs/core/supplemental-web/contents/cardmap.shtml
index a5688dd..d98a4e9 100755
--- a/abs/core/supplemental-web/contents/cardmap.shtml
+++ b/abs/core/supplemental-web/contents/cardmap.shtml
@@ -3,12 +3,11 @@
<style type="text/css">@import "/frame.css";</style>
</head>
<body>
- <div id="header">
- <h1>Tuners</h1>
- <h2>Detected Cards and Static Device Paths</h2>
- <br>
- </div>
- <!--#exec cmd=" MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/list_cardmap.py" -->
+ <div id="header">
+ <h1>Tuners</h1>
+ <h2>Detected Cards and Static Device Paths</h2>
+ </div>
+ <!--#exec cmd=" MYTHCONFDIR=/usr/share/mythtv /data/srv/httpd/htdocs/list_cardmap.py" -->
</body>
</html>
diff --git a/abs/core/supplemental-web/contents/exports.shtml b/abs/core/supplemental-web/contents/exports.shtml
index 7aaba33..12e079c 100755
--- a/abs/core/supplemental-web/contents/exports.shtml
+++ b/abs/core/supplemental-web/contents/exports.shtml
@@ -1,18 +1,14 @@
<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-<div id="mainContainer">
- <div id="header">
- <h1>File Shares</h1>
- <br>
- </div>
- <div id="content">
- <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" -->
- </div>
-</div>
-</body>
+ <head>
+ <style type="text/css">@import "/frame.css";</style>
+ </head>
+ <body>
+ <div id="header">
+ <h1>File Shares</h1>
+ </div>
+ <div id="navcontainer">
+ <!--#exec cmd="/data/srv/httpd/htdocs/list_exports.py" -->
+ </div>
+ </body>
</html>
diff --git a/abs/core/supplemental-web/contents/frame.css b/abs/core/supplemental-web/contents/frame.css
index 9d5e7d3..59da3c7 100644
--- a/abs/core/supplemental-web/contents/frame.css
+++ b/abs/core/supplemental-web/contents/frame.css
@@ -102,10 +102,12 @@ img.center {
}
#navlist {
- margin-left: 50px;
- padding-left: 0px;
- list-style-type: square;
+ clear: both;
+ width: 770px;
+ margin: 10px auto;
+ display: block;
text-align: left;
+ list-style-type: square;
}
#navlist li {
diff --git a/abs/core/supplemental-web/contents/header.html b/abs/core/supplemental-web/contents/header.html
index ce27d52..d972bfa 100644
--- a/abs/core/supplemental-web/contents/header.html
+++ b/abs/core/supplemental-web/contents/header.html
@@ -49,6 +49,7 @@ function beStatus()
<li><a href="/logs/" >Logs</a></li>
<li><a href="/exports.shtml" >File Shares</a></li>
<li><a href="/cardmap.shtml" >Tuners</a></li>
+ <li><a href="/shell/" >Terminal</a></li>
</ul>
</li>
diff --git a/abs/core/supplemental-web/contents/list_cardmap.py b/abs/core/supplemental-web/contents/list_cardmap.py
index 4e2c1a9..c77ed83 100755
--- a/abs/core/supplemental-web/contents/list_cardmap.py
+++ b/abs/core/supplemental-web/contents/list_cardmap.py
@@ -88,6 +88,7 @@ slave_hosts = find_slave_hosts()
#--------------MBE-------------
hostname = socket.gethostname()
+print "</br>"
print "<h2>"
print "__________ %s __________" %(hostname)
print "</h2>"
diff --git a/abs/core/supplemental-web/contents/list_exports.py b/abs/core/supplemental-web/contents/list_exports.py
index 13ec690..79c2c38 100755
--- a/abs/core/supplemental-web/contents/list_exports.py
+++ b/abs/core/supplemental-web/contents/list_exports.py
@@ -59,24 +59,27 @@ nfslist = nfs_export_list()
smblist = smb_share_list()
-print "---------NFS SHARES-----------\n"
print "</br>"
+print "<h2>__________ NFS Shares __________</h2>"
+print "</br>"
+print '<ul id="navlist">'
for sharename in nfslist:
if sharename[1].find("noaccess") > -1 :
- print "%s \t no access" %sharename[0]
- print "</br>"
+ print "<h3>%s \t no access</h3>" %sharename[0]
else:
- print sharename[0]
- print "</br>"
+ print "<li>%s</li>" %sharename[0]
-print "\n---------SMB SHARES----------\n"
-print "</br>"
+print '</ul>'
+print "</br>"
+print "<h2>__________ SMB Shares __________</h2>"
+print "</br>"
+print '<ul id="navlist">'
if len(smblist) == 0:
- print "Samba is not running or no shares listed"
+ print "<h3>Samba is not running or no shares are listed</h3>"
print "</br>"
else:
for sharename in smblist:
- print "%s" %(sharename.split()[0])
- print "</br>"
+ print "<li>%s</li>" %(sharename.split()[0])
+print '</ul>'
--
cgit v0.12
From 6c0ab692b13d569c6d101e18eac45ec544f4c1e2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 14 Aug 2013 14:51:27 -0500
Subject: shellinabox: change onscreen keyboard to default on.
---
abs/extra/shellinabox/PKGBUILD | 6 +++++-
abs/extra/shellinabox/__changelog | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/abs/extra/shellinabox/PKGBUILD b/abs/extra/shellinabox/PKGBUILD
index 680de85..0fbe1e4 100644
--- a/abs/extra/shellinabox/PKGBUILD
+++ b/abs/extra/shellinabox/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Brian Moore <archlinux@cptl.org>
pkgname=shellinabox
pkgver=2.14
-pkgrel=4
+pkgrel=5
pkgdesc="A web-based ssh client."
arch=('i686' 'x86_64')
url="http://shellinabox.com/"
@@ -22,6 +22,10 @@ prepare() {
build() {
cd "$srcdir/$pkgname-$pkgver"
+ #change default to show onscreen keyboard
+ sed -i "s/this.softKeyboard = false;/this.softKeyboard = true;/g" ./shellinabox/vt100.js
+ sed -i "s/this.softKeyboard = false;/this.softKeyboard = true;/g" ./shellinabox/vt100.jspp
+
./configure --prefix=/usr
make
diff --git a/abs/extra/shellinabox/__changelog b/abs/extra/shellinabox/__changelog
index efedcc7..d0d35bb 100644
--- a/abs/extra/shellinabox/__changelog
+++ b/abs/extra/shellinabox/__changelog
@@ -6,3 +6,4 @@ add shellinaboxd.install
# 8/14/2013
add proxy config to PKGBUILD & .install
add shellinaboxd.include and shellinaboxd.gen_light_conf.d
+change default onscreen keyboard to true
--
cgit v0.12
From 9eb7f90551c6926ccc68ad03f708e52ca4f99f08 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 16 Aug 2013 17:37:11 -0500
Subject: ttf-dejavu: PKGBUILD provides ttf-font.
---
abs/core/ttf-dejavu/PKGBUILD | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/abs/core/ttf-dejavu/PKGBUILD b/abs/core/ttf-dejavu/PKGBUILD
index 0c2fca0..35f8e15 100644
--- a/abs/core/ttf-dejavu/PKGBUILD
+++ b/abs/core/ttf-dejavu/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 157781 2012-04-29 11:06:40Z allan $
+# $Id$
# Maintainer:
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Michal Krenek <mikos@sg1.cz>
pkgname=ttf-dejavu
pkgver=2.33
-pkgrel=3
+pkgrel=4
pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
arch=('any')
url="http://dejavu-fonts.org/wiki/Main_Page"
license=('custom')
depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-mkfontscale' 'xorg-mkfontdir')
+provides=('ttf-font')
install=ttf-dejavu.install
source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2)
md5sums=('8b601e91725b6d69141b0fcf527948c0')
--
cgit v0.12
From 6a2d18798baf78a3c2e4540741369852eb764cf6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 16 Aug 2013 17:53:46 -0500
Subject: opus: inital inclusion. dep of chromium 28
---
abs/extra/opus/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 abs/extra/opus/PKGBUILD
diff --git a/abs/extra/opus/PKGBUILD b/abs/extra/opus/PKGBUILD
new file mode 100644
index 0000000..9236886
--- /dev/null
+++ b/abs/extra/opus/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
+# Contributor: pumbur
+
+pkgname=opus
+pkgver=1.0.3
+pkgrel=1
+pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
+arch=(i686 x86_64)
+url="http://www.opus-codec.org/"
+license=(BSD)
+depends=(glibc)
+options=('!libtool')
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('86eedbd3c5a0171d2437850435e6edff')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --enable-custom-modes
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
--
cgit v0.12
From e66b31e5f7185c89abbdd88f3cca682b43eccd3e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 16 Aug 2013 18:04:19 -0500
Subject: glu: initial inclusion. dep of libwebp
---
abs/extra/glu/PKGBUILD | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
create mode 100644 abs/extra/glu/PKGBUILD
diff --git a/abs/extra/glu/PKGBUILD b/abs/extra/glu/PKGBUILD
new file mode 100644
index 0000000..d720ae4
--- /dev/null
+++ b/abs/extra/glu/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Contributor: Laurent Carlier <lordheavym@gmail.com>
+
+pkgname=glu
+pkgver=9.0.0
+pkgrel=2
+pkgdesc="Mesa OpenGL Utility library"
+arch=('i686' 'x86_64')
+url="http://cgit.freedesktop.org/mesa/glu/"
+license=('LGPL')
+depends=('libgl')
+options=('!libtool')
+source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -k check
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir/" install
+}
--
cgit v0.12
From c2c0f999ae7f3a092f6f9ffbd88e79e97f1f4d53 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 16 Aug 2013 18:09:42 -0500
Subject: libwebp: inital inclusion. dep of chromium 28
---
abs/extra/libwebp/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 40 insertions(+)
create mode 100644 abs/extra/libwebp/PKGBUILD
diff --git a/abs/extra/libwebp/PKGBUILD b/abs/extra/libwebp/PKGBUILD
new file mode 100644
index 0000000..f7100ff
--- /dev/null
+++ b/abs/extra/libwebp/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jon Nordby <jononor@gmail.com>
+
+pkgname=libwebp
+pkgver=0.3.1
+pkgrel=3
+pkgdesc="WebP library and conversion tools"
+arch=(x86_64 i686)
+url="https://developers.google.com/speed/webp/"
+license=(BSD)
+depends=(libpng libjpeg libtiff giflib)
+makedepends=(freeglut mesa glu)
+optdepends=('freeglut: vwebp viewer')
+options=('!libtool')
+source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr \
+ --enable-swap-16bit-csp \
+ --enable-experimental \
+ --enable-libwebpmux \
+ --enable-libwebpdemux \
+ --enable-libwebpdecoder \
+ --disable-static
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From b9463e0085b6fbf110f0c71143eca3f5c7fa61e5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 19 Aug 2013 14:26:25 -0500
Subject: snappy: initial inclusion. dep of chromium 28.
---
abs/extra/snappy/PKGBUILD | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
create mode 100644 abs/extra/snappy/PKGBUILD
diff --git a/abs/extra/snappy/PKGBUILD b/abs/extra/snappy/PKGBUILD
new file mode 100644
index 0000000..ef03f35
--- /dev/null
+++ b/abs/extra/snappy/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Antony Male <antony dot male at geemail dot com>>
+
+pkgname=snappy
+pkgver=1.1.0
+pkgrel=1
+pkgdesc='A fast compressor/decompressor library'
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/snappy/"
+license=('BSD')
+depends=('glibc' 'gcc-libs')
+checkdepends=('zlib')
+options=('!libtool')
+source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+md5sums=('c8f3ef29b5281e78f4946b2d739cea4f')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # compile without assertions
+ CXXFLAGS+=\ -DNDEBUG
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ # compile without assertions
+ CXXFLAGS+=\ -DNDEBUG
+
+ make -C "$pkgname-$pkgver" check
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+ install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
--
cgit v0.12
From 8a93fa938cbbb0d3b0b1c50ce5c8d0d6da918389 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 19 Aug 2013 14:46:53 -0500
Subject: graphite: initial inclusion. dep of harfbuzz.
---
abs/extra/graphite/PKGBUILD | 63 ++++++++++++++++++++++
abs/extra/graphite/graphite2-1.2.0-cmakepath.patch | 9 ++++
2 files changed, 72 insertions(+)
create mode 100644 abs/extra/graphite/PKGBUILD
create mode 100644 abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
diff --git a/abs/extra/graphite/PKGBUILD b/abs/extra/graphite/PKGBUILD
new file mode 100644
index 0000000..67fead2
--- /dev/null
+++ b/abs/extra/graphite/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+
+pkgname=graphite
+pkgver=1.2.3
+pkgrel=1
+epoch=1
+arch=('i686' 'x86_64')
+url="http://projects.palaso.org/projects/graphitedev"
+pkgdesc='reimplementation of the SIL Graphite text processing engine'
+license=('LGPL' 'GPL' 'custom')
+depends=('gcc-libs')
+makedepends=('cmake' 'freetype2' 'python2')
+ # - only for docs - target doesn't install properly
+ # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing
+options=('!libtool' '!emptydirs')
+source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
+ graphite2-1.2.0-cmakepath.patch)
+md5sums=('7042305e4208af4c2d5249d814ccce58'
+ '00353b67941dbc30b76a43253760769e')
+
+build() {
+ cd "${srcdir}"
+
+ # python2 fixes
+ sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
+
+ # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware
+ pushd graphite2-${pkgver}
+ patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
+ popd
+
+ mkdir build
+ cd build
+ cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
+ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE:STRING=Release \
+ -DGRAPHITE2_COMPARE_RENDERER=OFF \
+ #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed
+
+ # fix unwanted -O3 cflag (taken form Debian)
+ find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \;
+
+ make
+ #make docs
+}
+
+check() {
+ cd "${srcdir}"/build
+ sed -i "s:python:python2:g" tests/CTestTestfile.cmake
+ ctest
+}
+
+package() {
+ cd "${srcdir}"/build
+ # FIXME: all target doesn't install the docs target files
+ make DESTDIR="$pkgdir/" install
+
+ # licenses
+ mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
+ install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+}
diff --git a/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch b/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
new file mode 100644
index 0000000..ee71cd6
--- /dev/null
+++ b/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
+--- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530
++++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530
+@@ -136,4 +136,4 @@
+
+
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)
--
cgit v0.12
From b5a972bf8e18d3115788d059bdd8c301a78ec3e5 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 19 Aug 2013 14:55:55 -0500
Subject: harfbuzz: initial inclusion. dep of chromium 28
---
abs/extra/harfbuzz/PKGBUILD | 46 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
create mode 100644 abs/extra/harfbuzz/PKGBUILD
diff --git a/abs/extra/harfbuzz/PKGBUILD b/abs/extra/harfbuzz/PKGBUILD
new file mode 100644
index 0000000..c9f550f
--- /dev/null
+++ b/abs/extra/harfbuzz/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgbase=(harfbuzz)
+pkgname=(harfbuzz harfbuzz-icu)
+pkgver=0.9.19
+pkgrel=1
+pkgdesc="OpenType text shaping engine"
+arch=(i686 x86_64)
+url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
+license=(MIT)
+makedepends=(glib2 freetype2 graphite cairo icu)
+options=(!libtool)
+source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
+sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35')
+
+build() {
+ cd $pkgbase-$pkgver
+ ./configure --prefix=/usr \
+ --with-glib --with-freetype --with-cairo --with-icu --with-graphite2
+ make
+}
+
+package_harfbuzz() {
+ depends=(glib2 freetype2 graphite)
+ optdepends=('cairo: hb-view program')
+
+ cd $pkgbase-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING"
+
+# Split harfbuzz-icu
+ mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu
+ mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib
+ mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig
+ mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz
+}
+
+package_harfbuzz-icu(){
+ pkgdesc="$pkgdesc (ICU integration)"
+ depends=(harfbuzz icu)
+
+ mv hb-icu/* "$pkgdir"
+
+ install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
+}
--
cgit v0.12
From 820ad5cb2cd594b29b561e2f70f1f6bad5b287dd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 22 Aug 2013 10:49:44 -0500
Subject: pyxdg: python2-xdg initial inclusion. dep of speech-dispatcher.
---
abs/extra/pyxdg/PKGBUILD | 33 +++++++++++++++++++++++++++++++++
abs/extra/pyxdg/__changelog | 1 +
2 files changed, 34 insertions(+)
create mode 100644 abs/extra/pyxdg/PKGBUILD
create mode 100644 abs/extra/pyxdg/__changelog
diff --git a/abs/extra/pyxdg/PKGBUILD b/abs/extra/pyxdg/PKGBUILD
new file mode 100644
index 0000000..7ecc3f8
--- /dev/null
+++ b/abs/extra/pyxdg/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Hugo Doria <hugo@archlinux.org>
+# Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
+
+pkgbase=pyxdg
+pkgname=('python2-xdg')
+pkgver=0.25
+pkgrel=1
+pkgdesc="Python library to access freedesktop.org standards"
+arch=('any')
+url="http://freedesktop.org/Software/pyxdg"
+license=("LGPL")
+makedepends=('python2')
+source=(http://www.freedesktop.org/~takluyver/${pkgbase}-${pkgver}.tar.gz{,.asc})
+sha1sums=('1272ee62b8c3909ac4844a34a95f8b1fb3398af2'
+ 'b5ec82567cc4d7bcf3a151eaf70c42dd3ed5b194')
+
+package_python2-xdg() {
+ depends=('python2')
+ conflicts=('pyxdg')
+ provides=('pyxdg')
+ replaces=('pyxdg')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ python2 setup.py install --prefix=/usr --root="${pkgdir}"
+}
+
+#package_python-xdg() {
+# depends=('python')
+
+# cd "${srcdir}/${pkgbase}-${pkgver}"
+# python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
+#}
diff --git a/abs/extra/pyxdg/__changelog b/abs/extra/pyxdg/__changelog
new file mode 100644
index 0000000..9acc2f0
--- /dev/null
+++ b/abs/extra/pyxdg/__changelog
@@ -0,0 +1 @@
+Remove deps for python and building python pkg. Only build for python2
--
cgit v0.12
From 4cba5850fbd8199f2b2bf2af8c31bc47d953df90 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 22 Aug 2013 10:51:00 -0500
Subject: dotconf: initial inclusion. dep of speech-dispatcher.
---
abs/extra/dotconf/PKGBUILD | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
create mode 100644 abs/extra/dotconf/PKGBUILD
diff --git a/abs/extra/dotconf/PKGBUILD b/abs/extra/dotconf/PKGBUILD
new file mode 100644
index 0000000..07e7e91
--- /dev/null
+++ b/abs/extra/dotconf/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Chris Brannon <cmbrannon@cox.net>
+
+pkgname=dotconf
+pkgver=1.3
+pkgrel=3
+pkgdesc='A C library for parsing configuration files'
+url="https://github.com/williamh/dotconf"
+arch=('i686' 'x86_64')
+depends=('glibc')
+makedepends=('pkgconfig' 'findutils')
+license=('LGPL2.1')
+source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/williamh/${pkgname}/tarball/v${pkgver}")
+md5sums=('36bfdde245072fc2f4f5766b7db97c45')
+options=('!libtool')
+
+build() {
+ cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+ autoreconf -i
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/williamh-${pkgname}-4cd7b3a
+ make DESTDIR="${pkgdir}" install
+}
--
cgit v0.12
From 6ff412ce737b3805b780b201f6fea3f5badced25 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 22 Aug 2013 10:59:32 -0500
Subject: pyxdg: fix to build python-xdg pkg.
---
abs/extra/pyxdg/PKGBUILD | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/extra/pyxdg/PKGBUILD b/abs/extra/pyxdg/PKGBUILD
index 7ecc3f8..def51e5 100644
--- a/abs/extra/pyxdg/PKGBUILD
+++ b/abs/extra/pyxdg/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Mario A. Vazquez <mario_vazq@hotmail.com>
pkgbase=pyxdg
-pkgname=('python2-xdg')
+pkgname=('python2-xdg' 'python-xdg')
pkgver=0.25
pkgrel=1
pkgdesc="Python library to access freedesktop.org standards"
@@ -25,9 +25,9 @@ package_python2-xdg() {
python2 setup.py install --prefix=/usr --root="${pkgdir}"
}
-#package_python-xdg() {
-# depends=('python')
+package_python-xdg() {
+ depends=('python')
-# cd "${srcdir}/${pkgbase}-${pkgver}"
-# python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
-#}
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
+}
--
cgit v0.12
From 4f96b69b4630b14c016ee713b18a5653cc2bed64 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 22 Aug 2013 11:13:16 -0500
Subject: pyxdg: fix dep for python-xdg pkg.
---
abs/extra/pyxdg/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/extra/pyxdg/PKGBUILD b/abs/extra/pyxdg/PKGBUILD
index def51e5..f1a4473 100644
--- a/abs/extra/pyxdg/PKGBUILD
+++ b/abs/extra/pyxdg/PKGBUILD
@@ -26,7 +26,7 @@ package_python2-xdg() {
}
package_python-xdg() {
- depends=('python')
+ depends=('python2')
cd "${srcdir}/${pkgbase}-${pkgver}"
python setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1
--
cgit v0.12
From 81d6b687db35d5cee3b3243e64873b640e49f75a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 22 Aug 2013 11:22:49 -0500
Subject: speech-dispatcher: initial inclusion. dep of chromium 29
---
abs/extra/speech-dispatcher/PKGBUILD | 61 ++++++++++++++++++++++
abs/extra/speech-dispatcher/__changelog | 1 +
.../speech-dispatcher/speech-dispatcher.install | 22 ++++++++
.../speech-dispatcher/speech-dispatcherd.service | 10 ++++
4 files changed, 94 insertions(+)
create mode 100644 abs/extra/speech-dispatcher/PKGBUILD
create mode 100644 abs/extra/speech-dispatcher/__changelog
create mode 100644 abs/extra/speech-dispatcher/speech-dispatcher.install
create mode 100644 abs/extra/speech-dispatcher/speech-dispatcherd.service
diff --git a/abs/extra/speech-dispatcher/PKGBUILD b/abs/extra/speech-dispatcher/PKGBUILD
new file mode 100644
index 0000000..4c26348
--- /dev/null
+++ b/abs/extra/speech-dispatcher/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Steve Holmes <steve.holmes88@gmail.com>
+# Contributor: Alexander Jenisch <nt@divzero.at>
+# Contributor: Chris Brannon <cmbrannon@cox.net>
+# Contributor: Andreas Messer <andi@bupfen.de>
+
+pkgname=speech-dispatcher
+pkgver=0.8
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc="High-level device independent layer for speech synthesis interface"
+url="http://www.freebsoft.org/speechd"
+license=('GPL2' 'FDL')
+depends=('glib2' 'libltdl' 'python-xdg' 'dotconf')
+makedepends=('intltool')
+optdepends=('festival: Speech output using Festival'
+ 'espeak: Speech output using ESpeak'
+ 'pulseaudio: PulseAudio support')
+provides=("speechd=${pkgver}")
+options=('!libtool')
+backup=(etc/speech-dispatcher/clients/gnome-speech.conf
+ etc/speech-dispatcher/clients/emacs.conf
+ etc/speech-dispatcher/modules/ibmtts.conf
+ etc/speech-dispatcher/modules/espeak-generic.conf
+ etc/speech-dispatcher/modules/espeak.conf
+ etc/speech-dispatcher/modules/swift-generic.conf
+ etc/speech-dispatcher/modules/festival.conf
+ etc/speech-dispatcher/modules/cicero.conf
+ etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
+ etc/speech-dispatcher/modules/dtk-generic.conf
+ etc/speech-dispatcher/modules/llia_phon-generic.conf
+ etc/speech-dispatcher/modules/ivona.conf
+ etc/speech-dispatcher/modules/epos-generic.conf
+ etc/speech-dispatcher/modules/flite.conf
+ etc/speech-dispatcher/speechd.conf)
+install="${pkgname}.install"
+source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
+ 'speech-dispatcherd.service')
+md5sums=('d88691a64c676122f996230c107c392f'
+ 'd26f52e2e95a30eaa83560f0e63faca5')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --without-flite \
+ --without-espeak \
+ --without-pulse
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
+ install -d "${pkgdir}/var/log/speech-dispatcher"
+}
diff --git a/abs/extra/speech-dispatcher/__changelog b/abs/extra/speech-dispatcher/__changelog
new file mode 100644
index 0000000..15dba69
--- /dev/null
+++ b/abs/extra/speech-dispatcher/__changelog
@@ -0,0 +1 @@
+remove libpulse and espeak
diff --git a/abs/extra/speech-dispatcher/speech-dispatcher.install b/abs/extra/speech-dispatcher/speech-dispatcher.install
new file mode 100644
index 0000000..1565d3a
--- /dev/null
+++ b/abs/extra/speech-dispatcher/speech-dispatcher.install
@@ -0,0 +1,22 @@
+info_dir=usr/share/info
+info_files=('speech-dispatcher.info'
+ 'ssip.info'
+ 'spd-say.info')
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for f in ${info_files[@]}; do
+ install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for f in ${info_files[@]}; do
+ install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+ done
+}
diff --git a/abs/extra/speech-dispatcher/speech-dispatcherd.service b/abs/extra/speech-dispatcher/speech-dispatcherd.service
new file mode 100644
index 0000000..ce21c56
--- /dev/null
+++ b/abs/extra/speech-dispatcher/speech-dispatcherd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Speech-Dispatcher an high-level device independent layer for speech synthesis.
+After=syslog.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/speech-dispatcher -d
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 6d6ee1d71db0b51eaceeb0c62f4bc13cc671ee95 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 23 Aug 2013 17:02:48 -0500
Subject: nacl-toolchain-newlib: update to 12029
---
abs/extra/nacl-toolchain-newlib/PKGBUILD | 44 +++++--
.../binutils-texinfo-r0.patch | 58 +++++++++
.../nacl-toolchain-newlib/gcc-texinfo-r0.patch | 132 +++++++++++++++++++++
3 files changed, 225 insertions(+), 9 deletions(-)
create mode 100644 abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
create mode 100644 abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
diff --git a/abs/extra/nacl-toolchain-newlib/PKGBUILD b/abs/extra/nacl-toolchain-newlib/PKGBUILD
index 0635d1e..6f86814 100644
--- a/abs/extra/nacl-toolchain-newlib/PKGBUILD
+++ b/abs/extra/nacl-toolchain-newlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165618 2012-08-27 12:19:30Z foutrelis $
+# $Id$
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
pkgname=nacl-toolchain-newlib
-pkgver=9513
+pkgver=12029
pkgrel=1
_binutilsver=2.20.1
_newlibver=1.20.0
@@ -20,16 +20,20 @@ source=(http://ftp.gnu.org/gnu/binutils/binutils-$_binutilsver.tar.bz2
http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/nacltoolchain-buildscripts-r$pkgver.tar.gz
http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclbinutils-$_binutilsver-r$pkgver.patch.bz2
http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclnewlib-$_newlibver-r$pkgver.patch.bz2
- http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2)
+ http://commondatastorage.googleapis.com/nativeclient-archive2/x86_toolchain/r$pkgver/naclgcc-$_gccver-r$pkgver.patch.bz2
+ binutils-texinfo-r0.patch
+ gcc-texinfo-r0.patch)
sha256sums=('71d37c96451333c5c0b84b170169fdcb138bbb27397dc06281905d9717c8ed64'
'c644b2847244278c57bec2ddda69d8fab5a7c767f3b9af69aa7aa3da823ff692'
'97ed664694b02b4d58ac2cafe443d02a388f9cb3645e7778843b5086a5fec040'
- '3c3d6e63ef8caec24a9e368b72e6c94a28edc8c016da5fef73a312b4a3514909'
- 'caaefc2bf90325f152bd0998a29fcad425522a22c6ce373366c4dde2b76c5338'
- 'be9e48f8714eaadfc3349ac6d8b077050b719d16a3e7592573670cee7a3c4934'
- 'ccbc83627bc7c36f7bbe994ccffe4d51584d8812f2ed62f08528c173e06dcf85')
+ 'a77912c4aac01142bd1c2f684f9933d6fcd39f0e67a1058858be50f0db18da7e'
+ '3b0e41b7923a90d611e598b31ed30062cfa3cf2fc2cbe7304e340a0acc780186'
+ '2de88079c500a694b73dab5a6a3690b2126ea0df498f1e27c5819b7d4256cb1a'
+ 'c98bda783fbc9726a9d0374118b1315f4ade4fe3bb5cbc96511b7a80b385dd70'
+ '64ba7c3f5edbe33b17312ab6da6c4b9e244e47289bde796a3078bf73072a0139'
+ '7eab20b6db6a7224984fd4b5bff1742571b0429428ea2af02f83f82f3de63070')
-build() {
+prepare() {
cd "$srcdir"
mkdir SRC
@@ -37,10 +41,25 @@ build() {
mv newlib-$_newlibver SRC/newlib
mv gcc-$_gccver SRC/gcc
- for _patch in *.patch; do
+ for _patch in *-r$pkgver.patch; do
patch -d SRC -Np0 -i "$srcdir/$_patch"
done
+ cd SRC
+
+ # Fix build with texinfo 5.1
+ patch -d binutils -Np1 -i "$srcdir/binutils-texinfo-r0.patch"
+ patch -d gcc -Np1 -i "$srcdir/gcc-texinfo-r0.patch"
+}
+
+build() {
+ cd "$srcdir"
+ ./download_SRC.sh $pkgver
+
+ CFLAGS+=" $CPPFLAGS"
+ CXXFLAGS+=" $CPPFLAGS"
+ unset CPPFLAGS
+
make PREFIX="$srcdir/$pkgname" CANNED_REVISION="yes" build-with-newlib
}
@@ -49,6 +68,13 @@ package() {
install -d "$pkgdir/usr/lib"
mv $pkgname "$pkgdir/usr/lib/$pkgname"
+
+ # NaCL license
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+ # Newlib license
+ install -m644 -t "$pkgdir/usr/share/licenses/$pkgname/" \
+ SRC/newlib/COPYING.{NEWLIB,LIBGLOSS}
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch b/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
new file mode 100644
index 0000000..ab81d8a
--- /dev/null
+++ b/abs/extra/nacl-toolchain-newlib/binutils-texinfo-r0.patch
@@ -0,0 +1,58 @@
+https://bugs.gentoo.org/show_bug.cgi?id=464168
+
+commit 935f85422863b42b6fbca30885885e3fa28eea36
+Author: Nick Clifton <nickc@redhat.com>
+Date: Mon Jan 7 12:11:11 2013 +0000
+
+ * ld.texinfo: Replace @ with @@ when it is part of the text.
+ Correct ordering of M68HC11 entry.
+
+ * doc/binutils.texi: Fix ordering of top level nodes.
+ Replace erroneous uses of @itemx with @item.
+
+ * bfd.texinfo: Replace @ with @@ when it is part of the text.
+
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
diff --git a/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch b/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
new file mode 100644
index 0000000..8523373
--- /dev/null
+++ b/abs/extra/nacl-toolchain-newlib/gcc-texinfo-r0.patch
@@ -0,0 +1,132 @@
+https://bugs.gentoo.org/show_bug.cgi?id=464168
+
+commit 85ad240e47dcdc1bf20ef6a95e921ac1f766d995
+Author: schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sun Oct 28 09:19:54 2012 +0000
+
+ * doc/cppopts.texi: Fix use of @item vs. @itemx inside @table.
+ * doc/extend.texi: Likewise.
+ * doc/generic.texi: Likewise.
+ * doc/invoke.texi: Likewise.
+ * doc/md.texi: Likewise.
+ * doc/sourcebuild.texi: Likewise.
+
+
+ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@192887 138bc75d-0d04-0410-961f-82ee72b054a4
+
+diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi
+index 27b1095..a2eb79d 100644
+--- a/gcc/doc/cppopts.texi
++++ b/gcc/doc/cppopts.texi
+@@ -805,7 +805,7 @@ Replacement: [ ] @{ @} # \ ^ | ~
+ Enable special code to work around file systems which only permit very
+ short file names, such as MS-DOS@.
+
+-@itemx --help
++@item --help
+ @itemx --target-help
+ @opindex help
+ @opindex target-help
+diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi
+index dfbdc4c..bca0d8f 100644
+--- a/gcc/doc/md.texi
++++ b/gcc/doc/md.texi
+@@ -4483,8 +4483,8 @@ means of constraints requiring operands 1 and 0 to be the same location.
+ @cindex @code{ior@var{m}3} instruction pattern
+ @cindex @code{xor@var{m}3} instruction pattern
+ @item @samp{ssadd@var{m}3}, @samp{usadd@var{m}3}
+-@item @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
+-@item @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
++@itemx @samp{sub@var{m}3}, @samp{sssub@var{m}3}, @samp{ussub@var{m}3}
++@itemx @samp{mul@var{m}3}, @samp{ssmul@var{m}3}, @samp{usmul@var{m}3}
+ @itemx @samp{div@var{m}3}, @samp{ssdiv@var{m}3}
+ @itemx @samp{udiv@var{m}3}, @samp{usdiv@var{m}3}
+ @itemx @samp{mod@var{m}3}, @samp{umod@var{m}3}
+diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
+index 89e7712..ec8263f 100644
+--- a/gcc/doc/sourcebuild.texi
++++ b/gcc/doc/sourcebuild.texi
+@@ -691,7 +691,7 @@ standard rule in @file{gcc/Makefile.in} to the variable
+ @code{lang_checks}.
+
+ @table @code
+-@itemx all.cross
++@item all.cross
+ @itemx start.encap
+ @itemx rest.encap
+ FIXME: exactly what goes in each of these targets?
+--- a/gcc/doc/c-tree.texi
++++ b/gcc/doc/c-tree.texi
+@@ -2338,13 +2338,13 @@
+ not matter. The type of the operands and that of the result are
+ always of @code{BOOLEAN_TYPE} or @code{INTEGER_TYPE}.
+
+-@itemx POINTER_PLUS_EXPR
++@item POINTER_PLUS_EXPR
+ This node represents pointer arithmetic. The first operand is always
+ a pointer/reference type. The second operand is always an unsigned
+ integer type compatible with sizetype. This is the only binary
+ arithmetic operand that can operate on pointer types.
+
+-@itemx PLUS_EXPR
++@item PLUS_EXPR
+ @itemx MINUS_EXPR
+ @itemx MULT_EXPR
+ These nodes represent various binary arithmetic operations.
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -4645,11 +4652,11 @@
+ @option{-fdump-rtl-ce3} enable dumping after the three
+ if conversion passes.
+
+-@itemx -fdump-rtl-cprop_hardreg
++@item -fdump-rtl-cprop_hardreg
+ @opindex fdump-rtl-cprop_hardreg
+ Dump after hard register copy propagation.
+
+-@itemx -fdump-rtl-csa
++@item -fdump-rtl-csa
+ @opindex fdump-rtl-csa
+ Dump after combining stack adjustments.
+
+@@ -4660,11 +4667,11 @@
+ @option{-fdump-rtl-cse1} and @option{-fdump-rtl-cse2} enable dumping after
+ the two common sub-expression elimination passes.
+
+-@itemx -fdump-rtl-dce
++@item -fdump-rtl-dce
+ @opindex fdump-rtl-dce
+ Dump after the standalone dead code elimination passes.
+
+-@itemx -fdump-rtl-dbr
++@item -fdump-rtl-dbr
+ @opindex fdump-rtl-dbr
+ Dump after delayed branch scheduling.
+
+@@ -4709,7 +4716,7 @@
+ @opindex fdump-rtl-initvals
+ Dump after the computation of the initial value sets.
+
+-@itemx -fdump-rtl-into_cfglayout
++@item -fdump-rtl-into_cfglayout
+ @opindex fdump-rtl-into_cfglayout
+ Dump after converting to cfglayout mode.
+
+@@ -4739,7 +4746,7 @@
+ @opindex fdump-rtl-rnreg
+ Dump after register renumbering.
+
+-@itemx -fdump-rtl-outof_cfglayout
++@item -fdump-rtl-outof_cfglayout
+ @opindex fdump-rtl-outof_cfglayout
+ Dump after converting from cfglayout mode.
+
+@@ -4751,7 +4758,7 @@
+ @opindex fdump-rtl-postreload
+ Dump after post-reload optimizations.
+
+-@itemx -fdump-rtl-pro_and_epilogue
++@item -fdump-rtl-pro_and_epilogue
+ @opindex fdump-rtl-pro_and_epilogue
+ Dump after generating the function pro and epilogues.
+
--
cgit v0.12
From 8d0fbda7bb1967b70924a30fce8bdc724638cb88 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 26 Aug 2013 13:31:41 -0500
Subject: google-chrome: Initial Inclusion. Replace chromium. refs# 923.
---
abs/extra/google-chrome/PKGBUILD | 56 +++++++++++++++++++++++++++
abs/extra/google-chrome/__changelog | 5 +++
abs/extra/google-chrome/google-chrome.install | 17 ++++++++
3 files changed, 78 insertions(+)
create mode 100644 abs/extra/google-chrome/PKGBUILD
create mode 100644 abs/extra/google-chrome/__changelog
create mode 100644 abs/extra/google-chrome/google-chrome.install
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
new file mode 100644
index 0000000..f7926d3
--- /dev/null
+++ b/abs/extra/google-chrome/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Det <nimetonmaili at gmail a-dot com>
+# Contributors: t3ddy, Lex Rivera aka x-demon, ruario
+
+# Check for new Linux releases in: http://googlechromereleases.blogspot.com/search/label/Stable%20updates
+# 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=29.0.1547.57
+pkgrel=1
+pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
+arch=('i686' 'x86_64')
+url="https://www.google.com/chrome"
+license=('custom:chrome')
+depends=('alsa-lib' 'gconf' 'gtk2' 'hicolor-icon-theme' 'libpng' 'libxslt' 'libxss' 'nss' 'ttf-font' 'xdg-utils')
+optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
+ 'ttf-google-fonts-git')
+provides=("google-chrome=$pkgver")
+conflicts=('google-chrome')
+replaces=('chromium')
+options=('!emptydirs' '!strip')
+install=$pkgname.install
+_channel=stable
+_arch=i386
+[ "$CARCH" = 'x86_64' ] && _arch=amd64
+source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
+ "$url/intl/en/eula_text.html")
+md5sums=('6d32b3c70acf721ded0b8e3461db08ac'
+ '6d57da7476a4b1b7a81821d9c036425c')
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='335c20abfffdd1a195104a0321acb6f8'
+
+#PKGEXT='.pkg.tar'
+
+package() {
+ msg2 "Extracting the data.tar.lzma"
+ bsdtar -xf data.tar.lzma -C "$pkgdir/"
+
+ msg2 "Moving stuff in place"
+ mv "$pkgdir"/opt/google/chrome/google-chrome.desktop "$pkgdir"/usr/share/applications/
+
+ # Icons
+ for i in 16 22 24 32 48 64 128 256; do
+ install -Dm644 "$pkgdir"/opt/google/chrome/product_logo_${i}.png "$pkgdir"/usr/share/icons/hicolor/${i}x${i}/apps/google-chrome.png
+ done
+
+ # Man page
+ gzip "$pkgdir"/usr/share/man/man1/google-chrome.1
+
+ # License
+ install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html
+
+ msg2 "Symlinking missing Udev lib"
+ ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0
+
+ msg2 "Removing the Debian-intended cron job and duplicated images"
+ rm "$pkgdir"/etc/cron.daily/google-chrome "$pkgdir"/opt/google/chrome/product_logo_*
+}
diff --git a/abs/extra/google-chrome/__changelog b/abs/extra/google-chrome/__changelog
new file mode 100644
index 0000000..20fbc77
--- /dev/null
+++ b/abs/extra/google-chrome/__changelog
@@ -0,0 +1,5 @@
+8/25/13
+Pull from ARU: https://aur.archlinux.org/packages/google-chrome/
+- PKGBUILD: comment out PKGEXT so we compress the pkg
+- PKGBUILD: add replaces chromium
+- google-chrome.install: add symlink from /usr/bin/chromium to google-chrome so as not to break pkgs that use chromium
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
new file mode 100644
index 0000000..c5c7d50
--- /dev/null
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -0,0 +1,17 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ if [ ! -a /usr/bin/chromium ]; then
+ ln -s /usr/bin/google-chrome /usr/bin/chromium
+ fi
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ if [ -h /usr/bin/chromium ]; then
+ rm /usr/bin/chromium
+ fi
+}
--
cgit v0.12
From b20a30f37948d1e1d5d9cd24946e5d9c820b7ce1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 26 Aug 2013 14:07:33 -0500
Subject: nspr: update to 4.10. refs #923
---
abs/extra/nspr/PKGBUILD | 59 ++++++++++++++++-------------------------------
abs/extra/nspr/nspr.pc.in | 10 --------
2 files changed, 20 insertions(+), 49 deletions(-)
delete mode 100644 abs/extra/nspr/nspr.pc.in
diff --git a/abs/extra/nspr/PKGBUILD b/abs/extra/nspr/PKGBUILD
index 3b1ad58..3dd4de0 100644
--- a/abs/extra/nspr/PKGBUILD
+++ b/abs/extra/nspr/PKGBUILD
@@ -1,63 +1,44 @@
-# $Id: PKGBUILD 162022 2012-06-18 22:10:00Z ibiru $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
+
pkgname=nspr
-pkgver=4.9.1
-pkgrel=1
+pkgver=4.10
+pkgrel=2
pkgdesc="Netscape Portable Runtime"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/nspr/"
license=('MPL' 'GPL')
depends=('glibc')
makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
- nspr.pc.in)
-md5sums=('d36d7b65a38f5b43ebd50ad3ad227120'
- 'bce1611f3117b53fc904cab549c09967')
+options=('!emptydirs')
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
+md5sums=('f5466def95726b3c900d8a0227bdd034')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- if [ "$CARCH" = "x86_64" ]; then
- confflags="--enable-64bit"
+ cd $pkgname-$pkgver
+
+ if [[ $CARCH = x86_64 ]]; then
+ _confflags="--enable-64bit"
else
- confflags=""
+ _confflags=""
fi
- sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- -i mozilla/nsprpub/config/rules.mk
-
- ./mozilla/nsprpub/configure \
+ ./nspr/configure \
--prefix=/usr \
--libdir=/usr/lib \
--includedir=/usr/include/nspr \
--enable-optimize \
- --disable-debug ${confflags}
+ --disable-debug ${_confflags}
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- NSPR_LIBS=`./config/nspr-config --libs`
- NSPR_CFLAGS=`./config/nspr-config --cflags`
- NSPR_VERSION=`./config/nspr-config --version`
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
- -e "s,%prefix%,/usr," \
- -e "s,%exec_prefix%,/usr/bin," \
- -e "s,%includedir%,/usr/include/nspr," \
- -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
- -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
- -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
- chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
- ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
-
- chmod 644 ${pkgdir}/usr/lib/*.a
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
- rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
- "${pkgdir}/usr/bin/prerr.properties" \
- "${pkgdir}/usr/share/aclocal/nspr.m4" \
- "${pkgdir}/usr/include/nspr/md"
+ chmod 644 "$pkgdir"/usr/lib/*.a
+ ln -s nspr.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nspr.pc"
+ rm -r "$pkgdir"/usr/bin/{compile-et.pl,prerr.properties} \
+ "$pkgdir/usr/include/nspr/md"
}
diff --git a/abs/extra/nspr/nspr.pc.in b/abs/extra/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0..0000000
--- a/abs/extra/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
--
cgit v0.12
From 3d4c07fbf84f796988aba0c9131f997bcf1c5127 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 26 Aug 2013 14:23:43 -0500
Subject: nss: update to 3.15.1 refs #923
---
abs/extra/nss/PKGBUILD | 139 ++++++------
abs/extra/nss/add_spi+cacert_ca_certs.patch | 322 ++++++++++++++++------------
abs/extra/nss/nss-no-rpath.patch | 14 --
3 files changed, 254 insertions(+), 221 deletions(-)
delete mode 100644 abs/extra/nss/nss-no-rpath.patch
diff --git a/abs/extra/nss/PKGBUILD b/abs/extra/nss/PKGBUILD
index 77bc6ef..09c9d97 100644
--- a/abs/extra/nss/PKGBUILD
+++ b/abs/extra/nss/PKGBUILD
@@ -1,106 +1,97 @@
-# $Id: PKGBUILD 162023 2012-06-18 22:10:13Z ibiru $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nss
-pkgver=3.13.5
+pkgver=3.15.1
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64)
url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
-_nsprver=4.9.1
+_nsprver=4.10
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
makedepends=('perl')
-options=('!strip')
+options=('!strip' '!makeflags')
source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
- nss-no-rpath.patch
nss.pc.in
nss-config.in
- add_spi+cacert_ca_certs.patch
- ssl-renegotiate-transitional.patch)
-sha1sums=('22cfe2cbccc93189699e6eed283eca288b45f6cb'
- 'c8fcdb153af9d39689243119adb475905a657284'
+ ssl-renegotiate-transitional.patch
+ add_spi+cacert_ca_certs.patch)
+sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
- '3d89f29e321d7df7269b7ae6d219654543feaa6a'
- '8a964a744ba098711b80c0d279a2993524e8eb92')
+ '8a964a744ba098711b80c0d279a2993524e8eb92'
+ 'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # Add CAcert and spi-inc.org CA certificates.
+ # See http://wiki.cacert.org/NSSLib for how to generate
+ patch -Np1 -i ../add_spi+cacert_ca_certs.patch
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
- # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
- patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
# Adds transitional SSL renegotiate support - patch from Debian
- patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
- # Removes rpath
- patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
+ patch -Np3 -i ../ssl-renegotiate-transitional.patch
# Respect LDFLAGS
- sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
- -i security/coreconf/rules.mk
+ sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
+ -i nss/coreconf/rules.mk
+}
+
- # Generate certdata.c from certdata.txt
- cd security/nss/lib/ckfw/builtins
- make generate
+build() {
+ cd $pkgname-$pkgver/nss
- cd "${srcdir}/${pkgname}-${pkgver}"
export BUILD_OPT=1
- export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
- export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
export NSS_USE_SYSTEM_SQLITE=1
export NSS_ENABLE_ECC=1
- export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
- export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
+ export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
+ export NSPR_LIB_DIR="`nspr-config --libdir`"
export XCFLAGS="${CFLAGS}"
[ "$CARCH" = "x86_64" ] && export USE_64=1
- make -j 1 -C mozilla/security/coreconf
- make -j 1 -C mozilla/security/dbm
- make -j 1 -C mozilla/security/nss
+ make -C coreconf
+ make -C lib/dbm
+ make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m755 -d "${pkgdir}/usr/bin"
- install -m755 -d "${pkgdir}/usr/include/nss"
-
- NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
- NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
- NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
- sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
- -e "s,%prefix%,/usr,g" \
- -e "s,%exec_prefix%,/usr/bin,g" \
- -e "s,%includedir%,/usr/include/nss,g" \
- -e "s,%NSPR_VERSION%,${pkgver},g" \
- -e "s,%NSS_VERSION%,${pkgver},g" > \
- "${pkgdir}/usr/lib/pkgconfig/nss.pc"
- ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
- chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
-
- sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
- -e "s,@prefix@,/usr/bin,g" \
- -e "s,@exec_prefix@,/usr/bin,g" \
- -e "s,@includedir@,/usr/include/nss,g" \
- -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
- -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
- -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
- > "${pkgdir}/usr/bin/nss-config"
- chmod 755 "${pkgdir}/usr/bin/nss-config"
-
- for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
- libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
- do
- install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
- done
-
- install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
- install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
-
- for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
- install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
- done
-
- install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
+ cd $pkgname-$pkgver
+ install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
+
+ NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
+ NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
+ NSS_VPATCH=$(grep '#define.*NSS_VPATCH' nss/lib/nss/nss.h | awk '{print $3}')
+
+ sed ../nss.pc.in \
+ -e "s,%libdir%,/usr/lib,g" \
+ -e "s,%prefix%,/usr,g" \
+ -e "s,%exec_prefix%,/usr/bin,g" \
+ -e "s,%includedir%,/usr/include/nss,g" \
+ -e "s,%NSPR_VERSION%,${_nsprver},g" \
+ -e "s,%NSS_VERSION%,${pkgver},g" \
+ > "$pkgdir/usr/lib/pkgconfig/nss.pc"
+ ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
+
+ sed ../nss-config.in \
+ -e "s,@libdir@,/usr/lib,g" \
+ -e "s,@prefix@,/usr/bin,g" \
+ -e "s,@exec_prefix@,/usr/bin,g" \
+ -e "s,@includedir@,/usr/include/nss,g" \
+ -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+ -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+ -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+ > "$pkgdir/usr/bin/nss-config"
+ chmod 755 "$pkgdir/usr/bin/nss-config"
+
+ cd dist/*.OBJ/bin
+ install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
+
+ cd ../lib
+ install -t "$pkgdir/usr/lib" *.so
+ install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk
+
+ cd ../../public/nss
+ install -t "$pkgdir/usr/include/nss" -m644 *.h
}
diff --git a/abs/extra/nss/add_spi+cacert_ca_certs.patch b/abs/extra/nss/add_spi+cacert_ca_certs.patch
index bf7e2ca..14c65e0 100644
--- a/abs/extra/nss/add_spi+cacert_ca_certs.patch
+++ b/abs/extra/nss/add_spi+cacert_ca_certs.patch
@@ -1,20 +1,20 @@
-## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds the SPI Inc. and CAcert.org CA certificates
-
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:32:14.000000000 +0100
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2012-02-24 09:35:07.577861466 +0100
-@@ -23475,3 +23475,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
+--- security/nss/lib/ckfw/builtins/certdata.txt.orig 2012-08-19 16:22:51.726895174 +0200
++++ security/nss/lib/ckfw/builtins/certdata.txt 2012-08-19 17:40:41.233306703 +0200
+@@ -24454,3 +24454,621 @@
+ CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
+ CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_MUST_VERIFY_TRUST
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
++
+#
+# Certificate "CAcert.org Class 1 Root CA"
+#
++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
++# Serial Number: 0 (0x0)
++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
++# Not Valid Before: Sun Mar 30 12:29:49 2003
++# Not Valid After : Tue Mar 29 12:29:49 2033
++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B
++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
@@ -165,8 +165,15 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+\103
+END
+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++# Trust for "CAcert.org Class 1 Root CA"
++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
++# Serial Number: 0 (0x0)
++# Subject: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
++# Not Valid Before: Sun Mar 30 12:29:49 2003
++# Not Valid After : Tue Mar 29 12:29:49 2033
++# Fingerprint (MD5): A6:1B:37:5E:39:0D:9C:36:54:EE:BD:20:31:46:1F:6B
++# Fingerprint (SHA1): 13:5C:EC:36:F4:9C:B8:E9:3B:1A:B2:70:CD:80:88:46:76:CE:8F:33
++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
@@ -191,14 +198,21 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\001\000
+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
+# Certificate "CAcert.org Class 3 Root CA"
+#
++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
++# Serial Number: 672138 (0xa418a)
++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc.
++# Not Valid Before: Mon May 23 17:48:02 2011
++# Not Valid After : Thu May 20 17:48:02 2021
++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42
++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
@@ -225,120 +239,148 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
++\002\003\012\101\212
+END
+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
++\060\202\007\131\060\202\005\101\240\003\002\001\002\002\003\012
++\101\212\060\015\006\011\052\206\110\206\367\015\001\001\013\005
++\000\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157
++\157\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025
++\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
++\164\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031
++\103\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040
++\101\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052
++\206\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162
++\164\100\143\141\143\145\162\164\056\157\162\147\060\036\027\015
++\061\061\060\065\062\063\061\067\064\070\060\062\132\027\015\062
++\061\060\065\062\060\061\067\064\070\060\062\132\060\124\061\024
++\060\022\006\003\125\004\012\023\013\103\101\143\145\162\164\040
++\111\156\143\056\061\036\060\034\006\003\125\004\013\023\025\150
++\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162\164
++\056\157\162\147\061\034\060\032\006\003\125\004\003\023\023\103
++\101\143\145\162\164\040\103\154\141\163\163\040\063\040\122\157
++\157\164\060\202\002\042\060\015\006\011\052\206\110\206\367\015
++\001\001\001\005\000\003\202\002\017\000\060\202\002\012\002\202
++\002\001\000\253\111\065\021\110\174\322\046\176\123\224\317\103
++\251\335\050\327\102\052\213\363\207\170\031\130\174\017\236\332
++\211\175\341\373\353\162\220\015\164\241\226\144\253\237\240\044
++\231\163\332\342\125\166\307\027\173\365\004\254\106\270\303\276
++\177\144\215\020\154\044\363\141\234\300\362\220\372\121\346\365
++\151\001\143\303\017\126\342\112\102\317\342\104\214\045\050\250
++\305\171\011\175\106\271\212\363\351\363\064\051\010\105\344\034
++\237\313\224\004\034\201\250\024\263\230\145\304\103\354\116\202
++\215\011\321\275\252\133\215\222\320\354\336\220\305\177\012\302
++\343\353\346\061\132\136\164\076\227\063\131\350\303\003\075\140
++\063\277\367\321\157\107\304\315\356\142\203\122\156\056\010\232
++\244\331\025\030\221\246\205\222\107\260\256\110\353\155\267\041
++\354\205\032\150\162\065\253\377\360\020\135\300\364\224\247\152
++\325\073\222\176\114\220\005\176\223\301\054\213\244\216\142\164
++\025\161\156\013\161\003\352\257\025\070\232\324\322\005\162\157
++\214\371\053\353\132\162\045\371\071\106\343\162\033\076\004\303
++\144\047\042\020\052\212\117\130\247\003\255\276\264\056\023\355
++\135\252\110\327\325\175\324\052\173\134\372\106\004\120\344\314
++\016\102\133\214\355\333\362\317\374\226\223\340\333\021\066\124
++\142\064\070\217\014\140\233\073\227\126\070\255\363\322\133\213
++\240\133\352\116\226\270\174\327\325\240\206\160\100\323\221\051
++\267\242\074\255\365\214\273\317\032\222\212\344\064\173\300\330
++\154\137\351\012\302\303\247\040\232\132\337\054\135\122\134\272
++\107\325\233\357\044\050\160\070\040\057\325\177\051\300\262\101
++\003\150\222\314\340\234\314\227\113\105\357\072\020\012\253\160
++\072\230\225\160\255\065\261\352\205\053\244\034\200\041\061\251
++\256\140\172\200\046\110\000\270\001\300\223\143\125\042\221\074
++\126\347\257\333\072\045\363\217\061\124\352\046\213\201\131\371
++\241\321\123\021\305\173\235\003\366\164\021\340\155\261\054\077
++\054\206\221\231\161\232\246\167\213\064\140\321\024\264\054\254
++\235\257\214\020\323\237\304\152\370\157\023\374\163\131\367\146
++\102\164\036\212\343\370\334\322\157\230\234\313\107\230\225\100
++\005\373\351\002\003\001\000\001\243\202\002\015\060\202\002\011
++\060\035\006\003\125\035\016\004\026\004\024\165\250\161\140\114
++\210\023\360\170\331\211\167\265\155\305\211\337\274\261\172\060
++\201\243\006\003\125\035\043\004\201\233\060\201\230\200\024\026
++\265\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262
++\071\030\321\241\175\244\173\060\171\061\020\060\016\006\003\125
++\004\012\023\007\122\157\157\164\040\103\101\061\036\060\034\006
++\003\125\004\013\023\025\150\164\164\160\072\057\057\167\167\167
++\056\143\141\143\145\162\164\056\157\162\147\061\042\060\040\006
++\003\125\004\003\023\031\103\101\040\103\145\162\164\040\123\151
++\147\156\151\156\147\040\101\165\164\150\157\162\151\164\171\061
++\041\060\037\006\011\052\206\110\206\367\015\001\011\001\026\022
++\163\165\160\160\157\162\164\100\143\141\143\145\162\164\056\157
++\162\147\202\001\000\060\017\006\003\125\035\023\001\001\377\004
++\005\060\003\001\001\377\060\135\006\010\053\006\001\005\005\007
++\001\001\004\121\060\117\060\043\006\010\053\006\001\005\005\007
++\060\001\206\027\150\164\164\160\072\057\057\157\143\163\160\056
++\103\101\143\145\162\164\056\157\162\147\057\060\050\006\010\053
++\006\001\005\005\007\060\002\206\034\150\164\164\160\072\057\057
++\167\167\167\056\103\101\143\145\162\164\056\157\162\147\057\143
++\141\056\143\162\164\060\112\006\003\125\035\040\004\103\060\101
++\060\077\006\010\053\006\001\004\001\201\220\112\060\063\060\061
++\006\010\053\006\001\005\005\007\002\001\026\045\150\164\164\160
++\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157\162
++\147\057\151\156\144\145\170\056\160\150\160\077\151\144\075\061
++\060\060\064\006\011\140\206\110\001\206\370\102\001\010\004\047
++\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101\143
++\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160\150
++\160\077\151\144\075\061\060\060\120\006\011\140\206\110\001\206
++\370\102\001\015\004\103\026\101\124\157\040\147\145\164\040\171
++\157\165\162\040\157\167\156\040\143\145\162\164\151\146\151\143
++\141\164\145\040\146\157\162\040\106\122\105\105\054\040\147\157
++\040\164\157\040\150\164\164\160\072\057\057\167\167\167\056\103
++\101\143\145\162\164\056\157\162\147\060\015\006\011\052\206\110
++\206\367\015\001\001\013\005\000\003\202\002\001\000\051\050\205
++\256\104\251\271\257\244\171\023\360\250\243\053\227\140\363\134
++\356\343\057\301\366\342\146\240\021\256\066\067\072\166\025\004
++\123\352\102\365\371\352\300\025\330\246\202\331\344\141\256\162
++\013\051\134\220\103\350\101\262\341\167\333\002\023\104\170\107
++\125\257\130\374\314\230\366\105\271\321\040\370\330\041\007\376
++\155\252\163\324\263\306\007\351\011\205\314\073\362\266\276\054
++\034\045\325\161\214\071\265\056\352\276\030\201\272\260\223\270
++\017\343\346\327\046\214\061\132\162\003\204\122\346\246\365\063
++\042\105\012\310\013\015\212\270\066\157\220\011\241\253\275\327
++\325\116\056\161\242\324\256\372\247\124\053\353\065\215\132\267
++\124\210\057\356\164\237\355\110\026\312\015\110\320\224\323\254
++\244\242\366\044\337\222\343\275\353\103\100\221\156\034\030\216
++\126\264\202\022\363\251\223\237\324\274\234\255\234\165\356\132
++\227\033\225\347\164\055\034\017\260\054\227\237\373\251\063\071
++\172\347\003\072\222\216\042\366\214\015\344\331\176\015\166\030
++\367\001\371\357\226\226\242\125\163\300\074\161\264\035\032\126
++\103\267\303\012\215\162\374\342\020\011\013\101\316\214\224\240
++\371\003\375\161\163\113\212\127\063\345\216\164\176\025\001\000
++\346\314\112\034\347\177\225\031\055\305\245\014\213\273\265\355
++\205\263\134\323\337\270\271\362\312\307\015\001\024\254\160\130
++\305\214\215\063\324\235\146\243\032\120\225\043\374\110\340\006
++\103\022\331\315\247\206\071\057\066\162\243\200\020\344\341\363
++\321\313\133\032\300\344\200\232\174\023\163\006\117\333\243\153
++\044\012\272\263\034\274\112\170\273\345\343\165\070\245\110\247
++\242\036\257\166\324\136\367\070\206\126\132\211\316\326\303\247
++\171\262\122\240\306\361\205\264\045\214\362\077\226\263\020\331
++\215\154\127\073\237\157\206\072\030\202\042\066\310\260\221\070
++\333\052\241\223\252\204\077\365\047\145\256\163\325\310\325\323
++\167\352\113\235\307\101\273\307\300\343\240\077\344\175\244\215
++\163\346\022\113\337\241\163\163\163\072\200\350\325\313\216\057
++\313\352\023\247\326\101\213\254\372\074\211\327\044\365\116\264
++\340\141\222\267\363\067\230\304\276\226\243\267\212
+END
+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++# Trust for "CAcert.org Class 3 Root CA"
++# Issuer: E=support@cacert.org,CN=CA Cert Signing Authority,OU=http://www.cacert.org,O=Root CA
++# Serial Number: 672138 (0xa418a)
++# Subject: CN=CAcert Class 3 Root,OU=http://www.CAcert.org,O=CAcert Inc.
++# Not Valid Before: Mon May 23 17:48:02 2011
++# Not Valid After : Thu May 20 17:48:02 2021
++# Fingerprint (MD5): F7:25:12:82:4E:67:B5:D0:8D:92:B7:7C:0B:86:7A:42
++# Fingerprint (SHA1): AD:7C:3F:64:FC:44:39:FE:F4:E9:0B:E8:F4:7C:6C:FA:8A:AD:FD:CE
++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
++\255\174\077\144\374\104\071\376\364\351\013\350\364\174\154\372
++\212\255\375\316
+END
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
++\367\045\022\202\116\147\265\320\215\222\267\174\013\206\172\102
+END
+CKA_ISSUER MULTILINE_OCTAL
+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
@@ -351,21 +393,28 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+\100\143\141\143\145\162\164\056\157\162\147
+END
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
++\002\003\012\101\212
+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
+
+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
++# Certificate "Software in the Public Interest"
+#
++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28
++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
++# Not Valid Before: Tue May 13 08:07:56 2008
++# Not Valid After : Fri May 11 08:07:56 2018
++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78
++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
++CKA_LABEL UTF8 "Software in the Public Interest"
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
+CKA_SUBJECT MULTILINE_OCTAL
+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
@@ -532,12 +581,19 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+\243\140
+END
+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
++# Trust for "Software in the Public Interest"
++# Issuer: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
++# Serial Number:00:e8:8e:b6:c9:f8:2a:14:28
++# Subject: E=hostmaster@spi-inc.org,CN=Certificate Authority,OU=hostmaster,O=Software in the Public Interest,L=Indianapolis,ST=Indiana,C=US
++# Not Valid Before: Tue May 13 08:07:56 2008
++# Not Valid After : Fri May 11 08:07:56 2018
++# Fingerprint (MD5): 2A:47:9F:60:BB:83:74:6F:01:03:D7:0B:0D:F6:0D:78
++# Fingerprint (SHA1): AF:70:88:43:83:82:02:15:CD:61:C6:BC:EC:FD:37:24:A9:90:43:1C
++CKA_CLASS CK_OBJECT_CLASS CKO_NSS_TRUST
+CKA_TOKEN CK_BBOOL CK_TRUE
+CKA_PRIVATE CK_BBOOL CK_FALSE
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
++CKA_LABEL UTF8 "Software in the Public Interest"
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
+\251\220\103\034
@@ -562,7 +618,7 @@ Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
+\002\011\000\350\216\266\311\370\052\024\050
+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
++CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
++CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
++CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_TRUSTED_DELEGATOR
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/abs/extra/nss/nss-no-rpath.patch b/abs/extra/nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea573..0000000
--- a/abs/extra/nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
-
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
-
--
cgit v0.12
From 4ee6a50adc019938e74655f66dfe483dd5573154 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 26 Aug 2013 14:26:15 -0500
Subject: web-on-linhes: change dep to google-chrome. refs #923
---
abs/extra/web-on-linhes/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD
index ec7965c..61abc93 100644
--- a/abs/extra/web-on-linhes/PKGBUILD
+++ b/abs/extra/web-on-linhes/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=web-on-linhes
pkgver=1.00.0
-pkgrel=5
+pkgrel=6
pkgdesc="Added multiple websites with 10' UIs to Play Online Streams."
arch=('i686' 'x86_64')
license=('GPL2')
url="http://www.linhes.org/"
-depends=('chromium' 'flashplugin' 'linhes-scripts>=7-29' )
+depends=('google-chrome' 'linhes-scripts>=7-29' )
install=web-on-linhes.install
source=('web-on-linhes.sh' 'web-on-linhes_is.conf')
--
cgit v0.12
From bb07bc66b3020f320fb818ec426807fcb89159f0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 31 Aug 2013 20:58:00 -0500
Subject: LinHES-system: add checkXFSfrag.sh and weekly cron job. closes #929
---
abs/core/LinHES-system/PKGBUILD | 10 +++++--
abs/core/LinHES-system/checkXFSfrag.sh | 51 ++++++++++++++++++++++++++++++++++
abs/core/LinHES-system/xfs_defrag | 3 ++
3 files changed, 61 insertions(+), 3 deletions(-)
create mode 100755 abs/core/LinHES-system/checkXFSfrag.sh
create mode 100755 abs/core/LinHES-system/xfs_defrag
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 8588f3a..be0de10 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
MVDIR=$startdir/pkg/usr/LH
BINDIR=$startdir/pkg/usr/bin
@@ -32,12 +32,13 @@ binfiles="LinHES-start optimize_mythdb.py
misc_upcoming_recordings.pl
misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh
- be_check.py"
+ be_check.py
+ checkXFSfrag.sh"
source=(LinHES-session
LinHES-profile.sh $binfiles
alsa-base myth_mtc.lr
- diskspace cacheclean.cron
+ diskspace cacheclean.cron xfs_defrag
readme_is_xml readme_light add_storage.readme
system-sudo.rules )
@@ -71,6 +72,7 @@ build() {
install -m755 -D $startdir/src/cacheclean.cron $startdir/pkg/etc/cron.weekly/cacheclean.cron
install -m755 -D $startdir/src/diskspace $startdir/pkg/etc/cron.tenminutes/diskspace
install -m644 -D $startdir/src/myth_mtc.lr $startdir/pkg/etc/logrotate.d/myth_mtc
+ install -m755 -D $startdir/src/xfs_defrag $startdir/pkg/etc/cron.weekly/xfs_defrag
#sudo rules
@@ -121,10 +123,12 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'17f678d37187be0f12d67f64e40429c6'
'bacc813b48bafcc6fe906e5969930501'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
+ '911b0fbc8d9178dac1a193346c9decaf'
'eb879fee9603a05d5420d4ce8ed9e450'
'6782771960c495aeb597893f37d1e5ee'
'84492954db16740f949d795b74383189'
'02c810c2f47b7c4495fdacaf54189473'
+ '474d5c6883fcfffae4f199aceb3b1356'
'1e2ca4dd872a50df6b70528e06df558a'
'59d0602bac7e06f11abba1894acc8bb0'
'da432d68962e109e09beb2b71c8c8571'
diff --git a/abs/core/LinHES-system/checkXFSfrag.sh b/abs/core/LinHES-system/checkXFSfrag.sh
new file mode 100755
index 0000000..99b833c
--- /dev/null
+++ b/abs/core/LinHES-system/checkXFSfrag.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# Bash script by Gene Alexander (http://www.eracc.com/contact)
+# of ERA Computers & Consulting (www.eracc.com, blog.eracc.com, shopping.eracc.com)
+# Written using vim, the BEST plain text file editor in all of Creation.
+#
+# Teach yourself bash scripting: http://tldp.org/LDP/abs/html/index.html
+#
+# Purpose: To check fragmentation on XFS with xfs_db and run xfs_fsr on XFS mount points that
+# are above a specific fragmentation threshold.
+#
+# What is xfs_db? Use 'man xfs_db' to find out.
+# What is xfs_fsr? Use 'man xfs_fsr' to find out.
+#
+# Any busy files, such as open logs on /var/log, will be skipped. To defragment logs one should
+# wrap this script with another script to stop and restart logging. Or, even better, write
+# one's own script just for defragmentation of the logs.
+#
+# Warranty: NONE. Use at your own discretion and be aware that data loss is on your head if
+# you choose to use this script.
+#
+# License: GPL 2.0 http://www.gnu.org/licenses/gpl-2.0.html
+#
+# Suggested Usage: crontab file for root
+# 0 0 * * * /root/bin/chkxfsfrag # Run at midnight
+#
+# Original Release: 2011 December 15 (Merry Christmas!)
+# DO NOT ALTER HEADER FROM THIS LINE UP.
+#
+e='/bin/echo -e' # Use the echo command, not built-in.
+xfsfsr=/usr/sbin/xfs_fsr # Set variable with the path to xfs_fsr.
+xfsdb=/usr/sbin/xfs_db # Set variable with the path to xfs_db.
+pctmax=15 # Set maxiumum frag percent needed for defrag.
+ # This is zero here for testing purposes only
+ # a higher number should be used in production.
+array=`df -T|grep xfs|cut -f 1 --delim=" "` # Array of all XFS file systems.
+for i in ${array[@]};
+do
+ percentage=`$xfsdb -c frag -r ${i}|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}."
+ # Only uncomment one of the following two lines.
+ #$xfsfsr -v ${i} # Uncomment for verbose defrag.
+ $xfsfsr ${i} # Uncomment for quiet defrag.
+ else
+ $e "${i}\t$percent2 is not above fragmentation threshold of $pctmax."
+ fi
+done
+exit 0
diff --git a/abs/core/LinHES-system/xfs_defrag b/abs/core/LinHES-system/xfs_defrag
new file mode 100755
index 0000000..4d35507
--- /dev/null
+++ b/abs/core/LinHES-system/xfs_defrag
@@ -0,0 +1,3 @@
+#!/bin/bash
+#. /etc/profile
+/usr/LH/bin/checkXFSfrag.sh > /var/log/xfs_defrag.log
--
cgit v0.12
From 070df0f6aec8333a0d775994b61411418ebe29dd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 3 Sep 2013 17:07:38 -0500
Subject: libarchive: update to 3.1.2
---
...tree-fix-line-filename-length-calculation.patch | 29 +++
abs/core/libarchive/PKGBUILD | 34 ++--
abs/core/libarchive/libarchive-3.1.2-acl.patch | 219 +++++++++++++++++++++
3 files changed, 271 insertions(+), 11 deletions(-)
create mode 100644 abs/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch
create mode 100644 abs/core/libarchive/libarchive-3.1.2-acl.patch
diff --git a/abs/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch b/abs/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch
new file mode 100644
index 0000000..a255f2c
--- /dev/null
+++ b/abs/core/libarchive/0001-mtree-fix-line-filename-length-calculation.patch
@@ -0,0 +1,29 @@
+From e65bf287f0133426b26611fe3e80b51267987106 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 21 Feb 2013 19:01:06 -0500
+Subject: [PATCH] mtree: fix line filename length calculation. Fixes #301.
+ Signed-off-by: Andres Mejia <amejia004@gmail.com>
+
+---
+ libarchive/archive_write_set_format_mtree.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libarchive/archive_write_set_format_mtree.c b/libarchive/archive_write_set_format_mtree.c
+index 9c0613c..f37f723 100644
+--- a/libarchive/archive_write_set_format_mtree.c
++++ b/libarchive/archive_write_set_format_mtree.c
+@@ -1855,9 +1855,9 @@ mtree_entry_setup_filenames(struct archive_write *a, struct mtree_entry *file,
+ return (ret);
+ }
+
+- /* Make a basename from dirname and slash */
++ /* Make a basename from file->parentdir.s and slash */
+ *slash = '\0';
+- file->parentdir.length = slash - dirname;
++ file->parentdir.length = slash - file->parentdir.s;
+ archive_strcpy(&(file->basename), slash + 1);
+ return (ret);
+ }
+--
+1.8.1.4
+
diff --git a/abs/core/libarchive/PKGBUILD b/abs/core/libarchive/PKGBUILD
index e3f7385..cb043a3 100644
--- a/abs/core/libarchive/PKGBUILD
+++ b/abs/core/libarchive/PKGBUILD
@@ -1,32 +1,44 @@
-# $Id: PKGBUILD 155375 2012-04-02 16:12:53Z dan $
+# $Id$
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=libarchive
-pkgver=3.0.4
-pkgrel=1
+pkgver=3.1.2
+pkgrel=2
pkgdesc="library that can create and read several streaming archive formats"
arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/"
+url="http://libarchive.org/"
license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz")
-md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16')
-sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac')
+depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
+provides=('libarchive.so')
+source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
+ '0001-mtree-fix-line-filename-length-calculation.patch'
+ 'libarchive-3.1.2-acl.patch')
+md5sums=('efad5a503f66329bb9d2f4308b5de98a'
+ 'fda89c145bbcd793a96b06b463ef6a72'
+ 'a5c995661c62429ceff2c23ea322393b')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
+
+ # https://code.google.com/p/libarchive/issues/detail?id=301
+ # upstream commit e65bf287f0133426b26611fe3e80b51267987106
+ patch -Np1 -i "$srcdir/0001-mtree-fix-line-filename-length-calculation.patch"
+
+ # https://code.google.com/p/libarchive/issues/detail?id=329
+ patch -Np1 -i "$srcdir/libarchive-3.1.2-acl.patch"
+
./configure --prefix=/usr --without-xml2
make
}
check() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make check
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
diff --git a/abs/core/libarchive/libarchive-3.1.2-acl.patch b/abs/core/libarchive/libarchive-3.1.2-acl.patch
new file mode 100644
index 0000000..ce563b0
--- /dev/null
+++ b/abs/core/libarchive/libarchive-3.1.2-acl.patch
@@ -0,0 +1,219 @@
+diff -ruN libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c
+--- libarchive-3.1.2/libarchive/archive_read_disk_entry_from_file.c 2013-02-08 01:52:07.000000000 +0100
++++ libarchive-3.1.2.fixed/libarchive/archive_read_disk_entry_from_file.c 2013-08-08 10:47:41.000000000 +0200
+@@ -399,7 +399,7 @@
+ #endif
+
+
+-#if defined(HAVE_POSIX_ACL) && defined(ACL_TYPE_NFS4)
++#ifdef HAVE_POSIX_ACL
+ static int translate_acl(struct archive_read_disk *a,
+ struct archive_entry *entry, acl_t acl, int archive_entry_acl_type);
+
+@@ -419,6 +419,7 @@
+
+ archive_entry_acl_clear(entry);
+
++#ifdef ACL_TYPE_NFS4
+ /* Try NFS4 ACL first. */
+ if (*fd >= 0)
+ acl = acl_get_fd(*fd);
+@@ -447,6 +448,7 @@
+ acl_free(acl);
+ return (ARCHIVE_OK);
+ }
++#endif
+
+ /* Retrieve access ACL from file. */
+ if (*fd >= 0)
+@@ -492,6 +494,7 @@
+ {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE},
+ {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE},
+ {ARCHIVE_ENTRY_ACL_READ, ACL_READ},
++#ifdef ACL_TYPE_NFS4
+ {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA},
+ {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY},
+ {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA},
+@@ -508,8 +511,10 @@
+ {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL},
+ {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER},
+ {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE}
++#endif
+ };
+
++#ifdef ACL_TYPE_NFS4
+ static struct {
+ int archive_inherit;
+ int platform_inherit;
+@@ -519,21 +524,25 @@
+ {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT},
+ {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}
+ };
+-
++#endif
+ static int
+ translate_acl(struct archive_read_disk *a,
+ struct archive_entry *entry, acl_t acl, int default_entry_acl_type)
+ {
+ acl_tag_t acl_tag;
++#ifdef ACL_TYPE_NFS4
+ acl_entry_type_t acl_type;
+ acl_flagset_t acl_flagset;
++ int brand, r;
++#endif
+ acl_entry_t acl_entry;
+ acl_permset_t acl_permset;
+- int brand, i, r, entry_acl_type;
++ int i, entry_acl_type;
+ int s, ae_id, ae_tag, ae_perm;
+ const char *ae_name;
+
+
++#ifdef ACL_TYPE_NFS4
+ // FreeBSD "brands" ACLs as POSIX.1e or NFSv4
+ // Make sure the "brand" on this ACL is consistent
+ // with the default_entry_acl_type bits provided.
+@@ -560,6 +569,7 @@
+ return ARCHIVE_FAILED;
+ break;
+ }
++#endif
+
+
+ s = acl_get_entry(acl, ACL_FIRST_ENTRY, &acl_entry);
+@@ -592,9 +602,11 @@
+ case ACL_OTHER:
+ ae_tag = ARCHIVE_ENTRY_ACL_OTHER;
+ break;
++#ifdef ACL_TYPE_NFS4
+ case ACL_EVERYONE:
+ ae_tag = ARCHIVE_ENTRY_ACL_EVERYONE;
+ break;
++#endif
+ default:
+ /* Skip types that libarchive can't support. */
+ s = acl_get_entry(acl, ACL_NEXT_ENTRY, &acl_entry);
+@@ -605,6 +617,7 @@
+ // XXX acl_get_entry_type_np on FreeBSD returns EINVAL for
+ // non-NFSv4 ACLs
+ entry_acl_type = default_entry_acl_type;
++#ifdef ACL_TYPE_NFS4
+ r = acl_get_entry_type_np(acl_entry, &acl_type);
+ if (r == 0) {
+ switch (acl_type) {
+@@ -634,9 +647,10 @@
+ ae_perm |= acl_inherit_map[i].archive_inherit;
+
+ }
++#endif
+
+ acl_get_permset(acl_entry, &acl_permset);
+- for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) {
++ for (i = 0; i < (int)(sizeof(acl_perm_map) / sizeof(acl_perm_map[0])); ++i) {
+ /*
+ * acl_get_perm() is spelled differently on different
+ * platforms; see above.
+diff -ruN libarchive-3.1.2/libarchive/archive_write_disk_acl.c libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c
+--- libarchive-3.1.2/libarchive/archive_write_disk_acl.c 2013-01-14 02:43:45.000000000 +0100
++++ libarchive-3.1.2.fixed/libarchive/archive_write_disk_acl.c 2013-08-08 10:31:35.000000000 +0200
+@@ -43,7 +43,7 @@
+ #include "archive_acl_private.h"
+ #include "archive_write_disk_private.h"
+
+-#if !defined(HAVE_POSIX_ACL) || !defined(ACL_TYPE_NFS4)
++#ifndef HAVE_POSIX_ACL
+ /* Default empty function body to satisfy mainline code. */
+ int
+ archive_write_disk_set_acls(struct archive *a, int fd, const char *name,
+@@ -79,10 +79,12 @@
+ ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_DEFAULT,
+ ARCHIVE_ENTRY_ACL_TYPE_DEFAULT, "default");
+ return (ret);
++#ifdef ACL_TYPE_NFS4
+ } else if (archive_acl_count(abstract_acl, ARCHIVE_ENTRY_ACL_TYPE_NFS4) > 0) {
+ ret = set_acl(a, fd, name, abstract_acl, ACL_TYPE_NFS4,
+ ARCHIVE_ENTRY_ACL_TYPE_NFS4, "nfs4");
+ return (ret);
++#endif
+ } else
+ return ARCHIVE_OK;
+ }
+@@ -94,6 +96,7 @@
+ {ARCHIVE_ENTRY_ACL_EXECUTE, ACL_EXECUTE},
+ {ARCHIVE_ENTRY_ACL_WRITE, ACL_WRITE},
+ {ARCHIVE_ENTRY_ACL_READ, ACL_READ},
++#ifdef ACL_TYPE_NFS4
+ {ARCHIVE_ENTRY_ACL_READ_DATA, ACL_READ_DATA},
+ {ARCHIVE_ENTRY_ACL_LIST_DIRECTORY, ACL_LIST_DIRECTORY},
+ {ARCHIVE_ENTRY_ACL_WRITE_DATA, ACL_WRITE_DATA},
+@@ -110,8 +113,10 @@
+ {ARCHIVE_ENTRY_ACL_WRITE_ACL, ACL_WRITE_ACL},
+ {ARCHIVE_ENTRY_ACL_WRITE_OWNER, ACL_WRITE_OWNER},
+ {ARCHIVE_ENTRY_ACL_SYNCHRONIZE, ACL_SYNCHRONIZE}
++#endif
+ };
+
++#ifdef ACL_TYPE_NFS4
+ static struct {
+ int archive_inherit;
+ int platform_inherit;
+@@ -121,6 +126,7 @@
+ {ARCHIVE_ENTRY_ACL_ENTRY_NO_PROPAGATE_INHERIT, ACL_ENTRY_NO_PROPAGATE_INHERIT},
+ {ARCHIVE_ENTRY_ACL_ENTRY_INHERIT_ONLY, ACL_ENTRY_INHERIT_ONLY}
+ };
++#endif
+
+ static int
+ set_acl(struct archive *a, int fd, const char *name,
+@@ -130,7 +136,9 @@
+ acl_t acl;
+ acl_entry_t acl_entry;
+ acl_permset_t acl_permset;
++#ifdef ACL_TYPE_NFS4
+ acl_flagset_t acl_flagset;
++#endif
+ int ret;
+ int ae_type, ae_permset, ae_tag, ae_id;
+ uid_t ae_uid;
+@@ -171,14 +179,17 @@
+ case ARCHIVE_ENTRY_ACL_OTHER:
+ acl_set_tag_type(acl_entry, ACL_OTHER);
+ break;
++#ifdef ACL_TYPE_NFS4
+ case ARCHIVE_ENTRY_ACL_EVERYONE:
+ acl_set_tag_type(acl_entry, ACL_EVERYONE);
+ break;
++#endif
+ default:
+ /* XXX */
+ break;
+ }
+
++#ifdef ACL_TYPE_NFS4
+ switch (ae_type) {
+ case ARCHIVE_ENTRY_ACL_TYPE_ALLOW:
+ acl_set_entry_type_np(acl_entry, ACL_ENTRY_TYPE_ALLOW);
+@@ -200,6 +211,7 @@
+ // XXX error handling here.
+ break;
+ }
++#endif
+
+ acl_get_permset(acl_entry, &acl_permset);
+ acl_clear_perms(acl_permset);
+@@ -210,6 +222,7 @@
+ acl_perm_map[i].platform_perm);
+ }
+
++#ifdef ACL_TYPE_NFS4
+ acl_get_flagset_np(acl_entry, &acl_flagset);
+ acl_clear_flags_np(acl_flagset);
+ for (i = 0; i < (int)(sizeof(acl_inherit_map) / sizeof(acl_inherit_map[0])); ++i) {
+@@ -217,6 +230,7 @@
+ acl_add_flag_np(acl_flagset,
+ acl_inherit_map[i].platform_inherit);
+ }
++#endif
+ }
+
+ /* Try restoring the ACL through 'fd' if we can. */
--
cgit v0.12
From 8b4a9048580d17aaa7b085c3efd9295a5aa32ebd Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 4 Sep 2013 15:12:12 -0500
Subject: bash: update to 4.2.045
---
abs/core/bash/PKGBUILD | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/abs/core/bash/PKGBUILD b/abs/core/bash/PKGBUILD
index 02a6283..09a93e9 100644
--- a/abs/core/bash/PKGBUILD
+++ b/abs/core/bash/PKGBUILD
@@ -4,9 +4,9 @@
pkgname=bash
_basever=4.2
-_patchlevel=037 #prepare for some patches
+_patchlevel=045 #prepare for some patches
pkgver=$_basever.$_patchlevel
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')
@@ -152,4 +152,20 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
'9c3142956064d175a880bcb186e51ef9'
'a1a87649853f20fe99572ddc02b0c67f'
'c10692f447d4966c879f8fb8d7c8ebc9'
- '1bf5e34ad46566bc2d0eb7560ff8968e')
+ '1bf5e34ad46566bc2d0eb7560ff8968e'
+ '9ef3c308cde413e95866c1266cfb4e98'
+ 'afbb94e04dab29bd4ce92199892f2b5e'
+ 'cd48f57a404498d4e5c73a3501c4b1a5'
+ 'd2693a2728b5a0448947d23ce47cb4b3'
+ '00a2371b6c05acbfce6bc850c6d982f8'
+ '72744ac844a1dfd15dddbba7f73ec45c'
+ '7bc4942a66ca4024ee964db7ede07896'
+ '7e97f02d9dd1436eed278f2732542ecf'
+ '1cf7701017ebfc8e129de92c8f8b798c'
+ '4ef8b5af440bf7b939b7955ce68b4dc7'
+ '9e61168fca692d8d1a733c389a63712e'
+ '665861582049ba270cc726b7a6e0324d'
+ 'b4b11d64b45ea9ec50dcc74c6c3861f6'
+ '233031ccf9cbb1265be30753e0fa41f4'
+ '1661bcc83c4715f54368877452ff2247'
+ '302c5516e469171b5187118024fca2a7')
--
cgit v0.12
From bed8b45575c0365415c452dc1a63108fcf9f3d82 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 4 Sep 2013 16:41:18 -0500
Subject: fakechroot: initial inclusion. dep of pacman 4.1.2
---
abs/extra/fakechroot/PKGBUILD | 43 +++++++++++++++++++++++++++++++++
abs/extra/fakechroot/fakechroot.install | 11 +++++++++
2 files changed, 54 insertions(+)
create mode 100644 abs/extra/fakechroot/PKGBUILD
create mode 100644 abs/extra/fakechroot/fakechroot.install
diff --git a/abs/extra/fakechroot/PKGBUILD b/abs/extra/fakechroot/PKGBUILD
new file mode 100644
index 0000000..4cdd8c9
--- /dev/null
+++ b/abs/extra/fakechroot/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer : Allan McRae <allan@archlinux.org>
+# Contributor: Aaron Griffin <aaron@archlinux.org>
+
+pkgname=fakechroot
+pkgver=2.16
+pkgrel=3
+pkgdesc="Gives a fake chroot environment"
+arch=('i686' 'x86_64')
+url="https://github.com/fakechroot/fakechroot/wiki"
+license=('LGPL')
+options=('!libtool')
+install=fakechroot.install
+source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz)
+md5sums=('3ea5efb76664e787450e0cfcefc1b807')
+
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # https://github.com/fakechroot/fakechroot/issues/10
+ sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sbindir=/usr/bin \
+ --libdir=/usr/lib/libfakeroot --sysconfdir=/etc
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ install -dm755 ${pkgdir}/etc/ld.so.conf.d/
+ echo '/usr/lib/libfakeroot/fakechroot/' > ${pkgdir}/etc/ld.so.conf.d/fakechroot.conf
+}
diff --git a/abs/extra/fakechroot/fakechroot.install b/abs/extra/fakechroot/fakechroot.install
new file mode 100644
index 0000000..61c5b73
--- /dev/null
+++ b/abs/extra/fakechroot/fakechroot.install
@@ -0,0 +1,11 @@
+post_install() {
+ sbin/ldconfig -r .
+}
+
+post_upgrade() {
+ sbin/ldconfig -r .
+}
+
+post_remove() {
+ sbin/ldconfig -r .
+}
--
cgit v0.12
From 98d16659fcf26772590c559d58ab7112148c292d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 5 Sep 2013 14:19:57 -0500
Subject: pacman: update to 4.1.2
---
...flict-for-replacing-owned-empty-directory.patch | 152 ---------------------
.../0002-Check-empty-subdirectory-ownership.patch | 61 ---------
...pgrade-scriptlet-gets-old-package-version.patch | 29 ----
abs/core/pacman/PKGBUILD | 59 ++++----
abs/core/pacman/__changelog | 2 +
abs/core/pacman/makepkg.conf | 45 ++++--
abs/core/pacman/pacman.conf.x86_64 | 17 +--
abs/core/pacman/pacman.install | 2 +
8 files changed, 69 insertions(+), 298 deletions(-)
delete mode 100644 abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
delete mode 100644 abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch
delete mode 100644 abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
create mode 100644 abs/core/pacman/__changelog
diff --git a/abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch b/abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
deleted file mode 100644
index 85622aa..0000000
--- a/abs/core/pacman/0001-Add-conflict-for-replacing-owned-empty-directory.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From 717fdb8ee0fd23cf72fc7d2832317f513caefa2c Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sun, 8 Jul 2012 21:36:36 +1000
-Subject: [PATCH 1/4] Add conflict for replacing owned empty directory
-
-When two packages own an empty directory, pacman finds no conflict when
-one of those packages wants to replace the directory with a file or a
-symlink. When it comes to actually extracting the new file/symlink,
-pacman sees the directory is still there (we do not remove empty
-directories if they are owned by a package) and refuses to extract.
-
-Detect this potential conflict early and bail. Note that it is a
-_potential_ conflict and not a guaranteed one as the other package owning
-the directory could be updated or removed first which would remove
-the conflict. However, pacman currently can not sort package installation
-order to ensure this, so this conflict requires manual upgrade ordering.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- lib/libalpm/conflict.c | 32 ++++++++++++++++++++++++++------
- test/pacman/tests/fileconflict009.py | 20 ++++++++++++++++++++
- test/pacman/tests/fileconflict010.py | 20 ++++++++++++++++++++
- 3 files changed, 66 insertions(+), 6 deletions(-)
- create mode 100644 test/pacman/tests/fileconflict009.py
- create mode 100644 test/pacman/tests/fileconflict010.py
-
-diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
-index 32f6f30..efa1a87 100644
---- a/lib/libalpm/conflict.c
-+++ b/lib/libalpm/conflict.c
-@@ -328,15 +328,35 @@ const alpm_file_t *_alpm_filelist_contains(alpm_filelist_t *filelist,
- return NULL;
- }
-
--static int dir_belongsto_pkg(const char *root, const char *dirpath,
-+static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
- alpm_pkg_t *pkg)
- {
-+ alpm_list_t *i;
- struct stat sbuf;
- char path[PATH_MAX];
- char abspath[PATH_MAX];
-- struct dirent *ent = NULL;
- DIR *dir;
-+ struct dirent *ent = NULL;
-+ const char *root = handle->root;
-+
-+ /* TODO: this is an overly strict check but currently pacman will not
-+ * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
-+ * is not simple as even if the directory is being unowned by a conflicting
-+ * package, pacman does not sort this to ensure all required directory
-+ * "removals" happen before installation of file/symlink */
-+
-+ /* check that no other _installed_ package owns the directory */
-+ for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
-+ if(pkg == i->data) {
-+ continue;
-+ }
-+
-+ if(_alpm_filelist_contains(alpm_pkg_get_files(i->data), dirpath)) {
-+ return 0;
-+ }
-+ }
-
-+ /* check all files in directory are owned by the package */
- snprintf(abspath, PATH_MAX, "%s%s", root, dirpath);
- dir = opendir(abspath);
- if(dir == NULL) {
-@@ -349,13 +369,13 @@ static int dir_belongsto_pkg(const char *root, const char *dirpath,
- if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
- continue;
- }
-- snprintf(path, PATH_MAX, "%s/%s", dirpath, name);
-+ snprintf(path, PATH_MAX, "%s%s", dirpath, name);
- snprintf(abspath, PATH_MAX, "%s%s", root, path);
- if(stat(abspath, &sbuf) != 0) {
- continue;
- }
- if(S_ISDIR(sbuf.st_mode)) {
-- if(dir_belongsto_pkg(root, path, pkg)) {
-+ if(dir_belongsto_pkg(handle, path, pkg)) {
- continue;
- } else {
- closedir(dir);
-@@ -529,9 +549,9 @@ alpm_list_t *_alpm_db_find_fileconflicts(alpm_handle_t *handle,
- sprintf(dir, "%s/", filestr);
- if(_alpm_filelist_contains(alpm_pkg_get_files(dbpkg), dir)) {
- _alpm_log(handle, ALPM_LOG_DEBUG,
-- "check if all files in %s belongs to %s\n",
-+ "check if all files in %s belong to %s\n",
- dir, dbpkg->name);
-- resolved_conflict = dir_belongsto_pkg(handle->root, filestr, dbpkg);
-+ resolved_conflict = dir_belongsto_pkg(handle, dir, dbpkg);
- }
- free(dir);
- }
-diff --git a/test/pacman/tests/fileconflict009.py b/test/pacman/tests/fileconflict009.py
-new file mode 100644
-index 0000000..904af4a
---- /dev/null
-+++ b/test/pacman/tests/fileconflict009.py
-@@ -0,0 +1,20 @@
-+self.description = "dir->symlink change during package upgrade (directory conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+lp2 = pmpkg("pkg2")
-+lp2.files = ["dir/"]
-+self.addpkg2db("local", lp2)
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir -> /usr/dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("PKG_VERSION=pkg2|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
-diff --git a/test/pacman/tests/fileconflict010.py b/test/pacman/tests/fileconflict010.py
-new file mode 100644
-index 0000000..0a3ce83
---- /dev/null
-+++ b/test/pacman/tests/fileconflict010.py
-@@ -0,0 +1,20 @@
-+self.description = "dir->file change during package upgrade (directory conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+lp2 = pmpkg("pkg2")
-+lp2.files = ["dir/"]
-+self.addpkg2db("local", lp2)
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("PKG_VERSION=pkg2|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
---
-1.7.11.1
-
diff --git a/abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch b/abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch
deleted file mode 100644
index 6cf496d..0000000
--- a/abs/core/pacman/0002-Check-empty-subdirectory-ownership.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 44e9fdd0e848382337edb97d41e7317638a67bac Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sun, 8 Jul 2012 23:58:37 +1000
-Subject: [PATCH 2/4] Check empty subdirectory ownership
-
-When checking if a package owns a directory, it is important to check
-not only that all the files in the directory are part of the package,
-but also if the directory is part of a package. This catches empty
-subdirectories during conflict checking for directory to file/symlink
-replacements.
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- lib/libalpm/conflict.c | 5 +++++
- test/pacman/tests/fileconflict012.py | 17 +++++++++++++++++
- 2 files changed, 22 insertions(+)
- create mode 100644 test/pacman/tests/fileconflict012.py
-
-diff --git a/lib/libalpm/conflict.c b/lib/libalpm/conflict.c
-index efa1a87..d6e5d8c 100644
---- a/lib/libalpm/conflict.c
-+++ b/lib/libalpm/conflict.c
-@@ -339,6 +339,11 @@ static int dir_belongsto_pkg(alpm_handle_t *handle, const char *dirpath,
- struct dirent *ent = NULL;
- const char *root = handle->root;
-
-+ /* check directory is actually in package - used for subdirectory checks */
-+ if(!_alpm_filelist_contains(alpm_pkg_get_files(pkg), dirpath)) {
-+ return 0;
-+ }
-+
- /* TODO: this is an overly strict check but currently pacman will not
- * overwrite a directory with a file (case 10/11 in add.c). Adjusting that
- * is not simple as even if the directory is being unowned by a conflicting
-diff --git a/test/pacman/tests/fileconflict012.py b/test/pacman/tests/fileconflict012.py
-new file mode 100644
-index 0000000..421b739
---- /dev/null
-+++ b/test/pacman/tests/fileconflict012.py
-@@ -0,0 +1,17 @@
-+self.description = "dir->file change during package upgrade (filesystem file conflict)"
-+
-+lp1 = pmpkg("pkg1")
-+lp1.files = ["dir/"]
-+self.addpkg2db("local", lp1)
-+
-+self.filesystem = ["dir/file"]
-+
-+p = pmpkg("pkg1", "1.0-2")
-+p.files = ["dir"]
-+self.addpkg2db("sync", p)
-+
-+self.args = "-S pkg1"
-+
-+self.addrule("PACMAN_RETCODE=1")
-+self.addrule("PKG_VERSION=pkg1|1.0-1")
-+self.addrule("DIR_EXIST=dir/")
---
-1.7.11.1
-
diff --git a/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch b/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
deleted file mode 100644
index ae3a57e..0000000
--- a/abs/core/pacman/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1bf05e706b5edac92e9c913a69ca8686c6440f8b Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan@archlinux.org>
-Date: Fri, 04 May 2012 16:41:40 +0000
-Subject: Ensure pre_upgrade scriptlet gets old package version
-
-This was accidentally broken in the refactor done in commit 73139ccb.
-
-Fixes FS#29371.
-
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
-diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
-index 6c2f0cb..c49d99b 100644
---- a/lib/libalpm/add.c
-+++ b/lib/libalpm/add.c
-@@ -488,8 +488,9 @@ static int commit_single_pkg(alpm_handle_t *handle, alpm_pkg_t *newpkg,
- if(alpm_pkg_has_scriptlet(newpkg) &&
- !(trans->flags & ALPM_TRANS_FLAG_NOSCRIPTLET)) {
- const char *scriptlet_name = is_upgrade ? "pre_upgrade" : "pre_install";
-- _alpm_runscriptlet(handle, pkgfile,
-- scriptlet_name, newpkg->version, NULL, 1);
-+
-+ _alpm_runscriptlet(handle, pkgfile, scriptlet_name,
-+ newpkg->version, oldpkg ? oldpkg->version : NULL, 1);
- }
-
- /* we override any pre-set reason if we have alldeps or allexplicit set */
---
-cgit v0.9.0.2-13-g2bd3
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index 6ee826d..bc88ebb 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -1,49 +1,39 @@
# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 171528 2012-11-18 11:37:56Z allan $
+# $Id$
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=pacman
-pkgver=4.0.3
-pkgrel=5
+pkgver=4.1.2
+pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
license=('GPL')
-groups=('base')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
+groups=('base' 'base-devel')
+depends=('bash>=4.2.042-2' 'glibc>=2.16' 'libarchive>=3.1.2' 'curl>=7.19.4'
'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-makedepends=('asciidoc')
+#checkdepends=('python2' 'fakechroot')
optdepends=('fakeroot: for makepkg usage as normal user')
+provides=('pacman-contrib')
+conflicts=('pacman-contrib')
+replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
- 0001-Add-conflict-for-replacing-owned-empty-directory.patch
- 0002-Check-empty-subdirectory-ownership.patch
- 0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
- pacman.conf
pacman.conf.x86_64
makepkg.conf)
-md5sums=('387965c7125e60e5f0b9ff3b427fe0f9'
- '1a70392526c8768470da678b31905a6e'
- '1a9b79788640907a2b34e8671cacc94a'
- 'a9ddd43891bed364e1e97d27b2887bf1'
- '2e8cbf55a94b1954b167c5dee6b62317'
- '99734ea46795f466d41c503e9e23b6d4'
- '556d49489e82b5750cf026d3b18c8f4f'
- '589cd34eb9d5b678455e8289394f523e')
build() {
cd $srcdir/$pkgname-$pkgver
- patch -p1 -i $srcdir/0001-Add-conflict-for-replacing-owned-empty-directory.patch
- patch -p1 -i $srcdir/0002-Check-empty-subdirectory-ownership.patch
- patch -p1 -i $srcdir/0003-Ensure-pre_upgrade-scriptlet-gets-old-package-version.patch
-
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
+ --localstatedir=/var --enable-doc \
+ --with-scriptlet-shell=/usr/bin/bash \
+ --with-ldconfig=/usr/bin/ldconfig
make
+ make -C contrib
}
check() {
@@ -53,18 +43,19 @@ check() {
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
+ make DESTDIR=$pkgdir -C contrib install
# install Arch specific stuff
- mkdir -p $pkgdir/etc
+ install -dm755 $pkgdir/etc
+ install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
+
case "$CARCH" in
- i686)
- install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
+ i686)
mycarch="i686"
mychost="i686-pc-linux-gnu"
myflags="-march=i686"
;;
x86_64)
- install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
myflags="-march=x86-64"
@@ -76,12 +67,18 @@ package() {
-e "s|@CARCH[@]|$mycarch|g" \
-e "s|@CHOST[@]|$mychost|g" \
-e "s|@CARCHFLAGS[@]|$myflags|g"
+
+ # put bash_completion in the right location
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/pacman \
+ ${pkgdir}/usr/share/bash-completion/completions
+ rmdir ${pkgdir}/etc/bash_completion.d
- # install completion files
- install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
for f in makepkg pacman-key; do
ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
done
-
- install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
+md5sums=('063c8b0ff6bdf903dc235445525627cd'
+ '7e46c2654b016fc1de45499a537cb990'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '5f360e003e95f1a5cbd6e60d937dfd25')
diff --git a/abs/core/pacman/__changelog b/abs/core/pacman/__changelog
new file mode 100644
index 0000000..d53c316
--- /dev/null
+++ b/abs/core/pacman/__changelog
@@ -0,0 +1,2 @@
+- PKGBUILD: change dep glibc to LH 2.16
+- pacman.install: remove SyncFirst option from /etc/pacman.conf
diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf
index 25ca015..dc58009 100644
--- a/abs/core/pacman/makepkg.conf
+++ b/abs/core/pacman/makepkg.conf
@@ -11,7 +11,7 @@
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'rsync::/usr/bin/rsync -z %u %o'
+ 'rsync::/usr/bin/rsync --no-motd -z %u %o'
'scp::/usr/bin/scp -C %u %o')
# Other common tools:
@@ -29,11 +29,15 @@ CHOST="@CHOST@"
#-- Compiler and Linker Flags
# -march (or -mcpu) builds exclusively for an architecture
# -mtune optimizes for an architecture, but builds for whole processor family
-CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
-CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+CPPFLAGS="-D_FORTIFY_SOURCE=2"
+CFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
+CXXFLAGS="@CARCHFLAGS@ -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4"
LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
+#-- Debugging flags
+DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
#########################################################################
# BUILD ENVIRONMENT
@@ -63,18 +67,20 @@ BUILDENV=(fakeroot !distcc color !ccache check !sign)
# These are default values for the options=() settings
#########################################################################
#
-# Default: OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+# Default: OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
# A negated option will do the opposite of the comments below.
#
-#-- strip: Strip symbols from binaries/libraries
-#-- docs: Save doc directories specified by DOC_DIRS
-#-- libtool: Leave libtool (.la) files in packages
-#-- emptydirs: Leave empty directories in packages
-#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
-#-- purge: Remove files specified by PURGE_TARGETS
-#-- upx: Compress binary executable files using UPX
-#
-OPTIONS=(strip docs libtool emptydirs zipman purge !upx)
+#-- strip: Strip symbols from binaries/libraries
+#-- docs: Save doc directories specified by DOC_DIRS
+#-- libtool: Leave libtool (.la) files in packages
+#-- staticlibs: Leave static library (.a) files in packages
+#-- emptydirs: Leave empty directories in packages
+#-- zipman: Compress manual (man and info) pages in MAN_DIRS with gzip
+#-- purge: Remove files specified by PURGE_TARGETS
+#-- upx: Compress binary executable files using UPX
+#-- debug: Add debugging flags as specified in DEBUG_* variables
+#
+OPTIONS=(strip docs libtool staticlibs emptydirs zipman purge !upx !debug)
#-- File integrity checks to use. Valid: md5, sha1, sha256, sha384, sha512
INTEGRITY_CHECK=(md5)
@@ -103,12 +109,25 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#SRCDEST=/home/sources
#-- Source packages: specify a fixed directory where all src packages will be placed
#SRCPKGDEST=/home/srcpackages
+#-- Log files: specify a fixed directory where all log files will be placed
+#LOGDEST=/home/makepkglogs
#-- Packager: name/email of the person or organization building packages
#PACKAGER="John Doe <john@doe.com>"
#-- Specify a key to use for package signing
#GPGKEY=""
#########################################################################
+# COMPRESSION DEFAULTS
+#########################################################################
+#
+COMPRESSGZ=(gzip -c -f -n)
+COMPRESSBZ2=(bzip2 -c -f)
+COMPRESSXZ=(xz -c -z -)
+COMPRESSLRZ=(lrzip -q)
+COMPRESSLZO=(lzop -q)
+COMPRESSZ=(compress -c -f)
+
+#########################################################################
# EXTENSION DEFAULTS
#########################################################################
#
diff --git a/abs/core/pacman/pacman.conf.x86_64 b/abs/core/pacman/pacman.conf.x86_64
index 42321bb..f43fe39 100644
--- a/abs/core/pacman/pacman.conf.x86_64
+++ b/abs/core/pacman/pacman.conf.x86_64
@@ -15,11 +15,10 @@
#LogFile = /var/log/pacman.log
#GPGDir = /etc/pacman.d/gnupg/
HoldPkg = pacman glibc
-# If upgrades are available for these packages they will be asked for first
-SyncFirst = pacman
#XferCommand = /usr/bin/curl -C - -f %u > %o
#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
+#UseDelta = 0.7
Architecture = auto
# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
@@ -31,14 +30,16 @@ Architecture = auto
# Misc options
#UseSyslog
-#UseDelta
+#Color
#TotalDownload
CheckSpace
#VerbosePkgLists
# By default, pacman accepts packages signed by keys that its local keyring
# trusts (see pacman-key and its man page), as well as unsigned packages.
-#SigLevel = Optional TrustedOnly
+SigLevel = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
# NOTE: You must run `pacman-key --init` before first using pacman; the local
# keyring can then be populated with the keys of all official Arch Linux
@@ -68,34 +69,27 @@ CheckSpace
# after the header, and they will be used before the default mirrors.
#[testing]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[core]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
[extra]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
#[community-testing]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
[community]
-SigLevel = PackageRequired
Include = /etc/pacman.d/mirrorlist
# If you want to run 32 bit applications on your x86_64 system,
# enable the multilib repositories as required here.
#[multilib-testing]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
#[multilib]
-#SigLevel = PackageRequired
#Include = /etc/pacman.d/mirrorlist
# An example of a custom package repository. See the pacman manpage for
@@ -103,4 +97,3 @@ Include = /etc/pacman.d/mirrorlist
#[custom]
#SigLevel = Optional TrustAll
#Server = file:///home/custompkgs
-
diff --git a/abs/core/pacman/pacman.install b/abs/core/pacman/pacman.install
index 487819a..42b2808 100644
--- a/abs/core/pacman/pacman.install
+++ b/abs/core/pacman/pacman.install
@@ -12,6 +12,8 @@ post_upgrade() {
if [ ! -f "etc/pacman.d/gnupg/pubring.gpg" ] || [ "$(vercmp $2 4.0.3-2)" -lt 0 ]; then
_check_pubring
fi
+ sed -i '/^# If upgrades are available/d' /etc/pacman.conf
+ sed -i '/^SyncFirst/d' /etc/pacman.conf
}
post_install() {
--
cgit v0.12
From ba306a92b3dfc7436d2a08b564d2c6cb0426c2b8 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 5 Sep 2013 14:51:00 -0500
Subject: linux-firmware: update to 20130905. closes #812
---
abs/core/linux-firmware/PKGBUILD | 53 ++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 26 deletions(-)
diff --git a/abs/core/linux-firmware/PKGBUILD b/abs/core/linux-firmware/PKGBUILD
index 6148c95..db3610c 100644
--- a/abs/core/linux-firmware/PKGBUILD
+++ b/abs/core/linux-firmware/PKGBUILD
@@ -1,20 +1,14 @@
-# $Id: PKGBUILD 162535 2012-06-27 08:19:33Z thomas $
+# $Id$
# Maintainer: Thomas Bächler <thomas@archlinux.org>
-#
-# Create a new tarball from the linux-firmware git tree with the following command:
-# git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
-# git archive --format=tar --prefix linux-firmware-$(date +%Y%m%d)/ master | xz -9 > linux-firmware-$(date +%Y%m%d).tar.xz
-#
-
pkgname=linux-firmware
-pkgver=20120625
+pkgver=20130905
pkgrel=1
pkgdesc="Firmware files for Linux"
+makedepends=('git')
arch=('any')
-url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary"
+url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary"
license=('GPL2' 'GPL3' 'custom')
-provides=('kernel26-firmware=2.6.34.99')
conflicts=('linux-firmware-git'
'kernel26-firmware'
'ar9170-fw'
@@ -26,29 +20,36 @@ conflicts=('linux-firmware-git'
'iwlwifi-6000-ucode'
'rt2870usb-fw'
'rt2x00-rt61-fw'
- 'rt2x00-rt71w-fw')
+ 'rt2x00-rt71w-fw'
+ 'amd-ucode')
replaces=('kernel26-firmware'
- 'ar9170-fw'
- 'iwlwifi-1000-ucode'
- 'iwlwifi-3945-ucode'
- 'iwlwifi-4965-ucode'
- 'iwlwifi-5000-ucode'
- 'iwlwifi-5150-ucode'
- 'iwlwifi-6000-ucode'
- 'rt2870usb-fw'
- 'rt2x00-rt61-fw'
- 'rt2x00-rt71w-fw')
+ 'ar9170-fw'
+ 'iwlwifi-1000-ucode'
+ 'iwlwifi-3945-ucode'
+ 'iwlwifi-4965-ucode'
+ 'iwlwifi-5000-ucode'
+ 'iwlwifi-5150-ucode'
+ 'iwlwifi-6000-ucode'
+ 'rt2870usb-fw'
+ 'rt2x00-rt61-fw'
+ 'rt2x00-rt71w-fw'
+ 'amd-ucode')
options=(!strip)
-source=(ftp://ftp.archlinux.org/other/linux-firmware/$pkgname-$pkgver.tar.xz)
-sha256sums=('2061a054155380721b7ccca6ff71b3f6832cc5a2992d8b1b9536f8365786d65b')
+source=('git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git#branch=master')
+md5sums=('SKIP')
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+pkgver() {
+ date +%Y%m%d
+}
+package() {
+ cd "${srcdir}/${pkgname}"
+ # remove not needed Makefile #35236
+ rm Makefile
install -d -m755 "${pkgdir}/usr/lib/firmware"
cp -a * "${pkgdir}/usr/lib/firmware/"
install -d -m755 "${pkgdir}/usr/share/licenses/linux-firmware/"
- rm -f "${pkgdir}/usr/lib/firmware/"{configure,GPL*}
+ rm -f "${pkgdir}/usr/lib/firmware/"{README*,configure,GPL*}
mv "${pkgdir}/usr/lib/firmware"/{LICEN*,WHENCE} "${pkgdir}/usr/share/licenses/linux-firmware/"
}
# vim:set ts=2 sw=2 et:
--
cgit v0.12
From e8455dae9497f9e7fbbe381807b9d0d0cab78749 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 5 Sep 2013 15:37:02 -0500
Subject: google-chrome: update to 29.0.1547.65
---
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 f7926d3..a6ea6b7 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=29.0.1547.57
+pkgver=29.0.1547.65
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -24,9 +24,9 @@ _arch=i386
[ "$CARCH" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
"$url/intl/en/eula_text.html")
-md5sums=('6d32b3c70acf721ded0b8e3461db08ac'
+md5sums=('40109e81b3fa3e65e6d0b64c4631c75d'
'6d57da7476a4b1b7a81821d9c036425c')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='335c20abfffdd1a195104a0321acb6f8'
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='69b73f30c933972b04bcb5ce2da5ecef'
#PKGEXT='.pkg.tar'
--
cgit v0.12
From ca895f031111dca13b1381ba20049b0b8a84b097 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 5 Sep 2013 16:17:58 -0500
Subject: pacman: revert down to 4.1.0 due to execv error
---
abs/core/pacman/PKGBUILD | 41 +++++++++++++++++------------------------
abs/core/pacman/makepkg.conf | 11 ++++-------
2 files changed, 21 insertions(+), 31 deletions(-)
diff --git a/abs/core/pacman/PKGBUILD b/abs/core/pacman/PKGBUILD
index bc88ebb..63ee374 100644
--- a/abs/core/pacman/PKGBUILD
+++ b/abs/core/pacman/PKGBUILD
@@ -4,34 +4,34 @@
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=pacman
-pkgver=4.1.2
+pkgver=4.1.0
pkgrel=1
pkgdesc="A library-based package manager with dependency support"
arch=('i686' 'x86_64')
url="http://www.archlinux.org/pacman/"
license=('GPL')
groups=('base' 'base-devel')
-depends=('bash>=4.2.042-2' 'glibc>=2.16' 'libarchive>=3.1.2' 'curl>=7.19.4'
+depends=('bash' 'glibc>=2.15' 'libarchive>=3.1.2' 'curl>=7.19.4'
'gpgme' 'pacman-mirrorlist' 'archlinux-keyring')
-#checkdepends=('python2' 'fakechroot')
+makedepends=('asciidoc')
+checkdepends=('fakechroot')
optdepends=('fakeroot: for makepkg usage as normal user')
-provides=('pacman-contrib')
-conflicts=('pacman-contrib')
-replaces=('pacman-contrib')
backup=(etc/pacman.conf etc/makepkg.conf)
install=pacman.install
options=(!libtool)
source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
pacman.conf.x86_64
makepkg.conf)
+md5sums=('a0f2b3148bee4784f21cf373cf59a0bc'
+ '4959b8d00056398195f4e549e7bdd346'
+ 'de74a13618347f08ae4a9637f74471c4'
+ '2ea6f0a5badef735ec7d30a372f5e9c6')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc \
- --with-scriptlet-shell=/usr/bin/bash \
- --with-ldconfig=/usr/bin/ldconfig
+ --localstatedir=/var --enable-doc
make
make -C contrib
}
@@ -43,19 +43,18 @@ check() {
package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
- make DESTDIR=$pkgdir -C contrib install
# install Arch specific stuff
- install -dm755 $pkgdir/etc
- install -m644 $srcdir/pacman.conf.$CARCH $pkgdir/etc/pacman.conf
-
+ mkdir -p $pkgdir/etc
case "$CARCH" in
- i686)
+ i686)
+ install -m644 $srcdir/pacman.conf.i686 $pkgdir/etc/pacman.conf
mycarch="i686"
mychost="i686-pc-linux-gnu"
myflags="-march=i686"
;;
x86_64)
+ install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
mycarch="x86_64"
mychost="x86_64-unknown-linux-gnu"
myflags="-march=x86-64"
@@ -67,18 +66,12 @@ package() {
-e "s|@CARCH[@]|$mycarch|g" \
-e "s|@CHOST[@]|$mychost|g" \
-e "s|@CARCHFLAGS[@]|$myflags|g"
-
- # put bash_completion in the right location
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/pacman \
- ${pkgdir}/usr/share/bash-completion/completions
- rmdir ${pkgdir}/etc/bash_completion.d
+ # install completion files
+ install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
for f in makepkg pacman-key; do
ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
done
+
+ install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
}
-md5sums=('063c8b0ff6bdf903dc235445525627cd'
- '7e46c2654b016fc1de45499a537cb990'
- 'de74a13618347f08ae4a9637f74471c4'
- '5f360e003e95f1a5cbd6e60d937dfd25')
diff --git a/abs/core/pacman/makepkg.conf b/abs/core/pacman/makepkg.conf
index dc58009..dfec258 100644
--- a/abs/core/pacman/makepkg.conf
+++ b/abs/core/pacman/makepkg.conf
@@ -11,7 +11,7 @@
DLAGENTS=('ftp::/usr/bin/curl -fC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u'
'http::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'
- 'rsync::/usr/bin/rsync --no-motd -z %u %o'
+ 'rsync::/usr/bin/rsync -z %u %o'
'scp::/usr/bin/scp -C %u %o')
# Other common tools:
@@ -36,8 +36,8 @@ LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro"
#-- Make Flags: change this for DistCC/SMP systems
#MAKEFLAGS="-j2"
#-- Debugging flags
-DEBUG_CFLAGS="-g -fvar-tracking-assignments"
-DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
+#DEBUG_CFLAGS="-g -fvar-tracking-assignments"
+#DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
#########################################################################
# BUILD ENVIRONMENT
@@ -109,8 +109,6 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#SRCDEST=/home/sources
#-- Source packages: specify a fixed directory where all src packages will be placed
#SRCPKGDEST=/home/srcpackages
-#-- Log files: specify a fixed directory where all log files will be placed
-#LOGDEST=/home/makepkglogs
#-- Packager: name/email of the person or organization building packages
#PACKAGER="John Doe <john@doe.com>"
#-- Specify a key to use for package signing
@@ -123,10 +121,9 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
COMPRESSGZ=(gzip -c -f -n)
COMPRESSBZ2=(bzip2 -c -f)
COMPRESSXZ=(xz -c -z -)
-COMPRESSLRZ=(lrzip -q)
-COMPRESSLZO=(lzop -q)
COMPRESSZ=(compress -c -f)
+
#########################################################################
# EXTENSION DEFAULTS
#########################################################################
--
cgit v0.12
From dbacecb575454346bb3d28823289adb0d5606ca1 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 5 Sep 2013 17:04:30 -0500
Subject: ttf-google-fonts-git: initial inclusion. opt dep of google-chrome
---
abs/extra/ttf-google-fonts-git/PKGBUILD | 72 +++++++++++++++++++++++++++++
abs/extra/ttf-google-fonts-git/font.install | 15 ++++++
2 files changed, 87 insertions(+)
create mode 100644 abs/extra/ttf-google-fonts-git/PKGBUILD
create mode 100644 abs/extra/ttf-google-fonts-git/font.install
diff --git a/abs/extra/ttf-google-fonts-git/PKGBUILD b/abs/extra/ttf-google-fonts-git/PKGBUILD
new file mode 100644
index 0000000..a4e60a2
--- /dev/null
+++ b/abs/extra/ttf-google-fonts-git/PKGBUILD
@@ -0,0 +1,72 @@
+# Maintainer: Sebastian Stammler <stammler.s@gmail.com>
+#
+# Now pacman 4.1 ready!
+# For improvements/fixes to this package, please send me a
+# pull request on github: https://github.com/sebastianst/aur-packages
+#
+# Contributor: Sarkasper <echo a2FzcGVyLm1lbnRlbkBnbXguY29tCg== | base64 -d>
+# Contributor: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Michalis Georgiou <mechmg93@gmail.comr>
+# Contributor: Alexander De Sousa <archaur.xandy21@spamgourmet.com>
+
+pkgname=ttf-google-fonts-git
+pkgver=20130818
+pkgrel=1
+pkgdesc="Google Fonts catalogue."
+arch=('any')
+url="https://github.com/w0ng/googlefontdirectory"
+license=('various')
+depends=('fontconfig' 'xorg-fonts-encodings')
+makedepends=(git)
+conflicts=('googlefontdirectory'
+ 'jsmath-fonts'
+ 'lohit-fonts'
+ 'oldstand-font'
+ 'otf-goudy'
+ 'ttf-andika'
+ 'ttf-anonymous-pro'
+ 'ttf-cantarell'
+ 'ttf-cardo'
+ 'ttf-chromeos-fonts'
+ 'ttf-droid'
+ 'ttf-google-webfonts-hg'
+ 'ttf-inconsolata'
+ 'ttf-kimberly_geswein_print'
+ 'ttf-nova'
+ 'ttf-oldstandard'
+ 'ttf-pt-mono'
+ 'ttf-pt-sans'
+ 'ttf-ptsans'
+ 'ttf-roboto'
+ 'ttf-sil-fonts'
+ 'ttf-sortsmillgoudy'
+ 'ttf-source-code-pro'
+ 'ttf-source-sans-pro'
+ 'ttf-ubuntu-font-family'
+ 'ttf-vollkorn'
+ 'ttf-google-webfonts'
+ 'ttf-oxygen'
+ 'ttf-opensans'
+ 'ttf-medievalsharp'
+ 'ttf-google-webfonts-git'
+ 'cantarell-fonts'
+ 'ttf-comfortaa')
+provides=("${conflicts[@]}")
+source=("git://github.com/w0ng/googlefontdirectory.git")
+md5sums=('SKIP')
+install=font.install
+
+# git variables
+_gitname="googlefontdirectory"
+
+pkgver() {
+ cd "$srcdir/$_gitname"
+ git log -1 --format="%cd" --date=short | sed 's|-||g'
+}
+
+package() {
+ cd "$srcdir"
+ install -dm755 "$pkgdir/usr/share/fonts/TTF"
+ find . -type f -name \*.ttf -exec install -Dm644 '{}' \
+ "$pkgdir/usr/share/fonts/TTF" \;
+}
diff --git a/abs/extra/ttf-google-fonts-git/font.install b/abs/extra/ttf-google-fonts-git/font.install
new file mode 100644
index 0000000..faf717e
--- /dev/null
+++ b/abs/extra/ttf-google-fonts-git/font.install
@@ -0,0 +1,15 @@
+post_install() {
+ echo -n "Updating font cache... "
+ fc-cache -fs > /dev/null
+ mkfontscale /usr/share/fonts/TTF
+ mkfontdir /usr/share/fonts/TTF
+ echo "done"
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install $1
+}
\ No newline at end of file
--
cgit v0.12
From cae8a0ab97a5bb71e96823b15c5695124e4a531c Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 6 Sep 2013 19:22:26 -0500
Subject: mythtv/plugins/web: update to latest fixes .25 on 9-6-13
---
abs/core/mythtv/stable-0.25/git_src/git_hash | 2 +-
abs/core/mythtv/stable-0.25/git_src/git_hash_web | 2 +-
abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.25/mythweb/PKGBUILD | 10 +++++-----
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
index 474b835..0d4d167 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash
@@ -1 +1 @@
-ed3b7d10a63178bff5ce4134613ff86a85d73830
+b5adf034713acfd1923eecad2f96c43be688d0d0
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash_web b/abs/core/mythtv/stable-0.25/git_src/git_hash_web
index bf76f69..04176fb 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash_web
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash_web
@@ -1 +1 @@
-89a347c85284c5cf3ca3ad7250f21c7e698af858
+48778a639409bc591ee4a6ab4bec543da94e66c1
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index 3228a58..e5dea15 100644
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.25
-pkgrel=18
+pkgrel=17
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 730bb71..6cc944b 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mythtv
pkgver=0.25
-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.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
index 728b6dc..f3e019a 100644
--- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythweb
pkgver=0.25
-pkgrel=7
+pkgrel=8
commit_hash=`cat ../git_src/git_hash_web`
@@ -51,10 +51,10 @@ build() {
[ "$CARCH" = "i686" ] && ARCH="i686"
[ "$CARCH" = "x86_64" ] && ARCH="x86-64"
- mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data}
- rsync -arp --exclude .git --delete-excluded $startdir/src/mythweb/* $startdir/pkg/$DOCROOT
- rm $startdir/pkg/$DOCROOT/README
- chown -R http:http $startdir/pkg/$DOCROOT
+ mkdir -p $pkgdir/$DOCROOT/{image_cache,php_sessions,data}
+ rsync -arp --exclude .git --delete-excluded $srcdir/mythweb/* $pkgdir/$DOCROOT
+ rm $pkgdir/$DOCROOT/README
+ chown -R http:http $pkgdir/$DOCROOT
chmod g+rw $pkgdir/$DOCROOT/{image_cache,php_sessions,data}
# mythweb modules_path fix for 0.24
--
cgit v0.12
From dedf4d68699d56068544eac84515b5d935c64f7d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 6 Sep 2013 21:10:58 -0500
Subject: mythinstall: remove hitchhiker timezone. closes #930.
---
abs/core/mythinstall/PKGBUILD | 12 +++---
abs/core/mythinstall/checkout_MythVantage.sh | 8 ++--
abs/core/mythinstall/misc_settings.cpp.patch | 57 ++++++++++++++++++++++++++++
abs/core/mythinstall/misc_settings.h.patch | 20 ++++++++++
4 files changed, 87 insertions(+), 10 deletions(-)
create mode 100644 abs/core/mythinstall/misc_settings.cpp.patch
create mode 100644 abs/core/mythinstall/misc_settings.h.patch
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index b95d720..40a3a06 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=77
+pkgrel=78
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.25')
@@ -9,13 +9,13 @@ makedepends=('mythtv>=0.25')
logofiles=`ls logo*.png`
source=('install-ui.xml' $logofiles)
-build() {
+package() {
# It is assumed that you have built the mythtv package in the same
- cd $startdir
- cd -
+ #cd $startdir
+ #cd -
#install -D MythVantage-app/mythinstall/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
install -D $srcdir/install-ui.xml $pkgdir/usr/share/mythtv/themes/default/install-ui.xml
- MVBINDIR=$startdir/pkg/usr/MythVantage/bin
+ MVBINDIR=$pkgdir/usr/MythVantage/bin
mkdir -p $MVBINDIR
install -m 0755 $startdir/mythinstall.bin $MVBINDIR/MythVantage
cd $MVBINDIR
@@ -25,7 +25,7 @@ build() {
for i in $logofiles
do
- install -D -m 0755 $startdir/$i $startdir/pkg/usr/MythVantage/logos/$i
+ install -D -m 0755 $srcdir/$i $/pkgdir/usr/MythVantage/logos/$i
done
}
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index ecc7cd0..bb1a7b7 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -56,11 +56,11 @@ sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common
#echo 'INCLUDEPATH += $$MYTHPATH/mythtv/libs/libmythtv/' >> $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
+#remove hitchhiker guide to timezones
+patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.cpp < $MYDIR/misc_settings.cpp.patch
+patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.h < $MYDIR/misc_settings.h.patch
+
cd $MYDIR/src/MythVantage-app/mythinstall && qmake
make || exit 1
#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
#make ||exit 1
-
-
-
-
diff --git a/abs/core/mythinstall/misc_settings.cpp.patch b/abs/core/mythinstall/misc_settings.cpp.patch
new file mode 100644
index 0000000..75c4d8d
--- /dev/null
+++ b/abs/core/mythinstall/misc_settings.cpp.patch
@@ -0,0 +1,57 @@
+--- misc_settings.cpp.orig 2013-09-06 21:04:22.406221919 +0000
++++ misc_settings.cpp 2013-09-06 21:01:01.927900734 +0000
+@@ -74,17 +74,17 @@
+ // miscsettings_2->addChild(HostZipcode());
+
+ TimezoneRegion *timezoneregion = new TimezoneRegion();
+- TimezoneButton *timezonebutton = new TimezoneButton();
++// TimezoneButton *timezonebutton = new TimezoneButton();
+
+ VerticalConfigurationGroup* miscsettings =
+ new VerticalConfigurationGroup(false, true,false,false);
+- miscsettings->addChild(timezonebutton);
++// miscsettings->addChild(timezonebutton);
+ if ( showLabels && ( hostparm.ThisTimeZone != "" ))
+ {
+ if (MVAPP)
+ {
+ miscsettings->addChild(temptimezone);
+- timezonebutton->disableButton();
++// timezonebutton->disableButton();
+ }
+ else
+ miscsettings->addChild(timezoneregion);
+@@ -104,13 +104,13 @@
+
+
+
+- connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
++// connect(timezonebutton, SIGNAL(mf_launch_tzgui()),timezoneregion ,SLOT(timezone_gathersettings()));
+
+ connect(timezoneregion,SIGNAL(mf_show_tz(QString)),this,SLOT(mf_show_tz(QString)));
+ connect(this,SIGNAL(update_timezone(QString)),timezoneregion,SLOT(update_timezone_values(QString)));
+
+ autoLaunchTimer = new QTimer(this);
+- connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
++// connect(autoLaunchTimer, SIGNAL(timeout()), timezonebutton, SLOT(launch_tzgui()));
+ autoLaunchTimer->start(0);
+ }
+
+@@ -191,7 +191,7 @@
+
+
+ //_______________Misc time timezone
+-
++/*
+ TimezoneButton::TimezoneButton():
+ VerticalConfigurationGroup(false,false,false,false)
+ {
+@@ -211,7 +211,7 @@
+ {
+ TZButton->setEnabled(false);
+ }
+-
++*/
+ //This is used for the timezone
+ QStringList findFilesRecursively ( QStringList paths, QString fileTypes ) {
+ if ( fileTypes.isEmpty() ) fileTypes = "*";
diff --git a/abs/core/mythinstall/misc_settings.h.patch b/abs/core/mythinstall/misc_settings.h.patch
new file mode 100644
index 0000000..10c69fb
--- /dev/null
+++ b/abs/core/mythinstall/misc_settings.h.patch
@@ -0,0 +1,20 @@
+--- misc_settings.h.orig 2013-09-06 20:57:11.240009509 +0000
++++ misc_settings.h 2013-09-06 21:06:16.558645309 +0000
+@@ -35,7 +35,7 @@
+ MiscMainFrame2();
+ };
+
+-
++/*
+ class TimezoneButton: public VerticalConfigurationGroup {
+ Q_OBJECT
+ public:
+@@ -48,7 +48,7 @@
+ QString mf_launch_tzgui();
+
+ };
+-
++*/
+ class TimezoneRegion: public TriggeredConfigurationGroup {
+ Q_OBJECT
+ public:
--
cgit v0.12
From 0f9b73710a34526c1553b08cdb2cab5fdaf58b7e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 9 Sep 2013 17:16:15 -0500
Subject: mythplugins: bump pkgrel up.
---
abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index e5dea15..7278249 100644
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('mytharchive'
'mythweather'
'mythzoneminder')
pkgver=0.25
-pkgrel=17
+pkgrel=19
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
--
cgit v0.12
From 26e580bd850bbbfc2b39177ee272ab052c012b49 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 12:04:33 -0500
Subject: postfix: readd for R8 and update to 2.10.2. refs #922
---
abs/extra/postfix/PKGBUILD | 94 +++++++++++++++++++-----------------
abs/extra/postfix/aliases.patch | 18 +++++++
abs/extra/postfix/install | 18 +++++++
abs/extra/postfix/postfix | 58 ----------------------
abs/extra/postfix/postfix.install | 38 ---------------
abs/extra/postfix/postfix.patch.bz2 | Bin 373 -> 0 bytes
abs/extra/postfix/service | 14 ++++++
7 files changed, 100 insertions(+), 140 deletions(-)
create mode 100644 abs/extra/postfix/aliases.patch
create mode 100644 abs/extra/postfix/install
delete mode 100755 abs/extra/postfix/postfix
delete mode 100644 abs/extra/postfix/postfix.install
delete mode 100644 abs/extra/postfix/postfix.patch.bz2
create mode 100644 abs/extra/postfix/service
diff --git a/abs/extra/postfix/PKGBUILD b/abs/extra/postfix/PKGBUILD
index 159f9eb..86b79f6 100644
--- a/abs/extra/postfix/PKGBUILD
+++ b/abs/extra/postfix/PKGBUILD
@@ -1,52 +1,58 @@
-# $Id: PKGBUILD 70372 2010-02-26 13:35:23Z paul $
+# $Id$
# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+
pkgname=postfix
-pkgver=2.7.1
+pkgver=2.10.2
pkgrel=1
-pkgdesc="Secure, fast, easy to administer drop in replacement for Sendmail (MTA)"
-arch=('i686' 'x86_64')
+pkgdesc='Fast, easy to administer, secure mail server'
+url='http://www.postfix.org/'
license=('custom')
-depends=('pcre' 'libsasl' 'db>=4.7')
-backup=(etc/postfix/aliases etc/postfix/virtual etc/postfix/relocated \
- etc/postfix/access etc/postfix/header_checks etc/postfix/transport \
- etc/postfix/generic etc/postfix/canonical \
- etc/postfix/main.cf etc/postfix/master.cf)
-install="${pkgname}.install"
+arch=('i686' 'x86_64')
+depends=('pcre' 'libsasl' 'db')
+backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
+source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ 'aliases.patch'
+ 'service')
+sha1sums=('4721024784d071c3e663d610db17f8bd99821f3d' 'SKIP'
+ '5fc3de6c7df1e5851a0a379e825148868808318b'
+ 'dd12885d367bebaf0fc9d2e9823a7f82086b6ee9')
+
provides=('smtp-server' 'smtp-forwarder')
-replaces=('postfix-mysql' 'postfix-pgsql')
-conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder')
-url="http://www.postfix.org/"
-source=(ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz \
- ${pkgname}.patch.bz2 \
- ${pkgname})
+conflicts=('smtp-server' 'smtp-forwarder')
+
+install=install
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make makefiles \
- CCARGS="-DUSE_SASL_AUTH -I/usr/include/sasl \
- -DUSE_CYRUS_SASL \
- -DUSE_TLS" \
- AUXLIBS="-lsasl2 -lssl -lcrypto -llber -lz -lm "
- make OPT="${CFLAGS}" || return 1
-
- sh postfix-install -non-interactive \
- install_root="${pkgdir}" \
- daemon_directory="/usr/lib/${pkgname}" \
- sample_directory="/etc/${pkgname}/sample" \
- manpage_directory="/usr/share/man"
-
- cd ${pkgdir}
- cat ${srcdir}/${pkgname}.patch |patch -Np0 || return 1
- rm -f etc/${pkgname}/main.cf~
-
- cd ${pkgdir}
- mkdir etc/rc.d
- install -m 0755 ${srcdir}/${pkgname} etc/rc.d/${pkgname}
-
- install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make makefiles DEBUG='' CCARGS=' \
+ -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl \
+ -DUSE_TLS \
+ -DDEF_COMMAND_DIR=\"/usr/bin\" \
+ -DDEF_DAEMON_DIR=\"/usr/lib/postfix\" \
+ -DDEF_SENDMAIL_PATH=\"/usr/bin/sendmail\" \
+# -DDEF_README_DIR=\"/usr/share/doc/postfix\" \
+ -DDEF_SAMPLE_DIR=\"/etc/postfix/sample\" \
+ -DDEF_MANPAGE_DIR=\"/usr/share/man\" \
+ ' AUXLIBS=' \
+ -lsasl2 \
+ -lssl -lcrypto \
+ ' OPT="${CFLAGS} ${LDFLAGS}"
+
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sh postfix-install -non-interactive install_root="${pkgdir}"
+
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+
+ cd "${pkgdir}"
+ patch -p0 -i "${srcdir}"/aliases.patch
+ sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "usr/lib/${pkgname}/postfix-files"
}
-md5sums=('b7a5c3ccd309156a65d6f8d2683d4fa1'
- 'a3c45ff23ef036143711793fcf2478c3'
- 'c847b96f08925f08b0f610468a8e21f6')
diff --git a/abs/extra/postfix/aliases.patch b/abs/extra/postfix/aliases.patch
new file mode 100644
index 0000000..6767870
--- /dev/null
+++ b/abs/extra/postfix/aliases.patch
@@ -0,0 +1,18 @@
+--- etc/postfix/main.cf.orig 2010-12-13 20:18:22.000000000 +0100
++++ etc/postfix/main.cf 2010-12-13 20:18:24.000000000 +0100
+@@ -382,6 +382,7 @@
+ #alias_maps = hash:/etc/aliases
+ #alias_maps = hash:/etc/aliases, nis:mail.aliases
+ #alias_maps = netinfo:/aliases
++alias_maps = hash:/etc/postfix/aliases
+
+ # The alias_database parameter specifies the alias database(s) that
+ # are built with "newaliases" or "sendmail -bi". This is a separate
+@@ -392,6 +393,7 @@
+ #alias_database = dbm:/etc/mail/aliases
+ #alias_database = hash:/etc/aliases
+ #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
++alias_database = $alias_maps
+
+ # ADDRESS EXTENSIONS (e.g., user+foo)
+ #
diff --git a/abs/extra/postfix/install b/abs/extra/postfix/install
new file mode 100644
index 0000000..c7e06b0
--- /dev/null
+++ b/abs/extra/postfix/install
@@ -0,0 +1,18 @@
+post_upgrade() {
+ /usr/lib/postfix/post-install daemon_directory=/usr/lib/postfix command_directory=/usr/bin upgrade-package
+ chown postfix var/lib/postfix
+}
+
+post_install() {
+ getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
+ getent group postfix &>/dev/null || groupadd -g 73 postfix >/dev/null
+ getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
+ post_upgrade
+}
+
+pre_remove() {
+ getent passwd postfix &>/dev/null && userdel postfix >/dev/null
+ getent group postfix &>/dev/null && groupdel postfix >/dev/null
+ getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
+ true
+}
diff --git a/abs/extra/postfix/postfix b/abs/extra/postfix/postfix
deleted file mode 100755
index 37dd6a8..0000000
--- a/abs/extra/postfix/postfix
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pgrep -f /usr/lib/postfix/master`
-
-start() {
- stat_busy "Starting Postfix"
- [ -z "$PID" ] && /usr/sbin/postfix start &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon postfix
- stat_done
- fi
-}
-
-stop() {
- stat_busy "Stopping Postfix"
- [ ! -z "$PID" ] && /usr/sbin/postfix stop &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon postfix
- stat_done
- fi
-}
-
-reload() {
- stat_busy "Reloading Postfix"
- [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- # calling 'stop' and 'start' without the $0 fails...
- $0 stop
- $0 start
- ;;
- reload)
- reload
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
diff --git a/abs/extra/postfix/postfix.install b/abs/extra/postfix/postfix.install
deleted file mode 100644
index bac3e1d..0000000
--- a/abs/extra/postfix/postfix.install
+++ /dev/null
@@ -1,38 +0,0 @@
-# arg 1: the new package version
-post_install() {
- if [ -z "`grep '^postdrop::' /etc/group`" ]; then
- groupadd -g 75 postdrop >& /dev/null
- fi
- if [ -z "`grep '^postfix::' /etc/group`" ]; then
- groupadd -g 73 postfix >& /dev/null
- fi
- if [ -z "`grep '^postfix:' /etc/passwd`" ]; then
- useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix
- else
- # fix a packaging bug from before (postfix should have no shell)
- usermod -s /bin/false postfix
- fi
-
- chown postfix var/spool/postfix/{active,bounce,corrupt,defer,deferred,\
-flush,hold,incoming,private,public,maildrop,trace,saved}
- chown postfix var/lib/postfix
- chgrp postdrop var/spool/postfix/{public,maildrop}
- chgrp postdrop usr/sbin/postqueue
- chgrp postdrop usr/sbin/postdrop
- chmod g+s usr/sbin/{postqueue,postdrop}
-
- newaliases
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- userdel postfix &> /dev/null
- groupdel postfix &> /dev/null
- groupdel postdrop &> /dev/null
-}
diff --git a/abs/extra/postfix/postfix.patch.bz2 b/abs/extra/postfix/postfix.patch.bz2
deleted file mode 100644
index dbc0950..0000000
Binary files a/abs/extra/postfix/postfix.patch.bz2 and /dev/null differ
diff --git a/abs/extra/postfix/service b/abs/extra/postfix/service
new file mode 100644
index 0000000..a7cdc53
--- /dev/null
+++ b/abs/extra/postfix/service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Postfix Mail Transport Agent
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/var/spool/postfix/pid/master.pid
+ExecStart=/usr/bin/postfix start
+ExecStop=/usr/bin/postfix stop
+ExecReload=/usr/bin/postfix reload
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
--
cgit v0.12
From 2fb3df67b20d4b0f9265a3a4348eb00d318de24a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 12:15:47 -0500
Subject: runit-scripts: set crond run to use postfix. refs #922
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/cron/run | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index fdbdab1..c90f052 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.0
-pkgrel=2
+pkgrel=3
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/cron/run b/abs/core/runit-scripts/runitscripts/services/cron/run
index 3d358d3..bf5787a 100755
--- a/abs/core/runit-scripts/runitscripts/services/cron/run
+++ b/abs/core/runit-scripts/runitscripts/services/cron/run
@@ -6,4 +6,4 @@ stat_runit "Starting Cron"
exec 2>&1
-exec /usr/sbin/crond -f -M /dev/null -l info
+exec /usr/sbin/crond -f -M /usr/bin/postfix -l info
--
cgit v0.12
From a83690437992a2822e204df7ddc57ad3540dff43 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 12:55:27 -0500
Subject: dcron: make postfix a dep
---
abs/core/dcron/PKGBUILD | 4 ++--
abs/core/dcron/__changelog | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/abs/core/dcron/PKGBUILD b/abs/core/dcron/PKGBUILD
index 26c1a7a..19f31f6 100644
--- a/abs/core/dcron/PKGBUILD
+++ b/abs/core/dcron/PKGBUILD
@@ -2,13 +2,13 @@
pkgname=dcron
pkgver=4.5
-pkgrel=2
+pkgrel=3
pkgdesc="dillon's lightweight cron daemon"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.jimpryor.net/linux/dcron"
backup=('var/spool/cron/root' 'etc/conf.d/crond')
-depends=('bash')
+depends=('bash' 'postfix')
provides=('cron')
conflicts=('cron')
source=("http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz")
diff --git a/abs/core/dcron/__changelog b/abs/core/dcron/__changelog
index 8e4bced..da81f68 100644
--- a/abs/core/dcron/__changelog
+++ b/abs/core/dcron/__changelog
@@ -6,3 +6,4 @@ Added an every ten minutes dir + job by .install file
echo "*/10 * * * * /usr/sbin/run-cron /etc/cron.tenminutes" >> /var/spool/cron/root
fi
+- add postfix as a dep
--
cgit v0.12
From c4a8e594cea72515b59ad0167611dc48ed0e4092 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 13:06:28 -0500
Subject: runit-scripts: add package function to PKGBUILD
---
abs/core/runit-scripts/PKGBUILD | 31 +++++++++++++++++--------------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index c90f052..f3ef203 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.0
-pkgrel=3
+pkgrel=4
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
@@ -14,19 +14,22 @@ source=(fbsplash-runit.sh)
arch=('i686' 'x86_64')
build() {
- rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $startdir/src
- cd $startdir/src/runitscripts
- install -d $startdir/pkg/etc/
- install -d $startdir/pkg/etc/runit/
- install -d $startdir/pkg/etc/sv
- install -d $startdir/pkg/sbin
- install -d $startdir/pkg/etc/rc.d/functions.d
+ rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $srcdir
+}
+
+package() {
+ cd $srcdir/runitscripts
+ install -d $pkgdir/etc/
+ install -d $pkgdir/etc/runit/
+ install -d $pkgdir/etc/sv
+ install -d $pkgdir/sbin
+ install -d $pkgdir/etc/rc.d/functions.d
- install -m0700 1 2 3 1.local 3.local ctrlaltdel $startdir/pkg/etc/runit
- install -m755 $startdir/src/fbsplash-runit.sh $startdir/pkg/etc/rc.d/functions.d/fbsplash-runit.sh
- install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
- rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
- chmod -R 755 $startdir/pkg/etc/sv
- chown -R root:root $startdir/pkg/etc/sv
+ install -m0700 1 2 3 1.local 3.local ctrlaltdel $pkgdir/etc/runit
+ install -m755 $srcdir/fbsplash-runit.sh $pkgdir/etc/rc.d/functions.d/fbsplash-runit.sh
+ install -m0755 reboot-runit halt-runit logger $pkgdir/sbin
+ rsync -a --exclude=.svn services/* $pkgdir/etc/sv
+ chmod -R 755 $pkgdir/etc/sv
+ chown -R root:root $pkgdir/etc/sv
}
md5sums=('c79246677d5ffe687bcf6df1b9c2abc2')
--
cgit v0.12
From ea476b31c11c99c6f36c13216ae04feecc7e532b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 14:48:06 -0500
Subject: libmicrohttpd: update to 0.9.27.
---
abs/extra/libmicrohttpd/PKGBUILD | 8 ++++----
abs/extra/libmicrohttpd/libmicrohttpd.install | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/extra/libmicrohttpd/PKGBUILD b/abs/extra/libmicrohttpd/PKGBUILD
index 7312377..978b589 100644
--- a/abs/extra/libmicrohttpd/PKGBUILD
+++ b/abs/extra/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79771 2012-11-12 09:04:51Z spupykin $
+# $Id$
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
# Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
# Contributor: Mathias Rohnstock <linksoft@gmx.de>
pkgname=libmicrohttpd
-pkgver=0.9.23
+pkgver=0.9.27
pkgrel=1
pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ options=('!libtool')
depends=('gnutls' 'libgcrypt')
install=libmicrohttpd.install
source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('efd038d93836adc0149beaa1c2927f61')
+md5sums=('a10496b7f1b495aaf6897584da52f51b')
build() {
cd ${pkgname}-${pkgver}
@@ -32,6 +32,6 @@ package() {
${pkgdir}/usr/include/$pkgname/platform.h
install -Dm644 ${srcdir}/${pkgname}-${pkgver}/src/include/plibc/plibc.h \
${pkgdir}/usr/include/$pkgname/plibc.h
- sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I{includedir}/libmicrohttpd#' \
+ sed -i 's#Cflags: -I${includedir}#Cflags: -I${includedir} -I${includedir}/libmicrohttpd#' \
$pkgdir/usr/lib/pkgconfig/libmicrohttpd.pc
}
diff --git a/abs/extra/libmicrohttpd/libmicrohttpd.install b/abs/extra/libmicrohttpd/libmicrohttpd.install
index dc0d2b9..7129b17 100644
--- a/abs/extra/libmicrohttpd/libmicrohttpd.install
+++ b/abs/extra/libmicrohttpd/libmicrohttpd.install
@@ -1,5 +1,5 @@
infodir=usr/share/info
-filelist=(microhttpd.info microhttpd-tutorial.info)
+filelist=(libmicrohttpd.info libmicrohttpd-tutorial.info)
post_install() {
[ -x usr/bin/install-info ] || return 0
--
cgit v0.12
From 71bf899632ef6feb13282043a4af7dfd52c255f3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 15:21:41 -0500
Subject: taglib: update to 1.8. refs #901
---
abs/core/taglib/PKGBUILD | 12 +++++-------
abs/core/taglib/ape-idev2.patch | 12 ------------
2 files changed, 5 insertions(+), 19 deletions(-)
delete mode 100644 abs/core/taglib/ape-idev2.patch
diff --git a/abs/core/taglib/PKGBUILD b/abs/core/taglib/PKGBUILD
index 38de561..6909877 100644
--- a/abs/core/taglib/PKGBUILD
+++ b/abs/core/taglib/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 158844 2012-05-12 11:47:35Z tomegun $
+# $Id$
# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: Ike Devolder <ike.devolder@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=taglib
-pkgver=1.7.2
+pkgver=1.8
pkgrel=1
pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
arch=('i686' 'x86_64')
@@ -13,12 +14,11 @@ license=('LGPL' 'MPL')
depends=('sh' 'zlib' 'gcc-libs')
makedepends=('cmake' 'pkg-config')
options=('!libtool')
-source=("http://developer.kde.org/~wheeler/files/src/$pkgname-$pkgver.tar.gz"
- 'ape-idev2.patch')
+source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/ape-idev2.patch
cd "${srcdir}"
mkdir build
@@ -35,5 +35,3 @@ package() {
cd "${srcdir}"/build
make DESTDIR="${pkgdir}" install
}
-md5sums=('b0a9e797d3833fb933c7c3176de3d720'
- 'c7c165d99acf01456351ba39ff7056cb')
diff --git a/abs/core/taglib/ape-idev2.patch b/abs/core/taglib/ape-idev2.patch
deleted file mode 100644
index 9c58da4..0000000
--- a/abs/core/taglib/ape-idev2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur taglib-1.7.orig/taglib/ape/apeproperties.cpp taglib-1.7/taglib/ape/apeproperties.cpp
---- taglib-1.7.orig/taglib/ape/apeproperties.cpp 2011-03-12 00:15:38.000000000 +1100
-+++ taglib-1.7/taglib/ape/apeproperties.cpp 2011-07-29 21:19:45.984345060 +1000
-@@ -137,7 +137,7 @@
- long ID3v2OriginalSize = 0;
- bool hasID3v2 = false;
- if(ID3v2Location >= 0) {
-- ID3v2::Tag tag(d->file, ID3v2Location, 0);
-+ ID3v2::Tag tag(d->file, ID3v2Location);
- ID3v2OriginalSize = tag.header()->completeTagSize();
- if(tag.header()->tagSize() > 0)
- hasID3v2 = true;
--
cgit v0.12
From 46a8970a3b19d668aa8876811d4eb136752138c6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 15:33:34 -0500
Subject: libcec: update to 2.1.3. refs #901
---
abs/core/libcec/PKGBUILD | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/abs/core/libcec/PKGBUILD b/abs/core/libcec/PKGBUILD
index be742f5..e2ce13d 100644
--- a/abs/core/libcec/PKGBUILD
+++ b/abs/core/libcec/PKGBUILD
@@ -1,5 +1,10 @@
+# $Id$
+# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
+# vim: ft=sh:
+
pkgname=libcec
-pkgver=1.8.0
+pkgver=2.1.3
pkgrel=1
pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
arch=('i686' 'x86_64')
@@ -7,14 +12,17 @@ url="https://github.com/Pulse-Eight/libcec"
license=('GPL')
depends=('udev' 'lockdev')
source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-b0a5e4f
-sha256sums=('3725d19cabec4bbd4142fd735bda43d33aad2a4a62b20ef337f395b549e7adec')
+_srcfolder=Pulse-Eight-libcec-54be21e
options=(!libtool)
+sha256sums=('2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1')
build() {
mv "$_srcfolder" "$pkgname-$pkgver"
cd "$pkgname-$pkgver"
+ export CFLAGS="$CFLAGS -fPIC"
+ export CXXFLAGS="$CXXFLAGS -fPIC"
+ export LDFLAGS="$LDFLAGS -fPIC"
autoreconf -vif
./configure --prefix=/usr
make
--
cgit v0.12
From 68869136557badbb6ffe5ebf5b33558adf552ae2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 10 Sep 2013 17:26:28 -0500
Subject: pygobject2: update to 2.28.6 git maintence branch. refs #901
---
abs/core/python_modules/pygobject2/PKGBUILD | 95 ++++++++++------------
.../pygobject2/python2-fix-type.patch | 50 ------------
.../pygobject2/python3-fix-build.patch | 34 --------
.../pygobject2/python3-fix-maketrans.patch | 36 --------
4 files changed, 42 insertions(+), 173 deletions(-)
delete mode 100644 abs/core/python_modules/pygobject2/python2-fix-type.patch
delete mode 100644 abs/core/python_modules/pygobject2/python3-fix-build.patch
delete mode 100644 abs/core/python_modules/pygobject2/python3-fix-maketrans.patch
diff --git a/abs/core/python_modules/pygobject2/PKGBUILD b/abs/core/python_modules/pygobject2/PKGBUILD
index 0f03bda..f4e921e 100644
--- a/abs/core/python_modules/pygobject2/PKGBUILD
+++ b/abs/core/python_modules/pygobject2/PKGBUILD
@@ -1,86 +1,75 @@
-# $Id: PKGBUILD 158678 2012-05-06 22:44:32Z bisson $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=pygobject2
pkgname=(python2-gobject2 pygobject2-devel)
pkgver=2.28.6
-pkgrel=6
-arch=('i686' 'x86_64')
+pkgrel=9
+arch=(i686 x86_64)
url="http://www.pygtk.org/"
-license=('LGPL')
-makedepends=( 'python2')
-source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
- python2-fix-type.patch
- python3-fix-build.patch
- python3-fix-maketrans.patch)
+license=(LGPL)
+makedepends=(python2 git)
options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
- 'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
- 'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
- '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
-build() {
- cd "${srcdir}"
- cp -a "pygobject-${pkgver}" python2-build
- mkdir devel
+# pygobject-2-28 branch: https://git.gnome.org/browse/pygobject/log/?h=pygobject-2-28
+source=('git://git.gnome.org/pygobject#commit=9456ba7')
+sha256sums=('SKIP')
+
+prepare() {
+ cd pygobject
+ autoreconf -fi
- (
- cd python2-build
- export PYTHON=/usr/bin/python2
- ./configure --prefix=/usr --disable-introspection
- make
- )
+ cd ..
+ cp -a pygobject python2-build
+}
- (
- cd "pygobject-${pkgver}"
- #patches available in 2.28 branch but unreleased.
- patch -Np1 -i "${srcdir}/python2-fix-type.patch"
- patch -Np1 -i "${srcdir}/python3-fix-build.patch"
- patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
+build() {
+ cd python2-build
+ ./configure --prefix=/usr --disable-introspection \
+ PYTHON=/usr/bin/python2
+ make
- ./configure --prefix=/usr --disable-introspection
- make
- )
+ cd ../pygobject
+ ./configure --prefix=/usr --disable-introspection
+ make
}
package_python-gobject2() {
pkgdesc="Python 3 bindings for GObject2"
-# depends=('glib2' 'pygobject2-devel' 'python')
- replaces=('py3gobject')
+ depends=(glib2 pygobject2-devel python)
+ replaces=(py3gobject)
provides=("py3gobject=$pkgver")
- cd "${srcdir}/pygobject-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ cd pygobject
+ make DESTDIR="$pkgdir" install
# Delete devel stuff
- rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
+ rm -r "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}}
}
package_python2-gobject2() {
pkgdesc="Python 2 bindings for GObject2"
- depends=('glib2' 'pygobject2-devel' 'python2')
- replaces=('pygobject')
+ depends=(glib2 pygobject2-devel python2)
+ replaces=(pygobject)
provides=("pygobject=$pkgver")
- cd "${srcdir}/python2-build"
- make DESTDIR="${pkgdir}" install
+ cd python2-build
+ make DESTDIR="$pkgdir" install
- find "$pkgdir"/usr/share/pygobject -name '*.py' | \
- xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+ find "$pkgdir"/usr/share/pygobject -name '*.py' -exec \
+ sed -i '1s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' {} +
+
+ rm -r "$pkgdir"/usr/share/gtk-doc
# Split devel stuff
- mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
- "$srcdir/devel/"
+ cd ..
+ mkdir -p devel/usr/{lib,share/pygobject}
+ mv {"$pkgdir",devel}/usr/include
+ mv {"$pkgdir",devel}/usr/lib/pkgconfig
+ mv {"$pkgdir",devel}/usr/share/pygobject/xsl
}
package_pygobject2-devel() {
pkgdesc="Development files for the pygobject bindings"
-
- cd "${srcdir}/devel"
- mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
- mv include "$pkgdir/usr/"
- mv pkgconfig "$pkgdir/usr/lib/"
- mv gtk-doc "$pkgdir/usr/share/"
- mv xsl "$pkgdir/usr/share/pygobject/"
+ mv devel/* "$pkgdir"
}
diff --git a/abs/core/python_modules/pygobject2/python2-fix-type.patch b/abs/core/python_modules/pygobject2/python2-fix-type.patch
deleted file mode 100644
index 78e7ddf..0000000
--- a/abs/core/python_modules/pygobject2/python2-fix-type.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 12 Mar 2012 16:44:14 -0400
-Subject: gio-types.defs: change some enums to flags
-
-These flags types were originally incorrectly handled in glib as being
-enums. That bug was fixed, but they're still enums here, leading to
-warnings about the mismatch.
-
-Change them to flags.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668522
----
- gio/gio-types.defs | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/gio-types.defs b/gio/gio-types.defs
-index 331e0bc..7eee5c8 100644
---- a/gio/gio-types.defs
-+++ b/gio/gio-types.defs
-@@ -526,7 +526,7 @@
- )
- )
-
--(define-enum MountMountFlags
-+(define-flags MountMountFlags
- (in-module "gio")
- (c-name "GMountMountFlags")
- (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
-@@ -545,7 +545,7 @@
- )
- )
-
--(define-enum DriveStartFlags
-+(define-flags DriveStartFlags
- (in-module "gio")
- (c-name "GDriveStartFlags")
- (gtype-id "G_TYPE_DRIVE_START_FLAGS")
-@@ -770,7 +770,7 @@
- )
- )
-
--(define-enum SocketMsgFlags
-+(define-flags SocketMsgFlags
- (in-module "gio")
- (c-name "GSocketMsgFlags")
- (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
---
-1.7.9.1
-
diff --git a/abs/core/python_modules/pygobject2/python3-fix-build.patch b/abs/core/python_modules/pygobject2/python3-fix-build.patch
deleted file mode 100644
index 4cb8cfe..0000000
--- a/abs/core/python_modules/pygobject2/python3-fix-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <icq@gnome.org>
-Date: Thu, 21 Apr 2011 14:52:20 +0000
-Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore
-
----
-diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
-index 81b9865..edf52d7 100644
---- a/gi/pygi-foreign-cairo.c
-+++ b/gi/pygi-foreign-cairo.c
-@@ -30,7 +30,7 @@
- #include <pycairo/py3cairo.h>
- #endif
-
--Pycairo_CAPI_t *Pycairo_CAPI;
-+static Pycairo_CAPI_t *Pycairo_CAPI;
-
- #include "pygi-foreign.h"
-
-@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info,
- static PyMethodDef _gi_cairo_functions[] = {0,};
- PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
- {
-+#if PY_VERSION_HEX < 0x03000000
- Pycairo_IMPORT;
-+#else
-+ Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI");
-+#endif
-+
- if (Pycairo_CAPI == NULL)
- return PYGLIB_MODULE_ERROR_RETURN;
-
---
-cgit v0.9
diff --git a/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch b/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch
deleted file mode 100644
index f5bc0e7..0000000
--- a/abs/core/python_modules/pygobject2/python3-fix-maketrans.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Wed, 13 Jul 2011 06:42:22 +0000
-Subject: [python3] Fix maketrans import
-
-Python3 moved the maketrans() function from the string module to a str method.
-This unbreaks gi/module.py for Python 3 again.
----
-diff --git a/gi/module.py b/gi/module.py
-index 70df76c..d56bdaf 100644
---- a/gi/module.py
-+++ b/gi/module.py
-@@ -24,7 +24,11 @@ from __future__ import absolute_import
-
- import os
- import gobject
--import string
-+try:
-+ maketrans = ''.maketrans
-+except AttributeError:
-+ # fallback for Python 2
-+ from string import maketrans
-
- import gi
- from .overrides import registry
-@@ -124,7 +128,7 @@ class IntrospectionModule(object):
- # Don't use upper() here to avoid locale specific
- # identifier conversion (e. g. in Turkish 'i'.upper() == 'i')
- # see https://bugzilla.gnome.org/show_bug.cgi?id=649165
-- ascii_upper_trans = string.maketrans(
-+ ascii_upper_trans = maketrans(
- 'abcdefgjhijklmnopqrstuvwxyz',
- 'ABCDEFGJHIJKLMNOPQRSTUVWXYZ')
- for value_info in info.get_values():
---
-cgit v0.9
--
cgit v0.12
From d5ac192c56d8bffcd0f1ab29913f93a2de86ceeb Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 11 Sep 2013 10:56:29 -0500
Subject: xbmc: update to 12.2. refs #901.
---
abs/extra/xbmc/PKGBUILD | 46 +++++++++++++++++++++++++--------------------
abs/extra/xbmc/xbmc.install | 30 +++++++++--------------------
abs/extra/xbmc/xbmc.service | 13 +++++++++++++
abs/extra/xbmc/xbmc11.patch | 15 ---------------
4 files changed, 48 insertions(+), 56 deletions(-)
create mode 100644 abs/extra/xbmc/xbmc.service
delete mode 100644 abs/extra/xbmc/xbmc11.patch
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 874e0d5..33fbb70 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -8,32 +8,36 @@
_prefix=/usr
pkgname=xbmc
-pkgver=11.0
-pkgrel=10
+pkgver=12.2
+pkgrel=5
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'custom')
-depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg' 'libsamplerate' 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'linhes-scripts>=7-31')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' 'udisks' 'upower' 'bluez')
-optdepends=(
- 'libcec: support for Pulse-Eight USB-CEC adapter'
- 'vdpau-video: accelerated video playback for nvidia cards'
- 'xvba-video: accelerated video playback for amd cards'
- 'lirc: remote controller support'
- 'udisks: automount external drives'
- 'upower: used to trigger suspend functionality'
- 'unrar: access compressed files without unpacking them'
-)
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+ 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
+ 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
+ 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
+ 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu'
+ 'tinyxml' 'taglib' 'linhes-scripts>=7-31')
+makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
+ 'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
+optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
+ 'lirc: remote controller support'
+ 'udisks: automount external drives'
+ 'upower: used to trigger suspend functionality'
+ 'unrar: access compressed files without unpacking them'
+ 'xorg-xinit: autostart xbmc')
install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" 'xbmc11.patch' 'xbmc.sh' 'xbmc_lib.conf')
+source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
+ "xbmc.service" "xbmc.sh" "xbmc_lib.conf")
build() {
cd "${srcdir}/xbmc-$pkgver"
- patch -p1 < ../xbmc11.patch
# fix lsb_release dependency
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
+# sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
# Bootstrapping XBMC
./bootstrap
@@ -41,7 +45,7 @@ build() {
# Configuring XBMC
export PYTHON_VERSION=2 # external python v2
./configure --prefix=$_prefix --exec-prefix=$_prefix \
- --enable-debug \
+ --disable-debug \
--enable-optimizations \
--enable-gl \
--enable-sdl \
@@ -71,8 +75,7 @@ build() {
--enable-libusb \
--enable-libcec \
--enable-external-libraries \
- --disable-external-ffmpeg \
- --disable-crystalhd
+ --disable-external-ffmpeg
# Now (finally) build
make
}
@@ -99,14 +102,17 @@ package() {
mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
done
+ # LinHES stuff
mkdir -p ${pkgdir}/usr/LH/bin
install -D -m 0755 ${srcdir}/xbmc.sh ${pkgdir}/usr/LH/bin
#add in xbmc_lib.conf
install -D -m0744 ${srcdir}/xbmc_lib.conf ${pkgdir}/etc/gen_lib_xml.d/xbmc_lib.conf
+ # systemd stuff
+ install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
}
# vim:set ts=2 sw=2 et:
-md5sums=('9e8a26ee25173c7268abea7f1d82d428'
- '5aa2e21a1f9fea60a2e5bb345e5aefd0'
+md5sums=('489f3877decae4e265ece54f9eaef0ba'
+ '76fae229ebc3bcfaab7e7f27e4fb51f5'
'e48a3d87984669ef206e902bc8290ff9'
'8c5cd1b5e7660a49ccd2f99967180a82')
diff --git a/abs/extra/xbmc/xbmc.install b/abs/extra/xbmc/xbmc.install
index 46ac150..6490483 100644
--- a/abs/extra/xbmc/xbmc.install
+++ b/abs/extra/xbmc/xbmc.install
@@ -1,29 +1,17 @@
post_install() {
- gen_lib_xml.py
- echo ">> If XBMC won't start, but just segfaults, double check your X.Org config."
- echo ">> The display depth has to be at least 24-bit, ie"
- echo ">> set \"DefaultDepth 24\" under the \"Screen\" section of your xorg.conf file."
- echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its"
- echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107"
- echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)."
- echo ">> Note that this is a development version of XBMC."
- echo ">> If you encounter problems with XBMC don't forget to consult the official"
- echo ">> xbmc forums found here: http://forum.xbmc.org "
- echo ">> and report bugs to the xbmc bugtracker found here: http://trac.xbmc.org."
- echo
-
- [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
+ [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+ [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+ getent group xbmc > /dev/null || groupadd xbmc
+ getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+ usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
+ gen_lib_xml.py
}
post_upgrade() {
- gen_lib_xml.py
- [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
+ post_install $1
}
post_remove() {
- [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
- [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
- gen_lib_xml.py
+ post_install $1
+ echo "You may want to remove xbmc user and group"
}
diff --git a/abs/extra/xbmc/xbmc.service b/abs/extra/xbmc/xbmc.service
new file mode 100644
index 0000000..431582f
--- /dev/null
+++ b/abs/extra/xbmc/xbmc.service
@@ -0,0 +1,13 @@
+[Unit]
+Description = Starts instance of XBMC using xinit
+After = remote-fs.target
+
+[Service]
+User = xbmc
+Group = xbmc
+Type = simple
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
+Restart = always
+
+[Install]
+WantedBy = multi-user.target
diff --git a/abs/extra/xbmc/xbmc11.patch b/abs/extra/xbmc/xbmc11.patch
deleted file mode 100644
index fb144d1..0000000
--- a/abs/extra/xbmc/xbmc11.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruaN xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
---- xbmc-11.0.orig//xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2012-03-21 22:07:50.000000000 +0000
-+++ xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp 2012-04-08 21:04:19.000000000 +0000
-@@ -22,9 +22,9 @@
- #if (defined HAVE_CONFIG_H) && (!defined WIN32)
- #include "config.h"
- #endif
--#ifdef _WIN32
-+//#ifdef _WIN32
- #include "system.h" // just for HAS_LIBRTMP
--#endif
-+//#endif
-
- #ifdef HAS_LIBRTMP
- #include "settings/AdvancedSettings.h"
--
cgit v0.12
From 741577f34d4ee8e58ca52a9604af05f2de1a3250 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 11 Sep 2013 14:17:59 -0500
Subject: linhes-udev-rules: move install to /usr/lib
---
abs/core/linhes-udev-rules/PKGBUILD | 26 +++++++++++++-------------
abs/core/linhes-udev-rules/__changelog | 3 +++
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/abs/core/linhes-udev-rules/PKGBUILD b/abs/core/linhes-udev-rules/PKGBUILD
index df8c389..4bcfa67 100644
--- a/abs/core/linhes-udev-rules/PKGBUILD
+++ b/abs/core/linhes-udev-rules/PKGBUILD
@@ -1,6 +1,6 @@
pkgname="linhes-udev-rules"
pkgver=8
-pkgrel=3
+pkgrel=4
arch=(i686 x86_64)
license=('GPL')
groups=('base')
@@ -20,29 +20,29 @@ source=(
#write_cd_rules)
-build() {
+package() {
cd $srcdir
# Install our rule for permissions and symlinks
- #install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
+ #install -D -m644 $srcdir/81-arch.rules $pkgdir/usr/lib/udev/rules.d/81-arch.rules
# Install OSS Emulation rules
- install -D -m644 $srcdir/81-OSS_Emulation.rules $pkgdir/lib/udev/rules.d/81-OSS_Emulation.rules
+ install -D -m644 $srcdir/81-OSS_Emulation.rules $pkgdir/usr/lib/udev/rules.d/81-OSS_Emulation.rules
# Install dvicoIR rules
- install -D -m644 $srcdir/81-dvicoIR.rules $pkgdir/lib/udev/rules.d/81-dvicoIR.rules
- install -D -m644 $srcdir/81-remote.rules $pkgdir/lib/udev/rules.d/81-remote.rules
+ install -D -m644 $srcdir/81-dvicoIR.rules $pkgdir/usr/lib/udev/rules.d/81-dvicoIR.rules
+ install -D -m644 $srcdir/81-remote.rules $pkgdir/usr/lib/udev/rules.d/81-remote.rules
# Install CD/DVD symlink rules
- install -D -m644 $srcdir/81-CD_DVD_symlinks.rules $pkgdir/lib/udev/rules.d/81-CD_DVD_symlinks.rules
- #install -D -m644 $srcdir/75-cd-aliases-generator.rules $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules
+ install -D -m644 $srcdir/81-CD_DVD_symlinks.rules $pkgdir/usr/lib/udev/rules.d/81-CD_DVD_symlinks.rules
+ #install -D -m644 $srcdir/75-cd-aliases-generator.rules $pkgdir/usr/lib/udev/rules.d/75-cd-aliases-generator.rules
# Install SoundGraph LCD rules
- install -D -m644 $srcdir/81-SoundGraph_LCD.rules $pkgdir/lib/udev/rules.d/81-SoundGraph_LCD.rules
+ install -D -m644 $srcdir/81-SoundGraph_LCD.rules $pkgdir/usr/lib/udev/rules.d/81-SoundGraph_LCD.rules
# Install SoundGraph rules
- install -D -m644 $srcdir/81-SoundGraph.rules $pkgdir/lib/udev/rules.d/81-SoundGraph.rules
+ install -D -m644 $srcdir/81-SoundGraph.rules $pkgdir/usr/lib/udev/rules.d/81-SoundGraph.rules
# install cdsymlinks.sh
- install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
+ install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/usr/lib/udev/cdsymlinks.sh
#taken from suse
- #install -D -m755 $srcdir/write_cd_rules $pkgdir/lib/udev/write_cd_rules
- #install -D -m755 $srcdir/rule_generator.functions $pkgdir/lib/udev/rule_generator.functions
+ #install -D -m755 $srcdir/write_cd_rules $pkgdir/usr/lib/udev/write_cd_rules
+ #install -D -m755 $srcdir/rule_generator.functions $pkgdir/usr/lib/udev/rule_generator.functions
}
diff --git a/abs/core/linhes-udev-rules/__changelog b/abs/core/linhes-udev-rules/__changelog
index 574222c..7aa236d 100644
--- a/abs/core/linhes-udev-rules/__changelog
+++ b/abs/core/linhes-udev-rules/__changelog
@@ -21,3 +21,6 @@
12/17/2012 -jm
Removed all udev bits and kept only the rules.
+
+9/11/2013 Britney Fransen
+ moved install to /usr/lib
--
cgit v0.12
From a1750b3798eb34c9f03b966e1fe5a85731e8adf6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 11 Sep 2013 14:29:23 -0500
Subject: rsyslog: move /lib to /usr/lib
---
abs/core/rsyslog/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/rsyslog/PKGBUILD b/abs/core/rsyslog/PKGBUILD
index a0a8604..e8084ea 100644
--- a/abs/core/rsyslog/PKGBUILD
+++ b/abs/core/rsyslog/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=rsyslog
pkgver=5.8.6
-pkgrel=8
+pkgrel=9
pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
url="http://www.rsyslog.com/"
arch=('i686' 'x86_64')
@@ -33,7 +33,7 @@ build() {
--enable-imtemplate \
--enable-gnutls \
--enable-inet \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=/usr/lib/systemd/system
make
}
package() {
--
cgit v0.12
From 4cdf462b8f6f36bb076539f79d9d5ccd4cf0a1f9 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 12 Sep 2013 14:18:55 -0500
Subject: nettle: update to 2.7.1.
---
abs/core/nettle/PKGBUILD | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/abs/core/nettle/PKGBUILD b/abs/core/nettle/PKGBUILD
index 2e9f8c0..a017c92 100644
--- a/abs/core/nettle/PKGBUILD
+++ b/abs/core/nettle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $
+# $Id$
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: bender02 at gmx dot com
pkgname=nettle
-pkgver=2.5
+pkgver=2.7.1
pkgrel=1
pkgdesc="A low-level cryptographic library"
arch=('i686' 'x86_64')
@@ -11,14 +11,15 @@ url="http://www.lysator.liu.se/~nisse/nettle/"
license=('GPL2')
install=$pkgname.install
depends=('gmp')
-source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz)
-md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c')
+source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
+md5sums=('003d5147911317931dd453520eb234a5'
+ 'SKIP')
+
build() {
cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --libdir=/usr/lib \
- --enable-shared \
- --disable-static # <-- seems not working now
+ --enable-shared
make
}
@@ -31,6 +32,6 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
- # remove static libs
+ # remove static libs #--disable-static - build would break (since nettle 2.6) - and had no effect before
rm -f ${pkgdir}/usr/lib/{libhogweed,libnettle}.a
}
--
cgit v0.12
From e9af82d9827f4a9e39148364f4192f12369754c2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 12 Sep 2013 15:07:46 -0500
Subject: libarchive: add nettle as a dep.
---
abs/core/libarchive/PKGBUILD | 4 ++--
abs/core/libarchive/__changelog | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 abs/core/libarchive/__changelog
diff --git a/abs/core/libarchive/PKGBUILD b/abs/core/libarchive/PKGBUILD
index cb043a3..182ea71 100644
--- a/abs/core/libarchive/PKGBUILD
+++ b/abs/core/libarchive/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=libarchive
pkgver=3.1.2
-pkgrel=2
+pkgrel=3
pkgdesc="library that can create and read several streaming archive formats"
arch=('i686' 'x86_64')
url="http://libarchive.org/"
license=('BSD')
-depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
+depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib' 'nettle')
provides=('libarchive.so')
source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
'0001-mtree-fix-line-filename-length-calculation.patch'
diff --git a/abs/core/libarchive/__changelog b/abs/core/libarchive/__changelog
new file mode 100644
index 0000000..a21fb55
--- /dev/null
+++ b/abs/core/libarchive/__changelog
@@ -0,0 +1,2 @@
+- add nettle as a dep of libarchive. bsdcpio needs nettle when creating
+ the LH iso.
--
cgit v0.12
From c6c6fc2e7dead82922a926c82ac7655ea0ecd60b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 12 Sep 2013 16:09:39 -0500
Subject: LinHES-config: update README for installer.
Update PKGBUILD with package() and use and
---
abs/core/LinHES-config/PKGBUILD | 41 ++++++++++++++++++++---------------------
abs/core/LinHES-config/README | 7 ++++---
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 9f1584c..a756d3d 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,13 +1,12 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=5
+pkgrel=6
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'
'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
'python-pexpect' 'python-netifaces'
'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'udevil')
-#LinHES-timezone
arch=('i686' 'x86_64')
source=(mv_install.py 09_mythvantge_runit_grub
@@ -59,15 +58,15 @@ source=(mv_install.py 09_mythvantge_runit_grub
backup=(etc/mythvantage.cfg)
install=config.install
-build() {
- mkdir -p $startdir/pkg/etc
- mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
- install -D -m0755 09_mythvantge_runit_grub $startdir/pkg/etc/grub.d/09_mythvantge_runit_grub
+package() {
+ mkdir -p $pkgdir/etc
+ mkdir -p $pkgdir/usr/share/mythtv/themes/default
+ install -D -m0755 09_mythvantge_runit_grub $pkgdir/etc/grub.d/09_mythvantge_runit_grub
- MVDIR=$startdir/pkg/usr/MythVantage
- mkdir $startdir/pkg/etc/profile.d
- install -m 0755 MythVantage.sh $startdir/pkg/etc/profile.d/MythVantage.sh
+ MVDIR=$pkgdir/usr/MythVantage
+ mkdir $pkgdir/etc/profile.d
+ install -m 0755 MythVantage.sh $pkgdir/etc/profile.d/MythVantage.sh
mkdir -p $MVDIR/bin
mkdir -p $MVDIR/etc
@@ -110,28 +109,28 @@ build() {
install -m 0755 plymouth_config.py $MVDIR/bin/
install -m 0755 discover_infinitv.py $MVDIR/bin/
install -m 0755 backend_control.sh $MVDIR/bin/
- install -m 0755 mythvantage.cfg $startdir/pkg/etc/
+ install -m 0755 mythvantage.cfg $pkgdir/etc/
#README file displayed on install
install -m 0755 README $MVDIR/README
- mkdir -p $startdir/pkg/usr/bin
- install -m 0755 file_time_offset.py $startdir/pkg/usr/bin/file_time_offset.py
+ mkdir -p $pkgdir/usr/bin
+ install -m 0755 file_time_offset.py $pkgdir/usr/bin/file_time_offset.py
#Copy in the branding stuff
- install -m 0755 LinHES-release $startdir/pkg/etc/LinHES-release
+ install -m 0755 LinHES-release $pkgdir/etc/LinHES-release
#sudo rules
- mkdir -p $startdir/pkg/etc/sudoers.d/
- chmod 750 $startdir/pkg/etc/sudoers.d/
- chown -R root:root $startdir/pkg/etc/sudoers.d
- install -o root -g root -m 0750 config-sudo.rules $startdir/pkg/etc/sudoers.d/config_sudo
+ mkdir -p $pkgdir/etc/sudoers.d/
+ chmod 750 $pkgdir/etc/sudoers.d/
+ chown -R root:root $pkgdir/etc/sudoers.d
+ install -o root -g root -m 0750 config-sudo.rules $pkgdir/etc/sudoers.d/config_sudo
#sysctrl conf
- install -o root -g root -D -m 0755 hdhr.conf $startdir/pkg/etc/sysctl.d/hdhr.conf
+ install -o root -g root -D -m 0755 hdhr.conf $pkgdir/etc/sysctl.d/hdhr.conf
#modules blacklist files
- install -o root -g root -D -m 0755 blacklist_pcspkr.conf $startdir/pkg/etc/modprobe.d/blacklist_pcspkr.conf
- install -o root -g root -D -m 0755 blacklist_nouveau.conf $startdir/pkg/etc/modprobe.d/blacklist_nouveau.conf
+ 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
}
md5sums=('c832059cd635359d39a2ac3166ff463c'
'3f6855b7bb860a44f96a972c2e80f497'
@@ -155,7 +154,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'5e865cc04fe5de8a39d9c1e377fc4ebe'
'd3490e93f313bbbcbc6c3693c56b9c17'
'3d1e4a119f38cff0498bf8a67e94e4b3'
- '71fd2d0d448fc2fcd15415a1beed7109'
+ '2506860a416e1988934225d80d501c2c'
'c0549457750c4f8e8038d904a0f3012a'
'3d1e3c7315881a109fb089a540d2262c'
'b845de3e05c1734cce4b9ac5e8f1baaf'
diff --git a/abs/core/LinHES-config/README b/abs/core/LinHES-config/README
index e9c7b03..d7beb9f 100644
--- a/abs/core/LinHES-config/README
+++ b/abs/core/LinHES-config/README
@@ -4,8 +4,9 @@ Installation Guide:
http://linhes.org/install
Support for LinHES:
-http://linhes.org
-irc.freenode.net #linhes
+Wiki - http://linhes.org
+Forums - http://forum.linhes.org
+IRC - irc.freenode.net #linhes
Report bugs at:
-http://linhes.org/bugs
+http://linhes.org/
--
cgit v0.12
From b96431e7ef2e564879dc1de554d9e36c48f42584 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 14 Sep 2013 16:09:26 -0500
Subject: LinHES-system, linhes-scripts,xymon: move find_orphans.py to
LinHES-system and update xymon dep.
---
abs/core/LinHES-system/PKGBUILD | 122 ++++++++--------
abs/core/LinHES-system/diskspace | 2 -
abs/core/LinHES-system/diskspace.cron | 2 +
abs/core/LinHES-system/find_orphans.py | 238 ++++++++++++++++++++++++++++++++
abs/core/LinHES-system/readme_is_xml | 2 +-
abs/core/LinHES-system/xfs_defrag | 3 -
abs/core/LinHES-system/xfs_defrag.cron | 3 +
abs/core/linhes-scripts/PKGBUILD | 8 +-
abs/core/linhes-scripts/find_orphans.py | 238 --------------------------------
abs/core/xymon/PKGBUILD | 4 +-
10 files changed, 306 insertions(+), 316 deletions(-)
delete mode 100755 abs/core/LinHES-system/diskspace
create mode 100755 abs/core/LinHES-system/diskspace.cron
create mode 100644 abs/core/LinHES-system/find_orphans.py
delete mode 100755 abs/core/LinHES-system/xfs_defrag
create mode 100755 abs/core/LinHES-system/xfs_defrag.cron
delete mode 100644 abs/core/linhes-scripts/find_orphans.py
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index be0de10..b97034e 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,88 +1,79 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64')
-MVDIR=$startdir/pkg/usr/LH
-BINDIR=$startdir/pkg/usr/bin
install=system.install
-pkgdesc="scripts and things related to having an automated system"
-depends=(linhes-sounds xdotool tilda keylaunch python_aosd 'linhes-scripts>=7-24' 'udisks' 'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu' 'ethtool')
-backup=(etc/modprobe.d/alsa-base)
-binfiles="LinHES-start optimize_mythdb.py
- myth_mtc.py myth_mtc.sh LinHES-run
- load-modules-mythvantage.sh
- unclutter-toggle.sh tvterm.sh
- mythfrontend-start set_windowmanager.sh
- myth_status.py myth_status.sh
+pkgdesc="Everything that makes LinHES an automated system"
+license=('GPL2')
+depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
+ 'python_aosd' 'linhes-scripts>=7-24' 'udisks'
+ 'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter'
+ 'wmctrl' 'archlinux-xdg-menu' 'ethtool')
+backup=('etc/modprobe.d/alsa-base')
+binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
+ LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
+ mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
install_supplemental_service.sh
- lh_system_backup
- lh_system_backup_job
- lh_system_restore_job
- lh_system_host_update
- lh_system_all_host_update
- add_storage.py
- diskspace.sh
- cacheclean lh_backend_control.sh switch_web.sh
- create_media_dirs.sh
- msg_client.py msg_daemon.py
+ lh_system_backup lh_system_backup_job lh_system_restore_job
+ lh_system_host_update lh_system_all_host_update
+ add_storage.py diskspace.sh cacheclean lh_backend_control.sh
+ switch_web.sh create_media_dirs.sh msg_client.py msg_daemon.py
gen_is_xml.py gen_lib_xml.py gen_light_include.py gen_game_xml.py
- misc_recent_recordings.pl
- misc_status_config.py
- misc_status_info.sh
- misc_upcoming_recordings.pl
- misc_which_recorder.pl
+ misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
+ misc_upcoming_recordings.pl misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh
- be_check.py
- checkXFSfrag.sh"
+ be_check.py checkXFSfrag.sh find_orphans.py"
source=(LinHES-session
LinHES-profile.sh $binfiles
alsa-base myth_mtc.lr
- diskspace cacheclean.cron xfs_defrag
+ diskspace.cron cacheclean.cron xfs_defrag.cron
readme_is_xml readme_light add_storage.readme
system-sudo.rules )
-build() {
- cd $startdir/src
- install -m755 -D LinHES-session $startdir/pkg/etc/X11/Sessions/LinHES
- install -m755 -D LinHES-profile.sh $startdir/pkg/etc/profile.d/LinHES-profile.sh
- ####### install to /usr/LH/bin
- for i in $binfiles
- do
- item=$i
- install -m755 -D $item $MVDIR/bin/$item
- echo "installing $item to $MVDIR"
- done
+package() {
+ cd $srcdir
-# cd $startdir/bin
-# for i in *
-# do
-# item=$i
-# install -m755 -D $item $MVDIR/bin/$item
-# echo "bin stuff: $item"
-# done
+ MVDIR=$pkgdir/usr/LH
+ BINDIR=$pkgdir/usr/bin
- install -m644 -D $startdir/src/alsa-base $startdir/pkg/etc/modprobe.d/alsa-base.conf
- install -m644 -D $startdir/src/readme_is_xml $startdir/pkg/etc/gen_is_xml.d/readme_is_xml
- install -m644 -D $startdir/src/readme_is_xml $startdir/pkg/etc/gen_lib_xml.d/readme_gen_xml
- install -m644 -D $startdir/src/readme_is_xml $startdir/pkg/etc/gen_game_xml.d/readme_gen_xml
- install -m644 -D $startdir/src/readme_light $startdir/pkg/etc/gen_light_conf.d/readme_gen_light
- install -m644 -D $startdir/src/add_storage.readme $startdir/pkg/etc/storage.d/readme
- # install -m755 -D $startdir/src/smolt.cron $startdir/pkg/etc/cron.weekly/smolt.cron
- install -m755 -D $startdir/src/cacheclean.cron $startdir/pkg/etc/cron.weekly/cacheclean.cron
- install -m755 -D $startdir/src/diskspace $startdir/pkg/etc/cron.tenminutes/diskspace
- install -m644 -D $startdir/src/myth_mtc.lr $startdir/pkg/etc/logrotate.d/myth_mtc
- install -m755 -D $startdir/src/xfs_defrag $startdir/pkg/etc/cron.weekly/xfs_defrag
+ install -m755 -D LinHES-session $pkgdir/etc/X11/Sessions/LinHES
+ install -m755 -D LinHES-profile.sh $pkgdir/etc/profile.d/LinHES-profile.sh
+
+ #files install to /usr/LH/bin
+ for i in $binfiles
+ do
+ item=$i
+ install -m755 -D $item $MVDIR/bin/$item
+ echo "installing $item to $MVDIR"
+ done
+ install -m644 -D $srcdir/alsa-base $pkgdir/etc/modprobe.d/alsa-base.conf
- #sudo rules
- mkdir -p $startdir/pkg/etc/sudoers.d/
- chmod 750 $startdir/pkg/etc/sudoers.d/
- chown -R root:root $startdir/pkg/etc/sudoers.d
- install -o root -g root -m 0750 $startdir/src/system-sudo.rules $startdir/pkg/etc/sudoers.d/system_sudo
+ #readme files
+ install -m644 -D $srcdir/readme_is_xml $pkgdir/etc/gen_is_xml.d/readme_is_xml
+ install -m644 -D $srcdir/readme_is_xml $pkgdir/etc/gen_lib_xml.d/readme_gen_xml
+ install -m644 -D $srcdir/readme_is_xml $pkgdir/etc/gen_game_xml.d/readme_gen_xml
+ install -m644 -D $srcdir/readme_light $pkgdir/etc/gen_light_conf.d/readme_gen_light
+ install -m644 -D $srcdir/add_storage.readme $pkgdir/etc/storage.d/readme
+ #cron files
+ #install -m755 -D $srcdir/smolt.cron $pkgdir/etc/cron.weekly/smolt.cron
+ install -m755 -D $srcdir/cacheclean.cron $pkgdir/etc/cron.weekly/cacheclean
+ install -m755 -D $srcdir/diskspace.cron $pkgdir/etc/cron.tenminutes/diskspace
+ install -m755 -D $srcdir/xfs_defrag.cron $pkgdir/etc/cron.weekly/xfs_defrag
+
+ #logrotate files
+ install -m644 -D $srcdir/myth_mtc.lr $pkgdir/etc/logrotate.d/myth_mtc
+
+ #sudo rules
+ mkdir -p $pkgdir/etc/sudoers.d/
+ chmod 750 $pkgdir/etc/sudoers.d/
+ chown -R root:root $pkgdir/etc/sudoers.d
+ install -o root -g root -m 0750 $srcdir/system-sudo.rules $pkgdir/etc/sudoers.d/system_sudo
}
+
md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'de32a1c50101265dd7f6ca5037f7a26a'
'a875ee97f86e46f34a741c2bc455f894'
@@ -124,12 +115,13 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'bacc813b48bafcc6fe906e5969930501'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
+ '34fc1f58ad1eabf4eff4979d420760c0'
'eb879fee9603a05d5420d4ce8ed9e450'
'6782771960c495aeb597893f37d1e5ee'
'84492954db16740f949d795b74383189'
'02c810c2f47b7c4495fdacaf54189473'
'474d5c6883fcfffae4f199aceb3b1356'
- '1e2ca4dd872a50df6b70528e06df558a'
+ '36bdfa8d877cea20ca3870faf08e08d5'
'59d0602bac7e06f11abba1894acc8bb0'
'da432d68962e109e09beb2b71c8c8571'
'366ccb097d1c221389709485c3b2d159')
diff --git a/abs/core/LinHES-system/diskspace b/abs/core/LinHES-system/diskspace
deleted file mode 100755
index ab3c91b..0000000
--- a/abs/core/LinHES-system/diskspace
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/usr/bin/nice -n19 /usr/LH/bin/diskspace.sh -osd
diff --git a/abs/core/LinHES-system/diskspace.cron b/abs/core/LinHES-system/diskspace.cron
new file mode 100755
index 0000000..ab3c91b
--- /dev/null
+++ b/abs/core/LinHES-system/diskspace.cron
@@ -0,0 +1,2 @@
+#!/bin/bash
+/usr/bin/nice -n19 /usr/LH/bin/diskspace.sh -osd
diff --git a/abs/core/LinHES-system/find_orphans.py b/abs/core/LinHES-system/find_orphans.py
new file mode 100644
index 0000000..cdc03d4
--- /dev/null
+++ b/abs/core/LinHES-system/find_orphans.py
@@ -0,0 +1,238 @@
+#!/usr/bin/env python2
+
+from MythTV import MythDB, MythBE, Recorded, MythError
+from socket import timeout
+
+import os
+import sys
+
+def human_size(s):
+ s = float(s)
+ o = 0
+ while s > 1000:
+ s /= 1000
+ o += 1
+ return str(round(s,1))+('B ','KB','MB','GB')[o]
+
+class File( str ):
+ def __new__(self, host, group, path, name, size):
+ return str.__new__(self, name)
+ def __init__(self, host, group, path, name, size):
+ self.host = host
+ self.group = group
+ self.path = path
+ self.size = int(size)
+ def pprint(self):
+ name = u'%s: %s' % (self.host, os.path.join(self.path, self))
+ print u' {0:<90}{1:>8}'.format(name, human_size(self.size))
+ def delete(self):
+ be = MythBE(self.host, db=DB)
+ be.deleteFile(self, self.group)
+
+class MyRecorded( Recorded ):
+ _table = 'recorded'
+ def pprint(self):
+ name = u'{0.hostname}: {0.title}'.format(self)
+ if self.subtitle:
+ name += u' - '+self.subtitle
+ print u' {0:<70}{1:>28}'.format(name,self.basename)
+
+def printrecs(title, recs):
+ print title
+ for rec in sorted(recs, key=lambda x: x.title):
+ rec.pprint()
+ print u'{0:>88}{1:>12}'.format('Count:',len(recs))
+
+def printfiles(title, files):
+ print title
+ for f in sorted(files, key=lambda x: x.path):
+ f.pprint()
+ size = sum([f.size for f in files])
+ print u'{0:>88}{1:>12}'.format('Total:',human_size(size))
+
+def populate(host=None):
+ unfiltered = []
+ kwargs = {'livetv':True}
+ if host:
+ with DB as c:
+ c.execute("""SELECT count(1) FROM settings
+ WHERE hostname=%s AND value=%s""",
+ (host, 'BackendServerIP'))
+ if c.fetchone()[0] == 0:
+ raise Exception('Invalid hostname specified on command line.')
+ hosts = [host]
+ kwargs['hostname'] = host
+ else:
+ with DB as c:
+ c.execute("""SELECT hostname FROM settings
+ WHERE value='BackendServerIP'""")
+ hosts = [r[0] for r in c.fetchall()]
+ for host in hosts:
+ for sg in DB.getStorageGroup():
+ if sg.groupname in ('Videos','Banners','Coverart',\
+ 'Fanart','Screenshots','Trailers'):
+ continue
+ try:
+ dirs,files,sizes = BE.getSGList(host, sg.groupname, sg.dirname)
+ for f,s in zip(files,sizes):
+ newfile = File(host, sg.groupname, sg.dirname, f, s)
+ if newfile not in unfiltered:
+ unfiltered.append(newfile)
+ except:
+ pass
+
+ recs = list(DB.searchRecorded(**kwargs))
+
+ zerorecs = []
+ orphvids = []
+ for rec in list(recs):
+ if rec.basename in unfiltered:
+ recs.remove(rec)
+ i = unfiltered.index(rec.basename)
+ f = unfiltered.pop(i)
+ if f.size < 1024:
+ zerorecs.append(rec)
+ name = rec.basename.rsplit('.',1)[0]
+ for f in list(unfiltered):
+ if name in f:
+ unfiltered.remove(f)
+ for f in list(unfiltered):
+ if not (f.endswith('.mpg') or f.endswith('.nuv')):
+ continue
+ orphvids.append(f)
+ unfiltered.remove(f)
+
+ orphimgs = []
+ for f in list(unfiltered):
+ if not f.endswith('.png'):
+ continue
+ orphimgs.append(f)
+ unfiltered.remove(f)
+
+ dbbackup = []
+ for f in list(unfiltered):
+ if 'sql' not in f:
+ continue
+ dbbackup.append(f)
+ unfiltered.remove(f)
+
+ return (recs, zerorecs, orphvids, orphimgs, dbbackup, unfiltered)
+
+def delete_recs(recs):
+ printrecs('The following recordings will be deleted', recs)
+ print 'Are you sure you want to continue?'
+ try:
+ res = raw_input('> ')
+ while True:
+ if res == 'yes':
+ for rec in recs:
+ rec.delete(True, True)
+ break
+ elif res == 'no':
+ break
+ else:
+ res = raw_input("'yes' or 'no' > ")
+ except MythError:
+ name = u'{0.hostname}: {0.title}'.format(rec)
+ if rec.subtitle:
+ name += ' - '+rec.subtitle
+ print "Warning: Failed to delete '" + name + "'"
+ except KeyboardInterrupt:
+ pass
+ except EOFError:
+ sys.exit(0)
+
+def delete_files(files):
+ printfiles('The following files will be deleted', files)
+ print 'Are you sure you want to continue?'
+ try:
+ res = raw_input('> ')
+ while True:
+ if res == 'yes':
+ for f in files:
+ f.delete()
+ break
+ elif res == 'no':
+ break
+ else:
+ res = raw_input("'yes' or 'no' > ")
+ except KeyboardInterrupt:
+ pass
+ except EOFError:
+ sys.exit(0)
+
+def main(host=None):
+ while True:
+ recs, zerorecs, orphvids, orphimgs, dbbackup, unfiltered = populate(host)
+
+ if len(recs):
+ printrecs("Recordings with missing files", recs)
+ if len(zerorecs):
+ printrecs("Zero byte recordings", zerorecs)
+ if len(orphvids):
+ printfiles("Orphaned video files", orphvids)
+ if len(orphimgs):
+ printfiles("Orphaned snapshots", orphimgs)
+ if len(dbbackup):
+ printfiles("Database backups", dbbackup)
+ if len(unfiltered):
+ printfiles("Other files", unfiltered)
+ if not printOnly:
+ opts = []
+ if len(recs):
+ opts.append(['Delete orphaned recording entries', delete_recs, recs])
+ if len(zerorecs):
+ opts.append(['Delete zero byte recordings', delete_recs, zerorecs])
+ if len(orphvids):
+ opts.append(['Delete orphaned video files', delete_files, orphvids])
+ if len(orphimgs):
+ opts.append(['Delete orphaned snapshots', delete_files, orphimgs])
+ if len(unfiltered):
+ opts.append(['Delete other files', delete_files, unfiltered])
+ opts.append(['Refresh list', None, None])
+ print 'Please select from the following'
+ for i, opt in enumerate(opts):
+ print ' {0}. {1}'.format(i+1, opt[0])
+
+ try:
+ inner = True
+ res = raw_input('> ')
+ while inner:
+ try:
+ res = int(res)
+ except:
+ res = raw_input('input number. ctrl-c to exit > ')
+ continue
+ if (res <= 0) or (res > len(opts)):
+ res = raw_input('input number within range > ')
+ continue
+ break
+ opt = opts[res-1]
+ if opt[1] is None:
+ continue
+ else:
+ opt[1](opt[2])
+
+ except KeyboardInterrupt:
+ break
+ except EOFError:
+ sys.exit(0)
+ else:
+ sys.exit(0)
+DB = MythDB()
+BE = MythBE(db=DB)
+DB.searchRecorded.handler = MyRecorded
+DB.searchRecorded.dbclass = MyRecorded
+
+if __name__ == '__main__':
+ global printOnly
+ if "--printonly" in sys.argv :
+ printOnly=True
+ else:
+ printOnly=False
+
+
+ if len(sys.argv) == 2 and sys.argv[1] != "--printonly":
+ main(sys.argv[1])
+ else:
+ main()
diff --git a/abs/core/LinHES-system/readme_is_xml b/abs/core/LinHES-system/readme_is_xml
index d2af0f6..f0a13cb 100644
--- a/abs/core/LinHES-system/readme_is_xml
+++ b/abs/core/LinHES-system/readme_is_xml
@@ -1 +1 @@
-Files ending in .conf will be read by gen_is_xml.py or gen_lib_xml.py and output xml as appropriate
+Files ending in .conf will be read by gen_is_xml.py or gen_lib_xml.py or gen_game_xml.py and output xml as appropriate
diff --git a/abs/core/LinHES-system/xfs_defrag b/abs/core/LinHES-system/xfs_defrag
deleted file mode 100755
index 4d35507..0000000
--- a/abs/core/LinHES-system/xfs_defrag
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-#. /etc/profile
-/usr/LH/bin/checkXFSfrag.sh > /var/log/xfs_defrag.log
diff --git a/abs/core/LinHES-system/xfs_defrag.cron b/abs/core/LinHES-system/xfs_defrag.cron
new file mode 100755
index 0000000..4d35507
--- /dev/null
+++ b/abs/core/LinHES-system/xfs_defrag.cron
@@ -0,0 +1,3 @@
+#!/bin/bash
+#. /etc/profile
+/usr/LH/bin/checkXFSfrag.sh > /var/log/xfs_defrag.log
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 147a035..d376bbb 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=51
+pkgrel=52
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -47,7 +47,6 @@ dtheme.sh
xwin_find.sh
upgrade_screen_rc
upgrade_linhes_script.sh
-find_orphans.py
acl_fix_fstab.py
stop_xss.sh
myth2mkv
@@ -56,7 +55,7 @@ ripD_eject.sh
get_airplay_key
)
-build() {
+package() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -d ${pkgdir}/usr/LH/etc
@@ -68,7 +67,7 @@ build() {
cp run-limit-mythcommflag ${pkgdir}/etc/sv/limit-mythcommflag/run
mkdir -p ${pkgdir}/etc/logrotate.d/
# cp pause_mythcommflag ${pkgdir}/etc/logrotate.d/
- install -m644 -D pause_mythcommflag $startdir/pkg/etc/logrotate.d/pause_mythcommflag
+ install -m644 -D pause_mythcommflag ${pkgdir}/etc/logrotate.d/pause_mythcommflag
}
md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
@@ -106,7 +105,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'a94fe6d980f4b810f2e2ae5352084b39'
'974c137d3fcb85942ba8945a1bc815fe'
'f454faeabfa153b10389a9a3bfd51c4a'
- '34fc1f58ad1eabf4eff4979d420760c0'
'cc9cdabcdfc969c2829b58c0e513488c'
'54a478660d0f8150fe10112a9ecf2740'
'503df99218373dfc75e7e7f5e449a44e'
diff --git a/abs/core/linhes-scripts/find_orphans.py b/abs/core/linhes-scripts/find_orphans.py
deleted file mode 100644
index cdc03d4..0000000
--- a/abs/core/linhes-scripts/find_orphans.py
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/usr/bin/env python2
-
-from MythTV import MythDB, MythBE, Recorded, MythError
-from socket import timeout
-
-import os
-import sys
-
-def human_size(s):
- s = float(s)
- o = 0
- while s > 1000:
- s /= 1000
- o += 1
- return str(round(s,1))+('B ','KB','MB','GB')[o]
-
-class File( str ):
- def __new__(self, host, group, path, name, size):
- return str.__new__(self, name)
- def __init__(self, host, group, path, name, size):
- self.host = host
- self.group = group
- self.path = path
- self.size = int(size)
- def pprint(self):
- name = u'%s: %s' % (self.host, os.path.join(self.path, self))
- print u' {0:<90}{1:>8}'.format(name, human_size(self.size))
- def delete(self):
- be = MythBE(self.host, db=DB)
- be.deleteFile(self, self.group)
-
-class MyRecorded( Recorded ):
- _table = 'recorded'
- def pprint(self):
- name = u'{0.hostname}: {0.title}'.format(self)
- if self.subtitle:
- name += u' - '+self.subtitle
- print u' {0:<70}{1:>28}'.format(name,self.basename)
-
-def printrecs(title, recs):
- print title
- for rec in sorted(recs, key=lambda x: x.title):
- rec.pprint()
- print u'{0:>88}{1:>12}'.format('Count:',len(recs))
-
-def printfiles(title, files):
- print title
- for f in sorted(files, key=lambda x: x.path):
- f.pprint()
- size = sum([f.size for f in files])
- print u'{0:>88}{1:>12}'.format('Total:',human_size(size))
-
-def populate(host=None):
- unfiltered = []
- kwargs = {'livetv':True}
- if host:
- with DB as c:
- c.execute("""SELECT count(1) FROM settings
- WHERE hostname=%s AND value=%s""",
- (host, 'BackendServerIP'))
- if c.fetchone()[0] == 0:
- raise Exception('Invalid hostname specified on command line.')
- hosts = [host]
- kwargs['hostname'] = host
- else:
- with DB as c:
- c.execute("""SELECT hostname FROM settings
- WHERE value='BackendServerIP'""")
- hosts = [r[0] for r in c.fetchall()]
- for host in hosts:
- for sg in DB.getStorageGroup():
- if sg.groupname in ('Videos','Banners','Coverart',\
- 'Fanart','Screenshots','Trailers'):
- continue
- try:
- dirs,files,sizes = BE.getSGList(host, sg.groupname, sg.dirname)
- for f,s in zip(files,sizes):
- newfile = File(host, sg.groupname, sg.dirname, f, s)
- if newfile not in unfiltered:
- unfiltered.append(newfile)
- except:
- pass
-
- recs = list(DB.searchRecorded(**kwargs))
-
- zerorecs = []
- orphvids = []
- for rec in list(recs):
- if rec.basename in unfiltered:
- recs.remove(rec)
- i = unfiltered.index(rec.basename)
- f = unfiltered.pop(i)
- if f.size < 1024:
- zerorecs.append(rec)
- name = rec.basename.rsplit('.',1)[0]
- for f in list(unfiltered):
- if name in f:
- unfiltered.remove(f)
- for f in list(unfiltered):
- if not (f.endswith('.mpg') or f.endswith('.nuv')):
- continue
- orphvids.append(f)
- unfiltered.remove(f)
-
- orphimgs = []
- for f in list(unfiltered):
- if not f.endswith('.png'):
- continue
- orphimgs.append(f)
- unfiltered.remove(f)
-
- dbbackup = []
- for f in list(unfiltered):
- if 'sql' not in f:
- continue
- dbbackup.append(f)
- unfiltered.remove(f)
-
- return (recs, zerorecs, orphvids, orphimgs, dbbackup, unfiltered)
-
-def delete_recs(recs):
- printrecs('The following recordings will be deleted', recs)
- print 'Are you sure you want to continue?'
- try:
- res = raw_input('> ')
- while True:
- if res == 'yes':
- for rec in recs:
- rec.delete(True, True)
- break
- elif res == 'no':
- break
- else:
- res = raw_input("'yes' or 'no' > ")
- except MythError:
- name = u'{0.hostname}: {0.title}'.format(rec)
- if rec.subtitle:
- name += ' - '+rec.subtitle
- print "Warning: Failed to delete '" + name + "'"
- except KeyboardInterrupt:
- pass
- except EOFError:
- sys.exit(0)
-
-def delete_files(files):
- printfiles('The following files will be deleted', files)
- print 'Are you sure you want to continue?'
- try:
- res = raw_input('> ')
- while True:
- if res == 'yes':
- for f in files:
- f.delete()
- break
- elif res == 'no':
- break
- else:
- res = raw_input("'yes' or 'no' > ")
- except KeyboardInterrupt:
- pass
- except EOFError:
- sys.exit(0)
-
-def main(host=None):
- while True:
- recs, zerorecs, orphvids, orphimgs, dbbackup, unfiltered = populate(host)
-
- if len(recs):
- printrecs("Recordings with missing files", recs)
- if len(zerorecs):
- printrecs("Zero byte recordings", zerorecs)
- if len(orphvids):
- printfiles("Orphaned video files", orphvids)
- if len(orphimgs):
- printfiles("Orphaned snapshots", orphimgs)
- if len(dbbackup):
- printfiles("Database backups", dbbackup)
- if len(unfiltered):
- printfiles("Other files", unfiltered)
- if not printOnly:
- opts = []
- if len(recs):
- opts.append(['Delete orphaned recording entries', delete_recs, recs])
- if len(zerorecs):
- opts.append(['Delete zero byte recordings', delete_recs, zerorecs])
- if len(orphvids):
- opts.append(['Delete orphaned video files', delete_files, orphvids])
- if len(orphimgs):
- opts.append(['Delete orphaned snapshots', delete_files, orphimgs])
- if len(unfiltered):
- opts.append(['Delete other files', delete_files, unfiltered])
- opts.append(['Refresh list', None, None])
- print 'Please select from the following'
- for i, opt in enumerate(opts):
- print ' {0}. {1}'.format(i+1, opt[0])
-
- try:
- inner = True
- res = raw_input('> ')
- while inner:
- try:
- res = int(res)
- except:
- res = raw_input('input number. ctrl-c to exit > ')
- continue
- if (res <= 0) or (res > len(opts)):
- res = raw_input('input number within range > ')
- continue
- break
- opt = opts[res-1]
- if opt[1] is None:
- continue
- else:
- opt[1](opt[2])
-
- except KeyboardInterrupt:
- break
- except EOFError:
- sys.exit(0)
- else:
- sys.exit(0)
-DB = MythDB()
-BE = MythBE(db=DB)
-DB.searchRecorded.handler = MyRecorded
-DB.searchRecorded.dbclass = MyRecorded
-
-if __name__ == '__main__':
- global printOnly
- if "--printonly" in sys.argv :
- printOnly=True
- else:
- printOnly=False
-
-
- if len(sys.argv) == 2 and sys.argv[1] != "--printonly":
- main(sys.argv[1])
- else:
- main()
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index a8e2c4b..0c797ee 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=48
+pkgrel=49
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.xymon.com/"
source=(http://hivelocity.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
-depends=(rrdtool fping pcre python2 graphviz 'linhes-scripts>=7-24')
+depends=('rrdtool' 'fping' 'pcre' 'python2' 'graphviz' 'LinHES-system>=8.0-5')
install=xymon.install
--
cgit v0.12
From 3c36d806034f2c63d48bf0d7c577969be4155fb7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 14 Sep 2013 16:41:47 -0500
Subject: LinHES-system, linhes-scripts: move idle.sh and xwin_find.sh to
LinHES-system.
LinHES-system: add gnu-netcat as dep for idle.sh.
---
abs/core/LinHES-system/PKGBUILD | 8 +-
abs/core/LinHES-system/idle.sh | 147 +++++++++++++++++++++++++++++++++++
abs/core/LinHES-system/xwin_find.sh | 72 +++++++++++++++++
abs/core/linhes-scripts/PKGBUILD | 8 +-
abs/core/linhes-scripts/idle.sh | 147 -----------------------------------
abs/core/linhes-scripts/xwin_find.sh | 72 -----------------
6 files changed, 226 insertions(+), 228 deletions(-)
create mode 100755 abs/core/LinHES-system/idle.sh
create mode 100644 abs/core/LinHES-system/xwin_find.sh
delete mode 100755 abs/core/linhes-scripts/idle.sh
delete mode 100644 abs/core/linhes-scripts/xwin_find.sh
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index b97034e..a00751b 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -8,7 +8,7 @@ license=('GPL2')
depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
'python_aosd' 'linhes-scripts>=7-24' 'udisks'
'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter'
- 'wmctrl' 'archlinux-xdg-menu' 'ethtool')
+ 'wmctrl' 'archlinux-xdg-menu' 'ethtool' 'gnu-netcat')
backup=('etc/modprobe.d/alsa-base')
binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
@@ -22,7 +22,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
misc_upcoming_recordings.pl misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh
- be_check.py checkXFSfrag.sh find_orphans.py"
+ be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh"
source=(LinHES-session
LinHES-profile.sh $binfiles
@@ -116,6 +116,8 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
+ 'c3ada01d3a739abe3f920b02d4ea3f6e'
+ 'a94fe6d980f4b810f2e2ae5352084b39'
'eb879fee9603a05d5420d4ce8ed9e450'
'6782771960c495aeb597893f37d1e5ee'
'84492954db16740f949d795b74383189'
diff --git a/abs/core/LinHES-system/idle.sh b/abs/core/LinHES-system/idle.sh
new file mode 100755
index 0000000..4f6174c
--- /dev/null
+++ b/abs/core/LinHES-system/idle.sh
@@ -0,0 +1,147 @@
+#!/bin/bash
+
+usage () {
+ echo "Usage: $0 [-h] [-s] [-t <minutes_needed>] [-l] [-w] [-m] [-r] [-v]"
+ echo
+ echo "-h - Print this help/usage message and quit"
+ echo "-s - Run silently (default is verbose)"
+ echo "-t - Minutes of idle time needed (default is 20)"
+ echo "-l - Check for user logins (default: false - do not check)"
+ echo "-w - Check for open windows (default: false - do not check)"
+ echo "-m - Include mythshutdown daily wake, locked, & about to start wake in system busy"
+ echo " (default: daily wake, locked & about to start wake is system idle)"
+ echo "-r - Check if mythfrontends are running (default: false - do not check)"
+ echo "-v - Be more verbose for debugging"
+ echo
+ echo "Silent mode is recommended for use in cron jobs or scripts."
+ exit $1
+}
+
+msg () { # A status reporting function
+ [ "$VERBOSE" -ne 0 ] && echo "$*"
+}
+
+mysql_cmd () {
+ /usr/bin/mysql -u root mythconverg -sBe "$*"
+}
+
+# Command line argument handling
+VERBOSE=1
+LOGINS=0
+WINDOWS=0
+DAILY=0
+RUNNING=0
+TIME_BEFORE=20
+TIME_AFTER=5 # Only adjustable by editing here
+
+while getopts "hslwmrt:v" OPT ; do
+ case $OPT in
+ h) usage 0 ;;
+ s) VERBOSE=0 ;;
+ t) TIME_BEFORE=$OPTARG ;;
+ l) LOGINS=1 ;;
+ w) WINDOWS=1 ;;
+ m) DAILY=1 ;;
+ r) RUNNING=1 ;;
+ v) VERBOSE=2 ;;
+ *) usage 1 ;;
+ esac
+done
+# Check for extra cruft on the command line...
+shift $(($OPTIND - 1))
+[ -n "$*" ] && usage 1
+
+msg "Checking what MythTV is doing now or plans to within $TIME_BEFORE minutes..."
+msg
+
+/usr/bin/mythshutdown --status
+BUSY="$?"
+msg "mythshutdown returned $BUSY"
+if [ "$DAILY" -eq 0 ] ; then
+ msg " including daily wake, locked, and about to start wake as system idle"
+ # Ignore daily wake, locked and about to start wake flag values
+ BUSY=$(($BUSY & 0x2F))
+ msg " mythshutdown returned $BUSY"
+fi
+
+SCHEMALOCK=$(mysql_cmd "select count(*) from schemalock")
+msg "schemalock $SCHEMALOCK"
+
+JOBS=$(mysql_cmd "select count(*) from jobqueue where status = 4")
+msg "running jobs $JOBS"
+
+INUSE=$(mysql_cmd "select count(*) from inuseprograms")
+msg "inuse programs $INUSE"
+
+UPCOMING=$(timeout 3 misc_upcoming_recordings.pl --plain_text --text_format "%rs " --heading "" --minutes $TIME_BEFORE --recordings -1 | wc -w)
+msg "planned recordings $UPCOMING"
+if [ "$VERBOSE" -ge 2 ] ; then
+ msg
+ timeout 3 /usr/LH/bin/misc_upcoming_recordings.pl --plain_text --minutes $TIME_BEFORE --recordings -1
+fi
+
+# Check all host's mythfrontends if they are running and playing
+HOSTNAMES=$(mysql_cmd "select hostname from settings where value = 'FrontendIdleTimeout'")
+FERUNNING=0
+PLAYING=0
+for HOST in $HOSTNAMES
+do
+ if [ "$VERBOSE" -ge 2 ]; then
+ msg "Checking $HOST's mythfrontend status..."
+ fi
+ncOUTPUT=$(timeout 2 nc $HOST 6546 << EOF
+query location
+quit
+EOF
+)
+ if [ "$RUNNING" -ge 1 ] ; then
+ if [[ "$ncOUTPUT" == *"# "* ]]; then
+ FERUNNING=$(( $FERUNNING + 1 ))
+ msg "$HOST's mythfrontend is running $FERUNNING"
+ else
+ msg "$HOST's mythfrontend is NOT running $FERUNNING"
+ fi
+ fi
+ if [[ "$ncOUTPUT" == *"# Playback "* ]]; then
+ PLAYING=$(( $PLAYING + 1 ))
+ msg "$HOST is playing a recording or video $PLAYING"
+ else
+ msg "$HOST is NOT playing a recording or video $PLAYING"
+ fi
+done
+
+# Check for users logged in
+if [ "$LOGINS" -ge 1 ] ; then
+ USERS=`/usr/bin/last | /bin/grep "still logged in" | awk '{ print $1 }'`
+ if [ -n "$USERS" ] ; then
+ LOGINS=1
+ msg "The following user(s) are still logged in:"
+ msg "${USERS}"
+ else
+ LOGINS=0
+ msg "No users are logged in $LOGINS"
+ fi
+fi
+
+# Check for open windows
+FOUNDWINDOWS=0
+if [ "$WINDOWS" -ge 1 ] ; then
+ /usr/LH/bin/xwin_find.sh -q '.*(mythtv@|xterm|Firefox|Namoroka|Opera|Chromium).*'
+ FOUNDWINDOWS="$?"
+ FOUNDWINDOWS=$(($FOUNDWINDOWS == 0))
+ if [ "$FOUNDWINDOWS" -eq 0 ] ; then
+ msg "no application windows open $FOUNDWINDOWS"
+ else
+ msg "one or more application windows open $FOUNDWINDOWS"
+ fi
+fi
+
+activities=$(($BUSY + $SCHEMALOCK + $JOBS + $INUSE + $UPCOMING + $FERUNNING + $PLAYING + $LOGINS + $FOUNDWINDOWS))
+msg
+if [ "$activities" -eq 0 ] ; then
+ msg "System is idle"
+ exit 0
+else
+ msg "System is busy"
+ exit 1
+fi
diff --git a/abs/core/LinHES-system/xwin_find.sh b/abs/core/LinHES-system/xwin_find.sh
new file mode 100644
index 0000000..35309dd
--- /dev/null
+++ b/abs/core/LinHES-system/xwin_find.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# xwin_find [-v|-q] [timeout] window_name_regex
+#
+# Look for a window of the windows full name given by a awk regular
+# expression, and print the windows xwindow ID.
+#
+# If a timeout is given (in seconds)continue to look for the windows ID
+# for this amount of time before returning. (EG default a single search)
+#
+# If no such window is found output nothing, just exit
+#
+# OPTIONS
+# -v verbose, print the full matching xwininfo line on stderr
+# -q do not print windows ID on stdout
+#
+####
+# Anthony Thyssen September 2005
+#
+PROGNAME=`type $0 | awk '{print $3}'` # search for executable on path
+PROGDIR=`dirname $PROGNAME` # extract directory of program
+PROGNAME=`basename $PROGNAME` # base name of program
+Usage() {
+ echo >&2 "$PROGNAME:" "$@"
+ sed >&2 -n '/^###/q; s/^#$/# /; 3s/^#/# Usage:/; 3,$s/^# //p;' \
+ "$PROGDIR/$PROGNAME"
+ exit 10;
+}
+
+timeout=0
+
+while [ $# -gt 0 ]; do
+ case "$1" in
+ [0-9]*) timeout=`date +%s`
+ timeout=`expr $timeout + $1 + 1` || Usage
+ ;;
+ -q) QUIET=true ;; # don't print the final window ID, just status
+ -v) VERBOSE=true ;; # output the full xwininfo line on stderr
+
+ --) shift; break ;; # end of user options
+ -*) Usage "Unknown option \"$1\"" ;;
+ *) break ;; # end of user options
+ esac
+ shift # next option
+done
+
+[ $# -lt 1 ] && Usage "Missing window search regex"
+[ $# -gt 1 ] && Usage "Too many arguments."
+
+
+find_win() {
+ # nice added to let it give way to starting processes
+ if [ "$VERBOSE" ]; then
+ line=`nice xwininfo -root -tree | awk '/"'"$1"'":/ {print; exit}'`
+ echo >&2 $line # VERBOSE - xwininfo output
+ echo "$line" | sed 's/ .*//'
+ else
+ nice xwininfo -root -tree | awk '/"'"$1"'":/ {print $1; exit}'
+ fi
+}
+
+while :; do
+ id=`find_win "$1"`
+ if [ "$id" ]; then
+ [ -z "$QUIET" ] && echo $id # the window ID found
+ exit 0;
+ fi
+ [ `date +%s` -ge $timeout ] && break
+done
+
+exit 1 # window was not found
+
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index d376bbb..5ccc91a 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=52
+pkgrel=53
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
depends=('xosd' 'cpulimit' 'screen' 'mencoder' 'tablet-encode' 'mplayer'
- 'normalize' 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell' 'gnu-netcat')
+ 'normalize' 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell')
url="http://linhes.org/"
install="linhes-scripts.install"
source=(
@@ -29,7 +29,6 @@ mythwelcome-config.py
pause_mythcommflag
limit-mythcommflag.sh
vdpau-detector
-idle.sh
screenshooter.sh
run-limit-mythcommflag
linhes_update.sh
@@ -44,7 +43,6 @@ myth2fuze
dct700-cc.sh
qip7100-cc.sh
dtheme.sh
-xwin_find.sh
upgrade_screen_rc
upgrade_linhes_script.sh
acl_fix_fstab.py
@@ -87,7 +85,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'3b776bbff68906ddc2f62b7e0dde3fe4'
'a57641fb63d7bb6d92a438f1ea779a57'
'3d0adf26280cde55a0c47188fff34826'
- 'c3ada01d3a739abe3f920b02d4ea3f6e'
'b2c3dd48a4abb976eda2d5fbf22a173a'
'b527b01d119d3bc33b8fa69bdf1082bb'
'9d077c24d102fa02e4f417d639d8b00a'
@@ -102,7 +99,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'df727c98350a64e2171c950bbefc9c5d'
'7b890e7044db38e8d439f67e398af206'
'35693f50939d5827aeabfce8c5dce589'
- 'a94fe6d980f4b810f2e2ae5352084b39'
'974c137d3fcb85942ba8945a1bc815fe'
'f454faeabfa153b10389a9a3bfd51c4a'
'cc9cdabcdfc969c2829b58c0e513488c'
diff --git a/abs/core/linhes-scripts/idle.sh b/abs/core/linhes-scripts/idle.sh
deleted file mode 100755
index 4f6174c..0000000
--- a/abs/core/linhes-scripts/idle.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-usage () {
- echo "Usage: $0 [-h] [-s] [-t <minutes_needed>] [-l] [-w] [-m] [-r] [-v]"
- echo
- echo "-h - Print this help/usage message and quit"
- echo "-s - Run silently (default is verbose)"
- echo "-t - Minutes of idle time needed (default is 20)"
- echo "-l - Check for user logins (default: false - do not check)"
- echo "-w - Check for open windows (default: false - do not check)"
- echo "-m - Include mythshutdown daily wake, locked, & about to start wake in system busy"
- echo " (default: daily wake, locked & about to start wake is system idle)"
- echo "-r - Check if mythfrontends are running (default: false - do not check)"
- echo "-v - Be more verbose for debugging"
- echo
- echo "Silent mode is recommended for use in cron jobs or scripts."
- exit $1
-}
-
-msg () { # A status reporting function
- [ "$VERBOSE" -ne 0 ] && echo "$*"
-}
-
-mysql_cmd () {
- /usr/bin/mysql -u root mythconverg -sBe "$*"
-}
-
-# Command line argument handling
-VERBOSE=1
-LOGINS=0
-WINDOWS=0
-DAILY=0
-RUNNING=0
-TIME_BEFORE=20
-TIME_AFTER=5 # Only adjustable by editing here
-
-while getopts "hslwmrt:v" OPT ; do
- case $OPT in
- h) usage 0 ;;
- s) VERBOSE=0 ;;
- t) TIME_BEFORE=$OPTARG ;;
- l) LOGINS=1 ;;
- w) WINDOWS=1 ;;
- m) DAILY=1 ;;
- r) RUNNING=1 ;;
- v) VERBOSE=2 ;;
- *) usage 1 ;;
- esac
-done
-# Check for extra cruft on the command line...
-shift $(($OPTIND - 1))
-[ -n "$*" ] && usage 1
-
-msg "Checking what MythTV is doing now or plans to within $TIME_BEFORE minutes..."
-msg
-
-/usr/bin/mythshutdown --status
-BUSY="$?"
-msg "mythshutdown returned $BUSY"
-if [ "$DAILY" -eq 0 ] ; then
- msg " including daily wake, locked, and about to start wake as system idle"
- # Ignore daily wake, locked and about to start wake flag values
- BUSY=$(($BUSY & 0x2F))
- msg " mythshutdown returned $BUSY"
-fi
-
-SCHEMALOCK=$(mysql_cmd "select count(*) from schemalock")
-msg "schemalock $SCHEMALOCK"
-
-JOBS=$(mysql_cmd "select count(*) from jobqueue where status = 4")
-msg "running jobs $JOBS"
-
-INUSE=$(mysql_cmd "select count(*) from inuseprograms")
-msg "inuse programs $INUSE"
-
-UPCOMING=$(timeout 3 misc_upcoming_recordings.pl --plain_text --text_format "%rs " --heading "" --minutes $TIME_BEFORE --recordings -1 | wc -w)
-msg "planned recordings $UPCOMING"
-if [ "$VERBOSE" -ge 2 ] ; then
- msg
- timeout 3 /usr/LH/bin/misc_upcoming_recordings.pl --plain_text --minutes $TIME_BEFORE --recordings -1
-fi
-
-# Check all host's mythfrontends if they are running and playing
-HOSTNAMES=$(mysql_cmd "select hostname from settings where value = 'FrontendIdleTimeout'")
-FERUNNING=0
-PLAYING=0
-for HOST in $HOSTNAMES
-do
- if [ "$VERBOSE" -ge 2 ]; then
- msg "Checking $HOST's mythfrontend status..."
- fi
-ncOUTPUT=$(timeout 2 nc $HOST 6546 << EOF
-query location
-quit
-EOF
-)
- if [ "$RUNNING" -ge 1 ] ; then
- if [[ "$ncOUTPUT" == *"# "* ]]; then
- FERUNNING=$(( $FERUNNING + 1 ))
- msg "$HOST's mythfrontend is running $FERUNNING"
- else
- msg "$HOST's mythfrontend is NOT running $FERUNNING"
- fi
- fi
- if [[ "$ncOUTPUT" == *"# Playback "* ]]; then
- PLAYING=$(( $PLAYING + 1 ))
- msg "$HOST is playing a recording or video $PLAYING"
- else
- msg "$HOST is NOT playing a recording or video $PLAYING"
- fi
-done
-
-# Check for users logged in
-if [ "$LOGINS" -ge 1 ] ; then
- USERS=`/usr/bin/last | /bin/grep "still logged in" | awk '{ print $1 }'`
- if [ -n "$USERS" ] ; then
- LOGINS=1
- msg "The following user(s) are still logged in:"
- msg "${USERS}"
- else
- LOGINS=0
- msg "No users are logged in $LOGINS"
- fi
-fi
-
-# Check for open windows
-FOUNDWINDOWS=0
-if [ "$WINDOWS" -ge 1 ] ; then
- /usr/LH/bin/xwin_find.sh -q '.*(mythtv@|xterm|Firefox|Namoroka|Opera|Chromium).*'
- FOUNDWINDOWS="$?"
- FOUNDWINDOWS=$(($FOUNDWINDOWS == 0))
- if [ "$FOUNDWINDOWS" -eq 0 ] ; then
- msg "no application windows open $FOUNDWINDOWS"
- else
- msg "one or more application windows open $FOUNDWINDOWS"
- fi
-fi
-
-activities=$(($BUSY + $SCHEMALOCK + $JOBS + $INUSE + $UPCOMING + $FERUNNING + $PLAYING + $LOGINS + $FOUNDWINDOWS))
-msg
-if [ "$activities" -eq 0 ] ; then
- msg "System is idle"
- exit 0
-else
- msg "System is busy"
- exit 1
-fi
diff --git a/abs/core/linhes-scripts/xwin_find.sh b/abs/core/linhes-scripts/xwin_find.sh
deleted file mode 100644
index 35309dd..0000000
--- a/abs/core/linhes-scripts/xwin_find.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-# xwin_find [-v|-q] [timeout] window_name_regex
-#
-# Look for a window of the windows full name given by a awk regular
-# expression, and print the windows xwindow ID.
-#
-# If a timeout is given (in seconds)continue to look for the windows ID
-# for this amount of time before returning. (EG default a single search)
-#
-# If no such window is found output nothing, just exit
-#
-# OPTIONS
-# -v verbose, print the full matching xwininfo line on stderr
-# -q do not print windows ID on stdout
-#
-####
-# Anthony Thyssen September 2005
-#
-PROGNAME=`type $0 | awk '{print $3}'` # search for executable on path
-PROGDIR=`dirname $PROGNAME` # extract directory of program
-PROGNAME=`basename $PROGNAME` # base name of program
-Usage() {
- echo >&2 "$PROGNAME:" "$@"
- sed >&2 -n '/^###/q; s/^#$/# /; 3s/^#/# Usage:/; 3,$s/^# //p;' \
- "$PROGDIR/$PROGNAME"
- exit 10;
-}
-
-timeout=0
-
-while [ $# -gt 0 ]; do
- case "$1" in
- [0-9]*) timeout=`date +%s`
- timeout=`expr $timeout + $1 + 1` || Usage
- ;;
- -q) QUIET=true ;; # don't print the final window ID, just status
- -v) VERBOSE=true ;; # output the full xwininfo line on stderr
-
- --) shift; break ;; # end of user options
- -*) Usage "Unknown option \"$1\"" ;;
- *) break ;; # end of user options
- esac
- shift # next option
-done
-
-[ $# -lt 1 ] && Usage "Missing window search regex"
-[ $# -gt 1 ] && Usage "Too many arguments."
-
-
-find_win() {
- # nice added to let it give way to starting processes
- if [ "$VERBOSE" ]; then
- line=`nice xwininfo -root -tree | awk '/"'"$1"'":/ {print; exit}'`
- echo >&2 $line # VERBOSE - xwininfo output
- echo "$line" | sed 's/ .*//'
- else
- nice xwininfo -root -tree | awk '/"'"$1"'":/ {print $1; exit}'
- fi
-}
-
-while :; do
- id=`find_win "$1"`
- if [ "$id" ]; then
- [ -z "$QUIET" ] && echo $id # the window ID found
- exit 0;
- fi
- [ `date +%s` -ge $timeout ] && break
-done
-
-exit 1 # window was not found
-
--
cgit v0.12
From 096c20a03e34e5142356c2df5ba7602990561d4e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 14 Sep 2013 17:10:40 -0500
Subject: LinHES-system, linhes-scripts: move linhes_update*.sh and
mythwelcome-* to LinHES-system
---
abs/core/LinHES-system/PKGBUILD | 12 +++-
abs/core/linhes-scripts/PKGBUILD | 14 +---
abs/core/linhes-scripts/linhes_update.sh | 74 ----------------------
abs/core/linhes-scripts/linhes_update2.sh | 52 ---------------
abs/core/linhes-scripts/linhes_update3.sh | 28 --------
abs/core/linhes-scripts/mythwelcome-config.py | 27 --------
abs/core/linhes-scripts/mythwelcome-set-alarm.sh | 23 -------
abs/core/linhes-scripts/mythwelcome-test-wakeup.sh | 16 -----
8 files changed, 11 insertions(+), 235 deletions(-)
delete mode 100644 abs/core/linhes-scripts/linhes_update.sh
delete mode 100644 abs/core/linhes-scripts/linhes_update2.sh
delete mode 100644 abs/core/linhes-scripts/linhes_update3.sh
delete mode 100755 abs/core/linhes-scripts/mythwelcome-config.py
delete mode 100755 abs/core/linhes-scripts/mythwelcome-set-alarm.sh
delete mode 100755 abs/core/linhes-scripts/mythwelcome-test-wakeup.sh
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index a00751b..3b9b419 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -22,7 +22,9 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
misc_upcoming_recordings.pl misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh
- be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh"
+ be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
+ linhes_update.sh linhes_update2.sh linhes_update3.sh
+ mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
source=(LinHES-session
LinHES-profile.sh $binfiles
@@ -118,6 +120,12 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'34fc1f58ad1eabf4eff4979d420760c0'
'c3ada01d3a739abe3f920b02d4ea3f6e'
'a94fe6d980f4b810f2e2ae5352084b39'
+ '9d077c24d102fa02e4f417d639d8b00a'
+ '98979920c30bb48c02d00f6943e9e50e'
+ '460861e6d0cf999629b734912eea0acf'
+ '92950f0ffb1faf1ed64c6be2b8fbc3f6'
+ '95c092f67036a361ef7a57436f44332e'
+ '410795ef9039e4c6c0484e706ecfd567'
'eb879fee9603a05d5420d4ce8ed9e450'
'6782771960c495aeb597893f37d1e5ee'
'84492954db16740f949d795b74383189'
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 5ccc91a..e78d857 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=53
+pkgrel=54
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -20,20 +20,14 @@ shootscreens-mythtv.sh
importfiles.sh
myth2mp3
mplayer-resumer.pl
-mythwelcome-test-wakeup.sh
pause-mythcommflag.sh
myth2x264
770-wrapper.sh
-mythwelcome-set-alarm.sh
-mythwelcome-config.py
pause_mythcommflag
limit-mythcommflag.sh
vdpau-detector
screenshooter.sh
run-limit-mythcommflag
-linhes_update.sh
-linhes_update2.sh
-linhes_update3.sh
update_schema_021_to_022.sh
upgrade_linhes.sh
remove_php_mythvideo.sh
@@ -76,20 +70,14 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'6b6e7d34a4bda6d608d150039adefd07'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'18263972b6326e140bbef0bb7dfa2da9'
- '410795ef9039e4c6c0484e706ecfd567'
'ad98d51e79f83df7c03f828dbeaea7f4'
'3b1c44a0818b35b6939c3cb2b723ce9e'
'd2b475821f902c5e081e7da43a35e6ac'
- '95c092f67036a361ef7a57436f44332e'
- '92950f0ffb1faf1ed64c6be2b8fbc3f6'
'3b776bbff68906ddc2f62b7e0dde3fe4'
'a57641fb63d7bb6d92a438f1ea779a57'
'3d0adf26280cde55a0c47188fff34826'
'b2c3dd48a4abb976eda2d5fbf22a173a'
'b527b01d119d3bc33b8fa69bdf1082bb'
- '9d077c24d102fa02e4f417d639d8b00a'
- '98979920c30bb48c02d00f6943e9e50e'
- '460861e6d0cf999629b734912eea0acf'
'65629302a4d2c3adf88cdf0ebc10d493'
'ab469714d77f3a29c7dda715e5ab98e0'
'87b0dc855181f98516acb18a7d551601'
diff --git a/abs/core/linhes-scripts/linhes_update.sh b/abs/core/linhes-scripts/linhes_update.sh
deleted file mode 100644
index e5dd2ad..0000000
--- a/abs/core/linhes-scripts/linhes_update.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-dsply () {
- if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
- then
- killall -9 osd_cat
- echo -e "\nUpdates available!\nExit and re-enter Service Menu\n to install the updates." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nUpdates available!\nExit and re-enter Service Menu\n to install the updates." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- exit
- else
- killall -9 osd_cat
- echo -e "Checking for updates..." | osd_cat --pos=middle --align=center --delay=300 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "Checking for updates..." | osd_cat --pos=middle --align=center --delay=300 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- fi
-}
-chck () {
- sudo pacman -Sy
- sudo pacman -Qu > /tmp/to_be_upgraded
- if [[ ! -s /tmp/to_be_upgraded ]]
- then
- killall -9 osd_cat
- echo -e "\nNo updates available." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nNo updates available." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- else
- mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
- sed -e '/\#Check/,/\#Check/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
- mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
- grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
- echo "<!--#UpdatesAvailable-->" >> /tmp/linhes.xml.tmp
- echo " <button>" >> /tmp/linhes.xml.tmp
- echo " <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp
- echo " <text>Updates Available</text>" >> /tmp/linhes.xml.tmp
- echo " <action>MENU update2.xml</action>" >> /tmp/linhes.xml.tmp
- echo " </button>" >> /tmp/linhes.xml.tmp
- echo "<!--#UpdatesAvailable-->" >> /tmp/linhes.xml.tmp
- echo "</mythmenu>" >> /tmp/linhes.xml.tmp
- mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
-
- echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp
- if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
- then
- echo "" >> /tmp/update3.xml.tmp
- echo " <button>" >> /tmp/update3.xml.tmp
- echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
- echo " <text>REBOOT REQUIRED</text>" >> /tmp/update3.xml.tmp
- echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
- echo " </button>" >> /tmp/update3.xml.tmp
- fi
-
- while read line; do
- echo "" >> /tmp/update3.xml.tmp
- echo " <button>" >> /tmp/update3.xml.tmp
- echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
- echo " <text>$line</text>" >> /tmp/update3.xml.tmp
- echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
- echo " </button>" >> /tmp/update3.xml.tmp
- done < "/tmp/to_be_upgraded"
- echo "</mythmenu>" >> /tmp/update3.xml.tmp
- mv /tmp/update3.xml.tmp /usr/share/mythtv/themes/defaultmenu/update3.xml
- dsply
- fi
- }
-dsply
-chck
diff --git a/abs/core/linhes-scripts/linhes_update2.sh b/abs/core/linhes-scripts/linhes_update2.sh
deleted file mode 100644
index d6984ed..0000000
--- a/abs/core/linhes-scripts/linhes_update2.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-
-if [[ "$1" = "install" ]]
-then
- killall -9 osd_cat
- echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
- killall -9 osd_cat
- echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
- then
- echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- fi
-else
- killall -9 osd_cat
- echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-fi
-
-rm -fr /tmp/to_be_upgraded
-
-if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
-then
- mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
- sed -e '/\#UpdatesAv/,/\#UpdatesAv/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
- mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
- grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
- echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
- echo " <button>" >> /tmp/linhes.xml.tmp
- echo " <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp
- echo " <text>Update LinHES</text>" >> /tmp/linhes.xml.tmp
- echo " <action>MENU update.xml</action>" >> /tmp/linhes.xml.tmp
- echo " </button>" >> /tmp/linhes.xml.tmp
- echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
- echo "" >> /tmp/linhes.xml.tmp
- echo "</mythmenu>" >> /tmp/linhes.xml.tmp
- mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
-fi
diff --git a/abs/core/linhes-scripts/linhes_update3.sh b/abs/core/linhes-scripts/linhes_update3.sh
deleted file mode 100644
index 72641db..0000000
--- a/abs/core/linhes-scripts/linhes_update3.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-
-sudo killall osd_cat
-cat /tmp/to_be_upgraded | sed 's/ /\n/g' | sed '/^$/d' | grep - > /tmp/to_be_upgraded2
-COUNT=$(wc -l /tmp/to_be_upgraded2 | awk '{print $1}')
-if [ $COUNT -lt 20 ]
- then
- cat /tmp/to_be_upgraded2 | osd_cat --lines=20 --pos=top --align=center --delay=12 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- else
- cat /tmp/to_be_upgraded2 | osd_cat --lines=20 --pos=top --align=center --delay=1 --wait --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-fi
-if grep kernel26 /tmp/to_be_upgraded2
-then
- killall -9 osd_cat
- echo -e "Please note:\The kernel will be upgraded.\nThis will require a reboot.\nPlease do so when no jobs are running." | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
-else
- exit
-fi
diff --git a/abs/core/linhes-scripts/mythwelcome-config.py b/abs/core/linhes-scripts/mythwelcome-config.py
deleted file mode 100755
index 5ab24b0..0000000
--- a/abs/core/linhes-scripts/mythwelcome-config.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env python2
-
-# This script will configure the myth db to allow MythWelcome to wake and shutdown the system.
-
-from socket import gethostname
-from MythTV import MythDB
-mythdb = MythDB()
-localhostname = gethostname()
-
-# mythwelcome --setup
-mythdb.settings[localhostname].MythShutdownNvramCmd = u'sudo sh -c \"/usr/LH/bin/mythwelcome-set-alarm.sh $time\"'
-mythdb.settings[localhostname].MythShutdownWakeupTimeFmt = u'time_t'
-mythdb.settings[localhostname].MythShutdownNvramRestartCmd = u''
-mythdb.settings[localhostname].MythShutdownReboot = u'sudo /sbin/reboot'
-mythdb.settings[localhostname].MythShutdownPowerOff = u'sudo /sbin/poweroff'
-mythdb.settings[localhostname].MythShutdownXTermCmd = u'xterm'
-mythdb.settings[localhostname].MythWelcomeStartFECmd = u'/usr/LH/bin/mythfrontend-start'
-
-
-# mythtv-setup Shutdown/Wakeup options
-if mythdb.settings[localhostname].idleTimeoutSecs == u'0':
- mythdb.settings[localhostname].idleTimeoutSecs = u'40'
-
-mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss'
-mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time'
-mythdb.settings.NULL.ServerHaltCommand = u'/usr/bin/mythshutdown --shutdown'
-mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.sh -s -m -r'
diff --git a/abs/core/linhes-scripts/mythwelcome-set-alarm.sh b/abs/core/linhes-scripts/mythwelcome-set-alarm.sh
deleted file mode 100755
index 990adf7..0000000
--- a/abs/core/linhes-scripts/mythwelcome-set-alarm.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#$1 is the first argument to the script. It is the time in seconds since 1970
-#This is defined in mythwelcome with the time_t argument
-
-# Configure mythwelcome --setup page:
-# Command to Set Wakeup Time: sudo sh -c "/usr/LH/bin/mythwelcome-set-alarm.sh $time"
-# Wakeup Time Format: time_t
-# nvram-wakeup Restart Command: Leave this blank
-# Command to reboot: sudo /sbin/reboot
-# Command to shutdown: sudo /sbin/poweroff
-# Command to run Xterm: xterm
-# Command to start the Frontend: /usr/bin/mythfrontend -l /var/log/mythtv/mythfrontend.log
-
-# Configure mythtv-setup Shutdown/Wakeup Options page:
-# Idletimeout (secs): any value greater that 0
-# Wakeup time format: yyyy-MM-ddThh:mm:ss
-# Set wakeup time command: /usr/bin/mythshutdown --setwakeup $time
-# Server Halt command: /usr/bin/mythshutdown --shutdown
-# Pre shutdown check command: /usr/bin/mythshutdown --check
-
-echo 0 > /sys/class/rtc/rtc0/wakealarm #this clears your alarm
-echo $1 > /sys/class/rtc/rtc0/wakealarm #this writes your alarm
-cat /proc/driver/rtc > /var/log/wake_alarm
diff --git a/abs/core/linhes-scripts/mythwelcome-test-wakeup.sh b/abs/core/linhes-scripts/mythwelcome-test-wakeup.sh
deleted file mode 100755
index 4aadf6d..0000000
--- a/abs/core/linhes-scripts/mythwelcome-test-wakeup.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-sudo sh -c "echo 0 > /sys/class/rtc/rtc0/wakealarm" #this clears your alarm
-sudo sh -c "echo `date '+%s' -d '+ 4 minutes'` > /sys/class/rtc/rtc0/wakealarm" #this writes your alarm
-cat /proc/driver/rtc
-cat /proc/driver/rtc > /var/log/wake_alarm
-echo "Your computer is set to start up in 4 minutes using ACPI."
-echo -n "Do you want to shutdown the computer now? (y/n): "
-read -n 1 shutdown
-if [ "$shutdown" == "y" ]; then
- echo -e "\nShutting down now..."
- sudo shutdown -t 5 -h now
-else
- echo -e "\nTo shutdown execute the following:"
- echo " sudo shutdown -t 5 -h now"
-fi
--
cgit v0.12
From 5c0d20865c3464770242bbe2a7594e81b067d635 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 14 Sep 2013 17:27:52 -0500
Subject: LinHES-system, linhes-scripts: move linhes_update*.sh and
mythwelcome-* to LinHES-system
forgot to add files
---
abs/core/LinHES-system/linhes_update.sh | 74 +++++++++++++++++++++++
abs/core/LinHES-system/linhes_update2.sh | 52 ++++++++++++++++
abs/core/LinHES-system/linhes_update3.sh | 28 +++++++++
abs/core/LinHES-system/mythwelcome-config.py | 27 +++++++++
abs/core/LinHES-system/mythwelcome-set-alarm.sh | 23 +++++++
abs/core/LinHES-system/mythwelcome-test-wakeup.sh | 16 +++++
6 files changed, 220 insertions(+)
create mode 100644 abs/core/LinHES-system/linhes_update.sh
create mode 100644 abs/core/LinHES-system/linhes_update2.sh
create mode 100644 abs/core/LinHES-system/linhes_update3.sh
create mode 100755 abs/core/LinHES-system/mythwelcome-config.py
create mode 100755 abs/core/LinHES-system/mythwelcome-set-alarm.sh
create mode 100755 abs/core/LinHES-system/mythwelcome-test-wakeup.sh
diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh
new file mode 100644
index 0000000..e5dd2ad
--- /dev/null
+++ b/abs/core/LinHES-system/linhes_update.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+#----------------------------------------------------------------------------
+. /etc/osd_cat.cfg || {
+ color=yellow
+ outline=2
+ outlinecolour=black
+ shadow=0
+ shadowcolour=black
+ font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+}
+#----------------------------------------------------------------------------
+dsply () {
+ if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
+ then
+ killall -9 osd_cat
+ echo -e "\nUpdates available!\nExit and re-enter Service Menu\n to install the updates." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "\nUpdates available!\nExit and re-enter Service Menu\n to install the updates." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ exit
+ else
+ killall -9 osd_cat
+ echo -e "Checking for updates..." | osd_cat --pos=middle --align=center --delay=300 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "Checking for updates..." | osd_cat --pos=middle --align=center --delay=300 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ fi
+}
+chck () {
+ sudo pacman -Sy
+ sudo pacman -Qu > /tmp/to_be_upgraded
+ if [[ ! -s /tmp/to_be_upgraded ]]
+ then
+ killall -9 osd_cat
+ echo -e "\nNo updates available." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "\nNo updates available." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ else
+ mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
+ sed -e '/\#Check/,/\#Check/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
+ mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
+ grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
+ echo "<!--#UpdatesAvailable-->" >> /tmp/linhes.xml.tmp
+ echo " <button>" >> /tmp/linhes.xml.tmp
+ echo " <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp
+ echo " <text>Updates Available</text>" >> /tmp/linhes.xml.tmp
+ echo " <action>MENU update2.xml</action>" >> /tmp/linhes.xml.tmp
+ echo " </button>" >> /tmp/linhes.xml.tmp
+ echo "<!--#UpdatesAvailable-->" >> /tmp/linhes.xml.tmp
+ echo "</mythmenu>" >> /tmp/linhes.xml.tmp
+ mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
+
+ echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp
+ if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
+ then
+ echo "" >> /tmp/update3.xml.tmp
+ echo " <button>" >> /tmp/update3.xml.tmp
+ echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
+ echo " <text>REBOOT REQUIRED</text>" >> /tmp/update3.xml.tmp
+ echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
+ echo " </button>" >> /tmp/update3.xml.tmp
+ fi
+
+ while read line; do
+ echo "" >> /tmp/update3.xml.tmp
+ echo " <button>" >> /tmp/update3.xml.tmp
+ echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
+ echo " <text>$line</text>" >> /tmp/update3.xml.tmp
+ echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
+ echo " </button>" >> /tmp/update3.xml.tmp
+ done < "/tmp/to_be_upgraded"
+ echo "</mythmenu>" >> /tmp/update3.xml.tmp
+ mv /tmp/update3.xml.tmp /usr/share/mythtv/themes/defaultmenu/update3.xml
+ dsply
+ fi
+ }
+dsply
+chck
diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh
new file mode 100644
index 0000000..d6984ed
--- /dev/null
+++ b/abs/core/LinHES-system/linhes_update2.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+#----------------------------------------------------------------------------
+. /etc/osd_cat.cfg || {
+ color=yellow
+ outline=2
+ outlinecolour=black
+ shadow=0
+ shadowcolour=black
+ font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+}
+#----------------------------------------------------------------------------
+
+if [[ "$1" = "install" ]]
+then
+ killall -9 osd_cat
+ echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
+ killall -9 osd_cat
+ echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
+ then
+ echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ fi
+else
+ killall -9 osd_cat
+ echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+fi
+
+rm -fr /tmp/to_be_upgraded
+
+if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
+then
+ mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
+ sed -e '/\#UpdatesAv/,/\#UpdatesAv/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
+ mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
+ grep -v -e /mythmenu /tmp/linhes.xml > /tmp/linhes.xml.tmp
+ echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
+ echo " <button>" >> /tmp/linhes.xml.tmp
+ echo " <type>UPGRADE</type>" >> /tmp/linhes.xml.tmp
+ echo " <text>Update LinHES</text>" >> /tmp/linhes.xml.tmp
+ echo " <action>MENU update.xml</action>" >> /tmp/linhes.xml.tmp
+ echo " </button>" >> /tmp/linhes.xml.tmp
+ echo "<!--#Check for updates-->" >> /tmp/linhes.xml.tmp
+ echo "" >> /tmp/linhes.xml.tmp
+ echo "</mythmenu>" >> /tmp/linhes.xml.tmp
+ mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
+fi
diff --git a/abs/core/LinHES-system/linhes_update3.sh b/abs/core/LinHES-system/linhes_update3.sh
new file mode 100644
index 0000000..72641db
--- /dev/null
+++ b/abs/core/LinHES-system/linhes_update3.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+#----------------------------------------------------------------------------
+. /etc/osd_cat.cfg || {
+ color=yellow
+ outline=2
+ outlinecolour=black
+ shadow=0
+ shadowcolour=black
+ font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+}
+#----------------------------------------------------------------------------
+
+sudo killall osd_cat
+cat /tmp/to_be_upgraded | sed 's/ /\n/g' | sed '/^$/d' | grep - > /tmp/to_be_upgraded2
+COUNT=$(wc -l /tmp/to_be_upgraded2 | awk '{print $1}')
+if [ $COUNT -lt 20 ]
+ then
+ cat /tmp/to_be_upgraded2 | osd_cat --lines=20 --pos=top --align=center --delay=12 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ else
+ cat /tmp/to_be_upgraded2 | osd_cat --lines=20 --pos=top --align=center --delay=1 --wait --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+fi
+if grep kernel26 /tmp/to_be_upgraded2
+then
+ killall -9 osd_cat
+ echo -e "Please note:\The kernel will be upgraded.\nThis will require a reboot.\nPlease do so when no jobs are running." | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
+else
+ exit
+fi
diff --git a/abs/core/LinHES-system/mythwelcome-config.py b/abs/core/LinHES-system/mythwelcome-config.py
new file mode 100755
index 0000000..5ab24b0
--- /dev/null
+++ b/abs/core/LinHES-system/mythwelcome-config.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env python2
+
+# This script will configure the myth db to allow MythWelcome to wake and shutdown the system.
+
+from socket import gethostname
+from MythTV import MythDB
+mythdb = MythDB()
+localhostname = gethostname()
+
+# mythwelcome --setup
+mythdb.settings[localhostname].MythShutdownNvramCmd = u'sudo sh -c \"/usr/LH/bin/mythwelcome-set-alarm.sh $time\"'
+mythdb.settings[localhostname].MythShutdownWakeupTimeFmt = u'time_t'
+mythdb.settings[localhostname].MythShutdownNvramRestartCmd = u''
+mythdb.settings[localhostname].MythShutdownReboot = u'sudo /sbin/reboot'
+mythdb.settings[localhostname].MythShutdownPowerOff = u'sudo /sbin/poweroff'
+mythdb.settings[localhostname].MythShutdownXTermCmd = u'xterm'
+mythdb.settings[localhostname].MythWelcomeStartFECmd = u'/usr/LH/bin/mythfrontend-start'
+
+
+# mythtv-setup Shutdown/Wakeup options
+if mythdb.settings[localhostname].idleTimeoutSecs == u'0':
+ mythdb.settings[localhostname].idleTimeoutSecs = u'40'
+
+mythdb.settings.NULL.WakeupTimeFormat = u'yyyy-MM-ddThh:mm:ss'
+mythdb.settings.NULL.SetWakeuptimeCommand = u'/usr/bin/mythshutdown --setwakeup $time'
+mythdb.settings.NULL.ServerHaltCommand = u'/usr/bin/mythshutdown --shutdown'
+mythdb.settings.NULL.preSDWUCheckCommand = u'/usr/LH/bin/idle.sh -s -m -r'
diff --git a/abs/core/LinHES-system/mythwelcome-set-alarm.sh b/abs/core/LinHES-system/mythwelcome-set-alarm.sh
new file mode 100755
index 0000000..990adf7
--- /dev/null
+++ b/abs/core/LinHES-system/mythwelcome-set-alarm.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+#$1 is the first argument to the script. It is the time in seconds since 1970
+#This is defined in mythwelcome with the time_t argument
+
+# Configure mythwelcome --setup page:
+# Command to Set Wakeup Time: sudo sh -c "/usr/LH/bin/mythwelcome-set-alarm.sh $time"
+# Wakeup Time Format: time_t
+# nvram-wakeup Restart Command: Leave this blank
+# Command to reboot: sudo /sbin/reboot
+# Command to shutdown: sudo /sbin/poweroff
+# Command to run Xterm: xterm
+# Command to start the Frontend: /usr/bin/mythfrontend -l /var/log/mythtv/mythfrontend.log
+
+# Configure mythtv-setup Shutdown/Wakeup Options page:
+# Idletimeout (secs): any value greater that 0
+# Wakeup time format: yyyy-MM-ddThh:mm:ss
+# Set wakeup time command: /usr/bin/mythshutdown --setwakeup $time
+# Server Halt command: /usr/bin/mythshutdown --shutdown
+# Pre shutdown check command: /usr/bin/mythshutdown --check
+
+echo 0 > /sys/class/rtc/rtc0/wakealarm #this clears your alarm
+echo $1 > /sys/class/rtc/rtc0/wakealarm #this writes your alarm
+cat /proc/driver/rtc > /var/log/wake_alarm
diff --git a/abs/core/LinHES-system/mythwelcome-test-wakeup.sh b/abs/core/LinHES-system/mythwelcome-test-wakeup.sh
new file mode 100755
index 0000000..4aadf6d
--- /dev/null
+++ b/abs/core/LinHES-system/mythwelcome-test-wakeup.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+sudo sh -c "echo 0 > /sys/class/rtc/rtc0/wakealarm" #this clears your alarm
+sudo sh -c "echo `date '+%s' -d '+ 4 minutes'` > /sys/class/rtc/rtc0/wakealarm" #this writes your alarm
+cat /proc/driver/rtc
+cat /proc/driver/rtc > /var/log/wake_alarm
+echo "Your computer is set to start up in 4 minutes using ACPI."
+echo -n "Do you want to shutdown the computer now? (y/n): "
+read -n 1 shutdown
+if [ "$shutdown" == "y" ]; then
+ echo -e "\nShutting down now..."
+ sudo shutdown -t 5 -h now
+else
+ echo -e "\nTo shutdown execute the following:"
+ echo " sudo shutdown -t 5 -h now"
+fi
--
cgit v0.12
From ab5cfcecea2c03037d5829f7cc8f19153b25b343 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 11:05:36 -0500
Subject: LinHES-system: linhes_update*: update to use msg_client.py
---
abs/core/LinHES-system/PKGBUILD | 14 +++---
abs/core/LinHES-system/linhes_update.sh | 80 +++++++++++++++-----------------
abs/core/LinHES-system/linhes_update2.sh | 31 ++++---------
abs/core/LinHES-system/linhes_update3.sh | 28 -----------
4 files changed, 51 insertions(+), 102 deletions(-)
delete mode 100644 abs/core/LinHES-system/linhes_update3.sh
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 3b9b419..5bc00d4 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -9,7 +9,7 @@ depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
'python_aosd' 'linhes-scripts>=7-24' 'udisks'
'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter'
'wmctrl' 'archlinux-xdg-menu' 'ethtool' 'gnu-netcat')
-backup=('etc/modprobe.d/alsa-base')
+backup=('etc/modprobe.d/alsa-base.conf')
binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
@@ -23,11 +23,10 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
misc_upcoming_recordings.pl misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh
be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
- linhes_update.sh linhes_update2.sh linhes_update3.sh
+ linhes_update.sh linhes_update2.sh
mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
-source=(LinHES-session
- LinHES-profile.sh $binfiles
+source=(LinHES-session LinHES-profile.sh $binfiles
alsa-base myth_mtc.lr
diskspace.cron cacheclean.cron xfs_defrag.cron
readme_is_xml readme_light add_storage.readme
@@ -120,9 +119,8 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'34fc1f58ad1eabf4eff4979d420760c0'
'c3ada01d3a739abe3f920b02d4ea3f6e'
'a94fe6d980f4b810f2e2ae5352084b39'
- '9d077c24d102fa02e4f417d639d8b00a'
- '98979920c30bb48c02d00f6943e9e50e'
- '460861e6d0cf999629b734912eea0acf'
+ 'e1011e0df090372cccc03ecf9d6805c7'
+ 'd14335afe7dafa035a70399210e0df1a'
'92950f0ffb1faf1ed64c6be2b8fbc3f6'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
diff --git a/abs/core/LinHES-system/linhes_update.sh b/abs/core/LinHES-system/linhes_update.sh
index e5dd2ad..87ac8a1 100644
--- a/abs/core/LinHES-system/linhes_update.sh
+++ b/abs/core/LinHES-system/linhes_update.sh
@@ -1,37 +1,27 @@
#!/bin/bash
+#Called from LinHES Service Menu Check for Updates Menu
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
dsply () {
- if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
- then
- killall -9 osd_cat
- echo -e "\nUpdates available!\nExit and re-enter Service Menu\n to install the updates." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nUpdates available!\nExit and re-enter Service Menu\n to install the updates." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ if grep -q Updates\ Available /usr/share/mythtv/themes/defaultmenu/linhes.xml
+ then
+ msg_client.py --clear --tag "checkUpdates"
+ msg_client.py --kill
+ msg_client.py --msg "Updates available!\nExit and re-enter Service Menu\nto install the updates.|middle"
exit
- else
- killall -9 osd_cat
- echo -e "Checking for updates..." | osd_cat --pos=middle --align=center --delay=300 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "Checking for updates..." | osd_cat --pos=middle --align=center --delay=300 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- fi
+ else
+ msg_client.py --msg "Checking for updates...|middle" --timeout 600 --tag "checkUpdates"
+ fi
}
+
chck () {
sudo pacman -Sy
sudo pacman -Qu > /tmp/to_be_upgraded
if [[ ! -s /tmp/to_be_upgraded ]]
- then
- killall -9 osd_cat
- echo -e "\nNo updates available." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nNo updates available." | osd_cat --pos=middle --align=center --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- else
+ then
+ msg_client.py --clear --tag "checkUpdates"
+ msg_client.py --kill
+ msg_client.py --msg "No updates available.|middle"
+ else
mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp/linhes.xml.tmp
sed -e '/\#Check/,/\#Check/d' < /tmp/linhes.xml.tmp > /usr/share/mythtv/themes/defaultmenu/linhes.xml
mv /usr/share/mythtv/themes/defaultmenu/linhes.xml /tmp
@@ -47,28 +37,32 @@ chck () {
mv /tmp/linhes.xml.tmp /usr/share/mythtv/themes/defaultmenu/linhes.xml
echo "<mythmenu name=\"LinHES\">" > /tmp/update3.xml.tmp
- if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
- then
- echo "" >> /tmp/update3.xml.tmp
- echo " <button>" >> /tmp/update3.xml.tmp
- echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
- echo " <text>REBOOT REQUIRED</text>" >> /tmp/update3.xml.tmp
- echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
- echo " </button>" >> /tmp/update3.xml.tmp
+
+ #check for kernel update and warn reboot is required
+ if grep linux /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
+ then
+ echo "" >> /tmp/update3.xml.tmp
+ echo " <button>" >> /tmp/update3.xml.tmp
+ echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
+ echo " <text>REBOOT REQUIRED</text>" >> /tmp/update3.xml.tmp
+ echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
+ echo " </button>" >> /tmp/update3.xml.tmp
fi
-
+
+ #create menu items for each pkg to be upgraded
while read line; do
- echo "" >> /tmp/update3.xml.tmp
- echo " <button>" >> /tmp/update3.xml.tmp
- echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
- echo " <text>$line</text>" >> /tmp/update3.xml.tmp
- echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
- echo " </button>" >> /tmp/update3.xml.tmp
- done < "/tmp/to_be_upgraded"
- echo "</mythmenu>" >> /tmp/update3.xml.tmp
- mv /tmp/update3.xml.tmp /usr/share/mythtv/themes/defaultmenu/update3.xml
+ echo "" >> /tmp/update3.xml.tmp
+ echo " <button>" >> /tmp/update3.xml.tmp
+ echo " <type>UPGRADE</type>" >> /tmp/update3.xml.tmp
+ echo " <text>$line</text>" >> /tmp/update3.xml.tmp
+ echo " <action>NONE</action>" >> /tmp/update3.xml.tmp
+ echo " </button>" >> /tmp/update3.xml.tmp
+ done < "/tmp/to_be_upgraded"
+ echo "</mythmenu>" >> /tmp/update3.xml.tmp
+ mv /tmp/update3.xml.tmp /usr/share/mythtv/themes/defaultmenu/update3.xml
dsply
fi
}
+
dsply
chck
diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh
index d6984ed..cd04e3d 100644
--- a/abs/core/LinHES-system/linhes_update2.sh
+++ b/abs/core/LinHES-system/linhes_update2.sh
@@ -1,34 +1,19 @@
#!/bin/bash
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
if [[ "$1" = "install" ]]
then
- killall -9 osd_cat
- echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "Updating..." | osd_cat --pos=middle --align=center --delay=300000 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- sudo pacman -Suf --noconfirm && sudo killall -9 osd_cat
- killall -9 osd_cat
- echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nUpdates complete." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- if grep kernel26 /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
+ msg_client.py --msg "Updating...|middle" --timeout 600 --tag "Updating"
+ sudo pacman -Suf --noconfirm
+ msg_client.py --clear --tag "Updating"
+ msg_client.py --kill
+ msg_client.py --msg "Updates complete.|middle"
+ if grep linux /tmp/to_be_upgraded || grep nvidia /tmp/to_be_upgraded
then
- echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\n\nUpdates require a reboot." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ msg_client.py --msg "Updates require a reboot.|middle"
fi
else
- killall -9 osd_cat
- echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- echo -e "\nUpdates canceled." | osd_cat --pos=middle --align=center --delay=3 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
+ msg_client.py --msg "Updates canceled.|middle"
fi
rm -fr /tmp/to_be_upgraded
diff --git a/abs/core/LinHES-system/linhes_update3.sh b/abs/core/LinHES-system/linhes_update3.sh
deleted file mode 100644
index 72641db..0000000
--- a/abs/core/LinHES-system/linhes_update3.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-
-sudo killall osd_cat
-cat /tmp/to_be_upgraded | sed 's/ /\n/g' | sed '/^$/d' | grep - > /tmp/to_be_upgraded2
-COUNT=$(wc -l /tmp/to_be_upgraded2 | awk '{print $1}')
-if [ $COUNT -lt 20 ]
- then
- cat /tmp/to_be_upgraded2 | osd_cat --lines=20 --pos=top --align=center --delay=12 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
- else
- cat /tmp/to_be_upgraded2 | osd_cat --lines=20 --pos=top --align=center --delay=1 --wait --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
-fi
-if grep kernel26 /tmp/to_be_upgraded2
-then
- killall -9 osd_cat
- echo -e "Please note:\The kernel will be upgraded.\nThis will require a reboot.\nPlease do so when no jobs are running." | osd_cat --pos=middle --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
-else
- exit
-fi
--
cgit v0.12
From d6560b4da709f229d12c7eec7c088b50f0b474db Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 11:43:27 -0500
Subject: LinHES-system: remove myth_mts.lr as rsyslog and log_care take care
of log rotation
---
abs/core/LinHES-system/PKGBUILD | 9 ++-------
abs/core/LinHES-system/myth_mtc.lr | 9 ---------
2 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100644 abs/core/LinHES-system/myth_mtc.lr
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 5bc00d4..b21ff84 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -27,8 +27,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
source=(LinHES-session LinHES-profile.sh $binfiles
- alsa-base myth_mtc.lr
- diskspace.cron cacheclean.cron xfs_defrag.cron
+ alsa-base diskspace.cron cacheclean.cron xfs_defrag.cron
readme_is_xml readme_light add_storage.readme
system-sudo.rules )
@@ -64,9 +63,6 @@ package() {
install -m755 -D $srcdir/diskspace.cron $pkgdir/etc/cron.tenminutes/diskspace
install -m755 -D $srcdir/xfs_defrag.cron $pkgdir/etc/cron.weekly/xfs_defrag
- #logrotate files
- install -m644 -D $srcdir/myth_mtc.lr $pkgdir/etc/logrotate.d/myth_mtc
-
#sudo rules
mkdir -p $pkgdir/etc/sudoers.d/
chmod 750 $pkgdir/etc/sudoers.d/
@@ -125,7 +121,6 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
'eb879fee9603a05d5420d4ce8ed9e450'
- '6782771960c495aeb597893f37d1e5ee'
'84492954db16740f949d795b74383189'
'02c810c2f47b7c4495fdacaf54189473'
'474d5c6883fcfffae4f199aceb3b1356'
diff --git a/abs/core/LinHES-system/myth_mtc.lr b/abs/core/LinHES-system/myth_mtc.lr
deleted file mode 100644
index 2b2fbba..0000000
--- a/abs/core/LinHES-system/myth_mtc.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/myth_mtc.log {
- copytruncate
- daily
- #size 1M
- missingok
- rotate 7
- compress
- notifempty
-}
--
cgit v0.12
From ab7fa7b3c11b2cf1cfe49cb66149ef3d0d67b6b7 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 12:15:08 -0500
Subject: linhes-scripts: remove acl_fix.fstab.py as it isn't needed in R8.
Remove linhes-scripts as a dep from LinHES-system, certmaster, e16_theme_settings and wmaker_settings as acl_fix_fstab.py was the reason for the dep.
---
abs/core/LinHES-system/PKGBUILD | 8 ++--
abs/core/certmaster/PKGBUILD | 27 ++++++-----
abs/core/e16_theme_settings/PKGBUILD | 6 +--
abs/core/linhes-scripts/PKGBUILD | 6 +--
abs/core/linhes-scripts/acl_fix_fstab.py | 64 --------------------------
abs/core/linhes-scripts/linhes-scripts.install | 7 ---
abs/core/wmaker_settings/PKGBUILD | 6 +--
7 files changed, 27 insertions(+), 97 deletions(-)
delete mode 100644 abs/core/linhes-scripts/acl_fix_fstab.py
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index b21ff84..94b94fb 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,14 +1,14 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=9
+pkgrel=10
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
license=('GPL2')
depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
- 'python_aosd' 'linhes-scripts>=7-24' 'udisks'
- 'LinHES-config>=2.3-59' 'sudo' 'python2-dbus' 'unclutter'
- 'wmctrl' 'archlinux-xdg-menu' 'ethtool' 'gnu-netcat')
+ 'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo'
+ 'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu'
+ 'ethtool' 'gnu-netcat')
backup=('etc/modprobe.d/alsa-base.conf')
binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
diff --git a/abs/core/certmaster/PKGBUILD b/abs/core/certmaster/PKGBUILD
index 0c2bb91..85cb0f1 100644
--- a/abs/core/certmaster/PKGBUILD
+++ b/abs/core/certmaster/PKGBUILD
@@ -1,10 +1,10 @@
pkgname=certmaster
pkgver=0.28
-pkgrel=3
+pkgrel=4
pkgdesc="certmaster"
url="https://fedorahosted.org/certmaster/ "
license="gpl"
-depends=('pyopenssl' 'linhes-scripts>=7-24' )
+depends=('pyopenssl')
makedepends=()
conflicts=()
replaces=()
@@ -16,17 +16,20 @@ source=($pkgname-$pkgver.tar.gz certmaster.conf minion.conf logrotate-certmaster
arch=('i686' 'x86_64')
build() {
- cd $startdir/src/$pkgname-${pkgver}
+ cd $srcdir/$pkgname-${pkgver}
python setup.py build
- python setup.py install --prefix=$startdir/pkg/usr
- cd $startdir/src
- install -m755 -D minion.conf $startdir/pkg/etc/certmaster/minion.conf
- install -m755 -D certmaster.conf $startdir/pkg/etc/certmaster/certmaster.conf
- install -m644 -D logrotate-certmaster.conf $startdir/pkg/etc/logrotate.d/certmaster
- mkdir -p $startdir/pkg/var/log/certmaster
- cd $startdir/pkg
- find ./usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
- find ./ -name "*.pyc" -print | xargs rm -f
+ python setup.py install --prefix=$pkgdir/usr
+}
+
+package() {
+ cd $srcdir
+ install -m755 -D minion.conf $pkgdir/etc/certmaster/minion.conf
+ install -m755 -D certmaster.conf $pkgdir/etc/certmaster/certmaster.conf
+ install -m644 -D logrotate-certmaster.conf $pkgdir/etc/logrotate.d/certmaster
+ mkdir -p $pkgdir/var/log/certmaster
+ cd $pkgdir
+ find $pkgdir/usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
+ find $pkgdir/ -name "*.pyc" -print | xargs rm -f
}
md5sums=('f5acc9ff1efa34971296e26d794c5b35'
'953ff601e5381b457383e7a3c4928192'
diff --git a/abs/core/e16_theme_settings/PKGBUILD b/abs/core/e16_theme_settings/PKGBUILD
index 4616e97..4526103 100644
--- a/abs/core/e16_theme_settings/PKGBUILD
+++ b/abs/core/e16_theme_settings/PKGBUILD
@@ -1,15 +1,15 @@
pkgname=e16_theme_settings
pkgver=1.0
-pkgrel=15
+pkgrel=16
pkgdesc="Default settings for e16"
-depends=(enlightenment 'linhes-scripts>=7-24')
+depends=('enlightenment')
source=()
arch=('i686' 'x86_64')
groups=(alt_wm)
install=e16.install
configdir=/usr/share/wm_data
backup=('usr/share/wm_data/e16_config_dir/e_config--0.0.cfg')
-build() {
+package() {
echo $startdir
mkdir -p $pkgdir/$configdir
rsync -arp --exclude=.svn $startdir/e16_config_dir $pkgdir/$configdir
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index e78d857..0c81167 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=54
+pkgrel=55
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -39,7 +39,6 @@ qip7100-cc.sh
dtheme.sh
upgrade_screen_rc
upgrade_linhes_script.sh
-acl_fix_fstab.py
stop_xss.sh
myth2mkv
LinHES-osd
@@ -51,7 +50,7 @@ package() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -d ${pkgdir}/usr/LH/etc
- install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/
+ install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/
install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/
mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise
cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run
@@ -89,7 +88,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'35693f50939d5827aeabfce8c5dce589'
'974c137d3fcb85942ba8945a1bc815fe'
'f454faeabfa153b10389a9a3bfd51c4a'
- 'cc9cdabcdfc969c2829b58c0e513488c'
'54a478660d0f8150fe10112a9ecf2740'
'503df99218373dfc75e7e7f5e449a44e'
'b608044c9e7530a400d8f5b88fdfe6e6'
diff --git a/abs/core/linhes-scripts/acl_fix_fstab.py b/abs/core/linhes-scripts/acl_fix_fstab.py
deleted file mode 100644
index 187cab1..0000000
--- a/abs/core/linhes-scripts/acl_fix_fstab.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python2
-import os
-import sys
-import subprocess as sub
-
-def should_add_acl(mount_point,fs_map):
- acl_fs_list=["ext3","ext4"]
- rc = False
- for i in fs_map:
- if i[0] == mount_point:
- if i[1] in acl_fs_list:
- rc = True
-
- return rc
-
-
-cmd="cp -f /etc/fstab /etc/fstab.backup.pre_acl"
-os.system(cmd)
-f = open('/etc/fstab', 'r')
-fstab=f.readlines()
-f.close()
-
-p = sub.Popen(['/sbin/fsck','-N' ],stdout=sub.PIPE,stderr=sub.PIPE)
-output, errors = p.communicate()
-output = output.split("\n")
-fs_map=[]
-for i in output:
- if i.startswith("["):
- split_line=i.split()
- #find mount_p and remove the last char
- mount_p = split_line[3][:-1]
- fstype = split_line[4].split(".")[1]
- append_tuple=(mount_p,fstype)
- fs_map.append(append_tuple)
-
-
-
-mp=['/' , '/myth', '/data']
-newfstab=[]
-for line in fstab:
- new_line=line
- split_line=line.split()
- try:
- if split_line[1] in mp and should_add_acl(split_line[1],fs_map):
- #print split_line[3]
- if "acl" in split_line[3]:
- pass
- else:
- print "Adding ACL"
- new_acl=split_line[3]+",acl"
- split_line[3]=new_acl
- new_line='\t'.join(split_line)
- except:
- pass
- newfstab.append(new_line)
-
-
-f = open('/etc/fstab', 'w')
-for i in newfstab:
- f.write(i)
- f.write("\n")
-
-f.close()
-
diff --git a/abs/core/linhes-scripts/linhes-scripts.install b/abs/core/linhes-scripts/linhes-scripts.install
index d4c9e59..f554bd0 100644
--- a/abs/core/linhes-scripts/linhes-scripts.install
+++ b/abs/core/linhes-scripts/linhes-scripts.install
@@ -2,13 +2,6 @@
post_upgrade() {
. /etc/profile
/usr/LH/bin/remove_php_mythvideo.sh
- if [ "`vercmp $2 7-24`" -lt 0 ]
- then
- echo "Applying ACL fix and remounting /"
- /usr/LH/bin/acl_fix_fstab.py
- mount -o remount /
- fi
-
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/core/wmaker_settings/PKGBUILD b/abs/core/wmaker_settings/PKGBUILD
index 8b29e41..0ad0dfd 100644
--- a/abs/core/wmaker_settings/PKGBUILD
+++ b/abs/core/wmaker_settings/PKGBUILD
@@ -1,14 +1,14 @@
pkgname=wmaker_settings
pkgver=1.0
-pkgrel=18
+pkgrel=19
pkgdesc="Default settings for windowmaker+ theme"
-depends=('windowmaker' 'linhes-scripts>=7-24')
+depends=('windowmaker')
source=()
arch=('i686' 'x86_64')
groups=(alt_wm)
install=wmaker_settings.install
configdir=/usr/share/wm_data
-build() {
+package() {
echo $startdir
mkdir -p $pkgdir/$configdir
rsync -arp --exclude=.svn $startdir/GNUstep $pkgdir/$configdir
--
cgit v0.12
From 5e44c4adc1cc8bd90226ad3c078c4c3924bd8da6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 12:43:35 -0500
Subject: LinHES-system: msg_client.py: update usage text
diskspace.sh: remove old osd settings
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/diskspace.sh | 13 -------------
abs/core/LinHES-system/msg_client.py | 20 ++++++++++++--------
3 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 94b94fb..9abf04a 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -92,12 +92,12 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'1be1d3dfc83f828eede93055713882ae'
'47e093e8cfe4b5b96602358e1f540832'
'a8e486f5d23913242b6edb862bf44c0e'
- 'b9b0a8370f46f0b5e144a66897e8eefb'
+ '7bd8c0e96631be95086621b1d818aa95'
'6519d209e151cdc39ae7e1091d189c3e'
'8f474e019d5fcb775497aca355d61b0b'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
- '0e76cd8f320a852a162931450a1fb8b7'
+ '4abc4780fa78ed40c07401b3cd25209b'
'645297f5905e87eb99999d5a0f3f069a'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
diff --git a/abs/core/LinHES-system/diskspace.sh b/abs/core/LinHES-system/diskspace.sh
index 635a972..d27221a 100755
--- a/abs/core/LinHES-system/diskspace.sh
+++ b/abs/core/LinHES-system/diskspace.sh
@@ -16,7 +16,6 @@ AWK='/usr/bin/awk'
CUT='/usr/bin/cut'
HOSTNAME='/usr/bin/hostname'
DATE='/bin/date'
-OSD_CAT='/usr/bin/osd_cat'
MSG_CLIENT='/usr/LH/bin/msg_client.py --msg'
export DISPLAY=:0.0
#
@@ -40,17 +39,6 @@ for ARG in "$@" ; do
esac
done
-#----------------------------------------------------------------------------
-. /etc/osd_cat.cfg || {
- color=yellow
- outline=2
- outlinecolour=black
- shadow=0
- shadowcolour=black
- font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-}
-#----------------------------------------------------------------------------
-
[ $VERBOSE = true ] && echo "Checking free disk space on ${THIS_HOST}"
[ $VERBOSE = true ] && echo "Threshold for warning is ${ALERT}%"
[ $VERBOSE = true ] && echo "------------------------------------------------------------------"
@@ -73,7 +61,6 @@ $DF -HPl | $GREP -E "^/dev/" | $AWK '{ print $5 " " $6 " " $1 }' | while read OU
else
echo "WARNING: ${PARTITION} (${DEVICE}) is ${USED_PCENT}% full on ${THIS_HOST}." #|
if [ $OSD = true ] && [ ${PARTITION} = / ]; then
- #echo "WARNING: The root (${PARTITION}) partition is ${USED_PCENT}% full on ${THIS_HOST}." | $OSD_CAT --pos=top --offset=40 --align=center --delay=10 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font &
$MSG_CLIENT "WARNING: The root (${PARTITION}) partition is ${USED_PCENT}% full on ${THIS_HOST}."
fi
fi
diff --git a/abs/core/LinHES-system/msg_client.py b/abs/core/LinHES-system/msg_client.py
index 54c2e54..8c5e3c4 100755
--- a/abs/core/LinHES-system/msg_client.py
+++ b/abs/core/LinHES-system/msg_client.py
@@ -33,8 +33,8 @@ def send_message(message):
def usage():
line = '''
Help screen:
- msg_client.py is used to add,remove, or list items in the queue of messages that
- will be displayed on screen. Optionaly messages can be given an identifier or "tag".
+ msg_client.py is used to add, remove, or list items in the queue of messages that
+ will be displayed on screen. Optionally messages can be given an identifier or "tag".
This identifier does not have to be unique.
Items are processed in the order they arrive, based off their slot number.
@@ -43,19 +43,23 @@ def usage():
ADD:
- To add items to the queue:
- msg_client.py --msg "My first message" --tag "tag1"
+ To add items to the queue:
+ msg_client.py --msg "My first message" --tag "tag1"
+
+ To add a message with a line break use \\n:
+ msg_client.py --msg "My first\\nmessage" --tag "tag1"
+
REMOVE:
Removing items are based off the tag.
To remove all items from the queue that match the tag "tag1":
- msg_client.py --clear --tag tag1
+ msg_client.py --clear --tag "tag1"
To remove all items from the queue:
- msg_client.py --clear
+ msg_client.py --clear
- Listing items in the queue or to get the total count:
+ Listing items in the queue or to get the total item count:
msg_client.py --print_list
> -------------
> msg : slot 1
@@ -75,7 +79,7 @@ if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument('--tag', action='store', dest='tag',help='message tag')
- parser.add_argument('--timeout', action='store', dest='timeout',help='time to display message')
+ parser.add_argument('--timeout', action='store', dest='timeout',help='time to display message in seconds')
action = parser.add_mutually_exclusive_group(required=True)
action.add_argument('--msg', action='store', dest='msg', help='Add message to the queue')
action.add_argument('--clear', action='store_true', help='Remove message from queue that match tag')
--
cgit v0.12
From e0e80fb41248e5691afdcda5f34ec8364d3c2c5f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 13:55:19 -0500
Subject: LinHES-system: move stop_xss.sh from linhes-scripts.
remove stop_xss.sh from linhes-scripts. Remove linhes-scripts as a dep of web-on-linhes and xbmc.
---
abs/core/LinHES-system/PKGBUILD | 5 +++--
abs/core/LinHES-system/stop_xss.sh | 12 ++++++++++++
abs/core/linhes-scripts/PKGBUILD | 4 +---
abs/core/linhes-scripts/stop_xss.sh | 12 ------------
abs/extra/web-on-linhes/PKGBUILD | 6 +++---
abs/extra/xbmc/PKGBUILD | 4 ++--
6 files changed, 21 insertions(+), 22 deletions(-)
create mode 100755 abs/core/LinHES-system/stop_xss.sh
delete mode 100644 abs/core/linhes-scripts/stop_xss.sh
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 9abf04a..82cc14b 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=11
+pkgrel=12
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -21,7 +21,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
gen_is_xml.py gen_lib_xml.py gen_light_include.py gen_game_xml.py
misc_recent_recordings.pl misc_status_config.py misc_status_info.sh
misc_upcoming_recordings.pl misc_which_recorder.pl
- change_channel.sh change_channel_wrapper.sh
+ change_channel.sh change_channel_wrapper.sh stop_xss.sh
be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
linhes_update.sh linhes_update2.sh
mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
@@ -110,6 +110,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'116b0f62ed4e8dd6e437930deeb6e49e'
'17f678d37187be0f12d67f64e40429c6'
'bacc813b48bafcc6fe906e5969930501'
+ '54a478660d0f8150fe10112a9ecf2740'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
diff --git a/abs/core/LinHES-system/stop_xss.sh b/abs/core/LinHES-system/stop_xss.sh
new file mode 100755
index 0000000..4bb9d1a
--- /dev/null
+++ b/abs/core/LinHES-system/stop_xss.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+while [ 1=1 ];
+do
+
+ if [ "$(pidof chromium)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)" ]
+ then
+ xscreensaver-command -deactivate
+ fi
+ sleep 60
+
+done
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 0c81167..050c4e2 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=55
+pkgrel=56
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
@@ -39,7 +39,6 @@ qip7100-cc.sh
dtheme.sh
upgrade_screen_rc
upgrade_linhes_script.sh
-stop_xss.sh
myth2mkv
LinHES-osd
ripD_eject.sh
@@ -88,7 +87,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'35693f50939d5827aeabfce8c5dce589'
'974c137d3fcb85942ba8945a1bc815fe'
'f454faeabfa153b10389a9a3bfd51c4a'
- '54a478660d0f8150fe10112a9ecf2740'
'503df99218373dfc75e7e7f5e449a44e'
'b608044c9e7530a400d8f5b88fdfe6e6'
'e2e24dd59d5d576cc33feafb329fa302'
diff --git a/abs/core/linhes-scripts/stop_xss.sh b/abs/core/linhes-scripts/stop_xss.sh
deleted file mode 100644
index 4bb9d1a..0000000
--- a/abs/core/linhes-scripts/stop_xss.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-while [ 1=1 ];
-do
-
- if [ "$(pidof chromium)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)" ]
- then
- xscreensaver-command -deactivate
- fi
- sleep 60
-
-done
diff --git a/abs/extra/web-on-linhes/PKGBUILD b/abs/extra/web-on-linhes/PKGBUILD
index 61abc93..64afe1e 100644
--- a/abs/extra/web-on-linhes/PKGBUILD
+++ b/abs/extra/web-on-linhes/PKGBUILD
@@ -3,16 +3,16 @@
pkgname=web-on-linhes
pkgver=1.00.0
-pkgrel=6
+pkgrel=7
pkgdesc="Added multiple websites with 10' UIs to Play Online Streams."
arch=('i686' 'x86_64')
license=('GPL2')
url="http://www.linhes.org/"
-depends=('google-chrome' 'linhes-scripts>=7-29' )
+depends=('google-chrome')
install=web-on-linhes.install
source=('web-on-linhes.sh' 'web-on-linhes_is.conf')
-build() {
+package() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -D -m755 *.sh ${pkgdir}/usr/LH/bin
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 33fbb70..e496886 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -9,7 +9,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=12.2
-pkgrel=5
+pkgrel=6
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -19,7 +19,7 @@ depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez-libs' 'glu'
- 'tinyxml' 'taglib' 'linhes-scripts>=7-31')
+ 'tinyxml' 'taglib')
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
--
cgit v0.12
From 13db4e5f492412b8127322169ffc8e75c3ea4ef4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 15:23:51 -0500
Subject: LinHES-system: stop_xss.sh: google-chrome replaces chromium
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/stop_xss.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 82cc14b..03e5eca 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=12
+pkgrel=13
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -110,7 +110,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'116b0f62ed4e8dd6e437930deeb6e49e'
'17f678d37187be0f12d67f64e40429c6'
'bacc813b48bafcc6fe906e5969930501'
- '54a478660d0f8150fe10112a9ecf2740'
+ '8e02efe1ad0df9a179075147eebb05b9'
'8b0298f70f97cc1dc2a58b9a73c64bd3'
'911b0fbc8d9178dac1a193346c9decaf'
'34fc1f58ad1eabf4eff4979d420760c0'
diff --git a/abs/core/LinHES-system/stop_xss.sh b/abs/core/LinHES-system/stop_xss.sh
index 4bb9d1a..b03169b 100755
--- a/abs/core/LinHES-system/stop_xss.sh
+++ b/abs/core/LinHES-system/stop_xss.sh
@@ -3,7 +3,7 @@
while [ 1=1 ];
do
- if [ "$(pidof chromium)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)" ]
+ if [ "$(pidof google-chrome)" -o "$(pidof huludesktop)" -o "$(pidof xbmc.bin)" ]
then
xscreensaver-command -deactivate
fi
--
cgit v0.12
From 2c5a67ec9f7176f022449415a48f48d89cf0afad Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 16 Sep 2013 17:08:01 -0500
Subject: LinHES-system: move get_airplay_key, importfile.sh, myth2mkv,
myth2mp3, and ripD_eject.sh from linhes-scripts
---
abs/core/LinHES-system/PKGBUILD | 14 +-
abs/core/LinHES-system/get_airplay_key | 6 +
abs/core/LinHES-system/importfiles.sh | 18 ++
abs/core/LinHES-system/myth2mkv | 433 ++++++++++++++++++++++++++++++++
abs/core/LinHES-system/myth2mp3 | 96 +++++++
abs/core/LinHES-system/ripD_eject.sh | 125 +++++++++
abs/core/linhes-scripts/PKGBUILD | 18 +-
abs/core/linhes-scripts/get_airplay_key | 6 -
abs/core/linhes-scripts/importfiles.sh | 18 --
abs/core/linhes-scripts/myth2mkv | 433 --------------------------------
abs/core/linhes-scripts/myth2mp3 | 96 -------
abs/core/linhes-scripts/ripD_eject.sh | 125 ---------
12 files changed, 692 insertions(+), 696 deletions(-)
create mode 100755 abs/core/LinHES-system/get_airplay_key
create mode 100755 abs/core/LinHES-system/importfiles.sh
create mode 100644 abs/core/LinHES-system/myth2mkv
create mode 100755 abs/core/LinHES-system/myth2mp3
create mode 100755 abs/core/LinHES-system/ripD_eject.sh
delete mode 100755 abs/core/linhes-scripts/get_airplay_key
delete mode 100755 abs/core/linhes-scripts/importfiles.sh
delete mode 100644 abs/core/linhes-scripts/myth2mkv
delete mode 100755 abs/core/linhes-scripts/myth2mp3
delete mode 100755 abs/core/linhes-scripts/ripD_eject.sh
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 03e5eca..ee79c88 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=13
+pkgrel=14
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -8,12 +8,13 @@ license=('GPL2')
depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo'
'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu'
- 'ethtool' 'gnu-netcat')
+ 'ethtool' 'gnu-netcat' 'normalize'
+ 'handbrake-cli' 'mkvtoolnix' 'mplayer')
backup=('etc/modprobe.d/alsa-base.conf')
binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
LinHES-run load-modules-mythvantage.sh unclutter-toggle.sh tvterm.sh
mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh
- install_supplemental_service.sh
+ install_supplemental_service.sh get_airplay_key importfiles.sh
lh_system_backup lh_system_backup_job lh_system_restore_job
lh_system_host_update lh_system_all_host_update
add_storage.py diskspace.sh cacheclean lh_backend_control.sh
@@ -23,7 +24,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
misc_upcoming_recordings.pl misc_which_recorder.pl
change_channel.sh change_channel_wrapper.sh stop_xss.sh
be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
- linhes_update.sh linhes_update2.sh
+ linhes_update.sh linhes_update2.sh myth2mkv myth2mp3 ripD_eject.sh
mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
source=(LinHES-session LinHES-profile.sh $binfiles
@@ -86,6 +87,8 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'692563448cca1d49f45e7d1c8abcaa0c'
'962a3e9eaba2d1466251b7ab0956705d'
'1758aed160de64abfafb28a3a8f3390e'
+ '33fbebbd546672cedd3c5e7350ab414e'
+ '6b6e7d34a4bda6d608d150039adefd07'
'3edef50a49a47694bf8add39cc160add'
'5e17e0786afd891550a660f646076308'
'bc69a520add58ede9b060c73e67ace13'
@@ -118,6 +121,9 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'a94fe6d980f4b810f2e2ae5352084b39'
'e1011e0df090372cccc03ecf9d6805c7'
'd14335afe7dafa035a70399210e0df1a'
+ '503df99218373dfc75e7e7f5e449a44e'
+ '4a1fda884dcd7d65fb2690fbdbd92a83'
+ 'e2e24dd59d5d576cc33feafb329fa302'
'92950f0ffb1faf1ed64c6be2b8fbc3f6'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
diff --git a/abs/core/LinHES-system/get_airplay_key b/abs/core/LinHES-system/get_airplay_key
new file mode 100755
index 0000000..89a40dd
--- /dev/null
+++ b/abs/core/LinHES-system/get_airplay_key
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. /usr/MythVantage/bin/install_functions.sh
+curl https://raw.github.com/juhovh/shairplay/master/airport.key > $MYTHHOME/.mythtv/RAOPKey.rsa
+chmod 755 $MYTHHOME/.mythtv/RAOPKey.rsa
+chown mythtv:mythtv $MYTHHOME/.mythtv/RAOPKey.rsa
\ No newline at end of file
diff --git a/abs/core/LinHES-system/importfiles.sh b/abs/core/LinHES-system/importfiles.sh
new file mode 100755
index 0000000..84f1ab5
--- /dev/null
+++ b/abs/core/LinHES-system/importfiles.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+export FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+
+DVD_or_CD=`cat /proc/mounts |grep iso9660|awk '{print $2}'|tail -1`
+if [ "$DVD_or_CD" != "" ]; then
+ echo "Copying files from $DVD_or_CD to /myth/video." > /tmp/screens
+ echo "This could take several minutes, depending on the" >> /tmp/screens
+ echo "speed and size of your optical media." >> /tmp/screens
+ cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=0 &
+ /bin/cp -R $DVD_or_CD/* /myth/video/
+ killall osd_cat
+ echo "Copied videos from $DVD_or_CD to /myth/video" > /tmp/screens
+ cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=2 &
+else
+ echo "No optical media found. If you just inserted" > /tmp/screens
+ echo "your media, please wait a moment and try again." >> /tmp/screens
+ cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=5 &
+fi
diff --git a/abs/core/LinHES-system/myth2mkv b/abs/core/LinHES-system/myth2mkv
new file mode 100644
index 0000000..aedccff
--- /dev/null
+++ b/abs/core/LinHES-system/myth2mkv
@@ -0,0 +1,433 @@
+#!/bin/bash
+#
+# Convert video to AVC-1 / h264
+#
+# version 0.25-004
+#
+# Prerequisites:
+# - mythtv >= 0.25
+# - handbrake-cli
+# - mplayer
+# - mkvtoolnix
+#
+# Arguments
+# $1 must be the directory/file of the recording
+# $2 must be chanid
+# $3 must be starttime
+# $4 must be title
+# $5 must be subtitle
+# $6 must be jobid
+# $7 must be quality of encode
+#
+# As a MythTV user job:
+# myth2mkv "%DIR%/%FILE%" "%CHANID%" "%STARTTIME%" "%TITLE%" "%SUBTITLE%" "%JOBID%" HQ|MQ|LQ
+
+########################
+# #
+# Adjustable variables #
+# #
+########################
+
+OUTDIR=/myth/video
+LOGPATH=/var/log/mythtv
+LOGFILE=${LOGPATH}/myth2mkv-$$.log
+
+# TMPDIR is for large transient files
+TMPDIR=/myth/tmp
+
+# x264 tuning:
+# Tune x264 based on content. Valid options for TUNING are:
+# film, animation, grain, stillimage, psnr, ssim, fastdecode, zerolatency
+# Separate multiple options with a comma. DEFAULT: none
+TUNING=""
+
+# Custom cropping. Useful if you have a 4:3 image in a HD frame or if
+# HandBrake's autocrop smarts fail you.
+# Crop 240 pixels off the left and right for 4:3 image in 1920x1080 frame
+# Crop 160 pixels off the left and right for 4:3 image in 1280x720 frame
+# <T:B:L:R>
+# i.e. 0:0:240:240
+# Default: In HQ: CROP="0:0:0:0" (no cropping).
+# IN MQ and LQ: autocrop.
+CROP=""
+
+# Force custom output resolution.
+# Default: Keep same resolution as input file (less any cropping).
+WIDTH=""
+HEIGHT=""
+
+# Force use/non-use of deinterlacing filter. Y|N|G (Yes, No, Guess)
+# Default: G - Guess based on source resolution.
+# If the source video width is 1920, 1440, 852, 704, 640 or 528 pixels
+# "G" will deinterlace the video. Change to "Y" to force use of deinterlacing
+# filter or to "N" to NOT use deinterlace filter no matter the resolution.
+DEINT="G"
+
+############################
+# #
+# End adjustable variables #
+# #
+############################
+
+if [[ -e $HOME/.mythtv/mysql.txt ]] ; then
+ . $HOME/.mythtv/mysql.txt
+else
+ DBHostName=${DBHostName:-"localhost"}
+ DBUserName=${DBUserName:-"mythtv"}
+ DBPassword=${DBPassword:-"mythtv"}
+ DBName=${DBName:-"mythconverg"}
+fi
+
+if [[ ! -d ${TMPDIR} ]] ; then
+ mkdir -p ${TMPDIR}
+fi
+
+if [[ ! -d ${OUTDIR} ]] ; then
+ mkdir -p ${OUTDIR}
+fi
+
+#------FUNCTIONS---------------
+update_comment()
+# Arg_1 = COMMENT
+{
+if [ ${NO_JOBID} -eq 0 ]; then
+ SQL_CMD="update jobqueue set comment=\"${1}\" where id=\"${JOBID}\";"
+ `${MYSQLCMD} "${SQL_CMD}"`
+fi
+}
+
+check_background_progress()
+# check handbrake progress in background
+{
+while [ `tail -2 ${STATUSFILE} | grep -c "^HandBrake has exited"` = 0 ]
+do
+ sleep 10
+ check_myth_jobcmds
+ pass=`tail -1 ${STATUSFILE} | egrep -o -e 'task [0-9]' | tail -1 | sed 's/task\ //g'`
+ prog_percent=`tail -1 ${STATUSFILE} | egrep -o -e '[0-9]*\.[0-9]. %' | tail -1 | sed 's/\ %//g'`
+ current_FPS=`tail -1 ${STATUSFILE} | egrep -o -e 'avg [0-9.]*\.[0-9]* fps' | tail -1 | sed -e 's/avg\ //g' -e 's/\ fps//g'`
+ current_ETA=`tail -1 ${STATUSFILE} | egrep -o -e 'ETA [0-9.][0-9.]h[0-9.][0-9.]m[0-9.][0-9.]s' | tail -1`
+ if [ -n "$prog_percent" ]; then
+ echo "Pass ${pass}, ${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
+ update_comment "Pass ${pass} of 2, ${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
+ fi
+ sleep 10
+done
+}
+
+check_myth_jobcmds()
+# check the myth database for stop pause or resume commands
+{
+if [[ ${NO_JOBID} -eq 0 ]] ; then
+ CURRENT_CMD=`${MYSQLCMD} "select cmds from jobqueue where id = \"${JOBID}\";"`
+ case "${CURRENT_CMD}" in
+ # JOB_RUN
+ 0) ;;
+ # JOB_PAUSE
+ 1) `${MYSQLCMD} "update jobqueue set status=\"6\" where id=\"${JOBID}\";"`
+ kill -s STOP ${handbrake_pid} ;;
+ # JOB_RESUME
+ 2) `${MYSQLCMD} "update jobqueue set status=\"4\" where id=\"${JOBID}\";"`
+ `${MYSQLCMD} "update jobqueue set cmds=\"0\" where id=\"${JOBID}\";"`
+ kill -s CONT ${handbrake_pid} ;;
+ # JOB_STOP
+ 4) `${MYSQLCMD} "update jobqueue set status=\"5\" where id=\"${JOBID}\";"`
+ `${MYSQLCMD} "update jobqueue set cmds=\"0\" where id=\"${JOBID}\";"`
+ kill -9 ${handbrake_pid} ${command_pid}
+ clean_up_files
+ echo "Encode Cancelled" >> ${LOGFILE}
+ `${MYSQLCMD} "update jobqueue set status=\"320\" where id=\"${JOBID}\";"`
+ exit ;;
+ esac
+fi
+}
+
+get_info_for_hb() {
+# Collect some info about source file
+
+/usr/bin/mplayer -nolirc -identify -frames 0 "${HBINPUTFILE}" \
+ 2>/dev/null 1>"${IDFILE}"
+
+VIDEOW=$( grep ID_VIDEO_WIDTH= "${IDFILE}" | awk -F= '{ print $NF }' )
+FPS=$( grep ID_VIDEO_FPS= "${IDFILE}" | awk -F= '{ print $NF }' )
+
+# HandBrake does not like a framerate of 29.970, so let's drop the 0
+if [[ ${FPS} = "29.970" ]] ; then
+ FPS="29.97"
+fi
+
+# HandBrake does not like a framerate of 59.940, so let's drop the 0
+if [[ ${FPS} = "59.940" ]] ; then
+ FPS="59.94"
+fi
+
+# A rough guestimation that if the video width is 1920, 1440, 852, 704, 640 or
+# 528 pixels it is probably interlaced.
+if [[ ${DEINT} = Y ]] ; then
+ DEINT="-d slow"
+else
+ if [[ ${DEINT} = N ]] ; then
+ DEINT=""
+ else
+ if [[ ${VIDEOW} = 1920 || ${VIDEOW} = 1440 || ${VIDEOW} = 852 || \
+ ${VIDEOW} = 704 || ${VIDEOW} = 640 || ${VIDEOW} = 528 ]] ; then
+ DEINT="-d slow"
+ else
+ DEINT=""
+ fi
+ fi
+fi
+
+if [[ -n ${DEINT} ]] ; then
+ if [[ ${QUALITY} = LQ ]] ; then
+ DEINT="-d fast"
+ fi
+fi
+
+if [[ -n ${TUNING} ]] ; then
+ TUNING="--x264-tune ${TUNING}"
+fi
+
+if [[ -n ${CROP} ]] ; then
+ CROP="--crop ${CROP}"
+fi
+
+if [[ -n ${WIDTH} ]] ; then
+ WIDTH="-w ${WIDTH} -X ${WIDTH}"
+fi
+
+if [[ -n ${HEIGHT} ]] ; then
+ HEIGHT="-l ${HEIGHT} -Y ${HEIGHT}"
+fi
+
+if [[ ${QUALITY} = HQ ]] ; then
+ if [[ -n ${CROP} ]] ; then
+ CROP="--crop ${CROP}"
+ else
+ CROP="--crop 0:0:0:0 --strict-anamorphic"
+ fi
+ HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -x b-adapt=2:rc-lookahead=50 -b 5000 -2 -T ${WIDTH} ${HEIGHT} -r ${FPS} --cfr ${CROP} ${DEINT} -a 1 -E copy -s 1"
+else
+ if [[ ${CROP} = "--crop 0:0:0:0" ]] ; then
+ CROP="${CROP} --strict-anamorphic"
+ fi
+ if [[ ${QUALITY} = LQ ]] ; then
+ HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -b 1250 ${WIDTH} ${HEIGHT} -r ${FPS} --pfr ${CROP} ${DEINT} -a 1 -E lame -B 128 -Q 8 -6 stereo -s 1"
+ else
+ # Fallback to "MQ"
+ HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -b 2500 -2 -T ${WIDTH} ${HEIGHT} -r ${FPS} --pfr ${CROP} ${DEINT} -a 1 -E lame -B 256 -Q 3 -6 stereo -s 1"
+ fi
+fi
+}
+
+get_handbrake_pid()
+{
+process_name=""
+i1=1
+while [ "${process_name}" != "found" ]; do
+ handbrake_pid=`expr ${handbrake_pid} + 1`
+ i1=`expr ${i1} + 1`
+ if [ "`ps ${handbrake_pid} | grep HandBrakeCLI | sed 's_.*\(HandBrakeCLI\).*_\1_'`" = "HandBrakeCLI" ]; then
+ process_name="found"
+ fi
+ if [ ${i1} -gt 20 ]; then
+ break
+ fi
+done
+}
+
+tag_file() {
+DATE=`date`
+
+# Create a tag file here
+echo "<?xml version='1.0' encoding='ISO-8859-1'?>" > "${TAG_FILE}"
+echo "" >> "${TAG_FILE}"
+echo "<!DOCTYPE Tags SYSTEM 'matroskatags.dtd'>" >> "${TAG_FILE}"
+echo "" >> "${TAG_FILE}"
+echo "<Tags>" >> "${TAG_FILE}"
+echo " <Tag>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>TITLE</Name>" >> "${TAG_FILE}"
+echo " <String>${TITLE}</String>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>SUBTITLE</Name>" >> "${TAG_FILE}"
+echo " <String>${SUBTITLE}</String>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>SUMMARY</Name>" >> "${TAG_FILE}"
+echo " <String>${DESCR}</String>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>DATE_RELEASED</Name>" >> "${TAG_FILE}"
+echo " <String>${OAD}</String>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>ENCODER</Name>" >> "${TAG_FILE}"
+echo " <String>HandBrakeCLI ${HBCLIVER}</String>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " <Simple>" >> "${TAG_FILE}"
+echo " <Name>DATE_TAGGED</Name>" >> "${TAG_FILE}"
+echo " <String>${DATE}</String>" >> "${TAG_FILE}"
+echo " </Simple>" >> "${TAG_FILE}"
+echo " </Tag>" >> "${TAG_FILE}"
+echo "</Tags>" >> "${TAG_FILE}"
+
+# Add tag info into MKV file
+echo "Adding tag info to ${TITLE} - ${SUBTITLE} ..." >> ${LOGFILE}
+
+/usr/bin/mkvpropedit -r ${LOGFILE} -t all:"${TAG_FILE}" "${TMPFILE}"
+}
+
+clean_up_files()
+# clean up left over files
+{
+unlink ${TMPFILE} 2> /dev/null
+unlink ${TMPCUTFILE} 2> /dev/null
+unlink ${TMPCUTFILE}.map 2> /dev/null
+unlink ${STATUSFILE} 2> /dev/null
+unlink ${IDFILE} 2> /dev/null
+unlink ${HB_RETURN_CODE} 2> /dev/null
+unlink ${TAG_FILE} 2> /dev/null
+}
+
+#-------MAIN SCRIPT------------
+
+# create temp filename so multiple instances won't conflict
+TMPNAME=toX264-$$
+TMPFILE=${TMPDIR}/${TMPNAME}.mkv
+TMPCUTFILE=${TMPDIR}/${TMPNAME}.mpg
+HBINPUTFILE="${1}"
+TITLE="${4}"
+SUBTITLE="${5}"
+JOBID="${6}"
+QUALITY="${7}"
+BASE=`basename ${HBINPUTFILE}`
+HBCLIVER=`pacman -Q | grep handbrake-cli | awk '{ print $NF }' | awk -F"-" '{ print $1 }'`
+STATUSFILE=/tmp/${TMPNAME}-status.log
+HB_RETURN_CODE=/tmp/${TMPNAME}-hb_return_code
+IDFILE=/tmp/${TMPNAME}-id.txt
+TAG_FILE=/tmp/${TMPNAME}.xml
+MYSQLCMD="mysql -B --skip-column-names -u ${DBUserName} -p${DBPassword} -h ${DBHostName} -D ${DBName} -e"
+OAD=`${MYSQLCMD} "select originalairdate from recorded where basename LIKE '${BASE}';"`
+DESCR=`${MYSQLCMD} "select description from recorded where basename LIKE '${BASE}';" | sed 's/\&/and/g'`
+USER=`whoami`
+
+# check if %JOBID% is passed from command line
+if [ -z ${JOBID} ]; then
+ NO_JOBID=1
+else
+ NO_JOBID=0
+fi
+
+# log file location
+CDate="`date`"
+echo "" >> ${LOGFILE}
+echo $CDate >> ${LOGFILE}
+echo "File to encode: ${HBINPUTFILE}" >> ${LOGFILE}
+echo " --> Name: ${TITLE} - ${SUBTITLE}" >> ${LOGFILE}
+echo " --> Temporary Files: ${TMPNAME}.*" >> ${LOGFILE}
+echo "" >> ${LOGFILE}
+
+get_info_for_hb
+ERROR=$?
+
+if [[ ${ERROR} != 0 ]] ; then
+ echo "Error parsing source file information!" >> ${LOGFILE}
+ cat ${IDFILE} >> ${LOGFILE}
+ clean_up_files
+ exit 1
+fi
+
+# start timer
+beforetime="$(date +%s)"
+
+check_myth_jobcmds
+
+# If there is a cutlist, use it:
+if [[ -n `mythutil --getcutlist --chanid "${2}" --starttime "${3}" | grep \
+ Cutlist: | awk -F": " '{ print $NF }'` ]] ; then
+ echo "Applying cutlist for ${TITLE} - ${SUBTITLE} ..." >> ${LOGFILE}
+ mythtranscode --chanid "${2}" --starttime "${3}" -m --honorcutlist \
+ -q --loglevel info --logpath "${LOGPATH}" -o "${TMPCUTFILE}"
+ mythtrans_pid=$!
+ ERROR=$?
+ HBINPUTFILE=${TMPCUTFILE}
+fi
+
+if [[ ${ERROR} != 0 ]] ; then
+ echo "MythTranscode error!" >> ${LOGFILE}
+ echo "Check ${LOGPATH}/mythtranscode.date.${mythtrans_pid}.log for mythtranscode error" >> ${LOGFILE}
+ clean_up_files
+ exit 1
+fi
+
+# run handbrake in background to do conversion
+echo "Encoding ${TITLE} - ${SUBTITLE} ..." >> ${LOGFILE}
+
+( /usr/bin/nice -n19 nohup /usr/bin/HandBrakeCLI -i ${HBINPUTFILE} ${HB_OPTS} \
+ > ${STATUSFILE} 2>&1 ; echo $? > ${HB_RETURN_CODE} ) &
+handbrake_pid=$!
+command_pid=${handbrake_pid}
+get_handbrake_pid
+
+check_background_progress
+
+if [[ `cat ${HB_RETURN_CODE}` != 0 ]] ; then
+ echo "HandBrakeCLI error!" >> ${LOGFILE}
+ cat ${STATUSFILE} >> ${LOGFILE}
+ clean_up_files
+ exit 1
+fi
+
+tag_file
+ERROR=$?
+
+if [[ ${ERROR} != 0 ]] ; then
+ echo "Error creating tag file!" >> ${LOGFILE}
+ cat ${TAG_FILE} >> ${LOGFILE}
+ clean_up_files
+ exit 1
+fi
+
+# make output filename unique and do not clobber an existing file
+# Build a final file name
+FILE=$( echo "${TITLE,,} ${OAD} ${SUBTITLE,,}" | tr -d [:punct:] | tr [:blank:] "_" | tr -s "_" )
+OUTPUTFILE="${OUTDIR}/${FILE}.mkv"
+i=1
+while [ -e "${OUTPUTFILE}" ]
+do
+ OUTPUTFILE="${OUTDIR}/${FILE}-${i}.mkv"
+ i=`expr $i + 1`
+done
+
+# move temp file to output location
+chown -v "${USER}" "${TMPFILE}" >> ${LOGFILE}
+mv -v "${TMPFILE}" "$OUTPUTFILE" >> ${LOGFILE}
+ERROR=$?
+
+if [[ ${ERROR} != 0 ]] ; then
+ echo "Error moving ${TMPFILE} to ${OUTPUTFILE} !" >> ${LOGFILE}
+ clean_up_files
+ exit 1
+fi
+
+# stop timer
+aftertime="$(date +%s)"
+seconds="$(expr ${aftertime} - ${beforetime})"
+
+if [ ${ERROR} -eq 0 ]; then
+ echo "File Encoded Successfully: ${OUTPUTFILE}" >> ${LOGFILE}
+ hours=$((seconds / 3600))
+ seconds=$((seconds % 3600))
+ minutes=$((seconds / 60))
+ seconds=$((seconds % 60))
+ echo "Encoding took ${hours} hour\(s\) ${minutes} minute\(s\) ${seconds} second\(s\) @ ${current_FPS} fps." >> ${LOGFILE}
+ `${MYSQLCMD} "update jobqueue set status = \"272\" where id = \"${JOBID}\";"`
+ update_comment "Encode Successful. Encoding Time: ${hours} hour\(s\) ${minutes} minute\(s\) ${seconds} second\(s\)"
+else
+ echo "ERROR: ${ERROR}" >> ${LOGFILE}
+fi
+
+# Clean up
+clean_up_files
diff --git a/abs/core/LinHES-system/myth2mp3 b/abs/core/LinHES-system/myth2mp3
new file mode 100755
index 0000000..69d5d3f
--- /dev/null
+++ b/abs/core/LinHES-system/myth2mp3
@@ -0,0 +1,96 @@
+#!/bin/sh
+# convert recordings to as mp3 audio only
+# version 1.1.3
+
+# usage:
+# first parameter must be %DIR%/%FILE% of the recording
+# second parameter must be the desired base name of the output
+# third parameter must be %CHANID% if you set USECUTLIST=Y
+# fourth parameter must be %STARTTIME% if you set USECUTLIST=Y
+# In the mythtv setup screen invoke this script like this:
+# MYTHTV User Job Command:
+# /usr/LH/bin/myth2mp3 "%DIR%/%FILE%" "%TITLE% - %SUBTITLE%" "%CHANID%" "%STARTTIME%"
+
+# options:
+BITRATE=256k #ie. 128k, 160k, 192k, 224k, 256k
+USECUTLIST=Y #Y or N
+
+# where the converted audio is stored
+OUT_DIR=/myth/music
+
+# create temp filename so multiple instances won't conflict
+TMPNAME=toMP3-$$
+TMPFILE=/myth/tmp/$TMPNAME
+TMPCUTFILE=/myth/tmp/$TMPNAME.mpg
+FFINPUTFILE=$1
+TITLE=`echo $2 | sed 's/\//_/g'`
+
+# log file location
+LOGFILE=/var/log/mythtv/myth2mp3.log
+CDate="`date`"
+echo "" >> $LOGFILE
+echo $CDate >> $LOGFILE
+echo "File to encode: $1 Name: $TITLE" >> $LOGFILE
+
+# start timer
+beforetime="$(date +%s)"
+
+# check if using cutlist
+if [ $USECUTLIST = Y ];then
+ MYTHCOMMFRAMES=`mythutil --getcutlist --chanid "$3" --starttime "$4" | grep 'Cutlist:' | cut -d \ -f 2`
+ if [ -n "$MYTHCOMMFRAMES" ]; then
+ echo "Extracting Cutlist..." >> $LOGFILE
+ /usr/bin/nice -n19 /usr/bin/mythtranscode --chanid "$3" --starttime "$4" --outfile "$TMPCUTFILE" --mpeg2 --honorcutlist
+ FFINPUTFILE=$TMPCUTFILE
+ fi
+fi
+
+# run ffmpeg to do conversion to wav
+echo "Encoding to intermediate wav..." >> $LOGFILE
+/usr/bin/nice -n19 /usr/bin/ffmpeg -i "$FFINPUTFILE" -vn -acodec pcm_s16le -ar 44100 -ac 2 "$TMPFILE.wav"
+ERROR=$?
+
+# Normalize the intermediate wav
+echo "Normalizing intermediate wav..." >> $LOGFILE
+/usr/bin/nice -n19 /usr/bin/normalize -q "$TMPFILE.wav"
+ERROR=$?
+
+FFINPUTFILE=$TMPFILE.wav
+
+# Final encode of normalized wav to mp3
+echo "Encoding normalized wav to mp3..." >> $LOGFILE
+/usr/bin/nice -n19 /usr/bin/ffmpeg -i "$FFINPUTFILE" -vn -acodec libmp3lame -ab $BITRATE -ar 44100 -ac 2 "$TMPFILE.mp3"
+ERROR=$?
+
+# make output filename unique
+OUTPUTFILE=$OUT_DIR/$TITLE.mp3
+i=1
+while [ -e "$OUTPUTFILE" ]
+do
+ OUTPUTFILE=$OUT_DIR/$TITLE-$i.mp3
+ i=`expr $i + 1`
+done
+
+# move temp file to output location
+chown mythtv "$TMPFILE.mp3" && mv "$TMPFILE.mp3" "$OUTPUTFILE"
+
+# stop timer
+aftertime="$(date +%s)"
+seconds="$(expr $aftertime - $beforetime)"
+
+if [ $ERROR -eq 0 ]; then
+ echo "File Encoded Sucessfully: $OUTPUTFILE" >> $LOGFILE
+ hours=$((seconds / 3600))
+ seconds=$((seconds % 3600))
+ minutes=$((seconds / 60))
+ seconds=$((seconds % 60))
+ echo "Encoding Time: $hours hour(s) $minutes minute(s) $seconds second(s)" >> $LOGFILE
+else
+ echo "ERROR: $ERROR" >> $LOGFILE
+fi
+
+# clean up left over files
+unlink $TMPFILE.mp3 2> /dev/null
+unlink $TMPFILE.wav 2> /dev/null
+unlink $TMPCUTFILE 2> /dev/null
+unlink $TMPCUTFILE.map 2> /dev/null
diff --git a/abs/core/LinHES-system/ripD_eject.sh b/abs/core/LinHES-system/ripD_eject.sh
new file mode 100755
index 0000000..99947a8
--- /dev/null
+++ b/abs/core/LinHES-system/ripD_eject.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# /usr/LH/bin/ripD_eject.sh
+# A DVD rip and eject script.
+########################################################################
+DEV='/dev/sr0' # DVD device
+MPNT='media/cdrom' # Mount Point
+Ddir='/myth/video' # DVD output dir List
+Bsnd='/usr/share/sounds/init.wav' # Begin sound file
+Esnd='/usr/share/sounds/complete.wav' # End sound file
+DATE=$(date +%Y%m%d_%H%M) # current date/time
+LOG='/var/log/mythtv/ripD.log' # name of Log file.
+TRACK=$(lsdvd | grep -i longest | awk '{print $3}') #Finds longest track
+FILE=$TITLE
+#-----------------------------------------------------------------------
+FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+OPTS="-f $FONT -s 2 -p bottom -A left -i 50 -l 4"
+#-----------------------------------------------------------------------
+[ -r /etc/rip.cfg ] && . /etc/rip.cfg
+#-----------------------------------------------------------------------
+LOCK=/tmp/.ripLock.$$
+[ "$DISPLAY" == "" ] && export DISPLAY=:0
+########################################################################
+function osd { # $1=text, $2=color, $3=delay
+ cmd="osd_cat $OPTS"
+ [ -n "$2" ] && cmd="$cmd --color=$2"
+ [ -n "$3" ] && cmd="$cmd -d $3"
+ killall osd_cat
+ echo -e "$1" | $cmd
+} >& /dev/null
+function osd_loop() {
+ FN=$1 ; shift
+# TXT="$MAX to $dir"
+ TXT="$MAX to $dir/$FILE"
+ N=0
+ while [ -f "$LOCK" ]; do
+ #osd "\nbacking up DVD: '$@'\n$TXT" gray 60
+ osd "\nbacking up DVD: '$TITLE'\n$TXT" gray 60
+ N=$(($N+1))
+ [ -d "$FN" ] && SIZE=$(du -sh $FN | awk '{print $1}')
+# TXT="$SIZE of $MAX @ $N min. elapsed"
+ TXT="$N min. elapsed"
+ done
+}
+########################################################################
+LinHES-osd "\nDetecting DVD" gray20 5 &
+echo "`date` detected DVD" >> $LOG
+rm -f /tmp/.ripLock.*
+#=======================================================================
+for dir in $Ddir ; do
+ if [ -d $dir -a -w $dir ]; then
+ break
+ fi
+done
+#-----------------------------------------------------------------------
+if [ ! -d "$dir" ]; then
+ echo "no $dir" >> $LOG
+ osd "\ndirectory: $dir\nnot found!" red 10 &
+ eject ; eject
+ exit 0
+fi
+if [ ! -w "$dir" ]; then
+ echo "$dir not writable" >> $LOG
+ osd "\ndirectory: $Cdir\nnot writable!" red 10 &
+ eject ; eject
+ exit 0
+fi
+#-----------------------------------------------------------------------
+mount $DEV >& /dev/null
+dev=$(readlink $DEV)
+df=$(df -h /dev/$dev | grep /dev/$dev)
+MAX=$(echo $df | while read d v r ; do echo $v ; done)
+echo " backup $MAX to $dir" >> $LOG
+#=======================================================================
+# first make sure DMA is on:
+sudo hdparm -d1 -u1 $DEV >& /dev/null
+# attempt to get the DVD information:
+TITLE=$(dvdbackup -i /dev/sr0 -I | grep information | awk '{ s = ""; for (i = 8; i <= NF; i++) s = s $i " "; print s }' | tr -d '"' | sed 's/ /_/g' | sed 's/_$//g')
+if [ "$TITLE" == "DVD_VIDEO" -o "$TITLE" == "" \
+ -o "$TITLE" == " " -o "$TITLE" == "[ ].*" ]; then
+ # if not a good title,
+ TITLE="dvdbackup_$DATE"
+fi
+echo " $TITLE" >> $LOG
+if [ $1 = m ]
+then
+ COMMAND="dvdbackup -M -i $DEV -o $dir -n $TITLE"
+ elif [ $1 = h ]
+ then
+# COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=320:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 720 -o $dir/$TITLE.avi"
+ COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "High\ Profile" --main-feature"
+ FILE=$TITLE.mp4
+ elif [ $1 = n ]
+ then
+# COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=160:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 512 -o $dir/$TITLE.avi"
+ COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Normal" --main-feature"
+ FILE=$TITLE.mp4
+ elif [ $1 = l ]
+ then
+# COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=96:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 320 -o $dir/$TITLE.avi"
+ COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Classic" --main-feature"
+ FILE=$TITLE.mp4
+ elif [ $1 = i ]
+ then
+ COMMAND="dd if=$DEV of=$dir/$TITLE.iso bs=2048"
+ FILE=$TITLE.iso
+fi
+{ # for the redir below:
+ # Begin:
+ touch $LOCK
+ osd_loop "$dir/$TITLE" "$TITLE" &
+ dvdbackup -i $DEV -I
+ sleep 1 ; aplay $Bsnd
+ $COMMAND
+ # Finish:
+ rm -f $LOCK
+ osd "\nfinish DVD: '$TITLE'\ninto $dir/$FILE" gray20 5 &
+ sleep 1 ; aplay $Esnd
+ # Eject the media:
+ sudo eject ; sudo eject
+} > $dir/.$TITLE.log 2>&1
+echo " `du -sh $dir/$FILE`" >> $LOG
+echo " `date` finished DVD" >> $LOG
+exit 0
+########################################################################
+# End
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 050c4e2..c5849c0 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=linhes-scripts
pkgver=7
-pkgrel=56
+pkgrel=57
pkgdesc="Various scripts that help to make LinHES, LinHES."
arch=('i686' 'x86_64')
license=('GPL2')
depends=('xosd' 'cpulimit' 'screen' 'mencoder' 'tablet-encode' 'mplayer'
- 'normalize' 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell')
+ 'handbrake-cli' 'mkvtoolnix' 'perl' 'perl-shell')
url="http://linhes.org/"
install="linhes-scripts.install"
source=(
@@ -17,8 +17,6 @@ shootscreens.sh
mplayer-resumer-vdpau.pl
run-pause-mythcommflag
shootscreens-mythtv.sh
-importfiles.sh
-myth2mp3
mplayer-resumer.pl
pause-mythcommflag.sh
myth2x264
@@ -39,17 +37,14 @@ qip7100-cc.sh
dtheme.sh
upgrade_screen_rc
upgrade_linhes_script.sh
-myth2mkv
LinHES-osd
-ripD_eject.sh
-get_airplay_key
)
package() {
cd ${srcdir}
install -d ${pkgdir}/usr/LH/bin
install -d ${pkgdir}/usr/LH/etc
- install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* get_airplay_key ${pkgdir}/usr/LH/bin/
+ install -D -m755 myth2* *.sh *.pl vdpau* run-* pause_* LinHES* ${pkgdir}/usr/LH/bin/
install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/
mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise
cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run
@@ -65,8 +60,6 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'9ae2cd7a0c42d57ad8b5f515d7d60196'
'1274bad3fb7296f00acd2d44804bad14'
'47225fa9b6c953d56f6ede84d921a300'
- '6b6e7d34a4bda6d608d150039adefd07'
- '4a1fda884dcd7d65fb2690fbdbd92a83'
'18263972b6326e140bbef0bb7dfa2da9'
'ad98d51e79f83df7c03f828dbeaea7f4'
'3b1c44a0818b35b6939c3cb2b723ce9e'
@@ -87,7 +80,4 @@ md5sums=('47a66238d95259d75c9c5cbcbb6da19f'
'35693f50939d5827aeabfce8c5dce589'
'974c137d3fcb85942ba8945a1bc815fe'
'f454faeabfa153b10389a9a3bfd51c4a'
- '503df99218373dfc75e7e7f5e449a44e'
- 'b608044c9e7530a400d8f5b88fdfe6e6'
- 'e2e24dd59d5d576cc33feafb329fa302'
- '33fbebbd546672cedd3c5e7350ab414e')
+ 'b608044c9e7530a400d8f5b88fdfe6e6')
diff --git a/abs/core/linhes-scripts/get_airplay_key b/abs/core/linhes-scripts/get_airplay_key
deleted file mode 100755
index 89a40dd..0000000
--- a/abs/core/linhes-scripts/get_airplay_key
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-. /usr/MythVantage/bin/install_functions.sh
-curl https://raw.github.com/juhovh/shairplay/master/airport.key > $MYTHHOME/.mythtv/RAOPKey.rsa
-chmod 755 $MYTHHOME/.mythtv/RAOPKey.rsa
-chown mythtv:mythtv $MYTHHOME/.mythtv/RAOPKey.rsa
\ No newline at end of file
diff --git a/abs/core/linhes-scripts/importfiles.sh b/abs/core/linhes-scripts/importfiles.sh
deleted file mode 100755
index 84f1ab5..0000000
--- a/abs/core/linhes-scripts/importfiles.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-export FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-
-DVD_or_CD=`cat /proc/mounts |grep iso9660|awk '{print $2}'|tail -1`
-if [ "$DVD_or_CD" != "" ]; then
- echo "Copying files from $DVD_or_CD to /myth/video." > /tmp/screens
- echo "This could take several minutes, depending on the" >> /tmp/screens
- echo "speed and size of your optical media." >> /tmp/screens
- cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=0 &
- /bin/cp -R $DVD_or_CD/* /myth/video/
- killall osd_cat
- echo "Copied videos from $DVD_or_CD to /myth/video" > /tmp/screens
- cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=2 &
-else
- echo "No optical media found. If you just inserted" > /tmp/screens
- echo "your media, please wait a moment and try again." >> /tmp/screens
- cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=5 &
-fi
diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/linhes-scripts/myth2mkv
deleted file mode 100644
index aedccff..0000000
--- a/abs/core/linhes-scripts/myth2mkv
+++ /dev/null
@@ -1,433 +0,0 @@
-#!/bin/bash
-#
-# Convert video to AVC-1 / h264
-#
-# version 0.25-004
-#
-# Prerequisites:
-# - mythtv >= 0.25
-# - handbrake-cli
-# - mplayer
-# - mkvtoolnix
-#
-# Arguments
-# $1 must be the directory/file of the recording
-# $2 must be chanid
-# $3 must be starttime
-# $4 must be title
-# $5 must be subtitle
-# $6 must be jobid
-# $7 must be quality of encode
-#
-# As a MythTV user job:
-# myth2mkv "%DIR%/%FILE%" "%CHANID%" "%STARTTIME%" "%TITLE%" "%SUBTITLE%" "%JOBID%" HQ|MQ|LQ
-
-########################
-# #
-# Adjustable variables #
-# #
-########################
-
-OUTDIR=/myth/video
-LOGPATH=/var/log/mythtv
-LOGFILE=${LOGPATH}/myth2mkv-$$.log
-
-# TMPDIR is for large transient files
-TMPDIR=/myth/tmp
-
-# x264 tuning:
-# Tune x264 based on content. Valid options for TUNING are:
-# film, animation, grain, stillimage, psnr, ssim, fastdecode, zerolatency
-# Separate multiple options with a comma. DEFAULT: none
-TUNING=""
-
-# Custom cropping. Useful if you have a 4:3 image in a HD frame or if
-# HandBrake's autocrop smarts fail you.
-# Crop 240 pixels off the left and right for 4:3 image in 1920x1080 frame
-# Crop 160 pixels off the left and right for 4:3 image in 1280x720 frame
-# <T:B:L:R>
-# i.e. 0:0:240:240
-# Default: In HQ: CROP="0:0:0:0" (no cropping).
-# IN MQ and LQ: autocrop.
-CROP=""
-
-# Force custom output resolution.
-# Default: Keep same resolution as input file (less any cropping).
-WIDTH=""
-HEIGHT=""
-
-# Force use/non-use of deinterlacing filter. Y|N|G (Yes, No, Guess)
-# Default: G - Guess based on source resolution.
-# If the source video width is 1920, 1440, 852, 704, 640 or 528 pixels
-# "G" will deinterlace the video. Change to "Y" to force use of deinterlacing
-# filter or to "N" to NOT use deinterlace filter no matter the resolution.
-DEINT="G"
-
-############################
-# #
-# End adjustable variables #
-# #
-############################
-
-if [[ -e $HOME/.mythtv/mysql.txt ]] ; then
- . $HOME/.mythtv/mysql.txt
-else
- DBHostName=${DBHostName:-"localhost"}
- DBUserName=${DBUserName:-"mythtv"}
- DBPassword=${DBPassword:-"mythtv"}
- DBName=${DBName:-"mythconverg"}
-fi
-
-if [[ ! -d ${TMPDIR} ]] ; then
- mkdir -p ${TMPDIR}
-fi
-
-if [[ ! -d ${OUTDIR} ]] ; then
- mkdir -p ${OUTDIR}
-fi
-
-#------FUNCTIONS---------------
-update_comment()
-# Arg_1 = COMMENT
-{
-if [ ${NO_JOBID} -eq 0 ]; then
- SQL_CMD="update jobqueue set comment=\"${1}\" where id=\"${JOBID}\";"
- `${MYSQLCMD} "${SQL_CMD}"`
-fi
-}
-
-check_background_progress()
-# check handbrake progress in background
-{
-while [ `tail -2 ${STATUSFILE} | grep -c "^HandBrake has exited"` = 0 ]
-do
- sleep 10
- check_myth_jobcmds
- pass=`tail -1 ${STATUSFILE} | egrep -o -e 'task [0-9]' | tail -1 | sed 's/task\ //g'`
- prog_percent=`tail -1 ${STATUSFILE} | egrep -o -e '[0-9]*\.[0-9]. %' | tail -1 | sed 's/\ %//g'`
- current_FPS=`tail -1 ${STATUSFILE} | egrep -o -e 'avg [0-9.]*\.[0-9]* fps' | tail -1 | sed -e 's/avg\ //g' -e 's/\ fps//g'`
- current_ETA=`tail -1 ${STATUSFILE} | egrep -o -e 'ETA [0-9.][0-9.]h[0-9.][0-9.]m[0-9.][0-9.]s' | tail -1`
- if [ -n "$prog_percent" ]; then
- echo "Pass ${pass}, ${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
- update_comment "Pass ${pass} of 2, ${prog_percent}% @ ${current_FPS} fps. ${current_ETA}"
- fi
- sleep 10
-done
-}
-
-check_myth_jobcmds()
-# check the myth database for stop pause or resume commands
-{
-if [[ ${NO_JOBID} -eq 0 ]] ; then
- CURRENT_CMD=`${MYSQLCMD} "select cmds from jobqueue where id = \"${JOBID}\";"`
- case "${CURRENT_CMD}" in
- # JOB_RUN
- 0) ;;
- # JOB_PAUSE
- 1) `${MYSQLCMD} "update jobqueue set status=\"6\" where id=\"${JOBID}\";"`
- kill -s STOP ${handbrake_pid} ;;
- # JOB_RESUME
- 2) `${MYSQLCMD} "update jobqueue set status=\"4\" where id=\"${JOBID}\";"`
- `${MYSQLCMD} "update jobqueue set cmds=\"0\" where id=\"${JOBID}\";"`
- kill -s CONT ${handbrake_pid} ;;
- # JOB_STOP
- 4) `${MYSQLCMD} "update jobqueue set status=\"5\" where id=\"${JOBID}\";"`
- `${MYSQLCMD} "update jobqueue set cmds=\"0\" where id=\"${JOBID}\";"`
- kill -9 ${handbrake_pid} ${command_pid}
- clean_up_files
- echo "Encode Cancelled" >> ${LOGFILE}
- `${MYSQLCMD} "update jobqueue set status=\"320\" where id=\"${JOBID}\";"`
- exit ;;
- esac
-fi
-}
-
-get_info_for_hb() {
-# Collect some info about source file
-
-/usr/bin/mplayer -nolirc -identify -frames 0 "${HBINPUTFILE}" \
- 2>/dev/null 1>"${IDFILE}"
-
-VIDEOW=$( grep ID_VIDEO_WIDTH= "${IDFILE}" | awk -F= '{ print $NF }' )
-FPS=$( grep ID_VIDEO_FPS= "${IDFILE}" | awk -F= '{ print $NF }' )
-
-# HandBrake does not like a framerate of 29.970, so let's drop the 0
-if [[ ${FPS} = "29.970" ]] ; then
- FPS="29.97"
-fi
-
-# HandBrake does not like a framerate of 59.940, so let's drop the 0
-if [[ ${FPS} = "59.940" ]] ; then
- FPS="59.94"
-fi
-
-# A rough guestimation that if the video width is 1920, 1440, 852, 704, 640 or
-# 528 pixels it is probably interlaced.
-if [[ ${DEINT} = Y ]] ; then
- DEINT="-d slow"
-else
- if [[ ${DEINT} = N ]] ; then
- DEINT=""
- else
- if [[ ${VIDEOW} = 1920 || ${VIDEOW} = 1440 || ${VIDEOW} = 852 || \
- ${VIDEOW} = 704 || ${VIDEOW} = 640 || ${VIDEOW} = 528 ]] ; then
- DEINT="-d slow"
- else
- DEINT=""
- fi
- fi
-fi
-
-if [[ -n ${DEINT} ]] ; then
- if [[ ${QUALITY} = LQ ]] ; then
- DEINT="-d fast"
- fi
-fi
-
-if [[ -n ${TUNING} ]] ; then
- TUNING="--x264-tune ${TUNING}"
-fi
-
-if [[ -n ${CROP} ]] ; then
- CROP="--crop ${CROP}"
-fi
-
-if [[ -n ${WIDTH} ]] ; then
- WIDTH="-w ${WIDTH} -X ${WIDTH}"
-fi
-
-if [[ -n ${HEIGHT} ]] ; then
- HEIGHT="-l ${HEIGHT} -Y ${HEIGHT}"
-fi
-
-if [[ ${QUALITY} = HQ ]] ; then
- if [[ -n ${CROP} ]] ; then
- CROP="--crop ${CROP}"
- else
- CROP="--crop 0:0:0:0 --strict-anamorphic"
- fi
- HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -x b-adapt=2:rc-lookahead=50 -b 5000 -2 -T ${WIDTH} ${HEIGHT} -r ${FPS} --cfr ${CROP} ${DEINT} -a 1 -E copy -s 1"
-else
- if [[ ${CROP} = "--crop 0:0:0:0" ]] ; then
- CROP="${CROP} --strict-anamorphic"
- fi
- if [[ ${QUALITY} = LQ ]] ; then
- HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -b 1250 ${WIDTH} ${HEIGHT} -r ${FPS} --pfr ${CROP} ${DEINT} -a 1 -E lame -B 128 -Q 8 -6 stereo -s 1"
- else
- # Fallback to "MQ"
- HB_OPTS="-o ${TMPFILE} -f mkv -m -e x264 ${TUNING} -b 2500 -2 -T ${WIDTH} ${HEIGHT} -r ${FPS} --pfr ${CROP} ${DEINT} -a 1 -E lame -B 256 -Q 3 -6 stereo -s 1"
- fi
-fi
-}
-
-get_handbrake_pid()
-{
-process_name=""
-i1=1
-while [ "${process_name}" != "found" ]; do
- handbrake_pid=`expr ${handbrake_pid} + 1`
- i1=`expr ${i1} + 1`
- if [ "`ps ${handbrake_pid} | grep HandBrakeCLI | sed 's_.*\(HandBrakeCLI\).*_\1_'`" = "HandBrakeCLI" ]; then
- process_name="found"
- fi
- if [ ${i1} -gt 20 ]; then
- break
- fi
-done
-}
-
-tag_file() {
-DATE=`date`
-
-# Create a tag file here
-echo "<?xml version='1.0' encoding='ISO-8859-1'?>" > "${TAG_FILE}"
-echo "" >> "${TAG_FILE}"
-echo "<!DOCTYPE Tags SYSTEM 'matroskatags.dtd'>" >> "${TAG_FILE}"
-echo "" >> "${TAG_FILE}"
-echo "<Tags>" >> "${TAG_FILE}"
-echo " <Tag>" >> "${TAG_FILE}"
-echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>TITLE</Name>" >> "${TAG_FILE}"
-echo " <String>${TITLE}</String>" >> "${TAG_FILE}"
-echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>SUBTITLE</Name>" >> "${TAG_FILE}"
-echo " <String>${SUBTITLE}</String>" >> "${TAG_FILE}"
-echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>SUMMARY</Name>" >> "${TAG_FILE}"
-echo " <String>${DESCR}</String>" >> "${TAG_FILE}"
-echo " </Simple>" >> "${TAG_FILE}"
-echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>DATE_RELEASED</Name>" >> "${TAG_FILE}"
-echo " <String>${OAD}</String>" >> "${TAG_FILE}"
-echo " </Simple>" >> "${TAG_FILE}"
-echo " </Simple>" >> "${TAG_FILE}"
-echo " </Simple>" >> "${TAG_FILE}"
-echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>ENCODER</Name>" >> "${TAG_FILE}"
-echo " <String>HandBrakeCLI ${HBCLIVER}</String>" >> "${TAG_FILE}"
-echo " </Simple>" >> "${TAG_FILE}"
-echo " <Simple>" >> "${TAG_FILE}"
-echo " <Name>DATE_TAGGED</Name>" >> "${TAG_FILE}"
-echo " <String>${DATE}</String>" >> "${TAG_FILE}"
-echo " </Simple>" >> "${TAG_FILE}"
-echo " </Tag>" >> "${TAG_FILE}"
-echo "</Tags>" >> "${TAG_FILE}"
-
-# Add tag info into MKV file
-echo "Adding tag info to ${TITLE} - ${SUBTITLE} ..." >> ${LOGFILE}
-
-/usr/bin/mkvpropedit -r ${LOGFILE} -t all:"${TAG_FILE}" "${TMPFILE}"
-}
-
-clean_up_files()
-# clean up left over files
-{
-unlink ${TMPFILE} 2> /dev/null
-unlink ${TMPCUTFILE} 2> /dev/null
-unlink ${TMPCUTFILE}.map 2> /dev/null
-unlink ${STATUSFILE} 2> /dev/null
-unlink ${IDFILE} 2> /dev/null
-unlink ${HB_RETURN_CODE} 2> /dev/null
-unlink ${TAG_FILE} 2> /dev/null
-}
-
-#-------MAIN SCRIPT------------
-
-# create temp filename so multiple instances won't conflict
-TMPNAME=toX264-$$
-TMPFILE=${TMPDIR}/${TMPNAME}.mkv
-TMPCUTFILE=${TMPDIR}/${TMPNAME}.mpg
-HBINPUTFILE="${1}"
-TITLE="${4}"
-SUBTITLE="${5}"
-JOBID="${6}"
-QUALITY="${7}"
-BASE=`basename ${HBINPUTFILE}`
-HBCLIVER=`pacman -Q | grep handbrake-cli | awk '{ print $NF }' | awk -F"-" '{ print $1 }'`
-STATUSFILE=/tmp/${TMPNAME}-status.log
-HB_RETURN_CODE=/tmp/${TMPNAME}-hb_return_code
-IDFILE=/tmp/${TMPNAME}-id.txt
-TAG_FILE=/tmp/${TMPNAME}.xml
-MYSQLCMD="mysql -B --skip-column-names -u ${DBUserName} -p${DBPassword} -h ${DBHostName} -D ${DBName} -e"
-OAD=`${MYSQLCMD} "select originalairdate from recorded where basename LIKE '${BASE}';"`
-DESCR=`${MYSQLCMD} "select description from recorded where basename LIKE '${BASE}';" | sed 's/\&/and/g'`
-USER=`whoami`
-
-# check if %JOBID% is passed from command line
-if [ -z ${JOBID} ]; then
- NO_JOBID=1
-else
- NO_JOBID=0
-fi
-
-# log file location
-CDate="`date`"
-echo "" >> ${LOGFILE}
-echo $CDate >> ${LOGFILE}
-echo "File to encode: ${HBINPUTFILE}" >> ${LOGFILE}
-echo " --> Name: ${TITLE} - ${SUBTITLE}" >> ${LOGFILE}
-echo " --> Temporary Files: ${TMPNAME}.*" >> ${LOGFILE}
-echo "" >> ${LOGFILE}
-
-get_info_for_hb
-ERROR=$?
-
-if [[ ${ERROR} != 0 ]] ; then
- echo "Error parsing source file information!" >> ${LOGFILE}
- cat ${IDFILE} >> ${LOGFILE}
- clean_up_files
- exit 1
-fi
-
-# start timer
-beforetime="$(date +%s)"
-
-check_myth_jobcmds
-
-# If there is a cutlist, use it:
-if [[ -n `mythutil --getcutlist --chanid "${2}" --starttime "${3}" | grep \
- Cutlist: | awk -F": " '{ print $NF }'` ]] ; then
- echo "Applying cutlist for ${TITLE} - ${SUBTITLE} ..." >> ${LOGFILE}
- mythtranscode --chanid "${2}" --starttime "${3}" -m --honorcutlist \
- -q --loglevel info --logpath "${LOGPATH}" -o "${TMPCUTFILE}"
- mythtrans_pid=$!
- ERROR=$?
- HBINPUTFILE=${TMPCUTFILE}
-fi
-
-if [[ ${ERROR} != 0 ]] ; then
- echo "MythTranscode error!" >> ${LOGFILE}
- echo "Check ${LOGPATH}/mythtranscode.date.${mythtrans_pid}.log for mythtranscode error" >> ${LOGFILE}
- clean_up_files
- exit 1
-fi
-
-# run handbrake in background to do conversion
-echo "Encoding ${TITLE} - ${SUBTITLE} ..." >> ${LOGFILE}
-
-( /usr/bin/nice -n19 nohup /usr/bin/HandBrakeCLI -i ${HBINPUTFILE} ${HB_OPTS} \
- > ${STATUSFILE} 2>&1 ; echo $? > ${HB_RETURN_CODE} ) &
-handbrake_pid=$!
-command_pid=${handbrake_pid}
-get_handbrake_pid
-
-check_background_progress
-
-if [[ `cat ${HB_RETURN_CODE}` != 0 ]] ; then
- echo "HandBrakeCLI error!" >> ${LOGFILE}
- cat ${STATUSFILE} >> ${LOGFILE}
- clean_up_files
- exit 1
-fi
-
-tag_file
-ERROR=$?
-
-if [[ ${ERROR} != 0 ]] ; then
- echo "Error creating tag file!" >> ${LOGFILE}
- cat ${TAG_FILE} >> ${LOGFILE}
- clean_up_files
- exit 1
-fi
-
-# make output filename unique and do not clobber an existing file
-# Build a final file name
-FILE=$( echo "${TITLE,,} ${OAD} ${SUBTITLE,,}" | tr -d [:punct:] | tr [:blank:] "_" | tr -s "_" )
-OUTPUTFILE="${OUTDIR}/${FILE}.mkv"
-i=1
-while [ -e "${OUTPUTFILE}" ]
-do
- OUTPUTFILE="${OUTDIR}/${FILE}-${i}.mkv"
- i=`expr $i + 1`
-done
-
-# move temp file to output location
-chown -v "${USER}" "${TMPFILE}" >> ${LOGFILE}
-mv -v "${TMPFILE}" "$OUTPUTFILE" >> ${LOGFILE}
-ERROR=$?
-
-if [[ ${ERROR} != 0 ]] ; then
- echo "Error moving ${TMPFILE} to ${OUTPUTFILE} !" >> ${LOGFILE}
- clean_up_files
- exit 1
-fi
-
-# stop timer
-aftertime="$(date +%s)"
-seconds="$(expr ${aftertime} - ${beforetime})"
-
-if [ ${ERROR} -eq 0 ]; then
- echo "File Encoded Successfully: ${OUTPUTFILE}" >> ${LOGFILE}
- hours=$((seconds / 3600))
- seconds=$((seconds % 3600))
- minutes=$((seconds / 60))
- seconds=$((seconds % 60))
- echo "Encoding took ${hours} hour\(s\) ${minutes} minute\(s\) ${seconds} second\(s\) @ ${current_FPS} fps." >> ${LOGFILE}
- `${MYSQLCMD} "update jobqueue set status = \"272\" where id = \"${JOBID}\";"`
- update_comment "Encode Successful. Encoding Time: ${hours} hour\(s\) ${minutes} minute\(s\) ${seconds} second\(s\)"
-else
- echo "ERROR: ${ERROR}" >> ${LOGFILE}
-fi
-
-# Clean up
-clean_up_files
diff --git a/abs/core/linhes-scripts/myth2mp3 b/abs/core/linhes-scripts/myth2mp3
deleted file mode 100755
index 69d5d3f..0000000
--- a/abs/core/linhes-scripts/myth2mp3
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-# convert recordings to as mp3 audio only
-# version 1.1.3
-
-# usage:
-# first parameter must be %DIR%/%FILE% of the recording
-# second parameter must be the desired base name of the output
-# third parameter must be %CHANID% if you set USECUTLIST=Y
-# fourth parameter must be %STARTTIME% if you set USECUTLIST=Y
-# In the mythtv setup screen invoke this script like this:
-# MYTHTV User Job Command:
-# /usr/LH/bin/myth2mp3 "%DIR%/%FILE%" "%TITLE% - %SUBTITLE%" "%CHANID%" "%STARTTIME%"
-
-# options:
-BITRATE=256k #ie. 128k, 160k, 192k, 224k, 256k
-USECUTLIST=Y #Y or N
-
-# where the converted audio is stored
-OUT_DIR=/myth/music
-
-# create temp filename so multiple instances won't conflict
-TMPNAME=toMP3-$$
-TMPFILE=/myth/tmp/$TMPNAME
-TMPCUTFILE=/myth/tmp/$TMPNAME.mpg
-FFINPUTFILE=$1
-TITLE=`echo $2 | sed 's/\//_/g'`
-
-# log file location
-LOGFILE=/var/log/mythtv/myth2mp3.log
-CDate="`date`"
-echo "" >> $LOGFILE
-echo $CDate >> $LOGFILE
-echo "File to encode: $1 Name: $TITLE" >> $LOGFILE
-
-# start timer
-beforetime="$(date +%s)"
-
-# check if using cutlist
-if [ $USECUTLIST = Y ];then
- MYTHCOMMFRAMES=`mythutil --getcutlist --chanid "$3" --starttime "$4" | grep 'Cutlist:' | cut -d \ -f 2`
- if [ -n "$MYTHCOMMFRAMES" ]; then
- echo "Extracting Cutlist..." >> $LOGFILE
- /usr/bin/nice -n19 /usr/bin/mythtranscode --chanid "$3" --starttime "$4" --outfile "$TMPCUTFILE" --mpeg2 --honorcutlist
- FFINPUTFILE=$TMPCUTFILE
- fi
-fi
-
-# run ffmpeg to do conversion to wav
-echo "Encoding to intermediate wav..." >> $LOGFILE
-/usr/bin/nice -n19 /usr/bin/ffmpeg -i "$FFINPUTFILE" -vn -acodec pcm_s16le -ar 44100 -ac 2 "$TMPFILE.wav"
-ERROR=$?
-
-# Normalize the intermediate wav
-echo "Normalizing intermediate wav..." >> $LOGFILE
-/usr/bin/nice -n19 /usr/bin/normalize -q "$TMPFILE.wav"
-ERROR=$?
-
-FFINPUTFILE=$TMPFILE.wav
-
-# Final encode of normalized wav to mp3
-echo "Encoding normalized wav to mp3..." >> $LOGFILE
-/usr/bin/nice -n19 /usr/bin/ffmpeg -i "$FFINPUTFILE" -vn -acodec libmp3lame -ab $BITRATE -ar 44100 -ac 2 "$TMPFILE.mp3"
-ERROR=$?
-
-# make output filename unique
-OUTPUTFILE=$OUT_DIR/$TITLE.mp3
-i=1
-while [ -e "$OUTPUTFILE" ]
-do
- OUTPUTFILE=$OUT_DIR/$TITLE-$i.mp3
- i=`expr $i + 1`
-done
-
-# move temp file to output location
-chown mythtv "$TMPFILE.mp3" && mv "$TMPFILE.mp3" "$OUTPUTFILE"
-
-# stop timer
-aftertime="$(date +%s)"
-seconds="$(expr $aftertime - $beforetime)"
-
-if [ $ERROR -eq 0 ]; then
- echo "File Encoded Sucessfully: $OUTPUTFILE" >> $LOGFILE
- hours=$((seconds / 3600))
- seconds=$((seconds % 3600))
- minutes=$((seconds / 60))
- seconds=$((seconds % 60))
- echo "Encoding Time: $hours hour(s) $minutes minute(s) $seconds second(s)" >> $LOGFILE
-else
- echo "ERROR: $ERROR" >> $LOGFILE
-fi
-
-# clean up left over files
-unlink $TMPFILE.mp3 2> /dev/null
-unlink $TMPFILE.wav 2> /dev/null
-unlink $TMPCUTFILE 2> /dev/null
-unlink $TMPCUTFILE.map 2> /dev/null
diff --git a/abs/core/linhes-scripts/ripD_eject.sh b/abs/core/linhes-scripts/ripD_eject.sh
deleted file mode 100755
index 99947a8..0000000
--- a/abs/core/linhes-scripts/ripD_eject.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/bash
-# /usr/LH/bin/ripD_eject.sh
-# A DVD rip and eject script.
-########################################################################
-DEV='/dev/sr0' # DVD device
-MPNT='media/cdrom' # Mount Point
-Ddir='/myth/video' # DVD output dir List
-Bsnd='/usr/share/sounds/init.wav' # Begin sound file
-Esnd='/usr/share/sounds/complete.wav' # End sound file
-DATE=$(date +%Y%m%d_%H%M) # current date/time
-LOG='/var/log/mythtv/ripD.log' # name of Log file.
-TRACK=$(lsdvd | grep -i longest | awk '{print $3}') #Finds longest track
-FILE=$TITLE
-#-----------------------------------------------------------------------
-FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-OPTS="-f $FONT -s 2 -p bottom -A left -i 50 -l 4"
-#-----------------------------------------------------------------------
-[ -r /etc/rip.cfg ] && . /etc/rip.cfg
-#-----------------------------------------------------------------------
-LOCK=/tmp/.ripLock.$$
-[ "$DISPLAY" == "" ] && export DISPLAY=:0
-########################################################################
-function osd { # $1=text, $2=color, $3=delay
- cmd="osd_cat $OPTS"
- [ -n "$2" ] && cmd="$cmd --color=$2"
- [ -n "$3" ] && cmd="$cmd -d $3"
- killall osd_cat
- echo -e "$1" | $cmd
-} >& /dev/null
-function osd_loop() {
- FN=$1 ; shift
-# TXT="$MAX to $dir"
- TXT="$MAX to $dir/$FILE"
- N=0
- while [ -f "$LOCK" ]; do
- #osd "\nbacking up DVD: '$@'\n$TXT" gray 60
- osd "\nbacking up DVD: '$TITLE'\n$TXT" gray 60
- N=$(($N+1))
- [ -d "$FN" ] && SIZE=$(du -sh $FN | awk '{print $1}')
-# TXT="$SIZE of $MAX @ $N min. elapsed"
- TXT="$N min. elapsed"
- done
-}
-########################################################################
-LinHES-osd "\nDetecting DVD" gray20 5 &
-echo "`date` detected DVD" >> $LOG
-rm -f /tmp/.ripLock.*
-#=======================================================================
-for dir in $Ddir ; do
- if [ -d $dir -a -w $dir ]; then
- break
- fi
-done
-#-----------------------------------------------------------------------
-if [ ! -d "$dir" ]; then
- echo "no $dir" >> $LOG
- osd "\ndirectory: $dir\nnot found!" red 10 &
- eject ; eject
- exit 0
-fi
-if [ ! -w "$dir" ]; then
- echo "$dir not writable" >> $LOG
- osd "\ndirectory: $Cdir\nnot writable!" red 10 &
- eject ; eject
- exit 0
-fi
-#-----------------------------------------------------------------------
-mount $DEV >& /dev/null
-dev=$(readlink $DEV)
-df=$(df -h /dev/$dev | grep /dev/$dev)
-MAX=$(echo $df | while read d v r ; do echo $v ; done)
-echo " backup $MAX to $dir" >> $LOG
-#=======================================================================
-# first make sure DMA is on:
-sudo hdparm -d1 -u1 $DEV >& /dev/null
-# attempt to get the DVD information:
-TITLE=$(dvdbackup -i /dev/sr0 -I | grep information | awk '{ s = ""; for (i = 8; i <= NF; i++) s = s $i " "; print s }' | tr -d '"' | sed 's/ /_/g' | sed 's/_$//g')
-if [ "$TITLE" == "DVD_VIDEO" -o "$TITLE" == "" \
- -o "$TITLE" == " " -o "$TITLE" == "[ ].*" ]; then
- # if not a good title,
- TITLE="dvdbackup_$DATE"
-fi
-echo " $TITLE" >> $LOG
-if [ $1 = m ]
-then
- COMMAND="dvdbackup -M -i $DEV -o $dir -n $TITLE"
- elif [ $1 = h ]
- then
-# COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=320:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 720 -o $dir/$TITLE.avi"
- COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "High\ Profile" --main-feature"
- FILE=$TITLE.mp4
- elif [ $1 = n ]
- then
-# COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=160:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 512 -o $dir/$TITLE.avi"
- COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Normal" --main-feature"
- FILE=$TITLE.mp4
- elif [ $1 = l ]
- then
-# COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=96:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 320 -o $dir/$TITLE.avi"
- COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Classic" --main-feature"
- FILE=$TITLE.mp4
- elif [ $1 = i ]
- then
- COMMAND="dd if=$DEV of=$dir/$TITLE.iso bs=2048"
- FILE=$TITLE.iso
-fi
-{ # for the redir below:
- # Begin:
- touch $LOCK
- osd_loop "$dir/$TITLE" "$TITLE" &
- dvdbackup -i $DEV -I
- sleep 1 ; aplay $Bsnd
- $COMMAND
- # Finish:
- rm -f $LOCK
- osd "\nfinish DVD: '$TITLE'\ninto $dir/$FILE" gray20 5 &
- sleep 1 ; aplay $Esnd
- # Eject the media:
- sudo eject ; sudo eject
-} > $dir/.$TITLE.log 2>&1
-echo " `du -sh $dir/$FILE`" >> $LOG
-echo " `date` finished DVD" >> $LOG
-exit 0
-########################################################################
-# End
--
cgit v0.12
From 68d5862f26515b2ec6b3d41d9ea97953284bf44e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 17 Sep 2013 13:19:27 -0500
Subject: LinHES-system: msg_daemon.py: fix osd flash to the right before it
scrolls into place by moving osd off screen before showing
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/importfiles.sh | 15 ++++-----------
abs/core/LinHES-system/msg_daemon.py | 1 +
3 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index ee79c88..ab8ef52 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=14
+pkgrel=15
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -88,7 +88,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'962a3e9eaba2d1466251b7ab0956705d'
'1758aed160de64abfafb28a3a8f3390e'
'33fbebbd546672cedd3c5e7350ab414e'
- '6b6e7d34a4bda6d608d150039adefd07'
+ 'ea2eef75dceeea631085928c94e3191a'
'3edef50a49a47694bf8add39cc160add'
'5e17e0786afd891550a660f646076308'
'bc69a520add58ede9b060c73e67ace13'
@@ -101,7 +101,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'4abc4780fa78ed40c07401b3cd25209b'
- '645297f5905e87eb99999d5a0f3f069a'
+ 'cf5d14fdb45991d07ab9db7726cf1322'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/importfiles.sh b/abs/core/LinHES-system/importfiles.sh
index 84f1ab5..61ad324 100755
--- a/abs/core/LinHES-system/importfiles.sh
+++ b/abs/core/LinHES-system/importfiles.sh
@@ -1,18 +1,11 @@
#!/bin/bash
-export FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
DVD_or_CD=`cat /proc/mounts |grep iso9660|awk '{print $2}'|tail -1`
if [ "$DVD_or_CD" != "" ]; then
- echo "Copying files from $DVD_or_CD to /myth/video." > /tmp/screens
- echo "This could take several minutes, depending on the" >> /tmp/screens
- echo "speed and size of your optical media." >> /tmp/screens
- cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=0 &
+ msg_client.py --msg "Copying files from $DVD_or_CD to /myth/video. Please wait..." --timeout 900
/bin/cp -R $DVD_or_CD/* /myth/video/
- killall osd_cat
- echo "Copied videos from $DVD_or_CD to /myth/video" > /tmp/screens
- cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=2 &
+ msg_client.py --kill
+ msg_client.py --msg "Copied videos from $DVD_or_CD to /myth/video"
else
- echo "No optical media found. If you just inserted" > /tmp/screens
- echo "your media, please wait a moment and try again." >> /tmp/screens
- cat /tmp/screens | osd_cat --font=$FONT --shadow=3 --pos=middle --align=centre --color=yellow --delay=5 &
+ msg_client.py --msg "No optical media found. If you just inserted media please wait a moment and try again.|middle"
fi
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index cd0465b..4c37171 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -24,6 +24,7 @@ class msg_aosd():
osd.set_position(pos, width, height)
(x, y, _, _) = osd.get_geometry()
osd.set_position_offset(width, height)
+ osd.set_geometry(2000, y, width, height)
osd.show()
x -= 1
--
cgit v0.12
From 8237da7b67ce46abac536bc53e3e39e7d49eb669 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 17 Sep 2013 14:11:04 -0500
Subject: func: msg.cfg: change msg_client.py font color to linhes yellow.
Add a definition for displaying OSD at bottom center.
---
abs/core/func/PKGBUILD | 42 +++++++++++++++++++++---------------------
abs/core/func/msg.cfg | 10 ++++++++--
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD
index 11bc623..0005fd0 100644
--- a/abs/core/func/PKGBUILD
+++ b/abs/core/func/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=func
pkgver=0.25
-pkgrel=12
+pkgrel=13
pkgdesc="fedora unifed network controller"
url=""
license="gpl"
@@ -9,31 +9,31 @@ makedepends=()
conflicts=()
replaces=()
backup=('etc/func/minion.conf')
-moddir="pkg/usr/lib/python2.7/site-packages/func/minion/modules/"
install=func.install
source=($pkgname-$pkgver.tar.gz minion.conf power.py pacman.py failed_func fe_restart.py msg.py msg.cfg func_ssl_patch logrotate-func.conf)
arch=('i686' 'x86_64')
-build() {
- cd $startdir/src/$pkgname-${pkgver}
- patch -Np1 < $startdir/src/func_ssl_patch
+package() {
+ moddir="$pkgdir/usr/lib/python2.7/site-packages/func/minion/modules/"
+ cd $srcdir/$pkgname-${pkgver}
+ patch -Np1 < $srcdir/func_ssl_patch
python2 setup.py build
- python2 setup.py install --prefix=$startdir/pkg/usr
- cd $startdir/src
- install -m755 -D minion.conf $startdir/pkg/etc/func/minion.conf
- install -m755 -D $startdir/src/$pkgname-$pkgver/etc/async_methods.conf $startdir/pkg/etc/func/async_methods.conf
- install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/sample.acl $startdir/pkg/etc/func/minion-acl.d/sample.acl
- install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/Test.conf $startdir/pkg/etc/func/modules/Test.conf
- install -m755 -D $startdir/src/power.py ${startdir}/${moddir}/power.py
- install -m755 -D $startdir/src/pacman.py ${startdir}/${moddir}/pacman.py
- install -m755 -D $startdir/src/msg.py ${startdir}/${moddir}/msg.py
- install -m755 -D $startdir/src/msg.cfg ${startdir}/pkg/usr/MythVantage/etc/msg.cfg
- install -m755 -D $startdir/src/fe_restart.py ${startdir}/${moddir}/fe_restart.py
- install -m755 -D $startdir/src/failed_func $startdir/pkg/usr/MythVantage/bin/failed_func
- mkdir -p $startdir/pkg/var/log/func
- install -m644 -D ../logrotate-func.conf $startdir/pkg/etc/logrotate.d/func
+ python2 setup.py install --prefix=$pkgdir/usr
+ cd $srcdir
+ install -m755 -D minion.conf $pkgdir/etc/func/minion.conf
+ install -m755 -D $srcdir/$pkgname-$pkgver/etc/async_methods.conf $pkgdir/etc/func/async_methods.conf
+ install -m755 -D $srcdir/$pkgname-${pkgver}/etc/sample.acl $pkgdir/etc/func/minion-acl.d/sample.acl
+ install -m755 -D $srcdir/$pkgname-${pkgver}/etc/Test.conf $pkgdir/etc/func/modules/Test.conf
+ install -m755 -D $srcdir/power.py ${moddir}/power.py
+ install -m755 -D $srcdir/pacman.py ${moddir}/pacman.py
+ install -m755 -D $srcdir/msg.py ${moddir}/msg.py
+ install -m755 -D $srcdir/msg.cfg $pkgdir/usr/MythVantage/etc/msg.cfg
+ install -m755 -D $srcdir/fe_restart.py ${moddir}/fe_restart.py
+ install -m755 -D $srcdir/failed_func $pkgdir/usr/MythVantage/bin/failed_func
+ mkdir -p $pkgdir/var/log/func
+ install -m644 -D ../logrotate-func.conf $pkgdir/etc/logrotate.d/func
- cd $startdir/pkg
+ cd $pkgdir
find ./usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
find ./ -name "*.pyc" -print | xargs rm -f
}
@@ -44,6 +44,6 @@ md5sums=('892252004f122c61bb58bb4607553ffe'
'c30f420c01628a08061270e8502115c5'
'b02a733b7a74569e57521bc3708724a5'
'7b4266a8031cf7de485bf6b74e57bd74'
- '28e141f04ccbdde1199b41888e102dc9'
+ '55645b66d85297200747137fcb0a2e6b'
'b816bdb222e646a7801b218c3a626b0e'
'7d7c8a334f6b46ae1e5e483854b93924')
diff --git a/abs/core/func/msg.cfg b/abs/core/func/msg.cfg
index fed17a7..69a949c 100644
--- a/abs/core/func/msg.cfg
+++ b/abs/core/func/msg.cfg
@@ -1,11 +1,17 @@
[default]
-font_color=green
+font_color=#ebb81c
display_time=5000
position=1
font_type=Times New Roman Italic 48
[middle]
-font_color=green
+font_color=#ebb81c
display_time=5000
position=4
font_type=Times New Roman Italic 48
+
+[bottom]
+font_color=#ebb81c
+display_time=5000
+position=7
+font_type=Times New Roman Italic 48
--
cgit v0.12
From 649f466d6496c9f8fe965215980c756d76b36eb3 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 17 Sep 2013 16:19:13 -0500
Subject: LinHES-system: convert ripD_eject.sh and importfiles.sh to use
msg_client.py for OSD.
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/importfiles.sh | 4 ++--
abs/core/LinHES-system/ripD_eject.sh | 33 +++++++++++++--------------------
3 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index ab8ef52..5cc8ca9 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=15
+pkgrel=16
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -88,7 +88,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'962a3e9eaba2d1466251b7ab0956705d'
'1758aed160de64abfafb28a3a8f3390e'
'33fbebbd546672cedd3c5e7350ab414e'
- 'ea2eef75dceeea631085928c94e3191a'
+ 'c773d8caacba8fbd4968e8afe5137bc6'
'3edef50a49a47694bf8add39cc160add'
'5e17e0786afd891550a660f646076308'
'bc69a520add58ede9b060c73e67ace13'
@@ -123,7 +123,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'd14335afe7dafa035a70399210e0df1a'
'503df99218373dfc75e7e7f5e449a44e'
'4a1fda884dcd7d65fb2690fbdbd92a83'
- 'e2e24dd59d5d576cc33feafb329fa302'
+ '2b7fe3b57592823a4c7e3ec132dcb7f4'
'92950f0ffb1faf1ed64c6be2b8fbc3f6'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
diff --git a/abs/core/LinHES-system/importfiles.sh b/abs/core/LinHES-system/importfiles.sh
index 61ad324..eb0e863 100755
--- a/abs/core/LinHES-system/importfiles.sh
+++ b/abs/core/LinHES-system/importfiles.sh
@@ -2,10 +2,10 @@
DVD_or_CD=`cat /proc/mounts |grep iso9660|awk '{print $2}'|tail -1`
if [ "$DVD_or_CD" != "" ]; then
- msg_client.py --msg "Copying files from $DVD_or_CD to /myth/video. Please wait..." --timeout 900
+ msg_client.py --msg "Copying files from $DVD_or_CD to /myth/video..." --timeout 3600
/bin/cp -R $DVD_or_CD/* /myth/video/
msg_client.py --kill
- msg_client.py --msg "Copied videos from $DVD_or_CD to /myth/video"
+ msg_client.py --msg "Finished copying from $DVD_or_CD to /myth/video."
else
msg_client.py --msg "No optical media found. If you just inserted media please wait a moment and try again.|middle"
fi
diff --git a/abs/core/LinHES-system/ripD_eject.sh b/abs/core/LinHES-system/ripD_eject.sh
index 99947a8..715d0dd 100755
--- a/abs/core/LinHES-system/ripD_eject.sh
+++ b/abs/core/LinHES-system/ripD_eject.sh
@@ -12,37 +12,30 @@ LOG='/var/log/mythtv/ripD.log' # name of Log file.
TRACK=$(lsdvd | grep -i longest | awk '{print $3}') #Finds longest track
FILE=$TITLE
#-----------------------------------------------------------------------
-FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-OPTS="-f $FONT -s 2 -p bottom -A left -i 50 -l 4"
-#-----------------------------------------------------------------------
[ -r /etc/rip.cfg ] && . /etc/rip.cfg
#-----------------------------------------------------------------------
LOCK=/tmp/.ripLock.$$
[ "$DISPLAY" == "" ] && export DISPLAY=:0
########################################################################
-function osd { # $1=text, $2=color, $3=delay
- cmd="osd_cat $OPTS"
- [ -n "$2" ] && cmd="$cmd --color=$2"
- [ -n "$3" ] && cmd="$cmd -d $3"
- killall osd_cat
- echo -e "$1" | $cmd
+function osd { # $1=text, $2=delay
+ msg_client.py --kill
+ msg_client.py --msg "$1" --timeout $2
} >& /dev/null
function osd_loop() {
FN=$1 ; shift
-# TXT="$MAX to $dir"
- TXT="$MAX to $dir/$FILE"
+ TXT="to $dir/$FILE"
N=0
while [ -f "$LOCK" ]; do
- #osd "\nbacking up DVD: '$@'\n$TXT" gray 60
- osd "\nbacking up DVD: '$TITLE'\n$TXT" gray 60
- N=$(($N+1))
- [ -d "$FN" ] && SIZE=$(du -sh $FN | awk '{print $1}')
+ osd "Backing up '$TITLE' $TXT" 70
+ N=$(($N+1))
+# [ -d "$FN" ] && SIZE=$(du -sh $FN | awk '{print $1}')
# TXT="$SIZE of $MAX @ $N min. elapsed"
- TXT="$N min. elapsed"
+ TXT="($N min. elapsed)"
+ sleep 60
done
}
########################################################################
-LinHES-osd "\nDetecting DVD" gray20 5 &
+osd "Detecting DVD..." 60 &
echo "`date` detected DVD" >> $LOG
rm -f /tmp/.ripLock.*
#=======================================================================
@@ -54,13 +47,13 @@ done
#-----------------------------------------------------------------------
if [ ! -d "$dir" ]; then
echo "no $dir" >> $LOG
- osd "\ndirectory: $dir\nnot found!" red 10 &
+ osd "$dir Not Found!" 10 &
eject ; eject
exit 0
fi
if [ ! -w "$dir" ]; then
echo "$dir not writable" >> $LOG
- osd "\ndirectory: $Cdir\nnot writable!" red 10 &
+ osd "$dir Not Writable!" 10 &
eject ; eject
exit 0
fi
@@ -113,7 +106,7 @@ fi
$COMMAND
# Finish:
rm -f $LOCK
- osd "\nfinish DVD: '$TITLE'\ninto $dir/$FILE" gray20 5 &
+ osd "Done Backing up '$TITLE' to $dir/$FILE" 5 &
sleep 1 ; aplay $Esnd
# Eject the media:
sudo eject ; sudo eject
--
cgit v0.12
From 1e9f1068d75226eea306c999a85051baf9a832c0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 17 Sep 2013 18:49:56 -0500
Subject: mythtv: update optical_menu.xml.patch to put importfiles.sh in the
background
---
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 2 +-
abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 6cc944b..95f2a12 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mythtv
pkgver=0.25
-pkgrel=27
+pkgrel=28
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.25/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
index 1ff2db2..b836e85 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
@@ -12,9 +12,9 @@
+
+ <button>
+ <type>DVD_RIP</type>
-+ <text>Import video files from DVD</text>
-+ <description>Import video files from a data DVD</description>
-+ <action>EXEC /usr/LH/bin/importfiles.sh</action>
++ <text>Import Files from DVD</text>
++ <description>Import all files from a data DVD</description>
++ <action>EXEC /usr/LH/bin/importfiles.sh &</action>
+ </button>
+
+ <button>
--
cgit v0.12
From f1d637f88d67fb598ae3c0af7d44a3f2083452fa Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 08:44:03 -0500
Subject: keylaunch: add keybindings for chrome and restarting frontend window
manager
---
abs/core/keylaunch/PKGBUILD | 13 ++++++++-----
abs/core/keylaunch/example_rc | 7 ++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD
index 67b8d77..d869044 100644
--- a/abs/core/keylaunch/PKGBUILD
+++ b/abs/core/keylaunch/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=keylaunch
pkgver=1.3.9
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64')
pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. "
url="http://www.oroborus.org/"
@@ -9,11 +9,14 @@ source=(http://ftp.debian.org/debian/pool/main/k/keylaunch/keylaunch_1.3.9.tar.g
install=keylaunch.install
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr
make
- make DESTDIR=$startdir/pkg install
- install -D -m0755 ../example_rc $startdir/pkg/etc/keylaunchrc
+ make DESTDIR=$pkgdir install
+}
+
+package() {
+ install -D -m0755 $srcdir/example_rc $pkgdir/etc/keylaunchrc
}
md5sums=('710f68a3e7026b4139cc94ea790576c3'
- '98d341f2fb87ce4fbbecafbdc776b2a7')
+ '01d31c5c748f7a2802d7b0e7aa07a678')
diff --git a/abs/core/keylaunch/example_rc b/abs/core/keylaunch/example_rc
index 5dd0f59..284a4a1 100644
--- a/abs/core/keylaunch/example_rc
+++ b/abs/core/keylaunch/example_rc
@@ -15,13 +15,10 @@ key=..*u:/usr/LH/bin/unclutter-toggle.sh
key=.**u:/usr/LH/bin/unclutter-toggle.sh
key=..*h:/usr/MythVantage/bin/mythinstall -H
key=..*m:/usr/LH/bin/mythfrontend-start
+key=.**f:sudo sv restart frontend
+key=..*w:/usr/bin/google-chrome
-
-#key=..*1:sudo sv start mythbackend
-#key=..*2:sudo sv stop mythbackend
-#key=..*3:sudo sv restart mythbackend
-
key=..*1:/usr/LH/bin/lh_backend_control.sh start
key=..*2:/usr/LH/bin/lh_backend_control.sh stop
key=..*3:/usr/LH/bin/lh_backend_control.sh restart
--
cgit v0.12
From 5463d11b411596a84af52b98a22e62b3eff81b4f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 11:40:14 -0500
Subject: mythinstall: update help
---
abs/core/mythinstall/PKGBUILD | 8 ++--
abs/core/mythinstall/checkout_MythVantage.sh | 3 ++
abs/core/mythinstall/main.cpp.patch | 63 ++++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 4 deletions(-)
create mode 100644 abs/core/mythinstall/main.cpp.patch
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 40a3a06..3009f32 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=78
+pkgrel=79
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.25')
@@ -21,11 +21,11 @@ package() {
cd $MVBINDIR
ln -s MythVantage mythvantage
ln -s MythVantage mythinstall
- cd -
-
+ #cd -
+echo $logofiles
for i in $logofiles
do
- install -D -m 0755 $srcdir/$i $/pkgdir/usr/MythVantage/logos/$i
+ install -D -m 0755 $srcdir/$i $pkgdir/usr/MythVantage/logos/$i
done
}
diff --git a/abs/core/mythinstall/checkout_MythVantage.sh b/abs/core/mythinstall/checkout_MythVantage.sh
index bb1a7b7..e0d4b0c 100755
--- a/abs/core/mythinstall/checkout_MythVantage.sh
+++ b/abs/core/mythinstall/checkout_MythVantage.sh
@@ -60,6 +60,9 @@ sed -i "s/mythvantage/LinHES/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common
patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.cpp < $MYDIR/misc_settings.cpp.patch
patch -N $MYDIR/src/MythVantage-app/mythinstall/misc_settings.h < $MYDIR/misc_settings.h.patch
+#update help screen
+patch -N $MYDIR/src/MythVantage-app/mythinstall/main.cpp < $MYDIR/main.cpp.patch
+
cd $MYDIR/src/MythVantage-app/mythinstall && qmake
make || exit 1
#cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
diff --git a/abs/core/mythinstall/main.cpp.patch b/abs/core/mythinstall/main.cpp.patch
new file mode 100644
index 0000000..90f243a
--- /dev/null
+++ b/abs/core/mythinstall/main.cpp.patch
@@ -0,0 +1,63 @@
+--- main.cpp.orig 2013-09-18 13:57:34.589499257 +0000
++++ main.cpp 2013-09-18 14:27:59.535328888 +0000
+@@ -445,38 +445,45 @@
+ {
+ DialogBox *dia = NULL;
+ QString prompt;
+- QString *problems = new QString(" Help Screen");
++ QString *problems = new QString("LinHES Help");
+ problems->append("\n");
+- problems->append("-------------------------------------------------");
++ problems->append("Visit http://linhes.org for additional help.");
+ problems->append("\n");
+- problems->append("Alt+h This screen");
++ problems->append("\n");
++ problems->append("------Keyboard Shortcuts---------------------------------");
++ problems->append("\n");
++ problems->append("Alt + h: This Screen");
+ problems->append("\n");
+ #ifdef __MVAPP__
+- problems->append("F2 open/close terminal");
++ problems->append("F2: Open/Close Terminal");
+ problems->append("\n");
+- problems->append("Shift + Return opens new xterm");
++ problems->append("Shift + Return: Open New Terminal (xterm)");
+ problems->append("\n");
+- problems->append("Alt+F2 for 2nd desktop Alt+F1 to go back");
++ problems->append("Alt + F2: Show 2nd desktop Alt + F1 To Go Back");
+ problems->append("\n");
+- problems->append("Alt+c Capture myth screenshot");
++ problems->append("Alt + c: Capture Myth Screenshot");
+ problems->append("\n");
+ #else
+- problems->append("Alt + X opens new xterm ");
++ problems->append("Alt + x: Open New Terminal (xterm)");
+ problems->append("\n");
+- problems->append("Alt + m start mythfrontend");
++ problems->append("Alt + m: Open mythfrontend");
+ problems->append("\n");
+- problems->append("m will display a popup for power/about");
++ problems->append("m in mythfrontend: Display Power/About Menu");
+ problems->append("\n");
+ #endif
+- problems->append("Ctrl + Alt + u unhide mouse cursor");
++ problems->append("Alt + 1: Start Master mythbackend");
++ problems->append("\n");
++ problems->append("Alt + 2: Stop Master mythbackend");
++ problems->append("\n");
++ problems->append("Alt + 3: Restart Master mythbackend");
+ problems->append("\n");
+- problems->append("Alt+1 start masterbackend");
++ problems->append("Alt + s: Open mythtv-setup");
+ problems->append("\n");
+- problems->append("Alt+2 stop masterbackend");
++ problems->append("Alt + u: Unhide/Hide Mouse Pointer");
+ problems->append("\n");
+- problems->append("Alt+3 restart masterbackend");
++ problems->append("Alt + w: Open Web Browser (Chrome if installed)");
+ problems->append("\n");
+- problems->append("Alt+s run mythtv-setup");
++ problems->append("Ctrl + Alt + f: Restart Window Manager");
+ problems->append("\n");
+
+
--
cgit v0.12
From d2a41cc6a88cc7754b1ed723a77029d67d7b86b4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 11:56:45 -0500
Subject: LinHES-system: linhes_update2.sh: pacman 4.1 changed the -f option to
--force.
unclutter-toggle.sh: add osd notification.
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/linhes_update2.sh | 2 +-
abs/core/LinHES-system/unclutter-toggle.sh | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 5cc8ca9..86fd230 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=16
+pkgrel=17
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -80,7 +80,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'6f5b757524d905b5d2420519a88edc93'
'4b4585ccba30595cf958d202997c57f7'
'dc3eef2a624754e16805d72bbe488b67'
- 'dc0be354ce77ba2b89868fc29b942c43'
+ 'fb61271da6b69678ef7ea35a5726a01f'
'542e670e78d117657f93141e9689f54d'
'41951459ea9d2b0567be521b67e6285a'
'bb72ab230c7a71706285bd0f31a4fb1f'
@@ -120,7 +120,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'c3ada01d3a739abe3f920b02d4ea3f6e'
'a94fe6d980f4b810f2e2ae5352084b39'
'e1011e0df090372cccc03ecf9d6805c7'
- 'd14335afe7dafa035a70399210e0df1a'
+ '5727da2f13541b0cde2aea0ab94d4960'
'503df99218373dfc75e7e7f5e449a44e'
'4a1fda884dcd7d65fb2690fbdbd92a83'
'2b7fe3b57592823a4c7e3ec132dcb7f4'
diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh
index cd04e3d..fbdd36b 100644
--- a/abs/core/LinHES-system/linhes_update2.sh
+++ b/abs/core/LinHES-system/linhes_update2.sh
@@ -4,7 +4,7 @@
if [[ "$1" = "install" ]]
then
msg_client.py --msg "Updating...|middle" --timeout 600 --tag "Updating"
- sudo pacman -Suf --noconfirm
+ sudo pacman -Su --force --noconfirm
msg_client.py --clear --tag "Updating"
msg_client.py --kill
msg_client.py --msg "Updates complete.|middle"
diff --git a/abs/core/LinHES-system/unclutter-toggle.sh b/abs/core/LinHES-system/unclutter-toggle.sh
index aadce50..02a12ff 100644
--- a/abs/core/LinHES-system/unclutter-toggle.sh
+++ b/abs/core/LinHES-system/unclutter-toggle.sh
@@ -5,7 +5,9 @@ idle=1
. /etc/unclutter.cfg
if [ -n "${PIDUNC}" ];
then
+ msg_client.py --msg "Showing mouse pointer..."
killall -9 unclutter
else
+ msg_client.py --msg "Hiding mouse pointer..."
/usr/X11R6/bin/unclutter -root -idle $idle -jitter $jitter -noevents &
fi
--
cgit v0.12
From feeab4e304d49176eb57ecfd7eb291055368f284 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 12:08:28 -0500
Subject: LinHES-system: unclutter-toggle.sh: fix path to unclutter.
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/unclutter-toggle.sh | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 86fd230..1a9c554 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=17
+pkgrel=18
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -80,7 +80,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'6f5b757524d905b5d2420519a88edc93'
'4b4585ccba30595cf958d202997c57f7'
'dc3eef2a624754e16805d72bbe488b67'
- 'fb61271da6b69678ef7ea35a5726a01f'
+ '617af86b901538817ebdcaf646248dc5'
'542e670e78d117657f93141e9689f54d'
'41951459ea9d2b0567be521b67e6285a'
'bb72ab230c7a71706285bd0f31a4fb1f'
diff --git a/abs/core/LinHES-system/unclutter-toggle.sh b/abs/core/LinHES-system/unclutter-toggle.sh
index 02a12ff..9b08a14 100644
--- a/abs/core/LinHES-system/unclutter-toggle.sh
+++ b/abs/core/LinHES-system/unclutter-toggle.sh
@@ -9,5 +9,5 @@ then
killall -9 unclutter
else
msg_client.py --msg "Hiding mouse pointer..."
- /usr/X11R6/bin/unclutter -root -idle $idle -jitter $jitter -noevents &
+ /usr/bin/unclutter -root -idle $idle -jitter $jitter -noevents &
fi
--
cgit v0.12
From 0af3b7dc2646ab0e4791e2c634eefd36510ddaab Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 12:21:27 -0500
Subject: LinHES-config: fix pacman -f cmds since pacman 4.1 doesn't support
-f, only --force
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/mv_common.py | 4 ++--
abs/core/LinHES-config/mv_supplemental.py | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index a756d3d..e452add 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=6
+pkgrel=7
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'
@@ -156,7 +156,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'3d1e4a119f38cff0498bf8a67e94e4b3'
'2506860a416e1988934225d80d501c2c'
'c0549457750c4f8e8038d904a0f3012a'
- '3d1e3c7315881a109fb089a540d2262c'
+ '075fe16ef92621ce31f41df5c5577daf'
'b845de3e05c1734cce4b9ac5e8f1baaf'
'31ad5416bf2ab1909338a16035941127'
'8b7dce4a3a0a281fa6656aa8781a648e'
@@ -166,7 +166,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'3eec99951c01d1a1abf7ecfeb33f922b'
'087a0ef743bc8af915503f8773536ce4'
'183a11aa06d60065106472ed9f72cc4a'
- 'b4900090d841d3e390cb840cf16afd85'
+ 'b2c63ca687a460844fa6f8dabf55f750'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
'e4b61402858058f7575b776d62d5ee89'
diff --git a/abs/core/LinHES-config/mv_common.py b/abs/core/LinHES-config/mv_common.py
index 432c270..ff2ee9f 100755
--- a/abs/core/LinHES-config/mv_common.py
+++ b/abs/core/LinHES-config/mv_common.py
@@ -229,7 +229,7 @@ def pacinstall(pkg):
elif pkg == "xymonclient":
if os.path.exists('/home/xymon/client'):
- cmd='''pacman --noconfirm --dbonly -Sddf xymonclient'''
+ cmd='''pacman --noconfirm --dbonly -Sdd --force xymonclient'''
runcmd(cmd)
if not pkg_blacklist_check(pkg):
@@ -237,7 +237,7 @@ def pacinstall(pkg):
logging.info(" %s is already installed, will not install",pkg)
else:
logging.info(" Installing %s",pkg)
- cmd ='''pacman --noconfirm -Sf %s ''' %pkg
+ cmd ='''pacman --noconfirm -S --force %s ''' %pkg
runcmd(cmd)
else:
logging.info(" %s is blacklisted, will not install",pkg)
diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py
index 2b8bd2f..2699b3b 100755
--- a/abs/core/LinHES-config/mv_supplemental.py
+++ b/abs/core/LinHES-config/mv_supplemental.py
@@ -41,9 +41,9 @@ def supplemental(systemconfig,this_is_install = False):
logging.info(" Installing supplemental system\n")
if this_is_install == True:
if os.path.exists('/home/xymon/server'):
- cmd='''pacman --noconfirm --dbonly -Sddf xymonserver'''
+ cmd='''pacman --noconfirm --dbonly -Sdd --force xymonserver'''
mv_common.runcmd(cmd)
cmd='''/usr/LH/bin/install_supplemental_service.sh'''
mv_common.runcmd(cmd)
- logging.info("__End of supplemental\n")
\ No newline at end of file
+ logging.info("__End of supplemental\n")
--
cgit v0.12
From c03f6a2c2122bd033aa4070112a6458a3dec750f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 15:20:41 -0500
Subject: LinHES-system: msg_daemon.py: make top slots slide down from the top
and slide up to disappear.
---
abs/core/LinHES-system/PKGBUILD | 4 +--
abs/core/LinHES-system/msg_daemon.py | 47 +++++++++++++++++++++++++-----------
2 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 1a9c554..43a8dbf 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=18
+pkgrel=19
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -101,7 +101,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'4abc4780fa78ed40c07401b3cd25209b'
- 'cf5d14fdb45991d07ab9db7726cf1322'
+ '1d275246216ba1b22d5f09eb1c775a73'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 4c37171..fe47263 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -28,21 +28,40 @@ class msg_aosd():
osd.show()
x -= 1
- y += height - 1;
- for i in range(1, height + 1, step):
- osd.loop_for(5)
- y -= step
- osd.set_geometry(x, y, width, i)
- osd.set_position(pos, width, height)
- osd.set_position_offset(-1, -1)
- (x, y, _, _) = osd.get_geometry()
- #time to display
- osd.loop_for(display_time)
- for i in range(height, 0, -step):
- y += step
- osd.set_geometry(x, y, width, i);
- osd.loop_for(1);
+ if pos < 3: #top positions
+ y -= height + 1;
+ for i in range(1, height + 1, step):
+ osd.loop_for(5)
+ y += step
+ osd.set_geometry(x, y, width, height)
+
+ osd.set_position(pos, width, height)
+ osd.set_position_offset(-1, -1)
+ (x, y, _, _) = osd.get_geometry()
+ #time to display
+ osd.loop_for(display_time)
+ for i in range(height, 0, -step):
+ y -= step
+ osd.set_geometry(x, y, width, height);
+ osd.loop_for(1);
+
+ else: #bottom positions
+ y += height - 1;
+ for i in range(1, height + 1, step):
+ osd.loop_for(5)
+ y -= step
+ osd.set_geometry(x, y, width, i)
+
+ osd.set_position(pos, width, height)
+ osd.set_position_offset(-1, -1)
+ (x, y, _, _) = osd.get_geometry()
+ #time to display
+ osd.loop_for(display_time)
+ for i in range(height, 0, -step):
+ y += step
+ osd.set_geometry(x, y, width, i);
+ osd.loop_for(1);
osd.hide();
--
cgit v0.12
From 698d5855134c0d2b9f6ebaf26b4e828bc3083a7a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 17:13:58 -0500
Subject: supplemental-web: add favicon.ico
---
abs/core/supplemental-web/PKGBUILD | 45 ++++------------------
abs/core/supplemental-web/contents/alt_index.html | 4 +-
abs/core/supplemental-web/contents/favicon.ico | Bin 0 -> 1150 bytes
3 files changed, 11 insertions(+), 38 deletions(-)
create mode 100644 abs/core/supplemental-web/contents/favicon.ico
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index fa46e23..c24ebb8 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,75 +1,46 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=6
+pkgrel=8
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
source=(lighttpd-supplement.conf extra.cfg.txt wakeonlan.sh slaveserve.py supplemental_slave.rules supplemental_web.rules )
-build(){
- cd $startdir/src
-}
-
-#
-# build() {
-# cd $startdir/src
-# mkdir -p $MVDIR/etc
-# install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf
-# install -m755 -D wakeonlan.sh $MVDIR/bin/wakeonlan.sh
-# # install -m755 -D backend_control.sh $MVDIR/bin/backend_control.sh
-# mkdir -p $startdir/pkg/data/srv/httpd/htdocs/
-# cp -rp $startdir/contents/* $startdir/pkg/data/srv/httpd/htdocs
-# chmod -R 755 $startdir/pkg/data/srv/httpd/htdocs
-# cd $startdir
-# mkdir -p $startdir/pkg/data/srv/httpd/
-# cp -rp cgi $startdir/pkg/data/srv/httpd/
-# cd $startdir/src
-# install -m755 -D extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt
-# }
-
package_supplemental-web() {
pkgdesc="supplemental-web package for master backend"
depends=('wol' 'etherwake' 'lighttpd' 'php' 'fcgi' 'python2' 'xymonserver' 'certmaster' 'func' 'python_aosd' 'LinHES-system>=2-50' 'shellinabox')
install=supplemental-web.install
- cd $startdir/src
MVDIR=$pkgdir/usr/MythVantage
- mkdir -p $MVDIR/etc
install -m755 -D lighttpd-supplement.conf $pkgdir/etc/gen_light_conf.d/lighttpd-supplement.conf
install -m755 -D wakeonlan.sh $MVDIR/bin/wakeonlan.sh
# install -m755 -D backend_control.sh $MVDIR/bin/backend_control.sh
mkdir -p $pkgdir/data/srv/httpd/htdocs/
cp -rp $startdir/contents/* $pkgdir/data/srv/httpd/htdocs
chmod -R 755 $pkgdir/data/srv/httpd/htdocs
- cd $startdir
mkdir -p $pkgdir/data/srv/httpd/
- cp -rp cgi $pkgdir/data/srv/httpd/
- cd $startdir/src
- install -m755 -D extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt
+ cp -rp $startdir/cgi $pkgdir/data/srv/httpd/
+ install -m755 -D $srcdir/extra.cfg.txt $pkgdir/data/srv/httpd/cgi/extra.cfg.txt
#sudo rules
- install -D -m400 $startdir/src/supplemental_web.rules $pkgdir/etc/sudoers.d/supplemental_web
+ install -D -m400 $srcdir/supplemental_web.rules $pkgdir/etc/sudoers.d/supplemental_web
chmod 750 $pkgdir/etc/sudoers.d
-
- }
+}
package_supplemental-web-slave() {
pkgdesc="supplemental-web package for slave backend"
depends=('python2' 'func' 'python_aosd' 'LinHES-system>=2-50')
conflicts="supplemental-web"
- cd $startdir
mkdir -p $pkgdir/data/srv/httpd/
- cp -rp cgi $pkgdir/data/srv/httpd/
+ cp -rp $startdir/cgi $pkgdir/data/srv/httpd/
chown -R root:root $pkgdir/data/srv/httpd/
chmod -R 755 $pkgdir/data/srv/httpd/
install -m755 -D $srcdir/slaveserve.py $pkgdir/data/srv/httpd/cgi/slaveserve.py
#sudo rules
- install -D -m400 $startdir/src/supplemental_slave.rules $pkgdir/etc/sudoers.d/supplemental_slave
+ install -D -m400 $srcdir/supplemental_slave.rules $pkgdir/etc/sudoers.d/supplemental_slave
chmod 750 $pkgdir/etc/sudoers.d
-
-
- }
+}
md5sums=('a2497205c92ad5b3aa565574afbf7f80'
'3d8c7b430c1319d706ca420825918d2a'
diff --git a/abs/core/supplemental-web/contents/alt_index.html b/abs/core/supplemental-web/contents/alt_index.html
index 7a0f3d2..1168c4a 100644
--- a/abs/core/supplemental-web/contents/alt_index.html
+++ b/abs/core/supplemental-web/contents/alt_index.html
@@ -1,6 +1,8 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
<html>
- <head><title>LinHES: The Linux Home Entertainment System</title>
+ <head>
+ <link rel="shortcut icon" href="/favicon.ico">
+ <title>LinHES: The Linux Home Entertainment System</title>
</head>
<frameset cols="205, 100%" frameborder="no" border="0" bordercolor="#000000">
<frame src="header.html" scrolling=no name="menuframe" />
diff --git a/abs/core/supplemental-web/contents/favicon.ico b/abs/core/supplemental-web/contents/favicon.ico
new file mode 100644
index 0000000..6a99443
Binary files /dev/null and b/abs/core/supplemental-web/contents/favicon.ico differ
--
cgit v0.12
From bf7ad0aef3cdad0fc0f4dae46763cce150ccc65d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 18 Sep 2013 17:25:06 -0500
Subject: mythweb: change dep to supplemental-web.
---
abs/core/mythtv/stable-0.25/mythweb/PKGBUILD | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
index f3e019a..9882ad8 100644
--- a/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythweb/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=mythweb
pkgver=0.25
-pkgrel=8
+pkgrel=9
commit_hash=`cat ../git_src/git_hash_web`
@@ -9,7 +9,7 @@ url="http://www.mythtv.org"
license="GPL"
arch=('i686' 'x86_64')
-depends=('mythtv>=0.25' 'lighttpd' 'php' 'local-website')
+depends=('mythtv>=0.25' 'lighttpd' 'php' 'supplemental-web')
groups=('mythtv-extras')
install=mythweb.install
#http://code.mythtv.org/trac/ticket/10504
@@ -17,7 +17,6 @@ install=mythweb.install
patches=(schedules.php.patch tv-schedules.php.patch)
source=(`echo ${patches[@]:0}` mythweb.include mythweb_gen_light.conf)
-DOCROOT=/data/srv/httpd/mythweb
build() {
if [ -e ${srcdir}/mythweb ]
@@ -35,7 +34,7 @@ build() {
msg "The local files are updated."
- cd $startdir/src/mythweb
+ cd $srcdir/mythweb
@@ -50,7 +49,10 @@ build() {
[ "$CARCH" = "i686" ] && ARCH="i686"
[ "$CARCH" = "x86_64" ] && ARCH="x86-64"
+}
+package() {
+ DOCROOT=/data/srv/httpd/mythweb
mkdir -p $pkgdir/$DOCROOT/{image_cache,php_sessions,data}
rsync -arp --exclude .git --delete-excluded $srcdir/mythweb/* $pkgdir/$DOCROOT
rm $pkgdir/$DOCROOT/README
--
cgit v0.12
From 43ef393b635a7da7511057ff72f1ac3d9c41925d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 19 Sep 2013 13:09:12 -0500
Subject: remove chromium and deps.
rm deps graphite, harfbuzz, libwebp, opus, snappy, speech-dispatcher
---
abs/extra/chromium/PKGBUILD | 139 ---------------------
...mium-20.0.1132.57-glib-2.16-use-siginfo_t.patch | 35 ------
abs/extra/chromium/chromium-ppapi-r0.patch | 11 --
abs/extra/chromium/chromium.default | 4 -
abs/extra/chromium/chromium.desktop | 113 -----------------
abs/extra/chromium/chromium.install | 12 --
abs/extra/chromium/chromium.sh | 16 ---
abs/extra/graphite/PKGBUILD | 63 ----------
abs/extra/graphite/graphite2-1.2.0-cmakepath.patch | 9 --
abs/extra/harfbuzz/PKGBUILD | 46 -------
abs/extra/libwebp/PKGBUILD | 40 ------
abs/extra/opus/PKGBUILD | 34 -----
abs/extra/snappy/PKGBUILD | 42 -------
abs/extra/speech-dispatcher/PKGBUILD | 61 ---------
abs/extra/speech-dispatcher/__changelog | 1 -
.../speech-dispatcher/speech-dispatcher.install | 22 ----
.../speech-dispatcher/speech-dispatcherd.service | 10 --
17 files changed, 658 deletions(-)
delete mode 100644 abs/extra/chromium/PKGBUILD
delete mode 100644 abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
delete mode 100644 abs/extra/chromium/chromium-ppapi-r0.patch
delete mode 100644 abs/extra/chromium/chromium.default
delete mode 100644 abs/extra/chromium/chromium.desktop
delete mode 100644 abs/extra/chromium/chromium.install
delete mode 100755 abs/extra/chromium/chromium.sh
delete mode 100644 abs/extra/graphite/PKGBUILD
delete mode 100644 abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
delete mode 100644 abs/extra/harfbuzz/PKGBUILD
delete mode 100644 abs/extra/libwebp/PKGBUILD
delete mode 100644 abs/extra/opus/PKGBUILD
delete mode 100644 abs/extra/snappy/PKGBUILD
delete mode 100644 abs/extra/speech-dispatcher/PKGBUILD
delete mode 100644 abs/extra/speech-dispatcher/__changelog
delete mode 100644 abs/extra/speech-dispatcher/speech-dispatcher.install
delete mode 100644 abs/extra/speech-dispatcher/speech-dispatcherd.service
diff --git a/abs/extra/chromium/PKGBUILD b/abs/extra/chromium/PKGBUILD
deleted file mode 100644
index 821ba39..0000000
--- a/abs/extra/chromium/PKGBUILD
+++ /dev/null
@@ -1,139 +0,0 @@
-# $Id: PKGBUILD 170409 2012-11-07 11:29:05Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=chromium
-pkgver=23.0.1271.64
-pkgrel=1
-pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
-arch=('i686' 'x86_64')
-url="http://www.chromium.org/"
-license=('BSD')
-depends=('gtk2' 'dbus-glib' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent'
- 'libxss' 'libgcrypt' 'ttf-dejavu' 'desktop-file-utils'
- 'hicolor-icon-theme')
-makedepends=('python2' 'perl' 'gperf' 'yasm' 'mesa' 'libgnome-keyring'
- 'elfutils' 'subversion' 'nacl-toolchain-newlib')
-optdepends=('kdebase-kdialog: needed for file dialogs in KDE')
-backup=('etc/chromium/default')
-install=chromium.install
-source=(http://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.bz2
- chromium.desktop
- chromium.default
- chromium.sh
- chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
- chromium-ppapi-r0.patch)
-sha256sums=('e894bb22d4747c69fc34b181be3a25e20fd9599ed93f08779df600fe3402ffe7'
- '09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
- '478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
- '4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9'
- 'c1baf14121502efbc2a31b64029dcafa0e28ca5b71ad0e28a3c6342d18198615'
- '1f4b57670d317959bc2dc60e5d2a44aa8fc6028f7ed540cdb502fa0aa99c81bd')
-
-build() {
- cd "$srcdir/chromium-$pkgver"
-
- # Fix build with glibc 2.16
- patch -Np1 -i "$srcdir/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch"
-
- # Fix build without NaCl glibc toolchain (patch from Gentoo)
- patch -Np0 -i "$srcdir/chromium-ppapi-r0.patch"
-
- # http://code.google.com/p/chromium/issues/detail?id=109527
- sed -i 's|glib/gutils.h|glib.h|' ui/base/l10n/l10n_util.cc
-
- # Missing gyp files in tarball (http://crbug.com/144823)
- sed -i '/nacl_test_data\.gyp/d' chrome/chrome_tests.gypi
-
- # Use Python 2
- find . -type f -exec sed -i -r \
- -e 's|/usr/bin/python$|&2|g' \
- -e 's|(/usr/bin/python2)\.4$|\1|g' \
- {} +
- # There are still a lot of relative calls which need a workaround
- mkdir "$srcdir/python2-path"
- ln -s /usr/bin/python2 "$srcdir/python2-path/python"
- export PATH="$srcdir/python2-path:$PATH"
-
- # Prepare NaCL toolchain
- mkdir -p sdk native_client/toolchain/.tars
- cp -a /usr/lib/nacl-toolchain-newlib sdk/nacl-sdk
- tar czf native_client/toolchain/.tars/naclsdk_linux_x86.tgz sdk
- rm -r sdk
-
- # CFLAGS are passed through release_extra_cflags below
- export -n CFLAGS CXXFLAGS
-
- # Silence "identifier 'nullptr' is a keyword in C++11" warnings
- CFLAGS+=' -Wno-c++0x-compat'
-
- build/gyp_chromium --depth=. \
- -Dwerror= \
- -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
- -Dlinux_strip_binary=1 \
- -Dlinux_use_gold_binary=0 \
- -Dlinux_use_gold_flags=0 \
- -Drelease_extra_cflags="$CFLAGS" \
- -Dffmpeg_branding=Chrome \
- -Dproprietary_codecs=1 \
- -Duse_system_bzip2=1 \
- -Duse_system_ffmpeg=0 \
- -Duse_system_libevent=1 \
- -Duse_system_libjpeg=1 \
- -Duse_system_libpng=1 \
- -Duse_system_libxml=0 \
- -Duse_system_ssl=0 \
- -Duse_system_yasm=1 \
- -Duse_system_zlib=0 \
- -Duse_gconf=0 \
- -Ddisable_glibc=1 \
- -Ddisable_pnacl=1 \
- -Ddisable_sse2=1
-
- make chrome chrome_sandbox BUILDTYPE=Release
-}
-
-package() {
- cd "$srcdir/chromium-$pkgver"
-
- install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
-
- install -Dm4755 -o root -g root out/Release/chrome_sandbox \
- "$pkgdir/usr/lib/chromium/chromium-sandbox"
-
- cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
- out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
- "$pkgdir/usr/lib/chromium/"
-
- if [[ $CARCH == i686 ]]; then
- rm "$pkgdir/usr/lib/chromium/nacl_irt_x86_64.nexe"
- fi
-
- # Allow users to override command-line options
- install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
-
- cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
-
- install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
-
- install -Dm644 "$srcdir/chromium.desktop" \
- "$pkgdir/usr/share/applications/chromium.desktop"
-
- for size in 22 24 48 64 128 256; do
- install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
- "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
- done
-
- for size in 16 32; do
- install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
- "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
- done
-
- install -D "$srcdir/chromium.sh" "$pkgdir/usr/bin/chromium"
-
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch b/abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
deleted file mode 100644
index 1d11a39..0000000
--- a/abs/extra/chromium/chromium-20.0.1132.57-glib-2.16-use-siginfo_t.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -upr chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
---- chromium-20.0.1132.57.orig/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-10 10:48:31.000000000 +0300
-+++ chromium-20.0.1132.57/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2012-07-11 23:44:11.000000000 +0300
-@@ -243,14 +243,13 @@ struct kernel_rusage {
- long ru_nivcsw;
- };
-
--struct siginfo;
- #if defined(__i386__) || defined(__arm__) || defined(__PPC__)
-
- /* include/asm-{arm,i386,mips,ppc}/signal.h */
- struct kernel_old_sigaction {
- union {
- void (*sa_handler_)(int);
-- void (*sa_sigaction_)(int, struct siginfo *, void *);
-+ void (*sa_sigaction_)(int, siginfo_t *, void *);
- };
- unsigned long sa_mask;
- unsigned long sa_flags;
-@@ -287,13 +286,13 @@ struct kernel_sigaction {
- unsigned long sa_flags;
- union {
- void (*sa_handler_)(int);
-- void (*sa_sigaction_)(int, struct siginfo *, void *);
-+ void (*sa_sigaction_)(int, siginfo_t *, void *);
- };
- struct kernel_sigset_t sa_mask;
- #else
- union {
- void (*sa_handler_)(int);
-- void (*sa_sigaction_)(int, struct siginfo *, void *);
-+ void (*sa_sigaction_)(int, siginfo_t *, void *);
- };
- unsigned long sa_flags;
- void (*sa_restorer)(void);
diff --git a/abs/extra/chromium/chromium-ppapi-r0.patch b/abs/extra/chromium/chromium-ppapi-r0.patch
deleted file mode 100644
index fb7e160..0000000
--- a/abs/extra/chromium/chromium-ppapi-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ppapi/ppapi_untrusted.gyp.orig 2012-06-12 10:20:16.000000000 +0200
-+++ ppapi/ppapi_untrusted.gyp 2012-06-12 10:20:52.000000000 +0200
-@@ -80,7 +80,7 @@
- ],
- },
- 'conditions': [
-- ['target_arch!="arm"', {
-+ ['target_arch!="arm" and disable_glibc==0', {
- 'variables': {
- 'build_glibc': 1,
- # NOTE: Use /lib, not /lib64 here; it is a symbolic link which
diff --git a/abs/extra/chromium/chromium.default b/abs/extra/chromium/chromium.default
deleted file mode 100644
index 2632024..0000000
--- a/abs/extra/chromium/chromium.default
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default settings for chromium. This file is sourced by /usr/bin/chromium
-
-# Options to pass to chromium
-CHROMIUM_FLAGS=""
diff --git a/abs/extra/chromium/chromium.desktop b/abs/extra/chromium/chromium.desktop
deleted file mode 100644
index 18446d4..0000000
--- a/abs/extra/chromium/chromium.desktop
+++ /dev/null
@@ -1,113 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Chromium
-# Only KDE 4 seems to use GenericName, so we reuse the KDE strings.
-# From Ubuntu's language-pack-kde-XX-base packages, version 9.04-20090413.
-GenericName=Web Browser
-GenericName[ar]=متصفح الشبكة
-GenericName[bg]=Уеб браузър
-GenericName[ca]=Navegador web
-GenericName[cs]=WWW prohlížeč
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής ιστού
-GenericName[en_GB]=Web Browser
-GenericName[es]=Navegador web
-GenericName[et]=Veebibrauser
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[gu]=વેબ બ્રાઉઝર
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[kn]=ಜಾಲ ವೀಕ್ಷಕ
-GenericName[ko]=웹 브라우저
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Tīmekļa pārlūks
-GenericName[ml]=വെബ് ബ്രൌസര്
-GenericName[mr]=वेब ब्राऊजर
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador da Internet
-GenericName[ro]=Navigator de Internet
-GenericName[ru]=Веб-браузер
-GenericName[sl]=Spletni brskalnik
-GenericName[sv]=Webbläsare
-GenericName[ta]=இணைய உலாவி
-GenericName[th]=เว็บเบราว์เซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_HK]=網頁瀏覽器
-GenericName[zh_TW]=網頁瀏覽器
-# Not translated in KDE, from Epiphany 2.26.1-0ubuntu1.
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[fil]=Web Browser
-GenericName[hr]=Web preglednik
-GenericName[id]=Browser Web
-GenericName[or]=ଓ୍ବେବ ବ୍ରାଉଜର
-GenericName[sk]=WWW prehliadač
-GenericName[sr]=Интернет прегледник
-GenericName[te]=మహాతల అన్వేషి
-GenericName[vi]=Bộ duyệt Web
-# Gnome and KDE 3 uses Comment.
-Comment=Access the Internet
-Comment[ar]=الدخول إلى الإنترنت
-Comment[bg]=Достъп до интернет
-Comment[bn]=ইন্টারনেটটি অ্যাক্সেস করুন
-Comment[ca]=Accedeix a Internet
-Comment[cs]=Přístup k internetu
-Comment[da]=Få adgang til internettet
-Comment[de]=Internetzugriff
-Comment[el]=Πρόσβαση στο Διαδίκτυο
-Comment[en_GB]=Access the Internet
-Comment[es]=Accede a Internet.
-Comment[et]=Pääs Internetti
-Comment[fi]=Käytä internetiä
-Comment[fil]=I-access ang Internet
-Comment[fr]=Accéder à Internet
-Comment[gu]=ઇંટરનેટ ઍક્સેસ કરો
-Comment[he]=גישה אל האינטרנט
-Comment[hi]=इंटरनेट तक पहुंच स्थापित करें
-Comment[hr]=Pristup Internetu
-Comment[hu]=Internetelérés
-Comment[id]=Akses Internet
-Comment[it]=Accesso a Internet
-Comment[ja]=インターネットにアクセス
-Comment[kn]=ಇಂಟರ್ನೆಟ್ ಅನ್ನು ಪ್ರವೇಶಿಸಿ
-Comment[ko]=인터넷 연결
-Comment[lt]=Interneto prieiga
-Comment[lv]=Piekļūt internetam
-Comment[ml]=ഇന്റര്നെറ്റ് ആക്സസ് ചെയ്യുക
-Comment[mr]=इंटरनेटमध्ये प्रवेश करा
-Comment[nb]=Gå til Internett
-Comment[nl]=Verbinding maken met internet
-Comment[or]=ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରବେଶ କରନ୍ତୁ
-Comment[pl]=Skorzystaj z internetu
-Comment[pt]=Aceder à Internet
-Comment[pt_BR]=Acessar a internet
-Comment[ro]=Accesaţi Internetul
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prístup do siete Internet
-Comment[sl]=Dostop do interneta
-Comment[sr]=Приступите Интернету
-Comment[sv]=Gå ut på Internet
-Comment[ta]=இணையத்தை அணுகுதல்
-Comment[te]=ఇంటర్నెట్ను ఆక్సెస్ చెయ్యండి
-Comment[th]=เข้าถึงอินเทอร์เน็ต
-Comment[tr]=İnternet'e erişin
-Comment[uk]=Доступ до Інтернету
-Comment[vi]=Truy cập Internet
-Comment[zh_CN]=访问互联网
-Comment[zh_HK]=連線到網際網路
-Comment[zh_TW]=連線到網際網路
-Exec=chromium %U
-Terminal=false
-Icon=chromium
-Type=Application
-Categories=GTK;Network;WebBrowser;
-MimeType=text/html;text/xml;application/xhtml+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
diff --git a/abs/extra/chromium/chromium.install b/abs/extra/chromium/chromium.install
deleted file mode 100644
index d43ea7c..0000000
--- a/abs/extra/chromium/chromium.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/abs/extra/chromium/chromium.sh b/abs/extra/chromium/chromium.sh
deleted file mode 100755
index ba8a7e6..0000000
--- a/abs/extra/chromium/chromium.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Allow users to override command-line options
-# Based on Gentoo's chromium package (and by extension, Debian's)
-if [[ -f /etc/chromium/default ]]; then
- . /etc/chromium/default
-fi
-
-# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system
-# default CHROMIUM_FLAGS (from /etc/chromium/default)
-CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-$CHROMIUM_FLAGS}
-
-export CHROME_WRAPPER=$(readlink -f "$0")
-export CHROME_DESKTOP=chromium.desktop
-
-exec /usr/lib/chromium/chromium $CHROMIUM_FLAGS "$@"
diff --git a/abs/extra/graphite/PKGBUILD b/abs/extra/graphite/PKGBUILD
deleted file mode 100644
index 67fead2..0000000
--- a/abs/extra/graphite/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgname=graphite
-pkgver=1.2.3
-pkgrel=1
-epoch=1
-arch=('i686' 'x86_64')
-url="http://projects.palaso.org/projects/graphitedev"
-pkgdesc='reimplementation of the SIL Graphite text processing engine'
-license=('LGPL' 'GPL' 'custom')
-depends=('gcc-libs')
-makedepends=('cmake' 'freetype2' 'python2')
- # - only for docs - target doesn't install properly
- # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to be missing
-options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
- graphite2-1.2.0-cmakepath.patch)
-md5sums=('7042305e4208af4c2d5249d814ccce58'
- '00353b67941dbc30b76a43253760769e')
-
-build() {
- cd "${srcdir}"
-
- # python2 fixes
- sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
-
- # fix install path - .cmake files contain architecture dependend content - patch taken from FC/Slackware
- pushd graphite2-${pkgver}
- patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
- popd
-
- mkdir build
- cd build
- cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
- -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DGRAPHITE2_COMPARE_RENDERER=OFF \
- #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target will be fixed
-
- # fix unwanted -O3 cflag (taken form Debian)
- find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \;
-
- make
- #make docs
-}
-
-check() {
- cd "${srcdir}"/build
- sed -i "s:python:python2:g" tests/CTestTestfile.cmake
- ctest
-}
-
-package() {
- cd "${srcdir}"/build
- # FIXME: all target doesn't install the docs target files
- make DESTDIR="$pkgdir/" install
-
- # licenses
- mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
- install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
diff --git a/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch b/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
deleted file mode 100644
index ee71cd6..0000000
--- a/abs/extra/graphite/graphite2-1.2.0-cmakepath.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt graphite2-1.2.0/src/CMakeLists.txt
---- graphite2-1.2.0.orig/src/CMakeLists.txt 2013-01-29 15:47:32.465841769 +0530
-+++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530
-@@ -136,4 +136,4 @@
-
-
- install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION include/graphite2 RUNTIME DESTINATION bin)
--install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
-+install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE gr2_)
diff --git a/abs/extra/harfbuzz/PKGBUILD b/abs/extra/harfbuzz/PKGBUILD
deleted file mode 100644
index c9f550f..0000000
--- a/abs/extra/harfbuzz/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=(harfbuzz)
-pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.19
-pkgrel=1
-pkgdesc="OpenType text shaping engine"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-license=(MIT)
-makedepends=(glib2 freetype2 graphite cairo icu)
-options=(!libtool)
-source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('d2da0f060d47f6ad9de8c8781bb21fa4b9eae8ea1cd1e956b814095baa002f35')
-
-build() {
- cd $pkgbase-$pkgver
- ./configure --prefix=/usr \
- --with-glib --with-freetype --with-cairo --with-icu --with-graphite2
- make
-}
-
-package_harfbuzz() {
- depends=(glib2 freetype2 graphite)
- optdepends=('cairo: hb-view program')
-
- cd $pkgbase-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/harfbuzz/COPYING"
-
-# Split harfbuzz-icu
- mkdir -p ../hb-icu/usr/{include/harfbuzz,lib/pkgconfig}; cd ../hb-icu
- mv "$pkgdir"/usr/lib/libharfbuzz-icu* ./usr/lib
- mv "$pkgdir"/usr/lib/pkgconfig/harfbuzz-icu.pc ./usr/lib/pkgconfig
- mv "$pkgdir"/usr/include/harfbuzz/hb-icu.h ./usr/include/harfbuzz
-}
-
-package_harfbuzz-icu(){
- pkgdesc="$pkgdesc (ICU integration)"
- depends=(harfbuzz icu)
-
- mv hb-icu/* "$pkgdir"
-
- install -Dm644 $pkgbase-$pkgver/COPYING "$pkgdir/usr/share/licenses/harfbuzz-icu/COPYING"
-}
diff --git a/abs/extra/libwebp/PKGBUILD b/abs/extra/libwebp/PKGBUILD
deleted file mode 100644
index f7100ff..0000000
--- a/abs/extra/libwebp/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Jon Nordby <jononor@gmail.com>
-
-pkgname=libwebp
-pkgver=0.3.1
-pkgrel=3
-pkgdesc="WebP library and conversion tools"
-arch=(x86_64 i686)
-url="https://developers.google.com/speed/webp/"
-license=(BSD)
-depends=(libpng libjpeg libtiff giflib)
-makedepends=(freeglut mesa glu)
-optdepends=('freeglut: vwebp viewer')
-options=('!libtool')
-source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr \
- --enable-swap-16bit-csp \
- --enable-experimental \
- --enable-libwebpmux \
- --enable-libwebpdemux \
- --enable-libwebpdecoder \
- --disable-static
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/opus/PKGBUILD b/abs/extra/opus/PKGBUILD
deleted file mode 100644
index 9236886..0000000
--- a/abs/extra/opus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
-# Contributor: pumbur
-
-pkgname=opus
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
-arch=(i686 x86_64)
-url="http://www.opus-codec.org/"
-license=(BSD)
-depends=(glibc)
-options=('!libtool')
-source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('86eedbd3c5a0171d2437850435e6edff')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --enable-custom-modes
- make
-}
-
-check() {
- cd $pkgname-$pkgver
- make check
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/abs/extra/snappy/PKGBUILD b/abs/extra/snappy/PKGBUILD
deleted file mode 100644
index ef03f35..0000000
--- a/abs/extra/snappy/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Antony Male <antony dot male at geemail dot com>>
-
-pkgname=snappy
-pkgver=1.1.0
-pkgrel=1
-pkgdesc='A fast compressor/decompressor library'
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/snappy/"
-license=('BSD')
-depends=('glibc' 'gcc-libs')
-checkdepends=('zlib')
-options=('!libtool')
-source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('c8f3ef29b5281e78f4946b2d739cea4f')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # compile without assertions
- CXXFLAGS+=\ -DNDEBUG
-
- ./configure --prefix=/usr
- make
-}
-
-check() {
- # compile without assertions
- CXXFLAGS+=\ -DNDEBUG
-
- make -C "$pkgname-$pkgver" check
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
- install -m644 -D COPYING "$pkgdir/usr/share/licenses/snappy/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/extra/speech-dispatcher/PKGBUILD b/abs/extra/speech-dispatcher/PKGBUILD
deleted file mode 100644
index 4c26348..0000000
--- a/abs/extra/speech-dispatcher/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Steve Holmes <steve.holmes88@gmail.com>
-# Contributor: Alexander Jenisch <nt@divzero.at>
-# Contributor: Chris Brannon <cmbrannon@cox.net>
-# Contributor: Andreas Messer <andi@bupfen.de>
-
-pkgname=speech-dispatcher
-pkgver=0.8
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="High-level device independent layer for speech synthesis interface"
-url="http://www.freebsoft.org/speechd"
-license=('GPL2' 'FDL')
-depends=('glib2' 'libltdl' 'python-xdg' 'dotconf')
-makedepends=('intltool')
-optdepends=('festival: Speech output using Festival'
- 'espeak: Speech output using ESpeak'
- 'pulseaudio: PulseAudio support')
-provides=("speechd=${pkgver}")
-options=('!libtool')
-backup=(etc/speech-dispatcher/clients/gnome-speech.conf
- etc/speech-dispatcher/clients/emacs.conf
- etc/speech-dispatcher/modules/ibmtts.conf
- etc/speech-dispatcher/modules/espeak-generic.conf
- etc/speech-dispatcher/modules/espeak.conf
- etc/speech-dispatcher/modules/swift-generic.conf
- etc/speech-dispatcher/modules/festival.conf
- etc/speech-dispatcher/modules/cicero.conf
- etc/speech-dispatcher/modules/espeak-mbrola-generic.conf
- etc/speech-dispatcher/modules/dtk-generic.conf
- etc/speech-dispatcher/modules/llia_phon-generic.conf
- etc/speech-dispatcher/modules/ivona.conf
- etc/speech-dispatcher/modules/epos-generic.conf
- etc/speech-dispatcher/modules/flite.conf
- etc/speech-dispatcher/speechd.conf)
-install="${pkgname}.install"
-source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
- 'speech-dispatcherd.service')
-md5sums=('d88691a64c676122f996230c107c392f'
- 'd26f52e2e95a30eaa83560f0e63faca5')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --without-flite \
- --without-espeak \
- --without-pulse
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
- install -d "${pkgdir}/var/log/speech-dispatcher"
-}
diff --git a/abs/extra/speech-dispatcher/__changelog b/abs/extra/speech-dispatcher/__changelog
deleted file mode 100644
index 15dba69..0000000
--- a/abs/extra/speech-dispatcher/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove libpulse and espeak
diff --git a/abs/extra/speech-dispatcher/speech-dispatcher.install b/abs/extra/speech-dispatcher/speech-dispatcher.install
deleted file mode 100644
index 1565d3a..0000000
--- a/abs/extra/speech-dispatcher/speech-dispatcher.install
+++ /dev/null
@@ -1,22 +0,0 @@
-info_dir=usr/share/info
-info_files=('speech-dispatcher.info'
- 'ssip.info'
- 'spd-say.info')
-
-post_install() {
- [[ -x usr/bin/install-info ]] || return 0
- for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- [[ -x usr/bin/install-info ]] || return 0
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
diff --git a/abs/extra/speech-dispatcher/speech-dispatcherd.service b/abs/extra/speech-dispatcher/speech-dispatcherd.service
deleted file mode 100644
index ce21c56..0000000
--- a/abs/extra/speech-dispatcher/speech-dispatcherd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Speech-Dispatcher an high-level device independent layer for speech synthesis.
-After=syslog.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/speech-dispatcher -d
-
-[Install]
-WantedBy=multi-user.target
--
cgit v0.12
From e5cd02ca168d06e41912344aa9346530aaeb0fee Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 19 Sep 2013 16:23:29 -0500
Subject: LinHES-config: mv_supplemental.py: don't install fluxbox unless it is
choosen.
---
abs/core/LinHES-config/PKGBUILD | 5 +++--
abs/core/LinHES-config/mv_supplemental.py | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index e452add..0920a02 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=7
+pkgrel=8
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'
@@ -132,6 +132,7 @@ package() {
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
}
+
md5sums=('c832059cd635359d39a2ac3166ff463c'
'3f6855b7bb860a44f96a972c2e80f497'
'aaeb581275433649ff74e05da5e61a78'
@@ -166,7 +167,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'3eec99951c01d1a1abf7ecfeb33f922b'
'087a0ef743bc8af915503f8773536ce4'
'183a11aa06d60065106472ed9f72cc4a'
- 'b2c63ca687a460844fa6f8dabf55f750'
+ '80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
'e4b61402858058f7575b776d62d5ee89'
diff --git a/abs/core/LinHES-config/mv_supplemental.py b/abs/core/LinHES-config/mv_supplemental.py
index 2699b3b..50a6c1a 100755
--- a/abs/core/LinHES-config/mv_supplemental.py
+++ b/abs/core/LinHES-config/mv_supplemental.py
@@ -24,7 +24,12 @@ def windowmanager(systemconfig):
else:
style = ""
- mv_common.pacinstall("alt_wm")
+ if windowmanager != "fluxbox":
+ mv_common.pacinstall("e16_theme_settings")
+ mv_common.pacinstall("wmaker_settings")
+ else:
+ mv_common.pacinstall("alt_wm")
+
cmd = '''/usr/LH/bin/set_windowmanager.sh %s %s ''' %(windowmanager,style)
print cmd
mv_common.runcmd(cmd)
--
cgit v0.12
From d3b112d34c237bd8bddedad8af0027bb86ad9116 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 20 Sep 2013 15:42:21 -0500
Subject: func: sed isn't needed as python2 is already interpreter.
---
abs/core/func/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD
index 0005fd0..a669d75 100644
--- a/abs/core/func/PKGBUILD
+++ b/abs/core/func/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=func
pkgver=0.25
-pkgrel=13
+pkgrel=14
pkgdesc="fedora unifed network controller"
url=""
license="gpl"
@@ -34,7 +34,7 @@ package() {
install -m644 -D ../logrotate-func.conf $pkgdir/etc/logrotate.d/func
cd $pkgdir
- find ./usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
+# find ./usr/bin/* -exec sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' {} \;
find ./ -name "*.pyc" -print | xargs rm -f
}
md5sums=('892252004f122c61bb58bb4607553ffe'
--
cgit v0.12
From c07a0a22356118de3a14f8a08136c2bfd2654607 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 21 Sep 2013 16:58:49 -0500
Subject: xcursor-vanilla-dmz: Initial inclusion. To be used as default LinHES
mouse cursor for both large and normal sizes.
---
abs/core/xcursor-vanilla-dmz/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
create mode 100644 abs/core/xcursor-vanilla-dmz/PKGBUILD
diff --git a/abs/core/xcursor-vanilla-dmz/PKGBUILD b/abs/core/xcursor-vanilla-dmz/PKGBUILD
new file mode 100644
index 0000000..c0f4319
--- /dev/null
+++ b/abs/core/xcursor-vanilla-dmz/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
+# Contributor: Björn Martensen <bjoern.martensen@gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgbase=xcursor-vanilla-dmz
+pkgname=('xcursor-vanilla-dmz' 'xcursor-vanilla-dmz-aa')
+pkgver=0.4.3
+pkgrel=1
+arch=('any')
+url="http://jimmac.musichall.cz/themes.php?skin=7"
+license=('CCPL:by-nc-sa')
+makedepends=('xorg-xcursorgen')
+source=(http://ftp.de.debian.org/debian/pool/main/d/dmz-cursor-theme/dmz-cursor-theme_${pkgver}.tar.gz)
+md5sums=('412256b1b8a65dd05b46f65b32e2f5e6')
+
+build() {
+ cd "${srcdir}/dmz-cursor-theme-${pkgver}"
+ (cd DMZ-White/pngs ; ./make.sh)
+ (cd DMZ-Black/pngs ; ./make.sh)
+}
+
+package_xcursor-vanilla-dmz() {
+ pkgdesc="Vanilla DMZ cursor theme"
+
+ cd "${srcdir}/dmz-cursor-theme-${pkgver}"
+ install -d "${pkgdir}"/usr/share/icons/Vanilla-DMZ/cursors
+ cp -a DMZ-White/xcursors/* "${pkgdir}"/usr/share/icons/Vanilla-DMZ/cursors
+ install -Dm644 DMZ-White/index.theme "${pkgdir}"/usr/share/icons/Vanilla-DMZ/index.theme
+}
+
+package_xcursor-vanilla-dmz-aa() {
+ pkgdesc="Vanilla DMZ AA cursor theme"
+
+ cd "${srcdir}/dmz-cursor-theme-${pkgver}"
+ install -d "${pkgdir}"/usr/share/icons/Vanilla-DMZ-AA/cursors
+ cp -a DMZ-Black/xcursors/* "${pkgdir}"/usr/share/icons/Vanilla-DMZ-AA/cursors
+ install -Dm644 DMZ-Black/index.theme "${pkgdir}"/usr/share/icons/Vanilla-DMZ-AA/index.theme
+}
--
cgit v0.12
From 0328daea42c752673f9268408e7ec96308c5852a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 21 Sep 2013 17:27:33 -0500
Subject: LinHES-config: add xcursor-vanilla-dmz-aa as dep.
systemconfig.py: set xcursor-vanilla-dmz-aa as default cursor so the size of the cursor will now change.
---
abs/core/LinHES-config/PKGBUILD | 6 +++---
abs/core/LinHES-config/systemconfig.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index 0920a02..b28ab94 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,11 +1,11 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=8
+pkgrel=9
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'
'sg3_utils' 'nmbscan' 'system-templates' 'rsync' 'python-parted'
- 'python-pexpect' 'python-netifaces'
+ 'python-pexpect' 'python-netifaces' 'xcursor-vanilla-dmz-aa'
'python-iplib' 'mythinstall>=2-10' 'sudo' 'setserial' 'udevil')
arch=('i686' 'x86_64')
@@ -171,7 +171,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
'e4b61402858058f7575b776d62d5ee89'
- '1a17256202d851f37c54f2836c244b5d'
+ '540a5b7f63a83ad53d6924c637bfd1c7'
'2596460462cf6c889cf8f95485537b20'
'dc3c5270691a62600475705f4cb78b56'
'4804aa93aaad3dfcfff08cd9ffd68836'
diff --git a/abs/core/LinHES-config/systemconfig.py b/abs/core/LinHES-config/systemconfig.py
index f7e3f5d..07b2820 100755
--- a/abs/core/LinHES-config/systemconfig.py
+++ b/abs/core/LinHES-config/systemconfig.py
@@ -40,8 +40,8 @@ def setup_x(systemconfig):
logging.info("____Skipping of Xorg, config disabled____")
else:
if not os.path.exists('/usr/share/icons/default'):
- if os.path.exists('/usr/share/icons/whiteglass'):
- os.symlink('/usr/share/icons/whiteglass','/usr/share/icons/default');
+ if os.path.exists('/usr/share/icons/Vanilla-DMZ-AA'):
+ os.symlink('/usr/share/icons/Vanilla-DMZ-AA','/usr/share/icons/default');
if systemconfig.get("UseXLargeMouse") == "1" :
cmd = "echo Xcursor.size: 48 > %s/.Xdefaults" %data_config.MYTHHOME
else:
--
cgit v0.12
From 4a1cc56a4d52ed3024aeb1f60c09e135a6ae6446 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 23 Sep 2013 14:44:16 -0500
Subject: keylaunch: keylaunch.install: check if mythtv home exist before
creating symlink
---
abs/core/keylaunch/PKGBUILD | 2 +-
abs/core/keylaunch/keylaunch.install | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD
index d869044..173cdff 100644
--- a/abs/core/keylaunch/PKGBUILD
+++ b/abs/core/keylaunch/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=keylaunch
pkgver=1.3.9
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. "
url="http://www.oroborus.org/"
diff --git a/abs/core/keylaunch/keylaunch.install b/abs/core/keylaunch/keylaunch.install
index faa176b..87f8fde 100644
--- a/abs/core/keylaunch/keylaunch.install
+++ b/abs/core/keylaunch/keylaunch.install
@@ -9,13 +9,16 @@ pre_install() {
# arg 1: the new package version
post_install() {
MHOME=`cat /etc/passwd | grep "mythtv" | cut -d":" -f6`
- if [ ! -e $MHOME/.keylaunchrc ]
+ if [ ! -z $MHOME ]
then
- echo "setting symlink for keylaunch"
- ln -s /etc/keylaunchrc $MHOME/.keylaunchrc
+ if [ ! -e $MHOME/.keylaunchrc ]
+ then
+ echo "setting symlink for keylaunch"
+ ln -s /etc/keylaunchrc $MHOME/.keylaunchrc
+ fi
+ echo "updating .keylaunchrc to run mythtv-setup as user"
+ sed -i 's/key=..*s:sudo\ \/usr\/bin\/mythtv-setup/key=..*s:\/usr\/bin\/mythtv-setup/g' $MHOME/.keylaunchrc
fi
- echo "updating .keylaunchrc to run mythtv-setup as user"
- sed -i 's/key=..*s:sudo\ \/usr\/bin\/mythtv-setup/key=..*s:\/usr\/bin\/mythtv-setup/g' $MHOME/.keylaunchrc
}
# arg 1: the new package version
--
cgit v0.12
From 1a7ffd256fa9d53e285109c3f6f4a6c74b901a10 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 23 Sep 2013 16:45:18 -0500
Subject: LinHES-system: LinHES-session: clean up and remove old commented out
sections and add status logging for some functions.
---
abs/core/LinHES-system/LinHES-session | 141 +++++++++-------------------------
abs/core/LinHES-system/PKGBUILD | 4 +-
2 files changed, 37 insertions(+), 108 deletions(-)
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 27ce2bd..a8c8c09 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -26,67 +26,8 @@ MYTH_ARGS="-d --syslog local6"
-# # Run any scripting that applies to special hardware. These brand-specific commands that run
-# # after Tweaker will, of course, override generic or hardware-specific settings.
-# SpecialHardwareCommands() {
-# special_hardware_file=/myth/.special_hardware_type
-# special_hardware=`cat $special_hardware_file`
-#
-# case $special_hardware in
-# dragon*)
-# sudo -E twk_audio.pl --implement digital
-# sudo -E twk_dragon.pl --implement all
-# ;;
-# ausdragon*)
-# ;;
-# *)
-# # there are no brand-specific commands for configuring whatever
-# # special hardware the user chose
-# ;;
-# esac
-# }
-
-
-#
-# . /etc/osd_cat.cfg || {
-# color=yellow
-# outline=2
-# outlinecolour=black
-# shadow=0
-# shadowcolour=black
-# font="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
-# }
-#
-# function delay_osd(){
-# if [ x$STARTUP_STYLE = xenhanced ]
-# then
-# cmd="ps -ef | grep -v grep | grep -q xmsg.py"
-# else
-# cmd="ps -ef | grep -v grep | grep -q osd_cat"
-# fi
-#
-# eval $cmd
-#
-# rc=$?
-# while [ $rc = 0 ]
-# do
-# eval $cmd
-# rc=$?
-# done
-#
-#
-# }
-#
-# function msg_osd(){
-# echo -e "$1" | osd_cat --pos=middle --align=center --offset=200 --delay=5 --color=$color --outline=$outline --outlinecolour=$outlinecolour --shadow=$shadow --shadowcolour=$shadowcolour --font=$font
-# }
-#
-# function msg_pyosd(){
-# /usr/LH/bin/xmsg.py -m "$1"
-# }
function msg(){
- #/usr/LH/bin/lh_message.sh "$1"
/usr/LH/bin/msg_client.py --msg "$1"
}
@@ -99,24 +40,33 @@ function unclutter(){
idle=1
jitter=200
fi
-
+ echo "Starting unclutter"
/usr/bin/unclutter -root -idle $idle -jitter $jitter -noevents &
}
+
function keylaunch(){
if [ -f /usr/bin/keylaunch ]
then
-# MHOME=`cat /etc/passwd | grep "mythtv" | cut -d":" -f6`
- if [ ! -e $HOME/.keylaunchrc ]
- then
- echo "setting symlink for keylaunch"
- ln -s /etc/keylaunchrc $HOME/.keylaunchrc
- fi
- /usr/bin/keylaunch &
+ if [ ! -z $HOME ] && [ ! -e $HOME/.keylaunchrc ]
+ then
+ echo "setting symlink for keylaunch"
+ ln -s /etc/keylaunchrc $HOME/.keylaunchrc
+ fi
+
+ echo "Checking if keylaunch is running"
+ if [ "$(pidof keylaunch)" ]
+ then
+ echo "keylaunch is already running"
+ else
+ echo "Starting keylaunch"
+ /usr/bin/keylaunch &
+ fi
fi
}
+
function start_x11vnc(){
if [ x$xvncenable = "x1" ]
then
@@ -138,11 +88,9 @@ function fluxbox_settings(){
configdir=/usr/share/fluxbox_settings
ln -s $configdir $HOME/.fluxbox
fi
-
}
-
function load_nvidia_settings(){
lsmod |cut -f1 -d" " |grep -q nvidia
if [ $? = 0 ]
@@ -152,8 +100,6 @@ function load_nvidia_settings(){
}
function run_tilda(){
-
-
if [ -f /usr/bin/tilda ]
then
if [ ! -e ~/.tilda/config_0 ]
@@ -197,7 +143,6 @@ function mouse_move(){
function start_screensaver(){
-
if [ x"$Screensavertype" = "xgscreensaver" ]
then
gnome-screensaver &
@@ -207,21 +152,22 @@ function start_screensaver(){
fi
}
-function show_help_tip(){
+function show_help_tip(){
if [ x$ShowTips = "x1" ]
then
msg "Alt+h for help"
fi
}
+
function notify_scan(){
if [ -e /tmp/scan_report ]
then
msg "\nNew storage found. \nRun add_storage.py for details"
fi
+}
- }
function auto_start(){
asdir="/etc/X11/autostart"
@@ -233,21 +179,22 @@ function auto_start(){
$i &
fi
done
- }
+}
+
function update_apple_trailers(){
#update apple trailers
if [[ x$RunFrontend = x1 && -f ~/.configure ]]
then
- /usr/bin/php -q /usr/bin/myth_trailers_grabber > /home/mythtv/appletrailer.xml && /usr/bin/fix_aple_url.sh 2>/dev/null &
+ /usr/bin/php -q /usr/bin/myth_trailers_grabber > $HOME/appletrailer.xml && /usr/bin/fix_aple_url.sh 2>/dev/null &
fi
}
+
function first_mythwelcome_config(){
echo "First configure: Running mythwelcome-config.py"
/usr/LH/bin/mythwelcome-config.py
- }
-
+}
function first_configure(){
@@ -283,7 +230,7 @@ function first_configure_default(){
sudo sv start mythbackend
sudo chown -R mythtv.mythtv /home/mythtv
nice -n 19 mythfilldatabase --quiet &
- msg "Guide data is being loaded. \n Until this completes\n some shows will appear as unknown \n in the program guide."
+ msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide."
rm ~/.configure
fi
else
@@ -292,7 +239,6 @@ function first_configure_default(){
rm -f ~/.configure
fi
fi
-
}
@@ -317,13 +263,13 @@ function first_configure_mv(){
if [ ! $STATUS = 2 ]
then
/usr/MythVantage/bin/backend_control.sh stop BE 127.0.0.1
- msg "MythTV setup is starting.\nPlease follow the steps for adding tuners and guide data."
+ msg "MythTV setup is starting.\nPlease follow the steps for adding tuners and guide data."
run_wmctrl &
/usr/bin/taskset -c 0 /usr/bin/mythtv-setup
/usr/MythVantage/bin/backend_control.sh start BE 127.0.0.1
fi
nice -n 19 mythfilldatabase --quiet &
- msg "Guide data is being loaded. \nUntil this completes \nsome shows will appear as "unknown" \nin the program guide."
+ msg "Guide data is being loaded.\nUntil this completes\nsome shows will appear as "unknown"\nin the program guide."
rm -f ~/.configure
fi
else
@@ -332,9 +278,9 @@ function first_configure_mv(){
rm -f ~/.configure
fi
fi
-
}
+
function start_myth() {
if [ x"$UseMythWelcome" = "x1" ]
then
@@ -371,8 +317,8 @@ function start_myth() {
else
run_myth
fi
+}
- }
function run_wmctrl(){
done="False"
@@ -394,9 +340,9 @@ function run_wmctrl(){
fi
sleep 5
done
-
}
+
function run_myth(){
if [ -f /tmp/nomfe ]
then
@@ -414,7 +360,6 @@ function run_myth(){
if [ ! x$STARTUP_STYLE = xlegacy ]
then
-
run_wmctrl &
$STARTCMD 2>&1
else
@@ -438,30 +383,17 @@ function start_myth_mv(){
function set_background()
{
echo "Setting the background"
-
}
-# if [ x"$WM" = "xdefault" ]
-# then
-# # fluxbox > /var/log/fluxbox.log 2>&1
-# WM=fluxbox
-# fi
-#
-#
-# if [ x"$WM" = "x" ]
-# then
-# # fluxbox > /var/log/fluxbox.log 2>&1
-# WM=fluxbox
-# fi
-#
-
-if [ $WM = "fluxbox" ]
+
+
+
+if [ x"$WM" = "fluxbox" ]
then
fluxbox_settings
fi
-
#if using mythvantage style, start the WM right away
# this is done so that starting mythtv can loop.
$WM &
@@ -469,7 +401,6 @@ pid=$!
mouse_move
keylaunch
start_x11vnc &
-#set_background
unclutter
load_nvidia_settings
run_tilda
@@ -490,5 +421,3 @@ fi
wmctrl -r "MythTV Frontend" -b remove,fullscreen
-
-
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 43a8dbf..3d52185 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=19
+pkgrel=20
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -72,7 +72,7 @@ package() {
}
-md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4'
+md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'de32a1c50101265dd7f6ca5037f7a26a'
'a875ee97f86e46f34a741c2bc455f894'
'76b2637cac0452b3acdbeeb4e8a5474b'
--
cgit v0.12
From b7629260f19f5cc7f40cf1337cbfd268c2fc9a02 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 23 Sep 2013 16:55:03 -0500
Subject: keylaunch & mythinstall: change ctl+alt+f keybinding to alt+f to
avoid conflict with e16 default keybinding.
---
abs/core/keylaunch/PKGBUILD | 4 ++--
abs/core/keylaunch/example_rc | 4 ++--
abs/core/mythinstall/PKGBUILD | 2 +-
abs/core/mythinstall/main.cpp.patch | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/abs/core/keylaunch/PKGBUILD b/abs/core/keylaunch/PKGBUILD
index 173cdff..5d77379 100644
--- a/abs/core/keylaunch/PKGBUILD
+++ b/abs/core/keylaunch/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=keylaunch
pkgver=1.3.9
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. "
url="http://www.oroborus.org/"
@@ -19,4 +19,4 @@ package() {
install -D -m0755 $srcdir/example_rc $pkgdir/etc/keylaunchrc
}
md5sums=('710f68a3e7026b4139cc94ea790576c3'
- '01d31c5c748f7a2802d7b0e7aa07a678')
+ '1141e182e2accb02c17548189bead4dc')
diff --git a/abs/core/keylaunch/example_rc b/abs/core/keylaunch/example_rc
index 284a4a1..8d409df 100644
--- a/abs/core/keylaunch/example_rc
+++ b/abs/core/keylaunch/example_rc
@@ -15,8 +15,8 @@ key=..*u:/usr/LH/bin/unclutter-toggle.sh
key=.**u:/usr/LH/bin/unclutter-toggle.sh
key=..*h:/usr/MythVantage/bin/mythinstall -H
key=..*m:/usr/LH/bin/mythfrontend-start
-key=.**f:sudo sv restart frontend
-key=..*w:/usr/bin/google-chrome
+key=..*f:sudo sv restart frontend
+key=..*w:/usr/bin/google-chrome --no-first-run||msg_client.py --msg "Chrome is not installed."
key=..*1:/usr/LH/bin/lh_backend_control.sh start
diff --git a/abs/core/mythinstall/PKGBUILD b/abs/core/mythinstall/PKGBUILD
index 3009f32..7f2bef6 100644
--- a/abs/core/mythinstall/PKGBUILD
+++ b/abs/core/mythinstall/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jams
pkgname=mythinstall
pkgver=3
-pkgrel=79
+pkgrel=80
pkgdesc="LinHES installer/systemconfig GUI."
arch=('i686' 'x86_64')
depends=('mythtv>=0.25')
diff --git a/abs/core/mythinstall/main.cpp.patch b/abs/core/mythinstall/main.cpp.patch
index 90f243a..9c4c3ce 100644
--- a/abs/core/mythinstall/main.cpp.patch
+++ b/abs/core/mythinstall/main.cpp.patch
@@ -57,7 +57,7 @@
+ problems->append("Alt + w: Open Web Browser (Chrome if installed)");
problems->append("\n");
- problems->append("Alt+s run mythtv-setup");
-+ problems->append("Ctrl + Alt + f: Restart Window Manager");
++ problems->append("Alt + f: Restart Window Manager");
problems->append("\n");
--
cgit v0.12
From 5b40bd4b5ba9fb5b7b79c4009a245bb2b63d4229 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 24 Sep 2013 19:59:20 -0500
Subject: LinHES-system & func: change msg_client.py font to Canter
LinHES-system: install_canter_font.sh: added to install Canter font
---
abs/core/LinHES-system/LinHES-system.install | 3 ++-
abs/core/LinHES-system/PKGBUILD | 8 +++++---
abs/core/LinHES-system/install_canter_font.sh | 23 +++++++++++++++++++++++
abs/core/LinHES-system/msg_daemon.py | 4 ++--
abs/core/func/PKGBUILD | 4 ++--
abs/core/func/msg.cfg | 12 +++++++++---
6 files changed, 43 insertions(+), 11 deletions(-)
create mode 100755 abs/core/LinHES-system/install_canter_font.sh
diff --git a/abs/core/LinHES-system/LinHES-system.install b/abs/core/LinHES-system/LinHES-system.install
index f2185cd..87ee8a9 100644
--- a/abs/core/LinHES-system/LinHES-system.install
+++ b/abs/core/LinHES-system/LinHES-system.install
@@ -1,12 +1,13 @@
## arg 1: the new package version
post_install() {
/usr/LH/bin/misc_status_config.py
+ /usr/LH/bin/install_canter_font.sh
}
## arg 1: the new package version
## arg 2: the old package version
post_upgrade() {
- /usr/LH/bin/misc_status_config.py
+ post_install
}
# vim:set ts=2 sw=2 et:
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 3d52185..92ff85e 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=20
+pkgrel=21
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -25,7 +25,8 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
change_channel.sh change_channel_wrapper.sh stop_xss.sh
be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
linhes_update.sh linhes_update2.sh myth2mkv myth2mp3 ripD_eject.sh
- mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
+ mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh
+ install_canter_font.sh"
source=(LinHES-session LinHES-profile.sh $binfiles
alsa-base diskspace.cron cacheclean.cron xfs_defrag.cron
@@ -101,7 +102,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'4abc4780fa78ed40c07401b3cd25209b'
- '1d275246216ba1b22d5f09eb1c775a73'
+ 'e5cdcfe0192670338b01bc48559e7a8d'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
@@ -127,6 +128,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'92950f0ffb1faf1ed64c6be2b8fbc3f6'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
+ '2f130013e9d699d93aed4bfa1935a6ee'
'eb879fee9603a05d5420d4ce8ed9e450'
'84492954db16740f949d795b74383189'
'02c810c2f47b7c4495fdacaf54189473'
diff --git a/abs/core/LinHES-system/install_canter_font.sh b/abs/core/LinHES-system/install_canter_font.sh
new file mode 100755
index 0000000..33cba54
--- /dev/null
+++ b/abs/core/LinHES-system/install_canter_font.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+if [ -e '/usr/share/fonts/TTF/Canter Bold.otf' ]
+then
+ echo "Canter is already installed."
+else
+ cd /tmp
+ mkdir canter/
+ cd ./canter
+ echo "Downloading Canter to /tmp/canter ..."
+ wget "http://fontfabric.com/downfont/canter.zip"
+ echo "Unzipping Canter..."
+ unzip -o ./canter.zip
+ echo "Copying Canter to fonts..."
+ cp Canter*.otf /usr/share/fonts/TTF/
+ echo "Updating font cache... "
+ fc-cache -f > /dev/null
+ mkfontscale /usr/share/fonts/TTF
+ mkfontdir /usr/share/fonts/TTF
+ echo "Removing /tmp/canter"
+ cd /tmp
+ rm -r ./canter
+fi
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index fe47263..3eb5e33 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -72,10 +72,10 @@ class msg_aosd():
osd.set_transparency(aosd.TRANSPARENCY_NONE)
osd.geom_x_offset = 10
- osd.geom_y_offset = 0
+ osd.geom_y_offset = 3
osd.back_color = "white"
- osd.back_opacity = 50
+ osd.back_opacity = 25
osd.shadow_color = "black"
osd.shadow_opacity = 127
diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD
index a669d75..3353e3c 100644
--- a/abs/core/func/PKGBUILD
+++ b/abs/core/func/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=func
pkgver=0.25
-pkgrel=14
+pkgrel=15
pkgdesc="fedora unifed network controller"
url=""
license="gpl"
@@ -44,6 +44,6 @@ md5sums=('892252004f122c61bb58bb4607553ffe'
'c30f420c01628a08061270e8502115c5'
'b02a733b7a74569e57521bc3708724a5'
'7b4266a8031cf7de485bf6b74e57bd74'
- '55645b66d85297200747137fcb0a2e6b'
+ 'ea85358075a49ad8f6a1833d3951ed7f'
'b816bdb222e646a7801b218c3a626b0e'
'7d7c8a334f6b46ae1e5e483854b93924')
diff --git a/abs/core/func/msg.cfg b/abs/core/func/msg.cfg
index 69a949c..525f8c5 100644
--- a/abs/core/func/msg.cfg
+++ b/abs/core/func/msg.cfg
@@ -2,16 +2,22 @@
font_color=#ebb81c
display_time=5000
position=1
-font_type=Times New Roman Italic 48
+font_type=CanterBold 56
[middle]
font_color=#ebb81c
display_time=5000
position=4
-font_type=Times New Roman Italic 48
+font_type=CanterBold 56
[bottom]
font_color=#ebb81c
display_time=5000
position=7
-font_type=Times New Roman Italic 48
+font_type=CanterBold 56
+
+[alert]
+font_color=red
+display_time=5000
+position=4
+font_type=CanterBold 64
--
cgit v0.12
From 33a2be7377667c3bd4f80472d3422ad1151b7ce6 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 24 Sep 2013 20:08:57 -0500
Subject: LinHES-system: remove old LinHES-system.install and add
install_canter_font.sh to system.install
---
abs/core/LinHES-system/LinHES-system.install | 13 -------------
abs/core/LinHES-system/PKGBUILD | 2 +-
abs/core/LinHES-system/system.install | 3 +++
3 files changed, 4 insertions(+), 14 deletions(-)
delete mode 100644 abs/core/LinHES-system/LinHES-system.install
diff --git a/abs/core/LinHES-system/LinHES-system.install b/abs/core/LinHES-system/LinHES-system.install
deleted file mode 100644
index 87ee8a9..0000000
--- a/abs/core/LinHES-system/LinHES-system.install
+++ /dev/null
@@ -1,13 +0,0 @@
-## arg 1: the new package version
-post_install() {
- /usr/LH/bin/misc_status_config.py
- /usr/LH/bin/install_canter_font.sh
-}
-
-## arg 1: the new package version
-## arg 2: the old package version
-post_upgrade() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 92ff85e..f47284f 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=21
+pkgrel=22
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install
index 662e271..c354e9e 100644
--- a/abs/core/LinHES-system/system.install
+++ b/abs/core/LinHES-system/system.install
@@ -18,6 +18,9 @@ post_install() {
# Add db entry for misc status in MythWeb
# not needed in R8 because it's in the DB, may be removed
#/usr/LH/bin/misc_status_config.py
+
+ # install canter font for msg_client.py
+ /usr/LH/bin/install_canter_font.sh
}
# arg 1: the new package version
--
cgit v0.12
From f98cf065b38a39d4a0262a74a5715d24ae880c3a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 26 Sep 2013 10:18:29 -0500
Subject: ttf-overlock: initial inclusion; used as default OSD font
---
abs/core/ttf-overlock/PKGBUILD | 23 +++++++++++++++++++++++
abs/core/ttf-overlock/ttf.install | 16 ++++++++++++++++
2 files changed, 39 insertions(+)
create mode 100644 abs/core/ttf-overlock/PKGBUILD
create mode 100644 abs/core/ttf-overlock/ttf.install
diff --git a/abs/core/ttf-overlock/PKGBUILD b/abs/core/ttf-overlock/PKGBUILD
new file mode 100644
index 0000000..1a4190c
--- /dev/null
+++ b/abs/core/ttf-overlock/PKGBUILD
@@ -0,0 +1,23 @@
+pkgname=ttf-overlock
+pkgver=1.0
+pkgrel=1
+pkgdesc='Overlock typeface font'
+arch=('any')
+license=('custom:OFL')
+url='http://www.fontsquirrel.com/fonts/overlock'
+depends=('fontconfig' 'xorg-fonts-encodings' 'xorg-font-utils')
+makedepends=('fontforge')
+install=ttf.install
+source=("http://www.fontsquirrel.com/fonts/download/overlock")
+
+package() {
+ cd "$srcdir"
+
+ install -d "$pkgdir/usr/share/fonts/TTF/"
+ install -m644 Overlock* "$pkgdir/usr/share/fonts/TTF/"
+
+ # install license
+ install -Dm644 "${srcdir}/SIL Open Font License.txt" \
+ "${pkgdir}/usr/share/licenses/${pkgname}/SIL Open Font License.txt"
+}
+md5sums=('8e8e479b4521f32a7f173000d89aa06b')
diff --git a/abs/core/ttf-overlock/ttf.install b/abs/core/ttf-overlock/ttf.install
new file mode 100644
index 0000000..7d26d0c
--- /dev/null
+++ b/abs/core/ttf-overlock/ttf.install
@@ -0,0 +1,16 @@
+post_install() {
+ echo -n "Updating font cache... "
+ fc-cache -f > /dev/null
+ mkfontscale /usr/share/fonts/TTF
+ mkfontdir /usr/share/fonts/TTF
+ echo "done."
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
--
cgit v0.12
From 38859c2f1949b928c648f5f4e1ad709e96a7a503 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 26 Sep 2013 10:25:36 -0500
Subject: LinHES-system: Change default OSD font to Overlock.
---
abs/core/LinHES-system/PKGBUILD | 10 ++++------
abs/core/LinHES-system/install_canter_font.sh | 23 -----------------------
abs/core/LinHES-system/msg_daemon.py | 2 +-
3 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100755 abs/core/LinHES-system/install_canter_font.sh
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index f47284f..33a47d8 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=22
+pkgrel=23
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -8,7 +8,7 @@ license=('GPL2')
depends=('linhes-sounds' 'xdotool' 'tilda' 'keylaunch'
'python_aosd' 'udisks' 'LinHES-config>=2.3-59' 'sudo'
'python2-dbus' 'unclutter' 'wmctrl' 'archlinux-xdg-menu'
- 'ethtool' 'gnu-netcat' 'normalize'
+ 'ethtool' 'gnu-netcat' 'normalize' 'ttf-overlock'
'handbrake-cli' 'mkvtoolnix' 'mplayer')
backup=('etc/modprobe.d/alsa-base.conf')
binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
@@ -25,8 +25,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py myth_mtc.sh
change_channel.sh change_channel_wrapper.sh stop_xss.sh
be_check.py checkXFSfrag.sh find_orphans.py idle.sh xwin_find.sh
linhes_update.sh linhes_update2.sh myth2mkv myth2mp3 ripD_eject.sh
- mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh
- install_canter_font.sh"
+ mythwelcome-config.py mythwelcome-set-alarm.sh mythwelcome-test-wakeup.sh"
source=(LinHES-session LinHES-profile.sh $binfiles
alsa-base diskspace.cron cacheclean.cron xfs_defrag.cron
@@ -102,7 +101,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'4abc4780fa78ed40c07401b3cd25209b'
- 'e5cdcfe0192670338b01bc48559e7a8d'
+ '78375aead3402bccbfbf26aa11f94ad4'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
@@ -128,7 +127,6 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'92950f0ffb1faf1ed64c6be2b8fbc3f6'
'95c092f67036a361ef7a57436f44332e'
'410795ef9039e4c6c0484e706ecfd567'
- '2f130013e9d699d93aed4bfa1935a6ee'
'eb879fee9603a05d5420d4ce8ed9e450'
'84492954db16740f949d795b74383189'
'02c810c2f47b7c4495fdacaf54189473'
diff --git a/abs/core/LinHES-system/install_canter_font.sh b/abs/core/LinHES-system/install_canter_font.sh
deleted file mode 100755
index 33cba54..0000000
--- a/abs/core/LinHES-system/install_canter_font.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-if [ -e '/usr/share/fonts/TTF/Canter Bold.otf' ]
-then
- echo "Canter is already installed."
-else
- cd /tmp
- mkdir canter/
- cd ./canter
- echo "Downloading Canter to /tmp/canter ..."
- wget "http://fontfabric.com/downfont/canter.zip"
- echo "Unzipping Canter..."
- unzip -o ./canter.zip
- echo "Copying Canter to fonts..."
- cp Canter*.otf /usr/share/fonts/TTF/
- echo "Updating font cache... "
- fc-cache -f > /dev/null
- mkfontscale /usr/share/fonts/TTF
- mkfontdir /usr/share/fonts/TTF
- echo "Removing /tmp/canter"
- cd /tmp
- rm -r ./canter
-fi
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 3eb5e33..ba611a3 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -72,7 +72,7 @@ class msg_aosd():
osd.set_transparency(aosd.TRANSPARENCY_NONE)
osd.geom_x_offset = 10
- osd.geom_y_offset = 3
+ osd.geom_y_offset = 0
osd.back_color = "white"
osd.back_opacity = 25
--
cgit v0.12
From fe2a6a4009b2d53946c1e6c8ed9187e82a3b2fb0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 26 Sep 2013 13:52:37 -0500
Subject: LinHES-system & func: Change OSD font to Overlock
msg_client.py: if cmd is --print_list wait 1s for data to be returned from msg_daemon
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/msg_client.py | 39 +++++++++++++++++++++--------------
abs/core/LinHES-system/msg_daemon.py | 2 +-
abs/core/LinHES-system/system.install | 1 -
abs/core/func/PKGBUILD | 4 ++--
abs/core/func/msg.cfg | 8 +++----
6 files changed, 34 insertions(+), 26 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 33a47d8..e05bcb3 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=23
+pkgrel=24
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -100,8 +100,8 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'8f474e019d5fcb775497aca355d61b0b'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
- '4abc4780fa78ed40c07401b3cd25209b'
- '78375aead3402bccbfbf26aa11f94ad4'
+ '3e60b17892e5b8214d47dcfddf5215a4'
+ '23c9ae11d9d058e2399283c197dfe9aa'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/msg_client.py b/abs/core/LinHES-system/msg_client.py
index 8c5e3c4..8978e86 100755
--- a/abs/core/LinHES-system/msg_client.py
+++ b/abs/core/LinHES-system/msg_client.py
@@ -23,6 +23,8 @@ def send_message(message):
#amount_received = 0
#amount_expected = len(message)
print "Waiting for response..."
+ if cmd == 'list':
+ time.sleep(1)
data = sock.recv(1024)
print data
@@ -32,7 +34,7 @@ def send_message(message):
sock.close()
def usage():
line = '''
- Help screen:
+ Usage:
msg_client.py is used to add, remove, or list items in the queue of messages that
will be displayed on screen. Optionally messages can be given an identifier or "tag".
This identifier does not have to be unique.
@@ -43,24 +45,27 @@ def usage():
ADD:
- To add items to the queue:
+ To add items to the queue (--tag is optional):
msg_client.py --msg "My first message" --tag "tag1"
To add a message with a line break use \\n:
- msg_client.py --msg "My first\\nmessage" --tag "tag1"
+ msg_client.py --msg "My first\\nmessage"
REMOVE:
- Removing items are based off the tag.
To remove all items from the queue that match the tag "tag1":
msg_client.py --clear --tag "tag1"
To remove all items from the queue:
msg_client.py --clear
+ To immediately stop displaying the current message:
+ msg_client.py --kill
+
- Listing items in the queue or to get the total item count:
- msg_client.py --print_list
+ LIST:
+ To list items in the queue or to get the total item count:
+ msg_client.py --print_list
> -------------
> msg : slot 1
> slot : 1
@@ -69,8 +74,12 @@ def usage():
> timeout : None
- To immediately stop displaying the current message, use the kill command.
- msg_client.py --kill
+ APPEARANCE:
+ Display profiles define the font color, display timeout, screen position,
+ and font. Display profiles are defined in /usr/MythVantage/etc/msg.cfg
+
+ To display the message using a profile:
+ msg_client.py --msg "Display middle profile.|middle"
'''
print line
@@ -78,14 +87,14 @@ def usage():
if __name__ == "__main__":
parser = argparse.ArgumentParser()
- parser.add_argument('--tag', action='store', dest='tag',help='message tag')
- parser.add_argument('--timeout', action='store', dest='timeout',help='time to display message in seconds')
+ parser.add_argument('--tag', action='store', dest='tag',help='Add a tag to the message')
+ parser.add_argument('--timeout', action='store', dest='timeout',help='Time to display the message in seconds')
action = parser.add_mutually_exclusive_group(required=True)
- action.add_argument('--msg', action='store', dest='msg', help='Add message to the queue')
- action.add_argument('--clear', action='store_true', help='Remove message from queue that match tag')
- action.add_argument('--kill', action='store_true', help='Kill current msg thats displayed')
- action.add_argument('--print_list', action='store_true', help='Print current queue')
- action.add_argument('--usage', action='store_true', help='Print help screen')
+ action.add_argument('--msg', action='store', dest='msg', help='Add a message to the queue')
+ action.add_argument('--clear', action='store_true', help='Remove messages from queue that match tag. No tag will remove all messages in the queue')
+ action.add_argument('--kill', action='store_true', help='Kill the current message that is displayed')
+ action.add_argument('--print_list', action='store_true', help='Print the current queue')
+ action.add_argument('--usage', action='store_true', help='Print usage screen')
results = parser.parse_args()
resultsdict = vars(results)
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index ba611a3..bbcebb3 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -371,7 +371,7 @@ if __name__ == "__main__":
for k,v in i.iteritems():
line=" %s : %s\n" %(k,v)
connection.send(line)
- line = "Number of messages in queue: %s \n" %(len(q))
+ line = "\nNumber of messages in queue: %s \n" %(len(q))
connection.send(line)
#connection.send(pickle.dumps(q))
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install
index c354e9e..c8dc71d 100644
--- a/abs/core/LinHES-system/system.install
+++ b/abs/core/LinHES-system/system.install
@@ -20,7 +20,6 @@ post_install() {
#/usr/LH/bin/misc_status_config.py
# install canter font for msg_client.py
- /usr/LH/bin/install_canter_font.sh
}
# arg 1: the new package version
diff --git a/abs/core/func/PKGBUILD b/abs/core/func/PKGBUILD
index 3353e3c..a4844cb 100644
--- a/abs/core/func/PKGBUILD
+++ b/abs/core/func/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=func
pkgver=0.25
-pkgrel=15
+pkgrel=16
pkgdesc="fedora unifed network controller"
url=""
license="gpl"
@@ -44,6 +44,6 @@ md5sums=('892252004f122c61bb58bb4607553ffe'
'c30f420c01628a08061270e8502115c5'
'b02a733b7a74569e57521bc3708724a5'
'7b4266a8031cf7de485bf6b74e57bd74'
- 'ea85358075a49ad8f6a1833d3951ed7f'
+ 'bdd37627c9effd745a051fd2d279975b'
'b816bdb222e646a7801b218c3a626b0e'
'7d7c8a334f6b46ae1e5e483854b93924')
diff --git a/abs/core/func/msg.cfg b/abs/core/func/msg.cfg
index 525f8c5..0d687c5 100644
--- a/abs/core/func/msg.cfg
+++ b/abs/core/func/msg.cfg
@@ -2,22 +2,22 @@
font_color=#ebb81c
display_time=5000
position=1
-font_type=CanterBold 56
+font_type=Overlock SC 40
[middle]
font_color=#ebb81c
display_time=5000
position=4
-font_type=CanterBold 56
+font_type=Overlock SC 40
[bottom]
font_color=#ebb81c
display_time=5000
position=7
-font_type=CanterBold 56
+font_type=Overlock SC 40
[alert]
font_color=red
display_time=5000
position=4
-font_type=CanterBold 64
+font_type=Overlock SC 40
--
cgit v0.12
From 923571ab70f887524fdb1ac31cdb36b072f491d2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Thu, 26 Sep 2013 16:45:28 -0500
Subject: LinHES-system: msg_daemon.py: initial support for y padding to
compensate for displays that overscan alot.
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/msg_daemon.py | 17 +++++++++--------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index e05bcb3..098c17f 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=24
+pkgrel=25
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -101,7 +101,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'3e60b17892e5b8214d47dcfddf5215a4'
- '23c9ae11d9d058e2399283c197dfe9aa'
+ 'fd765fc7ee640221ed4801b4a629365f'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index bbcebb3..1a855bc 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -20,6 +20,7 @@ class msg_aosd():
def scroll(self,osd, width, height, display_time,position):
pos = position
step = 1
+ ypad = 0
osd.set_position(pos, width, height)
(x, y, _, _) = osd.get_geometry()
@@ -29,15 +30,15 @@ class msg_aosd():
x -= 1
- if pos < 3: #top positions
- y -= height + 1;
+ if pos < 3: #top positions 0 to 2
+ y -= height - 1 - ypad;
for i in range(1, height + 1, step):
osd.loop_for(5)
y += step
osd.set_geometry(x, y, width, height)
- osd.set_position(pos, width, height)
- osd.set_position_offset(-1, -1)
+ #osd.set_position(pos, width, height)
+ #osd.set_position_offset(-1, -1)
(x, y, _, _) = osd.get_geometry()
#time to display
osd.loop_for(display_time)
@@ -46,15 +47,15 @@ class msg_aosd():
osd.set_geometry(x, y, width, height);
osd.loop_for(1);
- else: #bottom positions
- y += height - 1;
+ else: #bottom positions 3 to 8
+ y += height + 1 - ypad;
for i in range(1, height + 1, step):
osd.loop_for(5)
y -= step
osd.set_geometry(x, y, width, i)
- osd.set_position(pos, width, height)
- osd.set_position_offset(-1, -1)
+ #osd.set_position(pos, width, height)
+ #osd.set_position_offset(-1, -1)
(x, y, _, _) = osd.get_geometry()
#time to display
osd.loop_for(display_time)
--
cgit v0.12
From 6cef3f98f980e52687095c74b040cf5531688545 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 28 Sep 2013 13:57:29 -0500
Subject: LinHES-system: diskspace.sh: add OSD warnings for /home and
/data/srv/mysql
---
abs/core/LinHES-system/PKGBUILD | 6 +++---
abs/core/LinHES-system/diskspace.sh | 17 +++++++----------
abs/core/LinHES-system/msg_daemon.py | 4 ++--
3 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 098c17f..3cce3eb 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=25
+pkgrel=26
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -95,13 +95,13 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'1be1d3dfc83f828eede93055713882ae'
'47e093e8cfe4b5b96602358e1f540832'
'a8e486f5d23913242b6edb862bf44c0e'
- '7bd8c0e96631be95086621b1d818aa95'
+ '2c005d95312018bef80092136f80f254'
'6519d209e151cdc39ae7e1091d189c3e'
'8f474e019d5fcb775497aca355d61b0b'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'3e60b17892e5b8214d47dcfddf5215a4'
- 'fd765fc7ee640221ed4801b4a629365f'
+ '28d2fbad517bcd2ba0cb0ce09f99bf62'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/diskspace.sh b/abs/core/LinHES-system/diskspace.sh
index d27221a..5b41b73 100755
--- a/abs/core/LinHES-system/diskspace.sh
+++ b/abs/core/LinHES-system/diskspace.sh
@@ -5,7 +5,8 @@
#
# Static Config Variables
#
-ALERT=90 # free space percentage to trigger an alert
+# free space percentage to trigger an alert
+ALERT=90
#
# Static Binary Paths
@@ -17,7 +18,7 @@ CUT='/usr/bin/cut'
HOSTNAME='/usr/bin/hostname'
DATE='/bin/date'
MSG_CLIENT='/usr/LH/bin/msg_client.py --msg'
-export DISPLAY=:0.0
+
#
# Static System Variables
#
@@ -53,16 +54,12 @@ $DF -HPl | $GREP -E "^/dev/" | $AWK '{ print $5 " " $6 " " $1 }' | while read OU
PARTITION=$(echo ${OUTPUT} | $AWK '{ print $2 }' ) # Mount Point (eg, /home)
DEVICE=$(echo ${OUTPUT} | $AWK '{ print $3 }' ) # Device (eg, /dev/sda1 or LABEL or UUID)
if [ $VERBOSE = true ] ; then
- echo -e "Checking device ${DEVICE} which is mounted to ${PARTITION} \t${USED_PCENT}% used"
+ echo -e "${USED_PCENT}% used:\tDevice ${DEVICE} mounted to ${PARTITION}"
fi
if [ ${USED_PCENT} -ge $ALERT ]; then
- if [ $VERBOSE = true ] ; then
- echo "WARNING: ${PARTITION} (${DEVICE}) is ${USED_PCENT}% full on ${THIS_HOST}."
- else
- echo "WARNING: ${PARTITION} (${DEVICE}) is ${USED_PCENT}% full on ${THIS_HOST}." #|
- if [ $OSD = true ] && [ ${PARTITION} = / ]; then
- $MSG_CLIENT "WARNING: The root (${PARTITION}) partition is ${USED_PCENT}% full on ${THIS_HOST}."
- fi
+ echo "WARNING: Partition (${PARTITION}) on (${DEVICE}) is ${USED_PCENT}% full on ${THIS_HOST}"
+ if [ $OSD = true ] && { [ ${PARTITION} = / ] || [ ${PARTITION} = /home ] || [ ${PARTITION} = /data/srv/mysql ]; } then
+ $MSG_CLIENT "WARNING: Partition (${PARTITION}) on (${DEVICE}) is ${USED_PCENT}% full"
fi
fi
done
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 1a855bc..861dbe3 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -31,7 +31,7 @@ class msg_aosd():
x -= 1
if pos < 3: #top positions 0 to 2
- y -= height - 1 - ypad;
+ y -= height - ypad;
for i in range(1, height + 1, step):
osd.loop_for(5)
y += step
@@ -48,7 +48,7 @@ class msg_aosd():
osd.loop_for(1);
else: #bottom positions 3 to 8
- y += height + 1 - ypad;
+ y += height - ypad;
for i in range(1, height + 1, step):
osd.loop_for(5)
y -= step
--
cgit v0.12
From 3fc303041b0c38ef9d1f74e0be21fbbd5557e0d0 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 28 Sep 2013 14:12:07 -0500
Subject: runit-scripts: shellinaboxd run: add --no-beep to eliminate plugin
error
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/services/shellinaboxd/run | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index f3ef203..9354ae2 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.0
-pkgrel=4
+pkgrel=5
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
index bfc6018..bc94a73 100755
--- a/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
+++ b/abs/core/runit-scripts/runitscripts/services/shellinaboxd/run
@@ -6,4 +6,4 @@ export TERM=linux
stat_runit "Starting shellinabox"
-exec su - mythtv -c "shellinaboxd -c /etc/lighttpd/"
+exec su - mythtv -c "shellinaboxd -c /etc/lighttpd/ --no-beep"
--
cgit v0.12
From 1d47d5494777098c42cacadab9be9328f54da407 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 28 Sep 2013 15:25:20 -0500
Subject: LinHES-system: msg_daemon.py: make bottom positions scroll the same
as the top positions
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/msg_daemon.py | 35 +++++++++++++++++++++++------------
abs/core/LinHES-system/system.install | 2 +-
3 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 3cce3eb..fddb3a7 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=26
+pkgrel=27
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -101,7 +101,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'4a3cd8f9b33b2b86fdba47a8f1fa2859'
'16f079dab35dde6efd55bf6cf4e2fb2f'
'3e60b17892e5b8214d47dcfddf5215a4'
- '28d2fbad517bcd2ba0cb0ce09f99bf62'
+ '57ec994cc3964a10c00580e89ebcae35'
'ea315f41dcd6c978e546c95fc05546cf'
'ac61cc460d9e97ba1f5ef69e92cdfbe5'
'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 861dbe3..f84d0c8 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -31,39 +31,50 @@ class msg_aosd():
x -= 1
if pos < 3: #top positions 0 to 2
- y -= height - ypad;
- for i in range(1, height + 1, step):
+ y -= height;
+ for i in range(1, height + 1 + ypad, step):
osd.loop_for(5)
y += step
osd.set_geometry(x, y, width, height)
- #osd.set_position(pos, width, height)
- #osd.set_position_offset(-1, -1)
(x, y, _, _) = osd.get_geometry()
- #time to display
+ #time to display
osd.loop_for(display_time)
- for i in range(height, 0, -step):
+ for i in range(height + 1 + ypad, 0, -step):
y -= step
osd.set_geometry(x, y, width, height);
osd.loop_for(1);
- else: #bottom positions 3 to 8
- y += height - ypad;
- for i in range(1, height + 1, step):
+ elif pos < 6: #middle positions 3 to 5
+ y += height;
+ for i in range(1, height, step):
osd.loop_for(5)
y -= step
osd.set_geometry(x, y, width, i)
- #osd.set_position(pos, width, height)
- #osd.set_position_offset(-1, -1)
(x, y, _, _) = osd.get_geometry()
- #time to display
+ #time to display
osd.loop_for(display_time)
for i in range(height, 0, -step):
y += step
osd.set_geometry(x, y, width, i);
osd.loop_for(1);
+ else: #bottom positions 6 to 8
+ y += height;
+ for i in range(1, height + 1 + ypad, step):
+ osd.loop_for(5)
+ y -= step
+ osd.set_geometry(x, y, width, height)
+
+ (x, y, _, _) = osd.get_geometry()
+ #time to display
+ osd.loop_for(display_time)
+ for i in range(height + 1 + ypad, 0, -step):
+ y += step
+ osd.set_geometry(x, y, width, height);
+ osd.loop_for(1);
+
osd.hide();
def setup(self,font_color,font_type):
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install
index c8dc71d..ddad9e3 100644
--- a/abs/core/LinHES-system/system.install
+++ b/abs/core/LinHES-system/system.install
@@ -19,7 +19,7 @@ post_install() {
# not needed in R8 because it's in the DB, may be removed
#/usr/LH/bin/misc_status_config.py
- # install canter font for msg_client.py
+ sv restart msg_daemon
}
# arg 1: the new package version
--
cgit v0.12
From 745f038168bd69352eecad08f267bfc4f57dc52a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 30 Sep 2013 12:43:43 -0500
Subject: mythtv: add tmdb3.py v3.6 and update db to use tmdb3.py
The tmdb v2 api was shutdown on 9/15/13 and the version of tmdb.py that is in .25/fixes has problems
---
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 12 +-
abs/core/mythtv/stable-0.25/mythtv/mythtv.install | 4 +-
abs/core/mythtv/stable-0.25/mythtv/tmdb3.py | 278 +++++++++++++++++++++
.../mythtv/stable-0.25/mythtv/tmdb3_db_update.py | 8 +
4 files changed, 297 insertions(+), 5 deletions(-)
create mode 100755 abs/core/mythtv/stable-0.25/mythtv/tmdb3.py
create mode 100755 abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 95f2a12..873eb92 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mythtv
pkgver=0.25
-pkgrel=28
+pkgrel=29
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -77,7 +77,8 @@ optdepends=('xmltv: to download tv listings')
replaces=('mythvideo' 'myththemes')
conflicts=('mythvideo' 'myththemes')
source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}`
- 'mythbackend.lr' 'mythfrontend.lr' 'pretty' )
+ 'mythbackend.lr' 'mythfrontend.lr' 'pretty'
+ 'tmdb3.py' 'tmdb3_db_update.py')
build() {
@@ -108,6 +109,9 @@ build() {
#Fix Python DepreciationWarning
sed -i 's/return super(Artwork, cls).__new__(cls, attr, parent, imagetype)/return super(Artwork, cls).__new__(cls)/' ${srcdir}/mythtv/bindings/python/MythTV/dataheap.py
+ #Update tmdb3.py to v3.6 & add tmdb3_db_update.py script
+ cp $srcdir/tmdb3*.py $srcdir/mythtv/programs/scripts/metadata/Movie/
+
ARCH=${CARCH/_/-}
./configure --prefix=/usr --cpu=${ARCH} \
--disable-audio-jack \
@@ -162,4 +166,6 @@ md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
'ae23e6a8cffbe335fa37bf59978bf7a2'
'f735805a80b0d1180dee01f9df1b7004'
'f407d6af23e74a49540755420f84fa58'
- '5469d9921b726db750b991c87d226158')
+ '5469d9921b726db750b991c87d226158'
+ '187be42b1ffca6badfa539260ffef65e'
+ '561bc8552c9d1f146d02a6febea5e700')
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
index 3b44668..cc60916 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
+++ b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
@@ -2,6 +2,7 @@
post_install() {
gen_is_xml.py
gen_lib_xml.py
+ /usr/share/mythtv/metadata/Movie/tmdb3_db_update.py
}
pre_upgrade() {
@@ -9,8 +10,7 @@ pre_upgrade() {
}
post_upgrade() {
- gen_is_xml.py
- gen_lib_xml.py
+ post_install
}
diff --git a/abs/core/mythtv/stable-0.25/mythtv/tmdb3.py b/abs/core/mythtv/stable-0.25/mythtv/tmdb3.py
new file mode 100755
index 0000000..829f744
--- /dev/null
+++ b/abs/core/mythtv/stable-0.25/mythtv/tmdb3.py
@@ -0,0 +1,278 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+# ----------------------
+# Name: tmdb3.py
+# Python Script
+# Author: Raymond Wagner
+# Purpose: This python script is intended to translate lookups between the
+# TheMovieDB.org V3 API and MythTV's internal metadata format.
+# http://www.mythtv.org/wiki/MythVideo_Grabber_Script_Format
+# http://help.themoviedb.org/kb/api/about-3
+#-----------------------
+__title__ = "TheMovieDB.org V3"
+__author__ = "Raymond Wagner"
+__version__ = "0.3.6"
+# 0.1.0 Initial version
+# 0.2.0 Add language support, move cache to home directory
+# 0.3.0 Enable version detection to allow use in MythTV
+# 0.3.1 Add --test parameter for proper compatibility with mythmetadatalookup
+# 0.3.2 Add --area parameter to allow country selection for release date and
+# parental ratings
+# 0.3.3 Use translated title if available
+# 0.3.4 Add support for finding by IMDB under -D (simulate previous version)
+# 0.3.5 Add debugging mode
+# 0.3.6 Add handling for TMDB site and library returning null results in
+# search. This should only need to be a temporary fix, and should be
+# resolved upstream.
+
+from optparse import OptionParser
+import sys
+
+def buildSingle(inetref, opts):
+ from MythTV.tmdb3 import Movie
+ from MythTV import VideoMetadata
+ from lxml import etree
+
+ import re
+ if re.match('^0[0-9]{6}$', inetref):
+ movie = Movie.fromIMDB(inetref)
+ else:
+ movie = Movie(inetref)
+
+ tree = etree.XML(u'<metadata></metadata>')
+ mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
+ ['releasedate', 'releasedate'], ['tagline', 'tagline'],
+ ['description', 'overview'], ['homepage', 'homepage'],
+ ['userrating', 'userrating'], ['popularity', 'popularity'],
+ ['budget', 'budget'], ['revenue', 'revenue']]
+ m = VideoMetadata()
+ for i,j in mapping:
+ if getattr(movie, j):
+ setattr(m, i, getattr(movie, j))
+
+ if movie.title:
+ m.title = movie.title
+
+ releases = movie.releases.items()
+
+ if opts.country:
+ try:
+ # resort releases with selected country at top to ensure it
+ # is selected by the metadata libraries
+ index = zip(*releases)[0].index(opts.country)
+ releases.insert(0, releases.pop(index))
+ except ValueError:
+ pass
+ else:
+ m.releasedate = releases[0][1].releasedate
+
+ m.inetref = str(movie.id)
+ if movie.collection:
+ m.collectionref = str(movie.collection.id)
+ if movie.releasedate:
+ m.year = movie.releasedate.year
+ for country, release in releases:
+ if release.certification:
+ m.certifications[country] = release.certification
+ for genre in movie.genres:
+ m.categories.append(genre.name)
+ for studio in movie.studios:
+ m.studios.append(studio.name)
+ for country in movie.countries:
+ m.countries.append(country.name)
+ for cast in movie.cast:
+ d = {'name':cast.name, 'character':cast.character, 'department':'Actors',
+ 'job':'Actor', 'url':'http://www.themoviedb.org/people/{0}'.format(cast.id)}
+ if cast.profile: d['thumb'] = cast.profile.geturl()
+ m.people.append(d)
+ for crew in movie.crew:
+ d = {'name':crew.name, 'job':crew.job, 'department':crew.department,
+ 'url':'http://www.themoviedb.org/people/{0}'.format(crew.id)}
+ if crew.profile: d['thumb'] = crew.profile.geturl()
+ m.people.append(d)
+ for backdrop in movie.backdrops:
+ m.images.append({'type':'fanart', 'url':backdrop.geturl(),
+ 'thumb':backdrop.geturl(backdrop.sizes()[0])})
+ for poster in movie.posters:
+ m.images.append({'type':'coverart', 'url':poster.geturl(),
+ 'thumb':poster.geturl(poster.sizes()[0])})
+ tree.append(m.toXML())
+ sys.stdout.write(etree.tostring(tree, encoding='UTF-8', pretty_print=True,
+ xml_declaration=True))
+ sys.exit()
+
+def buildList(query, opts):
+ # TEMPORARY FIX:
+ # replace all dashes from queries to work around search behavior
+ # as negative to all text that comes afterwards
+ query = query.replace('-',' ')
+
+ from MythTV.tmdb3 import searchMovie
+ from MythTV import VideoMetadata
+ from lxml import etree
+ results = searchMovie(query)
+ tree = etree.XML(u'<metadata></metadata>')
+ mapping = [['runtime', 'runtime'], ['title', 'originaltitle'],
+ ['releasedate', 'releasedate'], ['tagline', 'tagline'],
+ ['description', 'overview'], ['homepage', 'homepage'],
+ ['userrating', 'userrating'], ['popularity', 'popularity']]
+
+ count = 0
+ for res in results:
+ if res is None:
+ continue
+
+ m = VideoMetadata()
+ for i,j in mapping:
+ if getattr(res, j):
+ setattr(m, i, getattr(res, j))
+ m.inetref = str(res.id)
+
+ if res.title:
+ m.title = res.title
+
+ #TODO:
+ # should releasedate and year be pulled from the country-specific data
+ # or should it be left to the default information to cut down on
+ # traffic from searches
+ if res.releasedate:
+ m.year = res.releasedate.year
+ if res.backdrop:
+ b = res.backdrop
+ m.images.append({'type':'fanart', 'url':b.geturl(),
+ 'thumb':b.geturl(b.sizes()[0])})
+ if res.poster:
+ p = res.poster
+ m.images.append({'type':'coverart', 'url':p.geturl(),
+ 'thumb':p.geturl(p.sizes()[0])})
+ tree.append(m.toXML())
+ count += 1
+ if count >= 60:
+ # page limiter, dont want to overload the server
+ break
+
+ sys.stdout.write(etree.tostring(tree, encoding='UTF-8', pretty_print=True,
+ xml_declaration=True))
+ sys.exit(0)
+
+def buildCollection(inetref, opts):
+ from MythTV.tmdb3 import Collection
+ from MythTV import VideoMetadata
+ from lxml import etree
+ collection = Collection(inetref)
+ tree = etree.XML(u'<metadata></metadata>')
+ m = VideoMetadata()
+ m.collectionref = str(collection.id)
+ m.title = collection.name
+ if collection.backdrop:
+ b = collection.backdrop
+ m.images.append({'type':'fanart', 'url':b.geturl(),
+ 'thumb':b.geturl(b.sizes()[0])})
+ if collection.poster:
+ p = collection.poster
+ m.images.append({'type':'coverart', 'url':p.geturl(),
+ 'thumb':p.geturl(p.sizes()[0])})
+ tree.append(m.toXML())
+ sys.stdout.write(etree.tostring(tree, encoding='UTF-8', pretty_print=True,
+ xml_declaration=True))
+ sys.exit()
+
+def buildVersion():
+ from lxml import etree
+ version = etree.XML(u'<grabber></grabber>')
+ etree.SubElement(version, "name").text = __title__
+ etree.SubElement(version, "author").text = __author__
+ etree.SubElement(version, "thumbnail").text = 'tmdb.png'
+ etree.SubElement(version, "command").text = 'tmdb3.py'
+ etree.SubElement(version, "type").text = 'movie'
+ etree.SubElement(version, "description").text = \
+ 'Search and metadata downloads for themoviedb.org'
+ etree.SubElement(version, "version").text = __version__
+ sys.stdout.write(etree.tostring(version, encoding='UTF-8', pretty_print=True,
+ xml_declaration=True))
+ sys.exit(0)
+
+def performSelfTest():
+ err = 0
+ try:
+ import MythTV
+ except:
+ err = 1
+ print ("Failed to import MythTV bindings. Check your `configure` output "
+ "to make sure installation was not disabled due to external "
+ "dependencies")
+ try:
+ import MythTV.tmdb3
+ except:
+ err = 1
+ print ("Failed to import PyTMDB3 library. This should have been included "
+ "with the python MythTV bindings.")
+ try:
+ import lxml
+ except:
+ err = 1
+ print "Failed to import python lxml library."
+
+ if not err:
+ print "Everything appears in order."
+ sys.exit(err)
+
+def main():
+ parser = OptionParser()
+
+ parser.add_option('-v', "--version", action="store_true", default=False,
+ dest="version", help="Display version and author")
+ parser.add_option('-t', "--test", action="store_true", default=False,
+ dest="test", help="Perform self-test for dependencies.")
+ parser.add_option('-M', "--movielist", action="store_true", default=False,
+ dest="movielist", help="Get Movies matching search.")
+ parser.add_option('-D', "--moviedata", action="store_true", default=False,
+ dest="moviedata", help="Get Movie data.")
+ parser.add_option('-C', "--collection", action="store_true", default=False,
+ dest="collectiondata", help="Get Collection data.")
+ parser.add_option('-l', "--language", metavar="LANGUAGE", default=u'en',
+ dest="language", help="Specify language for filtering.")
+ parser.add_option('-a', "--area", metavar="COUNTRY", default=u'US',
+ dest="country", help="Specify country for custom data.")
+ parser.add_option('--debug', action="store_true", default=False,
+ dest="debug", help=("Disable caching and enable raw "
+ "data output."))
+
+ opts, args = parser.parse_args()
+
+ if opts.version:
+ buildVersion()
+
+ if opts.test:
+ performSelfTest()
+
+ from MythTV.tmdb3 import set_key, set_cache, set_locale
+ set_key('c27cb71cff5bd76e1a7a009380562c62')
+
+ if opts.debug:
+ import MythTV.tmdb3
+ MythTV.tmdb3.request.DEBUG = True
+ set_cache(engine='null')
+ else:
+ set_cache(engine='file', filename='~/.mythtv/pytmdb3.cache')
+
+ if opts.language:
+ set_locale(language=opts.language, fallthrough=True)
+ if opts.country:
+ set_locale(country=opts.country, fallthrough=True)
+
+ if (len(args) != 1) or (args[0] == ''):
+ sys.stdout.write('ERROR: tmdb3.py requires exactly one non-empty argument')
+ sys.exit(1)
+
+ if opts.movielist:
+ buildList(args[0], opts)
+
+ if opts.moviedata:
+ buildSingle(args[0], opts)
+
+ if opts.collectiondata:
+ buildCollection(args[0], opts)
+
+if __name__ == '__main__':
+ main()
diff --git a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
new file mode 100755
index 0000000..35f1b29
--- /dev/null
+++ b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python2
+
+# This script will update the myth db to use tmdb3.py.
+
+from MythTV import MythDB
+mythdb = MythDB()
+
+mythdb.settings.NULL.MovieGrabber = u'metadata/Movie/tmdb3.py'
--
cgit v0.12
From 9567c7d747cd41b035eef2367836f8d41803d550 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 1 Oct 2013 13:08:08 -0500
Subject: mythtv: tmdb3_db_update.py: use systemconfig method do update db
depending on system type.
remove old tmdb.py
---
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 17 +++++-----
abs/core/mythtv/stable-0.25/mythtv/mythtv.install | 2 +-
.../mythtv/stable-0.25/mythtv/tmdb3_db_update.py | 37 ++++++++++++++++++++--
3 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 873eb92..72957a9 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mythtv
pkgver=0.25
-pkgrel=29
+pkgrel=32
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -45,9 +45,9 @@ depends=('mysql-clients'
'glew'
'openssl'
'libxml2'
- 'lsdvd'
- 'dvdbackup'
- 'x264')
+ 'lsdvd'
+ 'dvdbackup'
+ 'x264')
#glew for gpu commerical flagging
#openssl for roap
@@ -109,8 +109,9 @@ build() {
#Fix Python DepreciationWarning
sed -i 's/return super(Artwork, cls).__new__(cls, attr, parent, imagetype)/return super(Artwork, cls).__new__(cls)/' ${srcdir}/mythtv/bindings/python/MythTV/dataheap.py
- #Update tmdb3.py to v3.6 & add tmdb3_db_update.py script
+ #Update tmdb3.py to v3.6 & add tmdb3_db_update.py script & rm tmdb.py
cp $srcdir/tmdb3*.py $srcdir/mythtv/programs/scripts/metadata/Movie/
+ rm -f $srcdir/mythtv/programs/scripts/metadata/Movie/tmdb.py
ARCH=${CARCH/_/-}
./configure --prefix=/usr --cpu=${ARCH} \
@@ -122,8 +123,8 @@ build() {
--enable-vdpau \
--enable-crystalhd \
--dvb-path=/usr/include \
- --enable-libmp3lame \
- --enable-libx264 \
+ --enable-libmp3lame \
+ --enable-libx264 \
--with-bindings=perl,python --python=python2 || return 1
make all || return 1
@@ -168,4 +169,4 @@ md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
'f407d6af23e74a49540755420f84fa58'
'5469d9921b726db750b991c87d226158'
'187be42b1ffca6badfa539260ffef65e'
- '561bc8552c9d1f146d02a6febea5e700')
+ 'fbe0fc68707b0c9564a4e00dfa3c4916')
diff --git a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
index cc60916..5d4614d 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
+++ b/abs/core/mythtv/stable-0.25/mythtv/mythtv.install
@@ -2,7 +2,6 @@
post_install() {
gen_is_xml.py
gen_lib_xml.py
- /usr/share/mythtv/metadata/Movie/tmdb3_db_update.py
}
pre_upgrade() {
@@ -11,6 +10,7 @@ pre_upgrade() {
post_upgrade() {
post_install
+ /usr/share/mythtv/metadata/Movie/tmdb3_db_update.py
}
diff --git a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
index 35f1b29..4f31364 100755
--- a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
+++ b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
@@ -1,8 +1,41 @@
#!/usr/bin/env python2
-# This script will update the myth db to use tmdb3.py.
+# This script will configure the myth db to use tmdb3.py
+from socket import gethostname
from MythTV import MythDB
mythdb = MythDB()
+localhostname = gethostname()
+import sys
-mythdb.settings.NULL.MovieGrabber = u'metadata/Movie/tmdb3.py'
+# Function to set db setting. This setting is set in mythtv-setup.
+def dbSettingChange():
+ if mythdb.settings.NULL.MovieGrabber == u'metadata/Movie/tmdb3.py':
+ print 'The MythTV database setting MovieGrabber is already set to tmdb3.py.'
+ else:
+ mythdb.settings.NULL.MovieGrabber = u'metadata/Movie/tmdb3.py'
+ print 'The MythTV database setting MovieGrabber has been updated to tmdb3.py'
+ return
+
+#taken from systemconfig.py
+#this is how you populate the dict
+systemconfig = {}
+file_name = "/etc/systemconfig"
+try:
+ config_file = open(file_name)
+except:
+ print file_name + ' could not be opened'
+ sys.exit(1)
+
+for line in config_file:
+ line = line.strip()
+ if line and line[0] is not "#" and line[-1] is not "=":
+ var, val = line.rsplit("=", 1)
+ val = val.strip('"')
+ systemconfig[var.strip()] = val.strip()
+
+#this is how you reference a value from mv_hostype.py
+if (systemconfig.get("SystemType") == "Standalone"):
+ dbSettingChange()
+elif systemconfig.get("SystemType") == "Master_backend":
+ dbSettingChange()
--
cgit v0.12
From 98ccc35a989a9b5ac056d5113346e9f979eab88d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 1 Oct 2013 14:39:10 -0500
Subject: LinHES-system: misc_status_config.py: fix logging error
---
abs/core/LinHES-system/PKGBUILD | 4 ++--
abs/core/LinHES-system/misc_status_config.py | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index fddb3a7..6661028 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-system
pkgver=8.0
-pkgrel=27
+pkgrel=28
arch=('i686' 'x86_64')
install=system.install
pkgdesc="Everything that makes LinHES an automated system"
@@ -107,7 +107,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
'f3502bb7c665750da0ecdf6918f7c838'
'b7febd04f64fe21e8cfbb888219b0b31'
'06a628469051237943b7c874f2e29b8a'
- '54ebcc024db2e0ebe8121305d8926767'
+ '8fe86aa9109a285aedce3c8658952bbb'
'45f46d1f9193c8dde18e56369ec29a1e'
'145b1da6ce501b3ce38ea415a576bf2d'
'116b0f62ed4e8dd6e437930deeb6e49e'
diff --git a/abs/core/LinHES-system/misc_status_config.py b/abs/core/LinHES-system/misc_status_config.py
index cc82534..c9b8637 100755
--- a/abs/core/LinHES-system/misc_status_config.py
+++ b/abs/core/LinHES-system/misc_status_config.py
@@ -6,6 +6,7 @@ from socket import gethostname
from MythTV import MythDB
mythdb = MythDB()
localhostname = gethostname()
+import sys
# Function to set db setting. This setting is set in mythtv-setup.
def dbSettingChange():
@@ -23,7 +24,7 @@ file_name = "/etc/systemconfig"
try:
config_file = open(file_name)
except:
- logging.critical("%s could not be opened", file_name)
+ print file_name + " could not be opened"
sys.exit(1)
for line in config_file:
--
cgit v0.12
From b0a49356ef9f847ccc713165f8a822a0b0de7f71 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Oct 2013 13:54:01 -0500
Subject: google-chrome: update to 30.0.1599.66
---
abs/extra/google-chrome/PKGBUILD | 12 +++++++-----
abs/extra/google-chrome/google-chrome.install | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index a6ea6b7..461a868 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=29.0.1547.65
+pkgver=30.0.1599.66
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('alsa-lib' 'gconf' 'gtk2' 'hicolor-icon-theme' 'libpng' 'libxslt' 'libx
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=$pkgver")
-conflicts=('google-chrome')
+conflicts=('google-chrome-beta')
replaces=('chromium')
options=('!emptydirs' '!strip')
install=$pkgname.install
@@ -24,9 +24,9 @@ _arch=i386
[ "$CARCH" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
"$url/intl/en/eula_text.html")
-md5sums=('40109e81b3fa3e65e6d0b64c4631c75d'
+md5sums=('755827c51ad2896b76cf36fa1cba32ff'
'6d57da7476a4b1b7a81821d9c036425c')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='69b73f30c933972b04bcb5ce2da5ecef'
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='7f055de3dc3a62cedb5156420c1bc99a'
#PKGEXT='.pkg.tar'
@@ -35,6 +35,7 @@ package() {
bsdtar -xf data.tar.lzma -C "$pkgdir/"
msg2 "Moving stuff in place"
+ # Desktop
mv "$pkgdir"/opt/google/chrome/google-chrome.desktop "$pkgdir"/usr/share/applications/
# Icons
@@ -52,5 +53,6 @@ package() {
ln -s /usr/lib/libudev.so.1 "$pkgdir"/opt/google/chrome/libudev.so.0
msg2 "Removing the Debian-intended cron job and duplicated images"
- rm "$pkgdir"/etc/cron.daily/google-chrome "$pkgdir"/opt/google/chrome/product_logo_*
+ rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
+ rm "$pkgdir"/opt/google/chrome/product_logo_*.png
}
diff --git a/abs/extra/google-chrome/google-chrome.install b/abs/extra/google-chrome/google-chrome.install
index c5c7d50..4b923b2 100644
--- a/abs/extra/google-chrome/google-chrome.install
+++ b/abs/extra/google-chrome/google-chrome.install
@@ -1,6 +1,6 @@
post_install() {
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
- if [ ! -a /usr/bin/chromium ]; then
+ if [ ! -e /usr/bin/chromium ]; then
ln -s /usr/bin/google-chrome /usr/bin/chromium
fi
}
--
cgit v0.12
From 0cc0148c66fc114a1e8d4dba7d24b588106bb16e Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 6 Oct 2013 18:26:54 -0500
Subject: mythtv: remove pytmdb3.cache
---
abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 4 ++--
abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py | 8 +++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 72957a9..936060b 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=mythtv
pkgver=0.25
-pkgrel=32
+pkgrel=33
commit_hash=`cat ../git_src/git_hash`
pkgdesc="A Homebrew PVR project $commit_hash"
arch=('i686' 'x86_64')
@@ -169,4 +169,4 @@ md5sums=('7ef6de58240e7aad389a0b13d91b1cf6'
'f407d6af23e74a49540755420f84fa58'
'5469d9921b726db750b991c87d226158'
'187be42b1ffca6badfa539260ffef65e'
- 'fbe0fc68707b0c9564a4e00dfa3c4916')
+ '7460513f6791574eaa0ae0402ffd3688')
diff --git a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
index 4f31364..22fc635 100755
--- a/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
+++ b/abs/core/mythtv/stable-0.25/mythtv/tmdb3_db_update.py
@@ -6,7 +6,7 @@ from socket import gethostname
from MythTV import MythDB
mythdb = MythDB()
localhostname = gethostname()
-import sys
+import sys, os
# Function to set db setting. This setting is set in mythtv-setup.
def dbSettingChange():
@@ -15,6 +15,12 @@ def dbSettingChange():
else:
mythdb.settings.NULL.MovieGrabber = u'metadata/Movie/tmdb3.py'
print 'The MythTV database setting MovieGrabber has been updated to tmdb3.py'
+ try:
+ os.remove("/home/mythtv/.mythtv/pytmdb3.cache")
+ print 'tmdb3 cache at /home/mythtv/.mythtv/pytmdb3.cache removed.'
+ except OSError:
+ print "tmdb3 cache at /home/mythtv/.mythtv/pytmdb3.cache doesn't exist."
+ pass
return
#taken from systemconfig.py
--
cgit v0.12
From 047d923359234ba175a3eecd779f8792a2f9d11b Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 11 Oct 2013 14:27:02 -0500
Subject: shellinabox: fix shellinaboxd.include proxy
---
abs/extra/shellinabox/PKGBUILD | 4 ++--
abs/extra/shellinabox/shellinaboxd.include | 13 +++++--------
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/abs/extra/shellinabox/PKGBUILD b/abs/extra/shellinabox/PKGBUILD
index 0fbe1e4..af3b4be 100644
--- a/abs/extra/shellinabox/PKGBUILD
+++ b/abs/extra/shellinabox/PKGBUILD
@@ -1,7 +1,7 @@
# Contributor: Brian Moore <archlinux@cptl.org>
pkgname=shellinabox
pkgver=2.14
-pkgrel=5
+pkgrel=6
pkgdesc="A web-based ssh client."
arch=('i686' 'x86_64')
url="http://shellinabox.com/"
@@ -49,5 +49,5 @@ md5sums=('6c63b52edcebc56ee73a108e7211d174'
'feea22575089cc7eb4925b1daff88b8c'
'77e487f36da2abe51251500f4a1e024f'
'be649866d06ba497d88bb14f3e58f862'
- '06b131e47522d8028aa245c1b8884e00'
+ 'dd46ab61bfafdb56ea705a876963550e'
'aadd1edf4110aca2d16d806791e90019')
diff --git a/abs/extra/shellinabox/shellinaboxd.include b/abs/extra/shellinabox/shellinaboxd.include
index c4c11bd..8d2befa 100644
--- a/abs/extra/shellinabox/shellinaboxd.include
+++ b/abs/extra/shellinabox/shellinaboxd.include
@@ -1,10 +1,7 @@
#proxy for shellinaboxd
-proxy.server = ( "/shell/" =>
- ( "localhost" =>
- (
- "host" => "127.0.0.1",
- "port" => 4200
- )
- )
-)
+$HTTP["url"] =~ "/shell/" {
+ proxy.server = ( "" => (
+ ("host" => "127.0.0.1", "port" => 4200)
+ ))
+}
--
cgit v0.12
From cdddd9d3127f9b4d13b45edfb5e345f97338b61a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 11 Oct 2013 15:19:01 -0500
Subject: supplemental-web: update error pages for remyth, mythexport and
mythexpress
---
abs/core/supplemental-web/PKGBUILD | 2 +-
abs/core/supplemental-web/contents/error/mythexport.html | 13 ++++++++++++-
abs/core/supplemental-web/contents/error/mythexpress.html | 6 +++---
abs/core/supplemental-web/contents/error/remyth.html | 8 +++++---
4 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/abs/core/supplemental-web/PKGBUILD b/abs/core/supplemental-web/PKGBUILD
index c24ebb8..3fddaf6 100644
--- a/abs/core/supplemental-web/PKGBUILD
+++ b/abs/core/supplemental-web/PKGBUILD
@@ -1,7 +1,7 @@
pkgbase=supplemental-web
pkgname=('supplemental-web' 'supplemental-web-slave')
pkgver=8.0
-pkgrel=8
+pkgrel=9
arch=('i686' 'x86_64')
backup=('extra.cfg.txt')
diff --git a/abs/core/supplemental-web/contents/error/mythexport.html b/abs/core/supplemental-web/contents/error/mythexport.html
index 88966c6..f0d6b9d 100644
--- a/abs/core/supplemental-web/contents/error/mythexport.html
+++ b/abs/core/supplemental-web/contents/error/mythexport.html
@@ -4,8 +4,19 @@
</head>
<body>
-MythExport does not appear to be installed.
+<h2>MythExport does not appear to be installed</h2>
</br>
+</br>
+<h4>Export MythTV recordings to portable media players.</h4>
+</br>
+<div id="navcontainer">
+ <ul id="navlist">
+To enable MythExport run these commands in a terminal:
+ </br>
+ <li> pacman -Syyu mythexport </li>
+ <li> add_service.sh mythexport </li>
+</ul>
</body>
</html>
+
diff --git a/abs/core/supplemental-web/contents/error/mythexpress.html b/abs/core/supplemental-web/contents/error/mythexpress.html
index 0382233..0525dfc 100644
--- a/abs/core/supplemental-web/contents/error/mythexpress.html
+++ b/abs/core/supplemental-web/contents/error/mythexpress.html
@@ -4,14 +4,14 @@
</head>
<body>
-MythExpress is not enabled or installed.
+<h2>MythExpress is not enabled or installed</h2>
</br>
</br>
+<h4>MythExpress is a browser-based interface to MythTV's HTTP streaming capability.</h4>
</br>
<div id="navcontainer">
<ul id="navlist">
-
-To enable mythexpress run these commands in a terminal:
+To enable MythExpress run these commands in a terminal:
</br>
<li> pacman -Syyu mythexpress </li>
<li> add_service.sh mythexpress </li>
diff --git a/abs/core/supplemental-web/contents/error/remyth.html b/abs/core/supplemental-web/contents/error/remyth.html
index 72c2775..36661d2 100644
--- a/abs/core/supplemental-web/contents/error/remyth.html
+++ b/abs/core/supplemental-web/contents/error/remyth.html
@@ -4,14 +4,16 @@
</head>
<body>
-ReMyth is not enabled or installed.
+<h2>ReMyth is not enabled or installed</h2>
</br>
</br>
+<h4>ReMyth provides a nice remote for your MythTV Frontends.</h4>
+<h4>You will be able to view your recordings, as well as send actions to a frontend of your choosing.</h4>
</br>
+
<div id="navcontainer">
<ul id="navlist">
-
-To enable remyth run these commands in a terminal:
+To enable ReMyth run these commands in a terminal:
</br>
<li> pacman -Syyu remyth </li>
<li> add_service.sh remyth </li>
--
cgit v0.12
From 257cebba3fc780f70fd63ee50af4f722ac37c18d Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Oct 2013 09:52:43 -0500
Subject: LinHES-config: mv_locale.py: change LOCALE= to LANG=. closes #932
---
abs/core/LinHES-config/PKGBUILD | 4 ++--
abs/core/LinHES-config/config.install | 2 ++
abs/core/LinHES-config/mv_locale.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/abs/core/LinHES-config/PKGBUILD b/abs/core/LinHES-config/PKGBUILD
index b28ab94..6a8cba3 100755
--- a/abs/core/LinHES-config/PKGBUILD
+++ b/abs/core/LinHES-config/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=LinHES-config
pkgver=8.0
-pkgrel=9
+pkgrel=10
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'
@@ -170,7 +170,7 @@ md5sums=('c832059cd635359d39a2ac3166ff463c'
'80685e047993b00161be29e3580f3a40'
'299c24c0820fc9c483c820db2595e3cb'
'cf51cb22e23218ae7e9b55cac1ba3a7f'
- 'e4b61402858058f7575b776d62d5ee89'
+ '781f161a79c3188a31c8615b8258b241'
'540a5b7f63a83ad53d6924c637bfd1c7'
'2596460462cf6c889cf8f95485537b20'
'dc3c5270691a62600475705f4cb78b56'
diff --git a/abs/core/LinHES-config/config.install b/abs/core/LinHES-config/config.install
index 2da71ff..c9171a6 100644
--- a/abs/core/LinHES-config/config.install
+++ b/abs/core/LinHES-config/config.install
@@ -38,6 +38,8 @@ post_upgrade() {
echo "config.xml not found, generating a new one"
/usr/MythVantage/bin/systemconfig.py -m hostype
fi
+
+ /usr/MythVantage/bin/systemconfig.py -m locale
}
# arg 1: the old package version
diff --git a/abs/core/LinHES-config/mv_locale.py b/abs/core/LinHES-config/mv_locale.py
index 973be31..172e074 100644
--- a/abs/core/LinHES-config/mv_locale.py
+++ b/abs/core/LinHES-config/mv_locale.py
@@ -57,7 +57,7 @@ def genlocale(locale_list):
def update_locale_conf(locale):
logging.info(" Updating /etc/locale.conf")
- line='''LOCALE="%s"''' %locale
+ line='''LANG="%s"''' %locale
try:
f = open('/etc/locale.conf',"w")
f.write(line)
--
cgit v0.12
From 3133370154078710820b2700fbbb86963da940d2 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Oct 2013 14:03:29 -0500
Subject: php: add deps php-gd and php-mcrypt since they are enabled in php.ini
---
abs/core/php/PKGBUILD | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/abs/core/php/PKGBUILD b/abs/core/php/PKGBUILD
index b1b4cdc..122c6ca 100644
--- a/abs/core/php/PKGBUILD
+++ b/abs/core/php/PKGBUILD
@@ -22,7 +22,7 @@ pkgname=('php'
'php-tidy'
'php-xsl')
pkgver=5.4.8
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
license=('PHP')
url='http://www.php.net'
@@ -187,7 +187,7 @@ build() {
package_php() {
pkgdesc='An HTML-embedded scripting language'
- depends=('pcre' 'libxml2' 'bzip2' 'curl')
+ depends=('pcre' 'libxml2' 'bzip2' 'curl' 'php-gd' 'php-mcrypt')
replaces=('php-fileinfo' 'php-gmp' 'php-curl')
provides=('php-fileinfo' 'php-gmp' 'php-curl')
conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
--
cgit v0.12
From 92872a1d41950c7a99c5f7caf13a9802b890ef51 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Oct 2013 15:28:10 -0500
Subject: php: __changelog add note about deps
---
abs/core/php/__changelog | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/abs/core/php/__changelog b/abs/core/php/__changelog
index 46f3ff3..5e9fead 100644
--- a/abs/core/php/__changelog
+++ b/abs/core/php/__changelog
@@ -14,6 +14,7 @@ short_tags On
==> "extension=ftp.so"
==> "extension=zip.so"
+==> add php-gd and php-mcrypt as depends of php since we have them in php.ini
syslog.error on
@@ -27,4 +28,4 @@ then
then
sed -i 's|^.*date.timezone.*$|date.timezone='${timezone}'|' /etc/php/php.ini
fi
-fi
\ No newline at end of file
+fi
--
cgit v0.12
From e30a147731084878086c772d16e522e580ad02fc Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Tue, 15 Oct 2013 15:50:37 -0500
Subject: runit-scripts: halt-runit and reboot-runit: fix wall syntax to use
stdin.
---
abs/core/runit-scripts/PKGBUILD | 2 +-
abs/core/runit-scripts/runitscripts/halt-runit | 2 +-
abs/core/runit-scripts/runitscripts/reboot-runit | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD
index 9354ae2..b652cba 100755
--- a/abs/core/runit-scripts/PKGBUILD
+++ b/abs/core/runit-scripts/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=runit-scripts
pkgver=8.0
-pkgrel=5
+pkgrel=6
pkgdesc="collection of startup scripts for runit"
url="http://smarden.org/runit/"
license="BSD"
diff --git a/abs/core/runit-scripts/runitscripts/halt-runit b/abs/core/runit-scripts/runitscripts/halt-runit
index b7d9a95..ac0862c 100755
--- a/abs/core/runit-scripts/runitscripts/halt-runit
+++ b/abs/core/runit-scripts/runitscripts/halt-runit
@@ -1,3 +1,3 @@
#!/bin/sh
-wall "System will shutdown NOW"
+echo "System will shutdown NOW" | wall
runit-init 0
diff --git a/abs/core/runit-scripts/runitscripts/reboot-runit b/abs/core/runit-scripts/runitscripts/reboot-runit
index 0d3d9d4..47ef728 100755
--- a/abs/core/runit-scripts/runitscripts/reboot-runit
+++ b/abs/core/runit-scripts/runitscripts/reboot-runit
@@ -1,3 +1,3 @@
#!/bin/sh
-wall "System will reboot NOW"
+echo "System will reboot NOW" | wall
runit-init 6
--
cgit v0.12
From 36f4b0be52fddbd5f491da90475e69c25bf6903f Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 16 Oct 2013 13:13:53 -0500
Subject: google-chrome: update to 30.0.1599.101
---
abs/extra/google-chrome/PKGBUILD | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/abs/extra/google-chrome/PKGBUILD b/abs/extra/google-chrome/PKGBUILD
index 461a868..085418c 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=30.0.1599.66
+pkgver=30.0.1599.101
pkgrel=1
pkgdesc="An attempt at creating a safer, faster, and more stable browser (Stable Channel)"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('alsa-lib' 'gconf' 'gtk2' 'hicolor-icon-theme' 'libpng' 'libxslt' 'libx
optdepends=('kdebase-kdialog: needed for file dialogs in KDE'
'ttf-google-fonts-git')
provides=("google-chrome=$pkgver")
-conflicts=('google-chrome-beta')
+conflicts=('google-chrome')
replaces=('chromium')
options=('!emptydirs' '!strip')
install=$pkgname.install
@@ -24,9 +24,9 @@ _arch=i386
[ "$CARCH" = 'x86_64' ] && _arch=amd64
source=("google-chrome-${_channel}_${pkgver}_${_arch}.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_${_arch}.deb"
"$url/intl/en/eula_text.html")
-md5sums=('755827c51ad2896b76cf36fa1cba32ff'
+md5sums=('fa5d706a9f7ef0682de6b665c20f302f'
'6d57da7476a4b1b7a81821d9c036425c')
-[ "$CARCH" = 'x86_64' ] && md5sums[0]='7f055de3dc3a62cedb5156420c1bc99a'
+[ "$CARCH" = 'x86_64' ] && md5sums[0]='9abdef7ee0422f7dabb16941453551cc'
#PKGEXT='.pkg.tar'
--
cgit v0.12